commit af9111ac7fa399a5a33fbfa145060e1850f41e0e
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Tue Feb 7 10:30:37 2023 +1000
xserver 21.1.7
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 9ca7d3f61a88ae6cf47fdf139b6215d745db976b
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Wed Jan 25 11:41:40 2023 +1000
Xi: fix potential use-after-free in DeepCopyPointerClasses
CVE-2023-0494, ZDI-CAN-19596
This vulnerability was discovered by:
Jan-Niklas Sohn working with Trend Micro Zero Day Initiative
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
(cherry picked from commit 0ba6d8c37071131a49790243cdac55392ecf71ec)
commit 4b925d388f76764dcb02dfd1cd7276262dcd7d74
Author: Mike Gorse <mgorse@suse.com>
Date: Wed Jan 25 02:02:48 2023 +0000
dix: Use CopyPartialInternalEvent in EnqueueEvent
The event might be a DeviceEvent allocated on the stack, in
AccessXKeyboardEvent for instance. Fixes out-of-bounds read.
Signed-off-by: Mike Gorse <mgorse@suse.com>
(cherry picked from commit 2ef5ef57bd37a8bec2ac454053b283c6f87c3b40)
commit 44d6c82ac82a78d904a6d47387ac363d9699b891
Author: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
Date: Wed Jan 18 10:38:41 2023 -0800
darwin: Implement DetermineClientCmd for macOS
Withoug a proper implementation of DetermineClientCmd, clients that
connect via an ssh tunnel are miscategorized as local. This results
in failures when we try to use SCM_RIGHTS (eg: in MIT-SHM).
Fixes: https://github.com/XQuartz/XQuartz/issues/314
Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
(cherry picked from commit 0ea9b595891f2f31915538192961f3404d9ca699)
commit 1317083fbc407dc9dbb04ba5b98187b75222a16f
Author: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
Date: Wed Jan 18 12:19:05 2023 -0800
os: Use LOCAL_PEERPID from sys/un.h if it is available to detemine the pid when falling back on getpeereids()
This provides a way to determine the pid of a peer connection on
systems like darwin that do not support getpeerucred() nor
SO_PEERCRED.
Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
(cherry picked from commit 8a4ab2287398773a4868c220662d93bf84ec6241)
commit a6c49106cef36e84eb11d64e325465250b7678be
Author: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
Date: Wed Jan 18 12:02:54 2023 -0800
os: Update GetLocalClientCreds to prefer getpeerucred() or SO_PEERCRED over getpeereid()
GetLocalClientCreds() was preferring getpeereid() above other implementations.
getpeereid(), however, only returns the effective uid and gid of the peer,
leaving the pid unset. When this happens, we are unable to use the pid to
determine the peer's command line arguments and incorrectly treat ssh-tunneled
traffic as local.
To address this, we now prioritize getpeerucred() or SO_PEERCRED as those two
implementations will return the pid in addition to uid and gid.
Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
(cherry picked from commit 165d5c1260edcb998c5cf31d3969723c7452aa7f)
commit a220f53cb81248d06fb6f044c102c6ab8bffe2d5
Author: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
Date: Wed Jan 18 10:44:27 2023 -0800
os: Update AllocNewConnection() debug logging to include whether or not the client is local
Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
(cherry picked from commit 2577291f010e07173d0fc8b310ac355928f8ed7d)
commit 07f9689507eee11bdbc2828ac1319fbde91ad27c
Author: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
Date: Sun Nov 27 22:25:49 2022 -0800
Revert "meson: Don't build COMPOSITE for XQuartz"
This will allow us to remove build-time conditionalization on COMPOSITE
while still allowing XQuartz to disable it and use ROOTLESS.
This reverts commit 5f2d652377995c0c0c3cf07463b5018450661d13
(cherry picked from commit 66e7b7349dffda6fef51ed029fdc91b787ca4c08)
commit 8ea43dd8bf8f8f2cb82a2a1f2c004ee873e7810d
Author: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
Date: Sun Nov 27 22:23:43 2022 -0800
xquartz: Disable COMPOSITE at runtime
Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
(cherry picked from commit 2567388a2957cef526df1b7efb2684aa74feb641)
commit aa0d8d440c39beb276cd26723d822728ce394e01
Author: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
Date: Tue Jan 17 07:33:19 2023 -0800
xquartz: Update the about box copyright to 2023
Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
(cherry picked from commit 15077090d371a2679d274c5d129a3102762d18ec)
commit 8feba178f8b73b983033c197c384c580a6397a41
Author: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
Date: Sat Jan 14 23:33:59 2023 -0800
xquartz: Fix building with autoconf
Regressed-in: 5d302c378d9d21b34db2434425b766ac4f05de89
Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
commit c8ef9e38187e00dbaf956893f987e15e8f42f61c
Author: Olivier Fourdan <ofourdan@redhat.com>
Date: Tue Jul 12 14:44:48 2022 +0200
dix: Fix overzealous caching of ResourceClientBits()
Commit c7311654 cached the value of ResourceClientBits(), but that value
depends on the `MaxClients` value set either from the command line or
from the configuration file.
For the latter, a call to ResourceClientBits() is issued before the
configuration file is read, meaning that the cached value is from the
default, not from the maximum number of clients set in the configuration
file.
That obviously causes all sort of issues, including memory corruption
and crashes of the Xserver when reaching the default limit value.
To avoid that issue, also keep the LimitClient value, and recompute the
ilog2() value if that changes, as on startup when the value is set from
the the xorg.conf ServerFlags section.
v2: Drop the `cache == 0` test
Rename cache vars
Fixes: c7311654 - dix: cache ResourceClientBits() value
Closes: https://gitlab.freedesktop.org/xorg/xserver/-/issues/1310
Signed-off-by: Olivier Fourdan <ofourdan@redhat.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
(cherry picked from commit 2efa6d659508346358a1ef27b2393e18843f66a3)
commit a0216de2367429788be4ef430026ada215106ff5
Author: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
Date: Wed Dec 14 23:45:13 2022 -0800
rootless: Add additional debug logging to help triage XQuartz fb/rootless/damage crashes
Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
(cherry picked from commit 07ed1a623a4b36cdb741a322008ba53d913dc765)
commit 264272f3d76e4f1e50d984640c57de77aca9ba37
Author: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
Date: Wed Dec 14 17:07:46 2022 -0800
xquartz: Use xorg_backtrace() instead of rolling our own for debugging
Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
(cherry picked from commit d1a9a50792110683ae3f993eeeffeee79cf9cbce)
commit 20f380c6d93be3ef561251584163d1fe1ae2d966
Author: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
Date: Wed Dec 21 01:18:11 2022 -0800
xquartz: Ignore SIGPIPE at process launch
Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
(cherry picked from commit 9a66690eaf67c19b90e07f39b16436d34b59e27a)
commit 59b6fc88ed9f4b22397a568c2483e4c558856ffa
Author: Olivier Fourdan <ofourdan@redhat.com>
Date: Mon Dec 19 10:46:20 2022 +0100
xserver 21.1.6
Signed-off-by: Olivier Fourdan <ofourdan@redhat.com>
commit b7760d41c177983c2f2fca2ebdb8105628291720
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Mon Dec 19 10:06:45 2022 +1000
Xext: fix invalid event type mask in XTestSwapFakeInput
In commit b320ca0 the mask was inadvertently changed from octal 0177 to
hexadecimal 0x177.
Fixes commit b320ca0ffe4c0c872eeb3a93d9bde21f765c7c63
Xtest: disallow GenericEvents in XTestSwapFakeInput
Found by Stuart Cassoff
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
(cherry picked from commit bb1711b7fba42f2a0c7d1c09beee241a1b2bcc30)
commit 69ab3bcaa0f6a5adef6ec19161eb856a4744b32c
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Wed Jul 13 11:23:09 2022 +1000
xkb: fix some possible memleaks in XkbGetKbdByName
GetComponentByName returns an allocated string, so let's free that if we
fail somewhere.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
(cherry picked from commit 18f91b950e22c2a342a4fbc55e9ddf7534a707d2)
commit 5dbb2b52cfeab212b5c9b7e344692a6384efdc4c
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Tue Jul 5 12:06:20 2022 +1000
xkb: proof GetCountedString against request length attacks
GetCountedString did a check for the whole string to be within the
request buffer but not for the initial 2 bytes that contain the length
field. A swapped client could send a malformed request to trigger a
swaps() on those bytes, writing into random memory.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
(cherry picked from commit 11beef0b7f1ed290348e45618e5fa0d2bffcb72e)
commit becf9d51c33a21e7700b18bb2324f466bb966de5
Author: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
Date: Wed Dec 14 00:13:34 2022 -0800
xquartz: Fix some formatting
Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
commit 61d18bed664769b1d94ea1320e27f71560a01af2
Author: John D Pell <John+git@gaelicWizard.net>
Date: Tue Jul 13 23:46:28 2021 -0700
XQuartz: stub: Call LSOpenApplication instead of fork()/exec()
Reviewed-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
commit f292fbfaac0c653ee49bbb24deb3add2b5da602f
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Wed Dec 14 11:34:41 2022 +1000
xserver 21.1.5
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit e860bbce4fdb169e84033529331ae2666e679de7
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Mon Dec 5 15:55:54 2022 +1000
xkb: reset the radio_groups pointer to NULL after freeing it
Unlike other elements of the keymap, this pointer was freed but not
reset. On a subsequent XkbGetKbdByName request, the server may access
already freed memory.
CVE-2022-4283, ZDI-CAN-19530
This vulnerability was discovered by:
Jan-Niklas Sohn working with Trend Micro Zero Day Initiative
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Acked-by: Olivier Fourdan <ofourdan@redhat.com>
(cherry picked from commit ccdd431cd8f1cabae9d744f0514b6533c438908c)
commit 8a1fa008b2f90abce6cabb27d9bc2ed76d07b678
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Tue Nov 29 13:26:57 2022 +1000
Xi: avoid integer truncation in length check of ProcXIChangeProperty
This fixes an OOB read and the resulting information disclosure.
Length calculation for the request was clipped to a 32-bit integer. With
the correct stuff->num_items value the expected request size was
truncated, passing the REQUEST_FIXED_SIZE check.
The server then proceeded with reading at least stuff->num_items bytes
(depending on stuff->format) from the request and stuffing whatever it
finds into the property. In the process it would also allocate at least
stuff->num_items bytes, i.e. 4GB.
The same bug exists in ProcChangeProperty and ProcXChangeDeviceProperty,
so let's fix that too.
CVE-2022-46344, ZDI-CAN 19405
This vulnerability was discovered by:
Jan-Niklas Sohn working with Trend Micro Zero Day Initiative
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Acked-by: Olivier Fourdan <ofourdan@redhat.com>
(cherry picked from commit 8f454b793e1f13c99872c15f0eed1d7f3b823fe8)
commit 40f431de8a76f737c68ae659fee8472583f15e49
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Tue Nov 29 13:24:00 2022 +1000
Xi: return an error from XI property changes if verification failed
Both ProcXChangeDeviceProperty and ProcXIChangeProperty checked the
property for validity but didn't actually return the potential error.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Acked-by: Olivier Fourdan <ofourdan@redhat.com>
(cherry picked from commit b8a84cb0f2807b07ab70ca9915fcdee21301b8ca)
commit d6c7de9eadca980c8ce3b3b7752b67bfa95e6f31
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Tue Nov 29 14:53:07 2022 +1000
Xext: free the screen saver resource when replacing it
This fixes a use-after-free bug:
When a client first calls ScreenSaverSetAttributes(), a struct
ScreenSaverAttrRec is allocated and added to the client's
resources.
When the same client calls ScreenSaverSetAttributes() again, a new
struct ScreenSaverAttrRec is allocated, replacing the old struct. The
old struct was freed but not removed from the clients resources.
Later, when the client is destroyed the resource system invokes
ScreenSaverFreeAttr and attempts to clean up the already freed struct.
Fix this by letting the resource system free the old attrs instead.
CVE-2022-46343, ZDI-CAN 19404
This vulnerability was discovered by:
Jan-Niklas Sohn working with Trend Micro Zero Day Initiative
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Acked-by: Olivier Fourdan <ofourdan@redhat.com>
(cherry picked from commit 842ca3ccef100ce010d1d8f5f6d6cc1915055900)
commit 67927cc41f452228188bbe2aa34a9ee4a9ce0c6b
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Wed Nov 30 11:20:40 2022 +1000
Xext: free the XvRTVideoNotify when turning off from the same client
This fixes a use-after-free bug:
When a client first calls XvdiSelectVideoNotify() on a drawable with a
TRUE onoff argument, a struct XvVideoNotifyRec is allocated. This struct
is added twice to the resources:
- as the drawable's XvRTVideoNotifyList. This happens only once per
drawable, subsequent calls append to this list.
- as the client's XvRTVideoNotify. This happens for every client.
The struct keeps the ClientPtr around once it has been added for a
client. The idea, presumably, is that if the client disconnects we can remove
all structs from the drawable's list that match the client (by resetting
the ClientPtr to NULL), but if the drawable is destroyed we can remove
and free the whole list.
However, if the same client then calls XvdiSelectVideoNotify() on the
same drawable with a FALSE onoff argument, only the ClientPtr on the
existing struct was set to NULL. The struct itself remained in the
client's resources.
If the drawable is now destroyed, the resource system invokes
XvdiDestroyVideoNotifyList which frees the whole list for this drawable
- including our struct. This function however does not free the resource
for the client since our ClientPtr is NULL.
Later, when the client is destroyed and the resource system invokes
XvdiDestroyVideoNotify, we unconditionally set the ClientPtr to NULL. On
a struct that has been freed previously. This is generally frowned upon.
Fix this by calling FreeResource() on the second call instead of merely
setting the ClientPtr to NULL. This removes the struct from the client
resources (but not from the list), ensuring that it won't be accessed
again when the client quits.
Note that the assignment tpn->client = NULL; is superfluous since the
XvdiDestroyVideoNotify function will do this anyway. But it's left for
clarity and to match a similar invocation in XvdiSelectPortNotify.
CVE-2022-46342, ZDI-CAN 19400
This vulnerability was discovered by:
Jan-Niklas Sohn working with Trend Micro Zero Day Initiative
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Acked-by: Olivier Fourdan <ofourdan@redhat.com>
(cherry picked from commit b79f32b57cc0c1186b2899bce7cf89f7b325161b)
commit a6c0d7b142e762a6b9934a23e060ea91ff5afcea
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Tue Nov 29 13:55:32 2022 +1000
Xi: disallow passive grabs with a detail > 255
The XKB protocol effectively prevents us from ever using keycodes above
255. For buttons it's theoretically possible but realistically too niche
to worry about. For all other passive grabs, the detail must be zero
anyway.
This fixes an OOB write:
ProcXIPassiveUngrabDevice() calls DeletePassiveGrabFromList with a
temporary grab struct which contains tempGrab->detail.exact = stuff->detail.
For matching existing grabs, DeleteDetailFromMask is called with the
stuff->detail value. This function creates a new mask with the one bit
representing stuff->detail cleared.
However, the array size for the new mask is 8 * sizeof(CARD32) bits,
thus any detail above 255 results in an OOB array write.
CVE-2022-46341, ZDI-CAN 19381
This vulnerability was discovered by:
Jan-Niklas Sohn working with Trend Micro Zero Day Initiative
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Acked-by: Olivier Fourdan <ofourdan@redhat.com>
(cherry picked from commit 51eb63b0ee1509c6c6b8922b0e4aa037faa6f78b)
commit 936d34bdff4c479ccd0405fc221ff8e4c6c7014d
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Tue Nov 29 12:55:45 2022 +1000
Xtest: disallow GenericEvents in XTestSwapFakeInput
XTestSwapFakeInput assumes all events in this request are
sizeof(xEvent) and iterates through these in 32-byte increments.
However, a GenericEvent may be of arbitrary length longer than 32 bytes,
so any GenericEvent in this list would result in subsequent events to be
misparsed.
Additional, the swapped event is written into a stack-allocated struct
xEvent (size 32 bytes). For any GenericEvent longer than 32 bytes,
swapping the event may thus smash the stack like an avocado on toast.
Catch this case early and return BadValue for any GenericEvent.
Which is what would happen in unswapped setups anyway since XTest
doesn't support GenericEvent.
CVE-2022-46340, ZDI-CAN 19265
This vulnerability was discovered by:
Jan-Niklas Sohn working with Trend Micro Zero Day Initiative
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Acked-by: Olivier Fourdan <ofourdan@redhat.com>
(cherry picked from commit b320ca0ffe4c0c872eeb3a93d9bde21f765c7c63)
commit 5f2d652377995c0c0c3cf07463b5018450661d13
Author: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
Date: Sun Nov 27 15:04:13 2022 -0800
meson: Don't build COMPOSITE for XQuartz
Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
(cherry picked from commit 9c0373366988cc0b909ba31e61c43cc46e054b40)
commit 3dee0aac2c0ed4538880b65ee528e4633d103592
Author: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
Date: Thu Nov 24 10:58:26 2022 -0800
xquartz: Move default applications list outside of the main executable
This will allow side-wide customization.
Fixes: https://github.com/XQuartz/XQuartz/issues/274
Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
(cherry picked from commit e654de80ed560c480efc072d876808b1d78da052)
commit 5d302c378d9d21b34db2434425b766ac4f05de89
Author: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
Date: Thu Nov 24 11:04:08 2022 -0800
xquartz: Remove unused macro (X11LIBDIR)
Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
(cherry picked from commit 3dbd809c0e2d8da4191dd4a3fd4abdd14be0d838)
commit 6bf62381d0a1fb54226a10f9d0e6b03aff12f3aa
Author: Povilas Kanapickas <povilas@radix.lt>
Date: Tue Jul 12 16:09:23 2022 +0300
xserver 21.1.4
commit 06b23cccb1166fcccc2f5fe7259b3ef9e1d0f32e
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Tue Jul 5 11:11:06 2022 +1000
xkb: add request length validation for XkbSetGeometry
No validation of the various fields on that report were done, so a
malicious client could send a short request that claims it had N
sections, or rows, or keys, and the server would process the request for
N sections, running out of bounds of the actual request data.
Fix this by adding size checks to ensure our data is valid.
ZDI-CAN 16062, CVE-2022-2319.
This vulnerability was discovered by:
Jan-Niklas Sohn working with Trend Micro Zero Day Initiative
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
(cherry picked from commit 6907b6ea2b4ce949cb07271f5b678d5966d9df42)
commit e3a530540f2f13739b0233ec51d7a3985a7ec4be
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Tue Jul 5 09:50:41 2022 +1000
xkb: swap XkbSetDeviceInfo and XkbSetDeviceInfoCheck
XKB often uses a FooCheck and Foo function pair, the former is supposed
to check all values in the request and error out on BadLength,
BadValue, etc. The latter is then called once we're confident the values
are good (they may still fail on an individual device, but that's a
different topic).
In the case of XkbSetDeviceInfo, those functions were incorrectly
named, with XkbSetDeviceInfo ending up as the checker function and
XkbSetDeviceInfoCheck as the setter function. As a result, the setter
function was called before the checker function, accessing request
data and modifying device state before we ensured that the data is
valid.
In particular, the setter function relied on values being already
byte-swapped. This in turn could lead to potential OOB memory access.
Fix this by correctly naming the functions and moving the length checks
over to the checker function. These were added in 87c64fc5b0 to the
wrong function, probably due to the incorrect naming.
Fixes ZDI-CAN 16070, CVE-2022-2320.
This vulnerability was discovered by:
Jan-Niklas Sohn working with Trend Micro Zero Day Initiative
Introduced in c06e27b2f6fd9f7b9f827623a48876a225264132
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
(cherry picked from commit dd8caf39e9e15d8f302e54045dd08d8ebf1025dc)
commit e75840565775dc95b848b366aeed44066a9d8a28
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Tue Jul 5 12:40:47 2022 +1000
xkb: switch to array index loops to moving pointers
Most similar loops here use a pointer that advances with each loop
iteration, let's do the same here for consistency.
No functional changes.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Olivier Fourdan <ofourdan@redhat.com>
(cherry picked from commit f1070c01d616c5f21f939d5ebc533738779451ac)
commit f3d9c6ff12b5a8a1a9f316b096d5573060747ff9
Author: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
Date: Mon Jul 4 14:16:43 2022 -0700
xquartz: Add missing files to distribution tarball
Fixes: https://gitlab.freedesktop.org/xorg/xserver/-/issues/1346
Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
commit 147c17fc786c268ec51dc0f0655e69f6493f7ef2
Author: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
Date: Sat Jul 2 14:15:50 2022 -0700
XQuartz: Improve type safety for X11Controller's application menu editor
Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
(cherry picked from commit 4cfdc5af31ae8282903d0f65cff858330b9f9d1a)
commit 9e2fc7e2484be7c577ee5baf3765734beef9adc2
Author: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
Date: Sat Jul 2 14:17:18 2022 -0700
xquartz: Fix a possible crash when editing the Application menu due to mutaing immutable arrays
Crashing on exception: -[__NSCFArray replaceObjectAtIndex:withObject:]: mutating method sent to immutable object
Application Specific Backtrace 0:
0 CoreFoundation 0x00007ff80d2c5e9b __exceptionPreprocess + 242
1 libobjc.A.dylib 0x00007ff80d027e48 objc_exception_throw + 48
2 CoreFoundation 0x00007ff80d38167b _CFThrowFormattedException + 194
3 CoreFoundation 0x00007ff80d382a25 -[__NSCFArray removeObjectAtIndex:].cold.1 + 0
4 CoreFoundation 0x00007ff80d2e6c0b -[__NSCFArray replaceObjectAtIndex:withObject:] + 119
5 X11.bin 0x00000001003180f9 -[X11Controller tableView:setObjectValue:forTableColumn:row:] + 169
Fixes: https://github.com/XQuartz/XQuartz/issues/267
Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
(cherry picked from commit dfd057996b26420309c324ec844a5ba6dd07eda3)
commit 86ace20398a6c559e89213622538134b72e448b1
Author: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
Date: Fri Jul 1 14:26:06 2022 -0700
xquartz: Use correct defines when building to support Sparkle updates
Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
(cherry picked from commit aa636b97c66343b25e508b9c73d8505e8c11b1d9)
commit 855b96a85bc0711460a2542573a9a3959d1bfefa
Author: Povilas Kanapickas <povilas@radix.lt>
Date: Sun Dec 19 16:51:39 2021 +0200
xfree86: Fix event data alignment in inputtest driver
This fixes address sanitizer errors when running unit tests. The
additional copying may reduce performance by a small amount, but we
don't care about that because this driver is used for testing only.
Signed-off-by: Povilas Kanapickas <povilas@radix.lt>
(cherry picked from commit 7d2014e7d523e10623203582b9f573303750f087)
commit 9d05ee10c231edacc69b342677ae8c3cc32f97e5
Author: Povilas Kanapickas <povilas@radix.lt>
Date: Sun Jan 16 10:42:15 2022 +0200
dix: Don't send touch end to clients that do async grab without touches
GTK3 menu widget creates a selection for touch and other events and
after receiving touch events creates an async grab that excludes touch
events. Unfortunately it relies on X server not sending the touch end
event in order to function properly. Sending touch end event will cause
it to think that the initiating touch ended and when it actually ends,
the ButtonRelease event will make it think that the menu should be
closed. As a result, the menu will be open only for the duration of the
touch making it useless.
This commit reverts f682e0563f736ed2c2c612ed575e05b6e3db945e.
Fixes: https://gitlab.freedesktop.org/xorg/xserver/-/issues/1255
Signed-off-by: Povilas Kanapickas <povilas@radix.lt>
(cherry picked from commit 43e934a19f644cddedae73602e86429c9dc5074a)
commit b713e717c34d539486f661c03a0f1b35b3208d21
Author: Povilas Kanapickas <povilas@radix.lt>
Date: Sun Jan 23 22:18:52 2022 +0200
dix: Correctly save replayed event into GrabInfoRec
When processing events we operate on InternalEvent pointers. They may
actually refer to a an instance of DeviceEvent, GestureEvent or any
other event that comprises the InternalEvent union. This works well in
practice because we always look into event type before doing anything,
except in the case of copying the event.
*dst_event = *src_event would copy whole InternalEvent event and would
cause out of bounds read in case the pointed to event was not
InternalEvent but e.g. DeviceEvent.
This regression has been introduced in
23a8b62d34344575f9df9d057fb74bfefa94a77b.
Fixes https://gitlab.freedesktop.org/xorg/xserver/-/issues/1261
Signed-off-by: Povilas Kanapickas <povilas@radix.lt>
(cherry picked from commit 6ef5c05728f8b18170fbc8415d7502495a08670b)
commit cd3d21d8c44a35c22b7eca61a58bb5620b116102
Author: Samuel Thibault <samuel.thibault@ens-lyon.org>
Date: Wed Jan 26 00:05:55 2022 +0100
xkb: fix XkbSetMap when changing a keysym without changing a keytype
As the comment says:
"symsPerKey/mapWidths must be filled regardless of client-side flags"
so we always have to call CheckKeyTypes which will notably fill mapWidths
and nTypes. That is needed for CheckKeySyms to work since it checks the
width. Without it, any request with XkbKeySymsMask but not
XkbKeyTypesMask will fail because of the missing width information, for
instance this:
XkbDescPtr xkb;
if (!(xkb = XkbGetMap (dpy, XkbKeyTypesMask|XkbKeySymsMask, XkbUseCoreKbd))) {
fprintf (stderr, "ERROR getting map\n");
exit(1);
}
XFlush (dpy);
XSync (dpy, False);
XkbMapChangesRec changes = { .changed = 0 };
int oneGroupType[XkbNumKbdGroups] = { XkbOneLevelIndex };
if (XkbChangeTypesOfKey(xkb, keycode, 1, XkbGroup1Mask, oneGroupType, &changes)) {
fprintf(stderr, "ERROR changing type of key\n");
exit(1);
}
XkbKeySymEntry(xkb,keycode,0,0) = keysym;
if (!XkbChangeMap(dpy,xkb,&changes)) {
fprintf(stderr, "ERROR changing map\n");
exit(1);
}
XkbFreeKeyboard (xkb, 0, TRUE);
XFlush (dpy);
XSync (dpy, False);
This had being going under the radar since about ever until commit
de940e06f8733d87bbb857aef85d830053442cfe ("xkb: fix key type index check
in _XkbSetMapChecks") fixed checking the values of kt_index, which was
previously erroneously ignoring errors and ignoring all other checks, just
because nTypes was not set, precisely because CheckKeyTypes was not called.
Note: yes, CheckKeyTypes is meant to be callable without XkbKeyTypesMask, it
does properly check for that and just fills nTypes and mapWidths in that
case.
Signed-off-by: Samuel Thibault <samuel.thibault@ens-lyon.org>
(cherry picked from commit 0217cc6e0cf5013366105a90f5f91ccc4bab5425)
commit f575524314e9f20a1ff639f6bd65386cdbd083f4
Author: Povilas Kanapickas <povilas@radix.lt>
Date: Thu Feb 3 20:04:52 2022 +0200
Revert "os: Try to discover the current seat with the XDG_SEAT var first"
This reverts commit b27eaa72837eebe80adfe6c257a71a6b9eaf66ee.
commit 419fbf639d8f53d39449c157a9554bd5482ed64f
Author: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
Date: Sun Jun 26 10:31:54 2022 -0700
XQuartz: Add TCC reason keys to Info.plist
Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
(cherry picked from commit 9ce7264889e36fddbdf6bac332225ad6f628ad5d)
commit 66ac50090dd191f1b16daf338ca3b46d9147fbbd
Author: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
Date: Sun Jun 26 02:40:20 2022 -0700
XQuartz: Build the bundle trampoline when using meson
This brings the change for e1fdc856aedfcb4788011415930a0c6861df5123 into meson based builds
Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
(cherry picked from commit b00cf4aef881e00533f995c141c3586749cd7ca1)
commit 033d93a021e86dd5ce9b2b3a1554a72c7031a7f2
Author: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
Date: Mon Jun 20 17:08:53 2022 -0700
meson: Support building Xnest and Xorg on darwin
Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
(cherry picked from commit ef8101560eefd6160df6d4b57ddb65ea2328c441)
commit 433f53a1a08390a038176b7c1207512cf1dd3f44
Author: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
Date: Mon Jun 20 20:19:06 2022 -0700
tests: Fix build failure from missing micmap.c
FAILED: test/tests
clang -o test/tests test/tests.p/.._mi_miinitext.c.o test/tests.p/fixes.c.o test/tests.p/input.c.o test/tests.p/list.c.o test/tests.p/misc.c.o test/tests.p/signal-logging.c.o test/tests.p/string.c.o test/tests.p/test_xkb.c.o test/tests.p/tests-common.c.o test/tests.p/tests.c.o test/tests.p/touch.c.o test/tests.p/xfree86.c.o test/tests.p/xtest.c.o test/tests.p/hashtabletest.c.o -Wl,-dead_strip_dylibs -Wl,-headerpad_max_install_names -Wl,-undefined,error -fvisibility=hidden -O0 -g3 -gdwarf-2 -mmacosx-version-min=10.9 -Werror=unguarded-availability-new -Werror=format -Werror=objc-method-access -Werror=incompatible-pointer-types -F/Applications/Utilities/XQuartz.app/Contents/Frameworks -isysroot /Library/Developer/CommandLineTools/SDKs/MacOSX10.13.sdk -arch x86_64 -O0 -g3 -gdwarf-2 -mmacosx-version-min=10.9 -Werror=unguarded-availability-new -Werror=format -Werror=objc-method-access -Werror=incompatible-pointer-types -F/Applications/Utilities/XQuartz.app/Contents/Frameworks -isysroot /Library/Developer/CommandLineTools/SDKs/MacOSX10.13.sdk -arch x86_64 -Wl,-rpath,/opt/X11/lib mi/liblibxserver_mi.a dix/liblibxserver_dix.a composite/liblibxserver_composite.a damageext/liblibxserver_damageext.a dbe/liblibxserver_dbe.a randr/liblibxserver_randr.a miext/damage/liblibxserver_miext_damage.a render/liblibxserver_render.a present/liblibxserver_present.a Xext/liblibxserver_xext.a miext/sync/liblibxserver_miext_sync.a xfixes/liblibxserver_xfixes.a Xi/liblibxserver_xi.a xkb/liblibxserver_xkb.a record/liblibxserver_record.a os/liblibxserver_os.a os/liblibxlibc.a glx/liblibglxvnd.a hw/xfree86/common/libxorg_common.a hw/xfree86/loader/libxorg_loader.a hw/xfree86/ddc/libxorg_ddc.a hw/xfree86/xkb/libxorg_xkb.a hw/xfree86/i2c/libxorg_i2c.a hw/xfree86/modes/libxorg_modes.a hw/xfree86/os-support/libxorg_os_support.a hw/xfree86/parser/libxorg_parser.a hw/xfree86/ramdac/libxorg_ramdac.a fb/liblibxserver_fb.a Xext/liblibxserver_xext_vidmode.a dix/liblibxserver_main.a config/liblibxserver_config.a /opt/X11/lib/libpixman-1.dylib /opt/X11/lib/libxcvt.dylib /opt/X11/lib/libxkbfile.dylib /opt/X11/lib/libXfont2.dylib /opt/X11/lib/libXdmcp.dylib -lm /opt/X11/lib/libxshmfence.dylib -ldl -lpthread /opt/X11/lib/libXau.dylib /opt/X11/lib/libGL.dylib
Undefined symbols for architecture x86_64:
"_micmapScrPrivateKeyRec", referenced from:
_DGAInstallCmap in libxorg_common.a(xf86DGA.c.o)
_xf86HandleColormaps in libxorg_common.a(xf86cmap.c.o)
_CMapInstallColormap in libxorg_common.a(xf86cmap.c.o)
_CMapEnterVT in libxorg_common.a(xf86cmap.c.o)
_CMapSwitchMode in libxorg_common.a(xf86cmap.c.o)
_CMapSetDGAMode in libxorg_common.a(xf86cmap.c.o)
_CMapChangeGamma in libxorg_common.a(xf86cmap.c.o)
...
ld: symbol(s) not found for architecture x86_64
Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
(cherry picked from commit 6645ff59069d603806d749e8af73893cf88d2c06)
commit 3868f364728ae0cc35621bbfdd36bfa2e3f09fda
Author: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
Date: Mon Jun 20 20:05:46 2022 -0700
xf86-input-inputtest: Fix build on systems without SOCK_NONBLOCK
Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
(cherry picked from commit 707f23dab8787b4154011186206dc9964e2ebc11)
commit afcaaac96767d773422512e755e5ad3691a0627c
Author: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
Date: Mon Jun 20 19:51:39 2022 -0700
print_edid: Fix a format string error
../hw/xfree86/ddc/print_edid.c:511:20: error: format specifies type 'unsigned short' but the argument has type 'int' [-Werror,-Wformat]
det_mon->type - DS_VENDOR);
^~~~~~~~~~~~~~~~~~~~~~~~~
Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
(cherry picked from commit 199b8c0853c92ce19a589186f326621477401b74)
commit 6bb98fc62ddf8b0dd90f7b0b45978a0d0425ed5a
Author: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
Date: Tue Jun 21 11:46:14 2022 -0700
xquartz: Update autotools-based builds of XQuartz to account for recent changes
Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
commit 4ea6f661edbbd84b3f2b308675bd2aa848b53746
Author: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
Date: Mon Jun 20 20:32:26 2022 -0700
Revert "meson: Bump requirement to meson-0.50.0"
This bump is causing issues with our CI. Sorry about that.
This reverts commit a6a20a7c40f86b5586286aaa614e6b64a5987d82
(cherry picked from commit 8cd0397e5b4c1f0e0add1fea67f82b811214bf3e)
commit a6a20a7c40f86b5586286aaa614e6b64a5987d82
Author: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
Date: Sun Jun 19 23:06:40 2022 -0700
meson: Provide options to set CFBundleVersion and CFBundleVersionString in XQuartz
Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
(cherry picked from commit 4f5999826aa478ba5f138e74cfccdf3b854c8e54)
commit 37285e6252ce3afca5bc205121f83271548dfca9
Author: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
Date: Sun Jun 19 19:56:26 2022 -0700
xquartz: Update copyright for 2022
Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
(cherry picked from commit b12f5dc62d964d0279e1fa9403259cfd8e491285)
commit 96e7b55c5d6898a6715b62d5e01581617d218997
Author: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
Date: Sun Jun 19 19:55:44 2022 -0700
xquartz: Update Sparkle configuration to use SUPublicEDKey
Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
(cherry picked from commit 1d90bef30c4dfe13dd5e70fea606a02380cbcee6)
commit 6465263be8ae98283f8e99a3e95d04e786386040
Author: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
Date: Sun Jun 19 22:18:16 2022 -0700
meson: Bump requirement to meson-0.50.0
WARNING: Project specifies a minimum meson_version '>= 0.47.0' but uses features which were added in newer versions:
* 0.50.0: {'install arg in configure_file'}
Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
(cherry picked from commit 0a27f96d1d0e474b308be982fa7069d3ae0d9892)
commit e48acd9c40c09b7c66a7bfc6650afc216ba78cca
Author: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
Date: Thu Jun 16 00:10:26 2022 -0700
XQuartz: Ensure scroll events are delivered to a single window (not both X11 and AppKit)
Fixes: https://github.com/XQuartz/XQuartz/issues/130
Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
(cherry picked from commit 4532b696c644cb7f21e96cf76d3e6b21ccc0e309)
commit 140d9a0f75194d4079d5cd1e4ad4683c6f47683e
Author: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
Date: Sat Feb 20 14:21:01 2021 -0800
xquartz: Fold spaces related preferences into NSUserDefaults+XQuartzDefaults
Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
(cherry picked from commit f40610e0b4f2b4ae54ef6bbff756cb4a60e17e3b)
commit 03ec5b132f0b3e07f9340faaacaa2455717fd8d1
Author: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
Date: Sat Feb 20 14:00:14 2021 -0800
xquartz pbproxy: Adopt NSUserDefaults+XQuartzDefaults for preferences
Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
(cherry picked from commit 6134c73aebc3f928639e8f802be49ec8ecc17e66)
commit 6df6178bb917f596ec2f61a3aabf99eea620b6ec
Author: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
Date: Fri Feb 19 22:49:11 2021 -0800
xquartz: Create a separate category for organizing user preferences
Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
(cherry picked from commit 963ba6d9adf578ec8d7ed12ae22dece76b895172)
commit c6c1cba397ffa203123a8a6690dee728089e7325
Author: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
Date: Sat Sep 10 22:32:56 2016 -0700
os/connection: Improve abstraction for launchd secure sockets
This changes away from hard-coding the /tmp/launch-* path to now
supporting a generic <absolute path to unix socket>[.<screen>]
format for $DISPLAY.
cf-libxcb: d978a4f69b30b630f28d07f1003cf290284d24d8
Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
CC: Adam Jackson <ajax@kemper.freedesktop.org>
(cherry picked from commit 83d0d911069d502232d719882cd1c5cd090defa1)
commit 663af2f17eec2cc064f3d1e25e00fb840c441964
Author: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
Date: Sun Jun 12 22:06:01 2022 -0700
X11Application: Ensure TIS operations are done on the main thread
Fixes: https://github.com/XQuartz/XQuartz/issues/205
Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
(cherry picked from commit b1afcecc61d841f95e786e4f4f84184f91d149f1)
commit bd3564cf377deace41b359740331d84e3086e916
Author: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
Date: Fri Apr 23 02:15:30 2021 -0700
rootless: Dead code removal (ROOTLESS_REDISPLAY_DELAY is already defined)
Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
(cherry picked from commit c11b55f3c0c64645bca964aece825de0bdd92b1f)
commit 53173fdab492f0f638f6616fcf01af0b9ea6338d
Author: Olivier Fourdan <ofourdan@redhat.com>
Date: Thu Jan 20 10:20:38 2022 +0100
render: Fix build with gcc 12
The xserver fails to compile with the latest gcc 12:
render/picture.c: In function ‘CreateSolidPicture’:
render/picture.c:874:26: error: array subscript ‘union _SourcePict[0]’ is partly outside array bounds of ‘unsigned char[16]’ [-Werror=array-bounds]
874 | pPicture->pSourcePict->type = SourcePictTypeSolidFill;
| ^~
render/picture.c:868:45: note: object of size 16 allocated by ‘malloc’
868 | pPicture->pSourcePict = (SourcePictPtr) malloc(sizeof(PictSolidFill));
| ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~
render/picture.c: In function ‘CreateLinearGradientPicture’:
render/picture.c:906:26: error: array subscript ‘union _SourcePict[0]’ is partly outside array bounds of ‘unsigned char[32]’ [-Werror=array-bounds]
906 | pPicture->pSourcePict->linear.type = SourcePictTypeLinear;
| ^~
render/picture.c:899:45: note: object of size 32 allocated by ‘malloc’
899 | pPicture->pSourcePict = (SourcePictPtr) malloc(sizeof(PictLinearGradient));
| ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
render/picture.c: In function ‘CreateConicalGradientPicture’:
render/picture.c:989:26: error: array subscript ‘union _SourcePict[0]’ is partly outside array bounds of ‘unsigned char[32]’ [-Werror=array-bounds]
989 | pPicture->pSourcePict->conical.type = SourcePictTypeConical;
| ^~
render/picture.c:982:45: note: object of size 32 allocated by ‘malloc’
982 | pPicture->pSourcePict = (SourcePictPtr) malloc(sizeof(PictConicalGradient));
| ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
cc1: some warnings being treated as errors
ninja: build stopped: subcommand failed.
This is because gcc 12 has become stricter and raises a warning now.
Fix the warning/error by allocating enough memory to store the union
struct.
Signed-off-by: Olivier Fourdan <ofourdan@redhat.com>
Acked-by: Michel Dänzer <mdaenzer@redhat.com>
Closes: https://gitlab.freedesktop.org/xorg/xserver/-/issues/1256
(cherry picked from commit c6b0dcb82d4db07a2f32c09a8c09c85a5f57248e)
commit 69774044716039fa70655b3bc6dd6a4ff4535cfd
Author: Błażej Szczygieł <spaz16@wp.pl>
Date: Thu Jan 13 00:47:27 2022 +0100
present: Check for NULL to prevent crash
Closes: https://gitlab.freedesktop.org/xorg/xserver/-/issues/1275
Signed-off-by: Błażej Szczygieł <spaz16@wp.pl>
Tested-by: Aaron Plattner <aplattner@nvidia.com>
(cherry picked from commit 22d5818851967408bb7c903cb345b7ca8766094c)
commit 85397cc2efe8fa73461cd21afe700829b2eca768
Author: Povilas Kanapickas <povilas@radix.lt>
Date: Mon Jan 3 00:23:30 2022 +0200
xserver 21.1.3
Signed-off-by: Povilas Kanapickas <povilas@radix.lt>
commit 001feb6692b77254db6a4906a82fa1bdadfd7b85
Author: Adam Jackson <ajax@redhat.com>
Date: Tue Oct 26 11:46:37 2021 -0400
glx/dri: Filter out fbconfigs that don't have a supported pixmap format
For depth 30 in particular it's not uncommon for the DDX to not have
a configured pixmap format. Since the client expects to back both
GLXPixmaps and GLXPbuffers with X Pixmaps, trying to use an x2rgb10
fbconfig would fail along various paths to CreatePixmap. Filter these
fbconfigs out so the client can't ask for something that we know won't
work.
(cherry picked from commit f6c070a1ac05801c52ae60efb7dc4b3142653b7d)
commit 66890ca569291a53ea9cdc6ec19070173e522260
Author: Jocelyn Falempe <jfalempe@redhat.com>
Date: Fri Dec 17 10:18:25 2021 +0100
xf86/logind: fix missing call to vtenter if the platform device is not paused
If there is one platform device, which is not paused nor resumed,
systemd_logind_vtenter() will never get called.
This break suspend/resume, and switching to VT on system with Nvidia
proprietary driver.
This is a regression introduced by f5bd039633fa83
So now call systemd_logind_vtenter() if there are no paused
platform devices.
Closes: https://gitlab.freedesktop.org/xorg/xserver/-/issues/1271
Fixes: f5bd0396 - xf86/logind: fix call systemd_logind_vtenter after receiving drm device resume
Signed-off-by: Jocelyn Falempe <jfalempe@redhat.com>
Tested-by: Olivier Fourdan <ofourdan@redhat.com>
Reviewed-by: Hans de Goede <hdegoede@redhat.com>
commit fec0e2501b424ec6cfbf4c7983727acfafea0ccb
Author: Jocelyn Falempe <jfalempe@redhat.com>
Date: Thu Dec 16 15:46:43 2021 +0100
xf86/logind: Fix compilation error when built without logind/platform bus
This was introduced by commit 8eb1396d
Closes: https://gitlab.freedesktop.org/xorg/xserver/-/issues/1269
Fixes: da9d012a9 - xf86/logind: Fix drm_drop_master before vt_reldisp
Signed-off-by: Jocelyn Falempe <jfalempe@redhat.com>
Reviewed-by: Hans de Goede <hdegoede@redhat.com>
commit 8223a9d6d9ed2b9a4c1e6373f6ab854fdbda9ead
Author: Matthieu Herrb <matthieu@herrb.eu>
Date: Tue Nov 16 23:38:46 2021 +0100
Convert more funcs to use InternalEvent.
This fixes a crash when a DeviceEvent struct converted to
InteralEvent was beeing copied as InternalEvent (and thus
causing out of bounds reads) in ActivateGrabNoDelivery()
in events.c: 3876 *grabinfo->sync.event = *real_event;
Possible fix for https://gitlab.freedesktop.org/xorg/xserver/-/issues/1253
Signed-off-by: Matthieu Herrb <matthieu@herrb.eu>
(cherry picked from commit 5b8817a019845e1066c373022133985a0e2d718f)
commit b27eaa72837eebe80adfe6c257a71a6b9eaf66ee
Author: nerdopolis <bluescreen_avenger@verizon.net>
Date: Fri Oct 8 18:15:29 2021 -0400
os: Try to discover the current seat with the XDG_SEAT var first
(cherry picked from commit ca1dfdc9aa4b548de624d3a9af5147a998ba3d79)
commit 9852b29380673484aea25771a3e812c8e8a40393
Author: Povilas Kanapickas <povilas@radix.lt>
Date: Wed Dec 15 15:46:09 2021 +0200
xserver 21.1.2
Signed-off-by: Povilas Kanapickas <povilas@radix.lt>
commit 9fe2991075aca3321d59d03f3e45faca6cb718b8
Author: Sam James <sam@gentoo.org>
Date: Wed Dec 15 10:41:22 2021 +0200
hw/xfree86: fix sbus build for SPARC
Initially reported downstream in Gentoo. Manifests with errors like:
```
gnu/bin/ld: hw/xfree86/common/libxorg_common.a(xf86fbBus.c.o): in function `xf86ClaimFbSlot':
xf86fbBus.c:(.text+0x20): undefined reference to `sbusSlotClaimed'
/usr/lib/gcc/sparc-unknown-linux-gnu/11.2.0/../../../../sparc-unknown-linux-gnu/bin/ld: xf86fbBus.c:(.text+0x2c): undefined reference to `sbusSlotClaimed'
```
While we use the headers in meson.build, we don't reference xf86sbusBus.c
which defines the missing symbols like sbusSlotClaimed.
Bug: https://bugs.gentoo.org/828513
Signed-off-by: Sam James <sam@gentoo.org>
(cherry picked from commit 6c1a1fcc4bff90546ebc954f428c6df97005ea50)
commit 0b67785cd13e65d37416f75ab938bdc49cf4732f
Author: Povilas Kanapickas <povilas@radix.lt>
Date: Wed Dec 15 10:41:21 2021 +0200
render: Fix out of bounds access in SProcRenderCompositeGlyphs()
ZDI-CAN-14192, CVE-2021-4008
This vulnerability was discovered and the fix was suggested by:
Jan-Niklas Sohn working with Trend Micro Zero Day Initiative
Signed-off-by: Povilas Kanapickas <povilas@radix.lt>
(cherry picked from commit ebce7e2d80e7c80e1dda60f2f0bc886f1106ba60)
commit 7209982d2a89f2e27d2f83f8952e9512be813aa4
Author: Povilas Kanapickas <povilas@radix.lt>
Date: Wed Dec 15 10:41:20 2021 +0200
Xext: Fix out of bounds access in SProcScreenSaverSuspend()
ZDI-CAN-14951, CVE-2021-4010
This vulnerability was discovered and the fix was suggested by:
Jan-Niklas Sohn working with Trend Micro Zero Day Initiative
Signed-off-by: Povilas Kanapickas <povilas@radix.lt>
(cherry picked from commit 6c4c53010772e3cb4cb8acd54950c8eec9c00d21)
commit 6f09e7d3913a8188e32062f5e196bebb06bab140
Author: Povilas Kanapickas <povilas@radix.lt>
Date: Wed Dec 15 10:41:19 2021 +0200
xfixes: Fix out of bounds access in *ProcXFixesCreatePointerBarrier()
ZDI-CAN-14950, CVE-2021-4009
This vulnerability was discovered and the fix was suggested by:
Jan-Niklas Sohn working with Trend Micro Zero Day Initiative
Signed-off-by: Povilas Kanapickas <povilas@radix.lt>
(cherry picked from commit b5196750099ae6ae582e1f46bd0a6dad29550e02)
commit a82d523edb30e5856adca9f258ac716108c71f19
Author: Povilas Kanapickas <povilas@radix.lt>
Date: Wed Dec 15 10:41:18 2021 +0200
record: Fix out of bounds access in SwapCreateRegister()
ZDI-CAN-14952, CVE-2021-4011
This vulnerability was discovered and the fix was suggested by:
Jan-Niklas Sohn working with Trend Micro Zero Day Initiative
Signed-off-by: Povilas Kanapickas <povilas@radix.lt>
(cherry picked from commit e56f61c79fc3cee26d83cda0f84ae56d5979f768)
commit a39218d99c6961dda0142d9956eb7404a37d9bd2
Author: Matthieu Herrb <matthieu@herrb.eu>
Date: Wed Dec 15 10:41:17 2021 +0200
remove the PRE_RELEASE message.
With the new numbering scheme, XORG_VERISON_SNAP doesn't mean
a pre-release version anymore.
Signed-off-by: Matthieu Herrb <matthieu@herrb.eu>
(cherry picked from commit 4de9666b6d3c86660d728ddfc13d88700e5ff20d)
commit fc2eb7e8cc19a41e034f2f4286af58f8b4825d65
Author: Matt Turner <mattst88@gmail.com>
Date: Tue Dec 7 21:39:58 2021 -0800
test: #undef NDEBUG so assert is not compiled away
(cherry picked from commit d189102c783653a10931051175de24277a157331)
commit 7caf29ca6607ddf4c19a81d19c0f4acc6deb8936
Author: Povilas Kanapickas <povilas@radix.lt>
Date: Sat Nov 13 16:42:36 2021 +0200
meson: Correctly set DDXOSVERRORF and DDXBEFORERESET on xwin
This worked with autotools, but not meson build system.
Signed-off-by: Povilas Kanapickas <povilas@radix.lt>
(cherry picked from commit 04c93b98e9e4593aa2e6701bb08f5e27c3544d8a)
commit 101791f80fdefea738421a414177899db7c76e83
Author: Jonathan Gray <jsg@jsg.id.au>
Date: Fri Dec 3 19:17:18 2021 +1100
glamor: fix free of uninitialised pointers
Attempting to run fvwm on a x61/965gm with xserver 1.21.1 with the
modesetting driver on OpenBSD/amd64 would cause the xserver to
reliably crash.
I tracked this down to the free() calls introduced in
2906ee5e4a722138cccb3265a615da7705a52589
(d1ca47e1242b51c79cec7287f52c36c8e494706b in branch).
clang also warns about this:
glamor_program.c:296:13: warning: variable 'vs_prog_string' is used uninitialized whenever 'if' condition is true [-Wsometimes-uninitialized]
glamor_program.c:290:9: warning: variable 'vs_prog_string' is used uninitialized whenever 'if' condition is true [-Wsometimes-uninitialized]
glamor_program.c:288:9: warning: variable 'vs_prog_string' is used uninitialized whenever 'if' condition is true [-Wsometimes-uninitialized]
glamor_program.c:277:13: warning: variable 'vs_prog_string' is used uninitialized whenever 'if' condition is true [-Wsometimes-uninitialized]
glamor_program.c:296:13: warning: variable 'fs_prog_string' is used uninitialized whenever 'if' condition is true [-Wsometimes-uninitialized]
glamor_program.c:290:9: warning: variable 'fs_prog_string' is used uninitialized whenever 'if' condition is true [-Wsometimes-uninitialized]
glamor_program.c:288:9: warning: variable 'fs_prog_string' is used uninitialized whenever 'if' condition is true [-Wsometimes-uninitialized]
glamor_program.c:277:13: warning: variable 'fs_prog_string' is used uninitialized whenever 'if' condition is true [-Wsometimes-uninitialized]
Signed-off-by: Jonathan Gray <jsg@jsg.id.au>
Reviewed-by: Olivier Fourdan <ofourdan@redhat.com>
Fixes: 2906ee5e4 ("glamor: Fix leak in glamor_build_program()")
(cherry picked from commit 5ac6319776b13f96a2b336da4b35237618a5b001)
commit 2c6989f81e62bac05a583c39fa09a06172d1ece5
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu Dec 2 10:41:03 2021 +1000
xkb: fix XkbSetMap check for the keytypes count
The previous if/else condition resulted in us always setting the key
type count to the current number of key types. Split this up correctly.
Regression introduced in de940e06f8733d87bbb857aef85d830053442cfe
Fixes #1249
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
(cherry picked from commit be16bd8543f80ad2933ec9c37f082617c7084165)
commit 49444ce9f7ad34fff6ff94a9db95337f4bfd7b03
Author: Povilas Kanapickas <povilas@radix.lt>
Date: Sat Nov 13 17:23:54 2021 +0200
Revert "hw/xfree86: Propagate physical dimensions from DRM connector"
Quite a lot of applications currently expect the screen DPI exposed by
the X server to be 96 even when the real display DPI is different.
Additionally, currently Xwayland completely ignores any hardware
information and sets the DPI to 96. Accordingly the new behavior, even
if it fixes a bug, should not be enabled automatically to all users.
A better solution would be to make the default DPI stay as is and enable
the correct behavior with a command line option (maybe -dpi auto, or
similar). For now let's just revert the bug fix.
This reverts commit 05b3c681ea2f478c0cb941c2f8279919cf78de6d.
Signed-off-by: Povilas Kanapickas <povilas@radix.lt>
(cherry picked from commit 35af1299e73483eaf93d913a960e1d1738bc7de6)
commit 6f11b3c803898e0effe6ade2ae951f5758936152
Author: Dave Airlie <airlied@redhat.com>
Date: Thu Nov 11 06:35:19 2021 +1000
dri2: add crocus to the list of va_gl users
(cherry picked from commit a7b0a7fabd137183cc42a5edb15697e354c4450c)
commit 8eb1396d3ecfd2bf968105a99759ae9445bdf768
Author: Jocelyn Falempe <jfalempe@redhat.com>
Date: Thu Nov 18 14:51:21 2021 +0100
xf86/logind: Fix drm_drop_master before vt_reldisp
When switching to VT, the ioctl DRM_DROP_MASTER must be done before
the ioctl VT_RELDISP. Otherwise the kernel can't change the modesetting
reliably, and this leads to the console not showing up in some cases, like
after unplugging a docking station with a DP or HDMI monitor.
Before doing the VT_RELDISP, send a dbus message to logind, to
pause the drm device, so logind will do the ioctl DRM_DROP_MASTER.
With this patch, it changes the order logind will send the resume
event, and drm will be sent last instead of first.
so there is a also fix to call systemd_logind_vtenter() at the right time.
Signed-off-by: Jocelyn Falempe <jfalempe@redhat.com>
Reviewed-by: Hans de Goede <hdegoede@redhat.com>
(cherry picked from commit da9d012a9c760896941769d4127e3cfb1a7a9f03)
commit 6834f977a5eadbc3289f27b2bb83997132a39fdd
Author: Jocelyn Falempe <jfalempe@redhat.com>
Date: Thu Nov 18 14:45:42 2021 +0100
xf86/logind: fix call systemd_logind_vtenter after receiving drm device resume
logind send the resume event for input devices and drm device,
in any order. if we call vt_enter before logind resume the drm device,
it leads to a driver error, because logind has not done the
DRM_IOCTL_SET_MASTER on it.
Keep the old workaround to make sure we call systemd_logind_vtenter at
least once if there are no platform device
Signed-off-by: Jocelyn Falempe <jfalempe@redhat.com>
Reviewed-by: Hans de Goede <hdegoede@redhat.com>
(cherry picked from commit f5bd039633fa8360a10bd2aabb0111571f6275b0)
commit 0ed7b1224ef17ff3d27e791e03e0d98dd6373c8a
Author: nerdopolis <bluescreen_avenger@verizon.net>
Date: Fri Oct 8 21:51:43 2021 -0400
xfree86: On Linux, while only seat0 can have TTYs, don't assmume all seat0s have TTYs
(cherry picked from commit b8c12aac651d626c5120e6e8e18b42e7528caf43)
commit 6b997fb74e5c9473ee3989fca8d592a3a0d16067
Author: Povilas Kanapickas <povilas@radix.lt>
Date: Sun Nov 7 01:33:56 2021 +0200
xserver 21.1.1
Signed-off-by: Povilas Kanapickas <povilas@radix.lt>
commit 70a0c48ff3bb7e3392035ef333cc5c8453508f33
Author: Povilas Kanapickas <povilas@radix.lt>
Date: Sat Nov 6 20:09:48 2021 +0200
Makefile.am: Add missing meson build files to release tarball
commit db0da823f55734baf4c1e4de680e7091f33aac17
Author: Matthieu Herrb <matthieu.herrb@laas.fr>
Date: Sun Oct 31 11:28:28 2021 +0100
Make xf86CompatOutput() return NULL when there are no privates
Some drivers (mach64 w/o DRI for instance) don't initialize privates.
Signed-off-by: Matthieu Herrb <matthieu.herrb@laas.fr>
(cherry picked from commit 80eeff3ebac772e25c9107199989e677457dbe06)
commit fdb266ff814f6abb6ce006ecbac5ba78a92cdbca
Author: Jon Turney <jon.turney@dronecode.org.uk>
Date: Tue Nov 2 14:04:08 2021 +0000
s/__/@/ in inputtestdrv manpage
Update manpage subsitution style for 2e497bf8
(cherry picked from commit 0099412ea4347b02e61ea21946f309f2535cc07b)
commit 27a0ee32ccef8d621aaa758c804fc9a5ceeb5a56
Author: Povilas Kanapickas <povilas@radix.lt>
Date: Wed Oct 27 13:36:45 2021 +0300
xserver 21.1
Signed-off-by: Povilas Kanapickas <povilas@radix.lt>
commit d4944ceda1727180bbee1c582b4ac0796c2748cc
Author: Mario Kleiner <mario.kleiner.de@gmail.com>
Date: Mon Oct 18 08:14:04 2021 +0200
Fix RandR leasing for more than 1 simultaneously active lease.
Due to a switched order of parameters in the xorg_list_add()
call inside ProcRRCreateLease(), adding a new lease for RandR
output leasing does not actually add the new RRLeasePtr lease
record to the list of existing leases for a X-Screen, but instead
replaces the existing list with a new list that has the new lease
as the only element, and probably leaks a bit of memory.
Therefore the server "forgets" all active leases for a screen,
except for the last added lease. If multiple leases are created
in a session, then destruction of all leases but the last one
will fail in many cases, e.g., during server shutdown in
RRCloseScreen(), or resource destruction, e.g., in
RRCrtcDestroyResource().
Most importantly, it fails if a client simply close(fd)'es the
DRM master descriptor to release a lease, quits, gets killed or
crashes. In this case the kernel will destroy the lease and shut
down the display output, then send a lease event via udev to the
ddx, which e.g., in the modesetting-ddx will trigger a call to
drmmode_validate_leases().
That function is supposed to detect the released lease and tell
the server to terminate the lease on the server side as well,
via xf86CrtcLeaseTerminated(), but this doesn't happen for all
the leases the server has forgotten. The end result is a dead
video output, as the server won't reinitialize the crtc's
corresponding to the terminated but forgotten lease.
This bug was observed when using the amdvlk AMD OSS Vulkan
driver and trying to lease multiple VKDisplay's, and also
under Mesa radv, as both Mesa Vulkan/WSI/Display and amdvlk
terminate leases by simply close()ing the lease fd, not by
sending explicit RandR protocol requests to free leases.
Leasing worked, but ending a session with multiple active
leases ended in a lot of unpleasant darkness.
Fixing the wrong argument order to xorg_list_add() fixes the
problem. Tested on single-X-Screen and dual-X-Screen setups,
with one, two or three active leases.
Please merge this for the upcoming server 21.1 branch.
Merging into server 1.20 would also make a lot of sense.
Fixes: e4e3447603b5fd3a38a92c3f972396d1f81168ad
Signed-off-by: Mario Kleiner <mario.kleiner.de@gmail.com>
Cc: Keith Packard <keithp@keithp.com>
(cherry picked from commit f467f85ca1f780d5c7cf3c20888e399708d761ac)
commit e59faa4b8cc5aaa19474a5e7ca3a99d08006f8c5
Author: Povilas Kanapickas <povilas@radix.lt>
Date: Thu Oct 14 17:33:40 2021 +0300
xserver 21.1 RC 2
commit 3fb94f3c5ca73f15a78dbc6904380b9b9e402bf4
Author: Alex Richardson <Alexander.Richardson@cl.cam.ac.uk>
Date: Fri Jul 23 09:23:45 2021 +0100
dix/privates.c: Avoid undefined behaviour after realloc()
Adding the offset between the realloc result and the old allocation to
update pointers into the new allocation is undefined behaviour: the
old pointers are no longer valid after realloc() according to the C
standard. While this works on almost all architectures and compilers,
it causes problems on architectures that track pointer bounds (e.g.
CHERI or Arm's Morello): the DevPrivateKey pointers will still have the
bounds of the previous allocation and therefore any dereference will
result in a run-time trap.
I found this due to a crash (dereferencing an invalid capability) while
trying to run `XVnc` on a CHERI-RISC-V system. With this commit I can
successfully connect to the XVnc instance running inside a QEMU with a
VNC viewer on my host.
This also changes the check whether the allocation was moved to use
uintptr_t instead of a pointer since according to the C standard:
"The value of a pointer becomes indeterminate when the object it
points to (or just past) reaches the end of its lifetime." Casting to an
integer type avoids this undefined behaviour.
Signed-off-by: Alex Richardson <Alexander.Richardson@cl.cam.ac.uk>
(cherry picked from commit f9f705bf3cf0d169d54a70f235cc99e106dbda43)
commit b89fdd523e2c9e9b0cdf37b263833c4b0a8868b8
Author: nerdopolis <rbos@rbos>
Date: Thu Sep 30 08:51:18 2021 -0400
xf86: Accept devices with the 'simpledrm' driver.
SimpleDRM 'devices' are a fallback device, and do not have a busid
so they are getting skipped. This will allow simpledrm to work
with the modesetting driver
(cherry picked from commit b9218fadf3c09d83566549279d68886d8258f79c)
commit fbc690ccaf12d6536951d0ba403dfbb92c7c4115
Author: Mario Kleiner <mario.kleiner.de@gmail.com>
Date: Fri Oct 1 09:47:41 2021 +0200
modesetting: Consider RandR primary output for selectioh of sync crtc.
The "sync crtc" is the crtc used to drive the display timing of a
drawable under DRI2 and DRI3/Present. If a drawable intersects
multiple video outputs, then normally the crtc is chosen which has
the largest intersection area with the drawable.
If multiple outputs / crtc's have exacty the same intersection
area then the crtc chosen was simply the first one with maximum
intersection. Iow. the choice was random, depending on plugging
order of displays.
This adds the ability to choose a preferred output in such a tie
situation. The RandR output marked as "primary output" is chosen
on such a tie.
This new behaviour and its implementation is consistent with other
video ddx drivers. See amdgpu-ddx, ati-ddx and nouveau-ddx for
reference. This commit is a straightforward port from amdgpu-ddx.
Signed-off-by: Mario Kleiner <mario.kleiner.de@gmail.com>
(cherry picked from commit 4b75e65766a9ef3a26d4c1c9d7af9fc6d1d7be5b)
commit 22f4ff1026eeffc566f87453d7f1f70dc23ad4e0
Author: Mario Kleiner <mario.kleiner.de@gmail.com>
Date: Fri Oct 1 08:49:10 2021 +0200
modesetting: Handle mixed VRR and non-VRR display setups better.
In a setup with both VRR capable and non-VRR capable displays,
it was so far inconsistent if the driver would allow use of
VRR support or not, as "is_connector_vrr_capable" was set to
whatever the capabilities of the last added drm output were.
Iow. the plugging order of monitors determined the outcome.
Fix this: Now if at least one display is VRR capable, the driver
will treat an X-Screen as capable for VRR, plugging order no
longer matters.
Tested with a dual-display setup with one VRR monitor and one
non-VRR monitor. This is also beneficial with the new Option
"AsyncFlipSecondaries".
When we are at it, also add some so far missing description of
the "VariableRefresh" driver option, copied from amdgpu-ddx.
Signed-off-by: Mario Kleiner <mario.kleiner.de@gmail.com>
(cherry picked from commit 017ce263376aa64a495c4d71a140a24b1dff7054)
commit 0d0986bf3b924ccb26e4bc6a8c06aed41f238683
Author: Mario Kleiner <mario.kleiner.de@gmail.com>
Date: Fri Oct 1 07:42:01 2021 +0200
modesetting: Enable GAMMA_LUT for lut's with up to 4096 slots.
A lut size of 4096 slots has been verified to work correctly,
as tested with amdgpu-kms. Intel Tigerlake Gen12 hw has a very
large GAMMA_LUT size of 262145 slots, but also issues with its
current GAMMA_LUT implementation, as of Linux 5.14.
Therefore we keep GAMMA_LUT off for large lut's. This currently
excludes Intel Icelake, Tigerlake and later.
This can be overriden via the "UseGammaLUT" boolean xorg.conf option
to force use of GAMMA_LUT on or off.
See following link for the Tigerlake situation:
https://gitlab.freedesktop.org/drm/intel/-/issues/3916#note_1085315
Signed-off-by: Mario Kleiner <mario.kleiner.de@gmail.com>
(cherry picked from commit 66e5a5bb12c58413a4d71781c5a7f63f675bfe55)
commit bc1327e6de82da560c97f66c9c196d9bbd2d24be
Author: Ray Strode <rstrode@redhat.com>
Date: Mon Oct 4 14:27:54 2021 -0400
xkb: Drop check for XkbSetMapResizeTypes
Commit 446ff2d3177087b8173fa779fa5b77a2a128988b added checks to
prevalidate the size of incoming SetMap requests.
That commit checks for the XkbSetMapResizeTypes flag to be set before
allowing key types data to be processed.
key types data can be changed or even just sent wholesale unchanged
without the number of key types changing, however. The check for
XkbSetMapResizeTypes rejects those legitimate requests. In particular,
XkbChangeMap never sets XkbSetMapResizeTypes and so always fails now
any time XkbKeyTypesMask is in the changed mask.
This commit drops the check for XkbSetMapResizeTypes in flags when
prevalidating the request length.
(cherry picked from commit 8b7f4d3259e8b7d1eb3d8a83e8852989e869596a)
commit b87536682c185b6a825525d01e95e264018c0997
Author: Mario Kleiner <mario.kleiner.de@gmail.com>
Date: Tue Sep 14 07:52:33 2021 +0200
Revert "modesetting: Only use GAMMA_LUT if its size is 1024"
This reverts commit 617f591fc44e24413e1f91017d16734999bbbac1.
The problem described in that commit exists, but the two
preceeding commits with improvements to the servers RandR
code should avoid the mentioned problems while allowing the
use of GAMMA_LUT's instead of legacy gamma lut.
Use of legacy gamma lut's is not a good fix, because it will reduce
color output precision of gpu's with more than 1024 GAMMA_LUT
slots, e.g., AMD, ARM MALI and KOMEDA with 4096 slot luts,
and some Mediathek parts with 512 slot luts. On KOMEDA, legacy
lut's are completely unsupported by the kms driver, so gamma
correction gets disabled.
The situation is especially bad on Intel Icelake and later:
Use of legacy gamma tables will cause the kms driver to switch
to hardware legacy lut's with 256 slots, 8 bit wide, without
interpolation. This way color output precision is restricted to
8 bpc and any deep color / HDR output (10 bpc, fp16, fixed point 16)
becomes impossible. The latest Intel gen gpu's would have worse
color precision than parts which are more than 10 years old.
Signed-off-by: Mario Kleiner <mario.kleiner.de@gmail.com>
(cherry picked from commit 545fa90cbf37a4c18f013dabc9f3bfb8310a5a98)
commit 473a48660fc8a326312df2d5925017ce8152c7db
Author: Mario Kleiner <mario.kleiner.de@gmail.com>
Date: Tue Sep 14 07:51:46 2021 +0200
xfree86: Let xf86RandR12CrtcComputeGamma() deal with non-power-of-2 sizes.
The assumption in the upsampling code was that the crtc->gamma_size
size of the crtc's gamma table is a power of two. This is true for
almost all current driver + gpu combos at least on Linux, with typical
sizes of 256, 512, 1024 or 4096 slots.
However, Intel Gen-11 Icelake and later are outliers, as their gamma
table has 2^18 + 1 slots, very big and not a power of two!
Try to make upsampling behave at least reasonable: Replicate the
last gamma value to fill up remaining crtc->gamma_red/green/blue
slots, which would normally stay uninitialized. This is important,
because while the intel display driver does not actually use all
2^18+1 values passed as part of a GAMMA_LUT, it does need the
very last slot, which would not get initialized by the old code.
This should hopefully create reasonable behaviour with Icelake+
but is untested on the actual Intel hw due to lack of suitable
hw.
Signed-off-by: Mario Kleiner <mario.kleiner.de@gmail.com>
(cherry picked from commit 7326e131df3d1373dd796d9e2d931e81a3536bad)
commit b33f487a7ca276e11214eb45b87aab970ca43d79
Author: Mario Kleiner <mario.kleiner.de@gmail.com>
Date: Tue Sep 14 07:40:49 2021 +0200
xfree86: Avoid crash in xf86RandR12CrtcSetGamma() memcpy path.
If randrp->palette_size is zero, the memcpy() path can read past the
end of the randr_crtc's gammaRed/Green/Blue tables if the hw crtc's
gamma_size is greater than the randr_crtc's gammaSize.
Avoid this by clamping the to-be-copied size to the smaller of both
sizes.
Note that during regular server startup, the memcpy() path is only
taken initially twice, but then a suitable palette is created for
use during a session. Therefore during an actual running X-Session,
the xf86RandR12CrtcComputeGamma() will be used, which makes sure that
data is properly up- or down-sampled for mismatching source and
target crtc gamma sizes.
This should avoid reading past randr_crtc gamma memory for gpu's
with big crtc->gamma_size, e.g., AMD/MALI/KOMEDA 4096 slots, or
Intel Icelake and later with 262145 slots.
Tested against modesetting-ddx and amdgpu-ddx under screen color
depth 24 (8 bpc) and 30 (10 bpc) to make sure that clamping happens
properly.
This is an alternative fix for the one attempted in commit
617f591fc44e24413e1f91017d16734999bbbac1.
Signed-off-by: Mario Kleiner <mario.kleiner.de@gmail.com>
(cherry picked from commit 966f567432e91762382db09129f8fb4e2e434437)
commit d1ca47e1242b51c79cec7287f52c36c8e494706b
Author: Olivier Fourdan <ofourdan@redhat.com>
Date: Tue Sep 14 16:32:45 2021 +0200
glamor: Fix leak in glamor_build_program()
Fix the possible leak of `vs_prog_string` and `fs_prog_string` in case
of failure, as reported by covscan.
Signed-off-by: Olivier Fourdan <ofourdan@redhat.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Michel Dänzer <mdaenzer@redhat.com>
(cherry picked from commit 2906ee5e4a722138cccb3265a615da7705a52589)
commit d00e7dfc9da165810a578fa0910475686e1fa51c
Author: Povilas Kanapickas <povilas@radix.lt>
Date: Tue Sep 21 23:35:42 2021 +0300
xserver 21.1 RC 1
Signed-off-by: Povilas Kanapickas <povilas@radix.lt>
commit 4ee66f574a70948ca90a5db94dd666a389a5ff3e
Author: Povilas Kanapickas <povilas@radix.lt>
Date: Wed Sep 15 21:49:17 2021 +0300
Drop XWayland DDX
commit 72c5d153c920d769802ed73a1b9bfd0d32e7c178
Author: Aaron Plattner <aplattner@nvidia.com>
Date: Fri Sep 10 11:02:00 2021 -0700
xfree86: NUL-terminate strings in hwEnableIO
The Linux version of xf86EnableIO calls a helper function called hwEnableIO().
Except on Alpha, this function reads /proc/ioports looking for the 'keyboard'
and 'timer' ports, extracts the port ranges, and enables access to them. It does
this by reading 4 bytes from the string for the start port number and 4 bytes
for the last port number, passing those to atoi(). However, it doesn't add a
fifth byte for a NUL terminator, so some implementations of atoi() read past the
end of this string, triggering an AddressSanitizer error:
==1383==ERROR: AddressSanitizer: stack-buffer-overflow on address 0x7fff71fd5b74 at pc 0x7fe1be0de3e0 bp 0x7fff71fd5ae0 sp 0x7fff71fd5288
READ of size 5 at 0x7fff71fd5b74 thread T0
#0 0x7fe1be0de3df in __interceptor_atoi /build/gcc/src/gcc/libsanitizer/asan/asan_interceptors.cpp:520
#1 0x564971adcc45 in hwEnableIO ../hw/xfree86/os-support/linux/lnx_video.c:138
#2 0x564971adce87 in xf86EnableIO ../hw/xfree86/os-support/linux/lnx_video.c:174
#3 0x5649719f6a30 in InitOutput ../hw/xfree86/common/xf86Init.c:439
#4 0x564971585924 in dix_main ../dix/main.c:190
#5 0x564971b6246e in main ../dix/stubmain.c:34
#6 0x7fe1bdab6b24 in __libc_start_main (/usr/lib/libc.so.6+0x27b24)
#7 0x564971490e9d in _start (/home/aaron/git/x/xserver/build.asan/hw/xfree86/Xorg+0xb2e9d)
Address 0x7fff71fd5b74 is located in stack of thread T0 at offset 100 in frame
#0 0x564971adc96a in hwEnableIO ../hw/xfree86/os-support/linux/lnx_video.c:118
This frame has 3 object(s):
[32, 40) 'n' (line 120)
[64, 72) 'buf' (line 122)
[96, 100) 'target' (line 122) <== Memory access at offset 100 overflows this variable
HINT: this may be a false positive if your program uses some custom stack unwind mechanism, swapcontext or vfork
(longjmp and C++ exceptions *are* supported)
SUMMARY: AddressSanitizer: stack-buffer-overflow /build/gcc/src/gcc/libsanitizer/asan/asan_interceptors.cpp:520 in __interceptor_atoi
Shadow bytes around the buggy address:
0x10006e3f2b10: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
0x10006e3f2b20: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
0x10006e3f2b30: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
0x10006e3f2b40: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
0x10006e3f2b50: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
=>0x10006e3f2b60: 00 00 f1 f1 f1 f1 00 f2 f2 f2 00 f2 f2 f2[04]f3
0x10006e3f2b70: f3 f3 00 00 00 00 00 00 00 00 00 00 00 00 00 00
0x10006e3f2b80: 00 00 00 00 00 00 00 00 00 00 00 00 f1 f1 f1 f1
0x10006e3f2b90: f1 f1 f8 f2 00 f2 f2 f2 f8 f3 f3 f3 00 00 00 00
0x10006e3f2ba0: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 f1 f1
0x10006e3f2bb0: f1 f1 00 f3 f3 f3 00 00 00 00 00 00 00 00 00 00
Shadow byte legend (one shadow byte represents 8 application bytes):
Addressable: 00
Partially addressable: 01 02 03 04 05 06 07
Heap left redzone: fa
Freed heap region: fd
Stack left redzone: f1
Stack mid redzone: f2
Stack right redzone: f3
Stack after return: f5
Stack use after scope: f8
Global redzone: f9
Global init order: f6
Poisoned by user: f7
Container overflow: fc
Array cookie: ac
Intra object redzone: bb
ASan internal: fe
Left alloca redzone: ca
Right alloca redzone: cb
Shadow gap: cc
==1383==ABORTING
Fix this by NUL-terminating the string.
Fixes: https://gitlab.freedesktop.org/xorg/xserver/-/issues/1193#note_1053306
Signed-off-by: Aaron Plattner <aplattner@nvidia.com>
commit 617f591fc44e24413e1f91017d16734999bbbac1
Author: Aaron Plattner <aplattner@nvidia.com>
Date: Thu Sep 9 15:29:50 2021 -0700
modesetting: Only use GAMMA_LUT if its size is 1024
GAMMA_LUT sizes other than 1024 cause a crash during startup if the memcpy()
calls in xf86RandR12CrtcSetGamma() read past the end of the legacy X11 /
XVidMode gamma ramp.
This is a problem on Intel ICL / GEN11 platforms because they report a GAMMA_LUT
size of 262145. Since it's not clear that the modesetting driver will generate a
proper gamma ramp at that size even if xf86RandR12CrtcSetGamma() is fixed, just
disable use of GAMMA_LUT for sizes other than 1024 for now. This will cause the
modesetting driver to disable the CTM property and fall back to the legacy gamma
LUT.
Signed-off-by: Aaron Plattner <aplattner@nvidia.com>
Fixes: https://gitlab.freedesktop.org/xorg/xserver/-/issues/1193
Tested-by: Mark Herbert
commit e59e24c8779de65db87b8c07bc3f2abb479be082
Author: Povilas Kanapickas <povilas@radix.lt>
Date: Mon Sep 6 22:41:32 2021 +0300
glamor: Fix handling of 1-bit pixmaps
Since 8702c938b33b9ec180d64754eb922515c7c4a98b the pixmap formats are
handled in a single place. In the process of conversion the difference
between pixmap formats that can be uploaded and those that can be
rendered on GL side has been lost. This affects only 1-bit pixmaps: as
they aren't supported on GL, but can be converted to a R8 or A8 format
for rendering (see glamor_get_tex_format_type_from_pictformat()).
To work around this we add a separate flag that specifies whether the
format actually supports rendering in GL, convert all checks to use this
flag and then add 1-bit pixmap formats that don't support rendering in
GL.
Fixes: 8702c938b33b9ec180d64754eb922515c7c4a98b
Closes: https://gitlab.freedesktop.org/xorg/xserver/-/issues/1210
Acked-by: Olivier Fourdan <ofourdan@redhat.com>
Tested-by: Olivier Fourdan <ofourdan@redhat.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Povilas Kanapickas <povilas@radix.lt>
commit 68f01c0f02ece4f6efe9ce18be81244246a1e114
Author: Mario Kleiner <mario.kleiner.de@gmail.com>
Date: Mon Aug 30 05:42:04 2021 +0200
modesetting: Add option for non-vsynced flips for "secondary" outputs.
Whenever an unredirected fullscreen window uses pageflipping for a
DRI3/Present PresentPixmap() operation and the X-Screen has more than
one active output, multiple crtc's need to execute pageflips. Only
after the last flip has completed can the PresentPixmap operation
as a whole complete.
If a sync_flip is requested for the present, then the current
implementation will synchronize each pageflip to the vblank of
its associated crtc. This provides tear-free image presentation
across all outputs, but introduces a different artifact, if not
all outputs run at the same refresh rate with perfect synchrony:
The slowest output throttles the presentation rate, and present
completion is delayed to flip completion of the "latest" output
to complete. This means degraded performance, e.g., a dual-display
setup with a 144 Hz monitor and a 60 Hz monitor will always be
throttled to at most 60 fps. It also means non-constant present
rate if refresh cycles drift against each other, creating complex
"beat patterns", tremors, stutters and periodic slowdowns - quite
irritating!
Such a scenario will be especially annoying if one uses multiple
outputs in "mirror mode" aka "clone mode". One output will usually
be the "production output" with the highest quality and fastest
display attached, whereas a secondary mirror output just has a
cheaper display for monitoring attached. Users care about perfect
and perfectly timed tear-free presentation on the "production output",
but cares less about quality on the secondary "mirror output". They
are willing to trade quality on secondary outputs away in exchange
for better presentation timing on the "production output".
One example use case for such production + monitoring displays are
neuroscience / medical science applications where one high quality
display device is used to present visual animations to test subjects
or patients in a fMRI scanner room (production display), whereas
an operator monitors the same visual animations from a control room
on a lower quality display. Presentation timing needs to be perfect,
and animations high-speed and tear-free for the production display,
whereas quality and timing don't matter for the monitoring display.
This commit gives users the option to choose such a trade-off as
opt-in:
It adds a new boolean option "AsyncFlipSecondaries" to the device section
of xorg.conf. If this option is specified as true, then DRI3 pageflip
behaviour changes as follows:
1. The "reference crtc" for a windows PresentPixmap operation does a
vblank synced flip, or a DRM_MODE_PAGE_FLIP_ASYNC non-synchronized
flip, as requested by the caller, just as in the past. Typically
flips will be requested to be vblank synchronized for tear-free
presentation. The "reference crtc" is the one chosen by the caller
to drive presentation timing (as specified by PresentPixmap()'s
"target_msc", "divisor", "remainder" parameters and implemented by
vblank events) and to deliver Present completion timestamps (msc
and ust) extracted from its pageflip completion event.
2. All other crtc's, which also page-flip in a multi-display configuration,
will try to flip with DRM_MODE_PAGE_FLIP_ASYNC, ie. immediately and
not synchronized to vblank. This allows the PresentPixmap operation
to complete with little delay compared to a single-display present,
especially if the different crtc's run at different video refresh
rates or their refresh cycles are not perfectly synchronized, but
drift against each other. The downside is potential tearing artifacts
on all outputs apart from the one of the "reference crtc".
Successfully tested on a AMD gpu with single-display, dual-display and
triple-display setups, and with single-X-Screen as well as dual-X-Screen
"ZaphodHeads" configurations.
Please consider merging this commit for the upcoming server 1.21 branch.
Signed-off-by: Mario Kleiner <mario.kleiner.de@gmail.com>
commit 1fd5dec11bbb85e87f70a39f1c1b59af95a7feaf
Author: Ignacio Casal Quinteiro <qignacio@amazon.com>
Date: Tue Sep 7 16:58:10 2021 +0200
touchevents: set the screen pointer after checking the device is enabled
If the device is disabled the sprite is NULL so we get a seg fault
commit b3b81c8c2090cd49410960a021baf0d27fdd2ab3
Author: Povilas Kanapickas <povilas@radix.lt>
Date: Fri Sep 3 14:33:15 2021 +0300
Drop DMX DDX
It turns out xdmx currently crashes when any client attempts to use GL
and it has been in such state for about 14 years. There was a patch to
fix the problem [1] 4 years ago, but it never got merged. The last
activity on any bugs referring to xdmx has been more than 4 years ago.
Given such situation, I find it unlikely that anyone is still using xdmx
and just having the code is a drain of resources.
[1]: https://lists.x.org/archives/xorg-devel/2017-June/053919.html
Signed-off-by: Povilas Kanapickas <povilas@radix.lt>
commit 8f8ebf870b55c9875b7cfd8ef69c1df02d589b4a
Author: Mario Kleiner <mario.kleiner.de@gmail.com>
Date: Sat Aug 28 02:27:20 2021 +0200
modesetting: Allow Present flips with mismatched stride on atomic drivers.
When using DRI3+Present with PRIME render offload, sometimes there is
a mismatch between the stride of the to-be-presented Pixmap and the
frontbuffer. The current code would reject a pageflip present in this
case if atomic modesetting is not enabled, ie. always, as atomic
modesetting is disabled by default due to brokeness in the current
modesetting-ddx.
Fullscreen presents without page flipping however trigger the copy
path as fallback, which causes not only unreliable presentation timing
and degraded performance, but also massive tearing artifacts due to
rendering to the framebuffer without any hardware sync to vblank.
Tearing is extra awful on modesetting-ddx because glamor afaics seems
to use drawing of a textured triangle strip for the copy implementation,
not a dedicated blitter engine. The rasterization pattern creates extra
awful tearing artifacts.
We can do better: According to a tip from Michel Daenzer (thanks!),
at least atomic modesetting capable kms drivers should be able to
reliably change scanout stride during a pageflip, even if atomic
modesetting is not actually enabled for the modesetting client.
This commit adds detection logic to find out if the underlying kms
driver is atomic_modeset_capable, and if so, it no longer rejects
page flip presents on mismatched stride between new Pixmap and
frontbuffer.
We (ab)use a call to drmSetClientCap(ms->fd, DRM_CLIENT_CAP_ATOMIC, 0);
for this purpose. The call itself has no practical effect, as it
requests disabling atomic mode, although atomic mode is disabled by
default. However, the return value of drmSetClientCap() tells us if the
underlying kms driver is atomic modesetting capable: An atomic driver
will return 0 for success. A legacy non-atomic driver will return a
non-zero error code, either -EINVAL for early atomic Linux versions
4.0 - 4.19 (or for non-atomic Linux 3.x and earlier), or -EOPNOTSUPP
for Linux 4.20 and later.
Testing on a MacBookPro 2017 with Intel Kabylake display server gpu +
AMD Polaris11 as prime renderoffload gpu, X-Server master + Mesa 21.0.3
show improvement from unbearable tearing to perfect, despite a stride
mismatch between display gpu and Pixmap of 11776 Bytes vs. 11520
Bytes. That this is correct behaviour was also confirmed by comparing the
behaviour and .check_flip implementation of the patched modesetting-ddx
against the current intel-ddx SNA Present implementation.
Please consider merging this patch before the server-1.21 branch point.
This patch could also be cherry-picked into the server 1.20 branch to
fix the same limitation.
Signed-off-by: Mario Kleiner <mario.kleiner.de@gmail.com>
commit 7d34b1f2b7c612c3171e0b9758b5fc094bc33f63
Author: Simon Ser <contact@emersion.fr>
Date: Fri Jun 18 11:04:45 2021 +0200
xwayland: add -noTouchPointerEmulation
In some scenarios, the Wayland compositor might have more knowledge
than the X11 server and may be able to perform pointer emulation for
touch events better. Add a command-line switch to allow compositors
to turn Xwayland pointer emulation off.
Signed-off-by: Simon Ser <contact@emersion.fr>
commit 7c63c582a17b206a33b57a70dd61e7919a6ef9fe
Author: Mario Kleiner <mario.kleiner.de@gmail.com>
Date: Thu Aug 26 17:06:49 2021 +0200
Revert "glamor: Enable modifier support for xfree86 too"
This reverts commit 9b8999411033c9473cd68e92e4690a91aecf5b95.
Turns out that defaulting glamor_egl->dmabuf_capable = TRUE
breaks kms page-flipping on various Mesa+Linux/DRM-KMS+hardware
combos, resulting in broken presentation timing, degraded performance
and awful tearing. E.g., my testing shows that X-Server master +
Mesa 21.2 + Linux 5.3 on Intel Kabylake has broken pageflipping.
Similar behaviour was observed in the past on RaspberryPi 4/400
with VideoCore-6 by myself and others, and iirc by myself on some
AMD gpu's, although my memories of the latter are a bit dim.
Cfe. https://gitlab.freedesktop.org/mesa/mesa/-/issues/3601 and
possibly https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/254
for related problems.
The reason for pageflip failure on the modesetting-ddx under
DRI3/Present seems to be the following sequence:
1. Atomic modesetting for the modesetting-ddx is broken and therefore
both disabled by default in the modesetting-ddx itself and also
force-disabled by the Linux kernel since quite a while. If the kernel
detects drmSetClientCap(fd, DRM_CLIENT_CAP_ATOMIC, 1); from the
X-Server, it will reject the request, as a countermeasure to all the
past and current brokeness.
2. Without DRM_CLIENT_CAP_ATOMIC we don't get the implied universal
planes support (DRM_CLIENT_CAP_UNIVERSAL_PLANES).
3. Without DRM_CLIENT_CAP_UNIVERSAL_PLANES, drmModeGetPlaneResources()
will only return overlay planes, but not primary- or cursor planes.
4. As modesetting-ddx drmmode_crtc_create_planes() function can only
operate on primary planes, but can't get any from drmModeGetPlaneResources(),
the drmmode_crtc_create_planes() mostly turns into a no-op, never
executes populate_format_modifiers() and therefore the Linux kernels
DRM-KMS driver is not ever queried for the list of scanout/pageflip
capable DRM format modifiers. Iow. the drmmode_crtc->formats[i].modifiers
list stays empty with zero drmmode_crtc->formats[i].num_modifiers.
5. The list from step 4 provides the format+modifiers for intersection
which would get returned by the X-Servers DRI3 backend as response to
a xcb_dri3_get_supported_modifiers_window_modifiers() request. Given
an empty list was returned in step 4, this will lead to return of an
empty modifiers list by xcb_dri3_get_supported_modifiers_window_modifiers().
6. Both Mesa's DRI3/Present OpenGL backbuffer allocation logic and iirc
Mesa/Vulkan/WSI/X11's swapchain image allocation logic use the list
from xcb_dri3_get_supported_modifiers_window_modifiers() for format+
modifier selection for scanout/pageflip capable buffers. Cfe. Mesa's
dri3_alloc_render_buffer() function.
Due to the empty list, the Mesa code falls back to the format+modifiers
reported by xcb_dri3_get_supported_modifiers_screen_modifiers()
instead. This list contains all modifiers reported by GLAMOR as
result of glamor_get_formats() and glamor_get_modifiers(), which
in turn are query results from Mesa eglQueryDmaBufFormatsEXT()
and eglQueryDmaBufModifiersEXT(). Iow. all format+modifiers which
are supported for rendering are considered for the OpenGL backbuffers
and Vulkan swapchain buffers.
7. Depending on kms driver + gpu combo and Mesa version, such buffers
are often not direct-scanout / pageflip capable, and so pageflipping
can't be used for DRI3/Present of fullscreen windows. Whenever the
system has to fallback to copies instead of pageflips, the results
are broken presentation timing, degraded performance and quite
horrible tearing, as the current DRI3/Present implementation does not
perform any hardware synchronization of copy presents to the start
of vblank or similar.
By defaulting glamor_egl->dmabuf_capable = FALSE instead, as the server
1.20 branch does, we avoid this failure:
1. glamor_get_modifiers() turns into a no-op and returns false, not
reporting any supported dmabuf modifiers to the servers DRI3 code,
ie. the servers cache_formats_and_modifiers() function can't retrieve
and cache any format+modifiers. Therefore the servers DRI3 code now
also reports an empty format+modifiers list when Mesa does a
xcb_dri3_get_supported_modifiers_screen_modifiers() query.
2. Mesa's buffer allocation code therefore falls back to using the old
DRI image extensions createImage() function to allocate buffers
with use flags __DRI_IMAGE_USE_SCANOUT | __DRI_IMAGE_USE_BACKBUFFER
and our OpenGL backbuffers / Vulkan swapchain images get allocated
in a direct-scanout / pageflip capable format. Pageflipping works,
timing and performance is good, presentation is tear-free.
Please consider merging this for branching the X-Server 1.21 branch.
Signed-off-by: Mario Kleiner <mario.kleiner.de@gmail.com>
commit c5a9287dcf8d77ab104d56ac27ad6b1ff957fdfb
Author: Jon Turney <jon.turney@dronecode.org.uk>
Date: Wed May 12 16:51:26 2021 +0100
Don't underlink inputtest on targets which require complete linkage
Don't underlink inputtest on targets which require complete linkage
(e.g. when building for PE/COFF)
commit d68b50ec032fe4f02bde817abfd30328ec96a11c
Author: Jon Turney <jon.turney@dronecode.org.uk>
Date: Sat Jul 10 17:38:01 2021 +0100
Fix compilation with windows.h from latest w32api
misc.h has complex logic (checking MAXSHORT is undefined etc.)
controlling if it includes assert.h or not.
Including windows.h from w32api 9.0.0 now trips over that, causing
assert.h to not be included, causing various errors, e.g.
In file included from ../include/cursor.h:53,
from ../include/dix.h:54,
from ../os/osdep.h:139,
from ../hw/xwin/winauth.c:40:
../include/privates.h: In function ‘dixGetPrivateAddr’:
../include/privates.h:121:5: error: implicit declaration of function ‘assert’ [-Werror=implicit-function-declaration]
Fix this by IWYU in privates.h
commit ab86be0ed9233d6683daf00d359c562b12e137c8
Author: Mario Kleiner <mario.kleiner.de@gmail.com>
Date: Fri Aug 27 19:27:29 2021 +0200
modesetting: Fix VRR window property handling.
A misplaced error check can cause this failure scenario, and does
so reliably as tested on Ubuntu 21.04 with KDE Plasma 5 desktop
within the first few seconds of login session startup, rendering
VRR under modesetting-ddx unusable:
1. Some X11 client application changes some window property.
2. ms_change_property() is called as part of the property change
handling call chain (client->requestVector[X_ChangeProperty]).
It removes itself temporarily from the call chain - or so it
thinks, hooking up saved_change_property instead.
3. ret = saved_change_property(client) is called and fails
temporarily for some non-critical reason.
4. The misplaced error check returns early (error abort), without
first restoring ms_change_property() as initial X_ChangeProperty
handler in the call chain again.
-> Now ms_change_property() has removed itself permanently from the
property handler call chain for the remainder of the X session
and VRR property changes on windows are no longer handled, ie.
VRR no longer gets enabled/disabled in response to window VRR
property changes.
Place the error check at the proper place, just as it is correctly
done by amdgpu-ddx, and in modesetting-ddx ms_delete_property()
function.
Verified to fix VRR handling with an AMD gpu under KDE desktop
session.
Please consider merging before branching the server 1.21 branch.
Signed-off-by: Mario Kleiner <mario.kleiner.de@gmail.com>
commit 18d3131f9a332096825c09106a931c427246ddb7
Author: Povilas Kanapickas <povilas@radix.lt>
Date: Thu Aug 5 22:43:54 2021 +0300
meson: Implement developer documentation build
Signed-off-by: Povilas Kanapickas <povilas@radix.lt>
commit 722da1c62caad961ce09fc226daf84465f4b7a7e
Author: Povilas Kanapickas <povilas@radix.lt>
Date: Fri Aug 6 15:21:53 2021 +0300
meson: Add option to disable libdrm support
Signed-off-by: Povilas Kanapickas <povilas@radix.lt>
commit 1f720dc9a319bb66e2f5f28568614e81aa9e9e4d
Author: Adam Jackson <ajax@redhat.com>
Date: Tue Aug 17 16:06:57 2021 -0400
dmx: Fix some redeclaration warnings from gcc 11
Of the form:
../hw/dmx/config/xdmxconfig.c:68:26: warning: redundant redeclaration of ‘dmxConfigEntry’ [-Wredundant-decls]
68 | extern DMXConfigEntryPtr dmxConfigEntry;
| ^~~~~~~~~~~~~~
commit b49f0f9b323d66056aa9cd88f9ca1a124037bf32
Author: Adam Jackson <ajax@redhat.com>
Date: Tue Aug 17 16:04:40 2021 -0400
xkb: Silence a warning from gcc 11
I get this:
In function ‘TryCopyStr’,
inlined from ‘CopyISOLockArgs’ at ../xkb/xkbtext.c:875:9:
../xkb/xkbtext.c:720:13: warning: ‘tbuf’ may be used uninitialized [-Wmaybe-uninitialized]
720 | strcat(to, from);
| ^~~~~~~~~~~~~~~~
../xkb/xkbtext.c: In function ‘CopyISOLockArgs’:
<built-in>: note: by argument 1 of type ‘const char *’ to ‘__builtin_strlen’ declared here
../xkb/xkbtext.c:871:10: note: ‘tbuf’ declared here
871 | char tbuf[64];
| ^~~~
Just initialize tbuf so it definitely works.
commit c1138d8ec8d029de54261e355c0e5da0b001044a
Author: Adam Jackson <ajax@redhat.com>
Date: Fri Jul 9 15:30:16 2021 -0400
xinput: Silence a warning from gcc 11
[45/388] Compiling C object Xi/liblibxserver_xi.a.p/xichangehierarchy.c.o
../Xi/xichangehierarchy.c:61:32: warning: argument 1 of type ‘int[256]’ with mismatched bound [-Warray-parameter=]
61 | XISendDeviceHierarchyEvent(int flags[MAXDEVICES])
| ~~~~^~~~~~~~~~~~~~~~~
In file included from ../Xi/xichangehierarchy.c:54:
../Xi/xichangehierarchy.h:42:37: note: previously declared as ‘int[]’
42 | void XISendDeviceHierarchyEvent(int flags[]);
| ~~~~^~~~~~~
commit f3a98334e6a56858853f3894b0f48ee040741410
Author: Adam Jackson <ajax@redhat.com>
Date: Fri Jul 9 15:26:47 2021 -0400
selinux: Stop using security_context_t
This is apparently deprecated now and is and was always just char *.
commit 6f63873da55de33e51c1f6849a65501e380f19bc
Author: Simon Ser <contact@emersion.fr>
Date: Mon Jul 5 15:30:16 2021 +0200
xwayland: fix xdg_output leak
The xdg_output wasn't cleaned up when destroying the xwl_output.
Signed-off-by: Simon Ser <contact@emersion.fr>
commit 659260a0b7c1cef6060bd62a83deb03e3fa472b1
Author: Demi Marie Obenour <demi@invisiblethingslab.com>
Date: Fri Aug 6 13:23:08 2021 -0400
More missing version checks in SProcs
The bug in XFixes was also found in GenericEvent and Damage.
commit e4dabe8d9395d60699aa9831626920adaa847680
Author: Roman Gilg <subdiff@gmail.com>
Date: Sat Aug 7 14:15:07 2021 +0200
Remove build-only include from public header
The dix-config.h file is not installed, but dix.h is. The include makes the
compilation of external drivers fail (for example the libinput driver).
The Xserver compilation also works without the include, so just remove it.
Signed-off-by: Roman Gilg <subdiff@gmail.com>
commit 31fb35a7afc782e857bf60e524e7d966dbcd2551
Author: Demi Marie Obenour <demi@invisiblethingslab.com>
Date: Tue Jul 20 22:58:42 2021 -0400
XFixes: add version check for byteswapped clients
The version check for byteswapped clients was missing.
commit 7eba412072afdc9d27896410872e40364a8010bf
Author: Olivier Fourdan <ofourdan@redhat.com>
Date: Fri Mar 26 15:48:23 2021 +0100
xfree86: Move xf86CVTMode() function
The xf86CVTMode() was implemented in a standalone source file because it
was being used for both the xfree86 API and the standalone cvt utility.
Now that the cvt utility is removed (as part of libxcvt) we can move the
small xf86CVTMode() function with the rest of the xf86Modes sources.
Closes: https://gitlab.freedesktop.org/xorg/xserver/-/issues/1142
Signed-off-by: Olivier Fourdan <ofourdan@redhat.com>
Reviewed-by: Matt Turner <mattst88@gmail.com>
commit f2781e95369583259991cd3add6f90f33be32171
Author: Olivier Fourdan <ofourdan@redhat.com>
Date: Thu Mar 25 10:27:31 2021 +0100
xfree86/cvt: Drop cvt utility
The cvt utility is now replaced by the standalone version found in
libxcvt, no need to build the one in xfree86 anymore.
Closes: https://gitlab.freedesktop.org/xorg/xserver/-/issues/1142
Signed-off-by: Olivier Fourdan <ofourdan@redhat.com>
Reviewed-by: Matt Turner <mattst88@gmail.com>
commit f788289bdcc4f04bd2fb62552df1c8c1ae0aea45
Author: Olivier Fourdan <ofourdan@redhat.com>
Date: Thu Mar 25 10:19:55 2021 +0100
xfree86: Use libxcvt
Replace the local implementation of the VESA CVT standard timing
modelines generator with the one from libxct to avoid code duplication.
Closes: https://gitlab.freedesktop.org/xorg/xserver/-/issues/1142
Signed-off-by: Olivier Fourdan <ofourdan@redhat.com>
Reviewed-by: Matt Turner <mattst88@gmail.com>
commit 6ea2c001f9d23c91113b937fb99053e262d21df6
Author: Olivier Fourdan <ofourdan@redhat.com>
Date: Thu Mar 25 10:17:49 2021 +0100
xwayland: Use libxcvt
Xwayland is using a copy of the CVT generator found in Xorg.
Rather than duplicating the code within the xserver tree, use the
libxcvt implementation instead.
Closes: https://gitlab.freedesktop.org/xorg/xserver/-/issues/1142
Signed-off-by: Olivier Fourdan <ofourdan@redhat.com>
Reviewed-by: Matt Turner <mattst88@gmail.com>
commit a4ab57cb748674823744a8ef5a0b416ee553efe8
Author: Olivier Fourdan <ofourdan@redhat.com>
Date: Thu Mar 25 10:16:31 2021 +0100
build: Add dependency on libxcvt
libxcvt is a library providing a standalone version of the X server
implementation of the VESA CVT standard timing modelines generator.
Closes: https://gitlab.freedesktop.org/xorg/xserver/-/issues/1142
Signed-off-by: Olivier Fourdan <ofourdan@redhat.com>
Reviewed-by: Matt Turner <mattst88@gmail.com>
commit 84897891e5e7eb44068cda22284dca70c6cfd1a2
Author: Olivier Fourdan <ofourdan@redhat.com>
Date: Fri Jul 9 15:11:51 2021 +0200
ci: Install libxcvt from git
Signed-off-by: Olivier Fourdan <ofourdan@redhat.com>
commit 5c2592cbb19f996c4bb87bca4e4e46ab911d4bec
Author: Demi Marie Obenour <demi@invisiblethingslab.com>
Date: Tue Jul 20 22:37:26 2021 -0400
Add do-while loops to DIX macros
This ensures they will behave properly in conditionals and always
require a trailing semicolon.
commit d83c84bd9dc7fbd3588ce70b0c8bf0f63ed29ff3
Author: Alex Richardson <Alexander.Richardson@cl.cam.ac.uk>
Date: Fri Jul 23 09:24:50 2021 +0100
Mark the dixChangeWindowProperty() value argument as const
It is copied using memcpy() and not modified so we can add const. This
fixes a -Wincompatible-pointer-types-discards-qualifiers compiler warning
that was failing a -Werror XVnc build for me.
Signed-off-by: Alex Richardson <Alexander.Richardson@cl.cam.ac.uk>
commit fb5322ce2819260c07e06ab22b47df0a5d19f07d
Author: Zoltán Böszörményi <zboszor@gmail.com>
Date: Thu Jul 8 06:14:21 2021 +0200
glamoregl: Initialize glamor on the main device
This allows e.g. an UDL device (driven by llvmpipe) to be automatically
set up with GPU acceleration via reverse PRIME.
The result is e.g.:
# DISPLAY=:0.2 xrandr --listproviders
Providers: number : 2
Provider 0: id: 0xec cap: 0xf, Source Output, Sink Output, Source Offload, Sink Offload crtcs: 1 outputs: 1 associated providers: 1 name:modesetting
Provider 1: id: 0x12c cap: 0xb, Source Output, Sink Output, Sink Offload crtcs: 2 outputs: 2 associated providers: 1 name:Intel
Signed-off-by: Zoltán Böszörményi <zboszor@gmail.com>
commit f08bc32f5abc23ea715c15e8e86150434cc99e4f
Author: Zoltán Böszörményi <zboszor@gmail.com>
Date: Thu Jul 8 06:13:24 2021 +0200
xf86: Assign GPUs to screens according to configuration
If there is an explicit configuration, assign the RandR provider
of the GPUDevice to the screen it was specified for.
If there is no configuration (default case) the screen number is
still 0 so it doesn't change behaviour.
The result is e.g:
# DISPLAY=:0.2 xrandr --listproviders
Providers: number : 2
Provider 0: id: 0xd2 cap: 0x2, Sink Output crtcs: 1 outputs: 1 associated providers: 0 name:modesetting
Provider 1: id: 0xfd cap: 0xb, Source Output, Sink Output, Sink Offload crtcs: 2 outputs: 2 associated providers: 0 name:Intel
Signed-off-by: Zoltán Böszörményi <zboszor@gmail.com>
commit cd567415cc5645f8cdc78e85e8887e5cce76e6d7
Author: Zoltán Böszörményi <zboszor@gmail.com>
Date: Thu Jul 8 06:09:44 2021 +0200
xf86: Extract screen configuration matching into its own function
Signed-off-by: Zoltán Böszörményi <zboszor@gmail.com>
commit 16571b8926a5a7ba5a1885b36a16857addbe8f41
Author: Boris-Barboris <ismailsiege@gmail.com>
Date: Tue Jun 22 00:51:08 2021 +0300
Don't hardcode fps for fake screen
Currently, when main hardware screen is powered-off,
X server initializes fake screen's timer with
1 second update interval.
Streaming software like Nomachine or Vnc, as well as
desktop input automation suffers from it, since it
will forever be stuck on 1 fps until the display is
turned back on.
This commit adds command line option -fakescreenfps <int>
that allows the user to change the default fake screen
timer.
Signed-off-by: Baranin Alexander <ismailsiege@gmail.com>
commit 8836b9d243444031b6396d39d345f2f83b5fa6a9
Author: Łukasz Spintzyk <lukasz.spintzyk@synaptics.com>
Date: Thu Jul 22 13:12:05 2021 +0200
modesetting: unflip not possible when glamor is not set
This is fixing crashes of xfce when running under qemu
commit d6c02ffd9c910637f6b3b7249507998e9e45f93c
Author: Łukasz Spintzyk <lukasz.spintzyk@synaptics.com>
Date: Mon Jul 19 14:25:28 2021 +0200
present: fallback get_crtc to return crtc belonging to screen with present extension
Since crtc can belong to secondary output that may not have present
extension enabled we should fallback to first enabled crtc or fake crtc.
Fix for issue xorg/xserver#1195
commit f6f2f203bcde47c334836191982d77bbbbbf533c
Author: Michel Dänzer <mdaenzer@redhat.com>
Date: Thu May 20 19:00:10 2021 +0200
present: Drop flip_idler member from present_vblank_rec
It's redundant with the pixmap member of struct xwl_present_event.
Acked-by: Olivier Fourdan <ofourdan@redhat.com>
commit 212cfbcf68d279f2b3494e79fe8e3fbaabeba77c
Author: Michel Dänzer <mdaenzer@redhat.com>
Date: Wed May 12 15:25:51 2021 +0200
xwayland/present: Use present_vblank_ptr instead of xwl_present_event*
Where the latter isn't really needed.
Acked-by: Olivier Fourdan <ofourdan@redhat.com>
commit fe8c7855f3a85f156c792a3f18a175138407054b
Author: Michel Dänzer <mdaenzer@redhat.com>
Date: Wed May 12 12:51:32 2021 +0200
xwayland/present: Fold xwl_present_release_event into _free_event
The only difference was unhooking from the vblank.event_queue list,
which is already done by xwl_present_flip_notify_vblank in
xwl_present_msc_bump.
commit 31d2ebca77fcabec81194ae6dcd724c699b1b513
Author: Michel Dänzer <mdaenzer@redhat.com>
Date: Mon May 10 18:33:43 2021 +0200
xwayland/present: Drop target_msc member from struct xwl_present_event
Use present_vblank_rec::exec_msc instead.
Acked-by: Olivier Fourdan <ofourdan@redhat.com>
commit 495ec596640e26b6995c93eedc922d2702ad64ad
Author: Michel Dänzer <mdaenzer@redhat.com>
Date: Mon May 10 19:04:07 2021 +0200
xwayland/present: Drop pending member from struct xwl_present_event
We are handling two cases here: the active flip or the pending flip.
For the pending flip (event->pending == TRUE), we called
xwl_present_release_pixmap.
For the active flip (event->pending == FALSE), we called
xwl_present_release_event. However, xwl_present_flip_notify_vblank
already unhooked event->vblank.event_queue. So this was effectively the
same as calling xwl_present_release_pixmap.
Acked-by: Olivier Fourdan <ofourdan@redhat.com>
commit f73340445fe1da9ae9bc3197eb2ef41589aa2a4e
Author: Michel Dänzer <mdaenzer@redhat.com>
Date: Fri May 7 18:16:23 2021 +0200
xwayland/present: Drop list member from struct xwl_present_event
Use present_vblank_rec::event_queue instead.
The changes in xwl_present_execute shouldn't really be needed, since
we should never hit queue_vblank in present_execute_wait. But let's be
safe rather than sorry, plus this simplifies the code.
Acked-by: Olivier Fourdan <ofourdan@redhat.com>
commit aac31d2758d4e84774b633ec108d18f0bad6ef64
Author: Michel Dänzer <mdaenzer@redhat.com>
Date: Fri May 7 17:58:27 2021 +0200
xwayland/present: Drop exec_queue member from struct xwl_present_window
Doesn't serve any purpose anymore.
Acked-by: Olivier Fourdan <ofourdan@redhat.com>
commit f8c086b2145d1c9364e9b43ff4d796791d8af169
Author: Michel Dänzer <mdaenzer@redhat.com>
Date: Fri May 7 17:55:13 2021 +0200
xwayland/present: Fold xwl_present_event_notify into its caller
Can just call xwl_present_execute directly.
This allows dropping the window member from struct xwl_present_window as
well.
Acked-by: Olivier Fourdan <ofourdan@redhat.com>
commit c30f3d08acb01a41df0fe7176f237137f3039480
Author: Michel Dänzer <mdaenzer@redhat.com>
Date: Fri May 7 17:49:07 2021 +0200
xwayland/present: Use exec_queue for deferring completion events
We clear the vblank->pixmap field, so next time xwl_present_execute
falls through to present_execute_post.
Acked-by: Olivier Fourdan <ofourdan@redhat.com>
commit 4503c8d9ea7df5bda470501e638a730d91d718c9
Author: Michel Dänzer <mdaenzer@redhat.com>
Date: Fri May 7 12:56:30 2021 +0200
xwayland/present: Fold xwl_present_idle_notify into its caller
Allows simplification by avoiding indirection.
Acked-by: Olivier Fourdan <ofourdan@redhat.com>
commit b2a06e0700fa48c1e77fc687e6af39a4bb7c2ceb
Author: Michel Dänzer <mdaenzer@redhat.com>
Date: Fri May 7 12:34:49 2021 +0200
xwayland/present: Drop sync_flip member of struct xwl_present_window
The same information can be determined from the flip queue.
Acked-by: Olivier Fourdan <ofourdan@redhat.com>
commit fc53e3c536b5a338c595b5724c7d0b4734e45871
Author: Michel Dänzer <mdaenzer@redhat.com>
Date: Thu May 6 18:42:46 2021 +0200
xwaland/present: Drop flip_pending member of struct xwl_present_window
Use the first element of the flip_queue list for the same purpose.
Acked-by: Olivier Fourdan <ofourdan@redhat.com>
commit c592c66625d964e8ed1f3fcfc01a245e4c8a8015
Author: Michel Dänzer <mdaenzer@redhat.com>
Date: Fri May 7 12:21:44 2021 +0200
xwayland/present: Fold xwl_present_flip_notify into its callers
No need for them to be separate anymore.
Acked-by: Olivier Fourdan <ofourdan@redhat.com>
commit 42301760802ea1cbe3698797c2bfb3a91ee02430
Author: Michel Dänzer <mdaenzer@redhat.com>
Date: Fri Apr 23 12:59:55 2021 +0200
xwayland/present: Embed present_vblank_rec in xwl_present_event
This allows for various simplifications.
Use the pointer to the struct memory as the event ID. In contrast to
the SCMD code for Xorg (where pending DRM events cannot be cancelled),
this is safe here, because we can destroy pending Wayland callbacks. So
we can't get a callback with a stale pointer to freed memory.
Remove xwl_present_window::release_list in favour of
present_vblank_rec::window_list.
Remove xwl_present_event::xwl_present_window in favour of
present_vblank_rec::window.
xwl_present_free_event is never called for a NULL pointer anymore, no
need to check.
v2:
* Restore DestroyWindow wrapping order to make sure
present_destroy_window doesn't call xwl_present_abort_vblank.
Acked-by: Olivier Fourdan <ofourdan@redhat.com>
commit 61cc5d96ed281a082d8dd414506dea0084e446fd
Author: Michel Dänzer <mdaenzer@redhat.com>
Date: Wed May 5 15:02:25 2021 +0200
present: Refactor present_vblank_init helper ouf of _vblank_create
Allows embedding into another struct.
Acked-by: Olivier Fourdan <ofourdan@redhat.com>
commit 35f173ddb606f9fbac7957e427fe28a377204cfe
Author: Michel Dänzer <mdaenzer@redhat.com>
Date: Thu Apr 29 18:44:04 2021 +0200
xwayland/present: Drop abort member of struct xwl_present_event
We can call xwl_present_free_event unconditionally from
xwl_present_abort_vblank, since the sync_callback is already destroyed
in xwl_present_cleanup.
Acked-by: Olivier Fourdan <ofourdan@redhat.com>
commit 0517460301cbf9c6ed3020ef1dd0cd1df94ea178
Author: Michel Dänzer <mdaenzer@redhat.com>
Date: Tue May 11 12:56:53 2021 +0200
xwayland/present: Simplify calls to Xwayland-private functions
Change parameter types to what's really needed, or just fold the
function into its only caller.
Acked-by: Olivier Fourdan <ofourdan@redhat.com>
commit 490248ea70d3fe923446e17312880ae63590d45c
Author: Michel Dänzer <mdaenzer@redhat.com>
Date: Mon Apr 19 12:59:56 2021 +0200
xwayland/present: Rename present_wnmd_* functions to xwl_present_*
The WNMD indirection is gone.
Acked-by: Olivier Fourdan <ofourdan@redhat.com>
commit 0c0cbbc7cb4fa917a2b33494efb6dc03e5de9051
Author: Michel Dänzer <mdaenzer@redhat.com>
Date: Wed Apr 21 17:15:27 2021 +0200
present: Remove present_wnmd_info_rec
Doesn't serve any purpose anymore.
Acked-by: Olivier Fourdan <ofourdan@redhat.com>
commit 561c63d0f13a8c6379ed05338172570f93dbce37
Author: Michel Dänzer <mdaenzer@redhat.com>
Date: Mon Apr 19 18:41:59 2021 +0200
xwayland/present: Merge present_wnmd_flips_stop & xwl_present_flips_stop
Just use the latter instead of the former elsewhere. No need for them
to be separate anymore.
Acked-by: Olivier Fourdan <ofourdan@redhat.com>
commit a67f16fde1ff094c3ec4fffe8a7269b30c7b8668
Author: Michel Dänzer <mdaenzer@redhat.com>
Date: Mon Apr 19 18:53:36 2021 +0200
xwayland/present: Fold present_wnmd_get_ust_msc into its callers
Just use xwl_present_get_ust_msc directly. No need for the indirection
anymore.
Acked-by: Olivier Fourdan <ofourdan@redhat.com>
commit 080c1ca3f57b4226f34624b0cd2171ffbbc2be4f
Author: Michel Dänzer <mdaenzer@redhat.com>
Date: Mon Apr 19 18:46:23 2021 +0200
xwayland/present: Fold present_wnmd_queue_vblank into its callers
Just use xwl_present_queue_vblank directly. No need for the indirection
anymore.
Acked-by: Olivier Fourdan <ofourdan@redhat.com>
commit c22887bc7a83e9b8ad112aadaec069b0366fc38e
Author: Michel Dänzer <mdaenzer@redhat.com>
Date: Mon Apr 19 18:51:06 2021 +0200
xwayland/present: Fold present_wnmd_get_crtc into present_wnmd_pixmap
And use xwl_present_get_crtc directly.
No need for them to be separate anymore.
Acked-by: Olivier Fourdan <ofourdan@redhat.com>
commit cb35ff596ec4e4fc6a4e96d55e280cdf399791e1
Author: Michel Dänzer <mdaenzer@redhat.com>
Date: Mon Apr 19 18:34:07 2021 +0200
xwayland/present: Fold present_wnmd_check_flip into its callers
Mainly into xwl_present_check_flip, and call that from
present_wnmd_check_flip_window.
No need for them to be separate anymore.
Acked-by: Olivier Fourdan <ofourdan@redhat.com>
commit 7b78cf6b3ae386b9df2483692041dfa38a91bedb
Author: Michel Dänzer <mdaenzer@redhat.com>
Date: Mon Apr 19 18:26:55 2021 +0200
xwayland/present: Simplify query_capabilities
No need for the WNMD indirection anymore.
Acked-by: Olivier Fourdan <ofourdan@redhat.com>
commit 244403ec8718d782d57a830ece9357a75a0dd70b
Author: Michel Dänzer <mdaenzer@redhat.com>
Date: Mon Apr 19 18:01:52 2021 +0200
xwayland/present: Fold present_wnmd_abort_vblank into its only caller
No need for them to be separate anymore.
Acked-by: Olivier Fourdan <ofourdan@redhat.com>
commit f7adbc2166b7a4662cbd69507d8cbac11034c87e
Author: Michel Dänzer <mdaenzer@redhat.com>
Date: Mon Apr 19 18:06:22 2021 +0200
xwayland/present: Drop present_wnmd_flush in favour of xwl_present_flush
No need for the indirection anymore.
Acked-by: Olivier Fourdan <ofourdan@redhat.com>
commit 7fd114365d694360540bc46cd615aa47373be0a8
Author: Michel Dänzer <mdaenzer@redhat.com>
Date: Mon Apr 19 19:02:32 2021 +0200
xwayland/present: Fold present_wnmd_flip into present_wnmd_execute
No need for the indirection anymore.
Acked-by: Olivier Fourdan <ofourdan@redhat.com>
commit 2e1dcd731f98a8beceee699cc57b7082f98916c4
Author: Michel Dänzer <mdaenzer@redhat.com>
Date: Tue Apr 20 19:01:12 2021 +0200
xwayland/present: Fold present_wnmd_screen_init into xwl_present_init
No need for them to be separate anymore.
Acked-by: Olivier Fourdan <ofourdan@redhat.com>
commit b6419359b6b11ec659f59cc74075fcf049591425
Author: Michel Dänzer <mdaenzer@redhat.com>
Date: Wed Apr 21 12:50:02 2021 +0200
present: Move present_wnmd.c contents to hw/xwayland/xwayland-present.c
This will allow eliminating indirections and making the Xwayland Present
code more efficient and easier to follow.
While this technically changes the Xorg video driver ABI, I don't know
of any drivers using the dropped present_wnmd_* symbols, and I doubt a
Xorg driver could make use of them as is anyway.
(As a bonus, Xorg no longer links any Xwayland specific Present code)
v2:
* Wrap DestroyWindow before initializing Present, so that
present_destroy_window runs before xwl_present_cleanup. Avoids crash
due to present_destroy_window calling xwl_present_* functions when
xwl_present_window was already freed. (Olivier Fourdan)
Acked-by: Olivier Fourdan <ofourdan@redhat.com>
commit c35a716b02921e2fcae5fe89295a99c6dd5dec8c
Author: Michel Dänzer <mdaenzer@redhat.com>
Date: Fri Apr 16 18:45:39 2021 +0200
present: Fold wnmd_init_mode_hooks into wnmd_screen_init
Preparation for moving WNMD code to hw/xwayland. No functional change
intended.
Acked-by: Olivier Fourdan <ofourdan@redhat.com>
commit 10bdd87fe49cbd9b4c4b584024d663b928d3f1be
Author: Michel Dänzer <mdaenzer@redhat.com>
Date: Fri Apr 16 18:43:48 2021 +0200
present: Move present_wnmd_screen_init to present_wnmd.c
Now all WNMD code is in present_wnmd.c.
Acked-by: Olivier Fourdan <ofourdan@redhat.com>
commit b6d54b0f5d2fb3dc8a4b2812bfee94112c332256
Author: Michel Dänzer <mdaenzer@redhat.com>
Date: Wed Apr 21 17:01:36 2021 +0200
present: Dispatch clear_window_flip via present_screen_priv hook
Eliminates special cases in present_destroy_window.
Acked-by: Olivier Fourdan <ofourdan@redhat.com>
commit 93666ebe37a9c8d64b814c7af6b895f89ca5ff88
Author: Michel Dänzer <mdaenzer@redhat.com>
Date: Wed Apr 21 18:39:36 2021 +0200
present: Remove create_event_id hook
Each present_vblank_create caller generates and sets the ID afterwards.
Acked-by: Olivier Fourdan <ofourdan@redhat.com>
commit 44f705a5b6b4f79682c5e649eb718a193e01ec47
Author: Michel Dänzer <mdaenzer@redhat.com>
Date: Mon Apr 19 18:19:30 2021 +0200
present: Pass capabilities to present_vblank_create by value
Preparation for moving WNMD code to hw/xwayland. No functional change
intended.
Acked-by: Olivier Fourdan <ofourdan@redhat.com>
commit 86e645bcfaea63bc3f91e4ccbbc19569929b92c3
Author: Michel Dänzer <mdaenzer@redhat.com>
Date: Fri Jul 2 12:41:34 2021 +0200
xwayland/eglstream: Drop xwl_eglstream_set_window_pixmap
Not sure why we'd need to abandon a pending stream for a pixmap just
because it's no longer a window pixmap. Let's try not to.
Reviewed-by: Olivier Fourdan <ofourdan@redhat.com>
commit ba8763c27b2ebc91850abfcaf32ae972e80142e7
Author: Michel Dänzer <mdaenzer@redhat.com>
Date: Fri Jul 2 12:57:21 2021 +0200
xwayland/eglstream: Consolidate pending_cb destruction
Into a new xwl_eglstream_destroy_pending_stream helper.
Reviewed-by: Olivier Fourdan <ofourdan@redhat.com>
commit 204f10c29e0f323e7829ecf48e0f002be96e194d
Author: Michel Dänzer <mdaenzer@redhat.com>
Date: Wed Jul 7 18:53:35 2021 +0200
xwayland: Call RRTellChanged if the RandR configuration may have changed
This makes sure RandR events are sent to interested clients as needed.
This was happening implicitly in some cases, but not in others, e.g. if
the root window size didn't change.
If this were to call RRTellChanged more often than necessary in some
cases, that should be harmless, as it only sends events if something
has actually changed since last time.
Should fix https://bugzilla.redhat.com/show_bug.cgi?id=1979892 .
v2:
* Call RRTellChanged at the very end of update_screen_size, just in
case.
Reviewed-by: Olivier Fourdan <ofourdan@redhat.com>
commit a6d178b6af4bb4cd7ba28299c3ddd9d90bcbaaa5
Author: Michel Dänzer <mdaenzer@redhat.com>
Date: Wed Jul 7 18:51:02 2021 +0200
randr: Bail from RRTellChanged if there's no root window yet
This can happen if RRTellChanged is called during initialization.
Continuing in that case makes no sense conceptually:
* Any event sent over the wire requires a corresponding window.
* No root window probably means there can't be any clients which could
receive the events.
In practice, it would result in a crash down the road due to
dereferencing the NULL ScreenRec::root pointer.
Reviewed-by: Olivier Fourdan <ofourdan@redhat.com>
commit 7e20c8b7b8357eb8986f89e85be22ab1c29f2ca4
Author: Matt Turner <mattst88@gmail.com>
Date: Thu Jul 8 12:15:13 2021 -0700
Build xz tarballs instead of bzip2
Signed-off-by: Matt Turner <mattst88@gmail.com>
commit a9552868697cae02e37e67ae774a072885f202f8
Author: Dave Airlie <airlied@redhat.com>
Date: Thu Jul 1 06:48:55 2021 +1000
glamor: add EXT_gpu_shader4 support
This enables a number of the GLSL 1.30 paths on GPUs that have
EXT_gpu_shader4 but don't have GLSL 1.30 exposed.
(Intel gen4/5 mainly)
Reviewed-by: Adam Jackson <ajax@redhat.com>
commit a2f5b917f511fca1c9b1501495664e2f63c2e1b0
Author: Dave Airlie <airlied@redhat.com>
Date: Fri Jul 2 04:52:23 2021 +1000
glamor: add glamor_glsl_has_ints wrapper
This should make adding gpu shader4 support cleaner
Reviewed-by: Adam Jackson <ajax@redhat.com>
commit b4f55712da4d7294bfeb6cffc45b572fd999d800
Author: Povilas Kanapickas <povilas@radix.lt>
Date: Mon Jul 5 21:40:55 2021 +0300
xserver 21.0.99.1
Signed-off-by: Povilas Kanapickas <povilas@radix.lt>
commit b67e514dbb59bffc23b75d47ca7f24e96c4aeb05
Author: Povilas Kanapickas <povilas@radix.lt>
Date: Sat Jun 26 09:44:39 2021 +0300
meson: Fix warnings when reading back and checking feature flags
Meson does not like comparing things of different types which is a
problem when reading back values of feature flags as they may contain
either false (bool) or 1 (string).
Since there is a strong reason why we use false when the feature does
not exist, we work around this issue by always converting the returned
value to int via to_int().
Fixes: https://gitlab.freedesktop.org/xorg/xserver/-/issues/1190
Signed-off-by: Povilas Kanapickas <povilas@radix.lt>
commit b2a0de4f072fdcc0fb20a0853f7edaf714add9d9
Author: Adam Jackson <ajax@redhat.com>
Date: Tue Jun 22 12:39:56 2021 -0400
xfixes: Allow the client to upgrade the fixes protocol version
If you say FixesQueryVersion twice we remember whatever the second
version number was. With just libXfixes this isn't an issue because the
request is hidden in extension setup, but libxcb-xfixes doesn't do that
for you, which means the second one can _lower_ the requested fixes
version, disabling requests that the client thought it had enabled.
Paper over this by allowing the version number to be raised but not
lowered. Also go ahead and delete the minor version number from the
client state since xfixes doesn't have minor versions (yet, anyway).
commit 7d509b6f342d9732b567dc4efa867ea24919853b
Author: Olivier Fourdan <ofourdan@redhat.com>
Date: Fri Apr 30 09:56:05 2021 +0200
xwayland/eglstream: Remove stream validity
To avoid an EGL stream in the wrong state, if the window pixmap changed
before the stream was connected, we would still keep the pending stream
but mark it as invalid. Once the callback is received, the pending would
be simply discarded.
But all of this is actually to avoid a bug in egl-wayland, there should
not be any problem with Xwayland destroying an EGL stream while the
compositor is still using it.
With that bug now fixed in egl-wayland 1.1.7, we can safely drop all
that logic from Xwayland EGLstream backend.
Signed-off-by: Olivier Fourdan <ofourdan@redhat.com>
Reviewed-by: Michel Dänzer <mdaenzer@redhat.com>
Closes: https://gitlab.freedesktop.org/xorg/xserver/-/issues/1189
commit 2be9f795bc15012dc912f595003e01bb6aa66f54
Author: Olivier Fourdan <ofourdan@redhat.com>
Date: Wed Jun 23 11:35:17 2021 +0200
xwayland/eglstream: Keep pending stream if the pixmap didn't change
If the pixmap does not actually change in set_window_pixmap(), there is
no need to invalidate the pending stream, if there's one.
Signed-off-by: Olivier Fourdan <ofourdan@redhat.com>
Suggested-by: Michel Dänzer <mdaenzer@redhat.com>
Reviewed-by: Michel Dänzer <mdaenzer@redhat.com>
commit 2531ee02450e3be3549daa09407557c3addeba02
Author: orbea <orbea@riseup.net>
Date: Wed Jun 23 05:50:21 2021 -0700
hw/dmx/config: Link directly with libdmxconfig.a
When building xserver with slibtool (https://dev.midipix.org/cross/slibtool)
the build will fail.
/usr/bin/ld: cannot find -ldmxconfig
This is because xserver creates libdmxconfig.a internally and then links with
the linker flag -ldmxconfig. However according to automake documentation the
-lfoo linker flags should only be used for external dependencies and all
internal libraries should be linked with the libtool archive file (.la) or
the static archive (.a) when the former is not available.
GNU libtool is far more permissive and happens to silently obscure this issue
while slibtool fails because it instead sees '-L./.libs -ldmxconfig'.
commit 2f53d1cf7304574a516f6868822307648bc35333
Author: Povilas Kanapickas <povilas@radix.lt>
Date: Wed Apr 7 18:22:05 2021 +0300
config: Fix platform busid parsing when there is no ID_PATH prop
On at least Lenovo Thinkpad E585 udev does not have ID_PATH property for
the drm node (see
https://gitlab.freedesktop.org/xorg/xserver/-/issues/993). While this is
likely udev bug, this causes the device to be not recognized as
attribs->busid is NULL, which causes platform_find_pci_info to be not
called and corresponding xf86_platform_devices[i]->pdev to be NULL.
At this moment pdev being NULL will cause a crash, but this is a
different bug.
Fixes: https://gitlab.freedesktop.org/xorg/xserver/-/issues/993
Fixes: 0816e8fc linux: Make platform device probe less fragile
Reviewed-by: Zoltán Böszörményi <zboszor@gmail.com>
Signed-off-by: Povilas Kanapickas <povilas@radix.lt>
commit d4b38e111946b934d0f8438dc295dd9f7316318c
Author: Olivier Certner <olce.freedesktop@certner.fr>
Date: Tue Feb 9 10:49:00 2021 +0100
os: Properly report failure to link lock file
Stop assuming that a failure to link always means that the file indeed
exists. In case of other failure (e.g., permissions), the user would get an
inconsistent "Can't read lock file" message.
Signed-off-by: Olivier Certner <olce.freedesktop@certner.fr>
commit d66b7ec12986efd4f32fcc84cdaacbd04ec98ccb
Author: Łukasz Spintzyk <lukasz.spintzyk@synaptics.com>
Date: Wed Jun 23 15:26:23 2021 +0200
xfree86: Fix out of array bound access to xf86Entities
Signed-off-by: Łukasz Spintzyk <lukasz.spintzyk@synaptics.com>
commit 0d93bbfa2cfacbb73741f8bed0e32fa1a656b928
Author: Povilas Kanapickas <povilas@radix.lt>
Date: Fri Mar 26 00:51:02 2021 +0200
xfree86: Fix potentially NULL reference to platform device's PCI device
xf86_platform_devices[i].pdev may be NULL in cases we fail to parse the
busid in config_udev_odev_setup_attribs() (see also [1], [2]) such as
when udev does not give use ID_PATH. This in turn leads to
platform_find_pci_info() being not called and pdev being NULL.
[1]: https://gitlab.freedesktop.org/xorg/xserver/-/issues/993
[2]: https://gitlab.freedesktop.org/xorg/xserver/-/issues/1076
Reviewed-by: Zoltán Böszörményi <zboszor@gmail.com>
Signed-off-by: Povilas Kanapickas <povilas@radix.lt>
commit 303763941f9941e2e215a3c978b72de495478033
Author: Povilas Kanapickas <povilas@radix.lt>
Date: Fri Mar 26 00:51:01 2021 +0200
xfree86: Consistently check for reference to primaryBus pci_device
This is the only place where we don't check whether
primaryBus.id.plat->pdev is not NULL before accessing its members.
It may be NULL in cases we fail to parse the busid in
config_udev_odev_setup_attribs() (see also [1], [2]) such as when udev
does not give use ID_PATH. This in turn leads to
platform_find_pci_info() being not called and pdev being NULL in one of
the items within the xf86_platform_devices array. For this to cause a
crash we only need it to become the primaryBus device.
[1]: https://gitlab.freedesktop.org/xorg/xserver/-/issues/993
[2]: https://gitlab.freedesktop.org/xorg/xserver/-/issues/1076
Signed-off-by: Povilas Kanapickas <povilas@radix.lt>
commit b9722d39cd619ac55c2cfbb5644eabb84ff57f1b
Author: Povilas Kanapickas <povilas@radix.lt>
Date: Thu Jun 17 18:00:50 2021 +0300
configure.ac: Switch project version to 20.x.y style
Reviewed-by: Zoltán Böszörményi <zboszor@gmail.com>
Signed-off-by: Povilas Kanapickas <povilas@radix.lt>
commit ef89b6648e2a806237a6d2fa598e1b9c83f128b4
Author: Zoltán Böszörményi <zboszor@pr.hu>
Date: Mon Jun 21 12:12:41 2021 +0200
xfree86: Fix NULL pointer dereference crash
screenp->displays[count] (passed to configDisplay() in
configScreen()) is NULL if there is no Virtual setting
in the configuration.
Fixes: f8a6be04d0c7e6a99824ff888ad6c010960c5c21 ("xfree86: Change
displays array to pointers array to fix invalid pointer issues
after table reallocation")
Signed-off-by: Zoltán Böszörményi <zboszor@gmail.com>
commit aad61e8e03311eb8bae4f7db59e65634733eadc2
Author: Olivier Fourdan <ofourdan@redhat.com>
Date: Fri Jun 18 14:52:55 2021 +0200
glx: Fix use after free in MakeCurrent
The fix from commit c468d34c7 - "glx: Set ContextTag for all contexts"
is actually incomplete, it correctly sets the context tag for direct
contexts as well, but would fail to mark the context's currentClient.
As a result, when the context is destroyed, it would be freed
immediately rather than being just scheduled for deletion, even though
it is still current for some client. leading to a use-after-free.
Make sure to also set the context's currentClient for direct contexts as
well, not just indirect ones.
Signed-off-by: Olivier Fourdan <ofourdan@redhat.com>
Fixes: c468d34c7 - "glx: Set ContextTag for all contexts"
Closes: https://gitlab.freedesktop.org/xorg/xserver/-/issues/1186
Reviewed-by: Adam Jackson <ajax@redhat.com>
commit 021b3c2f778e718338f232b94880fc3ae9092085
Author: Povilas Kanapickas <povilas@radix.lt>
Date: Tue Jun 15 12:40:47 2021 +0300
configure.ac: Bump inputproto dep to 2.3.99.1
This should have been part of 6cbcbc81525b131b5b94409ea870af663d5c28bb.
Signed-off-by: Povilas Kanapickas <povilas@radix.lt>
commit 05b3c681ea2f478c0cb941c2f8279919cf78de6d
Author: Daniel Strnad <strnadda@gmail.com>
Date: Tue May 19 15:52:35 2020 +0200
hw/xfree86: Propagate physical dimensions from DRM connector
Physical dimmension of display can be obtained not just by configuration or
DDC, but also directly from kernel via drmModeGetConnector(). Until now
xserver silently discarded these values even when no configuration nor EDID
were present and fallbacked to default DPI.
commit f8a6be04d0c7e6a99824ff888ad6c010960c5c21
Author: Łukasz Spintzyk <lukasz.spintzyk@synaptics.com>
Date: Tue Jun 8 20:02:21 2021 +0200
xfree86: Change displays array to pointers array to fix invalid pointer issues after table reallocation
There are rare cases when xf86SetDepthBpp is resizing displays array in confScreen.
As that array is shared between set of ScrnInfoRec's then realloc might invalidate chached DispPtr display values in
otheres ScrnInfoRec objects.
If we will change displays array as an array of pointers to DispRec then cached DispRec pointers in ScrnInfoRec
won't be invalid after reallocation of displays array.
Signed-off-by: Łukasz Spintzyk <lukasz.spintzyk@synaptics.com>
commit 1a1bd5cf7a1a3364afb625f020e1c013fbabfbb6
Author: Povilas Kanapickas <povilas@radix.lt>
Date: Fri Apr 16 16:15:35 2021 +0300
modesetting: Add a limit on async page flip error log frequency
In certain circumstances we will have a lot of flip errors without a
reasonable way to prevent them. In such case we reduce the number of
logged messages to at least not fill the error logs.
The details are as follows:
At least on i915 hardware support for async page flip support depends on
the used modifiers which themselves can change dynamically for a screen.
This results in the following problems:
- We can't know about whether a particular CRTC will be able to do an
async flip without hardcoding the same logic as the kernel as there's no
interface to query this information.
- There is no way to give this information to an application, because
the protocol of the present extension does not specify anything about
changing of the capabilities on runtime or the need to re-query them.
Even if the above was solved, the only benefit would be avoiding a
roundtrip to the kernel and reduced amount of error logs. The former
does not seem to be a good enough benefit compared to the amount of work
that would need to be done. The latter is solved in this commit.
Reviewed-by: Eero Tamminen <eero.t.tamminen@intel.com>
Signed-off-by: Povilas Kanapickas <povilas@radix.lt>
commit 9992245c5f7821de1fbd866f43f0afe55080ed67
Author: Povilas Kanapickas <povilas@radix.lt>
Date: Fri Apr 16 16:15:34 2021 +0300
modesetting: Extract flip failure logging to a single place
Reviewed-by: Eero Tamminen <eero.t.tamminen@intel.com>
Signed-off-by: Povilas Kanapickas <povilas@radix.lt>
commit 9adb13e296baead53112a268ddfd291195742c71
Author: Jose Maria Casanova Crespo <jmcasanova@igalia.com>
Date: Tue Jun 8 14:52:17 2021 +0200
glamor: Avoid using GL_QUADS on V3D
Like in 0e3f1252dacdc3194 ("glamor: Avoid using GL_QUADS on VC4")
this will avoid mesa to fallback doing conversion for QUADS primitives.
Signed-off-by: Jose Maria Casanova Crespo <jmcasanova@igalia.com>
Reviewed-by: Emma Anholt <emma@anholt.net>
commit 104c7c50485238a1e8c2090dc96126e9624ef870
Author: Michel Dänzer <mdaenzer@redhat.com>
Date: Tue May 18 18:02:59 2021 +0200
xwayland/present: Move wl_buffer check into xwl_glamor_check_flip
Keeps the glamor specific code together more.
Reviewed-by: Olivier Fourdan <ofourdan@redhat.com>
commit 3641c24bd012d032ec289cde312a9a5a3ba8c3bf
Author: Michel Dänzer <mdaenzer@redhat.com>
Date: Tue May 18 17:56:50 2021 +0200
xwayland/eglstream: Handle xwl_pixmap_get returning NULL
In xwl_glamor_eglstream_get_wl_buffer_for_pixmap. This can likely be hit
now with an SHM pixmap via the Present flip path. There might be other
corner cases.
Fixes: f3eb1684fa50 "xwayland: enable MIT-SHM shared pixmaps"
Reviewed-by: Olivier Fourdan <ofourdan@redhat.com>
commit d163e0a1d5ec54cc726d45a239a0777d0a84d610
Author: Michel Dänzer <mdaenzer@redhat.com>
Date: Fri Jun 11 18:25:01 2021 +0200
ci: Fix UPSTREAM_REPO -> FDO_UPSTREAM_REPO
The latter is what ci-templates expect.
Fixes: ab73c16930d6 "ci: Update to the latest templates"
Reviewed-by: Simon Ser <contact@emersion.fr>
commit 7e7c147105ac704a7b33bdee0f85dc9ccdd8f747
Author: Lukasz Spintzyk <lukasz.spintzyk@gmail.com>
Date: Mon Jun 7 09:30:46 2021 +0200
modesetting: Disable reverse prime offload mode for displays running on evdi,udl
This mode for displays running on evdi/udl as side effect of failed glamor_egl_init
reverse_prime_offload_mode was initialized to FALSE
After Mesa upgrade to 21.0.0 GL_RENDERER is not llvmpipe that results in successful glamor_egl_init
and reverse_prime_offload_mode enabled.
This commit is explicitly disabling reverse_prime_offload_mode for evdi and udl drivers
Signed-off-by: Łukasz Spintzyk <lukasz.spintzyk@synaptics.com>
commit c468d34c7208c9041f9c077b54a00ae9cccad6a3
Author: Olivier Fourdan <ofourdan@redhat.com>
Date: Thu Jun 3 17:51:01 2021 +0200
glx: Set ContextTag for all contexts
Currently, xorgGlxMakeCurrent() would set the context tag only for
indirect GLX contexts.
However, several other places expect to find a context for the tag or
they would raise a GLXBadContextTag error, such as WaitGL() or WaitX().
Set the context tag for direct contexts as well, to avoid raising an
error and possibly killing the client.
Thanks to Erik Kurzinger <ekurzinger@nvidia.com> for spotting the issue.
Signed-off-by: Olivier Fourdan <ofourdan@redhat.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
commit 6b47321bc6138bcd737b36e038aba904d56f1cf6
Author: Olivier Fourdan <ofourdan@redhat.com>
Date: Wed Apr 28 13:33:29 2021 +0200
dix: Add optional terminate delay
When the command line option "-terminate" is used, it could be
interesting to give it an optional grace period to let the Xserver
running for a little longer in case a new connection occurs.
This adds an optional parameter to the "-terminate" command line option
for this purpose.
v2: Use a delay in seconds instead of milliseconds
(Martin Peres <martin.peres@mupuf.org>)
v3: Clarify man page entry, ensure terminateDelay is always >= 0,
simplify TimerFree(). (Peter Hutterer <peter.hutterer@who-t.net>)
Signed-off-by: Olivier Fourdan <ofourdan@redhat.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
commit e167299f6050d85778e62ed2a1e544ceef6452fc
Author: Olivier Fourdan <ofourdan@redhat.com>
Date: Fri Feb 19 12:03:39 2021 +0100
xfixes: Add ClientDisconnectMode
With Wayland compositors now being able to start Xwayland on demand, the
next logical step is to be able to stop Xwayland when there is no more
need for it.
The Xserver itself is capable of terminating itself once all X11 clients
are gone, yet in a typical full session, there are a number of X11
clients running continuously (e.g. the Xsettings daemon, IBus, etc.).
Those always-running clients will prevent the Xserver from terminating,
because the actual number of X11 clients will never drop to 0. Worse,
the X11 window manager of a Wayland compositor also counts as an X11
client, hence also preventing Xwayland from stopping.
Some compositors such as mutter use the XRes extension to query the X11
clients connected, match their PID with the actual executable name and
compare those with a list of executables that can be ignored when
deciding to kill the Xserver.
But that's not just clumsy, it is also racy, because a new X11 client
might initiate a connection the X11 server right when the compositor is
about to kill it.
To solve this issue directly at the Xserver level, this add new entries
to the XFixes extension to let the X11 clients themselves specify the
disconnect mode they expect.
Typically, those X11 daemon clients would specify the disconnect mode
XFixesClientDisconnectFlagTerminate to let the Xserver know that they
should not be accounted for when checking the remaining clients prior
to terminate.
Signed-off-by: Olivier Fourdan <ofourdan@redhat.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
commit b7a85e44da91d1663d5b4eabac06327c92a80f91
Author: Erik Kurzinger <ekurzinger@nvidia.com>
Date: Thu Dec 10 14:24:32 2020 -0800
glx: don't create implicit GLXWindow if one already exists
If a GLXMakeCurrent request specifies an X window as its drawable,
__glXGetDrawable will implicitly create a GLXWindow for it. However,
the client may have already explicitly created a GLXWindow for that X
window. If that happens, two __glXDrawableRes resources will be added
to the window.
If the explicitly-created GLXWindow is later destroyed by the client,
DrawableGone will call FreeResourceByType on the X window, but this
will actually free the resource for the implicitly-created GLXWindow,
since that one would be at the head of the list.
Then if the X window is destroyed after that, the resource for the
explicitly-created GLXWindow will be freed. But that GLXWindow was
already destroyed above. This crashes the server when it tries to call
the destroyed GLXWindow's destructor. It also means the
implicitly-created GLXWindow would have been leaked since the
FreeResourceByType call mentioned above skips calling the destructor.
To fix this, if __glXGetDrawable is given an X window, it should check
if there is already a GLXWindow associated with it, and only create an
implicit one if there is not.
Signed-off-by: Erik Kurzinger <ekurzinger@nvidia.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
commit 8274dd664335cd72739a1107f174e7a974a9ea24
Author: Jan Beich <jbeich@FreeBSD.org>
Date: Sun May 30 19:49:43 2021 +0000
meson: provide fallback for *proto dependencies
Meson has a built-in facility to use bundled versions of dependencies
if system packages are too old. Enable for xorgproto after 8e504d8b36eb:
Run-time dependency xproto found: YES 7.0.33
Run-time dependency randrproto found: YES 1.6.0
Run-time dependency renderproto found: YES 0.11.1
Run-time dependency xextproto found: YES 7.3.0
Dependency inputproto found: NO found 2.3.2 but need: '>= 2.3.99.1'
Found CMake: /usr/local/bin/cmake (3.20.2)
Run-time dependency inputproto found: NO (tried pkgconfig and cmake)
Looking for a fallback subproject for the dependency inputproto
meson.build:73:0: ERROR: Neither a subproject directory nor a xorgproto.wrap file was found.
commit 34a58d7714025bc1043bf5282358406eb10e4b8e
Author: Olivier Fourdan <ofourdan@redhat.com>
Date: Thu May 20 16:46:33 2021 +0200
xwayland/eglstream: Log when GL_OES_EGL_image is missing
That will dramatically affect performance, might as well log when we
cannot use GL_OES_EGL_image with the NVIDIA closed-source driver.
Signed-off-by: Olivier Fourdan <ofourdan@redhat.com>
Reviewed-by: Michel Dänzer <mdaenzer@redhat.com>
commit fae58e9b03696a3890f9c876306c68ffa6f9ff30
Author: Olivier Fourdan <ofourdan@redhat.com>
Date: Mon May 17 18:20:57 2021 +0200
xwayland/eglstream: Use "nvidia" for GLVND
If the EGLStream backend is able to use hardware acceleration with the
NVIDIA closed source driver, we should use the "nvidia" GLX
implementation instead of the one from Mesa to take advantage of the
NVIDIA hardware accelerated rendering.
Signed-off-by: Olivier Fourdan <ofourdan@redhat.com>
Reviewed-by: Michel Dänzer <mdaenzer@redhat.com>
commit 24fc8aea1e4bbaba780f1a316fba797a0198f603
Author: Olivier Fourdan <ofourdan@redhat.com>
Date: Thu May 20 12:11:42 2021 +0200
xwayland: Add preferred GLVND vendor to xwl_screen
If Xwayland's EGLstream backend supports hardware acceleration with the
NVIDIA closed-source driver, the GLX library also needs to be one
shipped by NVIDIA, that's what GLVND is for.
Add a new member to the xwl_screen that the backend can optionally set
to the preferred GLVND vendor to use.
If not set, "mesa" is assumed.
Signed-off-by: Olivier Fourdan <ofourdan@redhat.com>
Reviewed-by: Michel Dänzer <mdaenzer@redhat.com>
commit 2de5ded3c6d73c1672d2cb14d603cb23fcd477e5
Author: Niveditha Rau <niveditha.rau@oracle.com>
Date: Tue May 11 15:08:41 2021 -0700
glx: Check for byte-swapping in SetReplyHeader
Check for the need to byte-swap when attempting to display
GL apps between a big-endian server and little-endian client
or vice versa.
Fixes: https://gitlab.freedesktop.org/xorg/xserver/-/issues/1127
commit bcb1de600a7656e4ee6434a8d2e2772ca9fd0473
Author: Adam Jackson <ajax@redhat.com>
Date: Thu Apr 22 11:47:29 2021 -0400
glx: Fix error return code in GLXGetDrawableAttributes
This should only ever throw GLXBadDrawable, says the protocol spec.
commit eb6f8daca5dc15af321d0bcc54cd6cb8b6779257
Author: Povilas Kanapickas <povilas@radix.lt>
Date: Sun May 30 13:26:48 2021 +0300
Xi: Work around broken libxcb that doesn't ignore unknown device classes
libxcb 14.1 and older are not forwards-compatible with new device
classes as it does not properly ignore unknown device classes. Since
breaking libxcb would break quite a lot of applications, we instead
report Gesture device class only if the client advertised support for XI
2.4.
Clients may still not work in cases when a client advertises XI 2.4
support and then a completely separate module within the client uses
broken libxcb to call XIQueryDevice.
Signed-off-by: Povilas Kanapickas <povilas@radix.lt>
commit 7e692633fb9ab8e1ed2a88c3abb4fe04144c0a80
Author: Povilas Kanapickas <povilas@radix.lt>
Date: Sun May 30 13:26:47 2021 +0300
Xi: Implement gesture support for XIQueryDevice
commit 0886254f96f40e59193ccbb0e3acbd5ae92dbaa3
Author: Povilas Kanapickas <povilas@radix.lt>
Date: Sun May 30 13:26:46 2021 +0300
xfree86: Bump input minor ABI due to addition touchpad gestures
Signed-off-by: Povilas Kanapickas <povilas@radix.lt>
commit 1cdc3b5d146818993c5a9436d17e1d0888054c38
Author: Povilas Kanapickas <povilas@radix.lt>
Date: Sun May 30 13:26:45 2021 +0300
xfree86: Implement gesture support for test input driver
commit dccc0275f4f3740cc625fb60ab1d014d6ec10709
Author: Povilas Kanapickas <povilas@radix.lt>
Date: Sun May 30 13:26:44 2021 +0300
Bump XI protocol version to 2.4
commit 75feb1366809bfb6d50734c10ab11258783a2e9d
Author: Povilas Kanapickas <povilas@radix.lt>
Date: Sun May 30 13:26:43 2021 +0300
Xi: Include gestures among events that may freeze device
commit 5163fc8bc28ce8bc2703cddcd9f2775ebc311766
Author: Povilas Kanapickas <povilas@radix.lt>
Date: Sun May 30 13:26:42 2021 +0300
Implement gesture processing logic
commit d3c52df16105de5ac37e196a49b173e426caf417
Author: Povilas Kanapickas <povilas@radix.lt>
Date: Sun May 30 13:26:41 2021 +0300
hw/xfree86: Implement public APIs to submit gesture events
commit 100a2ad6da4ba90f8d489c7a2ed3f3f0ac879a6f
Author: Povilas Kanapickas <povilas@radix.lt>
Date: Sun May 30 13:26:40 2021 +0300
dix: Implement gesture event submission code path
commit 7656a9c8dddbc57adfd4fd05f8e26b1845ac8738
Author: Povilas Kanapickas <povilas@radix.lt>
Date: Sun May 30 13:26:39 2021 +0300
dix: Implement internal gesture state handling
commit 0bf4123fd3bc945d150884e6ea38bd2b81c0994b
Author: Povilas Kanapickas <povilas@radix.lt>
Date: Sun May 30 13:26:38 2021 +0300
dix: Implement gesture event fixups before delivery
commit 227f601de31aabf6aaa897477e42e6b7f8f7c963
Author: Povilas Kanapickas <povilas@radix.lt>
Date: Sun May 30 13:26:37 2021 +0300
xi: Implement conversions from internal to Xi2 gesture event structs
commit f3462178caf09a8777b8671eb03949b75c8ee07a
Author: Povilas Kanapickas <povilas@radix.lt>
Date: Sun May 30 13:26:36 2021 +0300
test/xi2: Verify that XI_GestureSwipeEnd is ignored when outside mask
commit 407a2234b32d9cb3fed2cc7e8069bb41b98e143f
Author: Povilas Kanapickas <povilas@radix.lt>
Date: Sun May 30 13:26:35 2021 +0300
test/xi2: Update tests for gesture event types
commit f83f7dbb1c1be406b82da9bca12be3c43d6bfeee
Author: Povilas Kanapickas <povilas@radix.lt>
Date: Sun May 30 13:26:34 2021 +0300
xi: Bump max supported XI2 event type
commit 81909546397eb180ed8983bdb80f5673dbae71ac
Author: Povilas Kanapickas <povilas@radix.lt>
Date: Sun May 30 13:26:33 2021 +0300
xi: Implement selection logic for gesture event types
commit 080bac39c844bd16b7e1493797c6e7644badf0ab
Author: Povilas Kanapickas <povilas@radix.lt>
Date: Sun May 30 13:26:32 2021 +0300
xi: Implement grab support for new gesture event types
commit b544a1fdb8fa7e7efc7dde66089e901d957061d9
Author: Povilas Kanapickas <povilas@radix.lt>
Date: Sun May 30 13:26:31 2021 +0300
xi: Implement internal gesture event struct
commit 22fa31ed561ed1e78bf3651f28e11882b1eac51f
Author: Povilas Kanapickas <povilas@radix.lt>
Date: Sun May 30 13:26:30 2021 +0300
dix: Add new internal event enums for gesture events
commit 8e504d8b36eb8f23bf8cfa46143d046cc6b8ea51
Author: Povilas Kanapickas <povilas@radix.lt>
Date: Sun May 30 13:26:29 2021 +0300
meson: Depend on inputproto 2.3.99.1
Signed-off-by: Povilas Kanapickas <povilas@radix.lt>
commit 2acde60147797393e0ee9428cff0f74cdc0a9227
Author: Povilas Kanapickas <povilas@radix.lt>
Date: Sun May 30 13:26:28 2021 +0300
.gitlab-ci: Install xorgproto 2021.4.99.2 from git
This is required for the support of upcoming XI 2.4 protocol.
Signed-off-by: Povilas Kanapickas <povilas@radix.lt>
commit 236d1775509404b0dcf44873422dd8652b1e9588
Author: Claes Nästén <pekdon@gmail.com>
Date: Fri May 14 13:57:10 2021 +0000
os: include unistd.h when HAVE_PSTACK is defined
On Solaris when HAVE_PSTACK is defined unistd.h needs to be included to
avoid implicit declarations of pipe, read, execle etc.
commit 7515c23a416825f0db51f9b445279b12d5918ebf
Author: Erik Kurzinger <ekurzinger@nvidia.com>
Date: Tue May 11 17:00:21 2021 -0400
xwayland/eglstream: flush stream after eglSwapBuffers
When eglSwapBuffers inserts a new frame into a window's stream, there may be a
delay before the state of the consumer end of the stream is updated to reflect
this. If the subsequent wl_surface_attach, wl_surface_damage, wl_surface_commit
calls are received by the compositor before then, it will (typically) re-use
the previous frame acquired from the stream instead of the latest one.
This can leave the window displaying out-of-date contents, which might never be
updated thereafter.
To fix this, after calling eglSwapBuffers, xwl_glamor_eglstream_post_damage
should call eglStreamFlushNV. This call will block until it can be guaranteed
that the state of the consumer end of the stream has been updated to reflect
that a new frame is available.
Closes: https://gitlab.freedesktop.org/xorg/xserver/-/issues/1171
Signed-off-by: Erik Kurzinger <ekurzinger@nvidia.com>
commit f3eb1684fa5008ad7c881f798a5efb7441b23035
Author: Simon Ser <contact@emersion.fr>
Date: Mon Apr 19 22:49:56 2021 +0200
xwayland: enable MIT-SHM shared pixmaps
Allow X11 clients to create shared pixmaps via the MIT-SHM
extension under Xwayland. Tested with a wlroots patch [1].
Also add a few assertions to make sure we have wl_buffers where we
need them.
[1]: https://github.com/swaywm/wlroots/pull/2875
Signed-off-by: Simon Ser <contact@emersion.fr>
Acked-by: Michel Dänzer <mdaenzer@redhat.com>
commit 3d33d885fcd1215a74c1819278cf6f9557c9860b
Author: Erik Kurzinger <ekurzinger@nvidia.com>
Date: Fri May 14 08:26:49 2021 -0400
xwayland/eglstream: allow commits to dma-buf backed pixmaps
As of commit 098e0f52 xwl_glamor_eglstream_allow_commits will not allow commits
if the xwl_pixmap does not have an EGLSurface. This is valid for pixmaps backed
by an EGLStream, however pixmaps backed by a dma-buf for OpenGL or Vulkan
rendering will never have an EGLSurface. Unlike EGLStream backed pixmaps,
though, glamor will render directly to the buffer that Xwayland passes to the
compositor. Hence, they don't require the intermediate copy in
xwl_glamor_eglstream_post_damage that EGLStream backed pixmaps do, so there is
no need for an EGLSurface.
Signed-off-by: Erik Kurzinger <ekurzinger@nvidia.com>
Acked-by: Olivier Fourdan <ofourdan@redhat.com>
Reviewed-by: Michel Dänzer <mdaenzer@redhat.com>
commit 012350e3db47fef0404346f55968032e62004fcf
Author: Olivier Fourdan <ofourdan@redhat.com>
Date: Fri Apr 30 16:23:10 2021 +0200
xwayland/eglstream: Set ALU to GXCopy for blitting
The EGLstream backend's post damage function uses a shader and
glDrawArrays() to copy the data from the glamor's pixmap texture prior
to do the eglSwapBuffers().
However, glDrawArrays() can be affected by the GL state, and therefore
not reliably produce the expected copy, causing the content of the
buffer to be corrupted.
Make sure to set the ALU to GXCopy prior to call glDrawArrays() to get
the expected result.
Signed-off-by: Olivier Fourdan <ofourdan@redhat.com>
Suggested-by: Michel Dänzer <mdaenzer@redhat.com>
commit d85bfa6ab7495281516f3a4b05dc1ff0b2c4bf91
Author: Olivier Fourdan <ofourdan@redhat.com>
Date: Tue May 4 10:56:38 2021 +0200
xwayland/eglstream: Do not always increment pixmap refcnt on commit
Currently, the EGLstream backend would increment the pixmap refcount for
each commit, and decrease that refcount on the wl_buffer release
callback.
But that's relying on the compositor sending us a release callback for
each commit, otherwise the pixmap refcount will keep increasing and the
pixmap will be leaked.
So instead, increment the refcount on the pixmap only when we have not
received a release notification for the wl_buffer, to avoid increasing
the pixmap refcount more than once without a corresponding release
event.
This way, if the pixmap is still in use when released on the X11 side,
the EGL stream will be kept until the compositor releases it.
Signed-off-by: Olivier Fourdan <ofourdan@redhat.com>
Suggested-by: Michel Dänzer <mdaenzer@redhat.com>
Reviewed-by: Michel Dänzer <mdaenzer@redhat.com>
commit b583395cd38ad101c7541bd8b0e91143ced44703
Author: Olivier Fourdan <ofourdan@redhat.com>
Date: Fri Apr 30 09:02:29 2021 +0200
xwayland/eglstream: Check eglSwapBuffers()
EGLstream's post_damage() would unconditionally return success
regardless of the actual status of the eglSwapBuffers().
Yet, if eglSwapBuffers() fails, we should not post the corresponding
damage as they wouldn't match the actual content of the buffer.
Use the eglSwapBuffers() return value as the return value for
post_damage() and do not take a refrence on the pixmap if it fails.
Signed-off-by: Olivier Fourdan <ofourdan@redhat.com>
Reviewed-by: Michel Dänzer <mdaenzer@redhat.com>
commit a45799971083c47082d085d3732a5b12692cf75b
Author: Olivier Fourdan <ofourdan@redhat.com>
Date: Mon Apr 19 14:52:38 2021 +0200
xwayland/eglstream: Fix calloc/malloc
Use calloc() instead of malloc() like the rest of the code.
Also fix the arguments of calloc() calls to match the definition which
is calloc(size_t nmemb, size_t size).
This is a cleanup patch, no functional change.
Signed-off-by: Olivier Fourdan <ofourdan@redhat.com>
Reviewed-by: Michel Dänzer <mdaenzer@redhat.com>
commit 098e0f52c088c6eb52c7e54c5a11cefabd480908
Author: Olivier Fourdan <ofourdan@redhat.com>
Date: Mon Apr 19 18:11:19 2021 +0200
xwayland/eglstream: Do not commit without surface
The EGL surface for the xwl_pixmap is created once the stream is ready
and valid.
If the pixmap's EGL surface fails, for whatever reason, the xwl_pixmap
will be unusable and will end up as an invalid wl_buffer.
Make sure we do not allow commits in that case and recreate the
xwl_pixmap/stream.
Signed-off-by: Olivier Fourdan <ofourdan@redhat.com>
Reviewed-by: Michel Dänzer <mdaenzer@redhat.com>
https://gitlab.freedesktop.org/xorg/xserver/-/issues/1156
commit bee2ebb29f0999862ab39af26c673c00af40b082
Author: Olivier Fourdan <ofourdan@redhat.com>
Date: Tue Apr 27 14:17:19 2021 +0200
xwayland/eglstream: Drop the list of pending streams
Now that the pending stream is associated with the xwl_pixmap for
EGLStream and the xwl_pixmap itself is associated to the pixmap, we have
a reliable way to get to those data from any pending stream.
As a result, the list of pending streams that we keep in the EGLStream
global structure becomes useless.
So we can drop the pending stream's xwl_pixmap and also the list of
pending streams altogether, and save us a walk though that list for each
callback.
Signed-off-by: Olivier Fourdan <ofourdan@redhat.com>
Suggested-by: Michel Dänzer <mdaenzer@redhat.com>
Reviewed-by: Michel Dänzer <mdaenzer@redhat.com>
commit e19bf86c17ef9c802fea24410cc6b1f51a19ce7f
Author: Olivier Fourdan <ofourdan@redhat.com>
Date: Wed Apr 14 17:31:08 2021 +0200
xwayland/eglstream: Keep a reference to the pixmap
Commit affc47452 - "xwayland: Drop the separate refcount for the
xwl_pixmap" removed the separate reference counter for the xwl_pixmap
which holds the EGLStream.
While that works fine for the common case, if the window's pixmap is
changed before the stream is ready, the older pixmap will be destroyed
and the xwl_pixmap along with it, even if the compositor is still using
the stream.
The code that was removed with commit affc47452 was taking care of that
by increasing the separate reference counter for the xwl_pixmap, but it
no longer the case.
As a result, we may end up with the EGL stream in the wrong state when
trying to use it, which will cascade down into all sort of issues.
To avoid the problem, increase the reference count on the pixmap when it
is marked as invalid in EGLStream's SetWindowPixmap().
This way, the xwl_pixmap and the EGLStream are kept until released by
the compositor, even when the pixmap changes before stream is ready.
Signed-off-by: Olivier Fourdan <ofourdan@redhat.com>
Reviewed-by: Michel Dänzer <mdaenzer@redhat.com>
Fixes: affc47452 xwayland: Drop the separate refcount for the xwl_pixmap
https://gitlab.freedesktop.org/xorg/xserver/-/issues/1156
commit cb61ecc7291cfbed2f76d4437cd7450b8e4dab00
Author: Olivier Fourdan <ofourdan@redhat.com>
Date: Fri Apr 16 10:38:23 2021 +0200
xwayland/eglstream: Dissociate pending stream from window
Previously, we would have pending streams associated with top level X11
windows, keeping temporary accounting for the pending streams before
they get fully initialized for the xwl_pixmap which would be associated
with X11 pixmaps.
If the window content changes before the stream is ready, the
corresponding pending stream would be marked as invalid and the pending
stream would be eventually removed once the stream becomes ready.
Since commit affc47452 - "xwayland: Drop the separate refcount for the
xwl_pixmap", we no longer keep a separate reference counter for the
xwl_pixmap, but rather tie it to the X11 pixmap lifespan. Yet, the
pending stream would still be associated with the X11 toplevel window.
Dissociate the pending streams from the X11 toplevel window, to keep it
tied only to the xwl_pixmap so that we can have:
- pixmap <-> xwl_pixmap
- xwl_pixmap <-> pending stream
Of course, the pending streams remain temporary and get removed as soon
as the ready callback is triggered, but the pending streams are not
linked to the X11 window anymore which can change their content, and
therefore their X11 pixmap at any time.
Signed-off-by: Olivier Fourdan <ofourdan@redhat.com>
Reviewed-by: Michel Dänzer <mdaenzer@redhat.com>
https://gitlab.freedesktop.org/xorg/xserver/-/issues/1156
commit cc596bcfb273eeab82ac3d59867668af8bad2abf
Author: Olivier Fourdan <ofourdan@redhat.com>
Date: Thu Apr 1 08:46:52 2021 +0200
xwayland/eglstream: Add more error checking
eglCreateStreamKHR() can fail and return EGL_NO_STREAM_KHR, in which
case there is no point in trying to create a buffer from it.
Similarly, eglCreateStreamProducerSurfaceKHR() also fail and return
EGL_NO_SURFACE, which in turn will be used in eglMakeCurrent() as
draw/read surface, and therefore would mean no draw/read buffer.
In those cases, log the error, and bail out early. That won't solve the
issue but will help with investigating the root cause of issues with
EGLStream backend.
Signed-off-by: Olivier Fourdan <ofourdan@redhat.com>
Reviewed-by: Michel Dänzer <mdaenzer@redhat.com>
https://gitlab.freedesktop.org/xorg/xserver/-/issues/1156
commit 823f3254fabd16e5e721da57cd260beac9b8f8bd
Author: Olivier Fourdan <ofourdan@redhat.com>
Date: Thu Apr 15 10:59:36 2021 +0200
xwayland/eglstream: Small refactoring
Some functions are called "callback" whereas they are not longer
callback functions or "unref" while they no longer deal with a reference
counter anymore, which is quite confusing. Rename those functions to be
more explicit.
Also, the pending streams can be destroyed in different places, move the
common code to separate function to avoid duplicating code and help with
readability of the code.
Signed-off-by: Olivier Fourdan <ofourdan@redhat.com>
Acked-by: Michel Dänzer <mdaenzer@redhat.com>
commit 85244d2a2081d61a2e4a06e847041f638de01e3f
Author: Olivier Fourdan <ofourdan@redhat.com>
Date: Wed Mar 31 09:49:35 2021 +0200
xwayland/eglstream: Check framebuffer status
The EGLStream backend would sometime generate GL errors trying to draw
to the framebuffer, which gives an invalid buffer, which in turn would
generate a Wayland error from the compositor which is fatal to the
client.
Check the framebuffer status and bail out early if it's not complete,
to avoid getting into trouble later.
Signed-off-by: Olivier Fourdan <ofourdan@redhat.com>
Reviewed-by: Michel Dänzer <mdaenzer@redhat.com>
https://gitlab.freedesktop.org/xorg/xserver/-/issues/1156
commit 252cbad316f43edc08aa5c844789398a58ba270c
Author: Olivier Fourdan <ofourdan@redhat.com>
Date: Wed Mar 31 13:57:45 2021 +0200
xwayland/glamor: Add return status to post_damage
If the glamor backend failed to post damage, the caller should do the
same to avoid a failure to attach the buffer to the Wayland surface.
Change the API of Xwayland's glamor backend post_damage() to return a
status so that xwl_window_post_damage() can tell whether the callee
failed.
Signed-off-by: Olivier Fourdan <ofourdan@redhat.com>
Reviewed-by: Michel Dänzer <mdaenzer@redhat.com>
https://gitlab.freedesktop.org/xorg/xserver/-/issues/1156
commit 3b265c59a6456f6e4abfb9e1694237bc56f1776a
Author: Olivier Fourdan <ofourdan@redhat.com>
Date: Tue Mar 30 08:48:25 2021 +0200
glamor: Dump backtrace on GL error
Currrently, when a GL error is triggered, glamor would log the error
which may not be sufficient to trace it back to the cause of the error.
Also dump the backtrace which may give more information as to where the
error comes from.
Signed-off-by: Olivier Fourdan <ofourdan@redhat.com>
Reviewed-by: Martin Peres <martin.peres@mupuf.org>
Reviewed-by: Michel Dänzer <mdaenzer@redhat.com>
https://gitlab.freedesktop.org/xorg/xserver/-/issues/1156
commit 25d2f4948f0abd39e099b8ac69b7cb1dab38a10a
Author: Olivier Fourdan <ofourdan@redhat.com>
Date: Mon Mar 29 15:01:15 2021 +0200
xwayland: Check buffer prior to attaching it
If the buffer is NULL, do not even try to attach it, and risk a Wayland
protocol error which would be fatal to us.
Signed-off-by: Olivier Fourdan <ofourdan@redhat.com>
Reviewed-by: Martin Peres <martin.peres@mupuf.org>
Reviewed-by: Michel Dänzer <mdaenzer@redhat.com>
https://gitlab.freedesktop.org/xorg/xserver/-/issues/1156
commit 4f0889e98306d30a37aba0fadb1fd3790c13205a
Author: Olivier Fourdan <ofourdan@redhat.com>
Date: Mon Mar 29 14:22:56 2021 +0200
xwayland/eglstream: Check buffer creation
EGLStream wl_eglstream_display_create_stream() may fail, yet Xwayland
would try to attach the buffer which may cause a fatal Wayland protocol
error raised by the compositor.
Check if the buffer creation worked, and fail gracefully otherwise (like
wayland-eglsurface does).
Signed-off-by: Olivier Fourdan <ofourdan@redhat.com>
Reviewed-by: Martin Peres <martin.peres@mupuf.org>
Reviewed-by: Michel Dänzer <mdaenzer@redhat.com>
https://gitlab.freedesktop.org/xorg/xserver/-/issues/1156
commit 4f6fbd5009ae533cf0b3bbe382502254f9276a01
Author: Erik Kurzinger <ekurzinger@nvidia.com>
Date: Tue Apr 27 07:23:44 2021 -0400
xwayland-eglstream: fix X11 rendering to flipping GL / VK window
If a window is being used for direct rendering with OpenGL or Vulkan, and is
using the flipping path for presentation, it's pixmap will be set to a dma-buf
backed pixmap created by the client-side GL driver. However, this means that
xwl_glamor_eglstream_post_damage won't work since it requires that the pixmap
has an EGLSurface that it can render to, which dma-buf backed pixmaps do not.
In this case, though, xwl_glamor_eglstream_post_damage is not necessary since
glamor will have rendered directly to the pixmap, so we can simply pass it
directly to the compositor. There's no need for the intermediate copy we
normally do in that function.
Therefore, this change adds an early-return case to post_damage for dma-buf
backed pixmaps, and removes the corresponding asserts from that function and
allow_commits.
Signed-off-by: Erik Kurzinger <ekurzinger@nvidia.com>
Acked-by: Olivier Fourdan <ofourdan@redhat.com>
Reviewed-by: Michel Dänzer <mdaenzer@redhat.com>
commit a50a0e348542bf32fb4239ee05a485772837f2f3
Author: qarmin <mikrutrafal54@gmail.com>
Date: Tue Apr 28 22:05:02 2020 +0200
glxcmds: Fix possible out of bounds
commit 3ea46f9336693d713ab63f422fffce42f9060a2c
Author: Mazlan, Hazwan Arif <hazwan.arif.mazlan@intel.com>
Date: Thu Jul 30 10:12:27 2020 +0800
dri2: Sync i965_pci_ids.h from mesa iris_pci_ids.h
Copied TGL PCI ID from MESA iris_pci_ids.h
This update brings in a significant number of new platform ID's
Sync up until commit f02ae698
Signed-off-by: Mazlan, Hazwan Arif <hazwan.arif.mazlan@intel.com>
commit d3933a24d1abdcb56f45e6076cb84a1110674a8a
Author: Jon Turney <jon.turney@dronecode.org.uk>
Date: Tue Apr 23 17:59:29 2019 +0100
CI: Add an x86 MinGW-w64 cross build
Only cross-build for x86 MinGW-w64, as x64 MinGW-w64 will probably
require fixing LLP64 issues.
I don't know any source for pre-built cross-dependencies of the X
server, so build these from git.
Don't build with GLX enabled, so I don't have to deal with
cross-building mesa and it's dependencies, for the moment.
commit 7e142cb2a848acb6af986fa91d254d4c23963b24
Author: luporl <luporl@FreeBSD.org>
Date: Wed Dec 9 11:11:15 2020 -0300
xserver: fix RGB mask handling
On FreeBSD 13.0-CURRENT for PowerPC64 big-endian (BE), X was
crashing in some cases. For instance, when twm was started
and the background was clicked to open its menu, X crashed
with a segmentation fault, trying to dereference a null pointer
at CreatePicture().
There were 2 issues with xorg-server handling of RGB masks that
caused the pointer above to be null and thus the crash:
- wrong use of ffs() to get the RGB offsets from the masks
- overflow when shifting a 16-bit integer
This change fixes both issues. They happen when the system is BE
but has a video adapter using a little-endian (LE) ARGB32
framebuffer. In order to display the correct colors, this setup
requires a BE RGBA32 color format to be used by X, by setting
the RGB masks appropriately, that didn't work properly because of
the issues above.
commit 5be3b80b8d084ca5721be8791910d5827d1b6014
Author: Łukasz Spintzyk <lukasz.spintzyk@synaptics.com>
Date: Fri Sep 18 14:32:01 2020 +0200
modesetting: Remove few common functions from ms namespace
A lot of that code is the same as in xf86-amdgpu and xf86-nouveau drivers. By removing that functions from
ms namespace we can move that code to common implementation.
Signed-off-by: Łukasz Spintzyk <lukasz.spintzyk@synaptics.com>
commit c282be503e267afdd050df837d4cf61e0e7287b7
Author: Łukasz Spintzyk <lukasz.spintzyk@synaptics.com>
Date: Fri Sep 18 14:31:53 2020 +0200
modesetting: remove unnecessary ms_covering_xf86_crtc dup of ms_covering_randr_crtc
Signed-off-by: Łukasz Spintzyk <lukasz.spintzyk@synaptics.com>
commit b923364c5ec8251e81b4aa5fd451d9d7bb038009
Author: Łukasz Spintzyk <lukasz.spintzyk@synaptics.com>
Date: Fri Sep 18 14:31:47 2020 +0200
modesetting: Find crtc on secondary outputs as fallback instead of returning primary crtc
Signed-off-by: Łukasz Spintzyk <lukasz.spintzyk@synaptics.com>
commit d2dce22b6775c772282ac2c0e224ef9685ab34fa
Author: Łukasz Spintzyk <lukasz.spintzyk@synaptics.com>
Date: Fri Sep 18 14:31:34 2020 +0200
present: fix msc offset calculation in screen mode
Instead of getting the current msc value from the window crtc,
which not exist take the last saved msc value saved in
the window_priv struct
Signed-off-by: Łukasz Spintzyk <lukasz.spintzyk@synaptics.com>
commit 908deb0895f9fe345d70be933d251ea10511d30a
Author: Łukasz Spintzyk <lukasz.spintzyk@synaptics.com>
Date: Fri Sep 18 14:31:25 2020 +0200
present: Use crtc's screen present operation for syncing
Signed-off-by: Łukasz Spintzyk <lukasz.spintzyk@synaptics.com>
commit d03c0de77ba36bb5221d00ac84dcdd6aae0df453
Author: Łukasz Spintzyk <lukasz.spintzyk@synaptics.com>
Date: Fri Sep 18 14:29:25 2020 +0200
modesetting: Initialize present extension despite glamor is disabled
Signed-off-by: Łukasz Spintzyk <lukasz.spintzyk@synaptics.com>
commit 7aaf54a1884f71dc363f0b884e57bcb67407a6cd
Author: Matthieu Herrb <matthieu@herrb.eu>
Date: Sun Mar 21 18:38:57 2021 +0100
Fix XChangeFeedbackControl() request underflow
CVE-2021-3472 / ZDI-CAN-1259
This vulnerability was discovered by:
Jan-Niklas Sohn working with Trend Micro Zero Day Initiative
Signed-off-by: Matthieu Herrb <matthieu@herrb.eu>
commit 66ce61983db0a067e48143750c4d5557d5638b1c
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu Mar 18 09:59:17 2021 +1000
xkb: silence a compiler warning
xkb.c: In function ‘ProcXkbSetMap’:
xkb.c:2747:5: warning: ISO C90 forbids mixed declarations and code [-Wdeclaration-after-statement]
2747 | DeviceIntPtr master = GetMaster(dev, MASTER_KEYBOARD);
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit f6b8f8c071a575e54645aeb0bd3cb37377b0e4d3
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu Mar 18 09:44:53 2021 +1000
xkb: don't require a trailing slash for the XKM output dir
Rework the function to use a single snprintf call instead of a mix of
strcpy/strcats. This now also appends a trailing slash where needed so we
don't rely on the build system to set this for us.
Also, since /tmp/ is the fallback and we never check if everything succeeded,
assert if we can't use /tmp/. This will never be triggered anyway, the only
caller to OutputDirectory() uses sizeof(PATH_MAX-sized array).
Follow-up from 6c51818a0f55282cbe5a870f58ca82ca45ee472d
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit eceafd4a2d159f5c2b789ad77ee283c2aa848a59
Author: Jan Beich <jbeich@FreeBSD.org>
Date: Fri Apr 9 14:44:13 2021 +0000
meson: switch getpeer* checks to autotools style
Checking for function "getpeereid" : YES
Checking for function "getpeerucred" : NO
[...]
include/meson.build:182:7: ERROR: Argument to "not" is not a boolean.
Fixes: 68c2cfadd6d3 ("meson: Make sure defines are either set to 1 or not defined")
commit 9f8421af637942e5d9963828f4ce55f456410603
Author: Jan Beich <jbeich@FreeBSD.org>
Date: Fri Apr 9 15:22:22 2021 +0000
meson: check pthread_setname_np like autotools
FreeBSD < 12.2 and OpenBSD only have pthread_set_name_np.
As libpthread isn't in scope use -Werror to trip the check.
Header <pthread.h> has symbol "PTHREAD_MUTEX_RECURSIVE" : YES
Checking if "pthread_setname_np(tid, name)" compiles: YES
os/inputthread.c:326:5: error: implicit declaration of function 'pthread_setname_np' is invalid in C99 [-Werror,-Wimplicit-function-declaration]
pthread_setname_np (pthread_self(), "InputThread");
^
os/inputthread.c:447:5: error: implicit declaration of function 'pthread_setname_np' is invalid in C99 [-Werror,-Wimplicit-function-declaration]
pthread_setname_np (pthread_self(), "MainThread");
^
Fixes: c20e7b5e2222 ("meson: Automatically detect HAVE_PTHREAD_SETNAME_NP")
commit 38e875904b039ec1889e7c81eb1d577a4f69b26d
Author: Erik Kurzinger <ekurzinger@nvidia.com>
Date: Thu Dec 3 14:57:51 2020 -0800
xwayland: implement pixmap_from_buffers for the eglstream backend
Provides an implementation for the pixmap_from_buffers DRI3 function for
xwayland's eglstream backend. This will be used by the NVIDIA GLX driver
to pass buffers from client applications to the server. These can then
be presented using the PRESENT extension.
To hopefully make this less error-prone, we also introduce a "type"
field for this struct to distinguish between xwl_pixmaps for the new
DRI3-created pixmaps and those for the existing glamor-created pixmaps.
Additionally, the patch enables wnmd present mode with the eglstream backend.
This involves creating a wl_buffer for the provided dma-buf before importing it
into EGL and passing this to the compositor so it can be scanned out directly
if possible.
Since both backends now support this present mode, the HAS_PRESENT_FLIP flag is
no longer needed, so it can be removed.
Reviewed-by: Michel Dänzer <mdaenzer@redhat.com>
Acked-by: Olivier Fourdan <ofourdan@redhat.com>
Signed-off-by: Erik Kurzinger <ekurzinger@nvidia.com>
commit bc99dd2127f12f1aae55971c09a2792eeaa98444
Author: Erik Kurzinger <ekurzinger@nvidia.com>
Date: Wed Mar 3 11:56:41 2021 +0100
xwayland: Add check_flip() glamor backend function
This is preliminary work for hardware accelerated rendering with the
NVIDIA driver.
This exposes a new glamor backend function, check_flip, which can be
used to control whether flipping is supported for the given pixmap.
Reviewed-by: Michel Dänzer <mdaenzer@redhat.com>
Acked-by: Olivier Fourdan <ofourdan@redhat.com>
Signed-off-by: Erik Kurzinger <ekurzinger@nvidia.com>
commit 400d4d0fdd55192f394e1a8273dfb2423c895ec0
Author: Erik Kurzinger <ekurzinger@nvidia.com>
Date: Fri Feb 12 12:09:27 2021 -0800
xwayland: move formats and modifiers functions to common glamor code
This is preliminary work for hardware accelerated rendering with the
NVIDIA driver.
This moves the modifiers and formats functions previously only available
to the GBM backend to the common glamor code so that it can be used by
both the GBM and EGLStream backends.
Reviewed-by: Michel Dänzer <mdaenzer@redhat.com>
Acked-by: Olivier Fourdan <ofourdan@redhat.com>
Signed-off-by: Erik Kurzinger <ekurzinger@nvidia.com>
commit ae225417c0a0828ffb24e11eb4b968c34692e25a
Author: Olivier Fourdan <ofourdan@redhat.com>
Date: Wed Mar 3 09:55:12 2021 +0100
xwayland: Move dmabuf interface to common glamor code
This is preliminary work for hardware accelerated rendering with the
NVIDIA driver.
The EGLStream backend can possibly also use the dmabuf interface, so
move the relevant code from the GBM specific source to the common bits.
Signed-off-by: Olivier Fourdan <ofourdan@redhat.com>
commit d231ce2d9ce9644e77e8dbe8c5a23eeb11e85b55
Author: Povilas Kanapickas <povilas@radix.lt>
Date: Wed Apr 7 22:16:43 2021 +0300
meson: Disable LTO for tests
`-flto=auto` together with `-Wl,-wrap` causes link errors at least in
certain compilers (e.g. GCC 10.2.0). Since this is reoccurring issue
(internet search shows similar problems with GCC 4.6 a decade ago) let's
disable LTO for tests even if it's disabled elsewhere.
Fixes: https://gitlab.freedesktop.org/xorg/xserver/-/issues/1116
Signed-off-by: Povilas Kanapickas <povilas@radix.lt>
commit 68c2cfadd6d31f0787bc35dbafe32d7dfd638e27
Author: Povilas Kanapickas <povilas@radix.lt>
Date: Mon Apr 5 16:24:47 2021 +0300
meson: Make sure defines are either set to 1 or not defined
This will make the behavior of meson consistent with autotools. The
configuration macros are exposed to public headers so any inconsistency
is likely to break code for anyone who's not careful to use #ifdef
instead of #if.
Signed-off-by: Povilas Kanapickas <povilas@radix.lt>
commit faff5bbdf5dec53101a9d8f624f45262016154c1
Author: Povilas Kanapickas <povilas@radix.lt>
Date: Mon Apr 5 16:24:46 2021 +0300
meson: Sync the name of INPUTTHREAD conf macro with autotools build
The rest of dix code uses INPUTTHREAD, so having a different name in
meson configuration was an oversight.
Fixes: https://gitlab.freedesktop.org/xorg/xserver/-/issues/936
Signed-off-by: Povilas Kanapickas <povilas@radix.lt>
commit b25795462f4754ec2e3c677a41dea33ed1be79da
Author: Povilas Kanapickas <povilas@radix.lt>
Date: Mon Apr 5 16:24:48 2021 +0300
meson: Add missing pthread dependency for libxserver_os library
Signed-off-by: Povilas Kanapickas <povilas@radix.lt>
commit 9582ef4efc72afa9f84b6469b5f81ce5dd8eb15d
Author: Povilas Kanapickas <povilas@radix.lt>
Date: Mon Apr 5 16:24:45 2021 +0300
meson: Fix typo in libxserver_os dependencies for openbsd
This has not been tested, but os_deps is not used anywhere in the file,
so it's likely this was a typo.
Signed-off-by: Povilas Kanapickas <povilas@radix.lt>
commit 689496ed657ef055869f5eda7e09ff35edff30cc
Author: Povilas Kanapickas <povilas@radix.lt>
Date: Wed Apr 7 21:55:03 2021 +0300
meson: Switch project version to 20.x.y style
commit 2df55813d0f553050ff06065a67e90f678db593a
Author: Povilas Kanapickas <povilas@radix.lt>
Date: Wed Apr 7 21:55:02 2021 +0300
meson: Drop version subpatch handling
commit 5d3679104aaeabac585894606ad317b433b65238
Author: Adam Jackson <ajax@redhat.com>
Date: Wed Apr 7 21:55:01 2021 +0300
meson.build: Keep the protocol version looking like xserver 1.20.x did
This effectively changes the versioning to be as if xserver 21.0 was
xserver 1.21.0. This should keep any client-side version checks that
know about the Xorg 7.0 -> xserver 1.0 epoch from getting confused.
commit 3e4e70db10a4b2d531ccd649c18317ea2a49d256
Author: George Matsumura <gmmatsumura01@bvsd.org>
Date: Wed Apr 7 17:28:46 2021 -0600
meson: Fix DragonFly BSD identifier in meson build files
This changes the operating system identifier tested against
host_machine.system() in meson build files from "dragonflybsd"
to the officially stable "dragonfly".
Signed-off-by: George Matsumura <gmmatsumura01@bvsd.org>
commit 199f278a1b7570b1cb6e24b8bedb4d721b3c9938
Author: Edouard Gaulué <edouard@e-gaulue.com>
Date: Tue Mar 16 20:59:17 2021 +0100
French text in Preferences Pane Review
commit 65b27d82f2c6c3eecbc7370765ee7c036b245b2f
Author: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
Date: Sun Apr 4 16:10:28 2021 -0700
xquartz: Call PseudoramiXExtensionInit() through InitOutput() just like xwin
Fixes: https://github.com/XQuartz/XQuartz/issues/140
Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
commit 34e2a64ce00c219d64b8169b774661d5727c45c7
Author: Pascal VITOUX <vitoux.pascal@gmail.com>
Date: Fri Nov 27 16:54:59 2020 +0000
xfree86: fix gtf support detection for EDID 1.4
According to the "VESA Enhanced EDID Standard", all GTF compliant
displays are continuous frequency.
The GTF support flags in 'Display Range Limits Descriptor' cannot be
used if the display is a non-continuous frequency multi-mode display.
Closes #1105
Signed-off-by: Pascal VITOUX <vitoux.pascal@gmail.com>
Fixes: 6a79a737 ("xfree86: add drm modes on non-GTF panels")
Reviewed-by: Aaron Ma aaron.ma@canonical.com
commit b75d0cca28aaae5cd21ad76ad2822138fac2882a
Author: Aaron Plattner <aplattner@nvidia.com>
Date: Fri Feb 19 11:47:13 2021 -0800
modesetting: Defer crtc gamma size upgrade to drmmode_setup_colormap
Rather than trying to create a gamma ramp array of the appropriate size in
drmmode_crtc_init when the GAMMA_LUT property should be used, just flag the crtc
as wanting to use the GAMMA_LUT property and then replace the gamma ramp later,
right before calling xf86HandleColormaps. This avoids a problem during initial
startup where xf86RandR12CreateObjects12 hard-codes a gamma ramp size of 256,
causing xf86RandR12CrtcSetGamma to read past the end of the DIX layer's RandR
gamma ramp array:
PreInit
drmmode_pre_init
drmmode_crtc_init
crtc->gamma_size = 1024
ScreenInit
xf86CrtcScreenInit
xf86RandR12Init
xf86RandR12Init12
xf86RandR12CreateObjects12
RRCrtcCreate
randr_crtc->gammaSize = 0
xf86RandR12InitGamma(pScrn, 256)
RRCrtcGammaSetSize
randr_crtc->gammaSize = 256
xf86RandR12InitGamma
xf86RandR12CrtcInitGamma
RRCrtcGammaSet
xf86RandR12CrtcSetGamma
// crtc->gamma_size is 1024 here, while randr_crtc->gammaRed
// is a 256-element array.
memcpy(crtc->gamma_red, randr_crtc->gammaRed, crtc->gamma_size * sizeof(crtc->gamma_red[0]));
drmmode_setup_colormap
xf86HandleColormaps
xf86RandR12InitGamma
RRCrtcGammaSetSize
randr_crtc->gammaSize = 1024
Fixes: 245b9db0 - modesetting: Use GAMMA_LUT when available
Closes: https://gitlab.freedesktop.org/xorg/xserver/-/issues/1126
Signed-off-by: Aaron Plattner <aplattner@nvidia.com>
Reviewed-by: Robert Morell <rmorell@nvidia.com>
commit ab8f8c98418db6954b17d93280b7b526fc1d3f7c
Author: Jeremie Courreges-Anglas <jca@wxcvbn.org>
Date: Thu Jan 21 23:52:15 2021 +0100
xserver/os: safer IPv6 "kame hack" fix, only override sin6_scope_id if zero
This helps on KAME-based systems which want to get rid of this hack.
The assumption is that if sin6_scope_id is set, then the interface index
is no longer embedded in the address.
Signed-off-by: Jeremie Courreges-Anglas <jca@wxcvbn.org>
commit aeed57d722f2eb978c17fd7e859334d34af38d05
Author: Povilas Kanapickas <povilas@radix.lt>
Date: Fri Mar 26 00:09:41 2021 +0200
xkb: Fix parsing of XkbSA_DeviceValuator action type
The xkb spec defines that the 7th element of the DeviceValuator key
action description is "valuator 2 value".
This error most likely was accidentally introduced as a copy-paste error
in edeb033f29ae2d52e86c543ccbf22fb7ae1fdb7f.
Signed-off-by: Povilas Kanapickas <povilas@radix.lt>
commit a3931ec6f43857aeed7feac5d223d7db6728145e
Author: Povilas Kanapickas <povilas@radix.lt>
Date: Thu Mar 25 22:46:33 2021 +0200
xfree86: Create a symlink X -> Xorg when installing using meson
This brings the behavior closer than what we currently have with
autotools-based build system.
Meson does not currently have native support for symlinks.
See https://github.com/mesonbuild/meson/issues/1602.
Signed-off-by: Povilas Kanapickas <povilas@radix.lt>
commit 09cd65233e0f5c04e7e3d063decf357f239a65f6
Author: Povilas Kanapickas <povilas@radix.lt>
Date: Thu Mar 25 22:48:56 2021 +0200
xfree86: Set appropriate install_mode for suid_wrapper
commit 88b5e1a219a16dd66be6302dbf88ec93d317f991
Author: Povilas Kanapickas <povilas@radix.lt>
Date: Thu Mar 25 22:48:55 2021 +0200
meson: Bump min meson version to 0.47 to get install_mode support
commit 82d2156ba7b4e592a2ceb5da767b690862852caa
Author: Povilas Kanapickas <povilas@radix.lt>
Date: Thu Mar 25 22:51:39 2021 +0200
xfree86: Fix meson overwriting suid wrapper with the wrapped executable
Meson gets confused when there are two targets of the same name within
the same directory, so we use a different intermediate name.
This is a problem with the Xorg SUID wrapper which has the same filename
as the real Xorg executable and is configured in the same meson.build
file. This commit works around this by using a different filename in
build stage and renaming only when installing.
Signed-off-by: Povilas Kanapickas <povilas@radix.lt>
commit ba51acb1de752924c389cedbca39b5dc63679ee6
Author: Povilas Kanapickas <povilas@radix.lt>
Date: Thu Mar 25 22:57:56 2021 +0200
miext: Remove if check which is always true
In both cases we check for width > 0 just above, and the variable is not
modified between the checks, so the condition is always true.
Signed-off-by: Povilas Kanapickas <povilas@radix.lt>
commit 99e7ccffb38b4c93ff0c73586ec72a7fb78cae53
Author: Povilas Kanapickas <povilas@radix.lt>
Date: Thu Mar 25 23:18:14 2021 +0200
dix: Fix URL to description of focus in/out model
The current URL points to an unrelated patch for acpid.
Signed-off-by: Povilas Kanapickas <povilas@radix.lt>
commit 1b7dca27eb44eac9cb0a8d1463d968872c76f4d5
Author: Simon Ser <contact@emersion.fr>
Date: Thu Feb 18 12:04:48 2021 +0100
xwayland: remove wl_log_set_handler_client workaround
This bumps the minimum Wayland version to 1.5 (released in 2014).
Signed-off-by: Simon Ser <contact@emersion.fr>
Reviewed-by: Michel Dänzer <mdaenzer@redhat.com>
Reviewed-by: Olivier Fourdan <ofourdan@redhat.com>
Reviewed-by: Martin Peres <martin.peres@mupuf.org>
commit 6c51818a0f55282cbe5a870f58ca82ca45ee472d
Author: Michel Dänzer <mdaenzer@redhat.com>
Date: Fri Mar 5 15:23:53 2021 +0100
meson: Make sure XKM_OUTPUT_DIR has a trailing slash
RunXkbComp passes an invalid file path to xkbcomp if there's no
trailing slash.
Closes: https://gitlab.freedesktop.org/xorg/xserver/-/issues/1146
Suggested-by: Dylan Baker <dylan.c.baker@intel.com>
commit 376eaadde36f80fcbe6b0391a3385e77b4602854
Author: Jan Beich <jbeich@FreeBSD.org>
Date: Fri Mar 5 22:50:51 2021 +0000
meson: hide C API if Xorg is disabled (like autotools)
When building only Xwayland using Meson some files are always installed.
This causes package conflict if Xwayland is built separately from Xorg.
include/xorg/compositeext.h
include/xorg/damage.h
include/xorg/damagestr.h
include/xorg/dbestruct.h
include/xorg/dri3.h
include/xorg/fb.h
include/xorg/fboverlay.h
include/xorg/fbpict.h
include/xorg/fbrop.h
include/xorg/geext.h
include/xorg/geint.h
include/xorg/glyphstr.h
include/xorg/mi.h
include/xorg/micmap.h
include/xorg/micoord.h
include/xorg/migc.h
include/xorg/miline.h
include/xorg/mioverlay.h
include/xorg/mipict.h
include/xorg/mipointer.h
include/xorg/mipointrst.h
include/xorg/mistruct.h
include/xorg/misync.h
include/xorg/misyncfd.h
include/xorg/misyncshm.h
include/xorg/misyncstr.h
include/xorg/mizerarc.h
include/xorg/panoramiX.h
include/xorg/panoramiXsrv.h
include/xorg/picture.h
include/xorg/picturestr.h
include/xorg/present.h
include/xorg/presentext.h
include/xorg/randrstr.h
include/xorg/rrtransform.h
include/xorg/shadow.h
include/xorg/shmint.h
include/xorg/syncsdk.h
include/xorg/vndserver.h
include/xorg/wfbrename.h
include/xorg/xace.h
include/xorg/xacestr.h
include/xorg/xorg-server.h
include/xorg/xvdix.h
include/xorg/xvmcext.h
share/aclocal/xorg-server.m4
Reviewed-by: Michel Dänzer <mdaenzer@redhat.com>
commit 4ae36f418ed683532b0b6991e4a1e7d56740b845
Author: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
Date: Mon Mar 8 21:02:40 2021 -0800
xquartz: Ensure the mouse pointer is shown when switching to a native macOS alert or window
Fixes: https://github.com/XQuartz/XQuartz/issues/100
Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
commit b2d96b5cd459963a9587ee9c86afc9266ba3d02b
Author: Matthieu Herrb <matthieu.herrb@laas.fr>
Date: Sat Feb 27 11:30:18 2021 +0100
Avoid sequences of malloc(0) / free() by checking the length.
This has an impact on heap fragmentation.
Signed-off-by: Matthieu Herrb <matthieu.herrb@laas.fr>
commit 15a413e11d186a9206a39a9b2fe4b72c065d5918
Author: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
Date: Mon Feb 22 23:02:42 2021 -0800
xquartz: Update meson build to remove deleted files
Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
commit e59848548a462f1a0ac751bb8bb6afe56258cf4e
Author: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
Date: Fri Mar 5 22:57:24 2021 -0800
xquartz: Fix appFlags build failure with macOS 10.15+ SDKs
Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
commit 69e087caa4fdfcc303080c021ba463afcf4290c7
Author: Olivier Fourdan <ofourdan@redhat.com>
Date: Fri Feb 5 11:36:15 2021 +0100
xwayland: Fix path in pkg-config with autoconf
When using autoconf/automake to build Xwayland, the actual path to
Xwayland is not fully qualified and refers to the "exec_prefix".
As a result, the path provided by the generated pkg-config file is wrong
when using autoconf to build the Xserver.
Fix the xwayland.pc file to also set the variable "prefix" and
"exec_prefix" so that the path to Xwayland is fully resolved.
Add those variables to the meson build as well for good measure.
Signed-off-by: Olivier Fourdan <ofourdan@redhat.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Acked-by: Michel Dänzer <mdaenzer@redhat.com>
commit d7391f383ddca5089586b4d04fede56169a1a85e
Author: Olivier Fourdan <ofourdan@redhat.com>
Date: Thu Mar 4 14:13:41 2021 +0100
xwayland: Fix LeaveNotify for relative pointer
Since commit 20c78f38, we use the relative pointer for enter/leave
events.
However, sprite_check_lost_focus() which verifies whether the pointer has
left an Xwayland surface still explicitly check for the absolute
pointer.
As a result, no LeaveNotify event is emitted anymore now when the
pointer crosses from an Xwayland surface to a Wayland native one.
Make sure to check the last slave device against get_pointer_event() as
well, not just the absolute pointer.
Signed-off-by: Olivier Fourdan <ofourdan@redhat.com>
Acked-by: Martin Peres <martin.peres@mupuf.org>
Acked-by: Roman Gilg <subdiff@gmail.com>
Tested-by: Roman Gilg <subdiff@gmail.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Fixes: 20c78f38 - xwayland: use get_pointer_device() for enter/leave
handling too
commit a5367face12d8e4162bc49a60b5d13955a7fb293
Author: Jacob Cherry <jcherry@nvidia.com>
Date: Wed Mar 3 17:50:31 2021 +0000
xfree86: Fix autoconfig secondary GPU devices
The code path added by commit 69e4b8e6 (xfree86: attempt to autoconfig
gpu slave devices (v3)) assumes that it will only be run if the primary
device on the screen is the first device in xf86configptr->conf_device_lst.
While this is true most of the time, there are two specific cases where
this assumption fails.
First, if the first device in conf_device_lst is assigned to a different
seat than the running X server, it will be skipped by the previous
FIND_SUITABLE macro usage. Second, if the primary device was explicitly
assigned to the screen but auto_gpu_device is still set and no secondary
devices were explicitly listed, that device may not be the first device
in conf_device_lst.
When the first device in conf_device_lst is not the primary device
assigned to the screen, two problems emerge. First, the first device in
conf_device_lst will never be assigned to the screen as a secondary
device. Second, the primary device is additionally assigned to the
screen as a secondary device. The combination of these problems causes
certain otherwise valid configurations to be invalid. For example, if a
primary device is assigned to a screen and a secondary device is listed
in the config but not explicitly assigned to the screen, then one order
of the device sections results in a usable PRIME or Reverse PRIME setup
and the other order does not.
This commit removes the assumption that the primary device is the first
device in conf_device_lst by starting the loop from the start of
conf_device_lst and skipping the primary device when it is encountered.
Signed-off-by: Jacob Cherry <jcherry@nvidia.com>
commit 97ed0048e45f4909a0c164b27e768af8c9364068
Author: Olivier Fourdan <ofourdan@redhat.com>
Date: Fri Dec 18 17:53:33 2020 +0100
xwayland: Delay cursor visibility update
Xwayland won't emulate XWarpPointer requests if the cursor is visible,
this is to avoid having the cursor jumping on screen and preventing
random X11 clients from controlling the pointer in Wayland, while
allowing games which use that mechanism with a hidden cursor to work in
Xwayland.
There are, however, games which tend to do it in the wrong order, i.e.
show the cursor before moving the pointer, and because Xwayland will not
allow an X11 client to move the pointer while the cursor is visible, the
requests will fail.
Add a workaround for such X11 clients, when the cursor is being shown,
keep it invisible until the cursor is actually moved. This way, X11
clients which show their cursor just before moving it would still have a
chance to succeed.
v2: Add a timeout to show the cursor for well behaved clients.
v3: Some cleanup (Michel)
v4: Do not cancel cursor delay when updating the cursor to avoid
delaying cursor visibility indefinitely if the client keeps
settings different cursors (Michel)
Signed-off-by: Olivier Fourdan <ofourdan@redhat.com>
Tested-by: Jaap Buurman jaapbuurman@gmail.com
Reviewed-by: Michel Dänzer <mdaenzer@redhat.com>
Closes: https://gitlab.freedesktop.org/xorg/xserver/-/issues/734
commit 9d329a0fb17c1a7840408d329ee2e2a04d357387
Author: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
Date: Sun Feb 21 21:49:58 2021 -0800
xquartz: Remove a check for NSAppKitVersionNumber >= NSAppKitVersionNumber10_7
This check is always true on our supported systems.
Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
commit 839b49ac05c3285434d8487b48d8b52323187e44
Author: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
Date: Sun Feb 21 21:49:14 2021 -0800
xquartz: Don't include strndup.c any more since we no longer support 10.8 and older
Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
commit 677eb6827bd68bdf29e3539d1e10e9872896efec
Author: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
Date: Sun Feb 21 20:58:42 2021 -0800
xquartz: Add a launch trampoline to better integrate with modern versions of macOS
Fixes: https://github.com/XQuartz/XQuartz/issues/6
Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
commit 25035229b73742f9e6a96ac3e535b30b5c6196a8
Author: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
Date: Fri Feb 19 23:16:56 2021 -0800
xquartz: Don't process AppKit events if we haven't finished initializing
Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
commit 487286d47260782d331229af10df17711cbca1ea
Author: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
Date: Sat Feb 20 17:24:14 2021 -0800
xquartz: Allocate each fbconfig separately
A change during the 1.20 development cycle resulted in fbconfigs being walked
and deallocated individually during __glXScreenDestroy. This change
now avoids a use-after-free caused by that change.
==50859==ERROR: AddressSanitizer: heap-use-after-free on address 0x00010d3819c8 at pc 0x0001009d4230 bp 0x00016feca7a0 sp 0x00016feca798
READ of size 8 at 0x00010d3819c8 thread T5
#0 0x1009d422c in __glXScreenDestroy glxscreens.c:448
#1 0x10091cc98 in __glXAquaScreenDestroy indirect.c:510
#2 0x1009d2734 in glxCloseScreen glxscreens.c:169
#3 0x100740a24 in dix_main main.c:325
#4 0x10023ed50 in server_thread quartzStartup.c:65
#5 0x199ae7fd0 in _pthread_start+0x13c (libsystem_pthread.dylib:arm64e+0x6fd0)
#6 0x199ae2d38 in thread_start+0x4 (libsystem_pthread.dylib:arm64e+0x1d38)
0x00010d3819c8 is located 200 bytes inside of 12800-byte region [0x00010d381900,0x00010d384b00)
freed by thread T5 here:
#0 0x101477ba8 in wrap_free+0x98 (libclang_rt.asan_osx_dynamic.dylib:arm64e+0x3fba8)
#1 0x1009d4240 in __glXScreenDestroy glxscreens.c:449
#2 0x10091cc98 in __glXAquaScreenDestroy indirect.c:510
#3 0x1009d2734 in glxCloseScreen glxscreens.c:169
#4 0x100740a24 in dix_main main.c:325
#5 0x10023ed50 in server_thread quartzStartup.c:65
#6 0x199ae7fd0 in _pthread_start+0x13c (libsystem_pthread.dylib:arm64e+0x6fd0)
#7 0x199ae2d38 in thread_start+0x4 (libsystem_pthread.dylib:arm64e+0x1d38)
previously allocated by thread T5 here:
#0 0x101477e38 in wrap_calloc+0x9c (libclang_rt.asan_osx_dynamic.dylib:arm64e+0x3fe38)
#1 0x100925a40 in __glXAquaCreateVisualConfigs visualConfigs.c:116
#2 0x10091cb24 in __glXAquaScreenProbe+0x224 (X11.bin:arm64+0x100730b24)
#3 0x1009cd840 in xorgGlxServerInit glxext.c:528
#4 0x10074539c in _CallCallbacks dixutils.c:743
#5 0x100932a70 in CallCallbacks callback.h:83
#6 0x100932478 in GlxExtensionInit vndext.c:244
#7 0x10020a364 in InitExtensions miinitext.c:267
#8 0x10073fe7c in dix_main main.c:197
#9 0x10023ed50 in server_thread quartzStartup.c:65
#10 0x199ae7fd0 in _pthread_start+0x13c (libsystem_pthread.dylib:arm64e+0x6fd0)
#11 0x199ae2d38 in thread_start+0x4 (libsystem_pthread.dylib:arm64e+0x1d38)
Regressed-in: 4b0a3cbab131eb453e2b3fc0337121969258a7be
CC: Giuseppe Bilotta <giuseppe.bilotta@gmail.com>
Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
commit 6a83fb51b7a8b2e167e7d6380229b69e5452f91f
Author: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
Date: Sat Feb 20 15:17:18 2021 -0800
xquartz: Fix a compiler warning about const incompatible pointer assignment
driWrap.c:541:30: error: assigning to 'GCOps *' (aka 'struct _GCOps *') from 'const GCOps *' (aka 'const struct _GCOps *') discards
qualifiers [-Werror,-Wincompatible-pointer-types-discards-qualifiers]
pGCPriv->originalOps = pGC->ops;
^ ~~~~~~~~
Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
commit a3ddcdd56c246e2226c7cdf372c2a1294eb6d888
Author: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
Date: Thu Feb 18 23:16:15 2021 -0800
xquartz: Fix build with sparkle enabled
Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
commit 279bcbd9cf9e557a6789d6e4cede8e8799c3788e
Author: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
Date: Thu Feb 18 12:43:53 2021 -0800
xquartz: Silence a compiler warning about missing internal methods on NSApplication
Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
commit fe89c70e472a9da0541b798eea60c5362b49a99d
Author: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
Date: Thu Feb 18 22:19:21 2021 -0800
xquartz: Rewrite Window menu handling to not depend on X11App.windowsMenu.numberOfItems being correct in -awakeFromNib
Fixes: https://github.com/XQuartz/XQuartz/issues/56
Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
commit 41aed8f69634ec61ea0e40fff1cfdaf868be843e
Author: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
Date: Thu Feb 18 15:41:29 2021 -0800
xquartz: Convert X11Controller ivars into @properties
Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
commit c2750e1fab774c8e6675ecf284124ff55b5be9cf
Author: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
Date: Thu Feb 18 14:39:46 2021 -0800
xquartz: Convert X11Application ivars into @properties
Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
commit f51b97b0de2e562e341f2d72c5f00a74c71a159f
Author: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
Date: Thu Feb 18 14:47:50 2021 -0800
xquartz: Fold quartzCommon.h into quartz.h
Everything declared in it comes from quartz.c, so match reality.
Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
commit 4b4500c48f06e7ef41cd94f417e49b3f4f1412ae
Author: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
Date: Thu Feb 18 13:00:43 2021 -0800
xquartz: Fold away some unnecessary hops to X11Controller through X11Application
Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
commit 39c0e1c0ab6a0a89a71f26446973c779ca7fd927
Author: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
Date: Thu Feb 18 09:41:30 2021 -0800
xquartz: Fold away array_with_strings_and_numbers and simplify with more modern Objective-C
Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
commit 87f8fe1f74f10faf0ffc84f03539799ad4c2465e
Author: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
Date: Thu Feb 18 09:33:56 2021 -0800
xqaurtz: Remove message_kit_thread() and use dispatch instead
Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
commit 94e4e173486c2a94ddcfd2d0515e1ee6731f6656
Author: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
Date: Wed Feb 17 23:58:53 2021 -0800
xquartz: Use objc_autoreleasePoolPush / objc_autoreleasePoolPop directly in QuartzBlockHandler
It violates @autoreleasepool best practices, and this helps collapse quartzCocoa.m into quartz.c
Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
commit fba421f700498fa382089df47942df36a2d75ce6
Author: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
Date: Wed Feb 17 22:04:55 2021 -0800
xquartz: Minor code modernization -- @autoreleasepool adoption
Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
commit 318f8a4a8a47a0ce4bbbf4290469e933602c9b30
Author: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
Date: Wed Feb 17 20:55:06 2021 -0800
xquartz: Remove some dead code for compatibility with older nibs
Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
commit 72a39dccf99191fbfbb4b399c446fd017d55f24e
Author: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
Date: Thu Feb 18 16:05:34 2021 -0800
xquartz: Remove a workaround for AppKit versions older than Lion
Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
commit 7e2875035800887f3f41f75cba4299088daf939a
Author: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
Date: Wed Feb 17 15:45:45 2021 -0800
xquartz: Fix applications menu table background color for dark mode
Fixes: https://github.com/XQuartz/XQuartz/issues/32
Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
commit 85beee9885a8e65960fbbde2de9aa28598b4d6ae
Author: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
Date: Wed Feb 17 15:16:26 2021 -0800
xquartz: Apply Xcode 12.4 automatic updates to nibs
Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
commit 4e892aa6e132447e43d7bae7e3aca4f1fb172f93
Author: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
Date: Wed Feb 17 13:38:31 2021 -0800
xquartz: Update the about box copyright to 2021
Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
commit c9a3b14c1472632afaff340f73a77a2b961f195a
Author: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
Date: Mon Feb 1 16:27:38 2021 -0800
xquartz: Ensure we call into TIS on the main thread
There is a place where this code was called on the main thread.
We're using a rather nasty anti-pattern to just call a block inline rather
than synchonously calling it on the main thread if we're already on the main
thread. This code could use a good overhaul, but I don't have time to rip
it apart right now. This will address the immediate issue.
Fixes: https://github.com/XQuartz/XQuartz/issues/40
Fixes: https://github.com/XQuartz/XQuartz/issues/48
Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
commit af17b5c499ded807395c7ef02254d5af8ddc4667
Author: Povilas Kanapickas <povilas@radix.lt>
Date: Mon Feb 15 14:52:32 2021 +0200
dix: Use correct listener to deliver touch end events
This fixes an problem left in f682e0563f736ed2c2c612ed575e05b6e3db945e
due to an incorrect cherry-pick.
We must use old listener->listener to deliver the touch event. Otherwise
grab won't let the event through and the abovementioned commit has no
effect.
Signed-off-by: Povilas Kanapickas <povilas@radix.lt>
commit 20c78f38a0b33b88bc82a2bcd54d2e6c74a4c132
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Tue Feb 16 14:48:13 2021 +1000
xwayland: use get_pointer_device() for enter/leave handling too
In Weston, clicking the window decoration of an Xwayland client gives us a
wl_pointer.button event immediately followed by a wl_pointer.leave event.
The leave event does not contain any button state information, so the button
remains logically down in the DIX.
Once the pointer button is released, a wl_pointer.enter event is sent with
the current button state (zero). This needs to trigger a ButtonRelease event
but for that we need to ensure that the device is the same as the one we send
ButtonPress events through.
Fixes a regression introduced in a4095162ca923992a8cfae6d0f09ff9f8144762a.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Olivier Fourdan <ofourdan@redhat.com>
commit dee2bb033e78e2f4aae7f5708c3d4fc74a9957de
Author: Olivier Fourdan <ofourdan@redhat.com>
Date: Mon Feb 15 11:33:56 2021 +0100
dix: Guard against non-existing PtrFeedbackPtr
Trying to change the pointer control settings on a device without
PtrFeedbackPtr would be a bug and a crash in the Xserver.
Guard against that case by returning early with a BadImplementation
error, that might kill the X11 client but the Xserver would survive.
Signed-off-by: Olivier Fourdan <ofourdan@redhat.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Related: https://gitlab.freedesktop.org/xorg/xserver/-/issues/1137
commit ab76272a7d2bff997985893c89147412a7360310
Author: Olivier Fourdan <ofourdan@redhat.com>
Date: Mon Feb 15 11:23:59 2021 +0100
xwayland: Add PtrFeedback to the touch device
Trying to change the acceleration/threshold on Xwayland cannot work, and
the corresponding handler xwl_pointer_control() is a no-op.
Yet, an X11 client trying to change those on the touch device may
possibly cause a crash because the touch device in Xwayland doesn't set
that.
Initialize the touch device's PtrFeedback to make sure that just cannot
happen.
Signed-off-by: Olivier Fourdan <ofourdan@redhat.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Closes: https://gitlab.freedesktop.org/xorg/xserver/-/issues/1137
commit a4095162ca923992a8cfae6d0f09ff9f8144762a
Author: Olivier Fourdan <ofourdan@redhat.com>
Date: Thu Feb 11 11:42:01 2021 +0100
xwayland: Use relative device for buttons/axis
We are using the relative pointer for motion events, but buttons and
axis events still go through the absolute pointer device.
That means additional DeviceChanged events that could be avoided if the
buttons and axis events were coming from the same device as motion
events.
Route those events to the relative pointer if available so that motion,
buttons and axis events come from the same device (most of the time).
Suggested-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Olivier Fourdan <ofourdan@redhat.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Related: https://gitlab.freedesktop.org/xorg/xserver/-/issues/1130
commit 1abab61dc23d585860bc847bcecb1b0315977c27
Author: Olivier Fourdan <ofourdan@redhat.com>
Date: Thu Feb 11 15:32:34 2021 +0100
xwayland: Add wheel axis to relative pointer
The relative pointer only has 2 axis, if we want to route the mouse
wheel events to that device, we need to add the axis definition, similar
to what is done for the absolute pointer.
Signed-off-by: Olivier Fourdan <ofourdan@redhat.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Related: https://gitlab.freedesktop.org/xorg/xserver/-/issues/1130
commit 71817928247971566903d56c0571db61b7933747
Author: Olivier Fourdan <ofourdan@redhat.com>
Date: Tue Feb 9 13:33:05 2021 +0100
xwayland: Split dispatch_pointer_motion_event
This is a cleanup patch, no functional change.
Split the function dispatch_pointer_motion_event() into three separate
simpler functions, relative motion with a warp emulator, relative motion
and absolute motion.
This makes the code a lot easier to read for me, rather than having
everything in a single function with nested if/else conditions.
Signed-off-by: Olivier Fourdan <ofourdan@redhat.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
commit c5c5322ad69b0751f16c785a479b2989b8794235
Author: Olivier Fourdan <ofourdan@redhat.com>
Date: Tue Feb 9 13:04:59 2021 +0100
xwayland: Use relative values for raw events
Xwayland supports relative motion events from the Wayland compositor via
the relative-pointer protocol, and converts those to the absolute range
in device units for raw events.
Some X11 clients however wrongly assume relative values in the axis
values even for devices explicitly labeled as absolute. While this is a
bug in the client, such applications would work fine in plain Xorg but
not with Xwayland.
To avoid that issue, use the relative values for raw events without
conversion, so that such application continue to work in Xwayland.
Thanks Peter for figuring out the root cause.
v2: Don't duplicate relative and absolute events (Peter)
v3: Use POINTER_RAWONLY (Peter)
Suggested-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Olivier Fourdan <ofourdan@redhat.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Closes: https://gitlab.freedesktop.org/xorg/xserver/-/issues/1130
commit ebdb2e264676c3b27a708328348efe73e0d3c8c2
Author: Olivier Fourdan <ofourdan@redhat.com>
Date: Tue Feb 9 13:01:21 2021 +0100
xwayland: Use a resolution of 0 for relative motion
That's what evdev/libinput drivers do.
Suggested-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Olivier Fourdan <ofourdan@redhat.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Related: https://gitlab.freedesktop.org/xorg/xserver/-/issues/1130
commit b5e1f13681090fc327dc2cabee1dc123273e785b
Author: Olivier Fourdan <ofourdan@redhat.com>
Date: Thu Feb 11 09:48:12 2021 +0100
dix: Add POINTER_RAWONLY flag
This add a new flag POINTER_RAWONLY for GetPointerEvents() which does
pretty much the opposite of POINTER_NORAW.
Basically, this tells GetPointerEvents() that we only want the
DeviceChanged events and any raw events for this motion but no actual
motion events.
This is preliminary work for Xwayland to be able to use relative motion
events for raw events. Xwayland would use absolute events for raw
events, but some X11 clients (wrongly) assume raw events to be always
relative.
To allow such clients to work with Xwayland, it needs to switch to
relative raw events (if those are available from the Wayland
compositor).
However, Xwayland cannot use relative motion events for actual pointer
location because that would cause a drift over time, the pointer being
actually controlled by the Wayland compositor.
So Xwayland needs to be able to send only relative raw events, hence
this API.
Bump the ABI_XINPUT_VERSION minor version to reflect that API addition.
v2: Actually avoid sending motion events (Peter)
v3: Keep sending raw emulated events with RAWONLY (Peter)
Suggested-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Olivier Fourdan <ofourdan@redhat.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Related: https://gitlab.freedesktop.org/xorg/xserver/-/issues/1130
commit 213129012bc0fe508a8a4180ffda1ef661894049
Author: Povilas Kanapickas <povilas@radix.lt>
Date: Sun Dec 20 00:48:22 2020 +0200
Xi: Deliver pointer emulated touch events to grabbing client
Delivery of emulated events usually happens only to the owning client.
If there are grabs, only the grabbing client may receive these events.
This logic does not work during the touch event replay in
DeactivatePointerGrab(), as the previous grab is no longer in the
listener queue of the touch, so the next owner gets whole emulated event
sequence. This may trigger implicit grabs. After replay,
DeactivatePointerGrab() will update the global grab without regard to
this new implicit grab, which leads to issues down the line.
This change is effectively the same as 35e5a76cc1 except that the change
is limited to only emulated pointer events. Otherwise, in the case of a
device grab we end up not sending any touch events to clients that
selected XI_TouchOwnership event and should get touch events before they
get ownership of touch sequence.
Fixes #7
https://bugs.freedesktop.org/show_bug.cgi?id=96536
commit 30e11535afb3c4efc3a5cef640de44c7cd9bb561
Author: Povilas Kanapickas <povilas@radix.lt>
Date: Sun Dec 20 00:48:21 2020 +0200
Revert "Xi: Use current device active grab to deliver touch events if any"
This reverts commit 98e3db2ac43d4a3f13475cb160c8ce0155ac7d61.
commit f682e0563f736ed2c2c612ed575e05b6e3db945e
Author: Povilas Kanapickas <povilas@radix.lt>
Date: Mon Feb 8 05:21:29 2021 +0200
dix: Send touch end to clients that do async grab without touch events
If a XI2 client started listening to touches due to a selection and then
creates an active async grab that does not include touch events, then it
currently won't get the touch end event which will produce inconsistent
view of the pending touches.
Note that we only need to consider touch listeners and can ignore
pointer emulation. Under XI2 if a active grab replaces a passive
implicit grab and the active grab does not include the button release
event, the client won't get it either.
commit c7730cfe5577ebde006d408f502766d8c3a73670
Author: Olivier Fourdan <ofourdan@redhat.com>
Date: Wed May 13 16:48:55 2020 +0200
xwayland: Translate keyboard grabs on the root window
When an X11 client issues an active grab on the keyboard, Xwayland
forward this to the Wayland compositor using the Xwayland specific
protocol "xwayland-keyboard-grab" if it can find the corresponding
Xwayland window.
Some X11 clients (typically older games) however try to issue the
keyboard grab on the X11 root window, which has obviously no matching
Xwayland window. In such a case, the grab is simply ignored and the game
will not work as expected.
To workaround that issue, if an X11 client issues a keyboard grab on the
root window, Xwayland will search for a toplevel window belonging to the
same X11 client that it can use as the grab window instead.
This way, the grab can be forwarded to the Wayland compositor that can
either grant or deny the request based on the window and its internal
policies.
The heuristic picks the first realized toplevel window belonging to the
client so that the Wayland compositor will send it the keyboard events,
and the Xserver grab mechanism will then take care of routing the events
to the expected X11 window by itself.
v2: Make the test more clear (Dor Askayo <dor.askayo@gmail.com>)
Signed-off-by: Olivier Fourdan <ofourdan@redhat.com>
Acked-by: Jonas Ådahl <jadahl@gmail.com>
See-also: https://gitlab.gnome.org/GNOME/mutter/-/issues/1249
commit 520e7a1310ddc25b30bcaa0ea3eeaa6c4d137c8c
Author: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
Date: Wed Jan 27 15:03:46 2021 -0800
xquartz: Ensure that NSRunAlertPanel() is run on the main thread
Fixes: https://github.com/XQuartz/XQuartz/issues/30
Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
commit 7d0bb7ed061458698ff27856976939b261e73b23
Author: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
Date: Wed Jan 27 13:46:02 2021 -0800
xquartz: Remove support for older versions of libXplugin
Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
commit 5e7c0762e6fdaefc9b8257c0f875432b1877c49e
Author: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
Date: Wed Jan 27 13:43:01 2021 -0800
xquartz: Remove unused include of AvailabilityMacros.h from various sources
Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
commit 59f22341a8b4cd468d6f37fb17dd7fde347e430b
Author: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
Date: Wed Jan 27 13:40:48 2021 -0800
xquartz: Remove support for building for i386
Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
commit aea15a76593f98205e44f20632178dc384c02d57
Author: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
Date: Wed Jan 27 13:35:17 2021 -0800
xquartz: Remove support for Mountain Lion and earlier versions of macOS
Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
commit c0b2d3e099a60f55b18ca9c30373000f12d40fe2
Author: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
Date: Wed Jan 27 13:33:22 2021 -0800
xquartz: Remove support for Lion and earlier versions of macOS
Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
commit cc9cf6f085be6e8264f925a11d67a12ad47a042b
Author: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
Date: Wed Jan 27 13:29:52 2021 -0800
xquartz: Remove support for SnowLeopard and earlier versions of macOS
Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
commit f699aac2ea2cf6a3e2d3bdcb2d8179e103de1d4e
Author: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
Date: Wed Jan 27 13:09:50 2021 -0800
xquartz: Remove check for libdispatch now that we don't support pre-SnowLeopard
Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
commit 5ad49102722274f53b9b011082d9e0f202fcd9a4
Author: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
Date: Wed Jan 27 13:23:18 2021 -0800
xquartz: Remove support for Leopard and earlier versions of macOS
Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
commit 6e6db055f8b517ae9d63351d4c00fd480cb6b54a
Author: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
Date: Wed Jan 27 13:18:35 2021 -0800
xquartz: Remove support for Tiger and earlier versions of macOS
Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
commit 20b86c4060c1d4fbc099675d5100fe17e4ac0147
Author: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
Date: Wed Jan 27 13:12:34 2021 -0800
os: Remove support for Tiger and earlier versions of macOS
Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
commit 74aef85bd88a1fdb22d445ad14975232a7bebdd7
Author: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
Date: Wed Jan 27 13:25:54 2021 -0800
xquartz: Remove support for Panther and earlier versions of macOS
Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
commit 0e272ac458fbd530787273073473e566b0ac306e
Author: Jim DeLaHunt <from.github@jdlh.com>
Date: Mon Dec 11 00:08:52 2017 -0800
Fix typo "XQaurtz" in Xquartz.man
commit 5429791b1cf7f6cabf6c64aad0a4b1b5418253c9
Author: Olivier Fourdan <ofourdan@redhat.com>
Date: Thu Jan 28 17:11:44 2021 +0100
Revert "mi: Shortcut miDoCopy/miCopyArea based on clipList"
This reverts commit f665a9c9e6c8643f3050378249db3088ae3057be.
Signed-off-by: Olivier Fourdan <ofourdan@redhat.com>
Acked-by: Martin Peres <martin.peres@mupuf.org>
Closes: https://gitlab.freedesktop.org/xorg/xserver/-/issues/1108
Closes: https://gitlab.freedesktop.org/xorg/xserver/-/issues/1128
commit 3cdac5ba07a79761652d960e0e907601f82718bc
Author: Olivier Fourdan <ofourdan@redhat.com>
Date: Wed Sep 9 10:51:24 2020 +0200
mi: List extensions in usage message
Not all extensions can be enabled or disabled at runtime, list the
extensions which can from the help message rather than on error only.
v2:
* Print the header message in the ListStaticExtensions() (Peter
Hutterer)
* Do not export ListStaticExtensions() as Xserver API
Signed-off-by: Olivier Fourdan <ofourdan@redhat.com>
Reviewed-by: Michel Dänzer <mdaenzer@redhat.com>
commit a81c98e42a954580ca0d43c89169dc2069c87b96
Author: Olivier Fourdan <ofourdan@redhat.com>
Date: Tue Sep 8 18:34:48 2020 +0200
mi: Don't log the full extension list on disable
When enabling or disabling an extension which is not known to the
Xserver, it will log an error message and list the extensions it knows
about.
That clutters the logs when the Xserver is Xwayland spawned by the
Wayland compositor who doesn't actually know the list of extensions
enabled at build time in the Xserver.
Considering that disabling a non-existing extension is a no-op anyway,
list all the extensions available only when attempting to enable an
extension which the Xserver doesn't know about.
Signed-off-by: Olivier Fourdan <ofourdan@redhat.com>
Reviewed-by: Michel Dänzer <mdaenzer@redhat.com>
commit 4341f1da728e4c67187b48865faf06c1312bcdff
Author: Misha Gusarov <dottedmag@dottedmag.net>
Date: Wed Jan 27 12:37:51 2021 +0000
xwayland: Add -verbose option as in xfree86
Makes it easier to debug Xwayland problems.
Signed-off-by: Misha Gusarov <dottedmag@dottedmag.net>
commit 0148a15da1616a868d71abe1b56e3f28cc79533c
Author: Julien Cristau <jcristau@debian.org>
Date: Wed Jan 6 10:20:53 2021 +0100
compiler.h: don't define inb/outb and friends on mips
The definition relies on IOPortBase, which is only ever set in
hw/xfree86/os-support/bsd/arm_video.c
This caused build failures on linux/mips with GCC 10, due to this
change (from https://gcc.gnu.org/gcc-10/changes.html#c):
"GCC now defaults to -fno-common. As a result, global variable accesses
are more efficient on various targets. In C, global variables with
multiple tentative definitions now result in linker errors. With
-fcommon such definitions are silently merged during linking."
As a result anything including compiler.h would get its own definition
of IOPortBase and the linker would error out.
commit f08ab719df921e1269691553daf56853380fb241
Author: Michel Dänzer <mdaenzer@redhat.com>
Date: Thu Dec 17 18:58:28 2020 +0100
ci: Test ninja dist in meson jobs
While this isn't critical yet, it might become so at some point, so
let's make sure it keeps working.
Don't set the PIGLIT/XTEST_DIR variables for ninja dist, testing XTS
once against each DDX is enough (as part of ninja test).
Requires git in the docker image.
v2:
* Drop /usr/local/bin/xkbcomp symlink, no longer needed with xkbcomp
1.4.1 (Peter Hutterer)
commit 099eb6261cfb4a7a674ead467a8a9dfb2ee173d8
Author: Michel Dänzer <mdaenzer@redhat.com>
Date: Fri Jan 15 18:32:30 2021 +0100
ci: Build xkbcomp 1.4.1 for the docker image
This is a requirement for testing meson dist in CI.
commit 9716c4193fd4db7cdf3c6d7fb32d4ad2919cbe46
Author: Olivier Fourdan <ofourdan@redhat.com>
Date: Fri Jan 22 10:29:29 2021 +0100
xwayland: Add new pkg-config variable for listenfd
Since commit b3f3d65e, xwayland now supports the command line option
"-listenfd" for passing file descriptors and marked "-listen" as
deprecated for this specific purpose.
Add a new pkg-config variable "have_listenfd" to the xwayland.pc so that
compositors can know this is available and use listenfd in place of the
deprecated option.
Signed-off-by: Olivier Fourdan <ofourdan@redhat.com>
Reviewed-by: Michel Dänzer <mdaenzer@redhat.com>
Reviewed-by: Jonas Ådahl <jadahl@gmail.com>
commit a9269808f394955f213e34303c2c14fd61c35ab5
Author: Erik Kurzinger <ekurzinger@nvidia.com>
Date: Thu Jan 7 07:00:33 2021 -0800
xwayland: remove unused parameter of xwl_glamor_pixmap_get_wl_buffer
There are currently no callers that make use of the "created" output parameter
of xwl_glamor_pixmap_get_wl_buffer. Remove it, along with the corresponding
argument of the associated EGL backend entrypoint.
commit 532245798085a67b5ff906778f88373d5bcd2e4c
Author: Povilas Kanapickas <povilas@radix.lt>
Date: Tue Dec 22 07:30:46 2020 +0200
xfree86/inputtest: Drop extraneous linux-specific include
Signed-off-by: Povilas Kanapickas <povilas@radix.lt>
commit 3ab3083cc20534c83a5a35f0af1f2779f8df0b7b
Author: Povilas Kanapickas <povilas@radix.lt>
Date: Sun Dec 20 01:11:43 2020 +0200
xi: Don't deliver emulated motion when there's no owner for touch end
Pointer-emulated touch events should only be delivered to the client
that owns the sequence even if it's a core client that became the
effective owner of the sequency by selecting for pointer press and
movement.
Currently the emulated events are delivered like this already (see
TouchResourceIsOwner() check in DeliverEmulatedMotionEvent()), except in
the case of TouchEnd, in which case the generated motion event is still
delivered to some client that's not necessarily the owner of the touch
sequence.
We already know whether a touch sequence that is about to emulate a
pointer event has an owner, we just need to check that. This further
allows to simplify DeliverEmulatedMotionEvent() as it won't ever be
called for non-owned touch events.
https://bugs.freedesktop.org/show_bug.cgi?id=60394
Signed-off-by: Povilas Kanapickas <povilas@radix.lt>
commit 365cbbfc4b99f7d9937d1b8b61f1483556a5b57a
Author: Adam Jackson <ajax@redhat.com>
Date: Fri Dec 18 09:36:30 2020 -0500
os, shm: fcntl()'s third argument is integer, not pointer
All of these uses were attempting to set FD_CLOEXEC, which happens to be
(1<<0). Since flags is going to be aligned in memory, its address is
never going to have the low bit set, so we were never actually setting
what we meant to.
Fixes: xorg/xserver#1114
commit 5e3900904ddc27f3d5580ce3a07929469d82fb5e
Author: Povilas Kanapickas <povilas@radix.lt>
Date: Fri Dec 18 04:39:07 2020 +0200
xfree86: Use different scroll increment than libinput in inputtest drv
Signed-off-by: Povilas Kanapickas <povilas@radix.lt>
commit 58465a3dd90c3bc698ba9ebb2c4a516df6ff7dfd
Author: Povilas Kanapickas <povilas@radix.lt>
Date: Thu Dec 17 03:08:06 2020 +0200
xfree86: Add scroll axes to touch devices in inputtest driver
Signed-off-by: Povilas Kanapickas <povilas@radix.lt>
commit 91a8013990a967bfd8c4145c4a79b86cc495a205
Author: Povilas Kanapickas <povilas@radix.lt>
Date: Thu Dec 17 03:08:05 2020 +0200
xfree86: Add support for pressure valuator axis in inputtest driver
Signed-off-by: Povilas Kanapickas <povilas@radix.lt>
commit 742b87f7ee5abd1406a77ac1baacbc43759bd275
Author: Povilas Kanapickas <povilas@radix.lt>
Date: Thu Dec 17 03:08:04 2020 +0200
xfree86: Fix axis labels for PointerAbsolute input of inputtest driver
Signed-off-by: Povilas Kanapickas <povilas@radix.lt>
commit e4a9f0bb4e36cffe4f7021bfa27753a9f42df2ff
Author: Olivier Fourdan <ofourdan@redhat.com>
Date: Mon Dec 14 15:38:42 2020 +0100
xwayland: Remove unneeded variable
Just a small code cleanup, there is no need to allocate a variable only
to check the return value of eglInitialize().
Signed-off-by: Olivier Fourdan <ofourdan@redhat.com>
Reviewed-by: Michel Dänzer <mdaenzer@redhat.com>
Reviewed-by: Tony Lindgren <tony@atomide.com>
commit 95be87db986470c8fce5ea91af0bbf3177f1de36
Author: Olivier Fourdan <ofourdan@redhat.com>
Date: Mon Dec 14 10:06:12 2020 +0100
xwayland: Refactor glamor EGL init
Glamor requires at least big GL 2.1 or GLES2, therefore Xwayland tries
to initialize first GL and then GLES2 if that fails.
It does that all in one single function which makes the code slightly
complicated, move the initialization of big-GL and GLES2 to separate
functions to help with readability of the code.
Signed-off-by: Olivier Fourdan <ofourdan@redhat.com>
Reviewed-by: Michel Dänzer <mdaenzer@redhat.com>
Reviewed-by: Tony Lindgren <tony@atomide.com>
commit 65673b02ef28884da3267fe1be579c20e2cddfa6
Author: Tony Lindgren <tony@atomide.com>
Date: Tue Dec 1 12:54:36 2020 +0200
xwayland: fix GL version check for GLES only devices
We currently bail out early for GLES only devices, and call
epoxy_gl_version() too early for GLES only that will make GLES only
devices return NULL for glGetString(GL_RENDERER).
Let's also add a check to see if we need to recreate the context to
avoid pointless warnings for GLES only devices as suggested by
Olivier Fourdan <ofourdan@redhat.com>.
Fixes: a506b4ec - xwayland: make context current to check GL version
Signed-off-by: Tony Lindgren <tony@atomide.com>
commit 5d73a8b59e0d01d1ee4cb484e4b43563cec2eee9
Author: Fabrice Fontaine <fontaine.fabrice@gmail.com>
Date: Thu Dec 10 22:32:59 2020 +0100
meson.build: KMS support also depends on dri2
Kernel modesettings support also depends on dri2, see
./hw/xfree86/drivers/modesetting/meson.build
So update meson.build to reflect the changes made in configure.ac by
commit 9c81b8f5b5d7bc987f73e8ef01a81e61205e58ee
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
commit 8c0afc9eb26a0866301072dec30717885fd14305
Author: Povilas Kanapickas <povilas@radix.lt>
Date: Sat Oct 10 02:09:05 2020 +0300
xfree86: Implement a test input driver
Signed-off-by: Povilas Kanapickas <povilas@radix.lt>
commit f95d81e88be07f43c91660e675d077ccd9ee47a9
Author: Olivier Fourdan <ofourdan@redhat.com>
Date: Mon Dec 7 14:21:56 2020 +0100
xwayland: Hold window buffer until released
The window buffer mechanism would free the pixmap and its corresponding
Wayland buffer as soon as window buffers are disposed.
Typically when the X11 window is unrealized, the current window buffer
is still used by the Wayland compositor and yet Xwayland will destroy
the buffer.
As a matter of fact, Xwayland should not destroy the Wayland buffer
before the wl_buffer.release event is received.
Add a reference counter to the window buffer similar to the to pixmap
reference counter to keep the buffer around until the release callback
is received.
Increase that reference counter on the buffer which will be attached to
the surface, and drop that reference when receiving the release callback
notification.
v2: Use a specific reference counter on the buffer rather than relying
on the pixmap refcnt (Michel Dänzer <mdaenzer@redhat.com>)
Signed-off-by: Olivier Fourdan <ofourdan@redhat.com>
Reviewed-by: Michel Dänzer <mdaenzer@redhat.com>
Acked-by: Martin Peres <martin.peres@mupuf.org>
commit 85d8eac4bcf44c077bb82aaae10ae45feb9c4e72
Author: Olivier Fourdan <ofourdan@redhat.com>
Date: Mon Dec 7 14:09:58 2020 +0100
xwayland: Hold cursor buffer until released
The cursor code would destroy the buffer as soon as the cursor is
unrealized on X11 side.
Yet, the Wayland compositor may still be using the buffer as long as a
released callback has not been received.
Increase the reference counter on the pixmap to hold a reference on the
pixmap when attaching it to the surface and use the new pixmap release
callback mechanism to release that reference when the buffer is
released.
Signed-off-by: Olivier Fourdan <ofourdan@redhat.com>
Acked-by: Martin Peres <martin.peres@mupuf.org>
Reviewed-by: Michel Dänzer <mdaenzer@redhat.com>
commit 79afbd608b7e6abc5d6d0f7e1fb6e460500c7934
Author: Olivier Fourdan <ofourdan@redhat.com>
Date: Thu Dec 10 10:10:05 2020 +0100
xwayland: Factorize common cursor code
The seat and tablet cursor functions are very similar, factorize the
commonalities to simplify the code and reduce the copy/paste.
Signed-off-by: Olivier Fourdan <ofourdan@redhat.com>
Reviewed-by: Michel Dänzer <mdaenzer@redhat.com>
commit 36e353bcf428c4e6a31292ffa749ea6395cba4a3
Author: Prabhu Sundararaj <prabhu.sundararaj@nxp.com>
Date: Wed Nov 25 08:02:41 2020 +0100
Remove check for useSIGIO option
Commit 6a5a4e60373c1386b311b2a8bb666c32d68a9d99 removed the option to
configure useSIGIO option. Indeed, the xfree86 SIGIO support was
reworked to use internal versions of OsBlockSIGIO and OsReleaseSIGIO.
As a result, useSIGIO is no longer needed and can dropped
Fixes: 6a5a4e60 - Remove SIGIO support for input [v5]
Closes: xorg/xserver#1107
Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Prabhu Sundararaj <prabhu.sundararaj@nxp.com>
Signed-off-by: Mylène Josserand <mylene.josserand@free-electrons.com>
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
commit 95539ab37baa1292d1f2daaa552f9741b0364cad
Author: Mariusz Ceier <mceier+freedesktop@gmail.com>
Date: Wed Dec 2 12:29:15 2020 +0100
xwayland: Replace LogMessage with LogMessageVerb
LogMessage logs only when the XLOG_VERBOSITY is >= 1, but by default
XLOG_VERBOSITY is 0, so for example warning about deprected -listen
parameter is never shown when running "Xwayland -listen 32 -help".
Signed-off-by: Mariusz Ceier <mceier+freedesktop@gmail.com>
commit 74627d13c75cab7aa73c0e713feae0934e780ba0
Author: Michal Srb <msrb@suse.com>
Date: Thu Jun 21 13:44:04 2018 +0200
xkb: Fix heap overflow caused by optimized away min.
Calling strlen on char[4] that does not need to contain '\0' is wrong and X
server may end up running into uninitialized memory.
In addition GCC 8 is clever enough that it knows that strlen on char[4] can
return 0, 1, 2, 3 or cause undefined behavior. With this knowledge it can
optimize away the min(..., 4). In reality it can cause the memcpy to be called
with bigger size than 4 and overflow the destination buffer.
Fixes: 83913de25d35 (xkb: Silence some compiler warnings)
Closes: https://gitlab.freedesktop.org/xorg/xserver/-/issues/288
Signed-off-by: Matt Turner <mattst88@gmail.com>
commit 446ff2d3177087b8173fa779fa5b77a2a128988b
Author: Matthieu Herrb <matthieu@herrb.eu>
Date: Thu Nov 12 19:15:07 2020 +0100
Check SetMap request length carefully.
Avoid out of bounds memory accesses on too short request.
ZDI-CAN 11572 / CVE-2020-14360
This vulnerability was discovered by:
Jan-Niklas Sohn working with Trend Micro Zero Day Initiative
Signed-off-by: Matthieu Herrb <matthieu@herrb.eu>
commit 87c64fc5b0db9f62f4e361444f4b60501ebf67b9
Author: Matthieu Herrb <matthieu@herrb.eu>
Date: Sun Oct 11 17:05:09 2020 +0200
Fix XkbSetDeviceInfo() and SetDeviceIndicators() heap overflows
ZDI-CAN 11389 / CVE-2020-25712
This vulnerability was discovered by:
Jan-Niklas Sohn working with Trend Micro Zero Day Initiative
Signed-off-by: Matthieu Herrb <matthieu@herrb.eu>
commit 11652706b0aa7d2609b710db0bd1262c5f6ed596
Author: Michel Dänzer <mdaenzer@redhat.com>
Date: Fri Nov 20 16:54:02 2020 +0100
present/wnmd: Translate update region to screen space
The region as passed in is in the source pixmap's coordinate space, so
intersecting it with the clipList (which is in screen space) resulted in
disappointment.
Fixes Firefox popups such as the hamburger menu when using the EGL
backend.
v2:
* Drop vblank->x/y_off from RegionTranslate call, since they're always
0 here (present_wnmd_check_flip rejects flips for x/y_off != 0).
Reported-by: Robert Mader <robert.mader@posteo.de>
Tested-by: Robert Mader <robert.mader@posteo.de>
Reviewed-by: Olivier Fourdan <ofourdan@redhat.com>
Tested-by: Joakim Tjernlund <joakim.tjernlund@infinera.com> # v1
commit b0530fe42286f340032566ce0bf22a5e9ddfe67f
Author: Michel Dänzer <mdaenzer@redhat.com>
Date: Tue Jan 28 18:51:53 2020 +0100
glx: Remove unused bswap_CARD64
GCC warned about it:
../../../glx/indirect_dispatch_swap.c:85:1: warning: ‘bswap_CARD64’ defined but not used [-Wunused-function]
85 | bswap_CARD64(const void *src)
| ^~~~~~~~~~~~
commit 3ce05a44f3d9b114af936f39e3f44552c5bf2c43
Author: Olivier Fourdan <ofourdan@redhat.com>
Date: Thu Nov 26 14:39:32 2020 +0100
modesetting: Fix build with DebugPresent() enabled
By default, the macro DebugPresent() is a no-op but it can be enabled
at build time for debugging purpose.
However, doing so prevents the code to build because one debug statement
tries to make use of a non-existent variable:
present.c: In function ‘ms_present_queue_vblank’:
present.c:147:18: error: ‘vbl’ undeclared (first use in this function)
147 | vbl.request.sequence));
| ^~~
present.c:49:32: note: in definition of macro ‘DebugPresent’
49 | #define DebugPresent(x) ErrorF x
| ^
Fix the build with DebugPresent() by removing the vbl variable from the
debug message.
Signed-off-by: Olivier Fourdan <ofourdan@redhat.com>
commit 95b79aa907789a16f736097abe959e906f86f63a
Author: Erik Kurzinger <ekurzinger@nvidia.com>
Date: Fri Nov 13 14:36:14 2020 -0800
GLX: fix context render type queries
Querying the GLX_RENDER_TYPE of a GLX context via glXQueryContext will
currently return the render type of the context's FB config, which is
a bitmask of GLX_RGBA_BIT / GLX_COLOR_INDEX_BIT / ... values. However,
this query should really return the render type that was specified
when creating the context, which is one of GLX_RGBA_TYPE /
GLX_COLOR_INDEX_TYPE / .... To enable this, save the render type when
creating a new context (defaulting to GLX_RGBA_TYPE if unspecified),
and then include this value in the context attributes sent to clients.
commit 9c81b8f5b5d7bc987f73e8ef01a81e61205e58ee
Author: Fabrice Fontaine <fontaine.fabrice@gmail.com>
Date: Wed Jan 8 22:51:42 2020 +0100
configure.ac: KMS support also depends on dri2
Kernel modesettings support also depends on dri2, see
http://cgit.freedesktop.org/xorg/xserver/tree/hw/xfree86/drivers/modesetting/Makefile.am#n46
Fix #479
Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
[Patch retrieved (with a small update of commit message) from:
https://git.buildroot.net/buildroot/tree/package/x11r7/xserver_xorg-server/1.20.6/0001-modesettings-needs-dri2.patch]
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
commit 682167475c1930f80a68de58e522ac08dbb35fa8
Author: Böszörményi Zoltán <zboszor@pr.hu>
Date: Thu Nov 14 09:29:20 2019 +0100
Introduce and use BUS_USB
With !155, the device bus ID received via udev is constructed
properly with the "usb:" prefix. But, it is not enough to
make the following line to work in Section "Device":
BusID "usb:0:1.2:1.0"
Introduce BUS_USB, so the prefix can be distinguished from BUS_PCI
and check the supplied BusID value against device->attribs->busid
in xf86PlatformDeviceCheckBusID().
Signed-off-by: Böszörményi Zoltán <zboszor@pr.hu>
commit c0dcadad6c18b06ddc6e349d7c58bfccb715ff55
Author: Reza Arbab <arbab@linux.ibm.com>
Date: Wed Mar 27 11:45:02 2019 -0500
linux: Fix udev ID_PATH parsing for udl devices
The ID_PATH for a udl device looks like this:
$ udevadm info /dev/dri/card2 | grep -w ID_PATH
E: ID_PATH=pci-0000:00:14.0-usb-0:9.1:1.0
The parsing added in 0816e8fca6194 ("linux: Make platform device probe
less fragile"), sets OdevAttributes::busid to "pci:0000:00:14.0", where
drmGetBusid() would have returned "3-9.1:1.0".
Identifying this as a "pci:*" device eventually causes the vendor/device
id check in probeSingleDevice() to fail, because a USB controller isn't
a supported device:
$ udevadm info --path=/devices/pci0000:00/0000:00:14.0 | grep -e VENDOR -e ID_PCI_CLASS
E: ID_PCI_CLASS_FROM_DATABASE=Serial bus controller
E: ID_VENDOR_FROM_DATABASE=Intel Corporation
Instead of parsing out "pci:0000:00:14.0" in this case, use
"usb:0:9.1:1.0" so the device probe will succeed.
Fixes: 0816e8fca6194 ("linux: Make platform device probe less fragile")
Signed-off-by: Reza Arbab <arbab@linux.ibm.com>
commit af4622d3f90382225afb83e3896cb6f236f30c0a
Author: Aaron Plattner <aplattner@nvidia.com>
Date: Fri Nov 20 19:43:25 2020 -0800
modesetting: Add missing copyright notices
I forgot to add these in commits 4fefe73fe, b6985d6b3, 245b9db03, and 4e670f128.
Signed-off-by: Aaron Plattner <aplattner@nvidia.com>
commit 07e6935030c8f0a757bce0a90c54b59d8bf47df6
Author: Povilas Kanapickas <povilas@radix.lt>
Date: Sat Oct 10 02:51:40 2020 +0300
test/xi2: Fix mask size in XISelectEvents test
XI2LASTEVENT identifies the bit number, not the mask size in bits. The
mask size in bits is XI2LASTEVENT + 1 and the mask size in bytes is
(XI2LASTEVENT + 8) / 8 or XI2MASKSIZE.
commit f5220117e970a40c09babe199709bb2db69c4311
Author: Povilas Kanapickas <povilas@radix.lt>
Date: Sat Oct 10 02:51:39 2020 +0300
dix: Extract FreezeThisEventIfNeededForSyncGrab()
commit 36f8dacc0652ddc5657e70942269f1f9e22710c6
Author: Povilas Kanapickas <povilas@radix.lt>
Date: Sat Oct 10 02:51:37 2020 +0300
dix: Extract ActivateGrabNoDeliver()
commit 23a8b62d34344575f9df9d057fb74bfefa94a77b
Author: Povilas Kanapickas <povilas@radix.lt>
Date: Sat Oct 10 02:51:36 2020 +0300
dix: Store replayed event into GrabInfoRec struct as InternalEvent*
commit 8bd8b3af1931629db548d39bb390edbef4315b0b
Author: Povilas Kanapickas <povilas@radix.lt>
Date: Sat Oct 10 02:51:35 2020 +0300
dix: Rename LISTENER_* to TOUCH_LISTENER_*
commit f6e0bf68333f7edb02e3b937bc164f6591da2320
Author: Povilas Kanapickas <povilas@radix.lt>
Date: Sat Oct 10 02:51:34 2020 +0300
Xi: Make check_for_touch_selection_conflicts() more generic
commit 56d720592155c55617728e8ddf1ba8192fe5d46c
Author: Povilas Kanapickas <povilas@radix.lt>
Date: Sat Oct 10 02:51:33 2020 +0300
dix: Extract DeliverDeviceClassesChangedEvent() utility function
commit 5b0c5344b7131f0812bcbf070194adaa2175d150
Author: Povilas Kanapickas <povilas@radix.lt>
Date: Sat Oct 10 02:51:32 2020 +0300
dix: Extract CopySprite() utility
commit acd819ac07bf66165f5d44af4a224f68c31bc30d
Author: Povilas Kanapickas <povilas@radix.lt>
Date: Sat Oct 10 02:51:31 2020 +0300
dix: Extract FixUpXI2DeviceEventFromWindow()
commit bb7aab6afe8655fc40ecff49791889b6512bb6a0
Author: Jon Turney <jon.turney@dronecode.org.uk>
Date: Sat Nov 21 15:45:49 2020 +0000
hw/xwin: Fix building with -fno-common
Provide an actual definition of noDriExtension where used, rather than a
tentative definition in a header, to fix compilation with -fno-common
(the default with gcc 10).
commit d18dcecbe08a9ff22e43f12b6b7679a6ef1a6eb0
Author: Olivier Fourdan <ofourdan@redhat.com>
Date: Mon Nov 2 10:24:45 2020 +0100
xwayland: Clean up pending eglstream on pixmap destroy
EGLStream implementation in Xwayland keeps a list of pending streams for
a window.
If the windows's pixmap is destroyed while there is a pending stream,
the pending stream will point to freed memory once the callback is
triggered.
Make sure to cancel the pending stream if there's one when the pixmap is
destroyed.
v2:
* Use xorg_list_for_each_entry() instead of the safe variant (Michel
Dänzer <mdaenzer@redhat.com>)
Signed-off-by: Olivier Fourdan <ofourdan@redhat.com>
Tested-by: Karol Szuster <karolsz9898@gmail.com>
Acked-by: Michel Dänzer <mdaenzer@redhat.com>
Closes https://gitlab.freedesktop.org/xorg/xserver/-/issues/1096
commit 662b2bcb84d5782aff1b93732eb010b0b43e5706
Author: Olivier Fourdan <ofourdan@redhat.com>
Date: Tue Sep 22 09:54:15 2020 +0200
xwayland: Use the pixmap release callback with EGLStream
Commit 77658741 - "xwayland: Add buffer release callback" added an API
to deal with Wayland buffer release callbacks.
The EGLstream implementation has its own wl_buffer callback, move that
to the buffer release API instead so we don't have to deal with Wayland
buffers directly and match the other Xwayland pixmap backend
implementations.
Signed-off-by: Olivier Fourdan <ofourdan@redhat.com>
Reviewed-by: Michel Dänzer <mdaenzer@redhat.com>
Tested-by: Erik Kurzinger <ekurzinger@nvidia.com>
commit e538601128c1a8bb4247a817da2bbb3f671811b3
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Sun Nov 1 15:52:48 2020 -0800
int10: wrap entire V_ADDR_R* macros in parens for safer expansion
Resolves warnings from Oracle Parfait static analyser:
Error: Misleading macro
Misleading macro [misleading-macro]:
misleading evaluation of ternary '?:' operator in expansion of macro V_ADDR_RB due to missing parentheses
at line 392 of hw/xfree86/int10/generic.c.
'|' operator has higher precedence than ternary '?:' operator inside macro body at line 431
low precedence ternary '?:' operator is hidden by expansion of macro V_ADDR_RB at line 431
Misleading macro [misleading-macro]:
misleading evaluation of ternary '?:' operator in expansion of macro V_ADDR_RB due to missing parentheses
at line 392 of hw/xfree86/int10/generic.c.
'<<' operator has higher precedence than ternary '?:' operator inside macro body at line 431
low precedence ternary '?:' operator is hidden by expansion of macro V_ADDR_RB at line 431
Misleading macro [misleading-macro]:
misleading evaluation of ternary '?:' operator in expansion of macro V_ADDR_RB due to missing parentheses
at line 392 of hw/xfree86/int10/generic.c.
'<<' operator has higher precedence than ternary '?:' operator inside macro body at line 442
low precedence ternary '?:' operator is hidden by expansion of macro V_ADDR_RB at line 442
Misleading macro [misleading-macro]:
misleading evaluation of ternary '?:' operator in expansion of macro V_ADDR_RB due to missing parentheses
at line 392 of hw/xfree86/int10/generic.c.
'<<' operator has higher precedence than ternary '?:' operator inside macro body at line 443
low precedence ternary '?:' operator is hidden by expansion of macro V_ADDR_RB at line 443
Misleading macro [misleading-macro]:
misleading evaluation of ternary '?:' operator in expansion of macro V_ADDR_RB due to missing parentheses
at line 392 of hw/xfree86/int10/generic.c.
'|' operator has higher precedence than ternary '?:' operator inside macro body at line 443
low precedence ternary '?:' operator is hidden by expansion of macro V_ADDR_RB at line 441
Misleading macro [misleading-macro]:
misleading evaluation of ternary '?:' operator in expansion of macro V_ADDR_RB due to missing parentheses
at line 392 of hw/xfree86/int10/generic.c.
'<<' operator has higher precedence than ternary '?:' operator inside macro body at line 443
low precedence ternary '?:' operator is hidden by expansion of macro V_ADDR_RB at line 443
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
commit a6574033f464c7cde02bce8f1b130ff6b2b2d9eb
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Sun Nov 1 15:45:08 2020 -0800
xkb: always set *mask_rtrn in XkbVirtualModsToReal
Resolves warning from Oracle Parfait static analyser:
Error: Uninitialised memory
Uninitialised memory variable [uninitialised-mem-var] (CWE 457):
Possible access to uninitialised memory referenced by variable 'mask'
at line 721 of xkb/XKBMisc.c in function 'XkbUpdateKeyTypeVirtualMods'.
Path in callee avoiding write at line 720
mask allocated at line 718
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
commit 034e792662a1c0c6ab52190e457b1f017bec01c6
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Sun Nov 1 13:55:59 2020 -0800
dmx: example code should set a good example
Resolves warning from Oracle Parfait static analyser:
Error: Unchecked result
Unchecked result [unchecked-result-call-X]:
Unchecked return value from call to XOpenDisplay. Value display must be ch
ecked to ensure this function was successful.
at line 73 of hw/dmx/examples/xbell.c in function 'main'.
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
commit d00594ebc7941a5491ad5583d6890ab7dc2ffc43
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Sun Nov 1 13:38:21 2020 -0800
AddInputDevice: only need to check once if we failed to calloc dev
Resolves warning from Oracle Parfait static analyser:
Warning: Impossible or redundant condition
Impossible or redundant condition [impossible-redundant-condition]:
Condition 'dev != NULL' of branch is determined by previous branch
at line 270 of dix/devices.c in function 'AddInputDevice'.
Condition 'dev != NULL' from this branch implies following branch is always true at line 262
Fixes: commit 493ad83323
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
commit 250db8708ac7ab11356b42faa493b6f1ba753013
Author: Michel Dänzer <mdaenzer@redhat.com>
Date: Tue Sep 15 11:49:20 2020 +0200
xwayland: Add and hook up test script
It runs XTS via piglit on (non-rootless) Xwayland on weston using the
headless backend.
Xwayland might use glamor if enabled in the build, but we're making sure
it uses software rendering.
v2:
* Use weston-info to wait for weston to be ready, instead of just a
fixed sleep. (Martin Peres)
v3:
* Build wayland 1.18 & weston 9.0 locally, since the packages in Debian
buster are too old for current Xwayland.
Acked-by: Olivier Fourdan <ofourdan@redhat.com>
commit 821399a9c920323e4934a2fd6375b86a151fa83c
Author: Michel Dänzer <mdaenzer@redhat.com>
Date: Wed Nov 11 12:45:36 2020 +0100
ci: Base docker image on Debian buster instead of testing
By its nature, testing incurs a risk of breaking something every time
we bump the image.
This requires building wayland-protocols locally, since the package in
buster is too old for current Xwayland.
Acked-by: Olivier Fourdan <ofourdan@redhat.com>
commit ab73c16930d67e5c80a23727804850406309b787
Author: Michel Dänzer <mdaenzer@redhat.com>
Date: Wed Sep 16 16:32:02 2020 +0200
ci: Update to the latest templates
They now ensure the image is up to date in forked projects, and we no
longer need to reconstruct the image name.
Acked-by: Olivier Fourdan <ofourdan@redhat.com>
commit 852d6d49109a3f0a9a73c86f5d5165d2c8dc5cbe
Author: Michel Dänzer <mdaenzer@redhat.com>
Date: Thu Nov 12 12:19:09 2020 +0100
ci: Explicitly list packages needed to build xserver
Instead of relying on apt-get build-dep.
Acked-by: Olivier Fourdan <ofourdan@redhat.com>
commit 8469935fe26659219560f425c7b35d564ad77324
Author: Michel Dänzer <mdaenzer@redhat.com>
Date: Thu Nov 12 12:01:45 2020 +0100
ci: Use a variable for ephemeral packages
So that they only need to be listed once.
Acked-by: Olivier Fourdan <ofourdan@redhat.com>
commit 996ba1b99a7212471d3c24359056c412de70c28d
Author: Michel Dänzer <mdaenzer@redhat.com>
Date: Wed Nov 11 18:22:28 2020 +0100
ci: Remove rendercheck Git tree
Noticed this was missing while making changes in this area.
Acked-by: Olivier Fourdan <ofourdan@redhat.com>
commit 8fc84a00254f642947397276e14d7740f502895d
Author: Michel Dänzer <mdaenzer@redhat.com>
Date: Wed Nov 11 19:02:50 2020 +0100
ci: Set GIT_STRATEGY=none for the container build job
It doesn't need a full checkout of the xserver Git tree, so this can
save some time and resources.
Acked-by: Olivier Fourdan <ofourdan@redhat.com>
commit 9a7515943f5a9b70567512cdc48cb2f688b3284b
Author: Michel Dänzer <mdaenzer@redhat.com>
Date: Wed Sep 16 12:55:35 2020 +0200
ci: Use $FDO_CI_CONCURRENT if set
To take advantage of more than 4 CPU cores available to the container.
Acked-by: Olivier Fourdan <ofourdan@redhat.com>
commit 28ed4b95e90fb225fc32cfdce16df603ab600fcd
Author: Olivier Fourdan <ofourdan@redhat.com>
Date: Tue Nov 10 10:40:05 2020 +0100
xwayland: Add a man page
Xwayland was missing a man page, add one.
Signed-off-by: Olivier Fourdan <ofourdan@redhat.com>
Reviewed-by: Martin Peres <martin.peres@mupuf.org>
commit d14cef853af52408e7ddba31b72cf5ac14389754
Author: Olivier Fourdan <ofourdan@redhat.com>
Date: Tue Nov 10 10:02:39 2020 +0100
xwayland: Do not list option "-eglstream" if not supported
As Xwayland is usually spawned by the Wayland server/compositor, its
command line options are not always adjustable.
Yet, if EGLStream is not supported in a given Xwayland build, the option
will do nothing (yet we must still accept it otherwise Xwayland would
refuse to run if the Wayland compositor uses it).
If Xwayland was built without support for EGLStream, there is not point
in showing the option in the help message though.
Signed-off-by: Olivier Fourdan <ofourdan@redhat.com>
Reviewed-by: Martin Peres <martin.peres@mupuf.org>
commit d163f938a00c177c5ff28e779993f18ee69476d4
Author: Olivier Fourdan <ofourdan@redhat.com>
Date: Tue Nov 10 09:53:57 2020 +0100
xwayland: Add help entry for -shm
The command line options "-shm" is used to instruct Xwayland to prefer
shared-memory for passing buffers to the Wayland server, rather than
using glamor and DRI3.
The option was there from the beginning, yet not documented in the
"-help" message.
Signed-off-by: Olivier Fourdan <ofourdan@redhat.com>
Reviewed-by: Martin Peres <martin.peres@mupuf.org>
commit df3aa4922fd7e256169e541188b724f67ca948e1
Author: Michel Dänzer <mdaenzer@redhat.com>
Date: Fri Nov 6 10:14:19 2020 +0100
xwayland: Make window_get_client_toplevel non-recursive
Noticed while reading the code.
Reviewed-by: Olivier Fourdan <ofourdan@redhat.com>
commit 899cebb76ab7754fea49f7babcd64a7e94052cc8
Author: Olivier Fourdan <ofourdan@redhat.com>
Date: Tue Oct 27 16:33:55 2020 +0100
configure: Build hashtable for Xres and glvnd
With autoconf, hashtable support is built along with Xres support.
Yet, glvnd also use it, so when disabling Xres from configure, the
build will fail at link time because hashtable functions are not
available.
Untie the build of hashtable from Xres support, just like meson build
does.
Signed-off-by: Olivier Fourdan <ofourdan@redhat.com>
Closes: https://gitlab.freedesktop.org/xorg/xserver/-/issues/1091
commit 606ba7fc51e5420646f75c4e672fbe61eb7c7e6e
Author: Olivier Fourdan <ofourdan@redhat.com>
Date: Thu Nov 5 18:35:54 2020 +0100
xwayland: Create an xwl_window for toplevel only
One general assumption in Xwayland is that the xwl_window remains the
same for all the child windows of the toplevel window.
When mapping a new X11 window, ensure_surface_for_window() checks for an
existing xwl_window by using xwl_window_get() which will just check for
the registered xwl_window for the window.
That means that a client mapping a child window of an existing window
with a xwl_window will get another different xwl_window.
If an X11 client issues a Present request on the parent window, hence
placed underneath its child window of the same size, the Wayland
compositor may not send the frame callback event for the parent's
Wayland surface which is reckoned to be not visible, obscured behind
the other Wayland surface for the child X11 window.
That bug affects some games running in wine which may get 1 fps because
the repaint occurs only on timeout with a long interval (as with, e.g.
https://bugs.winehq.org/show_bug.cgi?id=47066)
Fix ensure_surface_for_window() by using xwl_window_from_window() which
will walk the window tree, so that a child window won't get another
xwl_window than its parent.
https://gitlab.freedesktop.org/xorg/xserver/-/issues/1099
See-also: https://bugs.winehq.org/show_bug.cgi?id=47066
Signed-off-by: Olivier Fourdan <ofourdan@redhat.com>
Reviewed-by: Michel Dänzer <mdaenzer@redhat.com>
commit ffd02d9b26bd560849c407a6dd4f5c4d7d2c1736
Author: Olivier Fourdan <ofourdan@redhat.com>
Date: Mon Nov 2 15:44:31 2020 +0100
xwayland: non-rootless requires the XDG-WM-Base protocol
When running non-rootless, Xwayland requires that the Wayland compositor
supports the XDG-WM-Base protocol.
Check for XDG-WM-Base protocol support at startup and exit cleanly if
missing rather than segfaulting later in ensure_surface_for_window()
while trying to use xdg_wm_base_get_xdg_surface().
Signed-off-by: Olivier Fourdan <ofourdan@redhat.com>
Reviewed-by: Michel Dänzer <mdaenzer@redhat.com>
Reviewed-by: Simon Ser <contact@emersion.fr>
commit 7a7e55c5c1d6461a9f4d9a4e0129c1c6e1fd3d66
Author: Alex Goins <agoins@nvidia.com>
Date: Mon Oct 5 18:19:52 2020 -0500
glamor: Update pixmap's devKind when making it exportable
When making a pixmap exportable, glamor will currently create a temporary
exported pixmap backed by a GBM bo, with the devKind updated to the stride of
the bo. However, when the backing of the exported pixmap is swapped into the
original, the devKind of the original is not updated.
Some GBM bos may get implicitly padded, in which case the devKind of the pixmap
will not match the stride of the backing bo. For example, an 800x600 pixmap will
have a devKind of 3200, but the bo's stride will be 3328. This can cause
corruption with PRIME, when the sink uses the wrong stride to display the shared
pixmap.
This commit changes glamor_make_pixmap_exportable() to update the devKind of the
original pixmap after it swaps exported pixmap's backing into it, keeping
everything consistent.
Fixes issue #1018.
Signed-off-by: Alex Goins <agoins@nvidia.com>
Signed-off-by: Aaron Plattner <aplattner@nvidia.com>
Reviewed-by: Michel Dänzer <mdaenzer@redhat.com>
commit affc47452507d7e4605fd8c9a16db078e4f2aea2
Author: Adam Jackson <ajax@redhat.com>
Date: Tue Sep 22 16:13:00 2020 -0400
xwayland: Drop the separate refcount for the xwl_pixmap
Instead, bump the pixmap's refcount at the bottom of post_damage to
reflect the compositor's hold on the buffer, and "destroy" the pixmap in
the buffer release callback (which will dec the pixmap's refcount and
free if necessary).
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit 4e670f1281ad75c5673b6ac75645036d810da8d9
Author: Aaron Plattner <aplattner@nvidia.com>
Date: Fri Oct 25 00:06:40 2019 -0700
modesetting: Add CTM RandR property
When the "CTM" (color transform matrix) modesetting property is available,
create a corresponding RandR property.
To match the format of the property available in the amdgpu driver, expose it as
an array of 18 32-bit XA_INTEGERs representing a 3x3 matrix in row-major order,
where each entry is a S31.32 sign-magnitude fixed-point number with the
fractional part listed first.
Signed-off-by: Aaron Plattner <aplattner@nvidia.com>
Acked-by: Michel Dänzer <mdaenzer@redhat.com>
Reviewed-by: James Jones <jajones@nvidia.com>
commit 245b9db03a1e1189b992409283e3d88b5d56e62d
Author: Aaron Plattner <aplattner@nvidia.com>
Date: Thu Oct 24 13:46:35 2019 -0700
modesetting: Use GAMMA_LUT when available
If the kernel exposes GAMMA_LUT and GAMMA_LUT_SIZE properties and the size is
not what the server has pre-configured for the crtc, free the old gamma ramp
memory allocated by the server and replace it with new allocations of the
appropriate size.
In addition, when GAMMA_LUT is available, use drmModeCreatePropertyBlob() and
drmModeObjectSetProperty() to set the gamma ramp rather than using the legacy
drmModeCrtcSetGamma() function.
Add a new option "UseGammaLUT" to allow disabling this new behavior and falling
back to drmModeCrtcSetGamma() unconditionally.
Signed-off-by: Aaron Plattner <aplattner@nvidia.com>
commit b6985d6b3fb3e9ae36f638b0fd65cfad3d4bbd46
Author: Aaron Plattner <aplattner@nvidia.com>
Date: Thu Oct 24 13:41:39 2019 -0700
modesetting: Query properties even in non-atomic mode
Modeset properties can be set even when ms->atomic_modeset is disabled by using
the drmModeObjectSetProperty() function.
This will be necessary in a later change in order to set the GAMMA_LUT and CTM
properties.
Signed-off-by: Aaron Plattner <aplattner@nvidia.com>
commit 4fefe73feaee31a992b284963599d63feb598807
Author: Aaron Plattner <aplattner@nvidia.com>
Date: Tue Oct 22 10:06:30 2019 -0700
modesetting: Store property values in drmmode_prop_info_rec
A later change will need to read the value of the GAMMA_LUT_SIZE property.
Signed-off-by: Aaron Plattner <aplattner@nvidia.com>
commit 1626e9fa77c0d3715d38ededd43656aa6d942bd9
Author: Peter Harris <pharris@opentext.com>
Date: Wed Sep 30 16:01:06 2020 -0400
glx: set errorValue when returning GLXBadFBConfig
client->errorValue is already set in validGlxFBConfig. Set it in
__glXDisp_CreateContextAttribsARB for consistency.
Signed-off-by: Peter Harris <pharris@opentext.com>
commit 96d19e898acb56d8fc6e6febbc6498f67cdd66a0
Author: Adam Jackson <ajax@redhat.com>
Date: Thu Sep 24 17:08:27 2020 -0400
glx: Implement GLX_EXT_get_drawable_type
Trivial extension to let the client query whether this is a window
pixmap or pbuffer. Mostly for Mesa's convenience when setting up
drawable state, but plausibly useful for apps and middleware as well.
Upstream OpenGL Registry merge request:
https://github.com/KhronosGroup/OpenGL-Registry/pull/425
commit c15dd0ba4893f79f7181e783cb1ba404edca917a
Author: Bernhard Übelacker <bernhardu@mailbox.org>
Date: Sun Sep 27 18:03:48 2020 +0200
os: Fix instruction pointer written in xorg_backtrace
The address retrieved in "pip.start_ip" is not necessarily the same
address as unw_get_proc_name finds as nearest symbol and returns in "off".
Therefore using "pip.start_ip + off" is not reliable, at least
visible in the binaries from the Debian repository.
Bug-Debian: https://bugs.debian.org/971088
Signed-off-by: Bernhard Übelacker <bernhardu@mailbox.org>
commit acc581c96f16fe3c097dfd0da4ff33f7b104597d
Author: Dor Askayo <dor.askayo@gmail.com>
Date: Sat Sep 26 15:54:45 2020 +0300
dri3: Add missing libdrm dependency in Makefile.am
Fixes: 0ce93e5ba774 "dri3: Include dix-config.h instead of
xorg-config.h"
Signed-off-by: Dor Askayo <dor.askayo@gmail.com>
commit efb3abddd49fb75bd6d0e31046fed43d258c93da
Author: Kishore Kadiyala <kishore.kadiyala@intel.com>
Date: Sat Sep 19 01:28:14 2020 +0530
modesetting: keep going if a modeset fails on EnterVT
There was a time when setting a mode on a CRTC would not depend on the
associated connector's state. If a mode had been set successfully once,
it would mean it would work later on.
This changed with the introduction of new connectors type that now
require a link training sequence (DP, HDMI 2.0), and that means that
some events may have happened while the X server was not master that
would then prevent the mode from successfully be restored to its
previous state.
This patch relaxes the requirement that all modes should be restored on
EnterVT, or the entire X-Server would go down by allowing modesets to
fail (with some warnings). If a modeset fails, the CRTC will be
disabled, and a RandR event will be sent for the desktop environment to
fix the situation as well as possible.
Additional patches might be needed to make sure that the user would
never be left with all screens black in some scenarios.
v2 (Martin Peres):
- whitespace fixes
- remove the uevent handling (it is done in a previous patch)
- improve the commit message
- reduce the size of the patch by not changing lines needlessly
- return FALSE if one modeset fails in ignore mode
- add comments/todos to explain why we do things
- disable the CRTCs that failed the modeset
Signed-off-by: Kishore Kadiyala <kishore.kadiyala@intel.com>
Signed-off-by: Martin Peres <martin.peres@linux.intel.com>
Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Tested-by: Kishore Kadiyala <kishore.kadiyala@intel.com>
Closes: #1010
commit 293cf660c95d7ba36510bcc4114d7fd5c5f3801c
Author: Martin Peres <martin.peres@linux.intel.com>
Date: Fri Apr 24 18:06:16 2020 +0300
modesetting: check the kms state on EnterVT
Normally, we would receive a uevent coming from Linux's DRM subsystem,
which would trigger the check for disappearing/appearing resources.
However, this event is not received when X is not master (another VT
is selected), and so the userspace / desktop environment would not be
notified about the changes that happened while X wasn't master.
To fix the issue, this patch forces a refresh on EnterVT by splitting
the kms-checking code from the uevent handling into its own (exported)
function called drmmode_update_kms_state. This function is then called
from both the uevent-handling function, and on EnterVT right before
restoring the modes.
Signed-off-by: Martin Peres <martin.peres@linux.intel.com>
Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Acked-by: Kishore Kadiyala <kishore.kadiyala@intel.com>
Tested-by: Kishore Kadiyala <kishore.kadiyala@intel.com>
commit 4c00369024c9754e670fca37804711fef2980e2f
Author: Povilas Kanapickas <povilas@radix.lt>
Date: Tue Sep 22 20:53:49 2020 +0300
Bump input minor ABI due to addition of input event drain callback
Signed-off-by: Povilas Kanapickas <povilas@radix.lt>
commit 5eb985e3531b69d3ddc4dc0d4b69b4280b1626f8
Author: Povilas Kanapickas <povilas@radix.lt>
Date: Thu Sep 17 00:55:17 2020 +0300
mi: Add a callback to notify driver about input event submission
This is useful for mock input drivers that control the server in
integration tests. Given that input submission happens on a different
thread than processing, it's otherwise impossible for the driver to
synchronize with the completion of the processing of submitted events.
Signed-off-by: Povilas Kanapickas <povilas@radix.lt>
commit a5f439dcd21b4fda093cb382bb1a758b434a1444
Author: Olivier Fourdan <ofourdan@redhat.com>
Date: Mon Sep 14 15:39:10 2020 +0200
xwayland: Remove pending stream reference when freeing
The EGLStream backend keeps a queue of pending streams for each Xwayland
window.
However, when this pending queue is freed, the corresponding private
data may not be cleared (typically if the pixmap for this window has
changed before the compositor finished attaching the consumer for the
window's pixmap's original eglstream), leading to a use-after-free and a
crash when trying to use that data as the window pixmap.
Make sure to clear the private data when the pending stream is freed.
Closes: https://gitlab.freedesktop.org/xorg/xserver/-/issues/1055
Signed-off-by: Olivier Fourdan <ofourdan@redhat.com>
Tested-by: Karol Szuster <karolsz9898@gmail.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
commit 0b86c0c36241989d7e9662d007c5297fe22ae8b5
Author: Olivier Fourdan <ofourdan@redhat.com>
Date: Mon Sep 14 14:35:22 2020 +0200
xwayland: Add a flag for n-buffers in EGL backend
Using multiple window buffers crashes with EGLStream, which does not
need it anyway as this is handled through EGL directly.
Add a flag to the EGL backend to indicate whether it would benefit from
multiple buffers and use this in the get_buffer() function.
Thanks to Adam Jackson <ajax@redhat.com> for pointing out that issue
with EGLStream.
v2: Fix logical test (Adam Jackson <ajax@redhat.com>)
Signed-off-by: Olivier Fourdan <ofourdan@redhat.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
commit ae84f14fb554e5ad54c51c2e6d52ab4a68bf7a0a
Author: Olivier Fourdan <ofourdan@redhat.com>
Date: Mon Sep 14 14:26:34 2020 +0200
xwayland: Add a flag to expose EGL backend features
The present flip does not work with the EGLStream backend. Similarly,
the EGLStream backend does not require the buffer to be flushed as
eglSwapBuffers() should take care of this.
Instead of actually checking the backend in use in the present code,
add a flag in the form of a bitfield to the EGL backend to indicate
its features and requirements.
This should not introduce any functional change.
v2: Fix logical test (Adam Jackson <ajax@redhat.com>)
Signed-off-by: Olivier Fourdan <ofourdan@redhat.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
commit 239ebdc9e447d4f836d0c2aa6068c6064fffb46c
Author: Greg V <greg@unrelenting.technology>
Date: Tue Sep 15 17:41:04 2020 +0300
xwayland: use drmGetNodeTypeFromFd for checking if a node is a render one
Major/minor numbers are a.. major (ha) source of pain in FreeBSD porting.
In this case, Xwayland was thinking that /dev/dri/card0 is already a render node,
because the st_rdev on FreeBSD was passing the Linux-style check,
and because of the assumption, acceleration would fail because
various ioctls like AMDGPU_INFO would be denied on the non-render node.
Switch to libdrm's function that already works correctly on all platforms.
Signed-off-by: Greg V <greg@unrelenting.technology>
Reviewed-by: Emmanuel Vadot <manu@FreeBSD.org>
commit add3df2001a2eadc41c47683f50fdc0fd8b14964
Author: Michel Dänzer <mdaenzer@redhat.com>
Date: Tue Sep 15 11:43:16 2020 +0200
Consolidate fourcc.h
Move the copy in hw/xfree86/common to include/, and remove the one in
hw/kdrive/src/.
Fixes DIX glamor code including an xfree86 DDX header.
commit 62d8c1cc69e273199c9eb23e87b8631d32c56d33
Author: Michel Dänzer <mdaenzer@redhat.com>
Date: Tue Sep 15 11:41:34 2020 +0200
present: Include dix-config.h instead of xorg-config.h
This is DIX code.
commit 0ce93e5ba774a53459bac8c23016c5d3232038eb
Author: Michel Dänzer <mdaenzer@redhat.com>
Date: Tue Sep 15 11:38:55 2020 +0200
dri3: Include dix-config.h instead of xorg-config.h
This is DIX code.
commit 97f858d336a85cb49de6275918793c773d5d9db1
Author: Uday Kiran Pichika <pichika.uday.kiran@intel.com>
Date: Wed Aug 19 16:20:15 2020 +0530
modesetting: Allow users to opt-in VRR support
Fetch VariableRefresh option value from X conf file for
modesetting backend DDX driver. This option defaults to false,
and must be set to "true" in conf file for variable refresh
support in the DDX driver.
Signed-off-by: Uday Kiran Pichika <pichika.uday.kiran@intel.com>
commit ede2c32ce116138ddf081932ea2c33bd6f4b6990
Author: Uday Kiran Pichika <pichika.uday.kiran@intel.com>
Date: Thu Jun 18 16:07:33 2020 +0530
modesetting: Detect changes to the _VARIABLE_REFRESH window properties
Window wrappers gets the notification when the window
properties changes. These wrappers are mainly used to
keep track of per-window _VARIABLE_REFRESH property values.
These changes have been ported from AMDGPU
Signed-off-by: Uday Kiran Pichika <pichika.uday.kiran@intel.com>
commit 9823ea4ed24db76b1e61d69a8da8f7599857d02a
Author: Uday Kiran Pichika <pichika.uday.kiran@intel.com>
Date: Thu Jun 18 11:31:31 2020 +0530
modesetting: Lay the foundation for enabling VRR
These changes have been ported from AMD GPU DDX driver.
This patch adds support for setting the CRTC variable refresh property
for suitable windows flipping via the Present extension.
In order for a window to be suitable for variable refresh it must have
the _VARIABLE_REFRESH property set by the MESA and inform Modesetting
DDX driver with window property updates.
Then the window must pass the checks required to be suitable for
Present extension flips - it must cover the entire X screen and no
other window may already be flipping. And also DRM connector should
be VRR capable.
With these conditions met every CRTC for the X screen will have their
variable refresh property set to true.
Kernel Changes to support this feature in I915 driver is under development.
Tested with DOTA2, Xonotic and custom GLX apps.
Signed-off-by: Uday Kiran Pichika <pichika.uday.kiran@intel.com>
commit 42878790708c2a9ecdbb81f635e5e3a34842e34c
Author: Michel Dänzer <mdaenzer@redhat.com>
Date: Fri Sep 4 13:03:35 2020 +0200
present/wnmd: Remove no-op present_wnmd_flip_destroy
Reviewed-by: Roman Gilg <subdiff@gmail.com>
commit 59c40b0ee7cd864dd098f5ac41bbfe96e7bd0e9b
Author: Michel Dänzer <mdaenzer@redhat.com>
Date: Fri Sep 4 13:02:04 2020 +0200
present/wnmd: Remove dead present_wnmd_can_window_flip
present_can_window_flip is only called from the Xorg modesetting
driver, never in WNMD mode.
Reviewed-by: Roman Gilg <subdiff@gmail.com>
commit b6b1161fd7ac409156fb69439897bcabdeacf393
Author: Michel Dänzer <mdaenzer@redhat.com>
Date: Fri Sep 4 12:50:00 2020 +0200
present/wnmd: Remove dead check from present_wnmd_check_flip
present_wnmd_toplvl_pixmap_window returns a window with the same window
pixmap, so the check could never fail.
Reviewed-by: Roman Gilg <subdiff@gmail.com>
commit 4c25356d6cd908c5030c70e712076dff318ac00d
Author: Michel Dänzer <mdaenzer@redhat.com>
Date: Thu Aug 27 18:36:15 2020 +0200
xwayland: Check window pixmap in xwl_present_check_flip2
We can only flip if the window pixmap matches that of the toplevel
window. Doing so regardless could cause the toplevel window pixmap to
get destroyed while it was still referenced by the window, resulting in
use-after-free and likely a crash.
Closes: https://gitlab.freedesktop.org/xorg/xserver/-/issues/1033
Reviewed-by: Olivier Fourdan <ofourdan@redhat.com>
Reviewed-by: Roman Gilg <subdiff@gmail.com>
commit 7ac303c7b1e3b1be79ba3648e217798683e65a99
Author: Michel Dänzer <mdaenzer@redhat.com>
Date: Fri Aug 28 11:57:39 2020 +0200
present/wnmd: Can't use page flipping for windows clipped by children
Noticed this was missing while working on the following fix.
v2:
* Dropped present_wnmd_can_window_flip hunk (that function is never
called, will be cleaned up in a follow-up MR).
Reviewed-by: Olivier Fourdan <ofourdan@redhat.com> # v1
Reviewed-by: Roman Gilg <subdiff@gmail.com>
commit 727df0a74e75982f4352f0a3e574fcf6db3372f7
Author: Roman Gilg <subdiff@gmail.com>
Date: Mon Aug 10 19:14:28 2020 +0200
xwayland: Replace need_rotate boolean with simple check on xdg-output
The need_rotate variable is only used once anymore and had semantics which lead
to errors in the past. In particular when negated we are dealing with a double
negation.
The variable gets replaced with a simple check on the xdg-output directly.
Signed-off-by: Roman Gilg <subdiff@gmail.com>
commit da791ed9fdc715dcbe73c60a4c4ab2d385ab28e4
Author: Roman Gilg <subdiff@gmail.com>
Date: Thu Aug 13 16:55:03 2020 +0200
Revert "xserver: Fix a typo"
This reverts commit 427f8bc00981703abe3153b6da575faa69fe2748.
When receiving an output update for the mode size we need to rotate the stored
width and height values if and only if we have an xdg-output for this output
since in this case the stored values describe the output's size in logical
space, i.e. rotated.
The here reverted commit made a code change with which we would not rotate though
when an xdg-output was available since in this case the need_rotate variable was
set to False what caused in the check afterwards the first branch to execute.
commit 92f4a9ade3c97bda833b0e10f10856b2542f793c
Author: Roman Gilg <subdiff@gmail.com>
Date: Mon Aug 10 19:01:52 2020 +0200
xwayland: Switch width and height argument order
That is just a small style-change to the output_get_new_size function. The
function before did take first the height and then the width argument, what
is unusual since resolutions are normally named the other way around, for
example 1920x1080. Also compare the update_screen_size function.
Therefore change the order of arguments for output_get_new_size.
Signed-off-by: Roman Gilg <subdiff@gmail.com>
commit 1805383d9eb17ef8ac159366c684ac85b3d53731
Author: Roman Gilg <subdiff@gmail.com>
Date: Mon Aug 10 18:58:56 2020 +0200
xwayland: simplify output_get_new_size function
We can just read out the xdg_output field of the provided xwl_output to check
if a rotation is necessary or not.
This makes the function easier to understand. Additionally some documentation
is added.
Signed-off-by: Roman Gilg <subdiff@gmail.com>
commit 919f1f46fc67dae93b2b3f278fcbfc77af34ec58
Author: Michel Dänzer <mdaenzer@redhat.com>
Date: Mon Aug 31 12:10:43 2020 +0200
xfree86: Take second reference for SavedCursor in xf86CursorSetCursor
The same pointer is kept in CurrentCursor as well, therefore two
RefCursor calls are needed.
Fixes use-after-free after switching VTs.
Closes: https://gitlab.freedesktop.org/xorg/xserver/-/issues/1067
commit 2902b78535ecc6821cc027351818b28a5c7fdbdc
Author: Matthieu Herrb <matthieu@herrb.eu>
Date: Tue Aug 18 14:55:01 2020 +0200
Fix XRecordRegisterClients() Integer underflow
CVE-2020-14362 ZDI-CAN-11574
This vulnerability was discovered by:
Jan-Niklas Sohn working with Trend Micro Zero Day Initiative
Signed-off-by: Matthieu Herrb <matthieu@herrb.eu>
commit 144849ea27230962227e62a943b399e2ab304787
Author: Matthieu Herrb <matthieu@herrb.eu>
Date: Tue Aug 18 14:52:29 2020 +0200
Fix XkbSelectEvents() integer underflow
CVE-2020-14361 ZDI-CAN 11573
This vulnerability was discovered by:
Jan-Niklas Sohn working with Trend Micro Zero Day Initiative
Signed-off-by: Matthieu Herrb <matthieu@herrb.eu>
commit c940cc8b6c0a2983c1ec974f1b3f019795dd4cff
Author: Matthieu Herrb <matthieu@herrb.eu>
Date: Tue Aug 18 14:49:04 2020 +0200
Fix XIChangeHierarchy() integer underflow
CVE-2020-14346 / ZDI-CAN-11429
This vulnerability was discovered by:
Jan-Niklas Sohn working with Trend Micro Zero Day Initiative
Signed-off-by: Matthieu Herrb <matthieu@herrb.eu>
commit f7cd1276bbd4fe3a9700096dec33b52b8440788d
Author: Matthieu Herrb <matthieu@herrb.eu>
Date: Tue Aug 18 14:46:32 2020 +0200
Correct bounds checking in XkbSetNames()
CVE-2020-14345 / ZDI 11428
This vulnerability was discovered by:
Jan-Niklas Sohn working with Trend Micro Zero Day Initiative
Signed-off-by: Matthieu Herrb <matthieu@herrb.eu>
commit 1cccb486d48a5d2e7649836b993805bb65dc09e3
Author: Michel Dänzer <mdaenzer@redhat.com>
Date: Tue Jul 28 18:40:47 2020 +0200
present/wnmd: Execute copies at target_msc-1 already
It always takes one update cycle for the copy to become visible on the
host windowing system, so waiting for the target MSC resulted in 1 cycle
delay.
We re-use the idle list for copies which were executed but need their
completion event sent.
Fixes black seams when resizing the "Builder" sub-window of
GDK_BACKEND=x11 gtk4-demo
on Xwayland (see
https://gitlab.gnome.org/GNOME/mutter/-/issues/1290#note_873557).
Unfortunately, this cannot completely fix the seams with apps which
queue up multiple frames in advance, since there's always at least one
queued frame corresponding to the old window size. But it should at
least help a little in that case as well.
v2:
* Bug fix: Don't update exec_msc in present_wnmd_check_flip_window.
(Roman Gilg)
* Use exec_msc = target_msc - 1 instead of exec_msc--, and add a
comment, for clarity.
v3:
* Drop exec_msc = target_msc again in present_wnmd_execute.
* present_execute_copy should never set vblank->queued in
present_wnmd_execute now, so replace that branch with an assertion.
(Roman Gilg)
Reviewed-by: Roman Gilg <subdiff@gmail.com>
Tested-by: Roman Gilg <subdiff@gmail.com>
commit d14ea667feccf085c7d66a7c63f380975e07af66
Author: Michel Dänzer <mdaenzer@redhat.com>
Date: Tue Jul 28 18:53:45 2020 +0200
present/wnmd: Move up present_wnmd_queue_vblank
Allowing it to be called from more functions than before. No functional
change.
Reviewed-by: Roman Gilg <subdiff@gmail.com>
Tested-by: Roman Gilg <subdiff@gmail.com>
commit b0b3159abd8001fa3f6dfc44a288a95a62aa5cf6
Author: Michel Dänzer <mdaenzer@redhat.com>
Date: Wed Aug 12 17:38:33 2020 +0200
present: Add present_vblank::exec_msc field
For tracking the MSC when the present can be executed separately from
the target MSC.
Allows removing the requeue field instead, plus more later.
v2:
* Rename wait_msc → exec_msc (Roman Gilg)
* Use exec_msc = target_msc instead of exec_msc++, for clarity.
* Bug fix: Set exec_msc = target_msc also if present_flip returned
false in present_execute.
v3:
* Set exec_msc = target_msc also if present_wnmd_flip returned
false in present_wnmd_execute, for consistency.
v4:
* Specifically check for exec_msc == crtc_msc + 1 in
present_execute_wait/copy, to avoid re-introducing
https://bugs.freedesktop.org/show_bug.cgi?id=94596 .
Reviewed-by: Roman Gilg <subdiff@gmail.com>
Tested-by: Roman Gilg <subdiff@gmail.com>
commit 4c92dea952f7fed19857904f0f552900257ef4b9
Author: Michel Dänzer <mdaenzer@redhat.com>
Date: Tue Jul 28 18:48:42 2020 +0200
present: Move flip target_msc adjustment out of present_vblank_create
Preparation for different handling between SCMD & WNMD. No functional
change intended.
Reviewed-by: Roman Gilg <subdiff@gmail.com>
Tested-by: Roman Gilg <subdiff@gmail.com>
commit 032af35657aa95c6bbdb74ff8c72e535b9b56cfa
Author: Michel Dänzer <mdaenzer@redhat.com>
Date: Fri Jul 24 18:21:05 2020 +0200
glamor: Fix glamor_poly_fill_rect_gl xRectangle::width/height handling
(Using GLSL 1.30 or newer)
The width/height members of xRectangle are unsigned, but they were
being interpreted as signed when converting to floating point for the
vertex shader, producing incorrect drawing for values > 32767.
v2:
* Use separate GL_UNSIGNED_SHORT vertex attribute for width/height.
(Eric Anholt)
Reviewed-by: Eric Anholt <eric@anholt.net>
commit b22b4da980b763af5124f26627cad93983542d6b
Author: Adam Jackson <ajax@redhat.com>
Date: Fri Aug 14 19:19:46 2020 -0400
glamor: Fix debugging callback setup on GLES
You will not find GL_ARB_* extensions in a GLES context by definition,
the droid you're looking for is named GL_KHR_debug.
Reviewed-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Michel Dänzer <mdaenzer@redhat.com>
commit 5c20e4b834145f590c68dbc98e33c7d3d710001a
Author: Olivier Fourdan <ofourdan@redhat.com>
Date: Wed Jun 3 10:17:13 2020 +0200
xwayland: Disable the MIT-SCREEN-SAVER extension when rootless
Xwayland is just a Wayland client, no X11 screensaver should be
expected to work reliably on Xwayland when running rootless because
Xwayland cannot grab the input devices so it has no way to actually
lock the screen managed by the Wayland compositor.
Turn off the screensaver on Xwayland when running rootless by setting
the screensaver timeout and interval and their default values to zero
and disable the MIT-SCREEN-SAVER extension.
Closes: https://gitlab.freedesktop.org/xorg/xserver/-/issues/1051
Signed-off-by: Olivier Fourdan <ofourdan@redhat.com>
Reviewed-by: Michel Dänzer <mdaenzer@redhat.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
commit aac28e162e5108510065ad4c323affd6deffd816
Author: Matthieu Herrb <matthieu@herrb.eu>
Date: Sat Jul 25 19:33:50 2020 +0200
fix for ZDI-11426
Avoid leaking un-initalized memory to clients by zeroing the
whole pixmap on initial allocation.
This vulnerability was discovered by:
Jan-Niklas Sohn working with Trend Micro Zero Day Initiative
Signed-off-by: Matthieu Herrb <matthieu@herrb.eu>
Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
commit 9d8e7c4828747f6bba438528c6ef6e2577b50522
Author: Ignacio Casal Quinteiro <qignacio@amazon.com>
Date: Thu Jul 16 10:19:43 2020 +0200
XKB: Add debug key actions for grabs & window tree
Replicate 7d2543a3cb3089241982ce4f8984fd723d5312a1 but for
all types of X servers
commit c24eb7e31e750d2b9ba8f1b72f53b07a57495395
Author: Roman Gilg <subdiff@gmail.com>
Date: Tue Jul 28 20:24:50 2020 +0200
xwayland: Simplify Present event handling code
Instead of optionally return early when an event is aborted and potentially
clean it up in there we can only optionally inform Present if not aborted and
afterwards clean it up if required.
Saves some lines of code and conditional branches.
Signed-off-by: Roman Gilg <subdiff@gmail.com>
commit 06901e12c07691112b91b26b0c2000f8971e48b5
Author: Jon Turney <jon.turney@dronecode.org.uk>
Date: Thu Jun 4 13:25:45 2020 +0100
meson: Also ignore kms, kms_udev, hal options on Cygwin
commit 4c2d1fe0454ca2b7c13e600a31f6733705c1c7b9
Author: Jon Turney <jon.turney@dronecode.org.uk>
Date: Wed Jul 29 20:32:49 2020 +0100
hw/xwin: Update for renames in xserver/output API
Update commit ea47af87 renaming master_pixmap to primary_pixmap in
struct PixmapRec.
commit 9fbd3e43dd9e13700df96b508c3d97f77e2b9f7e
Author: Huacai Chen <chenhc@lemote.com>
Date: Sun Jul 5 05:59:58 2020 -0400
linux: Fix platform device probe for DT-based PCI
On a DT-base PCI platform, the sysfs path of vga device is like this:
/sys/devices/platform/bus@10000000/1a000000.pci/pci0000:00/0000:00:11.0/0000:04:00.0.
Then the ID_PATH from udev is platform-1a000000.pci-pci-0000:04:00.0 and
the BusID will be pci-0000:04:00.0, which causes Xorg start fail. This
is because config_udev_odev_setup_attribs() use strstr() to search the
first "pci-" in ID_PATH. To fix this, we implement a strrstr() function
and use it to search the last "pci-" in ID_PATH, which can get a correct
BusID.
Signed-off-by: Huacai Chen <chenhc@lemote.com>
commit 591916ea9e7a77f68f436b4a541402d9deadfe64
Author: Roman Gilg <subdiff@gmail.com>
Date: Fri Jul 24 12:21:37 2020 +0200
present: Check valid region in window mode flips
For Pixmap flips to have well defined outcomes the window must be contained by
the valid region if such region was specified.
The valid region is inserted as an argument to the check in window mode.
Setting this argument is missing in screen mode as well but we ignore it for now
and only add it to window mode.
It seems there are none or only very few clients actually making use of valid
regions at the moment. For simplicity we therefore just check if a valid region
was set by the client and in this case do never flip, independently of the
window being contained by the region or not.
Signed-off-by: Roman Gilg <subdiff@gmail.com>
commit bf794bd7bfa3bdcf7de95ce237eb50ecc6ec11d2
Author: Roman Gilg <subdiff@gmail.com>
Date: Tue Jul 14 14:32:25 2020 +0200
present: Remove superfluous set abort flip function in window mode
The function is never called from present_screen.c in contrast to the behavior
in screen mode.
In present_wnmd.c we can simply remove the function which does an unnecessary
check of the property before setting it and directly set the property at the
two locations the function was called previously.
Signed-off-by: Roman Gilg <subdiff@gmail.com>
commit ab880b8b9e8d67a05fcb085097c94bbddf7dcb95
Author: Roman Gilg <subdiff@gmail.com>
Date: Sun Jul 12 13:42:31 2020 +0200
present: Idle vblanks any time in window mode
With the newly introduced separate API method for idling a presented Pixmap in
window mode we can simplify the logic by allowing calls to it at any point in
time.
This is done by setting the flip_idler flag if the Pixmap was idled before
being presented.
Signed-off-by: Roman Gilg <subdiff@gmail.com>
commit 932c6baca274f57beab51cd0dff1f7fa934e0ed0
Author: Roman Gilg <subdiff@gmail.com>
Date: Sat Jul 11 19:15:46 2020 +0200
present: Notify via distinct API functions in window mode
Notifying Present about events' states was done prior with the single function
present_wnmd_event_notify just like in screen mode. But it is more intelligible
if at least in window mode we make use of three different functions with names
that directly indicate what their purpose is:
* present_wnmd_event_notify only for queued events feedback.
* present_wnmd_flip_notify for when a presentation occured (flip).
* present_wnmd_idle_notify for when the Pixmap of the event can be reused.
This is an API-breaking change in regards to window mode. DDX written against
the previous version won't work anymore. It is assumed that there only exists
the XWayland DDX at the moment using the window mode such that this is not an
issue for the overall ecosystem.
Signed-off-by: Roman Gilg <subdiff@gmail.com>
commit f8211095c3d94307225318902598e8f79d038f26
Author: Roman Gilg <subdiff@gmail.com>
Date: Sat Feb 15 01:58:22 2020 +0100
xwayland: Rename present event lists
Rename the lists release_queue to release_list and event_list to
wait_list.
The prior names release_queue and event_list were ambiguous: in both are event-
like vblanks which can be removed from the lists in random order. In the
release_queue can be flips that are already released but still wait for the
sync or frame callback but normally the release comes later. In the event_list
are queued events waiting for a later msc.
Signed-off-by: Roman Gilg <subdiff@gmail.com>
commit 0db326e5ca3dd244dda502c8261801c04ff792ab
Author: Roman Gilg <subdiff@gmail.com>
Date: Wed Jul 8 10:24:41 2020 +0200
xwayland: Remove unused xwl_screen entry
In xwl_present_window an xwl_screen entry was declared but never actually used.
Signed-off-by: Roman Gilg <subdiff@gmail.com>
commit 495bf63a7df066672d9d44dedeb1f49658a247d8
Author: Alex Goins <agoins@nvidia.com>
Date: Thu Jul 2 20:03:06 2020 -0500
randr: Re-add removed NULL checks to xf86RandR12.c
Commit 1e3f9ea1 removed some NULL checks from xf86RandR12.c, on the premise that
they can't be reached unless RandR has already been initialized. For threesuch
calls, that's not true:
xf86Crtc.c::xf86CrtcScreenInit():
if (c == config->num_crtc) {
xf86RandR12SetRotations(screen, RR_Rotate_0 | RR_Rotate_90 |
RR_Rotate_180 | RR_Rotate_270 |
RR_Reflect_X | RR_Reflect_Y);
xf86RandR12SetTransformSupport(screen, TRUE);
}
else {
xf86RandR12SetRotations(screen, RR_Rotate_0);
xf86RandR12SetTransformSupport(screen, FALSE);
}
xf86Crtc.c::xf86CrtcCloseScreen():
xf86RandR12CloseScreen(screen);
This change adds checks back to xf86RandR12Set{Rotations,TransformSupport}() and
xf86RandR12CloseScreen(), checking that xf86RandR12KeyRec has been registered.
Without this, X will hit an assert that causes it to abort.
Signed-off-by: Alex Goins <agoins@nvidia.com>
commit 8eeff5d7880c6885ee6f206355599f13d739afa7
Author: Alex Goins <agoins@nvidia.com>
Date: Thu Jul 2 20:12:43 2020 -0500
randr: Check rrPrivKey in RRHasScanoutPixmap()
RRHasScanoutPixmap() is called from xf86CheckHWCursor(), regardless of whether
or not RandR has been initialized.
As mentioned in commit 4226c6d, it's possible that RandR has not been
initialized if the server is configured with Xinerama and there is more than one
X screen. Calling rrGetScrPriv when RandR isn't initialized causes an assertion
failure that aborts the server:
Xorg: ../include/privates.h:121: dixGetPrivateAddr: Assertion
key->initialized' failed.
Just as in commit 4226c6d, fix the problem by checking
dixPrivateKeyRegistered(rrPrivKey) before calling rrGetScrPriv.
Signed-off-by: Alex Goins <agoins@nvidia.com>
commit 6172bd2b41a7ce158b9052af3e373318e5e4381c
Author: Alex Goins <agoins@nvidia.com>
Date: Thu Jul 2 18:39:11 2020 -0500
randr: Check rrPrivKey before autobinding GPU screens
RRProviderAutoConfigGpuScreen() is called from outside RandR, so there is no
guarantee that RandR has been initialized when it is called.
As mentioned in commit 4226c6d, it's possible that RandR has not been
initialized if the server is configured with Xinerama and there is more than one
X screen. Calling rrGetScrPriv when RandR isn't initialized causes an assertion
failure that aborts the server:
Xorg: ../include/privates.h:121: dixGetPrivateAddr: Assertion
key->initialized' failed.
Just as in commit 4226c6d, fix the problem by checking
dixPrivateKeyRegistered(rrPrivKey) before calling rrGetScrPriv.
Signed-off-by: Alex Goins <agoins@nvidia.com>
commit e33453f9111b21e4814d628e6ae00bc7b200f404
Author: Michel Dänzer <mdaenzer@redhat.com>
Date: Fri Jul 10 18:56:42 2020 +0200
xwayland: Handle NULL xwl_seat in xwl_seat_can_emulate_pointer_warp
This can happen e.g. with weston's headless backend.
Reviewed-by: Olivier Fourdan <ofourdan@redhat.com>
commit ddb86e94c07a269dfc9cd80543f9f6a2c3e934a2
Author: Emmanuel Gil Peyrot <linkmauve@linkmauve.fr>
Date: Sat Jul 11 19:47:40 2020 +0200
xwayland: Remove harmless duplicated #include
commit a137dd5f79d272a57c6704143dc9c25a9b59c927
Author: Emmanuel Gil Peyrot <linkmauve@linkmauve.fr>
Date: Sat Jul 11 19:34:59 2020 +0200
xwayland: Use memfd_create() when available
This (so-far) Linux-only API lets users create file descriptors purely
in memory, without any backing file on the filesystem and the race
condition which could ensue when unlink()ing it.
It also allows seals to be placed on the file, ensuring to every other
process that we won’t be allowed to shrink the contents, potentially
causing a SIGBUS when they try reading it.
This patch is best viewed with the -w option of git log -p.
This is a port of this commit from Weston:
https://gitlab.freedesktop.org/wayland/weston/-/commit/deae98ef45e060b8412a5edd195fb0c7c14f0321
Fixes #848.
Signed-off-by: Emmanuel Gil Peyrot <linkmauve@linkmauve.fr>
commit ba0e789b912671c724a21b3a30291247718bcf7d
Author: Lyude Paul <lyude@redhat.com>
Date: Tue Jul 14 18:32:39 2020 -0400
xwayland: Store xwl_tablet_pad in its own private key
When a slave device causes the master virtual pointer device to change
device types, the device's private data pointer
(device->public.devicePrivate) is also changed to match the type of the
slave device. This can be a problem though, as tablet pad devices will
set the device's private data pointer to their own xwl_tablet_pad
struct. This can cause us to dereference the pointer as the wrong type,
and result in a segfault:
Thread 1 "Xwayland" received signal SIGSEGV, Segmentation fault.
wl_proxy_marshal (proxy=0x51, opcode=opcode@entry=0) at src/wayland-client.c:792
792 va_start(ap, opcode);
(gdb) bt
0 wl_proxy_marshal (proxy=0x51, opcode=opcode@entry=0) at
src/wayland-client.c:792
1 0x00005610b27b6c55 in wl_pointer_set_cursor (hotspot_y=0,
hotspot_x=0, surface=0x0, serial=<optimized out>, wl_pointer=<optimized
out>) at /usr/include/wayland-client-protocol.h:4610
2 xwl_seat_set_cursor (xwl_seat=xwl_seat@entry=0x5610b46d5d10) at
xwayland-cursor.c:137
3 0x00005610b27b6ecd in xwl_set_cursor (device=<optimized out>,
screen=<optimized out>, cursor=<optimized out>, x=<optimized out>,
y=<optimized out>) at xwayland-cursor.c:249
4 0x00005610b2800b46 in miPointerUpdateSprite (pDev=0x5610b4501a30) at
mipointer.c:468
5 miPointerUpdateSprite (pDev=0x5610b4501a30) at mipointer.c:410
6 0x00005610b2800e56 in miPointerDisplayCursor (pCursor=0x5610b4b35740,
pScreen=0x5610b3d54410, pDev=0x5610b4501a30) at mipointer.c:206
7 miPointerDisplayCursor (pDev=0x5610b4501a30, pScreen=0x5610b3d54410,
pCursor=0x5610b4b35740) at mipointer.c:194
8 0x00005610b27ed62b in CursorDisplayCursor (pDev=<optimized out>,
pScreen=0x5610b3d54410, pCursor=0x5610b4b35740) at cursor.c:168
9 0x00005610b28773ee in AnimCurDisplayCursor (pDev=0x5610b4501a30,
pScreen=0x5610b3d54410, pCursor=0x5610b4b35740) at animcur.c:197
10 0x00005610b28eb4ca in ChangeToCursor (pDev=0x5610b4501a30,
cursor=0x5610b4b35740) at events.c:938
11 0x00005610b28ec99f in WindowHasNewCursor
(pWin=pWin@entry=0x5610b4b2e0c0) at events.c:3362
12 0x00005610b291102d in ChangeWindowAttributes (pWin=0x5610b4b2e0c0,
vmask=<optimized out>, vlist=vlist@entry=0x5610b4c41dcc,
client=client@entry=0x5610b4b2c900) at window.c:1561
13 0x00005610b28db8e3 in ProcChangeWindowAttributes (client=0x5610b4b2c900)
at dispatch.c:746
14 0x00005610b28e1e5b in Dispatch () at dispatch.c:497
15 0x00005610b28e5f34 in dix_main (argc=16, argv=0x7ffc7a601b68,
envp=<optimized out>) at main.c:276
16 0x00007f8828cde042 in __libc_start_main (main=0x5610b27ae930 <main>,
argc=16, argv=0x7ffc7a601b68, init=<optimized out>, fini=<optimized
out>, rtld_fini=<optimized out>, stack_end=0x7ffc7a601b58) at
../csu/libc-start.c:308
17 0x00005610b27ae96e in _start () at cursor.c:1064
Simple reproducer in gnome-shell: open up an Xwayland window, press some
tablet buttons, lock and unlock the screen. Repeat if it doesn't crash
the first time.
So, let's fix this by registering our own device-specific private key
for storing a backpointer to xwl_tablet_pad, so that all input devices
have their private data pointers set to their respective xwl_seat.
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Lyude Paul <lyude@redhat.com>
commit 85a6fd11c723888ca093785a3df43066fdca9c33
Author: Roman Gilg <subdiff@gmail.com>
Date: Wed Jul 8 17:08:55 2020 +0200
xwayland: Damage surface in surface-relative coordinates
In 9141196d positional coordinates were added to the damage call of pixmap
flips. The damage box coordinates are in screen space though and we need
to convert them first to surface-relative ones by substracting the origin
of the window.
Signed-off-by: Roman Gilg <subdiff@gmail.com>
commit ed624544d4aef72db8dd575ad55ef5e206c54757
Author: Michel Dänzer <mdaenzer@redhat.com>
Date: Fri Jul 10 11:01:10 2020 +0200
xfree86: Bump ABI_VIDEODRV_VERSION to 25.2
This gives out of tree drivers a fighting chance to build against both
sides of
https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/468 .
Reviewed-by: Dave Airlie <airlied@redhat.com>
commit ea47af87f692b291a988834c6f14d73a08cb1d75
Author: Dave Airlie <airlied@redhat.com>
Date: Mon Jul 6 07:00:50 2020 +1000
xserver/output: rename some badly named variables/APIs.
This is an API and ABI break
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 15b7738389b36ec2739d4f599539bcb7c2be89a1
Author: Dave Airlie <airlied@redhat.com>
Date: Mon Jul 6 07:00:04 2020 +1000
exa: rename some badly named variables
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 5188603ff7d25186c9076fefeceba825f3a40d47
Author: Olivier Fourdan <ofourdan@redhat.com>
Date: Mon Apr 20 11:29:16 2020 +0200
xwayland: Add a pkg-config file for Xwayland
Xwayland is usually spawned by the Wayland compositor which sets the
command line options.
If a command line option is not supported, Xwayland will fail to start.
That somehow makes the Xwayland command line option sort of ABI, the
Wayland compositor need to know if a particular option is supported by
Xwayland at build time.
Also, currently, Xwayland is being installed along with the rest of the
common executable programs that users may run, which is sub-optimal
because, well, Xwayland is not a common executable program, it's meant
to be a proxy between the Wayland compositor and the legacy X11 clients
which wouldn't be able to run on Wayland otherwise.
Xwayland would be better installed in `libexec` but that directory is
(purposedly) not in the user `PATH` and therefore the Wayland compositor
may not be able to find Xwayland in that case.
To solve both problems (which options are supported by Xwayland and
where to look for it), add a `pkg-config` file specifically for Xwayland
which gives the full path to Xwayland (`xwayland`) and which options it
supports (using `pkg-config` variables).
The `pkg-config` file also provides the `Version` so the build scripts
can check for a particular version if necessary.
Obviously, Wayland compositors are not required to use the `pkg-config`
file and can continue to use whatever mechanism they deem preferable.
Signed-off-by: Olivier Fourdan <ofourdan@redhat.com>
Reviewed-by: Michel Dänzer <mdaenzer@redhat.com>
commit 2beefda5a80e5a016c32c1da733f9415a121179d
Author: Michel Dänzer <mdaenzer@redhat.com>
Date: Tue Mar 17 12:55:34 2020 +0100
xwayland: Move xwl_surface_damage definition to xwayland-screen.c
It was already declared in xwayland-screen.h, and only takes a screen
parameter, no window ones.
Reviewed-by: Olivier Fourdan <ofourdan@redhat.com>
commit 12af425acd3f4a3a8aa85352857b130b0006b83c
Author: Michel Dänzer <mdaenzer@redhat.com>
Date: Thu Jun 25 17:56:41 2020 +0200
xwayland: Rename xwl_pixmap_cb → xwl_buffer_release_cb
Seems clearer.
While we're at it, also drop the unused pixmap parameter.
Reviewed-by: Olivier Fourdan <ofourdan@redhat.com>
commit 9eb0b4f731e21952f93e168900f10bf07e261107
Author: Michel Dänzer <mdaenzer@redhat.com>
Date: Thu Jun 25 17:49:27 2020 +0200
xwayland: Remove xwl_present_event::buffer_released in favor of ::pixmap
No need for the separate boolean.
Reviewed-by: Olivier Fourdan <ofourdan@redhat.com>
commit 9141196d3104ab37385c3e385deaa70c002dd184
Author: Michel Dänzer <mdaenzer@redhat.com>
Date: Tue Mar 17 12:58:12 2020 +0100
xwayland: Propagate damage x1/y1 coordinates in xwl_present_flip
This couldn't have worked correctly for non-0 x1/y1.
Noticed by inspection.
Reviewed-by: Simon Ser <contact@emersion.fr>
commit 0006aecba097b437f96a462075494d68bdad24c1
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Sun Jul 5 13:18:45 2020 -0700
doc: Update URLs in Xserver-DTrace.xml
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
commit 23e83724df4809fd7857cc609c33ce7e8d3021a4
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Sun Jul 5 13:07:33 2020 -0700
Fix spelling/wording issues
Most (but not all) of these were found by using
codespell --builtin clear,rare,usage,informal,code,names
but not everything reported by that was fixed.
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
commit b0413b6e99c6b5fbc04229ce64ddf1f41b08e63e
Author: Olivier Fourdan <ofourdan@redhat.com>
Date: Tue Jun 2 11:23:46 2020 +0200
xwayland: Use a fixed DPI value for core protocol
The way Xwayland works (like all Wayland clients), it first queries the
Wayland registry, set up all relevant protocols and then initializes its
own structures.
That means Xwayland will get the Wayland outputs from the Wayland
compositor, compute the physical size of the combined outputs and set
the corresponding Xwayland screen properties accordingly.
Then it creates the X11 screen using fbScreenInit() but does so by using
a default DPI value of 96. That value is used to set the physical size
of the X11 screen, hence overriding the value computed from the actual
physical size provided by the Wayland compositor.
As a result, the DPI computed by tools such as xdpyinfo will always be
96 regardless of the actual screen size and resolution.
However, if the Wayland outputs get reconfigured, or new outputs added,
or existing outputs removed, Xwayland will recompute and update the
physical size of the screen, leading to an unexpected change of DPI.
To avoid that discrepancy, use a fixed size DPI (defaults to 96, and can
be set using the standard command lime option "-dpi") and compute a
physical screen size to match that DPI setting.
Note that only affects legacy core protocols, X11 clients can still get
the actual physical output size as reported by the Wayland compositor
using the RandR protocol, which also allows for the size to be 0 if the
size is unknown or meaningless.
Signed-off-by: Olivier Fourdan <ofourdan@redhat.com>
Reviewed-by: Simon Ser <contact@emersion.fr>
Closes: https://gitlab.freedesktop.org/xorg/xserver/-/issues/731
commit 6748a4094158d2bde1630b915a5318f9f22c8e0a
Author: SimonP <simonp.git@gmail.com>
Date: Tue Jun 9 13:26:48 2020 +0200
xwayland: Initialise values in xwlVidModeGetGamma()
ProcVidModeGetGamma() relies on GetGamma() to initialise values if it
returns TRUE. Without this, we're sending uninitialised values to
clients.
Fixes: xorg/xserver#1040
commit d35f68336b0a462dc660797d1779581f348af04e
Author: Sjoerd Simons <sjoerd@collabora.com>
Date: Fri Apr 10 16:34:06 2020 +0200
xwayland: Fix crashes when there is no pointer
When running with a weston session without a pointer device (thus with
the wl_seat not having a pointer) xwayland pointer warping and pointer
confining should simply be ignored to avoid crashes.
Signed-off-by: Sjoerd Simons <sjoerd@collabora.com>
commit 73480f172aeced074dd9301ae4d97f7d2f3a9a45
Author: Jose Maria Casanova Crespo <jmcasanova@igalia.com>
Date: Fri May 15 18:33:11 2020 +0200
modesetting: Fix front_bo leak at drmmode_xf86crtc_resize on XRandR rotation
Since the introduction of "modesetting: Remove unnecessary fb addition from
drmmode_xf86crtc_resize" the fb_id isn't initialited at
drmmode_xf86crtc_resize.
Rotate operation of XRandR uses rotate_bo. So in this case the fb_id
associated to the front_bo is not initialized at drmmode_set_mode_major.
So fd_id remains 0.
As every call to drmmode_xf86crtc_resize allocates a new front_bo we should
destroy unconditionally the old_front_bo if operation success. So we free
the allocated GBM handles.
This avoids crashing xserver with a OOM in the RPI4 1Gb at 4k resolution
after 3 series xrandr rotations from normal to left and vice versa reported at
https://github.com/raspberrypi/firmware/issues/1345
Signed-off-by: Jose Maria Casanova Crespo <jmcasanova@igalia.com>
Reviewed-by: Keith Packard <keithp@keithp.com>
Closes: https://gitlab.freedesktop.org/xorg/xserver/-/issues/1024
Fixes: 8774532121 "modesetting: Remove unnecessary fb addition from
drmmode_xf86crtc_resize"
commit b67052742980fd3ec669100048da71e09aa61358
Author: Michel Dänzer <mdaenzer@redhat.com>
Date: Fri Jun 19 18:10:18 2020 +0200
xwayland: Free all remaining events in xwl_present_cleanup
These events aren't reachable after xwl_present_cleanup, so they're
leaked if we don't free them first.
This requires storing the pixmap pointer in struct xwl_present_window.
Luckily, the buffer pointer isn't used for anything, so just replace
that.
v2:
* Bump pixmap reference count in xwl_present_flip and drop it in
xwl_present_free_event, fixes use-after-free in the latter due to the
pixmap already being destroyed.
Reviewed-by: Dave Airlie <airlied@redhat.com>
commit 1beffba699e2cc3f23039d2177c025bc127966de
Author: Michel Dänzer <mdaenzer@redhat.com>
Date: Fri Jun 19 18:14:35 2020 +0200
xwayland: Always use xwl_present_free_event for freeing Present events
Minor cleanup, and will make the next change simpler. No functional
change intended.
Reviewed-by: Dave Airlie <airlied@redhat.com>
commit 1bdedc8dbb9d035b85444c2558a137470ff52113
Author: Michel Dänzer <mdaenzer@redhat.com>
Date: Fri Jun 19 17:24:42 2020 +0200
present/wnmd: Free flip_queue entries in present_wnmd_clear_window_flip
When present_wnmd_clear_window_flip is done, present_destroy_window
frees struct present_window_priv, and the events in the flip queue
become unreachable. So if we don't free them first, they're leaked.
Also drop the call to present_wnmd_set_abort_flip, which just sets a
flag in struct present_window_priv and thus can't have any observable
effect after present_destroy_window.
Closes: https://gitlab.freedesktop.org/xorg/xserver/-/issues/1042
Reviewed-by: Dave Airlie <airlied@redhat.com>
commit bc9dd1c71c3722284ffaa7183f4119151b25a44f
Author: Michel Dänzer <mdaenzer@redhat.com>
Date: Fri Jun 19 17:02:40 2020 +0200
present/wnmd: Keep pixmap pointer in present_wnmd_clear_window_flip
The comment was incorrect: Any reference held by the window (see
present_wnmd_execute) is in addition to the one in struct present_vblank
(see present_vblank_create). So if we don't drop the latter, the pixmap
will be leaked.
Reviewed-by: Dave Airlie <airlied@redhat.com>
commit 7ae221ad5774756766dc78a73d71f4163ac7b1c6
Author: Martin Weber <martin.weber@secunet.com>
Date: Fri Jun 19 16:51:15 2020 +0200
hw/xfree86: Avoid cursor use after free
During a VT-Switch a raw pointer to the shared cursor object
is saved which is then freed (in case of low refcount) by a call to
xf86CursorSetCursor with argument pCurs = NullCursor.
This leads to a dangling pointer which can follow in a use after free.
This fix ensures that there is a shared handle saved for the VT-Switch cycle.
Reviewed-by: Michel Dänzer <mdaenzer@redhat.com>
commit 6a79a737e2c0bc730ee693b4ea4a1530c108be4e
Author: Aaron Ma <aaron.ma@canonical.com>
Date: Sat Apr 11 17:29:35 2020 +0800
xfree86: add drm modes on non-GTF panels
EDID1.4 replaced GTF Bit with Continuous or Non-Continuous Frequency Display.
Check the "Display Range Limits Descriptor" for GTF support.
If panel doesn't support GTF, then add gtf modes.
Otherwise X will only show the modes in "Detailed Timing Descriptor".
V2: Coding style changes.
V3: Coding style changes, remove unused variate.
V4: remove unused variate.
BugLink: https://gitlab.freedesktop.org/drm/intel/issues/313
Signed-off-by: Aaron Ma <aaron.ma@canonical.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
commit d6558477d7a264c2132bc977b51d80fc0277d1e0
Author: Simon Ser <contact@emersion.fr>
Date: Tue Jun 2 15:40:16 2020 +0200
xwayland: allow using linux-dmabuf with DRM_FORMAT_MOD_INVALID
When the linux-dmabuf protocol is available, prefer it over the old
wl_drm protocol. Previously wl_drm was used when modifiers aren't
supported, however linux-dmabuf supports formats without modifiers too.
In this case, linux-dmabuf will send a DRM_FORMAT_MOD_INVALID modifier
for each supported format [1].
This allows compositors to better handle these buffers, getting a
DMA-BUF and implementing features like direct scan-out.
A similar logic has been implemented for EGL [2].
DRM_FORMAT_MOD_INVALID is now stored in the xwl_screen->formats list.
glamor_get_modifiers still returns FALSE with zero modifiers if the
only advertised modifier is DRM_FORMAT_MOD_INVALID.
[1]: https://gitlab.freedesktop.org/wayland/wayland-protocols/commit/fb9b2a87317c77e26283da5f6c9559d709f6fdcd
[2]: https://gitlab.freedesktop.org/mesa/mesa/-/commit/c376865f5eeca535c4aa8e33bcf166052c1ce2f2
Signed-off-by: Simon Ser <contact@emersion.fr>
Reviewed-by: Michel Dänzer <mdaenzer@redhat.com>
commit c0e13cbf5a56e1fdd1e4ce58ebdefb6d2904e4b3
Author: Simon Ser <contact@emersion.fr>
Date: Tue Jun 2 15:28:38 2020 +0200
xwayland: only use linux-dmabuf if format/modifier was advertised
Previously, linux-dmabuf was used unconditionally if the buffer had a
modifier. However creating a linux-dmabuf buffer with a format/modifier
which hasn't been advertised will fail.
Change xwl_glamor_gbm_get_wl_buffer_for_pixmap to use linux-dmabuf when
the format/modifier has been advertised only.
Signed-off-by: Simon Ser <contact@emersion.fr>
Closes: https://gitlab.freedesktop.org/xorg/xserver/-/issues/1035
Tested-by: Emmanuel Gil Peyrot <linkmauve@linkmauve.fr>
Reviewed-by: Michel Dänzer <mdaenzer@redhat.com>
commit 9c8d2744584868aa2655bf3ec047f2f9669e4291
Author: Simon Ser <contact@emersion.fr>
Date: Mon May 4 10:53:57 2020 +0200
xwayland: don't use GBM_BO_USE_SCANOUT
This flag should only be used when the caller intends to display the
buffer on a hardware plane. Xwayland isn't a DRM client, so it doesn't
make sense to use this flag.
This change will allow the driver to potentially use buffer parameters
that are more optimized.
Signed-off-by: Simon Ser <contact@emersion.fr>
Reviewed-by: Daniel Stone <daniels@collabora.com>
Reviewed-by: Michel Dänzer <mdaenzer@redhat.com>
commit fc4f248544f207ffd68303da22ea1e27beb3729f
Author: Adam Jackson <ajax@redhat.com>
Date: Fri Jun 5 14:33:03 2020 -0400
xwayland: Set the vendor name for GLX_EXT_libglvnd
Without this the client library will flail around looking for a default
provider, probably one named "indirect", and that defeats the point of
having the EGL provider for direct context support in the first place.
This assumes that "mesa" will work, of course, and in general it should.
Mesa drivers will DTRT through the DRI3 setup path, and if our glamor is
atop something non-Mesa then you should fall back to llvmpipe like 1.20.
In the future it might be useful to differentiate the vendor here based
on whether glamor is using gbm or streams.
Fixes: xorg/xserver#1032
commit 5dc16f6fec672c10fc26dcaaf00df0f6bed0ef9a
Author: Matthieu Herrb <matthieu@herrb.eu>
Date: Tue Jun 2 17:32:11 2020 +0200
Remove BSD APM support.
None of the current BSD is actually using this code.
(checked DragonFly 5.8.1, FreeBSD 11.2, NetBSD 9.0 and OpenBSD 6.7)
Signed-off-by: Matthieu Herrb <matthieu@herrb.eu>
commit b5b529799a20f8a262066daeb726307c0631f208
Author: Jan Beich <jbeich@FreeBSD.org>
Date: Sun Feb 9 15:28:10 2020 +0000
meson: split udev from udev_kms which requires systemd
DragonFly and FreeBSD can use xf86-input-libinput with config/udev.
ld: error: undefined symbol: xf86PlatformDeviceProbe
>>> referenced by xf86platformBus.c
>>> xf86platformBus.c.o:(xf86platformProbe) in archive hw/xfree86/common/libxorg_common.a
ld: error: undefined symbol: xf86PlatformDeviceCheckBusID
>>> referenced by xf86platformBus.c
>>> xf86platformBus.c.o:(xf86platformProbeDev) in archive hw/xfree86/common/libxorg_common.a
ld: error: undefined symbol: xf86PlatformReprobeDevice
>>> referenced by xf86platformBus.c
>>> xf86platformBus.c.o:(xf86platformVTProbe) in archive hw/xfree86/common/libxorg_common.a
ld: error: undefined symbol: NewGPUDeviceRequest
>>> referenced by udev.c
>>> udev.c.o:(device_added) in archive config/liblibxserver_config.a
ld: error: undefined symbol: DeleteGPUDeviceRequest
>>> referenced by udev.c
>>> udev.c.o:(device_removed) in archive config/liblibxserver_config.a
commit be731e0bdc7d76ad3782d5b533b6bcc8378f41ad
Author: Jan Beich <jbeich@FreeBSD.org>
Date: Sun Feb 9 15:12:39 2020 +0000
glx: unbreak on Unix without /usr/include/drm
In file included from ../glx/glxdri2.c:35:
/usr/local/include/GL/internal/dri_interface.h:43:10: fatal error: 'drm.h' file not found
#include <drm.h>
^~~~~~~
In file included from ../glx/glxdriswrast.c:39:
/usr/local/include/GL/internal/dri_interface.h:43:10: fatal error: 'drm.h' file not found
#include <drm.h>
^~~~~~~
commit f2cf236da8e8fefd6f503ceb0a448c5ad9651024
Author: Jan Beich <jbeich@FreeBSD.org>
Date: Sat Nov 16 18:40:36 2019 +0000
os: unbreak xsha1 on FreeBSD
../os/xsha1.c:36:10: fatal error: 'sha1.h' file not found
#include <sha1.h>
^~~~~~~~
../os/xsha1.c:45:5: error: implicit declaration of function 'SHA1Init' is invalid in C99 [-Werror,-Wimplicit-function-declaration]
SHA1Init(ctx);
^
../os/xsha1.c:54:5: error: implicit declaration of function 'SHA1Update' is invalid in C99 [-Werror,-Wimplicit-function-declaration]
SHA1Update(sha1_ctx, data, size);
^
../os/xsha1.c:63:5: error: implicit declaration of function 'SHA1Final' is invalid in C99 [-Werror,-Wimplicit-function-declaration]
SHA1Final(result, sha1_ctx);
^
commit 4195e8035645007be313ade79032b8d561ceec6c
Author: Olivier Fourdan <ofourdan@redhat.com>
Date: Tue May 5 15:40:43 2020 +0200
xwayland: Clear private on device removal
Xwayland uses the device private to point to the `xwl_seat`.
Device may be removed at any time, including on suspend.
On resume, if the DIX code ends up calling a function that requires the
`xwl_seat` such as `xwl_set_cursor()` we may end up pointing at random
data.
Make sure the clear the device private data on removal so that we don't
try to use it and crash later.
Signed-off-by: Olivier Fourdan <ofourdan@redhat.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
https://gitlab.freedesktop.org/xorg/xserver/issues/709
commit 6ef1b0108ebe98c58fe5e00c86de52452c817518
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri May 8 10:54:31 2020 +1000
gitlab CI: use the fdo ci-templates repository
wayland/ci-templates was moved to freedesktop/ci-templates, everything
else stayed the same so the sha is still valid.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Acked-by: Michel Dänzer <mdaenzer@redhat.com>
commit 421ce458f1d295015c108eb32f9611e527649cf8
Author: Simon Ser <contact@emersion.fr>
Date: Mon May 4 18:20:17 2020 +0200
xwayland: import DMA-BUFs with GBM_BO_USE_RENDERING only
Drop GBM_BO_USE_SCANOUT from the GBM_BO_IMPORT_FD import, add
GBM_BO_USE_RENDERING to the GBM_BO_IMPORT_FD_MODIFIER import.
If the DMA-BUF cannot be scanned out, gbm_bo_import with
GBM_BO_USE_SCANOUT will fail. However Xwayland doesn't need to scan-out
the buffer and can work fine without scanout. Glamor only needs
GBM_BO_USE_RENDERING.
Signed-off-by: Simon Ser <contact@emersion.fr>
Reviewed-by: Michel Dänzer <mdaenzer@redhat.com>
Reviewed-by: Daniel Stone <daniels@collabora.com>
commit 0777cf46d7260f3d0c7fe82af5c94137d1e4f3de
Author: Carlos Garnacho <carlosg@gnome.org>
Date: Thu May 7 20:15:14 2020 +0200
xwayland: Improve checks for confined_to on InputOnly windows
In this pretty Wine/Proton specific kludge, we try to handle confining grabs
on InputOnly windows by trying to find the InputOutput window that the pointer
would get visually confined to.
The grabbing window and the visible window come from different clients, so
we used to simply resort to the pointer focus. This is troublesome though, as
the call may happen very soon at a time that the toplevel wasn't yet mapped by
the Wayland compositor, so the pointer focus may well be out of date soon.
In these situations, it does seem that even though the confining grab happens
too early to have the wayland surface mapped, the xserver view of the WindowPtr
does already reflect the size. Use this to find out the better window to
assign the confining grab to, one whose geometry fully contains the InputOnly
window's.
Signed-off-by: Carlos Garnacho <carlosg@gnome.org>
Reviewed-by: Olivier Fourdan <ofourdan@redhat.com>
commit f486e2fdaa1b252405a3aee90bd495b8b4c851f2
Author: Olivier Fourdan <ofourdan@redhat.com>
Date: Tue May 5 10:38:50 2020 +0200
xwayland: Remove undeeded test
xwl_seat_maybe_lock_on_hidden_cursor() checks that the value of
cursor_confinement_window is not NULL, yet there is no code path
that could lead to this.
Remove the test for cursor_confinement_window being set, it's useless.
Signed-off-by: Olivier Fourdan <ofourdan@redhat.com>
Reviewed-by: Carlos Garnacho <carlosg@gnome.org>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
commit baa8d12e464664b5ad3c591be05a0087482790ca
Author: Olivier Fourdan <ofourdan@redhat.com>
Date: Thu Apr 30 13:55:42 2020 +0200
xwayland: Lock on entering surface if needed
When an X11 client issues a ConfinePointer wit ha hidden cursor,
Xwayland may translate that as a pointer lock.
However, if the pointer is located on another window at the time,
the request may be ignored, even if the pointer later enters the window.
To avoid that issue, check again if locking the pointer with a hidden
cursor is needed when pointer enters a surface.
Signed-off-by: Olivier Fourdan <ofourdan@redhat.com>
Reviewed-by: Carlos Garnacho <carlosg@gnome.org>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 1345f804a88efc11c58f8388983d34445d3e5928
Author: Olivier Fourdan <ofourdan@redhat.com>
Date: Tue Mar 24 16:33:16 2020 +0100
xwayland: confine motion events to the confined window
When an X11 client has an active grab on the pointer, all events are
reported relative to the window with the grab.
For Xwayland, if an X11 client has a grab with a pointer confinement
active, while pointer focus is on another window, motion events should
not be reported to the client with the grab, because that sets the X11
client appart, the events would be reported when the pointer is on any
X11 window but not on Wayland native surfaces.
Therefore, if the pointer is confined on a window and that window
differs from the actual pointer focus window, just pretend we lost
pointer focus to another window.
Signed-off-by: Olivier Fourdan <ofourdan@redhat.com>
Closes: https://gitlab.freedesktop.org/xorg/xserver/issues/962
Reviewed-by: Carlos Garnacho <carlosg@gnome.org>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 5929b789f9c6531ee257504a7be9c9e3a49b30eb
Author: Olivier Fourdan <ofourdan@redhat.com>
Date: Tue Mar 24 16:12:38 2020 +0100
xwayland: Do not lock the pointer on the wrong window
If a client issues a grab on the pointer while the cursor is on another
X11 window, and then hides the cursor, we may end up locking the pointer
onto that other window.
Then a button click might end up moving the focus away from the window
which issued the grab, leaving the whole setup in a mixed up state.
Typically, if the pointer is on another X11 window, we should not try to
lock the pointer, so that it can be moved back to the window which
actually issues the grab (and hence the pointer confinement). Typically,
this is the same as an X11 client issuing a pointer grab while the
cursor is on another Wayland native window.
Signed-off-by: Olivier Fourdan <ofourdan@redhat.com>
Closes: https://gitlab.freedesktop.org/xorg/xserver/issues/962
Reviewed-by: Carlos Garnacho <carlosg@gnome.org>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
commit a5151f58cf98d1696d60a3577dc50851f159da8a
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Sun May 10 17:46:33 2020 -0700
Update URL's in man pages
Mostly http->https conversions, but also replaces gitweb.fd.o
with gitlab.fd.o, and xquartz.macosforge.org with xquartz.org.
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
commit 9bf33bab32fdfbe68b287947f55906ff0ac67f04
Author: Martin Weber <martin.weber@secunet.com>
Date: Fri May 8 16:45:50 2020 +0200
test: Fix struct initialization warning
commit 462beb5338a44390e2fff03096942b035b509830
Author: Christopher Chavez <chrischavez@gmx.us>
Date: Sat Apr 25 05:09:51 2020 +0000
XQuartz: recognize F16-F20 and Menu keys
Signed-off-by: Christopher Chavez <chrischavez@gmx.us>
commit 9937183e4bd2e96154bb4724805f74341ae84bd6
Author: Alexander Volkov <a.volkov@rusbitech.ru>
Date: Tue Apr 21 12:38:03 2020 +0300
Fix build with gcc 9.3.0's -Werror=alloc-size-larger-than=
commit 89f42b88216c0899977dd3861cbf13c5bae321d8
Author: Alexander Volkov <a.volkov@rusbitech.ru>
Date: Tue Apr 21 01:01:21 2020 +0300
gitlab-ci: Bump DEBIAN_TAG to build with gcc 9.3.0
commit 9890e91265cb58c0cddc4de3c8845d18ae6e5a77
Author: Tobias Stoeckmann <tobias@stoeckmann.org>
Date: Sun Apr 19 15:29:43 2020 +0200
hw/xfree86: Support ACPI without APM.
On systems with ACPI but disabled APM (e.g. --disable-linux-apm)
the code does not compile due to preprocessor directives.
If APM is disabled, the final return statement is considered to
be part of ACPI's last if-statement, leading to a function which
has no final return statement at all.
I have refactored the code so ACPI and APM are independent of each
other.
Signed-off-by: Tobias Stoeckmann <tobias@stoeckmann.org>
commit 785e59060c00129e47da6c0877604a56d7e0e32f
Author: Olivier Fourdan <ofourdan@redhat.com>
Date: Fri Apr 24 17:45:49 2020 +0200
xwayland: Fix infinite loop at startup
Mutter recently added headless tests, and when running those tests the
Wayland compositor runs for a very short time.
Xwayland is spawned by the Wayland compositor and upon startup will
query the various Wayland protocol supported by the compositor.
To do so, it will do a roundtrip to the Wayland server waiting for
events it expects.
If the Wayland compositor terminates before Xwayland has got the replies
it expects, it will loop indefinitely calling `wl_display_roundtrip()`
continuously.
To avoid that issue, add a new `xwl_screen_roundtrip()` that checks for
the returned value from `wl_display_roundtrip()` and fails if it is
negative.
Signed-off-by: Olivier Fourdan <ofourdan@redhat.com>
Reviewed-by: Roman Gilg <subdiff@gmail.com>
Reviewed-by: Jonas Ådahl <jadahl@gmail.com>
commit 2fe13a1f448ff27925f92a557f145bab9ab91a0e
Author: Jon Turney <jon.turney@dronecode.org.uk>
Date: Fri Feb 11 16:10:36 2011 +0000
hw/xwin: Drop call to setlocale()
Since we now only work with UTF-8 (or ISO8859-1) text in the clipboard,
we don't need to setlocale().
commit f269e01e1a783227c88b395cf6f55dcadeb751c9
Author: Jon Turney <jon.turney@dronecode.org.uk>
Date: Mon Jul 2 17:25:53 2018 +0100
hw/xwin: Consistently use BOOL type from Xmd.h
This avoids including Xdefs.h, which means we avoid all the issues with
_XSERVER64 effecting how types are defined by that.
commit 4055fed1e7933c05afe143cbd18743c1ff1c7fee
Author: Jon Turney <jon.turney@dronecode.org.uk>
Date: Sun Jul 1 15:53:42 2018 +0100
hw/xwin: Remove XSetAuthorization() for helper clients
All helper client code now uses xcb, so calling XSetAuthorization() is
no longer needed.
This is the last reference to libX11 from helper clients, so linking
with x11-xcb and libX11 is no longer required.
Also drop (unneeded?) linking with libXau.
Also drop installing these prerequistes on AppvVeyor.
Also move prototypes for functions in winauth.c from win.h into a new
header, winauth.h, and include that where needed.
commit 9e02e023b08e24d4213ca14d99612e4cf5ef2f1e
Author: Jon Turney <jon.turney@dronecode.org.uk>
Date: Sat Jun 30 16:00:16 2018 +0100
hw/xwin: xcbify clipboard integration
Convert clipboard integration code from libX11 to xcb
This drops support for COMPOUND_TEXT. Presumably some ancient
(pre-2000) clients exist which support that, but not UTF8_STRING, but we
don't have an example to test with. (Given the nature of the thing, the
users of those clients probably work in CJK languages)
Supporting COMPOUND_TEXT would also involve writing (or extracting from
Xlib) support for the ISO 2022 encoding.
v2:
Fix the length of text property set by a SelectionRequest
The length of the text property is not neccessarily the same as the
length of the clipboard text before it is d2u converted (specifically,
if that contains any '\r\n' sequences, it will be shorter as they are
now just '\n')
commit f4936de73c094e35eb293f32ab470347741a4fa0
Author: Jon Turney <jon.turney@dronecode.org.uk>
Date: Sun Jul 1 12:11:19 2018 +0100
hw/xwin: Remove nounicodeclipboard option
Always use CF_UNICODETEXT clipboard format. Windows will automatically
down-convert to CF_TEXT for clients which request that.
This is subtly different in one way: if CF_TEXT is requested, we now
post CF_UNICODETEXT and it is converted to CF_TEXT *in the locale of the
requesting process*. Previously, we would convert to CF_TEXT *in our
locale* and post that.
It looks like the code in the !X_HAVE_UTF8_STRING case didn't actually
work correctly, but fortunately that has never been true...
commit 9f51dfdec37c991173c7a580fd1c279cfe09142e
Author: Jon Turney <jon.turney@dronecode.org.uk>
Date: Sat Jun 30 16:15:52 2018 +0100
hw/xwin: Remove support for pre-Vista Win32 clipboard API
The original Win32 clipboard API is widely regarded as terrible, since
it relies on clients co-operatively managing the clipboard viewer chain,
and a single buggy client can break it for all other clients.
The last Windows version only supporting that API was Windows XP (5.1),
EOLed in 2014.
(This requires MinGW-w64 w32api 6.0.0 or later for
Add/RemoveClipboardListener correctly exported by the x86_64 user32
implib)
commit 9a4b62798bf4bcc2828a2a485e878e7d4447d03d
Author: Jon Turney <jon.turney@dronecode.org.uk>
Date: Fri Apr 26 02:26:44 2019 +0100
hw/xwin: Fix lingering uses of libX11 types and values
commit d7010cd93a381f1fc0cc681ddb70df9371370644
Author: Jon Turney <jon.turney@dronecode.org.uk>
Date: Thu Nov 19 18:06:28 2015 +0000
hw/xwin: Warn about too large Windows -> X clipboard pastes
XChangeProperty() requests larger than the ~16MB permitted even with
BigReq will fail BadLength
commit 56a91f20671402a8c6f60c40e5e4e18f7978c740
Author: Jon Turney <jon.turney@dronecode.org.uk>
Date: Wed Nov 18 21:27:23 2015 +0000
hw/xwin: Implement INCR protocol for X clipboard -> Windows clipboard
Also, relax the timeout mechanism so it allows 1 second between events,
rather than 1 second for the entire transfer, as transfers of large
pastes can take more than 1 second.
Also, prefer UTF8_STRING encoding to COMPOUND_TEXT encoding
commit 4f95d87d66b6a6e11aa8616c9242e0907ffee66b
Author: Michael Stapelberg <stapelberg@google.com>
Date: Thu Mar 26 21:53:58 2020 +0100
Xorg: honor AutoRepeat option
This option was implemented before the drivers were split in ≈2006,
and e.g. XWin still supports it.
With this commit, Xorg regains support, so that the following configuration can
be used to set the repeat rate for all keyboard devices without having to modify
Xorg command-line flags or having to automate xset(1):
Section "InputClass"
Identifier "system-keyboard"
MatchIsKeyboard "on"
Option "XkbLayout" "de"
Option "XkbVariant" "neo"
Option "AutoRepeat" "250 30"
EndSection
Signed-off-by: Michael Stapelberg <stapelberg@google.com>
commit 5684d436e2b65cd0fe305460e437a2f69af29865
Author: Adam Jackson <ajax@redhat.com>
Date: Thu Apr 19 14:49:22 2018 -0400
xinput: Remove PropagateMask
Initialized to a constant value, never modified, never varied by device.
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit 4520ec9bd54b261fa2b210e9550d76087ef06259
Author: Adam Jackson <ajax@redhat.com>
Date: Thu Apr 19 14:42:47 2018 -0400
xinput: Remove ExtExclusiveMasks
Initialized to a constant value, never modified, never varied by device.
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit 1e29f3ea3eb63cfcb78a463ee0345ec22a013033
Author: Adam Jackson <ajax@redhat.com>
Date: Thu Mar 5 16:32:56 2020 -0500
glx: Require screens match for share contexts for classic CreateContext
The GLX_ARB_create_context path (with which this should all get unified,
someday, sigh) already enforces this, but the classic path does not.
It's effectively assumed by the implementation anyway, so let's enforce
it rather than do crashy things.
Reviewed-by: Michel Dänzer <mdaenzer@redhat.com>
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit b56e501092169a9c0a60663d832ee71898a8bc4b
Author: Vasily Khoruzhick <anarsoul@gmail.com>
Date: Fri Mar 20 20:36:25 2020 -0700
glx: fixup symbol name for get_extensions function
glxProbeDriver() concatenates __DRI_DRIVER_GET_EXTENSIONS with driver name
to get symbol name for get_extension function. Unfortunately that doesn't
work for drivers that have hyphen in their name, e.g. sun4i-drm --
get_extensions() for these uses underscore instead.
As result dlsym() doesn't find get_extension() function and AIGLX
initialization fails resulting in following message in Xorg.0.log:
(EE) AIGLX error: sun4i-drm does not export required DRI extension
Replace all non-alpha-numeric characters with underscore to fix the issue.
Signed-off-by: Vasily Khoruzhick <anarsoul@gmail.com>
commit 5e91587302e85fd6f0e8d5ffbe30182e18c6913f
Author: Michel Dänzer <mdaenzer@redhat.com>
Date: Tue Mar 17 11:45:22 2020 +0100
xwayland: Delete all frame_callback_list nodes in xwl_unrealize_window
We were only calling xwl_present_unrealize_window for the toplevel
window, but the list can contain entries from child windows as well,
in which case we were leaving dangling pointers to freed memory.
Closes: https://gitlab.freedesktop.org/xorg/xserver/issues/1000
Fixes: c5067feaeea1 "xwayland: Use single frame callback for Present
flips and normal updates"
Reviewed-by: Olivier Fourdan <ofourdan@redhat.com>
Tested-by: Olivier Fourdan <ofourdan@redhat.com>
commit 5b9010fa6b0ab0971dddf5108d5a5046c05180b0
Author: Yuriy Vasilev <uuvasiliev@yandex.ru>
Date: Fri Mar 6 20:22:19 2020 +0300
modesetting: add support for GBM_FORMAT_ARGB1555
Reviewed-by: Michel Dänzer <mdaenzer@redhat.com>
Signed-off-by: Yuriy Vasilev <uuvasiliev@yandex.ru>
commit 8315fc4ea2e04598ce0c7e9771786a9334f0d456
Author: Yuriy Vasilev <uuvasiliev@yandex.ru>
Date: Thu Mar 5 17:02:26 2020 +0300
modesetting: add support for GBM_FORMAT_RGB565
This allow x-server to run with -depth 16.
Reviewed-by: Michel Dänzer <mdaenzer@redhat.com>
Signed-off-by: Yuriy Vasilev <uuvasiliev@yandex.ru>
commit 3d6efc4aaff80301c0b10b7b6ba297eb5e54c1a0
Author: mntmn <lukas@mntre.com>
Date: Sat Feb 22 17:25:15 2020 +0100
xwayland: port rooted xwayland from wl_shell to xdg-shell protocol
Recently, rooted Xwayland crashes on wlroots-based compositors, because
wlroots removed the deprecated wl_shell protocol.
This MR fixes this by changing the code in question to the xdg-shell
protocol. My motivation do this: on etnaviv-based embedded platforms,
rooted Xwayland is much faster and doesn't cause UI rendering bugs
compared to rootless Xwayland.
Signed-off-by: Lukas F. Hartmann <lukas@mntre.com>
commit de940e06f8733d87bbb857aef85d830053442cfe
Author: Peter Harris <pharris@opentext.com>
Date: Thu Nov 14 14:06:21 2019 -0500
xkb: fix key type index check in _XkbSetMapChecks
This code block was moved from a function that returns 0 for failure to a
function that returns 0 for Success in commit
649293f6b634e6305b6737a841d6e9d0f0065d6c. Change the return value to
BadValue to match the other checks in _XkbSetMapChecks.
Set nTypes to xkb->map->num_types when XkbKeyTypesMask is not set, to
allow requests with the XkbKeyTypesMask flag unset in stuff->present to
succeed.
Fixes a potential heap smash when client->swapped is true, because the
remainder of the request will not be swapped after "return 0", but
_XkbSetMap will be called anyway (because 0 is Success).
Signed-off-by: Peter Harris <pharris@opentext.com>
commit 270e439739e023463e7e0719a4eede69d45f7a3f
Author: Peter Harris <pharris@opentext.com>
Date: Thu Nov 14 14:00:31 2019 -0500
xkb: only swap once in XkbSetMap
The server swaps part of the request in _XkbSetMapChecks instead of
SProcXkbSetMap (presumably because walking the XkbSetMap request is hard,
and we don't want to maintain another copy of that code).
Swap the first time _XkbSetMapChecks is called, not the second time.
Signed-off-by: Peter Harris <pharris@opentext.com>
commit d4faab8708779df265239b203ed5f020bff681bf
Author: Hans de Goede <hdegoede@redhat.com>
Date: Mon Nov 4 15:01:18 2019 +0100
xwayland: Remove unnecessary xwl_window_is_toplevel() check from xwl_output_set_window_randr_emu_props()
Since the recent fix to call xwl_output_set_window_randr_emu_props() from
ensure_surface_for_window(), it is now only called on a toplevel window,
so the is-toplevel check is not necessary for the
xwl_output_set_window_randr_emu_props() case.
This commit moves the check to xwl_output_set_randr_emu_prop_callback()
so that we only do it when we are walking over all Windows of a client
to update the property on a change of the emulated resolution.
Acked-by: Olivier Fourdan <ofourdan@redhat.com>
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
commit 148f428dfccf606b932a00d5a00af06e8dca8a7e
Author: Hans de Goede <hdegoede@redhat.com>
Date: Mon Nov 4 14:32:29 2019 +0100
xwayland: Fix setting of _XWAYLAND_RANDR_EMU_MONITOR_RECTS prop on new windows
For window-manager managed windows, xwl_realize_window is only called for
the window-manager's decoration window and not for the actual client window
on which we should set the _XWAYLAND_RANDR_EMU_MONITOR_RECTS prop.
Usualy this is not a problem since we walk all client windows to update
the property when the resolution is changed through a randr call.
But for apps which first do the randr change and only then create their
window this does not work, and our xwl_output_set_window_randr_emu_props
call in xwl_realize_window is a no-op as that is only called for the wm
decoration window and not for the actual client's window.
This commit fixes this by making ensure_surface_for_window() call
xwl_output_set_window_randr_emu_props on the first and only child of
window-manager managed windows.
Note this also removes the non-functional xwl_output_set_window_randr_emu_props
call from xwl_realize_window, which was intended to do this, but does not
work.
This fixes apps using the ogre3d library always running at the
monitors native resolution.
Acked-by: Olivier Fourdan <ofourdan@redhat.com>
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
commit 4cfc2677f5c82ca5db0919de549b9b077f1ba113
Author: Hans de Goede <hdegoede@redhat.com>
Date: Mon Nov 4 11:46:49 2019 +0100
xwayland: Call xwl_window_check_resolution_change_emulation() on newly created O-R windows
Some clients, which use vidmode to change the resolution when going fullscreen,
create an override-redirect window and never trigger the screen->ResizeWindow
callback we rely on to do the xwl_window_check_resolution_change_emulation().
This causes us to not apply a viewport to them, causing the fullscreen window
to not fill the entire monitor.
This commit adds a call to xwl_window_check_resolution_change_emulation()
at the end of ensure_surface_for_window() to fix this. Note that
ensure_surface_for_window() exits early without creating an xwl_window
for new windows which will not be backed by a wayland surface and which
thus will not have an xwl_window.
This fixes ClanLib-0.6.x and alleggl-4.4.x using apps not properly
fullscreening.
Acked-by: Olivier Fourdan <ofourdan@redhat.com>
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
commit 88342353de45e64f408c38bb10cd1506ba0f159a
Author: Hans de Goede <hdegoede@redhat.com>
Date: Mon Oct 7 14:27:49 2019 +0200
xwayland: Fix emulated modes not being removed when screen rotation is used
The code building the mode-list does the following to deal with screen
rotation:
if (need_rotate || xwl_output->rotation & (RR_Rotate_0 | RR_Rotate_180)) {
mode_width = xwl_output->width;
mode_height = xwl_output->height;
} else {
mode_width = xwl_output->height;
mode_height = xwl_output->width;
}
This means we need to do something similar in xwl_output_set_emulated_mode()
to determine if the mode being set is the actual (not-emulated) output mode
and we this should remove any emulated modes set by the client.
All callers of xwl_output_set_emulated_mode always pass a mode pointer
to a member of xwl_output->randr_output->modes, so we do not need to
duplicate this code, instead we can simply check that the passed in mode
is modes[0] which always is the actual output mode.
Acked-by: Olivier Fourdan <ofourdan@redhat.com>
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
commit 10df0437a2b142e61c4d84ffffa9592ac6846ef1
Author: Hans de Goede <hdegoede@redhat.com>
Date: Thu Jan 9 11:00:36 2020 +0100
xwayland: Also hook screen's MoveWindow method
Not only hook the ResizeWindow method of the screen (which really is
MoveAndResize) but also hook the MoveWindow method for checking if we
need to setup a viewport for resolution change emulation.
Our resolution change emulation check if the windows origin matches
the monitors origin and the windows origin can also be changed by just
a move without being resized.
Also checking on a move becomes esp. important when we move to checking
on changes to the top-level non-window-manager client (X11)Window instead
of on changes to the xwl_window later on in this patch series.
Acked-by: Olivier Fourdan <ofourdan@redhat.com>
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
commit 4fc107460a349a1a46f0e5251e6fd2a31f4c0428
Author: Hans de Goede <hdegoede@redhat.com>
Date: Wed Jan 15 14:36:45 2020 +0100
xwayland: Also check resolution-change-emulation when the xwl_window itself moves
The recent change to use the top-level non-window-manager Window drawable
coordinates from xwl_window_check_resolution_change_emulation() in
combination with only calling it on a resize when the top-level window
is moved breaks things with mutter/gnome-shell.
When fullscreening a X11 window, mutter moves its window-decoration Window
wrapping the top-level Window to the monitor's origin coordinates (e.g. 0x0)
last. This updates the top-level's drawable coordinates, but as the
actual MoveWindow is called on the wrapper Window and not on the toplevel
we do not call xwl_window_check_resolution_change_emulation() and we never
enable the viewport.
This commit fixes this by also calling
xwl_window_check_resolution_change_emulation() if the Window being moved
is an xwl_window itself.
Acked-by: Olivier Fourdan <ofourdan@redhat.com>
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
commit 6d98f840da6dfcf2a69e03a1b3fa0bf602ba1f27
Author: Roman Gilg <subdiff@gmail.com>
Date: Fri Jan 3 17:55:28 2020 +0100
xwayland: Check emulation on client toplevel resize
When a reparented window is resized directly check the emulation instead of
doing this only when the window manager parent window is resized, what might
never happen.
For that to work we need to make sure that we compare the current size of the
client toplevel when looking for an emulated mode.
Changes by Hans de Goede:
- Remove xwl_window x, y, width and height members as those are no longer used.
- Add check for xwl_window_from_window() returning NULL.
Signed-off-by: Roman Gilg <subdiff@gmail.com>
Acked-by: Olivier Fourdan <ofourdan@redhat.com>
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
commit 060f10062eb1761515b762b46cba56c7a53db72c
Author: Roman Gilg <subdiff@gmail.com>
Date: Wed Jan 15 10:07:58 2020 +0100
xwayland: Make window_get_none_wm_owner return a Window instead of a Client
Make window_get_none_wm_owner return the first non-wm-window instead of the
owner (client) of the first non-wm-window and rename it to
window_get_client_toplevel to match its new behavior.
This is a preparation patch for switching to using the drawable coordinates
in xwl_window_should_enable_viewport()
Changes by Hans de Goede:
- Split this change out into a separate patch for easier reviewing
- Rename window_get_none_wm_owner to window_get_client_toplevel to match
its new behavior
Signed-off-by: Roman Gilg <subdiff@gmail.com>
Acked-by: Olivier Fourdan <ofourdan@redhat.com>
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
commit a69f7fbb54efc8ffad320c8afd23cb41fc9edc27
Author: Roman Gilg <subdiff@gmail.com>
Date: Fri Jan 3 17:27:28 2020 +0100
xwayland: Recurse on finding the none-wm owner
An X11 window manager might add a chain of parent windows when reparenting to a
decoration window.
That is for example the case for KWin, which reparents client windows to one
decoration and another wrapper parent window.
Account for that by a recursion into the tree. For now assume as before that
all X11 window managers reparent with one child only for these parent windows.
Changes by Hans de Goede:
- Move the xwl_window_is_toplevel() from a later patch in this series here
as it really belongs together with these changes
- Drop no longer necessary xwl_window argument from window_get_none_wm_owner
parameters
Signed-off-by: Roman Gilg <subdiff@gmail.com>
Reviewed-by: Hans de Goede <hdegoede@redhat.com>
Acked-by: Olivier Fourdan <ofourdan@redhat.com>
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
commit 948e02872feb641a176b3af82b6ef1201c97bb16
Author: Roman Gilg <subdiff@gmail.com>
Date: Fri Jan 3 17:12:14 2020 +0100
xwayland: Reuse viewport instead of recreating
When a viewport is already created we can reuse this object instead of
destroying it and getting a new one for updating the source rectangle and
destination size.
Signed-off-by: Roman Gilg <subdiff@gmail.com>
Reviewed-by: Hans de Goede <hdegoede@redhat.com>
Acked-by: Olivier Fourdan <ofourdan@redhat.com>
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
commit ded89300c1dd541f59fe6e93c5c69d7fe7088244
Author: Hans de Goede <hdegoede@redhat.com>
Date: Mon Jan 27 11:08:00 2020 +0100
xwayland: Cache client-id for the window-manager client
Instead of iterating over all clients which are listening for events on the
root window and checking if the client we are dealing with is the one
listening for SubstructureRedirectMask | ResizeRedirectMask events and thus
is the window-manager, cache the client-id of the window-manager in
xwl_screen and use that when checking if a client is the window-manager.
Note that we cache and compare the client-id rather then the ClienPtr,
this saves reading the ClientPtr from the global clients array when doing
the comparison.
Suggested-by: Olivier Fourdan <ofourdan@redhat.com>
Acked-by: Olivier Fourdan <ofourdan@redhat.com>
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
commit 1e44861aba449eec81d69b1da3a6e6f88676e04f
Author: Roman Gilg <subdiff@gmail.com>
Date: Mon May 27 23:01:53 2019 +0200
present: Rename window_msc variable in present function
The value is not the current msc of the window, but the target value
the client sets independently of the window speicific msc offset. Make
this clearer.
Signed-off-by: Roman Gilg <subdiff@gmail.com>
Reviewed-by: Michel Dänzer <michel.daenzer@amd.com>
commit d3c1b223cec2b475c4f1661d7e5dc5238d08d8f6
Author: Roman Gilg <subdiff@gmail.com>
Date: Mon May 27 22:58:49 2019 +0200
present: Move scmd-update-window-crtc function
Move the code portion down. That way it is at a similar position as in
the window mode file.
Signed-off-by: Roman Gilg <subdiff@gmail.com>
Reviewed-by: Michel Dänzer <michel.daenzer@amd.com>
commit 8c2dcc5f800438d2b4545d21a515e013e6aac484
Author: Roman Gilg <subdiff@gmail.com>
Date: Mon May 27 22:49:23 2019 +0200
present: Code cleanup of window to crtc timings update
Make the code more readable by going through some logical abort
conditions. Also make the function only about updating the crtc
msc value and not about also returning the next target msc.
Signed-off-by: Roman Gilg <subdiff@gmail.com>
Reviewed-by: Michel Dänzer <michel.daenzer@amd.com>
commit 4d89ba0058457d51f2e1a132c0b7fc8a3ec5c76d
Author: Roman Gilg <subdiff@gmail.com>
Date: Mon May 27 22:42:34 2019 +0200
present: Unfold and annotate the target-msc getter
Unfold and extensively annotate the target-msc adjustment function, to make
it easier to understand what's happening and why.
Signed-off-by: Roman Gilg <subdiff@gmail.com>
Reviewed-by: Michel Dänzer <michel.daenzer@amd.com>
commit 99e55f1b955e2db442184756fcd8b95791fd71de
Author: Roman Gilg <subdiff@gmail.com>
Date: Mon May 27 22:32:22 2019 +0200
present: Adjust timings with value arguments
We can use value arguments instead of pointers when adjusting the timings
by returning the adjusted value. This improves the readability.
Signed-off-by: Roman Gilg <subdiff@gmail.com>
Reviewed-by: Michel Dänzer <michel.daenzer@amd.com>
commit 4709d24f8e3ef5ee79085b77401eaacd7e1690c7
Author: Olivier Fourdan <ofourdan@redhat.com>
Date: Fri Feb 14 15:20:59 2020 +0100
xwayland: Add version command line option
Xorg supports the '-version' command line option, add something similar
to Xwayland.
Closes: https://gitlab.freedesktop.org/xorg/xserver/issues/976
Signed-off-by: Olivier Fourdan <ofourdan@redhat.com>
Reviewed-by: Jonas Ådahl <jadahl@gmail.com>
Reviewed-by: Michel Dänzer <mdaenzer@redhat.com>
commit ee9f6e20de1408d572dc1eba33f3d2a8501d7da5
Author: Adam Jackson <ajax@redhat.com>
Date: Tue Aug 27 18:10:38 2019 -0400
meson: Add support for libunwind
commit 42aaf37241fedfd6a0f72b255f2d45d6ea34d8c6
Author: Zoltán Böszörményi <zboszor@gmail.com>
Date: Wed Feb 12 21:29:52 2020 +0000
Fix modesetting device matching through kmsdev device path
xf86platformProbeDev didn't check the device path, fix it.
This is a problem when trying to set up a non-PCI device via
explicit xorg.conf.d configuration.
An USB DisplayLink device, being non-PCI was always set up
as a GPU device assigned to screen 0 instead of a regular
framebuffer, potentially having its own dedicated screen,
despite such configuration as below. Only the relevant parts
of the configuration are quoted, it's part of a larger context
with an Intel chip that has 3 outputs:
* DP1 connected to an LCD panel,
* VGA1 connected to an external monitor,
* HDMI1 unconnected and having no user visible connector
Section "ServerFlags"
Option "AutoBindGPU" "false"
EndSection
...
Section "Device"
Identifier "Intel2"
Driver "intel"
BusID "PCI:0:2:0"
Screen 2
Option "Monitor-HDMI1" "HDMI1"
Option "ZaphodHeads" "HDMI1"
EndSection
Section "Device"
Identifier "UDL"
Driver "modesetting"
Option "kmsdev" "/dev/dri/card0"
#BusID "usb:0:1.2:1.0"
Option "Monitor-DVI-I-1" "DVI-I-1"
Option "ShadowFB" "on"
Option "DoubleShadow" "on"
EndSection
...
Section "Screen"
Identifier "SCREEN2"
Option "AutoServerLayout" "on"
Device "UDL"
GPUDevice "Intel2"
Monitor "Monitor-DVI-I-1"
SubSection "Display"
Modes "1024x768"
Depth 24
EndSubSection
EndSection
Section "ServerLayout"
Identifier "LAYOUT"
Option "AutoServerLayout" "on"
Screen 0 "SCREEN"
Screen 1 "SCREEN1" RightOf "SCREEN"
Screen 2 "SCREEN2" RightOf "SCREEN1"
EndSection
On the particular machine I was trying to set up an UDL device,
I found the following structure was being used to match
the device to a platform device while I was debugging the issue:
xf86_platform_devices[0] == Intel, /dev/dri/card1, primary platform device
xf86_platform_devices[1] == UDL, /dev/dri/card0
devList[0] == "Intel0", ZaphodHeads: DP1
devList[1] == "Intel1", ZaphodHeads: VGA1
devList[2] == "UDL"
devList[3] == "Intel2", ZaphodHeads: HDMI1 (intended GPU device to UDL)
When xf86platformProbeDev() matched the UDL device, the BusID
check failed in both cases of:
* BusID "usb:0:1.2:1.0" was specified
* Option "kmsdev" "/dev/dri/card0" was specified
As a result, xf86platformProbeDev() went on to call probeSingleDevice()
with xf86_platform_devices[0] and devList[2], resulting in the
UDL device being set up as a GPU device assigned to the first screen
instead of as a framebuffer on the third screen as the configuration
specified.
Checking Option "kmsdev" in code code may be a layering violation.
But the modesetting driver is actually part of the Xorg sources
instead of being an external driver, so he "kmsdev" path knowledge
may be used here.
Signed-off-by: Böszörményi Zoltán <zboszor@pr.hu>
commit a542224ea28e2e8ccaf5e0df85bf6c603e97599a
Author: Michel Dänzer <mdaenzer@redhat.com>
Date: Fri Feb 7 12:15:07 2020 +0100
xwayland: Call glamor_block_handler from xwl_screen_post_damage
In between the two phases introduced by the previous change. This makes
sure all pending drawing to the new buffers is flushed before they're
committed to the Wayland server.
commit f88d9b1f779835302e02e255fcd45989db7f488d
Author: Michel Dänzer <mdaenzer@redhat.com>
Date: Fri Feb 7 12:06:39 2020 +0100
xwayland: Split up xwl_screen_post_damage into two phases
The first phase sets the new surface properties for all damaged
windows, then the second phase commits all surface updates.
This is preparatory for the next change, there should be no observable
change in behaviour (other than the order of Wayland protocol
requests).
Reviewed-by: Adam Jackson <ajax@redhat.com>
commit 7b33c2d3f31fe03f88cc26f08590f2baf1a6ef36
Author: Michel Dänzer <mdaenzer@redhat.com>
Date: Thu Feb 6 18:45:19 2020 +0100
Revert "xwayland/glamor-gbm: Add xwl_glamor_gbm_post_damage hook"
This reverts commit 9e85aa9c1fbf51ef00674e3a91aded4083a14a15.
To be replaced with a better solution.
Reviewed-by: Adam Jackson <ajax@redhat.com>
commit 1310346d6052c91910f526cbdcc81061fe6abd94
Author: Michel Dänzer <mdaenzer@redhat.com>
Date: Mon Feb 10 18:48:05 2020 +0100
gitlab-ci: Add meson build job with glamor disabled
To prevent breakage with glamor disabled from creeping in again.
Reviewed-by: Adam Jackson <ajax@redhat.com>
commit 72ccd7f540a36185ecdb62324c68496fb57e65fe
Author: Michel Dänzer <mdaenzer@redhat.com>
Date: Mon Feb 10 18:44:11 2020 +0100
gitlab-ci: Drop "-build-and-test" job name suffix
It's long and kind of redundant.
Reviewed-by: Adam Jackson <ajax@redhat.com>
commit 49553049e871d03e9e26672843de8712d20f688a
Author: Michel Dänzer <mdaenzer@redhat.com>
Date: Mon Feb 10 18:57:42 2020 +0100
modesetting: Remove local variable only used with glamor enabled
Resulted in a build failure with -Werror:
../hw/xfree86/drivers/modesetting/drmmode_display.c: In function ‘drmmode_crtc_set_mode’:
../hw/xfree86/drivers/modesetting/drmmode_display.c:759:15: error: unused variable ‘screen’ [-Werror=unused-variable]
759 | ScreenPtr screen = crtc->scrn->pScreen;
| ^~~~~~
Fixes: c66c548eabf0 "modesetting: Call glamor_finish from
drmmode_crtc_set_mode"
Reviewed-by: Adam Jackson <ajax@redhat.com>
commit 0cb9fa7949d6c5398de220fbdbe1e262e943fcbb
Author: Michel Dänzer <mdaenzer@redhat.com>
Date: Mon Feb 10 18:41:44 2020 +0100
modesetting: Fix build with glamor disabled
Fixes: cb1b1e184723 "modesetting: Indirect the glamor API through
LoaderSymbol"
Reviewed-by: Adam Jackson <ajax@redhat.com>
commit bfb36a5806196e257958907bfcdd71c24acc5d37
Author: Pekka Paalanen <pekka.paalanen@collabora.com>
Date: Mon Feb 10 16:07:41 2020 +0100
randr: auto-bind of GPU is a config change
When a GPU is auto-bound adding more outputs to a screen, that needs to count
as a configuration change on that screen so that a WM listening for
RRScreenChangeNotify gets notified and handles it as a hotplug. This is
particularly for cases where the outputs are already connected. Otherwise
nothing might happen.
Issue #909 describes a real world case where plugging in a DisplayLink dock
with a monitor already connected is sometimes left inactive by GNOME. That
issue is a race, and requires adding a sleep(5); as the first thing in
NewGPUDeviceRequest() to reproduce reliably. With the sleep, the monitor in the
dock will never activate automatically. Add this fix over the sleep, and the
issue is gone.
This fix was originally developed on a branch replicating Ubuntu 19.04 patch
set based on xserver 1.20.4. Testing on master branch was impossible due to
xorg/xserver#910.
Closes: https://gitlab.freedesktop.org/xorg/xserver/issues/909
Signed-off-by: Pekka Paalanen <pekka.paalanen@collabora.com>
Reviewed-by: Michel Dänzer <mdaenzer@redhat.com>
commit 3aa754c3637694a2a3083b8fd9fba0bc862b1a67
Author: David Seifert <soap@gentoo.org>
Date: Wed Feb 5 11:32:24 2020 +0100
Always use `-fno-common` in CI
* This prevents issues from creeping back in at a later stage.
commit 1cfdd1a96580733df3625bcea3384ffee3dc92df
Author: Dave Airlie <airlied@redhat.com>
Date: Tue Feb 4 16:02:06 2020 +1000
modesetting: remove unnecessary error message, fix zaphod leases
I introduced this error with the MST hotplug code, but it can trigger
on zaphod setups, and is perfectly fine. There is no support for
MST/hotplug on zaphod setups currently, so we can just skip over
the dynamic connector handling here. However we shouldn't skip
over the lease handling so move it into the codepath.
Fixes: 9257b1252da9 ("modesetting: add dynamic connector hotplug support (MST) (v3)")
Reviewed-by: Michel Dänzer <mdaenzer@redhat.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
commit 9e85aa9c1fbf51ef00674e3a91aded4083a14a15
Author: Michel Dänzer <mdaenzer@redhat.com>
Date: Thu Jan 30 12:29:03 2020 +0100
xwayland/glamor-gbm: Add xwl_glamor_gbm_post_damage hook
It flushes any pending drawing to the kernel, to make sure it'll be
visible to the Wayland server.
Without this, it was possible for the Wayland server to process surface
commits before Xwayland got around to flushing the corresponding
drawing, which could result in stale or even completely random window
contents being visible.
v2:
* Make EGL backend post_damage hook mandatory, don't check for NULL in
xwl_glamor_post_damage. (Olivier Fourdan)
Closes: https://gitlab.freedesktop.org/xorg/xserver/issues/951
Reviewed-by: Olivier Fourdan <ofourdan@redhat.com>
commit 6a5e47c57d16de8b6a6a2636f3cbad1aebec32e2
Author: Michel Dänzer <mdaenzer@redhat.com>
Date: Mon Jan 27 17:47:10 2020 +0100
xfree86/modes: Bail from xf86RotateRedisplay if pScreen->root is NULL
Avoids a crash in xf86RotatePrepare -> DamageRegister during
CreateScreenResources if rotation or another transform is configured for
any connected RandR output in xorg.conf. The generic rotation/transform
code generally can't work without the root window currently.
Closes: https://gitlab.freedesktop.org/xorg/xserver/issues/969
Fixes: 094f42cdfe5d "xfree86/modes: Call xf86RotateRedisplay from
xf86CrtcRotate"
Acked-by: Olivier Fourdan <ofourdan@redhat.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
commit 578371616e09364318c9fb2371a693d438b31b29
Author: Daniel Llewellyn <daniel@bowlhat.net>
Date: Wed Jan 29 21:33:24 2020 +0000
os: Ignore dying client in ResetCurrentRequest
You might as well, it's harmless. Better, some cleanup code (like DRI2
swap wait) needs to run both normally and at client exit, so it
simplifies the callers to not need to check first. See 4308f5d3 for a
similar example.
Props: @ajax (Adam Jackson)
Fixes: xorg/xserver#211
Signed-off-by: Daniel Llewellyn <diddledan@ubuntu.com>
commit b6a5389e1789d63c6c61983b973b8559953afc88
Author: Michel Dänzer <mdaenzer@redhat.com>
Date: Tue Jan 28 18:39:10 2020 +0100
gitlab-ci: Enable -Werror in the meson build job
There are no warnings left, so let's prevent new ones from creeping
back in.
commit 794fd7e563ca9430a4a29a8e9f1923c07c23a480
Author: Michel Dänzer <mdaenzer@redhat.com>
Date: Tue Jan 28 18:35:45 2020 +0100
tests/misc: Drop redundant screenInfo declaration
GCC warned about it:
../test/misc.c:36:19: warning: redundant redeclaration of ‘screenInfo’ [-Wredundant-decls]
36 | extern ScreenInfo screenInfo;
| ^~~~~~~~~~
In file included from ../test/misc.c:30:
../include/scrnintstr.h:688:29: note: previous declaration of ‘screenInfo’ was here
688 | extern _X_EXPORT ScreenInfo screenInfo;
| ^~~~~~~~~~
commit 4287604425e7ff905036541829896d1ddf7c65d0
Author: Michel Dänzer <mdaenzer@redhat.com>
Date: Tue Jan 28 18:31:13 2020 +0100
Xephyr: Cast "red" to char* for xcb_aux_parse_color
xcb_aux_parse_color takes a non-const pointer, even though it doesn't
modify the string or take ownership of its memory.
Avoids the following warning from GCC:
../hw/kdrive/ephyr/hostx.c: In function ‘hostx_init’:
../hw/kdrive/ephyr/hostx.c:683:30: warning: passing argument 1 of ‘xcb_aux_parse_color’ discards ‘const’ qualifier from pointer target type [-Wdiscarded-qualifiers]
683 | if (!xcb_aux_parse_color("red", &red, &green, &blue)) {
| ^~~~~
In file included from ../hw/kdrive/ephyr/hostx.c:50:
/usr/include/xcb/xcb_aux.h:194:27: note: expected ‘char *’ but argument is of type ‘const char *’
194 | xcb_aux_parse_color(char *color_name,
| ~~~~~~^~~~~~~~~~
commit 65387391a551fff6fec808d48b9bf4b6181cb050
Author: Michel Dänzer <mdaenzer@redhat.com>
Date: Tue Jan 28 18:22:45 2020 +0100
loader: strdup const string assigned to local variable name
There's a free(name) at the end of the function.
GCC warned about this:
../hw/xfree86/loader/loadmod.c: In function ‘LoadModule’:
../hw/xfree86/loader/loadmod.c:702:18: warning: assignment discards ‘const’ qualifier from pointer target type [-Wdiscarded-qualifiers]
702 | m = name = "int10";
| ^
commit e1fa3beb2fe2519e69f859f0acdc68e5a770de27
Author: Adam Jackson <ajax@redhat.com>
Date: Tue Jan 28 13:26:41 2020 -0500
Revert "dri2: Don't make reference to noClientException"
It's true that the value would always be -1, if it's not zero, but it's
usually zero is the problem. As a result we return failure from
otherwise successful indirect GLX paths, which isn't very nice of us.
This reverts commit 7d33ab0f8c7958b205076f71e4b47c24aace77fd.
Fixes: https://gitlab.freedesktop.org/xorg/xserver/issues/211
commit 435d41d5ffe5467f43225b59411ca9f9a05c10a6
Author: David Seifert <soap@gentoo.org>
Date: Fri Jan 24 12:49:44 2020 +0100
Fix building with `-fno-common`
* GCC 10 will switch the default to `-fno-common`.
https://gcc.gnu.org/PR85678
Bug: https://bugs.gentoo.org/705880
Signed-off-by: Matt Turner <mattst88@gmail.com>
commit 83826075e59c0393c16d2a2482dc5c9f2fdf4564
Author: George Matsumura <gmmatsumura01@bvsd.org>
Date: Thu Dec 26 23:01:26 2019 +0000
Restrict 1x1 pixmap filling optimization to GXcopy
This restricts an optimization whereby the filling of 1x1 pixmaps
went around the driver-provided function to cases where the
source color is meant to be directly copied to the destination,
as opposed to other operations which should produce different
destination values than just the foreground color.
Signed-off-by: George Matsumura <gmmatsumura01@bvsd.org>
Reviewed-by: Michel Dänzer <mdaenzer@redhat.com>
commit 0839b0523a01067cb9c9b53ebdd9ce4c00f0eb12
Author: E5ten <ethancsommer@gmail.com>
Date: Wed Jan 15 17:36:06 2020 +0000
meson: add prefix to serverconfigdir
fixes #853
commit a24a786fc8490fda08b15c3dab6fa6750f008ecb
Author: Michel Dänzer <mdaenzer@redhat.com>
Date: Tue Jan 14 09:23:34 2020 +0100
modesetting: Explicitly #include "mi.h"
For the miClearDrawable prototype. Apparently it doesn't get pulled in
for some build configurations, breaking the build.
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
commit 25ca99df38a2c28c25ab20a917e68442285f2353
Author: Kenneth Graunke <kenneth@whitecape.org>
Date: Mon Jan 13 23:34:49 2020 -0800
configure: Define GLAMOR_HAS_EGL_QUERY_DRIVER when available
Commit 195c2ef8f9f07b9bdabc0f554a9033b7857b99c7 added this to the Meson
build but neglected to add it to autotools.
v2: Also update dix-config.h.in
Fixes: 195c2ef8f ("glamor: Add a function to get the driver name via EGL_MESA_query_driver")
Reviewed-by: Michel Dänzer <mdaenzer@redhat.com> [v1]
Reviewed-by: Eric Engestrom <eric@engestrom.ch> [v1]
Reviewed-by: Matt Turner <mattst88@gmail.com>
commit 49456e0a37fac7bc9d1f01bc1519fb0d699956db
Author: Fabrice Fontaine <fontaine.fabrice@gmail.com>
Date: Fri Dec 27 23:33:37 2019 +0100
hw/xfree86/common/xf86Init.c: fix build without glx
Since commit d8ec33fe0542141aed1d9016d2ecaf52da944b4b, an include on
glxvndabi.h has been added to hw/xfree86/common/xf86Init.c
However, if glx is disabled through --disable-glx and GLX headers are
not installed in the build's environment, build fails on:
In file included from xf86Init.c:81:
../../../include/glxvndabi.h:64:10: fatal error: GL/glxproto.h: No such file or directory
64 | #include <GL/glxproto.h>
| ^~~~~~~~~~~~~~~
Fix this failure by removing this include which does not seem to be
needed (an other option would have been to keep it under an ifdef GLXEXT
block)
Fixes:
- http://autobuild.buildroot.org/results/de838a843f97673d1381a55fd4e9b07164693913
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
commit 26004df63c25061586a967f3586795a75280acc2
Author: Lubomir Rintel <lkundrak@v3.sk>
Date: Wed Dec 25 18:54:03 2019 +0100
glamor_egl: Reject OpenGL < 2.1 early on
The Etnaviv driver on GC2000 reports desktop OpenGL 1.3 but also OpenGL ES 2.0.
However, with the modesetting driver, GLES2 never gets a chance:
[ 11233.393] Require OpenGL version 2.1 or later.
[ 11233.393] (EE) modeset(0): Failed to initialize glamor at ScreenInit() time.
[ 11233.393] (EE)
Fatal server error:
[ 11233.395] (EE) AddScreen/ScreenInit failed for driver 0
Let's reject old desktop GL early on, just like XWayland seems to do.
This is perhaps a slightly bit more complicated that one would expect, since we
need to call eglMakeCurrent() before we query the GL version.
Signed-off-by: Lubomir Rintel <lkundrak@v3.sk>
commit 98bfee6a1b901a6f886d74dcc9fd3cbb68838375
Author: Michel Dänzer <mdaenzer@redhat.com>
Date: Mon Dec 23 09:26:17 2019 +0100
xwayland: Include xwayland-window.h from xwayland-glamor-eglstream.c
Fixes build failure.
Closes: https://gitlab.freedesktop.org/xorg/xserver/issues/954
Fixes: 89e32d00f6e0 "xwayland: Move Xwayland windows to its own sources"
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Olivier Fourdan <ofourdan@redhat.com>
commit e914fb16adcab8807a280450d5cdfff4bbdce96b
Author: Michel Dänzer <mdaenzer@redhat.com>
Date: Mon Dec 23 09:53:26 2019 +0100
gitlab-ci: Install libnvidia-egl-wayland-dev package
In order to build-test the Xwayland eglstream code.
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Olivier Fourdan <ofourdan@redhat.com>
commit a52122c7f2697361f53e82ac384ff3f4eba24c76
Author: Michel Dänzer <mdaenzer@redhat.com>
Date: Mon Dec 23 09:32:07 2019 +0100
gitlab-ci: Use sorted lists of distro packages, one per line
This will make it easier to review changes.
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Olivier Fourdan <ofourdan@redhat.com>
commit 37a64ede3b545cda9edde65c65c02054d2da43cb
Author: Michel Dänzer <mdaenzer@redhat.com>
Date: Mon Dec 23 09:51:43 2019 +0100
gitlab-ci: Strip down docker image contents more
Making the image significantly smaller.
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Olivier Fourdan <ofourdan@redhat.com>
commit 23b72d8e4b624ffd81a35e3b62be2430051a6ffa
Author: Michel Dänzer <mdaenzer@redhat.com>
Date: Mon Dec 23 09:35:09 2019 +0100
gitlab-ci: Use -j4 instead of -j$(proc)
The shared GitLab CI runners are configured for jobs making use of up
to 4 CPU cores, attempting to use more may overload them.
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Olivier Fourdan <ofourdan@redhat.com>
commit 9107a610deb130d0e4ddee92d6ca9a08a8e103f3
Author: Michel Dänzer <mdaenzer@redhat.com>
Date: Mon Dec 23 10:41:32 2019 +0100
gitlab-ci: Use host-mapped directory for ccache
Same as done in Mesa.
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Olivier Fourdan <ofourdan@redhat.com>
commit 4226c6d0329df440551b7b91ae573a82c64a1ac9
Author: Aaron Plattner <aplattner@nvidia.com>
Date: Thu Dec 26 13:40:17 2019 -0800
modesetting: Check whether RandR was initialized before calling rrGetScrPriv
Calling rrGetScrPriv when RandR isn't initialized causes an assertion
failure that aborts the server:
Xorg: ../include/privates.h:121: dixGetPrivateAddr: Assertion `key->initialized' failed.
Thread 1 "Xorg" received signal SIGABRT, Aborted.
0x00007ffff78a8f25 in raise () from /usr/lib/libc.so.6
(gdb) bt
#0 0x00007ffff78a8f25 in raise () from /usr/lib/libc.so.6
#1 0x00007ffff7892897 in abort () from /usr/lib/libc.so.6
#2 0x00007ffff7892767 in __assert_fail_base.cold () from /usr/lib/libc.so.6
#3 0x00007ffff78a1526 in __assert_fail () from /usr/lib/libc.so.6
#4 0x00007ffff7fb57c1 in dixGetPrivateAddr (privates=0x555555ab1b60, key=0x555555855720 <rrPrivKeyRec>) at ../include/privates.h:121
#5 0x00007ffff7fb5822 in dixGetPrivate (privates=0x555555ab1b60, key=0x555555855720 <rrPrivKeyRec>) at ../include/privates.h:136
#6 0x00007ffff7fb586a in dixLookupPrivate (privates=0x555555ab1b60, key=0x555555855720 <rrPrivKeyRec>) at ../include/privates.h:166
#7 0x00007ffff7fb8445 in CreateScreenResources (pScreen=0x555555ab1790) at ../hw/xfree86/drivers/modesetting/driver.c:1335
#8 0x000055555576c5e4 in xf86CrtcCreateScreenResources (screen=0x555555ab1790) at ../hw/xfree86/modes/xf86Crtc.c:744
#9 0x00005555555d8bb6 in dix_main (argc=4, argv=0x7fffffffead8, envp=0x7fffffffeb00) at ../dix/main.c:214
#10 0x00005555557a4f0b in main (argc=4, argv=0x7fffffffead8, envp=0x7fffffffeb00) at ../dix/stubmain.c:34
This can happen, for example, if the server is configured with Xinerama
and there is more than one X screen:
Section "ServerLayout"
Identifier "crash"
Screen 0 "modesetting"
Screen 1 "dummy" RightOf "modesetting"
Option "Xinerama"
EndSection
Section "Device"
Identifier "modesetting"
Driver "modesetting"
EndSection
Section "Screen"
Identifier "modesetting"
Device "modesetting"
EndSection
Section "Device"
Identifier "dummy"
Driver "dummy"
EndSection
Section "Screen"
Identifier "dummy"
Device "dummy"
EndSection
The problem does not reproduce if there is only one X screen because of
this code in xf86RandR12Init:
#ifdef PANORAMIX
/* XXX disable RandR when using Xinerama */
if (!noPanoramiXExtension) {
if (xf86NumScreens == 1)
noPanoramiXExtension = TRUE;
else
return TRUE;
}
#endif
Fix the problem by checking dixPrivateKeyRegistered(rrPrivKey) before
calling rrGetScrPriv. This is similar to what the xf86-video-amdgpu
driver does:
https://gitlab.freedesktop.org/xorg/driver/xf86-video-amdgpu/blob/fd66f5c0bea2b7c22a47bfd5eb1f22d32d166d9c/src/amdgpu_kms.c#L388
Signed-off-by: Aaron Plattner <aplattner@nvidia.com>
Reviewed-by: Michel Dänzer <mdaenzer@redhat.com>
commit b1ee4036bfd59dfd506ed8312b63edffc913b1c1
Author: Michel Dänzer <mdaenzer@redhat.com>
Date: Mon Dec 23 10:06:25 2019 +0100
gitlab-ci: Mark jobs as interruptible
Allowing redundant pipelines to be automatically cancelled.
commit 1e9c63beddb3010bb1f6eb96679410ca0aca037e
Author: Michel Dänzer <mdaenzer@redhat.com>
Date: Mon Dec 23 10:03:20 2019 +0100
gitlab-ci: Turn .retry YAML anchor into .ci-run-policy template
To match Mesa.
commit 456dff1bf890459840718339279dcb84d36531eb
Author: Alex Goins <agoins@nvidia.com>
Date: Thu Dec 12 20:18:53 2019 -0600
modesetting: Fix msSharePixmapBacking Segfault Regression
Commit cb1b1e184 modified msSharePixmapBacking() to derive modesettingPtr from
the 'screen' argument. Unfortunately, the name of the argument is misleading --
the screen is the slave screen. If the master is modesetting,
and the slave is not modesetting, it will segfault.
To fix the problem, this change derives modesettingPtr from
ppix->drawable.pScreen. This method is already used when calling
ms->glamor.shareable_fd_from_pixmap() later in the function.
To avoid future issues, this change also renames the 'screen' argument to
'slave'.
Signed-off-by: Alex Goins <agoins@nvidia.com>
Reviewed-by: Michel Dänzer <mdaenzer@redhat.com>
commit 58155baeac494c95a45d99d44dd9307e8aedd2af
Author: Olivier Fourdan <ofourdan@redhat.com>
Date: Wed Dec 18 15:00:11 2019 +0100
xwayland: Cleanup and remove `xwayland.h`
Now that each source and header should be in order, we can safely cleaup
the last remaining bits from the main `xwayland.h` which is not needed
anymore and can be removed.
Signed-off-by: Olivier Fourdan <ofourdan@redhat.com>
Reviewed-by: Michel Dänzer <mdaenzer@redhat.com>
commit c830bd847fa5b60db95dcbb54dde3868f2a31a9a
Author: Olivier Fourdan <ofourdan@redhat.com>
Date: Wed Dec 18 10:33:16 2019 +0100
xwayland: Remove `MODIFIER_META` definition
It's nowhere to be used.
Signed-off-by: Olivier Fourdan <ofourdan@redhat.com>
Reviewed-by: Michel Dänzer <mdaenzer@redhat.com>
commit 4c644fd792e642fc566f7b0b08bc000ecf641a50
Author: Olivier Fourdan <ofourdan@redhat.com>
Date: Wed Dec 18 14:13:34 2019 +0100
xwayland: Move Xwayland GLX declaration
Move the Xwayland GLX declaration to its own header file.
Signed-off-by: Olivier Fourdan <ofourdan@redhat.com>
Reviewed-by: Michel Dänzer <mdaenzer@redhat.com>
commit 808a0a038b945171e0c6e18093fe1b9daeafe26a
Author: Olivier Fourdan <ofourdan@redhat.com>
Date: Wed Dec 18 11:18:22 2019 +0100
xwayland: Move Xwayland vidmode declaration
Move the Xwayland vidmode declaration to its own header file.
Signed-off-by: Olivier Fourdan <ofourdan@redhat.com>
Reviewed-by: Michel Dänzer <mdaenzer@redhat.com>
commit e8ba8a94e120abf78886ca809f0bf01e7258367c
Author: Olivier Fourdan <ofourdan@redhat.com>
Date: Wed Dec 18 10:56:34 2019 +0100
xwayland: Move Xwayland CVT declaration
Move the Xwayland CVT declaration to its own header file.
Signed-off-by: Olivier Fourdan <ofourdan@redhat.com>
Reviewed-by: Michel Dänzer <mdaenzer@redhat.com>
commit 0617c635fa3577965c5fa198ed4e57da8fee919d
Author: Olivier Fourdan <ofourdan@redhat.com>
Date: Wed Dec 18 10:03:43 2019 +0100
xwayland: Separate Xwayland screen code
Move Xwayland screen related code to a separate source file and header.
Signed-off-by: Olivier Fourdan <ofourdan@redhat.com>
Reviewed-by: Michel Dänzer <mdaenzer@redhat.com>
commit 211609a9387a5fb0df83ef6ddea59ef817ea2f59
Author: Olivier Fourdan <ofourdan@redhat.com>
Date: Wed Dec 18 10:45:17 2019 +0100
xwayland: Move Xwayland cursor declarations
Move the Xwayland cursor declarations to their own header file.
Signed-off-by: Olivier Fourdan <ofourdan@redhat.com>
Reviewed-by: Michel Dänzer <mdaenzer@redhat.com>
commit aaeeb10b74920110c36efe069a47722bda5063dd
Author: Olivier Fourdan <ofourdan@redhat.com>
Date: Tue Dec 17 18:02:17 2019 +0100
xwayland: Move Xwayland output declarations
Move the Xwayland output declarations to their own header file.
Signed-off-by: Olivier Fourdan <ofourdan@redhat.com>
Reviewed-by: Michel Dänzer <mdaenzer@redhat.com>
commit 091b24f13e3a9cf46f1c55ba0ba3f35e0bb41a59
Author: Olivier Fourdan <ofourdan@redhat.com>
Date: Tue Dec 17 17:40:21 2019 +0100
xwayland: Move Xwayland input declarations
Move the Xwayland input declarations to their own header file.
Signed-off-by: Olivier Fourdan <ofourdan@redhat.com>
Reviewed-by: Michel Dänzer <mdaenzer@redhat.com>
commit e23d2223d89ee9ae7977b028f2a6522707e921d6
Author: Olivier Fourdan <ofourdan@redhat.com>
Date: Tue Dec 17 17:18:11 2019 +0100
xwayland: Move Xwayland present declarations
Move the Xwayland Present declarations to their own header file.
Signed-off-by: Olivier Fourdan <ofourdan@redhat.com>
Reviewed-by: Michel Dänzer <mdaenzer@redhat.com>
commit d780bdc2fdaeb94b873a9b6dd05a3ab636840ce7
Author: Olivier Fourdan <ofourdan@redhat.com>
Date: Tue Dec 17 17:07:58 2019 +0100
xwayland: Separate Xwayland pixmap code
Move Xwayland generic pixmap code to a separate source file and header.
Signed-off-by: Olivier Fourdan <ofourdan@redhat.com>
Reviewed-by: Michel Dänzer <mdaenzer@redhat.com>
commit 89e32d00f6e03fcdab267bfd9f0b0c5c2747d380
Author: Olivier Fourdan <ofourdan@redhat.com>
Date: Tue Dec 17 15:07:07 2019 +0100
xwayland: Move Xwayland windows to its own sources
Over time, Xwayland main source file `xwayland.c` has grown in size
which makes it look cluttered and harder to read.
Move the code dealing with Xwayland window to its own source and header
files.
Signed-off-by: Olivier Fourdan <ofourdan@redhat.com>
Reviewed-by: Michel Dänzer <mdaenzer@redhat.com>
commit 3a59650ba74e9d97473fa39269fdb74ad7e1cd43
Author: Olivier Fourdan <ofourdan@redhat.com>
Date: Mon Dec 16 17:23:30 2019 +0100
xwayland: Move GLAMOR declarations to their own header
Currently, `xwayland.h` contains all the declarations, which is a bit
awkward and hard to follow.
Move the GLAMOR relevant declarations to their own header file.
Signed-off-by: Olivier Fourdan <ofourdan@redhat.com>
Reviewed-by: Michel Dänzer <mdaenzer@redhat.com>
commit 177c8a230232d114cdbe1650bd22a396d182f5f8
Author: Olivier Fourdan <ofourdan@redhat.com>
Date: Mon Dec 16 17:07:02 2019 +0100
xwayland: Move SHM declarations to their own header
Currently, `xwayland.h` contains all the declarations, which is a bit
awkward and hard to follow.
Move the SHM relevant declarations to their own header file.
Signed-off-by: Olivier Fourdan <ofourdan@redhat.com>
Reviewed-by: Michel Dänzer <mdaenzer@redhat.com>
commit c20e61fddc8c2b8838533f23f54c1c5acea3e05f
Author: Olivier Fourdan <ofourdan@redhat.com>
Date: Tue Dec 17 08:48:51 2019 +0100
xwayland: Move Xwayland structures to their own header
Currently, `xwayland.h` contains all the declarations, which is a bit
awkward and hard to follow.
Move the Xwayland structures declarations to their own header file.
Signed-off-by: Olivier Fourdan <ofourdan@redhat.com>
Reviewed-by: Michel Dänzer <mdaenzer@redhat.com>
commit 5bfca0038e92d61e58d4dc1a54748faef8273023
Author: Michel Dänzer <mdaenzer@redhat.com>
Date: Wed Dec 18 18:18:50 2019 +0100
glamor: Only use dual blending with GLSL >= 1.30
It can't be used with older GLSL. Fixes a crash when attempting to
anyway.
Closes: https://gitlab.freedesktop.org/xorg/xserver/issues/97
Fixes: e7308b6c7756 "glamor: Add support for CA rendering in a single pass."
Reviewed-by: Dave Airlie <airlied@redhat.com>
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
commit 846e81ecb83f30b555ce71a32cd6965d7b9939a5
Author: Michel Dänzer <mdaenzer@redhat.com>
Date: Tue Dec 17 18:39:17 2019 +0100
xwayland: Create duplicate TrueColor GLXFBConfigs for Composite
Similar to what is done in Xorg. Not doing this prevented apps from
using GLX with a Composite visual, e.g. Firefox WebRender or Chromium.
v2:
* Fix inverted direct_color test, fixes Chromium as well.
* Drop Composite extension guards, since other Xwayland code calls
compRedirectWindow/compUnredirectWindow unconditionally anyway.
Closes: https://gitlab.freedesktop.org/xorg/xserver/issues/921
Fixes: 8469241592b94b "xwayland: Add EGL-backed GLX provider"
Reviewed-by: Adam Jackson <ajax@redhat.com> # v1
commit 02e7a497ceacef490921a8ae7115cd9f28a66dec
Author: Michel Dänzer <mdaenzer@redhat.com>
Date: Tue Dec 17 18:43:07 2019 +0100
xwayland: Fix duplicate "direct_color" comment to say "double_buffer"
Fixes: 8469241592b94b "xwayland: Add EGL-backed GLX provider"
Reviewed-by: Adam Jackson <ajax@redhat.com>
commit 9b31358c52e951883bf7c01c953a9da080542244
Author: Michel Dänzer <mdaenzer@redhat.com>
Date: Wed Nov 27 18:56:05 2019 +0100
xwayland: Use frame callbacks for Present vblank events
Instead of only the fallback timer.
Fixes https://gitlab.freedesktop.org/xorg/xserver/issues/854
v2:
* Drop unused frame_callback member of struct xwl_present_window
(Olivier Fourdan)
Reviewed-by: Olivier Fourdan <ofourdan@redhat.com>
commit c5067feaeea115761f0a72f37407c6e5e943d1a1
Author: Michel Dänzer <mdaenzer@redhat.com>
Date: Wed Nov 27 18:04:06 2019 +0100
xwayland: Use single frame callback for Present flips and normal updates
Using a list of Present windows that need to be called back.
This prepares for the following change, there should be no change in
observed behaviour.
v2:
* Use xwl_window_create_frame_callback instead of making the
frame_listener struct non-static (Olivier Fourdan)
Reviewed-by: Olivier Fourdan <ofourdan@redhat.com>
commit f80eea0529b2cfb805a9c7d4994a4235451131e3
Author: Michel Dänzer <mdaenzer@redhat.com>
Date: Fri Dec 13 18:26:35 2019 +0100
xwayland: Add xwl_window_create_frame_callback helper
This will be used by the following changes. No functional change
intended.
Reviewed-by: Olivier Fourdan <ofourdan@redhat.com>
commit 46e5236bbe0ca90f1c2a480c54d3f729d4930dfb
Author: Olivier Fourdan <ofourdan@redhat.com>
Date: Thu Dec 12 13:50:16 2019 +0100
xwayland: Take border width into account
Damage coordinates are relative to the drawable, (0,0) being the top
left corner inside the border.
Therefore, when applying damages or accumulating damages between window
buffers, we need to take the window border width into account as well,
otherwise the updates might be only partial or misplaced.
Related: https://gitlab.freedesktop.org/xorg/xserver/issues/951
Signed-off-by: Olivier Fourdan <ofourdan@redhat.com>
Reviewed-by: Michel Dänzer <mdaenzer@redhat.com>
commit 1cb886bc2a3e556b15779300350ec8867b4f907e
Author: Olivier Fourdan <ofourdan@redhat.com>
Date: Fri Dec 13 11:10:03 2019 +0100
xwayland: Recycle window buffers when setting pixmap
Right now, we would recycle the window buffers whenever the window the
window is resized.
This, however, is not sufficient to guarantee that the buffers are up
to date, since changing the window border width for example would not
trigger a `WindowResize` (the border being outside the window).
Make sure we recycle the buffers on `SetWindowPixmap` to ensure that
the buffers will be recycled whenever the pixmap size is changed.
Related: https://gitlab.freedesktop.org/xorg/xserver/issues/951
Suggested-by: Michel Dänzer <mdaenzer@redhat.com>
Signed-off-by: Olivier Fourdan <ofourdan@redhat.com>
Reviewed-by: Michel Dänzer <mdaenzer@redhat.com>
commit 71c3a97142265804d64f443bd1ddb68ac356f8a3
Author: dslater38 <dslater38@gmail.com>
Date: Thu Dec 12 04:54:46 2019 +0000
XWin: Fix infinite loop in GetShift()
GetShift(int mask) can be called with mask==0, causing
it to go into an infinite loop.
Note: GetShift(mask) will return 0 for a mask of
both 0 and -1. The assumption is that if mask == 0,
then the corresponding bits for which we're calculating
the shift, are also 0.
commit 0c729bb958375fbd8fb6811ff1ecc88bd9f80282
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu Dec 12 09:23:47 2019 +1000
gitlab CI: update to the latest version of the ci-templates
Primarily to fix the skopeo copy issue that causes pipelines to fail right
now, see ci-templates commit 0a9bdd33a98f05af67.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 2a2234ad1a0fe88400c1511fea67741e4ad09f7f
Author: Michel Dänzer <mdaenzer@redhat.com>
Date: Fri Nov 29 09:40:13 2019 +0100
xwayland: Do flush GPU work in xwl_present_flush
The Present code sends the idle notification event to the client after
xwl_present_flush returns. If we don't flush our GPU work here, the
client may race to draw another frame to the same buffer, so we may end
up copying (parts of) that new frame instead of the one we meant to.
Fixes https://gitlab.freedesktop.org/xorg/xserver/issues/835
Reviewed-by: Olivier Fourdan <ofourdan@redhat.com>
commit cd999f08c608458d6207110ed237c3a78441870b
Author: Olivier Fourdan <ofourdan@redhat.com>
Date: Fri Oct 25 16:28:50 2019 +0200
xwayland: Use multiple window buffers
Xwayland takes care of not attaching a new buffer if a frame callback is
pending.
Yet, the existing buffer (which was previously attached) may still be
updated from the X11 side, causing unexpected visual glitches to the
buffer.
Add multiple buffering to the xwl_window and alternate between buffers,
to leave the Wayland buffer untouched between frame callbacks and avoid
stuttering or tearing issues.
Closes: https://gitlab.freedesktop.org/xorg/xserver/issues/835
Signed-off-by: Olivier Fourdan <ofourdan@redhat.com>
Reviewed-by: Michel Dänzer <mdaenzer@redhat.com>
commit 1c6f875f52d74d2137161399e134c4888c4eadf2
Author: Olivier Fourdan <ofourdan@redhat.com>
Date: Wed Nov 6 11:49:33 2019 +0100
xwayland: Add multiple window buffering support
Add a mechanism to create, recycle and destroy window buffers when
needed.
Typically, this adds a new `xwl_window_buffer` structure which
represents a buffer for a given Xwayland window.
Each Xwayland window has two different pools of buffers:
- The available buffers pool:
Those are buffers which where created previously and that have either
not been submitted to the compositor or submitted and released.
- The unavailable buffers pool:
Those are typically the buffers which are being used by the
compositor, awaiting a release.
Initially, an Xwayland window starts with both pools empty. As soon as a
new buffer is needed, it's either created (if there is none available)
or picked from the pool of available buffers.
Once submitted to the compositor, the buffer is moved to the pool of
unavailable buffers. When the corresponding `wl_buffer` is released by
the compositor, it is moved back to pool of available buffers again to
be reused when needed.
To avoid keeping too many buffers around doing nothing, a garbage
collection of older, unused buffers also takes care of disposing the
buffers being unused for some time.
Signed-off-by: Olivier Fourdan <ofourdan@redhat.com>
Reviewed-by: Michel Dänzer <mdaenzer@redhat.com>
commit 77658741869f6a01cec0bdf49827494fb0f06edf
Author: Olivier Fourdan <ofourdan@redhat.com>
Date: Wed Oct 30 13:17:34 2019 +0100
xwayland: Add buffer release callback
The API `wl_buffer_add_listener` is misleading in the sense that there
can be only one `wl_buffer` release callback, and trying to add a new
listener when once is already in place will lead to a protocol error.
The Xwayland EGL backends may need to set up their own `wl_buffer`
release listener, meaning that there is no way to our own `wl_buffer`
release callback.
To avoid the problem, add our own callback API to be notified when the
`wl_buffer` associated with an `xwl_pixmap` is released, triggered from
the different `xwl_pixmap` implementations.
Also update the Present code to use the new buffer release callback API.
Signed-off-by: Olivier Fourdan <ofourdan@redhat.com>
Reviewed-by: Michel Dänzer <mdaenzer@redhat.com>
commit 8d4be7f6c4f7c673d7ec1a6bfdef944907a3916e
Author: Kenneth Graunke <kenneth@whitecape.org>
Date: Thu Nov 21 23:03:50 2019 -0800
modesetting: Use EGL_MESA_query_driver to select DRI driver if possible
New now ask Glamor to use EGL_MESA_query_driver to obtain the DRI driver
name; if successful, we use that as the DRI driver name. Following the
existing dri2.c logic, we also use the same name for the VDPAU driver,
except for i965 (and now iris), where we switch to the "va_gl" fallback.
This allows us to bypass the PCI ID lists in xserver and centralize the
driver selection mechanism inside Mesa. The hope is that we no longer
have to update these lists for any future hardware.
commit 195c2ef8f9f07b9bdabc0f554a9033b7857b99c7
Author: Kenneth Graunke <kenneth@whitecape.org>
Date: Thu Nov 21 23:01:28 2019 -0800
glamor: Add a function to get the driver name via EGL_MESA_query_driver
This maps to eglGetDisplayDriverName if EGL_MESA_query_render is
supported, otherwise it returns NULL.
commit 60003023fa5b301dd621da4797f8a93035ebeeca
Author: Michel Dänzer <mdaenzer@redhat.com>
Date: Fri Nov 22 18:32:38 2019 +0100
modesetting: Use glamor_clear_pixmap in drmmode_clear_pixmap
Should be slightly more efficient.
Reviewed-by: Adam Jackson <ajax@redhat.com>
commit 9ba13bac9dd076f166ff0d063fc144b904a40d12
Author: Michel Dänzer <mdaenzer@redhat.com>
Date: Mon Nov 18 18:06:28 2019 +0100
modesetting: Clear new screen pixmap storage on RandR resize
Fixes random garbage being visible intermittently.
Reviewed-by: Adam Jackson <ajax@redhat.com>
commit 327df450ffcf5bda5b4254db0208d355860d1010
Author: Michel Dänzer <mdaenzer@redhat.com>
Date: Fri Nov 22 17:51:22 2019 +0100
xfree86/modes: Call xf86RotateRedisplay from xf86CrtcRotate
If a new rotate buffer was allocated. This makes sure the new buffer
has valid transformed contents when it starts being displayed.
Reviewed-by: Adam Jackson <ajax@redhat.com>
commit c66c548eabf06835cb0cb906598fb87c7bb30cf4
Author: Michel Dänzer <mdaenzer@redhat.com>
Date: Fri Nov 22 17:58:12 2019 +0100
modesetting: Call glamor_finish from drmmode_crtc_set_mode
This makes sure any pending drawing to a new scanout buffer will be
visible from the start.
This makes the finish call in drmmode_copy_fb superfluous, so remove it.
Reviewed-by: Adam Jackson <ajax@redhat.com>
commit 06ef320e9bc1f1098df9cd5581f072528f28128e
Author: Michel Dänzer <mdaenzer@redhat.com>
Date: Fri Nov 22 18:05:04 2019 +0100
modesetting: Add glamor_finish() convenience macro
This will simplify backporting the following fix to the 1.20 branch.
Reviewed-by: Adam Jackson <ajax@redhat.com>
commit e6ab7f9f342f463092c45226f3294074351fdd5e
Author: Matt Turner <mattst88@gmail.com>
Date: Thu Nov 21 11:23:18 2019 -0500
xfree86: Test presence of isastream()
isastream() was never more than a stub in glibc, and was removed in
glibc-2.30 by commit a0a0dc83173c ("Remove obsolete, never-implemented
XSI STREAMS declarations").
Bug: https://bugs.gentoo.org/700838
Reviewed-by: Julien Cristau <jcristau@debian.org>
Signed-off-by: Matt Turner <mattst88@gmail.com>
commit ebf549db2d9341d99e0d0847b948dd798d98f7dc
Author: Dor Askayo <dor.askayo@gmail.com>
Date: Fri Nov 22 17:12:03 2019 +0100
glamor: make sure the correct FBO is cleared
This also removes an unnecesary call to glDrawBuffer.
Signed-off-by: Dor Askayo <dor.askayo@gmail.com>
Fixes: 0e9a0c20 - "xwayland: clear pixmaps after creation in rootless
mode"
Closes: https://gitlab.freedesktop.org/xorg/xserver/issues/933
Reviewed-by: Michel Dänzer <mdaenzer@redhat.com>
commit cb1b1e184723fc4748b9a28736fa07fdc5c2990c
Author: Adam Jackson <ajax@redhat.com>
Date: Mon Nov 18 16:46:44 2019 -0500
Revert "Revert "modesetting: Indirect the glamor API through LoaderSymbol""
Now that we've fixed LoaderSymbolFromModule this should work properly.
This reverts commit 5c7c6d5cffa98e4749185af9211d7642b57673d8.
Reviewed-by: Michel Dänzer <mdaenzer@redhat.com>
commit ab61c16ef07fde6eb7110c63c344c54eb2a2d117
Author: Adam Jackson <ajax@redhat.com>
Date: Mon Nov 18 16:43:50 2019 -0500
loader: Make LoaderSymbolFromModule take a ModuleDescPtr
The thing you get back from xf86LoadSubModule is a ModuleDescPtr, not a
dlsym handle. We don't expose ModuleDescPtr to the drivers, so change
LoaderSymbolFromModule to cast its void * argument to a ModuleDescPtr.
Reviewed-by: Michel Dänzer <mdaenzer@redhat.com>
commit 4308f5d3d1fbd0f5dce81e22c0c3f08c65a7c9d8
Author: Aaron Plattner <aplattner@nvidia.com>
Date: Tue Nov 19 10:08:51 2019 -0800
os: Don't crash in AttendClient if the client is gone
If a client is in the process of being closed down, then its client->osPrivate
pointer will be set to NULL by CloseDownConnection. This can cause a crash if
freeing the client's resources results in a call to AttendClient. For example,
if the client has a pending sync fence:
Thread 1 "X" received signal SIGSEGV, Segmentation fault.
AttendClient (client=0x5571c4aed9a0) at ../os/connection.c:942
(gdb) bt
#0 AttendClient (client=0x5571c4aed9a0) at ../os/connection.c:942
#1 0x00005571c3dbb865 in SyncAwaitTriggerFired (pTrigger=<optimized out>) at ../Xext/sync.c:694
#2 0x00005571c3dd5749 in miSyncDestroyFence (pFence=0x5571c5063980) at ../miext/sync/misync.c:120
#3 0x00005571c3dbbc69 in FreeFence (obj=<optimized out>, id=<optimized out>) at ../Xext/sync.c:1909
#4 0x00005571c3d7a01d in doFreeResource (res=0x5571c506e3d0, skip=skip@entry=0) at ../dix/resource.c:880
#5 0x00005571c3d7b1dc in FreeClientResources (client=0x5571c4aed9a0) at ../dix/resource.c:1146
#6 FreeClientResources (client=0x5571c4aed9a0) at ../dix/resource.c:1109
#7 0x00005571c3d5525f in CloseDownClient (client=0x5571c4aed9a0) at ../dix/dispatch.c:3473
#8 0x00005571c3d55eeb in Dispatch () at ../dix/dispatch.c:492
#9 0x00005571c3d59e96 in dix_main (argc=3, argv=0x7ffe7854bc28, envp=<optimized out>) at ../dix/main.c:276
#10 0x00007fea4837cb6b in __libc_start_main (main=0x5571c3d1d060 <main>, argc=3, argv=0x7ffe7854bc28, init=<optimized out>, fini=<optimized out>, rtld_fini=<optimized out>, stack_end=0x7ffe7854bc18) at ../csu/libc-start.c:308
#11 0x00005571c3d1d09a in _start () at ../Xext/sync.c:2378
(gdb) print client->osPrivate
$1 = (void *) 0x0
Since the client is about to be freed, its ignore count doesn't matter and
AttendClient can simply be a no-op. Check for client->clientGone in AttendClient
and remove similar checks from two callers that had them.
Signed-off-by: Aaron Plattner <aplattner@nvidia.com>
commit 66da95a172c4941b75ffedcdaa0138c0a48f11fb
Author: Olivier Fourdan <ofourdan@redhat.com>
Date: Tue Nov 12 10:03:55 2019 +0100
xwayland: Do not discard frame callbacks on allow commits
Currently, when a X11 client (usually the X11 window manager from a
Wayland compositor) changes the value of the X11 property
`_XWAYLAND_ALLOW_COMMITS` from `false` to `true`, all pending frame
callbacks on the window are discarded so that the commit occurs
immediately.
Weston uses that mechanism to prevent the content of the window from
showing before it's ready when mapping the window initially, but
discarding the pending frame callbacks has no effect on the initial
mapping of the X11 window since at that point there cannot be any frame
callback on a surface which hasn't been committed yet anyway.
However, discarding pending frame callbacks can be problematic if we
were to use the same `_XWAYLAND_ALLOW_COMMITS` mechanism to prevent
damages to be posted before the X11 toplevel is updated completely
(including the window decorations from the X11 window manager).
Remove the portion of code discarding the pending frame callback,
Xwayland should always wait for a pending frame callback if there's one
before posting new damages.
Signed-off-by: Olivier Fourdan <ofourdan@redhat.com>
Reviewed-by: Pekka Paalanen <pekka.paalanen@collabora.com>
Reviewed-by: Michel Dänzer <mdaenzer@redhat.com>
https://gitlab.freedesktop.org/xorg/xserver/merge_requests/333
commit 4f984fc06bd57cabfa38f6191f10714878dc8969
Author: Olivier Fourdan <ofourdan@redhat.com>
Date: Mon Nov 18 17:28:45 2019 +0100
present/wnmd: Relax assertion on CRTC on abort_vblank()
Currently, the function `present_wnmd_abort_vblank()` would fail if the
given `crtc` is NULL.
However, `xwl_present_get_crtc()` can return `NULL` under some
circumstances, which would cause an unexpected termination of Xwayland
in such a case, caused by the assertion failure being triggered.
Remove the assertion, considering that the `crtc` isn't actually used in
neither `present_wnmd_abort_vblank()` nor `xwl_present_abort_vblank()`.
Signed-off-by: Olivier Fourdan <ofourdan@redhat.com>
Reviewed-by: Michel Dänzer <mdaenzer@redhat.com>
Closes: https://gitlab.freedesktop.org/xorg/xserver/issues/937
commit 5c7c6d5cffa98e4749185af9211d7642b57673d8
Author: Michel Dänzer <mdaenzer@redhat.com>
Date: Fri Nov 15 11:32:38 2019 +0100
Revert "modesetting: Indirect the glamor API through LoaderSymbol"
This reverts commit dd63f717fe8636315343f421f4f2ee299258f079.
Caused a crash at least on some systems.
Closes: https://gitlab.freedesktop.org/xorg/xserver/issues/934
commit dd63f717fe8636315343f421f4f2ee299258f079
Author: Adam Jackson <ajax@redhat.com>
Date: Tue Oct 8 13:11:09 2019 -0400
modesetting: Indirect the glamor API through LoaderSymbol
Prerequisite for building all of xserver with -z now.
Gitlab: https://gitlab.freedesktop.org/xorg/xserver/issues/692
commit 45f35a0c6666c5f35df482948e0c8e91167429ef
Author: Adam Jackson <ajax@redhat.com>
Date: Tue Oct 8 12:52:28 2019 -0400
modesetting: Indirect the shadow API through LoaderSymbol
Prerequisite for building all of xserver with -z now.
Gitlab: https://gitlab.freedesktop.org/xorg/xserver/issues/692
commit 8760fab0a15805bdd12bb8f12bb1c665fde86cc2
Author: Adam Jackson <ajax@redhat.com>
Date: Tue Oct 8 13:29:22 2019 -0400
loader: Move LoaderSymbolFromModule() to public API
Bare LoaderSymbol() isn't really a great API, this is more of a direct
map to dlsym like you want.
Gitlab: https://gitlab.freedesktop.org/xorg/xserver/issues/692
commit e5e9a8ca91d1c087edd8788a110251ad940dbc94
Author: Aaron Plattner <aplattner@nvidia.com>
Date: Wed Nov 6 10:45:43 2019 -0800
xfree86: Call ScreenInit for protocol screens before GPU screens
During startup, the xfree86 DDX's InitOutput() calls PreInit for
protocol screens first, and then GPU screens. On teardown, dix_main()
calls CloseScreen in the reverse order: GPU screens first starting with
the last one and then working backwards, and then protocol screens also
in reverse order.
InitOutput() calls ScreenInit in the wrong order: for GPU screens first and then
for protocol screens. This causes a problem for drivers that have global state
that is tied to the first screen that calls ScreenInit.
Fix this by simply re-ordering the for loops to call PreInit for
protocol screens first and then for GPU screens second.
commit 562c7888be538c4d043ec1f374a9d9afa0b305a4
Author: Alex Goins <agoins@nvidia.com>
Date: Tue Sep 17 18:36:35 2019 -0500
modesetting: Implement ms_covering_randr_crtc() for ms_present_get_crtc()
ms_present_get_crtc() returns an RRCrtcPtr, but derives it from a xf86CrtcPtr
found via ms_dri2_crtc_covering_drawable()=>ms_covering_crtc(). As a result, it
depends on all associated DIX ScreenRecs having an xf86CrtcConfigPtr DDX
private.
Some DIX ScreenRecs don't have an xf86CrtcConfigPtr DDX private, but do have an
rrScrPrivPtr DDX private. Given that we can derive all of the information we
need from RandR, we can support these screens by avoiding the use of xf86Crtc.
This change implements an RandR-based path for ms_present_get_crtc(), allowing
drawables to successfully fall back to syncing to the primary output, even if
the slave doesn't have an xf86CrtcConfigPtr DDX private.
Without this change, if a slave doesn't have an xf86CrtcConfigPtr DDX private,
drawables will fall back to 1 FPS if they overlap an output on that slave.
Signed-off-by: Alex Goins <agoins@nvidia.com>
commit 797e7a0ceb673fe2870c673e248835526a84d000
Author: Alex Goins <agoins@nvidia.com>
Date: Tue Sep 17 18:03:34 2019 -0500
modesetting: Fix ms_covering_crtc() segfault with non-xf86Crtc slave
DIX ScreenRecs don't necessarily have an xf86CrtcConfigPtr DDX private.
ms_covering_crtc() assumes that they do, which can result in a segfault.
Update ms_covering_crtc() to check the XF86_CRTC_CONFIG_PTR() returned pointer
before dereferencing it. This will still mean that ms_covering_crtc() can't fall
back to the primary output when a drawable overlaps a slave output (going to the
1 FPS default instead), but it won't segfault.
Signed-off-by: Alex Goins <agoins@nvidia.com>
commit 3ef9029ace4245d9f8929aa71e22bc6a6f40b7b3
Author: Alex Goins <agoins@nvidia.com>
Date: Wed Aug 28 18:24:16 2019 -0500
modesetting: Fix ms_covering_crtc() segfault with non-modesetting slave primary
ms_covering_crtc() uses RRFirstOutput() to determine a primary output to fall
back to if a drawable is overlapping a slave output.
If the primary output is a slave output, RRFirstOutput() will return a slave
output even if passed a master ScreenPtr. ms_covering_crtc() dereferences the
output's devPrivate, which is invalid for non-modesetting outputs, and can
crash.
Changing RRFirstOutput() could have unintended side effects for other callers,
so this change replaces the call to RRFirstOutput() with ms_first_output().
ms_first_output() ignores the primary output if it doesn't match the given
ScreenPtr, choosing the first connected output instead.
Signed-off-by: Alex Goins <agoins@nvidia.com>
commit c82f814313a813d7e1a2d7d3b1f7561810446b34
Author: Alex Goins <agoins@nvidia.com>
Date: Wed Sep 4 12:25:31 2019 -0500
randr: Fix RRCrtcDetachScanoutPixmap() segfault during server teardown
During server teardown, mrootdraw is NULL, which can cause segfaults if
master->Stop{,Flipping}PixmapTracking() don't do NULL checking. In this case we
shouldn't need to do master->Stop{,Flipping}PixmapTracking() anyway, so just
skip it.
Signed-off-by: Alex Goins <agoins@nvidia.com>
commit fe439596b99db65bbae35eff1ea0b79db167f8d6
Author: Arthur Williams <taaparthur@gmail.com>
Date: Thu Oct 17 22:47:37 2019 -0700
include: Increase the number of max. input devices to 256.
Extending the decade old f0124ed93, to increase the number of input
devices from 40 to 256. 40 translates at most 9 MD, while 256 will allow
63 MD. It is an arbitrary number, but people are hitting the current
limit under reasonable conditions.
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=64793
Signed-off-by: Arthur Williams <taaparthur@gmail.com>
commit eddad048e35cbf0968d0f892009a248359a15ecd
Author: Olivier Fourdan <ofourdan@redhat.com>
Date: Wed Oct 30 15:33:39 2019 +0100
xwayland: Cosmetic, fix indentation
For some reason, indentation for EGL backend hooks was broken.
Signed-off-by: Olivier Fourdan <ofourdan@redhat.com>
Reviewed-by: Michel Dänzer <mdaenzer@redhat.com>
commit 4a857b161ce1202c60ac464c8eb6de358fed5508
Author: Olivier Fourdan <ofourdan@redhat.com>
Date: Wed Oct 30 13:11:28 2019 +0100
xwayland/shm: Use `calloc()`
Currently, Xwayland pixmap SHM code uses `malloc()` to allocate the
xwl_pixmap.
Use `calloc()` instead, as the EGLstream backend does, as it is safer
(initializing the allocated data to 0).
Signed-off-by: Olivier Fourdan <ofourdan@redhat.com>
Reviewed-by: Michel Dänzer <mdaenzer@redhat.com>
commit 0d4667b65a81047fe5d5af537d295c64cfa08d9c
Author: Olivier Fourdan <ofourdan@redhat.com>
Date: Wed Oct 30 11:50:24 2019 +0100
xwayland/glamor-gbm: Use `calloc()`
Currently, glamor GBM backend uses `malloc()` to allocate the
xwl_pixmap.
Use `calloc()` instead, as the EGLstream backend does, as it is safer
(initializing the allocated data to 0).
Signed-off-by: Olivier Fourdan <ofourdan@redhat.com>
Reviewed-by: Michel Dänzer <mdaenzer@redhat.com>
commit 2c5acdef3aab52d0a416aee3654a63328847f22e
Author: Olivier Fourdan <ofourdan@redhat.com>
Date: Thu Oct 31 09:04:19 2019 +0100
xwayland/eglstream: Fix order of `calloc()` args
The definition by the manual is `calloc(size_t nmemb, size_t size)`.
Swap the arguments of calloc() calls to match the definition.
Signed-off-by: Olivier Fourdan <ofourdan@redhat.com>
Reviewed-by: Michel Dänzer <mdaenzer@redhat.com>
commit 0e9a0c203c2ae4eae12bdbb95428f398211c7bee
Author: Dor Askayo <dor.askayo@gmail.com>
Date: Thu Nov 7 12:25:42 2019 +0100
xwayland: clear pixmaps after creation in rootless mode
When a pixmap is created with a backing FBO, the FBO should be cleared
to avoid rendering uninitialized memory. This could happen when the
pixmap is rendered without being filled in its entirety.
One example is when a top-level window without a background is
resized. The pixmap would be reallocated to prepare for more pixels,
but uninitialized memory would be rendered in the resize offset until
the client sends a frame that fills these additional pixels.
Another example is when a new top-level window is created without a
background. Uninitialized memory would be rendered after the pixmap is
allocated and before the client sends its first frame.
This issue is only apparent in OpenGL implementations that don't zero
the VRAM of allocated buffers by default, such as RadeonSI.
Signed-off-by: Dor Askayo <dor.askayo@gmail.com>
Closes: https://gitlab.freedesktop.org/xorg/xserver/issues/636
Reviewed-by: Michel Dänzer <mdaenzer@redhat.com>
commit a506b4ecb6c54fd0388e628520eec75ea3bcb27c
Author: Olivier Fourdan <ofourdan@redhat.com>
Date: Wed Nov 6 15:37:22 2019 +0100
xwayland: make context current to check GL version
`glGetString(GL_VERSION)` will return NULL without a current context.
Commit dabc7d8b (“xwayland: Fall back to GLES2 if we don't get at least
GL 2.1 in glamor”) would check the context is created, but it is made
current just after, so the call to `epoxy_gl_version()` would return 0,
hence defeating the version check.
Make the context current prior to call `epoxy_gl_version()`.
Fixes: dabc7d8b - xwayland: Fall back to GLES2 if we don't get at least
GL 2.1 in glamor
Closes: https://gitlab.freedesktop.org/xorg/xserver/issues/932
https://gitlab.freedesktop.org/xorg/xserver/merge_requests/324
Signed-off-by: Olivier Fourdan <ofourdan@redhat.com>
commit dabc7d8bf2d964460286168b52899c42b3369f8d
Author: Adam Jackson <ajax@redhat.com>
Date: Wed Oct 30 11:20:40 2019 -0400
xwayland: Fall back to GLES2 if we don't get at least GL 2.1 in glamor
Some particularly unfortunate hardware (Intel gen3, mostly) will give
you GLES2 but not GL 2.1. Fall back to GLES2 for such cases so you still
get accelerated GLX.
commit 741bd73429e337071f49509ddcc5fb392e20b0f6
Author: Hans de Goede <hdegoede@redhat.com>
Date: Mon Nov 4 20:03:17 2019 +0100
glamor/xwayland: Define EGL_NO_X11
Define EGL_NO_X11 everywhere were we also define MESA_EGL_NO_X11_HEADERS,
EGL_NO_X11 is the MESA_EGL_NO_X11_HEADERS equivalent for the egl headers
shipped with libglvnd.
This fixes the xserver not building with the libglvnd-1.2.0 headers:
In file included from /usr/include/EGL/eglplatform.h:128,
from /usr/include/epoxy/egl_generated.h:11,
from /usr/include/epoxy/egl.h:46,
from glamor_priv.h:43,
from glamor_composite_glyphs.c:25:
/usr/include/X11/Xlib.h:222:2: error: conflicting types for 'GC'
222 | *GC;
| ^~
In file included from glamor.h:34,
from glamor_priv.h:32,
from glamor_composite_glyphs.c:25:
../include/gcstruct.h:282:3: note: previous declaration of 'GC' was here
282 | } GC;
| ^~
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
commit 622eea366aaf162479eaabd93c88fa04efe98bcc
Author: Jon Turney <jon.turney@dronecode.org.uk>
Date: Sat Oct 26 17:12:26 2019 +0100
meson: Add sha1 library options
v2: Set the define for xha1.c programatically, rather than using loads
of conditionals.
commit 417e4553f143820acc33998898bbd5c3d4567bcd
Author: Adam Jackson <ajax@redhat.com>
Date: Wed Oct 9 12:07:00 2019 -0400
misprite: Stop wrapping GetImage/GetSpans
SourceValidate handles this for us consistently now.
Reviewed-by: Michel Dänzer <mdaenzer@redhat.com>
commit 77f614eb331b0240c699f7aef13a8046c9c2c70a
Author: Adam Jackson <ajax@redhat.com>
Date: Wed Oct 9 12:05:56 2019 -0400
composite: Stop wrapping GetImage/GetSpans
SourceValidate handles this for us consistently now.
Reviewed-by: Michel Dänzer <mdaenzer@redhat.com>
commit 516e75dbb6bbf97c7af9c2226242ffd9259fec11
Author: Adam Jackson <ajax@redhat.com>
Date: Wed Oct 9 11:57:18 2019 -0400
dix: Call SourceValidate before GetImage
This ensures that any prep work for the drawable we're about to read
from is already done before we call down to GetImage. This should be no
functional change as most of the callers with a non-trivial
SourceValidate are already wrapping GetImage and doing the equivalent
thing, but we'll be simplifying that shortly.
More importantly this ensures that if any of that prep work would
generate events - like automatic compositing flushing rendering to a
parent pixmap which then triggers damage - then it happens entirely
before we start writing the GetImage reply header.
Note that we do not do the same for GetSpans, but that's okay. The only
way to get to GetSpans is through miCopyArea or miCopyPlane - where the
callers must already call SourceValidate - or miGetImage - which this
commit now protects with SourceValidate.
Fixes: xorg/xserver#902
Reviewed-by: Michel Dänzer <mdaenzer@redhat.com>
commit ff310903f34ac34c916ad74e919d1ac12aea4715
Author: Adam Jackson <ajax@redhat.com>
Date: Wed Oct 9 11:27:12 2019 -0400
mi: Add a default no-op miSourceValidate
Slightly simplifies the callers since they don't need to check for
non-NULL anymore.
I do extremely hate the workarounds here to suppress misprite taking the
cursor down though. Surely there's a better way.
Reviewed-by: Michel Dänzer <mdaenzer@redhat.com>
commit 89a9927b1e5ac416441a33b44abddf8372edfe6a
Author: Adam Jackson <ajax@redhat.com>
Date: Wed Oct 16 14:44:49 2019 -0400
include: Remove now-empty site.h
commit ff4e2c24ec599ecdbd24eb181afb50f896beb46d
Author: Adam Jackson <ajax@redhat.com>
Date: Wed Oct 16 14:43:36 2019 -0400
dix: Move default screensaver defaults into globals.c
commit 43fc5307804edc9a09e7ad8794a02b5e18c4f9db
Author: Adam Jackson <ajax@redhat.com>
Date: Wed Oct 16 14:41:20 2019 -0400
include: Move some input-related default #defines to input.h
commit 2d1ed64d2aedb1af5476ba011bbd36ddcf00c311
Author: Adam Jackson <ajax@redhat.com>
Date: Wed Oct 16 14:33:43 2019 -0400
dix: Remove -to option to set the default connection timeout
One minute is admittedly arbitrary, but again, pretty sure this never
gets set on the command line in practice.
commit 46a275522f8692b8fc20043ec7a5e74d43448f0b
Author: Adam Jackson <ajax@redhat.com>
Date: Wed Oct 16 14:30:18 2019 -0400
xdmcp: Remove unconfigurable COMPILEDDISPLAYCLASS
commit 66eb933ec91724a351b7368cf7171adb108299fb
Author: Adam Jackson <ajax@redhat.com>
Date: Wed Oct 16 14:28:33 2019 -0400
os: Remove unconfigurable DEFAULT_ACCESS_CONTROL macro
commit 56ea4c769c2d65df2de86009e8e499f39a8a3d4d
Author: Adam Jackson <ajax@redhat.com>
Date: Wed Oct 16 14:21:06 2019 -0400
dix: Remove -fn and -fc options to set default text/cursor fonts
I strongly suspect these never get used in the wild, and it's not an
especially useful thing to do in any case.
commit 4ebce1ed8b63decb0919146a034f0c80ac47c3cd
Author: Adam Jackson <ajax@redhat.com>
Date: Wed Oct 16 13:56:34 2019 -0400
os: Move log verbosity defaults into os/log.c
There's not any configuration knobs for this so there's no real reason
to leave them in a configgy header.
commit e21371984def00b0e0b5cfc976bfd1756a2905d4
Author: Adam Jackson <ajax@redhat.com>
Date: Wed Oct 16 13:52:54 2019 -0400
include: Remove unused default value for COMPILEDDEFAULTFONTPATH
Again, we're setting this at configure time now.
commit f58fee67b1730798a57629da2f496c9fa594d143
Author: Adam Jackson <ajax@redhat.com>
Date: Wed Oct 16 13:51:41 2019 -0400
include: Remove unused default value for VENDOR_RELEASE
We're always setting this in the appropriate blah-config.h now.
commit 4b936ebcaaa80cc1dc1a51f110c7ecd77b06950e
Author: Adam Jackson <ajax@redhat.com>
Date: Wed Oct 16 13:51:11 2019 -0400
include: Remove unused VENDOR_STRING
commit ec659f021e62338018ac09ea61c3f4baa4fdf6e2
Author: Adam Jackson <ajax@redhat.com>
Date: Wed Oct 16 13:49:13 2019 -0400
dix: Remove now-unused SetVendorString
commit fc671085ee52c6599005e2359930bebe6195ca83
Author: Adam Jackson <ajax@redhat.com>
Date: Wed Oct 16 13:42:15 2019 -0400
dmx: Stop overriding the vendor string
commit 0e4bd71d02d09c320e76280ae8f14df169387507
Author: Ville Syrjälä <ville.syrjala@linux.intel.com>
Date: Tue Sep 3 16:44:56 2019 +0300
modesetting: Fix possible_crtcs
Populate outout possible_crtcs as the union of possible_crtcs from
the encoders rather than the intersection. Otherwise we're easily left
with possible_crtcs==0 when all the possible encoders have
non-overlapping possible_crtcs.
No idea what the magic 0x7f is about, but keep it around in case
it matters.
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
commit 334f1107146a2e6ebf6f7743b77aec2ad5c46f75
Author: Alexander Tsoy <alexander@tsoy.me>
Date: Mon Sep 23 18:23:40 2019 +0300
configure: Set libdrm flags correctly if only XORG is enabled
This fixes modesetting driver build failure which can be triggered with
the following configure options:
$ ./configure --disable-dri --disable-dri2 --disable-dri3
--disable-config-udev --enable-xorg
Bugzilla: https://bugs.gentoo.org/689768
Signed-off-by: Alexander Tsoy <alexander@tsoy.me>
Reviewed-by: Emil Velikov <emil.velikov@collabora.com>
commit a1e3dfa50a9a9a41c93c12f19f40d97c56ddf850
Author: Jon Turney <jon.turney@dronecode.org.uk>
Date: Sat Oct 26 18:43:01 2019 +0100
xquartz: Remove trailing quote to fix build
Fix xquartz build after typo in 3c78d637 ("global: Remove BUILD_DATE and
BUILD_TIME")
commit 0cf15714e1253f4ef61bb5e1f825b318a48b3cac
Author: Keith Packard <keithp@keithp.com>
Date: Thu May 16 12:24:01 2019 -0700
modesetting: typo in drmmode_display.c -- ',' instead of ';' at end of line
This seems like a simple typo to me; thanks to C it isn't caught by
the compiler.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 427f8bc00981703abe3153b6da575faa69fe2748
Author: Robert Mader <robert.mader@posteo.de>
Date: Wed Oct 16 19:14:06 2019 +0200
xserver: Fix a typo
If `need_rotate` is TRUE, we should check for the right rotate.
commit 55482c1caf4dbe7f4735b75366bd4acd81937fc1
Author: Adam Jackson <ajax@redhat.com>
Date: Tue Oct 15 13:40:01 2019 -0400
render: Fix undefined shift in xRenderColorToCard32
Delightfully this is undefined even though CARD16 is an "unsigned" type,
because it's an unsigned short, which C promotes to signed int because
everything is stupid.
commit 592525386ad81cf9c8816f42f01a5bea01034e98
Author: Adam Jackson <ajax@redhat.com>
Date: Tue Oct 15 13:32:36 2019 -0400
dix: Fix undefined memset in _dixInitScreenPrivates
Again, memset(0, ...) is undefined.
commit f44ac101c523a0439bd1a864850e3c1a4e154549
Author: Adam Jackson <ajax@redhat.com>
Date: Tue Oct 15 13:21:37 2019 -0400
record: Fix undefined memcpy in RecordAClientStateChange
If we don't have any recording contexts just skip all this. Note this
also skips a pointless trip through malloc(0)/free.
commit 9155e0c7c6696ec8c657e32bf41a08f88a8f3d0d
Author: Adam Jackson <ajax@redhat.com>
Date: Tue Oct 15 13:16:17 2019 -0400
mi: Fix undefined memcpy in mieqGrowQueue
The first time we get here, eventQueue->events is NULL.
commit 6fe7c43fa52ffa9b91887ea7f8044e54b12637c9
Author: Adam Jackson <ajax@redhat.com>
Date: Tue Oct 15 13:10:35 2019 -0400
dix: Fix undefined shift in ht_generic_hash
The hits keep coming.
commit 1e5f478b7e1183d38ad07d1f5e68fdc9680f2eb8
Author: Adam Jackson <ajax@redhat.com>
Date: Tue Oct 15 13:08:57 2019 -0400
dix: Fix undefined shift in HashResourceID
Again, we need all of the bits of an unsigned int to make this work.
commit 3671a3ee88dac3cf1a301adf27dc2b43b069815b
Author: Adam Jackson <ajax@redhat.com>
Date: Tue Oct 15 13:01:27 2019 -0400
mi: Fix undefined shift in miSetVisualTypesAndMasks
The masks we end up building will occupy all 32 bits of an unsigned int,
which means we had better build the shifts out of unsigned ints, because
left-shifting a signed int all the way into the sign bit is undefined.
commit a41d45eedc0c217c28def47acbd8759e31706b96
Author: Adam Jackson <ajax@redhat.com>
Date: Tue Oct 15 11:59:39 2019 -0400
dix: Fix undefined memset in dixInitPrivates
When we set these up initially, no subsystems have allocated any
privates yet, so the storage address will be null, and memset(NULL, ...)
is undefined.
commit 535f14656a2a42f0cca13a4264e8111300e5806d
Author: Michel Dänzer <mdaenzer@redhat.com>
Date: Mon Oct 14 12:48:24 2019 +0200
Revert https://gitlab.freedesktop.org/xorg/xserver/merge_requests/235
Caused assertion failures / crashes with Xorg.
Closes: https://gitlab.freedesktop.org/xorg/xserver/issues/916
commit 5315f988d9f175e4850f4259f691a68d95ce7ac2
Author: Hans de Goede <hdegoede@redhat.com>
Date: Mon Sep 2 17:32:45 2019 +0200
xwayland: Set _XWAYLAND_RANDR_EMU_MONITOR_RECTS property for resolution emulation
Apps using randr to change the resolution when going fullscreen, in
combination with _NET_WM_STATE_FULLSCREEN to tell the window-manager (WM)
to make their window fullscreen, expect the WM to give the fullscreen window
the size of the emulated resolution as would happen when run under Xorg (*).
We need the WM to emulate this behavior for these apps to work correctly,
with Xwaylands resolution change emulation. For the WM to emulate this,
it needs to know about the emulated resolution for the Windows owning
client for each monitor.
This commit adds a _XWAYLAND_RANDR_EMU_MONITOR_RECTS property, which
contains 4 Cardinals (32 bit integers) per monitor with resolution
emulation info. Window-managers can use this to get the emulated
resolution for the client and size the window correctly.
*) Since under Xorg the resolution will actually be changed and after that
going fullscreen through NET_WM_STATE_FULLSCREEN will size the window to
be equal to the new resolution.
Reviewed-by: Olivier Fourdan <ofourdan@redhat.com>
Acked-by: Michel Dänzer <mdaenzer@redhat.com>
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
commit 0c305dbff8a44f3fa3d6aefd372a967029a7a527
Author: Hans de Goede <hdegoede@redhat.com>
Date: Mon Aug 26 12:26:34 2019 +0200
xwayland: xwl_window_should_enable_viewport: Add extra test
Games based on the allegro gaming library or on ClanLib-1.0 do not size
their window to match the fullscreen resolution, instead they use a
window covering the entire screen, drawing only the fullscreen resolution
part of it.
This commit adds a check for these games, so that we correctly apply a
viewport to them making fullscreen work properly for these games under
Xwayland.
Reviewed-by: Olivier Fourdan <ofourdan@redhat.com>
Acked-by: Michel Dänzer <mdaenzer@redhat.com>
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
commit 38de6260816674b5430144cc38a8a27d93d1bf19
Author: Hans de Goede <hdegoede@redhat.com>
Date: Tue Jul 9 09:31:13 2019 +0200
xwayland: Add vidmode mode changing emulation support
Add support for fake mode changes using viewport, for apps which want to
change the resolution when going fullscreen.
Reviewed-by: Olivier Fourdan <ofourdan@redhat.com>
Acked-by: Michel Dänzer <mdaenzer@redhat.com>
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
commit bcad1b813a04b9f3ff225f57a4baad09bd6315b9
Author: Hans de Goede <hdegoede@redhat.com>
Date: Mon Jul 8 18:35:27 2019 +0200
xwayland: Add xwlVidModeGetCurrentRRMode helper to the vidmode code
crtc->mode reflects the mode set through the xrandr extension, once we
add support for also changing the mode through the vidmode extension this
will no longer correctly reflect the emulated resolution.
Add a new xwlVidModeGetCurrentRRMode helper which determines the mode by
looking at the emulated_mode instead.
Likewise add a xwlVidModeGetRRMode helper and use that in
xwlVidModeCheckModeForMonitor/xwlVidModeCheckModeForDriver to allow any
mode listed in the randr_output's mode list.
This is a preparation patch for adding emulated mode/resolution change
support to Xwayland's XF86 vidmode extension emulation.
Reviewed-by: Olivier Fourdan <ofourdan@redhat.com>
Acked-by: Michel Dänzer <mdaenzer@redhat.com>
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
commit 43c80078126f6f33c6ab7d3cf4668733bde03366
Author: Hans de Goede <hdegoede@redhat.com>
Date: Mon Jul 8 14:00:27 2019 +0200
xwayland: Add xwlRRModeToDisplayMode() helper function
This is a preparation patch for adding emulated mode/resolution change
support to Xwayland's XF86 vidmode extension emulation, using the
Wayland viewport extension.
Reviewed-by: Olivier Fourdan <ofourdan@redhat.com>
Acked-by: Michel Dänzer <mdaenzer@redhat.com>
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
commit d99b9ff0f237d15e7eb507484493c73b393d5dba
Author: Hans de Goede <hdegoede@redhat.com>
Date: Tue Jul 2 11:55:26 2019 +0200
xwayland: Add support for randr-resolution change emulation using viewport
Add support for per client randr-resolution change emulation using viewport,
for apps which want to change the resolution when going fullscreen.
Partly based on earlier work on this by Robert Mader <robert.mader@posteo.de>
Note SDL2 and SFML do not restore randr resolution when going from
fullscreen -> windowed, I believe this is caused by us still reporting the
desktop resolution when they query the resolution. This is not a problem
because when windowed the toplevel window size includes the window-decorations
so it never matches the emulated resolution.
One exception would be the window being resizable in Windowed mode and the
user resizing the window so that including decorations it matches the
emulated resolution *and* the window being at pos 0x0. But this is an
extreme corner case. Still I will submit patches upstream to SDL2
and SFML to always restore the desktop resolution under Xwayland,
disabling resolution emulation all together when going windowed.
Reviewed-by: Olivier Fourdan <ofourdan@redhat.com>
Acked-by: Michel Dänzer <mdaenzer@redhat.com>
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
commit aca0a588eb40a5e6669094a2ab7f71ca0ba06b16
Author: Hans de Goede <hdegoede@redhat.com>
Date: Thu Aug 29 23:04:36 2019 +0200
xwayland: Add support for storing per client per output emulated resolution
Add support for storing per output randr/vidmode emulated resolution
into the per client data.
Since we do not have a free/delete callback for the client this uses
a simple static array. The entries are tied to a specific output by the
server_output_id, with a server_output_id of 0 indicating a free slot
(0 is the "None" Wayland object id).
Note that even if we were to store this in a linked list, we would still
need the server_output_id as this is *per client* *per output*.
This is a preparation patch for adding randr/vidmode resolution
change emulation.
Reviewed-by: Olivier Fourdan <ofourdan@redhat.com>
Acked-by: Michel Dänzer <mdaenzer@redhat.com>
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
commit 905cb8b9e27add5f49a45fe167a0005bf05218bc
Author: Hans de Goede <hdegoede@redhat.com>
Date: Thu Aug 29 22:45:12 2019 +0200
xwayland: Add per client private data
Add per client private data, which for now is empty.
This is a preparation patch for adding randr/vidmode resolution
change emulation.
Reviewed-by: Olivier Fourdan <ofourdan@redhat.com>
Acked-by: Michel Dänzer <mdaenzer@redhat.com>
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
commit e89872f51aa834fa9d94a4ca4822f03b0341ab4f
Author: Robert Mader <robert.mader@posteo.de>
Date: Mon Jan 22 17:57:38 2018 +0100
xwayland: Use RandR 1.2 interface (rev 2)
This adds the RandR 1.2 interface to xwayland and allows modes
advertised by the compositor to be set in an undistructive manner.
With this patch, applications that try to set the resolution will usually
succeed and work while other apps using the same xwayland
instance are not affected at all.
The RandR 1.2 interface will be needed to implement fake-mode-setting and
already makes applications work much cleaner and predictive when a mode
was set.
[hdegoede@redhat.com: Make crtc_set only succeed if the mode matches
the desktop resolution]
Reviewed-by: Olivier Fourdan <ofourdan@redhat.com>
Acked-by: Michel Dänzer <mdaenzer@redhat.com>
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
commit 0d656d796071fb637e4969ea800855fe5d1c9728
Author: Hans de Goede <hdegoede@redhat.com>
Date: Wed Jun 26 16:46:54 2019 +0200
xwayland: Add fake output modes to xrandr output mode lists
This is a preparation patch for adding support for apps which want to
change the resolution when they go fullscreen because they are hardcoded
to render at a specific resolution, e.g. 640x480.
Follow up patches will fake the mode-switch these apps want by using
WPviewport to scale there pixmap to cover the entire output.
Reviewed-by: Olivier Fourdan <ofourdan@redhat.com>
Acked-by: Michel Dänzer <mdaenzer@redhat.com>
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
commit 7c6f17790d3aedb164481264b0f05a8a14103731
Author: Robert Mader <robert.mader@posteo.de>
Date: Tue Jul 2 12:03:12 2019 +0200
xwayland: Use buffer_damage instead of surface damage if available
When a viewport is set, damage will only work properly when using
wl_surface_damage_buffer instead of wl_surface_damage.
When no viewport is set, there should be no difference between
surface and buffer damage.
This is a preparation patch for using viewport to add support for fake
mode-changes through xrandr for apps which want to change the resolution
when going fullscreen.
Changes by Hans de Goede <hdegoede@redhat.com>:
-Split the damage changes out into their own patch
-Add xwl_surface_damage helper
-Also use buffer_damage / the new helper for the present and cursor code
Reviewed-by: Olivier Fourdan <ofourdan@redhat.com>
Acked-by: Michel Dänzer <mdaenzer@redhat.com>
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
commit 47bba4625339592d08b375bcd8e51029c0000850
Author: Robert Mader <robert.mader@posteo.de>
Date: Mon Jan 22 22:02:32 2018 +0100
xwayland: Add wp_viewport wayland extension support
This commit adds support for the wayland wp_viewport extension, note
nothing uses this yet.
This is a preparation patch for adding support for fake mode-changes through
xrandr for apps which want to change the resolution when going fullscreen.
[hdegoede@redhat.com: Split the code for the extension out into its own patch]
Reviewed-by: Olivier Fourdan <ofourdan@redhat.com>
Acked-by: Michel Dänzer <mdaenzer@redhat.com>
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
commit 834a467af978ac7a24ed17b8c8e58b6cddb4faf9
Author: Hans de Goede <hdegoede@redhat.com>
Date: Thu Aug 29 14:18:28 2019 +0200
dix: Add GetCurrentClient helper
Request-handlers as registered in the requestVector array, always get
passed the clientPtr for the client which sent the request.
But the implementation of many request-handlers typically consists of
a generic handler calling implementation specific callbacks and / or
various helpers often multiple levels deep and in many cases the clientPtr
does not get passed to the callbacks / helpers.
This means that in some places where we would like to have access to the
current-client, we cannot easily access it and fixing this would require
a lot of work and often would involve ABI breakage.
This commit adds a GetCurrentClient helper which can be used as a
shortcut to get access to the clienPtr for the currently being processed
request without needing a lot of refactoring and ABI breakage.
Note using this new GetCurrentClient helper is only safe for code
which only runs from the main thread, this new variable MUST NOT be used
by code which runs from signal handlers or from the input-thread.
The specific use-case which resulted in the creation of this patch is adding
support for emulation of randr / vidmode resolution changes to Xwayland.
This emulation will not actually change the monitor resolution instead it
will scale any window with a size which exactly matches the requested
resolution to fill the entire monitor. The main use-case for this is
games which are hard-coded to render at a specific resolution and have
sofar relied on randr / vidmode to change the monitor resolution when going
fullscreen.
To make this emulation as robust as possible (e.g. avoid accidentally scaling
windows from other apps) we want to make the emulated resolution a per client
state. But e.g. the RRSetCrtc function does not take a client pointer; and is
a (used) part of the Xorg server ABI (note the problem is not just limited
to RRSetCrtc).
Reviewed-by: Olivier Fourdan <ofourdan@redhat.com>
Reviewed-by: Michel Dänzer <mdaenzer@redhat.com>
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
commit b2a0d6065d86b8bf409ffae41180662560c42ce7
Author: Emil Velikov <emil.velikov@collabora.com>
Date: Fri Jul 12 14:45:16 2019 +0100
vfb: add DRI3/glamor support
This commit adds DRI3/glamor support, effectively translating into
hardware GPU support.
Theoretically it should be possible to use DRM/GPU drivers such as
virtio or vgem, although only the intel i915 driver is currently tested.
Since Xvfb does no modeset, it opens the render node. Currently that is
fixed to "/dev/dri/renderD128" and will be tweaked with future commits.
Specific use-cases are left for the reader - testing glamor, GL driver
or others.
v2: Drop GLAMOR_NO_XV, use GLAMOR_FOR_XORG instead (Michel Dänzer)
v3: Fix build w/o glamor
v4:
- Split out glamor dependency patch for meson (Pekka)
- Enhance commit message (Pekka)
- Use O_CLOEXEC with open() (Pekka)
- Enhance error path, memory leak comments (Pekka)
Signed-off-by: Emil Velikov <emil.velikov@collabora.com>
commit 9e574a5bd828e813ff31bdd5cbec52539534a958
Author: Emil Velikov <emil.velikov@collabora.com>
Date: Mon Sep 23 16:23:02 2019 +0100
meson: glamor depends on gbm and epoxy mark as such
Currently glamor depends on epoxy and gbm, even the autotools build
enforces that.
Follow suite and do the same for the meson build.
v1: Split out from larger patch (Pekka)
Signed-off-by: Emil Velikov <emil.velikov@collbora.com>
commit 86c8458f3d09d2c4fb68de7e6ab515739e8f8b3c
Author: Emil Velikov <emil.velikov@collabora.com>
Date: Fri Jul 12 11:34:44 2019 +0100
vfb: clarify code flow in vfbScreenInit
v2: Enhance commit message (Pekka)
Signed-off-by: Emil Velikov <emil.velikov@collabora.com>
commit 744c419cb4eaed4006b5f0f319b72d7ffa9fbc6d
Author: Emil Velikov <emil.velikov@collabora.com>
Date: Fri Jul 19 10:53:19 2019 +0100
glamor: check for non NULL pixmap at close_screen
DDX such as Xorg, Xwayland & Xephyr do not destroy the pixmap before
they call into CloseScreen. At the same time Xvfb (support for glamor
coming with later commit) do.
As such the pixmap will be NULL and we'll crash out.
Signed-off-by: Emil Velikov <emil.velikov@collabora.com>
commit 7667180fb9dbd606e40c000aefc807371d2fb478
Author: Emil Velikov <emil.velikov@collabora.com>
Date: Fri Jul 19 10:53:19 2019 +0100
glamor_egl: check for non NULL pixmap at egl_close_screen
DDX such as Xorg, Xwayland & Xephyr do not destroy the pixmap before
they call into CloseScreen. At the same time Xvfb (support for glamor
coming with later commit) do.
As such the pixmap will be NULL and we'll crash out.
Signed-off-by: Emil Velikov <emil.velikov@collabora.com>
commit 15354fb68f09eecceec5747a58cd16e6ce9236ca
Author: Emil Velikov <emil.velikov@collabora.com>
Date: Fri Jul 19 15:57:52 2019 +0100
glamor_egl: override the CloseScreen/DestroyPixmap earlier
Currently we wrap the EGL CloseScreen/DestroyPixmap callbacks after the
glamor ones. Thus upon teardown, we'll end calling things in the wrong
order.
Signed-off-by: Emil Velikov <emil.velikov@collabora.com>
commit 89597eeba6e7a3418caa375f19f8dd303219881c
Author: Emil Velikov <emil.velikov@collabora.com>
Date: Thu Jul 18 14:04:33 2019 +0100
glamor_egl: remove unneeded xf86 includes/GLAMOR_FOR_XORG
As of last commit, all of glamor_egl ix xf86 agnostic, so adjust the
includes and drop the GLAMOR_FOR_XORG instances.
Note the macro is still used for glamor_xv_init() which pulls xf86.
v2: Drop GLAMOR_FOR_XORG guards (Michel Dänzer)
Signed-off-by: Emil Velikov <emil.velikov@collabora.com>
commit f3ab3d0c6123c8e7ddd3be6142f721590d153848
Author: Emil Velikov <emil.velikov@collabora.com>
Date: Thu Jul 18 13:57:02 2019 +0100
glamor_egl: disable modifiers via glamor_init()
Currently we parse through xf86Info.debug to check if we the modifiers
should be disabled. Handle that within DDX and pass GLAMOR_NO_MODIFIERS
into the glamor_init() flags.
This allows individual DDX control over the setting - say when modifiers
are woking OK with one implementation and not the other.
Most importantly, this removes the final xf86 piece from the codebase.
Signed-off-by: Emil Velikov <emil.velikov@collabora.com>
commit 4018811838c344ee92d10e60789853e4ba512612
Author: Emil Velikov <emil.velikov@collabora.com>
Date: Wed Jul 17 16:07:43 2019 +0100
glamor_egl: don't use ScrnInfoRec::privates
Move from the xf86 specific ScrnInfoRec::privates, to the dix private
handling. Since there's no FreeScreen function in ScreenPtr, fold the
former within the existing CloseScreen.
Users, such as modesetting are updated, and out of tree drivers will
need equivalent, yet trivial, patch.
Note: we need to ensure that the screen private is unset and the screen
callbacks are restored in our CloseScreen function.
Signed-off-by: Emil Velikov <emil.velikov@collabora.com>
commit 1b5183b26d9977d46f6624126a2b2b6d77a74659
Author: Emil Velikov <emil.velikov@collabora.com>
Date: Thu Jul 18 15:58:13 2019 +0100
glamor_egl: move glamor_egl_cleanup() further up
We'll use the function within glamor_egl_close_screen() with next patch.
Signed-off-by: Emil Velikov <emil.velikov@collabora.com>
commit 6a557167366b8b1352709397df50649d5665b755
Author: Emil Velikov <emil.velikov@collabora.com>
Date: Tue Jul 16 17:50:13 2019 +0100
glamor/egl: remove unused function pointers
The following two members of glamor_egl_screen_private has been unused
for a little while now.
CreateScreenResources
CloseScreen
Signed-off-by: Emil Velikov <emil.velikov@collabora.com>
commit 52a2a052aa3ab92b07c185c1fc2bf4ee2d727f4d
Author: Emil Velikov <emil.velikov@collabora.com>
Date: Fri Jul 12 17:47:27 2019 +0100
glamor_egl: use LogMessage over xf86DrvMsg
Much of glamor already use LogMessage() so we might as well be
consistent. This effectively paves the way of making glamor-egl xf86
agnostic.
Signed-off-by: Emil Velikov <emil.velikov@collabora.com>
commit 3340ddf37743fdf197dfc16a97107435ff53c6e4
Author: Adam Jackson <ajax@redhat.com>
Date: Wed Oct 9 16:03:17 2019 -0400
meson: Apparently 1.2 is < 1.2.0
Siiiigh.
commit c7486613b0dc586f93f6ba293d9b55c69995b05c
Author: Adam Jackson <ajax@redhat.com>
Date: Wed Oct 9 15:17:47 2019 -0400
meson: Fix another reference to "gl" 9.2.0
Previous commit e6ef2b12 missed a spot.
commit e6ef2b12404dfec7f23592a3524d2a63d9d25802
Author: Marvin Schmidt <marv@exherbo.org>
Date: Tue Sep 24 09:58:43 2019 +0200
build: glx: Lower gl version to work with libglvnd
When using mesa with libglvnd support, mesa will no longer install the
gl, glx, egl pkg-config files but instead let libglvnd provide them.
libglvnd maintainers decided to change the versioning as it was
mesa-specific previously. Now the libraries have versions of the API
they expose[1].
This causes problems when building the X server:
checking for glproto >= 1.4.17 gl >= 9.2.0... no
configure: error: Package requirements (glproto >= 1.4.17 gl >= 9.2.0) were not met:
Requested 'gl >= 9.2.0' but version of gl is 1.2
Lower the version requirement to 1.2 to allow building against libglvnd
provided libraries
[1] https://github.com/NVIDIA/libglvnd/commit/0dfaea2bcb7cdcc785f95e244223bd004a2d7fba
commit afd80cfcd5ed7cd45d72620e74df86b016f81f3a
Author: Jon Turney <jon.turney@dronecode.org.uk>
Date: Mon Sep 16 12:43:20 2019 +0100
Revert "appveyor: Drop building Xorg server"
This reverts commit a9537cfdd1ed9656f4e29225af8861418b4fd682.
This is buildable again since !244
commit e693c9657f98c334e9921ca2f8ebf710497c0c6a
Author: Arthur Williams <taaparthur@gmail.com>
Date: Sun Oct 6 11:55:35 2019 -0700
dix: Check for NULL spriteInfo in GetPairedDevice
There is a race when reseting the XServer that causes spriteInfo to be
NULL in GetPairedDevice resulting a segfault and subsequent crash. The
problem was noticed when opening a connection, creating master devices,
destroying master devices and closing the connection during testing.
Signed-off-by: Arthur Williams <taaparthur@gmail.com>
commit a505ecba1048048c168472e4b4a92c13f92b0613
Author: Sven Joachim <svenjoac@gmx.de>
Date: Fri Oct 4 10:29:31 2019 +0200
gitlab-ci: Add a manpage substitutions regression test
This catches the broken manpages in the autoconf build which appeared
after commit 2e497bf887ac ("man: s/__/@/g") and were only partly
rectified by commit 0445705a8bbf ("man: Fix automake seddery").
Reviewed-by: Michel Dänzer <mdaenzer@redhat.com>
commit de0d39f825cce7422986011ee9d5db91f15e2987
Author: Sven Joachim <svenjoac@gmx.de>
Date: Wed Oct 2 18:26:07 2019 +0200
modesetting: Fix broken manpage in autoconf build
The autoconf build for the modesetting driver still relied on
xorg-macros.m4 for string replacements and did not include the
top-level manpages.am. As a result, no substitutions took place after
commit 2e497bf887aca832dc0dd30d071c5288ab5c1e15.
This should be a candidate for the 1.20 branch.
Reviewed-by: Michel Dänzer <mdaenzer@redhat.com>
commit 726e4230c6ffe3148f9877eba32287cfe8d158c1
Author: Sven Joachim <svenjoac@gmx.de>
Date: Wed Oct 2 18:25:17 2019 +0200
xwayland: Add more files to .gitignore
Also sort the file again, missed in commit c8c276c9569b.
commit b2de577f6388c6dd7a463e5cebb8b1366bb45d1f
Author: Adam Jackson <ajax@redhat.com>
Date: Tue Jul 23 14:33:45 2019 -0400
xfree86: Merge vbe into int10
There's not really a good reason to keep these separate, the vbe code
requires int10 and is not very large. This change eliminates the
build-time options for vbe; if you build int10, you get vbe.
Gitlab: https://gitlab.freedesktop.org/xorg/xserver/issues/692
Reviewed-by: Emil Velikov <emil.velikov@collabora.com>
commit e7b5af451c101608d8cc003e8dd0ff83ded17146
Author: Sven Joachim <svenjoac@gmx.de>
Date: Mon Sep 30 18:44:25 2019 +0200
.dir-locals.el: Add missing final newline
commit 47387916fb84f8f9c7931eb7162d1663a6023467
Author: Sven Joachim <svenjoac@gmx.de>
Date: Mon Sep 30 18:43:13 2019 +0200
Fix various spelling errors
commit 2a9268e4a0ba7b062ded4d361be3119d887aac41
Author: Adam Jackson <ajax@redhat.com>
Date: Tue Sep 3 11:20:58 2019 -0400
dri2: Set fallback driver names for Intel and AMD chips
i965 and radeonsi, respectively, are the drivers that have been
receiving new hardware support. It's really silly to need to update the
server side to know specific new devices IDs every time a new ASIC comes
out.
Reviewed-by: Michel Dänzer <mdaenzer@redhat.com>
commit cbdde938cbaf604741cd057fac743859ada342ec
Author: Adam Jackson <ajax@redhat.com>
Date: Fri Sep 27 11:43:52 2019 -0400
modesetting: Reduce "glamor initialization failed" message to X_INFO
This might be an error or not, for example refusing to work on llvmpipe
is normal and expected. glamor_egl_init() will print X_ERROR messages if
appropriate, so we don't need to here.
Reviewed-by: Michel Dänzer <mdaenzer@redhat.com>
commit 0d8cc7bb180468fee72330f40d87f6e9db7b42c0
Author: Michel Dänzer <mdaenzer@redhat.com>
Date: Mon Sep 23 18:35:41 2019 +0200
miext/sync: Make struct _SyncObject::initialized fully ABI compatible
With a 32-bit build, putting the initialized field at the end of the
struct bumped the struct size from 20 bytes to 24, changing the layout
of other structs embedding struct _SyncObject. While this would be
acceptable on master, it caused crashes with 1.20.
Making the initialized field a char and putting it in the hole before
the beingDestroyed field restores the 32-bit ABI as well.
Fixes https://gitlab.freedesktop.org/xorg/xserver/issues/892
Reviewed-by: Aaron Plattner <aplattner@nvidia.com>
Reviewed-by: Alex Goins <agoins@nvidia.com>
commit 6036e845271800b2e268f5cba9283ce07a7fad3a
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Mon Sep 23 16:28:42 2019 -0700
meson: fix builds on Solaris 11.4
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
commit 0e8c0d2f238e5d50daaf4672bd80ad519673b5e3
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Mon Sep 23 15:12:01 2019 -0700
ospoll: Fix Solaris ports implementation to build on Solaris 11.4
Wrong version got committed, but wasn't noticed since it only builds
with meson, not autoconf.
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
commit cca4bc342cacdbd1ce819c08af2f4795f6a704c3
Author: Andres Rodriguez <andresx7@gmail.com>
Date: Fri Sep 6 18:32:44 2019 -0400
xf86: Disable unused crtc functions when a lease is revoked
This fixes 'non-desktop' displays staying powered on after their lease
has been revoked.
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=111620
Cc: Keith Packard <keithp@keithp.com>
Signed-off-by: Andres Rodriguez <andresx7@gmail.com>
commit 0f19381f4906e3100cd43544f1cad82d2a933c63
Author: Olivier Fourdan <ofourdan@redhat.com>
Date: Tue Jul 9 11:08:27 2019 +0200
xwayland: Don't create wl_buffer backing pixmap
In non-rootless mode, not all pixmaps need a wl_buffer backing.
Suggested-by: Twaik Yont (@twaik) in #834
Signed-off-by: Olivier Fourdan <ofourdan@redhat.com>
Reviewed-by: Michel Dänzer <mdaenzer@redhat.com>
commit edf964434eac10ffbe27cc883e3ab95505669aee
Author: Jonas Ådahl <jadahl@gmail.com>
Date: Fri Sep 13 17:11:27 2019 +0200
xwayland/glamor-gbm: Handle DRM_FORMAT_MOD_INVALID gracefully
The compositor may send DRM_FORMAT_MOD_INVALID instead of a list of
modifiers for various reasons. Handle this gracefully by ignoring it.
Without this, if a compositor would send DRM_FORMAT_MOD_INVALID, it'd
result in empty windows provided by Xwayland.
Signed-off-by: Jonas Ådahl <jadahl@gmail.com>
Reviewed-by: Olivier Fourdan <ofourdan@redhat.com>
Reviewed-by: Michel Dänzer <mdaenzer@redhat.com>
commit 429ee86ab949d6e49c07491a88d6b8d8babc3246
Author: Martin Weber <martin.weber@secunet.com>
Date: Wed Sep 18 14:29:05 2019 +0200
udev: Fixed NULL pointer argument of strcmp
Signed-off-by: Martin Weber <martin.weber@secunet.com>
commit bcf2dd0cd20825ccf4284c67f678ad37ecd1d2b1
Author: Jon Turney <jon.turney@dronecode.org.uk>
Date: Fri Feb 19 21:53:00 2016 +0000
hw/xwin: Add -icon option to set the screen window icon in windowed mode
Add an -icon option to set the screen window icon in windowed mode
Allow cygwin paths in an icon-specification
Update man pages and system.XWinrc appropriately
Also, log an error if the icon specified for TRAYICON cannot be loaded
Also, fix a bug in appending a '\' to IconDirectory only if it doesn't
already end with one, which was fortunately benign.
Note: LoadImageComma would be simpler if we just stated that XWinrc
paths are Cygwin paths on Cygwin, Windows paths on MinGW, but that could
break existing .XWinrc files
Note: Given that we can specify paths in an icon-specifier, I'm not sure
what IconDirectory wins us.
v2:
Fix formatting problems in man page additions
v3:
Fix some more s/_/@/g in man pages
commit ac5d3a200a6d4bdb9ae4a9ef6f2238cf185d38e5
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Tue Sep 10 17:28:36 2019 -0700
meson: don't require xf86bigfontproto if not building xf86bigfont support
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
commit 7ad1d0d384085fb480e00547c22a3e8a14b514ea
Author: Carlos Garnacho <carlosg@gnome.org>
Date: Sat Jul 20 00:16:43 2019 +0200
xwayland: Allow passing a fd for set up clients
This FD also triggers the "wait for WM_S0" paths, so that the
compositor may set up a "maintenance line" for Xwayland, for
services that are essential to run before any client (eg. xrdb).
Those services would use this FD, disguised as an extra display
connection.
This -initfd can be seen as a generalization of -wm, a Wayland
compositor may use -initfd to launch its WM and any other clients
that should start up, or it may use -wm as a dedicated connection for
the WM and optionally use -initfd for the misc. startup clients.
If either of -wm or -initfd is passed, Xwayland will expect a selection
notification on WM_S0 before incorporating the FDs in -listen to the
poll list.
Also, correct a minor typo in the listenfd argument output,
give → given.
Signed-off-by: Carlos Garnacho <carlosg@gnome.org>
commit 78cc8b6f9613fc71f6ecc7e8848d54364a250634
Author: Carlos Garnacho <carlosg@gnome.org>
Date: Mon Jan 7 15:33:35 2019 +0100
xwayland: Handle the case of windows being realized before redirection
If Xwayland gets to realize a window meant for composition before the
compositor redirected windows (i.e. redirect mode is not RedirectDrawManual
yet), the window would stay "invisible" as we wouldn't create a
wl_surface/wl_shell_surface for it at any later point.
This scenario may happen if the wayland compositor sets up a X11 socket
upfront, but waits to raise Xwayland until there are X11 clients. In this
case the first data on the socket is the client's, the compositor can hardly
beat that in order to redirect subwindows before the client realizes a
Window.
In order to jump across this hurdle, allow the late creation of a matching
(shell) surface for the WindowPtr on SetWindowPixmapProc, so it is ensured
to be created after the compositor set up redirection.
Signed-off-by: Carlos Garnacho <carlosg@gnome.org>
Reviewed-by: Michel Dänzer <mdaenzer@redhat.com>
Reviewed-by: Olivier Fourdan <ofourdan@redhat.com>
commit c2e8ae964052944312c5023ca7ea5c41a92990e5
Author: Carlos Garnacho <carlosg@gnome.org>
Date: Mon Jan 7 15:33:31 2019 +0100
xwayland: Refactor surface creation into a separate function
This is just called from xwl_window_realize() ATM, but will be useful in
future commits.
Signed-off-by: Carlos Garnacho <carlosg@gnome.org>
commit 4e50440ae20c537d6a4edf356cda67dd33d4e5a8
Author: Carlos Garnacho <carlosg@gnome.org>
Date: Mon Jan 7 15:20:05 2019 +0100
xwayland: Separate DamagePtr into separate window data
This will be dissociated in future commits to handle the cases
where windows are being realized before there is a compositor
handling redirection.
In that case, we still want the DamagePtr to be registered upfront
on RealizeWindowProc before a corresponding xwl_window might be
created. Most notably, it cannot be lazily created on
SetWindowPixmapProc as damage accounting gets broken.
Signed-off-by: Carlos Garnacho <carlosg@gnome.org>
commit 07463a40458ecc52d935b1a0bd820f6d9664da22
Author: Simon Ser <contact@emersion.fr>
Date: Tue Sep 3 13:10:33 2019 +0300
ci: bump DEBIAN_TAG
The previous commit requires wayland-protocols 1.18. Bump DEBIAN_TAG to
re-generate the Debian image and get the wayland-protocols update.
Signed-off-by: Simon Ser <contact@emersion.fr>
Reviewed-by: Michel Dänzer <mdaenzer@redhat.com>
commit 01ed478c65227ae961d33bc1daf4a64da84f15a6
Author: Simon Ser <contact@emersion.fr>
Date: Mon Sep 2 22:42:17 2019 +0300
xwayland: add support for xdg-output-unstable-v1 version 3
This adds support for xdg-output-unstable-v1 version 3, added in [1].
This new version deprecates zxdg_output_v1.done and replaces it with
wl_output.done. If the version is high enough, there's no need to wait for both
an xdg_output.done event and a wl_output.done event -- we only care about
wl_output.done.
[1]: https://gitlab.freedesktop.org/wayland/wayland-protocols/commit/962dd535372c8e4681374c23d2603cbe06cd7031
Signed-off-by: Simon Ser <contact@emersion.fr>
Reviewed-by: Olivier Fourdan <ofourdan@redhat.com>
commit f0d78b47ac49977a6007f5fe081f00c6eb19a12e
Author: Maarten Lankhorst <dev@mblankhorst.nl>
Date: Thu Apr 25 11:46:41 2019 +0200
modesetting: Disable atomic support by default
The atomic driver has issues with modesetting when stealing
connectors from a different crtc, a black screen when doing rotation
on a different crtc, and in general is just a mapping of the legacy
helpers to atomic. This is already done in the kernel, so just
fallback to legacy by default until this is fixed.
Please backport to 1.20, as we don't want to enable it for everyone
there. It breaks for existing users.
The fixes to make the xserver more atomic have been pending on the
mailing list for ages.
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=110375
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=110030
References: https://gitlab.freedesktop.org/xorg/xserver/merge_requests/36/commits
Signed-off-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
commit 7d0e660e0e2808e098ab9d4de843e9b31c64af21
Author: Adam Jackson <ajax@redhat.com>
Date: Tue Aug 27 15:54:42 2019 -0400
meson: Add dtrace support
commit e0e051a3920e3e2731d35807e00d30ba9ef7f122
Author: Adam Jackson <ajax@redhat.com>
Date: Tue Aug 27 15:50:23 2019 -0400
dtrace: s/#if/#ifdef/ for XSERVER_DTRACE
No functional change, matches meson style.
commit 7968d10fadd37eabd811481e1d47fe01706269f3
Author: Adam Jackson <ajax@redhat.com>
Date: Tue Aug 27 15:48:59 2019 -0400
dtrace: Move Xserver.d from dix/ to include/
dix/ is typically not in the include path, and this properly belongs in
include anyway since it's needed from os/ too.
commit 4fa43fc5134bedf50904ec634f9a63d0570b0827
Author: Adam Jackson <ajax@redhat.com>
Date: Tue Aug 27 15:43:50 2019 -0400
dtrace: Remove Xserver-dtrace.h.in hack
This was a workaround for very old versions of dtrace(1) that didn't
support the -h switch. We no longer support such old OSes.
commit f8c85961c8fcb283e4ed6fc2b942428e4da2d093
Author: Adam Jackson <ajax@redhat.com>
Date: Thu Aug 22 15:07:18 2019 -0400
glx: Disable GLX_EXT_import_context if !enableIndirectGLX
GLX_EXT_import_context allows multiple clients to share the same
indirect context. If you can't create an indirect context, you're
certainly not going to be able to share one. Hide the extension from the
server string if we've disabled indirect contexts.
This turns piglit's tests from fail to skip when indirect contexts are
disabled. Since GLX_EXT_import_context has been supported in
xfree86-derived servers since day 1 (it was included in the initial GLX
code drop from SGI), this is now also a hint to the client that indirect
contexts are unlikely to work at all.
Reviewed-by: Michel Dänzer <michel@daenzer.net>
commit 4f27d1e05f67eb8953a9bbed7e6f34b03456c64f
Author: Christopher Chavez <chrischavez@gmx.us>
Date: Sat Jul 27 10:51:57 2019 -0500
XQuartz: translate additional mouse buttons
Old behavior was to translate the middle mouse button, as well as
every other button that isn't the left or right mouse button,
to act as the middle mouse button (2).
New behavior is to translate only the middle mouse button to 2,
and translate higher-numbered buttons to 8 and higher.
This allows additional mouse buttons to behave under XQuartz
more like they do by default under X11 on other platforms
(e.g. Linux and BSD distributions).
Signed-off-by: Christopher Chavez <chrischavez@gmx.us>
commit 436fd7e8b4966c305ea9c43f3c14c2ca04c35539
Author: Adam Jackson <ajax@redhat.com>
Date: Wed Jan 23 11:47:44 2019 -0500
render: Break PICT_a4
The Render protocol requires this format, but it is wrong to do so. We
are not aware of any hardware with a real 4bpp implementation of this
format. Some GL hardware may have GL_LUMINANCE4_ALPHA4_EXT, and may also
be able to wire L to 1, but that would win you none of memory, quality,
or (likely) performance over A8. Any attempt to use this format is
therefore likely a (painful) software fallback.
Pleasantly (and given the above, unsurprisingly) it seems to be unused
in the wild. None of the major toolkits will try to use it, and
rendercheck does not in fact validate that all of the "standard" picture
formats exist.
Drop the explicit A4 setup from picture format initialization. Note that
the DDXes are not changed and still expose a depth-4 pixmap format, but
we only add picture formats for True/DirectColor-credible depths (i.e.
depth >= 15).
Implements: xorg/proto/xorgproto!1
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit 0c5179c280a193a1dbbe29160906087f06eae6f2
Author: Ville Syrjälä <ville.syrjala@linux.intel.com>
Date: Tue Aug 20 17:46:09 2019 +0300
modesetting: Update props for dynamically added outputs
Dynamically added outputs should have their properties
properly updated as well. Otherwise we're left with an output
with many of its propeties not exposed.
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Michel Dänzer <michel@daenzer.net>
commit 194ba38728b34a76885275dae153057c8afaf72e
Author: Adam Jackson <ajax@redhat.com>
Date: Mon Aug 19 14:27:54 2019 -0400
miext/sync: Fix needless ABI change
The initialized field was added in:
commit 82f01ad7869e3f2be51e41a8246dab5982bbc36a
Author: Alex Goins <agoins@nvidia.com>
Date: Wed Apr 10 13:48:02 2019 -0500
xsync: Add resource inside of SyncCreate, export SyncCreate
But it added this field not at the end of SyncObject. It may not have
been _usefully_ possible to create those from another extension prior to
that commit, but that's still an ABI-incompatible change.
commit 95dcc81cb122e5a4c5b38e84ef46eb872b2e1431
Author: Adam Jackson <ajax@redhat.com>
Date: Fri Aug 16 14:56:19 2019 -0400
glx: Fix previous context validation in xorgGlxMakeCurrent
vnd has already verified that the context tag is valid before this gets
called, and we only set the context tag private data to non-null for
indirect clients. Mesa happens to be buggy and doesn't send MakeCurrent
requests nearly as much as it should for direct contexts, but if you fix
that, then unbinding a direct context would fail here with
GLXBadContextTag.
Sadly Mesa will still need to carry a workaround here for broken
servers, but we should still fix the server.
commit aed62f8fbea3f618f97ee0105b2d430c8cddf8f5
Author: Olivier Fourdan <ofourdan@redhat.com>
Date: Thu Aug 1 13:34:13 2019 +0200
meson/xwayland: No libdrm nor epoxy without glamor
When building Xwayland with neither DRI nor GLamor support enabled with
the Meson build system, the resulting binary would still link against
libdrm and epoxy even though those are not used/needed.
Make sure we require and link against libdrm and epoxy only if needed.
Signed-off-by: Olivier Fourdan <ofourdan@redhat.com>
commit e8a85ba818a82d8c5acacc53dfc4fdfff573ae90
Author: Olivier Fourdan <ofourdan@redhat.com>
Date: Thu Aug 1 13:28:48 2019 +0200
meson: Build miext/sync for Xwayland
When using the Meson build system, miext/sync would be build only for
dri3.
As a result, when building with Meson without DRI3 enabled, Xwayland
would fail to link because `miSyncShmScreenInit()` is nowhere to be
found.
Make sure to build miext/sync for either DRI3 or Xwayland.
Signed-off-by: Olivier Fourdan <ofourdan@redhat.com>
commit c0bbc29ae59737ea0e55fd9c8b65133010d32b80
Author: Olivier Fourdan <ofourdan@redhat.com>
Date: Thu Aug 1 09:48:59 2019 +0200
meson: Move requirements in a single place
Some modules are required in multiple places in the meson file.
Move the actual requirements to the top of the file as a variable so
that updating a version does not require changing the actual value in
multiple places.
Signed-off-by: Olivier Fourdan <ofourdan@redhat.com>
commit bf758660c9c0e20abd141a1215e2e2b1ac342097
Author: Olivier Fourdan <ofourdan@redhat.com>
Date: Thu Aug 1 13:39:47 2019 +0200
configure/xwayland: No libdrm nor epoxy without glamor
When building Xwayland without neither DRI nor GLamor support enabled
with the autotools build system, the resulting binary would still link
against libdrm and epoxy even though those are not used/needed.
Make sure we require and link against libdrm and epoxy only if needed.
Signed-off-by: Olivier Fourdan <ofourdan@redhat.com>
commit 5096fcd492b1efd178773748e5f42177439426d6
Author: Adam Jackson <ajax@redhat.com>
Date: Wed Aug 14 14:10:07 2019 -0400
composite: Be more paranoid in compDestroyDamage
Consider these two facts:
- You can't rely on resource deletion order
- damageDestroyWindow automatically destroys any damage listener
connected to the doomed window
Now consider a redirected window being destroyed. If the damage
associated with the redirection is destroyed before the window, then
when compFreeClientWindow tries to unredirect the window, the call to
compSetParentPixmap may see that cw->damageRegistered is still true, and
call DamageUnregister(NULL) (because compDestroyDamage already zeroed
out cw->damage), and you get a backtrace that looks like:
#6 <signal handler called>
#7 DamageUnregister (pDamage=0x0) at damage.c:1773 <-----------------
#8 0x000000000051f767 in compSetParentPixmap (pWin=pWin@entry=0x28489c0) at compalloc.c:646
#9 0x000000000051fa01 in compFreeClientWindow (pWin=0x28489c0, id=<optimized out>) at compalloc.c:291
#10 0x000000000051a499 in FreeCompositeClientWindow (value=<optimized out>, ccwid=<optimized out>) at compext.c:74
#11 0x0000000000597932 in doFreeResource (res=0x28494c0, skip=0) at resource.c:880
#12 0x000000000059850e in FreeResource (id=857, skipDeleteFuncType=skipDeleteFuncType@entry=0) at resource.c:910
#13 0x000000000051ee01 in compUnredirectWindow (pClient=0x1f6b4e0, pWin=pWin@entry=0x28489c0, update=update@entry=0) at compalloc.c:336
#14 0x000000000051b723 in compCheckBackingStore (pWin=0x28489c0) at compinit.c:131
#15 compChangeWindowAttributes (pWin=0x28489c0, mask=<optimized out>) at compinit.c:152
#16 0x000000000051d1f9 in compDestroyWindow (pWin=0x28489c0) at compwindow.c:664
#17 0x00000000004d85be in damageDestroyWindow (pWindow=0x28489c0) at damage.c:1570
#18 0x00000000004896f0 in DbeDestroyWindow (pWin=0x28489c0) at dbe.c:1326
#19 0x00000000004d229e in present_destroy_window (window=0x28489c0) at present_screen.c:163
#20 0x000000000059c4e4 in FreeWindowResources (pWin=pWin@entry=0x28489c0) at window.c:1032
#21 0x000000000059f2c6 in DeleteWindow (value=0x28489c0, wid=<optimized out>) at window.c:1101
#22 0x0000000000597932 in doFreeResource (res=0x2843bd0, skip=skip@entry=0) at resource.c:880
#23 0x0000000000598b0c in FreeClientResources (client=client@entry=0x2848560) at resource.c:1146
#24 0x0000000000572e2f in CloseDownClient (client=0x2848560) at dispatch.c:3473
Fix this by zeroing out more of the CompWindowPtr when the damage is
destroyed, so that any further calls into composite will avoid touching
cw->damage.
commit 3c78d637553a5ed207cd67a6f84b9b1fffe5b91f
Author: Adam Jackson <ajax@redhat.com>
Date: Wed Aug 14 14:51:56 2019 -0400
global: Remove BUILD_DATE and BUILD_TIME
All this does is make reproducible builds impossible.
commit 61aa40aeb3d4efefda47f245ed4b83a1a19b1d4c
Author: Matt Turner <mattst88@gmail.com>
Date: Fri Aug 9 20:22:29 2019 -0700
dix: Assert noPanoramiXExtension is false in PanoramiX code
When compiling with link time optimization, GCC thinks it's discovered
undefined behavior:
events.c: In function 'XineramaConfineCursorToWindow':
events.c:609:13: warning: iteration 2147483647 invokes undefined behavior [-Waggressive-loop-optimizations]
events.c:609:11: note: within this loop
events.c:605:49: warning: array subscript -1 is below array bounds of 'struct _Window *[16]' [-Warray-bounds]
events.c:606:31: warning: array subscript -1 is below array bounds of 'struct _Screen *[16]' [-Warray-bounds]
events.c:610:39: warning: array subscript -2 is below array bounds of 'struct _Screen *[16]' [-Warray-bounds]
events.c:617:38: warning: array subscript -2 is below array bounds of 'struct _Window *[16]' [-Warray-bounds]
events.c:619:35: warning: array subscript -2 is below array bounds of 'struct _Screen *[16]' [-Warray-bounds]
This results from
i = PanoramiXNumScreens - 1;
RegionCopy(&pSprite->Reg1, &pSprite->windows[i]->borderSize);
off_x = screenInfo.screens[i]->x;
off_y = screenInfo.screens[i]->y;
where GCC believes that PanoramiXNumScreens might be 0. Unfortunately
GCC is just smart enough to be an annoyance because this case is not
actually possible: XineramaConfineCursorToWindow() is only called when
noPanoramiXExtension is false, and if noPanoramiXExtension is false then
PanoramiXNumScreens must be >1 (see PanoramiXExtensionInit()).
So, add an assert(!noPanoramiXExtension), which to my surprise provides
GCC with information even in release builds and lets GCC understand that
the code is not doing anything that is undefined behavior.
I chose this solution instead of the proposed assert(i >= 0) because the
same pattern occurs in CheckVirtualMotion() but is inside an
'if (!noPanoramiXExtension)' and does not generate any warnings.
Fixes: xorg/xserver#590
Signed-off-by: Matt Turner <mattst88@gmail.com>
commit c69b37e8da87c9f76dbf4add7340a77ea443c760
Author: Hans de Goede <hdegoede@redhat.com>
Date: Thu Aug 8 21:56:59 2019 +0200
modesetting: Only log 1 error for consecutive flip failures
Only log 1 error for consecutive flip failures, instead of filling the
log and the disk with errors for each attempted flip.
Despite our best efforts we may end up with a BO which gets refused
when we try to import it as a framebuffer, see e.g. :
https://bugs.freedesktop.org/show_bug.cgi?id=111306
This should not happen, but as the above bugs shows sometimes it does
and chances are it will happen again.
Note ideally we should check if the import is possible at
ms_present_check_flip time, like the amdgpu code is doing since:
https://gitlab.freedesktop.org/xorg/driver/xf86-video-amdgpu/merge_requests/35
but that requires a chunk of refactoring work on the modesetting driver,
so for now this will have to do.
Reviewed-by: Michel Dänzer <michel.daenzer@amd.com>
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
commit 3dc838f77d9a9417adf6a03cc82aa4e9337153a7
Author: Hans de Goede <hdegoede@redhat.com>
Date: Thu Aug 8 21:54:51 2019 +0200
modesetting: Improve page-flip error reporting
Before this commit ms_do_pageflip logged a single error for both the
drmmode_bo_import failure path as well as for the queue_flip_on_crtc
path. This commit splits this into 2 separate error logs so that it is
clear what the cause of the flip-failure is.
Reviewed-by: Michel Dänzer <michel.daenzer@amd.com>
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
commit 12821852f0d82ecef686262382c84b2c1625a99f
Author: Hans de Goede <hdegoede@redhat.com>
Date: Mon Jul 15 14:35:49 2019 +0200
modesetting: Avoid duplicate error messages on present-flip errors
Currently on present-flip failures we log 2 messages for each failure,
1 from ms_do_pageflip and then another one from ms_present_flip which
is the caller of ms_do_pageflip. This commit adds a log_prefix argument
to ms_do_pageflip so that its log messages can show if it is a DRI2 or
a Present flip which fails and removes the redundant error message from
ms_present_flip.
Reviewed-by: Michel Dänzer <michel.daenzer@amd.com>
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
commit 078277e4d92f05a90c4715d61b89b9d9d38d68ea
Author: Dave Airlie <airlied@redhat.com>
Date: Fri Aug 17 09:49:24 2012 +1000
xf86: autobind GPUs to the screen
This is a modified version of a patch we've been carry-ing in Fedora and
RHEL for years now. This patch automatically adds secondary GPUs to the
master as output sink / offload source making e.g. the use of
slave-outputs just work, with requiring the user to manually run
"xrandr --setprovideroutputsource" before he can hookup an external
monitor to his hybrid graphics laptop.
There is one problem with this patch, which is why it was not upstreamed
before. What to do when a secondary GPU gets detected really is a policy
decission (e.g. one may want to autobind PCI GPUs but not USB ones) and
as such should be under control of the Desktop Environment.
Unconditionally adding autobinding support to the xserver will result
in races between the DE dealing with the hotplug of a secondary GPU
and the server itself dealing with it.
However we've waited for years for any Desktop Environments to actually
start doing some sort of autoconfiguration of secondary GPUs and there
is still not a single DE dealing with this, so I believe that it is
time to upstream this now.
To avoid potential future problems if any DEs get support for doing
secondary GPU configuration themselves, the new autobind functionality
is made optional. Since no DEs currently support doing this themselves it
is enabled by default. When DEs grow support for doing this themselves
they can disable the servers autobinding through the servers cmdline or a
xorg.conf snippet.
Signed-off-by: Dave Airlie <airlied@gmail.com>
[hdegoede@redhat.com: Make configurable, fix with nvidia, submit upstream]
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Reviewed-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Emil Velikov <emil.velikov@collabora.com>
---
Changes in v2:
-Make the default enabled instead of installing a xorg.conf
snippet which enables it unconditionally
Changes in v3:
-Handle GPUScreen autoconfig in randr/rrprovider.c, looking at
rrScrPriv->provider, rather then in hw/xfree86/modes/xf86Crtc.c
looking at xf86CrtcConfig->provider. This fixes the autoconfig not
working with the nvidia binary driver
commit fbd2bb9dd047a206b9c8cfaca62079c8d866c617
Author: Hans de Goede <hdegoede@redhat.com>
Date: Thu Aug 1 12:38:35 2019 +0200
mi: Use GC clipregion instead of drawable in miDoCopy/miCopyArea
As discussed in issue #829 the "mi: Shortcut miDoCopy/miCopyArea based
on clipList" change leads to pointer-trails (area under pointer not
restored when it moves) when using a software cursor.
Checking pGC->pCompositeClip instead of pDstDrawable->clipList fixes
this problem.
Fixes: #829
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
commit 0aaac8d783e78c040a70a55ba8d67809abd7e625
Author: Hans de Goede <hdegoede@redhat.com>
Date: Mon Jun 24 21:46:26 2019 +0200
modesetting: Disable pageflipping when using a swcursor
The miPointerSpriteFunc swcursor code expects there to only be a single
framebuffer and when the cursor moves it will undo the damage of the
previous draw, potentially overwriting what ever is there in a new
framebuffer installed after a flip.
This leads to all kind of artifacts, so we need to disable pageflipping
when a swcursor is used.
The code for this has shamelessly been copied from the xf86-video-amdgpu
code.
Fixes: https://gitlab.freedesktop.org/xorg/xserver/issues/828
Reviewed-by: Michel Dänzer <michel.daenzer@amd.com>
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
commit 0331153b227c1cadf94f912cc02949d7159b02a2
Author: Hans de Goede <hdegoede@redhat.com>
Date: Mon Jun 24 21:49:59 2019 +0200
modesetting: Fix compiler warning
Fix the following compiler warning:
drmmode_display.c: In function ‘drmmode_create_bo’:
drmmode_display.c:1019:9: warning: ISO C90 forbids mixed declarations and code [
1019 | uint32_t num_modifiers;
| ^~~~~~~~
Reviewed-by: Michel Dänzer <michel.daenzer@amd.com>
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
commit 13f359fa838a9b5e855fbbee9c2f79bad84a1ace
Author: Hans de Goede <hdegoede@redhat.com>
Date: Mon Jun 24 21:20:06 2019 +0200
modesetting: Remove obsolete, unused msPixmapPrivate declaration and macro
When the pixmapPrivateKeyRec was moved from a global to being embedded
inside the drmmode_rec these 2 where missed, clean them up.
Reviewed-by: Michel Dänzer <michel.daenzer@amd.com>
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
commit f9e7cdf65901665cf5a4efc4df3164337229f3ac
Author: Hans de Goede <hdegoede@redhat.com>
Date: Mon Aug 5 17:12:01 2019 +0200
xf86: dri2: Use va_gl as VDPAU driver for Intel i965 GPUs
The modesetting driver (which now often is used with Intel GPUs),
relies on DRI2ScreenInit() to setup the DRI and VDPAU driver names.
Before this commit it would always assign the same name to the 2 names,
but the VDPAU driver for i965 GPUs should be va_gl.
This commit adds a special case for the i965 case, replacing the
VDPAU driver name with "va_gl" if the GPU is using the i965 driver
for DRI.
Note this commit adds a FIXME comment for a related memory leak, that leak
was already present and fixing it falls outside of the scope of this commit.
BugLink: https://bugzilla.redhat.com/show_bug.cgi?id=1413733
Cc: kwizart@gmail.com
Reviewed-by: Emil Velikov <emil.velikov@collabora.com>
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
commit 6f41bf31051ec915cb4316421d3b7eddfebdd8c6
Author: Ross Burton <ross.burton@intel.com>
Date: Thu Aug 1 15:24:51 2019 +0100
sdksyms.sh: don't embed the build path
This script generates a header that has a comment containing the build path for
no real reason. As this source can end up deployed on targets in debug packages
this means there is both potentially sensitive information leakage about the
build environment, and a source of change for reproducible builds.
commit b7dae57f1d50ca3c8197f894c445a00b92a3ee9c
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Sun Aug 4 10:28:51 2019 -0700
Fix NO_UNDEFINED build with statically linked fb
Stop trying to link to a shared library we no longer build
Fixes: commit c1703cdf3b - "xfree86: Link fb statically"
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
commit f107bde1e2e8c67eb42d0a5c757c0a1c777b0327
Author: Olivier Fourdan <ofourdan@redhat.com>
Date: Wed Jul 31 11:14:37 2019 +0200
xwayland: Fix build warning without glamor
Building Xwayland without glamor support would raise a warning at build
time:
xwayland.c: In function ‘xwl_screen_init’:
xwayland.c:980:10: warning: unused variable ‘use_eglstreams’
980 | Bool use_eglstreams = FALSE;
| ^~~~~~~~~~~~~~
When building without glamor support, we cannot have EGL Streams support
either, the two being related. So we do not need to declare the variable
`use_eglstreams` if glamor is not enabled.
Signed-off-by: Olivier Fourdan <ofourdan@redhat.com>
Reviewed-by: Michel Dänzer <michel.daenzer@amd.com>
commit 8587bbd85adaa92a429257a7b6f75e60f56cd603
Author: Olivier Fourdan <ofourdan@redhat.com>
Date: Wed Jul 31 09:25:09 2019 +0200
xwayland: Fix build without glamor
When building Xwayland without glamor support enabled using automake,
the build would fail at link time trying to find `glamor_block_handler`:
/usr/bin/ld: xwayland-glx.o: in function `egl_drawable_wait_x':
hw/xwayland/xwayland-glx.c:102: undefined reference to
`glamor_block_handler'
Make sure we don't try to build `xwayland-glx.c` without glamor in the
Xwayland Makefile.
Note: Meson build is fine because it's already build only with glamor
enabled.
Fixes: commit 8469241 - "xwayland: Add EGL-backed GLX provider"
Signed-off-by: Olivier Fourdan <ofourdan@redhat.com>
commit a026972776b303fa640f54e5e8f0fc1abf879071
Author: Jon Turney <jon.turney@dronecode.org.uk>
Date: Mon Mar 16 15:43:07 2015 +0000
Clarify authorization failure reason strings sent back to the client
commit c1703cdf3b0d6663fcac68598eefe324ae4e1e71
Author: Adam Jackson <ajax@redhat.com>
Date: Tue Jul 23 11:54:15 2019 -0400
xfree86: Link fb statically
There's no real benefit to leaving this loadable, virtually every driver
is going to load it.
Reviewed-by: Jon Turney <jon.turney@dronecode.org.uk>
commit d9ec525059dbe96fc893c73c0362be2a6dd73e85
Author: Olivier Fourdan <ofourdan@redhat.com>
Date: Tue Jul 23 11:01:47 2019 +0200
xwayland: Do not free a NULL GBM bo
Both `gbm_bo_create()` and `gbm_bo_create_with_modifiers()` can fail and
return `NULL`.
If that occurs, `xwl_glamor_gbm_create_pixmap()` will not create a
pixmap for the (NULL) GBM bo, but would still try to free the bo which
leads to a crash in mesa:
[...]
#7 <signal handler called>
#8 in gbm_bo_destroy (bo=0x0) at ../src/gbm/main/gbm.c:439
#9 in xwl_glamor_gbm_create_pixmap () at xwayland-glamor-gbm.c:245
#10 in ProcCreatePixmap () at dispatch.c:1440
#11 in Dispatch () at dispatch.c:478
#12 in dix_main () at main.c:276
To avoid the crash, only free the GBM bo if not `NULL`.
Signed-off-by: Olivier Fourdan <ofourdan@redhat.com>
Reviewed-by: Michel Dänzer <michel.daenzer@amd.com>
Bugzilla: https://bugzilla.redhat.com/1729925
commit 454b3a826edb5fc6d0fea3a9cfd1a5e8fc568747
Author: Adam Jackson <ajax@redhat.com>
Date: Mon Jul 22 13:51:06 2019 -0400
hw: Rename boolean config value field from bool to boolean
"bool" conflicts with C++ (meh) and stdbool.h (ngh alright fine). This
is a driver-visible change and will likely break the build for mach64,
but it can be fixed by simply using xf86ReturnOptValBool like every
other driver.
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit 074c98cf5365c3d534f7c62ad6dbdd332883b46b
Author: Paolo Borelli <pborelli@gnome.org>
Date: Mon Jul 22 12:46:31 2019 +0200
Xvfb: set rotations ret value
commit a9537cfdd1ed9656f4e29225af8861418b4fd682
Author: Jon Turney <jon.turney@dronecode.org.uk>
Date: Sun Jul 21 14:43:24 2019 +0100
appveyor: Drop building Xorg server
(Temporarily) drop building Xorg server (since this doesn't work after
a530b6e8) until we come up with a better solution. (See #692)
commit 401ff618cf5bb93648c05f025dfa96b0324e94b7
Author: Jon Turney <jon.turney@dronecode.org.uk>
Date: Sat Jul 6 17:58:12 2019 +0100
appveyor: Workaround a Cygwin setup bug
Run Cygwin's setup a second time to workaround for it's defective
handling of obsolete packages.
(Specifically, python3-lxml is currently obsoleted by python36-lxml, but
that doesn't get installed on the first run)
commit 011b87a8c6e68b992ed27db4e93ae1f1e6dc508f
Author: Yaakov Selkowitz <yselkowitz@users.sourceforge.net>
Date: Wed Oct 29 14:05:52 2014 +0000
hw/xwin: Add EWMH properties for describing multiple desktops to the root window
mate-terminal apparently requires these to be present to work
We just set them to describe one desktop, for the moment.
It seems we can safely ignore the _NET_WM_DESKTOP property on child
windows, and any _NET_WM_DESKTOP messages, as we only support one
desktop for windows to be on.
Signed-off-by: Jon Turney <jon.turney@dronecode.org.uk>
commit 3d493e91ab66c8f66efaded6b81c87385863b843
Author: Colin Harrison <colin@xming.myzen.co.uk>
Date: Tue Aug 28 15:30:23 2018 +0100
hw/xwin: Respect -notrayicon option on taskbar restart
commit a588e6f81b1d8dfb9076358e5039d3ee6628a50f
Author: Jon Turney <jon.turney@dronecode.org.uk>
Date: Thu Jul 2 22:21:28 2015 +0100
hw/xwin: Rename WM_WM_MAP{2,3} to WM_WM_MAP_{UN,}MANAGED
WM_WM_MAP was removed in 52e05b92
Rename WM_WM_MAP2 as WM_WM_MAP_UNMANAGED (meaning an override-redirect
window, which manages it's own activation)
Rename WM_WM_MAP3 as WM_WM_MAP_MANAGED (meaning a normal window, which
is activated when clicked)
commit a47e7eb247d5c61be43d31b32887dee1dc89ba67
Author: Jon Turney <jon.turney@dronecode.org.uk>
Date: Fri May 9 22:09:38 2014 +0100
hw/xwin: Log counts of pixel formats which couldn't be used
Log a count of pixel formats which couldn't be used for various reasons
commit 82225aab81d581e943c67c679695a1d15757d69d
Author: Ignacio Casal Quinteiro <qignacio@amazon.com>
Date: Wed Jul 17 14:45:46 2019 +0200
vfb: set gamma size to avoid xrandr to complain about it missing
commit 492639f5e167b12ef81c4e4fa0e6a2749cbfe3a0
Author: Ignacio Casal Quinteiro <qignacio@amazon.com>
Date: Wed Jul 17 14:39:29 2019 +0200
vfb: factor out method to free a single screen info
commit 356ffd6729861bc9d0cd059fd8a99d7135fe50dd
Author: Ignacio Casal Quinteiro <qignacio@amazon.com>
Date: Wed Jul 17 14:18:47 2019 +0200
vfb: no need for else if we are returning
commit d0850241c6218f61127c45c2f95d6e791c3fea44
Author: Adam Jackson <ajax@redhat.com>
Date: Mon Jul 15 11:38:44 2019 -0400
xwayland: Expand the RANDR screen size limits
There's not really a good way to query this from the wayland server, so
just set the maximum to the X11 protocol limits. While we're at it,
lower the minimum screen size to something implausibly small too, just
in case.
Fixes: xorg/xserver#850
Reviewed-by: Michel Dänzer <michel.daenzer@amd.com>
commit fe4cd0e7f5c58fa94db36326aadc1bd4e6d73eba
Author: Olivier Fourdan <ofourdan@redhat.com>
Date: Mon Jul 1 13:20:39 2019 +0200
compiler.h: Do not include sys/io.h on ARM with glibc
<sys/io.h> on ARM hasn't worked for a long, long time, so it was removed
it from glibc upstream.
Remove the include to avoid a compilation failure on ARM with glibc.
Signed-off-by: Olivier Fourdan <ofourdan@redhat.com>
Closes: https://gitlab.freedesktop.org/xorg/xserver/issues/840
commit ce9455b5ee389b100a9b7da76b79690d97211b7a
Author: Olivier Fourdan <ofourdan@redhat.com>
Date: Fri Jun 28 16:55:11 2019 +0200
xwayland: Update screen pixmap on output resize
Running Xwayland non-rootless and resizing the output would lead to a
crash while trying to update the larger areas of the root window.
Make sure we resize the backing pixmap according to the new output size
to avoid the crash.
Signed-off-by: Olivier Fourdan <ofourdan@redhat.com>
Closes: https://gitlab.freedesktop.org/xorg/xserver/issues/834
Reviewed-by: Michel Dänzer <michel.daenzer@amd.com>
commit a530b6e8923f2b9153a773c8618a1e2f41619288
Author: Adam Jackson <ajax@redhat.com>
Date: Tue Apr 30 18:01:27 2019 -0400
meson: Fix libshadow.so linkage
Don't link against fb, it's the driver's responsibility to load that
first. Underlinking like this is unpleasant but this matches what
autotools does.
Fixes: xorg/xserver#540
commit a8d9ebeb43583e8d8ef182ac15adbdce256d4867
Author: Matt Roper <matthew.d.roper@intel.com>
Date: Wed Jun 26 09:34:46 2019 -0700
dri2: Sync i965_pci_ids.h from mesa
Copied from Mesa with no modifications.
This update brings in a significant number of new platform ID's.
Syncs with mesa up to commit e334a595e ("intel/icl: Add new ICL
PCI-IDs").
Signed-off-by: Matt Roper <matthew.d.roper@intel.com>
commit 2f0dd1816d556eef8c4b691330d39f13e1ed93f0
Author: Michel Dänzer <michel.daenzer@amd.com>
Date: Wed Jul 3 11:53:56 2019 +0200
Revert "present/scmd: Check that the flip and screen pixmap pitches match"
This reverts commit ef91da2757050652c724f6e674e8b1acf5d0cb31.
I thought this couldn't work under any circumstances, but I was wrong,
and drivers are already checking for cases that really cannot work.
Fixes issue #839.
commit fabc4219622f3c0b41b1cb897c46e092377059e3
Author: Samuel Thibault <samuel.thibault@ens-lyon.org>
Date: Mon Jul 1 02:33:26 2019 +0200
Fix crash on XkbSetMap
Since group_info and width are used for the key actions allocations,
when modifying them we need to take care of reallocation key actions if
needed.
commit 8469bfead9515ab3644f1769a1ff51466ba8ffee
Author: Samuel Thibault <samuel.thibault@ens-lyon.org>
Date: Mon Jul 1 02:31:02 2019 +0200
Fix crash on XkbSetMap
Some devices may not have keyboard information.
Fixes #574
commit ff6b771eeea763c19d057e8741a2cadb37db9b68
Author: Jon Turney <jon.turney@dronecode.org.uk>
Date: Thu Mar 8 14:25:54 2018 +0000
hw/xwin: Improve data returned for RANDR queries
Set a linear gamma ramp. This avoids the xrandr command always warning
'Failed to get size of gamma for output default'
(perhaps we should be using GDI GetDeviceGammaRamp(), if possible?)
Make CRTC report non-zero physical dimensions initially
commit 2549ab2065ad293139d4e82e5d5a5ea13f7257c9
Author: Jon Turney <jon.turney@dronecode.org.uk>
Date: Fri Mar 9 14:16:01 2018 +0000
hw/xwin: Always keep RANDR fake mode information up to date
The rrGetInfo hook is not called for all RANDR requests (e.g.
RRGetOutputInfo), so we must always keep the fake mode information up to
date, rather than doing it lazily in the rrGetInfo hook)
Because we are so bad, most GTK+3 versions treat the output name 'default'
specially, and don't try to use RANDR with it. But versions 3.21.6 to
3.22.24, don't do this, and get badly confused by a CRTC with size 0x0.
See:
https://bugzilla.gnome.org/show_bug.cgi?id=771033
https://bugzilla.gnome.org/show_bug.cgi?id=780101
Future work: Rather than reporting a single fake CRTC with a mode matching
the entire virtual display, the fake CRTCs we report should match our
'pseudo-xinerama' monitors
commit b078e03410f5f2a004ab9732eb6e5ed24da3edcf
Author: Jon Turney <jon.turney@dronecode.org.uk>
Date: Wed Apr 19 14:50:38 2017 +0100
hw/xwin: Make QueryMonitor() slightly less insane
Make QueryMonitor() slightly less insane, making it return TRUE if the
specified monitor exists, rather than always returning TRUE (which we
are uselessly checking, and then also checking if the specified monitor
exists)
(Note that EnumDisplayMonitors() doesn't seem to have meaningful way to
return errors, see 5940580f)
Also: Spamming the long UseMsg() after "Invalid monitor number" isn't very
helpful.
Also: If we are exiting in ddxProcessArgument() due to an error in
options, use a non-zero exit status.
commit 8f7e4b56d2e0abd09526c7d0eeee15bfb754e557
Author: Jon Turney <jon.turney@dronecode.org.uk>
Date: Sun Oct 8 22:17:40 2017 +0100
hw/xwin: Fix transposed RaiseVolume and LowerVolume scan codes
commit bfcaaecc552c7a3d85f6309b8079eb8e6fda8779
Author: Colin Harrison <colin@xming.myzen.co.uk>
Date: Sat Jun 30 13:43:11 2018 +0100
hw/xwin: Add the Belgian (Comma) keyboard layout
commit 188f461463fcc60432f9d7a76ad69ec97631db5d
Author: Colin Harrison <colin@xming.myzen.co.uk>
Date: Thu Feb 22 13:18:42 2018 +0000
hw/xwin: Add Russian keyboard layout
commit e39dc0f5b7c88c9ba670383658846a1f658cbc47
Author: Adam Jackson <ajax@redhat.com>
Date: Thu Jun 20 12:15:31 2019 -0400
present: Require presentproto 1.2
The PresentOptionSuboptimal support code is not optional (once you've
enabled building Present at all), so require a protocol package version
that defines what we need.
Fixes: xorg/xserver#821
commit 9acff309434a8029bcce1b22530043459bb71791
Author: Adam Jackson <ajax@redhat.com>
Date: Wed Jun 19 14:23:56 2019 -0400
linux: Fix platform device PCI detection for complex bus topologies
Suppose you're in a Hyper-V guest and are trying to use PCI passthrough.
The ID_PATH that udev will construct for that looks something like
"acpi-VMBUS:00-pci-b8c8:00:00.0", and obviously looking for "pci-" in
the first four characters of that is going to not work.
Instead, strstr. I suppose it's possible you could have _multiple_ PCI
buses in the path, in which case you'd want strrstr, if that were a
thing.
commit b3f3d65ed302baf78befe45eed458e666e1ff143
Author: Olivier Fourdan <ofourdan@redhat.com>
Date: Wed Jun 19 09:19:24 2019 +0200
xwayland: Add "-listenfd" option
Using the existing command line option "-listen" for passing file
descriptors between the Wayland compositor and Xwayland is misleading,
Xwayland should add is own command line option for that specific use.
As XWayland is spawned by the Wayland compositor, we cannot just change
the option, as that would break all existing Wayland compositors using
Xwayland, so we add a new options "-listenfd" and mark the previous one
as deprecated and log a warning, but it still works for backward
compatibility.
Signed-off-by: Olivier Fourdan <ofourdan@redhat.com>
https://gitlab.freedesktop.org/xorg/xserver/merge_requests/214
commit 4a287cc2b6d849c29b43af07d93fa0048d8d6e90
Author: Olivier Fourdan <ofourdan@redhat.com>
Date: Tue Jun 18 10:41:02 2019 +0200
xwayland: Allow for regular transport types for listen
Xwayland uses the command line option “-listen” to pass file descriptors
from the Wayland compositor.
That breaks the traditional, documented behavior of the “-listen”
command line option which is to enable a transport type.
Checks if the given option starts with a digit, otherwise treat it as a
regular transport type.
Closes: https://gitlab.freedesktop.org/xorg/xserver/issues/817
Suggested-by: Rodrigo Exterckötter Tjäder
Signed-off-by: Olivier Fourdan <ofourdan@redhat.com>
commit 0dc0cef4959dfb16d8334f235150733e634e2ba9
Author: Adam Jackson <ajax@redhat.com>
Date: Tue Jun 18 14:52:04 2019 -0400
xwayland-glx: Fix GLX visual mask setup
a2rgb10 configs would end up with channel masks corresponding to
argb8888. This would confuse the GLX core code into matching an a2rgb10
config to the root window visual, and that would make things look wrong
and bad.
Fix this by handling more cases. We're still not fully general here, and
this could still be wrong on big-endian. The XXX comment about doing
something less ugly still applies, ideally we would get this information
out of EGL instead of making lucky guesses. Still, better than it was.
Fixes: xorg/xserver#824
commit 2afee831a439add6cca5b7fa8c76a9de4326b2b7
Author: Jon Turney <jon.turney@dronecode.org.uk>
Date: Thu Jan 5 13:17:59 2017 +0000
hw/xwin: Add an option to use alpha channel in multiwindow mode
Add an option to turn on the use of the X window's alpha channel in
multiwindow mode, i.e. this uses the X window's alpha channel for
compositing into the native desktop.
This works on W7/Vista (using DwmEnableBlurBehindWindow()), and Windows
10 (using the undocumented SetWindowCompositionAttribute()), but not on
Windows 8/8.1
-compositewm must be enabled for this to be useful, as we only have a
pixmap with an alpha channel for the X window in that case. The
framebuffer/root window doesn't have one (unless perhaps you are using
the rootless extension, maybe...).
v2:
Update meson.build
Future work:
A window property to control use of alpha?
Option to turn off blur on W7/Vista
Implement _NET_WM_WINDOW_OPACITY
commit 2e1bc743734cc1e1043c8f2c9497a5a172507bc9
Author: Jon Turney <jon.turney@dronecode.org.uk>
Date: Tue Dec 1 19:33:38 2015 +0000
hw/xwin: Set convenience variables for WM_CREATE as well
Set convenience variables in winTopLevelWindowProc() for WM_CREATE as
well.
commit f67918353a14dad8aa75c965e036d106e7d2d1a4
Author: Jon Turney <jon.turney@dronecode.org.uk>
Date: Sat Nov 7 19:44:09 2015 +0000
hw/xwin: Improve performance of -compositewm
I think that a major cost in the current implementation is doing a
CreateDIBSection()/DestroyObject() on every refresh. So provide our own
CreatePixmap() instead, which does the CreateDIBSection(), once.
Testcase: glxgears or foobillard with direct swrast
Testcase: scrolling in a full-screen xterm
v2:
Fix handling of RENDER Scratch Pixmaps
(A problem easily shown with gitk or emacs)
v3:
Note that we don't own screen pixmap to release in DestroyPixmap
Log if unimplemented slow-path ever gets hit
commit 6865fe71477206d989f982235fc32be4ff164ccd
Author: Jon Turney <jon.turney@dronecode.org.uk>
Date: Mon Aug 10 20:16:16 2015 +0100
hw/xwin: Avoid artefacts when resizing a window
Fill the area outside the current window size with black, rather than
leaking framebuffer contents or leaving it undrawn.
commit ebcea16e71cd9c037351f2dc4527ca696346c8a6
Author: Jon Turney <jon.turney@dronecode.org.uk>
Date: Mon Aug 3 16:47:38 2015 +0100
hw/xwin: A simpleminded attempt at composition
Rather than drawing the window contents from the shadow framebuffer, use
Composite extension redirection to cause the server to maintain a bitmap
image of each top-level X window, and draw the window contents from
that, so that window contents which are occluded in the framebuffer show
correctly in the task bar and task switcher previews.
v2:
Fix incorrect use of memset() found by gcc5
hw/xwin/winshadgdi.c: In function ‘winBltExposedWindowRegionShadowGDI’:
hw/xwin/winshadgdi.c:861:9: warning: ‘memset’ used with constant zero length parameter; this could be due to transposed parameters [-Wmemset-transposed-args]
v3:
Turn on -compositewm by default
v4:
Ignore -swcursor if -compositewm
-swcursor is not compatible with -compositewm (because the window
contents are drawn from an off-screen pixmap, not from the screen
pixmap, where the software cursor will be drawn).
v5:
Update meson.build also
Add -compositewm option to help output
Update CI to install prerequisites
commit adebc376b9fbda53d234a27f11eea9a0b945b50e
Author: Jon Turney <jon.turney@dronecode.org.uk>
Date: Mon Aug 3 15:59:40 2015 +0100
hw/xwin: Push multiwindow wndproc WM_PAINT down into drawing engine
Push the multiwindow wndproc WM_PAINT handling down into the drawing
engine. Only the GDI engine is supported in multiwindow mode currently,
so we only need to do this in the GDI engine.
commit 065f73353bfa5667e0fb4f42e338978b40e86652
Author: Jon Turney <jon.turney@dronecode.org.uk>
Date: Mon Aug 3 11:39:36 2015 +0100
hw/xwin: Align winBltExposedRegionsShadowGDI with winTopLevelWindowProc's WM_PAINT
Make winBltExposedRegionsShadowGDI() do the same stuff that
winTopLevelWindowProc()'s WM_PAINT handler does.
Note that winBltExposedRegionsShadowGDI() is currently used 1) in
windowed mode when the GDI engine is selected, and 2) in multiwindow
mode when "Hide Root Window" is off.
commit f4cdbf640b6440df4af784ca35e1b1340965cc10
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Wed May 29 16:19:55 2019 +1000
Xi: return AlreadyGrabbed for key grabs > 255
We can't have high keycodes because everything in XKB relies on 8 bits. XI2's
API allows for 32-bit keycodes so we have to take those but nothing in the
server is really ready for this. The effect of this right now is that any high
keycode grab is clipped to 255 and thus ends up grabbing a different key
instead.
https://bugzilla.redhat.com/show_bug.cgi?id=1697804
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit dea4a74621294391ce5901bb3339e1b8e7151efc
Author: Carlos Garnacho <carlosg@gnome.org>
Date: Wed May 22 17:51:04 2019 +0200
xwayland: Reset scheduled frames after hiding tablet cursor
Hiding the tablet tool cursor results in it being hidden forever after.
This is due to the stale frame callback that will neither be disposed
or replaced. This can be reproduced in krita (X11) as the pointer
cursor is hidden while over the canvas.
Clearing the frame callback ensures the correct behavior in future
xwl_tablet_tool_set_cursor() calls (i.e. a new cursor surface being
displayed, and a new frame callback created), and is 1:1
with xwl_seat_set_cursor() for pointers.
Signed-off-by: Carlos Garnacho <carlosg@gnome.org>
commit 26fe29f4fa53cbb7d51892e2cf397c084093812f
Author: Olivier Fourdan <ofourdan@redhat.com>
Date: Fri Apr 26 13:37:09 2019 +0200
glamor: Make pixmap exportable from `gbm_bo_from_pixmap()`
If a pixmap is not exportable, `glamor_gbm_bo_from_pixmap()` would fail
and the modesettings driver would consequently fail to do its page flip,
which both prevents Present from working and also fill up the logs with
error messages such as:
(EE) modeset(0): Failed to get GBM bo for flip to new front.
(EE) modeset(0): present flip failed
Refactor the code so that `glamor_gbm_bo_from_pixmap()` takes care of
making the pixmap exportable.
Signed-off-by: Olivier Fourdan <ofourdan@redhat.com>
Signed-off-by: Yuxuan Shui yshui@hadean.com
See-also: https://gitlab.freedesktop.org/xorg/xserver/merge_requests/131
Closes: https://gitlab.freedesktop.org/xorg/xserver/issues/68
Fixes: 86b2d8740a "glamor: Reallocate pixmap storage without modifiers
if necessary"
commit 48f4ab750955106cd650bb5d3fb1c44d7696aafa
Author: Olivier Fourdan <ofourdan@redhat.com>
Date: Tue Mar 12 17:25:41 2019 +0100
xwayland: check `glamor_set_pixmap_texture()` status
With `glamor_set_pixmap_texture()` returning its status, remove the hack
and use the return value.
Signed-off-by: Olivier Fourdan <ofourdan@redhat.com>
commit 9e37e41fa78a33b95fd78e92b74b961086ab712b
Author: Olivier Fourdan <ofourdan@redhat.com>
Date: Tue Mar 12 17:15:10 2019 +0100
glamor: return status from `glamor_set_pixmap_texture()`
Chnage the API for `glamor_set_pixmap_texture()` to return a status,
so that the caller can know whether it succeeded or not.
Signed-off-by: Olivier Fourdan <ofourdan@redhat.com>
commit fc6380a11be4c6202ed72f241dd9ee8c7c24671d
Author: Olivier Fourdan <ofourdan@redhat.com>
Date: Tue Mar 12 15:38:03 2019 +0100
xwayland: Check status in GBM pixmap creation
The current code in `xwl_glamor_gbm_create_pixmap_for_bo()` may fail in
several cases that are not checked for:
- `eglCreateImageKHR()` may have failed to create the image,
- `glEGLImageTargetTexture2DOES()` may fail and set an error,
- `glamor_set_pixmap_texture()` may fail for very large pixmaps
because the corresponding FBO could not be created.
Trying to upload content to a pixmap with no texture will crash Mesa,
glamor and Xwayland, e.g.:
XXX fail to create fbo.
(EE)
(EE) Backtrace:
(EE) 0: Xwayland (OsSigHandler+0x29)
(EE) 1: libpthread.so.0 (funlockfile+0x50)
(EE) 2: libc.so.6 (__memmove_avx_unaligned_erms+0x215)
(EE) 3: dri/i965_dri.so (_mesa_format_convert+0xab3)
(EE) 4: dri/i965_dri.so (_mesa_texstore+0x205)
(EE) 5: dri/i965_dri.so (store_texsubimage+0x28c)
(EE) 6: dri/i965_dri.so (intel_upload_tex+0x13b)
(EE) 7: dri/i965_dri.so (texture_sub_image+0x134)
(EE) 8: dri/i965_dri.so (texsubimage_err+0x150)
(EE) 9: dri/i965_dri.so (_mesa_TexSubImage2D+0x48)
(EE) 10: Xwayland (glamor_upload_boxes+0x246)
(EE) 11: Xwayland (glamor_copy+0x4d1)
(EE) 12: Xwayland (miCopyRegion+0x96)
(EE) 13: Xwayland (miDoCopy+0x43c)
(EE) 14: Xwayland (glamor_copy_area+0x24)
(EE) 15: Xwayland (damageCopyArea+0xba)
(EE) 16: Xwayland (compCopyWindow+0x31c)
(EE) 17: Xwayland (damageCopyWindow+0xd3)
(EE) 18: Xwayland (miResizeWindow+0x7b7)
(EE) 19: Xwayland (compResizeWindow+0x3a)
(EE) 20: Xwayland (ConfigureWindow+0xa96)
(EE) 21: Xwayland (ProcConfigureWindow+0x7d)
(EE) 22: Xwayland (Dispatch+0x320)
(EE) 23: Xwayland (dix_main+0x366)
(EE) 24: libc.so.6 (__libc_start_main+0xf3)
(EE) 25: Xwayland (_start+0x2e)
(EE)
Fatal server error:
(EE) Caught signal 11 (Segmentation fault). Server aborting
(EE)
Check for the possible cases of failure above and fallback to the
regular glamor pixmap creation when an error is detected.
Signed-off-by: Olivier Fourdan <ofourdan@redhat.com>
Closes: https://gitlab.freedesktop.org/xorg/xserver/issues/661
commit 766bf01b21306ec6bcf5ca884c0af15bdcde25f6
Author: Adam Jackson <ajax@redhat.com>
Date: Thu May 16 15:48:14 2019 -0400
glamor: Fix more fallback paths with non-GXcopy rop with GLES
Desktop GL can handle arbitrary rops here, GLES can't. The switch
statement attempts to optimize some cases that GLES can still handle if
we precompute the right pixel value, but we were then throwing that
pixel value away and using gc->fgPixel anyway. Fix this, and now
xts-render passes against glamor+gles.
commit 8469241592b94b002a975274a596ca0dcdd9563f
Author: Adam Jackson <ajax@redhat.com>
Date: Wed May 8 14:09:00 2019 -0400
xwayland: Add EGL-backed GLX provider
Without this we're using driswrast to set up GLX visuals. This is
unfortunate because llvmpipe does not expose multisample configs, so
various apps that expect them will fail. With this we just query the
capabilities of the EGL that's backing glamor, and reflect that to the
GLX clients. This also paves the way for xserver to stop being a DRI
driver loader, which is nice.
Fixes: xorg/xserver#640
Fixes: xorg/xserver#643
Fixes: https://bugs.freedesktop.org/show_bug.cgi?id=98272
Reviewed-by: Olivier Fourdan <ofourdan@redhat.com>
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit b4231d69028adc8123801a7552b40a15ea928d1b
Author: Aaron Plattner <aplattner@nvidia.com>
Date: Tue May 21 10:50:42 2019 -0700
GLX: Set GlxServerExports::{major,minor}Version
Commit 56c0a71fdd94a008e5d746261f70a713c4767f93 incremented the
GLXSERVER_VENDOR_ABI_MINOR_VERSION define, but this define was not actually
being used to set glxServer.minorVersion.
Update the initializer for glxServer to use the correct version numbers.
Signed-off-by: Aaron Plattner <aplattner@nvidia.com>
commit 0a07446318f248b65fcbc8ab8a73ead51153f09e
Author: Olivier Fourdan <ofourdan@redhat.com>
Date: Thu May 9 10:36:19 2019 +0200
xwayland: Avoid a crash on pointer enter with a grab
On pointer enter notification, Xwayland checks for an existing pointer
warp with a `NULL` sprite.
In turn, `xwl_pointer_warp_emulator_maybe_lock()` checks for an existing
grab and the destination window using `XYToWindow()` which does not
check for the actual sprite not being `NULL`.
So, in some cases, when the pointer enters the surface and there is an
existing X11 grab which is not an ownerEvents grab, Xwayland would crash
trying to dereference the `NULL` sprite pointer:
#0 __GI_raise ()
#1 __GI_abort () at abort.c:79
#2 OsAbort () at utils.c:1351
#3 AbortServer () at log.c:879
#4 FatalError () at log.c:1017
#5 OsSigHandler () at osinit.c:156
#6 OsSigHandler () at osinit.c:110
#7 <signal handler called>
#8 XYToWindow (pSprite=0x0, x=0, y=0) at events.c:2880
#9 xwl_pointer_warp_emulator_maybe_lock () at xwayland-input.c:2673
#10 pointer_handle_enter () at xwayland-input.c:434
Avoid the crash by simply checking for the sprite being not `NULL` in
`xwl_pointer_warp_emulator_maybe_lock()`
Signed-off-by: Olivier Fourdan <ofourdan@redhat.com>
Bugzilla: https://bugzilla.redhat.com/1708119
commit 965eda947d4c847c6e520317b57024b4586507ec
Author: Jon Turney <jon.turney@dronecode.org.uk>
Date: Thu Apr 25 23:11:08 2019 +0100
mi: Provide ffs when compiling using MinGW
I don't know how I feel about the promise made in 2e7f790b :)
commit a838c840a3f8c55157615f072b9a3c3a4b476b37
Author: Jon Turney <jon.turney@dronecode.org.uk>
Date: Thu Apr 25 22:44:49 2019 +0100
os: Ensure sigset_t is provided when compiling for MinGW
Only _sigset_t is defined by MinGW's signal.h
commit 7b4b030df8f9c994f3dc60cf85e74d234464af28
Author: Jon Turney <jon.turney@dronecode.org.uk>
Date: Thu Jul 28 14:46:15 2016 +0100
configure: Check for sigprocmask
MinGW defines SIG_BLOCK, but doesn't have signal masks, so rather than
checking for SIG_BLOCK, add a configure check for sigprocmask.
v2:
Also add check to meson.build
commit 6c5d048095379a85f1862429b9049edc1c82e167
Author: Jon Turney <jon.turney@dronecode.org.uk>
Date: Thu Jul 28 14:09:51 2016 +0100
os: Fix build of xserver_poll.c on MinGW
Include winsock.h for definition of fd_set type and select()
Future work: Maybe this also needs some error checking for fd > FD_SETSIZE?
commit 246b729df87e94e405a8b257f34a22fa2719d30c
Author: Jon Turney <jon.turney@dronecode.org.uk>
Date: Thu Jul 28 14:26:38 2016 +0100
configure: Force --disable-input-thread for MinGW
I don't think an input thread can ever be useful on Windows.
There is a pthread emulation, so having the thread itself isn't much of
a problem.
However, there is no device to wait on for Windows events, and even if
we were to replace select() with WFMO, Windows wants to send events for
a window to the thread which created that window.
So, disable input thread by default for MinGW
v2:
Also add similar to meson.build
commit 29a8baa031a87ef44d1e5320ecec5015d26fd385
Merge: 2aec5c3c81 56c0a71fdd
Author: Aaron Plattner <aplattner@nvidia.com>
Date: Fri May 17 08:39:50 2019 -0700
Merge commit 'refs/merge-requests/194/head' of gitlab.freedesktop.org:xorg/xserver
commit 56c0a71fdd94a008e5d746261f70a713c4767f93
Author: Kyle Brenneman <kbrenneman@nvidia.com>
Date: Thu May 2 07:17:21 2019 -0600
GLX: Add a function to change a clients vendor list.
Add a new function, GlxServerExports::setClientScreenVendor, which will change
the vendor that handles GLX requests for a screen, but only for requests from
a specific client.
v2: Increment the GLXVND minor version number.
v3: Note the GLXVND version requirement for setClientScreenVendor.
Signed-off-by: Aaron Plattner <aplattner@nvidia.com>
Reviewed-by: Aaron Plattner <aplattner@nvidia.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
commit 8b67ec7cc6fda243480a5a8ca118b66242f3eb2c
Author: Kyle Brenneman <kbrenneman@nvidia.com>
Date: Wed May 8 08:44:54 2019 -0600
GLX: Use the sending client for looking up XID's
When GlxGetXIDMap looks up an unknown XID, it will now look up a vendor based
on the screen number for the XID and the client that sent the current request.
In GlxGetXIDMap, if the XID is for a regular X window, then it won't be in the
(XID -> vendor) mapping, so we have to look up a vendor by screen number.
With this change, GlxGetXIDMap will use the (screen -> vendor) map for
whichever client sent the current request, instead of using the global
(screen -> vendor) map.
Since GlxGetXIDMap doesn't take a ClientPtr argument, GlxDispatchRequest will
store the client for the current request in a global variable. That way, the
ABI for GLXVND doesn't need to change.
v2: Fix an error check in GlxDispatchRequest.
Signed-off-by: Aaron Plattner <aplattner@nvidia.com>
Reviewed-by: Aaron Plattner <aplattner@nvidia.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
commit 37a36a6b5b887d5c5a17a6931ceba8ad5d1bb6d5
Author: Kyle Brenneman <kbrenneman@nvidia.com>
Date: Thu Oct 19 15:14:51 2017 -0600
GLX: Add a per-client vendor mapping.
Each client now has its own (screen, vendor) mapping.
Currently, it's just a copy of the global mapping, but later changes will allow
it to change.
Signed-off-by: Aaron Plattner <aplattner@nvidia.com>
Reviewed-by: Aaron Plattner <aplattner@nvidia.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
commit 2aec5c3c812ffe4a85b5e62452b244819a812dd6
Author: Adam Jackson <ajax@redhat.com>
Date: Tue May 14 12:39:23 2019 -0400
glx: Fix potential crashes in glXWait{GL,X}
glxc->drawPriv will be NULL if the context is direct, or if it is
current but without a bound drawable. Mesa's libGL won't normally emit
protocol for direct contexts for these calls, but a malign client could
still crash the server.
commit a0f738a67327ca1315bacdf543c28cc3046989dc
Author: brian <bphaslett@users.noreply.github.com>
Date: Thu May 2 16:25:50 2019 -0500
Fixed ioperm calls in hwEnableIO
commit bb46e785405891775a30636a647e40a7dc4d1ca7
Author: Topi Miettinen <toiwoton@gmail.com>
Date: Wed May 1 18:07:03 2019 +0300
os: add support for systemd notification
It can take some time for Xorg to start. If Xorg runs as a systemd
service and other services are based on it, they have no way to
determine when Xorg is really ready to accept requests. Let's use
sd_notify() provided by libsystemd to signal systemd for readiness.
If Xorg has not been started as a systemd service, this won't do
anything.
Signed-off-by: Topi Miettinen <toiwoton@gmail.com>
commit 9d25408a59d6273f1c4c994de9cc53f488a8ec3c
Author: Adam Richter <adamrichter4@gmail.com>
Date: Thu May 2 15:02:36 2019 -0700
assert(a && b) --> assert(a); assert(b)
Separate each statement of the form "assert(a && b);" into "assert(a);"
and "assert(b);" for more precise diagnostics, except for this clever
use in drmmode_display.c where it was used to pass a hint to developers:
assert(num_infos <= 32 && "update return type");
commit dd1aebccf2e1722ac10fb73ed438251785283b8d
Author: Jon Turney <jon.turney@dronecode.org.uk>
Date: Sat Apr 20 13:50:57 2019 +0100
travis: Suppress uninteresting warnings on OSX
Suppress uninteresting warnings on OSX that we are drowning in, turned
on by default in meson.
commit f0e22a76c93c98d67dbd5c966812b2901de5ed49
Author: Jon Turney <jon.turney@dronecode.org.uk>
Date: Fri Apr 19 15:37:22 2019 +0100
travis: Add OSX meson build to matrix
Unfortunately, a 'brew update' is currently needed to get the meson >=
0.46.0 required by xserver.
commit 0bdfa5bc0ab050ce74c2289178f2f89790e2c8ef
Author: Jon Turney <jon.turney@dronecode.org.uk>
Date: Sat Apr 20 01:24:21 2019 +0100
travis: Don't produce fat binaries on OSX
Trying to build fat binaries for multiple arches tickles a bug [1] in
the framework detector in meson 0.50. Workaround this by not bothering
building for x86, which is probably no great loss :S
https://github.com/mesonbuild/meson/issues/5290
commit 655b1eb32e3f7f9ba587e878a691fbc9195e81f5
Author: Jon Turney <jon.turney@dronecode.org.uk>
Date: Thu Apr 18 17:06:41 2019 +0100
meson: Convert xquartz from autotools
Differences from autotools:
* Autotools defined NO_ALLOCA for OSX builds. I don't think we need
this anymore as Xalloc.h is no longer used anywhere in the xserver.
* X11.bin is linked with -u,miDCInitialize, and then libserver_mi
provided to satisfy (just) that. It's been that way since the commit
which added it. We can't write the equivalent in meson due to linker
argument ordering issues, but do we really need to?
* An explicit -Dsecure-rpc=false is required for OSX, since in meson we
don't do the checks that XTRANS_SECURE_RPC_FLAGS did for the existence
of the specific RPC functions required.
commit e5f4c7c80b3f15b1941c530e58fbded0fd06a97e
Author: Jon Turney <jon.turney@dronecode.org.uk>
Date: Fri Apr 19 14:03:58 2019 +0100
xquartz: Fix a typo in man page substitution
The typo fixed in d69460159 was still present for this setting when
added in ac439842.
meson warns that there is no substitution with this name.
commit ecf62b7ba6e7eba1a3f3a50d46eaf9f4f11550c4
Author: Jon Turney <jon.turney@dronecode.org.uk>
Date: Fri Apr 19 14:01:48 2019 +0100
meson: Build rootless extension
commit b4ed20c4f118031305f6ce76dda4e325950b2958
Author: Jon Turney <jon.turney@dronecode.org.uk>
Date: Sat Apr 20 12:45:11 2019 +0100
Promote file containing date & time build was configured to top-level
Promote the generated file containing the date & time build was
configured to top-level.
Rename it from xf86Build.h to buildDateTIme.h.
Use it as well in XQuartz, stringize BUILD_DATE when needed.
commit 71cff63c06a6b494dc8921270535f33fb78bd32b
Author: Adam Richter <adamrichter4@gmail.com>
Date: Wed May 1 15:22:15 2019 -0700
hw/dmx/glxProxy/glxcmds.c CreateContext(): free glxc->real_ids and glxc in a couple of error branches, per complaints from cppcheck.
commit b6eb8cf03f5850d13ec21101ec1783a444aefcab
Author: Adam Richter <adamrichter4@gmail.com>
Date: Wed May 1 15:22:02 2019 -0700
hw/xfree86/os-support/linux/lnx_agp.c xf86GetAGPInfo(): free(info) in an error path, caught by cppcheck.
commit 99904a3a7b10f8a8314e7ab6b8c4af41cb445693
Author: Adam Richter <adamrichter4@gmail.com>
Date: Wed May 1 15:21:48 2019 -0700
hw/xwin/glx/indirect.c glxWinScreenProbe(): Add free(screen) that was missing from an error path. Caught by cppcheck.
commit 007d812a832cf32b02542bbae13a3997e655171a
Author: Adam Jackson <ajax@redhat.com>
Date: Tue Apr 30 13:40:43 2019 -0400
glx: Fix GLX_CONTEXT_RELEASE_BEHAVIOR_ARB handling
None of this was getting compiled because we hadn't defined the macro
(and aren't getting them from <GL/glxext.h> because reasons). Fix that.
Fixes: xorg/xserver#684
commit a2302de6feb43dd10b159661d5fe7d2036c6c020
Author: Jon Turney <jon.turney@dronecode.org.uk>
Date: Thu Oct 13 14:20:14 2016 +0100
hw/xwin: Remove mwextwm mode
This has always been described as 'experimental'
We don't think this has any users: This mode has been disabled in Cygwin
packages since March 2016. We've never provided the xwinwm WM for x86_64
Cygwin. No one has even asked where the option has gone.
This leaves XQuartz as the only user of the rootless extension.
Remove --enable-windowswm configure option
Remove multiwindowextwm stuff from Makefiles
Remove -mwextwm option
Remove -mwextwm from man-page and help
Un-ifdef XWIN_MULTIWINDOWEXTWM
v2:
Remove rootless include paths
Remove windowswmproto from meson.build
commit 504468d2cf56c6588342249c4625a0bfadf0751d
Author: Jon Turney <jon.turney@dronecode.org.uk>
Date: Fri Apr 26 19:46:05 2019 +0100
meson: Don't use strndup() unless it's prototyped
A workaround for https://github.com/mesonbuild/meson/issues/3672
MinGW-w64 gcc has a built-in strndup, but it's not in the C library and
MinGW-w64 headers don't prototype it.
Don't try to use it, as that will cause an undefined reference if gcc
decides that an out-of-line call is appropriate.
commit d3a528c91ec77b29d4d70091f5eb6939919a19ab
Author: Jon Turney <jon.turney@dronecode.org.uk>
Date: Thu Apr 25 23:21:46 2019 +0100
Remove unneeded include of dix.h from strcasestr.c
In the meson build, functions to make up for the shortcomings of libc
are compiled into a separate library. We don't bother making the pixman
headers available (reasonably enough) to this compilation, but they are
required indirectly by dix.h. Just remove this unneeded include.
commit fd52110ec44b97359c2d75bb54047e6de10ed856
Author: Jon Turney <jon.turney@dronecode.org.uk>
Date: Fri Apr 26 01:09:25 2019 +0100
meson: Don't try to build tests on Windows
Most of these could be made to work, but would need to be ported off
using fork and poll...
commit 50b8670fdf7ab9195617145c229d8fae8519f5a9
Author: Jon Turney <jon.turney@dronecode.org.uk>
Date: Fri Apr 26 01:00:28 2019 +0100
meson: Require clock_gettime() as well for MONOTONIC_CLOCK
As configure.ac, require that clock_gettime() exists as well to use
MONOTONIC_CLOCK (MinGW provides the define, but not the function)
commit 92a52611f6ee2777cb11d5125c04a983b9a662d1
Author: Jon Turney <jon.turney@dronecode.org.uk>
Date: Fri Apr 26 00:46:09 2019 +0100
meson: Link with ws2_32 for socket functions on Windows
commit d21224cd150e28c2868c8d194e68fe4474cdce1b
Author: Jon Turney <jon.turney@dronecode.org.uk>
Date: Fri Apr 26 00:32:29 2019 +0100
meson: Don't set UNIXCONN on Windows
As XTRANS_CONNECTION_FLAGS did, don't try to build unix socket support
on Windows.
commit 93a1cdcc78bc909e25a224b76ae8f6a90322d0ba
Author: Jon Turney <jon.turney@dronecode.org.uk>
Date: Thu Apr 25 14:53:38 2019 +0100
meson: Fix hw/xwin for -Dglx=false
hw/xwin/meson.build:140:0: ERROR: Unknown variable "xwin_windowsdri".
hw/xwin/meson.build:141:0: ERROR: Unknown variable "xwin_glx".
commit 331850ce6f0c48a1cfc489da2a27ca0220997a2f
Author: Jon Turney <jon.turney@dronecode.org.uk>
Date: Thu Apr 25 14:39:58 2019 +0100
meson: Fix value of libglxvnd in -Dglx=false build
hw/vfb/meson.build:7:0: ERROR: '' is not a target.
commit c2feeca1b008fb01b2128daef2dc361dfb193a41
Author: Jon Turney <jon.turney@dronecode.org.uk>
Date: Sun Apr 28 21:56:20 2019 +0100
meson: Absence of dri.pc is an error if building with GLX
Currently, this can error if dri.pc isn't found, as we can't then get
the value of pkgconfig variable from it:
include/meson.build:199:10: ERROR: 'dri' is not a pkgconfig dependency
I think we need DRI_DRIVER_PATH (only) when building GLX, even if dri2/3
isn't enabled, so we know where to load swrast_dri.so from.
(For autotools, configure.ac directly calls `pkg-config
--variable=dridriverdir dri`, the backticks swallowing any error,
causing the value of this define to be empty if dri.pc isn't present)
commit 1f5742d27187fabba0c556b50ebfcd9fddfdcf2b
Author: Jon Turney <jon.turney@dronecode.org.uk>
Date: Mon Dec 17 12:01:59 2018 +0000
meson: Fix building unit tests when protocol headers aren't in default include path
commit f013979507da96377fad0e58b0699d9de051bb39
Author: Jon Turney <jon.turney@dronecode.org.uk>
Date: Thu Apr 18 11:37:32 2019 +0100
xquartz: Add stub ddxInputThread()
Omitted from 4ad21c32
commit 836f93de99b35050d78d61d3654f7c5655184144
Author: Fabrice Fontaine <fontaine.fabrice@gmail.com>
Date: Fri Apr 19 10:19:50 2019 +0200
hw/xwayland/Makefile.am: fix build without glx
Commit d8ec33fe0542141aed1d9016d2ecaf52da944b4b added libglxvnd.la to
Xwayland_LDFLAGS but GLX can be disabled through --disable-glx.
In this case, build fails on:
make[3]: *** No rule to make target '../../glx/libglxvnd.la', needed by 'Xwayland'. Stop.
make[3]: *** Waiting for unfinished jobs....
Fixes:
- http://autobuild.buildroot.org/results/397f8098c57fc6c88aa12dc8d35ebb1b933d52ef
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
commit 0854732d55a76cdb584306e8e653c2bcd292a7cb
Author: Diego Viola <diego.viola@gmail.com>
Date: Fri Apr 19 22:13:46 2019 -0300
ephyr: fix typo: rquires -> requires
Signed-off-by: Diego Viola <diego.viola@gmail.com>
commit 9c7ebf259f49f5e63906f572a1101747ac023b72
Author: Jon Turney <jon.turney@dronecode.org.uk>
Date: Sun Sep 17 14:55:04 2017 +0100
appveyor: Use ccache
Reduces i686 cygwin no-change build time from ~7 minutes to ~2.5 minutes
commit 16d851375994332844fd434ed91fc6c0c24f8983
Author: Jon Turney <jon.turney@dronecode.org.uk>
Date: Thu Apr 18 12:44:40 2019 +0100
appveyor: Drop cleaning of packaged libtool .la files
Not needed as meson doesn't use libtool. I think they've all been
rebuilt now, in any case...
commit f3e6002d79aa51633ef06e34c2b13553ae008218
Author: Jon Turney <jon.turney@dronecode.org.uk>
Date: Thu Apr 18 12:01:54 2019 +0100
appveyor: Drop trying to preserve build artefacts
We stopped staging them in 1519475a, so this did nothing.
commit 883530835d463124fcc9bc6143ef139819f6c981
Author: Jon Turney <jon.turney@dronecode.org.uk>
Date: Thu Apr 18 12:07:34 2019 +0100
appveyor: Drop installing unnecessary packages
Drop installing packages which were used by the autotools build (or
maybe even monolithic build!) but are no longer required by the meson
build
Also, alphabetically sort within tools, protocol headers, devel
libraries, miscellaneous groups to match [1]
[1] https://x.cygwin.com/docs/cg/prog-build-prerequisites.html
Also, update to require xkbcomp-devel, split from xkbcomp
commit 6370cf026ae0d752b0f28d4a25fd22c60fea26f0
Author: Jon Turney <jon.turney@dronecode.org.uk>
Date: Wed Aug 8 17:29:55 2018 +0100
appveyor: Reformat an absurdly long line in .appveyor.yml
Using YAML line-folding doesn't seem possible, as setup doesn't tolerate
spaces between package names, so instead drop some unneeded double quotes,
double quote the whole thing and escape newlines
commit 7f962c70b6d9c346477f23f6c15211e749110078
Author: Alex Goins <agoins@nvidia.com>
Date: Wed Apr 10 13:48:02 2019 -0500
xsync: Add resource inside of SyncCreate, export SyncCreate
As shown by DRI3 adding the SyncCreateFenceFromFD() function, extensions may
want to create a fence, then initialize it in their own way. This currently
can't be done without adding a function directly to Xext/sync.c due to the fact
that the RTFence resource type is private and there is no external interface to
add to it.
To facilitate other X extensions creating fences and initializing them, this
change exports SyncCreate() and adds the resource directly within it. Callers no
longer need to call AddResource() after SyncCreate(), they only need to
initialize the SyncObject.
To prevent FreeFence() and FreeCounter() from segfaulting if the call to
AddResource() fails before the sync object is initialized, this adds a new
'initialized' parameter to SyncObject that, when FALSE, causes FreeFence() and
FreeCounter() to skip de-initialization and simply free the object.
Initialization after adding the resource shouldn't otherwise be a problem due to
the single-threaded nature of X.
Signed-off-by: Alex Goins <agoins@nvidia.com>
Reviewed-by: James Jones <jajones@nvidia.com>
Signed-off-by: Aaron Plattner <aplattner@nvidia.com>
commit 8702c938b33b9ec180d64754eb922515c7c4a98b
Author: Eric Anholt <eric@anholt.net>
Date: Tue Mar 26 15:10:49 2019 -0700
glamor: Introduce a central place for our pixmap format/type handling.
We had various helper functions trying to come up with the
internalformat/format/type/render formats for pixmaps, and it's much
nicer to just detect what those should be once at startup. This gives
us a chance to do the right thing for GLES.
It also, notably, fixes our format/type for depth 15 and 16 setup for
desktop GL, so that we actually allocate 16bpp (GL_RGB/565) on most
drivers instead of 32bpp (GL_RGB/UBYTE).
GLES still has regressions over desktop (2 regressions in llvmpipe
XTS, many in rendercheck), but I think this is a good baseline.
Signed-off-by: Eric Anholt <eric@anholt.net>
commit c94da112a77bfc8c6b45ffe31c04e6b7931a3c9a
Author: Eric Anholt <eric@anholt.net>
Date: Tue Mar 26 16:57:24 2019 -0700
glamor: Plumb the pixmap through fbo creation instead of a "format"
For GLES, we're going to need a lot more logic for picking the
iformat/format/type of texture setup, so we'll want the pixmap's depth
and is_cbcr flag.
Signed-off-by: Eric Anholt <eric@anholt.net>
commit 34485be2560ea6f96a849b5d05edb1de28caf2f3
Author: Eric Anholt <eric@anholt.net>
Date: Tue Mar 26 15:58:59 2019 -0700
glamor: Stop trying to store the pixmap's "format" in glamor_pixmap_fbo.
"format" is a bit of a confused term (internalformat vs GL format),
and all we really needed was "is this GL_RED?"
Signed-off-by: Eric Anholt <eric@anholt.net>
commit 1b2e224d7dca9d6d86d6150ba0a5ddf0abee1f22
Author: Eric Anholt <eric@anholt.net>
Date: Tue Mar 26 15:02:38 2019 -0700
glamor: Switch the gl_flavor to a boolean is_gles.
There are only 2 flavors we are distinguishing -- GL versions are
handled separately.
Signed-off-by: Eric Anholt <eric@anholt.net>
commit 2764128e9fe775fabe28b0b9be427c16754e7128
Author: Jon Turney <jon.turney@dronecode.org.uk>
Date: Wed Apr 17 11:43:57 2019 +0100
Fix missing prototype warning for xf86_find_platform_device_by_devnum()
../hw/kdrive/src/kdrive.c:999:1: warning: no previous prototype for ‘xf86_find_platform_device_by_devnum’ [-Wmissing-prototypes]
Place the same guards around this stub as are around including the
hotplug.h header which declares the prototype.
commit ba59427abae3a8b260e66fcfab90c9de96c3e01c
Author: Jon Turney <jon.turney@dronecode.org.uk>
Date: Wed Apr 17 11:37:56 2019 +0100
Fix maybe-uninitialized warning in xf86NewInputDevice()
If SYSTEMD_LOGIND is not defined, systemd_logind_take_fd is defined as a
macro evaluating to -1 by systemd-logind.h, leaving paused
uninitialized.
../hw/xfree86/common/xf86Xinput.c: In function ‘xf86NewInputDevice’:
../hw/xfree86/common/xf86Xinput.c:919:16: warning: ‘paused’ may be used uninitialized in this function [-Wmaybe-uninitialized]
../hw/xfree86/common/xf86Xinput.c:877:10: note: ‘paused’ was declared here
commit 7c266cafed14b38c039091651069ae9888c3a8ae
Author: Jon Turney <jon.turney@dronecode.org.uk>
Date: Wed Apr 17 11:37:11 2019 +0100
Fix old-style definition warning for xf86OSInputThreadInit()
../hw/xfree86/os-support/stub/stub_init.c: In function ‘xf86OSInputThreadInit’:
../hw/xfree86/os-support/stub/stub_init.c:29:1: warning: old-style function definition [-Wold-style-definition]
commit 6975807945d12c07f00e18df7fafeff43efa0267
Author: Adam Jackson <ajax@redhat.com>
Date: Thu Mar 14 16:37:35 2019 -0400
dix: Remove WindowRec::backStorage
This is only being set, never read.
commit 0f477cc68bbfe37555f73313dcc50b303c3ca210
Author: Adam Jackson <ajax@redhat.com>
Date: Thu Mar 14 16:34:40 2019 -0400
dix, composite: Optimize setting window backing store state
We hide CWBackingStore from the screen hook if nothing's actually
changing, which means compChangeWindowAttributes no longer needs to
compare the requested state with the present one.
commit 4e101e7e3b4d3e6cdb38f1cd60a764aaade5c4a2
Author: Adam Jackson <ajax@redhat.com>
Date: Thu Mar 14 16:19:02 2019 -0400
mi: Simplify a conditional in miHandleExposures
miHandleExposures does two things: computes the region for which to
generate expose events, and (if the destination is a window) paints the
exposed regions with the background. The bit of this conditional we're
deleting here asserts that the source is either a pixmap or a window
without backing store. The only other possibility is a window _with_
backing store. In the old backing store implementation, this was where
you would recover bits from backing store. Since our "backing store" is
the redirected window pixmap, we know we've already copied all we could,
because CopyArea had already seen the entire window pixmap. So now in
that third case, we are still drawing to a pixmap (so there's no
background to paint) and we are still not generating events, so we can
exit early.
The comment above the function about recovering bits from backing store
is clearly misleading, so delete that too.
commit 147ed28bbf78f6b75a22b21458785aea536e44f8
Author: Aaron Plattner <aplattner@nvidia.com>
Date: Wed Apr 3 13:11:14 2019 -0700
xfree86: Export xf86GPUScreens and xf86NumGPUScreens
Drivers may need to loop over the allocated screens during PreInit, for example
to consolidate xorg.conf options that apply to a GPU device as a whole.
Currently, this works for protocol screens becuase x86Screens is exported, but
does not work for GPU screens.
Export xf86GPUScreens and xf86NumGPUScreens for consistency with xf86Screens and
xf86NumScreens.
Signed-off-by: Aaron Plattner <aplattner@nvidia.com>
commit 0a005c4fe4fccc9bb6c3a5266065f8437621fdb9
Author: Eric Anholt <eric@anholt.net>
Date: Thu Apr 4 16:26:26 2019 -0700
test: Fix meson build with xvfb disabled.
Fixes #678
Signed-off-by: Eric Anholt <eric@anholt.net>
commit 8ab80fd5057f3d954ac6dc310cc8773e9694a0b1
Author: Dave Airlie <airlied@redhat.com>
Date: Fri Mar 29 08:44:07 2019 +1000
xf86: set status to connected for monitors enabled in conf
If the user sets Option "Enable" "TRUE" for a monitor, the X
server will connect the connector a crtc but tell the user it
is disconnected.
However the user in this case is mutter, when it gets it's view
of the output configuration it sees the output is disconnected
and never sets it up again, which seems like the right thing to do.
If we let the user enable a monitor, lets just set it as always
connected.
Reviewed-by: Olivier Fourdan <ofourdan@redhat.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
commit f1790339d0c4cf09aa1b3f68c01d66eab1901718
Author: Jon Turney <jon.turney@dronecode.org.uk>
Date: Sun Mar 31 16:35:16 2019 +0100
tests: Always separate rendercheck -f and -o options with a space
commit fee147d75eef91be8cbfdd77dd444cc65c29b038
Author: Michel Dänzer <michel.daenzer@amd.com>
Date: Fri Mar 29 10:12:40 2019 +0100
gitlab-ci: Retry jobs after runner system failures
Up to twice, for a total of 3 attempts maximum.
This will hopefully avoid spurious CI pipeline failures due to
intermittent GitLab/docker infrastructure issues.
Inspired by
https://gitlab.freedesktop.org/mesa/mesa/commit/6140ed3d2c5409bcdb5c0879411690ef222b086c
Reviewed-by: Eric Anholt <eric@anholt.net>
commit b5ef99f26ab5fdc5e9b4f63c977de3cb0f4d5d4f
Author: Michel Dänzer <michel.daenzer@amd.com>
Date: Fri Mar 29 10:01:20 2019 +0100
gitlab-ci: Simplify autotools job script
Drop the verbose test log output, matching the meson job script.
Reviewed-by: Eric Anholt <eric@anholt.net>
commit 35561d4d1e2bc168affdadd74e73ae5321c43a8a
Author: Michel Dänzer <michel.daenzer@amd.com>
Date: Fri Mar 29 09:58:21 2019 +0100
gitlab-ci: Simplify meson job script
This way, the second ninja command line will be visible again as well in
the job output.
Reviewed-by: Eric Anholt <eric@anholt.net>
commit 4adda1f6359fd96436dd61d0250b84f55b2fd277
Author: Roman Gilg <subdiff@gmail.com>
Date: Fri Mar 29 10:55:31 2019 +0100
present: Call present_vblank_scrap in screen mode
This cleans up some code duplication. No functional change.
Signed-off-by: Roman Gilg <subdiff@gmail.com>
Reviewed-by: Michel Dänzer <michel.daenzer@amd.com>
commit d7b1753d446ecde3ff58e3de39a634c3137473c8
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Mon Mar 25 13:19:41 2019 +1000
dix: leave last.valuators alone on slave switch
Terms:
dev->last.valuator[] is the last value given to us by the driver
dev->valuator.axisVal[] is the last value sent to the client
dev->last.scroll[] is the abs value of the scroll axis as given by the driver,
used for button emulation calculation (and the remainder)
This function updates the device's last.valuator state based on the current
master axis state. This way, relative motion continues fluidly when switching
between devices. Before mouse 2 comes into effect, it's valuator state is
updated to wherever the pointer currently is so the relative event applies on
top of that.
This can only work for x/y axes, all other axes aren't guaranteed to have the
same meaning and/or may not be present:
- xtest device: no valuator 2
- mouse: valuator 2 is horizontal scroll axis
- tablet: valuator 2 is pressure
Scaling the current value from the pressure range into the range for
horizontal scrolling makes no sense. And it causes scroll jumps:
- scroll down, last.valuator == axisVal == 20
- xdotool click 1, the XTest device doesn't have that valuator
- scroll up
- updateSlaveDeviceCoords reset last.valuator to 0 (axisVal == 20)
- DeviceClassesChangedEvent includes value 20 for the axis
- event is processed, last.value changes from 0 to -1
- axisVal is updated to -1, causing a jump of -21
The same applies when we switch from tablet to mouse wheel if the pressure
value is 0 on proximity out (basically guaranteed). So let's drop this code
altogether and only leave the scaling for the relative x/y motion.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 3b26b90cb787a14fa5f8bb2033eab8ab6562a9a5
Author: Eric Anholt <eric@anholt.net>
Date: Mon Mar 25 16:30:18 2019 -0700
glamor: Fix a compiler warning since the recent OOM fixes.
Signed-off-by: Eric Anholt <eric@anholt.net>
commit a63d796ce02ae94a016e6ec027fdf0d4bff68805
Author: Eric Anholt <eric@anholt.net>
Date: Tue Mar 26 11:30:55 2019 -0700
gitlab-ci: Build and test glamor using Xephyr.
I keep wanting this when reviewing people's glamor patches.
Signed-off-by: Eric Anholt <eric@anholt.net>
commit ce5242fa2eef25c9921311480401bda6cd8952be
Author: Eric Anholt <eric@anholt.net>
Date: Tue Mar 26 13:38:22 2019 -0700
gitlab-ci: Build and install a current version of rendercheck.
For really testing glamor, we want it installed. Use master instead
of whatever version is in repos, because we'll want to update when new
tests are added.
Signed-off-by: Eric Anholt <eric@anholt.net>
commit 2a2f0ac3a99f32e6e5cc23003360534400d8f445
Author: Eric Anholt <eric@anholt.net>
Date: Tue Mar 26 13:35:41 2019 -0700
gitlab-ci: Make shallow clones of git trees we'll be nuking at the end.
We only check out master, and delete .git when we're done, so save the
bandwidth.
Signed-off-by: Eric Anholt <eric@anholt.net>
commit 0dc271690b0841473e442ffbf97464876234a7c8
Author: Eric Anholt <eric@anholt.net>
Date: Tue Mar 26 13:33:09 2019 -0700
gitlab-ci: Don't bother building piglit.
We don't use any of piglit's tests, just the framework.
Signed-off-by: Eric Anholt <eric@anholt.net>
commit 8c1dac5f83fba8fcd51f68214c0c5cf5d14ed2a7
Author: Eric Anholt <eric@anholt.net>
Date: Tue Mar 26 12:58:39 2019 -0700
gitlab-ci: Install Mesa so we can test glamor.
We need the DRI swrast driver (for GLX in vfb), and also libgl (for
libepoxy in glamor)
Signed-off-by: Eric Anholt <eric@anholt.net>
commit 3f3c489e51e1b8a82adee9c7c5942dadf218b70d
Author: Eric Anholt <eric@anholt.net>
Date: Tue Mar 26 11:06:00 2019 -0700
test: Trim the Render ops that we test the composite paths on.
We cover all Render ops under the "blend" group, so when we're doing
the cross products of some formats for the masking operation, skip
most of the ops (covering just zero, one, and src/dst alpha blend
factors along with a definitely non-glamor-accelerated one) .
All the tests now complete in <20s of runtime on my skylake.
Signed-off-by: Eric Anholt <eric@anholt.net>
commit 58c168ad93d770a3c48cc07daaa8a2acd1c0729d
Author: Eric Anholt <eric@anholt.net>
Date: Tue Mar 26 10:21:29 2019 -0700
test: Execute rendercheck tests without using piglit.
This gets us parallelism between rendercheck tests at the cost of
spinning up more Xvfbs, and nicer logging of the tests that are run.
Signed-off-by: Eric Anholt <eric@anholt.net>
commit 82aab622952197003799d756f06881b2c7df48bc
Author: Eric Anholt <eric@anholt.net>
Date: Wed Mar 27 09:47:41 2019 -0700
docker: Stop dumping long-summary and meson test logs in the CI logs.
I've found that it's hard to find the original error in a dump full of
xserver debug spam for the passing cases, and when I needed to look at
this I end up using a proper editor on the file from the artifacts
view anyway.
Signed-off-by: Eric Anholt <eric@anholt.net>
commit 05ded049acaa90ba07295f939910c22bb1e10e3a
Author: Eric Anholt <eric@anholt.net>
Date: Tue Mar 26 13:43:05 2019 -0700
test: Skip a few tests on glamor that are known to fail on llvmpipe.
Signed-off-by: Eric Anholt <eric@anholt.net>
commit 30369c6345250d71ef9ca5b12e4991c601e350c6
Author: Eric Anholt <eric@anholt.net>
Date: Wed Mar 27 09:45:34 2019 -0700
gitlab-ci: Add a note about where to manage your containers.
Michel noted that I could do this instead of bumping the tag as I
developed, so leave that note for the next person.
Signed-off-by: Eric Anholt <eric@anholt.net>
commit 164a37eac2a5e7390f69ce152796df54e2f00d98
Author: Eric Anholt <eric@anholt.net>
Date: Tue Mar 26 10:59:27 2019 -0700
simple-xinit: Introduce an escaped "--" argument.
For testing xephyr-glamor on top of Xvfb in CI better, I want to be
able to make one command line describing the nested server invocation,
but that means I need to get two simple-xinits to split client/server
on different "--" arguments.
Signed-off-by: Eric Anholt <eric@anholt.net>
commit 29aed56ec72d2e95dba8975eb44f385a5f6ef1ff
Author: Eric Anholt <eric@anholt.net>
Date: Tue Mar 26 12:26:34 2019 -0700
simple-xinit: Avoid hanging if the server fails to set up the display fd.
Early fatal errors may leave us with nothing in the displayfd pipe,
and we'd block forever.
Signed-off-by: Eric Anholt <eric@anholt.net>
commit f7069723093de585d082cfd98f0191d163569a78
Author: Benjamin Tissoires <benjamin.tissoires@gmail.com>
Date: Mon Mar 18 11:09:29 2019 +0100
CI: use wayland-ci-templates to manage the images
There shouldn't be a difference for users, but this way we do manage
all of our containers from freedesktop.org
Signed-off-by: Benjamin Tissoires <benjamin.tissoires@gmail.com>
Reviewed-by: Michel Dänzer <michel.daenzer@amd.com>
commit 5a549c957a873bd44ab351e627828905ee7dbf18
Author: Michael Biebl <biebl@debian.org>
Date: Wed Jan 24 04:05:47 2018 +0100
Revert "systemd-logind: Monitor systemd-logind going away"
systemd-logind since version 234 (released 2017-07-12) supports being
restarted without losing state [1]. From the systemd NEWS file [2]:
* systemd-logind may now be restarted without losing state. It stores
the file descriptors for devices it manages in the system manager
using the FDSTORE= mechanism. Please note that further changes in
other components may be required to make use of this (for example
Xorg has code to listen for stops of systemd-logind and terminate
itself when logind is stopped or restarted, in order to avoid using
stale file descriptors for graphical devices, which is now
counterproductive and must be reverted in order for restarts of
systemd-logind to be safe. See
https://cgit.freedesktop.org/xorg/xserver/commit/?id=dc48bd653c7e101.)
This reverts commit dc48bd653c7e1013e2d69e3f59ae3cbc0c893473.
Closes: #531
[1] https://github.com/systemd/systemd/pull/5600
[2] https://github.com/systemd/systemd/commit/9f09a95a7e6127f526c0ef7b6fd060cc0b01cdcc
commit f3567600cff5e91cbc2110cd72ce3fefbb8cab3a
Author: Jon Turney <jon.turney@dronecode.org.uk>
Date: Thu Mar 14 17:15:52 2019 +0000
meson: handle missing xkbcomp.pc better
Applying get_pkgconfig_variable() to a not-found dependency was always
documented as an error, but meson 0.49 now actually raises an error[1]:
meson.build:110:4: ERROR: 'xkbcomp' is not a pkgconfig dependency
Check xkbcomp_dep is a suitable dependency type before applying
get_pkgconfig_variable() to it.
[1] but this is more by accident than design (see the discusssion at [2]
et seq.), so who knows where things will come to rest...
[2] https://github.com/mesonbuild/meson/pull/4444#issuecomment-442443301
commit ef91da2757050652c724f6e674e8b1acf5d0cb31
Author: Michel Dänzer <michel.daenzer@amd.com>
Date: Wed Feb 27 18:29:50 2019 +0100
present/scmd: Check that the flip and screen pixmap pitches match
If they don't, flipping will result in corrupted display.
Test case:
* Run Xorg at 1920x1080 with no window manager
* glxgears -geometry 2048x1080
commit 9114c4341cec91ed41c9527c88200b7712357951
Author: Jon Turney <jon.turney@dronecode.org.uk>
Date: Wed Mar 13 13:25:02 2019 +0000
meson: Drop a meson version check
Drop some code conditional on meson version, which is not needed
since 7e046b94 bumped the minimum meson version
commit c020769dbfb965740c8441d8242b738ef572a7c9
Author: Jon Turney <jon.turney@dronecode.org.uk>
Date: Wed Mar 13 14:57:14 2019 +0000
Add xf86OSInputThreadInit to stub os-support as well
stub os support also needs to provide xf86OSInputThreadInit, omitted in
ea1527a8
commit 2e18eec6f03cc4d9d5bf62853c65d341b363f4b3
Author: Michel Dänzer <michel.daenzer@amd.com>
Date: Fri Mar 8 18:49:04 2019 +0100
xwayland/present: Destroy sync_callback in xwl_present_cleanup
xwl_present_cleanup frees the struct xwl_present_window memory,
so if there's a pending callback, we have to destroy it to prevent
use-after-free in xwl_present_sync_callback.
Should fix issue #645.
Reviewed-by: Olivier Fourdan <ofourdan@redhat.com>
commit f665a9c9e6c8643f3050378249db3088ae3057be
Author: Adam Jackson <ajax@redhat.com>
Date: Tue Sep 30 12:26:28 2014 -0400
mi: Shortcut miDoCopy/miCopyArea based on clipList
This is maybe one more comparison, but it catches FullyObscured windows
slightly earlier, so it's kind of a wash. The important thing is this
allows for paintable but unmapped windows, which will have non-empty
clipList.
commit 3904216b01fd9dabee65e6cb120fa8aad5e8b459
Author: Adam Jackson <ajax@redhat.com>
Date: Wed Mar 6 17:03:58 2019 -0500
dix: Outdent Unmap{Window,Subwindows} a bit
No functional change, just folding some conditionals together.
commit 74479a99ecf18fdfdafd033b5efd8d785dd12c28
Author: Olivier Fourdan <ofourdan@redhat.com>
Date: Fri Mar 8 18:19:16 2019 +0100
glamor: pixmap FBO may not be allocated
If `_glamor_create_tex()` fails to allocate the FBO because of
GL_OUT_OF_MEMORY error, the `pixmap_priv->fbo` is NULL.
However, `glamor_get_pixmap_texture()` doesn't actually check whether
the `pixmap_priv->fbo` is NULL and will segfault with a NULL pointer
dereference trying to access the `pixmap_priv->fbo->tex`.
Signed-off-by: Olivier Fourdan <ofourdan@redhat.com>
Closes: https://gitlab.freedesktop.org/xorg/xserver/issues/647
commit 8c4e8d9eff03cefc987f13c900b0a47403946127
Author: Paul Kocialkowski <paul.kocialkowski@bootlin.com>
Date: Mon Mar 4 11:52:43 2019 +0100
glamor: Fallback to system memory for RW PBO buffer allocation
We currently support two modes of operation for RW PBO buffers: one
that allocates a pack buffer with GL memory and one that uses system
memory when the former is not supported.
Since allocation with system memory is less likely to fail, add a
fallback to system memory when GL memory failed instead of bailing
out.
Signed-off-by: Paul Kocialkowski <paul.kocialkowski@bootlin.com>
commit de6b3fac1f26075ce915006c914c4a4755617715
Author: Paul Kocialkowski <paul.kocialkowski@bootlin.com>
Date: Mon Mar 4 11:38:20 2019 +0100
glamor: Propagate glamor_prepare_access failures in copy helpers
glamor_prepare_access can fail for a few reasons, especially when
failing to allocate a PBO buffer. Take this in account and bail in
the copy helpers that call the helper when a failure happens.
Signed-off-by: Paul Kocialkowski <paul.kocialkowski@bootlin.com>
commit bc2e12239f86e5a4acd220744f42eb83ba55d328
Author: Paul Kocialkowski <paul.kocialkowski@bootlin.com>
Date: Mon Mar 4 11:47:11 2019 +0100
glamor: Error out on out-of-memory when allocating PBO for FBO access
Packed buffer allocation (which happens at glBufferData time with the
buffer bound) can fail when there is no GL memory left.
Pick up the error when it happens, print a proper error message, do
some cleanup and bail.
Signed-off-by: Paul Kocialkowski <paul.kocialkowski@bootlin.com>
commit c98c7709c67d8ed6b7455ec700a49b58c396ec2c
Author: Paul Kocialkowski <paul.kocialkowski@bootlin.com>
Date: Mon Mar 4 11:24:26 2019 +0100
glamor: Propagate FBO allocation failure for picture to texture upload
When uploading a picture to a texture, glamor_upload_picture_to_texture
calls glamor_pixmap_ensure_fbo to ensure that there is backing FBO.
The FBO will be allocated if the picture's drawable pixmap does not have
one already, which can fail when there is no GL memory left.
glamor_upload_picture_to_texture checks that the call succeeded and will
enter the failure path if it did not. However, unlike many other
functions in glamor, this one has ret set to TRUE initially, so it needs
to be set to FALSE when a failure happens.
Otherwise, the error is not propagated and the failure path return TRUE.
This leads to a fault when trying to access the FBO pointer later on.
Signed-off-by: Paul Kocialkowski <paul.kocialkowski@bootlin.com>
commit e51ebc18a7fb5b30213b3b5e743cba1f2e7a0e83
Author: Andy Ritger <aritger@nvidia.com>
Date: Wed Feb 13 13:20:52 2019 -0800
xfree86/modes: Add "NoOutputInitialSize" option
Normally, the X server infers the initial screen size based on any
connected outputs. However, if no outputs are connected, the X server
picks a default screen size of 1024 x 768. This option overrides the
default screen size to use when no outputs are connected. In contrast
to the "Virtual" Display SubSection entry, which applies unconditionally,
"NoOutputInitialSize" is only used if no outputs are detected when the
X server starts.
Parse this option in the new exported helper function
xf86AssignNoOutputInitialSize(), so that other XFree86 loadable drivers
can use it, even if they don't use xf86InitialConfiguration().
Signed-off-by: Andy Ritger <aritger@nvidia.com>
Reviewed-by: Keith Packard <keithp@keithp.com>
commit 7e046b9467784451769af3a03db46e3c690063b0
Author: Adam Jackson <ajax@redhat.com>
Date: Tue Mar 5 11:31:29 2019 -0500
meson: Bump required meson version to 0.46
We were being naughty:
WARNING: Project specifies a minimum meson_version '>= 0.42.0' but uses features which were added in newer versions:
* 0.46.0: {'compiler.has_multi_link_argument', 'compiler.has_link_argument'}
commit 0ec9a13c2a207e98e2dd6b352552c0e069af0727
Author: Michel Dänzer <michel.daenzer@amd.com>
Date: Wed Feb 27 16:47:40 2019 +0100
Revert "gitlab-ci: Only run docker-image stage if relevant source files change"
This reverts commit 8694395fcfd407190db74f31064960e484747377.
Some scenarios have come to light where this failed to ensure the docker
image exists:
* If the master branch of a forked repository is used for an MR which
doesn't modify .gitlab-ci.yml, the docker-image job may not run.
* If the docker-image job of the first pipeline in a forked repository
is cancelled or fails for any reason, and .gitlab-ci.yml isn't
modified for the next pipeline run.
commit 12769c516d9356bd92f90e2f53a4853dbfdc4aed
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Thu Feb 21 15:38:07 2019 -0800
os-support/solaris: Set IOPL for input thread too
Since the Solaris kernel tracks IOPL per thread, and doesn't inherit
raised IOPL levels when creating a new thread, we need to turn it on
in the input thread for input drivers like vmmouse that need register
access to work correctly.
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
commit ea1527a8a662dcc5ac3ed49135740aa5f24f74bc
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Thu Feb 21 15:35:38 2019 -0800
Add xf86OSInputThreadInit call from common layer into os-support layer
Allows os backends to run additional code as necessary to set up the
input thread.
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
commit 4ad21c3247d98ac6c5ad71fa36be60ed04f7c92c
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Thu Feb 21 15:22:57 2019 -0800
Add ddxInputThread call from os layer into ddx layer
Allows ddx's to run additional code as necessary to set up the
input thread.
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
commit 7533fa9bd5a4a0f7743d553be186514d684308c8
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Thu Feb 21 14:51:22 2019 -0800
os-support/solaris: Drop ExtendedEnabled global variable
Keeping track of kernel state in user space doesn't buy us anything,
and introduces bugs, as we were keeping global state but the Solaris
kernel tracks IOPL per thread.
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
commit 432fad04e7aaad1f10d732a51665ecbe934246c6
Author: Michel Dänzer <michel.daenzer@amd.com>
Date: Fri Feb 22 10:22:49 2019 +0100
gitlab-ci: Run make distcheck in autotools build & test job
We don't set the PIGLIT_DIR and XTS_DIR environment variables for make
distcheck for now, otherwise it complains about files left behind by
piglit.
commit f9bbc9d5ead5cf298f0e3e0b7ac5229af830f6e7
Author: Michel Dänzer <michel.daenzer@amd.com>
Date: Fri Feb 22 10:21:27 2019 +0100
glx,xquartz: Fix make distcheck
Guard BUILT_SOURCES and CLEANFILES by XWIN_GLX_WINDOWS/XQUARTZ.
commit 2f12c8017508f23195db92503435fc3ef183da4b
Author: Michel Dänzer <michel.daenzer@amd.com>
Date: Tue Feb 19 18:37:53 2019 +0100
gitlab-ci: Add autotools build & test job
commit b577df77451d34e28cfef3bda5031a43caeba90a
Author: Michel Dänzer <michel.daenzer@amd.com>
Date: Thu Feb 14 17:39:24 2019 +0100
gitlab-ci: Use ccache
Meson picks it up automatically.
Based on:
* https://gitlab.freedesktop.org/mesa/mesa/merge_requests/240
* https://gould.cx/ted/blog/2017/06/10/ccache-for-Gitlab-CI/
* https://stackoverflow.com/questions/53659419/ccache-no-hits-in-gitlab-ci
v2 based on the corresponding Mesa change:
* Quote CCACHE_(BASE)DIR environment variables.
* Clear ccache stats in before_script.
* Move cache stanza to the build-and-test job, the cache isn't used in
the docker-image job.
Reviewed-by: Adam Jackson <ajax@redhat.com> # v1
commit 537f06e21ee2c4c88ee062c26555338257e043ef
Author: Michel Dänzer <michel.daenzer@amd.com>
Date: Tue Feb 19 18:16:16 2019 +0100
gitlab-ci: Add ccache to docker image, and leave in autotools
We're going to make use of these in build & test jobs.
commit f6753c117ef0f83499d5e2d6dda226fec9ddf803
Author: Alexander Volkov <a.volkov@rusbitech.ru>
Date: Mon Feb 11 18:54:10 2019 +0300
shm: Use memfd_create when possible
It doesn't require shared memory dir and thus allows
to avoid cases when this dir is detected incorrectly,
as in https://bugreports.qt.io/browse/QTBUG-71440
Signed-off-by: Alexander Volkov <a.volkov@rusbitech.ru>
commit 678d64aa2e929368b6d6f2b83bbf5540c4fa292d
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri Feb 8 13:29:14 2019 +1000
Xi: lock the input thread for any pointer barrier list manipulation
The input thread checks the barriers for pointer positioning, swapping the
list out from underneath is considered impolite.
Reported-by: Michel Dänzer <michel.daenzer@amd.com>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Michel Dänzer <michel.daenzer@amd.com>
commit fede384962edd175b1a2ce6edd8d2ef9b0fd74f0
Author: Michel Dänzer <michel.daenzer@amd.com>
Date: Mon Feb 11 18:32:07 2019 +0100
gitlab-ci: Don't rely on $CI_PROJECT_NAME
The name of a forked repository can be changed later, in which case this
would fail to refer to the main repository.
Pointed out by Eric Engestrom in
https://gitlab.freedesktop.org/mesa/mesa/merge_requests/224 .
commit 8694395fcfd407190db74f31064960e484747377
Author: Michel Dänzer <michel.daenzer@amd.com>
Date: Thu Feb 7 17:35:13 2019 +0100
gitlab-ci: Only run docker-image stage if relevant source files change
Otherwise there's normally no need to run it. It will also run when a
new branch is created, which ensures that the docker image always exists
(e.g. in a newly forked repository).
Inspired by https://gitlab.freedesktop.org/mesa/mesa/merge_requests/143
commit 8f8d358bad2d33de36686e8405ade8b5b921cafd
Author: Adam Jackson <ajax@redhat.com>
Date: Tue Jul 8 12:36:10 2014 -0400
ramdac: Remove core ramdac code
Now that there are no ramdac drivers this can go.
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit f0385fb420158ac3bc1c4c325431ffc5c62344bb
Author: Adam Jackson <ajax@redhat.com>
Date: Fri Feb 28 16:07:27 2014 -0500
ramdac: Remove ramdac drivers
External RAMDACs are a very 1996 kind of thing, this code really doesn't
belong in the server.
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit 937a5b78a2f6ea771132ff0f9ece708a23c1bdad
Author: Peter Harris <pharris@opentext.com>
Date: Wed Jan 30 14:51:07 2019 -0500
os: Fix GetTimeInMicros resolution
GetTimeInMillis is called first, which sets clockid to
CLOCK_MONOTONIC_COARSE, which is typically much lower resolution than
the callers of GetTimeInMicros want.
Prior to a779fda224bee0c4d27636503367e55ae93b33c2, GetTimeInMillis and
GetTimeInMicros did not share a clockid.
Restore the clockid split to fix the granularity of GetTimeInMicros.
Signed-off-by: Peter Harris <pharris@opentext.com>
commit a093a88531599832811a1ba5cb85101af91a545e
Author: Michel Dänzer <michel.daenzer@amd.com>
Date: Tue Jan 29 18:59:09 2019 +0100
present/wnmd: Allow flipping if the window pixmap matches the toplevel's
Instead of testing window->redirectDraw.
With Xwayland, the toplevel window is always redirected, so this would
unnecessarily preclude flipping there in some cases, e.g. with wlroots
based Wayland compositors or with fullscreen X11 windows in weston.
Fixes issue #631.
commit ff560488558deb299b0822a3e3bc66672f4c690f
Author: Adam Jackson <ajax@redhat.com>
Date: Wed Jan 23 14:23:40 2019 -0500
dri2: Stop pretending VGA arbitration matters
The VGA arbiter controls the PCI bus' routing of legacy VGA resources,
specifically the video memory aperture at 0xa0000-0xb0000 (640k should
be etc.) and a handful of I/O ports. Since 128k is far too small for a
real framebuffer these days, every driver instead maps a linear version
of VRAM through the PCI BAR. And no DRI2 drivers ever need I/O port
access, because all operations they might be used for (legacy VGA CRTC
setup, mostly) happen on the kernel side.
In other words, this just works, and we can stop breaking it.
Signed-off-by: Adam Jackson <ajax@redhat.com>
Reviewed-by: Dave Airlie <airlied@redhat.com>
commit d3a26bbf618507e1ca05b2bc99a880075b77db77
Author: A. Wilcox <AWilcox@Wilcox-Tech.com>
Date: Sat Jan 26 15:37:56 2019 -0600
DRI2: Add another Coffeelake PCI ID
A user of Adélie Linux reported that modesetting wasn't working properly on
their Intel i7-9700K-integrated UHD 630 GPU. Xorg.0.log showed:
[ 131.902] (EE) modeset(0): [DRI2] No driver mapping found for PCI device 0x8086 / 0x3e98
[ 131.902] (EE) modeset(0): Failed to initialize the DRI2 extension.
Indeed, that PCI ID is missing from i965_pci_ids. Adding it fixed the issue
and allowed the system to work with i965_dri under modesetting.
commit 709c6562975c3bea10dd0571527a4aac79a6bf6f
Author: Adam Jackson <ajax@redhat.com>
Date: Tue Oct 16 12:58:25 2018 -0400
vnd: Fix a silly memory leak
'disp' was already allocated by LookupVendorPrivDispatch above,
clobbering it will do no good.
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit bf991a5f989c5e6e726a3731f468b7b7d65d9f4a
Author: Adam Jackson <ajax@redhat.com>
Date: Wed Jan 16 14:20:17 2019 -0500
mi: When {en,dis}abling extensions, match names case-insensitively
Both because extension names are inconsistently capitalized on the wire,
and because the table we're walking spells it COMPOSITE not Composite.
The latter is certainly also a bug, but there's no reason for us to be
that strict.
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit 086c2e3de55bbf0cbc1d97f7dc2db70a7f5e69e3
Author: Adam Jackson <ajax@redhat.com>
Date: Mon Jan 14 12:42:00 2019 -0500
dri3: Fix XACE access mode for open and get_supported_modifiers
Neither opening a screen nor querying its modifiers confers the right to
attach the buffer for any particular pixmap. GetAttr seems more correct.
Fixes: xorg/xserver#550
commit 6c1d720047b193f138e877e994cb4a4fb8e73753
Author: Adam Jackson <ajax@redhat.com>
Date: Tue Oct 30 11:37:32 2018 -0400
agp: Make the legacy AGP interface optional
The only thing using this anymore is the i810 driver, so this can safely
be disabled on non-i686 builds.
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit 1e3f9ea14cced2ee894d072c977507ad43cb59c5
Author: Adam Jackson <ajax@redhat.com>
Date: Fri Jan 11 11:38:34 2019 -0500
randr: Remove funky indirection around the xf86 screen private key
All of the null checks here are redundant, you can't get to those paths
unless RANDR's already been initialized. Delete them, and remove the
pointer too.
Signed-off-by: Adam Jackson <ajax@redhat.com>
Reviewed-by: Michel Dänzer <michel.daenzer@amd.com>
commit 30044b2253c2dd51e1aedb2f897159c657ca8f0d
Author: Michel Dänzer <michel.daenzer@amd.com>
Date: Wed Dec 5 18:31:27 2018 +0100
xfree86/modes: Don't clobber gamma LUT of compatibility output's CRTC
If the driver calls xf86HandleColormaps, CMapChangeGamma updates the HW
gamma LUT of all CRTCs via xf86RandR12LoadPalette. However,
xf86RandR12ChangeGamma was then clobbering the gamma LUT of the RandR
1.2 compatibility output's CRTC with the gamma curves computed from the
screen's global gamma values.
Fix this by bailing if xf86RandR12LoadPalette is installed.
Fixes: 02ff0a5d7e32 "xf86RandR12: Fix XF86VidModeSetGamma triggering a
BadImplementation error"
commit cc05c01925755310f027c61daa29648a10155f96
Author: Rohan Garg <rohan@garg.io>
Date: Thu Dec 13 19:15:01 2018 +0100
glamor/glamor_egl.c: EGL_NATIVE_PIXMAP_KHR do not require contexts
From https://www.khronos.org/registry/EGL/extensions/KHR/EGL_KHR_image_pixmap.txt
* If <target> is EGL_NATIVE_PIXMAP_KHR, and <ctx> is not EGL_NO_CONTEXT,
the error EGL_BAD_PARAMETER is generated.
Fixes: a5321ea4 ("Allow to create textured pixmaps from gbm_bo without using gem names")
commit 88dd4cea51f7e461cb4859c06bfe641890caa97b
Author: Rohan Garg <rohan@garg.io>
Date: Thu Dec 13 17:46:27 2018 +0100
glamor/egl: Drop a implicit depends on EGL_KHR_no_config_context
Not all platforms provide EGL_KHR_no_config_context, this ensures
that eglCreateContext works on such platforms by querying for
a config.
commit e3fb178617a579c98877a3baae14c4dfe4d55db8
Author: Maya Rashish <maya@NetBSD.org>
Date: Thu Jan 10 14:55:17 2019 +0200
xfree86: Try nouveau on NetBSD as well.
commit bf2a7bb4ffbd199882fe4bd183561469833a9e6b
Author: Maya Rashish <maya@NetBSD.org>
Date: Thu Jan 10 18:39:33 2019 +0200
Fix typo in error message
commit e8295c50209f2963fa2823e8de7e8363a38cd2d1
Author: Olivier Fourdan <ofourdan@redhat.com>
Date: Tue Jan 8 12:48:53 2019 +0100
xwayland: handle case without any crtc
Xwayland creates and destroys the CRTC along with the Wayland outputs,
so there is possibly a case where the number of CRTC drops to 0.
However, `xwl_present_get_crtc()` always return `crtcs[0]` which is
invalid when `numCrtcs` is 0.
That leads to crash if a client queries the Present capabilities when
there is no CRTC, the backtrace looks like:
#0 raise() from libc.so
#1 abort() from libc.so
#2 OsAbort() at utils.c:1350
#3 AbortServer() at log.c:879
#4 FatalError() at log.c:1017
#5 OsSigHandler() at osinit.c:156
#6 OsSigHandler() at osinit.c:110
#7 <signal handler called>
#8 main_arena() from libc.so
#9 proc_present_query_capabilities() at present_request.c:236
#10 Dispatch() at dispatch.c:478
#11 dix_main() at main.c:276
To avoid returning an invalid pointer (`crtcs[0]`) in that case, simply
check for `numCrtcs` being 0 and return `NULL` in that case.
Thanks to Michel Dänzer <michel.daenzer@amd.com> for pointing this as a
possible cause of the crash.
Signed-off-by: Olivier Fourdan <ofourdan@redhat.com>
Reviewed-by: Michel Dänzer <michel.daenzer@amd.com>
Bugzilla: https://bugzilla.redhat.com/1609181
commit bf5613f888e837641b9e16aacb36ffb43a9cccda
Author: Roman Gilg <subdiff@gmail.com>
Date: Wed Jan 2 21:55:23 2019 +0100
xwayland: Fix wm_fd readin with no listen_fds
Since 08843efc KWin was not able to start a Wayland session. Independently
of listen_fd_count add_client_fd must be called. Same holds for the
wm_selection_callback. Therefore just remove the condition.
Bugzilla: https://bugs.freedesktop.org/109220
Signed-off-by: Roman Gilg <subdiff@gmail.com>
commit 7fb6338c68e158053295cb448faa5c559aa9990c
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Tue Jan 1 16:49:32 2019 -0800
os: Report errors opening authorization file (#469)
Fixes: xorg/xserver#469
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
commit a3d01ee9d0b5e523b0771e2a26542ac15e29a33f
Author: Michel Dänzer <michel.daenzer@amd.com>
Date: Wed Dec 19 10:11:22 2018 +0100
glamor: Remove unused format_for_pixmap helper
Reviewed-by: Eric Anholt <eric@anholt.net>
commit 2e256e8260648619e407b1de70fe43cf32819247
Author: Michel Dänzer <michel.daenzer@amd.com>
Date: Wed Dec 19 11:10:10 2018 +0100
glamor: Allow HW acceleration for more RENDER formats
As long as the storage format is compatible.
v2:
* Remove explicit cases for formats handled by the default case.
Reviewed-by: Eric Anholt <eric@anholt.net>
commit 7e6faa5b3c05e0b7149ee840403885b0b40b5827
Author: Michel Dänzer <michel.daenzer@amd.com>
Date: Wed Dec 19 10:06:23 2018 +0100
glamor: Check that storage format is compatible with RENDER format
Fixes x2r10g10b10 related rendercheck failures.
Reviewed-by: Eric Anholt <eric@anholt.net>
commit d12881ea1d95bc8b189582da9e847a801927acce
Author: Michel Dänzer <michel.daenzer@amd.com>
Date: Fri Dec 14 16:19:46 2018 +0100
Revert "ci: Work around broken python UTF8 handling in the CI docker image"
This reverts commit 899d260701ff783254f8ead91dab8dc515d554f6.
No longer necessary with the previous changes.
Reviewed-by: Eric Anholt <eric@anholt.net>
commit bc6998b728749015bfd93a85fbae48af777c9a34
Author: Michel Dänzer <michel.daenzer@amd.com>
Date: Fri Dec 14 17:25:41 2018 +0100
gitlab-ci: Set LC_ALL=C.UTF-8
Although piglit could now handle non-ASCII characters in the
environment, meson was still failing without this (even though it's
using Python 3).
Reviewed-by: Eric Anholt <eric@anholt.net>
commit 4aaaf69229be574d6d11084225ecd91446a15170
Author: Michel Dänzer <michel.daenzer@amd.com>
Date: Wed Oct 10 10:31:12 2018 +0200
test: Use .../piglit instead of .../piglit-*.py
The latter use Python 2 and break with any non-ASCII characters in the
environment, the former uses Python 3 and works fine in that case.
Reviewed-by: Eric Anholt <eric@anholt.net>
commit f56d8e2282a3d1344aa1300c78faede0071a3bfa
Author: Michel Dänzer <michel.daenzer@amd.com>
Date: Fri Dec 14 11:04:24 2018 +0100
gitlab-ci: Docker image can be generated as part of pipeline
This removes the dependency on an externally generated docker image, and
should make it easier to update the docker image or make other changes
related to it.
This is based on Debian testing, because I'm most familiar with Debian.
But it should be easy to base it on another distro.
v2:
* Use kaniko instead of docker-in-docker for image generation, so it can
also work in unprivileged runners.
* Drop piglit.conf & tetexec.cfg overrides, just make sure the files in
the image work.
commit ed44f9cd6a4ccf6de7dda70432764b4da10f3f44
Author: Michel Dänzer <michel.daenzer@amd.com>
Date: Thu Dec 13 18:29:31 2018 +0100
Drop Travis Linux build in favour of GitLab CI
Fold build-travis-deps.sh into .gitlab-ci.yml.
Preparation for the next change, which would break the Travis Linux
build.
Reviewed-by: Eric Anholt <eric@anholt.net>
commit 0e541b10933377572373da48d1f2932ff095dcde
Author: Jon Turney <jon.turney@dronecode.org.uk>
Date: Thu Dec 13 23:00:32 2018 +0000
meson: Add misc unit tests
v2:
has_link_argument requires meson 0.46.0
commit fde27b9b4814b18aca6ec587bd3cfe9ab04b0c72
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Wed Nov 28 10:05:49 2018 +1000
test: fix failing tests
Broken since 69d8ea4a49793a94f821d1a328856901a1c02a5a because our fake screen
didn't have a root window and writing the XKB rules prop would happily
segfault. Fix this by setting up the required bits.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Tested-by: Michel Dänzer michel.daenzer@amd.com
commit a7472da94136ef977b8d6af956a15767736236ea
Author: Michel Daenzer <michel@daenzer.net>
Date: Wed Dec 12 18:34:36 2018 +0100
Make artifacts of piglit results if job fails
Can be useful for figuring out what caused the failure.
commit c1bb392b1df4023e9dec489facfa221a53499ddc
Author: Michel Daenzer <michel@daenzer.net>
Date: Wed Dec 12 12:55:57 2018 +0100
travis: Use a single meson invocation
The prefix setting didn't take for some reason.
commit c73116540205c20162befe935ef608f4bed3af0a
Author: Olivier Fourdan <ofourdan@redhat.com>
Date: Fri Nov 30 13:09:53 2018 +0100
dix: cache ResourceClientBits() value
The `LimitClient` is set once and for all at startup, whereas the
function `ResourceClientBits()` which returns the client field offset
within the XID based on the value of `LimitClient` can be called
repeatedly.
Small optimization, cache the result of `ilog2()`, that saves running
the same loop over and over each time `ResourceClientBits()` is called.
Signed-off-by: Olivier Fourdan <ofourdan@redhat.com>
commit 48b1af2718ab81c66f565438553415c05f1faa5c
Author: Ilia Mirkin <imirkin@alum.mit.edu>
Date: Mon Dec 10 23:34:11 2018 -0500
modesetting: fix conn_id termination and potential overrun by 1 byte
Noticed when porting this logic to xf86-video-nouveau, and valgrind
complained about conditional jump based on uninitialized data.
Signed-off-by: Ilia Mirkin <imirkin@alum.mit.edu>
Reviewed-by: Pekka Paalanen <pekka.paalanen@collabora.com>
commit 899d260701ff783254f8ead91dab8dc515d554f6
Author: Adam Jackson <ajax@redhat.com>
Date: Tue Dec 11 12:30:59 2018 -0500
ci: Work around broken python UTF8 handling in the CI docker image
Gitlab very kindly exposes the details of the git commit message (among
much else) in the environment. Unfortunately, piglit tries to handle the
environment in non-UTF8-safe ways, which means if the top-of-tree commit
mentions non-ASCII characters (say, in the author's name) then all the
tests fail and so does the pipeline.
Fortunately none of those variables are things our piglit invocation
needs. Since I've failed to rebuild the docker image as yet, just clear
the likely variables from the environment before running piglit.
This-makes-me: ☹
commit 82ed89c0f8b18d8214430580dc80c8d3e37bef33
Author: Adam Jackson <ajax@redhat.com>
Date: Thu Nov 29 14:48:11 2018 -0500
automake: Distribute meson's configure header templates
Fixes: xorg/xserver#17
commit a425eee6dce3b0cfd18b591907e8302a91b648c6
Author: Lionel Landwerlin <lionel.g.landwerlin@intel.com>
Date: Fri Nov 9 12:34:59 2018 +0000
present: fix compile warning with debug traces
Signed-off-by: Lionel Landwerlin <lionel.g.landwerlin@intel.com>
commit 7a44e8d4007b9c3ca55a5cc3f5e98601565311c7
Author: Lyude Paul <lyude@redhat.com>
Date: Tue Nov 13 20:14:10 2018 -0500
modesetting: Actually disable CRTCs in legacy mode
Believe it or not, somehow we've never done this in legacy mode! We
currently simply change the DPMS property on the CRTC's output's
respective DRM connector, but this means that we're just setting the
CRTC as inactive-not disabled. From the perspective of the kernel, this
means that any shared resources used by the CRTC are still in use.
This can cause problems for drivers that are not yet fully atomic,
despite using the atomic helpers internally. For instance: if CRTC-1 and
CRTC-2 are still enabled and use shared resources within the kernel (an
MST topology, for example), and then userspace tries to go enable CRTC-3
on the same topology this might suddenly fail if CRTC-3 needs the shared
resources CRTC-1 and CRTC-2 are using. While I don't know of any
situations in the mainline kernel that actually trigger this, future
plans for reworking the atomic check of MST drivers are absolutely
going to make this into a real issue (they already are in my WIP
branches for the kernel).
So: actually do the right thing here and disable CRTCs when they're not
going to be used anymore, even in legacy mode.
Signed-off-by: Lyude Paul <lyude@redhat.com>
commit 17a22ad948009badbc79bbcd9a067004c98f5744
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Sun Nov 25 12:56:29 2018 -0800
Update configure.ac bug URL for gitlab migration
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
commit 5d097c2a20fce44cdb9d5c302d46bc7fa16edfec
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Sun Nov 18 15:49:27 2018 -0800
Update README for gitlab migration
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
commit e6cd1c9bdefe83e7d99b703a68d26eebb451f889
Author: Michel Dänzer <michel.daenzer@amd.com>
Date: Thu Nov 15 17:16:59 2018 +0100
xwayland: Don't take buffer release queue into account for frame timer
The buffer release queue has two kinds of entries:
* Pending async flips.
* Completed flips waiting for their buffer to be released by the Wayland
compositor.
xwl_present_timer_callback neither completes async flips nor releases
buffers, so the timer isn't needed for the buffer release queue.
commit f541615342ce6bfb0e6d4e68deb3a924a87e8ba9
Author: Michel Dänzer <michel.daenzer@amd.com>
Date: Fri Nov 9 17:18:53 2018 +0100
xwayland: Don't need xwl_window anymore in xwl_present_queue_vblank
Fixes issue #12. Presumably the problem was that Present operations on
unmapped windows were executed immediately instead of only when reaching
the target MSC.
commit 8c9538573cb9a342897eb3fb4b0c1e4ed917bd0e
Author: Michel Dänzer <michel.daenzer@amd.com>
Date: Thu Nov 1 18:24:28 2018 +0100
xwayland: Add xwl_present_unrealize_window
When a window is unrealized, a pending frame callback may never be
called, which could result in repeatedly freezing until the frame timer
fires after a second.
Fixes these symptoms when switching from fullscreen to windowed mode in
sauerbraten.
commit 6b016d58d23d16eaae9908a92ed90547d1926317
Author: Michel Dänzer <michel.daenzer@amd.com>
Date: Thu Nov 1 18:44:24 2018 +0100
xwayland: Replace xwl_window::present_window with ::present_flipped
There's no need to keep track of the window which last performed a
Present flip. This fixes crashes due to the assertion in
xwl_present_flips_stop failing. Fixes issue #10.
The damage generated by a flip only needs to be ignored once, then
xwl_window::present_flipped can be cleared. This may fix freezing in
the (hypothetical) scenario where Present flips are performed on a
window, followed by other drawing requests using the window as the
destination, but nothing triggering xwl_present_flips_stop. The damage
from the latter drawing requests would continue being ignored.
commit 8738ce85df535bdfdfecfce1c0d64e209cc6e508
Author: Ray Strode <rstrode@redhat.com>
Date: Fri Nov 16 14:36:55 2018 -0500
dix: ensure work queues are cleared on reset
If the server resets, most client workqueues are cleaned up as the
clients are killed.
The one exception is the server's client, which is exempt from
the killing spree.
If that client has a queued work procedure active, it won't get
cleared on reset.
This commit ensures it gets cleared too.
commit 364d64981549544213e2bca8de6ff8a5b2b5a69e
Author: Samuel Thibault <samuel.thibault@ens-lyon.org>
Date: Tue Oct 30 18:43:51 2018 +0100
dix: do not send focus event when grab actually does not change
c67f2eac5651 ("dix: always send focus event on grab change") made dix
always sent events when it's a NotifyGrab or NotifyUngrab, even if
from == to, because 'from' can just come from a previous XSetInputFocus
call.
However, when an application calls XGrabKeyboard several times on
the same window, we are now sending spurious FocusOut+FocusIn with
NotifyGrab, even if the grab does not actually change. This makes screen
readers for blind people spuriously emit activity events which disturb
screen reading workflow when e.g. switching between menus.
This commit avoids calling DoFocusEvents in that precise case, i.e. when
oldWin is a previous grab and the new grab is the same window.
Signed-off-by: Samuel Thibault <samuel.thibault@ens-lyon.org>
Reviewed-by: Adam Jackson <ajax@redhat.com>
commit 82f8cf8990009f6cac567814dd6b7fd41cfad82d
Author: Manoj Gupta <manojgupta@chromium.org>
Date: Tue Nov 13 11:35:25 2018 -0800
config/udev: Include header <sys/sysmacros.h> to use major/minor
glibc 2.25 has dropped sys/sysmacros.h from sys/types.h, so add
it explicitly in config/udev.c.
This is similar to the commit 84e3b96b531363e47f6789aacfcae4aa60135e2e
Signed-off-by: Manoj Gupta <manojgupta@chromium.org>
Reviewed-by: Adam Jackson <ajax@redhat.com>
commit fbdd4d679a7d020f78f7b877033b83e00f5a0f73
Author: Michal Srb <msrb@suse.com>
Date: Mon Nov 12 13:51:48 2018 +0100
dix/window: Use ConfigureWindow instead of MoveWindow
The screensaver can regularly move its window to random offsets. It should
use the ConfigureWindow function instead of calling the Screen's MoveWindow
directly. Some MoveWindow implementations, such as compMoveWindow, rely on
Screen's ConfigNotify being called first as it happens in ConfigureWindow.
Reviewed-by: Adam Jackson <ajax@redhat.com>
commit 23752b3ef889ada7b705c51f478f5817e5caaed3
Author: Adam Jackson <ajax@redhat.com>
Date: Thu Oct 25 13:13:13 2018 -0400
os: Establish new connections synchronously not on the work queue
This contortion made a bit more sense before we got SetNotifyFd and
friends, but now there's no need for it.
Signed-off-by: Adam Jackson <ajax@redhat.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 69d8ea4a49793a94f821d1a328856901a1c02a5a
Author: Adam Jackson <ajax@redhat.com>
Date: Thu Oct 25 11:22:19 2018 -0400
xkb: Write the _XKB_RULES_NAMES window property synchronously
I can't think of a good reason why this would need to be deferred to the
work queue. When we get to this point we're never in the middle of
request processing, so we can't corrupt the event/reply stream.
Signed-off-by: Adam Jackson <ajax@redhat.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 0a95a8ae625accaf0ef5e2372ef7f65a52658d9d
Author: Adam Jackson <ajax@redhat.com>
Date: Tue Oct 23 15:07:48 2018 -0400
xwayland: Move command line fd initialization to InitOutput
Again, as this is DDX state not screen state, run it from DDX setup not
screen setup.
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit 08843efc5940563a2275c654804c999cfc772987
Author: Adam Jackson <ajax@redhat.com>
Date: Tue Oct 23 14:33:24 2018 -0400
xwayland: Move wm_fd and listen_fds out of xwl_screen
There are logically server state not screen state. Not that multiple
screens works, at the moment, but that's no excuse to be sloppy.
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit 2118e4471be037f2e642f35ff0494aa09177c9ee
Author: Marco Trevisan (Treviño) <mail@3v1n0.net>
Date: Sat Oct 27 03:54:09 2018 +0200
dix/events: reuse grab pointer value
commit 35e5a76cc1d02801fadd49d12e60664b02e4bebc
Author: Marco Trevisan (Treviño) <mail@3v1n0.net>
Date: Fri Oct 26 19:52:49 2018 +0200
Xi: Use current device active grab to deliver touch events if any
When Retrieving touch delivery data we need to check if we have an active
grab on such device, and in that case use it to delivery events.
If we don't do this, when rejecting the touch events in DeactivatePointerGrab,
we will end-up in creating an implicit grab that will change the device
deviceGrab's state, causing a recursion during TouchEndTouch.
Fixes #7
https://bugs.freedesktop.org/show_bug.cgi?id=96536
commit 700505144fcdd55b4bd1f6c30b7aa01bf848af11
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Sat Nov 10 15:00:31 2018 -0800
Remove obsolete B16 & B32 tags in struct definitions
They were defined as empty macros on all platforms except for the
long unsupported Cray systems which needed to use bitfields to define
types smaller than 64-bits.
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
commit 6ef025a8728282db6a233bde55789b114f916abb
Author: Michel Dänzer <michel.daenzer@amd.com>
Date: Tue Nov 6 11:33:19 2018 +0100
Revert "dix: Work around non-premultiplied ARGB cursor data harder"
This reverts commit b45c74f0f2868689e7ed695b33e8c60cd378df0b.
It broke the cursor in other games. Apparently those use cursor data
with premultiplied alpha, but with some pixels having r/g/b values
larger than the alpha value (which corresponds to original r/g/b
values > 1.0), triggering the workaround.
Seems the cure turned out worse than the disease, so revert.
Bugzilla: https://bugs.freedesktop.org/108650
commit c901adc327bce4c0d19caf350cbcb0cd5254f306
Author: Adam Jackson <ajax@redhat.com>
Date: Wed Oct 31 11:43:33 2018 -0400
modesetting: Hush an unimportant log message
Verbosity level 0 is "always print", just make it a normal message.
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit 52451f1f89890e3088c6fd9d7da0708fd9263950
Author: Adam Jackson <ajax@redhat.com>
Date: Wed Sep 5 12:10:20 2018 -0400
dix: De-ugly the prototype for Add{GPU,}Screen
commit e50c85f4ebf559a3bac4817b41074c43d4691779
Author: Eric Anholt <eric@anholt.net>
Date: Fri Oct 26 17:47:30 2018 -0700
Fix segfault on probing a non-PCI platform device on a system with PCI.
Some Broadcom set-top-box boards have PCI busses, but the GPU is still
probed through DT. We would dereference a null busid here in that
case.
Signed-off-by: Eric Anholt <eric@anholt.net>
commit 3297a1c871a25647d9d08b5f528e640cc2a1d2c2
Author: Adam Jackson <ajax@redhat.com>
Date: Wed Oct 24 16:30:40 2018 -0400
include: Remove ___CLIENTSIGNALALL_DEFINED___ copypasta
___CLIENTSIGNAL_DEFINED___ is a hack to work around the declaration of
ClientSignal both in our own headers and in <X11/include/fontproto.h>,
the latter of which is properly part of libXfont (1, only) but packaged
in xorgproto because we have made some mistakes. ClientSignalAll needs
no such workaround.
Signed-off-by: Adam Jackson <ajax@redhat.com>
Reviewed-by: Eric Anholt <eric@anholt.net>
commit 06f448d4af905412b1e0b4074f7763ec85f2b6e8
Author: Adam Jackson <ajax@redhat.com>
Date: Wed Oct 24 16:23:04 2018 -0400
include: Stop including <X11/fonts/fontproto.h>
Despite being packaged in xorgproto (formerly fontsproto), fontproto.h
is actually a list of the ABI libXfont version 1 expected of the X
server. We switched to libXfont2 three years ago, this is unnecessary.
Signed-off-by: Adam Jackson <ajax@redhat.com>
Reviewed-by: Eric Anholt <eric@anholt.net>
commit ace551d8a2603e37b18237a52f62d627c75d9e2a
Author: Michel Dänzer <michel.daenzer@amd.com>
Date: Thu Oct 18 17:42:01 2018 +0200
xwayland: Complete "synchronous" Present flips from xwl_present_msc_bump
Completing them from xwl_present_sync_callback had at least two issues:
* It was before the MSC was incremented in xwl_present_frame_callback,
so the MSC value in the completion event could be lower than the
target specified by the client. This could cause hangs with the Mesa
Vulkan drivers.
* It allowed clients to run at a frame-rate higher than the Wayland
compositor's frame-rate, wasting energy on generating frames which
were never displayed. This isn't expected to happen unless the client
specified PresentOptionAsync (in which case flips are still completed
from xwl_present_sync_callback, allowing higher frame-rates).
v2:
* Make xwl_present_has_events return true when there's a pending
"synchronous" flip, so those complete after at most ~1 second even if
the Wayland server doesn't send a frame event.
Bugzilla: https://bugs.freedesktop.org/106713
commit 2bfc46d4147dc0bec4cdbb80431a0f4cc1d3b030
Author: Michel Dänzer <michel.daenzer@amd.com>
Date: Thu Oct 18 17:36:24 2018 +0200
xwayland: Rename xwl_present_events_notify to xwl_present_msc_bump
And consolidate more code from xwl_present_timer_callback and
xwl_present_frame_callback in it.
commit 5e8b9a3a563047e3998d45e761f7a50e4b0f6cb3
Author: Michel Dänzer <michel.daenzer@amd.com>
Date: Wed Oct 24 11:23:05 2018 +0200
xwayland: Use xwl_present_reset_timer in xwl_present_timer_callback
Apart from simplifying the code, this should also prevent a condition
(which might only be possible with the following fix) reported in
https://gitlab.freedesktop.org/wayland/weston/issues/115#note_52467:
1. xwl_present_timer_callback indirectly calls xwl_present_reset_timer
-> xwl_present_free_timer
2. xwl_present_timer_callback then returns a non-0 value, so DoTimer
calls TimerSet with the old xwl_present_window->frame_timer pointer
which was freed in step 1 => use after free
Calling xwl_present_reset_timer explicitly passes NULL to TimerSet if
step 1 freed xwl_present_window->frame_timer, and it will allocate a new
one.
commit 036794bebce72a3fa2f95996d2e537ff568e0ff1
Author: Olivier Fourdan <ofourdan@redhat.com>
Date: Fri Oct 19 16:04:32 2018 +0200
xwayland: do not crash if `gbm_bo_create()` fails
The function `xwl_glamor_gbm_create_pixmap()` first creates a buffer
objects and then creates the xwl_pixmap from it.
However, `xwl_glamor_gbm_create_pixmap_for_bo()` is not called if the
buffer object creation fails, and `xwl_glamor_gbm_create_pixmap()`
simply returns `glamor_create_pixmap()`.
The problem with this is that if `xwl_glamor_gbm_create_pixmap_for_bo()`
is not called then neither is `xwl_pixmap_set_private()` and further
calls to `xwl_pixmap_get()` will return NULL and cause a NULL pointer
dereference if the return value is not checked:
#0 xwl_glamor_gbm_get_wl_buffer_for_pixmap ()
at hw/xwayland/xwayland-glamor-gbm.c:248
#1 xwl_window_post_damage () at hw/xwayland/xwayland.c:697
#2 xwl_display_post_damage () at hw/xwayland/xwayland.c:759
#3 block_handler () at hw/xwayland/xwayland.c:890
#4 BlockHandler () at dix/dixutils.c:388
#5 WaitForSomething () at os/WaitFor.c:201
#6 Dispatch () at dix/dispatch.c:421
#7 dix_main () at dix/main.c:276
#8 __libc_start_main () at ../csu/libc-start.c:308
#9 _start ()
(gdb) print xwl_pixmap
$1 = (struct xwl_pixmap *) 0x0
Make sure we check for `xwl_pixmap_get()` returned value where relevant
and fail gracefully if this is the case.
See also: https://gitlab.gnome.org/GNOME/mutter/issues/340
Signed-off-by: Olivier Fourdan <ofourdan@redhat.com>
Reviewed-by: Marco Trevisan <mail@3v1n0.net>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 32abc222880119eba0adf17897c3d8d1cc1f17db
Author: Olivier Fourdan <ofourdan@redhat.com>
Date: Mon Oct 22 11:54:31 2018 +0200
present: Remove `present_event_abandon()`
This has never been actually implemented, do not tempt people to use it.
Signed-off-by: Olivier Fourdan <ofourdan@redhat.com>
Reviewed-by: Michel Daenzer <michel.daenzer@amd.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
commit b768b7d6cec41b8b320c468ec41aab5a8b49b27b
Author: Olivier Fourdan <ofourdan@redhat.com>
Date: Mon Oct 22 11:48:25 2018 +0200
present/wnmd: Fix use after free on CRTC removal
Xwayland will add and remove CRTCs as Wayland outputs are added or
removed.
If there is a pending flip when this occurs, the
`xwl_present_sync_callback()` will be triggered after the Xwayland
output's RRCtrcPtr has been destroyed, hence causing a crash in Xwayland
while trying to use freed memory:
#1 abort ()
#2 OsAbort () at utils.c:1350
#3 AbortServer () at log.c:877
#4 FatalError () at log.c:1015
#5 OsSigHandler () at osinit.c:156
#6 <signal handler called>
#7 dixGetPrivate () at ../include/privates.h:122
#8 dixLookupPrivate () at ../include/privates.h:166
#9 present_screen_priv () at present_priv.h:198
#10 present_wnmd_flip () at present_wnmd.c:358
#11 present_wnmd_execute () at present_wnmd.c:466
#12 present_wnmd_re_execute () at present_wnmd.c:80
#13 xwl_present_sync_callback () at xwayland-present.c:287
#14 ffi_call_unix64 () from /lib64/libffi.so.6
#15 ffi_call () from /lib64/libffi.so.6
#16 wl_closure_invoke () at src/connection.c:1006
#17 dispatch_event () at src/wayland-client.c:1427
#18 dispatch_queue () at src/wayland-client.c:1573
#19 wl_display_dispatch_queue_pending () at src/wayland-client.c:1815
#20 wl_display_dispatch_pending () at src/wayland-client.c:1878
#21 xwl_read_events () at xwayland.c:814
#22 ospoll_wait () at ospoll.c:651
#23 WaitForSomething () at WaitFor.c:208
#24 Dispatch () at ../include/list.h:220
#25 dix_main () at main.c:276
To avoid the issue, get the `ScreenPtr` from the window instead of the
CRTC that might have been just freed, `xwl_present_flip()` has no use
for the CRTC anyway.
Bugzilla: https://bugs.freedesktop.org/108249
Suggested-by: Michel Daenzer <michel.daenzer@amd.com>
Signed-off-by: Olivier Fourdan <ofourdan@redhat.com>
Reviewed-by: Michel Daenzer <michel.daenzer@amd.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 8d048a1fd3e3806c408192d33e62859f5bc5c343
Author: Adam Jackson <ajax@redhat.com>
Date: Tue Oct 23 14:28:21 2018 -0400
os: Factor out CHECK_FOR_REQUIRED_ARGUMENTS
Lifted from vfb. xfree86 had almost the same thing but unparameterized,
port it to the vfb style.
Signed-off-by: Adam Jackson <ajax@redhat.com>
Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
commit b45c74f0f2868689e7ed695b33e8c60cd378df0b
Author: Michel Dänzer <michel.daenzer@amd.com>
Date: Thu Oct 25 10:50:03 2018 +0200
dix: Work around non-premultiplied ARGB cursor data harder
Turns out some apps (e.g. the Civilization VI game) use
non-premultiplied cursor data which doesn't have any pixels with 0 alpha
but non-0 non-alpha, but can still result in visual artifacts.
This uses the method suggested by Kamil in
https://bugs.freedesktop.org/92309#c19: check for pixels where any
colour component value is larger than the alpha value, which isn't
possible with premultiplied alpha.
There can still be non-premultiplied data which won't be caught by this,
but that should result in slightly incorrect colours and/or blending at
the worst, not wildly incorrect colours such as shown in the bug report
below.
Bugzilla: https://bugs.freedesktop.org/108355
Suggested-by: Kamil Paral <kamil.paral@gmail.com>
commit 248d164eae27f1f310266d78e52f13f64362f81e
Author: Matthieu Herrb <matthieu@herrb.eu>
Date: Tue Oct 23 21:29:09 2018 +0200
LogFilePrep: add a comment to the unsafe format string.
CVE-2018-14665 also made it possible to exploit this to access
memory. With -logfile forbidden when running with elevated privileges
this is no longer an issue.
Signed-off-by: Matthieu Herrb <matthieu@herrb.eu>
Reviewed-by: Adam Jackson <ajax@redhat.com>
commit 50c0cf885a6e91c0ea71fb49fa8f1b7c86fe330e
Author: Matthieu Herrb <matthieu@herrb.eu>
Date: Tue Oct 23 21:29:08 2018 +0200
Disable -logfile and -modulepath when running with elevated privileges
Could cause privilege elevation and/or arbitrary files overwrite, when
the X server is running with elevated privileges (ie when Xorg is
installed with the setuid bit set and started by a non-root user).
CVE-2018-14665
Issue reported by Narendra Shinde and Red Hat.
Signed-off-by: Matthieu Herrb <matthieu@herrb.eu>
Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Adam Jackson <ajax@redhat.com>
commit 08ff37d05a04a1ceed6086cfceae9c34331cb633
Author: Andreas Fett <a.fett@gmx.de>
Date: Mon Oct 22 22:03:22 2018 +0200
os/xdmcp: Fix binding of ipv6 source address
Choose the socket fd of the correct address family based
on the address family of the argument to the -from option.
Fixes: xorg/xserver#4
commit 96e00730e7ab4a5a2bea453b0ce84e4f8c93acd8
Author: Adam Jackson <ajax@redhat.com>
Date: Wed Oct 24 15:00:09 2018 -0400
xfree86: bump video ABI version to 25.0
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit cb0de153bf0c486da7e968ab0f258c9c0c9ed34a
Author: Michel Dänzer <michel.daenzer@amd.com>
Date: Fri Oct 19 18:27:37 2018 +0200
xwayland: Plug leaks in xwl_present_sync_callback
xwl_present_window->sync_callback was leaked.
The event memory was leaked if the corresponding buffer had already been
released.
commit 53d32c94f39b4a89f70fed2e102c5fb5d6cae8bc
Author: Adam Jackson <ajax@redhat.com>
Date: Tue Oct 23 14:09:55 2018 -0400
dix: Remove the magic WhenMapped backing store hack
Automatic compositing exists, if that's what you want then use it.
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit 382c26dade81a4c629307a3bfe6f5cca5af640e0
Author: Michel Dänzer <michel.daenzer@amd.com>
Date: Fri Oct 5 12:24:23 2018 +0200
glamor: Add support for exporting depth 15/8 pixmaps
This allows X to run with glamor at these depths.
commit a2d188c7db1baaf21b42c2e8bccf54c8d5486548
Author: Olivier Fourdan <ofourdan@redhat.com>
Date: Mon Oct 8 16:38:01 2018 +0200
xwayland: keep `xwl_present_timer_callback()` private
`xwl_present_timer_callback()` is initially marked a private and later
implemented as public.
Let's keep that private, shall we.
Signed-off-by: Olivier Fourdan <ofourdan@redhat.com>
commit 0816e8fca6194dfb4cc94c3a7fcb2c7f2a921386
Author: Adam Jackson <ajax@redhat.com>
Date: Tue Sep 18 14:37:51 2018 -0400
linux: Make platform device probe less fragile
At the point where xf86BusProbe runs we haven't yet taken our own VT,
which means we can't perform drm "master" operations on the device. This
is tragic, because we need master to fish the bus id string out of the
kernel, which we can only do after drmSetInterfaceVersion, which for
some reason stores that string on the device not the file handle and
thus needs master access.
Fortunately we know the format of the busid string, and it happens to
almost be the same as the ID_PATH variable from udev. Use that instead
and stop calling drmSetInterfaceVersion.
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit 71703e4e8bd00719eefad53c2ed6c604079f87ea
Author: rpm-build <rpm-build>
Date: Wed Oct 17 09:00:59 2018 +1000
xfree86: ensure the readlink buffer is null-terminated
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Dave Airlie <airlied@redhat.com>
commit ff91c696ff8f5f56da40e107cb5c321539758a81
Author: Michal Srb <msrb@suse.com>
Date: Tue Oct 16 09:32:13 2018 +0200
xfree86: Only switch to original VT if it is active.
If the X server is terminated while its VT is not active, it should
not change the current VT.
v2: Query current state in xf86CloseConsole using VT_GETSTATE instead of
keeping track in xf86VTEnter/xf86VTLeave/etc.
commit 7c25439f0db4c20a4eab4ed44262eb396305f58a
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Tue Oct 16 10:37:16 2018 +1000
xwayland: fix a realloc OOM error case
Found by coverity
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit bd5fe7593fd0df236f3b2be1f062166ddba7d67c
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Tue Oct 16 09:42:51 2018 +1000
xfree86: fix readlink call
Misplaced parenthesis caused us to compare the sizeof, not the readlink return
value.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit dda2323d239a48e50ac9fd6617d7b630d8a14235
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Tue Oct 16 09:39:54 2018 +1000
xwayland: make a if noop clearer to the compiler/coverity
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit fc78bcca21e767697de6ad4d8e03b6728856f613
Author: Adam Jackson <ajax@redhat.com>
Date: Wed Oct 10 14:09:11 2018 -0400
fbdevhw: Refuse to touch PCI devices on the fallback probe path
Fixes: https://gitlab.freedesktop.org/xorg/driver/xf86-video-fbdev/issues/9
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit af151895f3cb1755a7a5631f2398a3d3b219cbef
Author: Adam Jackson <ajax@redhat.com>
Date: Fri Oct 5 14:50:20 2018 -0400
glamor/egl: Avoid crashing on broken configurations
0a9415cf apparently can tickle bugs in the GL stack where glGetString
returns NULL, presumably because the eglMakeCurrent() didn't manage to
actually install a dispatch table and you're hitting a stub function.
That's clearly not our bug, but if it happens we should at least not
crash. Notice this case and fail gently.
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit 32677ce03d793a1f2aa8871112eb3d19b3cb762f
Author: Alexander Volkov <a.volkov@rusbitech.ru>
Date: Mon Feb 26 19:41:18 2018 +0300
os/xdmcp: Don't create a new socket in XdmcpReset()
xdmcpSocket survives during the reset, there is no
need to create a new one.
This commit restores logic that was broken by
49c0f2413d32fdfe36e45861fcb32aaeab633094 in Xorg 1.19.
Signed-off-by: Alexander Volkov <a.volkov@rusbitech.ru>
commit 1bd5d0a53c5ff4169c5a6704c1c4b276f998b938
Author: Pierre Ossman <ossman@cendio.se>
Date: Wed Oct 3 10:28:52 2018 +0200
Switch automatic composite update to WorkQueue
It is currently (ab)using the screen BlockHandler callback to do
this. But this can cause problems with other extension as their
block handlers might have executed before Composite's. And the
operations Composite does might result in them wanting to change
timeouts.
Practically this caused problems for TigerVNC's VNC extension which
failed to send out updates for Composite's screen updates.
commit 43a0f9a5dbb469f4f403a8530f33be67618933b8
Author: Adam Jackson <ajax@redhat.com>
Date: Mon Oct 1 11:42:37 2018 -0400
modesetting: Don't free(dst) in drmmode_prop_info_copy
The destination is always either on the stack or in the middle of some
struct.
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit 361894497c6802b62c2da4a3dc7e98939fb24404
Author: Olivier Fourdan <ofourdan@redhat.com>
Date: Wed Sep 26 15:40:32 2018 +0200
xwayland: search for a render node to use
wl_drm's protocol "device" event provides the path to the DRM device,
which may not be a render node, thus causing Xwayland to fall back to
DRM authentication which may fail if the user has switched to another
VT while Xwayland is starting.
Search for a render node corresponding to the given DRM device and try
to use it instead, as render nodes do not need DRM authentication and
Xwayland can make use of them if it can find one.
Closes: https://bugs.freedesktop.org/108038
Signed-off-by: Olivier Fourdan <ofourdan@redhat.com>
commit 03b2125005b1c8d4eb62a4173a74458bbe72807b
Author: Adam Jackson <ajax@redhat.com>
Date: Tue Aug 7 15:40:13 2018 -0400
dix: Remove LegalModifier()
This hasn't done anything besides return TRUE in a long long time.
Reviewed-by: Eric Anholt <eric@anholt.net>
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit a23eba2a91024d27da45e5aee1f4215f7ec2ae82
Author: Adam Jackson <ajax@redhat.com>
Date: Mon Nov 20 14:28:13 2017 -0500
dix: Merge AbortDDX into ddxGiveUp
These are so close to identical that most DDXes implement one in terms
of the other. All the relevant cases can be distinguished by the error
code, so merge the functions together to make things simpler.
Reviewed-by: Eric Anholt <eric@anholt.net>
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit d78ac2f15913bf6f00e06986cc7db0ade9ebd806
Author: Adam Jackson <ajax@redhat.com>
Date: Tue Aug 7 15:16:16 2018 -0400
mi: Factor out miSaveScreen
Reviewed-by: Eric Anholt <eric@anholt.net>
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit 0a9415cf793babed1f28c61f8047d51de04f1528
Author: Adam Jackson <ajax@redhat.com>
Date: Fri Sep 14 11:33:43 2018 -0400
glamor_egl: Don't initialize on llvmpipe
Mesa started supporting GL_OES_EGL_image on llvmpipe in 17.3, after this
commit:
commit bbdeddd5fd0b797e1e281f058338b3da4d98029d
Author: Gurchetan Singh <gurchetansingh@chromium.org>
Date: Tue Aug 1 14:49:33 2017 -0700
st/dri: add drisw image extension
That's pretty cool, but it means glamor now thinks it can initialize on
llvmpipe. This is almost certainly not what anyone wants, as glamor on
llvmpipe is pretty much uniformly slower than fb.
This fixes both Xorg and Xwayland to refuse glamor in such a setup.
Xephyr is left alone, both because glamor is not the default there and
because Xephyr+glamor+llvmpipe is one of the easier ways to get xts to
exercise glamor.
The (very small) downside of this change is that you lose DRI3 support.
This wouldn't have helped you very much (since an lp glamor blit is
slower than a pixman blit), but it would eliminate the PutImage overhead
for llvmpipe's glXSwapBuffers. A future change should add DRI3 support
for the fb-only case.
Reviewed-by: Eric Anholt <eric@anholt.net>
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit feca61cdb5351bbe178f7083938a973703aff866
Author: Jon Turney <jon.turney@dronecode.org.uk>
Date: Thu Sep 27 22:23:14 2018 +0100
test: Initialize the pixmap in damage test
commit d1c00c859c6676fbb540420c9055788bc19cb18f
Author: Adam Jackson <ajax@redhat.com>
Date: Tue Aug 28 15:58:54 2018 -0400
xfree86: Remove -flippixels
No supported driver supports 1bpp anymore, nor has in a very long time.
This option only worked with vgahw anyway.
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit 2bd631810d910975a5df55c0e76b02856d53688d
Author: Adam Jackson <ajax@redhat.com>
Date: Thu Sep 13 16:11:23 2018 -0400
automake: Fix Linux build with --disable-apm --disable-acpi
Fixes: accd32a4 (xorg: Remove the XF86PM define.)
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit 89901e14d2f98def2399fd0546838721e7ac452d
Author: Eric Anholt <eric@anholt.net>
Date: Wed Sep 19 18:02:41 2018 -0700
test: Add the start of a testsuite for damage.
Inspired by the previous bug, build something we can use to write
damage testcases, including testing for the bug.
Signed-off-by: Eric Anholt <eric@anholt.net>
commit bc36594e0eb8bfa5a673bcfd8c8168f70994a1df
Author: Cedric Roux <sed@free.fr>
Date: Wed Sep 12 19:14:18 2018 +0200
miext/damage: take care of the coordinate mode in damagePolyPoint
The mode (CoordModeOrigin or CoordModePrevious) was not taken into
account when computing the box. The result was a bad drawing of
points in some situations (on my hardware/software configuration,
calling XDrawString followed by XDrawPoints in the mode
CoordModePrevious).
Signed-off-by: Cedric Roux <sed@free.fr>
Signed-off-by: Eric Anholt <eric@anholt.net>
commit 734b2d6907f730571a2805cbc53fe7056190f19e
Author: Olivier Fourdan <ofourdan@redhat.com>
Date: Thu Sep 20 16:32:29 2018 +0200
xwayland: Use `double` for `xwl_tablet_tool`
So we do not lose subpixel precision in Xwayland.
Suggested-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Olivier Fourdan <ofourdan@redhat.com>
Closes: https://gitlab.freedesktop.org/libinput/libinput/issues/138
commit 2f424df0ca340b1c4e47d9461b04a2c5ec3ec649
Author: Jon Turney <jon.turney@dronecode.org.uk>
Date: Tue May 2 14:00:47 2017 +0100
hw/xwin/glx: Fix logging about WGL pxfs with overlays
Signed-off-by: Jon Turney <jon.turney@dronecode.org.uk>
Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
commit d63f9dddeb0c656af2b8c6135cc40a76f0b5604f
Author: Jon Turney <jon.turney@dronecode.org.uk>
Date: Fri Jul 15 15:18:36 2016 +0100
hw/xwin/glx: Use multisample attributes with wglChoosePixelFormatARB()
Seems like this was omitted in error
Signed-off-by: Jon Turney <jon.turney@dronecode.org.uk>
Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
commit e3398d921be74df9c5d23408f39e70548df896d8
Author: Jon Turney <jon.turney@dronecode.org.uk>
Date: Fri Jul 15 15:15:18 2016 +0100
hw/xwin/glx: Add GLX_ARB_framebuffer_sRGB extension
v2:
Fix a bogus warning about a missing pixelformat attribute issued for every
pixelformat when WGL_ARB_framebuffer_sRGB isn't available
Signed-off-by: Jon Turney <jon.turney@dronecode.org.uk>
Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
commit 1fc240c6877e44fc9e6d85837dc2d27e26193291
Author: Jon Turney <jon.turney@dronecode.org.uk>
Date: Fri Jul 15 13:46:45 2016 +0100
hw/xwin/glx: publish GLX create_context extensions
Future work: To properly support GLX_ARB_create_context in indirect mode, we
need to use wglCreateContextAttribsARB() rather than wglCreateContext(),
when attribs are provided, rather than just dropping attribs on the floor,
as we currently do.
That probably entails removing the deferred context creation and instead
using a temporary window, as direct WGL does.
Signed-off-by: Jon Turney <jon.turney@dronecode.org.uk>
Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
commit 67b47d50dfb5f7a994ae44708d1b1ef1c42537b5
Author: Jon Turney <jon.turney@dronecode.org.uk>
Date: Fri Jul 15 14:06:32 2016 +0100
hw/xwin/glx: Add support for float format fbconfig GLX extensions
v2:
Set renderType more correctly
Signed-off-by: Jon Turney <jon.turney@dronecode.org.uk>
Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
commit 6be9681eb9eb6645b19c09f7b3b6d5b5bef8866d
Author: Jon Turney <jon.turney@dronecode.org.uk>
Date: Fri Jul 15 14:02:10 2016 +0100
hw/xwin/glx: Make WGL -> GLX extension mapping table-driven
Signed-off-by: Jon Turney <jon.turney@dronecode.org.uk>
Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
commit ad6b4113cd27e7c57908081c0a20ab956d418f06
Author: Jon Turney <jon.turney@dronecode.org.uk>
Date: Thu Jul 24 12:26:22 2014 +0100
hw/xwin/glx: Fallback to ChoosePixelFormat() if wglChoosePixelFormatARB() fails
In glxWinSetPixelFormat() handle the case where wglChoosePixelFormatARB()
fails and fallback to ChoosePixelFormat()
It seems for some drivers, wglChoosePixelFormatARB() can fail when the
provided DC doesn't belong to the driver (e.g. it's a compatible DC for a
bitmap, so allow a fallback to ChoosePixelFormat() if it fails.
Signed-off-by: Jon Turney <jon.turney@dronecode.org.uk>
Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
commit 8c0adf404a25407995dae79664ef4875ce093497
Author: Jon Turney <jon.turney@dronecode.org.uk>
Date: Sat Jan 11 16:35:31 2014 +0000
hw/xwin/glx: Don't create fbConfigs for un-accelerated pixelFormats
Exposing these pixelFormats is problematic: they are provided by the 'GDI
Generic' renderer, which doesn't support the same set of extensions as the
IGD providing the more capable pixelFormats.
Signed-off-by: Jon Turney <jon.turney@dronecode.org.uk>
Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
commit 6a2ce6c5da9456b97683db6224f38ef3b02cce4b
Author: Ross Burton <ross.burton@intel.com>
Date: Thu Sep 20 13:21:34 2018 +0100
compiler.h: only use inx/outx on ARM with glibc
musl only implements inx/outx on x86, so check for __GLIBC__ instead of
__linux__.
Signed-off-by: Ross Burton <ross.burton@intel.com>
commit 5f65a6246fe752764045dd1e38912f1dccec71e4
Author: Ross Burton <ross.burton@intel.com>
Date: Thu Sep 20 20:12:24 2018 +0100
xorg-server.m4: just all cflags instead of just sdkdir
Instead of fetching just the sdkdir variable of xorg-server using pkg-config,
simply get all of the CFLAGS. Aside from completeness, this helps builds in
sysroots as pkg-config knows what to do with --cflags but doesn't remap
arbitrary variables.
Signed-off-by: Ross Burton <ross.burton@intel.com>
commit 19f6cb570becbc4e355807199c6e251fc7935132
Author: Eric Anholt <eric@anholt.net>
Date: Wed Sep 19 13:28:06 2018 -0700
shm: Pick the shm dir at run time, not build time.
Prodding the builder's filesystem for tmp dirs doesn't necessarily
tell you anything about what the actual host's filesystem is going to
look like, so we should just try the dirs at runtime.
Signed-off-by: Eric Anholt <eric@anholt.net>
commit 804a9b4f57107fa2d0ed1ae0becda5bebaffe6e1
Author: Eric Anholt <eric@anholt.net>
Date: Wed Sep 19 13:20:12 2018 -0700
shm: reindent shm_tmpfile to follow our standards.
Signed-off-by: Eric Anholt <eric@anholt.net>
commit b8b64cd627232a1fed791b8baf562900144bf186
Author: Eric Anholt <eric@anholt.net>
Date: Wed Sep 19 13:12:40 2018 -0700
xorg: Don't log "Build Operating System: Linux 4.9.0-5-amd64 x86_64 Debian"
I don't think this is useful information to have in the log, and it's
a bunch of autotools and meson logic to produce it.
Signed-off-by: Eric Anholt <eric@anholt.net>
commit bfa6e84641fc7473fc2eb7e0e872e6b9fc339c2a
Author: Eric Anholt <eric@anholt.net>
Date: Wed Sep 19 13:07:16 2018 -0700
meson: Add configure option and autodetection of HAVE_INPUTTHREAD.
Signed-off-by: Eric Anholt <eric@anholt.net>
commit a56da0ff2814f86af08668610327082b8e2f4308
Author: Adam Jackson <ajax@redhat.com>
Date: Wed Sep 12 17:19:38 2018 -0400
include: Remove now-dead declarations
60ec8ead broke the autotools build:
sdksyms.o:(.data+0x58): undefined reference to `InitConnectionLimits'
sdksyms.o:(.data+0x2ec8): undefined reference to `xf86ServerName'
collect2: error: ld returned 1 exit status
Makefile:811: recipe for target 'Xorg' failed
Likewise 3a4d7c79 for InitConnectionLimits.
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit a2c1260958fb8b4ec81b9107c5d1ca222cc7d770
Author: Adam Jackson <ajax@redhat.com>
Date: Mon Aug 27 15:02:50 2018 -0400
xfree86: Remove vestigial lastScrnFlag
Only the mga XAA code ever set this (hence the compat macro), since XAA
is long gone this can go too.
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit c7414f4d07b69a4b2f0d0af06f032393cf5fe6aa
Author: Adam Jackson <ajax@redhat.com>
Date: Wed Aug 22 14:57:05 2018 -0400
xfree86: Remove NoTrapSignals
This was dangerous on UMS and largely pointless on KMS.
commit d1aeaad5c6fc614c28129f5d2717c12ff7320081
Author: Adam Jackson <ajax@redhat.com>
Date: Wed Aug 22 12:30:32 2018 -0400
xfree86: Remove a fallback path we never hit
If it's really this important we should just do it and not complain. We
never do it so it must not matter.
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit 771980fc02c79bb44e8cee48da9ba159e6baeaa6
Author: Adam Jackson <ajax@redhat.com>
Date: Mon Aug 20 17:01:24 2018 -0400
xfree86: Remove some not-terribly-useful debugging
I'm sure printing the address of function pointers in modules you'd
loaded might have made sense back when we rolled our own dlopen, but we
got better.
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit 6a094185d14db6818d98a320c59e0c4d7d43d5a8
Author: Adam Jackson <ajax@redhat.com>
Date: Wed Aug 22 11:18:58 2018 -0400
xfree86: Remove some redundant zero-fill for ScrnInfoRec
xf86AllocateScreen() callocs these for us.
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit 60ec8eadc370a9b06cc3f105974c0c6b8ad1bb4e
Author: Adam Jackson <ajax@redhat.com>
Date: Tue Aug 21 15:09:03 2018 -0400
xfree86: Remove unused xf86GetServerName()
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit a41ccaa0857146e986f11360d4f2aeb3913af9a6
Author: Adam Jackson <ajax@redhat.com>
Date: Wed Sep 12 15:45:52 2018 -0400
gitlab: Skip the docker-in-docker step
No idea which cult's cargo I was looking at there. Cuts about a minute
off the build time.
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit 3a4d7c79e7fb14c6f914db921c3dce1c22f62cd9
Author: Adam Jackson <ajax@redhat.com>
Date: Wed Aug 29 15:48:28 2018 -0400
dix: Remove MaxClients
This variable was no longer being read anywhere. MAXCLIENTS the macro is
the compile-time maximum limit, LIMITCLIENTS the macro is the default
limit, LimitClients the variable is the limit for the current server.
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit 7d689f049c3cc16b8e0cb0103a384a2ceb84ea33
Author: Adam Jackson <ajax@redhat.com>
Date: Wed Aug 29 15:42:20 2018 -0400
xfree86: Fix Option "MaxClients" validation
The old code would not in fact validate the option value, though it
might complain about it in the log. It also didn't let you set some
legal values that the -maxclients command line option would.
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit d791c8e5abc174ae589d954b0beb51d232f60019
Author: Adam Jackson <ajax@redhat.com>
Date: Mon Aug 27 16:42:42 2018 -0400
dga: Make shutdown less magical and/or terrifying
DGAShutdown() walks every screen and attempts to reset the mode. That's
maybe a reasonable thing to do, although the explicit loop is certainly
a bad smell.
In ddxGiveUp it's called after we've torn down the vga arbiter - and in
fact most of the rest of screen state - which is... very very bad. The
other place it's called is from the Control-Alt-BackSpace handler, where
we don't even attempt to do vga arb setup, and where in any case we're
going to escape the main loop eventually anyway.
Move all that cleanup work inside DGACloseScreen. This means it happens
earlier in server teardown than previously, but not in a way you're ever
going to be upset about.
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit 3d06d111b272d495c2f12779097a3d9f1e632603
Author: Adam Jackson <ajax@redhat.com>
Date: Mon Aug 27 16:39:10 2018 -0400
dga: Simplify mieq handler registration
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit 801977e8252f87f9ab156c7e02ad00fb1d70f8e5
Author: Adam Jackson <ajax@redhat.com>
Date: Mon Aug 27 16:34:20 2018 -0400
mi: Hush mieqSetHandler for no-op changes
If we set the handler to the thing it's already set to, that's fine.
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit ba0f5d854f4db52974ab5cd09191303b01b075ff
Author: Dave Airlie <airlied@redhat.com>
Date: Wed Sep 12 11:39:32 2018 +1000
devices: break after finding and removing device from lists
Coverity complains about a use after free in here after the
freeing, I can't follow the linked list so well, but whot
says the device can only be on one list once, so break should
fix it.
Signed-off-by: Dave Airlie <airlied@redhat.com>
commit c4591ea17110b5c318a5ef4b0f17a4eea306ea71
Author: Dave Airlie <airlied@redhat.com>
Date: Wed Sep 12 11:12:51 2018 +1000
mibltblt: free prgnSrcClip on error path.
Pointed out by coverity.
Signed-off-by: Dave Airlie <airlied@redhat.com>
commit 758393951233d1b2520cf4cefd33ec4288a3880a
Author: Dave Airlie <airlied@redhat.com>
Date: Wed Sep 12 11:09:40 2018 +1000
xkb: fix what looks to be a copy-paste error with first vs firstMM
Pointed out by coverity.
Signed-off-by: Dave Airlie <airlied@redhat.com>
commit cad3a1a82da3c8421b5cc98af27a779a38b5c709
Author: Dave Airlie <airlied@redhat.com>
Date: Wed Sep 12 11:05:45 2018 +1000
posix_tty: free leak of xf86SetStrOption return value.
Pointed out by coverity.
Signed-off-by: Dave Airlie <airlied@redhat.com>
commit b6c29a881eb49300fddfd0187cb10891f5257d3b
Author: Dave Airlie <airlied@redhat.com>
Date: Wed Sep 12 10:56:40 2018 +1000
modesetting: get pEnt after error checks
This saves us having to make sure we clean it up.
Pointed out by coverity.
Signed-off-by: Dave Airlie <airlied@redhat.com>
commit f0a5c0d1fdaeee3cd701215f4f57b7eacaf783c2
Author: Dave Airlie <airlied@redhat.com>
Date: Wed Sep 12 10:52:25 2018 +1000
glamor: fix leak of fs_getcolor_source.
This is created using XNFstrdup, so it needs to be freed.
Pointed out by coverity.
Signed-off-by: Dave Airlie <airlied@redhat.com>
commit c7fa6a0a0d4ad28ee21b8dd9ad4fbe33f462bc71
Author: Dave Airlie <airlied@redhat.com>
Date: Wed Sep 12 10:50:21 2018 +1000
fboverlay: move bpp checks above malloc
Avoids having to free the malloced object.
Pointed out by coverity.
Signed-off-by: Dave Airlie <airlied@redhat.com>
commit 51ae6126dcf3e234d0f678f02934bc9515abb8ae
Author: Dave Airlie <airlied@redhat.com>
Date: Wed Sep 12 10:33:04 2018 +1000
xi: free modifiers_failed on error path. (v2)
Pointed out by coverity.
v2: set modifies_failed to NULL at start (whot)
Signed-off-by: Dave Airlie <airlied@redhat.com>
commit 3439929c510501929c6ef1d90477c33bf8838632
Author: Dave Airlie <airlied@redhat.com>
Date: Wed Sep 12 10:30:13 2018 +1000
shm: move shmsize verify before allocating the drawable.
Otherwise if the VERIFY_SHMSIZE macro fails we leak the drawables
we allocated earlier.
Noticed by coverity scan.
Signed-off-by: Dave Airlie <airlied@redhat.com>
commit 047794e3503774c576a815cc170663cbcff198dd
Author: Adam Jackson <ajax@redhat.com>
Date: Tue Sep 11 10:33:25 2018 -0400
xselinux: warning fix
../Xext/xselinux_ext.c: In function ‘SELinuxExtensionInit’:
../Xext/xselinux_ext.c:692:21: warning: variable ‘extEntry’ set but not used [-Wunused-but-set-variable]
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit f4115bcc8c5f9d30ccfca5d5a7fc27acded02864
Author: Julien Isorce <julien.isorce@gmail.com>
Date: Tue Sep 11 10:28:33 2018 -0700
glamor: add support for NV12 in Xv
Useful when video decoders only output NV12. Currently
glamor Xv only supports I420 and YV12.
Note that Intel's sna supports I420, YV12, YUY2, UYVY, NV12.
Test: xvinfo | grep NV12
Test: gst-launch-1.0 videotestsrc ! video/x-raw, format=NV12 ! xvimagesink
v2: Combine the two texture2Ds on u_sampler.
Signed-off-by: Julien Isorce <jisorce@oblong.com>
Tested-by: Olivier Fourdan <ofourdan@redhat.com>
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
commit 44f5885686a30776160891e09cd4453afb9d5ade
Author: Julien Isorce <julien.isorce@gmail.com>
Date: Thu Sep 6 15:38:14 2018 -0700
glamor: add support for GL_RG
Allow to upload the CbCr plane of an NV12 image into a GL texture.
Signed-off-by: Julien Isorce <jisorce@oblong.com>
Tested-by: Olivier Fourdan <ofourdan@redhat.com>
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
commit f98ff253c722da3f5ad747e6813752f9e74c54b5
Author: Julien Isorce <julien.isorce@gmail.com>
Date: Thu Sep 6 15:38:13 2018 -0700
xfree86: define FOURCC_NV12 and XVIMAGE_NV12
Useful for glamor.
Signed-off-by: Julien Isorce <jisorce@oblong.com>
Tested-by: Olivier Fourdan <ofourdan@redhat.com>
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
commit fc855216028e6a34b667c11e198aea405fb4bc00
Author: Adam Jackson <ajax@redhat.com>
Date: Thu Aug 9 09:55:23 2018 -0400
Remove old region API conversion scripts
This was eight years ago, if you still need these you're in a bad place.
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit c4f3e42fe316c90a73908a838ce64abbb28fe0a2
Author: Adam Jackson <ajax@redhat.com>
Date: Wed Aug 29 16:07:59 2018 -0400
modesetting: Document Option "DoubleShadow" in the man page
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit 0dc2c419e11cf28b8fa1e607d4cf2d15f2eb2306
Author: Adam Jackson <ajax@redhat.com>
Date: Wed Aug 29 15:57:46 2018 -0400
modesetting: Lie less in the man page
We don't support 8bpp, and we do have acceleration.
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit 3f31f56929e80001970e3821ed8b10c6075df8e6
Author: Olivier Fourdan <ofourdan@redhat.com>
Date: Wed Sep 5 10:49:27 2018 +0200
xwayland: Remove xwl_present_window from privates on cleanup
Xwayland's `xwl_destroy_window()` invokes `xwl_present_cleanup()`
before the common `DestroyWindow()`.
But then `DestroyWindow()` calls `present_destroy_window()` which will
possibly end up in `xwl_present_abort_vblank()` which will try to access
data that was previously freed by `xwl_present_cleanup()`:
Invalid read of size 8
at 0x434184: xwl_present_abort_vblank (xwayland-present.c:378)
by 0x53785B: present_wnmd_abort_vblank (present_wnmd.c:651)
by 0x53695A: present_free_window_vblank (present_screen.c:87)
by 0x53695A: present_destroy_window (present_screen.c:152)
by 0x42A90D: xwl_destroy_window (xwayland.c:653)
by 0x584298: compDestroyWindow (compwindow.c:613)
by 0x53CEE3: damageDestroyWindow (damage.c:1570)
by 0x4F1BB8: DbeDestroyWindow (dbe.c:1326)
by 0x46F7F6: FreeWindowResources (window.c:1031)
by 0x472847: DeleteWindow (window.c:1099)
by 0x46B54C: doFreeResource (resource.c:880)
by 0x46C706: FreeClientResources (resource.c:1146)
by 0x446ADE: CloseDownClient (dispatch.c:3473)
Address 0x182abde0 is 80 bytes inside a block of size 112 free'd
at 0x4C2FDAC: free (vg_replace_malloc.c:530)
by 0x42A937: xwl_destroy_window (xwayland.c:647)
by 0x584298: compDestroyWindow (compwindow.c:613)
by 0x53CEE3: damageDestroyWindow (damage.c:1570)
by 0x4F1BB8: DbeDestroyWindow (dbe.c:1326)
by 0x46F7F6: FreeWindowResources (window.c:1031)
by 0x472847: DeleteWindow (window.c:1099)
by 0x46B54C: doFreeResource (resource.c:880)
by 0x46C706: FreeClientResources (resource.c:1146)
by 0x446ADE: CloseDownClient (dispatch.c:3473)
by 0x446DA5: ProcKillClient (dispatch.c:3279)
by 0x4476AF: Dispatch (dispatch.c:479)
Block was alloc'd at
at 0x4C30B06: calloc (vg_replace_malloc.c:711)
by 0x433F46: xwl_present_window_get_priv (xwayland-present.c:54)
by 0x434228: xwl_present_get_crtc (xwayland-present.c:302)
by 0x539728: proc_present_query_capabilities (present_request.c:227)
by 0x4476AF: Dispatch (dispatch.c:479)
by 0x44B5B5: dix_main (main.c:276)
by 0x75F611A: (below main) (libc-start.c:308)
This is because `xwl_present_cleanup()` frees the memory but does not
remove it from the window's privates, and `xwl_present_abort_vblank()`
will still find it and hence try to access that freed memory...
Remove `xwl_present_window` from window's privates on cleanup so that no
other function can find and reuse that data once it's freed.
Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=1616269
Signed-off-by: Olivier Fourdan <ofourdan@redhat.com>
commit 53ce2ba0a19af9c549f47a4cc678afcebeb6087e
Author: Lionel Landwerlin <lionel.g.landwerlin@intel.com>
Date: Tue Aug 28 21:30:05 2018 +0100
xwayland: fix access to invalid pointer
xwl_output->randr_crtc is used in the update_screen_size() function :
==5331== Invalid read of size 4
==5331== at 0x15263D: update_screen_size (xwayland-output.c:190)
==5331== by 0x152C48: xwl_output_remove (xwayland-output.c:413)
==5331== by 0x6570FCD: ffi_call_unix64 (in /usr/lib/x86_64-linux-gnu/libffi.so.6.0.4)
==5331== by 0x657093E: ffi_call (in /usr/lib/x86_64-linux-gnu/libffi.so.6.0.4)
==5331== by 0x4DDB183: ??? (in /usr/lib/x86_64-linux-gnu/libwayland-client.so.0.3.0)
==5331== by 0x4DD79D8: ??? (in /usr/lib/x86_64-linux-gnu/libwayland-client.so.0.3.0)
==5331== by 0x4DD8EA3: wl_display_dispatch_queue_pending (in /usr/lib/x86_64-linux-gnu/libwayland-client.so.0.3.0)
==5331== by 0x14BCCA: xwl_read_events (xwayland.c:814)
==5331== by 0x2AC0D0: ospoll_wait (ospoll.c:651)
==5331== by 0x2A5322: WaitForSomething (WaitFor.c:208)
==5331== by 0x27574B: Dispatch (dispatch.c:421)
==5331== by 0x279945: dix_main (main.c:276)
==5331== Address 0x1aacb5f4 is 36 bytes inside a block of size 154 free'd
==5331== at 0x48369EB: free (vg_replace_malloc.c:530)
==5331== by 0x1F8AE8: RROutputDestroyResource (rroutput.c:421)
==5331== by 0x29A2AC: doFreeResource (resource.c:880)
==5331== by 0x29AE5B: FreeResource (resource.c:910)
==5331== by 0x152BE0: xwl_output_remove (xwayland-output.c:408)
==5331== by 0x6570FCD: ffi_call_unix64 (in /usr/lib/x86_64-linux-gnu/libffi.so.6.0.4)
==5331== by 0x657093E: ffi_call (in /usr/lib/x86_64-linux-gnu/libffi.so.6.0.4)
==5331== by 0x4DDB183: ??? (in /usr/lib/x86_64-linux-gnu/libwayland-client.so.0.3.0)
==5331== by 0x4DD79D8: ??? (in /usr/lib/x86_64-linux-gnu/libwayland-client.so.0.3.0)
==5331== by 0x4DD8EA3: wl_display_dispatch_queue_pending (in /usr/lib/x86_64-linux-gnu/libwayland-client.so.0.3.0)
==5331== by 0x14BCCA: xwl_read_events (xwayland.c:814)
==5331== by 0x2AC0D0: ospoll_wait (ospoll.c:651)
==5331== Block was alloc'd at
==5331== at 0x48357BF: malloc (vg_replace_malloc.c:299)
==5331== by 0x1F93E0: RROutputCreate (rroutput.c:83)
==5331== by 0x152A75: xwl_output_create (xwayland-output.c:361)
==5331== by 0x14BE59: registry_global (xwayland.c:764)
==5331== by 0x6570FCD: ffi_call_unix64 (in /usr/lib/x86_64-linux-gnu/libffi.so.6.0.4)
==5331== by 0x657093E: ffi_call (in /usr/lib/x86_64-linux-gnu/libffi.so.6.0.4)
==5331== by 0x4DDB183: ??? (in /usr/lib/x86_64-linux-gnu/libwayland-client.so.0.3.0)
==5331== by 0x4DD79D8: ??? (in /usr/lib/x86_64-linux-gnu/libwayland-client.so.0.3.0)
==5331== by 0x4DD8EA3: wl_display_dispatch_queue_pending (in /usr/lib/x86_64-linux-gnu/libwayland-client.so.0.3.0)
==5331== by 0x14BCCA: xwl_read_events (xwayland.c:814)
==5331== by 0x2AC0D0: ospoll_wait (ospoll.c:651)
==5331== by 0x2A5322: WaitForSomething (WaitFor.c:208)
Signed-off-by: Lionel Landwerlin <lionel.g.landwerlin@intel.com>
Reviewed-by: Daniel Stone <daniels@collabora.com>
commit 75448671abe2c6ae3745eb5d2ed2e76df2de9c41
Author: Olivier Fourdan <ofourdan@redhat.com>
Date: Wed Sep 5 15:20:17 2018 +0200
glx: check for indirect context in CreateContextAttribsARB()
Commit 99f0365b "Add a command line argument for disabling indirect GLX"
added a test to check if indirect context are enabled in
`DoCreateContext()` but `__glXDisp_CreateContextAttribsARB()` doesn't
use `DoCreateContext()` and doesn't check if indirect context is
enabled.
As a result, clients can still manage to create indirect contexts using
`glXCreateContextAttribsARB()` even if indirect contexts are disabled,
which can possibly crash Xservers such as Xwayland or Xephyr when the
context is destroyed.
To avoid the issue, check for `enableIndirectGLX` in
`__glXDisp_CreateContextAttribsARB()` as well.
Fixes: 99f0365b "Add a command line argument for disabling indirect GLX"
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=107508
Signed-off-by: Olivier Fourdan <ofourdan@redhat.com>
commit ce271535adb6974e0a43bb64c8ed7a5dcaff67a2
Author: Lionel Landwerlin <lionel.g.landwerlin@intel.com>
Date: Mon Aug 27 01:04:45 2018 +0100
present: fix freed pointer access
When a vblank has been marked as aborted, it's going to be free in the
flip_notify function when stopped. We can't notify it after it's
stopped because the pointer is invalid.
Valgrind backtrace:
==5331== Invalid read of size 8
==5331== at 0x212B4D: present_vblank_notify (present_vblank.c:34)
==5331== by 0x21439B: present_wnmd_flip_notify (present_wnmd.c:194)
==5331== by 0x21439B: present_wnmd_event_notify (present_wnmd.c:228)
==5331== by 0x156216: xwl_present_sync_callback (xwayland-present.c:282)
==5331== by 0x6570FCD: ffi_call_unix64 (in /usr/lib/x86_64-linux-gnu/libffi.so.6.0.4)
==5331== by 0x657093E: ffi_call (in /usr/lib/x86_64-linux-gnu/libffi.so.6.0.4)
==5331== by 0x4DDB183: ??? (in /usr/lib/x86_64-linux-gnu/libwayland-client.so.0.3.0)
==5331== by 0x4DD79D8: ??? (in /usr/lib/x86_64-linux-gnu/libwayland-client.so.0.3.0)
==5331== by 0x4DD8EA3: wl_display_dispatch_queue_pending (in /usr/lib/x86_64-linux-gnu/libwayland-client.so.0.3.0)
==5331== by 0x14BCCA: xwl_read_events (xwayland.c:814)
==5331== by 0x2AC0D0: ospoll_wait (ospoll.c:651)
==5331== by 0x2A5322: WaitForSomething (WaitFor.c:208)
==5331== by 0x27574B: Dispatch (dispatch.c:421)
==5331== Address 0x1b44dc98 is 40 bytes inside a block of size 184 free'd
==5331== at 0x48369EB: free (vg_replace_malloc.c:530)
==5331== by 0x213B0A: present_wnmd_free_idle_vblanks (present_wnmd.c:118)
==5331== by 0x213B0A: present_wnmd_flips_stop (present_wnmd.c:161)
==5331== by 0x2143EF: present_wnmd_flip_notify (present_wnmd.c:192)
==5331== by 0x2143EF: present_wnmd_event_notify (present_wnmd.c:228)
==5331== by 0x156216: xwl_present_sync_callback (xwayland-present.c:282)
==5331== by 0x6570FCD: ffi_call_unix64 (in /usr/lib/x86_64-linux-gnu/libffi.so.6.0.4)
==5331== by 0x657093E: ffi_call (in /usr/lib/x86_64-linux-gnu/libffi.so.6.0.4)
==5331== by 0x4DDB183: ??? (in /usr/lib/x86_64-linux-gnu/libwayland-client.so.0.3.0)
==5331== by 0x4DD79D8: ??? (in /usr/lib/x86_64-linux-gnu/libwayland-client.so.0.3.0)
==5331== by 0x4DD8EA3: wl_display_dispatch_queue_pending (in /usr/lib/x86_64-linux-gnu/libwayland-client.so.0.3.0)
==5331== by 0x14BCCA: xwl_read_events (xwayland.c:814)
==5331== by 0x2AC0D0: ospoll_wait (ospoll.c:651)
==5331== by 0x2A5322: WaitForSomething (WaitFor.c:208)
==5331== Block was alloc'd at
==5331== at 0x48377D5: calloc (vg_replace_malloc.c:711)
==5331== by 0x212D9F: present_vblank_create (present_vblank.c:69)
==5331== by 0x214014: present_wnmd_pixmap (present_wnmd.c:610)
==5331== by 0x21576C: proc_present_pixmap (present_request.c:150)
==5331== by 0x27599D: Dispatch (dispatch.c:479)
==5331== by 0x279945: dix_main (main.c:276)
==5331== by 0x633AB16: (below main) (libc-start.c:310)
v2: Still notify aborted flips (Roman)
Signed-off-by: Lionel Landwerlin <lionel.g.landwerlin@intel.com>
Reviewed-by: Daniel Stone <daniels@collabora.com>
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=107314
Reviewed-by: Roman Gilg <subdiff@gmail.com>
Tested-by: Roman Gilg <subdiff@gmail.com>
commit b3f64786a3fd428f7fdccd8c884478fd62b70c16
Author: Eric Anholt <eric@anholt.net>
Date: Tue Sep 4 20:52:57 2018 -0700
glamor: Add support for exporting depth 16 pixmaps.
With a patch to mesa to expose rgb565 pbuffers even on a server with
only depth 24 and 32 visuals, fixes
dEQP-EGL.functional.render.single_context.gles2.rgb565_pbuffer. Those
pbuffers (or at least something renderable with 565) are required by
the current CTS for GLES3, and having the server support DRI3 on those
pixmaps means that we can avoid having a different path for EGL
pbuffers compared to pixmaps.
Signed-off-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Michel Dänzer <michel.daenzer@amd.com>
commit b84e7f1c2293f22bd9fcd92a6a82601f94a060a5
Author: Lyude Paul <lyude@redhat.com>
Date: Thu Sep 6 16:40:06 2018 -0400
meson: Fix building with -Ddga=false
We forget to assign a value to xf86dgaproto_dep if -Ddga=false, which
causes the meson build to fail:
meson.build:448:0: ERROR: Unknown variable "xf86dgaproto_dep".
A full log can be found at /home/lyudess/build/xserver/meson-logs/meson-log.txt
FAILED: build.ninja
So, just set it to an empty dependency to fix that.
Signed-off-by: Lyude Paul <lyude@redhat.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
commit a9a5bd0020dc76040d9b3722c0c88ccb12132dc0
Author: Jon Turney <jon.turney@dronecode.org.uk>
Date: Mon Aug 27 12:41:22 2018 +0100
hw/xwin: Fix 'make distcheck'
Add internal.h to SOURCES, omitted from 126c1cfa
Signed-off-by: Jon Turney <jon.turney@dronecode.org.uk>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit cd285922cdec966825e47220b1182a57abc1ff90
Author: Scott Anderson <scott@anderso.nz>
Date: Mon Aug 6 18:09:26 2018 +1200
xwayland: use wayland axis_discrete event
This prevents multiple scroll events happening for wayland compositors
which send axis values other than 10. For example, libinput will
typically return 15 for each scroll wheel step, and if a wayland
compositor sends those to xwayland without normalising them, 2 scroll
wheel steps will end up as 3 xorg scroll events. By listening for the
discrete_axis event, this will now correctly send only 2 xorg scroll
events.
The wayland protocol gurantees that there will always be an axis event
following an axis_discrete event. However, it does not gurantee that
other events (including other axis_discrete+axis pairs) will not happen
in between them. So we must keep a list of outstanding axis_discrete
events.
Signed-off-by: Scott Anderson <scott@anderso.nz>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit f79e5368512b72bb463925983d265b070261b7aa
Author: Jim Qu <Jim.Qu@amd.com>
Date: Mon Aug 27 13:37:38 2018 +0800
modesetting: code refactor for PRIME sync
The X will be crashed on the system with other DDX driver,
such as amdgpu.
show the log like:
randr: falling back to unsynchronized pixmap sharing
(EE)
(EE) Backtrace:
(EE) 0: /usr/lib/xorg/Xorg (xorg_backtrace+0x4e)
(EE) 1: /usr/lib/xorg/Xorg (0x55cb0151a000+0x1b5ce9)
(EE) 2: /lib/x86_64-linux-gnu/libpthread.so.0 (0x7f1587a1d000+0x11390)
(EE)
(EE) Segmentation fault at address 0x0
(EE)
The issue is that modesetting as the master, and amdgpu as the slave.
Thus, when the master attempts to access pSlavePixPriv in ms_dirty_update(),
problems result due to the fact that it's accessing AMD's 'ppriv' using the
modesetting structure definition.
Apart from fixing crash issue, the patch fix other issue in master interface
in which driver should refer to master pixmap.
Signed-off-by: Jim Qu <Jim.Qu@amd.com>
Reviewed-by: Alex Goins <agoins@nvidia.com>
commit 8a3ae555efb02b3811cca0bfb4ddaf8fe1457778
Author: Eric Anholt <eric@anholt.net>
Date: Thu Aug 9 13:02:41 2018 -0700
meson: Add an option to build XSELINUX.
Dependencies are ported from the automake build.
v2: Make it a tristate defaulting to 'auto'. Use pkg-config for libaudit.
Signed-off-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Adam Jackson <ajax@redhat.com>
commit a90f33721eba7f2dbde4a7278f1a213d696c85e9
Author: Alex Goins <agoins@nvidia.com>
Date: Tue Aug 14 15:05:46 2018 -0500
randr: rrCheckPixmapBounding should only increase screen size
The purpose of rrCheckPixmapBounding() is to make sure that the fb is large
enough to accommodate the region scanned out by a GPU screen. Currently, however,
it will actually shrink the fb if it's larger than it needs to be.
This is a problem when combining PRIME output slaving with arbitrary transforms
with xrandr.
Although arbitrary transforms are not supposed to constrain the size of the fb
(https://lists.freedesktop.org/archives/xorg-devel/2018-January/055563.html),
xrandr will use RRSetScreenSize to resize the desktop to accommodate scaling
transforms, e.g. scaling a 1920x1080 display to 3840x2160 will result in a
desktop size of 3840x2160.
In the case of PRIME, rrCheckPixmapBounding() will be called after
RRSetScreenSize() and it will resize the fb back down to what it would be
without the scaling transform, e.g. 1920x1080. This represents divergence in
behavior between PRIME and non-PRIME outputs.
I had originally made rrCheckPixmapBounding() account for arbitrary transforms,
but realized that the fb being large enough to accommodate arbitrary transforms
is not a hard requirement enforced in the server. Instead, this change simply
makes it so that rrCheckPixmapBounding() will only resize the fb to be larger
than it already is, preventing it from stepping on prior requests to increase
the size of the fb.
Signed-off-by: Alex Goins <agoins@nvidia.com>
Reviewed-by: Keith Packard <keithp@keithp.com>
Reviewed-by: Michel Dänzer <michel.daenzer@amd.com>
commit 1fc20b985cc888345bc8c6fce7b43f10ce71fe43
Author: Eric Anholt <eric@anholt.net>
Date: Tue Aug 7 16:23:19 2018 -0700
meson: Add detection of libsystemd-daemon.
This enables Xtrans's systemd socket activation.
Signed-off-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 4ba786677050684c8801201f6bd83ce884f2885e
Author: Eric Anholt <eric@anholt.net>
Date: Tue Aug 7 16:23:18 2018 -0700
meson: Get close to parity with autotools for CLIENTIDS tracking.
The client ID is only needed for XRes, and autotools build ignores the
--clientids= arg if xres is disabled. We haven't made a meson option
for disabling tracking client ids (is it actually worth a build
option?), so just make this depend on xres.
Signed-off-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
commit e047da37becc23a8d2549d8f264aaa18e4965186
Author: Eric Anholt <eric@anholt.net>
Date: Tue Aug 7 16:23:17 2018 -0700
meson: Add missing setup of the NO_LOCAL_CLIENT_CRED define.
Ported from autotools.
Signed-off-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 049d2346abee091f18e6f62bcf7331267c2ba656
Author: Eric Anholt <eric@anholt.net>
Date: Tue Aug 7 16:23:16 2018 -0700
meson: Make FALLBACK_INPUT_DRIVER configurable in meson.
This makes us match the featureset of autotools, and also fixes the
non-Linux default value to match.
Signed-off-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 97bd8bc9cb6d910420627760288696e2a0c5d226
Author: Eric Anholt <eric@anholt.net>
Date: Tue Aug 7 16:23:14 2018 -0700
meson: Make xf86vidmodeproto mandatory.
This is silly to have optional based on detection of the protocol
headers, particularly now that we have a single protocol header repo
to install.
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Eric Anholt <eric@anholt.net>
commit db53c439ba785a16f789918fe66da6ba161a0742
Author: Eric Anholt <eric@anholt.net>
Date: Tue Aug 7 16:23:13 2018 -0700
meson: Add linking to x86 iopl libs on BSDs.
Ported from automake.
Signed-off-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 9869512cbf1bd87146f59106c0c71bda76cc0dcc
Author: Eric Anholt <eric@anholt.net>
Date: Tue Aug 7 16:23:12 2018 -0700
meson: Add HAVE_LIBDISPATCH define to xquartz build.
Signed-off-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 843e44adf17b2828991a26ac3f8f82cf2fa63bd3
Author: Eric Anholt <eric@anholt.net>
Date: Tue Aug 7 16:23:11 2018 -0700
meson: Add PIO access support for FreeBSD and NetBSD on Alpha.
Signed-off-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 513d52d58915f291c0f706b67b8dc73f45de109f
Author: Eric Anholt <eric@anholt.net>
Date: Tue Aug 7 16:23:10 2018 -0700
meson, automake: Drop unused USESTDRES cflag setup.
Nothing in tree references the flag.
Signed-off-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
commit d0545847a06f375586927ea66c521a039439f708
Author: vadym.shovkoplias <vadym.shovkoplias@globallogic.com>
Date: Thu Aug 9 12:25:08 2018 -0400
autotools: Handle case when bindir var in xkbcomp.pc is absent
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=107521
Fixes: 726839459cb (autotools: Derive xkb configuration from xkbcomp.pc)
Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: vadym.shovkoplias <vadym.shovkoplias@globallogic.com>
commit 4fe02b8da3ca58500f7e6e017e388907cf4a8b73
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Wed Aug 8 15:22:41 2018 +1000
dix: check_modmap_change() returns Success, not true
Not sure what if anything calls XSetDeviceModifierMapping() but this would've
failed all the time. check_modmap_change() returns Success but we were
treating it like a boolean. Fix this.
Reported-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Keith Packard <keithp@keithp.com>
commit c20e7b5e2222c0cae2a487264748fa5db711e6e4
Author: Eric Anholt <eric@anholt.net>
Date: Wed Aug 1 13:49:54 2018 -0700
meson: Automatically detect HAVE_PTHREAD_SETNAME_NP
Signed-off-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 86c9245838b95e8a0c37fa61d835112933c738f0
Author: Eric Anholt <eric@anholt.net>
Date: Wed Aug 1 13:49:53 2018 -0700
meson: Try to hook up BSD APM build configuration.
I don't have a BSD to test on, but this should do the same as what
autotools did.
Signed-off-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
commit accd32a466a1a87ab45b5422dff2ef5a9c867049
Author: Eric Anholt <eric@anholt.net>
Date: Wed Aug 1 13:49:52 2018 -0700
xorg: Remove the XF86PM define.
We already have pm_noop.c being built most of the time for the
no-OS-PM case, so just switch to always using it.
Signed-off-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 708ddfbda1391468d66957e247f51854b39db5fa
Author: Eric Anholt <eric@anholt.net>
Date: Wed Aug 1 13:49:51 2018 -0700
automake,meson: Remove HAVE_LIBUDEV define.
CONFIG_UDEV and CONFIG_UDEV_KMS are the actual defines that are used
in the C code.
Signed-off-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 7deaf990079b94c70d263d8f1e16bb954bd2917f
Author: Eric Anholt <eric@anholt.net>
Date: Wed Aug 1 13:49:50 2018 -0700
meson: Automatically detect support for XTRANS_SEND_FDs.
The SCM_RIGHTS flag seems to be the thing that xtrans depends on, and
meson makes the check easy without needing a build option.
Signed-off-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
commit e3e5265743a3536f15c8b7ae521848a646cdc189
Author: Eric Anholt <eric@anholt.net>
Date: Wed Aug 1 13:49:49 2018 -0700
meson: Remove XXX for libconfig in kdrive.
This is already included in ephyr (the only kdrive server left)
Signed-off-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 1ef7aed3e2bb2af32330f19b1e7560000512ddfe
Author: Keith Packard <keithp@keithp.com>
Date: Tue Jun 26 09:20:00 2018 -0700
During reset/shutdown, clean up leases in DIX instead of each driver
Instead of having every video driver loop over any pending leases to
free them during CloseScreen, do this up in the DIX layer by
terminating leases when a leased CRTC or Output is destroyed and
(just to make sure), also terminating leases in RRCloseScreen. The
latter should "never" get invoked as any lease should be associated
with a resource which was destroyed.
This is required as by the time the driver's CloseScreen function is
invoked, we've already freed all of the DIX randr structures and no
longer have any way to reference the leases
Signed-off-by: Keith Packard <keithp@keithp.com>
Fixes: https://bugs.freedesktop.org/show_bug.cgi?id=106960
Cc: Thomas Hellstrom <thellstrom@vmware.com>
commit d625e16918ef9104863709eb108346464767c444
Author: Takashi Iwai <tiwai@suse.de>
Date: Thu Jul 19 14:38:19 2018 +0200
modesetting: Fix cirrus 24bpp breakage
The recent rewrite of modesetting driver broke the 24bpp support.
As typically found on cirrus KMS, it leads to a blank screen, spewing
the error like:
failed to add fb -22
(EE) modeset(0): failed to set mode: Invalid argument
The culript is that the wrong bpp value of the front buffer is passed
to drmModeAddFB(). Fix it by replacing with the back buffer bpp,
drmmode->kbpp.
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Tested-by: Stefan Dirsch <sndirsch@suse.de>
Reviewed-by: Adam Jackson <ajax@redhat.com>
commit cdec2b3c195d1d080207ef01c55ff14b45370010
Author: Olivier Fourdan <ofourdan@redhat.com>
Date: Wed Jul 25 16:33:23 2018 +0200
xwayland: Enable DRI3 for glamor
glamor_fds_from_pixmap() will bail out early if DRI3 is not enabled,
unfortunately Xwayland's glamor code would not set it as enabled which
would lead to blank pixmaps when using texture from pixmap.
Make sure to mark DRI3 as enabled from glamor_egl_screen_init() in
Xwayland.
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=107287
Fixes: c8c276c956 ("glamor: Implement PixmapFromBuffers and BuffersFromPixmap")
Signed-off-by: Olivier Fourdan <ofourdan@redhat.com>
Reviewed-by: Michel Dänzer <michel.daenzer@amd.com>
commit ce2dde9ed0243a18ae18af0879134f7c1afbd700
Author: emersion <contact@emersion.fr>
Date: Fri Jul 13 15:51:26 2018 -0400
xwayland: rotate logical size for RRMode
The logical size is the size of the output in the global compositor
space. The mode width/height should be scaled as in the logical
size, but shouldn't be transformed. Thus we need to rotate back
the logical size to be able to use it as the mode width/height.
This fixes issues with pointer input on transformed outputs.
Signed-Off-By: Simon Ser <contact@emersion.fr>
Reviewed-by: Olivier Fourdan <ofourdan@redhat.com>
commit 93cafb0828d2e24bd14616df1aa9883fb843dd6c
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Wed Jul 18 13:22:43 2018 +1000
Xext: dynamically allocate the PanoramiXDepths[j].vids array
Control flow is:
PanoramiXMaybeAddDepth() allocates an array size 240 (pDepth->numVisuals)
PanoramiXMaybeAddVisual() finds up to 270 matches (pScreen->numVisuals)
and writes those into the previously allocated array.
This caused invalid reads/writes followed by eventually a double-free abort.
Reproduced with xorg-integration-tests server test
XineramaTest.ScreenCrossing/* (and a bunch of others).
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Keith Packard <keithp@keithp.com>
commit 1c7f34e99ff9750979a03ae20c6be1f2b42c284c
Author: Stefan Agner <stefan@agner.ch>
Date: Thu Dec 22 15:41:06 2016 +0100
modesetting: Fix 16 bit depth/bpp mode
When setting DefaultDepth to 16 in the Screen section, the current
code requests a 32 bpp framebuffer, however the X-Server seems to
assumes 16 bpp.
Fixes commit 21217d02168d ("modesetting: Implement 32->24 bpp
conversion in shadow update")
Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Stefan Agner <stefan@agner.ch>
commit d95a1310ef8e08a93a28f9766d1b4093f7891404
Author: Lyude Paul <lyude@redhat.com>
Date: Fri Jun 22 12:49:47 2018 -0400
meson: ensure the libc has RPC functions when secure-rpc is enabled
Currently our meson.build just makes the assumption that the libc is
going to provide RPC functions. This doesn't actually seem to be the
case on Fedora, which causes compilation to fail unexpectedly:
../../Projects/xserver/os/rpcauth.c:47:10: fatal error: rpc/rpc.h: No such file or directory
#include <rpc/rpc.h>
^~~~~~~~~~~
compilation terminated.
So, in the event that we can't use libtirpc ensure that we actually
check whether or not the libc provides rpc/rpc.h. If it doesn't, raise
an error.
Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Lyude Paul <lyude@redhat.com>
commit d83efc47b7a524b4f8d4a993c27a3e402a98fa7c
Author: Keith Packard <keithp@keithp.com>
Date: Tue Jun 26 16:34:29 2018 -0700
xf86-video-modesetting: Lease planes as well if using atomic
If we're using atomic modesetting, then we're also using universal
planes, and so the lease we create needs to include the plane.
Signed-off-by: Keith Packard <keithp@keithp.com>
Reviewed-by: Daniel Stone <daniels@collabora.com>
commit 4a11f66e4690f9e94dc61cb264f5ef78dbdb255a
Author: Keith Packard <keithp@keithp.com>
Date: Tue Jun 26 14:05:31 2018 -0700
xf86-video-modesetting: Don't enable UNIVERSAL_PLANES separately
We don't want universal_planes unless we're using atomic APIs for
modesetting, and the kernel already enables universal_planes
automatically when atomic is enabled.
If we enable universal_planes when we're not using atomic, then we
won't have selected a plane for each crtc, and this will break lease
creation which requires planes for each output when universal_planes
is enabled.
Signed-off-by: Keith Packard <keithp@keithp.com>
Reviewed-by: Daniel Stone <daniels@collabora.com>
commit 2faf4cef8bcf9bb2034a27219a656ea7221afc6c
Author: Keith Packard <keithp@keithp.com>
Date: Thu Jun 28 11:45:16 2018 -0700
xfree86: Wrap RRCrtcIsLeased and RROutputIsLeased to check for DIX structures
Before DIX structures are allocated for crtcs and outputs, we don't
want to call DIX randr code with NULL pointers. This can happen if the
driver sets video modes early in server initialization, which Nouveau
does in zaphod mode.
Cc: thellstrom@vmware.com
Fixes: https://bugs.freedesktop.org/show_bug.cgi?id=106772
Fixes: https://bugs.freedesktop.org/show_bug.cgi?id=106960
Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit c55a44a9a86aaece17c1a2e73c77e3e665c4888e
Author: Keith Packard <keithp@keithp.com>
Date: Thu Jun 28 11:45:15 2018 -0700
xfree86: Reset randr_crtc and randr_output early in xf86CrtcCloseScreen
The DIX crtc and output structures are freed when their resources are
destroyed, which happens before CloseScreen is called. As a result, we
know these pointers are invalid and referencing them during any of the
remaining CloseScreen sequence will be bad.
Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
Cc: thellstrom@vmware.com
Fixes: https://bugs.freedesktop.org/show_bug.cgi?id=106960
commit 49283e238a0ba6051034ae635e5970891f17f9df
Author: Jon Turney <jon.turney@dronecode.org.uk>
Date: Sat Jun 30 12:53:35 2018 +0100
meson: use absolute paths in manpage substitutions
paths returned by get_option('foodir') are potentially relative to prefix
Noticed when comparing manpages generated by a meson build with those
generated by an autotools build
Signed-off-by: Jon Turney <jon.turney@dronecode.org.uk>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 38ff29ec8ead0a293f50ac52146199babe4205ca
Author: Keith Packard <keithp@keithp.com>
Date: Thu Jan 18 18:07:29 2018 -0800
modesetting: Allow a DRM fd to be passed on command line with -masterfd [v2]
This lets an application open a suitable DRM device and pass the file
descriptor to the mode setting driver through an X server command line
option, '-masterfd'.
There's a companion application, xlease, which creates a DRM master by
leasing an output from another X server. That is available at
git clone git://people.freedesktop.org/~keithp/xlease
v2:
Always print usage, but note that it can't be used if
setuid/gid
Suggested-by: Lyude Paul <lyude@redhat.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
Reviewed-by: Lyude Paul <lyude@redhat.com>
commit 2f39b2a07805194fdd7def30d941666963d6e670
Author: Laurent Carlier <lordheavym@gmail.com>
Date: Sat Jun 16 13:00:01 2018 +0200
meson: Add configuration of listening on tcp, unix and local
bugzilla: https://bugs.kde.org/show_bug.cgi?id=395419
bugzilla: https://bugs.archlinux.org/task/59025
Signed-off-by: Laurent Carlier <lordheavym@gmail.com>
Reviewed-by: Aaron Plattner <aplattner@nvidia.com>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit c41d4ff48f72aa964afd131b59e1538295d062dc
Author: Lyude Paul <lyude@redhat.com>
Date: Wed Jun 27 20:29:42 2018 -0400
modesetting: Fix uninitialized memory usage in drmmode_crtc_get_fb_id()
This really sucked to find out :(
Signed-off-by: Lyude Paul <lyude@redhat.com>
Reviewed-by: Karol Herbst <kherbst@redhat.com>
commit 9f02855e7a1b7a3c1e2ee7bfbc73e87c29126920
Author: Thomas Hellstrom <thellstrom@vmware.com>
Date: Wed Jun 20 19:23:48 2018 +0200
glamor: Work around GEM usage v2
KMS drivers are not required to support GEM. In particular, vmwgfx
doesn't support flink and handles and names are identical.
Getting a bo name should really be part of a lower level API, if needed,
but in the mean time work around this by setting the name identical to
the handle if GEM isn't supported.
This fixes modesetting driver dri2 on vmwgfx.
Reviewed-by: Deepak Rawat <drawat@vmware.com>
Signed-off-by: Thomas Hellstrom <thellstrom@vmware.com>
commit dc90b1c3c328f1d0b022a234b69ef32bda7ccb01
Author: Lyude Paul <lyude@redhat.com>
Date: Wed Jun 20 19:12:32 2018 -0400
randr: Scream when creating a shared pixmap fails
This seems like a problem worth screaming about.
Signed-off-by: Lyude Paul <lyude@redhat.com>
Reviewed-by: Dave Airlie <airlied@redhat.com>
commit 186a21c4bac744ffe645c8d1a6dda2d41c6d33d8
Author: Lyude Paul <lyude@redhat.com>
Date: Wed Jun 20 19:12:31 2018 -0400
glamor: Unbreak glamor_fd_from_pixmap()
When support for allocating GBM BOs with modifiers was added,
glamor_fd_from_pixmap() was changed so that it would return an error if
it got a bo with modifiers set from glamor_fds_from_pixmap(). The
problem is that on systems that support BOs with modifiers,
glamor_fds_from_pixmap() will always return BOs with modifiers.
This means that glamor_fd_from_pixmap() was broken entirely, which broke
a number of other things including glamor_shareable_fd_from_pixmap(),
which meant that modesetting using multiple GPUs with the modesetting
DDX was also broken. Easy reproducer:
- Find a laptop with DRI prime that has outputs connected to the
dedicated GPU and integrated GPU
- Try to enable one display on each using the modesetting DDX
- Fail
Since there isn't a way to ask for no modifiers from
glamor_fds_from_pixmap, we create a shared _glamor_fds_from_pixmap()
function used by both glamor_fds_from_pixmap() and
glamor_fd_from_pixmap() that calls down to the appropriate
glamor_egl_fd*_from_pixmap() function.
Signed-off-by: Lyude Paul <lyude@redhat.com>
Reviewed-by: Dave Airlie <airlied@redhat.com>
Cc: Louis-Francis Ratté-Boulianne <lfrb@collabora.com>
Fixes: c8c276c956 ("glamor: Implement PixmapFromBuffers and BuffersFromPixmap")
commit c12f1bd4b76088ea66e3bec9ab9721a52b20cdf2
Author: Lyude Paul <lyude@redhat.com>
Date: Thu Jun 7 20:30:34 2018 -0400
modesetting: Also disable CRTC in drmmode_output_disable()
So, this did actually work on older kernels at one point in time,
however it seems that this working was a result of some of the Linux
kernel's atomic modesetting helpers not preserving the CRTC's enabled
state in the right spots. This was fixed in:
846c7dfc1193 ("drm/atomic: Try to preserve the crtc enabled state in drm_atomic_remove_fb, v2")
As a result, atomic commits which simply disassociate a DRM connector
with it's CRTC while leaving the CRTC in an enabled state aren't enough
to disable the CRTC, and result in the atomic commit failing. This
currently can cause issues with MST hotplugging where X will end up
failing to disable the MST outputs after they've left the system. A
simple reproducer:
- Start up Xorg
- Connect an MST hub with displays connected to it
- Remove the hub
- Now there should be CRTCs stuck on the orphaned MST connectors, and X
won't be able to reclaim them.
Signed-off-by: Lyude Paul <lyude@redhat.com>
Cc: Louis-Francis Ratté-Boulianne <lfrb@collabora.com>
Reviewed-by: Dave Airlie <airlied@redhat.com>
commit 5a8b886a956773669ceb2a2bcacd59184bcc7c99
Author: Adam Jackson <ajax@redhat.com>
Date: Mon Jun 11 15:10:04 2018 -0400
configure: Remove unused CONFIGFILE
This isn't used for anything, which is just as well, because
/etc/xorg.conf is not in fact a path xserver will try to use.
Bugzilla: https://bugs.freedesktop.org/8890
Signed-off-by: Adam Jackson <ajax@redhat.com>
Reviewed-by: Aaron Plattner <aplattner@nvidia.com>
commit a85e94a50c94b07574c8701a3ff3c1243f4257f4
Author: Olivier Fourdan <ofourdan@redhat.com>
Date: Fri Jun 15 08:57:12 2018 +0200
modesetting: use drmmode_bo_import() for rotate_fb
drmmode_shadow_allocate() still uses drmModeAddFB() which may fail if
the format is not as expected, preventing from using a rotated output.
Change it to use the new function drmmode_bo_import() which takes care
of calling the drmModeAddFB2() API.
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=106715
Signed-off-by: Olivier Fourdan <ofourdan@redhat.com>
Tested-by: Tomas Pelka <tpelka@redhat.com>
Reviewed-by: Lyude Paul <lyude@redhat.com>
commit f5aace7a27d6d61068dcae46c9756b669ab51d50
Author: John Lumby <johnlumby@hotmail.com>
Date: Tue Jun 26 17:14:34 2018 -0700
Change the DPMS initialization to be conditional on not set from config
Any DPMS timeout values set in ServerFlags section of the xorg.conf
are being overwritten by DPMS extension initialization. Therefore
change the DPMS initialization of timeout values to be conditional on
not set from config.
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=106963
Signed-off-by: John Lumby <johnlumby@hotmail.com>
Reviewed-by: Emil Velikov <emil.velikov@collabora.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit f33cb4264387ed14a586ba080885b4d21e4aa48b
Author: Damien Leone <dleone@nvidia.com>
Date: Mon Jun 18 16:24:28 2018 -0700
os: Recompute whether any clients are ready after check_timers()
If a driver calls AttendClient() from within a timer callback we
need to re-compute the local 'are_ready' to prevent the attended
client from waiting until WaitForSomething() times out.
This is a fix similar to commit 9ed5b263.
Signed-off-by: Damien Leone <dleone@nvidia.com>
Reviewed-by: Keith Packard <keithp@keithp.com>
commit 92daeb31fa3235dc791e0444b072ec4bbc6e35ab
Author: Olivier Fourdan <ofourdan@redhat.com>
Date: Mon Jun 11 09:21:08 2018 +0200
xwayland: mandatory EGL backend API
The API init_wl_registry() and has_wl_interfaces() are marked as being
optional, but both GBM And EGLStream backends implement them so there is
point in keeping those optional.
Suggested-by: Emil Velikov <emil.velikov@collabora.com>
Signed-off-by: Olivier Fourdan <ofourdan@redhat.com>
commit 792359057bd54548555674d2d309c0cfeebac12d
Author: Olivier Fourdan <ofourdan@redhat.com>
Date: Mon Jun 11 09:13:30 2018 +0200
xwayland: simplify xwl_glamor_pixmap_get_wl_buffer()
When retrieving the Wayland buffer from a pixmap, if the buffer already
exists, the GBM backend will return that existing buffer.
However, as seen with the Present issues, if the call had previously
passed a wrong size, that buffer will remain at the wrong size for as
long as the buffer exists, which is error prone.
Considering that the width/height passed to get_wl_buffer() is always the
actual pixmap drawable size, and considering that the EGLStream backend
makes no use of the size either, there is really no point in passing the
width/height around.
Simplify the xwl_glamor_pixmap_get_wl_buffer() and EGL backends API by
removing the pixmap size, and use the drawable size instead.
Signed-off-by: Olivier Fourdan <ofourdan@redhat.com>
commit bdadaa25f5c1f62d30d8e76b4ebfcef414ed9c90
Author: Olivier Fourdan <ofourdan@redhat.com>
Date: Tue Jun 5 19:38:45 2018 +0200
xwayland: EGL_IMG_context_priority required by EGLStream
xwl_glamor_eglstream_init_egl() uses "EGL_IMG_context_priority"
extension, make sure it's actually available before using it.
Suggested-by: Emil Velikov <emil.velikov@collabora.com>
Signed-off-by: Olivier Fourdan <ofourdan@redhat.com>
Reviewed-by: Emil Velikov <emil.velikov@collabora.com>
commit 5d843f6947538dabde258584a5795e0b25ea8779
Author: Olivier Fourdan <ofourdan@redhat.com>
Date: Tue Jun 5 19:38:44 2018 +0200
xwayland: check for EGLStream backend explicitly
Now that we have separate backends for EGLStream and GBM, we can
explicitly check for the EGLStream backend to disable present support
in that case.
Signed-off-by: Olivier Fourdan <ofourdan@redhat.com>
Reviewed-by: Emil Velikov <emil.velikov@collabora.com>
commit d7185a84b60ed03aaa84eb522dcff365218e7211
Author: Olivier Fourdan <ofourdan@redhat.com>
Date: Tue Jun 5 19:38:43 2018 +0200
xwayland: refactor EGL backends for wayland registry
To be able to check for availability of the Wayland interfaces required
to run a given EGL backend (either GBM or EGLStream for now), we need
to have each backend structures and vfuncs in place before we enter the
Wayland registry dance.
That basically means that we should init all backends at first, connect
to the Wayland compositor and query the available interfaces and then
decide which backend is available and should be used (or none if either
the Wayland interfaces or the EGL extensions are not available).
For this purpose, hold an egl_backend struct for each backend we are to
consider prior to connect to the Wayland display so that, when we get to
query the Wayland interfaces, everything is in place for each backend to
handle the various Wayland interfaces.
Eventually, when we need to chose which EGL backend to use for glamor,
the available Wayland interfaces and EGL extensions available are all
known to Xwayland.
Signed-off-by: Olivier Fourdan <ofourdan@redhat.com>
Reviewed-by: Emil Velikov <emil.velikov@collabora.com>
commit 48f037a27c45b571c9750ac812977ac0a33ab12b
Author: Olivier Fourdan <ofourdan@redhat.com>
Date: Tue Jun 5 19:38:42 2018 +0200
xwayland: move EGL backend init to glamor
Move EGL backends initialization to its own function in
xwayland-glamor.c
Signed-off-by: Olivier Fourdan <ofourdan@redhat.com>
Reviewed-by: Emil Velikov <emil.velikov@collabora.com>
commit f2fcb4877e976d078b0eb4755177170467341484
Author: Olivier Fourdan <ofourdan@redhat.com>
Date: Tue Jun 5 19:38:41 2018 +0200
xwayland: Add Wayland interfaces check
Introduces a new egl_backend function to let the EGL backend check for
the presence of the required Wayland interfaces.
Signed-off-by: Olivier Fourdan <ofourdan@redhat.com>
Reviewed-by: Emil Velikov <emil.velikov@collabora.com>
commit b74b0f18b8d3032317e38453ee63ae9efd33a098
Author: Olivier Fourdan <ofourdan@redhat.com>
Date: Tue Jun 5 19:38:40 2018 +0200
xwayland: move egl_backend to its own struct
EGL backend availability requires both EGL extensions and Wayland
interfaces to be present, so we will need to consider multiple backends
during initialization.
As a preliminary work, move the egl_backend to its own struct so that we
can have more than one backend at any given time.
Signed-off-by: Olivier Fourdan <ofourdan@redhat.com>
Reviewed-by: Emil Velikov <emil.velikov@collabora.com>
commit de004eefc60ec595f5d6d81658468e082f8df930
Author: Olivier Fourdan <ofourdan@redhat.com>
Date: Tue Jun 5 19:38:39 2018 +0200
xwayland: skip drm authentication with render node
If using a render node, we can skip DRM authentication.
Suggested-by: Emil Velikov <emil.velikov@collabora.com>
Signed-off-by: Olivier Fourdan <ofourdan@redhat.com>
Reviewed-by: Emil Velikov <emil.velikov@collabora.com>
commit b823b43dca143810146f563d09e8996058b9d09e
Author: Olivier Fourdan <ofourdan@redhat.com>
Date: Tue Jun 5 19:38:38 2018 +0200
xwayland: GBM should fail w/out "GL_OES_EGL_image"
Surely, we should fail to init GBM backend if "GL_OES_EGL_image" is
missing.
This seems to have been lost with commit 1545e2dba ("xwayland: Decouple
GBM from glamor").
Suggested-by: Emil Velikov <emil.velikov@collabora.com>
Signed-off-by: Olivier Fourdan <ofourdan@redhat.com>
Reviewed-by: Emil Velikov <emil.velikov@collabora.com>
commit 78ce4aa979ff3f5870fbc12a7e5c53547084a61a
Author: Olivier Fourdan <ofourdan@redhat.com>
Date: Tue Jun 5 19:38:37 2018 +0200
xwayland: swap "name" and "id" in init_wl_registry()
Both xwl_glamor_init_wl_registry() and the Wayland global registry
handler use the interface id/name in that order, using name/id in the
egl_backend vfunc makes things confusing and error prone.
Signed-off-by: Olivier Fourdan <ofourdan@redhat.com>
Reviewed-by: Emil Velikov <emil.velikov@collabora.com>
commit f6b2109c1b49484af772df518314ec8e8432febe
Author: Olivier Fourdan <ofourdan@redhat.com>
Date: Tue Jun 5 19:38:36 2018 +0200
xwayland: move glamor specific routines
Functions such as:
xwl_glamor_egl_supports_device_probing()
xwl_glamor_egl_get_devices()
xwl_glamor_egl_device_has_egl_extensions()
Are of no use outside of EGLStream support, move them to the relevant
source file.
Similarly, the other glamor functions such as:
xwl_glamor_init()
xwl_screen_set_drm_interface()
xwl_screen_set_dmabuf_interface()
xwl_glamor_pixmap_get_wl_buffer()
xwl_glamor_init_wl_registry()
xwl_glamor_post_damage()
xwl_glamor_allow_commits()
xwl_glamor_egl_make_current()
Are useless without glamor support enabled, move those within a
a "#ifdef XWL_HAS_GLAMOR" in xwayland.h
Signed-off-by: Olivier Fourdan <ofourdan@redhat.com>
Reviewed-by: Emil Velikov <emil.velikov@collabora.com>
commit d31a7be15e259275599a9f67e0d921471ae64913
Author: Olivier Fourdan <ofourdan@redhat.com>
Date: Tue Jun 5 19:37:58 2018 +0200
xwayland: make xwl_output_get_xdg_output() static
Make xwl_output_get_xdg_output() private, it doesn't need to be
available elsewhere.
Signed-off-by: Olivier Fourdan <ofourdan@redhat.com>
Reviewed-by: Lyude Paul <lyude@redhat.com>
Reviewed-by: Emil Velikov <emil.velikov@collabora.com>
commit e16a6da79dea793a335be70ba07d5e1c1295b5eb
Author: Olivier Fourdan <ofourdan@redhat.com>
Date: Tue Jun 5 19:37:57 2018 +0200
xwayland: do not disable glamor if EGLStream failed
EGLStream requires glamor, but the opposite is not true. So if someone
passes "-eglstream" with a GPU which does not support EGLStream, we
could maybe still try GBM and be lucky.
That allows Wayland compositors to pass "-eglstream" regardless of the
actual hardware, if they want to enable EGLStream on GPU which support
it.
Signed-off-by: Olivier Fourdan <ofourdan@redhat.com>
Reviewed-by: Lyude Paul <lyude@redhat.com>
Reviewed-by: Emil Velikov <emil.velikov@collabora.com>
commit 44560af02823239e1b5b236e8cb365b5bdf24b6a
Author: Olivier Fourdan <ofourdan@redhat.com>
Date: Tue Jun 5 19:37:56 2018 +0200
xwayland: process Wayland events after adding screen
When we're done adding a new screen, we need to process any pending
Wayland events again.
Hence we don't end up processing xdg_output events unexpectedly when
glamor is disabled. Be that because "-shm" was passed or "-eglstream"
has failed.
Failing to do that could lead to a crash at startup:
Xwayland: dixGetPrivateAddr: Assertion `key->initialized' failed.
(EE)
(EE) Backtrace:
(EE) 0: Xwayland (OsSigHandler)
(EE) 1: libpthread.so.0 (funlockfile)
(EE) 2: libc.so.6 (gsignal)
(EE) 3: libc.so.6 (abort)
(EE) 4: libc.so.6 (?+0x0)
(EE) 5: libc.so.6 (__assert_fail)
(EE) 6: Xwayland (dixGetPrivateAddr)
(EE) 7: Xwayland (_fbGetWindowPixmap)
(EE) 8: Xwayland (getDrawableDamageRef)
(EE) 9: Xwayland (damageRegionProcessPending)
(EE) 10: Xwayland (damagePolyFillRect)
(EE) 11: Xwayland (miPaintWindow)
(EE) 12: Xwayland (miWindowExposures)
(EE) 13: Xwayland (miHandleValidateExposures)
(EE) 14: Xwayland (SetRootClip)
(EE) 15: Xwayland (update_screen_size)
(EE) 16: Xwayland (apply_output_change)
(EE) 17: libffi.so.6 (ffi_call_unix64)
(EE) 18: libffi.so.6 (ffi_call)
(EE) 19: libwayland-client.so.0 (wl_log_set_handler_client)
(EE) 20: libwayland-client.so.0 (_init)
(EE) 21: libwayland-client.so.0 (wl_display_dispatch_queue_pending)
(EE) 22: libwayland-client.so.0 (wl_display_roundtrip_queue)
(EE) 23: Xwayland (InitInput)
(EE) 24: Xwayland (dix_main)
(EE) 25: libc.so.6 (__libc_start_main)
(EE) 26: Xwayland (_start)
(EE)
(EE)
Fatal server error:
(EE) Caught signal 6 (Aborted). Server aborting
(EE)
Aborted (core dumped)
Signed-off-by: Olivier Fourdan <ofourdan@redhat.com>
Reviewed-by: Lyude Paul <lyude@redhat.com>
Reviewed-by: Emil Velikov <emil.velikov@collabora.com>
commit dbde3fec32641ae23389cffa12a04d3608936795
Author: Olivier Fourdan <ofourdan@redhat.com>
Date: Tue Jun 5 19:37:55 2018 +0200
xwayland: "EGL_EXT_device_base" required for EGLStream
eglQueryDevicesEXT() would abort if the required extensions are not
available, meaning that enabling “-eglstream” on a non-EGLStream
capable hardware would lead to an abort().
Check that "EGL_EXT_device_base" extension is available and bail out
early if not, so we don't abort() later in eglQueryDevicesEXT().
Signed-off-by: Olivier Fourdan <ofourdan@redhat.com>
Reviewed-by: Lyude Paul <lyude@redhat.com>
Reviewed-by: Emil Velikov <emil.velikov@collabora.com>
commit 06c31e782e360363238cf20e7afd3e4990a2c304
Author: Olivier Fourdan <ofourdan@redhat.com>
Date: Tue Jun 5 19:37:54 2018 +0200
xwayland: allow "-eglstream" option
The command line option "-eglstream" used to enable EGLStream support
for NVidia GPU was made available only when Xwayland was built with
EGLStream support enabled.
Wayland compositors who spawn Xwayland have no easy way to tell whether
or not Xwayland was built with EGLStream support enabled, and adding
"-eglstream" command line option to Xwayland when it wasn't built with
EGLStream support would prevent Xwayland from starting (“Unrecognized
option” error).
Make sure we support the command line option "-eglstream" regardless of
EGLStream support in Xwayland. Obviously, if Xwayland was built without
EGLStream support, this has no effect.
Signed-off-by: Olivier Fourdan <ofourdan@redhat.com>
Reviewed-by: Lyude Paul <lyude@redhat.com>
Reviewed-by: Emil Velikov <emil.velikov@collabora.com>
commit 707d0f912b916e7546c4f7e7a5f7023a53e74615
Author: Vladimir Panteleev <git@thecybershadow.net>
Date: Wed Jun 20 13:37:45 2018 +0000
glx/vndcmds: Fix vendor hash table key size
The keySize parameter of the hashing/comparison functions was
incorrectly specified to be sizeof(void*), even though the keys of
this hashtable are CARD32.
Fixes address sanitizer failure on 64-bit builds.
Reviewed-by: Adam Jackson <ajax@redhat.com>
commit 0170e200f546e4b3430bd07a70551436cf44b0be
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Mon Jun 11 09:04:22 2018 +1000
xwayland: add "tablet" into the tablet device names
Changes the device name from "xwayland-stylus" to "xwayland-tablet stylus".
This doesn't fully address #26 but it goes a little step into making it more
human-readable.
https://gitlab.freedesktop.org/wayland/wayland/issues/26
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Olivier Fourdan <ofourdan@redhat.com>
commit ec7e2b54c5b4a34b2a077082967bc3ead30e227e
Author: Alexander Volkov <a.volkov@rusbitech.ru>
Date: Tue Jun 5 13:05:39 2018 +0300
Xext/shm: Refuse to work for remote clients
Avoid access to System V shared memory segment on the X server side
for clients forwarded via SSH. Also prevent them from hanging while
waiting for the reply from the ShmCreateSegment request.
v2: Allow ShmQueryVersion request even for remote clients
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=11080
Signed-off-by: Alexander Volkov <a.volkov@rusbitech.ru>
Reviewed-by: Adam Jackson <ajax@redhat.com>
commit 5c95be38e5af28108d8c6c08dfe08d1dfcb7ed42
Author: Michał Górny <gentoo@mgorny.alt.pl>
Date: Mon Jun 11 17:17:31 2018 -0400
xfree86: Makefile shouldn't rely on superuser being named 'root'
Change the 'chown' statement in Makefile.am to use the numeric UID
of superuser instead of relying on the name 'root'.
Bugzilla: https://bugs.freedesktop.org/27726
Signed-off-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Michał Górny <gentoo@mgorny.alt.pl>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 166ac294aefe21a6cfcc0e7a4c9525eef49c2f0c
Author: Matt Turner <mattst88@gmail.com>
Date: Tue May 22 21:10:55 2018 -0700
xfree86: Inline xf86{Read,Write}Mmio{8,16,32} on alpha
In commit 9db2af6f757e (xfree86: Remove xf86{Map,Unmap}VidMem) we
somehow stopped exporting xf86{Read,Write}Mmio{8,16,32}. Since the
function pointer indirection was intended to support dense vs sparse and
sparse support is now gone, we can just make the functions static inline
in compiler.h and avoid all of this.
Bugzilla: https://bugs.gentoo.org/548906
Tested-by: Christopher May-Townsend <chris@maytownsend.co.uk>
Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Matt Turner <mattst88@gmail.com>
commit 1993f147d08170f07a72e43f0a0f27687e16967b
Author: Olivier Fourdan <ofourdan@redhat.com>
Date: Fri Jun 8 16:23:44 2018 +0200
xwayland: use pixmap size on present flip
If the pixmap size does not match the present box size, flickering
occurs.
This can happen when the client changes its size (e.g. switching to
fullscreen), and since the buffer is kept as long as the pixmap is
valid, once the buffer is created, it remains at the wrong (old) size
and causes continuous flickering.
Use the actual pixmap's drawable size instead of the present box to
create the buffer so that it's sized appropriately.
Bugzilla: https://bugs.freedesktop.org/106841
Fixes: 0fb2cca193e6 "xwayland: Preliminary support for Present's new
window flip mode"
Signed-off-by: Olivier Fourdan <ofourdan@redhat.com>
Reviewed-by: Michel Dänzer <michel.daenzer@amd.com>
Reviewed-by: Roman Gilg <subdiff@gmail.com>
commit 10eec2ccb11701fe29ab246acd6c0bdc2991b775
Author: Michel Dänzer <michel.daenzer@amd.com>
Date: Thu Jun 7 17:55:21 2018 +0200
present/wnmd: Preserve window pixmap's screen_x/y on flip
The incorrect values could result in the new pixmap's contents
getting corrupted down the line.
v2:
* Guard screen_x/y lines by #ifdef COMPOSITE
Bugzilla: https://bugs.freedesktop.org/106841
Fixes: 029608dd8020 "present: Add window flip mode"
Reviewed-by: Adam Jackson <ajax@redhat.com> # v1
Reviewed-by: Keith Packard <keithp@keithp.com> # v1
Reviewed-by: Roman Gilg <subdiff@gmail.com>
Tested-by: Olivier Fourdan <ofourdan@redhat.com> # v1
commit 6300049a9a4b84789a2e8141f5cad17adf22185c
Author: Dave Airlie <airlied@redhat.com>
Date: Tue May 29 10:39:22 2018 +1000
xwayland: fix typo in non-modifier fallback path
Pointed out on irc by q66.
Reviewed-by: Olivier Fourdan <ofourdan@redhat.com>
Reviewed-by: Michel Dänzer <michel.daenzer@amd.com>
commit 40586cc4f8faa271d62fd84fe98c41debb878984
Author: Roman Kapl <code@rkapl.cz>
Date: Thu Jun 7 03:31:42 2018 +0200
Xi: add forgotten byte-swaps for Valuator fields
This has caused nonsensical values in xinput output.
Signed-off-by: Roman Kapl <code@rkapl.cz>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit cefbc6a9356e5c6cf935b61557efa897762defae
Author: Roman Kapl <code@rkapl.cz>
Date: Thu Jun 7 03:31:41 2018 +0200
Xi: fix byte-swapping of button labels
The byte-swapping code forgot that the xXIButtonInfo is followed by a
button mask, not directly by the button labels. This resulted in client
crashes in cross-endian setups, for example in `xinput list --long`,
since the client got an invalid atom.
A new function was introduced to get the right positions for the label
and mask data.
Signed-off-by: Roman Kapl <code@rkapl.cz>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 9b8999411033c9473cd68e92e4690a91aecf5b95
Author: Adam Jackson <ajax@redhat.com>
Date: Wed Jun 6 15:56:26 2018 -0400
glamor: Enable modifier support for xfree86 too
This was left disabled in 1.20.0, it's time to start being sure it
works.
Signed-off-by: Adam Jackson <ajax@redhat.com>
Acked-by: Keith Packard <keithp@keithp.com>
Acked-by: Daniel Stone <daniels@collabora.com>
commit 3ebef6ab850675e1091df2125ebdfbb147436e6c
Author: Michel Dänzer <michel.daenzer@amd.com>
Date: Fri Jun 1 11:57:15 2018 +0200
exa: Use PictureMatchFormat for source-only picture format description
Their pFormat member is NULL, which resulted in a crash in
miRenderColorToPixel.
Fixes: 8171d4c2d67b "render: Store and use all 16bpc of precision for
solid pixels (v2.1)"
Reviewed-by: Adam Jackson <ajax@redhat.com>
commit 4d5950ce14676f970d9de97380929a93948b98f2
Author: Michel Dänzer <michel.daenzer@amd.com>
Date: Wed May 23 11:18:02 2018 +0200
glamor: Propagate glamor_fds_from_pixmap error in glamor_fd_from_pixmap
glamor_fds_from_pixmap returns 0 on error, but we were treating that as
success, continuing with uninitialized stride and fd values.
Also bail if the offset isn't 0, same as in dri3_fd_from_pixmap.
v2:
* Reduce to a simple one-liner fix (Emil Velikov)
Fixes: c8c276c9569b "glamor: Implement PixmapFromBuffers and
BuffersFromPixmap"
Reviewed-by: Emil Velikov <emil.l.velikov@gmail.com>
commit 3da999a0390407d512bf784e4faf01482bfff9ea
Author: Michel Dänzer <michel.daenzer@amd.com>
Date: Wed May 23 11:38:13 2018 +0200
glamor: Always return 0 from glamor_fds_from_pixmap on error
This matches what glamor_egl_fds_from_pixmap and dri3_fds_from_pixmap do
and what proc_dri3_buffers_from_pixmap expects.
Fixes: c8c276c9569b "glamor: Implement PixmapFromBuffers and
BuffersFromPixmap"
Reviewed-by: Emil Velikov <emil.l.velikov@gmail.com>
commit 315c63c41d833700c505e4f21ffac4c59e1e3b2c
Author: Michel Dänzer <michel.daenzer@amd.com>
Date: Fri May 18 11:23:01 2018 +0200
modesetting: Pass O_CLOEXEC when opening a DRM device
We don't want DRM file descriptors to leak to child processes.
Reviewed-by: Keith Packard <keithp@keithp.com>
Signed-off-by: Michel Dänzer <michel.daenzer@amd.com>
commit ab53e2859facecc0486344679dc01ea31fb427e9
Author: Michel Dänzer <michel.daenzer@amd.com>
Date: Fri May 18 11:23:00 2018 +0200
xfree86: Fix O_CLOEXEC usage in lnx_platform
It was passing O_CLOEXEC as permission bits instead of as a flag.
Signed-off-by: Michel Dänzer <michel.daenzer@amd.com>
Reviewed-by: Keith Packard <keithp@keithp.com>
commit 1e9d5533e3c08fc22099d6dd0f11fa642ab4f1b0
Author: Chris Wilson <chris@chris-wilson.co.uk>
Date: Sun Apr 15 15:40:05 2018 +0100
os/WaitFor: Use the simpler xorg_list_for_each_entry()
As we are not freeing elements while iterating the list of timers, we
can forgo using the safe variant, and reduce the number of pointer
dances required for the insertion sort.
Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
commit 6115d8b40ce0c91620b6d5e7d18e0da704409f89
Author: Chris Wilson <chris@chris-wilson.co.uk>
Date: Sun Apr 15 15:40:04 2018 +0100
os/WaitFor: Use xorg_list_append()
Currently, we use xorg_list_add(new, head->prev) which is functionaly
equivalent to xorg_list_append(), but with more pointer chasing, so
reduce the strain on the reader and compiler by using the simpler
append().
Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
commit 7437b6dbdee050f8ebb3a79b9077d051c91880c3
Author: Lukas F. Hartmann <lukas@mntmn.com>
Date: Tue May 15 21:51:56 2018 +0200
glamor_init: clamp GLSL to 120 if platform doesn't have instanced arrays
Hi,
I upgraded Xwayland and the assorted libraries from git masters today,
and noticed that glamor wouldn't work anymore on i.MX6/etnaviv. The
error was:
No provider of glVertexAttribDivisor found. Requires one of:
Desktop OpenGL 3.3
OpenGL ES 3.0
GL extension "GL_ANGLE_instanced_arrays"
GL extension "GL_ARB_instanced_arrays"
GL extension "GL_EXT_instanced_arrays"
GL extension "GL_NV_instanced_arrays"
The problem is that etnaviv offers GLSL 140 on GL 2.1 and glamor
rendering assumes that glVertexAttribDivisor() is always available on
GLSL>=130, which is not the case here. Forcing GLSL 120 makes glamor
work fine again on this platform. After chatting with ajax in
#xorg-devel, the following solution was proposed.
This is my first time of submitting a patch, so please excuse me and
advise if I'm doing it wrong ;)
Cheers
Lukas (mntmn)
Reviewed-by: Eric Anholt <eric@anholt.net>
commit 3ab32a537840c6e6d6228b4ba62f98fbf5224f8a
Author: Bas Nieuwenhuizen <bas@basnieuwenhuizen.nl>
Date: Sun May 13 15:31:37 2018 +0200
DRI2: Sync radeonsi_pci_ids.h from Mesa
Fixes DRI2 client driver name mapping for newer AMD GPUs with the
modesetting driver, allowing the DRI2 extension to initialize.
Fixes using GL with the modesetting driver for me.
Seems we were way behind on this one, time to look into something
more scalable?
Signed-off-by: Bas Nieuwenhuizen <bas@basnieuwenhuizen.nl>
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
commit 27eff10bfa1a02da7338a82e2312d2080e3e5876
Author: Jon Turney <jon.turney@dronecode.org.uk>
Date: Sun May 13 19:36:05 2018 +0100
meson: don't put literal 'PACKAGE_STRING' and 'XORG_MAN_PAGE' in man pages
Instead, substitute the same values as autotools does
Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Jon Turney <jon.turney@dronecode.org.uk>
commit 47321bb455b1226c04711241496e62667eea34ea
Author: Jon Turney <jon.turney@dronecode.org.uk>
Date: Sun May 13 19:36:04 2018 +0100
meson: don't install xorg wrapper manpages if suid-wrapper isn't being used
Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Jon Turney <jon.turney@dronecode.org.uk>
commit 08a3583b5b2f812cc7f039aebd74ff9b1cb0dbcd
Author: Jon Turney <jon.turney@dronecode.org.uk>
Date: Sun May 13 19:36:03 2018 +0100
meson: install xwinclip and Xwinrc man pages
Omitted from a1e8dc05
Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Jon Turney <jon.turney@dronecode.org.uk>
commit f50afa19fd67ca8a059eb909814a4d673bcb5a31
Author: Adam Jackson <ajax@redhat.com>
Date: Mon May 14 14:08:01 2018 -0400
Post-1.20 version bump
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit 82f8fc5ffc0065537896ec43ae60d67d9a164c75
Author: Adam Jackson <ajax@redhat.com>
Date: Thu May 10 12:24:11 2018 -0400
xserver 1.20
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit b6bf68b8416ec4b717eb78703fb63789c68e509a
Author: Aaron Plattner <aplattner@nvidia.com>
Date: Wed May 2 12:54:26 2018 -0700
meson: Fix module_dir configuration (v2)
meson.build has code to set the module_dir variable to
${libdir}/xorg/modules if the module_dir option string is empty.
However, this has several problems:
1. The variable is only used for an unused @moduledir@ substitution in
the man page. The rule for xorg-server.pc uses option('module_dir')
directly instead.
2. The 'module_dir' option has a default value of 'xorg/modules' so the
above rule doesn't do anything by default.
3. The xorg-server.pc rule uses ${exec_prefix}/option('module_dir'), so
the effect of #2 is that the default moduledir is different between
autoconf and meson. E.g. if ${prefix} is /X, then you get
autoconf: moduledir=/X/lib/xorg/modules
meson: moduledir=/X/xorg/modules
Fix this by using the module_dir variable when generating xorg-server.pc, and by
using join_paths() to assign module_dir unconditionally.
v2: Keep the 'xorg/modules' default path, but use join_paths() unconditionally (Thierry Reding)
Signed-off-by: Aaron Plattner <aplattner@nvidia.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 9d628ee5facf6318368d5b8ca181e083adcffe8c
Author: Roman Gilg <subdiff@gmail.com>
Date: Wed May 2 21:32:48 2018 +0200
modesetting: set gbm as dependency in meson build
Modifiers support needs gbm as a dependency. Without setting the dependency
included headers are not found reliably and the build might fail if the
headers are not placed in the default system include paths.
Signed-off-by: Roman Gilg <subdiff@gmail.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
commit 0445705a8bbf76a5532997823ea8110daff26c6d
Author: Adam Jackson <ajax@redhat.com>
Date: Mon May 7 17:21:20 2018 -0400
man: Fix automake seddery
Because this is an automakefile, things inside @@ get expanded, which
means your sed ends up saying s|/var/log|/var/log| and your manual pages
still have @logdir@ in them. Fix this by hiding the @s inside a trivial
character range, which keeps the pattern preserved all the way into the
Makefile.
Signed-off-by: Adam Jackson <ajax@redhat.com>
Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
commit 9f21872ad8591c1f6f8ea1e466f212c3582d3c33
Author: Adam Jackson <ajax@redhat.com>
Date: Mon May 7 17:21:19 2018 -0400
glx: Be sure to set an error for ghost contexts
Otherwise the caller is going to return garbage memory for the error
value.
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit b9f415cbad47412bfb218cf7375d0c2856a27d1b
Author: Adam Jackson <ajax@redhat.com>
Date: Mon May 7 17:21:18 2018 -0400
present: Fix swapping of PresentCompleteNotify events
The code would fall through to the PresentIdleNotify case, and nothing
good would come of it.
Signed-off-by: Adam Jackson <ajax@redhat.com>
Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
commit cc66777d85f3509b0f9dfc9210d0a0415a2a388d
Author: Adam Jackson <ajax@redhat.com>
Date: Mon May 7 17:21:17 2018 -0400
xwayland: Don't create a "fake" crtc for Present
We probably don't want a fake crtc to be visible to clients, and we
definitely don't want to generate events every time we create such a
fake (which would happen as a side effect from RRCrtcCreate hitting
RRTellChanged). As it happens we're not actually using that crtc for
anything because xwayland doesn't store any state on the crtc object,
so it suffices to use the real crtc for the screen.
Signed-off-by: Adam Jackson <ajax@redhat.com>
Tested-by: Roman Gilg <subdiff@gmail.com>
Reviewed-by: Roman Gilg <subdiff@gmail.com>
commit b23a0e4ded62500f2c248f23962ff5ac718467e6
Author: Eric Anholt <eric@anholt.net>
Date: Mon May 7 16:46:20 2018 -0700
xwayland: Fix a 32-bit build warning.
Signed-off-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Adam Jackson <ajax@redhat.com>
commit ef95331603ff31d3643360c399b3865db5b0b97d
Author: Eric Anholt <eric@anholt.net>
Date: Mon May 7 16:46:19 2018 -0700
dri3: Switch fds_from_pixmap to stdint types.
Again, this was causing 32-bit build warnings due to mixing CARD* and
stdint.
Signed-off-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Adam Jackson <ajax@redhat.com>
commit 4c754b01fafc4b042d9918c05a71157f6fa6392a
Author: Eric Anholt <eric@anholt.net>
Date: Mon May 7 16:46:18 2018 -0700
dri3: Switch get_modifiers to using stdint.
We were mixing stdint and CARD* types, causing compiler warnings on
32-bit. Just switch over to stdint, which is what we'd like the server
to be using long term, anyway.
Reviewed-by: Adam Jackson <ajax@redhat.com>
commit 5e86484a183f051d7a8a67ea13c23a3d6e69e76b
Author: Eric Anholt <eric@anholt.net>
Date: Mon May 7 16:46:17 2018 -0700
dri3: Switch get_drawable_modifiers to using stdint.
We were mixing stdint and CARD* types, causing compiler warnings on
32-bit. Just switch over to stdint, which is what we'd like the server
to be using long term, anyway.
Signed-off-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Adam Jackson <ajax@redhat.com>
commit 4ec02b573ef2424965d7ce2d33d150ddb92ec544
Author: Eric Anholt <eric@anholt.net>
Date: Mon May 7 16:46:16 2018 -0700
randr: Fix a compiler warning on 32-bit.
Signed-off-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Adam Jackson <ajax@redhat.com>
commit e1ccd0fa0e1081edf8a2c69ce6e8e3f67a4aecba
Author: Eric Anholt <eric@anholt.net>
Date: Mon May 7 16:46:15 2018 -0700
dix: Fix a warning about GetTimeInMillis return value in XFont2.
Signed-off-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Adam Jackson <ajax@redhat.com>
commit cf838f5ca81e0c967902b74fb1971bc6fac5c601
Author: Roman Gilg <subdiff@gmail.com>
Date: Fri May 4 03:07:31 2018 +0200
xwayland: persistent window struct on present
Instead of reusing xwl_window introduce a persistent window struct for every
window, that asks for Present flips.
This struct saves all relevant data and is only freed on window destroy.
Signed-off-by: Roman Gilg <subdiff@gmail.com>
Tested-by: Olivier Fourdan <ofourdan@redhat.com>
commit c9afd8cb5ec975b189ab7b678e1f997d6a2ba5ee
Author: Mario Kleiner <mario.kleiner.de@gmail.com>
Date: Sun May 6 07:34:31 2018 +0200
modesetting: Fix and improve ms_kernel_msc_to_crtc_msc()
The old 32-Bit wraparound handling didn't actually work, due to some
integer casting bug, and the mapping was ill equipped to deal with input
from the new true 64-bit GetCrtcSequence/QueueCrtcSequence api's
introduced in Linux 4.15.
For 32-Bit truncated input from pageflip events and old vblank events
and old drmWaitVblank ioctl, implement new wraparound handling, which
also allows to deal with wraparound in the other direction, e.g., if a
32-Bit truncated sequence value is passed in, whose true 64-Bit
in-kernel hw value is within 2^30 counts of the previous processed
value, but whose 32-bit truncated sequence value happens to lie just
above or below a 2^32 boundary, iow. one of the two values 'sequence'
vs. 'msc_prev' lies above a 2^32 border, the other one below it.
The method is directly translated from Mesa's proven implementation of
the INTEL_swap_events extension, where a true underlying 64-Bit wide
swapbuffers count (SBC) needs to get reconstructed from a 32-Bit LSB
truncated SBC transported over the X11 protocol wire. Same conditions
apply, ie. successive true 64-Bit SBC values are close to each other,
but don't always get received in strictly monotonically increasing
order. See Mesa commit cc5ddd584d17abd422ae4d8e83805969485740d9 ("glx:
Handle out-of-sequence swap completion events correctly. (v2)") for
explanation.
Additionally add a separate path for true 64-bit msc input originating
from Linux 4.15+ drmCrtcGetSequence/QueueSequence ioctl's and
corresponding 64-bit vblank events. True 64-bit msc's don't need
remapping and must be passed through.
As a reliability bonus, they are also used here to update the tracking
values msc_prev and ms_high with perfect 64-Bit ground truth as baseline
for mapping msc from pageflip completion events, because pageflip events
are always 32-bit wide, even when the new kernel api's are used. Because
each pageflip(-event) is always preceeded close in time (and vblank
count) by a drmCrtcQueueSequence queued event or drmCrtcGetSequence
query as part of DRI2 or DRI3+Present swap scheduling, we can be certain
that each pageflip event will get its truncated 32-bit msc remapped
reliably to the true 64-bit msc of flip completion whenever the sequence
api is available, ie. on Linux 4.15 or later.
Note: In principle at least the 32-bit mapping path could also be
backported to earlier server branches, as this seems to be broken for at
least server 1.16 to 1.19.
Signed-off-by: Mario Kleiner <mario.kleiner.de@gmail.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
Cc: Keith Packard <keithp@keithp.com>
Cc: Michel Dänzer <michel.daenzer@amd.com>
commit 73f0ed2d928afc692ed057eb3d7627328a6e5b12
Author: Mario Kleiner <mario.kleiner.de@gmail.com>
Date: Fri May 4 14:14:10 2018 +0200
modesetting: Remove ms_crtc_msc_to_kernel_msc().
The function is ported from intel-ddx uxa backend around 2013, where its
stated purpose was to apply a vblank_offset to msc values to correct for
problems with those kernel provided msc values. Some (somewhat magic and
puzzling to myself) heuristic tried to guess if provided values were
unreasonable and tried to adapt the corrective vblank_offset to account
for that.
Except: It wasn't applied to kernel provided msc values, but the values
delivered by clients via DRI2 or Present, so valid client targetmsc
values, e.g., requesting a vblank event > 1000 vblanks in the future,
triggered the offset correction in arbitrarily wrong ways, leading to
wrong msc values being returned and thereby vblank events queued to the
kernel for the wrong time. This causes glXSwapBuffersMscOML and
glXWaitForMscOML to swap / return immediately whenever a swap/wait in >
1000 vblanks is requested.
The original code was also written to only deal with 32 bit mscs, but
server 1.20 modesetting ddx can now use new Linux 4.15+ kernel vblank
api to process true 64 bit msc's, which may confuse the heuristic even
more due to 32 bit integer truncation/wrapping.
This code caused various problems in the intel-ddx in the past since
year 2013, and was removed there in 2015 by Chris Wilson in commit
42ebe2ef9646be5c4586868cf332b4cd79bb4618:
" uxa: Remove the filtering of bogus Present MSC values
If the intention was to filter the return values from the kernel, the
filtering would have been applied to the kernel values and not to the
incoming values from Present. This filtering introduces crazy integer
promotion and truncation bugs all because Present feeds garbage into its
vblank requests.
"
Indeed, i found a Mesa bug yesterday which can cause Mesa's
PresentPixmap request to spuriously feed garbage targetMSC's into the
driver under some conditions. However, while other video drivers seem to
cope relatively well with that, modesetting ddx causes KDE-5's
plasmashell to lock up badly quite frequently, and my suspicion is that
the code removed in this commit is one major source of the extra
fragility.
Also my own tests fail for any swap scheduled more than 1000 vblanks
into the future, which is not uncommon for some scientific applications.
Iow. modesetting's swap scheduling seems to be more robust without this
function afaics.
Signed-off-by: Mario Kleiner <mario.kleiner.de@gmail.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
Cc: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Keith Packard <keithp@keithp.com>
Tested-by: Mike Lothian <mike@fireburn.co.uk>
commit f5ded22e14e2e15390eff8e01ce32de496ae0e86
Author: Aaron Plattner <aplattner@nvidia.com>
Date: Fri May 4 10:48:17 2018 -0700
meson: Set XCONFIGFILE to 'xorg.conf' instead of '/etc/xorg.conf'
The autoconf build hard-codes XCONFIGFILE to just 'xorg.conf':
XF86CONFIGFILE="xorg.conf"
AC_DEFINE_DIR(XCONFIGFILE, XF86CONFIGFILE, [Name of configuration file])
Later, the X server passes that into DoSubstitution() which expands the path:
DoSubstitution(template="/etc/X11/%X", ..., XConfigFile="xorg.conf")
This returns "/etc/X11/xorg.conf".
The Meson build, on the other hand, sets XCONFIGFILE to
join_paths(get_option('sysconfdir'), 'xorg.conf'). If sysconfdir is /etc, this
results in '/etc/xorg.conf', resulting in DoSubstitution returning
'/etc/X11/etc/xorg.conf'.
Fix this by just hard-coding XCONFIGFILE to 'xorg.conf'.
Signed-off-by: Aaron Plattner <aplattner@nvidia.com>
Reviewed-by: Thierry Reding <treding@nvidia.com>
commit 1a3e4a2f6722048c5c7c4c1a9d6748e68a895a3e
Author: Aaron Plattner <aplattner@nvidia.com>
Date: Fri May 4 15:09:22 2018 -0700
meson: Define DEFAULT_LIBRARY_PATH as join_paths(get_option('prefix'), get_option('libdir'))
'libdir' defaults to 'lib', so running X -showDefaultLibPath just prints 'lib'
instead of '/usr/lib' or '/usr/local/lib'. Use joint_paths() to get the correct
full path.
Signed-off-by: Aaron Plattner <aplattner@nvidia.com>
Reviewed-by: Thierry Reding <treding@nvidia.com>
commit 1dcd784a677c58e77c368a676fd9dbd3159db94f
Author: Anuj Phogat <anuj.phogat@gmail.com>
Date: Thu May 3 11:29:11 2018 -0700
dri2: Sync i965_pci_ids.h from mesa
Copied from Mesa with no modifications.
Gives us Cofeelake platform names updates and sync on Kaby Lake,
Ice Lake PCI IDs.
Acked-by: Kenneth Graunke <kenneth@whitecape.org>
Signed-off-by: Anuj Phogat <anuj.phogat@gmail.com>
commit 4191b59bd5458ea3a8b0d5272bdcd250fee1e129
Author: Adam Jackson <ajax@redhat.com>
Date: Wed May 2 15:09:52 2018 -0400
meson: Fix build with three-component version numbers
Otherwise:
include/meson.build:5:0: ERROR: Index 3 out of bounds of array of size 3.
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit 531e1648fc0da03816ecc57481479e6fc6a45ac3
Author: Adam Jackson <ajax@redhat.com>
Date: Wed Apr 25 13:39:18 2018 -0400
gitlab-ci: Add for gitlab.freedesktop.org
Looks quite a bit like the travis path, doesn't it? Still, nice to not
rely on an external service if we don't have to.
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit 22285a6f1c5fa6ba22f4214c4ccc09e27d1925f6
Author: Roman Gilg <subdiff@gmail.com>
Date: Fri Apr 20 17:10:06 2018 +0200
present: fix msc offset calculation in window mode
Instead of getting the current msc value from the window, which might be
different to old one directly take the last saved msc value saved in
the window_priv struct.
Signed-off-by: Roman Gilg <subdiff@gmail.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
commit d7297b00444b0e2cd936fbfb08206a575ab8c29d
Author: Chris Wilson <chris@chris-wilson.co.uk>
Date: Mon Apr 30 15:19:53 2018 -0700
randr: Account for panning and transforms when constraining the cursor
commit 56c90e29f04727c903bd0f084d23bf44eb1a0a11 [1.10.99.901]
Author: Adam Jackson <ajax@redhat.com>
Date: Mon Nov 15 14:29:14 2010 -0500
randr: Add RRConstrainCursorHarder
introduced a regression as it ignored the effect of panning and
transforms upon the crtc bounds. The result was that the cursor would be
constrained to the visible area even though the panning arena was much
bigger, or the cursor was constrained to a region that did not even
match the visible area when the output was transformed or reflected.
This supercedes the hack introduced by
commit 1bf81af4a6be1113bcc3b940ab264d5c9e0f0c5d [1.12.99.904]
Author: Rui Matos <tiagomatos@gmail.com>
Date: Mon Jul 30 14:32:12 2012 -0400
xf86RandR12: Don't call ConstrainCursorHarder() if panning is enabled
which disabled the cursor constraints if a panning mode was active, but
did not fix the regression with arbitrary output transforms.
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=39949
Reviewed-by: Adam Jackson <ajax@redhat.com>
Cc: Rui Matos <tiagomatos@gmail.com>
commit a843c61456b2046fb1780415f17162b503243af7
Author: Roman Gilg <subdiff@gmail.com>
Date: Fri Apr 20 17:07:42 2018 +0200
xwayland: restrict present cleanup to presenting and top parent window
Clean up only if the request points to the presenting window or its top
parent window.
Since in this case all events are removed unconditionally, always stop
the timer.
Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Roman Gilg <subdiff@gmail.com>
commit 975d3a509667579b81d88616b91491472059354d
Author: Adam Jackson <ajax@redhat.com>
Date: Mon Apr 30 14:10:26 2018 -0400
xwayland: Avoid using epoxy_has_egl()
There's no real point - if we don't have EGL then the extension check is
also going to fail - and the entrypoint is new in 1.5.0, which we don't
need to require yet.
Signed-off-by: Adam Jackson <ajax@redhat.com>
Reviewed-by: Mario Kleiner <mario.kleiner.de@gmail.com>
commit d6f2272f44ce1a7a96ae04fdbde8708514c60771
Author: Adam Jackson <ajax@redhat.com>
Date: Mon Apr 30 14:07:44 2018 -0400
meson: Bump version number here too
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit 6cace4990abc2386b6ea68536b321994d264c295
Author: Louis-Francis Ratté-Boulianne <lfrb@collabora.com>
Date: Thu Apr 26 11:04:15 2018 -0400
modesetting: Fix GBM objects leak when checking for flip
GBM objects were never destroyed after looking for format and
modifier compatibility when deciding whether flipping or copying
a presented pixmap.
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=106106
Signed-off-by: Louis-Francis Ratté-Boulianne <lfrb@collabora.com>
commit e00ada9fbbddf4570fe38c3ceeb922af7afcfd1a
Author: Mario Kleiner <mario.kleiner.de@gmail.com>
Date: Mon Apr 30 09:06:09 2018 +0200
glamor: Don't fail in glamor_get_formats if not dmabuf_capable.
If dmabuf_capable is false, because the server "dmabuf_capable"
debug flag isn't set, treat it as successfull query with zero
returned formats, instead of failure.
This allows the servers cache_formats_and_modifiers() function
to cache the fact that formats are not supported during the
current server generation, instead of pointless retesting at
every invocation.
Signed-off-by: Mario Kleiner <mario.kleiner.de@gmail.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
commit 55db3c9cfc1bc92a53b75b99e8fa49a32d7efe63
Author: Mario Kleiner <mario.kleiner.de@gmail.com>
Date: Mon Apr 30 09:06:08 2018 +0200
dri3: Robustly clamp to 1.0 if not all screens support 1.2
Checking for dri3_screen_info_rec.version >= 2 is insufficient,
as some shipping drivers, e.g., intel-ddx, nouveau-ddx, set the
version to DRI3_SCREEN_INFO_VERSION, ie. to whatever version the
installed servers headers define. On server 1.20 that would
be version 2, but the drivers still don't support the v1.2
hooks. Make sure all hooks are defined before reporting v1.2.
Also make clamping of reported version to minimum of client
or server robust against possible future clients with possible
majorVersion >= 2.0.
Signed-off-by: Mario Kleiner <mario.kleiner.de@gmail.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
Cc: Daniel Stone <daniels@collabora.com>
commit fbc5c5cd532962d2df96a04e5c8cc0d21b47b08a
Author: Mario Kleiner <mario.kleiner.de@gmail.com>
Date: Mon Apr 30 09:06:07 2018 +0200
dri3: Fix error handling in dri3_buffer_from_pixmap request.
The old info->fd_from_pixmap() driver hook, which is
preferentially used in dri3_fd_from_pixmap(), can return
error codes other than -1, e.g., -EINVAL (-22) on nouveau-ddx.
Not handling the error causes a broken/corrupted X-Connection
resulting from a failed request.
This fixes failure of sddm-greeter to start up under nouveau-ddx
with DRI3 enabled and DRI3 protocol version properly clamped
to 1.0 by the server (see followup patch).
Fixes: 75bba3aedcb0 ("dri3: Use single-FD screen call for single-FD request")
Signed-off-by: Mario Kleiner <mario.kleiner.de@gmail.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
Cc: Daniel Stone <daniels@collabora.com>
commit 19d006ee3db4b4635ef9ef5c92562f3ffeddb305
Author: Adam Jackson <ajax@redhat.com>
Date: Tue Apr 24 16:08:26 2018 -0400
dri3: Clamp to 1.0 if not all screens support 1.2
Signed-off-by: Adam Jackson <ajax@redhat.com>
Reviewed-by: Daniel Stone <daniels@collabora.com>
commit 352a5ac87fd344936b759a5766eb74271e7d295d
Author: Mario Kleiner <mario.kleiner.de@gmail.com>
Date: Tue Apr 24 10:17:26 2018 +0200
dri3: Fix DRI3.2 support for drivers other than modesetting-ddx.
Both xf86-video-intel and xf86-video-nouveau cause OpenGL clients to
fail when used with DRI3 on server 1.20 with Mesa 18.1.
Reason is that the servers DRI3 version is now unconditionally reported
as DRI3 1.2 to 1.2 capable clients. This causes clients using Mesa 18.1
to use the new DRI 3.2 requests DRI3GetSupportedModifiers,
DRI3PixmapFromBuffers, etc. Drivers other than modesetting-ddx do not
support the needed hooks like info->pixmap_from_fds or
info->get_formats, info->get_modifiers. Unfortunately we can't simply
report the servers DRI3 version as 1.0 in this case, as the reported
version can not be specific to a X-Screen, and different screens may
have drivers with different capabilities.
Luckily the server has fallbacks to ->pixmap_from_fd, ->fd_from_pixmap,
and simply reporting an empty set of supported modifiers for the
DRI3GetSupportedModifiers request if the ddx doesn't support DRI 3.2.
Clients like Mesa 18.1's dri3 loader respond to the empty set of
reported modifiers by falling back to a dri driver selected buffer
format (image->createImageWithModifiers responds to a NULL modifier_list
by acting like ->createImage()). This works, but Mesa 18.1 will still
try to use the DRI3PixmapFromBuffers request to create the corresponding
pixmap, just passing in a modifier that corresponds to whatever tiling
the dri driver selected by default. To prevent this request - and
thereby the client - from failing with a BadImplementation error, remove
the check for modifier == DRM_MOD_FORMAT_INVALID in the pixmap_from_fd
fallback path of dri3_pixmap_from_fds() and trust that if we hit the
fallback path then the client will have passed a buffer with some driver
specific default tiling that can be handled by pixmap_from_fd.
Another approach would be for Mesa's dri3 loader to keep track how a
buffer was created (with explicit modifiers or not), and then call
DRI3PixmapFromBuffers or DRI3PixmapFromBuffer, but then any future DRI3
client implementation would need to be fixed, so the server side is
probably the better place for this.
Tested on Intel Ivybridge and NVidia Pascal.
Fixes: 6e7c40f62db6 ("dri3: Add multi-planar/modifier buffer requests")
Signed-off-by: Mario Kleiner <mario.kleiner.de@gmail.com>
Cc: Daniel Stone <daniels@collabora.com>
Cc: Louis-Francis Ratté-Boulianne <lfrb@collabora.com>
Tested-by: Mike Lothian <mike@fireburn.co.uk>
Reviewed-by: Adam Jackson <ajax@redhat.com>
commit c6ab21022ce876f9c1409db4bb1967134f9f6dbe
Author: Adam Jackson <ajax@redhat.com>
Date: Tue Apr 24 17:03:07 2018 -0400
xserver 1.20 RC5
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit c593d843f6305dd8bc5fa7762273d319a223abc4
Author: Daniel Stone <daniels@collabora.com>
Date: Tue Apr 24 21:27:47 2018 +0100
dri3: Don't call vfuncs on old DRI3 screens
Only call the get_supported_modifiers vfunc if the DRI3 screen struct is
sufficiently new.
Signed-off-by: Daniel Stone <daniels@collabora.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
commit 54ac09717cd8c49259f53a4a227d903ebe8e0a32
Author: Lyude Paul <lyude@redhat.com>
Date: Fri Apr 20 14:38:05 2018 -0400
xwayland: Add glamor egl_backend for EGLStreams
This adds initial support for displaying Xwayland applications through
the use of EGLStreams and nvidia's custom wayland protocol by adding
another egl_backend driver. This also adds some additional egl_backend
hooks that are required to make things work properly.
EGLStreams work a lot differently then the traditional way of handling
buffers with wayland. Unfortunately, there are also a LOT of various
pitfalls baked into it's design that need to be explained.
This has a very large and unfortunate implication: direct rendering is,
for the time being at least, impossible to do through EGLStreams. The
main reason being that the EGLStream spec mandates that we lose the
entire color buffer contents with each eglSwapBuffers(), which goes
against X's requirement of not losing data with pixmaps. no way to use
an allocated EGLSurface as the storage for glamor rendering like we do
with GBM, we have to rely on blitting each pixmap to it's respective
EGLSurface producer each frame. In order to pull this off, we add two
different additional egl_backend hooks that GBM opts out of
implementing:
- egl_backend.allow_commits for holding off displaying any EGLStream
backed pixmaps until the point where it's stream is completely
initialized and ready for use
- egl_backend.post_damage for blitting the content of the EGLStream
surface producer before Xwayland actually damages and commits the
wl_surface to the screen.
The other big pitfall here is that using nvidia's wayland-eglstreams
helper library is also not possible for the most part. All of it's API
for creating and destroying streams rely on being able to perform a
roundtrip in order to bring each stream to completion since the wayland
compositor must perform it's job of connecting a consumer to each
EGLstream. Because Xwayland has to potentially handle both responding to
the wayland compositor and it's own X clients, the situation of the
wayland compositor being one of our X clients must be considered. If we
perform a roundtrip with the Wayland compositor, it's possible that the
wayland compositor might currently be connected to us as an X client and
thus hang while both Xwayland and the wayland compositor await responses
from eachother. To avoid this, we work directly with the wayland
protocol and use wl_display_sync() events along with release() events to
set up and destroy EGLStreams asynchronously alongside handling X
clients.
Additionally, since setting up EGLStreams is not an atomic operation we
have to take into consideration the fact that an EGLStream can
potentially be created in response to a window resize, then immediately
deleted due to another pending window resize in the same X client's
pending reqests before Xwayland hits the part of it's event loop where
we read from the wayland compositor. To make this even more painful, we
also have to take into consideration that since EGLStreams are not
atomic that it's possible we could delete wayland resources for an
EGLStream before the compositor even finishes using them and thus run
into errors. So, we use quite a bit of tracking logic to keep EGLStream
objects alive until we know the compositor isn't using them (even if
this means the stream outlives the pixmap it backed).
While the default backend for glamor remains GBM, this patch exists for
users who have had to deal with the reprecussion of their GPU
manufacturers ignoring the advice of upstream and the standardization of
GBM across most major GPU manufacturers. It is not intended to be a
final solution to the GBM debate, but merely a baindaid so our users
don't have to suffer from the consequences of companies avoiding working
upstream. New drivers are strongly encouraged not to use this as a
backend, and use GBM like everyone else. We even spit this out as an
error from Xwayland when using the eglstream backend.
Signed-off-by: Lyude Paul <lyude@redhat.com>
Acked-by: Daniel Stone <daniels@collabora.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
commit 994f781007079176e0247ee64af5696d34debcde
Author: Lyude Paul <lyude@redhat.com>
Date: Fri Apr 20 14:38:04 2018 -0400
xwayland: Add xwayland-config.h
Just a small autogenerated header that will soon contain more then just
one macro.
Signed-off-by: Lyude Paul <lyude@redhat.com>
Reviewed-by: Daniel Stone <daniels@collabora.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
commit 1545e2dbadcb147d7d52b546d053149de866a031
Author: Lyude Paul <lyude@redhat.com>
Date: Fri Apr 20 14:38:03 2018 -0400
xwayland: Decouple GBM from glamor
This takes all of the gbm related code in wayland-glamor.c and moves it
into it's own EGL backend for Xwayland, xwayland-glamor-gbm.c.
Additionally, we add the egl_backend struct into xwl_screen in order to
provide hooks for alternative EGL backends such as nvidia's EGLStreams.
Signed-off-by: Lyude Paul <lyude@redhat.com>
Reviewed-by: Lyude Paul <lyude@redhat.com>
Reviewed-by: Daniel Stone <daniels@collabora.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
commit d2d664df974ac5a55d5819f0379fcdac05d22fa3
Author: Adam Jackson <ajax@redhat.com>
Date: Mon Apr 23 17:21:09 2018 -0400
vfb: Fix man page in re depth
32 is not a valid depth, and the default is now 24 not 8.
Signed-off-by: Adam Jackson <ajax@redhat.com>
Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
commit 79a7137557d33d4e92713ae8cabe838c44fea488
Author: Adam Jackson <ajax@redhat.com>
Date: Mon Apr 23 16:19:15 2018 -0400
glx: Require depth > 12 for GLX visuals
fb is happy to do TrueColor to 8bpp drawables, but mesa is not. Depth 12
is the biggest pseudocolor anyone ever really did, and 15 is the least
truecolor.
Without this Xvfb at depth 8 would "have" GLX, but no vendors
would actually back any of the screens. libGL will attempt to call
GLXQueryServerString to figure out the GLX version, and vnd will throw
an error because there's no vendor to dispatch that to, and then clients
crash.
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit 818885e6198cf2883155cb3d2e22c8c7bc4239fb
Author: Adam Jackson <ajax@redhat.com>
Date: Mon Apr 23 16:19:14 2018 -0400
vnd: Disable GLX if no vendors successfully initialized
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit fc25bceb515e5c18eecdebf5933c3e05cdac1a5a
Author: Adam Jackson <ajax@redhat.com>
Date: Mon Apr 23 16:19:13 2018 -0400
dix: Allow an extension to disable itself
GLX registers an extension before we know if there are any screens that
can actually do it. It's inconvenient to shrink the extension list, so
instead allow the extension to simply zero out its base opcode to
indicate that it needed to panic and disable itself.
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit 73a1cb9c92c936c2c1ae3d69fed743e21916d687
Author: Adam Jackson <ajax@redhat.com>
Date: Mon Apr 23 16:19:12 2018 -0400
dix: Factor out extension availability check
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit 9d5af632fde0373babfa32e66a59cfbf26ed7e5d
Author: Adam Jackson <ajax@redhat.com>
Date: Mon Apr 23 15:21:14 2018 -0400
animcur: Fix crash when removing a master device
Reproducer:
$ Xvfb -ac -noreset :1 &
$ DISPLAY=:1 xinput create-master touch1
$ DISPLAY=:1 xinput remove-master "touch1 pointer"
Bugzilla: https://bugs.freedesktop.org/105761
Signed-off-by: Adam Jackson <ajax@redhat.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 8275903956d7876519fa55fb805669dc301bf243
Author: Thomas Klausner <wiz@NetBSD.org>
Date: Mon Apr 23 14:56:17 2018 -0400
sdksyms: Cope with __pid_t and __uint32_t
Kludge sdksyms.c generator to not fail on GetClientPid.
It returns pid_t which on NetBSD is #define pid_t __pid_t
This slightly alters the GCC preprocessor output which this fragile
code could not deal with when using GCC 5+
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit e29d783278608544a208f211231a6a3ad2f8fa09
Author: Mario Kleiner <mario.kleiner.de@gmail.com>
Date: Fri Apr 20 19:59:40 2018 +0200
modesetting: Only use modifiers on kms drivers which do support them.
Use the DRM_CAP_ADDFB2_MODIFIERS query to make sure the kms
driver supports modifiers in the addfb2 ioctl, and fall back
to addfb ioctl without modifiers if modifiers are unsupported.
E.g., as of Linux 4.17, nouveau-kms so far does not suppport
modifiers and gets angry if drmModeAddFB2WithModifiers() is
called (-> failure to set a video mode -> blank screen), but
Mesa's nvc0+ gallium driver causes gbm_bo_get_modifier() to
return a valid modifier by translating the default tiling of
bo's created via gbm_bo_create() into a modifier other than
DRM_FORMAT_MOD_INVALID (see Mesa's nvc0_miptree_get_modifier()).
Testing for != DRM_FORMAT_MOD_INVALID is apparently not
sufficient for safe use of drmModeAddFB2WithModifiers.
Bonus: Handle potential failure of populate_format_modifiers().
The required DRM_CAP is defined since libdrm v2.4.65, and we
require v2.4.89+ for the server, so we can use it unconditionally.
Tested on intel-kms, radeon-kms, nouveau-kms. Fixes failure on
NVidia Pascal.
Fixes: 2f807c2324b4 ("modesetting: Add support for multi-plane pixmaps when page-flipping")
Signed-off-by: Mario Kleiner <mario.kleiner.de@gmail.com>
Cc: Daniel Stone <daniels@collabora.com>
Cc: Louis-Francis Ratté-Boulianne <lfrb@collabora.com>
Reviewed-by: Louis-Francis Ratté-Boulianne <lfrb@collabora.com>
commit fe4d1876b4f01c0b0e1916d548c398789f196164
Author: Lyude Paul <lyude@redhat.com>
Date: Wed Apr 18 17:57:54 2018 -0400
meson: Fix indenting in glx/meson.build
No functional changes, just fixing a tabs vs. space error I noticed
Signed-off-by: Lyude Paul <lyude@redhat.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
commit 4e28a6a223c4f9d0f5defe0313a94e22e0416787
Author: Lyude Paul <lyude@redhat.com>
Date: Wed Apr 18 18:09:15 2018 -0400
meson: Ensure we always build Xext/hashtable.c for glx
Seems that while glxvnd relies on some of the hashtable functions in
Xext, we only build hashtable support for Xext if we're also building
the res extension. This leads to some errors if you try to build glx
without res enabled:
glx/liblibglxvnd.a(vndcmds.c.o): In function `LookupVendorPrivDispatch':
/home/lyudess/Projects/xserver/glx/vndcmds.c:65: undefined reference to `ht_find'
/home/lyudess/Projects/xserver/glx/vndcmds.c:67: undefined reference to `ht_add'
glx/liblibglxvnd.a(vndcmds.c.o): In function `GlxDispatchInit':
/home/lyudess/Projects/xserver/glx/vndcmds.c:405: undefined reference to `ht_generic_compare'
/home/lyudess/Projects/xserver/glx/vndcmds.c:405: undefined reference to `ht_generic_hash'
/home/lyudess/Projects/xserver/glx/vndcmds.c:405: undefined reference to `ht_create'
glx/liblibglxvnd.a(vndcmds.c.o): In function `GlxDispatchReset':
/home/lyudess/Projects/xserver/glx/vndcmds.c:468: undefined reference to `ht_destroy'
collect2: error: ld returned 1 exit status
ninja: build stopped: subcommand failed.
So, make sure that hashtable.c gets both for both glx and res
Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Lyude Paul <lyude@redhat.com>
commit 3b4671f9e9c85f23e7593652e1482b11dc3ad4af
Author: Olivier Fourdan <ofourdan@redhat.com>
Date: Thu Apr 19 09:13:23 2018 +0200
xwayland: Clean up all frame callbacks
Regardless of the order we un-realize windows.
Suggested-by: Roman Gilg <subdiff@gmail.com>
Signed-off-by: Olivier Fourdan <ofourdan@redhat.com>
Reviewed-by: Roman Gilg <subdiff@gmail.com>
commit 8b8f9007cc56fdcee5479876e88e06b7f8b6de35
Author: Olivier Fourdan <ofourdan@redhat.com>
Date: Wed Apr 18 16:02:02 2018 +0200
xwayland: avoid using freed xwl_window on unrealize
xwl_unrealize_window() would use freed xwl_window which can lead to
various memory corruption and crashes, as reported by valgrind:
Invalid read of size 8
at 0x42C802: xwl_present_cleanup (xwayland-present.c:84)
by 0x42BA67: xwl_unrealize_window (xwayland.c:601)
by 0x541EE9: compUnrealizeWindow (compwindow.c:285)
by 0x57E1FA: UnrealizeTree (window.c:2816)
by 0x581189: UnmapWindow (window.c:2874)
by 0x54EB26: ProcUnmapWindow (dispatch.c:879)
by 0x554B7D: Dispatch (dispatch.c:479)
by 0x558BE5: dix_main (main.c:276)
by 0x7C4B1BA: (below main) (libc-start.c:308)
Address 0xf520f60 is 96 bytes inside a block of size 184 free'd
at 0x4C2EDAC: free (vg_replace_malloc.c:530)
by 0x42B9FB: xwl_unrealize_window (xwayland.c:624)
by 0x541EE9: compUnrealizeWindow (compwindow.c:285)
by 0x57E1FA: UnrealizeTree (window.c:2816)
by 0x581189: UnmapWindow (window.c:2874)
by 0x54EB26: ProcUnmapWindow (dispatch.c:879)
by 0x554B7D: Dispatch (dispatch.c:479)
by 0x558BE5: dix_main (main.c:276)
by 0x7C4B1BA: (below main) (libc-start.c:308)
Block was alloc'd at
at 0x4C2FB06: calloc (vg_replace_malloc.c:711)
by 0x42B307: xwl_realize_window (xwayland.c:488)
by 0x541E59: compRealizeWindow (compwindow.c:268)
by 0x57DA40: RealizeTree (window.c:2617)
by 0x580B28: MapWindow (window.c:2694)
by 0x54EA2A: ProcMapWindow (dispatch.c:845)
by 0x554B7D: Dispatch (dispatch.c:479)
by 0x558BE5: dix_main (main.c:276)
by 0x7C4B1BA: (below main) (libc-start.c:308)
This is because UnrealizeTree() traverses the tree from top to bottom,
which invalidates the assumption that if the Window doesn't feature an
xwl_window on its own, it's the xwl_window of its first ancestor with
one.
This reverts commit 82df2ce3
Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Olivier Fourdan <ofourdan@redhat.com>
commit 12a6b189fb17894d2c3851b70a396bbf41f444c6
Author: David Woodhouse <dwmw2@infradead.org>
Date: Tue Apr 17 22:22:21 2018 +0100
glamor: fix glamor_xv_query_image_attributes() for odd-width images
Images which are one pixel wider than a multiple of 8 are being handled
incorrectly. Other drivers round up the width to a multiple of two
before they start calculating. Do the same.
https://bugzilla.gnome.org/show_bug.cgi?id=795235
Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: David Woodhouse <dwmw2@infradead.org>
commit ac7a4bf44c68c5f323375974b208d4530fb5b60f
Author: Chris Wilson <chris@chris-wilson.co.uk>
Date: Sun Apr 15 15:40:03 2018 +0100
os/WaitFor: Check timers on every iteration
Currently we only check timer expiry if there are no client fd (or
other input) waiting to be serviced. This makes it very easy to starve
the timers with long request queues, and so miss critical timestamps.
The timer subsystem is just another input waiting to be serviced, so
evaluate it on every loop like all the others, at the cost of calling
GetTimeInMillis() slightly more frequently. (A more invasive and likely
OS specific alternative would be to move the timer wheel to the local
equivalent of timerfd, and treat it as an input fd to the event loop
exactly equivalent to all the others, and so also serviced on every
pass. The trade-off being that the kernel timer wheel is likely more
efficiently integrated with epoll, but individual updates to each timer
would then require syscalls.)
Reviewed-by: Peter Harris <pharris@opentext.com>
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
commit 78b6f940217c127f0f345b7710aa5994c6ded99c
Author: Adam Jackson <ajax@redhat.com>
Date: Mon Apr 16 14:08:27 2018 -0400
modesetting: Fix inverted check in dri2 WaitMSC
ms_queue_vblank() returns false on failure.
Reported-by: Chris Wilson <chris@chris-wilson.co.uk>
Signed-off-by: Adam Jackson <ajax@redhat.com>
Reviewed-by: Frank Binns <frank.binns@imgtec.com>
Tested-by: Mike Lothian <mike@fireburn.co.uk>
commit 4e92c51ce4d6ab50c1507a23a01c6be0d1954d79
Author: Mario Kleiner <mario.kleiner.de@gmail.com>
Date: Mon Apr 16 08:14:47 2018 +0200
dri3: Fix dri3_buffers_from_pixmap request.
Sending pixmap depth and bpp was omitted, so the Mesa
X11 + EGL + DRI3 side of things always failed to
dri3_create_image_khr_pixmap_from_buffers(), which led
to failure of X11 + EGL compositing under DRI3 under,
e.g., KDE Plasma 5.
Fixes: 6e7c40f62db6 ("dri3: Add multi-planar/modifier buffer requests")
Signed-off-by: Mario Kleiner <mario.kleiner.de@gmail.com>
Cc: Daniel Stone <daniels@collabora.com>
Cc: Louis-Francis Ratté-Boulianne <lfrb@collabora.com>
Reviewed-by: Louis-Francis Ratté-Boulianne <lfrb@collabora.com>
Tested-by: Mike Lothian <mike@fireburn.co.uk>
commit a98a95b798a0062783ae6fd2135ad488af5efcfd
Author: Matt Turner <mattst88@gmail.com>
Date: Sun Apr 15 23:37:45 2018 -0700
modesetting: Move GBM code inside #ifdef GLAMOR_HAS_GBM
Fixes a compilation error without Glamor.
Bugzilla: https://bugs.gentoo.org/653288
Signed-off-by: Matt Turner <mattst88@gmail.com>
Reviewed-by: Olivier Fourdan <ofourdan@redhat.com>
commit c3ae963a7b19e05b8296aae8b6354587756d48fa
Author: Olivier Fourdan <ofourdan@redhat.com>
Date: Mon Apr 16 09:39:09 2018 +0200
xwayland: Fix build without glamor
Present support in Xwayland relies on glamor, make sure Xwayland can
be built without glamor by moving references to Present code inside
the conditional GLAMOR_HAS_GBM.
Reported-by: Matt Turner <mattst88@gmail.com>
Signed-off-by: Olivier Fourdan <ofourdan@redhat.com>
Reviewed-by: Matt Turner <mattst88@gmail.com>
Reviewed-by: Roman Gilg <subdiff@gmail.com>
commit bf147f67b2b7170fcc5cca07192f6b195dce85e5
Author: Adam Jackson <ajax@redhat.com>
Date: Thu Apr 12 17:24:08 2018 -0400
xwayland: Don't crash on WarpPointer(dest_w = None)
Turns out that's legal, and xts exercises it, and we crash:
Thread 1 "Xwayland" received signal SIGSEGV, Segmentation fault.
dixGetPrivate (key=0x813660 <xwl_window_private_key>, privates=0x20) at ../../include/privates.h:122
122 return (char *) (*privates) + key->offset;
(gdb) bt
#0 dixGetPrivate (key=0x813660 <xwl_window_private_key>, privates=0x20) at ../../include/privates.h:122
#1 dixLookupPrivate (key=0x813660 <xwl_window_private_key>, privates=0x20) at ../../include/privates.h:166
#2 xwl_window_of_top (window=0x0) at xwayland.c:128
#3 xwl_cursor_warped_to (device=<optimized out>, screen=0x268b6e0, client=<optimized out>, window=0x0, sprite=0x300bb30,
x=2400, y=1350) at xwayland.c:292
#4 0x00000000005622ec in ProcWarpPointer (client=0x32755d0) at events.c:3618
In this case, x/y are the screen-space coordinates where the pointer
ends up, and we need to look up the (X) window there.
Signed-off-by: Adam Jackson <ajax@redhat.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
commit d7269b49c3408f93a6cb8e28ddc3dda88224620a
Author: Emil Velikov <emil.velikov@collabora.com>
Date: Wed Apr 11 18:51:16 2018 +0100
configure.ac: make use of wayland-scanner.pc
Replace the current (incorrect) assumption that wayland-scanner is
located in the wayland-client prefix. Make use of the wayland_scanner
variable in wayland-scanner.pc
It was introduced back in 2013 and we already require newer wayland bits
Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Emil Velikov <emil.velikov@collabora.com>
commit 0031bbad8400d35699664d18c0d8fc2e9e82d8a7
Author: Adam Jackson <ajax@redhat.com>
Date: Wed Apr 11 15:39:33 2018 -0400
sdksyms: Skip empty symbols
Apparently on NetBSD we can hit failures like this:
sdksyms.c:1773:15: error: expected expression before ',' token
(void *) &, /* ../../dri3/dri3.h:110 */
I've been unable to reproduce that locally (even in a NetBSD vm), but
an obvious workaround might be to just notice empty symbol names and
ignore them rather than emit invalid C code.
Tested-by: Thomas Klausner <wiz@netbsd.org>
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit d61e516c847b9ff7e89e6be269050032070c1ad3
Author: Adam Jackson <ajax@redhat.com>
Date: Tue Apr 10 15:45:02 2018 -0400
xserver 1.20 RC4
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit a42992a4cca49cedd3930f5694c7a16e4f614b36
Author: Emil Velikov <emil.velikov@collabora.com>
Date: Mon Apr 2 16:41:24 2018 +0100
dri3: rework format/modifier caching
Cut down the unnecessary malloc/memcpy/free by utilising the explicit
copy provided by the client.
But above all: do so, after ensuring we get valid data from the
implementation.
Fixes: cef12efc15c ("glamor: Implement GetSupportedModifiers")
Cc: Louis-Francis Ratté-Boulianne <lfrb@collabora.com>
Cc: Daniel Stone <daniels@collabora.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Emil Velikov <emil.velikov@collabora.com>
commit 71a069fd7fbe815d386fc1b3c44cda732cff7af0
Author: Emil Velikov <emil.velikov@collabora.com>
Date: Mon Apr 2 16:41:23 2018 +0100
glamor: zero num_formats from the start
The caller may ignore the return value (will be addressed with later
commit) so simply zero the count from the get-go. We're pretty much do
so, in all cases but one :-\
Fixes: cef12efc15c ("glamor: Implement GetSupportedModifiers")
Cc: Louis-Francis Ratté-Boulianne <lfrb@collabora.com>
Cc: Daniel Stone <daniels@collabora.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Emil Velikov <emil.velikov@collabora.com>
commit ac48724639e0a6a9e421b3b4e545d8506fd6bf5d
Author: Emil Velikov <emil.velikov@collabora.com>
Date: Mon Apr 2 16:41:22 2018 +0100
xwayland: zero num_formats from the start
The caller may ignore the return value (will be addressed with later
commit) so simply zero the count from the get-go. We're pretty much do
so, in all cases but one :-\
Fixes: cef12efc15c ("glamor: Implement GetSupportedModifiers")
Cc: Louis-Francis Ratté-Boulianne <lfrb@collabora.com>
Cc: Daniel Stone <daniels@collabora.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Emil Velikov <emil.velikov@collabora.com>
commit e2f45002fc3c53c6196935447b8fe77d0850175b
Author: Emil Velikov <emil.velikov@collabora.com>
Date: Mon Apr 2 16:41:20 2018 +0100
dri3: check for ::get_drawable_modifiers failure
Currently if the function fails, we'll fall into two false assumptions:
- the the count is zero
- that the storage pointer is safe for free()
I've just fixed the former (in glamor + xwayland) and have no
plans on adding yet another workaround for the latter.
Simply zero both variables. Regardless if the implementation is missing
the callback or it foobars with output variables (normally a bad idea).
Bonus points - this fixes a bug where we feed garbage to free() further
down ;-)
Fixes: cef12efc15c ("glamor: Implement GetSupportedModifiers")
Cc: Louis-Francis Ratté-Boulianne <lfrb@collabora.com>
Cc: Daniel Stone <daniels@collabora.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Emil Velikov <emil.velikov@collabora.com>
commit 150e4b12ad160b093899107ed586aa0cb258879e
Author: Emil Velikov <emil.velikov@collabora.com>
Date: Mon Apr 2 16:41:19 2018 +0100
glamor: zero num_modifiers from the start
The caller may ignore the return value (will be addressed with later
commit) so simply zero the count from the get-go. We're pretty much do
so, in all cases but one :-\
Fixes: cef12efc15c ("glamor: Implement GetSupportedModifiers")
Cc: Louis-Francis Ratté-Boulianne <lfrb@collabora.com>
Cc: Daniel Stone <daniels@collabora.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Emil Velikov <emil.velikov@collabora.com>
commit b36a14c0b0e7e38406622eb5ff0666a8b8bc50f4
Author: Emil Velikov <emil.velikov@collabora.com>
Date: Mon Apr 2 16:41:18 2018 +0100
xwayland: zero num_modifiers from the start
The caller may ignore the return value (will be addressed with later
commit) so simply zero the count from the get-go. We're pretty much do
so, in all cases but one :-\
Fixes: cef12efc15c ("glamor: Implement GetSupportedModifiers")
Cc: Louis-Francis Ratté-Boulianne <lfrb@collabora.com>
Cc: Daniel Stone <daniels@collabora.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Emil Velikov <emil.velikov@collabora.com>
commit a83ceec868a6d544bc7775a753b67aa40d0d0efc
Author: Emil Velikov <emil.velikov@collabora.com>
Date: Mon Apr 2 16:41:15 2018 +0100
dri3: simplify dri3_open() implementation
Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Emil Velikov <emil.velikov@collabora.com>
commit 9a159f37e00ed47ec8cbff7c57d8787b8f5685f5
Author: Emil Velikov <emil.velikov@collabora.com>
Date: Mon Apr 2 16:41:14 2018 +0100
dri3: annotate fds/strides/offsets arrays as const
It makes it perfectly clear that we should not be modifying them.
Should help highlight issues like the one fixed with previous commit.
Fixes: cef12efc15c ("glamor: Implement GetSupportedModifiers")
Cc: Louis-Francis Ratté-Boulianne <lfrb@collabora.com>
Cc: Daniel Stone <daniels@collabora.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Emil Velikov <emil.velikov@collabora.com>
commit 877fa0c66469628748dbd01506f15ddc4f11b849
Author: Emil Velikov <emil.velikov@collabora.com>
Date: Mon Apr 2 16:41:13 2018 +0100
xwayland: don't close() fds we don't own
The glamor_pixmap_from_fds error path erroneously closes the fds.
We don't own them, plus the caller closes them after the function in
called.
Fixes: cef12efc15c ("glamor: Implement GetSupportedModifiers")
Cc: Louis-Francis Ratté-Boulianne <lfrb@collabora.com>
Cc: Daniel Stone <daniels@collabora.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Emil Velikov <emil.velikov@collabora.com>
commit 66b632bb068672f507212b00bd313b5040bf1a39
Author: Emil Velikov <emil.velikov@collabora.com>
Date: Mon Apr 2 16:41:12 2018 +0100
dri3: annotate the dri3_screen_info data as const
dri3_screen_info is the user provide dispatch. Something that we do
not and should not change.
When using the _ptr typecast + const the compiler barfs at us
(rightfully so), so use the _rec one.
[Silence a new const mismatch warning too - ajax]
Fixes: 56313829886 ("dri3: Add DRI3 extension")
Cc: Keith Packard <keithp@keithp.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Emil Velikov <emil.velikov@collabora.com>
commit c67f2eac56518163981af59f5accb7c79bc00f6a
Author: Samuel Thibault <samuel.thibault@ens-lyon.org>
Date: Mon Apr 9 14:35:30 2018 +0200
dix: always send focus event on grab change
Focus events are useless when 'from' and 'to' are the same. But when
this is the result of a (Un)GrabKeyboard request, we should always send
them, including when the window manager had previously used XSetInputFocus
to specify the focus on a window which happens to be now taking a grab.
This is notably needed for window manager using XI to always get keyboard
events even during grabs, so they can determine exactly when grabbing is
active.
Signed-off-by: Samuel Thibault <samuel.thibault@ens-lyon.org>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 14be894b3f7976c133fc186e0e3c475606bab241
Author: Michal Srb <msrb@suse.com>
Date: Tue Aug 1 10:29:03 2017 +0200
Xext: Fix memory leaks in hashtable.
Do not forget to delete key and value of every item and the hashtable itself.
commit 1326ee0bc5eb858c3c00847b3ba65134e4ca2e2d
Author: Michal Srb <msrb@suse.com>
Date: Tue Feb 13 10:33:30 2018 +0100
glx: Do not call into Composite if it is disabled.
Otherwise X server crashes if GLX is enabled and Composite disabled. For
example the compIsAlternateVisual function will try to lookup CompScreenPtr
using the CompScreenPrivateKey, but that was never initialized if Composite is
disabled.
Fixes: f84e59a4f4. ("glx: Duplicate relevant fbconfigs for compositing visuals")
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=104993
Signed-off-by: Michal Srb <msrb@suse.com>
commit b9764b8489cabd15b50c360cfbd799fdab0883fd
Author: Jon Turney <jon.turney@dronecode.org.uk>
Date: Tue Apr 3 16:54:00 2018 +0100
hw/xwin/glx: Allocate fbconfigs correctly
4b0a3cba fixed leaking of GLX fbconfigs, so now xwin needs to allocate them
correctly (individually, rather than all at once), so they can be freed
successfully.
Signed-off-by: Jon Turney <jon.turney@dronecode.org.uk>
Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
commit e0a137ce5d653063604fa8d16c8498b8ac3ab3a7
Author: Kyle Brenneman <kbrenneman@nvidia.com>
Date: Fri Apr 6 12:42:33 2018 -0600
GLX: Fix a use after free error with the GLVND vendor handle.
The GLVND layer will destroy all of the vendor handles at the end of each
server generation, but the GLX module then tries to re-use the same (now-freed)
handle in xorgGlxServerInit at the start of the next generation.
In xorgGlxCloseExtension, explicitly destroy the vendor handle and set it to
NULL so that the next call to xorgGlxServerInit will recreate it.
Reviewed-by: Adam Jackson <ajax@redhat.com>
commit 31c1489eeb8c5391cd978303989de167819f0041
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri Apr 6 12:28:56 2018 +1000
xfree86: drop KDSKBMUTE handling
This was never merged upstream. It was a Fedora kernel patch but dropped from
Fedora in 2013 with kernel 3.12.
The reason for the KDSKBMUTE proposal has been fixed in systemd in Feb 2013,
systemd 198.
https://lists.freedesktop.org/archives/systemd-devel/2013-February/008795.html
Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 74aef564a7faea4410e92fa606216ab877b0d452
Author: Adam Jackson <ajax@redhat.com>
Date: Thu Apr 5 13:24:13 2018 -0400
xwayland: Silence a build warning if we can
[735/786] Generating 'hw/xwayland/Xwayland@exe/relative-pointer-unstable-v1-protocol.c'.
Using "code" is deprecated - use private-code or public-code.
See the help page for details.
Use private-code if wayland-scanner is new enough.
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit 6f0903ddc905f44272b85942323a467d82fef644
Author: Adam Jackson <ajax@redhat.com>
Date: Thu Apr 5 13:09:38 2018 -0400
dix: Hush an almost certainly bogus warning
../dix/getevents.c: In function ‘transformAbsolute’:
../dix/getevents.c:1195:28: warning: ‘oy’ may be used uninitialized in this function [-Wmaybe-uninitialized]
struct pixman_f_vector p = {.v = {*x, *y, 1} };
^
../dix/getevents.c:1234:22: note: ‘oy’ was declared here
double x, y, ox, oy;
^~
This one is truly special. Even though both ox and oy are set and read
along the same paths, only oy is marked for this warning! Initializing
just oy = 0.0 fixes it entirely, but let's not make a weird thing
weirder.
Signed-off-by: Adam Jackson <ajax@redhat.com>
Acked-by: Keith Packard <keithp@keithp.com>
commit 57e872301f5e836be2efb8f952f9c9711650b447
Author: Adam Jackson <ajax@redhat.com>
Date: Thu Apr 5 13:07:09 2018 -0400
mi: Hush an almost certainly bogus warning
In file included from ../mi/miexpose.c:83:
../mi/miexpose.c: In function ‘miHandleExposures’:
../include/regionstr.h:174:22: warning: ‘expBox.y2’ may be used uninitialized in this function [-Wmaybe-uninitialized]
(_pReg)->extents = *(_pBox);
~~~~~~~~~~~~~~~~~^~~~~~~~~~
../mi/miexpose.c:139:12: note: ‘expBox.y2’ was declared here
BoxRec expBox;
^~~~~~
etc. It's initialized if (extents), and then only read if (extents),
but gcc doesn't seem to figure that out. Whatever, bzero it to be
explicit.
Signed-off-by: Adam Jackson <ajax@redhat.com>
Acked-by: Keith Packard <keithp@keithp.com>
commit 83913de25d35709b3ab7b0ab124b73924145d2dd
Author: Adam Jackson <ajax@redhat.com>
Date: Thu Apr 5 12:59:11 2018 -0400
xkb: Silence some compiler warnings
Of the form:
../xkb/XKBGAlloc.c: In function ‘SrvXkbAddGeomKeyAlias’:
../xkb/XKBGAlloc.c:591:13: warning: ‘strncpy’ specified bound 4 equals destination size [-Wstringop-truncation]
strncpy(alias->real, realStr, XkbKeyNameLength);
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
This is intentional; the code that reads from these fields never reads
more than 4 bytes anyway. Rephrase things in terms of memcpy so that's
clear. Obviously this is awful but in XKB awful is par.
Signed-off-by: Adam Jackson <ajax@redhat.com>
Acked-by: Keith Packard <keithp@keithp.com>
commit d13cd3862e9ccd35c91a06680d02f2fc8fd03420
Author: Adam Jackson <ajax@redhat.com>
Date: Thu Apr 5 12:48:26 2018 -0400
dmx: Silence a string truncation warning.
../hw/dmx/config/dmxparse.c: In function ‘dmxConfigCreateOption’:
../hw/dmx/config/dmxparse.c:385:13: warning: ‘strncpy’ output truncated before terminating nul copying as many bytes from a string as its length [-Wstringop-truncation]
strncpy(option->string + offset, p->string, len);
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
../hw/dmx/config/dmxparse.c:383:23: note: length computed here
int len = strlen(p->string);
^~~~~~~~~~~~~~~~~
The thing it's warning about is intentional, the surrounding code does
its own nul-termination. Make that obvious by using memcpy instead.
Signed-off-by: Adam Jackson <ajax@redhat.com>
Acked-by: Keith Packard <keithp@keithp.com>
commit 176f26e96ab9958c84c98c88f31729d0240c420e
Author: Adam Jackson <ajax@redhat.com>
Date: Thu Apr 5 12:45:51 2018 -0400
dmx: Clean up some argument parsing code
This threw:
../hw/dmx/input/dmxarg.c: In function ‘dmxArgParse’:
../hw/dmx/input/dmxarg.c:128:5: warning: ‘strncpy’ specified bound depends on the length of the source argument [-Wstringop-overflow=]
strncpy(tmp, string, len);
^~~~~~~~~~~~~~~~~~~~~~~~~
../hw/dmx/input/dmxarg.c:126:11: note: length computed here
len = strlen(string) + 2;
^~~~~~~~~~~~~~
This code predates xstrtokenize, but that's no excuse.
Signed-off-by: Adam Jackson <ajax@redhat.com>
Acked-by: Keith Packard <keithp@keithp.com>
commit be99072a1a20af44d2457b8c86bd9041f61efa79
Author: Adam Jackson <ajax@redhat.com>
Date: Thu Apr 5 12:35:59 2018 -0400
dmx: Fix a read-from-uninitialized warning
../hw/dmx/dmxpixmap.c: In function ‘dmxBitmapToRegion’:
../include/regionstr.h:174:22: warning: ‘Box.x1’ may be used uninitialized in this function [-Wmaybe-uninitialized]
(_pReg)->extents = *(_pBox);
~~~~~~~~~~~~~~~~~^~~~~~~~~~
../hw/dmx/dmxpixmap.c:208:12: note: ‘Box.x1’ was declared here
BoxRec Box;
^~~
Signed-off-by: Adam Jackson <ajax@redhat.com>
Acked-by: Keith Packard <keithp@keithp.com>
commit c3b190f9da3a8cd6f98c127220683dd20aed0f9b
Author: Adam Jackson <ajax@redhat.com>
Date: Thu Apr 5 12:31:04 2018 -0400
dmx: Fix some snprintf warnings.
snprintf doesn't terminate the string if it truncates, so things like
this are lurking crashers:
../hw/dmx/dmxprop.c: In function ‘dmxPropertyIdentifier.part.0’:
../hw/dmx/dmxprop.c:94:36: warning: ‘%s’ directive output may be truncated writing up to 255 bytes into a region of size 123 [-Wformat-truncation=]
snprintf(buf, sizeof(buf), "%s:%s:%s", DMX_IDENT, hostname, display);
^~ ~~~~~~~~
../hw/dmx/dmxprop.c:94:5: note: ‘snprintf’ output 7 or more bytes (assuming 262) into a destination of size 128
snprintf(buf, sizeof(buf), "%s:%s:%s", DMX_IDENT, hostname, display);
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
../hw/dmx/dmxprop.c: In function ‘dmxPropertyWindow’:
../hw/dmx/dmxprop.c:372:36: warning: ‘%d’ directive output may be truncated writing between 1 and 11 bytes into a region of size between 0 and 127 [-Wformat-truncation=]
snprintf(buf, sizeof(buf), "%s,%d", id, dmxScreen->index);
^~
../hw/dmx/dmxprop.c:372:5: note: ‘snprintf’ output between 3 and 140 bytes into a destination of size 128
snprintf(buf, sizeof(buf), "%s,%d", id, dmxScreen->index);
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
We could be more precise about termination, but meh.
Signed-off-by: Adam Jackson <ajax@redhat.com>
Acked-by: Keith Packard <keithp@keithp.com>
commit 4c1453393feaebd688571ed1ba16c21703119ced
Author: Adam Jackson <ajax@redhat.com>
Date: Thu Apr 5 12:21:53 2018 -0400
gtf: Warning fix
../hw/xfree86/utils/gtf/gtf.c: In function ‘print_fb_mode’:
../hw/xfree86/utils/gtf/gtf.c:241:50: warning: cast from function call of type ‘double’ to non-matching type ‘int’ [-Wbad-function-cast]
printf(" timings %d %d %d %d %d %d %d\n", (int) rint(1000000.0 / m->pclk), /* pixclock in picoseconds */
That's pretty nitpicky of you, gcc, but at least it's easy to fix.
Signed-off-by: Adam Jackson <ajax@redhat.com>
Acked-by: Keith Packard <keithp@keithp.com>
commit 99f9b077c62e14ba955b9c1f7afda47f7799d317
Author: Daniel Stone <daniels@collabora.com>
Date: Thu Apr 5 16:47:39 2018 +0100
modesetting: Actually get framebuffer ID
We would fail to get the FB ID if it wasn't already imported, since we
were checking to see if the pointer was NULL (it never was) rather than
if the content of the pointer was 0.
Signed-off-by: Daniel Stone <daniels@collabora.com>
Reported-by: Olivier Fourdan <ofourdan@redhat.com>
Tested-by: Olivier Fourdan <ofourdan@redhat.com>
Reviewed-by: Olivier Fourdan <ofourdan@redhat.com>
commit 8ff1cdb2bff72a37e75004f562737dd0af6daf14
Author: Daniel Stone <daniels@collabora.com>
Date: Thu Apr 5 15:00:38 2018 +0100
dri3: Set stride and size for old clients
For old clients using the fd_from_pixmap entrypoint, make sure we set
stride and size correctly.
Noticed by inspection.
Signed-off-by: Daniel Stone <daniels@collabora.com>
commit 78574a66b5b286e26839877640592980de089d64
Author: Daniel Stone <daniels@collabora.com>
Date: Thu Apr 5 14:58:40 2018 +0100
modesetting: Don't reuse iterator in nested loop
drmmode_crtc_set_mode has a loop nested inside another loop, where both
of them were using 'i' as the loop iterator. Rename it to avoid an
infinite loop.
Signed-off-by: Daniel Stone <daniels@collabora.com>
Reported-by: Michel Dänzer <michel.daenzer@amd.com>
Reviewed-and-Tested-by: Michel Dänzer <michel.daenzer@amd.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
commit ce2a4313dd31084f7766af59b8477cabe029bf44
Author: Mario Kleiner <mario.kleiner.de@gmail.com>
Date: Wed Apr 4 03:49:02 2018 +0200
modesetting: Fix page flipping harder under DRI 3.2.
Non-atomic kms drivers like radeon-kms (or nouveau-kms with
default setting of "atomic ioctl disabled") don't export
any formats, so num_formats == 0.
Some atomic drivers (nouveau-kms with boot param nouveau.atomic=1,
or intel-kms on, e.g., Linux 4.13) expose num_formats == 0, or
don't expose any modifiers, so num_modifiers == 0.
Let the drmmode_is_format_supported() check pass in these cases
to allow page flipping, as it works just fine.
Tested on NV-96 for nouveau, HD-5770 for radeon, Intel Ivybridge
with Linux 4.13 and drm-next to fix page flipping.
Fixes: 9d147305b404 ("modesetting: Check if buffer format is supported when flipping")
Signed-off-by: Mario Kleiner <mario.kleiner.de@gmail.com>
Reviewed-by: Daniel Stone <daniels@collabora.com>
commit 44e7098367b87c79470d6760753e42014be7ca01
Author: Louis-Francis Ratté-Boulianne <lfrb@collabora.com>
Date: Wed Apr 4 00:01:15 2018 -0400
modesetting: Have consistent state when using atomic modesetting
We need to make sure that the atomic commit are consistent
or else the kernel will reject it. For example, when moving
a CRTC from one output to another one, the first output CRTC_ID
property needs to be reset. Also if the second output was using
another CRTC beforehands, it needs to be disabled to avoid an
inconsistent state.
Signed-off-by: Louis-Francis Ratté-Boulianne <lfrb@collabora.com>
Tested-by: Daniel Stone <daniels@collabora.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
commit bc4d278132956ec3c43695f1bd34083ef5fe7f22
Author: Louis-Francis Ratté-Boulianne <lfrb@collabora.com>
Date: Wed Apr 4 00:01:14 2018 -0400
modesetting: Use atomic modesetting to set DPMS mode
CRTCs and outputs needs to be enabled/disabled when the current
DPMS mode is changed. We also try to do it in an atomic commit
when possible.
Signed-off-by: Louis-Francis Ratté-Boulianne <lfrb@collabora.com>
Tested-by: Daniel Stone <daniels@collabora.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
commit 23c67987a337beb91292f8e318d566941453baa3
Author: Daniel Stone <daniels@collabora.com>
Date: Wed Apr 4 16:16:38 2018 +0100
glamor: Add fd_from_pixmap hook
Add a fd_from_pixmap (singular) hook to go with fds_from_pixmap, which
will ensure that the pixmap is allocated without modifiers and is thus
exportable to non-modifier-aware clients.
This makes it possible to run a compositing manager on an old GLX/EGL
stack on top of an X server which allocates internal buffer storage
using exotic modifiers from modifier-aware GBM/EGL/KMS.
Signed-off-by: Daniel Stone <daniels@collabora.com>
Reported-by: Adam Jackson <ajax@redhat.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
commit 9c407f0a1b40128fc65b19b6a499f1d4dae6f702
Author: Daniel Stone <daniels@collabora.com>
Date: Wed Apr 4 16:16:37 2018 +0100
glamor: Fall back to non-modifier allocations
If we try to allocate with particular modifiers but it fails, try to
fall back to non-modifier allocations.
Signed-off-by: Daniel Stone <daniels@collabora.com>
Reported-by: Adam Jackson <ajax@redhat.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
commit 86b2d8740a330deafe8a9bbf0402705a43efbb42
Author: Daniel Stone <daniels@collabora.com>
Date: Wed Apr 4 16:16:36 2018 +0100
glamor: Reallocate pixmap storage without modifiers if necessary
If we need a pixmap's storage to be exported to a context in which we
aren't aware of modifiers, reallocate the buffer again without
modifiers.
This makes it possible to run a compositing manager on an old GLX/EGL
stack on top of an X server which allocates internal buffer storage
using exotic modifiers from modifier-aware GBM/EGL/KMS.
Signed-off-by: Daniel Stone <daniels@collabora.com>
Reported-by: Adam Jackson <ajax@redhat.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
commit aab5c46ccbe769830cae383330fd62c074a0d2f7
Author: Daniel Stone <daniels@collabora.com>
Date: Wed Apr 4 16:16:35 2018 +0100
glamor: Push make_exportable into callers
Rather than calling make_exportable from the get_bo entrypoint, make
sure that someone has already explicitly requested the pixmap be
exportable.
This is technically an ABI break in that it changes observable
behaviour, but no driver other than modesetting has ever used get_bo.
Signed-off-by: Daniel Stone <daniels@collabora.com>
Reported-by: Adam Jackson <ajax@redhat.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
commit 1b9fa3b64ca420eb54b5e5f28074c326e1fbe825
Author: Daniel Stone <daniels@collabora.com>
Date: Wed Apr 4 16:16:34 2018 +0100
glamor: Track if BO allocation used modifiers
Keep track of whether or not we fed modifiers into GBM when we allocated
a BO. We'll use this later inside Glamor, to reallocate buffer storage
if we allocate buffer storage using modifiers, and a non-modifier-aware
client requests an export of that pixmap.
This makes it possible to run a compositing manager on an old GLX/EGL
stack on top of an X server which allocates internal buffer storage
using exotic modifiers from modifier-aware GBM/EGL/KMS.
Signed-off-by: Daniel Stone <daniels@collabora.com>
Reported-by: Adam Jackson <ajax@redhat.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
commit 0e9504e10c4363e24a83f1a82e6a4b9f5fd8f846
Author: Daniel Stone <daniels@collabora.com>
Date: Wed Apr 4 16:16:33 2018 +0100
drmmode: Track if BO allocation used modifiers
Keep track of whether or not we fed modifiers into GBM when we allocated
a BO. We'll use this later inside Glamor, to reallocate buffer storage
if we allocate buffer storage using modifiers, and a non-modifier-aware
client requests an export of that pixmap.
This makes it possible to run a compositing manager on an old GLX/EGL
stack on top of an X server which allocates internal buffer storage
using exotic modifiers from modifier-aware GBM/EGL/KMS.
Signed-off-by: Daniel Stone <daniels@collabora.com>
Reported-by: Adam Jackson <ajax@redhat.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
commit 75bba3aedcb04132a4fe2806680cd38a8f2bd206
Author: Daniel Stone <daniels@collabora.com>
Date: Wed Apr 4 16:16:32 2018 +0100
dri3: Use single-FD screen call for single-FD request
When importing client buffers into Pixmaps, we can use the fds_to_pixmap
hook for both single-FD and multi-FD client requests without any harm.
For the other direction of exporting Pixmap buffers to client FDs,
create a new helper which calls the old pixmap_to_fd hook if available.
This allows the implementation to ensure that the Pixmap storage is
accessible to clients not aware of multiple planes or modifiers, e.g. by
reallocating and copying.
This makes it possible to run a compositing manager on an old GLX/EGL
stack on top of an X server which allocates internal buffer storage
using exotic modifiers from modifier-aware GBM/EGL/KMS.
Signed-off-by: Daniel Stone <daniels@collabora.com>
Reported-by: Adam Jackson <ajax@redhat.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
commit 574069c2912893a9b9fd3d701eb3ad4784e31553
Author: Aaron Plattner <aplattner@nvidia.com>
Date: Mon Apr 2 15:04:08 2018 -0700
xfree86: Restore newline before "X Protocol Version" string
The newline before the protocl version got lost in commit
6cbefc3e0a33b380c147c533914437c7798d9b93. Prior to that commit, the
release date printed a newline at the end:
X.Org X Server 1.19.6
Release Date: 2017-12-20
X Protocol Version 11, Revision 0
Build Operating System: Linux 4.14.12-1-ARCH x86_64
Now, that string gets run together with the version:
X.Org X Server 1.19.99.903 (1.20.0 RC 3)X Protocol Version 11, Revision 0
Build Operating System: Linux
Since the version string printing has a variety of #ifdefs in it, just
add the newline to the begining of the protocol version string.
Signed-off-by: Aaron Plattner <aplattner@nvidia.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit df6cbf7a2b3b45be6910afb34459d30ca7783c16
Author: Adam Jackson <ajax@redhat.com>
Date: Mon Apr 2 15:44:50 2018 -0400
xserver 1.20 RC3
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit f580116f3c89b3c086655cbd441f84e50115ea78
Author: Louis-Francis Ratté-Boulianne <lfrb@collabora.com>
Date: Thu Mar 29 01:07:26 2018 -0400
modesetting: Fix reported size when using atomic modesetting
The framebuffer can include multiple CRTCs in multi-monitors
setup. So we shouldn't use the buffer size but the CRTC size
instead. Rotated displays are shadowed, so we don't need to
worry about it there.
Signed-off-by: Louis-Francis Ratté-Boulianne <lfrb@collabora.com>
Tested-by: Olivier Fourdan <ofourdan@redhat.com>
Reviewed-by: Olivier Fourdan <ofourdan@redhat.com>
Reviewed-by: Daniel Stone <daniels@collabora.com>
commit ce7d5087cfe1d2df756d93b7f567b3c0b0a7f6a8
Author: Louis-Francis Ratté-Boulianne <lfrb@collabora.com>
Date: Thu Mar 29 01:07:25 2018 -0400
modesetting: Ignore alpha channel when importing BOs for modesetting
Fixes a regression caused by modifiers support. For some hw to
continue working even if not supporting ARGB8888 and ARGB2101010
formats, we assume that all imported BOs are opaque.
Signed-off-by: Louis-Francis Ratté-Boulianne <lfrb@collabora.com>
Tested-by: Olivier Fourdan <ofourdan@redhat.com>
Reviewed-by: Olivier Fourdan <ofourdan@redhat.com>
Reviewed-by: Daniel Stone <daniels@collabora.com>
commit 85b3fc18606e56d01734defb0e9fa04182f9fc1c
Author: Olivier Fourdan <ofourdan@redhat.com>
Date: Thu Mar 29 09:42:08 2018 +0200
modesetting: Use actual crtc position for pageflip
Otherwise the same content is shown on all outputs.
Signed-off-by: Olivier Fourdan <ofourdan@redhat.com>
Reviewed-by: Daniel Stone <daniels@collabora.comM>
commit a10f1c9e08b982029186028b144d9243a2ebdde3
Author: Emil Velikov <emil.velikov@collabora.com>
Date: Mon Apr 2 18:51:21 2018 +0100
docs: remove resource management references
The code referenced was removed back in 2009.
Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Emil Velikov <emil.velikov@collabora.com>
commit 32c07e6b83fdb5b0ed99fc6b1eaa18064f6c3527
Author: Emil Velikov <emil.velikov@collabora.com>
Date: Mon Apr 2 18:51:20 2018 +0100
docs: purge some ISA references
The respective ISA functions were dropped back in 2008
Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Emil Velikov <emil.velikov@collabora.com>
commit 80d4098411ad96b662e830db06e59a7ab7f5c9d3
Author: Thierry Reding <treding@nvidia.com>
Date: Thu Mar 29 13:07:56 2018 +0200
meson: Add pixman-1 to required modules in xorg-server.pc
pixman headers will be included for builds of external modules against
the xorg-server SDK. Make sure pixman is listed as a required module so
that the correct CFLAGS will be added.
Note that the xorg-server.pc generated by the autotools-based build has
many more modules listed, but this seems to be enough to build at least
some of the external drivers against an X server built with Meson (I've
tested with xf86-input-libinput, xf86-video-nouveau and xf86-video-ati).
Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Thierry Reding <treding@nvidia.com>
commit 88c7b8bf4bae080ecb879fe7e3f8be2bede6f0a6
Author: Thierry Reding <treding@nvidia.com>
Date: Thu Mar 29 13:07:55 2018 +0200
meson: Distribute more SDK headers
Install missing headers to the SDK directory to allow external modules
to properly build against the SDK. After this commit, the list of files
installed in the SDK include directory is the same as the list of files
installed by the autotools-based build.
Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Thierry Reding <treding@nvidia.com>
commit f3b0a2aee21f12f3332bf598d3ba0fcbd2832f95
Author: Thierry Reding <treding@nvidia.com>
Date: Thu Mar 29 13:07:54 2018 +0200
meson: Remove usage of pkg-config --variable=includedir
Querying a pkg-config variable using the --variable option produces the
value of the given variable as stored in the pkg-config file and should
not be used to add directories to the include search path.
The reason for this is that it breaks cross-compilation, because header
files are installed relative to the host sysroot. pkg-config supports a
PKG_CONFIG_SYSROOT_DIR environment variable that points to this sysroot
and will prepend that to the path of directories in -I or -L options in
pkg-config's Cflags, Libs or Libs.private keywords. However, because no
context can be inferred from variable names, as opposed to the keywords
with fixed meaning, the sysroot path will not be prepended to them. The
build system is responsible for doing so if necessary since it is aware
of the context in which the variable is used.
Adding the include directory returned by pkg-config to the include path
leaks build system information into the cross-build and break with very
confusing errors such as this:
In file included from include/misc.h:82:0,
from dix/atom.c:55:
/usr/include/pthread.h:682:6: warning: '__regparm__' attribute directive ignored [-Wattributes]
__cleanup_fct_attribute;
^~~~~~~~~~~~~~~~~~~~~~~
or this:
In file included from include/misc.h:139:0,
from dix/atom.c:55:
/usr/include/stdlib.h:133:8: error: '_Float128' is not supported on this target
extern _Float128 strtof128 (const char *__restrict __nptr,
^~~~~~~~~
Fix this by replacing the include directory with the appropriate xproto
dependency required to add the correct include directory to the compile
command for subdirectories that are missing the dependency. As detailed
above, this gives pkg-config the opportunity to prepend the sysroot for
all paths in -I compiler options.
Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Thierry Reding <treding@nvidia.com>
commit 1c002bc43472063cf8599abb0d6d7367e30456e2
Author: Tobias Klausmann <tobias.johannes.klausmann@mni.thm.de>
Date: Fri Mar 30 22:32:13 2018 +0200
modesetting/drmmode: add NULL pointer check in drmmode_output_dpms
drmmode_output_dpms is called especially with !output->crtc found in
xf86DisableUnusedFunctions so we have to guard for it, else the server
segfaults:
0 0x00007fdc1706054b in drmmode_output_dpms (output=0x55e15243c210, mode=3) at
drmmode_display.c:2243
1 0x000055e1500b6873 in xf86DisableUnusedFunctions (pScrn=0x55e152133f00) at
xf86Crtc.c:3021
2 0x000055e1500be940 in xf86RandR12CrtcSet (pScreen=<optimized out>,
randr_crtc=0x55e1524b2b90, randr_mode=0x0, x=0, y=0, rotation=<optimized out>,
num_randr_outputs=0, randr_outputs=0x0) at xf86RandR12.c:1244
3 0x000055e1500fa1c2 in RRCrtcSet (crtc=<optimized out>, mode=0x0, x=0, y=0,
rotation=rotation@entry=1, numOutputs=numOutputs@entry=0, outputs=0x0) at
rrcrtc.c:763
4 0x000055e1500fba9e in ProcRRSetCrtcConfig (client=0x55e152bfae50) at
rrcrtc.c:1390
5 0x000055e150044008 in Dispatch () at dispatch.c:478
6 0x000055e150047ff8 in dix_main (argc=13, argv=0x7ffc68561038,
envp=<optimized out>) at main.c:276
7 0x00007fdc1a0c6a87 in __libc_start_main () at /lib64/libc.so.6
8 0x000055e150031d0a in _start () at ../sysdeps/x86_64/start.S:120
Fixes: ba0c75177 ("modesetting: Fix up some XXX from removing GLAMOR_HAS_DRM_*")
Signed-off-by: Tobias Klausmann <tobias.johannes.klausmann@mni.thm.de>
Reviewed-by: Adam Jackson <ajax@redhat.com>
commit 258081759fa70202a2e6134eeee4fe25ca54bedb
Author: Tobias Klausmann <tobias.johannes.klausmann@mni.thm.de>
Date: Fri Mar 30 22:31:46 2018 +0200
glamor: sanitze handling of "Debug" Option for "dmabuf_capable"
With the appearance of the this new Option the X Server would crash if the
option is not set.
Default dmabuf_capable to off/FALSE for now - a user without knowledge about
this option does not want to enable it until its save.
Fixes: d11d5bb80 ("glamor: Hide new DRI behind Option "Debug" "dmabuf_capable")
Signed-off-by: Tobias Klausmann <tobias.johannes.klausmann@mni.thm.de>
Reviewed-by: Adam Jackson <ajax@redhat.com>
commit debf75bd0b0ddfec82dad9580efa7d19479b55df
Author: Adam Jackson <ajax@redhat.com>
Date: Wed Mar 28 15:47:33 2018 -0400
xserver 1.20 RC2
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit 726839459cb887a60361cb4779f9871c03f372b1
Author: Adam Jackson <ajax@redhat.com>
Date: Wed Mar 28 16:11:18 2018 -0400
autotools: Derive xkb configuration from xkbcomp.pc
... if available, falling back to the current heuristics otherwise. This
_finally_ gets me to being able to run util/modular/release.sh without
overriding $prefix.
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit d11d5bb80d21f2aaa54ddf2f26a50aa6ef31d2fa
Author: Adam Jackson <ajax@redhat.com>
Date: Wed Mar 28 12:46:01 2018 -0400
glamor: Hide new DRI behind Option "Debug" "dmabuf_capable"
... for xfree86, at least for now. Things appear to work for Xwayland
but not yet for modesetting. Hopefully we can fix that before 1.20 but
in the meantime this makes testing both paths easier than a rebuild.
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit df13ea7da9174d2e1c732985d9b7a9a35a6916bc
Author: Adam Jackson <ajax@redhat.com>
Date: Wed Mar 28 12:46:00 2018 -0400
xfree86: Add Option "Debug" to ServerFlags
This provides a generic way to control obscure runtime behavior knobs
without making interface promises.
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit c95361465ee98dd97a99778d8a31be88fe9e4c4f
Author: Antoine Martin <antoine@nagafix.co.uk>
Date: Wed Mar 28 15:16:02 2018 -0400
os: Fix -logfile when used with -displayfd
Trivial way to reproduce the bug:
$ Xorg -logfile /tmp/mylog -config /etc/xpra/xorg.conf -displayfd 2
The server then moans:
Failed to rename log file "/tmp/mylog" to "/tmp/mylog": No such file or directory
And the log file is created but immediately renamed to "/tmp/mylog.old".
This is caused by the changes to the log file handling introduced by
this commit:
https://cgit.freedesktop.org/xorg/xserver/commit/?id=edcb6426f20c3be5dd5f50b76a686754aef2f64e
To fix this, only rename the logfile if the log filename contains the
magic substitution string "%s".
Signed-off-by: Antoine Martin <antoine@nagafix.co.uk>
Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
commit b355e55f500c18d55d0ac241e5f7e826ed62f555
Author: Olivier Fourdan <ofourdan@redhat.com>
Date: Wed Mar 28 12:17:48 2018 +0200
automake: Fix 'make dist'
Automake would skip a few meson files that would prevent to build with
meson a dist file previously generated by automake.
Signed-off-by: Olivier Fourdan <ofourdan@redhat.com>
Reviewed-by: Thierry Reding <treding@nvidia.com>
commit 16639ab77d14cecb7d03fd2d5c796c2fb1714c18
Author: Kyle Brenneman <kbrenneman@nvidia.com>
Date: Fri Mar 2 17:58:07 2018 -0700
Don't delete GLX's extensionInitCallback list during a reset.
When a callback list is initialized using CreateCallbackList via AddCallback,
the list gets added to the listsToCleanup array, and as a result the list gets
deleted at the end of the server generation.
But, vendor libraries add themselves to that callback list only once, not once
per generation, so if you delete the list, then no vendor will register itself
on the next generation, and GLX breaks.
Instead, use a static CallbackListRec for the extensionInitCallback list. That
way, it doesn't get added to listsToCleanup, and doesn't get deleted during a
reset.
Reviewed-by: Adam Jackson <ajax@redhat.com>
commit 7004a7c3c983b4453756b92341bf22790b1eb98d
Author: Daniel Stone <daniels@collabora.com>
Date: Fri Mar 23 13:50:23 2018 +0000
modesetting/drmmode: Remove unused flink call
We don't use flink in the GetFB import path anymore, as we do an
FD-based import instead.
Signed-off-by: Daniel Stone <daniels@collabora.com>
Reviewed-by: Emil Velikov <emil.velikov@collabora.com>
commit be087778a0eae3093ffdbba3ff7c9f3863d8e1d4
Author: Roman Gilg <subdiff@gmail.com>
Date: Tue Mar 13 16:00:57 2018 +0100
xwayland: Activate Present flips in rootless mode with Glamor
Link the newly introduced support for Present flips. For now flips can only
be used in rootless mode together with Glamor.
Signed-off-by: Roman Gilg <subdiff@gmail.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
commit 07750ff3c084c6549a5612d1f935a9a3ab3df67c
Author: Roman Gilg <subdiff@gmail.com>
Date: Tue Mar 13 16:00:55 2018 +0100
xwayland: Implement queuing present vblanks
Queue present events to msc values. Fake msc events with a refresh rate of
about 60fps when flips are not possible. When flips are executed rely on
frame callbacks with a slow updating timer as fallback.
This is important for applications, that want to limit their framerate.
Signed-off-by: Roman Gilg <subdiff@gmail.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
commit 86df366973de1c10da5fbdc57d1ff12b681c321f
Author: Roman Gilg <subdiff@gmail.com>
Date: Tue Mar 13 16:00:54 2018 +0100
xwayland: Add fallback timer for msc counting
When the compositor is not sending frame callbacks while we still wait
on buffer release events fake a continuous msc counter with a timer.
Having this timer is a prerequisite for queuing events.
Signed-off-by: Roman Gilg <subdiff@gmail.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
commit 0fb2cca193e60b731c8e75a2a7e795477fb5fd8f
Author: Roman Gilg <subdiff@gmail.com>
Date: Tue Mar 13 16:00:53 2018 +0100
xwayland: Preliminary support for Present's new window flip mode
Introduce support for Present's window flip mode. The support is not yet
complete, but works reasonable well for the most important use case, that
is fullscreen applications.
We take a Present flip and if the xwl_window->window has the same dimensions
as the presenting window, the flip is represented by a wl_buffer and attached
to the main wl_surface of the xwl_window.
After commit we are listening for the sync callback in order to tell Present,
that the pixmap flip is not longer pending, for the frame callback in order
to update the msc counter and for the buffer release callback in order to tell
Present that the pixmap is idle again.
The following functionality is missing from this patch:
* (slowed down) flips in case the compositor is not sending frame callbacks,
* queuing events to MSC times,
* per window flips for child windows with smaller size than the xwl_window.
To make use of this functionality Xwayland must run rootless and with
Glamor/GBM.
Signed-off-by: Roman Gilg <subdiff@gmail.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
commit 8fba2a03f1410f3bc7504e218ac1e5c964279ea2
Author: Roman Gilg <subdiff@gmail.com>
Date: Tue Mar 13 16:00:52 2018 +0100
xwayland: Add arguments to glamor_pixmap_get_wl_buffer
Add arguments to give the caller more information and control
over the creation of a wl_buffer with GBM, in particular let
the caller determine the size of the buffer.
Signed-off-by: Roman Gilg <subdiff@gmail.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
commit 902429f077325b98e30ede2710bd7a88440d2937
Author: Roman Gilg <subdiff@gmail.com>
Date: Tue Mar 13 16:00:51 2018 +0100
present: Add exported init function of window flip mode
Allow drivers now to initialize window flip mode.
Signed-off-by: Roman Gilg <subdiff@gmail.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
commit a337949f99bc473ea0ae0af64736eae3d5b39399
Author: Roman Gilg <subdiff@gmail.com>
Date: Tue Mar 13 16:00:50 2018 +0100
present: Add cleanups for window flip mode
Make sure that vblanks and windows get cleaned up correctly
in window flip mode.
Signed-off-by: Roman Gilg <subdiff@gmail.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
commit 66a5c0bccb222ad8b9b57b10490c3041e1b3f05e
Author: Roman Gilg <subdiff@gmail.com>
Date: Tue Mar 13 16:00:49 2018 +0100
present: In window flip mode report damage on flip to driver
Calculate damage before trying to flip and report it to the driver.
This allows drivers to optimize their rendering.
Signed-off-by: Roman Gilg <subdiff@gmail.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
commit 029608dd80204ac96423ef79ec46c1a18bbdd5ff
Author: Roman Gilg <subdiff@gmail.com>
Date: Tue Mar 13 16:00:48 2018 +0100
present: Add window flip mode
In contrast to screen flip mode this mode:
* supports flips per windows (these windows currently need to have the same
size as their parent windows with the same pixmap),
* sends pixmap idle signals to the client only after the driver has given
an additional event notify.
This patch only introduces the new mode as a stub. It additionally needs a
driver hook, such that it can get initialized and appropriate cleanup
functions.
Signed-off-by: Roman Gilg <subdiff@gmail.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
commit 8d370fcdcaed210d9f4afc1650aa8b161c7fbb44
Author: Roman Gilg <subdiff@gmail.com>
Date: Tue Mar 13 16:00:47 2018 +0100
present: Add driver facing window flip mode hooks
To enable special functionality of window flips introduce for window flips
a separate set of driver facing function hooks.
Signed-off-by: Roman Gilg <subdiff@gmail.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
commit 7b071b4e440313254398f06eb59b1596a6d3e8fe
Author: Roman Gilg <subdiff@gmail.com>
Date: Tue Mar 13 16:00:46 2018 +0100
present: Adapt flip mode API hooks for window flip mode
Flipping pixmaps per window needs additional arguments in the
flip mode API. Add these as preperation for window flip mode.
Signed-off-by: Roman Gilg <subdiff@gmail.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
commit 92b91b8cf34a38de39281044d8441b6cabe87a85
Author: Roman Gilg <subdiff@gmail.com>
Date: Tue Mar 13 16:00:45 2018 +0100
present: Add flip_idler vblank property
Introduce vblank property for flip modes, that demand explicite
allowance by the driver for vblanks to become idle.
Signed-off-by: Roman Gilg <subdiff@gmail.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
commit 84e47f3fe68f05f7b0b762e96acd4c95fa8000ca
Author: Roman Gilg <subdiff@gmail.com>
Date: Tue Mar 13 16:00:44 2018 +0100
present: Add present_window_priv properties for window flip mode
For window flip mode data about flips needs to be stored per window.
Add properties to 'present_window_priv' and initialize them on creation.
Signed-off-by: Roman Gilg <subdiff@gmail.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
commit 3aaaac0be573fb09a206966075d81ebe0510ca23
Author: Roman Gilg <subdiff@gmail.com>
Date: Tue Mar 13 16:00:43 2018 +0100
present: Refactor present_screen_init
To initialize easily different flip modes, refactor
'present_screen_init'.
Signed-off-by: Roman Gilg <subdiff@gmail.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
commit 6d813bbd5ea0fc38a8114c08368a7954eeb2ef37
Author: Roman Gilg <subdiff@gmail.com>
Date: Tue Mar 13 16:00:42 2018 +0100
present: Add more hooks to internal flip mode API
Add hooks to query caps, get crtcs, abort vblanks and destroy
a flip.
Signed-off-by: Roman Gilg <subdiff@gmail.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
commit 6a338b5959ca5a9e5260d71b6a739a5c672d77e7
Author: Roman Gilg <subdiff@gmail.com>
Date: Tue Mar 13 16:00:41 2018 +0100
present: Move timings adjustment in common part of flip mode API
To reduce future code duplication refactor timings adjustment out
as a separate function.
Signed-off-by: Roman Gilg <subdiff@gmail.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
commit 84112a1d0b221c00d7d3c23fd5b97687e6e3749a
Author: Roman Gilg <subdiff@gmail.com>
Date: Tue Mar 13 16:00:40 2018 +0100
present: Add flip mode API hook for present_can_window_flip
Flip modes can now have different implementations of
present_can_window_flip.
Signed-off-by: Roman Gilg <subdiff@gmail.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
commit 1db7cf0429eabf33f8e2b55a15db4d1f87e1fb95
Author: Roman Gilg <subdiff@gmail.com>
Date: Tue Mar 13 16:00:39 2018 +0100
present: Add flip mode API hook for present_pixmap
Make present_pixmap a common function callable by any
flip mode.
Signed-off-by: Roman Gilg <subdiff@gmail.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
commit 679ffbf5f39822ea508e50f1b7c92a2a9e79f7bb
Author: Roman Gilg <subdiff@gmail.com>
Date: Tue Mar 13 16:00:38 2018 +0100
present: Refactor execute in separate file
To be shared by multiple flip modes, refactor execute functionality,
such that logical chunks can go in new separate file.
Signed-off-by: Roman Gilg <subdiff@gmail.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
commit 1e7d8902bfe7cfb79c41b14fc6b50bcbe4f7c800
Author: Roman Gilg <subdiff@gmail.com>
Date: Tue Mar 13 16:00:37 2018 +0100
present: Add flip mode API hooks for several functions
Add 'queue_vblank', 'flush' and 're_execute' hooks, that
are supposed to be shared with other flip modes.
Signed-off-by: Roman Gilg <subdiff@gmail.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
commit 5365ece70a75a05df3d6351767d19c3edcf0305d
Author: Roman Gilg <subdiff@gmail.com>
Date: Tue Mar 13 16:00:36 2018 +0100
present: Move vblank functionality in seperate file
With the new internal flip mode API move vblank creation
and so on into a seperate file, such that it can be shared
between flip modes.
Signed-off-by: Roman Gilg <subdiff@gmail.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
commit c5c50c6db1e71e976596750277b1a618704c04aa
Author: Roman Gilg <subdiff@gmail.com>
Date: Tue Mar 13 16:00:35 2018 +0100
present: Preliminary internal flip mode API
Add some basic function hooks to our future present-internal flip mode API,
that will allow us to share functionality in between modes and move more code
in separate files.
Signed-off-by: Roman Gilg <subdiff@gmail.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
commit dda7efec36b495e100e670e057d7ef5022ef3976
Author: Roman Gilg <subdiff@gmail.com>
Date: Tue Mar 13 16:00:34 2018 +0100
present: Move screen flip functionality in separate file
As a preperation for future flip mode alternatives move most of the
functionality from 'present.c' into a separate file.
Leave some functions needed by future other flip modes in 'present.c'.
Signed-off-by: Roman Gilg <subdiff@gmail.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
commit 4303deae78c4e2a60856be87bf87cd1643c268f5
Author: Thierry Reding <treding@nvidia.com>
Date: Wed Mar 28 14:04:38 2018 +0200
meson: Properly extract ABI versions for xorg-server.pc
The newline in the middle of the awk expression confuses Meson and
causes it to pass only the string before the newline to awk, which will
subsequently fail because it encounters an unterminated string.
One fix would be to escape the newlines ('\\n'), but that causes the
newline to end up in the pkg-config file and separate the ABI version
lines by blank lines.
Instead, simply drop the newlines to make the generated pkg-config file
look more like the one generated as part of the autotools-based build.
Signed-off-by: Thierry Reding <treding@nvidia.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
commit 465b38cadd573ce50eca959f4b56bf4a6a638d91
Author: Thierry Reding <treding@nvidia.com>
Date: Wed Mar 28 14:04:37 2018 +0200
meson: Fix generation of xorg-server.pc
Meson stores relative paths for includedir, libdir and friends. These
have to be concatenated with the ${prefix} or ${exec_prefix} variables
to create a working pkg-config file.
While at it, set a default value for the module_dir option so that it
points to the same location as used in the autotools-based build.
Signed-off-by: Thierry Reding <treding@nvidia.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
commit d905e3330fd4f9b15a0277b22d608705787cb8bc
Author: Thierry Reding <treding@nvidia.com>
Date: Wed Mar 28 14:04:36 2018 +0200
meson: Fill in missing data for xorg-server.h
Provide more values for the definitions in xorg-server.h for Meson
builds. The only missing defines left after this are _BSD_SOURCE,
_POSIX_SOURCE and _XOPEN_SOURCE, but Meson seems to already define
these via the command-line if necessary.
Signed-off-by: Thierry Reding <treding@nvidia.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
commit 0babe78ed5afec8a06a517346f39b5ebd003773c
Author: Thierry Reding <treding@nvidia.com>
Date: Wed Mar 28 14:04:35 2018 +0200
meson: Generate xorg-server.h
Some drivers (such as xf86-input-libinput) require the xorg-server.h to
build. Generate it and install it so that it can be used by users.
Signed-off-by: Thierry Reding <treding@nvidia.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
commit b04ff31b9d471822fe96ed63eda93fc4cd8c22d0
Author: Thierry Reding <treding@nvidia.com>
Date: Wed Mar 28 14:04:34 2018 +0200
dix: Remove unused definitions from dix-config.h.in
There is no code around that will ever define values for the
WORKING_UNALIGNED_INT or XORG_RELEASE symbols, so they will always end
up commented out and are therefore completely useless.
Signed-off-by: Thierry Reding <treding@nvidia.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
commit c62a8b60b9a07092ebebf9aeb67a0c39c583aabe
Author: Thierry Reding <treding@nvidia.com>
Date: Wed Mar 28 14:04:33 2018 +0200
xorg: Remove unused definitions from xorg-server.h.in
There is no code around that will ever define values for the XLOADABLE,
WORKING_UNALIGNED_INT or XORG_RELEASE symbols, so they will always end
up commented out and are therefore completely useless.
Signed-off-by: Thierry Reding <treding@nvidia.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
commit 66402fcd8280b393d3992121c0bcff9c646c97ed
Author: Thierry Reding <treding@nvidia.com>
Date: Wed Mar 28 14:04:32 2018 +0200
meson: Fix build if Xdmcp is missing
Xdmcp is an optional dependency, so make sure the build succeeds if it
is missing.
Signed-off-by: Thierry Reding <treding@nvidia.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
commit 0a7dabc86c1a7b8d91a5d22ad12fbf03d859f43e
Author: Adam Jackson <ajax@redhat.com>
Date: Mon Mar 26 14:57:07 2018 -0400
meson: Add option to set default font path (v2)
The autotools build gets this from some macros in fontutil, but they're
just wrappers around pkgconfig.
v2: Use same default as autotools (Keith Packard)
Signed-off-by: Adam Jackson <ajax@redhat.com>
Reviewed-by: Keith Packard <keithp@keithp.com>
commit a26195d5c1eba86ada8f43e775c4190683e0f874
Author: Adam Jackson <ajax@redhat.com>
Date: Tue Mar 27 12:58:15 2018 -0400
Revert "suid touchup"
Pushed the wrong thing, sigh.
This reverts commit 73a0562615aa1adfb934b953e23b1e69b126db4f.
commit 73a0562615aa1adfb934b953e23b1e69b126db4f
Author: Adam Jackson <ajax@redhat.com>
Date: Tue Mar 27 12:06:38 2018 -0400
suid touchup
commit 64b3227374f7f161e610df735f376fcc5bb0fd58
Author: Adam Jackson <ajax@redhat.com>
Date: Tue Mar 27 10:47:05 2018 -0400
autotools: Fix excessive \-escaping that broke the build
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit d3e8af99dc1139fac3307bbcb0046500b3feff11
Author: Adam Jackson <ajax@redhat.com>
Date: Mon Mar 26 18:43:02 2018 -0400
meson: Fix install path for 10-quirks.conf
Signed-off-by: Adam Jackson <ajax@redhat.com>
Reviewed-by: Keith Packard <keithp@keithp.com>
commit 84507507ea03db2f6197b94c160bbee9768c4baa
Author: Adam Jackson <ajax@redhat.com>
Date: Mon Mar 26 18:43:01 2018 -0400
meson: Install xorg-server.m4
Signed-off-by: Adam Jackson <ajax@redhat.com>
Reviewed-by: Keith Packard <keithp@keithp.com>
commit 8c684f59d517db0812fbad5fc6bcd90c7c810493
Author: Adam Jackson <ajax@redhat.com>
Date: Mon Mar 26 18:43:00 2018 -0400
meson: Generate xorg-server.pc
Otherwise external drivers can't build against us.
Signed-off-by: Adam Jackson <ajax@redhat.com>
Acked-by: Keith Packard <keithp@keithp.com>
commit 9b67303a52f5380bc96862624778b101f6379527
Author: Adam Jackson <ajax@redhat.com>
Date: Mon Mar 26 18:42:59 2018 -0400
meson: Install the dmx utilities
And add the forgotten dmxrminput to the list.
Signed-off-by: Adam Jackson <ajax@redhat.com>
Reviewed-by: Keith Packard <keithp@keithp.com>
commit f9ef293cf612e50830ff316d67066ea544905dc9
Author: Adam Jackson <ajax@redhat.com>
Date: Mon Mar 26 18:42:58 2018 -0400
meson: Build cvt and gtf
Signed-off-by: Adam Jackson <ajax@redhat.com>
Reviewed-by: Keith Packard <keithp@keithp.com>
commit a1e8dc05163956de9ab73e567f86b91cb8790c0f
Author: Adam Jackson <ajax@redhat.com>
Date: Mon Mar 26 18:42:57 2018 -0400
meson: Install man pages
Signed-off-by: Adam Jackson <ajax@redhat.com>
Acked-by: Keith Packard <keithp@keithp.com>
commit 1e0df64738d6924151adbbd4b040df80178cfa6b
Author: Adam Jackson <ajax@redhat.com>
Date: Mon Mar 26 18:42:55 2018 -0400
meson: Build Xorg suid wrapper
Signed-off-by: Adam Jackson <ajax@redhat.com>
Reviewed-by: Keith Packard <keithp@keithp.com>
commit ab063cf96779c521618c022d4f669f69e3d9cc8f
Author: Adam Jackson <ajax@redhat.com>
Date: Mon Mar 26 18:42:54 2018 -0400
meson: Fix installing protocol.txt
One fix the constructed path, two actually install it.
Signed-off-by: Adam Jackson <ajax@redhat.com>
Reviewed-by: Keith Packard <keithp@keithp.com>
commit e3baacacda29afe524b3e4cab78ca057241c0551
Author: Adam Jackson <ajax@redhat.com>
Date: Mon Mar 26 18:42:53 2018 -0400
meson: Add libdrm to hw/xfree86/common's dependencies
Signed-off-by: Adam Jackson <ajax@redhat.com>
Acked-by: Keith Packard <keithp@keithp.com>
commit 2e497bf887aca832dc0dd30d071c5288ab5c1e15
Author: Adam Jackson <ajax@redhat.com>
Date: Mon Mar 26 18:42:52 2018 -0400
man: s/__/@/g
A cosmetic change for automake (though we have to replicate some of
xorg-macros.m4 in manpages.am now), but meson's configure_file() wants
@-delimited strings.
Signed-off-by: Adam Jackson <ajax@redhat.com>
Reviewed-by: Keith Packard <keithp@keithp.com>
commit 6cbefc3e0a33b380c147c533914437c7798d9b93
Author: Adam Jackson <ajax@redhat.com>
Date: Mon Mar 26 18:42:51 2018 -0400
autotools: Stop caring about XORG_DATE
Signed-off-by: Adam Jackson <ajax@redhat.com>
Acked-by: Keith Packard <keithp@keithp.com>
commit ba0c75177239ced7037d74cf61590377f6d075bb
Author: Adam Jackson <ajax@redhat.com>
Date: Thu Mar 22 14:47:21 2018 -0400
modesetting: Fix up some XXX from removing GLAMOR_HAS_DRM_*
Signed-off-by: Adam Jackson <ajax@redhat.com>
Reviewed-by: Emil Velikov <emil.velikov@collabora.com>
commit 757e0ee1884f2a34a287d632462e3bc689eccb3d
Author: Mario Kleiner <mario.kleiner.de@gmail.com>
Date: Mon Mar 12 17:57:50 2018 +0100
modesetting: Fix page flipping under DRI 3.2.
The check for "no modifier specified" in drmmode_is_format_supported()
should check for DRM_FORMAT_MOD_INVALID, not for zero, as zero actually
means DRM_FORMAT_MOD_LINEAR.
This allows page-flipping again when appropriate, as
tested under nouveau and ati drivers.
Fixes: 9d147305b404 ("modesetting: Check if buffer format is supported when flipping")
Signed-off-by: Mario Kleiner <mario.kleiner.de@gmail.com>
Reviewed-by: Daniel Stone <daniels@collabora.com>
commit 136b45e0c0f5b96b5ce014681d77756dc47f0768
Author: Adam Jackson <ajax@redhat.com>
Date: Fri Mar 16 18:03:18 2018 -0400
travis: Drop Xcode 8.2
Travis has only so many OSX builders, presumably due to the EULA
requiring that it be run on Apple-branded hardware. They're also really
slow to provision, presumably because they're virtual machines and not
containers. In any case it's not something I'm willing to be punished
for.
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit 243a34e170c4a7cc5d38b78f7409704adf703e9b
Author: Adam Jackson <ajax@redhat.com>
Date: Fri Mar 16 18:28:19 2018 -0400
travis: Bump rawhide image
The image now has enough mojo to run xts, hooray!
Note there's a couple of ugly bits in here. The piglit config fragment
and stock tetexec.cfg reflect missing features from the test suites
(using an installed copy of xts, figuring out the xserver test matrix at
runtime, etc.), I'll be happy to remove them once the tests are fixed.
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit 610055809f4030bd0e7312c6b0c561fdfe6e0183
Author: Eric Engestrom <eric.engestrom@imgtec.com>
Date: Tue Mar 13 10:55:22 2018 +0000
exa: promise not to touch the data when swapping pointers
exa/exa.c:525:10: warning: initialization discards ‘const’ qualifier from pointer target type [-Wdiscarded-qualifiers]
swap(pExaGC, pGC, funcs);
^
Signed-off-by: Eric Engestrom <eric.engestrom@imgtec.com>
Reviewed-by: Emil Velikov <emil.velikov@collabora.com>
commit d36128a72acac4d54813c52c93efefad2dc9af41
Author: Alexander Volkov <a.volkov@rusbitech.ru>
Date: Mon Mar 12 15:12:10 2018 +0300
Xext/shm: Downgrade from error to debug log output about success
Signed-off-by: Alexander Volkov <a.volkov@rusbitech.ru>
Reviewed-by: Adam Jackson <ajax@redhat.com>
commit 319af6f471912160ab3eb6395ef50f9950063d43
Author: Nicolai Hähnle <nicolai.haehnle@amd.com>
Date: Tue Mar 13 17:46:37 2018 -0400
glx: honor LIBGL_DRIVERS_PATH when loading DRI drivers
Allow switching to another driver build without a full installation.
Glamor already takes LIBGL_DRIVERS_PATH into account, so this change
makes sure that the same driver is used in both parts of the server.
Signed-off-by: Nicolai Hähnle <nicolai.haehnle@amd.com>
Reviewed-by: Ben Crocker <bcrocker@redhat.com>
Reviewed-by: Antoine Martin <antoine@nagafix.co.uk>
Tested-by: Ben Crocker <bcrocker@redhat.com>
commit 75a869a4e7c06072380931b714ac83b1037d3bbe
Author: Nicolai Hähnle <nicolai.haehnle@amd.com>
Date: Tue Mar 13 17:46:36 2018 -0400
xfree86: replace all uses of xf86PrivsElevated with PrivsElevated
[... but leave it defined and exported, since we're ABI-frozen - ajax]
Signed-off-by: Nicolai Hähnle <nicolai.haehnle@amd.com>
Reviewed-by: Ben Crocker <bcrocker@redhat.com>
Reviewed-by: Antoine Martin <antoine@nagafix.co.uk>
Tested-by: Ben Crocker <bcrocker@redhat.com>
restore abi
commit 1b6910af12cfefcc293be2f4144986fe3b56a36b
Author: Nicolai Hähnle <nicolai.haehnle@amd.com>
Date: Tue Mar 13 17:46:35 2018 -0400
os: use PrivsElevated instead of a manual check
Signed-off-by: Nicolai Hähnle <nicolai.haehnle@amd.com>
Reviewed-by: Ben Crocker <bcrocker@redhat.com>
Reviewed-by: Antoine Martin <antoine@nagafix.co.uk>
Tested-by: Ben Crocker <bcrocker@redhat.com>
commit 9ef602de46de2beae1d6231dc72a1a783a26122f
Author: Nicolai Hähnle <nicolai.haehnle@amd.com>
Date: Tue Mar 13 17:46:34 2018 -0400
os: move xf86PrivsElevated here
Having different types of code all trying to check for elevated privileges
is a bad idea. This implementation is the most thorough one.
Signed-off-by: Nicolai Hähnle <nicolai.haehnle@amd.com>
Reviewed-by: Ben Crocker <bcrocker@redhat.com>
Reviewed-by: Antoine Martin <antoine@nagafix.co.uk>
Tested-by: Ben Crocker <bcrocker@redhat.com>
Reviewed-by: Emil Velikov <emil.velikov@collabora.com>
commit 1519475a4382066707276d7463c7c6e52c382caa
Author: Adam Jackson <ajax@redhat.com>
Date: Wed Mar 14 15:29:15 2018 -0400
appveyor: use meson
i686 cygwin build time with autotools: 16:22
i686 cygwin build time with meson: 6:56
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit 2415ef5b228f5a235377decde95cb146c6642ea9
Author: Adam Jackson <ajax@redhat.com>
Date: Tue Mar 20 14:00:33 2018 -0400
meson: Add the x(org)proto headers to the include path
Without this meson won't properly use headers installed into a
non-default location.
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit 21e8a4a1b993a9b1abd4a7510cd3d8a152be998b
Author: Emil Velikov <emil.velikov@collabora.com>
Date: Wed Mar 7 18:45:33 2018 +0000
modesetting: remove fallback DRM_CAP_* defines
All the macros are available in the libdrm that we depend on.
Signed-off-by: Emil Velikov <emil.velikov@collabora.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
commit d2568c058745ea66353fefa8f7296a6f37795905
Author: Emil Velikov <emil.velikov@collabora.com>
Date: Wed Mar 7 18:45:32 2018 +0000
modesetting: remove always true DRM_IOCTL_CRTC_QUEUE_SEQUENCE guard
We already require libdrm 2.4.89 which provides the definition plus
guarding kernel UABI like that is generally a bad idea.
See previous commit for details why :-)
Cc: Keith Packard <keithp@keithp.com>
Signed-off-by: Emil Velikov <emil.velikov@collabora.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
commit f368428ab84c14f32f52e50b880d9353fbb87181
Author: Emil Velikov <emil.velikov@collabora.com>
Date: Wed Mar 7 18:45:31 2018 +0000
modesetting: remove always true defined(DRM_CAP_PRIME) guards
The macro was available in libdrm for ages. Furthermore having a guard
like this is a very bad idea.
Building on an old server will result in a missing run-time functionality.
Since it's UABI one can use a local fallback, old kernels will return
-EINVAL and the fallback path will kick in.
Signed-off-by: Emil Velikov <emil.velikov@collabora.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
commit 22b489d27365d2513bf1cab6da92254e3bdbcf41
Author: Emil Velikov <emil.velikov@collabora.com>
Date: Wed Mar 7 18:45:30 2018 +0000
Remove always true GLAMOR_HAS_DRM_* guards
With earlier commit the required version was bumped to 2.4.89, thus the
guards always evaluate to true.
Fixes: e4e3447603b ("Add RandR leases with modesetting driver support
[v6]")
Cc: Keith Packard <keithp@keithp.com>
Cc: Daniel Stone <daniels@collabora.com>
Cc: Louis-Francis Ratté-Boulianne <lfrb@collabora.com>
Signed-off-by: Emil Velikov <emil.velikov@collabora.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
commit e0748b10a8621066b404d713a76826907da777b9
Author: Emil Velikov <emil.velikov@collabora.com>
Date: Wed Mar 7 18:45:29 2018 +0000
configure: remove libdrm version check
We already require said version.
Signed-off-by: Emil Velikov <emil.velikov@collabora.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
commit 8718d46157b9317554aba3e01b9919a1c0c28026
Author: Adam Jackson <ajax@redhat.com>
Date: Wed Mar 14 16:43:09 2018 -0400
ci: Ignore builds for branches aimed at other CI services
Make appveyor ignore builds for /travis.*/ and vice versa. If you're
only testing a Windows change, building for OSX and Linux too is a bit
rude.
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit ae5c0dd199a5fbfbdf7a2d6b8c1b28c410289106
Author: Emil Velikov <emil.velikov@collabora.com>
Date: Tue Mar 13 18:38:49 2018 +0000
dri3: cap the version returned to the client
As per the protocol, the server should not return version greater than
the one supported by the client.
Add a spec quote and tweak the numbers accordingly.
Fixes: 563138298868 ("dri3: Add DRI3 extension")
Cc: Daniel Stone <daniels@collabora.com>
Cc: Keith Packard <keithp@keithp.com>
Signed-off-by: Emil Velikov <emil.velikov@collabora.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
commit 6a5d51e0823b43280e3646b7a0c919a3b76146ea
Author: Emil Velikov <emil.velikov@collabora.com>
Date: Mon Mar 19 16:04:43 2018 +0000
present: cap the version returned to the client
As per the protocol, the server should not return version greater than
the one supported by the client.
Add a spec quote and tweak the numbers accordingly.
Fixes: 5c5c1b77982 ("present: Add Present extension")
Cc: Thierry Reding <treding@nvidia.com>
Cc: Daniel Stone <daniels@collabora.com>
Cc: Keith Packard <keithp@keithp.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Emil Velikov <emil.velikov@collabora.com>
commit abb9b58d1af9a0286162e52ef9db390d0c950fc1
Author: Thierry Reding <treding@nvidia.com>
Date: Fri Mar 16 14:24:21 2018 +0100
present: Advertise protocol version 1.2
Everything is implemented to support protocol version 1.2. Make it
official.
Reviewed-by: Daniel Stone <daniels@collabora.com>
Signed-off-by: Thierry Reding <treding@nvidia.com>
Reviewed-by: Emil Velikov <emil.velikov@collabora.com>
commit 7fc89251ef5e7363dfbf6d831ed448bbcd8519b8
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Sun Mar 4 13:00:05 2018 -0800
Revert "modesetting: Remove #ifdefs XF86_PDEV_SERVER_FD"
This reverts commit 8c455db0ebb6e5313ca81428bb6dd75ef12aaa15.
Since xf86platformBus.h is only included when XSERVER_PLATFORM_BUS is
defined, and configure.ac only defines that on systems with udev, this
commit breaks the build on non-udev systems like Solaris.
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
commit edf08bd654dcdf31da9a592513b218bbd9f64cc6
Author: Adam Jackson <ajax@redhat.com>
Date: Wed Mar 14 12:10:27 2018 -0400
appveyor: Switch to xorgproto
Also build with -j2, the builder VM has two cores.
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit 8f628033bed408c4de215ca117fa2fa2d9f9d5cd
Author: Adam Jackson <ajax@redhat.com>
Date: Wed Mar 14 12:54:16 2018 -0400
travis: Update OSX build
Install and use xorgproto, and build with optimization as clang has
warnings that only work above -O0. Also expand the build matrix for both
Xcode 8.3 and 9.2. Both images are OSX 10.12 at the moment so this is
really just a way to test with clang 8 vs 9.
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit 1ca092f990e67c7dccf5790a72c41e84711c28a8
Author: Adam Jackson <ajax@redhat.com>
Date: Wed Mar 14 13:13:54 2018 -0400
travis: Switch linux build from stretch to rawhide
Stretch's Mesa is too far behind, and building Mesa to build xserver is
not the sort of problem we're trying to solve here. But our Travis
scripts run inside a docker image, and that image can be whatever, so
since I have to keep rawhide building anyway let's switch to that for
now. The dockerfile can be found at:
https://github.com/nwnk/xserver-travis
The $DISTRO part of the change is foreshadowing for the day we readd a
(probably sid-based) debian image; patches for other environments are
welcome.
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit 17d30369f4445e1693a1b75dc6620bbc21ec8e61
Author: Michel Dänzer <michel.daenzer@amd.com>
Date: Wed Mar 14 16:48:23 2018 +0100
randr: Initialize RROuptutRec::nonDesktop
Flagged by valgrind:
==13695== Conditional jump or move depends on uninitialised value(s)
==13695== at 0x22461C: RRNoticePropertyChange (rrproperty.c:150)
==13695== by 0x22461C: RRChangeOutputProperty (rrproperty.c:263)
==13695== by 0x222FC4: RROutputSetNonDesktop (rroutput.c:333)
==13695== by 0x22319C: RROutputCreate (rroutput.c:122)
==13695== by 0x1E1CE9: xf86RandR12CreateObjects12 (xf86RandR12.c:1734)
==13695== by 0x1E1CE9: xf86RandR12Init12 (xf86RandR12.c:2375)
==13695== by 0x1E1CE9: xf86RandR12Init (xf86RandR12.c:895)
==13695== by 0x1D469B: xf86CrtcScreenInit (xf86Crtc.c:778)
==13695== by 0xC095A54: RADEONScreenInit_KMS (radeon_kms.c:2436)
==13695== by 0x161444: AddGPUScreen (dispatch.c:3966)
==13695== by 0x1A3E46: InitOutput (xf86Init.c:763)
==13695== by 0x1654A7: dix_main (main.c:193)
==13695== by 0x7041A86: (below main) (libc-start.c:310)
==13695== Uninitialised value was created by a heap allocation
==13695== at 0x4C2CB8F: malloc (vg_replace_malloc.c:299)
==13695== by 0x223083: RROutputCreate (rroutput.c:83)
==13695== by 0x1E1CE9: xf86RandR12CreateObjects12 (xf86RandR12.c:1734)
==13695== by 0x1E1CE9: xf86RandR12Init12 (xf86RandR12.c:2375)
==13695== by 0x1E1CE9: xf86RandR12Init (xf86RandR12.c:895)
==13695== by 0x1D469B: xf86CrtcScreenInit (xf86Crtc.c:778)
==13695== by 0xC095A54: RADEONScreenInit_KMS (radeon_kms.c:2436)
==13695== by 0x161444: AddGPUScreen (dispatch.c:3966)
==13695== by 0x1A3E46: InitOutput (xf86Init.c:763)
==13695== by 0x1654A7: dix_main (main.c:193)
==13695== by 0x7041A86: (below main) (libc-start.c:310)
Signed-off-by: Michel Dänzer <michel.daenzer@amd.com>
Reviewed-by: Keith Packard <keithp@keithp.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 52048ce29f872192478fece3887b7bc1c8aace7d
Author: Keith Packard <keithp@keithp.com>
Date: Mon Mar 12 12:14:44 2018 -0700
Xext/saver: Swap ScreenSaverSuspend 'suspend' field. Handle old XCB clients.
This field was defined as a Bool in the protocol headers and BOOL in
xcb. Bool is not a valid type for protocol fields. It is defined as
'int' by Xdefs.h, which we expect to be 32-bits on all machines.
The protocol headers and xcb have patches posted to switch to CARD32,
which is at least well defined.
This change adds the necessary byte swapping to handle other-endian
clients with this 32-bit field, and then changes the request
processing to compare all 32-bits against zero so that it works with
both new and old clients.
On MSB machines, Xlib will continue to work properly, but old XCB will
not interoperate with the X server (either before or after this patch).
Signed-off-by: Keith Packard <keithp@keithp.com>
Reviewed-by: Mihai Moldovan <ionic@ionic.de>
Reviewed-by: Adam Jackson <ajax@redhat.com>
commit beda6afb3c33adbf77637141f05631081894e93a
Author: Mario Kleiner <mario.kleiner.de@gmail.com>
Date: Fri Mar 9 04:58:20 2018 +0100
glamor/xwayland: Add depth 30 format mapping for DRI 3.2 as well.
Signed-off-by: Mario Kleiner <mario.kleiner.de@gmail.com>
Reviewed-by: Daniel Stone <daniels@collabora.com>
commit 07c369e05ac116901dacc20f4742622bdca2784f
Author: Jon Turney <jon.turney@dronecode.org.uk>
Date: Thu Mar 8 12:34:26 2018 +0000
meson: Require libdrm for dri1/2/3 when configured 'auto' as well as 'true'
If dri1/2/3 are configured for auto-detection, libdrm is required, as well
as the corresponding proto. (Practically we will always have the
corresponding protos now, as they are part of xorgproto).
Signed-off-by: Jon Turney <jon.turney@dronecode.org.uk>
Reviewed-by: Emil Velikov <emil.velikov@collabora.com>
commit f69cd2024ef25e7fd2bd2d7012e33ce16eeb79ff
Author: Adam Jackson <ajax@redhat.com>
Date: Thu Mar 8 11:13:16 2018 -0500
os: Define {ReadFdFrom,WriteFdTo}Client unconditionally
Otherwise this is broken on cygwin:
rrlease.c: In function ‘ProcRRCreateLease’:
rrlease.c:305:9: error: implicit declaration of function ‘WriteFdToClient’ [-Werror=implicit-function-declaration]
if (WriteFdToClient(client, fd, TRUE) < 0) {
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit 90e0cdd42dfda2accfadffa5c550712696902e14
Author: Rodrigo Vivi <rodrigo.vivi@intel.com>
Date: Wed Mar 7 07:46:20 2018 -0800
dri2: Sync i965_pci_ids.h from Mesa.
Copied from Mesa with no modifications.
Gives us Geminilake and Kaby Lake platform names updates and
sync on Coffee Lake PCI IDs.
Cc: Timo Aaltonen <timo.aaltonen@canonical.com>
Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
commit 43576b901151a1f32209f476249a4de6980b654f
Author: Michel Dänzer <michel.daenzer@amd.com>
Date: Tue Mar 6 10:53:19 2018 +0100
glamor: Restore glamor_fd_from_pixmap and glamor_pixmap_from_fd
They're part of the 1.20 RC1 ABI, and actually used by external drivers.
Also, requiring drivers which don't support the new functionality in
DRI3 1.2 to switch to the new interfaces seems unreasonable.
Signed-off-by: Michel Dänzer <michel.daenzer@amd.com>
Reviewed-by: Daniel Stone <daniels@collabora.com>
commit 5d3fd3856b718cfbc87d17f1de698ced94923c78
Author: Samir Benmendil <me@rmz.io>
Date: Sat Mar 3 01:41:12 2018 +0000
xkb: XkbSetMap on the lastSlave needs to change the master
The layout needs to be set on the master too if the layout is changed on
the device that was last used by the master.
Fixes: https://bugs.freedesktop.org/show_bug.cgi?id=85256
Fixes: https://bugs.freedesktop.org/show_bug.cgi?id=91571
Signed-off-by: Samir Benmendil <me@rmz.io>
Acked-by: Daniel Stone <daniels@collabora.com>
commit ce8da936464cc78ec31de6e970e1353ffecf2547
Author: Louis-Francis Ratté-Boulianne <lfrb@collabora.com>
Date: Wed Feb 28 01:19:46 2018 +0000
dri3: Enable DRI3 version 1.2
Enable DRI3 v1.2 now that all functions have been implemented and
that there is at least one backend implementing the driver hooks
(modesetting/glamor).
Signed-off-by: Louis-Francis Ratté-Boulianne <lfrb@collabora.com>
Reviewed-by: Daniel Stone <daniels@collabora.com>
Acked-by: Keith Packard <keithp@keithp.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
commit 8d0d89715984e321315631dd6667e05813d26e03
Author: Louis-Francis Ratté-Boulianne <lfrb@collabora.com>
Date: Wed Feb 28 01:19:45 2018 +0000
glamor: Use gbm_bo_create_with_modifiers for internal pixmap allocation
Using modifier might allow the driver to use a more optimal format
(e.g. tiled/compressed). Let's try to use those if possible.
v2: Don't filter out multi-plane modifiers
Signed-off-by: Louis-Francis Ratté-Boulianne <lfrb@collabora.com>
Reviewed-by: Daniel Stone <daniels@collabora.com>
Acked-by: Keith Packard <keithp@keithp.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
commit cef12efc15ca1444d6d8cd839116b318a4668692
Author: Louis-Francis Ratté-Boulianne <lfrb@collabora.com>
Date: Wed Feb 28 01:19:44 2018 +0000
glamor: Implement GetSupportedModifiers
Implement function added in DRI3 v1.1.
A newest version of libepoxy (>= 1.4.4) is required as earlier
versions use a problematic version of Khronos
EXT_image_dma_buf_import_modifiers spec.
v4: Only send scanout-supported modifiers if flipping is possible
v5: Fix memory corruption in XWayland (uninitialized pointer)
Signed-off-by: Louis-Francis Ratté-Boulianne <lfrb@collabora.com>
Reviewed-by: Daniel Stone <daniels@collabora.com>
Acked-by: Keith Packard <keithp@keithp.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
commit c8c276c9569b3ca1e695682a5443f1b615c606bd
Author: Louis-Francis Ratté-Boulianne <lfrb@collabora.com>
Date: Wed Feb 28 01:19:43 2018 +0000
glamor: Implement PixmapFromBuffers and BuffersFromPixmap
It relies on GBM >= 17.1.0 where we can import BO with multiple
planes and a format modifier (GBM_BO_IMPORT_FD_MODIFIER).
v2: Properly free fds in Xwayland
[Also add glamor_egl_ext.h to Makefile.am for distcheck's sake - ajax]
Signed-off-by: Louis-Francis Ratté-Boulianne <lfrb@collabora.com>
Reviewed-by: Daniel Stone <daniels@collabora.com>
Acked-by: Keith Packard <keithp@keithp.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
commit 9d147305b4048dcec7ea4eda3eeea83f843f7788
Author: Louis-Francis Ratté-Boulianne <lfrb@collabora.com>
Date: Wed Feb 28 01:19:42 2018 +0000
modesetting: Check if buffer format is supported when flipping
Add support for 'check_flip2' so that the present core can know
why it is impossible to flip in that scenario. The core can then
let know the client that the buffer format/modifier is suboptimal.
v2: No longer need to implement 'check_flip'
Signed-off-by: Louis-Francis Ratté-Boulianne <lfrb@collabora.com>
Reviewed-by: Daniel Stone <daniels@collabora.com>
Acked-by: Keith Packard <keithp@keithp.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
commit e375f29662ad7589cc6d8d179846da9b8a897122
Author: Louis-Francis Ratté-Boulianne <lfrb@collabora.com>
Date: Wed Feb 28 01:19:41 2018 +0000
modesetting: Create scanout buffers using supported modifiers
Use most optimal buffer format (e.g. tiled/compressed) available
for scanout.
v2: Don't use multi-plane modifier to create scanout buffer
v3: Add flag to retrieve modifiers set from enabled CRTCs only
v4: Fix uses when GBM/EGL driver doesn't support modifiers
Signed-off-by: Louis-Francis Ratté-Boulianne <lfrb@collabora.com>
Reviewed-by: Daniel Stone <daniels@collabora.com>
Acked-by: Keith Packard <keithp@keithp.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
commit ca1c390ec7bf617c0147d69cf874dadce28e903b
Author: Louis-Francis Ratté-Boulianne <lfrb@collabora.com>
Date: Wed Feb 28 01:19:40 2018 +0000
modesetting: Get supported formats/modifiers for scanout
Retrieve IN_FORMATS property from the plane. It gives the
allowed formats and modifiers for BO allocation.
Signed-off-by: Louis-Francis Ratté-Boulianne <lfrb@collabora.com>
Reviewed-by: Daniel Stone <daniels@collabora.com>
Acked-by: Keith Packard <keithp@keithp.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
commit 9817c14f6a2ea5db44459659131c13f403716df1
Author: Louis-Francis Ratté-Boulianne <lfrb@collabora.com>
Date: Wed Feb 28 01:19:39 2018 +0000
modesetting: Use atomic modesetting to configure output/CRTCs
To make sure we also use the same primary plane and to avoid
mixing uses of two APIs, it is better to always use the atomic
modesetting API when possible.
v2: Don't use mode_output->connector_id
Signed-off-by: Louis-Francis Ratté-Boulianne <lfrb@collabora.com>
Reviewed-by: Daniel Stone <daniels@collabora.com>
Acked-by: Keith Packard <keithp@keithp.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
commit 2f807c2324b46fbd9a557e7a4f177a392d5851b3
Author: Louis-Francis Ratté-Boulianne <lfrb@collabora.com>
Date: Wed Feb 28 01:19:38 2018 +0000
modesetting: Add support for multi-plane pixmaps when page-flipping
This allows the uses of CCS compressed or tiled pixmaps as BOs when
page-flipping.
Signed-off-by: Louis-Francis Ratté-Boulianne <lfrb@collabora.com>
Reviewed-by: Daniel Stone <daniels@collabora.com>
Acked-by: Keith Packard <keithp@keithp.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
commit 4023d537341b9c36b9bb248c206e40694e4b08d2
Author: Louis-Francis Ratté-Boulianne <lfrb@collabora.com>
Date: Wed Feb 28 01:19:37 2018 +0000
modesetting: Use atomic modesetting API for pageflip if available
In order to flip between compressed and uncompressed buffers -
something drmModePageFlip explicitly bans us from doing - we need
to port use the atomic modesetting API. It's only 'fake' atomic
though given we still commit for each CRTC separately and
CRTC and connector properties are not set with the atomic API.
The helper functions to retrieve DRM properties have been borrowed
from Weston.
Signed-off-by: Louis-Francis Ratté-Boulianne <lfrb@collabora.com>
Reviewed-by: Daniel Stone <daniels@collabora.com>
Acked-by: Keith Packard <keithp@keithp.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
commit e2ef3b44fa697f2ed453767e98da72ea56d4046f
Author: Louis-Francis Ratté-Boulianne <lfrb@collabora.com>
Date: Wed Feb 28 01:19:36 2018 +0000
present: Send PresentCompleteModeSuboptimalCopy appropriately
Add 'check_flip2' hook for driver to let know the core
about why flipping is not possible ('reason').
If it is because of unsupported buffer format/modifier,
a PresentCompleteNotify event is sent to the client with
the PresentCompleteModeSuboptimalCopy mode.
v2: Check for PresentOptionSuboptimal and check driver version
before using 'check_flip2'.
v3: Only require one of 'check_flip' or 'check_flip2' to be
implemented by the driver.
Refactor reasons list to enum
Signed-off-by: Louis-Francis Ratté-Boulianne <lfrb@collabora.com>
Reviewed-by: Daniel Stone <daniels@collabora.com>
Acked-by: Keith Packard <keithp@keithp.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
commit 6e7c40f62db66f5b59b2cf59f1e6a26e4fd21bda
Author: Louis-Francis Ratté-Boulianne <lfrb@collabora.com>
Date: Wed Feb 28 01:19:35 2018 +0000
dri3: Add multi-planar/modifier buffer requests
Initial implementation for DRI3 v1.1. Only the DRI3 implementation
is there, backends need to implement the proper hooks.
Version is still set to 1.0 so clients shouldn't use the new
requests yet.
v2: Use depth/bpp instead of DRM formats in requests
v3: Remove DMA fence requests from v1.1
Add screen/drawable modifier sets
v4: Free array returned by 'get_drawable_modifiers()'
v5: Fix FD leak
Signed-off-by: Daniel Stone <daniels@collabora.com>
Signed-off-by: Louis-Francis Ratté-Boulianne <lfrb@collabora.com>
Acked-by: Keith Packard <keithp@keithp.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
commit 0ff4074224ea370e021d79526c63cef91356730d
Author: Keith Packard <keithp@keithp.com>
Date: Fri Mar 2 17:05:04 2018 -0800
Require libdrm 2.4.89 or newer
Both autotools and meson build systems had complicated logic around
what version of libdrm to require for various options. Remove that and
just check for a new enough version to support all of the options
which need libdrm.
Signed-off-by: Keith Packard <keithp@keithp.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
commit 43ffd572592d26bb78decfdf55e643bdfb011d3f
Author: Laurent Carlier <lordheavym@gmail.com>
Date: Thu Mar 1 12:58:16 2018 +0100
meson: Make SHM extension optional
v2: check for header 'sys/shm.h'
Signed-off-by: Laurent Carlier <lordheavym@gmail.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
commit de4565727a0bb199365d33e3c98d9ddd3e0de6f2
Author: Laurent Carlier <lordheavym@gmail.com>
Date: Thu Mar 1 12:57:27 2018 +0100
meson: get rid of useless HAVE_SYSV_IPC
Signed-off-by: Laurent Carlier <lordheavym@gmail.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
commit e02afb94783a25c21b07e44a7b615acdd86fa3f7
Author: Laurent Carlier <lordheavym@gmail.com>
Date: Thu Mar 1 12:56:28 2018 +0100
meson: Make ACPI support optional
v2: Define HAVE_ACPI in dix-config.h
Signed-off-by: Laurent Carlier <lordheavym@gmail.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
commit 238219e7312e2b5d972a8620b02379009686a005
Author: Laurent Carlier <lordheavym@gmail.com>
Date: Thu Mar 1 12:55:11 2018 +0100
meson: Make APM support optional
v2: Define HAVE_APM in dix-config.h
Signed-off-by: Laurent Carlier <lordheavym@gmail.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
commit 2af0a50a4bb9be9f58681d417ceb9a7029caaf3b
Author: Adam Jackson <ajax@redhat.com>
Date: Wed Feb 28 11:23:41 2018 -0500
randr: Fix a crash on initialization with GPU screens
RRSetChanged (immediately above) was immune to screens with no master,
but RRTellChanged was not:
Thread 1 "X" received signal SIGSEGV, Segmentation fault.
RRTellChanged (pScreen=<optimized out>) at ../../randr/randr.c:576
576 mastersp = rrGetScrPriv(master);
(gdb) bt
#0 RRTellChanged (pScreen=<optimized out>) at ../../randr/randr.c:576
#1 0x000055555566f1e9 in RRNoticePropertyChange (value=0x555555bfbf28, property=70, output=0x555555bfef10) at ../../randr/rrproperty.c:153
#2 RRChangeOutputProperty (output=output@entry=0x555555bfef10, property=<optimized out>, type=type@entry=19, format=format@entry=32, mode=<optimized out>, mode@entry=0, len=len@entry=1, value=0x7fffffffe77c, sendevent=1, pending=0)
at ../../randr/rrproperty.c:263
#3 0x000055555566dba5 in RROutputSetNonDesktop (output=output@entry=0x555555bfef10, nonDesktop=nonDesktop@entry=0) at ../../randr/rroutput.c:333
...
Reported-by: Michel Dänzer <michel@daenzer.net>
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit cf485c659d93c92b26c4390402575f061eb175f6
Author: Adam Jackson <ajax@redhat.com>
Date: Wed Feb 28 12:18:28 2018 -0500
xserver 1.20 RC 1
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit afccb266edc8b2ca014aec5b2a67bb1627f29fe9
Author: Adam Jackson <ajax@redhat.com>
Date: Wed Feb 28 12:26:26 2018 -0500
glx: Add vndserver.h to the SDK
Also unbreak 'make distcheck', sigh autotools.
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit 85ff1cdbd3286838e512fe7c70af149a8743b6fe
Author: Emil Velikov <emil.velikov@collabora.com>
Date: Tue Feb 27 17:05:50 2018 +0000
protocol.txt: add GLX req. 35 - SetClientInfo2ARB
Noticed while skimming for the typo'd version ;-)
Signed-off-by: Emil Velikov <emil.velikov@collabora.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
commit e4e3447603b5fd3a38a92c3f972396d1f81168ad
Author: Keith Packard <keithp@keithp.com>
Date: Mon Feb 12 13:51:56 2018 -0800
Add RandR leases with modesetting driver support [v6]
This adds support for RandR CRTC/Output leases through the modesetting
driver, creating a lease using new kernel infrastructure and returning
that to a client through an fd which will have access to only those
resources.
v2: Restore CRTC mode when leases terminate
When a lease terminates for a crtc we have saved data for, go
ahead and restore the saved mode.
v3: Report RR_Rotate_0 rotations for leased crtcs.
Ignore leased CRTCs when selecting screen size.
Stop leasing encoders, the kernel doesn't do that anymore.
Turn off crtc->enabled while leased so that modesetting
ignores them.
Check lease status before calling any driver mode functions
When starting a lease, mark leased CRTCs as disabled and hide
their cursors. Also, check to see if there are other
non-leased CRTCs which are driving leased Outputs and mark
them as disabled as well. Sometimes an application will lease
an idle crtc instead of the one already associated with the
leased output.
When terminating a lease, reset any CRTCs which are driving
outputs that are no longer leased so that they start working
again.
This required splitting the DIX level lease termination code
into two pieces, one to remove the lease from the system
(RRLeaseTerminated) and a new function that frees the lease
data structure (RRLeaseFree).
v4: Report RR_Rotate_0 rotation for leased crtcs.
v5: Terminate all leases on server reset.
Leases hang around after the associated client exits so that
the client doesn't need to occupy an X server client slot and
consume a file descriptor once it has gotten the output
resources necessary.
Any leases still hanging around when the X server resets or
shuts down need to be cleaned up by calling the kernel to
terminate the lease and freeing any DIX structures.
Note that we cannot simply use the existing
drmmode_terminate_lease function on each lease as that wants
to also reset the video mode, and during server shut down that
modesetting: Validate leases on VT enter
The kernel doesn't allow any master ioctls to run when another
VT is active, including simple things like listing the active
leases. To deal with that, we check the list of leases
whenever the X server VT is activated.
xfree86: hide disabled cursors when resetting after lease termination
The lessee may well have played with cursors and left one
active on our screen. Just tell the kernel to turn it off.
v6: Add meson build infrastructure
[Also bumped libdrm requirement - ajax]
Signed-off-by: Keith Packard <keithp@keithp.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
commit 023d4aba8d45e9e3630b944ecfb650c081799b96
Author: Keith Packard <keithp@keithp.com>
Date: Mon Feb 12 13:51:55 2018 -0800
xf86-video-modesetting: Create CONNECTOR_ID properties for outputs [v2]
This lets a DRM client map between X outputs and kernel connectors.
v2:
Change CONNECTOR_ID to enum -- Adam Jackson <ajax@nwnk.net>
Signed-off-by: Keith Packard <keithp@keithp.com>
Reviewed-by: Adam Jackson <ajax@nwnk.net>
commit 39573605050f6253d14a4786bb79ce2b48537039
Author: Keith Packard <keithp@keithp.com>
Date: Mon Feb 12 13:51:54 2018 -0800
randr: Support "non-desktop" property
Tracks changes to the non-desktop property so that when non-zero,
outputs will always appear to be disconnected.
Signed-off-by: Keith Packard <keithp@keithp.com>
Reviewed-by: Adam Jackson <ajax@nwnk.net>
commit b91c787c4cd2d20685db69426c539938c556128a
Author: Keith Packard <keithp@keithp.com>
Date: Mon Feb 12 13:51:53 2018 -0800
xf86-video-modesetting: Record non-desktop kernel property at PreInit time
Save any value of the kernel non-desktop property in the xf86Output
structure to avoid non-desktop outputs in the default configuration.
[Also bump randrproto requirement to a version that defines
RR_PROPERTY_NON_DESKTOP - ajax]
Signed-off-by: Keith Packard <keithp@keithp.com>
Reviewed-by: Adam Jackson <ajax@nwnk.net>
commit fabbaa8d6260da14fe5b7ca0f3f8748af16253a2
Author: Keith Packard <keithp@keithp.com>
Date: Mon Feb 12 13:51:52 2018 -0800
xfree86/modes: Check for non-desktop monitors during PreInit [v2]
At startup, we want to ignore non-desktop monitors unless we don't
find any desktop monitors. Because there are no DIX RandR resources
allocated, let the driver store this information in a new field in the
xf86Output structure and then use that value to help decide whether to
include an output as part of the default configuration.
v2:
Suggested-by: Michel Dänzer <michel@daenzer.net>
Bump XF86_CRTC_VERSION from 7 to 8. This will let out-of-tree
drivers know whether this field is available.
Signed-off-by: Keith Packard <keithp@keithp.com>
Reviewed-by: Adam Jackson <ajax@nwnk.net>
commit 80d4f4b6c20288aa3e0c9908d5d845fc0088a662
Author: Mario Kleiner <mario.kleiner.de@gmail.com>
Date: Tue Feb 27 03:05:32 2018 +0100
modesetting: Enable screen color depth 30 support.
glamor now supports depth 30, so allow use of it.
Signed-off-by: Mario Kleiner <mario.kleiner.de@gmail.com>
Reviewed-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Antoine Martin <antoine@nagafix.co.uk>
commit 7bc86c7d2346eadb3aafe1550ec55e63f2a3b3e5
Author: Mario Kleiner <mario.kleiner.de@gmail.com>
Date: Tue Feb 27 03:05:31 2018 +0100
modesetting: Adapt xf86HandleColorMaps() for > 24 color depth. (v2)
This retains old behavior for depths <= 24, but allows gamma
table and colormap updates to work properly at depth 30.
This needs the xf86Randr12CrtcComputeGamma() fix for depth 30
from a previous commit to work. Otherwise the server will work,
but gamma table updates will silently fail, iow. the server
would always run with a default identity gamma lut.
v2: Simplify as proposed by Michel.
Signed-off-by: Mario Kleiner <mario.kleiner.de@gmail.com>
Reviewed-by: Antoine Martin <antoine@nagafix.co.uk> (v1)
commit b5f9fcd50a999a00128c0cc3f6e7d1f66182c9d5
Author: Mario Kleiner <mario.kleiner.de@gmail.com>
Date: Tue Feb 27 03:05:30 2018 +0100
xfree86/modes: Adapt xf86Randr12CrtcComputeGamma() for depth 30. (v2)
At screen depths > 24 bit, the color palettes passed into
xf86Randr12CrtcComputeGamma() can have a larger number of slots
than the crtc's hardware lut. E.g., at depth 30, 1024 palette
slots vs. 256 hw lut slots. This palette size > crtc gamma size
case is not handled yet and leads to silent failure, so gamma
table updates do not happen.
Add a new subsampling path for this case.
This makes lut updates work again, as tested with the xgamma
utility (uses XF86VidMode extension) and some RandR based
gamma ramp animation.
v2: Better resampling when subsampling the palette, as
proposed by Ville. Now reaches the max index of the
palette and deals with non-power-of-two sizes. Thanks.
Signed-off-by: Mario Kleiner <mario.kleiner.de@gmail.com>
Reviewed-by: Antoine Martin <antoine@nagafix.co.uk> (v1)
Cc: <ville.syrjala@linux.intel.com>
commit 125201408ddd51ca8ea961a7338a6ad299e5816c
Author: Mario Kleiner <mario.kleiner.de@gmail.com>
Date: Tue Feb 27 03:05:29 2018 +0100
glamor: Bump version to 1.0.1 to signal depth 30 support.
Signed-off-by: Mario Kleiner <mario.kleiner.de@gmail.com>
Reviewed-by: Antoine Martin <antoine@nagafix.co.uk>
commit 7a687da24c9d3c9e40ffa426631bf355322d470e
Author: Mario Kleiner <mario.kleiner.de@gmail.com>
Date: Tue Feb 27 03:05:28 2018 +0100
glamor: Enable composite acceleration for rgb10 formats. (v2)
Specifically for xrgb2101010 format.
Tested on KDE Plasma-5 with XRender based composite
acceleration backend. Much smoother and faster.
(v2) Dropped argb2101010, because of depth 32 confusion with
argb8888, as pointed out by Eric. Thanks!
Signed-off-by: Mario Kleiner <mario.kleiner.de@gmail.com>
Reviewed-by: Antoine Martin <antoine@nagafix.co.uk>
commit c326c717c8dbf4a3f0c64a031fbe6030e73ff355
Author: Mario Kleiner <mario.kleiner.de@gmail.com>
Date: Tue Feb 27 03:05:27 2018 +0100
glamor: Fix loose ends in color depth 30 support.
This makes it work properly with OpenGL based desktop
compositing, as tested with EGL and GLX based compositing
under OpenGL-2/3, and also artifact free with XRender
based 2D compositing.
Signed-off-by: Mario Kleiner <mario.kleiner.de@gmail.com>
Reviewed-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Antoine Martin <antoine@nagafix.co.uk>
commit 9ab5d91c6c228e8f5b34e4b30c5104aed6c41958
Author: Mario Kleiner <mario.kleiner.de@gmail.com>
Date: Tue Feb 27 03:05:26 2018 +0100
glamor: Make Xv extension initialize at depth 30.
Support x-screens of depth 30, so init doesn't fail.
Signed-off-by: Mario Kleiner <mario.kleiner.de@gmail.com>
Reviewed-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Antoine Martin <antoine@nagafix.co.uk>
commit efe9e3e9ff96a06f50d94dc93ad2c19085fa3d09
Author: Mario Kleiner <mario.kleiner.de@gmail.com>
Date: Tue Feb 27 06:51:59 2018 +0100
modesetting: Fix fallback for lack of new vblank kernel API.
Turns out that the kernel DRM ioctl handling returns EINVAL
instead of ENOTTY if one tries to call the new drmCrtcGetSequence()
or drmCrtcQueueSequence() ioctl's introduced in Linux 4.15 on an
older kernel where they are missing. This causes the fallback code
not to fall back to the old drmWaitVblank() ioctl and thereby
failure of vblank stuff.
E.g., on Linux 4.13, glxgears -info runs unthrottled at 10000 fps
instead of 60 fps. Also breakage of OML_sync_control extension.
Check for errno != EINVAL before setting has_queue_sequence = TRUE.
Additionally in case of supported drmCrtcQueueSequence(), set
has_queue_sequence = TRUE on success, or we might get at
least a temporary failure in ms_queue_vblank().
One slight ambiguity is that we can also get EINVAL if
drm_crtc_vblank_get() fails in the kernel, so if that
happened at first invocation of the new api, we'd fall
back to drmWaitVblank() and then fail there, instead of
failing in the new api, but the end result would be the
same.
Fixes: 44d5f2eb8a2f ("xf86-video-modesetting: Support new vblank kernel API [v2]")
Signed-off-by: Mario Kleiner <mario.kleiner.de@gmail.com>
Cc: Keith Packard <keithp@keithp.com>
Reviewed-by: Keith Packard <keithp@keithp.com>
commit 8171d4c2d67b2990a278dc018ac32534c3afe606
Author: Adam Jackson <ajax@redhat.com>
Date: Fri Feb 23 16:08:10 2018 -0500
render: Store and use all 16bpc of precision for solid pixels (v2.1)
This plumbs the full width color for solid pictures through to fb, exa,
and glamor. External drivers and acceleration code may wish to make a
similar change for sufficiently new servers.
v2: Don't break ABI (Michel Dänzer)
v2.1: Use the (correct) full color in fb too (Michel Dänzer)
Signed-off-by: Adam Jackson <ajax@redhat.com>
Reviewed-by: Keith Packard <keithp@keithp.com>
commit 92272378064a878ce7a62852b877d674bcad89cd
Author: Jeffrey Smith <whydoubt@gmail.com>
Date: Thu Feb 15 06:46:55 2018 -0600
modesetting: Do not close uninitialized dri2 screen
If a dri2 screen is not successfully initialized, attempting to close it
results in a null dereference.
Maintain a flag indicating whether the dri2 screen was successfully
initialized, and check it before attempting to close the dri2 screen.
https://bugzilla.redhat.com/show_bug.cgi?id=1485811
https://bugzilla.redhat.com/show_bug.cgi?id=1493805
https://bugzilla.redhat.com/show_bug.cgi?id=1534459
https://bugzilla.redhat.com/show_bug.cgi?id=1541745
https://bugs.freedesktop.org/show_bug.cgi?id=101282
Signed-off-by: Jeff Smith <whydoubt@gmail.com>
commit aa29298416a6323fad1681a019dbcd54867b66c4
Author: Adam Jackson <ajax@redhat.com>
Date: Mon Feb 26 15:26:35 2018 -0500
glamor: unifdef XORG_VERSION_CURRENT
This is always true now that glamor is in-tree.
Signed-off-by: Adam Jackson <ajax@redhat.com>
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
commit 059879b3edb104014959426f953e1faf103d99ff
Author: Adam Jackson <ajax@redhat.com>
Date: Mon Feb 26 13:58:26 2018 -0500
xquartz: Fix linking with glxvnd
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit 22a3ffe68c9c498e0b6b74ebcf1404becda8e2b1
Author: Michel Dänzer <michel.daenzer@amd.com>
Date: Mon Feb 26 17:30:57 2018 +0100
glx: Don't pass NULL to glxGetClient
These guards were dropped by the commit below, but it turns out they're
needed. Fixes crash on VT switch.
Fixes: d8ec33fe0542 ("glx: Use vnd layer for dispatch (v4)")
Bugzilla: https://bugs.freedesktop.org/105233
Signed-off-by: Michel Dänzer <michel.daenzer@amd.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
commit 528c94c6501db936882cd06338e2250a0b884b36
Author: Adam Jackson <ajax@redhat.com>
Date: Tue Feb 20 11:03:46 2018 -0500
glx: Fix indirect no-config contexts
We would throw BadValue here for the GLX_SCREEN attribute. The upper
dispatch layer already checks this, we can ignore it here.
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit a63ab81f6be7ad46b7e2d98a50aef4da5e664847
Author: Adam Jackson <ajax@redhat.com>
Date: Tue Feb 20 11:03:45 2018 -0500
glx: Enable GLX_ARB_create_context_no_error (v2)
This is mostly for the client library's convenience, if this extension
is listed then it can know the attribute won't be rejected. Note that we
don't honor this attribute for indirect contexts. That's fine, we don't
want to introduce undefined behavior into a potentially privileged
process.
v2: Remember to ignore the attribute (Eric Anholt)
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit 701f3a206d6f71c4754f457e95e2b954cf0b80c7
Author: Adam Jackson <ajax@redhat.com>
Date: Fri Feb 23 16:08:11 2018 -0500
render: Simplify miCompositeRects
Make a solid-fill picture for this instead of a 1x1 pixmap. In principle
the backend can accelerate this directly, and we also get to preserve
all the bits of the fill color.
Signed-off-by: Adam Jackson <ajax@redhat.com>
Reviewed-by: Keith Packard <keithp@keithp.com>
commit 9339fa87d03204b29d47eb8c9406f701517b3514
Author: Adam Jackson <ajax@redhat.com>
Date: Thu Feb 22 16:53:22 2018 -0500
render: Cosmetic cleanup to default format creation
Signed-off-by: Adam Jackson <ajax@redhat.com>
Reviewed-by: Keith Packard <keithp@keithp.com>
commit ddf752eafe951bb9723aabf2579c4725a6ffc9de
Author: Adam Jackson <ajax@redhat.com>
Date: Thu Feb 22 16:53:21 2018 -0500
render: Remove some 24bpp handling
This can't happen anymore.
Signed-off-by: Adam Jackson <ajax@redhat.com>
Reviewed-by: Keith Packard <keithp@keithp.com>
commit efd84bff238f8e12bf652525990d36baada8785b
Author: Peter Harris <pharris@opentext.com>
Date: Thu Feb 22 18:07:38 2018 -0500
composite: Fix use-after-free in compReparentWindow
If an implicitly redirected window is unredirected by the reparent
operation, cw will be a stale pointer.
Signed-off-by: Peter Harris <pharris@opentext.com>
Reviewed-by: Keith Packard <keithp@keithp.com>
commit ac13d740bf14ba8799d4dfbee1f6f99a297dbc7e
Author: Emil Velikov <emil.velikov@collabora.com>
Date: Wed Feb 21 17:12:15 2018 +0000
mi: Mention extension loading in verbose logs
Listing the extensions is useful, despite being annoying for normal
usecases. Print it only when extra (lvl 3) vebose is requested.
v2: Move the logging to InitExtensions(), as requested by Adam.
Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Emil Velikov <emil.velikov@collabora.com>
commit 9237c5e2878c088a6cd26ea380763465a9e67012
Author: Emil Velikov <emil.velikov@collabora.com>
Date: Mon Feb 19 15:18:11 2018 +0000
docs: correct LoadExtensionList() documentation
Add the missing arguments to the function signature.
Fixes: e46820fb897 ("miinitext: introduce LoadExtensionList() to replace
over LoadExtension()")
Signed-off-by: Emil Velikov <emil.velikov@collabora.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
commit 089a1b0f9fa2e80457dc3d5f05c84565c9113a21
Author: Emil Velikov <emil.velikov@collabora.com>
Date: Mon Feb 19 15:18:10 2018 +0000
glx: set the version we implement in GlxServerExports
Set the major/minor version it's currently implemented, not the one
provided by the GLXSERVER_VENDOR_ABI_{MAJOR,MINOR}_VERSION macros.
Those are identical for now, but can change in the future.
Signed-off-by: Emil Velikov <emil.velikov@collabora.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
commit edc00e020310d8f53ebc16295c373fe84ec6ec87
Author: Emil Velikov <emil.velikov@collabora.com>
Date: Mon Feb 19 15:18:09 2018 +0000
glx: use C99 initializers for GlxServerExports
Signed-off-by: Emil Velikov <emil.velikov@collabora.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
commit 7fc757986947ad89d76fc0fd3d69f5fdeefc9055
Author: Emil Velikov <emil.velikov@collabora.com>
Date: Mon Feb 19 15:18:08 2018 +0000
glx: NULL check the correct argument in dispatch_GLXVendorPriv
malloc can return NULL, unlike GetVendorDispatchFunc. The latter
provides DispatchBadRequest.
Signed-off-by: Emil Velikov <emil.velikov@collabora.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
commit 1310241e8d606687811c7394811fe337c3e4de11
Author: Emil Velikov <emil.velikov@collabora.com>
Date: Mon Feb 19 15:18:07 2018 +0000
glx: keep glvnd_vendor a private [static] variable
Signed-off-by: Emil Velikov <emil.velikov@collabora.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
commit a054532668cbbb152d0d7acfcce1e03e884bb491
Author: Jason Ekstrand <jason@jlekstrand.net>
Date: Tue Feb 20 09:41:39 2018 -0800
xwayland: Fix backwards need_rotate logic (v2)
When xdg_output support was added to Xwayland, need_rotate parameter was
added to output_get_new_size where true gave you the old pre-xdg_output
behavior and false gave the new behavior. Unfortunately, the two places
where this is called, need_rotate was set backwards. This caused input
get clampped to the wrong dimensions. Also, the logic for deciding
whether or not to flip was wrong because, if need_rotate was false, it
would always flip which is not what you want.
v2 (Daniel Stone):
- Fix output_get_new_size so that it doesn't flip the dimensions when
need_rotate is false.
Signed-off-by: Jason Ekstrand <jason@jlekstrand.net>
Reviewed-by: Daniel Stone <daniels@collabora.com>
Reviewed-by: Olivier Fourdan <ofourdan@redhat.com>
commit 343ee7d07565a75b90e6489c5c29f772dca79c43
Author: Alexander Volkov <a.volkov@rusbitech.ru>
Date: Tue Feb 20 18:07:18 2018 +0300
Xephyr: Avoid calling xcb_shm_detach() twice
This call was forgotten to be removed in
90996f5909aab4bc9aa4011a6a6d0555a7aa3adf in which
hostx_destroy_shm_segment() was introduced, which
itself does it.
Signed-off-by: Alexander Volkov <a.volkov@rusbitech.ru>
Reviewed-by: Adam Jackson <ajax@redhat.com>
commit 5ba0ba93e127a8c460b013e3c6851dd186377c27
Author: Laurent Carlier <lordheavym@gmail.com>
Date: Sun Feb 18 10:58:35 2018 +0100
meson: Make DGA extension optional
Signed-off-by: Laurent Carlier <lordheavym@gmail.com>
commit e790bc621b8f55489e35b1de260c649d8d105d63
Author: Laurent Carlier <lordheavym@gmail.com>
Date: Sun Feb 18 10:58:34 2018 +0100
dga: #if XFreeXDGA → #ifdef XFreeXDGA
../include/events.h:32:14: error: #if with no expression
Signed-off-by: Laurent Carlier <lordheavym@gmail.com>
commit ce4e20f80ff64a5a8b9f344e2507128f379e0715
Author: Laurent Carlier <lordheavym@gmail.com>
Date: Sun Feb 18 10:58:33 2018 +0100
meson: Make Xv and XvMC extensions optional
Just mimic autoconf file, XvMC can't be enabled without Xv
Signed-off-by: Laurent Carlier <lordheavym@gmail.com>
commit 82d9e99bf99660537a11d9475369c43814cad664
Author: Laurent Carlier <lordheavym@gmail.com>
Date: Sun Feb 18 10:58:32 2018 +0100
meson: Xephyr Requires xcb-shm version 1.9.3 or newer
Sync with commit 8510f542e5474b719f7d7edba7ef0cc05af0271e
Signed-off-by: Laurent Carlier <lordheavym@gmail.com>
commit 272fa1817091117d078a22252a03d3161dfc7b0f
Author: Jeffrey Smith <whydoubt@gmail.com>
Date: Thu Feb 15 23:47:46 2018 -0600
os: avoid uninitialized offsets in backtrace
When xorg_backtrace calls unw_get_proc_name and an error occurs, offset
might not be set for the current frame.
Initialize offset for each frame so that the offset from another frame
cannot be used inadvertently.
Signed-off-by: Jeff Smith <whydoubt@gmail.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
commit 6f9d29040cd9f4723a2e6c1e5d2ec8104efc0710
Author: Jon Turney <jon.turney@dronecode.org.uk>
Date: Fri Feb 16 16:44:37 2018 +0000
hw/xwin: Update for glxvnd
- Link with libglxvnd in meson.build
- Call xorgGlxCreateVendor() like all other DDX
Signed-off-by: Jon Turney <jon.turney@dronecode.org.uk>
commit 500cc4a029efce9b962ab8fbb10da9f87d83372e
Author: Adam Jackson <ajax@redhat.com>
Date: Wed Feb 14 17:21:43 2018 -0500
dmx: warning fix
/home/ajax/git/xserver/at/../hw/dmx/input/dmxinputinit.c: In function ‘dmxInputInit’:
/home/ajax/git/xserver/at/../hw/dmx/input/dmxinputinit.c:1019:9: warning: ISO C90 forbids mixed declarations and code [-Wdeclaration-after-statement]
int found;
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit 9bcddaf9619d01cdbf965cedb9f86a08ed6dc524
Author: Adam Jackson <ajax@redhat.com>
Date: Wed Feb 14 17:20:16 2018 -0500
dri2: warning fix
/home/ajax/git/xserver/at/../glx/glxdri2.c: In function ‘create_driver_context’:
/home/ajax/git/xserver/at/../glx/glxdri2.c:444:5: warning: ISO C90 forbids mixed declarations and code [-Wdeclaration-after-statement]
const __DRIconfig *driConfig = config ? config->driConfig : NULL;
I don't know why autotools has decided not to be C99 but at least it's
trivial to fix.
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit 133bd4443be6b76a36afadfae0905b832e998165
Author: Adam Jackson <ajax@redhat.com>
Date: Wed Jan 10 13:05:48 2018 -0500
glx: Large commands are context state, not client state
There's no reason a multithreaded client shouldn't be allowed to
interleave other requests (for other contexts) with a RenderLarge. Move
the check into __glXForceCurrent, and store the state in the context not
the client.
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit 5d87e4f71355272c8da38c83f493b826623301cc
Author: Adam Jackson <ajax@redhat.com>
Date: Wed Jan 10 13:05:47 2018 -0500
miinitext: Remove separate extension toggle list
This was only separate because GLX was loadable. The frontend is now
linked statically, so we can use the static extension list directly.
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit 67c303fff303f94b62f03a76de97116c6ebcfda9
Author: Adam Jackson <ajax@redhat.com>
Date: Wed Jan 10 13:05:46 2018 -0500
miinitext: Load GLX on the mi path
Add a stub for Xnest so it continues to link, but otherwise we support
GLX on every server so there's no need to make every DDX add it.
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit d8ec33fe0542141aed1d9016d2ecaf52da944b4b
Author: Adam Jackson <ajax@redhat.com>
Date: Wed Jan 10 13:05:45 2018 -0500
glx: Use vnd layer for dispatch (v4)
The big change here is MakeCurrent and context tag tracking. We now
delegate context tags entirely to the vnd layer, and simply store a
pointer to the context state as the tag data. If a context is deleted
while it's current, we allocate a fake ID for the context and move the
context state there, so the tag data still points to a real context. As
a result we can stop trying so hard to detach the client from contexts
at disconnect time and just let resource destruction handle it.
Since vnd handles all the MakeCurrent protocol now, our request handlers
for it can just be return BadImplementation. We also remove a bunch of
LEGAL_NEW_RESOURCE, because now by the time we're called vnd has already
allocated its tracking resource on that XID.
v2: Update to match v2 of the vnd import, and remove more redundant work
like request length checks.
v3: Add/remove the XID map from the vendor private thunk, not the
backend. (Kyle Brenneman)
v4: Fix deletion of ghost contexts (Kyle Brenneman)
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit 8753218beae641e5c5ac2c2ba598cfb99a893cf4
Author: Kyle Brenneman <kbrenneman@nvidia.com>
Date: Wed Jan 10 13:05:44 2018 -0500
glx: Import glxvnd server module (v2)
This is based on an out-of-tree module written by Kyle:
https://github.com/kbrenneman/libglvnd/tree/server-libglx
I (ajax) did a bunch of cosmetic fixes, ported it off xfree86 API,
added request length checks, and fixed a minor bug or two.
v2: Use separate functions to set/get a context tag's private data, and
call the backend's MakeCurrent when a client disconnects to unbind the
context. (Kyle Brenneman)
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit d1fdddeb76328ab84d9a181a5c72b90013f0f0a6
Author: Laurent Carlier <lordheavym@gmail.com>
Date: Tue Feb 13 22:33:51 2018 +0100
meson: Make Security extension optional
Just mimic autoconf file, Security extension needs X-ACE extension
Signed-off-by: Laurent Carlier <lordheavym@gmail.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
commit 43ef94068e072228446484bf58c0624b9b9649ac
Author: Laurent Carlier <lordheavym@gmail.com>
Date: Tue Feb 13 22:33:50 2018 +0100
meson: Make more extensions optional
Just mimic autoconf file for xf86bigfont, screensaver,
xres, xace and xinerama extensions
Signed-off-by: Laurent Carlier <lordheavym@gmail.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
commit 3203dd175bd71ef4d154578165d930eec29afddb
Author: Laurent Carlier <lordheavym@gmail.com>
Date: Tue Feb 13 22:33:49 2018 +0100
meson: Make DPMS extension optional
Just mimic autoconf file, DPMS is disabled with Xquartz
Signed-off-by: Laurent Carlier <lordheavym@gmail.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
commit 2c3e137b786dab4a8002a4934fbcf4ef0742f473
Author: Adam Jackson <ajax@redhat.com>
Date: Wed Feb 14 14:10:44 2018 -0500
dmx: #if PANORAMIX → #ifdef PANORAMIX
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit ceaf4277447407a7430b9bc3205462fbdbae0e39
Author: Adam Jackson <ajax@redhat.com>
Date: Mon Feb 12 15:35:05 2018 -0500
xfixes: Restore monitoring of animated cursors
This was broken by:
commit aa6651f83c698e8cc40de61aad36c73ca7a6adcf
Author: Adam Jackson <ajax@redhat.com>
Date: Thu Jun 8 16:23:12 2017 -0400
xfixes: Remove the CursorCurrent array
As of that change we look up the current cursor dynamically instead of
trying to track every time it's set through ->DisplayCursor. That would
work, except the 'bits' of an animated cursor is a transparent 1x1
pixel. So now, look up whether there's an animated cursor, and use its
current frame if so.
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit 0b7a5700ad3d65e408a2fae00bdee867a8d2e1a8
Author: Adam Jackson <ajax@redhat.com>
Date: Mon Feb 12 15:35:04 2018 -0500
animcur: Change which CursorPtr we save in external state
Formerly spriteInfo->anim.pCursor would point to the animated cursor (or
NULL if not animated). That value would also be available in
spriteInfo->sprite->current, so instead lets use anim.pCursor to point
to the current animation element.
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit 8510f542e5474b719f7d7edba7ef0cc05af0271e
Author: Alexander Volkov <a.volkov@rusbitech.ru>
Date: Wed Feb 7 14:08:50 2018 +0300
Xephyr: Require xcb-shm version 1.9.3 or newer
It's needed for FD-passing.
Signed-off-by: Alexander Volkov <a.volkov@rusbitech.ru>
Reviewed-by: Adam Jackson <ajax@redhat.com>
commit 2ff6eaad85fd702e3cc597c44ccf2210570004ea
Author: Roman Gilg <subdiff@gmail.com>
Date: Fri Feb 9 23:40:42 2018 +0100
Correct xorg_list_is_empty return value description
The helper xorg_list_is_empty returns True when the list is empty and not when
it contains one or more elements.
Signed-off-by: Roman Gilg <subdiff@gmail.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit bebcc8477c8070ade9dd4be7299c718baeab3d7a
Author: Mario Kleiner <mario.kleiner.de@gmail.com>
Date: Mon Feb 5 11:20:41 2018 +0100
glx: Only assign 8 bpc fbconfigs for composite visuals.
Commit 91c42093b248 ("glx: Duplicate relevant fbconfigs for
compositing visuals") adds many new depth 32 fbconfigs as
composite visuals. On a X-Screen running at depth 24, this
also adds bgra 10-10-10-2 fbconigs, as they also have
config.rgbBits == 32, but these are not displayable on a
depth 24 screen, leading to visually corrupted desktops
under some compositors, e.g., fdo bug 104597 "Compton
weird colors" when running compton with
"compton --backend glx".
Be more conservative for now and only select fbconfigs with
8 bpc red, green, blue components for composite visuals.
Fixes: 91c42093b248 ("glx: Duplicate relevant fbconfigs for
compositing visuals")
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=104597
Signed-off-by: Mario Kleiner <mario.kleiner.de@gmail.com>
Reviewed-by: Thomas Hellstrom <thellstrom@vmware.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
commit 98edb9a35e2cdd61355656b82975d7f2b6a9f0e6
Author: Lyude Paul <lyude@redhat.com>
Date: Tue Feb 6 12:41:47 2018 -0500
xwayland: Don't process cursor warping without an xwl_seat
Unfortunately, on my machine Xwayland immediately crashes when I try to
start it. gdb backtrace:
#0 0x00007ffff74f0e79 in wl_proxy_marshal () from target:/lib64/libwayland-client.so.0
#1 0x0000000000413172 in zwp_confined_pointer_v1_destroy (zwp_confined_pointer_v1=0x700000000)
at hw/xwayland/Xwayland@exe/pointer-constraints-unstable-v1-client-protocol.h:612
#2 0x0000000000418bc0 in xwl_seat_destroy_confined_pointer (xwl_seat=0x8ba2a0)
at /home/lyudess/Projects/xserver/hw/xwayland/xwayland-input.c:2839
#3 0x0000000000418c09 in xwl_seat_unconfine_pointer (xwl_seat=0x8ba2a0)
at /home/lyudess/Projects/xserver/hw/xwayland/xwayland-input.c:2849
#4 0x0000000000410d97 in xwl_cursor_confined_to (device=0xa5a000, screen=0x8b9d80, window=0x9bdb70)
at /home/lyudess/Projects/xserver/hw/xwayland/xwayland.c:328
#5 0x00000000004a8571 in ConfineCursorToWindow (pDev=0xa5a000, pWin=0x9bdb70, generateEvents=1,
confineToScreen=0) at /home/lyudess/Projects/xserver/dix/events.c:900
#6 0x00000000004a94b7 in ScreenRestructured (pScreen=0x8b9d80)
at /home/lyudess/Projects/xserver/dix/events.c:1387
#7 0x0000000000502386 in RRScreenSizeNotify (pScreen=0x8b9d80)
at /home/lyudess/Projects/xserver/randr/rrscreen.c:160
#8 0x000000000041a83c in update_screen_size (xwl_output=0x8e7670, width=3840, height=2160)
at /home/lyudess/Projects/xserver/hw/xwayland/xwayland-output.c:203
#9 0x000000000041a9f0 in apply_output_change (xwl_output=0x8e7670)
at /home/lyudess/Projects/xserver/hw/xwayland/xwayland-output.c:252
#10 0x000000000041aaeb in xdg_output_handle_done (data=0x8e7670, xdg_output=0x8e7580)
at /home/lyudess/Projects/xserver/hw/xwayland/xwayland-output.c:307
#11 0x00007ffff50e9d1e in ffi_call_unix64 () at ../src/x86/unix64.S:76
#12 0x00007ffff50e968f in ffi_call (cif=<optimized out>, fn=<optimized out>, rvalue=<optimized out>,
avalue=<optimized out>) at ../src/x86/ffi64.c:525
#13 0x00007ffff74f3d8b in wl_closure_invoke () from target:/lib64/libwayland-client.so.0
#14 0x00007ffff74f0928 in dispatch_event.isra () from target:/lib64/libwayland-client.so.0
#15 0x00007ffff74f1be4 in wl_display_dispatch_queue_pending () from target:/lib64/libwayland-client.so.0
#16 0x00007ffff74f200b in wl_display_roundtrip_queue () from target:/lib64/libwayland-client.so.0
#17 0x0000000000418cad in InitInput (argc=12, argv=0x7fffffffd9c8)
at /home/lyudess/Projects/xserver/hw/xwayland/xwayland-input.c:2867
#18 0x00000000004a20e3 in dix_main (argc=12, argv=0x7fffffffd9c8, envp=0x7fffffffda30)
at /home/lyudess/Projects/xserver/dix/main.c:250
#19 0x0000000000420cb2 in main (argc=12, argv=0x7fffffffd9c8, envp=0x7fffffffda30)
at /home/lyudess/Projects/xserver/dix/stubmain.c:34
This appears to be the result of xwl_cursor_confined_to() and
xwl_screen_get_default_seat(). While not against protocol, mutter ends
up sending xdg_output before wl_seat. xwl_screen_get_default_seat()
makes the naïve assumption that we always have a valid seat, we end up
returning a pointer to the empty list itself instead of an actual seat
and causing ourselves to segfault.
So, actually return NULL in xwl_screen_get_default_seat() if the seat
list is empty, and skip any pointer confinement processing in
xwl_cursor_confined_to() when we don't have a seat setup yet.
Signed-off-by: Lyude Paul <lyude@redhat.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
commit fd21b282dc88936043a23baa4ec053a2811319a7
Author: Jeff Smith <whydoubt@gmail.com>
Date: Sun Feb 4 23:17:54 2018 -0600
xfree86: Only call PreInit handler if it exists for device
DoConfigure() attempts to call the PreInit handler on a device without
checking that the handler exists.
Check that the PreInit handler exists for a device before attempting to
call it.
Signed-off-by: Jeff Smith <whydoubt@gmail.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
commit e81031f3fda0f8b4237224b13c016759eaa52449
Author: Jeff Smith <whydoubt@gmail.com>
Date: Sun Feb 4 23:17:53 2018 -0600
xfree86: Allocate sufficienct space for dev2screen array
When the dev2screen is sized to xf86NumDrivers in DoConfigure(),
subsequent code may attempt to write past the end of the array.
Size the dev2screen array to nDevToConfig instead.
Signed-off-by: Jeff Smith <whydoubt@gmail.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
commit 1a24a0ae7b1a7400735530a21ac8c0247723223d
Author: Jeff Smith <whydoubt@gmail.com>
Date: Sun Feb 4 23:17:52 2018 -0600
xfree86: Do not use uninitialized pointer during probe
Commits b5dffbb and d75ffcd introduce code in xf86platformProbe() that
references a member of xf86configptr. However, when using the
"-configure" option, xf86configptr may not be initialized when
xf86platformProbe() is called.
Avoid referencing a member of xf86configptr if uninitialized.
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=100405
Signed-off-by: Jeff Smith <whydoubt@gmail.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
commit 1e23f03dd5fb6c981ef6d64c084f72fc6820ed71
Author: Jan Beich <jbeich@freebsd.org>
Date: Fri Jul 7 16:31:48 2017 +0200
shm, xwayland: prefer atomic close-on-exec without O_TMPFILE
Signed-off-by: Jan Beich <jbeich@FreeBSD.org>
Reviewed-by: Adam Jackson <ajax@redhat.com>
commit 3e3b8a40fee77d1af6ca0c2946ff276d555ddea8
Author: Michal Srb <msrb@suse.com>
Date: Mon Mar 27 15:03:38 2017 +0300
modesetting: Check for -1 before converting to unsigned int.
dri2.c:516:21: warning: comparison of unsigned expression < 0 is always false [-Wtautological-compare]
if (front->name < 0)
Prevents a failure from being ignored.
commit a9f68688f313752b1c6dfcbf6bf54f8c41fd811d
Author: Michal Srb <msrb@suse.com>
Date: Mon Mar 27 15:03:37 2017 +0300
xfree86: Silence always true condition warning.
xf86pciBus.c:1464:21: warning: comparison of constant 256 with expression of type 'uint8_t' (aka 'unsigned char') is always true [-Wtautological-constant-out-of-range-compare]
if (pVideo->bus < 256)
The code used to be in xf86FormatPciBusNumber and compared parameter which was int, but since b967bf2a it was inlined now it works with uint8_t.
commit b75835a4358065378142691bf4a20140981a410f
Author: Raimonds Cicans <ray@apollo.lv>
Date: Mon Nov 6 15:26:33 2017 +0200
Xdmx: fix input driver initialization code paths
Problem: Xdmx exit with error "(Fatal Error) dmx: Unknown input argument: "
if local input driver is specified (example: -input local,usb-kbd,usb-mou).
Cause: code block for remote input drivers is placed in code path common
for all drivers.
Fix: affected code block moved to remote input driver code path part.
Signed-off-by: Raimonds Cicans <ray@apollo.lv>
Reviewed-by: Adam Jackson <ajax@redhat.com>
commit cbf09619f2355d14c103eff69aaf191cca614c06
Author: Adam Jackson <ajax@redhat.com>
Date: Mon Nov 6 12:56:05 2017 -0500
meson: Get more xkb configuration from xkbcomp.pc
Signed-off-by: Adam Jackson <ajax@redhat.com>
Reviewed-by: Daniel Stone <daniels@collabora.com>
commit 93c16b0524711cd3cd8e32f151c53b5d6522e967
Author: Alexander Volkov <a.volkov@rusbitech.ru>
Date: Fri Feb 2 15:17:15 2018 +0300
Xephyr: Call forgotten XShmDetach if can't mmap SHM segment
Reviewed-by: Adam Jackson <ajax@redhat.com>
commit 6b26a7bda9efa93440734ede0382a3e9a6761365
Author: Alex Goins <agoins@nvidia.com>
Date: Mon Jan 8 18:44:25 2018 -0800
randr: Fix rotation check in ProcRRSetScreenSize()
ProcRRSetScreenSize() does bounds checking to ensure that none of the CRTCs have
a viewport that extends beyond the new screen size. In doing so, it accounts for
if the CRTC is rotated 90 or 270 degrees, swapping width and height.
However, it does so by testing if crtc->rotation is equal to RR_Rotate_90 or
RR_Rotate_270. crtc->rotation is a bit mask, and it includes reflection as well
as rotation. If a CRTC is reflected as well as rotated, it will incorrectly fail
this test, resulting in incorrect dimensions being used to verify the validity
of the new screen size. In some cases, this can cause valid uses of
ProcRRSetScreenSize() to fail with BadMatch.
This patch fixes the issue by testing that the bits RR_Rotate_90 or
RR_Rotate_270 are set, rather than testing for equality.
Signed-off-by: Alex Goins <agoins@nvidia.com>
Reviewed-by: Michel Dänzer <michel.daenzer@amd.com>
commit 90996f5909aab4bc9aa4011a6a6d0555a7aa3adf
Author: Alexander Volkov <a.volkov@rusbitech.ru>
Date: Wed Jan 31 15:36:36 2018 +0300
Xephyr: Prefer using MIT-SHM FD-passing when possible
This makes the shared memory visible only for the Xephyr
and the X server to which it is connected.
Signed-off-by: Alexander Volkov <a.volkov@rusbitech.ru>
Reviewed-by: Keith Packard <keithp@keithp.com>
commit 8a220bd83c3e23de7e07d3976bfc1248c38558d4
Author: Alexander Volkov <a.volkov@rusbitech.ru>
Date: Wed Jan 31 15:36:35 2018 +0300
Xephyr: Extract functions to create/delete shared memory segments
Signed-off-by: Alexander Volkov <a.volkov@rusbitech.ru>
Reviewed-by: Keith Packard <keithp@keithp.com>
commit 510e7d0d869dcc008b1e11e21961f2c1c3cb9cd3
Author: Jeff Smith <whydoubt@gmail.com>
Date: Tue Dec 26 22:10:52 2017 -0600
os: Always return microseconds from GetTimeInMicros()
When a monotonic clock is not available, GetTimeInMicros() returns the
time in nanoseconds. Instead, return the time in microseconds, as the
name indicates.
Signed-off-by: Jeff Smith <whydoubt@gmail.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
commit 94e7ca6a5667eeb13c078496a07d3e6cf1ec95cc
Author: Giuseppe Bilotta <giuseppe.bilotta@gmail.com>
Date: Wed Jan 31 17:33:48 2018 +0100
rrmonitor: allocate using the correct type
Monitor outputs are of type RROutput, not RRCrtc.
(Which are both XID, so this makes no difference in practice, other than
being technically correct.)
Signed-off-by: Giuseppe Bilotta <giuseppe.bilotta@gmail.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
commit ff410c56bfd6dcdf5d252ef0ba3f4c6fde91774b
Author: Jeff Smith <whydoubt@gmail.com>
Date: Fri Jan 26 06:25:22 2018 -0600
glamor: tidy up some gradient color formulas
- Avoid some needlessly complex equations for calculating the color at a
point in a gradient field.
- Avoid calculating certain values multiple times.
- Use similar variable names across the two versions of the get_color
function where practical.
Signed-off-by: Jeff Smith <whydoubt@gmail.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
commit 3bd17dff1ac5a4685a5da92a9982f621effee658
Author: Jeff Smith <whydoubt@gmail.com>
Date: Fri Jan 26 06:25:21 2018 -0600
glamor: remove unused variables in linear gradient shader
Signed-off-by: Jeff Smith <whydoubt@gmail.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
commit 5815c7b5951fd46d69e5c40144b64e516c7afdbf
Author: Jeff Smith <whydoubt@gmail.com>
Date: Fri Jan 26 06:25:20 2018 -0600
glamor: fix no-reflect case for gradients
When compositing a no-reflect gradient, 'before' the gradient is empty,
but 'after' the gradient is padded with the final color. Both sides are
supposed to be empty.
This is fixed by moving the virtual stops to match the first and last
client-supplied stops for no-reflect gradients, then causing everything
'before' the initial virtual stop and 'after' the final virtual stop to
emit rgba(0,0,0,0). This does not impact gradients using the other
reflect modes.
Signed-off-by: Jeff Smith <whydoubt@gmail.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
commit 3e377e238f7257fd01e56a4a25dfd77e033673e4
Author: Jeff Smith <whydoubt@gmail.com>
Date: Fri Jan 26 06:25:19 2018 -0600
glamor: fix repeat-reflect case in linear gradient shader
If _pt_distance is negative, it causes the final distance to be negative
in the repeat-reflect case. Moving the scaling by _pt_distance earlier
avoids this problem, and simplifies some equations as a bonus.
Bugzilla: https://bugs.freedesktop.org/98508
Signed-off-by: Jeff Smith <whydoubt@gmail.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
commit 9b7b8720ebc8028b14796a66d0a21b002682a83c
Author: Jeff Smith <whydoubt@gmail.com>
Date: Sat Jan 27 00:14:02 2018 -0600
edid: use value returned from pruning duplicate modes
xf86PruneDuplicateModes is passed a linked list of modes, and after
pruning the duplicate nodes, the new head of the list is returned. If
the first element is removed, the head of the list will change and the
returned value needs to be assigned.
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=103722
Thanks: John Lumby <johnlumby@hotmail.com>
Signed-off-by: Jeff Smith <whydoubt@gmail.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
commit dd00e5466a0e4ea313d1860824da4123692827ed
Author: Adam Jackson <ajax@redhat.com>
Date: Wed Jan 24 15:40:22 2018 -0500
xfree86: Remove broken RANDR disabling logic (v4)
The only way to get at xf86Info.disableRandR from configuration is
Option "RANDR" "foo" in ServerFlags, which probably nobody is using
seeing as it's not documented. The other way it could be set is if a
screen supports RANDR 1.2, in which case we set it to avoid trying to
use the RANDR 1.1 compat code. If the second screen is not 1.2-aware
then this would mean we don't do RANDR setup on the second screen at
all, which would almost certainly crash the first time you try to do
RANDR operations on the second screen.
Fix that all by deletion, and just check whether the screen already has
RANDR initialized before installing the stub support. If you want to
disable RANDR, use the Extensions section of xorg.conf instead.
v2: Also remove a now entirely pointless log message, telling you to
ignore a line we will no longer print.
v3: Explain the fallback path in InitOutput. (Keith Packard)
v4: Check whether the RANDR private key is initialized before trying to
use it to look up the screen private.
Signed-off-by: Adam Jackson <ajax@redhat.com>
Reviewed-by: Keith Packard <keithp@keithp.com>
commit 9a416a478c1a29d1aa12c394acf21fb1b4a3aca9
Author: Hawking Zhang <Hawking.Zhang@amd.com>
Date: Thu Jan 25 18:03:57 2018 +0100
glamor: Add 30bit RGB color format support
Signed-off-by: Hawking Zhang <Hawking.Zhang@amd.com>
[ Michel Dänzer: Adapt to glamor changes since 1.19 ]
Signed-off-by: Michel Dänzer <michel.daenzer@amd.com>
Acked-by: Alex Deucher <alexander.deucher@amd.com>
commit fc8b7d05e74a6351df56ad8b17216aeb0dcc016b
Author: Olivier Fourdan <ofourdan@redhat.com>
Date: Thu Jan 25 13:43:09 2018 +0100
xwayland: place a manual redirect on windows
Place a manual redirect on windows on xwl_realize_window() and remove
it on xwl_unrealize_window() to avoid the X11 window manager removing
its redirect before Xwayland has unrealized the window (e.g. if the X11
window manager has terminated unexpectedly)
Suggested by Daniel Stone <daniel@fooishbar.org>
Signed-off-by: Olivier Fourdan <ofourdan@redhat.com>
Reviewed-by: Daniel Stone <daniel@fooishbar.org>
commit 3362422e8413dd9f231cfac50ce0a0862525b1bf
Author: Olivier Fourdan <ofourdan@redhat.com>
Date: Wed Jan 24 17:45:37 2018 +0100
xwayland: remove dirty window unconditionally on unrealize
This is a rare occurrence of a crash in Xwayland for which I don't have
the reproducing steps, just a core file.
The backtrace looks as follow:
#0 raise () from /usr/lib64/libc.so.6
#1 abort () from /usr/lib64/libc.so.6
#2 OsAbort () at utils.c:1361
#3 AbortServer () at log.c:877
#4 FatalError () at log.c:1015
#5 OsSigHandler () at osinit.c:154
#6 <signal handler called>
#7 xwl_glamor_pixmap_get_wl_buffer () at xwayland-glamor.c:162
#8 xwl_screen_post_damage () at xwayland.c:514
#9 block_handler () at xwayland.c:665
#10 BlockHandler () at dixutils.c:388
#11 WaitForSomething () at WaitFor.c:219
#12 Dispatch () at dispatch.c:422
#13 dix_main () at main.c:287
The crash is caused by dereferencing “xwl_pixmap->buffer” in
xwl_glamor_pixmap_get_wl_buffer() because “xwl_pixmap” is NULL.
Reason for this is because the corresponding pixmap is from the root
window and xwayland is rootless by default.
This can happen if the window was mapped, redirected, damaged and
unredirected immediately, before the damage is processed by Xwayland.
Make sure to remove the dirty window from the damage list on unrealize
to prevent this from happening.
Credit goes to Adam Jackson <ajax@nwnk.net> and Daniel Stone
<daniel@fooishbar.org> for finding the root cause the issue.
Signed-off-by: Olivier Fourdan <ofourdan@redhat.com>
Reviewed-by: Daniel Stone <daniels@collabora.com>
commit 29a5423abd4bc6cb7bb800924a27b5d90951e408
Author: Jason Gerecke <killertofu@gmail.com>
Date: Tue Nov 7 11:09:44 2017 -0800
xwayland: Support for BTN_STYLUS3 kernel events
BTN_STYLUS3 has been introduced by the Linux 4.15 kernel to report the
status of the third button present on Wacom's new "Pro Pen 3D" stylus.
Treat this button like xf86-input-wacom and send a button 8 event
("navigate back") when received from Wayland.
Signed-off-by: Jason Gerecke <jason.gerecke@wacom.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 71348e99a8e6a95542e483b93839168ca8f51f81
Author: Michal Srb <msrb@suse.com>
Date: Mon Nov 27 09:59:01 2017 +0100
os/inputthread: Force unlock when stopping thread.
The inputthread is kept locked all the time while X server's VT is not active.
If the X server is terminated while not active, it will be stuck forever in
InputThreadFini waiting for the thread to join, but it wouldn't because it is
locked.
Fixes: https://bugs.freedesktop.org/show_bug.cgi?id=103782
Signed-off-by: Michal Srb <msrb@suse.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
commit d5c23b29487d5ff440abf5ed0beb22c00f21e387
Author: Peter Harris <pharris@opentext.com>
Date: Thu Dec 14 12:21:19 2017 -0500
composite: Propagate damagedDescendants when reparented
If a window that is fully covered by an automatic-redirected descendant
(even implicitly, eg. via BackingStores) is reparented, the automatic
updates could be broken if the new parent is not marked as having
damaged descendants.
Fix this issue by propagating the damagedDescendants flag whenever a
window is reparented.
Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Peter Harris <pharris@opentext.com>
commit ac138f9b31b0fba00742edbc3326afe66e28099a
Author: Rinat Ibragimov <ibragimovrinat@mail.ru>
Date: Tue Oct 24 01:43:43 2017 +0300
modesetting: setup colormap
Signed-off-by: Rinat Ibragimov <ibragimovrinat@mail.ru>
Reviewed-by: Michel Dänzer <michel.daenzer at amd.com>
commit 5cb330cd5d887b20351604ac080e8b71a4e28be7
Author: Adam Jackson <ajax@redhat.com>
Date: Wed Jan 24 15:24:00 2018 -0500
Revert "xfree86: Remove broken RANDR disabling logic (v3)"
Tsk. This broke vesa for me, the rrGetScrPriv in InitOutput will crash
if randr's screen private key hasn't been initialized yet. That seems
dumb, but let's not leave it broken.
This reverts commit c08d7c1cdde6a844338ed4c3645b00bf25843a31.
commit c08d7c1cdde6a844338ed4c3645b00bf25843a31
Author: Adam Jackson <ajax@redhat.com>
Date: Tue Jan 23 12:10:52 2018 -0500
xfree86: Remove broken RANDR disabling logic (v3)
The only way to get at xf86Info.disableRandR from configuration is
Option "RANDR" "foo" in ServerFlags, which probably nobody is using
seeing as it's not documented. The other way it could be set is if a
screen supports RANDR 1.2, in which case we set it to avoid trying to
use the RANDR 1.1 compat code. If the second screen is not 1.2-aware
then this would mean we don't do RANDR setup on the second screen at
all, which would almost certainly crash the first time you try to do
RANDR operations on the second screen.
Fix that all by deletion, and just check whether the screen already has
RANDR initialized before installing the stub support. If you want to
disable RANDR, use the Extensions section of xorg.conf instead.
v2: Also remove a now entirely pointless log message, telling you to
ignore a line we will no longer print.
v3: Explain the fallback path in InitOutput. (Keith Packard)
Signed-off-by: Adam Jackson <ajax@redhat.com>
Reviewed-by: Keith Packard <keithp@keithp.com>
commit da8de2a7f6ab52ef52039b0dc9978260232a34a6
Author: Olivier Fourdan <ofourdan@redhat.com>
Date: Thu Sep 7 17:43:16 2017 +0200
xwayland: Add optional xdg-output support
The xdg-output protocol aims at describing outputs in way which is
more in line with the concept of an output on desktop oriented systems.
For now it just features the position and logical size which describe
the output position and size in the global compositor space.
This is however much useful for Xwayland to advertise the output size
and position to X11 clients which need this to configure their surfaces
in the global compositor space as the compositor may apply a different
scale from what is advertised by the output scaling property (to achieve
fractional scaling, for example).
This was added in wayland-protocols 1.10.
Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Olivier Fourdan <ofourdan@redhat.com>
commit 75408f53d4e203e462b2f13ea4b06264f0e59ad2
Author: Michel Dänzer <michel.daenzer@amd.com>
Date: Wed Jan 24 12:28:38 2018 +0100
xf86XvMCScreenInit: Clear pScreenPriv->dixinfo when freeing pAdapt
Fixes double-free later in xf86XvMCCloseScreen, which would generally
cause fireworks.
Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Michel Dänzer <michel.daenzer@amd.com>
commit 76732f498f1e73fb081841a04faf068660f3d5c7
Author: Michel Dänzer <michel.daenzer@amd.com>
Date: Wed Jan 24 11:40:50 2018 +0100
Revert "present: Only send PresentCompleteNotify events to the presenting client"
This reverts commit 5c00e693631475679c1c2504e03177652ec7de28.
It broke the Gallium nine state tracker, which makes PresentPixmap
requests on one display connection and processes the corresponding
events on another one.
The issue that motivated this change is prevented on the client side by
https://cgit.freedesktop.org/mesa/mesa/commit/?id=7b0e8264dd21ae05521d08d41fecd84139401fef
Bugzilla: https://bugs.freedesktop.org/104678
commit f704620e5db8305c54c6b6981657d801dbf6849b
Author: Adam Jackson <ajax@redhat.com>
Date: Wed Jan 10 13:05:43 2018 -0500
glx: Move provider setup interface to glx_extinit.h
Keeps us from needing to add glx/ to the include path everywhere, since
we can't add it to the dix include path because the header file names
conflict with glxproxy.
Signed-off-by: Adam Jackson <ajax@redhat.com>
Reviewed-by: Eric Anholt <eric@anholt.net>
commit c2b2f06aa03fe738301ebaa82f220d9cfed5ab1a
Author: Adam Jackson <ajax@redhat.com>
Date: Wed Jan 10 13:05:42 2018 -0500
miinitext: General cleanup (v2)
This really just wants to be the list of disable booleans and
initialization functions, and nothing else. Stop including the protocol
headers from extinit.h, remove a stray mention of xgl, and move an
XInput declaration to a better place.
v2: A bunch of drivers assume they'll get the DPMS tokens implicitly,
so add it to globals.h.
Signed-off-by: Adam Jackson <ajax@redhat.com>
Reviewed-by: Eric Anholt <eric@anholt.net>
commit 4d5aab66c052795c7f0381a3dfc7293c9a41e441
Author: Keith Packard <keithp@keithp.com>
Date: Thu Dec 21 18:54:39 2017 -0800
xfree86: Disable cursor whenever turning off CRTC during modeset
This makes sure the CRTC's cursor is hidden before we hand the CRTC
over to some other application.
Signed-off-by: Keith Packard <keithp@keithp.com>
Reviewed-by: Michel Dänzer <michel.daenzer@amd.com>
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
commit 29f79bedf2c80241ba4b482db6ead08a5709a982
Author: Keith Packard <keithp@keithp.com>
Date: Thu Dec 21 18:54:37 2017 -0800
randr: Declare incoming property values const
RRChangeOutputProperty and RRConfigureOutputProperty should not modify
their parameters, and callers may want to pass pointers to fixed data,
so declare the value pointers as const in both cases.
Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit a12485ed846b852ca14d17d1e58c8b0f2399e577
Author: Keith Packard <keithp@keithp.com>
Date: Thu Dec 21 18:54:34 2017 -0800
xf86-video-modesetting: Update property values at detect and uevent time
We were updating the link-status property when a uevent came in, but
we also want to update the non-desktop property, and potentially
others as well. We also want to check at detect time in case we don't
get a hotplug event.
This patch updates every property provided by the kernel, sending
changes to DIX so it can track things as well.
Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 44d5f2eb8a2f92571698adec39ac569b71da5a1b
Author: Keith Packard <keithp@keithp.com>
Date: Thu Dec 21 18:54:33 2017 -0800
xf86-video-modesetting: Support new vblank kernel API [v2]
drmCrtcGetSequence returns the current vblank sequence and time.
drmCrtcQueueSequence queues an event for delivery at a specified
vblank sequence.
Use these (when available) in preference to drmWaitVBlank.
v2: Remove FIRST_PIXEL_OUT_FLAG. This has been removed from the kernel
API.
Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 627dfc2f836a3a1fc6afbd3f2335f88f5ca55ffd
Author: Adam Jackson <ajax@redhat.com>
Date: Mon Jan 22 15:43:05 2018 -0500
automake: Fix 'make distcheck'
Add some missing meson.builds to the distball, and update the meson
build test to work when the distcheck srcdir != builddir. The test build
directory will be $(srcdir)/_distcheck_build so srcdir will need to be
writable; this shouldn't be too much to ask I hope.
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit 2d29daf4c69385513a322002570ec2c41cfc838f
Author: Jon Turney <jon.turney@dronecode.org.uk>
Date: Thu Jan 18 16:18:12 2018 +0000
meson.build: Fix hw/xwin build when dependencies are installed in a non-default location
Signed-off-by: Jon Turney <jon.turney@dronecode.org.uk>
Reviewed-by: Eric Anholt <eric@anholt.net>
commit 514d2c243e01b114de304ea72226bbf8772b1b11
Author: Jon Turney <jon.turney@dronecode.org.uk>
Date: Wed Jan 17 13:43:47 2018 +0000
meson: Use and prefer tirpc for Secure RPC authentication
Reviewed-by: Adam Jackson <ajax@redhat.com>
commit f72587ecc7e1dedfb20a999a0e600b83c06a1b29
Author: Pekka Paalanen <pekka.paalanen@collabora.co.uk>
Date: Wed Dec 20 13:18:45 2017 +0200
xwayland: reduce over-damage
If an X11 app draws a little here, some there, and a tiny bit in the
opposite corner, using RegionExtents for the damage to be sent to the
Wayland compositor will cause massive over-damaging.
However, we cannot blindly send an arbitrary number of damage
rectangles, because there is a risk of overflowing the Wayland
connection. If that happens, it triggers an abort in libwayland-client.
Try to be more accurate with the damage by sending up to 256 rectangles
per window, and fall back to extents otherwise. The number is completely
arbitrary.
Signed-off-by: Pekka Paalanen <pekka.paalanen@collabora.co.uk>
Reviewed-by: Daniel Stone <daniels@collabora.com>
commit a5e9bcad7ad0887f804905b482894b85751519fb
Author: Martin Wilck <mwilck@suse.com>
Date: Tue Jan 9 20:33:09 2018 +0100
xfree86: add default modes for 16:9 and 16:10
Improve the user experience for users with wide screens by adding standard
16:9 and 16:10 modes to extramodes, as suggested previously
(https://lists.x.org/archives/xorg-devel/2016-February/048866.html).
Tested successfully on my laptop. Feedback welcome.
See also https://bugs.freedesktop.org/show_bug.cgi?id=37858.
Signed-off-by: Martin Wilck <mwilck@suse.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
commit 528cf6fcee1839cb829652a49c1b1bf45d6a37fb
Author: David Weinehall <david.weinehall@linux.intel.com>
Date: Thu Jan 18 15:12:46 2018 +0200
sync: Fix diffgreater comparison
xsync: Fix diffgreater comparison
While transitioning from CARD64 to int64,
the GreaterThan call was mistakenly transformed into ">=".
Part of this was fixed already in
commit 8060196a3e80a3c0ad2c0abbe459416821cd366c
This patch fixes the remaining issue.
Signed-off-by: David Weinehall <david.weinehall@linux.intel.com>
Reviewed-by: Keith Packard <keithp@keithp.com>
commit 32b42627217917337553121191e9bc3b423b8d99
Author: Keith Packard <keithp@keithp.com>
Date: Tue Jan 16 11:44:37 2018 -0800
modesetting: Use seq instead of msc in ms_queue_vblank failure path
When the call to queue a vblank event fails, we need to clean up by
removing the user-space queue entry. That is indexed by the local
sequence number, not by the kernel vblank count. The call in this
case was just passing the wrong value.
Signed-off-by: Keith Packard <keithp@keithp.com>
Reviewed-by: Eric Anholt <eric@anholt.net>
commit 15d91df47424127b9e8d0d73692e2196c79dd3fe
Author: Adam Jackson <ajax@redhat.com>
Date: Wed Jan 10 12:07:41 2018 -0500
x86emu: Teach the debug code about varargs
With -Wformat-nonliteral and a debug build you'd get yelled at here:
../hw/xfree86/x86emu/x86emu/debug.h:188:9: warning: format not a string literal, argument types not checked [-Wformat-nonliteral]
To fix this, rewrite the printf code to actually use varargs and the
appropriate format attribute. All callers of DECODE_PRINTF() pass a
string with no % specifiers, so we pass that as the argument to
printf("%s"). For DECODE_PRINTF2() we just pass the args through.
Signed-off-by: Adam Jackson <ajax@redhat.com>
Reviewed-by: Eric Anholt <eric@anholt.net>
commit 1274015186a8457c38c3b5dcc9965c62f1d2a7a6
Author: Adam Jackson <ajax@redhat.com>
Date: Mon Jan 8 15:50:29 2018 -0500
build: Remove <*dbm.h> checks
Formerly used by the rgb database code, which hasn't been a thing in
over a decade.
Reviewed-by: Eric Anholt <eric@anholt.net>
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit c3fbe2bbff19c67179f52b8dcd27b576a958fde7
Author: Adam Jackson <ajax@redhat.com>
Date: Mon Jan 8 15:50:28 2018 -0500
meson: Enable SUN-DES-1 auth code
Signed-off-by: Adam Jackson <ajax@redhat.com>
Reviewed-by: Eric Anholt <eric@anholt.net>
commit 4d82a150b2ee29c1025408cdb9ece255452a81bd
Author: Adam Jackson <ajax@redhat.com>
Date: Tue Jan 9 11:48:10 2018 -0500
animcur: Handle allocation failure for the animation timer
Signed-off-by: Adam Jackson <ajax@redhat.com>
Reviewed-by: Aaron Plattner <aplattner@nvidia.com>
Tested-by: Aaron Plattner <aplattner@nvidia.com>
commit de60245e05c0d2528d4ff42557a044387e53315c
Author: Adam Jackson <ajax@redhat.com>
Date: Tue Jan 9 10:54:05 2018 -0500
animcur: Fix transitions between animated cursors
We weren't cancelling the old timer when changing cursors, making things
go all crashy. Logically we could always cancel the timer first, but
then we'd have to call TimerSet to re-arm ourselves, and GetTimeInMillis
is potentially expensive.
Reported-by: https://devtalk.nvidia.com/default/topic/1028172/linux/titan-v-ubuntu-16-04lts-and-387-34-driver-crashes-badly/post/5230967/#5230967
Signed-off-by: Adam Jackson <ajax@redhat.com>
Reviewed-by: Aaron Plattner <aplattner@nvidia.com>
Tested-by: Aaron Plattner <aplattner@nvidia.com>
commit a09fbe6c82efc674fc3790c7ffad7df70866a7df
Author: Adam Jackson <ajax@redhat.com>
Date: Wed Dec 13 11:44:38 2017 -0500
glx: Stop printing messages about what GLX extensions we enable
glxinfo already exists, use it.
Signed-off-by: Adam Jackson <ajax@redhat.com>
Reviewed-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Emil Velikov <emil.velikov@collabora.com>
commit 4ed8d5c9463cbef0693d98eb9faf7f9c2222c383
Author: Adam Jackson <ajax@redhat.com>
Date: Tue Nov 14 15:33:54 2017 -0500
ddc: Port some paranoia from drm_edid.c
Avoid adding a "standard" mode timing if we've already got a matching
detailed timing. To help with that, parse CEA blocks for detailed
timings before doing standard or established timings.
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit 652913cd9474946bcb29271602bacfd98f46ad0b
Author: Adam Jackson <ajax@redhat.com>
Date: Wed Dec 13 14:53:56 2017 -0500
os: Fix a type error in the IPv6 XDMCP code
Building with strict-aliasing rightly chirps here:
../os/xdmcp.c: In function ‘XdmcpRegisterConnection’:
../os/xdmcp.c:489:31: warning: dereferencing type-punned pointer will break strict-aliasing rules [-Wstrict-aliasing]
&((struct sockaddr_in6 *) &address)->sin6_addr.s6_addr[12];
^~~~~~~~~~~~
We have "const char *address", so &address here is a char ** (i.e., it
points to the slot on the stack containing the pointer to the character
array passed in as an argument). Casting that to a struct sockaddr_in6 *
is wrong, because it means that area of the stack will be reinterpreted
as a struct sockaddr_in6.
Instead, cast address, not &address.
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit da4ffb2f6a0b5a039ae1362ae71e9b47441f90d2
Author: Jon Turney <jon.turney@dronecode.org.uk>
Date: Fri Dec 22 18:44:01 2017 +0000
meson: Correct the option for disabled int10 from 'disabled' to 'false'
Fix meson_option.txt to align with the check of the int10 option against
'disabled', not 'false' in hw/xfree/meson.build, to see if it shouldn't be
built at all.
This keeps everything consistent that 'false' always turns things off.
Not noticed before as options weren't validated against choices until meson
0.43
Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Jon Turney <jon.turney@dronecode.org.uk>
commit c601c8faf54ff9e3bcbc653421828d71042deef7
Author: Helmut Grohne <helmut@subdivi.de>
Date: Thu Dec 21 11:48:15 2017 +0100
build: guess availability of monotonic clock for cross compilation
When cross compiling, the value of MONOTONIC_CLOCK would be "cross
compiling", because AC_RUN_IFELSE doesn't work. However when enabling
wayland, a monotonic clock is required and configure aborts.
We change detection of CLOCK_MONOTONIC to degrade it gracefully from a
run check to a declaration check in case of cross compilation based on
the assumption that most systems will have a monotonic clock and those
that don't won't be able to run Xwayland anyway. The trade-off
essentially is either "always fail cross compilation" or "produce an
unusable Xwayland for unusual platform" and this commit switches to the
latter.
Signed-off-by: Helmut Grohne <helmut@subdivi.de>
Bug-Debian: https://bugs.debian.org/882531
Reviewed-by: Adam Jackson <ajax@redhat.com>
commit a309323328d9d6e0bf5d9ea1d75920e53b9beef3
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri Jan 5 11:58:42 2018 +1000
config: fix NULL value detection for ID_INPUT being unset
Erroneous condition caused us to keep going with all devices that didn't have
ID_INPUT set.
Fixes: 5aad81445c8c3d6
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=104382
Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit dbfbe58b94ec07a45fd6170f96bffec55051724e
Author: Corentin Rossignon <corentin.rossignon@gmail.com>
Date: Thu Jan 4 08:34:01 2018 +0100
glamor: Specify GLSL version for xv shader
SAMPLE is a GLSL keyword in newer OpenGL version.
This fix issue with gnome-shell and playing video using xv
Signed-off-by: Corentin Rossignon <corentin.rossignon@gmail.com>
Bugzilla: https://bugs.freedesktop.org/104405
Reviewed-by: Adam Jackson <ajax@redhat.com>
commit ab54bc295cd05281e55bd4d9c37216c0a929fc83
Author: Adam Jackson <ajax@redhat.com>
Date: Thu Oct 26 15:33:14 2017 -0400
animcur: Stop tracking the last display time in the SpriteInfoRec
Reviewed-by: Robert Morell <rmorell@nvidia.com>
Tested-by: Robert Morell <rmorell@nvidia.com>
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit 094a63d56fbfb9e23210cc9ac538fb198af37cee
Author: Adam Jackson <ajax@redhat.com>
Date: Thu Oct 26 15:24:39 2017 -0400
animcur: Run the timer from the device, not the screen
This is very slightly more efficient since the callback now doesn't need
to walk every input device, instead we know exactly which device's
cursor is being updated. AnimCurTimerNotify() gets outdented nicely as a
result. A more important side effect is that we can stop using the
TimerAbsolute mode and just pass in the relative delay.
In AnimCurSetCursorPosition, we no longer need to rearm the timer with
the new screen; it is enough to update the device's state. In
AnimCurDisplayCursor we need to notice when we're switching from
animated cursor to regular and cancel the existing timer.
Reviewed-by: Robert Morell <rmorell@nvidia.com>
Tested-by: Robert Morell <rmorell@nvidia.com>
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit cc3241a712684f8c7147f5688e9ee3ecb5a93b87
Author: Adam Jackson <ajax@redhat.com>
Date: Thu Oct 26 13:53:06 2017 -0400
animcur: Return the next interval directly from the timer callback
If the return value is non-zero here, DoTimer() will automatically rearm
the timer for the new (relative) delay. 'soonest' is in absolute time,
so subtract off 'now' and return that.
Reviewed-by: Robert Morell <rmorell@nvidia.com>
Tested-by: Robert Morell <rmorell@nvidia.com>
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit 3abbdb7318018584a27220737bd92081ce8ee67c
Author: Adam Jackson <ajax@redhat.com>
Date: Thu Oct 26 13:40:57 2017 -0400
animcur: Use fixed-size screen private
Reviewed-by: Robert Morell <rmorell@nvidia.com>
Tested-by: Robert Morell <rmorell@nvidia.com>
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit f615cb62d47cb24ea31718e8226df53ce6651c91
Author: Lukáš Krejčí <lskrejci@gmail.com>
Date: Sat Dec 30 23:46:45 2017 +0100
Xorg.wrap: Ensure correct ordering of post-install hook
The install rule of Xorg.wrap is currently a dependency of the
install-data target instead of the install-exec target. The build also
uses install-exec-hook to change the ownership and set the SUID bit on
the Xorg.wrap binary. The problem is that install-exec-hook is only
ordered respective to the install-exec target, the rules of install-data
may or may not have been executed.
If install-exec-hook runs before the Xorg.wrap binary is in place,
a message similar to the following will be present in the build log:
chown: cannot access '/pkgdir/usr/lib/xorg-server/Xorg.wrap': No such file or directory
make[6]: [Makefile:1151: install-exec-hook] Error 1 (ignored)
All that needs to be done is to change the name of the program variable
to contain 'exec' for the install rule to depend on the install-exec
target.
Excerpt from the Automake manual, chapter 12.2 The Two Parts of Install:
"Any variable using a user-defined directory prefix with ‘exec’ in the
name (e.g., myexecbin_PROGRAMS) is installed by install-exec. All other
user-defined prefixes are installed by install-data."
https://bugs.freedesktop.org/show_bug.cgi?id=104419
Signed-off-by: Lukáš Krejčí <lskrejci@gmail.com>
Acked-by: Hans de Goede <hdegoede@redhat.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 170c95978530f6373bdf4488116902b273f3abf4
Author: Olivier Fourdan <ofourdan@redhat.com>
Date: Fri Dec 15 16:43:47 2017 +0100
xwayland: avoid race condition on new keymap
When the Wayland compositor notifies of a new keymap, for the first X11
client using the keyboard, the last slave keyboard used might still not
be set (i.e. “lastSlave” is still NULL).
As a result, the new keymap is not applied, and the first X11 window
will have the wrong keymap set initially.
Apply the new keymap to the master keyboard as long as there's one.
Bugzilla: https://bugzilla.gnome.org/show_bug.cgi?id=791383
Signed-off-by: Olivier Fourdan <ofourdan@redhat.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit c72049530503ebde493cfcd22156105557ea18d3
Author: Konstantin Kharlamov <Hi-Angel@yandex.ru>
Date: Sun Dec 17 23:23:02 2017 +0300
modesetting: simplify bailing on calloc fail
The "done" label restores crtc-> {x,y,rotation,mode}, frees output_id.
Doing the calloc() before writing to those values frees us from
necessity to restore them if calloc fails, and allows to merge
"if (mode)" block.
Signed-off-by: Konstantin Kharlamov <Hi-Angel@yandex.ru>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit c2954b16c8730c7ed8441fd8dba25900f3aed265
Author: Tapani Pälli <tapani.palli@intel.com>
Date: Tue Nov 28 09:23:29 2017 +0200
glx: do not pick sRGB config for 32-bit RGBA visual
This fixes blending issues seen with kwin and gnome-shell when
32bit visual has sRGB capability set.
Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Tapani Pälli <tapani.palli@intel.com>
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=103699
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=103646
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=103655
commit cf7517675d988c2d1ff967d6d162a17acbdad466
Author: Keith Packard <keithp@keithp.com>
Date: Wed Aug 2 21:34:52 2017 -0700
xfree86: Hold input_lock across SPRITE functions in VGA arbiter
Avoid scrambling the sprite functions wrapper.
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=101995
Signed-off-by: Keith Packard <keithp@keithp.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
commit 3265d0c81f7a501258fa91e49fcc137714b4af5e
Author: Jon Turney <jon.turney@dronecode.org.uk>
Date: Tue Oct 10 13:43:40 2017 +0100
meson: Add dependency on generated code fragments in hw/xwin/glx/
Somehow I'd managed to write this with this dependency missing, so this only
works correctly when the generated files already exist and the correct
automatic dependencies generated, but fails on a clean build.
Including generated files with a .c extension into the sources for a target
causes meson to want to compile them (and it seems to be hard to say "make
the directory containing this generated file available to include").
So, change the extension of included generated C fragments to .ic
Update the autotools build to align.
Signed-off-by: Jon Turney <jon.turney@dronecode.org.uk>
commit edda951fa5145a50915611ee0e9e459074117700
Author: Peter Harris <pharris@opentext.com>
Date: Thu Oct 12 16:48:37 2017 -0400
os: Add epoll-like port implementation for Solaris
x11perf -noop with 200 xlogos connected is slightly faster with ports:
before after Operation
---------- ----------------- --------------------
18400000.0 19200000.0 (1.04) X protocol NoOperation
Acked-by: Keith Packard <keithp@keithp.com>
Signed-off-by: Peter Harris <pharris@opentext.com>
commit 83c04ee6eae1edc80528203fb515425108171cd8
Author: Peter Harris <pharris@opentext.com>
Date: Thu Oct 12 16:48:36 2017 -0400
os: Add epoll-like pollset implementation for AIX
AIX's poll only allows FD_SETSIZE entries in the fd list, which is
insufficient for expanded MaxClients.
As a bonus, x11perf -noop with ~250 xlogos connected is slightly faster
with pollset:
before after Operation
--------- ---------------- --------------------
5750000.0 5990000.0 (1.04) X protocol NoOperation
Signed-off-by: Peter Harris <pharris@opentext.com>
Acked-by: Keith Packard <keithp@keithp.com>
commit bed28300999a07514d741abe5c748adf234e18a6
Author: Adam Jackson <ajax@redhat.com>
Date: Mon Nov 20 15:43:07 2017 -0500
kdrive: remove KdSignalWrapper etc.
This no longer does anything useful.
Signed-off-by: Adam Jackson <ajax@redhat.com>
Reviewed-by: Olivier Fourdan <ofourdan@redhat.com>
Reviewed-by: Dave Airlie <airlied@redhat.com>
commit 4353d83f60766824a65f183716616eee8e17bb24
Author: Adam Jackson <ajax@redhat.com>
Date: Mon Nov 20 15:43:06 2017 -0500
xfree86: remove xf86CaughtSignal etc.
This no longer does anything useful.
Signed-off-by: Adam Jackson <ajax@redhat.com>
Reviewed-by: Olivier Fourdan <ofourdan@redhat.com>
Reviewed-by: Dave Airlie <airlied@redhat.com>
commit 9c72887939f319e185d2726d9d9a4191b9d12efd
Author: Adam Jackson <ajax@redhat.com>
Date: Mon Nov 20 15:43:05 2017 -0500
os: Make OsSignalHandler ask for core dumps for signo != SIGQUIT
SIGQUIT is a normal termination request, but any other signal we handle
here wants a core. This has the effect of making FatalError's call to
AbortServer trigger the
if (CoreDump)
OsAbort();
path. This will allow us to remove some DDX code that has the same net
effect.
Signed-off-by: Adam Jackson <ajax@redhat.com>
Reviewed-by: Olivier Fourdan <ofourdan@redhat.com>
Reviewed-by: Dave Airlie <airlied@redhat.com>
commit 0a255dceb79ee28a88667d5bd23cf989dbf9bed8
Author: Adam Jackson <ajax@redhat.com>
Date: Mon Nov 20 15:43:04 2017 -0500
xfree86: Remove xf86InterceptSignals
The only consumer of this is the Linux vm86 backend for int10 (which you
should not use), and there all it serves to do is make signals generated
by the vm86 task non-fatal. In practice this error appears never to
happen, and marching ahead with root privileges after arbitrary code has
raised a signal seems like a poor plan.
Remove the usage in the vm86 code, making this error fatal.
Signed-off-by: Adam Jackson <ajax@redhat.com>
Reviewed-by: Olivier Fourdan <ofourdan@redhat.com>
Reviewed-by: Dave Airlie <airlied@redhat.com>
commit 722c8035dcf3ae0b18841066fe4ee030277274bc
Author: Adam Jackson <ajax@redhat.com>
Date: Mon Nov 20 15:43:03 2017 -0500
xfree86: Remove xf86InterceptSigIll
This was added in ~2004 for the sis driver, to detect whether it could
use SSE for memcpy. Charmingly, the code to check whether that feature
exists in the server is:
#if XORG_VERSION_CURRENT >= XORG_VERSION_NUMERIC(6,8,99,13,0)
#define SISCHECKOSSSE /* Automatic check OS for SSE; requires SigIll facility */
#endif
Which means it has never worked in any modular server release.
A less gross way to do this is to check for SSE support with getauxval()
or /proc/cpuinfo or similar. Since no driver is using the existing
intercept mechanism, drop it.
Signed-off-by: Adam Jackson <ajax@redhat.com>
Reviewed-by: Olivier Fourdan <ofourdan@redhat.com>
Reviewed-by: Dave Airlie <airlied@redhat.com>
commit fe46cbea0f19959d469ca4d1f09be379dc7b1e45
Author: Olivier Fourdan <ofourdan@redhat.com>
Date: Tue Nov 21 14:45:13 2017 +0100
xwayland: Give up “cleanly“ on Wayland socket errors
Xwayland is a pretty standard Wayland client, we want to be able to
capture core dumps on crashes.
Yet using "-core" causes any FatalError() to generate a core dump,
meaning that we would get a core file for all Wayland server crashes,
which would generate a lot of false positives.
Instead of using FatalError() on Wayland socket errors, give up cleanly
to avoid dumping core files when "-core" is used.
See also: https://bugzilla.gnome.org/show_bug.cgi?id=790502
and: https://bugzilla.gnome.org/show_bug.cgi?id=789086
Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Olivier Fourdan <ofourdan@redhat.com>
commit 6883ae43eb72fe4e2651c1dca209563323fad2db
Author: Tomasz Śniatowski <kailoran@gmail.com>
Date: Wed Dec 6 12:16:17 2017 +0100
os: Fix strtok/free crash in ComputeLocalClient
Don't reuse cmd for strtok output to ensure the proper pointer is
freed afterwards.
The code incorrectly assumed the pointer returned by strtok(cmd, ":")
would always point to cmd. However, strtok(str, sep) != str if str
begins with sep. This caused an invalid-free crash when running
a program under X with a name beginning with a colon.
Fixes: https://bugs.freedesktop.org/show_bug.cgi?id=104123
Signed-off-by: Tomasz Śniatowski <kailoran@gmail.com>
Reviewed-by: Michel Dänzer <michel.daenzer@amd.com>
commit aa6651f83c698e8cc40de61aad36c73ca7a6adcf
Author: Adam Jackson <ajax@redhat.com>
Date: Thu Jun 8 16:23:12 2017 -0400
xfixes: Remove the CursorCurrent array
We're not wrapping all the ways a cursor can be destroyed, so this array
ends up with stale data. Rather than try harder to wrap more code paths,
just look up the cursor when we need it.
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit 3db7707df3cfd8ba62c10d08c7c731ec18ea8ddf
Author: Adam Jackson <ajax@redhat.com>
Date: Wed Dec 6 15:12:20 2017 -0500
test: Fix build dependency for bigreq test
libxcb-xinput isn't a thing in whichever Ubuntu it is that Travis is
using. The test is already optional, make it more so.
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit 9f7a9be13d6449c00c86d3035374f4f543654b3f
Author: Olivier Fourdan <ofourdan@redhat.com>
Date: Tue Dec 5 09:59:06 2017 +0100
dix: avoid deferencing NULL PtrCtrl
PtrCtrl really makes sense for relative pointing device only, absolute
devices such as touch devices do not have any PtrCtrl set.
In some cases, if the client issues a XGetPointerControl() immediatlely
after a ChangeMasterDeviceClasses() copied the touch device to the VCP,
a NULL pointer dereference will occur leading to a crash of Xwayland.
Check whether the PtrCtrl is not NULL in ProcGetPointerControl() and
return the default control values otherwise, to avoid the NULL pointer
dereference.
Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=1519533
Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Olivier Fourdan <ofourdan@redhat.com>
commit 60f4646ae10f0b57790fce46682baa531512b53e
Author: Carlos Garnacho <carlosg@gnome.org>
Date: Mon Dec 4 16:55:13 2017 +0100
xwayland: Keep separate variables for pointer and tablet foci
The tablet/stylus interfaces reused xwl_seat->focus_window, which
would leave a somewhat inconsistent state of that variable for
wl_pointer purposes (basically, everything) if the pointer happened
to lay on the same surface than the stylus while proximity_out
happens.
We just want the stylus xwl_window to correctly determine we have
stylus focus, and to correctly translate surface-local coordinates
to root coordinates, this can be done using a different variable.
Signed-off-by: Carlos Garnacho <carlosg@gnome.org>
Acked-by: Jason Gerecke <jason.gerecke@wacom.com>
Tested-by: Olivier Fourdan <ofourdan@redhat.com>
commit 97ac59b1ed3624f7c04e54dd3e3dadfa46a8f170
Author: Olivier Fourdan <ofourdan@redhat.com>
Date: Wed Sep 27 18:01:01 2017 +0200
xwayland: Fix non-argb cursor conversion
From the bug: "What happens if bits->width is less than 8? :)"
Fixes: https://bugs.freedesktop.org/show_bug.cgi?id=103012
Signed-off-by: Olivier Fourdan <ofourdan@redhat.com>
Reviewed-by: Emil Velikov <emil.velikov@collabora.com>
Reviewed-by: Daniel Stone <daniels@collabora.com>
commit a4c1e290824d0e40191ad26019b705f61c11e113
Author: Adam Jackson <ajax@redhat.com>
Date: Tue Nov 14 15:15:03 2017 -0500
glx: Implement GLX_EXT_no_config_context (v2)
Only enabled for the DRI backends at the moment. In principle WGL/CGL
could support this - it's sort of implied by GL 3.0 support - but in
practice their implementations back GLX drawables with native drawables
(and not anonymous FBOs), so they would need either a corresponding
window system binding extension or significant implementation work.
v2: Require that the two screen numbers match, per v4 of spec.
Khronos: https://github.com/KhronosGroup/OpenGL-Registry/pull/102
Signed-off-by: Adam Jackson <ajax@redhat.com>
Reviewed-by: Eric Anholt <eric@anholt.net>
commit f0fffa926a5771e0e604fe9a48178b0514ca5d41
Author: Adam Jackson <ajax@redhat.com>
Date: Tue Nov 14 15:15:02 2017 -0500
glx: Prepare __glXGetDrawable for no-config contexts
Any proper (GLX 1.3) drawable will already have a bound config, but if
we're doing the GLX 1.2 thing of making a Window current, we need to
infer the config from the window's Visual.
Signed-off-by: Adam Jackson <ajax@redhat.com>
Reviewed-by: Eric Anholt <eric@anholt.net>
commit 5d667df6ea1634191a26f9a7c26bc883701d62b0
Author: Adam Jackson <ajax@redhat.com>
Date: Tue Nov 14 15:15:01 2017 -0500
glx: Fix glXQueryContext for GLX_FBCONFIG_ID and GLX_RENDER_TYPE (v2)
Just never filled in, oops. Seems to have gone unnoticed because
normally glXQueryContext simply returns the values filled in by the
client library when the context was created. The only path by which you
normally get to a GLXQueryContext request is glXImportContext, and then
only if the context is already indirect.
However, that's a statement about Mesa's libGL (and anything else that
inherited that bit of the SGI SI more or less intact). Nothing prevents
a mischeivous client from issuing that request of a direct context, and
if they did we'd be in trouble because we never bothered to preserve the
associated fbconfig in the context state, so we'd crash looking up
GLX_VISUAL_ID_EXT. So let's fix that too.
v2: Fixed missing preservation of the config in DRI2 (Eric Anholt)
Signed-off-by: Adam Jackson <ajax@redhat.com>
Reviewed-by: Eric Anholt <eric@anholt.net>
commit 78b2ce1410dda758537d52398223ca9b757883bc
Author: Daniel Martin <consume.noise@gmail.com>
Date: Mon Nov 20 10:47:43 2017 +0100
modesetting: Remove #if 0 CMAP_LOAD_EVEN_IF_OFFSCREEN
CMAP_LOAD_EVEN_IF_OFFSCREEN has been encapsulated since the import of
xf86-video-modesetting into the tree.
Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Daniel Martin <consume.noise@gmail.com>
commit d563443381142fbc0b102422d7e7389bf3621331
Author: Daniel Martin <consume.noise@gmail.com>
Date: Mon Nov 20 10:47:42 2017 +0100
modesetting: Remove unused define DRV_ERROR
Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Daniel Martin <consume.noise@gmail.com>
commit 6804875662363764683a86c1614e4cf3cc70a20a
Author: Daniel Martin <consume.noise@gmail.com>
Date: Mon Nov 20 10:47:41 2017 +0100
modesetting: Reset output_id if drmModeGetConnector failed
If drmModeGetConnector() fails in drmmode_output_detect(), we have to
reset the output_id to -1 too.
Yet another spot leading to a potential NULL dereference when handling
the mode_output member as output_id was != -1. Though, this case should
be very hard to hit.
Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Daniel Martin <consume.noise@gmail.com>
commit e20b1016de22e893d5468960988ddd5677c11d98
Author: Daniel Martin <consume.noise@gmail.com>
Date: Mon Nov 20 10:47:40 2017 +0100
modesetting: Fix log msg if pixmap creation failed
Add a missing new-line character and make the message more verbose than
"Failed".
Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Daniel Martin <consume.noise@gmail.com>
commit 02981fe1a844e101c81037df79fc147f217f3bf9
Author: Daniel Martin <consume.noise@gmail.com>
Date: Mon Nov 20 10:47:39 2017 +0100
xfree86: Fix set but not used warnings in lnx_platform
Those warnings are generated, when building without systemd support:
../hw/xfree86/os-support/linux/lnx_platform.c: In function ‘get_drm_info’:
../hw/xfree86/os-support/linux/lnx_platform.c:29:16: warning: variable ‘minor’ set but not used [-Wunused-but-set-variable]
int major, minor, fd;
^~~~~
../hw/xfree86/os-support/linux/lnx_platform.c:29:9: warning: variable ‘major’ set but not used [-Wunused-but-set-variable]
int major, minor, fd;
^~~~~
In this case the functions are macros, which don't use theese arguments.
v2: Add comments, why the warnings appear. Suggested by Emil Velikov
Reviewed-by: Emil Velikov <emil.velikov@collabora.com>
Signed-off-by: Daniel Martin <consume.noise@gmail.com>
commit 918afeecbc63d70413e222efdb2ac4cfb16eae9e
Author: Daniel Martin <consume.noise@gmail.com>
Date: Mon Nov 20 10:47:38 2017 +0100
os/xdmcp: Honour -once when session is dead
Terminate a dead session when -once was passed. Don't restart it.
Signed-off-by: Daniel Martin <consume.noise@gmail.com>
Reviewed-by: Walter Harms <wharms@bfs.de>
commit 559954aaa8d811a22cf918cc16a7d618e12201a0
Author: Michel Dänzer <michel.daenzer@amd.com>
Date: Mon Oct 2 11:33:43 2017 +0200
present: Only send PresentCompleteNotify events to the presenting client
We were sending the events to all clients listening for them on the
window. But clients can get confused by events from another client, and
I can't imagine any case where receiving events from other clients would
be required.
v2:
* Also restrict events sent to additional windows to the presenting
client
* Don't shorten line lengths
Reviewed-by: Keith Packard <keithp@keithp.com>
commit fc7fb5bbe1c8f787e53500b9a2ca4af815f310d1
Author: Giuseppe Bilotta <giuseppe.bilotta@gmail.com>
Date: Thu Nov 9 10:21:21 2017 +0100
randr: free crtc->outputs on destroy
Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Giuseppe Bilotta <giuseppe.bilotta@gmail.com>
commit 16381d186e7c791031392ed8afcfd33009854e9e
Author: Giuseppe Bilotta <giuseppe.bilotta@gmail.com>
Date: Thu Nov 9 10:21:20 2017 +0100
randr: always realloc crtcs and outputs
When the last crtc (resp. output) is destroyed, the rrScrPriv crtcs
(resp. outputs) fields do not get cleared, which can lead to a situation
where the private's numCrtcs (resp. numOutputs) field is zero, but the
associated memory is still allocated. Just checking if numCrtcs (resp.
numOutputs) is zero is thus not a good criteria to determine whetehr to
use a realloc or a malloc.
Since crtcs (resp. outputs) are NULL-initialized anyway, relying on
numCrtcs (resp. numOutputs) is actually unnecessary, because
reallocation of a NULL ptr is equivalent to a malloc anyway.
Therefore, just use realloc() unconditionally, and ensure that the
fields are properly initialized.
Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Giuseppe Bilotta <giuseppe.bilotta@gmail.com>
commit fb5ee77b91a93e27801006be8ee34d27984e7fa6
Author: Giuseppe Bilotta <giuseppe.bilotta@gmail.com>
Date: Thu Nov 9 10:21:19 2017 +0100
randr: rrGetScreenResources: initialize memory
Similarly to bb766ef11227bd8c71ac65845d1930edd0eda40d, ensure that the
extra padding is set to 0.
Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Giuseppe Bilotta <giuseppe.bilotta@gmail.com>
commit 307c124d6bcfe26057767b2c0990dc9ac66b9c93
Author: Adam Jackson <ajax@redhat.com>
Date: Tue Nov 14 15:59:35 2017 -0500
glx: Only flush indirect contexts in MakeCurrent (v2)
If the context is direct none of the GL commands were issued by this
process, the server couldn't flush them even if it wanted to.
v2: Fix embarassingly obvious boolean inversion (Michel Dänzer)
Signed-off-by: Adam Jackson <ajax@redhat.com>
Reviewed-by: Michel Dänzer <michel.daenzer@amd.com>
commit 66e8eaa456a0f200c0649c56a2e34914daa88065
Author: Adam Jackson <ajax@redhat.com>
Date: Thu Nov 2 16:10:50 2017 -0400
glamor: Drop the non-VAO rendering path
GLES spells this extension as GL_OES_vertex_array_object, but it is
functionally equivalent to the GL_ARB version. Mesa has supported both
since 9.0, let's go ahead and require it.
Signed-off-by: Adam Jackson <ajax@redhat.com>
Reviewed-by: Eric Anholt <eric@anholt.net>
commit dbda03d5d15bec8fdff64bc8545875c39da81777
Author: Adam Jackson <ajax@redhat.com>
Date: Mon Nov 6 16:41:14 2017 -0500
glx: Drop references to <GL/internal/glcore.h>
This header is a truly ancient remnant of the SGI SI code, which used
the same struct for visual/fbconfig state on both sides of the wire.
We're not using this struct ourselves so let's stop depending on the
header.
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit eafcd009f1fe3e554219a428237ef1c71d1ba506
Author: Adam Jackson <ajax@redhat.com>
Date: Tue Oct 24 14:33:19 2017 -0400
xres: Return the atom naming the type, not its internal type number
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit 68556d74b49e99d3490166c446079f7d5de26ca4
Author: Hector Martin <marcan@marcan.st>
Date: Wed Nov 15 03:12:31 2017 +0900
edid: fix off-by-one error in CEA mode numbering
The CEA extension short video descriptors contain the VIC, which starts
at 1, not 0.
Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Hector Martin <marcan@marcan.st>
commit 9bd5a198dc5383d0d2a1e28f7aa4270132eca5db
Author: Adam Jackson <ajax@redhat.com>
Date: Tue Jul 11 15:37:07 2017 -0400
glamor: Remove unused glamor_create_screen_resources
Reviewed-by: Emil Velikov <emil.velikov@collabora.com>
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit 081675f7ffda0cce20b395874d6e5755fb6600a0
Author: Adam Jackson <ajax@redhat.com>
Date: Fri Jul 14 14:52:01 2017 -0400
glamor: Un-inline glamor_[gs]et_screen_private
text data bss dec hex filename
2134764 45210 128704 2308678 233a46 build/hw/kdrive/ephyr/Xephyr.before
2129972 45210 128704 2303886 23278e build/hw/kdrive/ephyr/Xephyr.after
Reviewed-by: Emil Velikov <emil.velikov@collabora.com>
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit 6dff5e5d49a21bc749e44f0e8cb390690ece750d
Author: Adam Jackson <ajax@redhat.com>
Date: Mon Jul 10 10:56:58 2017 -0400
xwayland: Stop printing the EGL version
It doesn't matter, none of this matters.
Acked-by: Olivier Fourdan <ofourdan@redhat.com>
Reviewed-by: Emil Velikov <emil.velikov@collabora.com>
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit c57f63829f0077b5a3e5968f8405e087a4490485
Author: Adam Jackson <ajax@redhat.com>
Date: Wed Sep 13 15:44:15 2017 -0400
dmx: Use noGlxExtension like other DDXes
Reviewed-by: Emil Velikov <emil.velikov@collabora.com>
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit fd0eafb18426da14601d5c0d0a50092c49a7aff8
Author: Adam Jackson <ajax@redhat.com>
Date: Mon Nov 6 16:07:41 2017 -0500
glx: Fix typos that break GLX_ARB_context_flush_control
The trailing \n are just wrong here, __glXEnableExtension wants a string
without them.
Signed-off-by: Adam Jackson <ajax@redhat.com>
Reviewed-by: Michel Dänzer <michel.daenzer@amd.com>
Reviewed-by: Emil Velikov <emil.velikov@collabora.com>
commit 2e7f790b5770589ae2f97ee363ecd33fdb362c24
Author: Adam Jackson <ajax@redhat.com>
Date: Mon Nov 6 15:25:34 2017 -0500
dix: Remove ffs.c
Your libc has ffs, I promise.
Signed-off-by: Adam Jackson <ajax@redhat.com>
Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
commit 4d15a2645f00995618d8687edf1fb0f4b2316ace
Author: Adam Jackson <ajax@redhat.com>
Date: Mon Nov 6 15:25:33 2017 -0500
os: Remove mffs()
This was always wide enough to work on an fd_mask ("mask" ffs
presumably). We don't operate on fd_masks anymore, so this can go.
Signed-off-by: Adam Jackson <ajax@redhat.com>
Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
commit 4b0a3cbab131eb453e2b3fc0337121969258a7be
Author: Giuseppe Bilotta <giuseppe.bilotta@gmail.com>
Date: Sat Nov 4 23:06:31 2017 +0100
glx: free fbconfigs on destroy
Reviewed-by: Eric Engestrom <eric.engestrom@imgtec.com>
Signed-off-by: Giuseppe Bilotta <giuseppe.bilotta@gmail.com>
commit bb766ef11227bd8c71ac65845d1930edd0eda40d
Author: Giuseppe Bilotta <giuseppe.bilotta@gmail.com>
Date: Sat Nov 4 23:06:29 2017 +0100
randr: ProcRRGetOutputInfo: initialize memory
Running Xephyr under valgrind reveals that we're sending some
uninitialized memory over the wire (particularly, the leftover padding
that comes from rounding extraLen to the next 32-bit multiple).
Solve by calloc()ing the memory instead of malloc()ing (the alternative
would be to memset just the padding, but I'm not sure it's more
convenient.)
Signed-off-by: Giuseppe Bilotta <giuseppe.bilotta@gmail.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
commit 6828645916505a5925db5c2c2e816fee4e1050e5
Author: Giuseppe Bilotta <giuseppe.bilotta@gmail.com>
Date: Sat Nov 4 23:06:28 2017 +0100
Xephyr: free driverPrivates on Fini
Reviewed-by: Eric Engestrom <eric.engestrom@imgtec.com>
commit b2167015043a458e9cf93b827b43eb5b7c552ce9
Author: Giuseppe Bilotta <giuseppe.bilotta@gmail.com>
Date: Sat Nov 4 23:06:27 2017 +0100
xkb: initialize tsyms
This fixes some “Conditional jump depends on uninitialized value(s)”
errors spotted by valgrind.
Reviewed-by: Eric Engestrom <eric.engestrom@imgtec.com>
Signed-off-by: Giuseppe Bilotta <giuseppe.bilotta@gmail.com>
commit 2dafa1bdafe583587431a5f6ebee6ec371c61a8d
Author: Giuseppe Bilotta <giuseppe.bilotta@gmail.com>
Date: Thu Nov 2 21:27:59 2017 +0100
dix/window: fix typos
Reviewed-by: Adam Jackson <ajax@redhat.com>
commit f84e59a4f474d22860bac8aec2947798a86db69b
Author: Thomas Hellstrom <thellstrom@vmware.com>
Date: Tue Sep 26 17:28:12 2017 -0700
glx: Duplicate relevant fbconfigs for compositing visuals
Previously, before GLX_OML_swap_method was fixed, both the X server and
client ignored the swapMethod fbconfig value, which meant that, if the dri
driver thought it exposed more than one swapMethod, it actually just
exported a duplicated set of fbconfigs. When fixing GLX_OML_swap_method
and restricting the choice for built-in visuals to a single swap method
that meant we didn't have that many fbconfigs to choose from when pairing
the compositing visual with an fbconfig, resulting in the fbconfig paired
with the compositing visual becoming too restrictive for some applications,
(at least for kwin). This problem would also happen if the dri driver
only exposed a single swap method to begin with.
So, to make sure the compositing visual gets a good enough fbconfig,
duplicate fbconfigs that are suitable for compositing visuals and make
sure these duplicated fbconfigs can be used only by compositing visuals.
For duplicated fbconfigs not paired with a compositing visual, construct
new compositing visuals, making compositing clients able to choose visuals
/ fbconfig more adapted to their needs.
This is in some sense equivalent to adding a new "TRUECOLOR_COMPOSITING"
GLX visualtype.
Fixes: 4486d199bd3b ("glx: Fix visual fbconfig matching with respect to
swap method")
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=102806
Signed-off-by: Thomas Hellstrom <thellstrom@vmware.com>
Tested-By: Nick Sarnie <commendsarnex@gmail.com>
Tested-by: Fredrik Höglund <fredrik@kde.org>
Reviewed-by: Adam Jackson <ajax@redhat.com>
commit 30f4d440ebc3517fdcc1d3c6a422a8fbf3af1f23
Author: Eric Anholt <eric@anholt.net>
Date: Tue Oct 31 12:22:31 2017 -0700
xkb: Print the xkbcomp path being executed when we fail to compile.
I don't know how many times I've had a broken server due to a bad
directory to xkbcomp, and only finding the whole path has shown me
where I went wrong.
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 14af8bee242fe40af0e91c61465d6720aaa60e97
Author: Eric Anholt <eric@anholt.net>
Date: Mon Oct 9 17:14:32 2017 -0700
test: Add a test for the overflow bug in bigreqs.
The failing struct comes from the python test written by Michal Srb
<msrb@suse.com>.
v2: Use a drawable (root window) and gc, so that PolyLines hopefully
actually tries processing things. However, the request seems to
process successfully so the poll() just stalls out. However, this
does let us distinguish between detecting the bigrequests error
and not, at least.
v3: Clean up the description of what we expect the poll() call to do.
v4: Use XI2 instead of PolyLine to trigger a predictable error. We know the
server replies with BadValue for a zero num_masks argument. So if we send
a bigreq with a num_masks 0 and a length 0, we can just check whether we
get killed (good) or a BadValue (bad). It doesn't test for specific memory
overflows or crashes, but based on the assumption that we shouldn't look
at *any* BigReq of size 0, this seems to be sufficient.
Signed-off-by: Eric Anholt <eric@anholt.net>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 5aad81445c8c3d6b7b30d503cfe26027fa482870
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Tue Sep 26 15:21:59 2017 +1000
config/udev: consider ID_INPUT_FOO=0 as 'unset'
Historically we didn't need to care about this case but more devices are
having invalid types set and they cannot be unset with a hwdb entry (which
doesn't handle the empty string). Allow for "0" to mean "unset" because
anything else would be crazy anyway.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit d5379b350fb63e42e604361c21ad9832b4c791b9
Author: Daniel Martin <consume.noise@gmail.com>
Date: Fri Oct 27 16:11:56 2017 +0200
Use ARRAY_SIZE all over the tree
Roundhouse kick replacing the various (sizeof(foo)/sizeof(foo[0])) with
the ARRAY_SIZE macro from dix.h when possible. A semantic patch for
coccinelle has been used first. Additionally, a few macros have been
inlined as they had only one or two users.
Signed-off-by: Daniel Martin <consume.noise@gmail.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
commit 15a32ee5d1fffa171bb05af9a0e5b472e4af1488
Author: Daniel Martin <consume.noise@gmail.com>
Date: Fri Oct 27 16:11:55 2017 +0200
test: signal-logging: Fix looping signed number tests
unsigned_tests[] was used to compute the amount of signed numbers to
test.
Signed-off-by: Daniel Martin <consume.noise@gmail.com>
Reviewed-by: Eric Engestrom <eric.engestrom@imgtec.com>
commit 0bcc65f2bf479c6a74ac70bb5b5181d6834dded6
Author: Daniel Martin <consume.noise@gmail.com>
Date: Fri Oct 27 16:11:54 2017 +0200
test: input: Fix used uninitialized warning in dix_event_to_core
input.c: In function ‘dix_event_to_core’:
../include/inputstr.h:61:55: warning: ‘*((void *)&ev+80)’ is used uninitialized in this function [-Wuninitialized]
#define SetBit(ptr, bit) (((BYTE *) (ptr))[(bit)>>3] |= (1 << ((bit) & 7)))
^~
Signed-off-by: Daniel Martin <consume.noise@gmail.com>
Reviewed-by: Eric Engestrom <eric.engestrom@imgtec.com>
commit 04a305121fbc08ecc2ef345ee7155d6087a43fd1
Author: Daniel Martin <consume.noise@gmail.com>
Date: Fri Oct 27 16:11:53 2017 +0200
modesetting: Fix potential buffer overflow
If one misconfigures a ZaphodHeads value (more than 20 characters
without a delimiter), we get an overflow of our buffer. Use
xstrtokenize() instead of writing/fixing our own tokenizer.
Signed-off-by: Daniel Martin <consume.noise@gmail.com>
Reviewed-by: Eric Engestrom <eric.engestrom@imgtec.com>
commit 2230e6c8af92b041821eee0ea6210eda82c74106
Author: Adam Jackson <ajax@redhat.com>
Date: Tue Oct 24 14:28:34 2017 -0400
glamor: Unconditionalize GLAMOR_TEXTURED_LARGE_PIXMAP
Signed-off-by: Adam Jackson <ajax@redhat.com>
Reviewed-by: Eric Anholt <eric@anholt.net>
commit 1edac5c1ceb8b21af45b20397ff64177ad22466c
Author: Adam Jackson <ajax@redhat.com>
Date: Tue Oct 24 14:28:33 2017 -0400
glamor: Unconditionalize GLAMOR_PIXMAP_DYNAMIC_UPLOAD
Signed-off-by: Adam Jackson <ajax@redhat.com>
Reviewed-by: Eric Anholt <eric@anholt.net>
commit 13409b91b1936330dbf19bacefa4b48d0b6843b8
Author: Adam Jackson <ajax@redhat.com>
Date: Tue Oct 24 14:28:32 2017 -0400
glamor: Unconditionalize GLAMOR_GRADIENT_SHADER
Effectively always true anyway.
Signed-off-by: Adam Jackson <ajax@redhat.com>
Reviewed-by: Eric Anholt <eric@anholt.net>
commit 266d9868ca1cf77b7d315d607b515f081a9f45c3
Author: Alex Goins <agoins@nvidia.com>
Date: Thu Oct 19 20:02:30 2017 -0700
xf86-video-modesetting: Fix ms_queue_vblank(flags = MS_QUEUE_RELATIVE)
Change 677c32bc refactored all usages of drmWaitVBlank() into a helper function,
ms_queue_vblank().
ms_queue_vblank() takes in an MS_QUEUE_RELATIVE flag to indicate that the
sequence number is relative rather than absolute, but still treats the actual
sequence number as absolute, passing it through ms_crtc_msc_to_kernel_msc()
unconditionally before calling drmWaitVBlank().
ms_crtc_msc_to_kernel_msc() works by subtracting a vblank offset from the
provided sequence number, which only makes sense for absolute sequence numbers.
In the case of PRIME Sync, drmmode_SharedPixmapPrsentOnVBlank() passes in 1,
which results in a large negative vblank offset. After subtracting, we're left
with a relative sequence number of 100,000+, i.e. wait for 100,000+ vblanks...
In the relative case we want to pass in the sequence number unmodified. Simply
add a check to do this.
Signed-off-by: Alex Goins <agoins@nvidia.com>
Reviewed-by: Keith Packard <keithp@keithp.com>
commit 68d95e759f8b6ebca6bd52e69e6bc34cc174f8ca
Author: Alex Goins <agoins@nvidia.com>
Date: Tue Oct 24 18:39:13 2017 -0700
ramdac: Check ScreenPriv != NULL in xf86ScreenSetCursor()
Similar to change cba5a10f, xf86ScreenSetCursor() would dereference ScreenPriv
without NULL checking it. If Option "SWCursor" is specified, ScreenPriv == NULL.
Without this fix, it is observed that setting Option "SWCursor" "on" on the
modesetting driver in a PRIME configuration will segfault the server.
It is important to return success rather than failure in the instance that
ScreenPriv == NULL and pCurs == NullCursor, because otherwise xf86SetCursor()
can fall into infinite recursion: xf86SetCursor(pCurs) calls
xf86ScreenSetCursor(pCurs), and if FALSE, calls xf86SetCursor(NullCursor). If
xf86ScreenSetCursor(NullCursor) returns FALSE, it calls
xf86SetCursor(NullCursor) again and this repeats forever.
Signed-off-by: Alex Goins <agoins@nvidia.com>
Reviewed-by: Dave Airlie <airlied@redhat.com>
commit 04163fe8c66ae6683a1384fd1bd91ea85f9892ee
Author: Adam Jackson <ajax@redhat.com>
Date: Tue Oct 24 13:03:09 2017 -0400
meson: Use [ true, false, auto ] for tristate values
For symmetry with the boolean options. I really do not want to care
whether an option is a tristate if I'm trying to set it explicitly.
Signed-off-by: Adam Jackson <ajax@redhat.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
commit c2c6e9e68a8815420233c996acdd29ba572b1f0e
Author: Adam Jackson <ajax@redhat.com>
Date: Tue Oct 24 14:38:13 2017 -0400
dix: Don't track the XKB client versions in the ClientRec
XKB stores some stuff in the ClientRec that, style-wise, should probably
be in a client private. vMinor tracks the client's idea of the XKB
minor version, but is never read, we can just nuke it. vMajor is only
used for a bug-compat workaround for X11R6.0-vintage clients. We're
only using though (1<<4) for xkbClientFlags in the protocol, so we can
pack that field down to a u8 and store the bug-compat flag there.
Signed-off-by: Adam Jackson <ajax@redhat.com>
Reviewed-by: Julien Cristau <jcristau@debian.org>
commit bc5fb8c0928498c32dc33680d40d50e6db5879b6
Author: Adam Jackson <ajax@redhat.com>
Date: Tue Oct 24 14:38:12 2017 -0400
dix: Don't vary the ClientRec ABI at build time
Just no.
Signed-off-by: Adam Jackson <ajax@redhat.com>
Reviewed-by: Julien Cristau <jcristau@debian.org>
commit 0c3ad9d1e06294b4f66717798afa4f5dfa505469
Author: Adam Jackson <ajax@redhat.com>
Date: Mon Oct 23 15:34:26 2017 -0400
travis: Bump linux Dockerfile to v7 for new meson
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit 4d53e30651c0fe5f7be38ae8529fa49846d39549
Author: Lyude Paul <lyude@redhat.com>
Date: Mon Oct 23 16:21:19 2017 -0400
meson: Don't use '' in link_with, ever
String arguments as elements in the array passed to the link_with
argument in meson's executable() functions are not valid and will end up
causing the build file generation to file. This actually ended up
exposing a bug in meson that caused it not to report where in the
meson.build file it was failing:
https://github.com/mesonbuild/meson/pull/2527
The proper way to have a variable that can contain either an empty link
target or an actual link target is:
some_target = []
if some_cond
some_target = static_library(...)
endif
This way if some_cond is False, some_target gets set to [], gets passed
to executable() in the link_with array, and then gets removed by array
flattening.
This also unbreaks Xwayland builds with -Dglx=false, the thing that
originally made me notice this.
Signed-off-by: Lyude Paul <lyude@redhat.com>
Reviewed-by: Jon Turney <jon.turney@dronecode.org.uk>
commit 5893e72a20ffa5cfcd6d0c7c5c934b92546d76c3
Author: Jon Turney <jon.turney@dronecode.org.uk>
Date: Tue Oct 24 12:07:08 2017 +0100
travis: Fix OSX build
Turn off homebrew autoupdating before installing ccache, to avoid:
/usr/local/Homebrew/Library/Homebrew/brew.rb:12:in `<main>': Homebrew must
be run under Ruby 2.3! You're running 2.0.0. (RuntimeError)
Signed-off-by: Jon Turney <jon.turney@dronecode.org.uk>
Reviewed-by: Adam Jackson <ajax@redhat.com>
commit f44935cdb7321af242ce9f242975f096807b97f7
Author: Daniel Martin <consume.noise@gmail.com>
Date: Mon Oct 23 10:31:21 2017 +0200
modesetting: Use helper to fetch drmModeProperty(Blob)s
Replace the various loops to lookup drmModeProperty(Blob)s by
introducing helper functions.
Signed-off-by: Daniel Martin <consume.noise@gmail.com>
commit 6abdb54a11dac4e8854ff94ecdcb90a14321ab31
Author: Daniel Martin <consume.noise@gmail.com>
Date: Mon Oct 23 10:31:20 2017 +0200
modesetting: Fix leak of tile_blob in drmmode_output_destroy
And drmModeFreePropertyBlob() can handle NULL pointers, no need to check
edid_blob.
Signed-off-by: Daniel Martin <consume.noise@gmail.com>
commit 8d7f7e24261e68459e6f0a865e243473f65fe7ad
Author: Daniel Martin <consume.noise@gmail.com>
Date: Fri Oct 20 10:05:35 2017 +0200
modesetting: Check crtc before searching link-status property
No need to lookup the link-status property if we don't have a crtc.
Signed-off-by: Daniel Martin <consume.noise@gmail.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
commit 8c455db0ebb6e5313ca81428bb6dd75ef12aaa15
Author: Daniel Martin <consume.noise@gmail.com>
Date: Fri Oct 20 10:05:34 2017 +0200
modesetting: Remove #ifdefs XF86_PDEV_SERVER_FD
XF86_PDEV_SERVER_FD is defined since:
commit 5fb641a29bfb4a33da964e1e9af523f3472015c6
Author: Hans de Goede <hdegoede@redhat.com>
Date: Mon Jan 13 12:03:46 2014 +0100
hotplug: Extend OdevAttributes for server-managed fd support
ifdef'ing for it is a leftover from the external xf86-video-modesetting.
Signed-off-by: Daniel Martin <consume.noise@gmail.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
commit 66d8cbf8ce9285a8771118e46daa44faa73ad847
Author: Daniel Martin <consume.noise@gmail.com>
Date: Fri Oct 20 10:05:33 2017 +0200
modesetting: Fix warning of unused variable if not GLAMOR_HAS_GBM
../hw/xfree86/drivers/modesetting/driver.c: In function ‘redisplay_dirty’:
../hw/xfree86/drivers/modesetting/driver.c:586:20: warning: unused variable ‘ms’ [-Wunused-variable]
modesettingPtr ms = modesettingPTR(xf86ScreenToScrn(screen));
Move the variable ms into #ifdef GLAMOR_HAS_GBM, where it is used.
Signed-off-by: Daniel Martin <consume.noise@gmail.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
commit 6d7e1d1de06336c9b49a253810afda8ac4e9f7b2
Author: Lyude Paul <lyude@redhat.com>
Date: Fri Oct 13 15:44:32 2017 -0400
meson: Don't forget to define DEBUG!
Changes since v2:
- Don't enable by default for debugoptimized builds
Signed-off-by: Lyude Paul <lyude@redhat.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
commit 0debe011901b87f686e2a76ce5edc150b04bf9d1
Author: Lyude Paul <lyude@redhat.com>
Date: Fri Oct 13 15:44:31 2017 -0400
meson: Silence -Wformat-nonliteral for x86emu
Signed-off-by: Lyude Paul <lyude@redhat.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
commit cbca18c5516084ee540255df52e116209f1c1cbe
Author: Lyude Paul <lyude@redhat.com>
Date: Fri Oct 13 15:44:30 2017 -0400
x86emu: Fix type conversion warnings on x86_64 with DEBUG
Warnings come from the fact that PRIx32 is not used for printing 32 bit
values instead of "%lx", and "%lx" evaluates to a 64 bit long on 64 bit
systems while PRIx32 always evaluates to the right type for the
respective arch.
Signed-off-by: Lyude Paul <lyude@redhat.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
commit 01470ce0a9628abc8af4fe7b960f0d1eced8cd46
Author: Lyude Paul <lyude@redhat.com>
Date: Fri Oct 13 15:44:29 2017 -0400
fbdevhw: Fix inconsistent #if DEBUG usage
fbdevhw is the only file in X's source that actually uses #if DEBUG to
check for debugging instead of #ifdef DEBUG. This is contrary to
everything else that checks the DEBUG macro in the source, so let's make
it consistent and in turn, make our meson files a little simpler.
Signed-off-by: Lyude Paul <lyude@redhat.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
commit c66d65a645332bbf055a1c49f092636139eb9285
Author: Eric Anholt <eric@anholt.net>
Date: Wed Jul 26 16:54:40 2017 -0700
glamor: Use GL_MESA_tile_raster_order for overlapping blits.
Improves Raspberry Pi 3 x11perf -copywinwin500 from ~480/sec to
~700/sec.
Signed-off-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Keith Packard <keithp@keithp.com>
commit 885636b7d42b3c7b151fc386d358184db004ce45
Author: Nikolay Martynov <mar.kolya@gmail.com>
Date: Wed Sep 13 23:23:13 2017 -0400
XShmGetImage: fix censoring
It looks like offsets calculated during image censoring are wrong.
This results in black (empty) images returns.
This fix is very similar to 6c6f09aac7f1d1367a042087b7681c7fdf1d1e0f
that was applied to XGetImage
Visually this fixes chromium/firefox window sharing in multiscreen
configurations - without this patch most of the windows on 'secodnary'
screens are black.
This also should fix https://bugs.freedesktop.org/show_bug.cgi?id=101730.
Signed-off-by: Nikolay Martynov <mar.kolya@gmail.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
commit a10b4fcdc016d7ac56e5bb35f7f844af41016efe
Author: Jon Turney <jon.turney@dronecode.org.uk>
Date: Tue Oct 10 14:28:33 2017 +0100
meson: Fix linkage of loadable modules for PE/COFF
For the loadable modules it makes sense to build for PE/COFF targets, link
those loadable modules with the import library for the Xorg executable, so
that symbols provided by the executable can be satisfied at link time (as
required by PE/COFF).
Since this uses the syntax of using the returned build target object from an
executable() with an implib: kwarg to link_with:, introduced in meson 0.42
and a syntax error with older meson, also update the minimum meson version
which we require in project() to that.
Signed-off-by: Jon Turney <jon.turney@dronecode.org.uk>
commit d43b1ca852562882fc6930afc36a982801e3be87
Author: Jon Turney <jon.turney@dronecode.org.uk>
Date: Tue Oct 10 14:28:32 2017 +0100
meson: Fix underlinkage of shadow loadable module
Future work: probably some other modules are underlinked?
Signed-off-by: Jon Turney <jon.turney@dronecode.org.uk>
commit 10cba7d54668698741510374ee63dec7a3cc3647
Author: Lyude Paul <lyude@redhat.com>
Date: Wed Oct 11 18:03:45 2017 -0400
meson: Add xkb_bin_dir option
Now that we can actually configure all of the directories xkb uses for
finding things, we can (finally, but only with meson) finally make it so
that with the correct meson configuration the Xserver will "just work"
without any additional changes to the installation prefix after
building.
For the people like me who have since scripted this part out of their
build process and forgotten about it, building and installing the X
server into a non-standard prefix has always required the following (or
something else that makes sure that X has a valid xkbcomp configuration)
commands be run right after doing the installation:
# start in root of prefix you installed X to
mkdir -pv share/X11/xkb/rules
ln -s /usr/share/X11/xkb/rules/evdev share/X11/xkb/rules/
rm -f bin/xkbcomp
ln -s /usr/bin/xkbcomp bin/
The one last piece of getting rid of this post-install junk is making
sure that we can control the directory that X uses for finding the
xkbcomp binary from meson so we can point it at the system provided
xkbcomp (/usr/bin/xkbcomp or similar). So, this patch adds a
configuration option for controlling this called xkb_bin_dir.
Signed-off-by: Lyude Paul <lyude@redhat.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Daniel Stone <daniels@collabora.com>
commit b747da5e25be944337a9cd1415506fc06b70aa81
Author: Nathan Kidd <nkidd@opentext.com>
Date: Fri Jan 9 10:15:46 2015 -0500
Unvalidated extra length in ProcEstablishConnection (CVE-2017-12176)
Reviewed-by: Julien Cristau <jcristau@debian.org>
Signed-off-by: Nathan Kidd <nkidd@opentext.com>
Signed-off-by: Julien Cristau <jcristau@debian.org>
commit 4ca68b878e851e2136c234f40a25008297d8d831
Author: Nathan Kidd <nkidd@opentext.com>
Date: Fri Jan 9 10:09:14 2015 -0500
dbe: Unvalidated variable-length request in ProcDbeGetVisualInfo (CVE-2017-12177)
v2: Protect against integer overflow (Alan Coopersmith)
Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
Reviewed-by: Julien Cristau <jcristau@debian.org>
Signed-off-by: Nathan Kidd <nkidd@opentext.com>
Signed-off-by: Julien Cristau <jcristau@debian.org>
commit 859b08d523307eebde7724fd1a0789c44813e821
Author: Nathan Kidd <nkidd@opentext.com>
Date: Wed Dec 24 16:22:18 2014 -0500
Xi: fix wrong extra length check in ProcXIChangeHierarchy (CVE-2017-12178)
Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
Reviewed-by: Julien Cristau <jcristau@debian.org>
Signed-off-by: Nathan Kidd <nkidd@opentext.com>
Signed-off-by: Julien Cristau <jcristau@debian.org>
commit d088e3c1286b548a58e62afdc70bb40981cdb9e8
Author: Nathan Kidd <nkidd@opentext.com>
Date: Fri Jan 9 10:04:41 2015 -0500
Xi: integer overflow and unvalidated length in (S)ProcXIBarrierReleasePointer
[jcristau: originally this patch fixed the same issue as commit
211e05ac85 "Xi: Test exact size of XIBarrierReleasePointer", with the
addition of these checks]
This addresses CVE-2017-12179
Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
Reviewed-by: Julien Cristau <jcristau@debian.org>
Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
Signed-off-by: Nathan Kidd <nkidd@opentext.com>
Signed-off-by: Julien Cristau <jcristau@debian.org>
commit 1b1d4c04695dced2463404174b50b3581dbd857b
Author: Nathan Kidd <nkidd@opentext.com>
Date: Sun Dec 21 01:10:03 2014 -0500
hw/xfree86: unvalidated lengths
This addresses:
CVE-2017-12180 in XFree86-VidModeExtension
CVE-2017-12181 in XFree86-DGA
CVE-2017-12182 in XFree86-DRI
Reviewed-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
Reviewed-by: Julien Cristau <jcristau@debian.org>
Signed-off-by: Nathan Kidd <nkidd@opentext.com>
Signed-off-by: Julien Cristau <jcristau@debian.org>
commit 55caa8b08c84af2b50fbc936cf334a5a93dd7db5
Author: Nathan Kidd <nkidd@opentext.com>
Date: Fri Jan 9 11:43:05 2015 -0500
xfixes: unvalidated lengths (CVE-2017-12183)
v2: Use before swap (Jeremy Huddleston Sequoia)
v3: Fix wrong XFixesCopyRegion checks (Alan Coopersmith)
Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
Reviewed-by: Julien Cristau <jcristau@debian.org>
Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
Signed-off-by: Nathan Kidd <nkidd@opentext.com>
Signed-off-by: Julien Cristau <jcristau@debian.org>
commit cad5a1050b7184d828aef9c1dd151c3ab649d37e
Author: Nathan Kidd <nkidd@opentext.com>
Date: Fri Jan 9 09:57:23 2015 -0500
Unvalidated lengths
v2: Add overflow check and remove unnecessary check (Julien Cristau)
This addresses:
CVE-2017-12184 in XINERAMA
CVE-2017-12185 in MIT-SCREEN-SAVER
CVE-2017-12186 in X-Resource
CVE-2017-12187 in RENDER
Reviewed-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
Reviewed-by: Julien Cristau <jcristau@debian.org>
Signed-off-by: Nathan Kidd <nkidd@opentext.com>
Signed-off-by: Julien Cristau <jcristau@debian.org>
commit 9c23685009aa96f4b861dcc5d2e01dbee00c4dd9
Author: Michal Srb <msrb@suse.com>
Date: Fri Jul 7 17:04:03 2017 +0200
os: Make sure big requests have sufficient length.
A client can send a big request where the 32B "length" field has value
0. When the big request header is removed and the length corrected,
the value will underflow to 0xFFFFFFFF. Functions processing the
request later will think that the client sent much more data and may
touch memory beyond the receive buffer.
Signed-off-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
commit c2f2b25ab55c67f9f3ad07c02fa746eae7c61196
Author: Louis-Francis Ratté-Boulianne <lfrb@collabora.com>
Date: Wed Sep 27 01:19:58 2017 -0400
present: Check the whole exec queue on event
Later events are sometimes added in front of the queue (e.g.
if page flipping fails) so we need to check the whole queue
on event.
Signed-off-by: Louis-Francis Ratté-Boulianne <lfrb@collabora.com>
Reviewed-by: Michel Dänzer <michel.daenzer@amd.com>
commit 677c32bcda98a96585bb1f66b57e0755a157b772
Author: Keith Packard <keithp@keithp.com>
Date: Fri Sep 29 08:48:33 2017 -0700
xf86-video-modesetting: Add ms_queue_vblank helper [v3]
This provides an API wrapper around the kernel interface for queueing
a vblank event, simplifying all of the callers.
v2: Fix missing '|' in computing vbl.request.type
v3: Remove spurious bit of next patch (thanks, Michel Dänzer)
Signed-off-by: Keith Packard <keithp@keithp.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
commit 94f11ca5cf011ef123bd222cabeaef6f424d76ac
Author: Keith Packard <keithp@keithp.com>
Date: Thu Jul 27 10:08:32 2017 -0700
xkb: Handle xkb formated string output safely (CVE-2017-13723)
Generating strings for XKB data used a single shared static buffer,
which offered several opportunities for errors. Use a ring of
resizable buffers instead, to avoid problems when strings end up
longer than anticipated.
Reviewed-by: Michal Srb <msrb@suse.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
Signed-off-by: Julien Cristau <jcristau@debian.org>
commit eaf1f72ed8994b708d94ec2de7b1a99f5c4a39b8
Author: Michal Srb <msrb@suse.com>
Date: Thu Jul 27 11:54:26 2017 +0200
xkb: Escape non-printable characters correctly.
XkbStringText escapes non-printable characters using octal numbers. Such escape
sequence would be at most 5 characters long ("\0123"), so it reserves 5 bytes
in the buffer. Due to char->unsigned int conversion, it would print much longer
string for negative numbers.
Reviewed-by: Keith Packard <keithp@keithp.com>
Signed-off-by: Julien Cristau <jcristau@debian.org>
commit b95f25af141d33a65f6f821ea9c003f66a01e1f1
Author: Michal Srb <msrb@suse.com>
Date: Fri Jul 28 16:27:10 2017 +0200
Xext/shm: Validate shmseg resource id (CVE-2017-13721)
Otherwise it can belong to a non-existing client and abort X server with
FatalError "client not in use", or overwrite existing segment of another
existing client.
Signed-off-by: Julien Cristau <jcristau@debian.org>
commit db465bae533f85e7f900deb96efecc831c9d550b
Author: Adam Jackson <ajax@redhat.com>
Date: Wed Sep 27 14:31:39 2017 -0400
meson: Port default warning flags from xorg-macros
Well, almost all of them. No -Wdeclaration-after-statement because
that's legal in C99, and in the limited ways we use it, more readable.
Signed-off-by: Adam Jackson <ajax@redhat.com>
Reviewed-by: Daniel Stone <daniels@collabora.com>
commit 40c90ead044aa3fab79280d7a5ca5ad8e390029e
Author: Adam Jackson <ajax@redhat.com>
Date: Wed Sep 27 14:31:38 2017 -0400
meson: Check for HAVE_TYPEOF
Without this, exa's gc swap macros trigger gcc's -Wdiscarded-qualifiers.
Signed-off-by: Adam Jackson <ajax@redhat.com>
Reviewed-by: Daniel Stone <daniels@collabora.com>
commit 712b02ec72b98291b78e17dcb1073a13c4a1086e
Author: Adam Jackson <ajax@redhat.com>
Date: Wed Sep 27 14:31:37 2017 -0400
meson: Default to gnu99
We don't really require all of C99, but enough that it's not worth
bothering with the distinction, especially if your toolchain is new
enough that meson is a thing for you. We could do strict C99 if we
really insisted on spelling it __typeof__, but who wants that? Nobody,
that's who.
Signed-off-by: Adam Jackson <ajax@redhat.com>
Reviewed-by: Eric Anholt <eric@anholt.net>
commit 041f25afa81dfc7e7ef350d5b955d2d5912846c9
Author: Adam Jackson <ajax@redhat.com>
Date: Wed Sep 27 14:31:36 2017 -0400
test: const correctness fix
../test/sync/sync.c: In function ‘main’:
../test/sync/sync.c:288:40: warning: initialization discards ‘const’ qualifier from pointer target type [-Wdiscarded-qualifiers]
xcb_query_extension_reply_t *ext = xcb_get_extension_data(c, &xcb_sync_id);
^~~~~~~~~~~~~~~~~~~~~~
Signed-off-by: Adam Jackson <ajax@redhat.com>
Reviewed-by: Eric Anholt <eric@anholt.net>
commit 1d1ff1142a5a3904175f45d2f52bbdffb0249e57
Author: Adam Jackson <ajax@redhat.com>
Date: Wed Sep 27 14:31:35 2017 -0400
dmx: More const correctness
Fixes several dozen cases like:
../hw/dmx/examples/ev.c: In function ‘main’:
../hw/dmx/examples/ev.c:147:29: warning: assignment discards ‘const’ qualifier from pointer target type [-Wdiscarded-qualifiers]
tmp = "X";
^
Signed-off-by: Adam Jackson <ajax@redhat.com>
Reviewed-by: Eric Anholt <eric@anholt.net>
commit eb25facb37ef74eab83060b75f8205ce1538817f
Author: Adam Jackson <ajax@redhat.com>
Date: Wed Sep 27 14:31:34 2017 -0400
dmx: Fix a silly redeclaration bug
../hw/dmx/dmx.c:66:12: warning: redundant redeclaration of ‘PanoramiXNumScreens’ [-Wredundant-decls]
extern int PanoramiXNumScreens;
^~~~~~~~~~~~~~~~~~~
In file included from ../hw/dmx/dmx.c:65:0:
../Xext/panoramiXsrv.h:11:22: note: previous declaration of ‘PanoramiXNumScreens’ was here
extern _X_EXPORT int PanoramiXNumScreens;
^~~~~~~~~~~~~~~~~~~
Signed-off-by: Adam Jackson <ajax@redhat.com>
Reviewed-by: Eric Anholt <eric@anholt.net>
commit 8060196a3e80a3c0ad2c0abbe459416821cd366c
Author: Louis-Francis Ratté-Boulianne <lfrb@collabora.com>
Date: Wed Sep 27 01:24:28 2017 -0400
sync: Fix delta value check
While transitionning from CARD64 to int64, the GreaterThan call
as mistakenly been transformed into ">=". That was at least
causing problems with Mutter.
Signed-off-by: Louis-Francis Ratté-Boulianne <lfrb@collabora.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
commit 37f4e7651a2fd51efa613a08a1e705553be33e76
Author: Keith Packard <keithp@keithp.com>
Date: Mon Sep 25 16:18:22 2017 -0700
modesetting: Skip no-longer-present connectors when resetting BAD links
Outputs may have NULL mode_output (connector) pointers if the
connector disappears while the server is running. Skip these when
resetting outputs with BAD link status.
Signed-off-by: Keith Packard <keithp@keithp.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
commit 147b4602f9c47e8977d13b1cbb6566f86dba8647
Author: Adam Jackson <ajax@redhat.com>
Date: Mon Sep 25 15:06:44 2017 -0400
xfree86: Hush some warnings when Xv is disabled
Spotted by Appveyor:
xf86Crtc.c:3281:1: warning: ‘xf86_crtc_box_area’ defined but not used [-Wunused-function]
xf86_crtc_box_area(BoxPtr box)
^~~~~~~~~~~~~~~~~~
xf86Crtc.c:3268:1: warning: ‘x86_crtc_box’ defined but not used [-Wunused-function]
x86_crtc_box(xf86CrtcPtr crtc, BoxPtr crtc_box)
^~~~~~~~~~~~
xf86Crtc.c:3256:1: warning: ‘x86_crtc_box_intersect’ defined but not used [-Wunused-function]
x86_crtc_box_intersect(BoxPtr dest, BoxPtr a, BoxPtr b)
^~~~~~~~~~~~~~~~~~~~~~
Signed-off-by: Adam Jackson <ajax@redhat.com>
Reviewed-by: Eric Anholt <eric@anholt.net>
commit 0888b22fea71118b1a9a238134b3b8d1dc659734
Author: Adam Jackson <ajax@redhat.com>
Date: Mon Sep 25 15:01:32 2017 -0400
test: Fix a thinko in simple-xinit
Spotted by clang courtesy of the shiny new OSX Travis target:
simple-xinit.c:90:65: warning: sizeof on pointer operation will return size of 'char *' instead of 'char [10]' [-Wsizeof-array-decay]
ret = read(displayfd, display_string, sizeof(display_string - 1));
Signed-off-by: Adam Jackson <ajax@redhat.com>
Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
commit 84e3b96b531363e47f6789aacfcae4aa60135e2e
Author: Nick Sarnie <commendsarnex@gmail.com>
Date: Sat Sep 23 17:35:48 2017 -0400
suid: Include sysmacros.h to fix build after glibc-2.25
[Added HAVE_SYS_SYSMACROS_H guard - ajax]
Signed-off-by: Nick Sarnie <commendsarnex@gmail.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
commit 0b00440678fa22c1c1ca4a292b67db3ab8676969
Author: Jon Turney <jon.turney@dronecode.org.uk>
Date: Fri Sep 22 15:25:05 2017 +0100
travis: Also build on OSX
Signed-off-by: Jon Turney <jon.turney@dronecode.org.uk>
Signed-off-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Eric Anholt <eric@anholt.net>
commit c30eca688781deb06b25a6a08297cb855aeb6ed2
Author: Jon Turney <jon.turney@dronecode.org.uk>
Date: Fri Sep 22 13:54:01 2017 +0100
meson: Make it possible to build for 32-bit targets
Setting glx_align64 to '' gives a null string in the arguments list passed
to the compiler. This is taken as an input filename, leading to:
"cc: error: : No such file or directory"
Instead, assign an empty list to glx_align64, which gets flattened to
nothing in the arguments list.
Signed-off-by: Jon Turney <jon.turney@dronecode.org.uk>
Signed-off-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Eric Anholt <eric@anholt.net>
commit 2c2e1b6f57753a82c7ca144a57950f9e2d76199e
Author: Adam Jackson <ajax@redhat.com>
Date: Wed Aug 30 14:58:24 2017 -0400
glx: Be a bit more paranoid in glx client cleanup
This would probably crash (via double-free) if you had multiple GPUs and
an indirect context.
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit d770f9293296d2d3c4e49e94130ff68c0890f625
Author: Daniel Stone <daniels@collabora.com>
Date: Wed Sep 20 07:22:13 2017 -0700
meson: Use dependency version_compare()
We can check the version on an existing dependency, rather than spinning
up pkg-config again just to check the right version.
Signed-off-by: Daniel Stone <daniels@collabora.com>
commit 86a89dd6020f59964c0e924acbfae9d5a51e3148
Author: Daniel Stone <daniels@collabora.com>
Date: Wed Sep 20 07:22:12 2017 -0700
Build: Use dri3proto/libdrm CFLAGS
Make sure we get the CFLAGS required for building DRI3 into the
command line.
Signed-off-by: Daniel Stone <daniels@collabora.com>
commit 294670682120c65001b36369d6395003704f4ac1
Author: Eric Anholt <eric@anholt.net>
Date: Mon Sep 18 17:34:33 2017 -0700
sync: Clean up a bit of header formatting.
Signed-off-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Keith Packard <keithp@keithp.com>
commit e0f872207aa203adb85e825c311ed50fe3a3af60
Author: Eric Anholt <eric@anholt.net>
Date: Mon Sep 18 17:34:32 2017 -0700
sync: Convert from "CARD64" to int64_t.
The extension was using the name CARD64 to represent 64-bit values,
with a #define from CARD64 to XSyncValue, a struct with a pair of
32-bit values representing a signed 64-bit value. This interfered
with protocol headers using CARD64 to try to actually store a
uint64_t. Now that stdint.h exists, let's just use that here,
instead.
v2: Fix alarm delta changes.
v3: Do the potentially overflowing math as uint and convert to int
afterward, out of C spec paranoia.
Signed-off-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Keith Packard <keithp@keithp.com>
commit 5cbfa276541e6a621cf9c4b44b75323e90a5bd4c
Author: Eric Anholt <eric@anholt.net>
Date: Mon Sep 18 17:34:31 2017 -0700
test: Add basic SYNC tests.
I couldn't find any, and I was modifying the implementation, so I had
to write some. I would like the test to end with a "make sure there
weren't any stray unchecked errors", but I didn't figure out how to do
that.
v2: Extend sync tests to cover alarm delta and waitvalue changes.
Signed-off-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Keith Packard <keithp@keithp.com>
commit 3336291fc68444ee65b48ba675ec947e505fed57
Author: Eric Anholt <eric@anholt.net>
Date: Mon Sep 18 17:34:30 2017 -0700
test: Return error from simple-xinit if the client crashes.
I want to be able to call client tests with simple-xinit, so assertion
failures should be an error.
v2: Clean up identical returns.
Signed-off-by: Eric Anholt <eric@anholt.net>
commit a8eeb332ccf4d13b3fdcc382397bd3ea45e76212
Author: Eric Anholt <eric@anholt.net>
Date: Mon Sep 18 17:34:29 2017 -0700
meson: Add Xvfb and Xephyr-glamor testing.
The Xvfb tests are passing and Xephyr-glamor is failing for me, but it
fails identically on autotools. It's disabled on Travis for now
because the >10 minutes of silence during testing times out the entire
build.
v2: Fix the disable on travis.
Signed-off-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Adam Jackson <ajax@redhat.com>
commit a09743c9300f805d6527368ddcf44f5dccd4b366
Author: Eric Anholt <eric@anholt.net>
Date: Mon Sep 18 17:34:28 2017 -0700
meson: Move Xvfb build under an option.
Autotools also had it as an option.
Signed-off-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Adam Jackson <ajax@redhat.com>
commit de3b61869140768335daed0e855a5ae4bdb75020
Author: Jon Turney <jon.turney@dronecode.org.uk>
Date: Fri Sep 15 14:36:52 2017 +0100
Add an .appveyor.yml for AppVeyor CI
This currently does an autotools build using Cygwin.
Signed-off-by: Jon Turney <jon.turney@dronecode.org.uk>
Reviewed-by: Adam Jackson <ajax@redhat.com>
commit 7d0728d6c42f9200b90c58e0357776018de18496
Author: Jon Turney <jon.turney@dronecode.org.uk>
Date: Fri Sep 15 14:36:51 2017 +0100
Revert "dmx: fix linking"
Since commit 3ef16dfb9830bd6b41ae428f4f213ae0c35c1056, "dmx: fix
linking", linking dmx is broken for me:
CCLD Xdmx.exe
../../render/.libs/librender.a(glyph.o): In function `HashGlyph':
/wip/xserver/build.x86_64/../render/glyph.c:168: undefined reference to `x_sha1_init'
/wip/xserver/build.x86_64/../render/glyph.c:174: undefined reference to `x_sha1_update'
/wip/xserver/build.x86_64/../render/glyph.c:177: undefined reference to `x_sha1_update'
/wip/xserver/build.x86_64/../render/glyph.c:180: undefined reference to `x_sha1_final'
../../render/.libs/librender.a(mipict.o): In function `miClipPictureReg':
/wip/xserver/build.x86_64/../render/mipict.c:233: undefined reference to `pixman_region_n_rects'
/wip/xserver/build.x86_64/../render/mipict.c:234: undefined reference to `pixman_region_n_rects'
/wip/xserver/build.x86_64/../render/mipict.c:235: undefined reference to `pixman_region_rectangles'
/wip/xserver/build.x86_64/../render/mipict.c:236: undefined reference to `pixman_region_rectangles'
/wip/xserver/build.x86_64/../render/mipict.c:248: undefined reference to `pixman_region_init'
/wip/xserver/build.x86_64/../render/mipict.c:251: undefined reference to `pixman_region_not_empty'
/wip/xserver/build.x86_64/../render/mipict.c:261: undefined reference to `pixman_region_not_empty'
../../render/.libs/librender.a(mipict.o): In function `miComputeCompositeRegion':
/wip/xserver/build.x86_64/../render/mipict.c:340: undefined reference to `pixman_region_init'
The change this was fixing appears to be effectively reverted by
542d9f6807ac06b70f564ccab10af69fa21a1221, so just revert commit
3ef16dfb9830bd6b41ae428f4f213ae0c35c1056.
Signed-off-by: Jon Turney <jon.turney@dronecode.org.uk>
Reviewed-by: Adam Jackson <ajax@redhat.com>
commit fbd80b2c8ebe9fd41229dc5438524d107c071ff1
Author: Dawid Kurek <dawid.kurek@displaylink.com>
Date: Thu Jul 6 14:51:11 2017 +0200
modesetting: Blacklist EVDI devices from PRIME sync
UDL (usb) devices are blacklisted because of they weird behaviour when
it comes to vblank events. As EVDI uses very similar model of handling
vblanks it should be treated similarly.
When doing a page flip, EVDI does not wait for real vblank, but
simulates it by adding constant delay. It also does not support
DRM_IOCTL_WAIT_VBLANK.
In contrast to UDL, EVDI uses platform devices, thus instead of 'usb' in
path they all have 'platform'.
It is possible to blacklist by 'platform', so without explicitly saying
'evdi', but it might be misleading when it comes to real reason for it.
Signed-off-by: Dawid Kurek <dawid.kurek@displaylink.com>
commit eac1a2e37b833c179b587107230805ea1fb3dfda
Author: Emil Velikov <emil.velikov@collabora.com>
Date: Thu Aug 3 19:43:28 2017 +0100
dri2: sort DRI2InfoPtr::version checking in ascending order
Makes it easer to follow if 8 is between 7 and 9 ;-)
Signed-off-by: Emil Velikov <emil.velikov@collabora.com>
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
commit 82df2ce38c560915f8c6574052bd56215b649072
Author: Roman Gilg <subdiff@gmail.com>
Date: Tue Aug 22 15:38:26 2017 +0200
xwayland: Avoid repeatedly looping through window ancestor chain
Calling xwl_window_from_window means looping through the window ancestor
chain whenever it is called on a child window or on an automatically
redirected window.
Since these properties and the potential ancestor's xwl_window are constant
between window realization and unrealization, we can omit the looping by
always putting the respective xwl_window in the Window's private field on
its realization. If the Window doesn't feature an xwl_window on its own,
it's the xwl_window of its first ancestor with one.
Signed-off-by: Roman Gilg <subdiff@gmail.com>
Reviewed-by: Pekka Paalanen <pekka.paalanen@collabora.co.uk>
commit 1089d5d518a315963a8cda6c7d47a0ce09de0979
Author: Olivier Fourdan <ofourdan@redhat.com>
Date: Thu Mar 2 11:03:15 2017 +0100
xwayland: add envvar XWAYLAND_NO_GLAMOR
Not all compositors allow for customizing the Xwayland command line,
gnome-shell/mutter for example have the command line and path to
Xwayland binary hardcoded, which makes it harder for users to disable
glamor acceleration in Xwayland (glamor being used by default).
Add an environment variable XWAYLAND_NO_GLAMOR to disable glamor support
in Xwayland.
Signed-off-by: Olivier Fourdan <ofourdan@redhat.com>
Reviewed-by: Eric Engestrom <eric.engestrom@imgtec.com>
commit 5abaa50b292798370a665ace5eec56fd830be226
Author: Eric Anholt <eric@anholt.net>
Date: Fri Sep 1 12:22:59 2017 -0700
meson: Move the BUILD_DATE/TIME setup to configure time.
By having it as a custom_target with build_always, every "ninja -C
build" would rebuild Xorg for the new date/time, even if the rest of
Xorg didn't change.
We could build the rest of Xorg into a static lib, and regenerate
date/time when the static lib changes and link that into a final Xorg,
but BUILD_DATE/TIME is such a dubious feature (compared to including a
git sha, which is easy with meson) it doesn't seem worth the build
time cost.
Signed-off-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Adam Jackson <ajax@redhat.com>
commit 05e7e8b587dd9d37e8beadc72ab993f028c47fa1
Author: Eric Anholt <eric@anholt.net>
Date: Fri Sep 1 12:22:58 2017 -0700
meson: Include BUILD_DATE in the meson xf86Build.h.
Due to a typo, I only had BUILD_TIME present.
Signed-off-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Adam Jackson <ajax@redhat.com>
commit 2b080a14c87fc9e5f77fc3361297ac332aa04f02
Author: Eric Anholt <eric@anholt.net>
Date: Fri Sep 1 12:22:57 2017 -0700
meson: Respect SOURCE_DATE_EPOCH for reproducible builds.
This just copies over Chris Lamb's code from autotools.
Signed-off-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Adam Jackson <ajax@redhat.com>
commit 937ed782ae5e4e0da739f0630d1681b3754f0281
Author: Chris Lamb <lamby@debian.org>
Date: Fri Sep 1 12:22:56 2017 -0700
configure.ac: Make BUILD_{DATE, TIME} respect SOURCE_DATE_EPOCH if set
Whilst working on the Reproducible Builds effort [0], we noticed that
xorg-server could not be built reproducibly. One reason is because it
embeds a "current" build and date time.
This should be compatible with both GNU and BSD date(1).
[0] https://reproducible-builds.org/
v2: Fix change in Y-M-D format that broke the build.
Signed-off-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Adam Jackson <ajax@redhat.com>
commit a49379b6045453c7b787cc638db6afd0d14dce9c
Author: Adam Jackson <ajax@redhat.com>
Date: Tue Sep 12 16:53:24 2017 -0400
fb: Check whether the window is enabled directly
... instead of its root window. Xwayland's rootless mode empties the
root window border clip since its root window has no storage, but
redirected windows (the only kind it can show) will have a non-empty
border clip anyway, cf. the #ifdef COMPOSITE in miComputeClips. With
this change, non-glamor Xwayland's GetImage actually works.
Other acceleration layers may need to change to account for this, but
this appears to be safe for the existing open source drivers. Only the
xfree86 DDX has any problem with losing its framebuffer on VT switch,
and even then only for UMS drivers (which excludes glamor, uxa, and sna
from consideration). This leaves exa, which already contains code to
evict pixmaps to host memory on VT switch. Since the xfree86 core will
still empty the root clip on VT switch, while the root window itself may
not contain a valid image we won't try to touch it, but GetImage from a
redirected window will now work even when switched away.
Acked-by: Keith Packard <keithp@keithp.com>
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit 9869dcb349b49f6d4cc2fab5d927cd8b1d1f463c
Author: Olivier Fourdan <ofourdan@redhat.com>
Date: Wed Jul 26 16:00:38 2017 +0200
glamor: Avoid overflow between box32 and box16 box
glamor_compute_transform_clipped_regions() uses a temporary box32
internally which is copied back to a box16 to init the regions16,
thus causing a potential overflow.
If an overflow occurs, the given region is invalid and the pixmap
init region will fail.
Simply check that the coordinates won't overflow when copying back to
the box16, avoiding a crash later down the line in glamor.
Fixes: https://bugs.freedesktop.org/show_bug.cgi?id=101894
Signed-off-by: Olivier Fourdan <ofourdan@redhat.com>
Tested-by: Fabrice Bellet <fabrice@bellet.info>
Reviewed-by: Adam Jackson <ajax@redhat.com>
commit bd353e9b84e013fc34ed730319d5b63d20977903
Author: Olivier Fourdan <ofourdan@redhat.com>
Date: Wed Jul 26 16:00:37 2017 +0200
glamor: handle NULL source picture
COMPOSITE_REGION() can pass NULL as a source picture, make sure we
handle that nicely in both glamor_composite_clipped_region() and
glamor_composite_choose_shader().
Fixes: https://bugs.freedesktop.org/show_bug.cgi?id=101894
Signed-off-by: Olivier Fourdan <ofourdan@redhat.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
commit 4486d199bd3bcb5b2b8ad9bc54eb11604d9bd653
Author: Thomas Hellstrom <thellstrom@vmware.com>
Date: Wed Sep 6 16:27:54 2017 +0200
glx: Fix visual fbconfig matching with respect to swap method
For the built in visuals, we'd typically select the "best" fbconfig
without considering the swap method. If the client then requests a
specific swap method, say GLX_SWAP_COPY_OML, it may well happen that the
first fbconfig matching requirements would have been paired with the 32-bit
compositing visual, and the client would render a potentially transparent
window.
Fix this so that we try to match fbconfigs with the same swap method to all
built-in visuals. That would guarantee that selecting a specific swap-
method would not influence the chance of getting a compositing visual.
Signed-off-by: Thomas Hellstrom <thellstrom@vmware.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
commit 0fc26310d5b09213c65f50bde444a1758172b016
Author: Thomas Hellstrom <thellstrom@vmware.com>
Date: Wed Sep 6 16:27:53 2017 +0200
glx: Work around a GLX_OML swap method in older dri drivers
The swapMethod config member would typically contain an arbitrary value
on older dri drivers. Fix this so that if we detect an illegal value,
return GLX_SWAP_UNDEFINED_OML.
Signed-off-by: Thomas Hellstrom <thellstrom@vmware.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
commit da29a15874229d78ec61946eacdbbed9871e3664
Author: Emil Velikov <emil.l.velikov@gmail.com>
Date: Thu Sep 29 18:36:43 2016 +0100
glx: remove unused systemTimeExtension
Not even a single DRI2/DRISW driver in mesa ever used this. Appears to be a
dri1 artefact copy/pasted in the dri2/drisw codebase.
Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>
Signed-off-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Eric Anholt <eric@anholt.net>
commit ea82ececbf85a7ac3d0931687f44c57534fde17c
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Wed Sep 6 11:53:02 2017 +1000
test: fix compiler warning
signal-logging.c:182:12: warning: suggest parentheses around assignment used as truth value [-Wparentheses]
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit e12e02b2e6ee4582ba902ec1d1e5309abc78e282
Author: Emil Velikov <emil.l.velikov@gmail.com>
Date: Sun Apr 17 17:24:53 2016 +0100
glamor: use the lowercase xnf.*alloc API
Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>
Reviewed-by: Olivier Fourdan <ofourdan@redhat.com>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 17e488570067cdf499c7ad17ab198508c6f1531d
Author: Emil Velikov <emil.l.velikov@gmail.com>
Date: Sun Apr 17 17:24:52 2016 +0100
xwayland: use the lowercase xnf.*alloc API
Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>
Reviewed-by: Olivier Fourdan <ofourdan@redhat.com>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit cdd0352ba05d4d8482aaca41797e05d40e58da36
Author: Olivier Fourdan <ofourdan@redhat.com>
Date: Thu Aug 31 10:23:00 2017 +0200
xwayland: Fix a segfault with pointer locking
Xwayland would crash in some circumstances while trying to issue a
pointer locking when the cursor is hidden when there is no seat focus
window set.
The crash signature looks like:
#0 zwp_pointer_constraints_v1_lock_pointer ()
#1 xwl_pointer_warp_emulator_lock () at xwayland-input.c:2584
#2 xwl_seat_maybe_lock_on_hidden_cursor () at xwayland-input.c:2756
#3 xwl_seat_maybe_lock_on_hidden_cursor () at xwayland-input.c:2765
#4 xwl_seat_cursor_visibility_changed () at xwayland-input.c:2768
#5 xwl_set_cursor () at xwayland-cursor.c:245
#6 miPointerUpdateSprite () at mipointer.c:468
#7 miPointerDisplayCursor () at mipointer.c:206
#8 CursorDisplayCursor () at cursor.c:150
#9 AnimCurDisplayCursor () at animcur.c:220
#10 ChangeToCursor () at events.c:936
#11 ActivatePointerGrab () at events.c:1542
#12 GrabDevice () at events.c:5120
#13 ProcGrabPointer () at events.c:4908
#14 Dispatch () at dispatch.c:478
#15 dix_main () at main.c:276
xwl_pointer_warp_emulator_lock() tries to use the surface from the
xwl_seat->focus_window leading to a NULL pointer dereference when that
value is NULL.
Check that xwl_seat->focus_window is not NULL earlier in the stack in
xwl_seat_maybe_lock_on_hidden_cursor() and return early if not the case
to avoid the crash.
Fixes: https://bugs.freedesktop.org/show_bug.cgi?id=102474
Signed-off-by: Olivier Fourdan <ofourdan@redhat.com>
Acked-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 3fbc3c3eefd3803d0c4e86e42595d8a891aeb5f2
Author: Olivier Fourdan <ofourdan@redhat.com>
Date: Fri Sep 1 09:35:33 2017 +0200
xwayland: No grab handler without protocol support
If the compositor has no support for the Xwayland keyboard grab
protocol, there is no need to set-up our keyboard grab handler.
Signed-off-by: Olivier Fourdan <ofourdan@redhat.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit aabf65d2a0206bd1a9c6e9a9f3153ded873dfd43
Author: Adam Jackson <ajax@redhat.com>
Date: Wed Aug 30 15:11:45 2017 -0400
os: Fix warning in LockServer
The meson build gives me:
../os/utils.c: In function ‘LockServer’:
../os/utils.c:310:40: warning: ‘snprintf’ output may be truncated before the last format character [-Wformat-truncation=]
snprintf(pid_str, sizeof(pid_str), "%10ld\n", (long) getpid());
^~~~~~~~~
../os/utils.c:310:5: note: ‘snprintf’ output between 12 and 13 bytes into a destination of size 12
snprintf(pid_str, sizeof(pid_str), "%10ld\n", (long) getpid());
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
Which seems to be due to the %d part meaning that a negative number's -
sign would be one wider than we're expecting. Fine, just coerce it to
unsigned.
Signed-off-by: Adam Jackson <ajax@redhat.com>
Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
commit 3bc32a7f593cbd2747237621135ef5196bc1e15a
Author: Adam Jackson <ajax@redhat.com>
Date: Tue Aug 22 12:19:56 2017 -0400
glx: Fix error generation for non-reply vendor private requests
Discarding the return value here is just wrong.
Signed-off-by: Adam Jackson <ajax@redhat.com>
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
commit 591ac95f73b1c1ea681c45e4da9afa2b1d505abe
Author: Emil Velikov <emil.l.velikov@gmail.com>
Date: Tue Aug 22 11:48:31 2017 +0100
xwin: automake: remove unused {SRCS, DEFS}_{NATIVEGDI, PRIMARYFB}
Left over from the following commits:
8465ee788fd xwin: Remove native GDI engine (v2)
c79f824bf66 xwin: Remove primary DirectDraw engine
v2: drop leading - in the makefile
Cc: Adam Jackson <ajax@redhat.com>
Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>
Reviewed-by: Jon Turney <jon.turney@dronecode.org.uk> (v1)
commit 69fe6156ec6cd37657d4e5af1c6f21ebf72b8fd7
Author: Emil Velikov <emil.l.velikov@gmail.com>
Date: Tue Aug 22 11:48:30 2017 +0100
xwin: remove always true/set XWIN_RANDR conditional/define
Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>
Reviewed-by: Jon Turney <jon.turney@dronecode.org.uk>
commit 8f1a200d0be261a60bb9e8e72d8704cef2d91cd4
Author: Emil Velikov <emil.l.velikov@gmail.com>
Date: Tue Aug 22 11:48:29 2017 +0100
xwin: remove always true/set XWIN_MULTIWINDOW conditional/define
v2: drop trailing endif (Jon)
Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>
Reviewed-by: Jon Turney <jon.turney@dronecode.org.uk>
commit 9d00f6190a8e5cc4ebda9b315d7c0a0782b58501
Author: Emil Velikov <emil.l.velikov@gmail.com>
Date: Tue Aug 22 11:48:28 2017 +0100
xwin: remove always true/set XWIN_CLIPBOARD conditional/define
v2: drop trailing endif (Jon)
Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>
Reviewed-by: Jon Turney <jon.turney@dronecode.org.uk>
commit 1ef65692258136d6e36d0d9d6c5efad9877c9ceb
Author: Emil Velikov <emil.l.velikov@gmail.com>
Date: Tue Aug 22 11:48:27 2017 +0100
os: make MitGenerateCookie() independent of XCSECURITY
Analogous to previous commit.
Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>
Reviewed-by: Jon Turney <jon.turney@dronecode.org.uk>
commit 292ee7151631cabbd928847a5a2ca47e14a06b75
Author: Emil Velikov <emil.l.velikov@gmail.com>
Date: Tue Aug 22 11:48:26 2017 +0100
os: make GenerateRandomData() independent of XCSECURITY
The function itself does not depend on the macro. Move it outside
of the ifdef guard and remove the identical copy in XWIN.
This is step 1 towards removing the duplication in winauth.c and moving
the OS specifics to os/
Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>
Reviewed-by: Jon Turney <jon.turney@dronecode.org.uk>
commit 8aee1f40eaa3527c90698d6826ce8314b8b5a92a
Author: Emil Velikov <emil.l.velikov@gmail.com>
Date: Tue Aug 22 11:48:25 2017 +0100
xwin/glx: remove unused __GLXWinScreen::glx_enable_bits
All the relevant code already uses the ::base::glx_enable_bits one.
Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>
Reviewed-by: Jon Turney <jon.turney@dronecode.org.uk>
commit 43878fa8772d8642f601d65e78d2f702ecc0de41
Author: Adam Jackson <ajax@redhat.com>
Date: Wed Aug 16 14:49:18 2017 -0400
glx: Remove some unused stuff from glxserver.h
Signed-off-by: Adam Jackson <ajax@redhat.com>
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
Reviewed-by: Keith Packard <keithp@keithp.com>
commit 3d81abba9ca2f9d57b4c293e3b7fcb32ef853f44
Author: Adam Jackson <ajax@redhat.com>
Date: Wed Aug 16 14:49:17 2017 -0400
glx: Inline some reply swapping code
Signed-off-by: Adam Jackson <ajax@redhat.com>
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
commit 51bab63b7353319c51ec2f1adaed95d86e4f6119
Author: Adam Jackson <ajax@redhat.com>
Date: Wed Aug 16 14:49:16 2017 -0400
glx: Remove True/False defines
Those are xlib spellings, we say TRUE/FALSE pretty consistently
elsewhere in the server.
Signed-off-by: Adam Jackson <ajax@redhat.com>
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
Reviewed-by: Keith Packard <keithp@keithp.com>
commit 8e3b26ceaa86eaf98a78f6b84f46a4a86aed8ef8
Author: Michel Dänzer <michel.daenzer@amd.com>
Date: Fri Apr 14 19:08:41 2017 +0900
Make PixmapDirtyUpdateRec::src a DrawablePtr
This allows making the master screen's pixmap_dirty_list entries
explicitly reflect that we're now tracking the root window instead of
the screen pixmap, in order to allow Present page flipping on master
outputs while there are active slave outputs.
Define HAS_DIRTYTRACKING_DRAWABLE_SRC for drivers to check, but leave
HAS_DIRTYTRACKING_ROTATION defined as well to make things slightly
easier for drivers.
Reviewed-by: Adam Jackson <ajax@redhat.com>
commit c52f77e4ca2cda878da341a6228e6411eec7b1a0
Author: Peter Harris <pharris@opentext.com>
Date: Mon Aug 14 15:54:36 2017 -0400
meson: Fix epoll detection
The epoll code depends on epoll_create1, not epoll_create.
Signed-off-by: Peter Harris <pharris@opentext.com>
Signed-off-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Eric Anholt <eric@anholt.net>
commit 27500ee82e97ef8a6b3199c2d7b623523c1ee2c1
Author: Eric Anholt <eric@anholt.net>
Date: Mon Jul 10 12:08:29 2017 -0700
glamor: Scissor Render composite operations to the bounds of the drawing.
Unlike the previous two fixes, this one introduces new GL calls and
statechanges of the scissor. However, given that our Render drawing
already does CPU side transformation and inefficient box upload, this
shouldn't be a limiting factor for Render acceleration.
Surprisingly, it improves x11perf -comppixwin10 -repeat 1 -reps 10000
on i965 by 3.21191% +/- 1.79977% (n=50).
v2: Make the jump to the exit land after scissor disable.
Signed-off-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Keith Packard <keithp@keithp.com>
commit e6ab3b1109e72a1512c6b7b92dd84525ad8c8052
Author: Eric Anholt <eric@anholt.net>
Date: Thu Jul 6 16:15:17 2017 -0700
glamor: Scissor CopyArea to the bounds of the drawing.
Like the previous fix to rectangles, this reduces the area drawn on
tiled renderers by letting the CPU-side tile setup know what tiles
might be drawn at all.
Surprisingly, it improves x11perf -copypixwin1 -repeat 1 -reps 10000
on i965 by 2.93185% +/- 1.5561% (n=90).
v2: Drop extra glamor_bounds_union_box() from previous debugging
(caught by Mark Marshall).
Signed-off-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Keith Packard <keithp@keithp.com> (v1)
commit 60cc7e367a2a5e6014f193105dafd47a4d598fd9
Author: Eric Anholt <eric@anholt.net>
Date: Thu Jul 6 15:43:14 2017 -0700
glamor: Scissor rectangle drawing to the bounds of the rects.
Scissors provide a critical hint to tiled renderers as to what tiles
need to be load/stored because they could be modified by the
rendering.
The bounds calculation here is limited to when we have a small number
of rects (large enough to cover rounded window corners, but probably
not xeyes) to avoid overhead on desktop GL.
No performance difference on i965 with x11perf -rect1 -repeat 1 -reps
10000 (n=50)
v2: Clamp rectangle bounds addition.
Signed-off-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Keith Packard <keithp@keithp.com>
commit f2110157713cf22c8b5c46a0d5416fdb033c27d3
Author: Eric Anholt <eric@anholt.net>
Date: Tue May 9 15:48:27 2017 -0700
test: Remove unused ddxstubs.c
Signed-off-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Keith Packard <keithp@keithp.com>
commit f80119120c487581ac050ce741808f7c8f438f35
Author: Adam Jackson <ajax@redhat.com>
Date: Thu Jul 27 16:02:28 2017 -0400
composite: Make compIsAlternateVisual safe even if Composite is off
As of ea483af9 we're calling this unconditionally from the GLX code so
the synthetic visual is in a lower select group. If Composite has been
disabled then GetCompScreen() will return NULL, and this would crash.
Rather than force the caller to check first, just always return FALSE if
Composite is disabled (which is correct, since none of the visuals will
be synthetic in that case).
Signed-off-by: Adam Jackson <ajax@redhat.com>
Reviewed-by: Aaron Plattner <aplattner@nvidia.com>
commit b06a85e7fd6ddac58dd97e5d7ce3b5ea9553c8f6
Author: Emil Velikov <emil.velikov@collabora.com>
Date: Mon Jul 31 14:13:48 2017 +0100
glx: remove unused GlxSetVisualConfigs stub
The function was an empty since 2008 at least. Drop it since no
drivers use it any more.
Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Emil Velikov <emil.velikov@collabora.com>
commit e8f190b445ae10b12896ee396cd8d57f6b6b8cc4
Author: Eric Anholt <eric@anholt.net>
Date: Fri Aug 4 13:19:01 2017 -0700
travis: Request a new docker image with xkb-data and xkbcomp installed.
Xvfb was erroring out with:
XKB: Failed to compile keymap
Keyboard initialization failed. This could be a missing or incorrect
setup of xkeyboard-config.
(EE) Fatal server error:
(EE) Failed to activate virtual core keyboard: 2(EE)
With this change, we can now run my xsync regression test on Travis.
Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Eric Anholt <eric@anholt.net>
commit b62e486c4e3d7411f3e70b610af7f8b9dd5e8a73
Author: Eric Anholt <eric@anholt.net>
Date: Fri Aug 4 13:19:00 2017 -0700
travis: Set prefix to /usr, so we find xkbcomp.
Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Eric Anholt <eric@anholt.net>
commit 2d50e32e0ba1045f8c73a14335743ae98121d102
Author: Eric Anholt <eric@anholt.net>
Date: Tue Aug 1 13:11:25 2017 -0700
meson: Fix xwayland build since xwayland-keyboard-grab.
The version detect was erroring out with 1.9 protos installed, and we
weren't building the new code.
Signed-off-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 0a448d133f4f1c913b1c2cb05accff31c74a3dbf
Author: Olivier Fourdan <ofourdan@redhat.com>
Date: Wed Jul 12 11:51:08 2017 +0200
xwayland: Add grab protocol support
The keyboard grabbing protocol for Xwayland is included in
wayland-protocol 1.9.
Update the wayland-protocol required version in both configure and meson
builds and add support for this new protocol in Xwayland.
Signed-off-by: Olivier Fourdan <ofourdan@redhat.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit abe49b009064c38823fac17c373fd5f1a390b3ab
Author: Jan Beich <jbeich@freebsd.org>
Date: Fri Jul 7 19:59:05 2017 +0200
dix: unbreak --with-dtrace (default) on FreeBSD 11.1+
gmake[2]: Entering directory '/path/to/xserver/dix'
/usr/sbin/dtrace -G -C -o dtrace-dix.o -s ../dix/Xserver.d .libs/atom.o ...
dtrace: failed to compile script ../dix/Xserver.d: line 26: useless declaration
gmake[2]: *** [Makefile:1007: dtrace-dix.o] Error 1
Signed-off-by: Jan Beich <jbeich@FreeBSD.org>
Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
commit c967e4cd8ba50034b6e02d87df10d04edf15ccf6
Author: Emil Velikov <emil.velikov@collabora.com>
Date: Mon Jul 31 14:06:48 2017 +0100
glx: don't export __glXDRISWRastProvider
The symbol is used only internally and is not part of the API/ABI.
Signed-off-by: Emil Velikov <emil.velikov@collabora.com>
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
commit c09e906d61a0855a8202e58ba72ed6bb3b08f37f
Author: Emil Velikov <emil.velikov@collabora.com>
Date: Mon Jul 31 14:06:47 2017 +0100
glx: fix typo becuase -> because
Signed-off-by: Emil Velikov <emil.velikov@collabora.com>
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
commit db0dd06ddf47d5190f2349ed8b0e71caa9e8e1eb
Author: Adam Jackson <ajax@redhat.com>
Date: Thu Jul 27 16:02:33 2017 -0400
glx: Allow arbitrary context attributes for direct contexts
For direct contexts, most context attributes don't require any
particular awareness on the part of the server. Examples include
GLX_ARB_create_context_no_error and GLX_ARB_context_flush_control, where
all of the behavior change lives in the renderer; since that's on the
client side for a direct context, there's no reason for the X server to
validate the attribute.
The context attributes will still be validated on the client side, and
we still validate attributes for indirect contexts since the server
implementation might need to handle them. For example, the indirect
code might internally use ARB_context_flush_control for all contexts, in
which case it would need to manually emit glFlush when the client
switches between two indirect contexts that didn't request the no-flush
attribute.
Signed-off-by: Adam Jackson <ajax@redhat.com>
Reviewed-by: Eric Anholt <eric@anholt.net>
commit 3050d277616ef472a24d8ccd24afcbf8e31ed80e
Author: Adam Jackson <ajax@redhat.com>
Date: Tue Jun 27 11:18:48 2017 -0400
xfree86: Fix X -configure driver sort yet again
There were two bugs here: The comparison function was not stable when
one or more of the drivers being compared is a fallback, and the last
driver in the list would never be moved.
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit 6f9939525c31f1f2d8d6c137a46404278384b4bf
Author: Adam Jackson <ajax@redhat.com>
Date: Mon Jun 26 12:43:54 2017 -0400
modesetting: Fix PCI initialization on non-zero domains
libdrm's busid matching for the legacy three-integer bus string format
simply ignores the domain number, rather than what we were doing here of
packing the domain into the bus number. Whatever, just use the existing
code to build a busid string, since that gets the domain right.
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit d16133e3e293fe16b291114d344fbd5a61d5ed65
Author: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
Date: Thu Jul 20 19:48:26 2017 -0700
glx: Only include compositeext.h if COMPOSITE is supported
Regressed-in: ea483af99a6351323afe00a0b630cd63310efdb1
Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
commit dd0b721c977e88d7c3830cc2a672c2793bca4fa0
Author: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
Date: Tue Jul 18 21:35:49 2017 -0700
XQuartz: Hack around an issue that can occur on macOS due to background apps incorrectly stealing focus
Works around <rdar://problem/7150340>.
Tested-by: Martin Otte <martinjotte@gmail.com>
Tested-by: Tom Lane <tgl@sss.pgh.pa.us>
Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
commit 211e05ac85a294ef361b9f80d689047fa52b9076
Author: Michal Srb <msrb@suse.com>
Date: Fri Jul 7 17:21:46 2017 +0200
Xi: Test exact size of XIBarrierReleasePointer
Otherwise a client can send any value of num_barriers and cause reading or swapping of values on heap behind the receive buffer.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit abb031e731f5c159add1b3351de9c4bb121bf00a
Author: Rodrigo Vivi <rodrigo.vivi@intel.com>
Date: Thu Jun 29 13:29:58 2017 -0700
dri2: Sync i965_pci_ids.h from Mesa.
Copied from Mesa with no modifications.
Gives us Coffee Lake and Cannon Lake PCI IDs.
Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Acked-by: Kenneth Graunke <kenneth@whitecape.org>
commit 05a4396f08c83d9261b8ad16908d9e2730bd4bbf
Author: Emil Velikov <emil.velikov@collabora.com>
Date: Thu Jun 29 02:17:06 2017 +0100
glamor: update "required EGL extensions" comment
The extensions listed have not been needed in a while. Replace with the
only remaining requirement.
Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Emil Velikov <emil.velikov@collabora.com>
commit 04511a0476b5c860e7d157b01080dff94d935f74
Author: Adam Jackson <ajax@redhat.com>
Date: Thu Jun 29 10:32:00 2017 -0400
wayland: Sync drm.xml with Mesa
... where it is named src/egl/wayland/wayland-drm/wayland-drm.xml and
has its requests sorted by protocol version number, avoiding a warning
from wayland-scanner.
Signed-off-by: Adam Jackson <ajax@redhat.com>
Reviewed-by: Daniel Stone <daniels@collabora.com>
commit ce393de0efb8626d15f3b97c97916971a6aefebd
Author: Dave Airlie <airlied@redhat.com>
Date: Fri Jun 23 09:29:13 2017 +1000
modesetting: handle NULL cursor in drmmode_set_cursor.
We had a bug reported with a touchscreen where we could end up
in here with a NULL cursor, so let's not crash the X server.
Signed-off-by: Dave Airlie <airlied@redhat.com>
Reviewed-and-Tested-by: Daniel Martin <consume.noise@gmail.com>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 43527d31810fe94a5eb4b2543bbc8eb26b1654b7
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Tue Jul 4 06:51:58 2017 +1000
xfree86: link to libinput(4) from the xorg.conf man page
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Pekka Paalanen <pekka.paalanen@collabora.co.uk>
commit edaad0eff48219787d27f7723cd3d4d9b293de96
Author: Adam Jackson <ajax@redhat.com>
Date: Thu Jun 29 13:57:37 2017 -0400
automake: Add hw/xfree86/xkb/meson.build to EXTRA_DIST
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit 06419a5b17180126d2507c8699229e07f5b2c434
Author: Emil Velikov <emil.velikov@collabora.com>
Date: Thu Jun 29 01:55:25 2017 +0100
glamor: remove no longer needed KHR_gl_texture_2D_image requirement
The code that needed it was introduced with commit 7cfd9cc2327 ("Add
DRI3 support to glamor") back in 2013. And was nuked a couple of years
ago with commit 51984dddfcc ("glamor: Delay making pixmaps shareable
until we need to.")
Signed-off-by: Emil Velikov <emil.velikov@collabora.com>
Reviewed-by: Eric Anholt <eric@anholt.net>
commit 47a7b63f7455eaeacb634fd800e924f2087dacbd
Author: Jon TURNEY <jon.turney@dronecode.org.uk>
Date: Mon Jun 26 14:54:06 2017 +0100
meson: Use --export-all-symbols when building PE/COFF objects
Reviewed-by: Adam Jackson <ajax@redhat.com>
commit b34abb3d2da46339d59a0feefd2240790a6a6a0e
Author: Jon TURNEY <jon.turney@dronecode.org.uk>
Date: Mon Jun 26 14:54:05 2017 +0100
meson: Shuffle around subdirs so we build Xorg loadable modules after Xorg
Reviewed-by: Adam Jackson <ajax@redhat.com>
commit fbdd73fac68383c93f6f5c6a7615860503039999
Author: Jon TURNEY <jon.turney@dronecode.org.uk>
Date: Mon Jun 26 14:54:04 2017 +0100
Move statically linked xorgxkb files from dixmods to a separate directory
[ajax: Fixed test/Makefile.am as well]
Reviewed-by: Adam Jackson <ajax@redhat.com>
commit 5c8fb7d128e312e6c01cd40c7ada072c4b5f3776
Author: Adam Jackson <ajax@redhat.com>
Date: Wed Jun 21 15:58:43 2017 -0400
xfree86: Move DRICreatePCIBusID to xf86Pci.h
xf86str.h is parsed into sdksyms unconditionally but the symbol is only
defined when building with PCI support. Move the decl to a header that
sdksyms only parses when building PCI support.
Signed-off-by: Adam Jackson <ajax@redhat.com>
Reviewed-by: Jon Turney <jon.turney@dronecode.org.uk>
commit 525db17e04d5cabaeefd20e38cebe7d606047a76
Author: Adam Jackson <ajax@redhat.com>
Date: Fri Jun 16 15:44:52 2017 -0400
glx/drisw: Use scratch GCs for swrastPutImage
The scratch GC defaults to the same state as our persistent GCs. Except
for the "draw" GC, which would generate graphics exposures for... well,
no reason really, PutImage doesn't generate graphics exposures.
Signed-off-by: Adam Jackson <ajax@redhat.com>
Reviewed-by: Keith Packard <keithp@keithp.com>
commit ecc5e362985d1f649c29ac5f93be19851eaf7d87
Author: Adam Jackson <ajax@redhat.com>
Date: Fri Jun 16 15:44:51 2017 -0400
glx/drisw: Remove unused glx_enable_bits
Sloppy of me!
Signed-off-by: Adam Jackson <ajax@redhat.com>
Acked-by: Keith Packard <keithp@keithp.com>
commit a6c23ef31a4e5aea19ddabdf4a0760f4c48f1ebe
Author: Adam Jackson <ajax@redhat.com>
Date: Fri Jun 16 15:44:50 2017 -0400
glx/dri2: Don't chirp when falling back to software
This isn't an error if the screen isn't accelerated in the first place.
Signed-off-by: Adam Jackson <ajax@redhat.com>
Acked-by: Keith Packard <keithp@keithp.com>
commit 0b1831d043028f7dd6accca19a81e2abd9a145b5
Author: Adam Jackson <ajax@redhat.com>
Date: Fri Jun 16 15:44:49 2017 -0400
glx: Remove some indirection around EXT_texture_from_pixmap
Signed-off-by: Adam Jackson <ajax@redhat.com>
Reviewed-by: Keith Packard <keithp@keithp.com>
commit c33541e59e338cd53f89d94a6898555d350e84aa
Author: Adam Jackson <ajax@redhat.com>
Date: Fri Jun 16 15:44:48 2017 -0400
glx: Remove __glXReply
Static data bad, hulk smash.
Signed-off-by: Adam Jackson <ajax@redhat.com>
Reviewed-by: Keith Packard <keithp@keithp.com>
commit d6db66811643d3762716f6b144a7358572216a4f
Author: Adam Jackson <ajax@redhat.com>
Date: Fri Jun 16 15:44:47 2017 -0400
dmx: Remove some not-very-interesting debug prints
gcc/glibc think the snprintf in dmxExecOS() might truncate. Yes, it
might, and we also don't care. Just delete all this.
Signed-off-by: Adam Jackson <ajax@redhat.com>
Acked-by: Keith Packard <keithp@keithp.com>
commit 17ad6e5d5616039021455bc821d6ee2497f7ebde
Author: Adam Jackson <ajax@redhat.com>
Date: Fri Jun 16 15:44:46 2017 -0400
dmx: Silence an unused-result warning
Modern glibc is very insistent that you care about whether write()
succeeds:
../hw/dmx/input/usb-keyboard.c: In function ‘kbdUSBCtrl’:
../hw/dmx/input/usb-keyboard.c:292:9: warning: ignoring return value of ‘write’, declared with attribute warn_unused_result [-Wunused-result]
write(priv->fd, &event, sizeof(event));
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
Signed-off-by: Adam Jackson <ajax@redhat.com>
Reviewed-by: Keith Packard <keithp@keithp.com>
commit fbc4da6fef2a0d2111284a19c26d83686ebcbd1f
Author: Adam Jackson <ajax@redhat.com>
Date: Fri Jun 16 15:44:44 2017 -0400
xfree86: Move DRICreatePCIBusID to the PCI code
This symbol is used by some DRI2+ drivers and there's nothing
DRI1-specific about it.
Signed-off-by: Adam Jackson <ajax@redhat.com>
Acked-by: Keith Packard <keithp@keithp.com>
commit b723da8390d2fe1bf048247302416b37972a0cc3
Author: Adam Jackson <ajax@redhat.com>
Date: Fri Jun 16 15:44:43 2017 -0400
xfree86: Remove unused xf86EnableVTSwitch
Signed-off-by: Adam Jackson <ajax@redhat.com>
Acked-by: Keith Packard <keithp@keithp.com>
commit f44e0af4daaad5b18d79f2076bc98d6e79f638af
Author: Adam Jackson <ajax@redhat.com>
Date: Fri Jun 16 15:44:42 2017 -0400
dix: Remove extension aliases
This appears to be essentially unused. The only known client-side
library for the SELinux extension is xcb, which does not look for the
name "Flask". The "SGI-GLX" alias for GLX appears to be a bit of
superstition at this point, NVIDIA's driver does not expose it and Mesa
does not check for it.
Signed-off-by: Adam Jackson <ajax@redhat.com>
Acked-by: Keith Packard <keithp@keithp.com>
commit 88e807d4fa90165868929190f601beef18252f57
Author: Adam Jackson <ajax@redhat.com>
Date: Fri Jun 16 15:44:41 2017 -0400
include: Remove some unused macros
Signed-off-by: Adam Jackson <ajax@redhat.com>
Reviewed-by: Keith Packard <keithp@keithp.com>
commit d2e57f71ad16f1e677dd542a8bc0db87dfa9791d
Author: Michel Dänzer <michel.daenzer@amd.com>
Date: Mon Jun 19 19:05:32 2017 +0900
xfree86: Document BusID PCI domain format in ddxDesign.xml
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
Signed-off-by: Michel Dänzer <michel.daenzer@amd.com>
commit 3b0fd9421add9f0ca8958ced0f39b2da21143c22
Author: Michel Dänzer <michel.daenzer@amd.com>
Date: Mon Jun 19 19:05:31 2017 +0900
xfree86: Document BusID PCI domain format in xorg.conf manpage
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
Signed-off-by: Michel Dänzer <michel.daenzer@amd.com>
commit 8e00dc59b51da7e0d3978c26b1884c4767aa2dc2
Author: Michel Dänzer <michel.daenzer@amd.com>
Date: Mon Jun 19 19:05:30 2017 +0900
xfree86: Fix printing of PCI domain/bus in xf86MatchPciInstances
It was attempting to use the <bus>@<domain> format accepted by the BusID
stanza, but the two values were swapped.
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
Signed-off-by: Michel Dänzer <michel.daenzer@amd.com>
commit e905b19a53f96013c4417bec993a1dea5a3b0a5f
Author: Michel Dänzer <michel.daenzer@amd.com>
Date: Mon Jun 19 19:05:29 2017 +0900
xfree86: Print BusID stanza compatible bus IDs for found devices
The PCI domain has to be specified like this:
"PCI:<bus>@<domain>:<device>:<function>"
Example before:
(--) PCI:*(0:0:1:0) 1002:130f:1043:85cb [...]
(--) PCI: (0:1:0:0) 1002:6939:1458:229d [...]
after:
(--) PCI:*(0@0:1:0) 1002:130f:1043:85cb [...]
(--) PCI: (1@0:0:0) 1002:6939:1458:229d [...]
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
Signed-off-by: Michel Dänzer <michel.daenzer@amd.com>
commit fb212f2c1bcfb015112aa665dd1f25d9b80f86fc
Author: Jon Turney <jon.turney@dronecode.org.uk>
Date: Sat Jun 17 14:32:30 2017 +0100
meson: Make VBE and VGAHW modules optional
Don't build them on platforms where they aren't meaningful.
Note that autoconf defines WITH_VGAHW when building the VGAHW module, but
that doesn't seem to be used anywhere, so we just drop that.
Signed-off-by: Jon Turney <jon.turney@dronecode.org.uk>
Reviewed-by: Eric Anholt <eric@anholt.net>
commit 6d2b7d33678e7a881ebdb5ceb4a32509ad3ee930
Author: Jon Turney <jon.turney@dronecode.org.uk>
Date: Thu May 4 14:08:48 2017 +0100
meson: Restore stub ossupport
Don't build BSD ossupport when there is no specific support, build stubs
Signed-off-by: Jon Turney <jon.turney@dronecode.org.uk>
Reviewed-by: Eric Anholt <eric@anholt.net>
commit 4212c884c423e5ce2cd3b4d67c0d656475fddc79
Author: Michel Dänzer <michel.daenzer@amd.com>
Date: Fri Jun 16 11:30:03 2017 +0900
xfree86/modes: Use RRTransformEqual in xf86RandR12CrtcSet
The memcmp didn't catch when e.g. only the filter changed. Tested by
alternately running
xrandr --output DVI-I-0 --scale-from 3840x2160 --filter bilinear
xrandr --output DVI-I-0 --scale-from 3840x2160 --filter nearest
Reviewed-by: Aaron Plattner <aplattner@nvidia.com>
commit 091af80be48c37f16c679d35fc12ad33e6b0cd74
Author: Aaron Plattner <aplattner@nvidia.com>
Date: Thu Jun 15 14:28:27 2017 -0700
randr: Use RRTransformEqual in RRCrtcPendingTransform
Currently, RRCrtcPendingTransform returns false unless the
transformation matrix itself is changing. This makes RRCrtcSet skip
doing anything if the only thing that is changing is the transform
filter.
There's already a function for comparing RRTransformPtrs, so use that
instead.
Tested by running
xrandr --output DP-1 --mode 1920x1080 --rate 144 --scale 0.5x0.5 --filter nearest
follwed by
xrandr --output DP-1 --mode 1920x1080 --rate 144 --scale 0.5x0.5 --filter bilinear
Signed-off-by: Aaron Plattner <aplattner@nvidia.com>
Reviewed-and-Tested-by: Michel Dänzer <michel.daenzer@amd.com>
commit ba336b24052122b136486961c82deac76bbde455
Author: Michal Srb <msrb@suse.com>
Date: Wed May 24 15:54:42 2017 +0300
Xi: Do not try to swap GenericEvent.
The SProcXSendExtensionEvent must not attempt to swap GenericEvent because
it is assuming that the event has fixed size and gives the swapping function
xEvent-sized buffer.
A GenericEvent would be later rejected by ProcXSendExtensionEvent anyway.
Signed-off-by: Michal Srb <msrb@suse.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 8caed4df36b1f802b4992edcfd282cbeeec35d9d
Author: Michal Srb <msrb@suse.com>
Date: Wed May 24 15:54:41 2017 +0300
Xi: Verify all events in ProcXSendExtensionEvent.
The requirement is that events have type in range
EXTENSION_EVENT_BASE..lastEvent, but it was tested
only for first event of all.
Signed-off-by: Michal Srb <msrb@suse.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 215f894965df5fb0bb45b107d84524e700d2073c
Author: Michal Srb <msrb@suse.com>
Date: Wed May 24 15:54:40 2017 +0300
dix: Disallow GenericEvent in SendEvent request.
The SendEvent request holds xEvent which is exactly 32 bytes long, no more,
no less. Both ProcSendEvent and SProcSendEvent verify that the received data
exactly match the request size. However nothing stops the client from passing
in event with xEvent::type = GenericEvent and any value of
xGenericEvent::length.
In the case of ProcSendEvent, the event will be eventually passed to
WriteEventsToClient which will see that it is Generic event and copy the
arbitrary length from the receive buffer (and possibly past it) and send it to
the other client. This allows clients to copy unitialized heap memory out of X
server or to crash it.
In case of SProcSendEvent, it will attempt to swap the incoming event by
calling a swapping function from the EventSwapVector array. The swapped event
is written to target buffer, which in this case is local xEvent variable. The
xEvent variable is 32 bytes long, but the swapping functions for GenericEvents
expect that the target buffer has size matching the size of the source
GenericEvent. This allows clients to cause stack buffer overflows.
Signed-off-by: Michal Srb <msrb@suse.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 05442de962d3dc624f79fc1a00eca3ffc5489ced
Author: Michal Srb <msrb@suse.com>
Date: Wed May 24 15:54:39 2017 +0300
Xi: Zero target buffer in SProcXSendExtensionEvent.
Make sure that the xEvent eventT is initialized with zeros, the same way as
in SProcSendEvent.
Some event swapping functions do not overwrite all 32 bytes of xEvent
structure, for example XSecurityAuthorizationRevoked. Two cooperating
clients, one swapped and the other not, can send
XSecurityAuthorizationRevoked event to each other to retrieve old stack data
from X server. This can be potentialy misused to go around ASLR or
stack-protector.
Signed-off-by: Michal Srb <msrb@suse.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit d82c3cee02a99cf7861d1effaa5c7d38683a7783
Author: Eric Anholt <eric@anholt.net>
Date: Thu Jun 1 13:59:54 2017 -0700
travis: Enable ccache.
We bind-mount the cache directory into the container. Cuts build time
from about 4 minutes to 2.
Signed-off-by: Eric Anholt <eric@anholt.net>
commit 01dfb65ee2e34148718d3f95dfd4629024edba84
Author: Eric Anholt <eric@anholt.net>
Date: Thu Jun 1 12:29:12 2017 -0700
travis: Add a build script for Travis CI.
This currently does a meson build using a docker image I've prepared.
The Dockerfile source is at:
https://github.com/anholt/xserver-travis
Docker proved to be necessary to cut the build time per Travis push.
If some day we end up using meson in more of the X stack, we may be
able to move more dependencies out of the docker image and into the CI
build (putting the I in CI). Until then, we'll have to do docker
image rebuilds when dependencies are added/updated.
To enable Travis CI on your github repository, see the first two steps
of the docs at:
https://docs.travis-ci.com/user/getting-started/
Once you do that, pushing branches to your github repo will trigger
builds, which will send you email if they fail. Current build status
can be veiewed your account on travis-ci.org:
https://travis-ci.org/anholt/xserver
commit fda2b064a0ebd223e8a39fd19f5c5ad1da0776e8
Author: Eric Anholt <eric@anholt.net>
Date: Thu Jun 1 12:29:11 2017 -0700
meson: Fix test for whether we've built glamor-EGL.
This matches the test we use for going into the glamor_egl subdir in
../../meson.build.
commit 75bf302ed20f4b9794f71f84c1da2b9fcd689356
Author: Eric Anholt <eric@anholt.net>
Date: Fri Jun 2 09:12:41 2017 -0700
dmx: Remove includes of glxtokens.h
Our top-level glx.h include already provides all of the tokens we use,
and fixes redefinition warnings in the meson build.
Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Eric Anholt <eric@anholt.net>
commit f3689f637f5ac0fb6c231a470e65b39aa5e9ba20
Author: Keith Packard <keithp@keithp.com>
Date: Wed May 17 09:57:29 2017 -0700
os: Set oc->fd to -1 when connection is closed
This ensures that we don't use the now-closed file descriptor in the
future.
Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit d05c754e1bde895589fb514d8f518afeccecbc05
Author: Keith Packard <keithp@keithp.com>
Date: Wed May 17 09:57:28 2017 -0700
os: Check oc->trans_conn before using oc->fd in YieldControlNoInput
oc->trans_conn is set to NULL when the connection is closed. At this
point, oc->fd is no longer valid and shouldn't be used. Move
dereference of oc->fd up into YieldControlNoInput where the state of
oc->trans_conn can be checked in a single place.
Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 448a5586e9235bee9648d89e4103ed48e6237c15
Author: Keith Packard <keithp@keithp.com>
Date: Wed May 17 09:57:27 2017 -0700
os: Don't call ospoll_listen/ospoll_mute after connection is closed
In set_poll_client, check oc->trans_conn to make sure the connection
is still running before changing the ospoll configuration of the file
descriptor in case some other bit of the server is now using this file
descriptor.
Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 523d35e3e1c703a655386f6348a4bfb4291c3969
Author: Keith Packard <keithp@keithp.com>
Date: Wed May 17 09:57:26 2017 -0700
os: Use CloseDownFileDescriptor from AbortClient, including ospoll_remove
AbortClient performs most of the same operations as
CloseDownFileDescriptor except that it doesn't call ospoll_remove,
leaving that unaware that the file descriptor has been closed.
If the file descriptor is re-used before the server comes back around
to clean up, and that new file descriptor is passed to SetNotifyFd,
then that function will mistakenly re-interpret the stale ClientPtr
returned by ospoll_data as a struct notify * instead and mangle data
badly.
To fix this, the patch does:
1) Change CloseDownFileDescriptor so that it can be called multiple
times on the same OsCommPtr. The calls related to the file
descriptor are moved inside the check for trans_conn and
oc->trans_conn is set to NULL after cleaning up.
2) Move the XdmcpCloseDisplay call into CloseDownFileDescriptor. I
don't think the actually matters as we just need to know at some
point that the session client has exited. Moving it avoids the
possibility of having this accidentally trigger from another client
with the same fd which closes down at around the same time.
3) Change AbortClient to call CloseDownFileDescriptor. This makes sure
that all of the fd-related clean up happens in the same way
everywhere, in particular ensures that ospoll is notified about the
closed file descriptor at the time it is closed and not some time later.
Debian-bug: https://bugs.debian.org/862824
Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 5d941ccb0b30399d505b48bff894c95cc3023bbe
Author: Keith Packard <keithp@keithp.com>
Date: Wed May 17 09:57:25 2017 -0700
os: Eliminate ConnectionTranslation
This infrastructure is no longer read, only written; the mapping
from fd to client is now handled by ospoll.
Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit c86fc56b10b603b41ae37057eedfa9c86b609752
Author: Keith Packard <keithp@keithp.com>
Date: Mon Jun 12 17:46:51 2017 -0700
glamor: Clarify variable names in glamor_copy_cpu_fbo
This function creates a temporary pixmap to hold data being moved from
the source to the destination. However, it labeled all of the
variables associated with this as src_, which makes it confusing to
read the code. Rename them tmp_ instead. Also fix the comment
describing the function to note that it copies from CPU to GPU, not
GPU to GPU.
Signed-off-by: Keith Packard <keithp@keithp.com>
Reviewed-by: Michel Dänzer <michel.daenzer@amd.com>
commit ffda82ed04d28feae2e001dbd0c32d6c795d90b1
Author: Michel Dänzer <michel.daenzer@amd.com>
Date: Tue Jun 6 18:42:06 2017 +0900
glamor: Fix temporary pixmap coordinate offsets
The previous values happened to work in basic cases, but not in general
if the destination is a subwindow or has a border.
Fixes crash with xli, which moves a large subwindow inside a smaller
parent window for scrolling.
No regressions with xterm, x11perf -copyplane or the xscreensaver
phosphor hack.
Bug: https://bugs.debian.org/857983
Reviewed-by: Keith Packard <keithp@keithp.com>
commit d4995a3936ae283b9080fdaa0905daa669ebacfc
Author: Adam Jackson <ajax@redhat.com>
Date: Mon Jun 12 14:43:23 2017 -0400
modesetting: Validate the atom for enum properties
The client could have said anything here, and if what they said doesn't
actually name an atom NameForAtom() will return NULL, and strcmp() will
be unhappy about that.
Signed-off-by: Adam Jackson <ajax@redhat.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 7c7a540f1e1d6b5466e1c9aa28476a2d7273d5ed
Author: Jason Gerecke <killertofu@gmail.com>
Date: Fri Jun 9 16:02:07 2017 -0700
xwayland: Implement tablet_tool_wheel for scrolling
The 'tablet_tool_wheel' function for tablet scrolling was added back in
8a1defcc634 but left unimplemented. This commit fills in the necessary
details, using the "clicks" count as the number of discrete scroll up/down
events to send.
Signed-off-by: Jason Gerecke <jason.gerecke@wacom.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit fbc9814975fe82be25becf1a55d4f8d34298a956
Author: Jason Gerecke <killertofu@gmail.com>
Date: Fri Jun 9 16:02:06 2017 -0700
xwayland: Correct off-by-one error in tablet button numbering
The 'tablet_tool_frame' function treats the button masks as though they
are zero-indexed, but 'tablet_tool_button_state' treats them as one-
indexed. The result is that an e.g. middle click event recieved from
Wayland will be sent from the X server as a right-click instead.
Fixes: 773b04748d0 ("xwayland: handle button events after motion events")
Signed-off-by: Jason Gerecke <jason.gerecke@wacom.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit d5e2f271ad93e50412ff3605fb25cb9622f437e0
Author: Carlos Garnacho <carlosg@gnome.org>
Date: Sun May 28 15:56:22 2017 +0200
xwayland: Remove two unused proc pointers.
Xwayland doesn't override these, so we don't need defining those
in the xwl_screen struct.
Signed-off-by: Carlos Garnacho <carlosg@gnome.org>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 95febc42cadf392a888104ad6d5cf4f34fdde7d5
Author: Carlos Garnacho <carlosg@gnome.org>
Date: Sun May 28 15:56:21 2017 +0200
Xi: Use WarpPointerProc hook on XI pointer warping implementation
Just like we do with XWarpPointer's.
Signed-off-by: Carlos Garnacho <carlosg@gnome.org>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit ca17f3e9fd3b59fdc5ffd0e5d78e4db6ddc87aa1
Author: Carlos Garnacho <carlosg@gnome.org>
Date: Sun May 28 15:56:20 2017 +0200
xwayland: Lock the pointer if it is confined and has no cursor
In the typical pattern in games of "hide cursor, grab with a confineTo,
warp constantly the pointer to the middle of the window" the last warping
step is actually rather optional. Some games may choose to just set up a
grab with confineTo argument, and trust that they'll get correct relative
X/Y axis values despite the hidden cursor hitting the confinement window
edge.
To cater for these cases, lock the pointer whenever there is a pointer
confinement and the cursor is hidden. This ensures the pointer position
is in sync with the compositor's when it's next shown again, and more
importantly resorts to the relative pointer for event delivery.
Signed-off-by: Carlos Garnacho <carlosg@gnome.org>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 513e3bd3870fdb8a8e0e2e52c0fa93872300bc8b
Author: Carlos Garnacho <carlosg@gnome.org>
Date: Sun May 28 15:56:19 2017 +0200
xwayland: Update root window size when desktop size changes
This fixes grabs on InputOnly windows whose parent is the root window
failing with GrabNotViewable. This is due to window->borderSize/windowSize
being computed as clipped by its parent, resulting in a null region.
Setting up the right size on the root window makes the InputOnly size
correct too, so the GrabNotViewable paths aren't hit anymore.
Signed-off-by: Carlos Garnacho <carlosg@gnome.org>
Acked-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit fafdb0cc9697eb53635ed1e78bec1d4cd87ab3a2
Author: Carlos Garnacho <carlosg@gnome.org>
Date: Sun May 28 15:56:18 2017 +0200
xwayland: "Accept" confineTo on InputOnly windows
Of sorts, actually make it confine to the pointer focus, as the
InputOnly window is entirely invisible to xwayland accounting,
we don't have a xwl_window for it.
Signed-off-by: Carlos Garnacho <carlosg@gnome.org>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit c217fcb4c4640ffd2fefee63c6fcd7ea5e64b942
Author: Carlos Garnacho <carlosg@gnome.org>
Date: Sun May 28 15:56:17 2017 +0200
xwayland: Allow pointer warp on root/None window
Of sorts, as we can't honor pointer warping across the whole root window
coordinates, peek the pointer focus in these cases.
Signed-off-by: Carlos Garnacho <carlosg@gnome.org>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit f065721e6fa6e9057cca4eadaf145a4dc22a08d2
Author: Carlos Garnacho <carlosg@gnome.org>
Date: Sun May 28 15:56:16 2017 +0200
dix: assume warping on the RootWindow always happens on visible coords
If the root window borderClip region is null, the PointInWindowIsVisible()
check fails if pointer warping is attempted on the root window, making
the warping operation bail out early.
Assume coordinates always lay inside the root window for this case,
the actual position will be clamped later within screen coordinates anyway.
Signed-off-by: Carlos Garnacho <carlosg@gnome.org>
Acked-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 7c88977d338a01aca866e52c9e736f8857fb9ae4
Author: Michel Dänzer <michel.daenzer@amd.com>
Date: Fri May 26 12:30:13 2017 +0900
glamor: Store the actual EGL/GLX context pointer in lastGLContext
Fixes subtle breakage which could sometimes trigger after a server reset
with multiple screens using glamor:
Screen A enters glamor_close_screen last and calls various cleanup
functions, which at some point call glamor_make_current to make sure
screen A's GL context is current. This sets lastGLContext to screen A's
&glamor_priv->ctx. Finally, glamor_close_screen calls
glamor_release_screen_priv, which calls free(glamor_priv).
Later, screen B enters glamor_init, which allocates a new glamor_priv.
With bad luck, this can return the same pointer which was previously
used for screen A's glamor_priv. So when screen B's glamor_init calls
glamor_make_current, lastGLContext == &glamor_priv->ctx, so MakeCurrent
isn't called for screen B's GL context, and the following OpenGL API
calls triggered by glamor_init mess up screen A's GL context.
The observed end result of this was a crash in glamor_get_vbo_space
because glamor_priv->vbo didn't match the GL context, though there might
be other possible outcomes.
Assigning the actual GL context pointer to lastGLContext prevents this
by preventing the false negative test in glamor_make_current.
Reviewed-by: Keith Packard <keithp@keithp.com>
Reviewed-by: Eric Anholt <eric@anholt.net>
commit d164c10850609c96fd46c8441efd40940b06dfe0
Author: Michel Dänzer <michel.daenzer@amd.com>
Date: Thu May 25 16:19:35 2017 +0900
xfree86: Add Option "PreferCloneMode"
When the default behaviour was changed from clone mode to horizontal
extended layout, a boolean ScrnInfoRec member preferClone was introduced
to choose the old default behaviour. Option "PreferCloneMode" allows
setting this preferClone member.
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
commit 87db150d8a572d8983a234663aaaab9cb8b6c98d
Author: Eric Anholt <eric@anholt.net>
Date: Thu Jun 1 10:07:55 2017 -0700
glamor: Remove the "delayed fallback" code.
The usage of this died with the old core rendering code.
Signed-off-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Keith Packard <keithp@keithp.com>
commit 72ddad7a97fa062bf9967d221c9a5520ebe33352
Author: Eric Anholt <eric@anholt.net>
Date: Wed May 17 11:36:07 2017 -0700
glamor: Drop glamor_set_screen_pixmap().
All that was left here was updating the FBO's size. However, the FBO
size was always set correctly already through
glamor_set_pixmap_texture() from whoever had attached a new BO to the
pixmap.
Signed-off-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Keith Packard <keithp@keithp.com>
commit 49b12cb7360608b14caef5facb12f146d0bd15e6
Author: Eric Anholt <eric@anholt.net>
Date: Wed May 17 11:33:16 2017 -0700
glamor: Stop tracking the screen_fbo.
This means we no longer get "s" for on-screen drawing in glamor_debug,
and there's only "m" (CPU memory) or "f" (Any GPU memory, aka FBOs).
That seems fine to me.
Signed-off-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Keith Packard <keithp@keithp.com>
commit fd0d2523a33620b36cd478925ddac5cf70f9c409
Author: Eric Anholt <eric@anholt.net>
Date: Tue May 9 15:33:21 2017 -0700
glamor_egl: Stop saving the EGL major/minor version.
We don't use them for anything.
Signed-off-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Keith Packard <keithp@keithp.com>
commit 1f38a31ed3969471cbed69c61edb971f6cff5287
Author: Jon Turney <jon.turney@dronecode.org.uk>
Date: Sun May 7 20:53:04 2017 +0100
Add meson.build for XWin server (v2)
This needs a meson with PRs #1784, #1792 and #1794
Future work: remove conditionals which are always on, and simplify redundant
CYGDEBUG conditionals
Signed-off-by: Jon Turney <jon.turney@dronecode.org.uk>
Reviewed-by: Eric Anholt <eric@anholt.net>
commit 36b9dac212a0f8a287cdbd35db152a5eb5cbc744
Author: Jon Turney <jon.turney@dronecode.org.uk>
Date: Tue May 9 12:59:19 2017 +0100
hw/xwin: Remove pretense of Xv support
Signed-off-by: Jon Turney <jon.turney@dronecode.org.uk>
Reviewed-by: Eric Anholt <eric@anholt.net>
commit 793af4d3f945b1d59eb2f84e625b581ea90b0066
Author: Jon Turney <jon.turney@dronecode.org.uk>
Date: Sun May 7 20:31:55 2017 +0100
hw/xwin: Don't unconditionally include rootless.h
Don't unconditionally include rootless.h, and so we don't need to add
rootless to the include path unless building MWEXTWM.
Signed-off-by: Jon Turney <jon.turney@dronecode.org.uk>
Reviewed-by: Eric Anholt <eric@anholt.net>
commit d8ccfb132602be88e640cc87ea58496e0445aab7
Author: Eric Anholt <eric@anholt.net>
Date: Thu Jun 1 16:46:02 2017 -0700
meson: Fix enabling of xshmfence.
I misspelled the enable flag, so DRI3 would throw BadImplementation
when you tried to start any GL app. Same as in
c7be7a688a78a34f61b90c0d95914e14b90b0cdc, we also convert it to #ifdef
for consistency.
Signed-off-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 4f29366f1e5678505fb882143c9b4a892d5b8273
Author: Lyude <lyude@redhat.com>
Date: Tue May 30 16:39:49 2017 -0400
xwayland: Don't load extension list more than once
When running an Xwayland server from the command line, we end up
resetting the server every time all of the clients connected to the
server leave. This would be fine, except that xwayland makes the mistake
of unconditionally calling LoadExtensionList(). This causes us to setup
the glxExtension twice in a row which means that when we lose our last
client on the second server generation, we end up trying to call the glx
destructors twice in a row resulting in a segfault:
(EE)
(EE) Backtrace:
(EE) 0: Xwayland (OsSigHandler+0x3b) [0x4982f9]
(EE) 1: /lib64/libpthread.so.0 (__restore_rt+0x0) [0x70845bf]
(EE) 2: /usr/lib64/dri/swrast_dri.so (__driDriverGetExtensions_virtio_gpu+0x32897d) [0x1196e5bd]
(EE) 3: /usr/lib64/dri/swrast_dri.so (__driDriverGetExtensions_virtio_gpu+0x328a45) [0x1196e745]
(EE) 4: /usr/lib64/dri/swrast_dri.so (__driDriverGetExtensions_virtio_gpu+0x32665f) [0x11969f7f]
(EE) 5: Xwayland (__glXDRIscreenDestroy+0x30) [0x54686e]
(EE) 6: Xwayland (glxCloseScreen+0x3f) [0x5473db]
(EE) 7: Xwayland (glxCloseScreen+0x53) [0x5473ef]
(EE) 8: Xwayland (dix_main+0x7b6) [0x44c8c9]
(EE) 9: Xwayland (main+0x28) [0x61c503]
(EE) 10: /lib64/libc.so.6 (__libc_start_main+0xf1) [0x72b1401]
(EE) 11: Xwayland (_start+0x2a) [0x4208fa]
(EE) 12: ? (?+0x2a) [0x2a]
(EE)
(EE) Segmentation fault at address 0x18
(EE)
Fatal server error:
(EE) Caught signal 11 (Segmentation fault). Server aborting
(EE)
Easy reproduction recipe:
- Start an Xwayland session with the default settings
- Open a window
- Close that window
- Open another window
- Close that window
- Total annihilation occurs
Signed-off-by: Lyude <lyude@redhat.com>
Reviewed-by: Michel Dänzer <michel.daenzer@amd.com>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 2fbf62b2fb3dcb29551251d09aa695715bb754f4
Author: Jason Gerecke <killertofu@gmail.com>
Date: Fri May 26 14:27:19 2017 -0700
xfree86: Fix interpretation of xf86WaitForInput timeout
Commit aa6717ce2 switched xf86WaitForInput from using select(2) to using
poll(2). Before this change, the timeout was interpreted as being in
microseconds; afterwards it is fed directly to xorg_poll which interprets
it as being in milliseconds. This results in the function potentially
blocking 1000x longer than intended. This commit scales down the timeout
argument before passing it to xorg_poll, being careful to ensure the result
is not rounded down due to integer division.
Signed-off-by: Jason Gerecke <jason.gerecke@wacom.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 96af794dc648eadcd596893412d7530e92cb5421
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri May 5 09:04:35 2017 +1000
xfree86: up the path name size to 512 in xf86MatchDriverFromFiles
./hw/xfree86/common/xf86pciBus.c: In function ‘xf86MatchDriverFromFiles’:
../hw/xfree86/common/xf86pciBus.c:1330:52: warning: ‘snprintf’ output may be
truncated before the last format character [-Wformat-truncation=]
snprintf(path_name, sizeof(path_name), "%s/%s", ^~~~~~~
../hw/xfree86/common/xf86pciBus.c:1330:13: note: ‘snprintf’ output between 2
dirent->d_name is 256, so sprintf("%s/%s") into a 256 buffer gives us:
and 257 bytes into a destination of size 256
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit bf3a591fdc5c98f7cab232bf5ec39902947ae2e5
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Mon May 8 10:07:51 2017 +1000
fb: remove some superfluous empty lines
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 933d80ba93cf9b5d32ce8673d60810c128debdab
Author: Adam Jackson <ajax@redhat.com>
Date: Thu May 18 11:19:53 2017 -0400
misprite: Clean up some preprocessor abuse
Signed-off-by: Adam Jackson <ajax@redhat.com>
Reviewed-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Keith Packard <keithp@keithp.com>
commit 57c223002c61c8ceb84fa7a02a3c1579517996f3
Author: Adam Jackson <ajax@redhat.com>
Date: Thu May 18 11:19:52 2017 -0400
misprite: Remove some dead cache variables
Unused since Keith ported misprite to damage in '04.
Signed-off-by: Adam Jackson <ajax@redhat.com>
Reviewed-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Keith Packard <keithp@keithp.com>
commit d0675e96f1fc8501324c88afa648a9d394f35587
Author: Eric Anholt <eric@anholt.net>
Date: Tue May 16 11:37:23 2017 -0700
glamor_egl: Drop glamor_egl_create_textured_screen_ext().
The function hasn't been doing anything useful since keithp's resource
freeing fixes in 2014.
Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Eric Anholt <eric@anholt.net>
commit c36f56808ffbefc4a3dcf61dfad17f62aeb8e16c
Author: Eric Anholt <eric@anholt.net>
Date: Wed May 17 17:06:44 2017 -0700
glamor_egl: Automatically choose a GLES2 context if desktop GL fails.
GLES2 support has been requested multiple times, and we've had this
code laying around trying to implement it. The GLES2 implementation
is not quite there yet (some pixel transfer failures), but it
shouldn't take much fixing at this point.
Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Eric Anholt <eric@anholt.net>
commit f6bf5f1c7475ff1b19b0e8c3e71c1224d5b6bc82
Author: Eric Anholt <eric@anholt.net>
Date: Wed May 17 17:06:43 2017 -0700
glamor_egl: Remove check for KHR_surfaceless_context_*
Those extensions don't exist. There's only surfaceless_context.
Signed-off-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Emil Velikov <emil.l.velikov@gmail.com>
commit 6e793ae08510639d011f638bcfc5246b9cccd1ae
Author: Eric Anholt <eric@anholt.net>
Date: Tue May 16 11:37:21 2017 -0700
glamor_egl: Drop warning about indirect GLX and GLES2.
Indirect GLX uses its own context and doesn't care what glamor is
using.
Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Eric Anholt <eric@anholt.net>
commit 59de50d6ef3331ee03eb82d4acba45aa75c70d42
Author: Eric Anholt <eric@anholt.net>
Date: Tue May 16 11:37:20 2017 -0700
glamor_egl: Avoid flink names in glamor_egl_create_textured_pixmap().
Using flink is banned on render nodes, and they needlessly expose our
screen pixmap contents to any authenticated client. This also
incidentally drops the dependency on EGL_MESA_drm_image.
Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Eric Anholt <eric@anholt.net>
commit 5d6f17d913bd4de0b4594585c0a8ba4f717a2a78
Author: Eric Anholt <eric@anholt.net>
Date: Tue May 16 11:37:19 2017 -0700
glamor_egl: Drop dead "cpp" field
It's been unused since the initial import.
Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Eric Anholt <eric@anholt.net>
commit 37618e810b70c24bb8a97dce844963ed1a99f897
Author: Eric Anholt <eric@anholt.net>
Date: Tue May 16 11:37:18 2017 -0700
glamor_egl: Drop dead gl_context_depth.
This was replaced in 4afe15d8bfd575c010ed1868697a7922a37ab378, but not
deleted.
Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Eric Anholt <eric@anholt.net>
commit a6a751e5d8962b01abc2a92ec35300f68cb38d94
Author: Eric Anholt <eric@anholt.net>
Date: Tue May 16 11:37:17 2017 -0700
glamor_egl: Drop unnecessary check for KHR_gl_renderbuffer_image.
I couldn't find it being used anywhere in the history of the code.
Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Eric Anholt <eric@anholt.net>
commit 40a153ee452390f713f7e5638af320a70defe106
Author: Eric Anholt <eric@anholt.net>
Date: Tue May 16 11:37:16 2017 -0700
glamor_egl: Always require the gbm-based image import path.
This has been associated with dri3 for now, but we need to use it
elsewhere in order to avoid flink. The extensions have been
implemented for long enough that I couldn't find when it was that we
turned them on. Oddly, we already required renderbuffer import
support, which is basically as hard to implement as texture import.
Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Eric Anholt <eric@anholt.net>
Acked-by: Daniel Stone <daniels@collabora.com>
commit b1b71b7a8b2d2c5d8f4afa67b75d10d4e7cbaa20
Author: Eric Anholt <eric@anholt.net>
Date: Tue May 16 11:37:15 2017 -0700
glamor_egl: Drop the has_gem flag.
We're using GBM, so we know we've got GEM.
Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Eric Anholt <eric@anholt.net>
commit 32957d9faeb8b0e968a23d91ed7391c0465dd1b9
Author: Eric Anholt <eric@anholt.net>
Date: Tue May 16 11:37:14 2017 -0700
modesetting: Drop code for GLAMOR && !GLAMOR_HAS_GBM.
The glamor_egl module that the GLAMOR paths are using is only built if
GLAMOR_HAS_GBM is true, and there's no plan for implementing the
module without GBM. Simplify modesetting's code as a result.
Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Eric Anholt <eric@anholt.net>
commit 5102ea38eb7331aeb1258cd148fd374cf0cbf8f2
Author: Eric Anholt <eric@anholt.net>
Date: Tue May 16 11:37:13 2017 -0700
glamor_egl: Unifdef GLAMOR_HAS_GBM.
We only build this code with GBM, and supporting non-GBM well would be
invasive.
Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Eric Anholt <eric@anholt.net>
commit 5064153c79d8b18767c0ade7635680a2f396f296
Author: Eric Anholt <eric@anholt.net>
Date: Tue May 16 11:37:12 2017 -0700
glamor_egl: Print a useful identifying string on initialization.
The EGL version is not used anywhere in the glamor code, so it's not
interesting. And when saying that we've started using GL
acceleration, it's nice to know what GL we're actually using.
Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Eric Anholt <eric@anholt.net>
commit fd96ff7fb325f54cb06c2bf5b8c37c75457b5c42
Author: Jon Turney <jon.turney@dronecode.org.uk>
Date: Tue Apr 18 10:44:55 2017 +0100
hw/xwin: Fix -Wunused-function warning for MessageName() in non-debug builds
../hw/xwin/winmultiwindowwm.c:188:1: warning: ‘MessageName’ defined but not used [-Wunused-function]
Signed-off-by: Jon Turney <jon.turney@dronecode.org.uk>
Reviewed-by: Yaakov Selkowitz <yselkowitz@users.sourceforge.net>
commit e49f5947eda578d8b029f42fb4ec9c90f413b4b3
Author: Jon Turney <jon.turney@dronecode.org.uk>
Date: Tue Apr 18 10:45:07 2017 +0100
hw/xwin: Fix -Wmaybe-uninitialized warnings in engine CloseScreen wrappers
../hw/xwin/winshadgdi.c: In function ‘winCloseScreenShadowGDI’:
../hw/xwin/winshadgdi.c:632:12: warning: ‘fReturn’ may be used uninitialized in this function [-Wmaybe-uninitialized]
../hw/xwin/winshadgdi.c:579:10: note: ‘fReturn’ was declared here
../hw/xwin/winshadddnl.c: In function ‘winCloseScreenShadowDDNL’:
../hw/xwin/winshadddnl.c:711:12: warning: ‘fReturn’ may be used uninitialized in this function [-Wmaybe-uninitialized]
../hw/xwin/winshadddnl.c:661:10: note: ‘fReturn’ was declared here
Signed-off-by: Jon Turney <jon.turney@dronecode.org.uk>
Reviewed-by: Yaakov Selkowitz <yselkowitz@users.sourceforge.net>
commit 319daa7a9fa8bcfdefb08d7770912775af22ad99
Author: Jon Turney <jon.turney@dronecode.org.uk>
Date: Wed Apr 19 13:30:27 2017 +0100
hw/xwin: Fix -Wmaybe-uninitialized warning in winWindowProc
This is possibly an actual bug in failing to check we successfully retrieved
the monitor size before using it to set the X screen size.
../hw/xwin/winwndproc.c: In function ‘winWindowProc’:
../hw/xwin/winwndproc.c:283:55: warning: ‘dwHeight’ may be used uninitialized in this function [-Wmaybe-uninitialized]
../hw/xwin/winwndproc.c:240:32: note: ‘dwHeight’ was declared here
../hw/xwin/winwndproc.c:281:54: warning: ‘dwWidth’ may be used uninitialized in this function [-Wmaybe-uninitialized]
../hw/xwin/winwndproc.c:240:23: note: ‘dwWidth’ was declared here
Signed-off-by: Jon Turney <jon.turney@dronecode.org.uk>
Reviewed-by: Yaakov Selkowitz <yselkowitz@users.sourceforge.net>
commit 7a90c9b24e6776c8f1fa43df4268f79a465c0d4e
Author: Jon Turney <jon.turney@dronecode.org.uk>
Date: Tue Apr 18 10:32:31 2017 +0100
xfree86: Hide unused variables when !XSERVER_LIBPCIACCESS
../hw/xfree86/common/xf86Config.c: In function ‘xf86HandleConfigFile’:
../hw/xfree86/common/xf86Config.c:2278:10: warning: unused variable ‘singlecard’ [-Wunused-variable]
../hw/xfree86/common/xf86Config.c:2277:17: warning: unused variable ‘scanptr’ [-Wunused-variable]
Signed-off-by: Jon Turney <jon.turney@dronecode.org.uk>
Reviewed-by: Yaakov Selkowitz <yselkowitz@users.sourceforge.net>
commit 7a19a3e093a62a779c3cab8c28930adcb1604e0d
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Mon May 8 10:24:34 2017 +1000
xfree86: build a shared lib identical to Xorg
Because we can use a shared lib in dlsym() for the symbol loader test,
but we can't use the executable.
v2: Drop a stray ' ' and rebase on 820a4cbe9fe, by anholt
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Eric Anholt <eric@anholt.net>
commit 49c742557457ff9200a10f32daadfcea50d4911c
Author: Adam Jackson <ajax@redhat.com>
Date: Thu May 11 17:17:55 2017 -0400
meson: Fix CLOCK_MONOTONIC test
C99 isn't enough on its own to get POSIX feature sets defined.
Signed-off-by: Adam Jackson <ajax@redhat.com>
Reviewed-by: Julien Cristau <jcristau@debian.org>
Tested-by: Pekka Paalanen <pekka.paalanen@collabora.co.uk>
commit 152375f4e4f1ee4833129802730b36af8d0f7e1a
Author: Adam Jackson <ajax@redhat.com>
Date: Thu May 11 17:17:54 2017 -0400
os, xfree86: Stop being so weird about <limits.h>
Whatever problem this is trying to fix, we don't care. Just include the
thing and stop worrying about whether _POSIX_SOURCE is defined.
Signed-off-by: Adam Jackson <ajax@redhat.com>
Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Julien Cristau <jcristau@debian.org>
Tested-by: Pekka Paalanen <pekka.paalanen@collabora.co.uk>
commit d9e23ea4228575344e3b4c0443cecc5eb75356e4
Author: Keith Packard <keithp@keithp.com>
Date: Wed May 10 21:50:45 2017 -0700
dix: Remove clients from input and output ready queues after closing
Delay removing the client from these two queues until all potential
I/O has completed in case we mark the client as ready for reading or
with pending output during the close operation.
Bugzilla: https://bugs.freedesktop.org/100957
Signed-off-by: Keith Packard <keithp@keithp.com>
Tested-by: Nick Sarnie <commendsarnex@gmail.com>
Reviewed-by: Michel Dänzer <michel.daenzer@amd.com>
commit c394f6b27329d212d2a8b9b3c6da1ef7847c46f3
Author: Julien Cristau <jcristau@debian.org>
Date: Thu May 11 08:42:16 2017 +0200
Replace all checks for 'linux' macro with '__linux__'
gcc -std=c99 does not define the former, and it's a horrible namespace
confusion anyway.
Signed-off-by: Julien Cristau <jcristau@debian.org>
Reviewed-by: Adam Jackson <ajax@redhat.com>
Tested-by: Pekka Paalanen <pekka.paalanen@collabora.co.uk>
commit 6634ffc4d26846dcf892f27682f9021f6d9956a9
Author: Julien Cristau <jcristau@debian.org>
Date: Thu May 11 08:42:15 2017 +0200
Drop workaround for pre-glibc linux
It seems unlikely anyone still needs to build against libc4/libc5.
Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Julien Cristau <jcristau@debian.org>
commit 318257029578a30e29c191befa94a20ad07f97d4
Author: Frank Binns <frank.binns@imgtec.com>
Date: Thu May 11 14:00:19 2017 +0100
hw/xfree86: fix comment typo
Signed-off-by: Frank Binns <frank.binns@imgtec.com>
commit 0848390d51f93ecfb9342cffe1cda46a65cfc07b
Author: Adam Jackson <ajax@redhat.com>
Date: Wed May 10 11:14:57 2017 -0400
xephyr: Fix regeneration
I had said:
commit c42311a9d7d2e5a67bdb7f4fa32032b4feba59b1
Author: Adam Jackson <ajax@redhat.com>
Date: Fri Mar 24 15:58:54 2017 -0400
kdrive: Remove KdOsFuncs
Only the Init slot was used, and Xephyr can just as easily do
that initialization directly.
And I'd've been right, but I forgot to make that initialization only
happen on startup (i.e. when serverGeneration == 1).
Reviewed-and-Tested-by: Michel Dänzer <michel.daenzer@amd.com>
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit 0ff2fb128bf35dffaa302f15e9ae004b65ee0827
Author: Peter Harris <pharris@opentext.com>
Date: Tue May 9 19:39:47 2017 -0400
meson: Detect strlcat/strlcpy/reallocarray in libbsd
If we're linking with libbsd anyway, we might as well use the functions
it provides instead of compiling our replacements.
Signed-off-by: Peter Harris <pharris@opentext.com>
Reviewed-by: Eric Anholt <eric@anholt.net>
commit c4c002d1ca80bd69776387dafb9c5bb082c72e48
Author: Peter Harris <pharris@opentext.com>
Date: Tue May 9 19:39:46 2017 -0400
meson: Only detect each function once
Use conf_data outside of include/ to avoid re-running detection of the
same functions.
Reviewed-by: Eric Anholt <eric@anholt.net>
Signed-off-by: Peter Harris <pharris@opentext.com>
commit 03d6275e6094a5ede5a70f05bbbdde653a9fd9e0
Author: Peter Harris <pharris@opentext.com>
Date: Tue May 9 19:39:45 2017 -0400
meson: Detect more functions
Set HAVE_REALLOCARRAY, HAVE_SIGACTION, HAVE_STRCASESTR, HAVE_STRLCAT,
HAVE_STRLCPY, HAVE_TIMINGSAFE_MEMCMP, and BUSFAULT.
Reviewed-by: Eric Anholt <eric@anholt.net>
Signed-off-by: Peter Harris <pharris@opentext.com>
commit ba1599610b1889545be8a9314dce8a740a2764d3
Author: Peter Harris <pharris@opentext.com>
Date: Tue May 9 19:39:44 2017 -0400
meson: Detect arc4random_buf
Reviewed-by: Eric Anholt <eric@anholt.net>
Signed-off-by: Peter Harris <pharris@opentext.com>
commit e67ca940473e249c7b9712ce6d515310ed1e4cf9
Author: Jon TURNEY <jon.turney@dronecode.org.uk>
Date: Mon May 8 11:40:22 2017 +0100
meson: An empty array is not a dependency object
Using the meson idiom of initializing a variaible to an empty array to
represent a null value does not work well for a variable expected to hold a
dependency object, as trying to apply found() to it will fail (currently).
I think this can be demonstrated by configuing with Dglamor=no, then gbm_dep
is set to [] in meson.build, and then tested with found() in
include/meson.build.
Use dependency('') to create an empty dependency.
Future work: In the autotools build GBM is required if build_xorg &
build_glamor. I suspect that it was also required for build_xwayland &
build_glamor, but that was never checked. That test seems to have gone
missing in meson.build, the required:false when checking for gbm should
possibly be dropped?
Signed-off-by: Jon Turney <jon.turney@dronecode.org.uk>
Reviewed-by: Eric Anholt <eric@anholt.net>
commit 16054647abfc9fe5f71d0098e17415e45fa28199
Author: Jon TURNEY <jon.turney@dronecode.org.uk>
Date: Mon May 8 11:40:21 2017 +0100
meson: Refine build_dbus
As in autotools build, only turn on build_dbus (build dbus-core.c) if it's
needed by build_hal or build_systemd_logind, not just because dbus is
available.
Building dbus-core.c without NEED_DBUS defined fails, as the contents of
dbus-core.h are turned off.
Signed-off-by: Jon Turney <jon.turney@dronecode.org.uk>
Acked-by: Eric Anholt <eric@anholt.net>
commit 820a4cbe9fef36bc97a7107ccc74a785180e227a
Author: Jon TURNEY <jon.turney@dronecode.org.uk>
Date: Tue May 9 12:23:48 2017 +0100
meson: Make driprotos and libdrm optional
Add options for DRI{1,2,3}
shmfence is required for DRI3
libdrm is required for any DRI{1,2,3}
Consolidate calls to dependency('libdrm')
Set WITH_LIBDRM when building with libdrm
v2:
Initialize libxserver_dri3 to []
Manually flatten libxserver, since meson doesn't (currently)
Use version_compare rather than circumloctions with dependency()
Signed-off-by: Jon Turney <jon.turney@dronecode.org.uk>
Reviewed-by: Eric Anholt <eric@anholt.net>
commit fdb11e2274f1d1069cdc9ff7b3655288c1b42cf4
Author: Jon TURNEY <jon.turney@dronecode.org.uk>
Date: Mon May 8 11:40:18 2017 +0100
meson: Don't require xf86dgaproto
This dependency is never used, and build_dga is hardwired to false later on,
anyhow.
Reviewed-by: Eric Anholt <eric@anholt.net>
Signed-off-by: Jon Turney <jon.turney@dronecode.org.uk>
commit 5bff2a68560837fc402905fef6244ce794c47843
Author: Jon TURNEY <jon.turney@dronecode.org.uk>
Date: Mon May 8 11:40:17 2017 +0100
meson: Nettle is required if it's the only SHA1 choice
Reviewed-by: Eric Anholt <eric@anholt.net>
Signed-off-by: Jon Turney <jon.turney@dronecode.org.uk>
commit 95e5fa04762fa0f04ac1349708d9e33c30205a96
Author: Jon TURNEY <jon.turney@dronecode.org.uk>
Date: Mon May 8 11:40:16 2017 +0100
meson: Remove stray whitespace
Reviewed-by: Eric Anholt <eric@anholt.net>
Signed-off-by: Jon Turney <jon.turney@dronecode.org.uk>
commit e9dbecf7c259f7e8b610fa93f97ea55f5dafa7af
Author: Adam Jackson <ajax@redhat.com>
Date: Wed May 10 10:56:16 2017 -0400
timingsafe_memcmp: Fix meson build
Include dix-config.h first to pick up _GNU_SOURCE so we get the
definition for sigset_t.
Reported-by: Pekka Paalanen <pekka.paalanen@collabora.co.uk>
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit 5d3b6cc221aff5b9322b31aa6f5ae922271bc7d8
Author: Karol Kosik <kkosik@nvidia.com>
Date: Wed Jul 22 16:42:07 2015 -0700
xfree86: Improved autoconfig drivers matching
Implementation of new drivers matching algorithm. New approach
doesn't add duplicate drivers and ease drivers matching phase.
v2: Re-commit the patch reverted in
2388f5e583d4ab2ee12f2b087d381b64aed3f7d5, with Aaron Plattner's
fix squashed in (by anholt).
Signed-off-by: Karol Kosik <kkosik@nvidia.com>
Signed-off-by: Aaron Plattner <aplattner@nvidia.com>
Signed-off-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Aaron Plattner <aplattner@nvidia.com> (v1)
Reviewed-by: Emil Velikov <emil.l.velikov@gmail.com> (v1)
Tested-by: Peter Hutterer <peter.hutterer@who-t.net>
Tested-by: Eric Anholt <eric@anholt.net>
commit 2388f5e583d4ab2ee12f2b087d381b64aed3f7d5
Author: Eric Anholt <eric@anholt.net>
Date: Tue May 9 13:37:59 2017 -0700
Revert "xfree86: Improved autoconfig drivers matching"
This reverts commit 112d0d7d01b98fb0d67910281dd1feeec125247b.
It broke Xorg for Adam, Peter, and myself, by failing hard when a
module load failed.
Signed-off-by: Eric Anholt <eric@anholt.net>
commit 1dd14e7a499428cf7215b49a9319199545bcd6cb
Author: Eric Anholt <eric@anholt.net>
Date: Mon May 8 10:36:30 2017 -0700
meson: Use link_whole() not link_with(), for the Xorg dixmods.
I clearly hadn't run ninja test, since fb no longer had any of the fb
symbols in it.
Signed-off-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
commit a06bb73053d9df56d9070ce325a43af3a3c7a6a2
Author: Lyude <lyude@redhat.com>
Date: Thu May 4 18:04:31 2017 -0400
xwayland: Unconditionally initialize lists in init_tablet_manager_seat()
In the event that xwayland gets launched on a wayland compositor that
doesn't yet have support for wp_tablet_manager, we end up skipping the
initialization of the lists. This is wrong, because regardless of
whether or not a tablet is present we still attempt to traverse these
lists later in xwl_set_cursor(), expecting that if the lists are empty
from no tablet manager that we simply won't execute any loop iterations.
(EE)
(EE) Backtrace:
(EE) 0: Xwayland (OsSigHandler+0x3b) [0x4982f9]
(EE) 1: /lib64/libpthread.so.0 (__restore_rt+0x0) [0x7f73722545bf]
(EE) 2: Xwayland (xwl_set_cursor+0x9f) [0x429974]
(EE) 3: Xwayland (miPointerUpdateSprite+0x261) [0x4fe1ca]
(EE) 4: Xwayland (mieqProcessInputEvents+0x239) [0x4f8d33]
(EE) 5: Xwayland (ProcessInputEvents+0x9) [0x4282f0]
(EE) 6: Xwayland (Dispatch+0x42) [0x43e2d4]
(EE) 7: Xwayland (dix_main+0x5c9) [0x44c6dc]
(EE) 8: Xwayland (main+0x28) [0x61c523]
(EE) 9: /lib64/libc.so.6 (__libc_start_main+0xf1) [0x7f7371e9d401]
(EE) 10: Xwayland (_start+0x2a) [0x4208fa]
(EE) 11: ? (?+0x2a) [0x2a]
(EE)
(EE) Segmentation fault at address 0x28
(EE)
Fatal server error:
(EE) Caught signal 11 (Segmentation fault). Server aborting
(EE)
Reproduced when trying to run upstream xwayland under fedora 25's weston
package.
Signed-off-by: Lyude <lyude@redhat.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 5f83b951ac7e0e6bbd766a9bb860283e32808c90
Author: Jon TURNEY <jon.turney@dronecode.org.uk>
Date: Thu May 4 13:46:26 2017 +0100
meson: Fix typo in xephyr option description
Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Jon Turney <jon.turney@dronecode.org.uk>
commit ce6741f6ac63493d6b903f8f58b83bf571baf4b9
Author: Jon TURNEY <jon.turney@dronecode.org.uk>
Date: Thu May 4 13:46:25 2017 +0100
meson: Fix typoed filename
Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Jon Turney <jon.turney@dronecode.org.uk>
commit 492534813302ef95538f485401fbcf6eccbd0026
Author: Jon TURNEY <jon.turney@dronecode.org.uk>
Date: Thu May 4 13:46:24 2017 +0100
meson: Make xf86vidmode optional
Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Jon Turney <jon.turney@dronecode.org.uk>
commit 3b3ce4a55b0c1f83eff37fb8544156e8961f3fa3
Author: Jon TURNEY <jon.turney@dronecode.org.uk>
Date: Thu May 4 13:46:23 2017 +0100
meson: Test to build xserver_poll.c was inverted
Test to build xserver_poll.c was inverted compared to autoconf. Build
xserver_poll.c if poll is missing.
Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Jon Turney <jon.turney@dronecode.org.uk>
commit 4b7dd6d1aa53bdeee2e3fd0c0a73f6ce40495682
Author: Adam Jackson <ajax@redhat.com>
Date: Wed May 3 15:40:08 2017 -0400
Makefile.am: make 'make distcheck' verify the meson build
Signed-off-by: Adam Jackson <ajax@redhat.com>
Reviewed-by: Eric Anholt <eric@anholt.net>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 111a5615a60565f7b68a7fa69dbac3d289d80c9e
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Wed May 3 15:40:07 2017 -0400
Makefile.am: add the meson files to the tarball
While we're shipping both build systems, we'll likely have 'make dist'
generated tarballs - those tarballs should be buildable with meson to
have more exposure. List them all explicitly since the list isn't likely
to change much.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Eric Engestrom <eric@engestrom.ch>
Reviewed-by: Eric Anholt <eric@anholt.net>
commit 11c133aafe63c776bde502057243d67fe2c630c8
Author: Eric Anholt <eric@anholt.net>
Date: Wed May 3 15:33:46 2017 -0700
meson: Fix kdrive build.
Signed-off-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit b7376fb933ac1b0c1771535c14cf77029eccb7f5
Author: Adam Jackson <ajax@redhat.com>
Date: Fri Mar 24 15:58:55 2017 -0400
kdrive: Remove dead slots from KdCardFuncs
Signed-off-by: Adam Jackson <ajax@redhat.com>
Reviewed-by: Eric Anholt <eric@anholt.net>
commit c42311a9d7d2e5a67bdb7f4fa32032b4feba59b1
Author: Adam Jackson <ajax@redhat.com>
Date: Fri Mar 24 15:58:54 2017 -0400
kdrive: Remove KdOsFuncs
Only the Init slot was used, and Xephyr can just as easily do that
initialization directly.
Reviewed-by: Eric Anholt <eric@anholt.net>
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit c0375dced38674ed98562529530d89ff02c48100
Author: Adam Jackson <ajax@redhat.com>
Date: Fri Mar 24 15:58:53 2017 -0400
kdrive: static and dead code cleanup
Reviewed-by: Eric Anholt <eric@anholt.net>
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit d732c36597fab2e9bc4f2aa72cf1110997697557
Author: Adam Jackson <ajax@redhat.com>
Date: Thu Apr 27 14:45:25 2017 -0400
xfree86: Silence a new glibc warning
glibc would like to stop declaring major()/minor() macros in
<sys/types.h> because that header gets included absolutely everywhere
and unix device major/minor is perhaps usually not what's expected. Fair
enough. If one includes <sys/sysmacros.h> as well then glibc knows we
meant it and doesn't warn, so do that if it exists.
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit c3147a20065b212fac78eb29c9bb9e150f9b22f5
Author: Adam Jackson <ajax@redhat.com>
Date: Thu Apr 27 14:45:24 2017 -0400
dmx: Fix decl mismatch for XRT_WINDOW
Building xserver with meson -Db_lto=true found this! Check it:
../hw/dmx/dmx.c:66:22: warning: type of ‘XRT_WINDOW’ does not match
original declaration [-Wlto-type-mismatch]
extern unsigned long XRT_WINDOW;
^
../include/resource.h:58:18: note: type ‘RESTYPE’ should match type ‘long
unsigned int’
typedef uint32_t RESTYPE;
^
../Xext/panoramiX.c:85:9: note: ‘XRT_WINDOW’ was previously declared here
RESTYPE XRT_WINDOW;
^
../Xext/panoramiX.c:85:9: note: code may be misoptimized unless
-fno-strict-aliasing is used
I have never managed successfully to build xserver with LTO with
autotools, so, score one for meson.
Get the decl from panoramiXsrv.h, which includes panoramiX.h first anyway.
Signed-off-by: Adam Jackson <ajax@redhat.com>
Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
commit ea275cd3d5fb561c6aed7876f486e1124082426c
Author: Eric Anholt <eric@anholt.net>
Date: Fri Apr 28 15:09:38 2017 -0700
meson: Fix glx build with DRI2 disabled.
A common meson pattern is to use empty arrays for optional sources and
dependencies, since it generally iterates over trees of arrays looking
for values. A value of '' will actually go looking for ''.
Daniel Stone <daniels@collabora.com>
Signed-off-by: Eric Anholt <eric@anholt.net>
commit 62f727c7ea359b7bdf58d9b827731a082b47553d
Author: Eric Anholt <eric@anholt.net>
Date: Fri Apr 28 15:09:37 2017 -0700
meson: use link_with for Xorg's shared modules as well as Xorg.
I converted Xorg when meson 0.40 came out, but fumbled my grep and
forgot that I had instances of the .extract_all_objects() workaround
in dixmods, too.
Signed-off-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Daniel Stone <daniels@collabora.com>
commit e2f68296ffb8e40035c0ebd949b67d1e2e424e11
Author: Keith Packard <keithp@keithp.com>
Date: Sat Apr 29 00:26:10 2017 -0700
os: Mark client as ready to read when closing due to write failure [100863]
This makes sure the server will go look at the client again, notice
that the FD is no longer valid and close the client down.
Bugzilla: https://bugs.freedesktop.org/100863
Signed-off-by: Keith Packard <keithp@keithp.com>
Reviewed-and-Tested-by: Michel Dänzer <michel.daenzer@amd.com>
commit a82971b07035ee9a4e3ed01326e7c1eab34b5a19
Author: Keith Packard <keithp@keithp.com>
Date: Sat Apr 29 00:21:47 2017 -0700
os: un-duplicate code to close client on write failure
There are three copies of the same short sequence of operations to
close down a client when a write error occurs. Create a new function,
AbortClient, which performs these operations and then call it from the
three places.
Signed-off-by: Keith Packard <keithp@keithp.com>
Reviewed-and-Tested-by: Michel Dänzer <michel.daenzer@amd.com>
commit 8475e6360ce31551d50fd63a26f7a44d1e8928f2
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Tue Feb 7 15:04:46 2017 +1000
xwayland: add tablet pad support
Hooked up a bit differently to the other tools. Those tools can be static for
all and be re-used. The wacom driver initializes the pad with the correct
number of buttons though and we can't do this until we have the pad done event.
If the tablet is removed and we plug a different one in, we should initialize
that correctly, so unlike the other tools the pad is properly removed and
re-initialized on plug.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Acked-by: Ping Cheng <ping.cheng@wacom.com>
commit f471b5b8eb451b442554517c7cb6f0aa90d218c4
Author: Carlos Garnacho <carlosg@gnome.org>
Date: Fri Nov 4 19:58:04 2016 +0100
xwayland: update cursor on tablet tools in proximity
Each xwl_tablet_tool gets a xwl_cursor, as on wayland each of those
will get an independent cursor that can be set through
zwp_tablet_tool.set_cursor.
However, all tools (and the pointer) share conceptually the same VCP
on Xwayland, so have cursor changes trigger a xwl_cursor update on
every tool (and the pointer, again). Maybe Xwayland could keep track
of the most recent device and only update that cursor to get better
visual results, but this is simpler, and it's going to be odd
anyway...
Signed-off-by: Carlos Garnacho <carlosg@gnome.org>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Acked-by: Ping Cheng <ping.cheng@wacom.com>
commit 6d1ad39fe6c18220dd39b0653fd1e4145140e2dc
Author: Carlos Garnacho <carlosg@gnome.org>
Date: Fri Nov 4 19:36:10 2016 +0100
xwayland: Refactor cursor management into xwl_cursor
This struct takes away the cursor info in xwl_seat, and has
an update function so we can share the frame handling code
across several xwl_cursors.
Signed-off-by: Carlos Garnacho <carlosg@gnome.org>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Acked-by: Ping Cheng <ping.cheng@wacom.com>
commit 773b04748d0c839bc8b12e33f74bb8d11c447f5b
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Tue Feb 7 12:23:46 2017 +1000
xwayland: handle button events after motion events
Make sure the button events are sent after the motion events into the new
position.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Acked-by: Ping Cheng <ping.cheng@wacom.com>
commit 8a1defcc634daddbb3570519d69ec5c9e39a8b56
Author: Jason Gerecke <killertofu@gmail.com>
Date: Fri Oct 14 14:31:46 2016 -0700
xwayland: Handle tablet_tool events
Translates Wayland tablet events into corresponding X11 tablet events. As
with the prior commit, these events are modeled after those created by the
xf86-input-wacom driver to maximize compatibility with existing applications.
Signed-off-by: Jason Gerecke <jason.gerecke@wacom.com>
Signed-off-by: Carlos Garnacho <carlosg@gnome.org>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Acked-by: Ping Cheng <ping.cheng@wacom.com>
commit 5812d1c28f4fb7b7de8b96a81415a21425561fd4
Author: Jason Gerecke <killertofu@gmail.com>
Date: Fri Jan 15 17:01:38 2016 -0800
xwayland: Handle wp_tablet events
Creates and maintains the canonical trio of X devices (stylus, eraser,
and cursor) to be shared by all connected tablets. A per-tablet trio
could be created instead, but there are very few benefits to such a
configuration since all tablets still ultimately share control of a
single master pointer.
The three X devices are modeled after those created by xf86-input-wacom
but use a generic maximum X and Y that should be large enough to
accurately represent values from even the largest currently-available
tablets.
Signed-off-by: Jason Gerecke <jason.gerecke@wacom.com>
Signed-off-by: Carlos Garnacho <carlosg@gnome.org>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Acked-by: Ping Cheng <ping.cheng@wacom.com>
commit 47c4415912b5b16b115135be365beb370858df76
Author: Jason Gerecke <killertofu@gmail.com>
Date: Fri Oct 14 14:50:18 2016 -0700
xwayland: Listen for wp_tablet_seat events
The wp_tablet_seat interface provides us with notifications as tablets,
tools, and pads are connected to the system. Add listener functions and
store references to the obtained devices.
Signed-off-by: Jason Gerecke <jason.gerecke@wacom.com>
Signed-off-by: Carlos Garnacho <carlosg@gnome.org>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Acked-by: Ping Cheng <ping.cheng@wacom.com>
commit 7d48b758a601ce0252ebd21297a7c42263adfaaf
Author: Jason Gerecke <killertofu@gmail.com>
Date: Fri Jan 15 17:29:37 2016 -0800
xwayland: Bind to wp_tablet_manager if available and get its seats
If we're notified about the existence of the wp_tablet_manager interface,
we bind to it so that we can make use of any tablets that are (or later
become) available. For each seat that exists or comes into existance at
a later point, obtain the associated tablet_seat.
Signed-off-by: Jason Gerecke <jason.gerecke@wacom.com>
Signed-off-by: Carlos Garnacho <carlosg@gnome.org>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Acked-by: Ping Cheng <ping.cheng@wacom.com>
commit 89c841915ac4fba6d2a5ad0051c778f1a76ffbf3
Author: Jason Gerecke <killertofu@gmail.com>
Date: Thu Oct 13 10:39:46 2016 -0700
xwayland: Depend on wayland-protocols to build tablet protocol headers
Signed-off-by: Jason Gerecke <jason.gerecke@wacom.com>
Signed-off-by: Carlos Garnacho <carlosg@gnome.org>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Acked-by: Ping Cheng <ping.cheng@wacom.com>
commit 59554eaa6c4d3d3c170a4be4fc385a86d05c5558
Author: Adam Jackson <ajax@redhat.com>
Date: Thu Apr 27 13:23:56 2017 -0400
meson: Build libvbe.so
Reviewed-by: Eric Anholt <eric@anholt.net>
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit 2f1a1be46c3366a47657fe7550bc59fb99acf91c
Author: Adam Jackson <ajax@redhat.com>
Date: Thu Apr 27 13:19:11 2017 -0400
meson: Build libshadowfb.so
Reviewed-by: Eric Anholt <eric@anholt.net>
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit bdce17959cd17fa6d46a1df361b53b5855ff62e8
Author: Adam Jackson <ajax@redhat.com>
Date: Thu Apr 27 13:15:55 2017 -0400
meson: Build libvgahw.so
Reviewed-by: Eric Anholt <eric@anholt.net>
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit 5c7d92362b25670856091663e70d3e0dc2350efb
Author: Adam Jackson <ajax@redhat.com>
Date: Thu Apr 27 13:10:33 2017 -0400
meson: Build libfbdevhw.so
Reviewed-by: Eric Anholt <eric@anholt.net>
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit 6413a87bcd3bfb91ac1536b41c37af0c6e47a9b6
Author: Adam Jackson <ajax@redhat.com>
Date: Thu Apr 27 12:58:54 2017 -0400
meson: Build libwfb.so
Reviewed-by: Eric Anholt <eric@anholt.net>
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit 1597297067fd14d479a2279ad1ab20082317271a
Author: Adam Jackson <ajax@redhat.com>
Date: Thu Apr 27 12:50:13 2017 -0400
meson: Build libglx.so
Reviewed-by: Eric Anholt <eric@anholt.net>
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit 47f047462dcb492203ff569a2b1528bff8cd3ff3
Author: Adam Jackson <ajax@redhat.com>
Date: Thu Apr 27 11:49:11 2017 -0400
meson: Fix linking the dmx utilities
Reviewed-by: Eric Anholt <eric@anholt.net>
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit 5d785693a8843d18be806ea9f8caecc2dcbf1007
Author: Adam Jackson <ajax@redhat.com>
Date: Thu Apr 27 11:47:11 2017 -0400
meson: Factor out the AC_REPLACE_FUNCS stuff to its own library
This is all just stuff we wish we had in libc, and some of this gets
used in eg. the dmx utilities build, so split it to its own library to
avoid pulling in xserver stuff.
Reviewed-by: Eric Anholt <eric@anholt.net>
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit 8659aac2ccc6649477f601908e1a4062fad8635e
Author: Adam Jackson <ajax@redhat.com>
Date: Thu Apr 27 12:52:29 2017 -0400
meson: Fix a typo
"bulid" isn't valid anything, and build_xwayland was already defined
above.
Reviewed-by: Eric Anholt <eric@anholt.net>
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit 112d0d7d01b98fb0d67910281dd1feeec125247b
Author: Karol Kosik <kkosik@nvidia.com>
Date: Wed Jul 22 16:42:07 2015 -0700
xfree86: Improved autoconfig drivers matching
Implementation of new drivers matching algorithm. New approach
doesn't add duplicate drivers and ease drivers matching phase.
Signed-off-by: Karol Kosik <kkosik@nvidia.com>
Reviewed-by: Aaron Plattner <aplattner@nvidia.com>
Reviewed-by: Emil Velikov <emil.l.velikov@gmail.com>
commit 1549e30372756cfdb85379fd8d93c769297ab6e6
Author: Eric Anholt <eric@anholt.net>
Date: Sat Mar 11 10:24:04 2017 -0800
Add a Meson build system alongside autotools.
This is a work in progress that builds Xvfb, Xephyr, Xwayland, Xnest,
and Xdmx so far. The outline of Xquartz/Xwin support is in tree, but
hasn't been built yet. The unit tests are also not done.
The intent is to build this as a complete replacement for the
autotools system, then eventually replace autotools. meson is faster
to generate the build, faster to run the bulid, shorter to write the
build files in, and less error-prone than autotools.
v2: Fix indentation nits, move version declaration to project(), use
existing meson_options for version-config.h's vendor name/web.
Signed-off-by: Eric Anholt <eric@anholt.net>
Acked-by: Keith Packard <keithp@keithp.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
commit c7be7a688a78a34f61b90c0d95914e14b90b0cdc
Author: Eric Anholt <eric@anholt.net>
Date: Tue Apr 25 16:03:00 2017 -0700
Use #ifdef instead of #if for features to make Meson easier.
We mostly use #ifdef throughout the tree, and this lets the generated
config.h files just be #define TOKEN instead of #define TOKEN 1.
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Keith Packard <keithp@keithp.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Eric Anholt <eric@anholt.net>
commit ace6bfd5901e19045371f9bd18b997b37f55b589
Author: Eric Anholt <eric@anholt.net>
Date: Tue Apr 25 16:02:59 2017 -0700
dix: Remove a redundant #define
Found when the meson conversion set the symbol to defined, instead of
defined to 1.
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Keith Packard <keithp@keithp.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Eric Anholt <eric@anholt.net>
commit 27a6b9f7c84c914d0f5909ec1069d72f5035bc04
Author: Michel Dänzer <michel.daenzer@amd.com>
Date: Wed Apr 26 18:31:08 2017 +0900
os: Handle SIGABRT
Without this, assertion failures can make life hard for users and those
trying to help them.
v2:
* Change commit log wording slightly to "can make life hard", since
apparently e.g. logind can alleviate that somewhat.
* Set default handler for SIGABRT in
hw/xfree86/common/xf86Init.c:InstallSignalHandlers() and
hw/xquartz/quartz.c:QuartzInitOutput() (Eric Anholt)
Reviewed-by: Eric Anholt <eric@anholt.net>
Signed-off-by: Michel Dänzer <michel.daenzer@amd.com>
commit 23f2f1932a1d3f36468eaf735ae34934d246567b
Author: Eric Anholt <eric@anholt.net>
Date: Tue Apr 25 11:33:50 2017 -0700
modesetting: Add the "DPI" connector type.
The number for it was merged to drm_mode.h in kernel 4.7, and the
output_names[] array just requires that we slot in new strings in
order.
Signed-off-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
commit fec9607c8e0a84dc86466c638d00b502f21ec622
Author: Eric Anholt <eric@anholt.net>
Date: Fri Apr 21 12:03:45 2017 -0700
Remove support for unaligned swaps.
The previous misc.h code went out of its way to allow swapping of
unaligned pointers to values. However, the members of an X
request/response are always naturally aligned within the struct, and
the buffers containing a request/response will also be aligned to at
least 8 bytes, so we can just drop it.
text data bss dec hex filename
before: 2215167 51552 132016 2398735 249a0f hw/xfree86/Xorg
after: 2214919 51552 132016 2398487 249917 hw/xfree86/Xorg
Signed-off-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Keith Packard <keithp@keithp.com>
commit 4552238960fc05ff885bcabbc24d1489370fbd89
Author: Eric Anholt <eric@anholt.net>
Date: Tue Mar 28 13:09:30 2017 -0700
Add unit tests for the byte swapping macros.
Peter noted a weirdness in my new bswap code, which could use some
tests to justify it.
Signed-off-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 563b6ee873b898c0f3e3671cf6adaf91def5d92a
Author: Eric Anholt <eric@anholt.net>
Date: Mon Mar 27 14:59:06 2017 -0700
Rewrite the byte swapping macros.
The clever pointer tricks were actually not working, and we were doing
the byte-by-byte moves in general. By just doing the memcpy and
obvious byte swap code, we end up generating actual byte swap
instructions, thanks to optimizing compilers.
text data bss dec hex filename
before: 2240807 51552 132016 2424375 24fe37 hw/xfree86/Xorg
after: 2215167 51552 132016 2398735 249a0f hw/xfree86/Xorg
Signed-off-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Keith Packard <keithp@keithp.com>
commit 5ef4e785131bb30e774a8175099c0432537533fa
Author: Eric Anholt <eric@anholt.net>
Date: Fri Mar 31 17:38:27 2017 -0700
Remove default defines of some directories.
The build defines these, so having the defaults is just a way for the
build system's configuration to get out of sync with the code.
v2: Drop #ifndefs around the other two defines.
Signed-off-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Keith Packard <keithp@keithp.com>
commit da27ca84b4324b68037d6ec19a73b9e0a5ef10bc
Author: Eric Anholt <eric@anholt.net>
Date: Fri Mar 31 17:33:52 2017 -0700
xorg: Change __XCONFIGFILE__ to XCONFIGFILE (and DIR) to fix scan.c.
parser/scan.c was checking for #ifdef XCONFIGFILE and XCONFIGDIR and
defaulting to "xorg.conf", and "xorg.conf.d", so if you had changed
__XCONFIGFILE__ to anything else, it would have got out of sync.
Settle on the name without gratuitous underscores.
Signed-off-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Keith Packard <keithp@keithp.com>
commit f81343dd2fff49c70f53e3efdd40f8f89a38e460
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Sat Apr 22 18:10:42 2017 -0700
Mark test_data static in Xinput protocol tests to avoid clashes
Fixes warning from Solaris linker:
ld: warning: symbol 'test_data' has differing sizes:
(file tests-protocol-xigetselectedevents.o value=0x418;
file tests-protocol-xigetclientpointer.o value=0x18);
tests-protocol-xigetselectedevents.o definition taken
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 7bfb87a2137853295ecc9e544a15626cfd773a02
Author: Olivier Fourdan <ofourdan@redhat.com>
Date: Fri Apr 21 09:05:51 2017 +0200
glamor: an FBO is not needed for Xv pixmaps
It appears that on some hardware/diver combo such as nv30/nouveau, using
GL_ALPHA as format for 8-bit depth will cause an incomplete attachment
error (GL_FRAMEBUFFER_INCOMPLETE_ATTACHMENT) when trying to bind the
texture.
As a result, the FBO is NULL and glamor segfaults when trying to access
the FBO width/height in pixmap_priv_get_scale() in glamor_xv_render().
This happens with glamor-xv which uses 8-bit pixmaps, meaning that on
such hardware/driver, trying to play a video using Xv will lead to a
crash of the Xserver. This affects Xwayland, Xephyr, modesetting driver
with glamor accel.
But the use of an FBO is not actually needed for glamox-xv, so by
disabling FBO at pixmap creation, we can avoid the issue entirely.
Fix suggested by Eric Anholt <eric@anholt.net>
Signed-off-by: Olivier Fourdan <ofourdan@redhat.com>
Fixes: https://bugs.freedesktop.org/show_bug.cgi?id=100710
Fixes: https://bugzilla.redhat.com/1412814
Reviewed-by: Eric Anholt <eric@anholt.net>
commit be80a3cb48a7860b9ed985b123f4d8a3b4ae3c89
Author: Eric Anholt <eric@anholt.net>
Date: Mon Mar 27 14:21:43 2017 -0700
glx: Use the same endian swapping as the rest of the server.
This dumps a ton of configure-time checks for system endian macros.
Given that we're marking the mixed-endian fixup code as cold, getting
at the system macros is a waste of code.
Signed-off-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Keith Packard <keithp@keithp.com>
commit dae97e1bb4d4f86db118c22dfeea0eef0d3f8bdd
Author: Eric Anholt <eric@anholt.net>
Date: Thu Mar 23 17:06:17 2017 -0700
configure: Stop checking for XdmcpWrap
As far back as the initial import, it seems to have been exposed, and
there's no explanation why the test happened in the initial xserver
import.
Signed-off-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Keith Packard <keithp@keithp.com>
commit cc882af336c8963a2cba0c93e29869ef59b19818
Author: Roman Gilg <subdiff@gmail.com>
Date: Tue Apr 11 15:52:58 2017 +0200
xwayland: Small comment edit
Be more precise in describing the return value.
Signed-off-by: Roman Gilg <subdiff@gmail.com>
Reviewed-by: Daniel Stone <daniels@collabora.com>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 41dafcc2a2942fc4c94ce3cbafc4a1b413c460c3
Author: Michel Dänzer <michel.daenzer@amd.com>
Date: Wed Apr 12 17:58:05 2017 +0900
xfree86/modes: Make colormap/gamma glue code work with RandR disabled
E.g. because Xinerama is enabled.
Fixes crash on startup and wrong colours in that case.
Bugzilla: https://bugs.freedesktop.org/100293
Bugzilla: https://bugs.freedesktop.org/100294
Fixes: 62f44052573b ("xfree86/modes: Move gamma initialization to
xf86RandR12Init12 v2")
Tested-by: Mariusz Bialonczyk <manio@skyboo.net>
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
commit bcee1b76aa0db8525b491485e90b8740763d7de6
Author: Martin Peres <martin.peres@linux.intel.com>
Date: Mon Apr 10 16:48:21 2017 +0300
modesetting: re-set the crtc's mode when link-status goes BAD
Despite all the careful planning of the kernel, a link may become
insufficient to handle the currently-set mode. At this point, the
kernel should mark this particular configuration as being broken
and potentially prune the mode before setting the offending connector's
link-status to BAD and send the userspace a hotplug event. This may
happen right after a modeset or later on.
Upon receiving a hot-plug event, we iterate through the connectors to
re-apply the currently-set mode on all the connectors that have a
link-status property set to BAD. The kernel may be able to get the
link to work by dropping to using a lower link bpp (with the same
display bpp). However, the modeset may fail if the kernel has pruned
the mode, so to make users aware of this problem a warning is outputed
in the logs to warn about having a potentially-black display.
This patch does not modify the current behaviour of always propagating
the events to the randr clients. This allows desktop environments to
re-probe the connectors and select a new resolution based on the new
(currated) mode list if a mode disapeared. This behaviour is expected in
order to pass the Display Port compliance tests.
Signed-off-by: Martin Peres <martin.peres@linux.intel.com>
Reviewed-by: Eric Anholt <eric@anholt.net>
commit ea91996a9c2081d0692f5c2f79a9fda9effba358
Author: Daniel Stone <daniels@collabora.com>
Date: Tue Apr 11 07:55:00 2017 +0100
README: Add link to fd.o CoC
The Contributor Covenant applies to all fd.o-hosted resources, including
lists and Bugzilla. Add a note to the README, reminding people to act
like human beings.
Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Daniel Stone <daniels@collabora.com>
commit 8bdf340e478524262c85fb81687d7f02b14ad71c
Author: Daniel Stone <daniels@collabora.com>
Date: Tue Apr 11 07:54:59 2017 +0100
README: HTTPS everywhere
All fd.o HTTP services are now HTTPS-only (with redirects, but still).
Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Daniel Stone <daniels@collabora.com>
commit 14d2fe74f4e51c5b37eab4b7475c804a0340b530
Author: Adam Jackson <ajax@redhat.com>
Date: Fri Apr 7 10:24:54 2017 -0400
xephyr: Check for host XVideo support before trying to use it
Otherwise xcb will treat our attempt to send xv requests as a connection
error (quite reasonably: we're asking it to emit a request for which
there is no defined major opcode), and we'll die quietly the first time
we hit KdBlockhandler.
Signed-off-by: Adam Jackson <ajax@redhat.com>
Reviewed-by: Eric Anholt <eric@anholt.net>
commit 7dfb9608d080b46a7b21b57dc8aa2f52670addce
Author: Adam Jackson <ajax@redhat.com>
Date: Wed Apr 5 13:21:10 2017 -0400
glx: Remove enter/leave server API
Dead code since:
commit 8aacf47e1778d8b72811b025a82452b933d3c1f2
Author: Adam Jackson <ajax@redhat.com>
Date: Fri Oct 4 12:58:19 2013 -0400
glx: Remove DRI1 AIGLX (v2)
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit 0c8e6ed85810e96d84173a52d628863802a78d82
Author: Daniel Stone <daniels@collabora.com>
Date: Fri Apr 7 14:27:58 2017 +0100
modesetting: Set correct DRM event context version
DRM_EVENT_CONTEXT_VERSION is the latest context version supported by
whatever version of libdrm is present. modesetting was blindly asserting
it supported whatever version that may be, even if it actually didn't.
With libdrm 2.4.78, setting a higher context version than 2 will attempt
to call the page_flip_handler2 vfunc if it was non-NULL, which being a
random chunk of stack memory, it might well have been.
Set the version as 2, which should be bumped only with the appropriate
version checks.
Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Daniel Stone <daniels@collabora.com>
commit e4d0757fc2620fd3182448c5e4b5a55a509594d3
Author: Adam Jackson <ajax@redhat.com>
Date: Wed Mar 29 11:35:32 2017 -0400
xfree86: Remove driver entity hooks and private
No driver is using these, as far as I know.
v2: Tripwire the entity hook arguments to xf86Config*Entity, fix
documentation (Eric Anholt)
Signed-off-by: Adam Jackson <ajax@redhat.com>
Reviewed-by: Eric Anholt <eric@anholt.net>
commit 33604187674ec78b2c0bf7f67af250acc80cf23a
Author: Adam Jackson <ajax@redhat.com>
Date: Fri Mar 24 12:30:58 2017 -0400
dpms: Consolidate a bunch of stuff into Xext/dpms.c
Most of this is a legacy of the old "extmod" design where you could load
_some_ extensions dynamically but only if the server had been built with
support for them in the first place.
Note that since we now only initialize the DPMS extension if at least
one screen supports it, we no longer need DPMSCapableFlag: if it would
be false, we would never read its value.
Signed-off-by: Adam Jackson <ajax@redhat.com>
Reviewed-by: Eric Anholt <eric@anholt.net>
commit 7f1ef9289d974fc2bacc968ae0b5d7714382cb9e
Author: Adam Jackson <ajax@redhat.com>
Date: Fri Mar 24 12:30:57 2017 -0400
dix: Lift DPMS to a screen hook
Following on from the previous change, this adds a DPMS hook to the
ScreenRec and uses that to infer DPMS support. As a result we can drop
the dpms stub code from Xext.
Signed-off-by: Adam Jackson <ajax@redhat.com>
Reviewed-by: Eric Anholt <eric@anholt.net>
commit 8ed0b00fceb34cdb54a0ea113c3cdff3b4c9e7e1
Author: Adam Jackson <ajax@redhat.com>
Date: Fri Mar 24 12:30:56 2017 -0400
xfree86: Clean up DPMS support
Rather than setting up a per-screen private, just conditionally
initialize ScrnInfoRec::DPMSSet based on the config options, and inspect
that to determine whether DPMS is supported.
We also move the "turn the screen back on at CloseScreen" logic into the
DPMS extension's (new) reset hook. This would be a behavior change for
the non-xfree86 servers, if any of them had non-stub DPMS support.
Signed-off-by: Adam Jackson <ajax@redhat.com>
Reviewed-by: Eric Anholt <eric@anholt.net>
commit 21eda7464d0e13ac6558edaf6531c3d3251e05df
Author: Tobias Stoeckmann <tobias@stoeckmann.org>
Date: Sun Mar 12 14:21:38 2017 +0100
dmx: Fix null pointer dereference
A null pointer dereference can occur in dmxSync, because TimerForce
does not handle a null pointer.
dmxSyncTimer is set to NULL a few lines above on a certain condition,
which happened on my machine. The explicit NULL check allowed me to
start Xdmx again without a segmentation fault.
Reviewed-by: Adam Jackson <ajax@redhat.com>
commit 5cdfcdef819efa6406807254cb3c7aba6ba5475e
Author: Matt Turner <mattst88@gmail.com>
Date: Thu Mar 23 19:37:46 2017 -0700
xkb: Correct type of XkbDfltAccessXOptions.
Declared as unsigned short in xkb/xkbAccessX.c.
Signed-off-by: Matt Turner <mattst88@gmail.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit f4b78286ea8d4c94a913a02a3579cbe55e8f1f6b
Author: Adam Jackson <ajax@redhat.com>
Date: Mon Mar 20 13:08:19 2017 -0400
glx: Fix MakeCurrent with no drawables
GLX_ARB_create_context, which we aspire to support, allows making GL 3.0
or newer contexts current with null current drawables. Strictly this
might not be legal for pre-3.0 contexts, but there's no harm in allowing
it anyway.
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit e2e50c509718ea8c7f4684dc18f5ce66e526792b
Author: Eric Anholt <eric@anholt.net>
Date: Wed Mar 22 15:11:35 2017 -0700
xserver: Unifdef HAVE_CONFIG_H
The X Server never generates a global config.h, and instead all these
paths are including dix-config.h or xorg-config.h.
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Daniel Stone <daniels@collabora.com>
Signed-off-by: Eric Anholt <eric@anholt.net>
commit 266af991c8e41e62f054ac9870468a9ba2aaa9f2
Author: Eric Anholt <eric@anholt.net>
Date: Wed Mar 22 15:11:34 2017 -0700
glamor: Fix some formatting that confused the unifdef command.
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Daniel Stone <daniels@collabora.com>
Signed-off-by: Eric Anholt <eric@anholt.net>
commit 2da405759fbabd4b918838a0de728c1911b4a2fa
Author: Eric Anholt <eric@anholt.net>
Date: Wed Mar 22 15:11:33 2017 -0700
xserver: Check the right HAVE_*_CONFIG_H.
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Daniel Stone <daniels@collabora.com>
Signed-off-by: Eric Anholt <eric@anholt.net>
commit 190c2adf4a237a4c0dc13d7566ca91662271d3e4
Author: Eric Anholt <eric@anholt.net>
Date: Wed Mar 22 15:11:32 2017 -0700
kdrive: Drop kdrive-config.h.
It had nothing left in it that was used but wasn't in dix-config.h.
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Daniel Stone <daniels@collabora.com>
Signed-off-by: Eric Anholt <eric@anholt.net>
commit 5c7ed785e3bdb9f0fbf8fbfdc93b5fdd2b2c7dbf
Author: Eric Anholt <eric@anholt.net>
Date: Wed Mar 22 15:11:31 2017 -0700
kdrive: Remove vestiges of TSLIB support.
The actual code was gone in 27819950e4158326e0f83a30f2e8968b932625ef,
but some checks remained.
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Daniel Stone <daniels@collabora.com>
Signed-off-by: Eric Anholt <eric@anholt.net>
commit 1b1a8c481773e15142202a7b761d614b33f12577
Author: Eric Anholt <eric@anholt.net>
Date: Wed Mar 22 15:11:30 2017 -0700
kdrive: Unifdef KDRIVE_EVDEV.
ajax deleted the evdev driver in the removal of fbdev and the linux
backend.
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Daniel Stone <daniels@collabora.com>
Signed-off-by: Eric Anholt <eric@anholt.net>
commit ad6689b7db0a4b0d22716acedae98462a68ea1ae
Author: Mariusz Bialonczyk <manio@skyboo.net>
Date: Fri Mar 17 11:20:22 2017 +0100
configure.ac: fix checking for libdrm version after 9232835bd
No matter what libdrm version was installed, it always set
the GLAMOR_HAS_DRM_NAME_FROM_FD_2 conditional to 1.
This obviously leads to compilation problems.
Fixes: 9232835bd16b ("glamor: use drmGetDeviceNameFromFD2 when available")
Signed-off-by: Mariusz Bialonczyk <manio@skyboo.net>
Reviewed-and-Tested-by: Qiang Yu <Qiang.Yu@amd.com>
commit eb2cf11724df5cbe0be3cce1ad4c61ba61e8ec6b
Author: Michel Dänzer <michel.daenzer@amd.com>
Date: Thu Mar 23 12:42:37 2017 +0900
Xephyr: Handle source-only pictures in ephyrPrepare/DoneComposite
There is no pixmap associated with source-only pictures.
Fixes Xephyr -fakexa crashing on startup.
Signed-off-by: Michel Dänzer <michel.daenzer@amd.com>
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit fdc79fe72bc0b97776df2c3a664076c60e08a87c
Author: Michel Dänzer <michel.daenzer@amd.com>
Date: Thu Mar 9 17:34:55 2017 +0900
edid: Prune duplicates after adding modes from DDC
Multiple calls to xf86EdidMonitorSet (which can be triggered e.g. by
running xrandr) would potentially keep adding the same modes, causing
the Monitor->Modes list to keep growing larger and using up more memory.
Fix this by calling xf86PruneDuplicateModes after adding the modes
returned by xf86DDCGetModes. This makes sure there's only one instance
of each unique mode in the list.
v2:
* Replace semicolon with {} for empty for loop (Emil Velikov)
* Slightly tweak commit log to avoid minor inaccuracy about what
xf86PruneDuplicateModes does
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=99521
Signed-off-by: Michel Dänzer <michel.daenzer@amd.com>
Reviewed-by: Emil Velikov <emil.l.velikov@gmail.com>
commit 4e76c2711740b775242170d8e5ee56c7e6829cce
Author: Adam Jackson <ajax@redhat.com>
Date: Mon Mar 20 13:42:12 2017 -0400
dix: Remove PRIVATE_DAMAGE
None of this is actually wired up to anything, so we can also remove the
devPrivates from the DamageRec. The DamageExtRec is what would need
devPrivates for selinux labeling, in principle.
Signed-off-by: Adam Jackson <ajax@redhat.com>
Reviewed-by: Eric Anholt <eric@anholt.net>
commit 40c12a76c2ae57adefd3b1d412387ebbfe2fb784
Author: Tobias Stoeckmann <tobias@stoeckmann.org>
Date: Sun Mar 19 17:55:07 2017 +0100
record: Fix OOB access in ProcRecordUnregisterClients
If a client sends a RecordUnregisterClients request with an nClients
field larger than INT_MAX / 4, an integer overflow leads to an
out of boundary access in RecordSanityCheckClientSpecifiers.
An example line with libXtst would be:
XRecordUnregisterClients(dpy, rc, clients, 0x40000001);
Reviewed-by: Adam Jackson <ajax@redhat.com>
commit 1ad230682338a9d2fc6eca6966a5bebb007df32c
Author: Adam Jackson <ajax@redhat.com>
Date: Mon Sep 26 13:28:42 2016 -0400
glamor: Avoid software fallback for planemasked ZPixmap GetImage
Same trick as in fb: just do a normal GetImage and deal with the
planemask on the CPU if you have to. Since the software fallback hit for
glamor is pretty brutal, this is a much more impressive win for glamor
than it was for fb:
11100.0 87700.0 (7.901) (copy 0xaaaaaaaa) ShmGetImage 10x10 square
9840.0 47800.0 (4.858) (copy 0xaaaaaaaa) ShmGetImage 100x100 square
1550.0 4240.0 (2.735) (copy 0xaaaaaaaa) ShmGetImage 500x500 square
9450.0 78900.0 (8.349) (0xaaaaaaaa) GetImage 10x10 square
6910.0 30900.0 (4.472) (0xaaaaaaaa) GetImage 100x100 square
431.0 2020.0 (4.687) (0xaaaaaaaa) GetImage 500x500 square
Measured with Xephyr -glamor on Skylake GT3e.
Reviewed-by: Eric Anholt <eric@anholt.net>
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit 4aa35c46dab72bc945981f6fd29e494133bc2b0a
Author: Adam Jackson <ajax@redhat.com>
Date: Wed Sep 28 11:18:34 2016 -0400
fb: Handle ZPixmap planemask in GetImage the other way around
Formerly we'd zero the image data and then pull out a plane at a time.
It's faster to apply the planemask after the fact, since that turns the
GetImage into a memcpy:
100000.0 101000.0 (1.010) (copy 0xaaaaaaaa) ShmGetImage 10x10 square
42400.0 59400.0 (1.401) (copy 0xaaaaaaaa) ShmGetImage 100x100 square
3040.0 5280.0 (1.737) (copy 0xaaaaaaaa) ShmGetImage 500x500 square
96100.0 95200.0 (0.991) (0xaaaaaaaa) GetImage 10x10 square
29600.0 36800.0 (1.243) (0xaaaaaaaa) GetImage 100x100 square
1850.0 2620.0 (1.416) (0xaaaaaaaa) GetImage 500x500 square
Measured with Xvfb at depth 24 on Skylake i7-6560U.
Reviewed-by: Eric Anholt <eric@anholt.net>
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit 368f60d461421fe5e2bbd90652d6ac858dbff8fe
Author: Kenneth Graunke <kenneth@whitecape.org>
Date: Fri Mar 17 13:45:04 2017 -0700
dri2: Sync i965_pci_ids.h from Mesa.
Copied from Mesa with no modifications. Gives us Geminilake PCI IDs.
Signed-off-by: Kenneth Graunke <kenneth@whitecape.org>
Acked-by: Eric Anholt <eric@anholt.net>
commit 8805a48ed35afb2ca66315656c1575ae5a01c639
Author: Olivier Fourdan <ofourdan@redhat.com>
Date: Fri Mar 17 15:58:26 2017 +0100
glamor: avoid a crash if texture allocation failed
Texture creation in _glamor_create_tex() can fail if a GL_OUT_OF_MEMORY
is raised, in which case the texture returned is zero.
But the texture value is not checked in glamor_create_fbo() and glamor
will abort in glamor_pixmap_ensure_fb() because the fbo->tex is 0:
Truncated backtrace:
Thread no. 1 (10 frames)
#4 glamor_pixmap_ensure_fb at glamor_fbo.c:57
#5 glamor_create_fbo_from_tex at glamor_fbo.c:112
#6 glamor_create_fbo at glamor_fbo.c:159
#7 glamor_create_fbo_array at glamor_fbo.c:210
#8 glamor_create_pixmap at glamor.c:226
#9 compNewPixmap at compalloc.c:536
#10 compAllocPixmap at compalloc.c:605
#11 compCheckRedirect at compwindow.c:167
#12 compRealizeWindow at compwindow.c:267
#13 RealizeTree at window.c:2617
Check the value returned by _glamor_create_tex() in glamor_create_fbo()
and return NULL in the texture is zero.
All callers of glamor_create_fbo() actually check the returned value and
will use a fallback code path if it's NULL.
Please cherry-pick this to active stable branches.
Bugzilla: https://bugzilla.redhat.com/1433305
Signed-off-by: Olivier Fourdan <ofourdan@redhat.com>
Reviewed-by: Eric Anholt <eric@anholt.net>
commit 0803918e64262482035f042e5e1f2a571d3dea1b
Author: Adam Jackson <ajax@redhat.com>
Date: Sat Sep 24 19:40:52 2016 -0400
fb: Remove 24bpp support (v3)
v2:
- Require power-of-two bpp in ScreenInit
- Eliminate fbCreatePixmapBpp
v3
- Squash in the exa and glamor changes so we can remove pRotatedPixmap
in the same stroke.
Reviewed-by: Eric Anholt <eric@anholt.net>
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit e33be78e2ab63abc84aa0baddff90bcefa9c183a
Author: Adam Jackson <ajax@redhat.com>
Date: Fri Feb 28 13:19:00 2014 -0500
xfree86: Remove 24bpp pixmap format support (v2)
There's really no reason to pretend to support this, apps hate it, all
we're doing is giving people a way to injure themselves. It doesn't work
anyway with any Radeon, any NVIDIA chip, or any Intel chip since i810.
Rip out all the logic for handling 24bpp pixmaps and framebuffers, and
silently ignore the old options that would ask for it.
The cirrus alpine driver has been updated to default to 16bpp, and both
it and the i810 driver can now use the 32->24 conversion code in shadow
if they want. All other drivers support 32bpp. Configurations that
explicitly request 24bpp in order to fit in VRAM will be broken now
though.
v2: Fix command line options to silently ignore 24bpp rather than fail
Reviewed-by: Eric Anholt <eric@anholt.net>
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit 83c4297d2c4fd501a9d36bc0cb7d357a8d22394c
Author: Adam Jackson <ajax@redhat.com>
Date: Fri Mar 17 12:40:03 2017 -0400
ephyr: Don't clobber bitsPerPixel when using glamor
This ends up passing 0 as the bpp argument to fb screen setup, which is
not really the best plan.
Reviewed-by: Eric Anholt <eric@anholt.net>
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit fe0b297420fc1de8a7fab28457d0864b3182e967
Author: Eric Anholt <eric@anholt.net>
Date: Wed Mar 15 17:51:46 2017 -0700
glamor: Fix dashed line rendering.
We were binding the screen pixmap as the dash and sampling its alpha,
which is usually just 1.0 (no dashing at all).
Please cherry-pick this to active stable branches.
Signed-off-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Keith Packard <keithp@keithp.com>
Reviewed-by: Michel Dänzer <michel.daenzer@amd.com>
commit 5b5ba7dc3d544868035b7088e9aac62eb2511e10
Author: Adam Jackson <ajax@redhat.com>
Date: Thu Mar 16 14:19:37 2017 -0400
Revert "sdksyms: Tighten up the symbols we add to the magic table"
Enough people are reporting build issues pointing at this commit that
it's not worth the benefit.
This reverts commit 3dad57b121fdf001e75fffa7e3007a9a0a154f67.
commit e337de2d488a124e5fee0fdcb882567b68f1767d
Author: Adam Jackson <ajax@redhat.com>
Date: Wed Nov 2 12:49:25 2016 -0400
xinerama: Implement graphics exposures for window->pixmap copies (v4)
This code is using GetImage to accumulate a logical view of the window
image (since the windows will be clipped to their containing screen),
and then PutImage to load that back into the pixmap. What it wasn't
doing was constructing a region for the obscured areas of the window and
emitting graphics exposures for same.
v2: Fix coordinate translation when the source is the root window
v3: Create sourceBox with the right coordinates initially instead of
translating (Keith Packard)
v4: Clamp the region to 15 bits to avoid overflow (Keith Packard)
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit f1f865e909090406841a9b9416ea6259a75c2086
Author: Adam Jackson <ajax@redhat.com>
Date: Mon Jan 23 11:31:36 2017 -0500
parser: Fix crash when xf86nameCompare(s1 = x, s2 = NULL)
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit 455051a0f1d2bc84f605c325f647bd64d414c47d
Author: Olivier Fourdan <ofourdan@redhat.com>
Date: Tue Mar 14 15:06:34 2017 +0100
glamor: Check glamor_set_destination_drawable() return value
Check the value returned by glamor_set_destination_drawable() and use
the fallback code path where possible.
Bugzilla: https://bugzilla.redhat.com/1417575
Signed-off-by: Olivier Fourdan <ofourdan@redhat.com>
commit 04b4bad7c048fd077fe839f10634c99ef1e488af
Author: Olivier Fourdan <ofourdan@redhat.com>
Date: Tue Mar 14 14:58:26 2017 +0100
glamor: glamor_set_destination_drawable() can fail
The fbo_array of a given glamor pixmap can be NULL in some cases, as
glamor_create_fbo_array() can fail to allocate the FBO array.
If this is the case, glamor_pixmap_fbo_at() will return NULL even though
the box index is valid, and glamor_set_destination_drawable() simply
assumes glamor_pixmap_fbo_at() will return an FBO prior to pass the
value to glamor_set_destination_pixmap_fbo(), which will segfault.
We need a way for glamor_set_destination_drawable() to fail safely and
let the caller know about the failure.
Add a boolean return value to glamor_set_destination_drawable() for that
purpose.
Bugzilla: https://bugzilla.redhat.com/1417575
Signed-off-by: Olivier Fourdan <ofourdan@redhat.com>
commit b0ce1d088a863492f5de11e4dbde10af4261d892
Author: Olivier Fourdan <ofourdan@redhat.com>
Date: Tue Mar 14 15:22:32 2017 +0100
Xephyr: Check screen resources creation success
If the screen pixmap or the corresponding texture creation with glamor
fails, exit cleanly with an error message instead of segfaulting.
Fixes: https://bugzilla.redhat.com/1431633
Reviewed-by: Michel Dänzer <michel.daenzer@amd.com>
Signed-off-by: Olivier Fourdan <ofourdan@redhat.com>
commit f40ff18c96e02ff18a367bf53feeb4bd8ee952a0
Author: Olivier Fourdan <ofourdan@redhat.com>
Date: Tue Mar 14 15:22:31 2017 +0100
glamor: Check for NULL pixmap in glamor_get_pixmap_texture()
glamor_create_pixmap() would return a NullPixmap if the given size is
larger than the maximum size of a pixmap.
But glamor_get_pixmap_texture() won't check if the given pixmap is
non-null, leading to a segfault if glamor_create_pixmap() failed.
This can be reproduced by passing Xephyr a very large screen width,
e.g.:
$ Xephyr -glamor -screen 32768x1024 :10
(EE)
(EE) Backtrace:
(EE) 0: Xephyr (OsSigHandler+0x29)
(EE) 1: /lib64/libpthread.so.0 (__restore_rt+0x0)
(EE) 2: Xephyr (glamor_get_pixmap_texture+0x30)
(EE) 3: Xephyr (ephyr_glamor_create_screen_resources+0xc6)
(EE) 4: Xephyr (ephyrCreateResources+0x98)
(EE) 5: Xephyr (dix_main+0x275)
(EE) 6: /lib64/libc.so.6 (__libc_start_main+0xf1)
(EE) 7: Xephyr (_start+0x2a)
(EE) 8: ? (?+0x2a) [0x2a]
(EE)
(EE) Segmentation fault at address 0x0
(EE)
Fatal server error:
(EE) Caught signal 11 (Segmentation fault). Server aborting
(EE)
Aborted (core dumped)
Bugzilla: https://bugzilla.redhat.com/1431633
Reviewed-by: Michel Dänzer <michel.daenzer@amd.com>
Signed-off-by: Olivier Fourdan <ofourdan@redhat.com>
commit 646bc74cded8b77d57312ae858a2ed01b0d17c21
Author: Adam Jackson <ajax@redhat.com>
Date: Fri Mar 3 14:51:51 2017 -0500
test: Fix distcheck failures
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit bca221609004aecbcc8928382ad29ce319d2eb6f
Author: Jon TURNEY <jon.turney@dronecode.org.uk>
Date: Mon Mar 6 17:44:19 2017 +0000
xfree86: work around a sdksyms problem with gcc5 on Cygwin
The linemarkers in the preprocessor output from gcc5 on Cygwin have
canonicalized paths to included files (e.g. xserver/build/../include/misc.h
is canonicalized to xserver/build/include/misc.h). (see gcc svn rev 210264,
which causes the transformation performed by -fcanonical-system-headers to
be applied to all include pathnames)
These canonicalized paths won't match $topdir, so sdksyms doesn't look at
the contents of those headers for sdk exported symbols.
Workaround this by canonicalizing all the paths we consider, using readlink.
v2:
Keep a cache of readlink results so it isn't quite so dreadfully slow.
Reviewed-by: Adam Jackson <ajax@redhat.com>
commit ac15d4cecca377c5c31ab852c39bbd554ca48fe2
Author: Tobias Stoeckmann <tobias@stoeckmann.org>
Date: Mon Mar 13 19:13:14 2017 +0100
render: Fix out of boundary heap access
ProcRenderCreateRadialGradient and ProcRenderCreateConicalGradient must
be protected against an integer overflow during length check. This is
already included in ProcRenderCreateLinearGradient since the fix for
CVE-2008-2362.
This can only be successfully exploited on a 32 bit system for an
out of boundary read later on. Validated by using ASAN.
Reviewed-by: Adam Jackson <ajax@redhat.com>
commit 0c1574d9882a91b2c1a046bf4ac5a9b138a37965
Author: Michel Dänzer <michel.daenzer@amd.com>
Date: Thu Mar 9 18:13:31 2017 +0900
glamor: Fix typo: "vec2_pos" -> "vec2 pos"
Fixes crash when trying to use dashed lines:
Failed to compile VS: 0:8(2): error: `vec2_pos' undeclared
Trivial.
Fixes: d8161aeb5089 ("glamor: Fix missing declaration in dash vertex
shader")
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=99943
commit 937527f9798d573ec82c2c508821899c229c018f
Author: Olivier Fourdan <ofourdan@redhat.com>
Date: Wed Mar 8 10:32:22 2017 +0100
xwayland: Monitor client states to destroy callbacks
Client resources can survive the client itself, in which case we
may end up in our sync callback trying to access client's data after
it's been freed/reclaimed.
Add a ClientStateCallback handler to monitor the client state changes
and clear the sync callback set up by the glamor drm code if any.
Fixes: https://bugs.freedesktop.org/show_bug.cgi?id=100040
Tested-by: Mark B <mark.blakeney@bullet-systems.net>
Signed-off-by: Olivier Fourdan <ofourdan@redhat.com>
Reviewed-by: Michel Dänzer <michel.daenzer@amd.com>
commit 669eb0a65430678fe97de9405e4e42dcb4417ed2
Author: Jon Turney <jon.turney@dronecode.org.uk>
Date: Wed Mar 8 23:46:27 2017 +0000
test: Use correct signature for XISetEventMask wrapper
This looks like it's always been wrong, but didn't matter before the single
test binary changes as the wrapper was only in place for tests which didn't
care about it's effects, so didn't forward to the real implementation. (see
the changes to protocol-xiselectevents.c in 773fc07e)
This fixes the protocol_xigetselectedevents_test for me. I'm a bit
surprised that passes for anyone at the moment.
Signed-off-by: Jon Turney <jon.turney@dronecode.org.uk>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 9232835bd16b6948442f7a4588fb9376782cb814
Author: Qiang Yu <Qiang.Yu@amd.com>
Date: Tue Mar 7 11:53:23 2017 +0800
glamor: use drmGetDeviceNameFromFD2 when available
This is for glamor can support fd from DRM render node which is useful
for a render only DDX.
Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Qiang Yu <Qiang.Yu@amd.com>
commit d4b7e0eaa4b2e97ce1dec653a2ae7d9621fe1431
Author: Olivier Fourdan <ofourdan@redhat.com>
Date: Tue Mar 7 10:28:35 2017 +0100
xwayland: clear cursor frame callback
After an X cursor is unrealized, the seat's corresponding x_cursor is
cleared, but if a frame callback was pending at the time, it will
remain and thus prevent any further cursor update, leaving the window
with no cursor.
Make sure to destroy the frame callback, if any, when that occurs, so
that next time a cursor needs to be set, it won't be ignored for a frame
callback that will never be triggered.
Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=1389327
Signed-off-by: Olivier Fourdan <ofourdan@redhat.com>
Reviewed-by: Pekka Paalanen <pekka.paalanen@collabora.co.uk>
Reviewed-by: Rui Matos <tiagomatos@gmail.com>
commit 64ca14b85e45b13628396f21d1903e311f92a9e1
Author: Olivier Fourdan <ofourdan@redhat.com>
Date: Thu Mar 2 10:19:26 2017 +0100
xwayland: make sure client is not gone in sync callback
in XWayland, dri3_send_open_reply() is called from a sync callback, so
there is a possibility that the client might be gone when we get to the
callback eventually, which leads to a crash in _XSERVTransSendFd() from
WriteFdToClient() .
Check if clientGone has been set in the sync callback handler to avoid
this.
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=99149
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=100040
Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=1416553
Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Olivier Fourdan <ofourdan@redhat.com>
Tested-by: Mark B <mark.blakeney@bullet-systems.net>
commit 5c44169caed811e59a65ba346de1cadb46d266ec
Author: Adam Jackson <ajax@redhat.com>
Date: Thu Mar 2 17:20:30 2017 -0500
os: Squash missing declaration warning for timingsafe_memcmp
timingsafe_memcmp.c:21:1: warning: no previous prototype for ‘timingsafe_memcmp’ [-Wmissing-prototypes]
timingsafe_memcmp(const void *b1, const void *b2, size_t len)
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit 0d7f05ed99b71a4641415c9f26e245c3bb24a9a0
Author: Adam Jackson <ajax@redhat.com>
Date: Wed Mar 1 16:13:59 2017 -0500
miarc: "Cache" arc span data for dashed arcs
This avoids recomputing the span data for every dash. x11perf thinks
this is a pretty modest speedup:
832919.4 840471.1 ( 1.009) 100-pixel dashed ellipse
672353.1 680652.2 ( 1.012) 100-pixel double-dashed ellipse
13748.9 24287.9 ( 1.767) 100-pixel wide dashed ellipse
9236.3 21298.2 ( 2.306) 100-pixel wide double-dashed ellipse
But part of the reason it's so modest there is that the arcs are
relatively small (100 pixel diameter at line width 10, so ~6000 pixels)
and the dashes relatively large (30 on 20 off so ~6 dashes per
quadrant).
With larger arcs and finer dashes this is much more impressive. A fairly
trivial testcase of a single 15000x13000 arc with the default {2, 2}
dash pattern drops from ~3500 milliseconds to 10 milliseconds.
Reviewed-by: Keith Packard <keithp@keithp.com>
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit 849c825855b82caf44d25edb8155bc9f17869256
Author: Adam Jackson <ajax@redhat.com>
Date: Wed Mar 1 16:13:58 2017 -0500
miarc: Make the caller free the arc span data
drawArc does some fairly expensive computation, but it's only sensitive
to arc width/height. Thread the span data up through the call chain so
it's at least possible for the caller to cache things.
Reviewed-by: Keith Packard <keithp@keithp.com>
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit 9426c5500b72e1fe004fef4c3b259023c4ec49f7
Author: Adam Jackson <ajax@redhat.com>
Date: Wed Mar 1 16:13:57 2017 -0500
miarc: Style cleanup for miWideArc
Outdent, normalize comment formatting, and use 'goto out' idiom for
error paths. No functional change.
Reviewed-by: Keith Packard <keithp@keithp.com>
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit fe5c340046c8cf755b92763a49b2dc475e856a76
Author: Olivier Fourdan <ofourdan@redhat.com>
Date: Wed Mar 1 08:51:31 2017 +0100
xwayland: do not set checkRepeat on master kbd
keyboard_check_repeat() fetches the XWayland seat from the
dev->public.devicePrivate do do its thing.
If a key event is sent programmatically through Xtest, our device is the
virtual core keyboard and that has a dev->public.devicePrivate of NULL,
leading to a segfault in keyboard_check_repeat().
This is the case with "antimicro" which sends key events based on the
joystick buttons.
Don't set the checkRepeat handler on the VCK since it cannot possibly work
anyway and it has no effect on the actual checkRepeat intended functionality.
Bugzilla: https://bugzilla.redhat.com/1416244
Signed-off-by: Olivier Fourdan <ofourdan@redhat.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 27819950e4158326e0f83a30f2e8968b932625ef
Author: Adam Jackson <ajax@redhat.com>
Date: Thu Feb 16 12:46:23 2017 -0500
kdrive: Remove now-unused linux backend
With Xfbdev gone this has no consumers.
Signed-off-by: Adam Jackson <ajax@redhat.com>
Acked-by: Alex Deucher <alexander.deucher@amd.com>
commit feed7e3f982a7ac14f6fe85ed2e1ec4a83700841
Author: Adam Jackson <ajax@redhat.com>
Date: Thu Feb 16 12:46:22 2017 -0500
xfbdev: Remove
With the shadow framebuffer overallocation bug fixed (ref below), Xorg +
fbdev has tens to hundreds of kilobytes more baseline memory usage than
Xfbdev. That's not nothing, but it's little enough that we should focus
our efforts on the server that actually gets development attention.
https://cgit.freedesktop.org/xorg/driver/xf86-video-fbdev/commit/?id=2c5eba8
Signed-off-by: Adam Jackson <ajax@redhat.com>
Acked-by: Alex Deucher <alexander.deucher@amd.com>
commit 35fbcb3f9987758bc26a87d5d7c033f4367cbd39
Author: Adam Jackson <ajax@redhat.com>
Date: Thu Feb 16 12:46:21 2017 -0500
xfake: Remove
We already have Xvfb for a dummy DDX.
Signed-off-by: Adam Jackson <ajax@redhat.com>
Acked-by: Alex Deucher <alexander.deucher@amd.com>
commit 3dad57b121fdf001e75fffa7e3007a9a0a154f67
Author: Adam Jackson <ajax@redhat.com>
Date: Thu Feb 16 14:00:03 2017 -0500
sdksyms: Tighten up the symbols we add to the magic table
The code as written would match anything declared extern. _X_EXPORT is
what we really mean here. That's a macro, so check for what it expands
to and skip if not found.
Signed-off-by: Adam Jackson <ajax@redhat.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 386fbbe410a1168b724136e54cf3bd37fb64ad4e
Author: Matthieu Herrb <matthieu@herrb.eu>
Date: Wed Mar 1 20:28:34 2017 +0100
Brown bag commit to fix 957e8d (arc4random_buf() support)
- typo in #ifdef check
- also need to add AC_CHECK_FUNCS([arc4random_buf])
Reported-by Eric Engestrom. Thanks
Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Matthieu Herrb <matthieu@herrb.eu>
commit dc7ceda90fdedb2212f105095fe8d449bfdb0eb4
Author: Adam Jackson <ajax@redhat.com>
Date: Thu Feb 16 14:56:45 2017 -0500
dispatch: Mark swapped dispatch as _X_COLD
This touches everything that ends up in the Xorg binary; the big missing
part is GLX since that's all generated code. Cuts about 14k from the
binary on amd64.
Signed-off-by: Adam Jackson <ajax@redhat.com>
Reviewed-by: Eric Anholt <eric@anholt.net>
commit 8c9909a99292b2fb4a86de694bb0029f61e35662
Author: Olivier Fourdan <ofourdan@redhat.com>
Date: Tue Feb 28 14:27:52 2017 +0100
xwayland: Make sure we have a focus window
During the InitInput() phase, the wayland events get dequeued so we
can possibly end up calling dispatch_pointer_motion_event().
If this occurs before xwl_seat->focus_window is set, it leads to a NULL
pointer derefence and a segfault.
Check for xwl_seat->focus_window in both pointer_handle_frame() and
relative_pointer_handle_relative_motion() prior to calling
dispatch_pointer_motion_event() like it's done in
pointer_handle_motion().
Bugzilla: https://bugzilla.redhat.com/1410804
Signed-off-by: Olivier Fourdan <ofourdan@redhat.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit c9cbdada755f1d00d164bef7833f1aef139ffeb0
Author: Adam Jackson <ajax@redhat.com>
Date: Mon Feb 20 10:24:14 2017 -0500
vfb: Bump default depth to 24
Signed-off-by: Adam Jackson <ajax@redhat.com>
Acked-by: Keith Packard <keithp@keithp.com>
Reviewed-by: Eric Anholt <eric@anholt.net>
commit 2855f759b1e7bf7f5e57cac36c1f0d0e5ac1a683
Author: Matthieu Herrb <matthieu@herrb.eu>
Date: Tue Feb 28 19:18:56 2017 +0100
auth: remove AuthToIDFunc and associated functions. Not used anymore.
And the current code for MitToId has a use-after-free() issue.
[Also remove the actual implementations - ajax]
Signed-off-by: Matthieu Herrb <matthieu@herrb.eu>
Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
commit 957e8db38f27932d353e86e9aa69cf16778b18f1
Author: Matthieu Herrb <matthieu@herrb.eu>
Date: Tue Feb 28 19:18:43 2017 +0100
Use arc4random_buf(3) if available to generate cookies.
Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Matthieu Herrb <matthieu@herrb.eu>
commit d7ac755f0b618eb1259d93c8a16ec6e39a18627c
Author: Matthieu Herrb <matthieu@herrb.eu>
Date: Tue Feb 28 19:18:25 2017 +0100
Use timingsafe_memcmp() to compare MIT-MAGIC-COOKIES CVE-2017-2624
Provide the function definition for systems that don't have it.
Signed-off-by: Matthieu Herrb <matthieu@herrb.eu>
Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
commit 1b12249fd6d4d3b566043d556503f3f625b9b4ba
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu Feb 23 10:21:49 2017 +1000
os: log a bug whenever WriteToClient is called from the input thread
The input thread should generate events, not send them. Make it easier to
find the instances where it's doing so.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Tested-by: Olivier Fourdan <ofourdan@redhat.com>
Reviewed-by: Olivier Fourdan <ofourdan@redhat.com>
commit 7d7788e0f2fbbf5d05cb918df11a5e1b7e047e48
Author: Olivier Fourdan <ofourdan@redhat.com>
Date: Fri Feb 17 09:16:24 2017 +0100
Revert "xwayland: bump wayland-protocols version to 1.7"
This reverts commit 371ff0c969a38a0013688391bbd7375bc7b6f933.
Reviewed-by: Adam Jackson <ajax@redhat.com>
commit 9f4d308cdad957a354912f17febe5bcad7f44812
Author: Pekka Paalanen <pekka.paalanen@collabora.co.uk>
Date: Wed Nov 23 13:30:53 2016 +0200
xwayland: use _XWAYLAND_ALLOW_COMMITS property
The X11 window manager (XWM) of a Wayland compositor can use the
_XWAYLAND_ALLOW_COMMITS property to control when Xwayland sends
wl_surface.commit requests. If the property is not set, the behaviour
remains what it was.
XWM uses the property to inhibit commits until the window is ready to be
shown. This gives XWM time to set up the window decorations and internal
state before Xwayland does the first commit. XWM can use this to ensure
the first commit carries fully drawn decorations and the window
management state is correct when the window becomes visible.
Setting the property to zero inhibits further commits, and setting it to
non-zero allows commits. Deleting the property allows commits.
When the property is changed from zero to non-zero, there will be a
commit on next block_handler() call provided that some damage has been
recorded.
Without this patch (i.e. with the old behaviour) Xwayland can and will
commit the surface very soon as the application window has been realized
and drawn into. This races with XWM and may cause visible glitches.
v3:
- introduced a simple setter for xwl_window::allow_commits
- split xwl_window_property_allow_commits() out of
xwl_property_callback()
- check MakeAtom(_XWAYLAND_ALLOW_COMMITS)
v2:
- use PropertyStateCallback instead of XACE, based on the patch
"xwayland: Track per-window support for netwm frame sync" by
Adam Jackson
- check property type is XA_CARDINAL
- drop a useless memcpy()
Weston Bug: https://phabricator.freedesktop.org/T7622
Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Pekka Paalanen <pekka.paalanen@collabora.co.uk>
commit a6308cea602f688ac653e3466cd57767e02093a9
Author: Pekka Paalanen <pekka.paalanen@collabora.co.uk>
Date: Thu Nov 24 11:54:44 2016 +0200
xwayland: fix 'buffer' may be used uninitialized warning
Fix the following warning due to --disable-glamor:
CC Xwayland-xwayland.o
In file included from /home/pq/local/include/wayland-client.h:40:0,
from xwayland.h:35,
from xwayland.c:26:
xwayland.c: In function ‘block_handler’:
/home/pq/local/include/wayland-client-protocol.h:3446:2: warning: ‘buffer’ may be used uninitialized in this function [-Wmaybe-uninitialized]
wl_proxy_marshal((struct wl_proxy *) wl_surface,
^
xwayland.c:466:23: note: ‘buffer’ was declared here
struct wl_buffer *buffer;
^
Signed-off-by: Pekka Paalanen <pekka.paalanen@collabora.co.uk>
Reviewed-by: Olivier Fourdan <ofourdan@redhat.com>
commit f7b8560f23ac5582e2f97dc9f6de32a42e61e520
Author: Pekka Paalanen <pekka.paalanen@collabora.co.uk>
Date: Thu Nov 24 11:45:25 2016 +0200
xwayland: refactor into xwl_window_post_damage()
Refactor xwl_screen_post_damage() and split the window specific code
into a new function xwl_window_post_damage().
This is a pure refactoring, there are no behavioral changes. An assert
is added to xwl_window_post_damage() to ensure frame callbacks are not
leaked if a future patch changes the call.
Signed-off-by: Pekka Paalanen <pekka.paalanen@collabora.co.uk>
Reviewed-by: Olivier Fourdan <ofourdan@redhat.com>
commit 8e3f9ce6c06e7605832c55dfd180396f66ec8b66
Author: Adam Jackson <ajax@redhat.com>
Date: Sat Jul 12 12:45:23 2014 -0400
dix: Add a callback chain for window property state change
This will be used by in-server features that need to react to property
changes. The first one will be _XWAYLAND_ALLOW_COMMITS.
Signed-off-by: Adam Jackson <ajax@redhat.com>
[Pekka: add commit message body]
Signed-off-by: Pekka Paalanen <pekka.paalanen@collabora.co.uk>
commit 50bcea8be337ea983e464f2b5b8b2dc6d1024532
Author: Adam Jackson <ajax@redhat.com>
Date: Sat Jul 12 12:39:21 2014 -0400
dix: Pass the whole property into deliverPropertyNotifyEvent
Instead of just the atom. No functional change.
Signed-off-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Pekka Paalanen <pekka.paalanen@collabora.co.uk>
commit fde5cd78488f3370c92397868ca78929296f7ad1
Author: Mihail Konev <k.mvc@ya.ru>
Date: Tue Jan 31 20:16:35 2017 +0500
tests: Fix guards for ld -wrap
Fixes XQuartz build.
Regressed-in: 23f6dbc96e47be6cbeed78cc9ef303987c3e29a9
Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Mihail Konev <k.mvc@ya.ru>
commit d8161aeb50891ae10c5656487ce8f982deed5f9f
Author: Dr.-Ing. Dieter Jurzitza <dieter.jurzitza@t-online.de>
Date: Thu Feb 23 12:57:26 2017 -0500
glamor: Fix missing declaration in dash vertex shader
Fixes a GLSL compilation error:
Failed to compile VS: 0:13(43): error: `pos' undeclared
0:13(14): error: operands to arithmetic operators must be numeric
0:13(13): error: operands to arithmetic operators must be numeric
Tested-by: Stefan Dirsch <sndirsch@suse.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
commit acdb5bf2de57c0080d2a6e730c788a0a428e13dc
Author: Chris Wilson <chris@chris-wilson.co.uk>
Date: Fri Feb 17 08:18:52 2017 +0000
os: Fix iteration over busfaults
Fixes a regression from
commit 41da295eb50fa08eaacd0ecde99f43a716fcb41a
Author: Keith Packard <keithp@keithp.com>
Date: Sun Nov 3 13:12:40 2013 -0800
Trap SIGBUS to handle truncated shared memory segments
that causes the SIGBUS handler to fail to chain up correctly and
corrupts nearby memory instead.
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit dcb63deb1b6337781943a7bea5bb2b04c6d76b55
Author: Chris Wilson <chris@chris-wilson.co.uk>
Date: Wed Feb 22 14:56:28 2017 +0000
inputthread: Initialise inputThreadInfo->changed before use
==8734== Thread 2 InputThread:
==8734== Conditional jump or move depends on uninitialised value(s)
==8734== at 0x2FDB05: InputThreadDoWork (inputthread.c:333)
==8734== by 0x6924423: start_thread (pthread_create.c:333)
==8734== by 0x6C229BE: clone (clone.S:105)
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 23d85c54421ebdd12460566918fcb7f309d2ee30
Author: Olivier Fourdan <ofourdan@redhat.com>
Date: Fri Feb 17 14:13:51 2017 +0100
os: remove unused define MAX_TIMES_PER
Remove leftover from commit e10ba9e, MAX_TIMES_PER is not used anymore.
Signed-off-by: Olivier Fourdan <ofourdan@redhat.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 8b170c4447868c8d4656cf2143f009db20885f3a
Author: Adam Jackson <ajax@redhat.com>
Date: Thu Feb 16 13:00:24 2017 -0500
mi: Add include guards to migc.h
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit e161853f380a0b176c81284024066cb2776136c3
Author: Adam Jackson <ajax@redhat.com>
Date: Thu Feb 16 13:00:24 2017 -0500
fb: Remove stray references to fbHasVisualTypes
Removed in 84e8de12.
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit 4c7d229582a97e07014091909745ac7dc4d5e93e
Author: Adam Jackson <ajax@redhat.com>
Date: Thu Feb 16 13:00:24 2017 -0500
fb: Remove unused fbGetFreeCompClip macro
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit 706e6d9cd074da606016ed4ecff51e9c2a822087
Author: Adam Jackson <ajax@redhat.com>
Date: Thu Feb 16 13:00:24 2017 -0500
wfb: Hide init function decls behind FB_ACCESS_WRAPPER
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit 790c1c0b10968776440a962e1fc6d1d3157b1559
Author: Adam Jackson <ajax@redhat.com>
Date: Thu Feb 16 13:00:24 2017 -0500
wfb: Add missing rename for fbGlyphs
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit a6566f9e4dbf9ea9568a14e22cb5d004e10dbd4d
Author: Michel Dänzer <michel.daenzer@amd.com>
Date: Thu Feb 16 16:13:56 2017 +0900
prime: Clear PixmapDirtyUpdateRec::damage when it's destroyed
The root window, and by extension any damage records referencing it,
may be destroyed before shared pixmaps referencing it, which resulted in
use-after-free / double-free in PixmapStopDirtyTracking.
Fixes: b5b292896f64 ("prime: Sync shared pixmap from root window instead of screen pixmap")
Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Michel Dänzer <michel.daenzer@amd.com>
commit 371ff0c969a38a0013688391bbd7375bc7b6f933
Author: Olivier Fourdan <ofourdan@redhat.com>
Date: Thu Feb 16 10:43:06 2017 +0100
xwayland: bump wayland-protocols version to 1.7
Xwayland support for pointer locking in confinement requires
wayland-protocols version 1.7 or later.
Update the required version in configure.ac to match the minimal
required version of wayland-protocols.
Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Olivier Fourdan <ofourdan@redhat.com>
commit 5d29b493666f728eccd8dd91992ea020bd4be9f9
Author: Adam Jackson <ajax@redhat.com>
Date: Tue Feb 14 15:30:56 2017 -0500
xfree86: Reorganize the reserved ScrnInfoRec slots
First, move them to the end of the struct, for marginally better cache
locality for the struct members that actually have meaning; move the
existing slots at the end of the struct up near some others with similar
meanings. Second, only keep four slots each of integer, data pointer,
and function pointer; we've rarely used this escape hatch so this is
still plenty.
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
Reviewed-by: Aaron Plattner <aplattner@nvidia.com>
Acked-by: Keith Packard <keithp@keithp.com>
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit 47db92473f7da2b7d6775ff681ec747009f8cf3f
Author: Adam Jackson <ajax@redhat.com>
Date: Tue Feb 14 15:30:55 2017 -0500
xfree86: Remove unused chipID/Rev from ScrnInfoRec
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
Reviewed-by: Aaron Plattner <aplattner@nvidia.com>
Acked-by: Keith Packard <keithp@keithp.com>
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit 4dcf68e41857cdf78387a6232160cba5cb467fb0
Author: Adam Jackson <ajax@redhat.com>
Date: Tue Feb 14 15:30:54 2017 -0500
xfree86: Remove memClk from ScrnInfoRec
Never set by the core, not used in any modern driver.
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
Reviewed-by: Aaron Plattner <aplattner@nvidia.com>
Acked-by: Keith Packard <keithp@keithp.com>
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit 0b6f2806029493afa246b4472ee88fc173976c5a
Author: Adam Jackson <ajax@redhat.com>
Date: Tue Feb 14 15:30:53 2017 -0500
xfree86: Remove Option "BiosBase" (v2)
Just no.
The ddxDesign chunk removes the whole para about xf86FixPciResource,
since it turns out that function doesn't exist at all anymore.
The only drivers that reference this at all are i128 and mga, and even
then only in the non-pciaccess path.
v2:
- Update commentary about i128/mga
- Don't remove the BiosBase keyword from the config parser since that
would turn a no-op into a fatal error (Aaron Plattner)
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
Reviewed-by: Aaron Plattner <aplattner@nvidia.com>
Acked-by: Keith Packard <keithp@keithp.com>
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit 76ef102be3b47d23ebfaaaa04fb5cfc0511d43f1
Author: Adam Jackson <ajax@redhat.com>
Date: Tue Feb 14 15:30:52 2017 -0500
xfree86: Drop virtualFrom from ScrnInfoRec
Seriously not worth the effort of tracking this, especially now that
competent drivers don't have a limit. The sis driver does inspect this
member, but hilariously does so only so it can print the same information
as the core does.
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
Reviewed-by: Aaron Plattner <aplattner@nvidia.com>
Acked-by: Keith Packard <keithp@keithp.com>
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit 5a945f54e738f6e9c5a489febdd8b87cd8a41210
Author: Adam Jackson <ajax@redhat.com>
Date: Tue Feb 14 15:30:51 2017 -0500
xfree86: Remove max[HV]Value from ScrnInfoRec
Only mach64 and rendition actually use this feature. Everyone else just
checks it in their ValidMode hook, they can too.
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
Reviewed-by: Aaron Plattner <aplattner@nvidia.com>
Acked-by: Keith Packard <keithp@keithp.com>
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit 3e1a23281dd64ee7457f36208cac77c01846a28f
Author: Adam Jackson <ajax@redhat.com>
Date: Tue Feb 14 15:30:50 2017 -0500
xfree86: Fix a comment about ScrnInfoRec
We don't actually need (or intend) to keep this struct the same across
revisions.
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
Reviewed-by: Aaron Plattner <aplattner@nvidia.com>
Acked-by: Keith Packard <keithp@keithp.com>
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit 4c00609c370dab130b69207cb2684c2b92bd3084
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Sun Feb 12 09:35:21 2017 -0800
DetermineClientCmd: try using /proc/pid/cmdline on Solaris too
Solaris 11.3.5 introduced support for /proc/pid/cmdline, so try it
first, and if we can't open it, then fallback to /proc/pid/psinfo
as we did before.
Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
commit 3f9507ed2f7246b2c8cf2bbc430cc99c5f35c92a
Author: Adam Jackson <ajax@redhat.com>
Date: Thu Feb 9 13:53:41 2017 -0500
xfree86: Bump video ABI to 24.0
c02f6a68 changed the layout of xf86CrtcFuncs.
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit 058809c43ec578a407cf40d4c3e54a42503e3562
Author: Olivier Fourdan <ofourdan@redhat.com>
Date: Wed Feb 8 09:23:20 2017 +0100
xwayland: Apply output rotation for screen size
Previously, we would swap the width/height of the Xwayland output based
on the output rotation, so that the overall screen size would match the
actual rotation of each output.
Problem is the RandR's ConstrainCursorHarder() handler will also apply
the output rotation, meaning that when the output is rotated, the
pointer will be constrained within the wrong dimension.
Moreover, XRandR assumes the original output width/height are unchanged
when the output is rotated, so by changing the Xwayland output width and
height based on rotation, Xwayland causes XRandr to report the wrong
output sizes (an output of size 1024x768 rotated left or right should
remain 1024x768, not 768x1024).
So to avoid this issue and keep things consistent between Wayland and
Xwayland outputs, leave the actual width/height unchanged but apply the
rotation when computing the screen size. This fixes both the output size
being wrong in "xrandr -q" and the pointer being constrained in the
wrong dimension with rotated with weston.
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=99663
Signed-off-by: Olivier Fourdan <ofourdan@redhat.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
commit afeace27d3818274b75d59375771dc964d2f56bb
Author: Olivier Fourdan <ofourdan@redhat.com>
Date: Tue Feb 7 15:31:22 2017 +0100
xwayland: CRTC should support all rotations
If the Wayland compositor sets a rotation on the output, Xwayland
translates the transformation as an xrandr rotation for the given
output.
However, if the rotation is not supported by the CRTC, this is not
a valid setup and xrandr queries will fail.
Pretend we support all rotations and reflections so that the
configuration remains a valid xrandr setup.
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=99663
Signed-off-by: Olivier Fourdan <ofourdan@redhat.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
commit 38696ea56854e055c31bd2730adfc7c39aa115b0
Author: Michel Dänzer <michel.daenzer@amd.com>
Date: Tue Feb 7 17:38:23 2017 +0900
damage: Validate source pictures bound to windows before unwrapping
The lower layers also do this, but no damage may be reported there,
since we unwrap before calling down.
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=99220
Signed-off-by: Michel Dänzer <michel.daenzer@amd.com>
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
commit 1c78bec9ca3cd1975a38bf5ebdba7dea65b309ab
Author: Svitozar Cherepii <razotivs@gmail.com>
Date: Fri Feb 3 01:49:04 2017 +0200
xwayland: Add hack for FWXGA resolution #99574
For some applications (like fullscreen games) it matters for XRandr
resolution to be correctly set and equal to root window resolution.
In XServer there is already hack for this, adapted it for XWayland.
Fixes: https://bugs.freedesktop.org/show_bug.cgi?id=99574
Signed-off-by: Svitozar Cherepii <razotivs@gmail.com>
Tested-by: Svitozar Cherepii <razotivs@gmail.com>
Acked-by: Olivier Fourdan <ofourdan@redhat.com>
commit 542d9f6807ac06b70f564ccab10af69fa21a1221
Author: Michel Dänzer <michel.daenzer@amd.com>
Date: Wed Feb 1 18:35:57 2017 +0900
present: Allow flipping with PRIME slave outputs
Works fine now.
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
Signed-off-by: Michel Dänzer <michel.daenzer@amd.com>
commit b5b292896f647c85f03f53b20b2f03c0e94de428
Author: Michel Dänzer <michel.daenzer@amd.com>
Date: Wed Feb 1 18:35:56 2017 +0900
prime: Sync shared pixmap from root window instead of screen pixmap
The screen pixmap doesn't receive updates while there's a Present flip
window.
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
Signed-off-by: Michel Dänzer <michel.daenzer@amd.com>
commit eb04b20160d706d4e0e67122d0adb1e723c0da92
Author: Michael Thayer <michael.thayer@oracle.com>
Date: Fri Sep 30 15:18:45 2016 +0200
modesetting: allow switching from software to hardware cursors (v5).
Currently if modesetting ever fails to set a hardware cursor it will switch
to using a software cursor and never go back. Change this to only
permanently switch to a software cursor if -ENXIO is returned (which means
hardware cursors not supported), and to otherwise still try a hardware
cursor first every time a new one is set. This is needed because hardware
may be able to handle some cursors in hardware and others not, or virtual
hardware may be able to handle hardware cursors at some times and not
others.
Changes since v1, v2 and v3:
* take into account the switch to load_cursor_argb_check
* keep the permanent software cursor fall-back if -ENXIO is returned
* move parts of v3 into separate patches
Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Michael Thayer <michael.thayer@oracle.com>
commit ecd0a62323f26b333c49bddd7237dd5118482a35
Author: Michael Thayer <michael.thayer@oracle.com>
Date: Fri Sep 30 08:02:09 2016 +0200
modesetting: Immediately handle failure to set HW cursor, v5
Based on v4 by Alexandre Courbot <acourbot@nvidia.com>
There is currently no reliable way to report failure to set a HW
cursor. Still such failures can happen if e.g. the MODE_CURSOR DRM
ioctl fails (which currently happens at least with modesetting on Tegra
for format incompatibility reasons).
As failures are currently handled by setting the HW cursor size to
(0,0), the fallback to SW cursor will not happen until the next time the
cursor changes and xf86CursorSetCursor() is called again. In the
meantime, the cursor will be invisible to the user.
This patch addresses that by adding _xf86CrtcFuncs::set_cursor_check and
_xf86CursorInfoRec::ShowCursorCheck hook variants that return booleans.
This allows to propagate errors up to xf86CursorSetCursor(), which can
then fall back to using the SW cursor immediately.
v5:
- Removed parts of patch already committed as part of 14c21ea1.
- Adjusted code slightly to match surrounding code.
- Effectively reverted af916477 which is made unnecessary by this patch.
Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Michael Thayer <michael.thayer@oracle.com>
commit c02f6a687c3d6bd0727322b055ee788f8fefa005
Author: Michael Thayer <michael.thayer@oracle.com>
Date: Thu Sep 29 20:23:12 2016 +0200
xfree86: Immediately handle failure to set HW cursor, v5
Based on v4 by Alexandre Courbot <acourbot@nvidia.com>
There is currently no reliable way to report failure to set a HW
cursor. Still such failures can happen if e.g. the MODE_CURSOR DRM
ioctl fails (which currently happens at least with modesetting on Tegra
for format incompatibility reasons).
As failures are currently handled by setting the HW cursor size to
(0,0), the fallback to SW cursor will not happen until the next time the
cursor changes and xf86CursorSetCursor() is called again. In the
meantime, the cursor will be invisible to the user.
This patch addresses that by adding _xf86CrtcFuncs::set_cursor_check and
_xf86CursorInfoRec::ShowCursorCheck hook variants that return booleans.
This allows to propagate errors up to xf86CursorSetCursor(), which can
then fall back to using the SW cursor immediately.
v5: Updated the patch to apply to current git HEAD, split up into two
patches (server and modesetting driver) and adjusted the code slightly
to match surrounding code. I also removed the new exported function
ShowCursorCheck(), as instead just changing ShowCursor() to return Bool
should not affect its current callers.
Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Michael Thayer <michael.thayer@oracle.com>
commit 3ef16dfb9830bd6b41ae428f4f213ae0c35c1056
Author: Mihail Konev <k.mvc@ya.ru>
Date: Sat Feb 4 00:03:24 2017 +0500
dmx: fix linking
Reviewed-by: Adam Jackson <ajax@redhat.com>
commit e50da50118408a195d4d2e1b39817fe7c4447c56
Author: Adam Jackson <ajax@redhat.com>
Date: Wed Jan 25 15:08:25 2017 -0500
dri1: Remove some dead event code
Signed-off-by: Adam Jackson <ajax@redhat.com>
Reviewed-by: Michel Dänzer <michel.daenzer@amd.com>
commit 0702f2e840370be53d129fc5e3c243dac47ee720
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Tue Feb 7 11:44:51 2017 +1000
xwayland: replace hardcoded function name with __func__ in error msg
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Pekka Paalanen <pekka.paalanen@collabora.co.uk>
Reviewed-by: Olivier Fourdan <ofourdan@redhat.com>
commit 3eb964e25243056dd998f52d3b00171b71c89189
Author: Chris Wilson <chris@chris-wilson.co.uk>
Date: Fri Jan 20 09:49:19 2017 +0000
xfree86: Take input_lock() for xf86ScreenCheckHWCursor
commit cfddd919cce4178baba07959e5e862d02e166522
Author: Chris Wilson <chris@chris-wilson.co.uk>
Date: Mon Jan 16 22:36:34 2017 +0000
xfree86: Take input lock for xf86TransparentCursor
commit 7198a6d4e74f684cb383b3e0f70dd2bae405e6e7
Author: Chris Wilson <chris@chris-wilson.co.uk>
Date: Mon Jan 16 22:17:36 2017 +0000
xfree86: Take the input lock for xf86RecolorCursor
xf86RecolorCursor() may be called directly from XRecolorCursor as well
as from xf86ScreenSetCursor(). In the latter case, the input lock is
already held, but not for the former and so we need to add a wrapper
function that acquires the input lock before performing
xf86RecolorCursor()
References: https://bugs.freedesktop.org/show_bug.cgi?id=99358
commit bb9128fdc86decd6f6e3b0e145011a8c08b1d2b5
Author: Qiang Yu <Qiang.Yu@amd.com>
Date: Thu Jan 26 18:13:53 2017 +0800
present: disable page flip only when a slave crtc is active
This prevents the tearing of moving window in a composite WM
desktop when output slave is attached but none of its crtc is
really active.
Signed-off-by: Qiang Yu <Qiang.Yu@amd.com>
Reviewed-by: Michel Dänzer <michel.daenzer@amd.com>
commit 45e0eb4b156f2155687cce268b07f10540fc507b
Author: Michel Dänzer <michel.daenzer@amd.com>
Date: Thu Jan 26 16:24:03 2017 +0900
loader: Handle mod->VersionInfo == NULL
This can happen when a module fails to load:
Program received signal SIGSEGV, Segmentation fault.
UnloadModule (_mod=0x5555559d9280) at ../../../../hw/xfree86/loader/loadmod.c:848
848 name = mod->VersionInfo->modname;
(gdb) bt
#0 UnloadModule (_mod=0x5555559d9280) at ../../../../hw/xfree86/loader/loadmod.c:848
#1 0x00005555555ddd1b in LoadModule (module=module@entry=0x5555559c7ce0 "fbdev", options=0x0, modreq=modreq@entry=0x0, errmaj=errmaj@entry=0x7fffffffe8ec) at ../../../../hw/xfree86/loader/loadmod.c:824
#2 0x00005555555edfe9 in xf86LoadModules (list=list@entry=0x5555559dcf50, optlist=optlist@entry=0x0) at ../../../../hw/xfree86/common/xf86Init.c:1506
#3 0x00005555555ee7bc in InitOutput (pScreenInfo=pScreenInfo@entry=0x5555559abf80 <screenInfo>, argc=argc@entry=4, argv=argv@entry=0x7fffffffeb18) at ../../../../hw/xfree86/common/xf86Init.c:484
#4 0x00005555555a885c in dix_main (argc=4, argv=0x7fffffffeb18, envp=<optimized out>) at ../../dix/main.c:197
#5 0x00007ffff5d582b1 in __libc_start_main (main=0x555555593130 <main>, argc=4, argv=0x7fffffffeb18, init=<optimized out>, fini=<optimized out>, rtld_fini=<optimized out>, stack_end=0x7fffffffeb08) at ../csu/libc-start.c:291
#6 0x000055555559316a in _start ()
Fixes: 8e83eacb9e2d ("loader: Remove unused path and name from ModuleDescPtr")
Signed-off-by: Michel Dänzer <michel.daenzer@amd.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 7617a0a180a2cd3427a8ffa9534152df6a8fecbf
Author: Qiang Yu <Qiang.Yu@amd.com>
Date: Wed Jan 11 13:59:22 2017 +0800
dri2: refine dri2_probe_driver_name (v2)
V2:
1. update comment
2. check bustype if PCI
3. configure add libdrm version check for drmGetDevice
Get PCI information from info->fd with drmGetDevice instead of
assuming the info->fd is the first entity of scrn which is not
true for multi entities scrn.
Signed-off-by: Qiang Yu <Qiang.Yu@amd.com>
Reviewed-by: Emil Velikov <emil.l.velikov@gmail.com>
commit b1a6986395f85b0194646a34b49367086dc9239d
Author: Martin Peres <martin.peres@linux.intel.com>
Date: Wed Jan 25 17:29:15 2017 +0200
tests: shuffle around the linking order to please GNU ld
Classic GNU ld resolves symbol dependencies only forward, while GOLD
seems to work regardless of the specified library order.
Suggested-by: Eero Tamminen <eero.t.tamminen@intel.com>
Reviewed-by: Mihail Konev <k.mvc@ya.ru>
Signed-off-by: Martin Peres <martin.peres@linux.intel.com>
commit cc0f173ea2936d1405e382329c1bd58c7af67ea7
Author: Adam Jackson <ajax@redhat.com>
Date: Thu Apr 14 15:56:46 2016 -0400
loader: Learn about the joy of snprintf
Reviewed-by: Julien Cristau <jcristau@debian.org>
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit 8e83eacb9e2d2c6c2b9f8cdb9e82c976a0237f24
Author: Adam Jackson <ajax@redhat.com>
Date: Thu Apr 14 15:30:35 2016 -0400
loader: Remove unused path and name from ModuleDescPtr
Just a waste of memory. Path was never referenced at all, and name was
only used when unloading the module; we can just as well get the
module's internal idea of its name from VersionInfo.
Reviewed-by: Julien Cristau <jcristau@debian.org>
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit 8920dca0091675f1202c1198336cd4d8e0259100
Author: Adam Jackson <ajax@redhat.com>
Date: Thu Apr 14 11:45:58 2016 -0400
loader: Remove unused arguments from LoadModule
Nobody was ever calling this with a non-null argument for subdir list or
pattern list. Having done this, InitSubdirs is only ever called with a
NULL argument, so it's really just a complicated way of duplicating the
default list; we can remove that and just walk the list directly.
The minor error code was only ever used to distinguish among two cases
of LDR_BADUSAGE. Whatever.
Reviewed-by: Julien Cristau <jcristau@debian.org>
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit ba726ba6a73efe1bd19708b058f481f28068a85b
Author: Adam Jackson <ajax@redhat.com>
Date: Thu Apr 14 11:30:02 2016 -0400
loader: Turn LoaderListDirs into LoaderListDir
Callers only ever use this for a single directory anyway.
While we're at it, also move xf86DriverListFromCompile near its only
user in the X -configure code (and inline it out of existence), and
remove LoaderFreeDirList as it's unused (since X -configure is just
going to exit anyway, none of that code cares about cleanup).
Reviewed-by: Julien Cristau <jcristau@debian.org>
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit c54a9ca152898ec2ffe50f6d5b70d483b85c1c34
Author: Adam Jackson <ajax@redhat.com>
Date: Thu Apr 14 11:17:22 2016 -0400
loader: Move loader list details to internal header
There's no reason a driver should ever care about this.
Reviewed-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Julien Cristau <jcristau@debian.org>
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit d55284e8638ede15be851aa8a19a98dbbff0ce20
Author: Adam Jackson <ajax@redhat.com>
Date: Wed Apr 13 16:06:50 2016 -0400
xfree86: Remove a stray reference to font modules
Reviewed-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Julien Cristau <jcristau@debian.org>
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit d7879c46724a36bfd9a3a08e49903d001ffbf93e
Author: Adam Jackson <ajax@redhat.com>
Date: Wed Apr 13 15:58:33 2016 -0400
xfree86: Fix up some bad indentation
indent(1) gets confused by function-like macros with no trailing
semicolon, which is fair enough really.
Reviewed-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Julien Cristau <jcristau@debian.org>
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit 5c577da5f3a65c68d2ee12e4afca8f20c3e8ccf4
Author: Adam Jackson <ajax@redhat.com>
Date: Thu Jul 14 15:42:18 2016 -0400
xfree86: Remove DriverRec1 compat struct
The idea here is that the driver might have once been old enough to not
have the driverFunc slot in DriverRec, with the module ABI not having
changed when it was added. That was ages ago, and drivers always declare
themselves with DriverRec not DriverRec1, so uninitialized slots will
simply be zero.
Reviewed-by: Emil Velikov <emil.l.velikov@gmail.com>
Reviewed-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Julien Cristau <jcristau@debian.org>
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit 2e3ad7e2506d9eb6667a5f229b5213d215451a5a
Author: Adam Jackson <ajax@redhat.com>
Date: Wed Apr 13 15:50:39 2016 -0400
loader: Remove silly "unspecified" version handling
Everybody using this functionality specifies a major version, which
makes sense. If you don't care about a minor version, that's equivalent
to saying you require minor >= 0, so just say so; likewise patch level.
Likewise ABI class is always specified.
Reviewed-by: Emil Velikov <emil.l.velikov@gmail.com>
Reviewed-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Julien Cristau <jcristau@debian.org>
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit ef533a912d18db31456b29a18c8bced649309565
Author: Adam Jackson <ajax@redhat.com>
Date: Tue Mar 1 08:29:06 2016 -0500
loader: Remove unused loader error codes and dead enum
The enum has been unused since at least the removal of elfloader.
Reviewed-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Julien Cristau <jcristau@debian.org>
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit 7e3cccf8e4426a4b25a7a94d52775d334693572f
Author: Adam Jackson <ajax@redhat.com>
Date: Wed Apr 13 14:59:27 2016 -0400
loader: Include fewer headers from xf86Module.h
This looks like more, but only if you don't compare it to the number
pulled in by misc.h.
Reviewed-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Julien Cristau <jcristau@debian.org>
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit 49fa76801348f6d044128f7ec743693d0759d683
Author: Adam Jackson <ajax@redhat.com>
Date: Fri Jun 5 11:01:30 2015 -0400
loader: Don't add internal/ to the search path
Reviewed-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Julien Cristau <jcristau@debian.org>
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit 97bd6e453676516891250389ec0fd695c110087c
Author: Adam Jackson <ajax@redhat.com>
Date: Fri Jun 5 10:58:20 2015 -0400
loader: Remove *GetOS
This API is dumb. uname(3) exists, feel free to use it, but ideally
write to the interface not to the OS. There are a couple of drivers
using this API, they could all reasonably just not.
This also removes the OS name from the loader subdirectory path search.
Having /usr/lib/xorg shared across OSes is a non-goal here.
Reviewed-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Julien Cristau <jcristau@debian.org>
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit a6fcb15472bb7663ae917f5913bf07b6d3c7f186
Author: Adam Jackson <ajax@redhat.com>
Date: Mon Jun 16 11:30:18 2014 -0400
loader: Port from xfree86 to dix API
Reviewed-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Julien Cristau <jcristau@debian.org>
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit 778cfc59762cdf528cf8672bfb5696844e91ebc3
Author: Emil Velikov <emil.l.velikov@gmail.com>
Date: Sun Apr 17 21:07:30 2016 +0100
xfree86: flatten pathlist management in the loader
Now that users can set the path only via LoaderSetPath(), we can simplify
things.
Reviewed-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Julien Cristau <jcristau@debian.org>
Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>
commit 7b71055fc65242a9c4b651e72bb07dbb3f00c4e6
Author: Emil Velikov <emil.l.velikov@gmail.com>
Date: Sun Apr 17 21:07:29 2016 +0100
xfree86: remove dummy/dead function prototype for LoadDriver
Reviewed-by: Julien Cristau <jcristau@debian.org>
Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>
commit 57eec704c3ddea0fecea2d8fbd1c3547f0b8fccf
Author: Emil Velikov <emil.l.velikov@gmail.com>
Date: Sun Apr 17 21:07:27 2016 +0100
xfree86: remove references to LoadSubModule's path from the doc
Afaics the argument hasn't been part of the API since the documentation
has been converted to xml with commit fc6ebe1e1d3 "Convert LinuxDoc
documents to DocBook/XML"
Reviewed-by: Julien Cristau <jcristau@debian.org>
Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>
commit 2196bb50383bd96d364f799018c0693c9309ed7f
Author: Emil Velikov <emil.l.velikov@gmail.com>
Date: Sun Apr 17 21:07:28 2016 +0100
xfree86: remove unused path from the LoadModule API
Similar to its little brother - LoadSubModule. Currently all call sites
provide NULL anyway ;-)
Reviewed-by: Aaron Plattner <aplattner@nvidia.com>
Reviewed-by: Julien Cristau <jcristau@debian.org>
Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>
commit ea483af99a6351323afe00a0b630cd63310efdb1
Author: Adam Jackson <ajax@redhat.com>
Date: Thu Jan 19 17:20:49 2017 -0500
glx: Move Composite's synthetic visuals to a different select group
Should you find yourself using a 16bpp display while also using a
compositor, you poor soul, you may find that your GLX applications
behave strangely; in particular, glxgears will be transparent. This is
because it clears to (0,0,0,0) which is transparent if you honor alpha,
and it will choose the synthetic visual because it has the most
available r/g/b bits.
To avoid this, bump synthetic visuals to a higher (less-preferred)
select group. Unless the client explicitly asks for non-zero alpha bits,
this will prefer any rgb565 visual ahead of the argb8888 visual.
Reviewed-by: Eric Anholt <eric@anholt.net>
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit 43efaa6e4fd903229dc9c508da4177ad4bbdd4d8
Author: Adam Jackson <ajax@redhat.com>
Date: Thu Jan 19 17:20:49 2017 -0500
glx: Send GLX_VISUAL_SELECT_GROUP_SGIX attribute for visuals
We already send this for fbconfigs. Mesa happens to implement
glXChooseVisual relative to the fbconfig data, but that might not be
true of NVIDIA's libGL.
Reviewed-by: Eric Anholt <eric@anholt.net>
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit ef2345aaa28461a76f77c65240ce5facc180f98e
Author: Adam Jackson <ajax@redhat.com>
Date: Thu Jan 19 17:20:49 2017 -0500
composite: Export compIsAlternateVisual
Reviewed-by: Eric Anholt <eric@anholt.net>
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit bccbaf7c113b1300071601879002682ebbe8b1c1
Author: Adam Jackson <ajax@redhat.com>
Date: Thu Jan 19 17:20:49 2017 -0500
composite: Remove a misleading comment
This comment is above compIsAlternateVisual, which used to be the only
thing determining whether implicit redirect was needed. It's not anymore
due to the redirection exception list. That job is now performed by
compImplicitRedirect, whose code is self-explanitory.
Reviewed-by: Eric Anholt <eric@anholt.net>
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit 86463981361064dd0352ec215abf1696ce7fc5ea
Author: Olivier Fourdan <ofourdan@redhat.com>
Date: Tue Jan 24 18:08:30 2017 +0100
glamor: Two pass won't work on memory pixmaps
When selecting "CA_TWO_PASS" in glamor_composite_clipped_region() when
the hardware does not support "GL_ARB_blend_func_extended", we call
glamor_composite_choose_shader() twice in a row, which in turn calls
glamor_pixmap_ensure_fbo().
On memory pixmaps, the first call will set the FBO and the second one
will fail an assertion in glamor_upload_picture_to_texture() because
the FBO is already set.
Bail out earlier when the mask pixmap is in memory and the hardware
capabilities would require to use two pass, so that the assertion is not
failed and the rendering is correct.
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=99346
Signed-off-by: Olivier Fourdan <ofourdan@redhat.com>
Reviewed-by: Eric Anholt <eric@anholt.net>
commit e7b8b7b131d8283c96ed0aff4593ab41441b5d3b
Author: Adam Jackson <ajax@redhat.com>
Date: Thu Jan 19 17:30:40 2017 -0500
kdrive: Remove non-evdev input drivers
Use evdev.
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit d740e1830a7ef32433fdf338c1e04dc6c9a927cb
Author: Adam Jackson <ajax@redhat.com>
Date: Thu Jan 19 17:30:39 2017 -0500
dmx: Remove non-evdev hardware input drivers
Use evdev.
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit 6f531b0cdf8c9d7f711dd46071a26c50db3f1a16
Author: Mihail Konev <k.mvc@ya.ru>
Date: Sat Jan 14 12:51:45 2017 +0500
tests: Fix typo
Remove redundrant/incorrect automake assignment.
Buglink: https://lists.x.org/archives/xorg-devel/2017-January/052320.html
Reported-by: Michel Dänzer <michel@daenzer.net>
Signed-off-by: Mihail Konev <k.mvc@ya.ru>
Reviewed-by: Jon Turney <jon.turney@dronecode.org.uk>
commit 3f8c2f94483bf0b96e129c97ef4950170a3f05b4
Author: Giuseppe Bilotta <giuseppe.bilotta@gmail.com>
Date: Fri Jan 13 18:44:01 2017 +0100
tests: Fix without-dtrace build
Signed-off-by: Giuseppe Bilotta <giuseppe.bilotta@gmail.com>
Reviewed-by: Mihail Konev <k.mvc@ya.ru>
Signed-off-by: Mihail Konev <k.mvc@ya.ru>
commit b44bef513bd83249036cb5a237dc20eb6088c17c
Author: Adam Jackson <ajax@redhat.com>
Date: Mon Jan 16 14:59:40 2017 -0500
Revert "tests: fix --disable-xorg build"
Pushed the wrong thing.
This reverts commit 730fd8c05f56da21894691bbd2e7ff37f67b45f4.
commit 730fd8c05f56da21894691bbd2e7ff37f67b45f4
Author: Mihail Konev <k.mvc@ya.ru>
Date: Sat Jan 14 15:19:30 2017 +0500
tests: fix --disable-xorg build
commit 704a867f8fb7652a8b7d5569bbe44e188457db4e
Author: Mihail Konev <k.mvc@ya.ru>
Date: Thu Jan 12 13:21:12 2017 +0500
tests: Remove obsolete libxservertest.la
Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Mihail Konev <k.mvc@ya.ru>
commit 23f6dbc96e47be6cbeed78cc9ef303987c3e29a9
Author: Mihail Konev <k.mvc@ya.ru>
Date: Thu Jan 12 13:21:11 2017 +0500
tests: Move test/{xi1,xi2}/tests to test/
Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Mihail Konev <k.mvc@ya.ru>
commit ead5064581665ff40c177dd1b447949f1420e209
Author: Mihail Konev <k.mvc@ya.ru>
Date: Thu Jan 12 13:21:10 2017 +0500
tests: Convert test/ to single binary
Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Mihail Konev <k.mvc@ya.ru>
commit 773fc07e4c2f816966809492a924a9bd1a15d059
Author: Mihail Konev <k.mvc@ya.ru>
Date: Thu Jan 12 13:21:09 2017 +0500
tests: Convert test/xi2/ to single binary
Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Mihail Konev <k.mvc@ya.ru>
commit 371576f64baa99c4ab1e736fbae7975a32577275
Author: Mihail Konev <k.mvc@ya.ru>
Date: Thu Jan 12 13:21:08 2017 +0500
tests: Convert test/xi1/ to single binary
Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Mihail Konev <k.mvc@ya.ru>
commit ff66bca3e8797db709e03572d296358dc4b95653
Author: Mihail Konev <k.mvc@ya.ru>
Date: Thu Jan 12 13:21:07 2017 +0500
tests: Refactor wraps into protocol-common.c
Part of refactoring the tests into a single binary,
to make partial rebuild slightly faster and less verbose.
Prepares for joining test/xi2/protocol-* into a single binary.
Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Mihail Konev <k.mvc@ya.ru>
commit 45546219e117c1b6129fd9f9be2ce5b592486feb
Author: Mihail Konev <k.mvc@ya.ru>
Date: Tue Jan 3 23:40:18 2017 +0500
tests: Avoid libtool message
The "copying selected object files" message appears as some source
files have the same name, and some objects are included twice.
Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Mihail Konev <k.mvc@ya.ru>
commit 785053d033e73d2deb0ded4b97eabfd881991978
Author: Keith Packard <keithp@keithp.com>
Date: Mon Jan 9 18:10:21 2017 -0800
AttendClient of grab-pervious client must queue to saved_ready_clients [v2]
A client which is attended while a grab is blocking execution of its
requests needs to be placed in the saved_ready_clients list so that it
will get scheduled once the grab terminates. Otherwise, if the client
never sends another request, there is no way for it to be placed in
the ready_clients list.
v2: Wrap comment above mark_client_saved_ready.
Remove test for OS_COMM_IGNORED which will always be true.
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=99333
Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 436da935bde43076f3052a758a463ed080e8a747
Author: Qiang Yu <Qiang.Yu@amd.com>
Date: Tue Jan 10 18:51:57 2017 +0800
modesetting: cleanup pci device open
Signed-off-by: Qiang Yu <Qiang.Yu@amd.com>
Reviewed-by: Hans de Goede <hdegoede@redhat.com>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 555e0a42d138ac8d83af62638752a1bebad602d6
Author: Qiang Yu <Qiang.Yu@amd.com>
Date: Tue Jan 10 18:51:55 2017 +0800
randr: fix xserver crash when xrandr setprovideroutputsource
xrandr --setprovideroutputsource <screen> <gpu screen>
Xorg: ../../../xserver/dix/dispatch.c:4018: AttachOutputGPU:
Assertion `new->isGPU' failed.
GPUScreen is not allowed to be sink output.
Signed-off-by: Qiang Yu <Qiang.Yu@amd.com>
Reviewed-by: Hans de Goede <hdegoede@redhat.com>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 1012510620de7dadd0ab18b19a8e11facd884601
Author: Qiang Yu <Qiang.Yu@amd.com>
Date: Tue Jan 10 18:51:54 2017 +0800
xfree86: fix wrong usage of xf86optionListMerge
Signed-off-by: Qiang Yu <Qiang.Yu@amd.com>
Reviewed-by: Hans de Goede <hdegoede@redhat.com>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit e473b2bc016adacfe3fa47fdf6a8ce9f8cddff62
Author: Michel Dänzer <michel.daenzer@amd.com>
Date: Fri Nov 25 17:34:05 2016 +0900
present: Only call present_flip_notify if vblank->queued == FALSE
We are no longer using the present_flip_queue list only for presents
which have already been submitted to the driver for page flipping, but
also for those which we are queueing up to be flipped later, marked
with vblank->queued == TRUE. We were incorrectly calling
present_flip_notify for such entries, failing the assertion in
present_flip_notify (or presumably resulting in other undesirable
behaviour with assertions disabled).
Reproduction recipe: Run the JavaFX test case referenced by
https://bugs.freedesktop.org/show_bug.cgi?id=98831#c6 and alt-tab out
of it while it's fullscreen. May take a few attempts to hit the
assertion failure.
Fixes: bab0f450a719 ("present: Fix presentation of flips out of order")
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=98854
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
commit 9d32b71c93cf6187e9320c99ae857e34a51b7102
Author: Mihail Konev <k.mvc@ya.ru>
Date: Wed Jan 4 07:08:51 2017 +0500
xkb: Match key releases with an overlaid press
Testcase:
In ~/.xbindkeysrc:
"xterm &"
XF86LaunchA
In ~/ov.xkb:
xkb_keymap {
xkb_keycodes { include "evdev" };
xkb_types { include "complete" };
xkb_compat { include "complete"
interpret Overlay1_Enable+AnyOfOrNone(all) {
action= SetControls(controls=Overlay1);
};
};
xkb_symbols { include "pc+inet(evdev)+us"
key <INS> { [ Overlay1_Enable ] };
key <AE01> { overlay1 = <AE02> }; // Insert+1 => 2
key <TLDE> { overlay1 = <I128> }; // Insert+~ => XF86LaunchA
};
xkb_geometry { include "pc(pc104)" };
};
Apply this layout: 'xkbcomp ~/ov.xkb $DISPLAY'.
Run "xbindkeys -n -v"
In the exact order:
- press Insert
- press Tilde
- release Insert
- wait
- release Tilde
Keyboard input in the new terminal window(s) would be locked
until another Insert+Tilde .
Reported-by: Mariusz Mazur <mariusz.g.mazur@gmail.com>
Signed-off-by: Mihail Konev <k.mvc@ya.ru>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 29a4f3db60fdeaef7bca3aa2746bb43a1850fddd
Author: Adam Jackson <ajax@redhat.com>
Date: Mon Jan 2 15:38:08 2017 -0500
glamor: Squash unused variable warning
Accidentally introduced in 05e19644.
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit 9874f73e88678c9eacbcba05e52336fc63a32712
Author: Kai-Heng Feng <kai.heng.feng@canonical.com>
Date: Thu Dec 15 13:56:38 2016 +0800
edid: Add quirk for ADA 1024x600 7" display.
Detailed mode reports 108 mm x 68 mm which is for smaller display.
Maximum image size reports 15 cm x 10 cm which aligns with its physical
size, use this size instead.
Signed-off-by: Kai-Heng Feng <kai.heng.feng@canonical.com>
Acked-by: Alex Deucher <alexander.deucher@amd.com>
commit 1b42f9505ff3a39b441464f553442079b750fe88
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu Dec 8 14:32:06 2016 +1000
os: return 0 from check_timers if we touched any of them
Fixes a regression introduced in 0b2f30834b1a9f. If a driver posts input
events during a timer function (wacom and synaptics do this during tap
timeouts), ProcessInputEvents() is not called for these events. There are no
new events on any fds, so the events just sit in the queue waiting for
something else to happen.
Fix this by simply returning 0 from check_timers if we ran at least one of
them or reset them all. This way the callers ospoll_wait will exit and
continue with normal processing.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Keith Packard <keithp@keithp.com>
commit c96c860b6420adf0d004707a323af30491a1d7d3
Author: Michal Srb <msrb@suse.com>
Date: Mon Dec 12 17:45:22 2016 +0200
xinerama: Swap the response in RRXineramaWriteMonitor
Reviewed-by: Adam Jackson <ajax@redhat.com>
commit 05e19644250698aa126a60bc671e85425df784d1
Author: Hans De Goede <hdegoede@redhat.com>
Date: Tue Dec 20 13:00:43 2016 +0100
glamor: Trust eglGetPlatformDisplayEXT if it exists
If the libEGL we are using has eglGetPlatformDisplayEXT, yet it still
returns NULL, then this very likely means that it does not support the
type (e.g. EGL_PLATFORM_GBM_MESA) passed in, and then returning NULL is
the right thing to do.
This avoids falling back to an eglGetDisplay() implementation which does
not understands the passed in gbm handle, treats it as a pointer to
something else completely, followed by a crash sooner or later.
Specifically this fixes using the nvidia binary driver, with nvidia's
libEGL + the modesetting driver on a secondary GPU crashing inside
glamor_egl_init() sometimes.
Cc: Eric Anholt <eric@anholt.net>
Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
commit 5b74e260e009d8bdf26433724495802b85cce7c3
Author: Mihail Konev <k.mvc@ya.ru>
Date: Thu Dec 29 12:37:18 2016 +0500
os,dix: Depend custom libs on libs, not objects
The custom os/os.O library reuses *.o files of os/libos.la.
The current rule assumes automake puts all the objects into per-target
am__*_la_OBJECTS variable. At least with AC_REPLACE_FUNCS, this no
longer holds (as wanted objects are put into LTLIBOBJS instead).
Depend on automake's result, the *.la library instead, to express demand
of any its dependencies being built.
Should be fixing randomly occuring "undefined reference to `strlcpy'"
errors when linking Xvfb and other DDX-es that could use os.O.
Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Mihail Konev <k.mvc@ya.ru>
commit b5dffbbac193aa640ffcfa0a431c21b862854e53
Author: Hans De Goede <hdegoede@redhat.com>
Date: Mon Dec 12 17:03:17 2016 +0100
xfree86: Add ModulePath support for OutputClass config Sections
Allow OutputClass config snippets to modify the module-path.
Note that any specified ModulePaths will be pre-pended to the normal
ModulePath. The idea behind this is that any output hardware specific
modules should have preference over the normal modules.
One use-case for this is the nvidia binary driver, this allows a
config snippet like this:
Section "OutputClass"
MatchDriver "nvidia"
Modulepath "/usr/lib64/nvidia/modules"
EndSection
To get the nvidia glx specific glx module loaded, but only when the
nvidia kernel driver is loaded.
Together with the glvnd work done recently, this allows the nouveau
+ mesa and nvidia-binary userspace stacks to co-exist on the same
system without any ldconfig / xorg.conf tweaking and the xserver will
automatically do the right thing depending on which kernel driver
(nouveau or nvidia) is loaded.
Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
commit d75ffcdbf8c1e3c8e0d46debcd533a9f2560f0a8
Author: Hans De Goede <hdegoede@redhat.com>
Date: Mon Dec 12 17:03:16 2016 +0100
xfree86: Allow overriding primary GPU detection from an OutputClass section
Allow using:
Option "PrimaryGPU" "yes"
In an OutputClass section to override the default primary GPU device
selection which selects the GPU used as output by the firmware.
If multiple output devices match an OutputClass section with
the PrimaryGPU option set, the first one enumerated becomes the
primary GPU.
Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
commit ab1a65b7755d081b41188104b21f4d21eaa3187b
Author: Hans De Goede <hdegoede@redhat.com>
Date: Mon Dec 12 17:03:15 2016 +0100
xfree86: xf86platformProbe: split finding pci-info and setting primary GPU
This is a preparation patch for allowing an OutputClass section to
override the default primary GPU device selection.
Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
commit 9cd3cc75269d9196898487b5712ee47b8291e077
Author: Hans De Goede <hdegoede@redhat.com>
Date: Mon Dec 12 17:03:14 2016 +0100
xfree86: Add options support for OutputClass Options
Add support for setting options in OutputClass Sections and having these
applied to any matching output devices.
Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
commit 08b84d72878e43401e99059c3c926dfa42a360c3
Author: Hans De Goede <hdegoede@redhat.com>
Date: Mon Dec 12 17:03:13 2016 +0100
xfree86: Make OutputClassMatches take a xf86_platform_device
Make OutputClassMatches directly take a xf86_platform_device as argument,
rather then an index into xf86_platform_devices. This makes things
easier for callers which already have a xf86_platform_device pointer.
Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
commit c57c1e53ea3d76ebba5b2a23b7260817d3e6b921
Author: Hans De Goede <hdegoede@redhat.com>
Date: Mon Dec 12 17:03:12 2016 +0100
xfree86: Free devlist returned by xf86MatchDevice
xf86MatchDevice returns a dynamically allocated list of GDevPtr-s,
free this when we're done with it.
Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
commit 32e632e85894eddc3ace83f16f1e973b1be478fe
Author: Adam Jackson <ajax@redhat.com>
Date: Mon Dec 12 13:08:17 2016 -0500
Revert "damage: Make damageRegionProcessPending take a damage not a drawable"
The commit message makes the assertion that the code below damage is not
allowed to change whether there's a damage monitor for the drawable.
That turns out not to be the case! exa's mixed code, at least, will
create and destroy a damage in PrepareAccess. The destroy path can then
be catastrophic, as damageRegionProcessPending will attempt to
RegionEmpty memory from the middle of a freed block.
I'd wanted that invariant for performance, but faster isn't worth
broken, so revert it. I think what exa's doing is reasonable, so the
better way to improve performance for the unmonitored case is to either
revisit dynamically wrapping into the GC, or inline damage into dix.
This reverts commit 4e124203f2260daaf54155f4a05fe469733e0b97.
Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=1389886
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit 6dd65a6e9bd41237afe7615bea1cc9510e82781a
Author: Adam Jackson <ajax@redhat.com>
Date: Fri Dec 9 14:52:38 2016 -0500
shadow: Remove unused shadowAlloc
Signed-off-by: Adam Jackson <ajax@redhat.com>
Reviewed-by: Keith Packard <keithp@keithp.com>
commit 8d985c1e696bf46edaea0021f03f6f613ce37860
Author: Adam Jackson <ajax@redhat.com>
Date: Fri Dec 9 14:52:37 2016 -0500
shadow: Macro cleanup
shadowDamage is just obfuscation. The other two macros won't work
outside shadow.c since the private key is in fact static there (meaning
the extern decl is a lie).
Signed-off-by: Adam Jackson <ajax@redhat.com>
Reviewed-by: Keith Packard <keithp@keithp.com>
commit a530dc2a62349d922de77a75786a3795102aec11
Author: Adam Jackson <ajax@redhat.com>
Date: Fri Dec 9 14:52:36 2016 -0500
shadow: Remove indirection stubs
These are no longer used in the drivers.
Signed-off-by: Adam Jackson <ajax@redhat.com>
Reviewed-by: Keith Packard <keithp@keithp.com>
commit 1ae09800863992cfb1d5d21c600e2bc29e3b6ab2
Author: Adam Jackson <ajax@redhat.com>
Date: Fri Dec 9 14:52:35 2016 -0500
shadow: Lift 32->24 conversion from modesetting to dix
Signed-off-by: Adam Jackson <ajax@redhat.com>
Reviewed-by: Keith Packard <keithp@keithp.com>
commit 2b486f052d8a7d3bada9eb2615aa19d79e999cbe
Author: Adam Jackson <ajax@redhat.com>
Date: Fri Dec 9 14:52:34 2016 -0500
shadowfb: Rename this particular shadow.c to shadowfb.c
So as not to conflict with the one in miext/shadow.
Signed-off-by: Adam Jackson <ajax@redhat.com>
Reviewed-by: Keith Packard <keithp@keithp.com>
commit 98caba9f5669291e84f8610cc3071a9ac2df205f
Author: Adam Jackson <ajax@redhat.com>
Date: Fri Dec 9 14:52:29 2016 -0500
dix: Clear graphicsExposures for scratch GCs in one place
... instead of in all the CreateScratchGC callers.
Signed-off-by: Adam Jackson <ajax@redhat.com>
Reviewed-by: Keith Packard <keithp@keithp.com>
commit e900a00f8dc5a1db63bafddd4ad1cde744975db1
Author: Adam Jackson <ajax@redhat.com>
Date: Fri Dec 9 14:52:28 2016 -0500
dix: Rename (and retype) PixmapPerDepth[1] to defaultStipple
Signed-off-by: Adam Jackson <ajax@redhat.com>
Reviewed-by: Keith Packard <keithp@keithp.com>
commit 8b335d9068fe4e1f1423a4d86c22b69ffcb819a5
Author: Ben Crocker <bcrocker@redhat.com>
Date: Tue Nov 15 16:34:38 2016 -0500
Fix a segfault that occurs if xorg.conf.d is absent:
In InitOutput, if xf86HandleConfigFile returns CONFIG_NOFILE
(which it does if no config file or directory is present), the
autoconfig flag is set, causing xf86AutoConfig to be called
later on.
xf86AutoConfig calls xf86OutputClassDriverList via the
call tree:
xf86AutoConfig =>
listPossibleVideoDrivers =>
xf86PlatformMatchDriver =>
xf86OutputClassDriverList
and xf86OutputClassDriverList attempts to traverse a linked list
that is a member of the XF86ConfigRec struct pointed to by the
global xf86configptr, which is NULL at this point because the
XF86ConfigRec struct is only allocated (by xf86readConfigFile)
AFTER the config file and directory have been successfully
opened; the CONFIG_NOFILE return from xf86HandleConfigFile
occurs BEFORE the call to xf86readConfigFile which allocates
the XF86ConfigRec struct.
Rx: In read.c (for symmetry with xf86freeConfig, which already
appears in this file), add a new function xf86allocateConfig
which tests the value of xf86configptr and, if it's NULL,
allocates the XF86ConfigRec struct and deposits the pointer
in xf86configptr. In xf86Parser.h, add a prototype for the
new xf86allocateConfig function.
Back in read.c, #include "xf86Config.h". In xf86readConfigFile,
change the open-code call to calloc to a call to the new
xf86allocateConfig function.
In xf86AutoConfig.c, add a call to the new xf86allocateConfig function
to the beginning of xf86AutoConfig to make sure the XF86ConfigRec struct
is allocated.
Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Ben Crocker <bcrocker@redhat.com>
commit b365c5d16894a259dbf29db4ca2640d8ed768063
Author: Pekka Paalanen <pekka.paalanen@collabora.co.uk>
Date: Wed Dec 7 15:43:06 2016 +0200
test: fix distributing scripts
Fix the following error on 'make distcheck':
make[6]: *** No rule to make target 'scripts/xvfb-piglit.sh', needed by 'scripts/xvfb-piglit.sh.log'. Stop.
make[6]: Leaving directory '/home/pq/git/xserver/xorg-server-1.19.99.1/_build/sub/test'
Makefile:1367: recipe for target 'check-TESTS' failed
The setup to trigger this is:
$ ./configure --prefix=/home/pq/local --disable-docs
--disable-devel-docs --enable-xwayland --disable-xorg --disable-xvfb
--disable-xnest --disable-xquartz --disable-xwin --enable-debug
SCRIPT_TESTS is populated conditionally, but we should distribute the
scripts in any case.
Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Pekka Paalanen <pekka.paalanen@collabora.co.uk>
commit f31875510d818ba517f082e124adb294db906e51
Author: Adam Jackson <ajax@redhat.com>
Date: Tue Dec 6 14:11:11 2016 -0500
composite: Fix repaint of borders (v2)
When going from border width zero to a non-zero border width, the
Composite extension is informed via the ConfigNotify callback. The
call-chain looks like this: compConfigNotify -> compReallocPixmap ->
compSetPixmap -> TraverseTree -> compSetPixmapVisitWindow. However, at
this time, pWindow->borderWidth was not yet updated. Thus, HasBorder()
is false and the window border will not be repainted.
To fix this, thread the new bw through to the window visitor, and
inspect that rather than HasBorder(). For the other callers of
compSetPixmap the border does not change size, so we can pass
pWin->borderWidth instead.
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=98499
Signed-off-by: Adam Jackson <ajax@redhat.com>
Reviewed-by: Keith Packard <keithp@keithp.com>
commit 75c4f6e412e07c5d416fa9ad8d7defd972d2baa9
Author: Hans de Goede <hdegoede@redhat.com>
Date: Fri Sep 30 12:29:09 2016 +0200
xfree86: Try harder to find atleast 1 non GPU Screen
If we did not find any non GPU Screens, try again ignoring the notion
of any video devices being the primary device. This fixes Xorg exiting
with a "no screens found" error when using virtio-vga in a
virtual-machine and when using a device driven by simpledrm.
This is a somewhat ugly solution, but it is the best I can come up with
without major surgery to the bus and probe code.
Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
commit 7121b03d324fccf687d49b63c53da7c8d93038c9
Author: Hans de Goede <hdegoede@redhat.com>
Date: Fri Sep 30 11:59:04 2016 +0200
xfree86: Make adding unclaimed devices as GPU devices a separate step
This is primarily a preparation patch for fixing the xserver exiting with
a "no screens found" error even though there are supported video cards,
due to the server not recognizing any card as the primary card.
This also fixes the (mostly theoretical) case of a platformBus capable
driver adding a device as GPUscreen before a driver which only supports
the old PCI probe method gets a chance to claim it as a normal screen.
Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
commit b72d161cad15bec9dd082d30521c5383be526c56
Author: Hans de Goede <hdegoede@redhat.com>
Date: Tue Sep 27 14:30:10 2016 +0200
xfree86: Remove redundant ServerIsNotSeat0 check from xf86CallDriverProbe
If foundScreen is TRUE, then all the code below the removed if
will not execute until we reach the return foundScreen; at the
end, so this entire if block is redundant.
Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
commit a46afee84d45fbff4e4dad9376afc95bbcc31d7c
Author: Hans de Goede <hdegoede@redhat.com>
Date: Tue Nov 22 14:53:20 2016 +0100
randr: rrCheckPixmapBounding: do not shrink the screen_pixmap
The purpose of rrCheckPixmapBounding is to make sure that the
screen_pixmap is *large* enough for the slave-output which crtc is
being configured.
However until now rrCheckPixmapBounding would also shrink the
screen_pixmap in certain scenarios leading to various problems.
For example: Take a laptop with its internalscreen on a slave-output and
currently disabled and an external monitor at 1920x1080+0+0.
Now lets say that we want to drive the external monitor at its native
resolution of 2560x1440 and have the internal screen mirror the top left
part of the external monitor, so we run:
$ xrandr --output eDP --mode 1920x1080 --pos 0x0 --output HDMI \
--mode 2560x1440 --pos 0x0
Here xrandr utility first calls RRSetScreenSize to 2560x1440, then it
calls RRSetCrtc 1920x1080+0+0 on the eDP, since this is a slave output,
rrCheckPixmapBounding gets called and resizes the screen_pixmap to
1920x1080, undoing the RRSetScreenSize. Then RRSetCrtc 2560x1440+0+0
gets called on the HDMI, depending on crtc->transforms this will
either result in a BadValue error from ProcRRSetCrtcConfig; or
it will succeed, but the monitor ends up running at 2560x1440
while showing a 1920x1080 screen_pixmap + black borders on the right
and bottom. Neither of which is what we want.
This commit removes the troublesome shrinking behavior, fixing this.
Note:
1) One could argue that this will leave us with a too large screen_pixmap
in some cases, but rrCheckPixmapBounding only gets called for slave
outputs, so xrandr clients already must manually shrink the screen_pixmap
after disabling crtcs in normal setups.
2) An alternative approach would be to also call rrCheckPixmapBounding
on RRSetCrtc on normal (non-slave) outputs, but that would result in
2 unnecessary resizes of the screen_pixmap in the above example, which
seems undesirable.
Cc: Nikhil Mahale <nmahale@nvidia.com>
Cc: Dave Airlie <airlied@redhat.com>
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Reviewed-by: Dave Airlie <airlied@redhat.com>
commit 3b624aa9a9df86dc7d48149e0f18ca223b4355f1
Author: Hans de Goede <hdegoede@redhat.com>
Date: Tue Nov 22 14:48:14 2016 +0100
randr: rrCheckPixmapBounding: Do not substract crtc non 0 x,y from screen size
The purpose of rrCheckPixmapBounding is to make sure that the
screen_pixmap is large enough for the slave-output which crtc is
being configured.
This should include crtc->x and crtc->y, otherwise the crtc might
still end up scanning out an area outside of the screen-pixmap.
For example: Take a laptop with an external monitor on a slave-output at
1920x1080+0+0 and its internal-screen at 3840x2160+1920+0 and in
gnome-settings-daemon move the external monitor to be on the ri ght of
the internal screen rather then on the left. First g-s-d will do a
RRSetScreenSize to 5760*2160 (which is a nop), then it calls RRSetCrtc
to move the slave output to 1920x1080+3840+0, since this is a slave
output, rrCheckPixmapBounding gets called, since the 2 crtcs now overlap
the code before this commit would shrinks the screen_pixmap to 3180*2160.
Then g-s-d calls RRSetCrtc to move the internal screen to 3180*2160+0+0.
And we end up with the slave-output configured to scan-out an area
which completely falls outside of the screen-pixmap (and end up with
a black display on the external monitor).
This commit fixes this by not substracting the x1 and y1 coordinates
of the union-ed region when determining the new screen_pixmap size.
Cc: Nikhil Mahale <nmahale@nvidia.com>
Cc: Dave Airlie <airlied@redhat.com>
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Reviewed-by: Dave Airlie <airlied@redhat.com>
commit e1d30075c923f96a375895d74ea12a3c92a640c6
Author: Adam Jackson <ajax@redhat.com>
Date: Tue Nov 22 10:51:24 2016 -0500
configure: Enable glamor when building just Xwayland
Signed-off-by: Adam Jackson <ajax@redhat.com>
Acked-by: Daniel Stone <daniels@collabora.com>
Reviewed-by: Pekka Paalanen <pekka.paalanen@collabora.co.uk>
Tested-by: Pekka Paalanen <pekka.paalanen@collabora.co.uk>
Reviewed-by: Eric Anholt <eric@anholt.net>
commit 59ad0e6a416d8e23f9d962af67a16ee28ec7867b
Author: Olivier Fourdan <ofourdan@redhat.com>
Date: Wed Nov 30 09:42:43 2016 +0100
xwayland: Fix use after free of cursors
Sometimes, Xwayland will try to use a cursor that has just been freed,
leading to a crash when trying to access that cursor data either in
miPointerUpdateSprite() or AnimCurTimerNotify().
CheckMotion() updates the pointer's cursor based on which xwindow
XYToWindow() returns, and Xwayland implements its own xwl_xy_to_window()
to fake a crossing to the root window when the pointer has left the
Wayland surface but is still within the xwindow.
But after an xwindow is unrealized, the last xwindow used to match the
xwindows is cleared so two consecutive calls to xwl_xy_to_window() may
not return the same xwindow.
To avoid this issue, update the last_xwindow based on enter and leave
notifications instead of xwl_xy_to_window(), and check if the xwindow
found by the regular miXYToWindow() is a child of the known last
xwindow, so that multiple consecutive calls to xwl_xy_to_window()
return the same xwindow, being either the one found by miXYToWindow()
or the root window.
Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=1385258
Signed-off-by: Olivier Fourdan <ofourdan@redhat.com>
Tested-by: Vít Ondruch <vondruch@redhat.com>
Tested-by: Satish Balay <balay@fastmail.fm>
Reviewed-by: Jonas Ådahl <jadahl@gmail.com>
commit f43207c1c4a8487600cf3ea116c10437417c861b
Author: Olivier Fourdan <ofourdan@redhat.com>
Date: Thu Nov 3 09:59:30 2016 +0100
glamor: restore vfunc handlers on init failure
In glamor_init(), if the minimum requirements are not met, glamor may
fail after setting up its own CloseScreen() and DestroyPixmap()
routines, leading to a crash when either of the two routines is called
if glamor failed to complete its initialization, e.g:
(EE) Backtrace:
(EE) 0: Xwayland (OsSigHandler+0x29)
(EE) 1: /lib64/libpthread.so.0 (__restore_rt+0x0)
(EE) 2: Xwayland (glamor_sync_close+0x2a)
(EE) 3: Xwayland (glamor_close_screen+0x52)
(EE) 4: Xwayland (CursorCloseScreen+0x88)
(EE) 5: Xwayland (AnimCurCloseScreen+0xa4)
(EE) 6: Xwayland (present_close_screen+0x42)
(EE) 7: Xwayland (dix_main+0x4f9)
(EE) 8: /lib64/libc.so.6 (__libc_start_main+0xf1)
(EE) 9: Xwayland (_start+0x2a)
Restore the previous CloseScreen() and DestroyPixmap() vfunc handlers in
case of failure when checking for the minimum requirements, so that if
any of the requirement is not met we don't leave the CloseScreen() and
DestroyPixmap() from glamor handlers in place.
Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=1390018
Signed-off-by: Olivier Fourdan <ofourdan@redhat.com>
Reviewed-by: Hans de Goede <hdegoede@redhat.com>
Reviewed-by: Eric Anholt <eric@anholt.net>
commit d6a6e1d6abb110ff00ad31b94cd29d92ca7c71a5
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri Nov 11 15:28:50 2016 +1000
Xi: when creating a new master device, update barries for all clients
The previous code only worked when the barrier was created by the same client
as the one calling XIChangeDeviceHierarchy.
http://bugzilla.redhat.com/show_bug.cgi?id=1384432
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Daniel Stone <daniels@collabora.com>
commit 5611585b87ce48428a66f98ece319a083f55d205
Author: Rui Matos <tiagomatos@gmail.com>
Date: Thu Nov 24 19:56:18 2016 +0100
xwayland: Don't send KeyRelease events on wl_keyboard::leave
Commits 816015648ffe660ddaa0f7d4d192e555b723c372 and
fee0827a9a695600765f3d04376fc9babe497401 made it so that
wl_keyboard::enter doesn't result in X clients getting KeyPress events
while still updating our internal xkb state to be in sync with the
host compositor.
wl_keyboard::leave needs to be handled in the same way as its
semantics from an X client POV should be the same as an X grab getting
triggered, i.e. X clients shouldn't get KeyRelease events for keys
that are still down at that point.
This patch uses LeaveNotify for these events on wl_keyboard::leave and
changes the current use of KeymapNotify to EnterNotify instead just to
keep some symmetry between both cases.
On ProcessDeviceEvent() we still need to deactivate X grabs if needed
for KeyReleases.
Signed-off-by: Rui Matos <tiagomatos@gmail.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 2de37eb71b928f6f50c109536c2f7b77293ad8e3
Author: Pekka Paalanen <pekka.paalanen@collabora.co.uk>
Date: Wed Nov 23 09:54:27 2016 +0200
xwayland: fix order of calloc() args
The definition by the manual is:
calloc(size_t nmemb, size_t size)
Swap the arguments of calloc() calls to be the right way around.
Presumably this makes no functional difference, but better follow the
spec.
Signed-off-by: Pekka Paalanen <pekka.paalanen@collabora.co.uk>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit cf8860786c3e301486cd2853bc82977ba75e6b17
Author: Rhys Kidd <rhyskidd@gmail.com>
Date: Fri Oct 28 22:44:30 2016 -0400
test: Fix stray Makefile reference to removed os test
Fixes the following warning:
test/Makefile.am:69: warning: variable 'os_LDADD' is defined but no program or
test/Makefile.am:69: library has 'os' as canonical name (possible typo)
Introduced upon the removal of test/os in:
commit 6a5a4e60373c1386b311b2a8bb666c32d68a9d99
Author: Keith Packard <keithp@keithp.com>
Date: Tue Dec 8 14:39:46 2015 -0800
Remove SIGIO support for input [v5]
This removes all of the SIGIO handling support used for input
throughout the X server, preparing the way for using threads for input
handling instead.
Places calling OsBlockSIGIO and OsReleaseSIGIO are marked with calls
to stub functions input_lock/input_unlock so that we don't lose this
information.
xfree86 SIGIO support is reworked to use internal versions of
OsBlockSIGIO and OsReleaseSIGIO.
v2: Don't change locking order (Peter Hutterer)
v3: Comment weird && FALSE in xf86Helper.c
Leave errno save/restore in xf86ReadInput
Squash with stub adding patch (Peter Hutterer)
v4: Leave UseSIGIO config parameter so that
existing config files don't break (Peter Hutterer)
v5: Split a couple of independent patch bits out
of kinput.c (Peter Hutterer)
Signed-off-by: Keith Packard <keithp@keithp.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Rhys Kidd <rhyskidd@gmail.com>
Reviewed-by: Keith Packard <keithp@keithp.com>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit f0f8d5bb535814d5803df541b0ef4cb0354fabbe
Author: Keith Packard <keithp@keithp.com>
Date: Fri Nov 18 09:48:28 2016 -0800
Bump to post-1.19 development version
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 45af7fcb522464922831005d63cc362dc09f19a9
Author: Olivier Fourdan <ofourdan@redhat.com>
Date: Thu Nov 10 09:36:40 2016 +0100
xwayland: Remove MIPOINTER() definition
Not needed anymore now that mipointer exposes an API for that,
miPointerInvalidateSprite()
Signed-off-by: Olivier Fourdan <ofourdan@redhat.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 7e5c9bdf73e4185ac4cf7f044da0793a5cc3e62c
Author: Keith Packard <keithp@keithp.com>
Date: Tue Nov 15 08:12:05 2016 -0800
Bump version to 1.19.0
Signed-off-by: Keith Packard <keithp@keithp.com>
commit ea8efb3a997e15d27d362762e6c85d59487f9864
Author: Keith Packard <keithp@keithp.com>
Date: Wed Nov 2 13:25:33 2016 -0700
dix: Make sure client is not in output_pending chain after closed (RH 1382444)
I think it is possible that output could get queued to a client during
CloseDownClient. After it is removed from the pending queue, active
grabs are released, the client is awoken if sleeping and any work
queue entries related to the client are processed.
To fix this, move the call removing it from the output_pending chain
until after clientGone has been set and then check clientGone in
output_pending_mark.
Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=1382444
Signed-off-by: Keith Packard <keithp@keithp.com>
Reviewed-by: Hans de Goede <hdegoede@redhat.com>
commit 7513da40a656317ad3aa101651d29373de99c798
Author: Timo Aaltonen <tjaalton@ubuntu.com>
Date: Wed Nov 2 17:18:11 2016 +0200
dri2: Sync i965_pci_ids.h from mesa
Import changes from these mesa commits:
85ea8deb26da420 i965: Removing PCI IDs that are no longer listed as Kabylake.
bdff2e554735ed9 i956: Add more Kabylake PCI IDs.
f1fa8b4a1ca73fa i965/bxt: Add 2x6 variant
d1ab544bb883d04 i965/chv: Display proper branding
20e8ee36627f874 i965/skl: Update Skylake renderer strings
644c8a515192d28 i965/skl: Add two missing device IDs
Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Timo Aaltonen <tjaalton@ubuntu.com>
commit 4cfee398726adf89db4b632ade7d6cab8b78282e
Author: Ian Ray <ian.ray@ge.com>
Date: Wed May 25 10:41:53 2016 +0300
xwayland-shm: block signals during fallocate
posix_fallocate() does an explicit rollback if it gets EINTR, and
this is a problem on slow systems because when the allocation size
is sufficiently large posix_fallocate() will always be interrupted
by the smart scheduler's SIGALRM.
Changes since v1 - big comment in the code to explain what is going on
Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Ian Ray <ian.ray@ge.com>
Acked-by: Pekka Paalanen <pekka.paalanen@collabora.co.uk>
Acked-by: Daniel Stone <daniels@collabora.com>
commit 512e75a23b7f6339593c3ae6942f0c420a975fd3
Author: Keith Packard <keithp@keithp.com>
Date: Fri Oct 28 09:32:42 2016 -0700
Bump to 1.18.99.902 (1.19 RC2)
Signed-off-by: Keith Packard <keithp@keithp.com>
commit c85f81825e196e96337347e0ce3a538fb2e38f16
Author: Keith Packard <keithp@keithp.com>
Date: Fri Oct 28 09:28:32 2016 -0700
dix: Bump MAXHASHSIZE for the resource db [v2]
[This was originally a workaround for a client-side resource leak:
http://lists.freedesktop.org/archives/xorg-devel/2012-November/034555.html
Obviously that's a broken app, but the performance problem it
illustrates - that walking the linked list ends up burning all your CPU
time - is real enough. - ajax]
v2: Replace with a shorter code sequence which computes the same
results for all but numBits == 7
Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 356db2340f5b473a7191c7969586ca5b0396c48f
Merge: 9ed5b26354 03d99ef729
Author: Keith Packard <keithp@keithp.com>
Date: Fri Oct 28 09:05:54 2016 -0700
Merge remote-tracking branch 'jturney/master'
commit 9ed5b263542e5245317927828f0515db6c0a54c8
Author: Keith Packard <keithp@keithp.com>
Date: Fri Oct 28 08:04:43 2016 -0700
os: Recompute whether any clients are ready after ProcessWorkQueue() (bug 98030)
If a work proc wakes up a sleeping client and it is ready to execute,
we need to re-compute the local 'are_ready' value before deciding
what timeout value to use in WaitForSomething.
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=98030
Signed-off-by: Keith Packard <keithp@keithp.com>
Reviewed-by: Hans de Goede <hdegoede@redhat.com>
commit 2c91f3235a4e1655e18cb014922529161051ffbb
Author: Keith Packard <keithp@keithp.com>
Date: Wed Oct 5 09:41:44 2016 -0700
ephyr: Leave window unmapped for -glamor-skip-present [v2]
If we're never painting anything in the window, we probably don't need
to map it.
v2: Drop ephyr_glamor_gles2 from hostx.c
Signed-off-by: Keith Packard <keithp@keithp.com>
Reviewed-by: Eric Anholt <eric@anholt.net>
commit cba5a10fd93310702cad9dbe1e6d48da99f5552f
Author: Alex Goins <agoins@nvidia.com>
Date: Wed Oct 26 11:03:49 2016 -0700
ramdac: Check sPriv != NULL in xf86CheckHWCursor()
xf86CheckHWCursor() would dereference sPriv without NULL checking it. If Option
"SWCursor" is specified, sPriv == NULL. In this case we should assume that HW
cursors are not supported.
Signed-off-by: Alex Goins <agoins@nvidia.com>
Reviewed-by: Andy Ritger <aritger@nvidia.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 03d99ef729178dd99268f185fb45320a29382091
Author: Jon Turney <jon.turney@dronecode.org.uk>
Date: Thu Oct 6 22:13:07 2016 +0100
glx/dri2: Don't build DRI loader if DRI2 isn't enabled
This partially reverts 501d8e2b.
Signed-off-by: Jon Turney <jon.turney@dronecode.org.uk>
Reviewed-by: Emil Velikov <emil.l.velikov@gmail.com>
commit 5cb328338684d8e5b03913c47475bfcd7acffec4
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Wed Oct 26 12:21:16 2016 +0200
inputthread: On Linux leave the main thread's name as-is
On Linux, setting the main thread's name changes the program name
(/proc/self/comm). Setting it to MainThread breaks scripts that rely on
the command name, e.g. ps -C Xorg.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
commit 007f8ee61a35ceda36b43e772a9a1074b8e27a06
Author: Olivier Fourdan <ofourdan@redhat.com>
Date: Fri Oct 21 10:11:45 2016 +0200
xwayland: Activate and enable touch devices
On some random condition, a touch event may trigger a crash in Xwayland
in GetTouchEvents().
The (simplified) backtrace goes as follow:
(gdb) bt
#0 GetTouchEvents() at getevents.c:1892
#1 QueueTouchEvents() at getevents.c:1866
#2 xwl_touch_send_event() at xwayland-input.c:652
#5 wl_closure_invoke() from libwayland-client.so.0
#6 dispatch_event() from libwayland-client.so.0
#7 wl_display_dispatch_queue_pending() from libwayland-client.so.0
#8 xwl_read_events() at xwayland.c:483
#9 ospoll_wait() at ospoll.c:412
#10 WaitForSomething() at WaitFor.c:222
#11 Dispatch() at dispatch.c:412
#12 dix_main() at main.c:287
#13 __libc_start_main() at libc-start.c:289
#14 _start ()
The crash occurs when trying to access the sprite associated with the
touch device, which appears to be NULL. Reason being the device itself
is more a keyboard device than a touch device.
Moreover, it appears the device is neither enabled nor activated
(inited=0, enabled=0) which doesn't seem right, but matches the code in
init_touch() from xwayland-input.c which would enable the device if it
was previously existing and otherwise would create the device but not
activate it.
Make sure we do activate and enable touch devices just like we do for
other input devices such as keyboard and pointer.
Signed-off-by: Olivier Fourdan <ofourdan@redhat.com>
Reviewed-by: Hans de Goede <hdegoede@redhat.com>
commit f68ba7b81ffe765380664fccc92f3e689c6c48c2
Author: Rui Matos <tiagomatos@gmail.com>
Date: Tue Oct 25 19:24:49 2016 +0200
xwayland: Transform pointer enter event coordinates
Pointer enter event coordinates are surface relative and we need them to
be screen relative for pScreen->SetCursorPosition().
https://bugzilla.gnome.org/show_bug.cgi?id=758283
Signed-off-by: Rui Matos <tiagomatos@gmail.com>
Reviewed-by: Eric Engestrom <eric.engestrom@imgtec.com>
Reviewed-by: Jonas Ådahl <jadahl@gmail.com>
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
commit f5c6d751d08c6de77c2ca49ba2a48f8023758cef
Author: Nikhil Mahale <nmahale@nvidia.com>
Date: Sat Oct 22 17:40:51 2016 +0530
modesetting: unifdef MODESETTING_OUTPUT_SLAVE_SUPPORT
Commit c7e8d4a6ee9542f56cd241cf7a960fb8223a6b22 had already unifdef
MODESETTING_OUTPUT_SLAVE_SUPPORT but commit
9257b1252da9092ddc676fec9aabe2b33dfad272 didn't notice that.
Signed-off-by: Nikhil Mahale <nmahale@nvidia.com>
Reviewed-by: Hans de Goede <hdegoede@redhat.com>
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
commit 4aaeeda4774397dd6d80aa240ca623ae795ec5dc
Author: Hans de Goede <hdegoede@redhat.com>
Date: Tue Oct 18 16:10:19 2016 +0200
xfree86: Xorg.wrap: Do not require root rights for cards with 0 outputs
Prior to this commit the Xorg.wrap code to detect if root rights are
necessary checked for DRM_IOCTL_MODE_GETRESOURCES succeeding *and*
reporting more then 0 output connectors.
DRM_IOCTL_MODE_GETRESOURCES succeeding alone is enough to differentiate
between old drm only cards (which need ums and thus root) and kms capable
cards.
Some hybrid gfx laptops have 0 output connectors on one of their 2 GPUs,
resulting in Xorg needlessly running as root. This commits removes the
res.count_connectors > 0 check, fixing this.
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Reviewed-by: Eric Engestrom <eric.engestrom@imgtec.com>
commit 7d91063aca4e4d326c294e246bc2dc36cb05318e
Author: Michel Dänzer <michel.daenzer@amd.com>
Date: Mon Oct 17 18:48:44 2016 +0900
DRI2: Sync radeonsi_pci_ids.h from Mesa
Fixes DRI2 client driver name mapping for newer AMD GPUs with the
modesetting driver, allowing the DRI2 extension to initialize.
Signed-off-by: Michel Dänzer <michel.daenzer@amd.com>
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
commit f6ff2e974c5de3071c899eba828789f1d4d8645a
Author: Mihail Konev <k.mvc@ya.ru>
Date: Sat Oct 15 04:13:43 2016 +0000
modesetting: fix glamor ifdef
Add a missing ifdef needed for --disable-glamor.
Signed-off-by: Mihail Konev <k.mvc@ya.ru>
Reviewed-by: Jon Turney <jon.turney@dronecode.org.uk>
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
commit 8fee6a917b6468e1b116d922f86484498874fb5c
Author: Mihail Konev <k.mvc@ya.ru>
Date: Fri Oct 14 02:40:59 2016 +0000
xwin: make glx optional again
Commit 501d8e2b removed --enable-aiglx, but made xwin always be
--enable-glx.
Signed-off-by: Mihail Konev <k.mvc@ya.ru>
Reviewed-by: Emil Velikov <emil.l.velikov@gmail.com>
Reviewed-by: Jon Turney <jon.turney@dronecode.org.uk>
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
commit d13cb974426f7f1110b0bdb08c4ebb46ff8975f7
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri Oct 21 06:27:57 2016 +1000
ddx: add new call to purge input devices that weren't added
Special case for the systemd-logind case in xfree86: when we're vt-switched
away and a device is plugged in, we get a paused fd from logind. Since we
can't probe the device or do anything with it, we store that device in the
xfree86 and handle it later when we vt-switch back. The device is not added to
inputInfo.devices until that time.
When the device is removed while still vt-switched away, the the config system
never notifies the DDX. It only runs through inputInfo.devices and our device
was never added to that.
When a device is plugged in, removed, and plugged in again while vt-switched
away, we have two entries in the xfree86-specific list that refer to the same
device node, both pending for addition later. On VT switch back, the first one
(the already removed one) will be added successfully, the second one (the
still plugged-in one) fails. Since the fd is correct, the device works until
it is removed again. The removed devices' config_info (i.e. the syspath)
doesn't match the actual device we addded tough (the input number increases
with each plug), it doesn't get removed, the fd remains open and we lose track
of the fd count. Plugging the device in again leads to a dead device.
Fix this by adding a call to notify the DDX to purge any remainders of devices
with the given config_info, that's the only identifiable bit we have at this
point.
https://bugs.freedesktop.org/show_bug.cgi?id=97928
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Hans de Goede <hdegoede@redhat.com>
commit 8fcf2fa78f09257933b17e7dc9a03a2034e3076f
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu Oct 20 15:45:46 2016 +1000
xfree86: swap the list of paused devices to an xorg_list
No functional changes but it makes it easier to remove elements from the
middle of the list (future patch).
We don't have an init call into this file, so the list is manually
initialized.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Hans de Goede <hdegoede@redhat.com>
commit 28d8855cd4e3be8831fb1c17bf1d205bd8465d1e
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu Oct 20 15:25:51 2016 +1000
xfree86: use the right option traversal list to search for an option
They're identically laid-out structs but let's use the right type to search
for our desired value.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Hans de Goede <hdegoede@redhat.com>
commit 7fc96fb02dade4a86f2fc038f3cf5f2d9c0cda00
Author: Emil Velikov <emil.velikov@collabora.com>
Date: Fri Oct 21 19:06:00 2016 +0100
glamor: don't look for non-existing EGL_KHR_platform_base
The extension does not exist in the registry, thus needs to know they're
using EGL 1.5 in order to determine the eglGetPlatformDisplay function
pointer is valid.
Thus brings us into some lovely circular dependency.
Since mesa won't be able (in the foreseeable future) to export the KHR
flavour of extension (another way one could assume that EGL 1.5 is
available) just drop all the heuristics and use the
EGL_EXT_platform_base extension.
In practise (checked with the Mali driver) any EGL 1.5 driver will
advertise support for EGL_EXT_platform_base.
Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>
commit 5dcb0666b82f5ab00f3d22e86f05ac14b0d5341e
Author: Mihail Konev <k.mvc@ya.ru>
Date: Sat Oct 15 17:59:05 2016 +0000
os/inputthread: Ensure pollfd refreshing
When putting a device node into a poll-request list, do not overwrite a
"please-remove" element with the same fd, so that a closed device file
is ospoll_remove'd prior to being ospoll_add'ed.
Before, the opposite order was possible, resulting in ospoll_add
considering the newly opened file being already polled, should it have a
fd for which the "please-remove" has not been procesed yet. In this
case, no further events would be seen from the device.
Signed-off-by: Mihail Konev <k.mvc@ya.ru>
Regressed-in: 52d6a1e832a5e62289dd4f32824ae16a78dfd7e8
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=97880
Patchwork: https://patchwork.freedesktop.org/patch/113763/
Hit-and-Reduced-by: Hans de Goede <hdegoede@redhat.com>
Reviewed-and-Reduced-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Keith Packard <keithp@keithp.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 9cf0bd4d4507dca6234024605b14724713f2109e
Author: Michel Dänzer <michel.daenzer@amd.com>
Date: Wed Oct 5 18:28:45 2016 +0900
xf86Cursor: Take the input lock in xf86Set/MoveCursor
Prevents the HW cursor from intermittently jumping around when the
cursor image is changed while the cursor is being moved. This is hardly
noticeable in normal operation but can be quite confusing when stepping
through these codepaths in a debugger.
Reviewed-by: Hans de Goede <hdegoede@redhat.com>
commit 011ce3297d924e78ef0254b0451561946bd8be8d
Author: Michel Dänzer <michel.daenzer@amd.com>
Date: Wed Oct 5 18:01:29 2016 +0900
xf86Cursor: Use PRIME master xf86CursorScreenRec::HotX/Y for slaves
xf86CursorScreenRec::HotX/Y contain 0 for PRIME slave screens.
Fixes incorrect HW cursor position on PRIME slave screens.
Also hoist the hotspot translation out from xf86ScreenSet/MoveCursor to
xf86Set/MoveCursor, since the hotspot position is a property of the
cursor, not the screen.
v2:
* Squash patches 1 & 2 of the v1 series, since it's basically the same
problem
* Use the master screen's xf86CursorScreenRec::HotX/Y instead of
CursorRec::bits->x/yhot, since CursorRec::bits can be NULL (Hans de
Goede)
Reviewed-by: Hans de Goede <hdegoede@redhat.com>
commit e3f53aa3a8dfc323c75837cd41e35b8e895d547e
Author: Adam Jackson <ajax@redhat.com>
Date: Thu Oct 6 14:42:34 2016 -0400
glx/dri2: Don't include drm headers
They're not needed, and they won't be present on win32.
Signed-off-by: Adam Jackson <ajax@redhat.com>
Reviewed-by: Emil Velikov <emil.l.veikov@gmail.com>
commit 97a8353ec1192d8d3bd2ebb99e5687cb91427e09
Author: Peter Harris <pharris@opentext.com>
Date: Thu Sep 29 11:17:48 2016 -0400
Fix id in error when resource does not exist
Always set client->errorValue before returning an error.
Test program:
int main(int argc, char *argv[]) {
int screen = 0;
xcb_connection_t *c = xcb_connect(NULL, &screen);
if (!c) {
printf("Cannot connect\n");
return 1;
}
xcb_void_cookie_t tok = xcb_free_gc_checked(c, BAD_VALUE);
xcb_g_context_error_t *err = (xcb_g_context_error_t *)xcb_request_check(c, tok);
if (!err) {
printf("Unexpected request success\n");
return 1;
}
if (err->bad_value != BAD_VALUE) {
printf("Error: Got 0x%X, expected 0x%X\n", err->bad_value, BAD_VALUE);
return 1;
}
printf("Success! Got expected bad value of 0x%X\n", BAD_VALUE);
return 0;
}
Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Peter Harris <pharris@opentext.com>
commit f4a41155479e68bf55740c1dfffafc78e4c02087
Author: Adam Jackson <ajax@redhat.com>
Date: Wed Oct 5 12:34:34 2016 -0400
glamor: Use eglGetPlatformDisplay{,EXT} if we can
eglGetDisplay forces the implementation to guess which kind of display
it's been handed. glvnd does something different from Mesa, and in
general it's impossible for the library to get this right. Add a new
inline that gets the logic right, and works around a quirk in epoxy.
Signed-off-by: Adam Jackson <ajax@redhat.com>
Reviewed-by: Eric Anholt <eric@anholt.net>
commit 95d3980c7c991b2cc8dcadac173635641ae15865
Author: Michel Dänzer <michel.daenzer@amd.com>
Date: Wed Oct 5 17:29:36 2016 +0900
test: Use $XSERVER_BUILDDIR for Xvfb executable path
Fixes make check with out-of-tree builds.
Signed-off-by: Michel Dänzer <michel.daenzer@amd.com>
Reviewed-by: Keith Packard <keithp@keithp.com>
Reviewed-by: Eric Anholt <eric@anholt.net>
commit cc69d4f110bd8a87b9e6c238ebebf8d85cbd93ec
Author: Emil Velikov <emil.l.velikov@gmail.com>
Date: Thu Sep 29 18:35:04 2016 +0100
xfree86/dri: remove libdrm runtime checks
As of last commit all the places in our configure.ac require version
2.3.1 (released back in 2007) or later. With the latter introducing the
1.3.0 version, as returned by drmGetLibVersion.
Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
commit 962962e978e5cededc20e577a36f77eb24d14bda
Author: Emil Velikov <emil.l.velikov@gmail.com>
Date: Thu Sep 29 18:35:03 2016 +0100
configure.ac: bump the required libdrm version to 2.3.1
It fixes a bug where the version reported by drmGetLibVersion() was
'wrong'. See libdrm commit 79038751ffe("libdrm: add support for server
side functionality in libdrm") for details.
Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
commit 74a8b320fa5068cd86d8b8b8e73fa92caae9a8a6
Author: Emil Velikov <emil.l.velikov@gmail.com>
Date: Thu Sep 29 18:35:02 2016 +0100
configure.ac: use $LIBDRM over libdrm when using pkg-config
The former contains the minimum required version which is required.
Strictly speaking Xephyr/Xwayland may require version greater than the
current 2.3.0, although I've personally haven't checked the specifics.
Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
commit 45e1220486139c483a69366323f8f590beffa19d
Author: Emil Velikov <emil.l.velikov@gmail.com>
Date: Thu Sep 29 18:35:01 2016 +0100
configure.ac: default to DRI=yes on solaris platforms
Afaict there's little-to-no reason/way one would want xserver without
DRI support on Solaris platforms.
This will allow us to simplify/fix all the libdrm detection in the next
commit.
Cc: Alan Coopersmith <alan.coopersmith@oracle.com>
Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>
Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
commit 501d8e2beb337e072c93c9310fcd927a099b9c3b
Author: Emil Velikov <emil.l.velikov@gmail.com>
Date: Thu Sep 29 18:41:19 2016 +0100
configure.ac: remove --enable-aiglx option
Presently the option guards both direct and accelerated indirect GLX. As
such when one toggles it off they end up without any acceleration.
Remove the option all together until we have the time to split/rework
things.
Cc: Jon Turney <jon.turney@dronecode.org.uk>
Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>
commit 7ec350ddd42479595f0ea88f86085af941913617
Author: Emil Velikov <emil.l.velikov@gmail.com>
Date: Thu Sep 29 18:41:18 2016 +0100
xfree86: remove aiglx cmd/xorg.conf option
The option is misleading and using it leads to disabling both direct and
accelerated indirect GLX. In such cases the xserver GLX attempts to
match DRISW (IGLX) configs with the DRI2/3 ones (direct GLX) leading to
all sorts of fun experience.
Remove the option until we get a clear split and control over direct vs
indirect GLX.
Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>
commit 04ef8558a731bf070abf1b40c7e6b54aad8f5f31
Author: Emil Velikov <emil.l.velikov@gmail.com>
Date: Thu Sep 29 18:41:17 2016 +0100
glx: drisw is not accelerated IGLX, reflect that in log messages
The messages from glxdricommon.c (used by drisw) still have the A, but
at least we're don't have it locally.
Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>
commit 1c2fcb95484777ca9aa80b3f814ad64e81f825f1
Author: Olivier Fourdan <ofourdan@redhat.com>
Date: Wed Oct 5 08:36:21 2016 +0200
glamor: Fix pixmap offset for bitplane in glamor_copy_fbo_cpu
Commit cba28d5 - "glamor: Handle bitplane in glamor_copy_fbo_cpu"
introduced a regression as the computed pixmap offset would not match
the actual coordinates and write data elsewhere in memory causing a
segfault in fbBltOne().
Translate the pixmap coordinates so that the data is read and written at
the correct location.
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=97974
Signed-off-by: Olivier Fourdan <ofourdan@redhat.com>
Reviewed-and-Tested-by: Michel Dänzer <michel.daenzer@amd.com>
commit a6e85e6330adcdcbcd939c0963daaecc96d41a2a
Author: Jonas Ådahl <jadahl@gmail.com>
Date: Tue Sep 13 15:17:08 2016 +0800
xwayland: Add pointer warp emulator
Emulate pointer warps by locking the pointer and sending relative
motion events instead of absolute. X will keep track of the "fake"
pointer cursor position given the relative motion events, and the
client warping the cursor will warp the faked cursor position.
Various requirements need to be met for the pointer warp emulator to
enable:
The cursor must be invisible: since it would not be acceptable that a
fake cursor position would be different from the visual representation
of the cursor, emulation can only be done when there is no visual
representation done by the Wayland compositor. Thus, for the emulator
to enable, the cursor must be hidden, and would the cursor be displayed
while the emulator is active, the emulator would be destroyed.
The window that is warped within must be likely to have pointer focus.
For example, warping outside of the window region will be ignored.
The pointer warp emulator will disable itself once the fake cursor
position leaves the window region, or the cursor is made visible.
This makes various games depending on pointer warping (such as 3D
first-person shooters and stategy games using click-to-drag-map like
things) work.
Signed-off-by: Jonas Ådahl <jadahl@gmail.com>
commit 467ab142fff926e1475440dd5f649a49f45808fa
Author: Jonas Ådahl <jadahl@gmail.com>
Date: Tue Sep 13 15:17:07 2016 +0800
xwayland: Translate a pointer grab with confineTo to pointer confinement
Translate grabbing a pointer device with confineTo set to a window into
confining the Wayland pointer using the pointer constraints protocol.
This makes clients that depend on the pointer not going outside of the
window region, such as certain games and virtual machines viewers, to
function more properly.
Signed-off-by: Jonas Ådahl <jadahl@gmail.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
commit ca7b593fbe54bc9a0b44037e62e4b4401cbd375e
Author: Jonas Ådahl <jadahl@gmail.com>
Date: Thu Sep 29 10:42:13 2016 +0800
xwayland: Bind pointer constraints global
Will be used by the pointer warp emulator.
Signed-off-by: Jonas Ådahl <jadahl@gmail.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
commit c14a8c6cc0fcd56c380d1220c2a8f04b74edee93
Author: Jonas Ådahl <jadahl@gmail.com>
Date: Tue Sep 13 15:17:05 2016 +0800
xwayland: Put getting a xwl_window from a Window in a helper
Signed-off-by: Jonas Ådahl <jadahl@gmail.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
commit b4644ce8d3420447a8e5a2339238968da0a59de7
Author: Jonas Ådahl <jadahl@gmail.com>
Date: Tue Sep 13 15:17:04 2016 +0800
xwayland: Set unaccelerated pointer motion delta if available
If there was an relative pointer motion within the same frame as an
absolute pointer motion, provide both the absolute coordinate and the
unaccelerated delta when setting the valuator mask.
If a frame contained only a relative motion, queue an absolute motion
with an unchanged position, but still pass the unaccelerated motion
event.
If the wl_seat advertised by the compositor is not new enough, assume
each relative and absolute pointer motion arrives within their own
separate frames.
Signed-off-by: Jonas Ådahl <jadahl@gmail.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
commit aa9634d03bc2434dfd25476529eccb14e46fcfdc
Author: Jonas Ådahl <jadahl@gmail.com>
Date: Tue Sep 13 15:17:03 2016 +0800
xwayland: Dispatch pointer motion events on wl_pointer.frame if possible
Wait until wl_pointer.frame with dispatching the pointer motion event,
if wl_pointer.frame is supported by the compositor. This will later be
used to combine unaccelerated motion deltas with the absolute motion
delta.
Signed-off-by: Jonas Ådahl <jadahl@gmail.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 42e8902395cb27af5c28306abd577a92c467a62d
Author: Krzysztof Sobiecki <sobkas@gmail.com>
Date: Tue Sep 13 22:23:49 2016 +0800
xwayland: Add a new input device used for pointer warping/locking
Generating relative and absolute movement events from the same input
device is problematic, because an absolute pointer device doesn't
expect to see any relative motion events. To be able to generate
relative pointer motion events including unaccelerated deltas, create a
secondary pointer device 'xwayland-relative-pointer', and use that for
emitting relative motion events.
Signed-off-by: Krzysztof Sobiecki <sobkas@gmail.com>
Signed-off-by: Jonas Ådahl <jadahl@gmail.com>
commit 011ada724afdba8955f1d4844b306e61390eead8
Author: Jonas Ådahl <jadahl@gmail.com>
Date: Tue Sep 13 15:17:01 2016 +0800
xwayland: Move pointer button initialization into helper
We'll later use this for initializing buttons for the relative pointer
since they need to be the same.
Signed-off-by: Jonas Ådahl <jadahl@gmail.com>
commit a77d0715c6272cc1778a54dccd8cb68dc28cd761
Author: Jonas Ådahl <jadahl@gmail.com>
Date: Tue Sep 13 15:17:00 2016 +0800
xwayland: Split up device class init/release into functions
Put device class initialization in init_[device_class](xwl_seat) and
releasing in release_[device class](xwl_seat). The purpose is to make
it easier to add more type of initialization here later, without making
the function too large.
Signed-off-by: Jonas Ådahl <jadahl@gmail.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 9037ba736a0424feee2fb6ac20cf7687613dc452
Author: Jonas Ådahl <jadahl@gmail.com>
Date: Thu Sep 29 10:40:01 2016 +0800
xwayland: Bind the relative pointer manager
Will be used for getting unaccelerated motion events and later for
relative motions used by a pointer warp emulator.
Signed-off-by: Jonas Ådahl <jadahl@gmail.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 0fae3be0686cae746e03d6e4592f97278cc2275d
Author: Jonas Ådahl <jadahl@gmail.com>
Date: Tue Sep 13 15:16:57 2016 +0800
dix: Add valuator_mask_set_absolute_unaccelerated
Add a valuator mask setter for setting absolute coordinate combined
with unaccelerated motion deltas. This will later be used by Xwayland
to combine a wl_pointer.motion() event with the unaccelerated delta of
a wp_relative_pointer.relative_motion() event.
Signed-off-by: Jonas Ådahl <jadahl@gmail.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
commit bbd4854f81ebba1119202c5f6ff4679c62afec1f
Author: Carlos Garnacho <carlosg@gnome.org>
Date: Tue Sep 27 19:03:26 2016 +0200
xwayland: Apply touch abs axes transformation before posting events
The way we map the touch absolute device to screen coordinates can't
work across wl_output mode and geometry events. Instead, set up
a fixed coordinate space, and transform touch events according to
the screen coordinate space as they happen.
Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Carlos Garnacho <carlosg@gnome.org>
commit ee526285882995289846648f3122c4295e3e8284
Author: Carlos Garnacho <carlosg@gnome.org>
Date: Wed Sep 28 12:35:36 2016 +0200
xwayland: Apply "last pointer window" check only to the pointer device
The checks in xwayland's XYToWindow handler pretty much assumes that the
sprite is managed by the wl_pointer, which is not entirely right, given
1) The Virtual Core Pointer may be controlled from other interfaces, and
2) there may be other SpriteRecs than the VCP's.
This makes XYToWindow calls return a sprite trace with just the root
window if any of those two assumptions are broken, eg. on touch events.
So turn the check upside down, first assume that the default XYToWindow
proc behavior is right, and later cut down the spriteTrace if the
current device happens to be the pointer and is out of focus. We work
our way to the device's lastSlave here so as not to break assumption #1
above.
Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Carlos Garnacho <carlosg@gnome.org>
Acked-by: Olivier Fourdan <ofourdan@redhat.com>
commit 2b6a068d21997ca812e665ed058e72eb4626c129
Author: Keith Packard <keithp@keithp.com>
Date: Mon Oct 3 15:37:03 2016 -0700
fb: XYPixmap format PutImage includes all planes in depth
Unlike GetImage, for which the provided planemask restricts the data
delivered, for PutImage in XYPixmap format, all of the planes in the
drawable depth are sent and those outside the plane mask are simply
ignored.
Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit c9b8ce73927a43ed82b267d1c1985445f24827cc
Author: Mark Yao <mark.yao@rock-chips.com>
Date: Fri Sep 30 16:42:35 2016 +0800
glamor: spans: fixup wrong count on glDrawArrays
In commit 9e9fcf5 (glamor: Add a helper function for the common
GL_QUADS fallback pattern.), the glDrawArrays count change was
accidentally changed to nbox.
Fixes xlogo with MESA_GL_VERSION_OVERRIDE=2.1 and
MESA_GLSL_VERSION_OVERRIDE=120
Signed-off-by: Mark Yao <mark.yao@rock-chips.com>
Reviewed-by: Eric Anholt <eric@anholt.net>
commit 2aca2dadda4cc9c378049457885d33a4eede9768
Author: Eric Anholt <eric@anholt.net>
Date: Sat Sep 24 14:42:28 2016 -0700
glamor: Fix link failure on GLES2.
Current Mesa requires that the precision qualifier on uniforms matches
between stages, even if (as in this case) the uniform isn't used in
one of the stages.
Signed-off-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Keith Packard <keithp@keithp.com>
commit 20fcdfcf39497fe44d2a3200338523effb8e2bc6
Author: Eric Anholt <eric@anholt.net>
Date: Sat Sep 24 14:30:27 2016 -0700
glamor: Remove #if 0-ed picture dumping code.
I don't think anybody has run this code since it was pulled into the
server.
Signed-off-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Keith Packard <keithp@keithp.com>
commit 4b5326aeba539249fcded91bf7806a708eeca651
Author: Eric Anholt <eric@anholt.net>
Date: Sat Sep 24 14:04:14 2016 -0700
glamor: Remove many unused glamor util functions.
Signed-off-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Keith Packard <keithp@keithp.com>
commit 117d614d1ba324bdb02c50a430c2e0d22a384f03
Author: Eric Anholt <eric@anholt.net>
Date: Sat Sep 24 22:26:17 2016 +0300
glamor: Require GL_OES_texture_border_clamp for GLES2.
The extension came out in 2000, and all Mesa-supported hardware that
can do glamor supports it. We were already relying on the ARB version
being present on desktop.
Signed-off-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Keith Packard <keithp@keithp.com>
commit 7a5ddf8da5ed817aa2dd6f7af1b9197a5ceec60b
Author: Adam Jackson <ajax@redhat.com>
Date: Wed Sep 28 15:27:20 2016 -0400
test: Re-enable a couple of GetImage tests
Fixed in 6c6f09aac.
Signed-off-by: Adam Jackson <ajax@redhat.com>
Reviewed-by: Eric Anholt <eric@anholt.net>
commit c7a9161da5eb80ef0444601621b52314255b0ce5
Author: Francois Tigeot <ftigeot@wolfpond.org>
Date: Fri Sep 23 11:36:49 2016 +0200
Enable XTRANS_SEND_FDS on FreeBSD, DragonFly and OpenBSD
This code is based on local patches which had been sitting in
FreeBSD and OpenBSD ports.
Reviewed-by: Matthieu Herrb <matthieu@herrb.eu>
Signed-off-by: François Tigeot <ftigeot@wolfpond.org>
commit 6c6f09aac7f1d1367a042087b7681c7fdf1d1e0f
Author: Keith Packard <keithp@keithp.com>
Date: Sun Sep 25 14:19:08 2016 +0300
xace: Don't censor window borders
GetImage is allowed to return window border contents, so don't remove
that from the returned image.
Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 380c2ca25ec4dd330f938e382ff4af60bc253785
Author: Hans de Goede <hdegoede@redhat.com>
Date: Fri Sep 23 14:11:52 2016 +0300
XF86VidMode: Fix free() on walked pointer
Based on: https://patchwork.freedesktop.org/patch/85636/
Rewritten to just not walk the pointer.
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Reviewed-by: Emi Velikov <emil.l.velikov@gmail.com>
commit 220d327ee00ec1278d50d4ba8cd20612e8b77c8f
Author: Hans de Goede <hdegoede@redhat.com>
Date: Fri Sep 23 14:06:52 2016 +0300
Xext: Fix a memory leak
Based on: https://patchwork.freedesktop.org/patch/85636/
Rewritten to also free the resources allocated by
panoramix_setup_ids().
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Reviewed-by: Emi Velikov <emil.l.velikov@gmail.com>
commit 3abf791ab82cb3dc7eacd0317fe0262a71340753
Author: Michael Thayer <michael.thayer@oracle.com>
Date: Fri Sep 16 17:51:25 2016 +0200
modesetting: only fall back to drmModeSetCursor() on -EINVAL
This change effectively reverts commit 074cf58. We were falling back from
drmModeSetCursor2() to drmModeSetCursor() whenever the first failed. This
fall-back only makes sense on pre-mid-2013 kernels which implemented the
cursor_set hook but not cursor_set2, and in this case the call to
drmModeSetCursor2() will always return -EINVAL. Specifically, a return
value of -ENXIO usually means that neither are supported.
Signed-off-by: Michael Thayer <michael.thayer@oracle.com>
[hdegoede@redhat.com: initialize ret to -EINVAL]
Reviewed-by: Hans de Goede <hdegoede@redhat.com>
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
commit 363f4273dd4aec3e26cc57ecb6c20f27e6c813d8
Author: Daniel Martin <consume.noise@gmail.com>
Date: Fri Dec 11 12:05:22 2015 +0100
modesetting: Consume all available udev events at once
We get multiple udev events for actions like docking a laptop into its
station or plugging a monitor to the station. By consuming as much
events as we can, we reduce the number of output re-evalutions.
I.e. having a Lenovo X250 in a ThinkPad Ultra Dock and plugging a
monitor to the station generates 5 udev events. Or having 2 monitors
attached to the station and docking the laptop generates 7 events.
It depends on the timing how many events can consumed at once.
Signed-off-by: Daniel Martin <consume.noise@gmail.com>
[hdegoede@redhat.com: Keep goto out so that we always call RRGetInfo()]
Reviewed-by: Hans de Goede <hdegoede@redhat.com>
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
commit ea91db4b83312e791dcae935b8720f49a3861d72
Author: Qiang Yu <Qiang.Yu@amd.com>
Date: Thu Sep 8 21:24:58 2016 +0800
config: fix GPUDevice fail when AutoAddGPU off + BusID
This fix is for the following xorg.conf can work:
Section "ServerFlags"
Option "AutoAddGPU" "off"
EndSection
Section "Device"
Identifier "Amd"
Driver "ati"
BusID "PCI:1:0:0"
EndSection
Section "Device"
Identifier "Intel"
Driver "modesetting"
BusID "pci:0:2:0"
EndSection
Section "Screen"
Identifier "Screen0"
Device "Intel"
GPUDevice "Amd"
EndSection
Without AutoAddGPU off, modesetting DDX will also be loaded
for GPUDevice.
Signed-off-by: Qiang Yu <Qiang.Yu@amd.com>
Reviewed-by: Michel Dänzer <michel.daenzer@amd.com>
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
commit ca8d88e50310a0d440a127c22a0a383cc149f408
Author: Laszlo Ersek <lersek@redhat.com>
Date: Wed Sep 7 15:08:06 2016 +0200
xfree86: recognize primary BUS_PCI device in xf86IsPrimaryPlatform()
The new platform bus code and the old PCI bus code overlap. Platform bus
can handle any type of device, including PCI devices, whereas the PCI code
can only handle PCI devices. Some drivers only support the old style
PCI-probe methods, but the primary device detection code is server based,
not driver based; so we might end up with a primary device which only has
a PCI bus-capable driver, but was detected as primary by the platform
code, or the other way around.
(The above paragraph was shamelessly stolen from Hans de Goede, and
customized.)
The latter case applies to QEMU's virtio-gpu-pci device: it is detected as
a BUS_PCI primary device, but we actually probe it first (with the
modesetting driver) through xf86platformProbeDev(). The
xf86IsPrimaryPlatform() function doesn't recognize the device as primary
(it bails out as soon as it sees BUS_PCI); instead, we add the device as a
secondary graphics card under "autoAddGPU". In turn, the success of this
automatic probing-as-GPU prevents xf86CallDriverProbe() from proceeding to
the PCI probing.
The result is that the server exits with no primary devices detected.
Commit cf66471353ac ("xfree86: use udev to provide device enumeration for
kms devices (v10)") added "cross-bus" matching to xf86IsPrimaryPci(). Port
that now to xf86IsPrimaryPlatform(), so that we can probe virtio-gpu-pci
as a primary card in platform bus code.
Cc: Adam Jackson <ajax@redhat.com>
Cc: Dave Airlie <airlied@redhat.com>
Cc: Hans de Goede <hdegoede@redhat.com>
Cc: Keith Packard <keithp@keithp.com>
Cc: Marcin Juszkiewicz <mjuszkiewicz@redhat.com>
Signed-off-by: Laszlo Ersek <lersek@redhat.com>
Tested-By: Marcin Juszkiewicz <mjuszkiewicz@redhat.com>
Reviewed-by: Hans de Goede <hdegoede@redhat.com>
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
commit 44968da376c880e096225f149f78673aa4c6e5e0
Author: Kyle Guinn <elyk03@gmail.com>
Date: Fri Sep 23 15:03:34 2016 +0300
xfree86: Fix null pointer dereference
Fixes: https://bugs.freedesktop.org/show_bug.cgi?id=93675
Signed-off-by: Kyle Guinn <elyk03@gmail.com>
[hdegoede@redhat.com: Simplify by adding 2 if conds together with &&]
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
commit 127e0569ca8dbf774df8f83d4c59bbbbf2e25a20
Author: David CARLIER <devnexen@gmail.com>
Date: Fri Sep 23 14:17:12 2016 +0300
xfree86: small memory leaks fixes
A couple of memory leaks fixes and avoiding bit shifting on an
unitialized value.
[hdegoede@redhat.com: Split out some non free fixes in separate patches]
[hdegoede@redhat.com: Don't touch ancient (and weird) os/rpcauth.c code]
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
commit d51cce7992508f366758fa13dd93be24df0947ed
Author: Adam Jackson <ajax@redhat.com>
Date: Tue Jul 5 13:07:09 2016 -0400
xephyr: Don't crash if the server advertises zero xv adaptors
Useless as an XVideo implementation with zero adaptors might be, it's
apparently a thing in the wild. Catch this case and bail out of xv init
if it happens.
Signed-off-by: Adam Jackson <ajax@redhat.com>
Reviewed-by: Hans de Goede <hdegoede@redhat.com>
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
commit 445271ec00f25405fa5ed0e149dd4a9d9f6098d4
Author: Hans de Goede <hdegoede@redhat.com>
Date: Fri Jul 1 17:36:02 2016 +0200
glx: Always enable EXT_texture_from_pixmap for DRI swrast glx
Prior to commit f95645c6f700 ("glx: Don't enable EXT_texture_from_pixmap
unconditionally") DRI glx would always advertise EXT_texture_from_pixmap.
That commit moved the setting of the extension in the extension bits from
__glXInitExtensionEnableBits to its callers so that
__glXInitExtensionEnableBits can be used more generally, but at the same
time made the setting of EXT_texture_from_pixmap conditionally on
__DRI_TEX_BUFFER being present.
This has result in an unintended behavior change which breaks e.g.
compositors running on llvmpipe. This commit makes the DRI swrast glx code
advertise EXT_texture_from_pixmap unconditionally again fixing this.
Fixes: f95645c6f700 ("glx: Don't enable EXT_texture_from_pixmap unconditionally")
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
---
Changes in v2:
-Only add unconditional advertising of GLX_EXT_texture_from_pixmap
to glxdriswrast.c, do not also add it to glxdri2.c
commit 02ff0a5d7e32ce8460d6d0669f532d65ad212fcd
Author: Hans de Goede <hdegoede@redhat.com>
Date: Sat Sep 17 11:33:13 2016 +0200
xf86RandR12: Fix XF86VidModeSetGamma triggering a BadImplementation error
Commit b4e46c0444bb ("xfree86: Hook up colormaps and RandR 1.2 gamma code")
dropped the providing of a pScrn->ChangeGamma callback from the xf86RandR12
code. Leaving pScrn->ChangeGamma NULL in most cases.
This triggers the BadImplementation error in xf86ChangeGamma() :
if (pScrn->ChangeGamma)
return (*pScrn->ChangeGamma) (pScrn, gamma);
return BadImplementation;
Which causes X-apps using XF86VidModeSetGamma to crash with a
X protocol error.
This commit fixes this by re-introducing the xf86RandR12ChangeGamma
helper removed by the commit and adjusting it to work with the new
combined palette / gamma code.
Fixes: b4e46c0444bb ("xfree86: Hook up colormaps and RandR 1.2 gamma code")
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
commit a58dd678bf952560e5422845e186d80a189953fe
Author: Hans de Goede <hdegoede@redhat.com>
Date: Sat Sep 17 11:42:09 2016 +0200
xf86RandR12: Move calculating of shift inside init_one_component
This is a preparation patch to allow easier usage of init_one_component
outside of xf86RandR12CrtcInitGamma.
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
commit 299cbb92670fdb83c24c3ef6327eb9d66b8be92a
Author: Hans de Goede <hdegoede@redhat.com>
Date: Thu Sep 15 14:35:52 2016 +0200
modesetting: Fix reverse prime update lagging on secondary GPU outputs
When using secondary GPU outputs the primary GPU's blockhandler
will copy changes from its framebuffer to a pixmap shared with the
secondary GPU.
In reverse prime setups the secondary GPU's blockhandler will do another
copy from the shared pixmap to its own framebuffer.
Before this commit, if the primary GPU's blockhandler would run after
the secondary GPU's blockhandler and no events were pending, then the
secondary GPU's blockhandler would not run until some events came in
(WaitForSomething() would block in the poll call), resulting in the
secondary GPU output sometimes showing stale contents (e.g. a just closed
window) for easily up to 10 seconds.
This commit fixes this by setting the timeout passed into the
blockhandler to 0 if any shared pixmaps were updated by the primary GPU,
forcing an immediate re-run of all blockhandlers.
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Reviewed-by: Dave Airlie <airlied@redhat.com>
commit e8695100b17b758359fc4897dbe995231ed224fc
Author: Hans de Goede <hdegoede@redhat.com>
Date: Thu Sep 15 14:28:35 2016 +0200
modesetting: Fix reverse prime partial update issues on secondary GPU outputs
When using reverse prime we do 2 copies, 1 from the primary GPU's
framebuffer to a shared pixmap and 1 from the shared pixmap to the
secondary GPU's framebuffer.
This means that on the primary GPU side the copy MUST be finished,
before we start the second copy (before the secondary GPU's driver
starts processing the damage on the shared pixmap).
This fixes secondary outputs sometimes showning (some) old fb contents,
because of the 2 copies racing with each other, for an example of
what this looks like see:
https://fedorapeople.org/~jwrdegoede/IMG_20160915_130555.jpg
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Reviewed-by: Dave Airlie <airlied@redhat.com>
Reviewed-by: Eric Anholt <eric@anholt.net>
commit 862a3dab287b5186a958d0131d70779468348e3e
Author: Olivier Fourdan <ofourdan@redhat.com>
Date: Thu Sep 22 09:38:50 2016 +0200
xwayland: Clear up x_cursor on UnrealizeCursor()
In Xwayland's xwl_unrealize_cursor(), the x_cursor is cleared up only
when a device value is provided to the UnrealizeCursor() routine, but
if the device is NULL as called from FreeCursor(), the corresponding
x_cursor for the xwl_seat is left untouched.
This might cause a segfault when trying to access the unrealized
cursor's devPrivates in xwl_seat_set_cursor().
A possible occurrence of this is the client changing the cursor, the
Xserver calling FreeCursor() which does UnrealizeCursor() and then
the Wayland server sending a pointer enter event, which invokes
xwl_seat_set_cursor() while the seat's x_cursor has just been
unrealized.
To avoid this, walk through all the xwl_seats and clear up all x_cursor
matching the cursor being unrealized.
Signed-off-by: Olivier Fourdan <ofourdan@redhat.com>
Reviewed-by: Jonas Ådahl <jadahl@gmail.com>
Reviewed-by: Hans de Goede <hdegoede@redhat.com>
commit b79eaf1184f6514ede9dcd9baaa24a40ef724a15
Author: Olivier Fourdan <ofourdan@redhat.com>
Date: Thu Sep 15 15:59:07 2016 +0200
xwayland: handle EAGAIN on Wayland fd
wl_display_flush() can fail with EAGAIN and Xwayland would make this a
fatal error.
When this happens, it means that Xwayland has flooded the Wayland file
descriptor, either because the Wayland compositor cannot cope or more
likely because of a deadlock situation where the Wayland compositor is
blocking, waiting for an X reply while Xwayland tries to write data to
the Wayland file descriptor.
The general consensus to avoid the deadlock is for the Wayland
compositor to never issue blocking X11 roundtrips, but in practice
blocking rountrips can occur in various places, including Xlib calls
themselves so this is not always achievable without major surgery in the
Wayland compositor/Window manager.
What this patch does is to avoid dispatching to the Wayland file
descriptor until it becomes available for writing again, while at the
same time continue processing X11 requests to release the deadlock.
This is not perfect, as there is still the possibility of another X
client hammering the connection and we'll still fail writing to the
Wayland connection eventually, but this improves things enough to avoid
a 100% repeatable crash with vlc and gtkperf.
Also, it is worth considering that window managers and Wayland
compositors such as mutter already have a higher priority than other
regular X clients thanks to XSyncSetPriority(), mitigating the risk.
Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=1278159
Bugzilla: https://bugzilla.gnome.org/show_bug.cgi?id=763400
Signed-off-by: Olivier Fourdan <ofourdan@redhat.com>
Reviewed-by: Daniel Stone <daniels@collabora.com>
commit 36e1a058c5826398ceea9dba6c166ae40c75646e
Author: Rui Matos <tiagomatos@gmail.com>
Date: Fri Feb 5 14:44:29 2016 +0100
xwayland: Close the shm fd as early as possible
Keeping the shm fd open beyond pixmap creation means we can easily
reach the open file descriptor limit if an X client asks us to create
that many pixmaps. Instead, let's get the wl_buffer immediatly so that
we can destroy the shm pool and close the fd before being asked to
create more.
Tested-by: Olivier Fourdan <ofourdan@redhat.com>
Reviewed-by: Olivier Fourdan <ofourdan@redhat.com>
commit fd4a6dc06fcf8671d616af52025e19200c79e404
Author: Adam Jackson <ajax@redhat.com>
Date: Tue Sep 27 17:15:12 2016 -0400
glamor: Fall back to software for CopyPlane if we need to
glUniform4ui is available starting in GL{,ES} 3.0. Technically it's
also in EXT_gpu_shader4, but that's not worth supporting. There was also
a MESA_shading_language_130 spec proposed at one point; if that ever
gets finished, we can update epoxy to know about it and fix up the
feature check.
Signed-off-by: Adam Jackson <ajax@redhat.com>
Reviewed-by: Michel Dänzer <michel.daenzer@amd.com>
commit c49e820f796c27cbd2907709576a3fb672acd453
Author: Eric Anholt <eric@anholt.net>
Date: Sun Sep 25 13:30:22 2016 -0700
test: Run xts against Xephyr -glamor when present
v2: Drop x8r8g8b8 skip, now that it's fixed.
Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Eric Anholt <eric@anholt.net>
commit 5392ea5525082ceeb3aad50d9168baee2abc860e
Author: Eric Anholt <eric@anholt.net>
Date: Sun Sep 25 13:30:21 2016 -0700
test: Switch our testing X server to being spawned with simple-xinit
Once I introduced a second X server being tested, I found that startx
hit races in choosing a display.
Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Eric Anholt <eric@anholt.net>
commit 283840c295c69aa3729f3f0aa2bf3ef83b1c220f
Author: Eric Anholt <eric@anholt.net>
Date: Sun Sep 25 13:30:20 2016 -0700
test: Update piglit HTML even when tests all pass
I was confused by the behavior I'd written before. keithp and
mattst88 responded with shock that I would have made it so surprising,
as well.
v2: Point to index.html instead of problems.html, which won't exist if
we had no problems.
Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Eric Anholt <eric@anholt.net>
commit 022fea767cd29d256fb99159df89cc25d339e787
Author: Eric Anholt <eric@anholt.net>
Date: Sun Sep 25 13:30:19 2016 -0700
test: Fix parsing of piglit results
The "dmesg-fail" line was matching our "fail" regex, so if you didn't
have those we would ignore fails.
Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Eric Anholt <eric@anholt.net>
commit 7fe5b9c02cf90b81532cb6dee3ec75c90c72c27c
Author: Eric Anholt <eric@anholt.net>
Date: Sun Sep 25 13:30:18 2016 -0700
test: Make the piglit-running script callable with an arbitrary server
v2: Check that SERVER_COMMAND is set.
Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Eric Anholt <eric@anholt.net>
commit 7ac130a0664b43b6ba5324548c8f7ab8230f7199
Author: Eric Anholt <eric@anholt.net>
Date: Sun Sep 25 13:30:17 2016 -0700
test: Add a little xinit-like program for starting servers for testing
The normal xinit is racy because it doesn't use -displayfd. This
implements the bare minimum for testing purposes, using -displayfd to
sequence starting the client, and avoids adding yet another dependency
to the server.
v2: Fix asprintf error checks.
v3: Add error checking for fork(), clarify calloc() arg.
Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Eric Anholt <eric@anholt.net>
commit 8d5e0c07b965d545c925c34be95d41c29135a63a
Author: Eric Anholt <eric@anholt.net>
Date: Sun Sep 25 13:30:16 2016 -0700
test: Handle srcdir != builddir in Xvfb testing
Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Eric Anholt <eric@anholt.net>
commit add49792608171feef8090f7520cfa02d2daae9c
Author: Eric Anholt <eric@anholt.net>
Date: Sun Sep 25 13:30:15 2016 -0700
ephyr: Add a mode for skipping redisplay in glamor
This speeds up headless testing of Xephyr -glamor with softpipe from
"a test per minute or so" to "a test every few seconds".
Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Eric Anholt <eric@anholt.net>
commit 453f813bb4afd39eb5b6b3c4a822894e04b6b11b
Author: Eric Anholt <eric@anholt.net>
Date: Sat Sep 24 14:37:28 2016 +0300
glamor: Properly handle mask formats without alpha.
Even if the pixmap's storage has alpha, it may have been uploaded with
garbage in the alpha channel, so we need to force the shader to set
alpha to 1. This was broken way back in
355334fcd99e4dce62e2be1e27290c9a74ea944f.
Fixes rendercheck -t composite -f x8r8g8b8.
Signed-off-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Michel Dänzer <michel.daenzer@amd.com>
commit 905c877f094eb6cfe905d64e34fdd01a72dd8103
Author: Eric Anholt <eric@anholt.net>
Date: Tue Sep 20 12:24:38 2016 +0100
glamor: Require that pixmap depths match for Render copies.
The copy optimization in d37329cba42fa8e72fe4be8a7be18e512268b5bd
replicated a bug from last time we did a copy optimization: CopyArea
is only defined for matching depths. This is only a problem at 15 vs
16 depth right now (24 vs 32 would also have matching Render formats,
but they should work) but be strict in case we store other depths
differently in the future.
Fixes rendercheck -t blend -o src -f x4r4g4b4,x3r4g4b4
v2: Drop excessive src->depth == dst->depth check that snuck in.
v3: Switch back to src->depth == dst->depth
v4: Touch up commit message (s/bpp/depth).
Signed-off-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Michel Dänzer <michel.daenzer@amd.com>
commit b87a07567421af05622197eec91a71e4fca4f79e
Author: Eric Anholt <eric@anholt.net>
Date: Tue Sep 20 12:14:36 2016 +0100
glamor: Fix some awful formatting of some fallback debug code.
This was clearly x-indent.sh damage.
Signed-off-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Michel Dänzer <michel.daenzer@amd.com>
commit ba199cb90157cefab01183f2e2c909895df73321
Author: Mark Kettenis <kettenis@openbsd.org>
Date: Tue Nov 17 22:31:21 2015 +0100
glamor: Make glamor_sync_init work with --disable-xshmfence
Signed-off-by: Mark Kettenis <kettenis@openbsd.org>
Signed-off-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Hans de Goede <hdegoede@redhat.com>
commit 8bb4b11298c285d2cd1eb28e65729933ec386829
Author: Matthieu Herrb <matthieu@herrb.eu>
Date: Fri Sep 23 16:56:06 2016 +0300
glamor: Make glamor_name_from_pixmap work without DRI3
This function is used by the modesetting driver to implement DRI2 and
shouldn't fail on systems that don't support DRI3.
v2: Drop stale commit message wording, fix compiler warning (by anholt)
Signed-off-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Eric Anholt <eric@anholt.net>
commit 128d40b2dd0a26a075a67854455d4208afaa01ca
Author: Eric Engestrom <eric@engestrom.ch>
Date: Sat Apr 2 19:53:18 2016 +0100
glamor: fix spelling mistakes
v2: Fix "orignal" too (review feedback by ajax, change by anholt)_
Signed-off-by: Eric Engestrom <eric@engestrom.ch>
Reviewed-by: Eric Anholt <eric@anholt.net>
commit ade315386cee9a65a3885c65e96256880ac6f00a
Author: Keith Packard <keithp@keithp.com>
Date: Fri Sep 23 09:52:21 2016 +0300
Require xproto 7.0.31
xproto 7.0.30 had a typo which caused compiles to fail on anything
other than clang
Signed-off-by: Keith Packard <keithp@keithp.com>
commit f72ff1f7ac784f3911fe2f8d746f62f7709f0edc
Author: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
Date: Mon Sep 19 09:34:50 2016 -0700
XQuartz: Silence an expected TSan warning
This code is safe. If the data race fails, the result is that we take the
lock and recheck.
==================
WARNING: ThreadSanitizer: data race (pid=31401)
Read of size 1 at 0x00010f5d2500 by thread T11:
#0 wait_for_mieq_init darwinEvents.c:102 (X11.bin+0x00010003155a)
#1 -[X11Application(Private) sendX11NSEvent:] X11Application.m:1330 (X11.bin+0x00010001d652)
#2 __28-[X11Application sendEvent:]_block_invoke X11Application.m:476 (X11.bin+0x00010001887f)
#3 __tsan::invoke_and_release_block(void*) <null>:144 (libclang_rt.tsan_osx_dynamic.dylib+0x00000005d97b)
#4 _dispatch_client_callout <null>:33 (libdispatch.dylib+0x0000000020ef)
Previous write of size 1 at 0x00010f5d2500 by thread T8:
[failed to restore the stack]
Location is global 'mieqInitialized' at 0x00010f5d2500 (X11.bin+0x000100599500)
Thread T11 (tid=4367138, running) created by thread T-1
[failed to restore the stack]
Thread T8 (tid=4367130, running) created by main thread at:
#0 pthread_create <null>:144 (libclang_rt.tsan_osx_dynamic.dylib+0x000000024490)
#1 create_thread quartzStartup.c:78 (X11.bin+0x000100039d2d)
#2 QuartzInitServer quartzStartup.c:95 (X11.bin+0x000100039b96)
#3 X11ApplicationMain X11Application.m:1238 (X11.bin+0x00010001cd54)
#4 X11ControllerMain X11Controller.m:984 (X11.bin+0x00010002a5b2)
#5 server_main quartzStartup.c:136 (X11.bin+0x000100039fbb)
#6 do_start_x11_server bundle-main.c:436 (X11.bin+0x000100002e25)
#7 _Xstart_x11_server mach_startupServer.c:189 (X11.bin+0x000100004e09)
#8 mach_startup_server mach_startupServer.c:399 (X11.bin+0x0001000056a4)
#9 mach_msg_server mach_msg.c:563 (libsystem_kernel.dylib+0x000000012186)
#10 start <null>:29 (libdyld.dylib+0x000000005254)
SUMMARY: ThreadSanitizer: data race darwinEvents.c:102 in wait_for_mieq_init
==================
Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
commit 7d6ebf3f4e4d517bb846d15a5deb131da19a267c
Author: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
Date: Mon Sep 19 00:21:44 2016 -0700
XQuartz: Adopt input_lock() and input_unlock()
This allows us to remove darwinEvents_lock() and darwinEvents_unlock()
and remove the serverRunning hack from dix
Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
commit 8bc4727f475321a8adcbbd859f3f8dd9eeb64aa4
Author: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
Date: Sun Sep 18 23:17:19 2016 -0700
XQuartz: pbproxy shouldn't need to wait for server initialization.
Just block on the socket like every other client does.
Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
commit 81493d30981d7deb38f57bca2a35487add5ea509
Author: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
Date: Sun Sep 18 23:13:20 2016 -0700
XQuartz: Remove X11ApplicationFatalError
AppKit handles crashes on app launch with their own dialog now, so we shouldn't need to do this ourselves.
Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
commit 9153ec8464336c280f2a6e79ffa443104bbeb98c
Author: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
Date: Sun Sep 18 22:45:16 2016 -0700
XQuartz: Don't respond to SIGALRM on the AppKit thread
==================
WARNING: ThreadSanitizer: data race (pid=69627)
Write of size 8 at 0x00010dae73f8 by main thread (mutexes: write M262):
#0 SmartScheduleTimer utils.c:1245 (X11.bin+0x0001004b21f9)
#1 __tsan::CallUserSignalHandler(__tsan::ThreadState*, bool, bool, bool, int, my_siginfo_t*, void*) <null>:144 (libclang_rt.tsan_osx_dynamic.dylib+0x0000000279f6)
#2 __CFRunLoopRun <null>:77 (CoreFoundation+0x000000087e17)
#3 X11ControllerMain X11Controller.m:984 (X11.bin+0x00010002a062)
#4 server_main quartzStartup.c:127 (X11.bin+0x000100039b6b)
#5 do_start_x11_server bundle-main.c:436 (X11.bin+0x0001000022c5)
#6 _Xstart_x11_server mach_startupServer.c:189 (X11.bin+0x0001000042a9)
#7 mach_startup_server mach_startupServer.c:399 (X11.bin+0x000100004b44)
#8 mach_msg_server mach_msg.c:563 (libsystem_kernel.dylib+0x000000012186)
#9 start <null>:29 (libdyld.dylib+0x000000005254)
Previous read of size 8 at 0x00010dae73f8 by thread T7:
[failed to restore the stack]
Location is global 'SmartScheduleTime' at 0x00010dae73f8 (X11.bin+0x0001005b03f8)
Mutex M262 (0x7d300000bd10) created at:
#0 pthread_mutex_init <null>:144 (libclang_rt.tsan_osx_dynamic.dylib+0x0000000253c3)
#1 __CFRunLoopCreate <null>:77 (CoreFoundation+0x000000054e63)
#2 X11ControllerMain X11Controller.m:984 (X11.bin+0x00010002a062)
#3 server_main quartzStartup.c:127 (X11.bin+0x000100039b6b)
#4 do_start_x11_server bundle-main.c:436 (X11.bin+0x0001000022c5)
#5 _Xstart_x11_server mach_startupServer.c:189 (X11.bin+0x0001000042a9)
#6 mach_startup_server mach_startupServer.c:399 (X11.bin+0x000100004b44)
#7 mach_msg_server mach_msg.c:563 (libsystem_kernel.dylib+0x000000012186)
#8 start <null>:29 (libdyld.dylib+0x000000005254)
Thread T7 (tid=4051693, running) created by main thread at:
#0 pthread_create <null>:144 (libclang_rt.tsan_osx_dynamic.dylib+0x000000024490)
#1 create_thread quartzStartup.c:78 (X11.bin+0x0001000398dd)
#2 QuartzInitServer quartzStartup.c:95 (X11.bin+0x000100039813)
#3 X11ApplicationMain X11Application.m:1286 (X11.bin+0x00010001c804)
#4 X11ControllerMain X11Controller.m:984 (X11.bin+0x00010002a062)
#5 server_main quartzStartup.c:127 (X11.bin+0x000100039b6b)
#6 do_start_x11_server bundle-main.c:436 (X11.bin+0x0001000022c5)
#7 _Xstart_x11_server mach_startupServer.c:189 (X11.bin+0x0001000042a9)
#8 mach_startup_server mach_startupServer.c:399 (X11.bin+0x000100004b44)
#9 mach_msg_server mach_msg.c:563 (libsystem_kernel.dylib+0x000000012186)
#10 start <null>:29 (libdyld.dylib+0x000000005254)
SUMMARY: ThreadSanitizer: data race utils.c:1245 in SmartScheduleTimer
==================
==================
WARNING: ThreadSanitizer: signal handler spoils errno (pid=69627)
#0 SmartScheduleTimer utils.c:1244 (X11.bin+0x0001004b21a0)
#1 __CFRunLoopRun <null>:77 (CoreFoundation+0x000000087e17)
#2 X11ControllerMain X11Controller.m:984 (X11.bin+0x00010002a062)
#3 server_main quartzStartup.c:127 (X11.bin+0x000100039b6b)
#4 do_start_x11_server bundle-main.c:436 (X11.bin+0x0001000022c5)
#5 _Xstart_x11_server mach_startupServer.c:189 (X11.bin+0x0001000042a9)
#6 mach_startup_server mach_startupServer.c:399 (X11.bin+0x000100004b44)
#7 mach_msg_server mach_msg.c:563 (libsystem_kernel.dylib+0x000000012186)
#8 start <null>:29 (libdyld.dylib+0x000000005254)
SUMMARY: ThreadSanitizer: signal handler spoils errno utils.c:1244 in SmartScheduleTimer
==================
Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
commit 2740dc1937e8ab32b4930f4086c302e6602a7bad
Author: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
Date: Mon Sep 19 01:25:13 2016 -0700
dix: Silence TSan warnings when checking for pending input
V2: Moves InputCheckPending() into dix.h
Bumps required version of xproto to 7.0.30
==================
WARNING: ThreadSanitizer: data race (pid=4943)
Read of size 4 at 0x00010c4e3854 by thread T8:
#0 WaitForSomething WaitFor.c:237 (X11.bin+0x00010049216c)
#1 Dispatch dispatch.c:413 (X11.bin+0x000100352ed9)
#2 dix_main main.c:287 (X11.bin+0x00010036e894)
#3 server_thread quartzStartup.c:66 (X11.bin+0x000100039e63)
Previous write of size 4 at 0x00010c4e3854 by thread T12 (mutexes: write M856, write M1976):
#0 mieqEnqueue mieq.c:263 (X11.bin+0x000100448d14)
#1 DarwinSendDDXEvent darwinEvents.c:641 (X11.bin+0x000100033613)
#2 DarwinProcessFDAdditionQueue_thread darwinEvents.c:338 (X11.bin+0x000100032039)
Location is global 'miEventQueue' at 0x00010c4e3850 (X11.bin+0x0001005ab854)
Mutex M856 (0x00010c4c8c80) created at:
#0 pthread_mutex_lock <null>:144 (libclang_rt.tsan_osx_dynamic.dylib+0x0000000321fe)
#1 DarwinListenOnOpenFD darwinEvents.c:300 (X11.bin+0x000100031607)
#2 socket_handoff bundle-main.c:288 (X11.bin+0x000100002b40)
#3 __do_request_fd_handoff_socket_block_invoke bundle-main.c:379 (X11.bin+0x0001000029ba)
#4 __tsan::invoke_and_release_block(void*) <null>:144 (libclang_rt.tsan_osx_dynamic.dylib+0x00000005d97b)
#5 _dispatch_client_callout <null>:33 (libdispatch.dylib+0x0000000020ef)
Mutex M1976 (0x00010c4e3d68) created at:
#0 pthread_mutex_init <null>:144 (libclang_rt.tsan_osx_dynamic.dylib+0x0000000253c3)
#1 input_lock inputthread.c:103 (X11.bin+0x00010049fd10)
#2 TimerSet WaitFor.c:343 (X11.bin+0x0001004926c2)
#3 RootlessQueueRedisplay rootlessScreen.c:594 (X11.bin+0x000100065d7f)
#4 RootlessInstallColormap rootlessScreen.c:514 (X11.bin+0x000100069f1a)
#5 miSpriteInstallColormap misprite.c:562 (X11.bin+0x000100467095)
#6 miCreateDefColormap micmap.c:270 (X11.bin+0x000100440399)
#7 DarwinScreenInit darwin.c:285 (X11.bin+0x0001000303bb)
#8 AddScreen dispatch.c:3908 (X11.bin+0x00010036c417)
#9 InitOutput darwin.c:671 (X11.bin+0x00010002fdeb)
#10 dix_main main.c:197 (X11.bin+0x00010036e228)
#11 server_thread quartzStartup.c:66 (X11.bin+0x000100039e63)
Thread T8 (tid=4198779, running) created by main thread at:
#0 pthread_create <null>:144 (libclang_rt.tsan_osx_dynamic.dylib+0x000000024490)
#1 create_thread quartzStartup.c:78 (X11.bin+0x000100039dad)
#2 QuartzInitServer quartzStartup.c:95 (X11.bin+0x000100039c16)
#3 X11ApplicationMain X11Application.m:1238 (X11.bin+0x00010001cde4)
#4 X11ControllerMain X11Controller.m:984 (X11.bin+0x00010002a642)
#5 server_main quartzStartup.c:136 (X11.bin+0x00010003a03b)
#6 do_start_x11_server bundle-main.c:436 (X11.bin+0x000100002eb5)
#7 _Xstart_x11_server mach_startupServer.c:189 (X11.bin+0x000100004e99)
#8 mach_startup_server mach_startupServer.c:399 (X11.bin+0x000100005734)
#9 mach_msg_server mach_msg.c:563 (libsystem_kernel.dylib+0x000000012186)
#10 start <null>:29 (libdyld.dylib+0x000000005254)
Thread T12 (tid=4198797, running) created by thread T8 at:
#0 pthread_create <null>:144 (libclang_rt.tsan_osx_dynamic.dylib+0x000000024490)
#1 create_thread darwinEvents.c:121 (X11.bin+0x000100031ecf)
#2 DarwinEQInit darwinEvents.c:365 (X11.bin+0x000100031860)
#3 InitInput darwin.c:571 (X11.bin+0x00010002ea09)
#4 dix_main main.c:261 (X11.bin+0x00010036e7ce)
#5 server_thread quartzStartup.c:66 (X11.bin+0x000100039e63)
SUMMARY: ThreadSanitizer: data race WaitFor.c:237 in WaitForSomething
==================
==================
WARNING: ThreadSanitizer: data race (pid=22841)
Write of size 4 at 0x000105bbd864 by main thread (mutexes: write M1945):
#0 mieqEnqueue mieq.c:263 (X11.bin+0x000100448cf4)
#1 DarwinSendDDXEvent darwinEvents.c:642 (X11.bin+0x000100033693)
#2 -[X11Controller set_window_menu:] X11Controller.m:275 (X11.bin+0x0001000222fd)
#3 -[X11Application set_window_menu:] X11Application.m:486 (X11.bin+0x000100018b44)
#4 -[X11Application handleMachMessage:] X11Application.m:177 (X11.bin+0x000100016678)
#5 __NSFireMachPort <null>:69 (Foundation+0x00000009b62b)
#6 X11ControllerMain X11Controller.m:984 (X11.bin+0x00010002a5f2)
#7 server_main quartzStartup.c:136 (X11.bin+0x000100039ffb)
#8 do_start_x11_server bundle-main.c:436 (X11.bin+0x000100002e65)
#9 _Xstart_x11_server mach_startupServer.c:189 (X11.bin+0x000100004e49)
#10 mach_startup_server mach_startupServer.c:399 (X11.bin+0x0001000056e4)
#11 mach_msg_server mach_msg.c:563 (libsystem_kernel.dylib+0x000000012186)
#12 start <null>:29 (libdyld.dylib+0x000000005254)
Previous read of size 4 at 0x000105bbd864 by thread T7:
#0 Dispatch dispatch.c:434 (X11.bin+0x000100352fc8)
#1 dix_main main.c:287 (X11.bin+0x00010036e874)
#2 server_thread quartzStartup.c:66 (X11.bin+0x000100039e23)
Location is global 'miEventQueue' at 0x000105bbd860 (X11.bin+0x0001005ab864)
Mutex M1945 (0x000105bbdd78) created at:
#0 pthread_mutex_init <null>:144 (libclang_rt.tsan_osx_dynamic.dylib+0x0000000253c3)
#1 input_lock inputthread.c:103 (X11.bin+0x00010049fd10)
#2 TimerSet WaitFor.c:348 (X11.bin+0x0001004926c2)
#3 RootlessQueueRedisplay rootlessScreen.c:594 (X11.bin+0x000100065d3f)
#4 RootlessInstallColormap rootlessScreen.c:514 (X11.bin+0x000100069eda)
#5 miSpriteInstallColormap misprite.c:562 (X11.bin+0x000100467075)
#6 miCreateDefColormap micmap.c:270 (X11.bin+0x000100440379)
#7 DarwinScreenInit darwin.c:285 (X11.bin+0x00010003036b)
#8 AddScreen dispatch.c:3914 (X11.bin+0x00010036c3f7)
#9 InitOutput darwin.c:671 (X11.bin+0x00010002fd9b)
#10 dix_main main.c:197 (X11.bin+0x00010036e208)
#11 server_thread quartzStartup.c:66 (X11.bin+0x000100039e23)
Thread T7 (tid=4257217, running) created by main thread at:
#0 pthread_create <null>:144 (libclang_rt.tsan_osx_dynamic.dylib+0x000000024490)
#1 create_thread quartzStartup.c:78 (X11.bin+0x000100039d6d)
#2 QuartzInitServer quartzStartup.c:95 (X11.bin+0x000100039bd6)
#3 X11ApplicationMain X11Application.m:1238 (X11.bin+0x00010001cd94)
#4 X11ControllerMain X11Controller.m:984 (X11.bin+0x00010002a5f2)
#5 server_main quartzStartup.c:136 (X11.bin+0x000100039ffb)
#6 do_start_x11_server bundle-main.c:436 (X11.bin+0x000100002e65)
#7 _Xstart_x11_server mach_startupServer.c:189 (X11.bin+0x000100004e49)
#8 mach_startup_server mach_startupServer.c:399 (X11.bin+0x0001000056e4)
#9 mach_msg_server mach_msg.c:563 (libsystem_kernel.dylib+0x000000012186)
#10 start <null>:29 (libdyld.dylib+0x000000005254)
SUMMARY: ThreadSanitizer: data race mieq.c:263 in mieqEnqueue
==================
Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
Reviewed-by: Keith Packard <keithp@keithp.com>
commit 7ff8a74945c0cb525a2d197e28426fd098a407cf
Author: Keith Packard <keithp@keithp.com>
Date: Thu Sep 22 02:53:46 2016 +0300
os: Clear saved poll events in listen so that edge triggering works
When a client is marked as write blocked, clear any old 'write ready'
bit in the osfds structure so that a new indication of write ready
(which is marked as edge trigggered) will trigger the callback.
Signed-off-by: Keith Packard <keithp@keithp.com>
Reviewed-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
Tested-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
Tested-by: Matthieu Herrb <matthieu@herrb.eu>
commit 1d365f1ffe0362732b64e565db6ae8af718758f2
Author: Keith Packard <keithp@keithp.com>
Date: Thu Sep 22 02:53:45 2016 +0300
os: Ready clients with pending output aren't flushed, so set NewOutputPending
When a client with pending output is ready (has request data pending),
FlushAllOutput will skip it to get all of the requests processed
before sending any queued output. That means FlushAllOutput is going
to return with some output pending to a client which isn't known to be
write blocked. And that means NewOutputPending needs to be set so that
FlushAllOutput will get called again to actually go flush this client.
It might be interesting to try just flushing the client to send any
queued data along the way. This patch just restores the server
behavior to what it was before the ospoll changes.
Signed-off-by: Keith Packard <keithp@keithp.com>
Reviewed-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
Tested-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
Tested-by: Matthieu Herrb <matthieu@herrb.eu>
commit d0c5d205a919fc1d2eb599356090b58b1bf0176d
Author: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
Date: Mon Sep 19 01:13:02 2016 -0700
dix: Make InitCoreDevices() failures more verbose.
Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 5794bdd52821463acf691c4230741f6b4289669b
Author: Mihail Konev <k.mvc@ya.ru>
Date: Wed Sep 14 11:47:15 2016 +0100
xkb: fix turbo-repeat of RedirectKey-ed keysyms
RedirectKey() action had been broken by commit 2e6190.
A dropped check caused over-intense autorepeat of keysyms enriched
with the action.
Previous to this commit, the check wrapped the entire switch() block,
which was dropped with the move to a separate function.
Restore the checking.
Signed-off-by: Mihail Konev <k.mvc@ya.ru>
Reviewed-by: Daniel Stone <daniels@collabora.com>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit fc1c358b955258ce675e49490de7c3b8ddee2b76
Author: Keith Packard <keithp@keithp.com>
Date: Mon Sep 19 09:02:57 2016 -0700
Bump to 1.18.99.901 (1.19 RC1)
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 5998da7855750dd947288349a0b14e65db1e3c8c
Author: Jonas Ådahl <jadahl@gmail.com>
Date: Tue Sep 13 15:16:56 2016 +0800
dix: Incroduce CursorConfinedTo vfunc in Screen
This function will be called when a pointer is grabbed non-root window
set as the 'confineTo'. This will enable the ddx to handle the
confinement their own way.
Signed-off-by: Jonas Ådahl <jadahl@gmail.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit daf48a3aba7d5c42d7156f0d0e2b1d8aae423303
Author: Jonas Ådahl <jadahl@gmail.com>
Date: Tue Sep 13 15:16:55 2016 +0800
dix: Introduce CursorWarpedTo vfunc in Screen
This new vfunc will be called, if set, after a client has issued a
WarpPointer request. This is necessary for implementing pointer warp
emulation in Xwayland.
Signed-off-by: Jonas Ådahl <jadahl@gmail.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 3ef51c5c74297937002668b0c507fa88550db67e
Author: Keith Packard <keithp@keithp.com>
Date: Fri Sep 16 10:03:49 2016 -0700
Bump version to 1.18.99.2
Prepare for 1.19 RC1
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 86038dfd42d6f6da9646ef2f87b2ab8ccba98e02
Author: Keith Packard <keithp@keithp.com>
Date: Fri Sep 16 10:56:15 2016 -0700
os: Add 'ospoll.h' to Makefile.am
Distribute this source file.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 56972d007dcde93693cb9e39931978b744942e5b
Author: Keith Packard <keithp@keithp.com>
Date: Fri Sep 16 10:55:27 2016 -0700
include: Add 'xserver_poll.h' to Makefile.am
Make sure this file is included in the tarball.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 61b159f5a79130a9661064d3f0143e5d6107985a
Author: Keith Packard <keithp@keithp.com>
Date: Fri Sep 16 10:54:37 2016 -0700
hw/xwin: Add 'dri' to DIST_SUBDIRS
This creates the needed Makefile.in files during 'make dist' or 'make
distcheck'
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 93f474e49b24abc673cb9cf5ea16fac296dce312
Author: Keith Packard <keithp@keithp.com>
Date: Fri Sep 16 10:43:09 2016 -0700
Remove 'dixfontstubs.h' from include EXTRA_DIST
This file was removed when moving to the new libXfont API, but
accidentally left in EXTRA_DIST.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 5b9f3ea2501a886fb74e5248e82a95e76443f1e8
Author: Michel Dänzer <michel.daenzer@amd.com>
Date: Thu Jan 14 18:09:44 2016 +0900
xfree86/modes: Set RandR primary output from CreateScreenResources
Fixes XRRGetOutputPrimary and xrandr not reporting a primary output after
startup. This was especially confusing when an output was explicitly
marked as primary using Option "Primary" in Section "Monitor".
Signed-off-by: Michel Dänzer <michel.daenzer@amd.com>
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit bd8ecd9be1568b59258b6d2f78530ede345b7c7a
Author: Michel Dänzer <michel.daenzer@amd.com>
Date: Fri Sep 16 09:51:31 2016 -0700
Add SyncSharedPixmap ScreenRec hook
Signed-off-by: Michel Dänzer <michel.daenzer@amd.com>
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 7f6fa4e449f5a7215bbf60ce8c874e163a7453a9
Author: Qiang Yu <Qiang.Yu@amd.com>
Date: Mon Sep 5 18:05:42 2016 +0800
modesetting: fix compile error when --disable-glamor
Move ms_flush_drm_events out of GLAMOR ifdef.
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=97586
Signed-off-by: Qiang Yu <Qiang.Yu@amd.com>
Reviewed-by: Michel Dänzer <michel.daenzer@amd.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit d81f9ce12aa4ac54b9c2b8c74c2f827c1f3e739a
Author: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
Date: Sun Sep 11 03:07:44 2016 -0700
dix/dispatch: Fix SmartScheduleClient interval adjustment to use best rather than pClient
pClient does not contain a live value after the transition to lists
https://bugs.freedesktop.org/show_bug.cgi?id=97765
Application Specific Information:
X.Org X Server 1.18.99.1 Build Date: 20160910
=================================================================
==16921==ERROR: AddressSanitizer: global-buffer-overflow on address 0x000108ce3834 at pc 0x000108880766 bp 0x7000045f76c0 sp 0x7000045f76b8
READ of size 4 at 0x000108ce3834 thread T6
#0 0x108880765 in SmartScheduleClient dispatch.c:365
#1 0x10887ecc5 in Dispatch dispatch.c:422
#2 0x1088c05f1 in dix_main main.c:301
#3 0x1082aabba in server_thread quartzStartup.c:66
#4 0x7fffc5f16aaa in _pthread_body (libsystem_pthread.dylib+0x3aaa)
#5 0x7fffc5f169f6 in _pthread_start (libsystem_pthread.dylib+0x39f6)
#6 0x7fffc5f161fc in thread_start (libsystem_pthread.dylib+0x31fc)
Regressed-in: 8f1edf4bd3a1f050ce9eeb5eac45dd1a8f7a6d5e
Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
Reviewed-by: Keith Packard <keithp@keithp.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 265c4e66533243b60d92cffc7769ecadb0292c8d
Merge: 3caf671ed2 f5f4d32ac7
Author: Keith Packard <keithp@keithp.com>
Date: Thu Sep 15 21:32:46 2016 -0700
Merge remote-tracking branch 'jturney/master'
commit 3caf671ed2a8a79856409a109355fc0f393d7aed
Author: Keith Packard <keithp@keithp.com>
Date: Wed Sep 14 22:40:32 2016 -0700
config/dbus: Initialize dbus fd to -1 so teardown doesn't use fd 0
The dbus teardown code is called when the server fatal errors even if
that is before dbus has ever been initialized. By statically
initializing the value of bus_info.fd, we avoid calling RemoveNotifyFd
on stdin.
Signed-off-by: Keith Packard <keithp@keithp.com>
Reviewed-by: Julien Cristau <jcristau@debian.org>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
commit f5f4d32ac7c250cfbfb94883ce7d7e46151e89f0
Author: Jon Turney <jon.turney@dronecode.org.uk>
Date: Thu Jul 24 12:29:41 2014 +0100
Add Windows-DRI extension
If windowsdriproto headers are available, build a Windows-DRI extension,
which supports requests to enable local clients to directly render GL to a
Windows drawable:
- a query to check if WGL is being used on a screen
- a query to map a fbconfigID to a native pixelformatindex
- a query to map a drawable to a native handle
Windows-DRI can only be useful if we are using WGL, so make an note if WGL
is active on a screen.
Make validGlxDrawable() public
Adjust glxWinSetPixelFormat() so it doesn't require a context, just a
screen and config.
That enables factoring out the deferred drawable creation code as
glxWinDeferredCreateDrawable()
Enhance glxWinDeferredCreateDrawable(), so that pixmaps are placed into a
file mapping, so they exist in memory which can be shared with the direct
rendering process.
Currently, this file mapping is accessed by a name generated from the XID.
This will not be unique across multiple server instances. It would perhaps
be better, although more complicated, to use an anonymous file mapping, and
then duplicate the handle for the direct rendering process.
Use glxWinDeferredCreateDrawable() to ensure the native handle exists for
the Windows-DRI query to map a drawable to native handle.
v2:
Various printf format warning fixes
v3:
Fix format warnings on x86
Move some uninteresting windows-dri output to debug log level
v4:
check for windowsdriproto when --enable-windowsdri
use windowsdriproto_CFLAGS
Signed-off-by: Jon Turney <jon.turney@dronecode.org.uk>
Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
commit 52d6a1e832a5e62289dd4f32824ae16a78dfd7e8
Author: Keith Packard <keithp@keithp.com>
Date: Thu Sep 8 11:02:30 2016 -0600
Hold input lock for deviceProc
This ensures that the deviceProc is never called while the input
thread is processing data from the device.
Signed-off-by: Keith Packard <keithp@keithp.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit dfc91f0f630f9e0500fc28b18e3f2851024d719f
Author: Keith Packard <keithp@keithp.com>
Date: Thu Sep 8 11:02:31 2016 -0600
Hold input lock while calling input device SetProperty callback
This keeps the input driver SetProperty function from being called
while input events are being processed.
Signed-off-by: Keith Packard <keithp@keithp.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit c4799f186b31e579721f5874c897f3f46db6ad0a
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Sat Sep 10 21:14:19 2016 -0700
os: Use pthread_setname_np to set thread names if available
Autoconf logic borrowed from glib
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
Tested-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
commit 75c1d04650f63464263c159d2e95364482be724f
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Sat Sep 10 21:08:01 2016 -0700
os: OsSigHandler should not show rtld errors for unrelated signals
If RTLD_DI_SETSIGNAL is set to let us turn runtime linker/loader errors
into catchable signals, then we should only show the errors when catching
that signal, instead of tossing out red herrings to distract people with
unrelated crashes long after their last failed symbol lookup (especially
when using drivers built to support multiple API's by checking which
symbols are available before calling them).
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Keith Packard <keithp@keithp.com>
Reviewed-by: Aaron Plattner <aplattner@nvidia.com>
commit 065eb6612492bacf4d7caaad90e35dafc2cbf7ea
Author: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
Date: Sun Sep 11 19:56:52 2016 -0700
os/inputthread: Fix setting of cloexec on file descriptors
O_CLOEXEC is not a file bit. It is not setable with F_SETFL. One must
use it when calling open(2). To set it cloexec on an existing fd,
F_SETFD and FD_CLOEXEC must be used.
This also fixes a build failure regression on configurations that don't
have O_CLOEXEC defined.
cf: http://pubs.opengroup.org/onlinepubs/9699919799/functions/fcntl.html
Regressed-in: 30ac7567980a1eb79d084a63e0e74e1d9a3af673
Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
Reviewed-by: Julien Cristau <jcristau@debian.org>
commit a5769de0f5399053e9864b753fa9755220d65ae0
Author: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
Date: Sun Sep 11 19:47:47 2016 -0700
Xext/shm: Fix usage of F_GETFD to match standard
flags = fcntl(fd, F_GETFD) is compliant.
fcntl(fd, F_GETFD, &flags) is non-compliant (Linux extension?)
cf: http://pubs.opengroup.org/onlinepubs/9699919799/functions/fcntl.html
Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
Reviewed-by: Julien Cristau <jcristau@debian.org>
commit 7def2fea30060d47780dc1eedc91fada5ae1934f
Author: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
Date: Sat Sep 10 23:37:46 2016 -0700
Xquartz: Update for removal of AddEnabledDevice and RemoveEnabledDevice
Regressed-in: be5a513fee6cbf29ef7570e57eb0436d70fbd88c
Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
commit 4f4ecd0f41cf1c710d3ef1626b747847e6184f4c
Author: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
Date: Sat Sep 10 22:16:11 2016 -0700
XQuartz: Cleanup CPPFLAGS that are no longer necessary on darwin
Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
commit 33d595255d4206df0d136014de33100817cbe344
Author: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
Date: Sun May 29 14:01:38 2016 -0700
XQuartz: Fix the issue where the h key could be come "stuck" after hiding XQuartz with cmd-h
The issue was that we set a flag to ignore the k key's up event when sent
the cmd-h down event, but because the cmd-h keycode hides XQuartz, we
became !_x_active by the time the event is delivered which caused us to
go down a differnet codepath rather than getting a chance to ignore it.
We then incorrectly ignored the next h up key.
https://bugs.freedesktop.org/show_bug.cgi?id=92648
Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
commit d8e05c04758cbcd7b5c11362cb28ce017d50098b
Author: Hans de Goede <hdegoede@redhat.com>
Date: Wed Aug 24 15:00:13 2016 +0200
modesetting: Fall back to primary crtc for vblank for drawables on slave outputs
This fixes glxgears running at 1 fps when fully covering a slave-output
and the modesetting driver is used for the master gpu.
Reported-by: Peter Wu <peter@lekensteyn.nl>
Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
commit 7ade8ba10e1e767bb510343c86573bc5d4804b92
Author: Hans de Goede <hdegoede@redhat.com>
Date: Wed Aug 24 14:55:27 2016 +0200
modesetting: ms_covering_crtc: Allow calling on non modesetting Screens
99% of the code in ms_covering_crtc is video-driver agnostic. Add a
screen_is_ms parameter when when FALSE skips the one ms specific check,
this will allow calling ms_covering_crtc on slave GPUs.
Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
commit 238248d67e6a422f31e8864c0b15d693a658cdac
Author: Hans de Goede <hdegoede@redhat.com>
Date: Mon Aug 15 12:02:54 2016 +0200
modesetting: Implement DRI2InfoRec version 9 callbacks
Implement the CreateBuffer2 / DestroyBuffer2 / CopyRegion2 DRI2InfoRec
version 9 callbacks, this is necessary for being an offload source
provider with DRI2.
Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
commit 03a7c50202f61030830ff639fccf52091e02156c
Author: Hans de Goede <hdegoede@redhat.com>
Date: Mon Aug 15 10:44:57 2016 +0200
modesetting: ms_dri2_create_buffer: check screen of existing front buffers
If a frontbuffer drawable already has a pixmap, make sure it was created
on the right screen.
Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
commit 35c4e96ed1d372dd161480be8cddcd2d4549e449
Author: Hans de Goede <hdegoede@redhat.com>
Date: Mon Sep 12 12:47:59 2016 +0200
randr: Fix crtc_bounds when using rotation combined with reflection
Before this commit crtc_bounds() did not take reflection into account,
when using reflection with 0 / 180 degree rotation this was not an
issue because of the default in the switch-case doing the right thing.
But when using 90 / 270 degree rotation we would also end up in the
default which is wrong in this case. This would lead to the cursor
being constrained to a height x height area of the monitor.
This commit masks out the reflection bits for the switch-case,
making crtc_bounds return the correct bounds and fixing the
problematic cursor constraining.
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Reviewed-by: Michel Dänzer <michel.daenzer@amd.com>
commit 7b634067c13045671685a9f00bfbac626ed68f94
Author: Dave Airlie <airlied@redhat.com>
Date: Wed Jul 15 10:15:51 2015 +1000
xf86Cursor: Add hw cursor support for prime
Currently with PRIME if we detect a secondary GPU,
we switch to using SW cursors, this isn't optimal,
esp for the intel/nvidia combinations, we have
no choice for the USB offload devices.
This patch checks on each slave screen if hw
cursors are enabled, and also calls set cursor
and move cursor on all screens.
Cc: Aaron Plattner <aplattner@nvidia.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Reviewed-by: Michel Dänzer <michel.daenzer@amd.com>
Reviewed-by: Keith Packard <keithp@keithp.com>
commit df88008f92f85ef96d9fe48ac509d027570424eb
Author: Hans de Goede <hdegoede@redhat.com>
Date: Tue Sep 6 11:48:31 2016 +0200
xf86Cursor: Deal with rotation on GPU screens using a hw-cursor
When a slave-output is rotated the transformation is done on the blit
from master to slave GPU, so crtc->transform_in_use is not set, but we
still need to adjust the mouse position for things to work.
This commit modifies xf86_crtc_transform_cursor_position to not rely
on crtc->f_framebuffer_to_crtc, so that it can be used with GPU screens
too and always calls it for crtcs with any form of rotation.
Note not using crtc->f_framebuffer_to_crtc means that crtc->transform
will not be taken into account, that is ok, because when we've a transform
active hw-cursors are not used and xf86_crtc_transform_cursor_position
will never get called.
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Reviewed-and-Tested-by: Michel Dänzer <michel.daenzer@amd.com>
commit f82fd47016628e8bcdcba3aab506a919fe8c49d8
Author: Hans de Goede <hdegoede@redhat.com>
Date: Tue Sep 6 11:50:50 2016 +0200
xf86Cursor: Fix xf86_crtc_rotate_coord using width/height wrongly
xf86_crtc_rotate_coord should be the exact inverse operation of
xf86_crtc_rotate_coord_back, but when calculating x / y for 90 / 270
degrees rotation it was using height to calculate x / width to calculate y,
instead of the otherway around.
This was likely not noticed before since xf86_crtc_rotate_coord
until now was only used with cursor_info->MaxWidth and
cursor_info->MaxHeight, which are usally the same.
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Reviewed-by: Michel Dänzer <michel.daenzer@amd.com>
commit b0b04cb266a62675dd7cde97111ebe7c1552db9a
Author: Hans de Goede <hdegoede@redhat.com>
Date: Tue Sep 6 13:14:35 2016 +0200
xf86Cursor: Fix xf86CurrentCursor to work on slave GPU Screens
The CurrentCursor is always attached to the master GPU.
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Reviewed-by: Michel Dänzer <michel.daenzer@amd.com>
commit 71fecc84e9ceb11ff61c912bdaa3fc959ec36bef
Author: Dave Airlie <airlied@redhat.com>
Date: Tue Sep 6 13:02:32 2016 +0200
xf86Cursor: Add xf86CheckHWCursor() helper function
This is a preparation patch for adding prime hw-cursor support.
Signed-off-by: Dave Airlie <airlied@redhat.com>
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Reviewed-by: Michel Dänzer <michel.daenzer@amd.com>
commit 2eefb53f58854ef9d34859583207ec37d3c3047a
Author: Hans de Goede <hdegoede@redhat.com>
Date: Tue Sep 6 13:15:36 2016 +0200
randr: Add RRHasScanoutPixmap helper function
This is a preparation patch for adding prime hw-cursor support.
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Reviewed-by: Michel Dänzer <michel.daenzer@amd.com>
commit a52530a655438f03919d47f6edd11287efff47bb
Author: Dave Airlie <airlied@redhat.com>
Date: Tue Sep 6 12:50:14 2016 +0200
dix: Add dixPrivatesCreated helper function
This is a preparation patch for adding prime hw-cursor support.
Signed-off-by: Dave Airlie <airlied@redhat.com>
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Reviewed-by: Keith Packard <keithp@keithp.com>
Reviewed-by: Michel Dänzer <michel.daenzer@amd.com>
commit 3fe4107643ba029dd48e3d12ec9bc97d07112300
Author: Hans de Goede <hdegoede@redhat.com>
Date: Thu Sep 8 09:30:31 2016 +0200
glamor: Fix crash when master gpu is using glamor and another gpu is hotplugged
When a GPU gets hotplugged while X is already running, glamor_egl_init()
gets called and changes the current egl context, without updating
lastGLContext, potentially causing the next glamor call on another GPU to
run in the wrong context.
This causes glamor to e.g. crash in the next glamor_create_pixmap() call
(called through the master's screen->CreatePixmap), note this is not the
only troublesome entry point I've seen other backtraces when using a
compositing window manager.
Set lastGLContext to NULL to force the next glamor_make_current() call
to set the right context.
Note that we cannot use glamor_make_current() here to replace the
eglMakeCurrent() call and update lastGLContext for us because
glamor_make_current takes a glamor_priv struct as argument and that
has not been created yet when glamor_egl_init() gets called.
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Reviewed-by: Keith Packard <keithp@keithp.com>
commit 1075af8a6c26009c04db30a6d6d1f10070568ab1
Author: Hans de Goede <hdegoede@redhat.com>
Date: Mon Aug 15 11:10:15 2016 +0200
modesetting: Remove some dead code
The "if (pixmap) ..." block this commit removes is inside an
"if (pixmap == NULL) ..." block, so it will never execute.
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Reviewed-by: Aaron Plattner <aplattner@nvidia.com>
commit dfa295b29c20b174f80ab823eef41e5211a6a921
Author: Hans de Goede <hdegoede@redhat.com>
Date: Wed Aug 24 14:13:19 2016 +0200
modesetting: ms_covering_crtc: Remove unused arguments, make static
Remove unused arguments from ms_covering_crtc, make it static as it is
only used in vblank.c.
While at it also change its first argument from a ScrnInfoPtr to a
ScreenPtr, this makes the next patch in this patch-set cleaner.
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Reviewed-by: Keith Packard <keithp@keithp.com>
commit cb7b145a25452de8b549e8c8e9ec3bcc752e55dc
Author: Hans de Goede <hdegoede@redhat.com>
Date: Wed Aug 17 12:03:41 2016 +0200
modesetting: Fix msSharePixmapBacking returning a non-linear bo
glamor_fd_from_pixmap() may return a tiled bo, which is not suitable
for sharing with another GPU as tiling usually is GPU specific.
Switch to glamor_shareable_fd_from_pixmap(), which always returns a
linear bo. This fixes mis-rendering when running the mode setting
driver on the master gpu in a dual-gpu setup and running an opengl
app with DRI_PRIME=1.
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Reviewed-by: Keith Packard <keithp@keithp.com>
commit a74d553cb97d545148bd2f81b7bd021cca94e076
Author: Hans de Goede <hdegoede@redhat.com>
Date: Tue Aug 23 12:18:56 2016 +0200
glamor: Add glamor_shareable_fd_from_pixmap()
Add glamor_shareable_fd_from_pixmap function to get dma-buf fds suitable
for sharing across GPUs (not using GPU specific tiling).
This is necessary for the modesetting driver to correctly implement
the DRI2 SharePixmapBacking callback.
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Reviewed-by: Keith Packard <keithp@keithp.com>
commit 527c6baa294d17c5eca1d87ac941844872e90dac
Author: Ran Benita <ran234@gmail.com>
Date: Wed Aug 29 12:33:34 2012 +0300
xkb: fix check for appending '|' character when applying rules
There are two ways to separate multiple files in XKB include statements:
'+' will cause the later file to override the first in case of conflict,
while '|' will cause it augment it (this is done by xkbcomp). '!' is
unrelated here.
Currently, if someone tries to use '|' in a rule instead of '+', it
won't have any effect. Since '|' is practically never used, this wasn't
noticed.
Signed-off-by: Ran Benita <ran234@gmail.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 392da389d7b0e9dd970741dcd5321a4e0fd3aef5
Author: Adam Jackson <ajax@redhat.com>
Date: Wed Mar 30 14:04:04 2016 -0400
glx: Fix computation of GLX_X_RENDERABLE fbconfig attribute
>From the GLX spec:
"GLX_X_RENDERABLE is a boolean indicating whether X can be used to
render into a drawable created with the GLXFBConfig. This attribute
is True if the GLXFBConfig supports GLX windows and/or pixmaps."
Every backend was setting this to true unconditionally, and then the
core ignored that value and sent true unconditionally on its own. This
is broken for ARB_fbconfig_float and EXT_fbconfig_packed_float, which
only apply to pbuffers, which are not renderable from non-GLX APIs.
Instead compute GLX_X_RENDERABLE from the supported drawable types. The
dri backends were getting _that_ wrong too, so fix that as well.
This is not a functional change, as there are no mesa drivers that claim
to support __DRI_ATTRIB_{UNSIGNED_,}FLOAT_BIT yet.
Signed-off-by: Adam Jackson <ajax@redhat.com>
Reviewed-by: Eric Anholt <eric@anholt.net>
commit 589f42e9830e66a7e26475fc9a8b91034b5aad86
Author: Rui Matos <tiagomatos@gmail.com>
Date: Sun Jun 26 19:48:23 2016 +0200
xwayland: Process queued events before making wayland mods effective
Since xwayland's initial commit we have had a check to not process
wayland modifier events while one of our surfaces has keyboard focus
since the normal xkb event processing keeps our internal modifier
state up to date and if we use the modifiers we get from the
compositor we mess up that state.
This was slightly changed in commit
10e9116b3f709bec6d6a50446c1341441a0564e4 to allow the xkb group to be
set from the wayland event while we have focus in case the compositor
triggers a group switch.
There's a better solution to the original problem though. Processing
queued events before overriding the xkb state with the compositor's
allows those events to be sent properly modified to X clients while
any further events will be modified with the wayland modifiers as
intended.
This allows us to fully take in the wayland modifiers, including
depressed ones, which fixes an issue where we wouldn't be aware of
already pressed modifiers on enter.
Signed-off-by: Rui Matos <tiagomatos@gmail.com>
Tested-by: Olivier Fourdan <ofourdan@redhat.com>
Reviewed-by: Daniel Stone <daniels@collabora.com>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit deae9c7e846e244e5d62b2dcfb6663fde0e12cbb
Author: Eric Anholt <eric@anholt.net>
Date: Wed Aug 31 17:00:00 2016 -0700
test: Run some XTS5 integration tests against Xvfb if possible.
By default the tests will be skipped. However, if you set XTEST_DIR
to the repo of a built X Test Suite and PIGLIT_DIR to a piglit repo
(no build necessary), make check will run piglit's xts-render tests
against Xvfb.
We could run more of XTS5, but I haven't spent the time identifying
what additional subset would be worth running, since much of it is
only really testing the client libraries. We want to make sure that
we keep the runtime down, and this subset of the test suite took 92
seconds according to piglit.
Reviewed-by: Adam Jackson <ajax@redhat.com>
commit f06aef31c0b2ab62d915a469a399d82a1a73ac28
Author: Qiang Yu <Qiang.Yu@amd.com>
Date: Mon Aug 22 18:14:18 2016 +0800
modesetting: add DRI2 page flip support
Signed-off-by: Qiang Yu <Qiang.Yu@amd.com>
Reviewed-by: Michel Dänzer <michel.daenzer@amd.com>
commit 4a839da6274b76424ee7cbc2deba2693e97e8186
Author: Qiang Yu <Qiang.Yu@amd.com>
Date: Mon Aug 22 18:14:17 2016 +0800
modesetting: move common page flip handle to pageflip.c
The common page flip handle framework can be shared with DRI2
page flip.
Signed-off-by: Qiang Yu <Qiang.Yu@amd.com>
Reviewed-by: Michel Dänzer <michel.daenzer@amd.com>
commit 4f1eb7864b61d0c992c5eff3339085e887792048
Author: Qiang Yu <Qiang.Yu@amd.com>
Date: Mon Aug 22 18:14:16 2016 +0800
modesetting: move ms_do_pageflip to pageflip.c
Signed-off-by: Qiang Yu <Qiang.Yu@amd.com>
Reviewed-by: Michel Dänzer <michel.daenzer@amd.com>
commit a586bf9ccf60b2cc66953555e82eeb6a8e0b4ca9
Author: Qiang Yu <Qiang.Yu@amd.com>
Date: Mon Aug 22 18:14:15 2016 +0800
modesetting: make ms_do_pageflip generic for share with DRI2
Signed-off-by: Qiang Yu <Qiang.Yu@amd.com>
Reviewed-by: Michel Dänzer <michel.daenzer@amd.com>
commit 7d33ab0f8c7958b205076f71e4b47c24aace77fd
Author: Adam Jackson <ajax@redhat.com>
Date: Tue Jun 28 15:54:44 2016 -0400
dri2: Don't make reference to noClientException
noClientException is now never filled in with a meaningful value, it's
always -1. The sole caller of this function disregards the error value
in any case.
Reviewed-by: Eric Anholt <eric@anholt.net>
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit dff435568b40286df2bf7a66e870f9ae5f4eb9bd
Author: Adam Jackson <ajax@redhat.com>
Date: Tue Jun 28 15:54:43 2016 -0400
dri3: Don't do return client->noClientException
Hasn't been necessary since:
commit 92ed75ac59e2d3af149cddb962efd05fc8487750
Author: Jamey Sharp <jamey@minilop.net>
Date: Mon May 10 20:22:05 2010 -0700
Eliminate boilerplate around client->noClientException.
Reviewed-by: Eric Anholt <eric@anholt.net>
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit 65493c0b73f6ee65b2a8fcaa4a15b0c453ff72b1
Author: Adam Jackson <ajax@redhat.com>
Date: Tue Jun 28 15:54:42 2016 -0400
sync: Don't do return client->noClientException
Hasn't been necessary since:
commit 92ed75ac59e2d3af149cddb962efd05fc8487750
Author: Jamey Sharp <jamey@minilop.net>
Date: Mon May 10 20:22:05 2010 -0700
Eliminate boilerplate around client->noClientException.
Signed-off-by: Adam Jackson <ajax@redhat.com>
Reviewed-by: Eric Anholt <eric@anholt.net>
commit bc3eed379ee5b4176db848708799fb2d5db16531
Author: Hans De Goede <hdegoede@redhat.com>
Date: Wed Aug 31 15:37:20 2016 +0200
modesetting: Hide cursor when initializing crtc
When Xorg gets started directly from a wayland-gdm the crtc still has the
wayland hw cursor set. Combine this with Xorg immediately falling back to
a sw cursor because a slave-output has a monitor attached at startup; and
we end up with the wayland hardware cursor overlay fixed in its last
position + the Xorg sw cursor resulting in 2 cursors.
This commit fixes this by hiding any left-over cursors when initializing
the crtc.
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Reviewed-by: Eric Engestrom <eric.engestrom@imgtec.com>
commit 6c984ac9a737304ab5e26de90c76a79d970b6e33
Author: Hans De Goede <hdegoede@redhat.com>
Date: Wed Aug 31 16:11:11 2016 +0200
modesetting: Do not use function local static variables
The modesetting driver may be driving 2 screens (slave and master
gpu), which may have different behavior wrt hardware cursor support.
So stop using static variables and instead store the hw-cursor support
related data in a per screen struct. While at it actually make it per
crtc data as in theory different crtc's could have different hw-cursor
support.
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Reviewed-by: Keith Packard <keithp@keithp.com>
commit d8c288ec371a853bcd023217f34893a0efae65ea
Author: Michael Thayer <michael.thayer@oracle.com>
Date: Wed Aug 24 08:48:13 2016 +1000
xi2: fix FocusIn grabs
Fix a couple of copy-and-paste errors preventing FocusIn grabs from working.
Perhaps the extension version should be bumped though to distinguish between
working and non-working extension versions.
Signed-off-by: Michael Thayer <michael.thayer@oracle.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 25e4f9ee68b99c2810efdb6cd8c56affa45e1fea
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Tue Aug 23 13:43:42 2016 +1000
xfree86: print the module name together with the load failure message
We're happily printing the error to stdout but not which module caused it...
That's in the Xorg.log but that's at least one click away.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Hans de Goede <hdegoede@redhat.com>
commit be334f42a198a25e817e6dab43dd0e30aa1cd4f8
Author: Michel Dänzer <michel.daenzer@amd.com>
Date: Thu Aug 18 09:40:34 2016 +0900
glamor: Declare "pos" in the composite glyph GLSL 1.20 vertex shader
Fixes shader compile failure:
Failed to compile VS: 0:13(43): error: `pos' undeclared
0:13(14): error: operands to arithmetic operators must be numeric
0:13(13): error: operands to arithmetic operators must be numeric
Program source:
#define ATLAS_DIM_INV 0.000976562500000000
attribute vec2 primitive;
attribute vec2 source;
varying vec2 glyph_pos;
uniform vec2 fill_offset;
uniform vec2 fill_size_inv;
varying vec2 fill_pos;
uniform vec4 v_matrix;
void main() {
gl_Position.xy = primitive.xy * v_matrix.xz + v_matrix.yw;
gl_Position.zw = vec2(0.0,1.0);
glyph_pos = source.xy * ATLAS_DIM_INV;
fill_pos = (fill_offset + primitive.xy + pos) * fill_size_inv;
}
(EE) Fatal server error:
(EE) GLSL compile failure
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=97300
Reviewed-by: Keith Packard <keithp@keithp.com>
commit cba28d572ac799391beacd89d57e69d0d7ed70e7
Author: Michel Dänzer <michel.daenzer@amd.com>
Date: Tue Jul 12 12:25:13 2016 +0900
glamor: Handle bitplane in glamor_copy_fbo_cpu
This can significantly speed up at least some CopyPlane cases, e.g.
indirectly for stippled fills.
v2:
* Make temporary pixmap the same size as the destination pixmap
(instead of the destination drawable size), and fix coordinate
parameters passed to fbCopyXtoX and glamor_upload_boxes. Fixes
incorrect rendering with x11perf -copyplane* and crashes with the
xscreensaver phosphor hack.
v3:
* Make the change a bit more compact and hopefully more readable by
re-using the existing src_* locals in the bitplane case as well.
Reported-by: Keith Raghubar <keith.raghubar@amd.com>
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
Acked-by: Eric Anholt <eric@anholt.net>
commit 6e5bec261c3f7af069b57618d6c82b070dc4579d
Author: Olivier Fourdan <ofourdan@redhat.com>
Date: Thu Jun 23 15:31:30 2016 +0200
wayland: Emulate crossing for native window
Emitting a LeaveNotify event every time the pointer leaves an X11 window
may confuse focus follow mouse mode in window managers such as
mutter/gnome-shell.
Keep the previously found X window and compare against the new one, and
if they match then it means the pointer has left an Xwayland window for
a native Wayland surface, only in this case fake the crossing to the
root window.
Signed-off-by: Olivier Fourdan <ofourdan@redhat.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 48c5c23a1b250c7f9d7a1747c76e4669ebf752cf
Author: Hans De Goede <hdegoede@redhat.com>
Date: Mon Aug 8 14:53:59 2016 +0200
Fix Xorg -configure not working anymore
Xorg -configure relies on the bus implementation, e.g.
xf86pciBus.c to call xf86AddBusDeviceToConfigure(). The new
xf86platformBus code does not have support for this.
Almost all drivers support both the xf86platformBus and xf86pciBus
nowadays, and the generic xf86Bus xf86CallDriverProbe() function
prefers the new xf86platformBus probe method when available.
Since the platformBus paths do not call xf86AddBusDeviceToConfigure()
this results in Xorg -configure failing with the following error:
"No devices to configure. Configuration failed.".
Adding support for the xf86Configure code to xf86platformBus.c
is non trivial and since we advise users to normally run without
any Xorg.conf at all not worth the trouble.
However some users still want to use Xorg -configure to generate a
template config file, this commit implements a minimal fix to make
things work again for PCI devices by skipping the platform
probe method when xf86DoConfigure is set.
This has been tested on a system with integrated intel graphics,
with both the intel and modesetting drivers and restores Xorg -configure
functionality on both cases.
Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
commit 6acd0d098add5a14f23d326ac6ee8cebab14b86a
Author: Adam Jackson <ajax@redhat.com>
Date: Wed Aug 17 10:32:28 2016 -0400
test: Remember to swap the window argument to XIQueryPointer
Before 5c69cb60 this wouldn't matter, because ProcXIQueryPointer
manually emitted its own error before (bogusly) returning Success to the
main loop. Since these tests only look at the return value of the
dispatch function we'd think things succeeded even when we'd generated
an error.
With that fixed, the test code's failure to swap the window id would
make dixLookupWindow (rightly) throw BadWindow.
Reviewed-and-Tested-by: Michel Dänzer <michel.daenzer@amd.com>
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit 5c69cb604a144bdced7d066eaca574aa44e8cb36
Author: Adam Jackson <ajax@redhat.com>
Date: Mon Jun 20 12:57:12 2016 -0400
xinput: Let top-level dispatch generate the error
... instead of calling SendErrorToClient ourselves.
Signed-off-by: Adam Jackson <ajax@redhat.com>
Reviewed-by: Daniel Stone <daniels@collabora.com>
commit 2f981c06a5b9b9eab5e8a9b1d0a18281c0d1033f
Author: Adam Jackson <ajax@redhat.com>
Date: Mon Jun 20 12:57:11 2016 -0400
xv: Remove some dumb calls SendErrorToClient
We already generate errors from the top level when non-Success is
returned from a dispatch function, so really we were emitting errors
twice.
Signed-off-by: Adam Jackson <ajax@redhat.com>
Reviewed-by: Daniel Stone <daniels@collabora.com>
commit 0bfa6bf9def43fd14bc79a302b912454e82999b1
Author: Adam Jackson <ajax@redhat.com>
Date: Mon Jun 20 12:57:10 2016 -0400
xwayland: Fix relinking when dix changes
Without this a change in eg Xext/ wouldn't relink Xwayland, making you
wonder why your changes didn't have any effect.
Signed-off-by: Adam Jackson <ajax@redhat.com>
Reviewed-by: Daniel Stone <daniels@collabora.com>
commit bf2ca502b9cd07044cba56499d5c092deb9d73f5
Author: Keith Packard <keithp@keithp.com>
Date: Mon Aug 15 22:25:56 2016 -0700
config: Hold input lock across udev socket handling
This avoids having the server running inside libudev from two threads
at once, which it appears to not like.
Signed-off-by: Keith Packard <keithp@keithp.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit de5291c04b05772e6da599a475baa1b19dcae07a
Author: Olivier Fourdan <ofourdan@redhat.com>
Date: Mon Aug 8 17:25:35 2016 +0200
present: Free the fake_present OsTimerPtr
Plug a leak in present_fake_queue_vblank() where the OsTimer would not
be freed.
492,608 (482,816 direct, 9,792 indirect) bytes in 15,088 blocks
are definitely lost in loss record 3,954 of 3,954
at 0x4C2ABDE: malloc (in vgpreload_memcheck-amd64-linux.so)
by 0x586B19: TimerSet (WaitFor.c:433)
by 0x4F1AA9: present_fake_queue_vblank (present_fake.c:108)
by 0x4F15E0: present_pixmap (present.c:954)
by 0x4F23B4: proc_present_pixmap (present_request.c:138)
by 0x552BCE: Dispatch (dispatch.c:430)
by 0x556C22: dix_main (main.c:300)
by 0x6F0D290: (below main) (in /usr/lib/libc-2.24.so)
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=97065
Signed-off-by: Olivier Fourdan <ofourdan@redhat.com>
Reviewed-by: Michel Dänzer <michel.daenzer@amd.com>
commit d21b53673b9de052004e761fd1299d2e788b44b8
Author: Michel Dänzer <michel.daenzer@amd.com>
Date: Wed Aug 3 10:19:20 2016 +0900
present: Call set_abort_flip / restore_screen_pixmap in clear_window_flip
We were asserting that these were called before from other places, but
that isn't always the case, e.g. during server shutdown.
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=96951
Reported-and-Tested-by: Tod Jackson <tod.jackson@gmail.com>
Reviewed-by: Hans de Goede <hdegoede@redhat.com>
Signed-off-by: Michel Dänzer <michel.daenzer@amd.com>
commit 9f04fa3babaaabe0ed5bf4aa2563755bc6c45723
Author: Michel Dänzer <michel.daenzer@amd.com>
Date: Wed Aug 3 10:19:19 2016 +0900
present: Make present_restore_screen_pixmap handle screen->root == NULL
Easier than dealing with it in all paths that can end up here during
server shutdown.
Signed-off-by: Michel Dänzer <michel.daenzer@amd.com>
Reviewed-by: Hans de Goede <hdegoede@redhat.com>
commit 4cbf1fb1f978ecd975770cebbb330dc10f712b77
Author: Olivier Fourdan <ofourdan@redhat.com>
Date: Mon Aug 8 17:57:57 2016 +0200
xwayland: Avoid double free of RRCrtc and RROutput
At shutdown, the Xserver will free all its resources which includes the
RRCrtc and RROutput created.
Xwayland would do the same in its xwl_output_destroy() called from
xwl_close_screen(), leading to a double free of existing RRCrtc
RROutput:
Invalid read of size 4
at 0x4CDA10: RRCrtcDestroy (rrcrtc.c:689)
by 0x426E75: xwl_output_destroy (xwayland-output.c:301)
by 0x424144: xwl_close_screen (xwayland.c:117)
by 0x460E17: CursorCloseScreen (cursor.c:187)
by 0x4EB5A3: AnimCurCloseScreen (animcur.c:106)
by 0x4EF431: present_close_screen (present_screen.c:64)
by 0x556D40: dix_main (main.c:354)
by 0x6F0D290: (below main) (in /usr/lib/libc-2.24.so)
Address 0xbb1fc30 is 0 bytes inside a block of size 728 free'd
at 0x4C2BDB0: free (in
/usr/lib/valgrind/vgpreload_memcheck-amd64-linux.so)
by 0x4CCE5F: RRCrtcDestroyResource (rrcrtc.c:719)
by 0x577541: doFreeResource (resource.c:895)
by 0x5787B5: FreeClientResources (resource.c:1161)
by 0x578862: FreeAllResources (resource.c:1176)
by 0x556C54: dix_main (main.c:323)
by 0x6F0D290: (below main) (in /usr/lib/libc-2.24.so)
Block was alloc'd at
at 0x4C2CA6A: calloc (in
/usr/lib/valgrind/vgpreload_memcheck-amd64-linux.so)
by 0x4CC6DB: RRCrtcCreate (rrcrtc.c:76)
by 0x426D1C: xwl_output_create (xwayland-output.c:264)
by 0x4232EC: registry_global (xwayland.c:431)
by 0x76CB1C7: ffi_call_unix64 (in /usr/lib/libffi.so.6.0.4)
by 0x76CAC29: ffi_call (in /usr/lib/libffi.so.6.0.4)
by 0x556CEFD: wl_closure_invoke (connection.c:935)
by 0x5569CBF: dispatch_event.isra.4 (wayland-client.c:1310)
by 0x556AF13: dispatch_queue (wayland-client.c:1456)
by 0x556AF13: wl_display_dispatch_queue_pending
(wayland-client.c:1698)
by 0x556B33A: wl_display_roundtrip_queue (wayland-client.c:1121)
by 0x42371C: xwl_screen_init (xwayland.c:631)
by 0x552F60: AddScreen (dispatch.c:3864)
And:
Invalid read of size 4
at 0x522890: RROutputDestroy (rroutput.c:348)
by 0x42684E: xwl_output_destroy (xwayland-output.c:302)
by 0x423CF4: xwl_close_screen (xwayland.c:118)
by 0x4B6377: CursorCloseScreen (cursor.c:187)
by 0x539503: AnimCurCloseScreen (animcur.c:106)
by 0x53D081: present_close_screen (present_screen.c:64)
by 0x43DBF0: dix_main (main.c:354)
by 0x7068730: (below main) (libc-start.c:289)
Address 0xc403190 is 0 bytes inside a block of size 154 free'd
at 0x4C2CD5A: free (vg_replace_malloc.c:530)
by 0x521DF3: RROutputDestroyResource (rroutput.c:389)
by 0x45DA61: doFreeResource (resource.c:895)
by 0x45ECFD: FreeClientResources (resource.c:1161)
by 0x45EDC2: FreeAllResources (resource.c:1176)
by 0x43DB04: dix_main (main.c:323)
by 0x7068730: (below main) (libc-start.c:289)
Block was alloc'd at
at 0x4C2BBAD: malloc (vg_replace_malloc.c:299)
by 0x52206B: RROutputCreate (rroutput.c:84)
by 0x426763: xwl_output_create (xwayland-output.c:270)
by 0x422EDC: registry_global (xwayland.c:432)
by 0x740FC57: ffi_call_unix64 (unix64.S:76)
by 0x740F6B9: ffi_call (ffi64.c:525)
by 0x5495A9D: wl_closure_invoke (connection.c:949)
by 0x549283F: dispatch_event.isra.4 (wayland-client.c:1274)
by 0x5493A13: dispatch_queue (wayland-client.c:1420)
by 0x5493A13: wl_display_dispatch_queue_pending
(wayland-client.c:1662)
by 0x5493D2E: wl_display_roundtrip_queue (wayland-client.c:1085)
by 0x4232EC: xwl_screen_init (xwayland.c:632)
by 0x439F50: AddScreen (dispatch.c:3864)
Split xwl_output_destroy() into xwl_output_destroy() which frees the
wl_output and the xwl_output structure, and xwl_output_remove() which
does the RRCrtcDestroy() and RROutputDestroy() and call the latter only
when an output is effectively removed.
An additional benefit, on top of avoiding a double free, is to avoid
updating the screen size at shutdown.
Signed-off-by: Olivier Fourdan <ofourdan@redhat.com>
Reviewed-by: Hans de Goede <hdegoede@redhat.com>
commit b380f3ac51f40ffefcde7d3db5c4c149f274246d
Author: Michel Dänzer <michel.daenzer@amd.com>
Date: Tue Aug 2 17:53:01 2016 +0900
dix: Pass ClientPtr to FlushCallback
This change has two effects:
1. Only calls FlushCallbacks when we're actually flushing data to a
client. The unnecessary FlushCallback calls could cause significant
performance degradation with compositing, which is significantly
reduced even without any driver changes.
2. By passing the ClientPtr to FlushCallbacks, drivers can completely
eliminate unnecessary flushing of GPU commands by keeping track of
whether we're flushing any XDamageNotify events to the client for
which the corresponding rendering commands haven't been flushed to
the GPU yet.
Reviewed-by: Adam Jackson <ajax@redha.com>
Signed-off-by: Michel Dänzer <michel.daenzer@amd.com>
commit 92b3cd32066aa5befa67a408cc079cd2ce4c077e
Author: Aaron Plattner <aplattner@nvidia.com>
Date: Tue Aug 2 10:34:07 2016 -0700
xace: Fix XaceCensorImage to actually censor the right part of the image
The caller passes arguments into XaceCensorImage that are in
window-relative coordinates. However, the pBuf that it uses to construct
a temporary pixmap has its origin at (x, y) relative to the window in
question. The code to convert the censor region into boxes adjusts for
the Y coordinate, but leaves the X coordinate alone. The result is that
if x is not zero, it censors the wrong part of the image.
Fix this by just translating censorRegion into pixmap-relative
coordinates and using the resulting boxes as-is.
Reported-by: Fabien Lelaquais <Fabien.Lelaquais@roguewave.com>
Link: https://lists.x.org/archives/xorg/2016-August/058165.html
Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Aaron Plattner <aplattner@nvidia.com>
commit 4d586118c113f3c0a6e95ed2d3fc7f9d03a4e362
Author: Olivier Fourdan <ofourdan@redhat.com>
Date: Tue Aug 2 11:24:41 2016 +0200
xwayland: Plug memleak in frame callbacks
The frame callback set up via wl_surface_frame() needs to be freed with
wl_callback_destroy() or we'll leak memory.
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=97065
Signed-off-by: Olivier Fourdan <ofourdan@redhat.com>
Reviewed-by: Daniel Stone <daniels@collabora.com>
commit 611b3b1d40f58035582480a3d7cfa77cb288cbc6
Author: Matthieu Herrb <matthieu@herrb.eu>
Date: Sun Jul 31 12:13:03 2016 +0200
Autoconfig: Fix the loop adding dectected drivers to the list of screens
This loop was written in a buggy style, causing a NULL driver ptr to be
passed to copyScreen(). copyScreen() only uses that to generate an
identifier string, so this is mostly harmless on systems that accept
NULL for asprintf() "%s" format. (the generated identifiers are off
by one wrt the driver names and the last one contains NULL.
For systems that don't accept NULL for '%s' this would cause a
segmentation fault when this code is used (no xorg.conf, but partial
config in xorg.conf.d for instance).
Signed-off-by: Matthieu Herrb <matthieu@herrb.eu>
Reviewed-by: Keith Packard <keithp@keithp.com>
commit 88820f1c7b66cbc98d3f19efca24c9f52410d9f9
Author: Emily Deng <Emily.Deng@amd.com>
Date: Mon Jul 25 16:12:53 2016 +0800
xfree86: vgaarb: Initialize local variable rsrc_decodes
In function xf86VGAarbiterScrnInit when the "pEnt->bus.type" is
BUS_PLATFORM, the "pScrn->vgaDev" won't be set, so the "pScrn->vgaDev" is
equal to zero.
The variable "rsrc_decodes" in function "xf86VGAarbiterAllowDRI" is not
initialized. So it will occur error when "pScrn->vgaDev == 0", and
"vga_count > 1". For this case, as "pScrn->vgaDev == 0", the function
"pci_device_vgaarb_get_info" will only set the value of "vga_count",
but won't set the value of "rsrc_decodes", so it will has two different
return values for function "xf86VGAarbiterAllowDRI" in different
platforms. One platform will return TRUE, as the "rsrc_decodes" 's
default value is 0, but another platform will return FALSE, as the
"rsrc_decodes" 's default value is "32767", this will cause disable
direct rendering.
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=96937
Signed-off-by: Emily Deng <Emily.Deng@amd.com>
Reviewed-by: Michel Dänzer <michel.daenzer@amd.com>
commit fa2bc06407665ee074f5914d0f83d4114b20fc8e
Author: Keith Packard <keithp@keithp.com>
Date: Fri Aug 12 17:40:55 2016 -0700
dix: Avoid writing uninitialized bytes in deliverPropertyNotifyEvent
Make sure the whole event is initialized, instead of leaving the pad
bytes unset.
Signed-off-by: Keith Packard <keithp@keithp.com>
Reviewed-by: Hans de Goede <hdegoede@redhat.com>
commit 67fc5d68f967d19236221b2c0c2e0fe45acf560f
Author: Keith Packard <keithp@keithp.com>
Date: Sat Aug 13 09:02:15 2016 -0700
os: Abandon loop after poll call when array of fds has changed
If a file descriptor is added or removed from an ospoll callback, then
the arrays containing file descriptor information will have all of
their indices changed, so the loop state is no longer consistent. Just
bail out and let the caller come back around to try again.
Signed-off-by: Keith Packard <keithp@keithp.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 7d6fffb6013cfc718d884cc549d7a8fef37240cf
Author: Keith Packard <keithp@keithp.com>
Date: Fri Aug 12 15:23:55 2016 -0700
os: Delay freeing of epoll_wait return pointers until epoll is idle.
Instead of freeing the struct ospollfd elements when the fd is
removed by the user, delay that until epoll is idle so that we are
sure no epoll_event structures could contain the stale pointer. This
handles cases where an fd is removed from the ospoll callback
interface, and also in case the OS keeps stale pointers around after
the call to epoll_ctl with EPOLL_CTL_DEL.
Signed-off-by: Keith Packard <keithp@keithp.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 69b782aa75bc06f11b8f9b532d5213f252c4c6c4
Author: Keith Packard <keithp@keithp.com>
Date: Fri Jul 29 17:45:45 2016 -0700
xfree86: Set pScrn->pScreen before driver ScreenInit is called
Any code called from the driver ScreenInit may want to refer to
pScrn->pScreen. As the function passed to AddScreen is the first place
the DDX sees a new screen, the generic code needs to make sure that
value is set before passing control to the video driver's
initialization code.
This was found by running a driver which didn't bother to set this
value when the initial colormap was installed; xf86RandR12LoadPalette
tried to use pScrn->pScreen and crashed.
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=97124
Signed-off-by: Keith Packard <keithp@keithp.com>
Reviewed-and-Tested-by: Michel Dänzer <michel.daenzer@amd.com>
commit 387d6b5df3e11de5cb88db8a559128fcb62e4e5a
Merge: d2558f063a 8bb9d460fb
Author: Keith Packard <keithp@keithp.com>
Date: Sat Aug 13 09:12:19 2016 -0700
Merge remote-tracking branch 'daenzer/for-master'
commit d2558f063a034a827247b66b4c5adbffe79dc0e7
Author: Keith Packard <keithp@keithp.com>
Date: Thu Aug 11 17:28:38 2016 -0700
Build glamor when Xorg or Xephyr are built.
Requires gbm when building Xorg so that xf86-video-modesetting will
work.
Signed-off-by: Keith Packard <keithp@keithp.com>
Reviewed-by: Hans de Goede <hdegoede@redhat.com>
Reviewed-by: Eric Anholt <eric@anholt.net>
commit 2b9f8ae98602d2abda7c363900f39a5bd3768a4c
Author: Keith Packard <keithp@keithp.com>
Date: Thu Aug 11 21:32:59 2016 -0700
mi: Remove spurious call to OsReleaseSignals from mieqGrowQueue
This call wasn't converted to 'input_unlock()' when the SIGIO code was
removed from the server, and so when the queue growing was reworked to
be done from the input thread, it got left sitting here. As the caller
now manages the lock, we don't need to switch this to input_unlock at
this point.
Signed-off-by: Keith Packard <keithp@keithp.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
commit f399919e13c994452f7219163b2a4b1fa015242e
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri Aug 12 13:59:56 2016 +1000
xfree86: lock input during PreInit
This is a problem for the libinput driver that uses the same context across
multiple devices. The driver may be halfway through setting up an input device
(and the only way to do so is to add it to libinput) when the input thread
comes in an reads events. This then causes mayhem when data is dereferenced
that hasn't been set up yet.
In my case the cause was the call to libinput_path_remove_device() inside
preinit racing with evdev_dispatch_device() handling of ENODEV. The sequence
was:
- thread 2 gets an event and calls evdev_dispatch_device()
- thread 1 calls libinput_path_remove_device() which sets the device->source
to NULL
- thread 2 reads from the fd, gets ENODEV and now removes the device->source,
dereferencing the null-pointer
This is the one I could reproduce the most, but there are other potential
pitfalls that affect any driver that uses the same fd for multiple devices.
Avoid all this and wrap PreInit into the lock.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Keith Packard <keithp@keithp.com>
commit dd4e21cb3a6e692e834ec34bec42944202b3e085
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri Aug 12 12:06:18 2016 +1000
xfree86: fix unbalanced input_lock/unlock in xf86NewInputDevice()
If a device couldn't be enabled we left the lock hanging.
This patch also removes the leftover OsReleaseSignals() call, now unnecessary.
Note that input_unlock() is later than previously OsReleaseSignals().
RemoveDevice() manipulates the input device and its file descriptors, it's
safer to put the input_unlock() call after RemoveDevice() to avoid events
coming in while the device is being removed.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Keith Packard <keithp@keithp.com>
commit bf31d6f43e5ce04891a96b226a975379e2e2ba71
Author: Keith Packard <keithp@keithp.com>
Date: Thu Aug 11 12:34:54 2016 -0700
os: Allow re-registering fd with InputThreadRegisterDev
Calling InputThreadRegisterDev twice with the same fd should replace
the existing function and args instead of creating a new entry with
the same fd.
Signed-off-by: Keith Packard <keithp@keithp.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 2df2815d6ae0c2ffb9e0a084d61ee3585f5116df
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Tue Aug 9 17:35:58 2016 +1000
os: append, rather than prepend, any new input thread fds
xf86AddEnabledDevice() prepends the new fd to the list,
xf86RemoveEnabledDevice() then searches for a matching fd and removes that
entry. If this is done for the same fd (and since we lose all information but
the actual fd) we usually unregister virtual devices in reverse order, causing
a dereference of already released memory.
Case in point:
- the wacom driver calls xf86AddEnabledDevice() once for the physical device,
then multiple times for the virtual subdevices
- when the physical device is unplugged, the driver calls
xf86RemoveEnabledDevice() for the physical device
- all we have is the fd, so we end up removing the last virtual device from
the fd set
- xf86DeleteInput() frees the physical device's pInfo
- the fd goes crazy with ENODEV, but a read_input() now passes the already
freed pInfo for the physical device
- boom
Fix this by appending to the fd list to provide bug-for-bug compatibility with
the old SIGIO code. This needs to be fixed in the driver, but meanwhile not
crashing the server provides for better user experience.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Keith Packard <keithp@keithp.com>
commit a446ff84de2dd29439521f6e87d75bde3bbf002c
Author: Michel Dänzer <michel.daenzer@amd.com>
Date: Fri Jul 29 17:38:21 2016 +0900
xfree86/modes: Handle no palette case better in xf86RandR12CrtcSetGamma
Just use the RandR gamma ramp directly.
Fixes random on-monitor colours with drivers which don't call
xf86HandleColormaps, e.g. modesetting.
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=97154
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
commit d3d4ff0ed4d4679b7983b1a3ea267ff945f7643c
Author: Kenneth Graunke <kenneth@whitecape.org>
Date: Thu Jul 28 07:28:51 2016 -0700
modesetting: Delete dead drmmode_bo_for_pixmap function.
Embarassingly, it looks like I introduced this dead function in
commit 13c7d53df8dac45ea2a685826cd45a39bcb51657 a year ago.
Nothing ever used it, not even then.
Signed-off-by: Kenneth Graunke <kenneth@whitecape.org>
Reviewed-by: Eric Anholt <eric@anholt.net>
commit 8bb9d460fbc82ee5d6f87e1d11cfa52f4f3072ee
Author: Michel Dänzer <michel.daenzer@amd.com>
Date: Fri Jul 29 17:38:21 2016 +0900
xfree86/modes: Handle no palette case better in xf86RandR12CrtcSetGamma
Just use the RandR gamma ramp directly.
Fixes random on-monitor colours with drivers which don't call
xf86HandleColormaps, e.g. modesetting.
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=97154
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
commit c833c0866f2f8f829185667efe3d6dfa5979a9e8
Author: Michel Dänzer <michel.daenzer@amd.com>
Date: Fri Jul 29 18:41:06 2016 +0900
present: Handle event mask updates as specified v2
From the Present extension specification:
An event context is associated with a specific window; using
an existing event context with a different window generates
a Match error.
If eventContext specifies an existing event context, then if
eventMask is empty, PresentSelectInput deletes the specified
context, otherwise the specified event context is changed to
select a different set of events.
If eventContext is an unused XID, then if eventMask is empty
no operation is performed. Otherwise, a new event context is
created selecting the specified events.
Without this change, there's no way for a client to explicitly change
or destroy an existing event mask entry. Trying to do so as specified
above would just result in a protocol error.
v2: (Keith Packard)
* Use dixLookupResourceByType instead of walking window_priv->events
* Return BadMatch if the existing event context is associated with a
different window or client
* Call LEGAL_NEW_RESOURCE again when creating a new event context
* Drop invalid "leak fix"
Signed-off-by: Michel Dänzer <michel.daenzer@amd.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
Reviewed-by: Keith Packard <keithp@keithp.com>
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
commit 0924ac014d7caadab0b15ba69cd0a09cfe8a01da
Author: Michel Dänzer <michel.daenzer@amd.com>
Date: Tue Jul 26 17:28:33 2016 +0900
present: Only call restore_screen_pixmap once from set_abort_flip
present_restore_screen_pixmap's work doesn't need to be done several
times for the same pending flip.
Fixes a crash if the X server quits while a flip is pending, in which
case present_set_abort_flip may be called several times, including when
screen->root is already cleared to NULL.
Reviewed-by: Hans de Goede <hdegoede@redhat.com>
commit b4e46c0444bb09f4af59d9d13acc939a0fbbc6d6
Author: Michel Dänzer <michel.daenzer@amd.com>
Date: Sat Nov 28 16:50:47 2015 +0900
xfree86: Hook up colormaps and RandR 1.2 gamma code v6
Instead of breaking the former when the driver supports the latter,
hook them up so that the hardware LUTs reflect the combination of the
current colourmap and gamma states. I.e. combine the colourmap, the
global gamma value/ramp and the RandR 1.2 per-CRTC gamma ramps into one
combined LUT per CRTC.
Fixes e.g. gamma sliders not working in games.
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=27222
v2:
* Initialize palette_size and palette struct members, fixes crash on
server startup.
v3:
* Free randrp->palette in xf86RandR12CloseScreen, fixes memory leak.
v4:
* Call CMapUnwrapScreen if xf86RandR12InitGamma fails (Emil Velikov).
* Still allow xf86HandleColormaps to be called with a NULL loadPalette
parameter in the xf86_crtc_supports_gamma case.
v5:
* Clean up inner loops in xf86RandR12CrtcComputeGamma (Keith Packard)
* Move palette update out of per-CRTC loop in xf86RandR12LoadPalette
(Keith Packard)
v6:
* Handle reallocarray failure in xf86RandR12LoadPalette (Keith Packard)
Reviewed-by: Keith Packard <keithp@keithp.com>
commit 17213b74fd7fc4c4e2fe7a3781e7422dd482a0ab
Author: Michel Dänzer <michel.daenzer@amd.com>
Date: Tue Jun 21 16:44:20 2016 +0900
xfree86/modes: Remove xf86RandR12CrtcGetGamma
This would normally return the same values the core RandR code passed to
xf86RandR12CrtcSetGamma before, which is rather pointless. The only
possible exception would be if a driver tried initializing
crtc->gamma_red/green/blue to reflect the hardware LUT state on startup,
but that can't work correctly if whatever set the LUT before the server
started was running at a different depth.
Even the pointless round-trip case will no longer work with the
following change.
Reviewed-by: Keith Packard <keithp@keithp.com>
commit 62f44052573b475a7b4c24f8e2da9bd6a8f1bd70
Author: Michel Dänzer <michel.daenzer@amd.com>
Date: Tue Jun 21 15:41:45 2016 +0900
xfree86/modes: Move gamma initialization to xf86RandR12Init12 v2
RRCrtcGammaSetSize cannot be used yet in xf86InitialConfiguration,
because randr_crtc isn't allocated yet at that point, but a following
change will require RRCrtcGammaSetSize to be called from
xf86RandR12CrtcInitGamma.
v2:
* Bail from xf86RandR12CrtcInitGamma if !crtc->funcs->gamma_set (Keith
Packard)
Reviewed-by: Keith Packard <keithp@keithp.com>
commit 0b2f30834b1a9f4a03542e25c5f54ae800df57e2
Author: Keith Packard <keithp@keithp.com>
Date: Sun May 29 17:47:29 2016 -0700
os: Clean up WaitFor.c
Do all timer stuff before blocking, avoiding a bunch of duplicate code
and merge common code in WaitForSomething.
The WaitForSomething changes need a bit of explanation to show that
the new code is effectively equivalent to the old. Eliding error
checking and trivial bits we've got:
Before:
if (ready clients)
timeout = 0
else
compute timeout
i = poll
if (i <= 0) {
if (ready clients)
return TRUE;
if (input)
return FALSE;
if (any ready timers) {
run timers
return FALSE;
}
} else {
if (input)
return FALSE;
if (any ready timers) {
run timers
return FALSE;
}
if (ready clients)
return TRUE;
}
After:
if (ready clients)
timeout = 0;
else
compute timeout
run_timers
poll
if (input)
return FALSE;
if (ready clients)
return TRUE;
The old code would return TRUE if there were ready clients and input
pending. Dispatch would then schedule that ready client, but before
processing any requests, it would notice that there was input pending
and go process it. The new code just checks for input first, which is
effectively the same.
If the poll timed out and there weren't clients ready, then timers
would get run.
If the poll didn't time out, then timers would get run, even if there
were clients now ready. Now, if the timeout interval was zero, that
means that the timers must have been ready *before* poll was
invoked. In this case, we should simply run the timers before calling
poll -- no sense calling poll just to discard any data that it
generates.
If the timeout interval was non-zero, and poll didn't timeout, then
either there aren't any timers to run, or we got a surprise and hit a
timer exactly as a client became ready to run. This is the one case
where the new code is different from the old; the new code delays the
timer call until the next time WaitForSomething is called.
Signed-off-by: Keith Packard <keithp@keithp.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
commit 2ab8b1dcd37900e5e2f11007d7c0cd0545209482
Author: Keith Packard <keithp@keithp.com>
Date: Sun May 29 19:48:25 2016 -0700
os: Use xorg_list for struct _OsTimerRec
No sense having an open-coded linked list here, plus the doubly linked
list is more efficient
Signed-off-by: Keith Packard <keithp@keithp.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
commit 50779c494d4682103b96db440021e56e44311b6b
Author: Keith Packard <keithp@keithp.com>
Date: Sun May 29 12:45:53 2016 -0700
os: Remove CheckConnections
poll provides per-fd notification of failure, so we don't need
CheckConnections anymore.
Signed-off-by: Keith Packard <keithp@keithp.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
commit f0275b1e5a4787da1f4d5507165315a000c22b33
Author: Keith Packard <keithp@keithp.com>
Date: Thu May 26 00:19:55 2016 -0700
os: Leave stdin and stdout open
There's no reason to close these now that we don't care what file
descriptors we use.
Signed-off-by: Keith Packard <keithp@keithp.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
commit 8217c29d2d8b29bd66bc54fee3fe5cb3385a05c7
Author: Keith Packard <keithp@keithp.com>
Date: Wed May 25 23:43:49 2016 -0700
Allow 1024 and 2048 for LimitClients
There's no reason not to offer ridiculous numbers of clients; only a
few static data structures are arrays of this length.
Signed-off-by: Keith Packard <keithp@keithp.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
commit e0edb963fe09582f23a4b55da4f8840173e7a1ee
Author: Keith Packard <keithp@keithp.com>
Date: Tue May 24 21:04:14 2016 -0700
os: eliminate fd value limits for clients
With no code depending on the range of file descriptors, checking
for that can be eliminated.
Signed-off-by: Keith Packard <keithp@keithp.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
commit 30bc0732f959bbc63f318c06d48de080d495da32
Author: Keith Packard <keithp@keithp.com>
Date: Tue May 24 21:12:33 2016 -0700
os: Use ospoll for input thread [v2]
Replace use of select(2) to avoid fd limits. Note that
InputThreadFillPipe used select as well, but none of the files passed
were non-blocking, so there was no need for that code at all.
v2: Keep ospoll API usage single threaded to avoid re-entrancy issues
Signed-off-by: Keith Packard <keithp@keithp.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
commit f993091e7db81b0420e23c485378cba112278839
Author: Keith Packard <keithp@keithp.com>
Date: Thu May 26 10:40:44 2016 -0700
os: Switch server to poll(2) [v3]
Eliminates all of the fd_set mangling in the server main thread
v2: Listen for POLLOUT while writes are blocked.
v3: Only mark client not ready on EAGAIN return from read
Signed-off-by: Keith Packard <keithp@keithp.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
commit 8f1edf4bd3a1f050ce9eeb5eac45dd1a8f7a6d5e
Author: Keith Packard <keithp@keithp.com>
Date: Thu May 19 13:59:54 2016 -0700
dix: Use list for ready clients
This converts the dispatch loop into using a list of ready clients
instead of an array. This changes the WaitForSomething API so that it
notifies DIX when a client becomes ready to read, instead of returning
the set of ready clients.
Signed-off-by: Keith Packard <keithp@keithp.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
commit d6eff3c31e8289881a3aa9b858e5710d0f741db0
Author: Keith Packard <keithp@keithp.com>
Date: Thu May 26 10:20:45 2016 -0700
os: Add ospoll interface [v2]
This provides a wrapper around poll or epoll providing a
callback-based interface for monitoring activity on a large set of
file descriptors.
v2: use xserver_poll API instead of poll. Don't use WSAPoll as
that is broken.
Signed-off-by: Keith Packard <keithp@keithp.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
commit d403aca70a07e1401cb93738f1af5961582a2e47
Author: Keith Packard <keithp@keithp.com>
Date: Mon Jul 18 15:58:42 2016 -0700
Switch poll() users to xserver_poll()
This uses the wrapper in case we need to emulate poll with select
as we do on Windows.
Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 711c36558f50943c8342f25ad210281134887a3d
Author: Brian M. Clapper <bmc@clapper.org>
Date: Mon Jul 11 18:30:05 2016 -0400
os: Add poll emulation for mingw [v2]
v2: rename as 'xserver_poll' to avoid potential library name
collisions. Provide 'xserver_poll.h' which uses the system
poll where available and falls back to this emulation otherwise.
Autodetects when this is required, building the emulation only
then
Source: https://github.com/bmc/poll
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit 2a79be9e4dd1b6ba00b69ff40bc5257ec84d34da
Author: Jon Turney <jon.turney@dronecode.org.uk>
Date: Tue Jul 19 13:35:37 2016 +0100
hw/xwin: Update BlockHandler function signature
Update for removal of fdset from Block/Wakeup handler API in 9d15912a
Signed-off-by: Jon Turney <jon.turney@dronecode.org.uk>
Reviewed-by: Keith Packard <keithp@keithp.com>
commit 60a91031d13e4d29c383087120e318f6b528b6e5
Author: Jon Turney <jon.turney@dronecode.org.uk>
Date: Tue Jul 19 13:35:36 2016 +0100
hw/xwin: Update for removal of AddEnabledDevice
Update for removal of AddEnabledDevice in be5a513f. Use SetNotifyFd instead.
Signed-off-by: Jon Turney <jon.turney@dronecode.org.uk>
Reviewed-by: Keith Packard <keithp@keithp.com>
commit 7f2d690725292e7b5a44c813c9456da426256873
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Mon Jun 27 10:17:14 2016 +1000
xfree86: if ATTR_KEYBOARD is set, match for keyboards
ATTR_KEY maps to ID_INPUT_KEY which is set for any device with keys.
ID_INPUT_KEYBOARD and thus ATTR_KEYBOARD is set for devices that are actual
keyboards (and have a set of expected keys).
Hand-written match rules may only apply ID_INPUT_KEYBOARD, so make sure we
match on that too.
Arguably we should've been matching on ATTR_KEYBOARD only all along but
changing that likely introduces regressions.
Reported-by: Marty Plummer <netz.kernel@gmail.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 4b311d23e84356bd0e9e736aeed7448dd6382118
Author: Adam Jackson <ajax@redhat.com>
Date: Mon Jul 18 12:46:51 2016 -0400
modesetting: resubmit dirty rects on EINVAL (v2)
This error code can mean we're submitting more rects at once than the
driver can handle. If that happens, resubmit one at a time.
v2: Make the rect submit loop more error-proof (Walter Harms)
Signed-off-by: Adam Jackson <ajax@redhat.com>
Reviewed-by: Michael Thayer <michael.thayer@oracle.com>
commit 8d3a368d8980e37e7e8c57065dc901ce809887c6
Author: Keith Packard <keithp@keithp.com>
Date: Wed Jun 1 22:47:29 2016 -0700
os: InputThreadFillPipe doesn't need select or poll
The file descriptors passed to InputThreadFillPipe are always
blocking, so there's no need to use Select (or poll).
Signed-off-by: Keith Packard <keithp@keithp.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
commit ef7ddbe242ed4c461f816663fb88646e41f1c21b
Author: Keith Packard <keithp@keithp.com>
Date: Wed Jun 1 22:35:09 2016 -0700
os: Move ETEST macro from io.c to osdep.h
This lets other code share this functionality
Signed-off-by: Keith Packard <keithp@keithp.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
commit 0d294462a5af08ada654c588fad921ed7a22749b
Author: Keith Packard <keithp@keithp.com>
Date: Sun May 29 15:06:36 2016 -0700
os: Add X_NOTIFY_ERROR value
This provides a way to report errors on file descriptors that is
better defined than "any bits which are not READ or WRITE".
Signed-off-by: Keith Packard <keithp@keithp.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
commit e6636b438322a9a2f2270ad9d60bf3dfc72be0b3
Author: Keith Packard <keithp@keithp.com>
Date: Thu May 26 10:30:56 2016 -0700
os: Compute timeout in milliseconds instead of struct timeval
The timeout resolution offered in the AdjustWaitForDelay call is
only milliseconds, so passing around the timeout as a pointer to a
struct timeval is not helpful. Doing everything in milliseconds up to
the point of the select call simplifies the code without affecting
functionality at all.
Signed-off-by: Keith Packard <keithp@keithp.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
commit a414db021575accff64abad6f1047245e81c7476
Author: Keith Packard <keithp@keithp.com>
Date: Thu May 19 15:08:05 2016 -0700
dix: Intermediate GrabServer state 'GrabKickout' not needed
The intermediate grabState, "GrabKickout", was used to trigger
dispatch into going back to WaitForSomething after doing a GrabServer
so that the set of ready clients would be recomputed to match what the
server should be processing. As we only process one client per
WaitForSomething call, we will always hit WaitForSomething after
finishing the current client, and so don't need any special case here.
Signed-off-by: Keith Packard <keithp@keithp.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
commit 7762a602c1dfdd8cfcf2b8c2281cf4d683d05216
Author: Keith Packard <keithp@keithp.com>
Date: Thu May 19 15:05:55 2016 -0700
dix/os: Merge priority computation into SmartScheduleClient
Instead of having scheduling done in two places (one in
WaitForSomething, and the other in SmartScheduleClient), just stick
all of the scheduling in SmartScheduleClient.
Signed-off-by: Keith Packard <keithp@keithp.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
commit 4af00242ef1e39499b932d12423fdf449296090a
Author: Keith Packard <keithp@keithp.com>
Date: Mon May 30 01:49:46 2016 -0700
Bump ABI versions to reflect block/wakeup handler API changes
Signed-off-by: Keith Packard <keithp@keithp.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
commit be5a513fee6cbf29ef7570e57eb0436d70fbd88c
Author: Keith Packard <keithp@keithp.com>
Date: Mon Dec 7 15:12:14 2015 -0800
Remove AddEnabledDevice and AddGeneralSocket APIs
All uses of these interfaces should instead be using the NotifyFd API
instead.
Signed-off-by: Keith Packard <keithp@keithp.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
commit 9d15912aa475b733bbb20efc367a67dacad63bf1
Author: Keith Packard <keithp@keithp.com>
Date: Tue Sep 1 18:51:14 2015 -0700
Remove fd_set from Block/Wakeup handler API
This removes the last uses of fd_set from the server interfaces
outside of the OS layer itself.
Signed-off-by: Keith Packard <keithp@keithp.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
commit fb0802113b4c57819cba15d64baf79bf4148607e
Author: Keith Packard <keithp@keithp.com>
Date: Tue Sep 1 11:20:04 2015 -0700
Remove readmask from screen block/wakeup handler
With no users of the interface needing the readmask anymore, we can
remove it from the argument passed to these functions.
Signed-off-by: Keith Packard <keithp@keithp.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
commit 410bc047480a9f98df678dc850bc6b99c3cfb5bf
Author: Keith Packard <keithp@keithp.com>
Date: Mon Dec 7 15:03:10 2015 -0800
dmx: Eliminate use of AddEnabledDevice [v2]
Use SetNotifyFd instead, with the hope that someday someone will come
fix this to be more efficient -- right now, the wakeup handler is
doing the event reading, instead of the notify callback.
v2: no need to patch dmxsigio.c as it has been removed.
Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 6299ef3d749d6f978d3d38d42f711ac56bf382eb
Author: Keith Packard <keithp@keithp.com>
Date: Thu Aug 27 11:49:35 2015 -0700
modesetting: Use passed-in fd for drm event monitoring NotifyFd callback
This is a cleanup, proposed by Adam Jackson, but wasn't merged with
the original NotifyFD changes.
Signed-off-by: Keith Packard <keithp@keithp.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
commit 6bf7b49f6711c7ed1837283dc04f93f4c1b77ecc
Author: Keith Packard <keithp@keithp.com>
Date: Thu Aug 27 11:47:26 2015 -0700
hw/kdrive: Use passed-in fd for kdrive/linux APM monitoring [v2]
This is a cleanup, proposed by Adam Jackson, but wasn't merged with
the original NotifyFD changes.
Signed-off-by: Keith Packard <keithp@keithp.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
commit 55c2e1a3aa587c58a74066724e11e30b3df267b8
Author: Keith Packard <keithp@keithp.com>
Date: Mon Dec 7 15:11:33 2015 -0800
xnest: Use SetNotifyFd to receive events
Signed-off-by: Keith Packard <keithp@keithp.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
commit 24e65bf0db57bf4ac70386c0a0e8275b73edd2fb
Author: Keith Packard <keithp@keithp.com>
Date: Thu Dec 3 01:02:02 2015 -0600
hw/xfree86: Use NotifyFd for other input fd wakeups
Remove code in xf86Wakeup for dealing with other input and switch to
using the new NotifyFd interface.
Signed-off-by: Keith Packard <keithp@keithp.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
commit c3fea428aed919826130ef8ebdb2cceb445a845b
Author: Keith Packard <keithp@keithp.com>
Date: Tue May 24 20:51:31 2016 -0700
os: Use NotifyFd for ErrorConnMax
Instead of open-coding a single FD wait, use NotifyFd to wait for the
FD to become readable before returning the error message.
Signed-off-by: Keith Packard <keithp@keithp.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
commit 559aac2d71250e3137aaa582e2a59a918ddf21b7
Author: Keith Packard <keithp@keithp.com>
Date: Tue May 24 21:59:38 2016 -0700
dmx: Switch from select(2) to poll(2) for input
Signed-off-by: Keith Packard <keithp@keithp.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
commit aa6717ce213e79735c72afc5ec9cc1f9c0297e09
Author: Keith Packard <keithp@keithp.com>
Date: Tue May 24 21:36:18 2016 -0700
xfree86: Switch from select(2) to poll(2)
xf86WaitForInput and the xf86 SIGIO handling code.
Signed-off-by: Keith Packard <keithp@keithp.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
commit 81135991a583b3b30a90e82ddc1d5c86d57bf00b
Author: Keith Packard <keithp@keithp.com>
Date: Tue May 24 21:19:13 2016 -0700
kdrive: switch from select(2) to poll(2)
This avoids fd limits
Signed-off-by: Keith Packard <keithp@keithp.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
commit 05a793f5b3c40747d5a92a076def7f4fb673c7e7
Author: Keith Packard <keithp@keithp.com>
Date: Tue Sep 1 18:50:55 2015 -0700
dix: Switch to the libXfont2 API (v2)
This new libXfont API eliminates exposing internal X server symbols to
the font library, replacing those with a struct full of the entire API
needed to use that library.
v2: Use libXfont2 instead of libXfont_2
Signed-off-by: Keith Packard <keithp@keithp.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
commit 950ffb8d6fd1480f305e38c571bda44f247f1de2
Author: Eric Anholt <eric@anholt.net>
Date: Fri Nov 6 12:27:42 2015 -0800
glamor: Remove the FBO cache.
It is a modest performance improvement (2.7% on Intel), with the
significant downside that it keeps extra pixmap contents laying around
for 1000 BlockHandlers without the ability for the system to purge
them when under memory pressure, and tiled renderers don't know that
we could avoid reading their current contents when beginning to render
again. We could use the FB invalidate functions, but they aren't
always available, aren't hooked up well in Mesa, and would eat into
the performance gains of having the cache.
[ajax: rebased to master]
Reviewed-by: Adam Jackson <ajax@redhat.com>
commit e8e36755abb17872d669b88d33ca9adc511029a0
Author: Michel Dänzer <michel.daenzer@amd.com>
Date: Fri Jul 1 12:34:20 2016 +0900
glamor: Translate solid text background region after clipping
Fixes incorrect clipping for redirected windows which don't happen to be
located at the top left corner of the screen.
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=96742
Signed-off-by: Michel Dänzer <michel.daenzer@amd.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
commit 32a9504c69183485b0b796fa3966cd1e39992365
Author: Adam Jackson <ajax@redhat.com>
Date: Tue Jul 12 10:04:18 2016 -0400
xfree86: Fix fallback driver sort order for Xorg -configure (v2)
The intent here was that fallback drivers would be at the end of the
list in order, but if a fallback driver happened to be at the end of the
list already that's not what would happen. Rather than open-code
something smarter, just use qsort.
Note that qsort puts things in ascending order, so somewhat backwardsly
fallbacks are greater than native drivers, and vesa is greater than
modesetting.
v2: Use strcmp to compare non-fallback drivers so we get a predictable
result if your libc's qsort isn't stable (Keith Packard)
Reviewed-by: Keith Packard <keithp@keithp.com>
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit 4926845a57fa8b53e18ea7d3434bf5539e9b7782
Author: Andrew Eikum <aeikum@codeweavers.com>
Date: Wed Jul 6 14:13:09 2016 -0500
shm: Also censor images returned by ShmGetImage
We currently censor images from dix's GetImage, but not from
ShmGetImage. This is a method to bypass XACE, creating a potential
leak. We should censor in both methods.
Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Andrew Eikum <aeikum@codeweavers.com>
commit 9fcb554e9bfdf3eed2c2250d89150e3e7b907f01
Author: Adam Jackson <ajax@redhat.com>
Date: Fri Jul 8 15:17:05 2016 -0400
xwayland: Only force monotonic clock once
Otherwise on regeneration we get:
(EE) BUG: triggered 'if (clockid)'
(EE) BUG: utils.c:440 in ForceClockId()
(EE)
(EE) Backtrace:
(EE) 0: ./hw/xwayland/Xwayland (ForceClockId+0x5c) [0x47713c]
(EE) 1: ./hw/xwayland/Xwayland (OsInit+0x25) [0x4763d5]
(EE) 2: ./hw/xwayland/Xwayland (dix_main+0x11c) [0x43e60c]
(EE) 3: /lib64/libc.so.6 (__libc_start_main+0xf1) [0x7f627b2f9731]
(EE) 4: ./hw/xwayland/Xwayland (_start+0x29) [0x4238e9]
(EE) 5: ? (?+0x29) [0x29]
Signed-off-by: Adam Jackson <ajax@redhat.com>
Reviewed-by: Jonas Ådahl <jadahl@gmail.com>
commit cf6730c503f8090a5d1b80918fe253fc2c5bc090
Author: Rui Matos <tiagomatos@gmail.com>
Date: Wed Jul 13 19:19:09 2016 +0200
xwayland: Update RR state on wl_output.done instead of wl_output.mode
Otherwise if the geometry changes but the mode doesn't we end up with
the previous geometry from RR's point of view.
Fixes https://bugzilla.gnome.org/show_bug.cgi?id=768710
Reviewed-by: Jonas Ådahl <jadahl@gmail.com>
Signed-off-by: Rui Matos <tiagomatos@gmail.com>
commit 401a8d6e1379133863e3271374dc21850d0d3cab
Author: Michel Dänzer <michel.daenzer@amd.com>
Date: Tue Jun 28 17:22:47 2016 +0900
dix: Work around non-premultiplied ARGB cursor data
Some games incorrectly use non-premultiplied ARGB cursor data, presumably
because that's what Windows uses. On some hardware (and with SWcursor),
this breaks areas of the cursor which are supposed to be transparent
(and presumably also translucent areas, but that's less noticeable).
This change checks for pixels with alpha == 0 and any non-alpha component
!= 0. If any such pixel is found, the data is assumed to be
non-premultiplied and fixed up by multiplying the RGB components with the
alpha component.
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=92309
Signed-off-by: Michel Dänzer <michel.daenzer@amd.com>
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
commit 033888e7766d226a179357d970223428c19c4b53
Author: Hans De Goede <hdegoede@redhat.com>
Date: Thu Jul 7 10:55:04 2016 +0200
linux: Do not try to open /dev/vc/0, fix error msg when /dev/tty0 open fails
/dev/vc/0 is a devfs thing which is long dead, so stop trying to open
/dev/vc/0, besides being a (small) code cleanup this will also fix the
"parse_vt_settings: Cannot open /dev/tty0 (%s)\n" error message to
display the actual error, rather then the -ENOENT from also trying
/dev/vc/0.
BugLink: https://patchwork.freedesktop.org/patch/8768/
Reported-by: Chad Versace <chad.versace@linux.intel.com>
Suggested-by: Julien Cristau <jcristau@debian.org>
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Reviewed-by: Julien Cristau <jcristau@debian.org>
Reviewed-by: Chad Versace <chad.versace@intel.com>
commit ce24f3aa5815e03c2d501d1504f6c0162b219801
Author: Alex Goins <agoins@nvidia.com>
Date: Thu Jul 7 14:50:03 2016 -0700
modesetting: NULL assignment for drmmode_set_target_scanout_target_cpu
Commit 80e64dae: "modesetting: Implement PRIME syncing as a sink" originally was
supposed to have this line, but it was dropped as part of the merge process.
Foregoing the NULL assignment causes a ton of problems with dereferencing
uninitialized memory.
Signed-off-by: Alex Goins <agoins@nvidia.com>
Reviewed-by: Dave Airlie <airlied@redhat.com>
commit df8e86931eb19c196ed2afc85d89525ef8cb711b
Author: agoins <agoins@nvidia.com>
Date: Thu Jun 16 20:06:48 2016 -0700
randr: Add ability to turn PRIME sync off
Adds an output parameter to disable PRIME synchronization.
Output parameter is created when the user calls 'xrandr
--setprovideroutputsource <sink> <source>' to prevent polluting output
parameters of non-PRIME configurations.
Defaults to on, so if the user wants PRIME synchronization they don't need
to do anything.
If the user wishes to disable PRIME synchronization when they first set up
PRIME, they can run 'xrandr --output <output> --set "PRIME Synchronization"
0' after running 'xrandr --setprovideroutputsource <sink> <source>', but
before 'xrandr --auto'.
If the user wishes to enable or disable PRIME synchronization after PRIME has
already been set up, they can run 'xrandr --output <output> --set "PRIME
Synchronization" <0 or 1>' at any time, xrandr will trigger a modeset, which
will tear down and setup PRIME in the configuration they requested on CRTCs
associated with that output.
randrstr.h:
Add central definition of the output property name.
rrcrtc.c:
Add function rrGetPixmapSharingSyncProp() to query the status of the
output property.
Add function rrSetPixmapSharingSyncProp() to set the output property.
Add 'sync' parameter to rrSetupPixmapSharing(), which when false will
use single buffering even if the required ABI functions are supported.
Changes rrSetupPixmapSharing() to only report an error if falling back
to single buffering when the user requested synchronization.
Change RRCrtcSet() to use rrPixmapSharingSyncProp() to query the status
of the output property and feed it into rrSetupPixmapSharing() using
the 'sync' parameter.
rrprovider.c:
Add RR(Init/Fini)PrimeSyncProps(), functions to create and destroy the
PRIME synchronization output property.
Add a call to RRInitPrimeSyncProps() in
ProcRRSetProviderOutputSource(), such that the output property is
created when the user requests PRIME.
Add a call to RRFiniPrimeSyncProps() in RRProviderDestroy().
v1: Initial commit
v2: Unchanged
v3: Add /* TODO */ for handling different sources with different outputs
Make rrSetupPixmapSharing() set the output property to 0 if it has to fall
back, to avoid user confusion.
Make rr(Get)PixmapSharingSyncProp() check the current value if there isn't a
pending value
v4: Unchanged
v5: Unchanged
v6: Rebase onto ToT
v7: Unchanged
Signed-off-by: Alex Goins <agoins@nvidia.com>
commit 60ad701a6a8cb9f1eacb72acfe2cb8d3b7a865dc
Author: Hans de Goede <hdegoede@redhat.com>
Date: Tue Jun 14 11:58:01 2016 +0200
modesetting: Load on GPU-s with 0 outputs
In newer laptops with switchable graphics, the GPU may have 0 outputs,
in this case the modesetting driver should still load if the GPU is
SourceOffload capable, so that it can be used as an offload source provider.
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Reviewed-by: Eric Engestrom <eric.engestrom@imgtec.com>
commit 94a1c77259ce39ba59ad87615df39b570ffab435
Author: Hans de Goede <hdegoede@redhat.com>
Date: Thu Jun 16 15:21:03 2016 +0200
modesetting: Fix swapping of provider sink / source capabilities
When a card has import capability it can be an offload _sink_, not
a source and vice versa for export capability.
This commit fixes the modesetting driver to properly set these
capabilities, this went unnoticed sofar because most gpus have both
import and export capability.
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Reviewed-by: Eric Engestrom <eric.engestrom@imgtec.com>
commit fcbafdfd79fd03205bc324e23b6d4e4d4f7180e1
Author: Adam Jackson <ajax@redhat.com>
Date: Wed Jul 22 12:14:08 2015 -0400
modesetting: Implement a double-buffered shadow mode
Server GPUs often have a VNC feature attached to allow remote console.
The controller implementing this feature is usually not very powerful,
and we can easily swamp it with work. This is made somewhat worse by
damage over-reporting the size of the dirty region, and a whole lot
worse by applications (or shells) that update the screen with identical
pixel content as was already there.
Fix this by double-buffering the shadow fb, using memcmp to identify
dirty tiles on each update pass. Since both shadows are in host memory
the memcmp is cheap, and worth it given the win in network bandwidth.
The tile size is somewhat arbitrarily chosen to be one cacheline wide at
32bpp on Intel Core.
By default we enable this behaviour for (a subset of) known server GPUs;
the heuristic could use work.
Signed-off-by: Adam Jackson <ajax@redhat.com>
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
commit 75e660e379d921a53eb7c3bc9c2e412fa58aec02
Author: Adam Jackson <ajax@redhat.com>
Date: Wed Jul 22 12:14:07 2015 -0400
modesetting: Drop some non-functional triple-buffering variables
Signed-off-by: Adam Jackson <ajax@redhat.com>
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
commit 21217d02168d1883b2d1f64399aec494f96a8b9d
Author: Dave Airlie <airlied@redhat.com>
Date: Wed Jul 22 12:14:06 2015 -0400
modesetting: Implement 32->24 bpp conversion in shadow update
24bpp front buffers tend to be the least well tested path for client
rendering. On the qemu cirrus emulation, and on some Matrox G200 server
chips, the hardware can't do 32bpp at all. It's better to just allocate
a 32bpp shadow and downconvert in the upload hook than expose a funky
pixmap format to clients.
[ajax: Ported from RHEL and separate modesetting driver, lifted kbpp
into the drmmode struct, cleaned up commit message, fixed 16bpp]
Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Dave Airlied <airlied@redhat.com>
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
[hdegoede@redhat.com: rebase, also use kbpp for rotate shadow fb]
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
commit af916477c65a083ec496ac3f088d766b410e8b6e
Author: Takashi Iwai <tiwai@suse.de>
Date: Mon Feb 16 17:00:55 2015 +0100
modesetting: Fix hw cursor check at the first call
With the previous patch, the modesetting driver can now return whether
the driver supports hw cursor. However, it alone doesn't suffice,
unfortunately. drmmode_load_cursor_argb_check() is called in the
following chain:
xf86CursorSetCursor()
-> xf86SetCursor()
-> xf86DriverLoadCursorARGB()
-> xf86_load_cursor_argb()
-> xf86_crtc_load_cursor_argb()
-> drmmode_load_cursor_argb_check()
*but* at first with drmmode_crtc->cursor_up = FALSE. Then the
function doesn't actually set the cursor but returns TRUE
unconditionally. The actual call of drmmode_set_cursor() is done at
first via the show_cursor callback, and there is no check of sw cursor
fallback any longer at this place. Since it's called only once per
cursor setup, so the xserver still thinks as if the hw cursor is
supported.
This patch is an ad hoc fix to correct the behavior somehow: it does
call drmmode_set_cursor() at the very first time even if cursor_up is
FALSE, then quickly hides again. In that way, whether the hw cursor
is supported is evaluated in the right place at the right time.
Of course, it might be more elegant if we have a more proper mechanism
to fall back to sw cursor at any call path. But it'd need more
rework, so I leave this workaround as is for now.
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
commit 14c21ea1c9496638b1feb8e6145c440fb4f1d14b
Author: Takashi Iwai <tiwai@suse.de>
Date: Mon Feb 16 17:00:54 2015 +0100
modesetting: Use load_cursor_argb_check for sw cursor fallback
The modesetting driver still has an everlasting bug of invisible
cursor on cirrus and other KMS drivers where no hardware cursor is
supported. This patch is a part of an attempt to address it.
This patch particularly converts the current load_cursor_argb callback
of modesetting driver to load_cursor_argb_check so that it can return
whether the driver handles the hw cursor or falls back to the sw
cursor.
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
[hdegoede@redhat.com: Add extra comment suggested by Kenneth]
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
commit 074cf58769b38550a3f35d5ecb73333330cb2aed
Author: Takashi Iwai <tiwai@suse.de>
Date: Mon Feb 16 17:00:53 2015 +0100
modesetting: Fix the error check from DRM_IOCTL_MODE_CURSOR2
The error value isn't always -EINVAL, e.g. the kernel drm core returns
-ENXIO when the corresponding ops doesn't exist. Without this fix,
DRM_IOCTL_MODE_CURSOR2 would be dealt as success even if it
shouldn't.
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Reviewed-by: Michel Dänzer <michel.daenzer@amd.com>
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
commit 3762edded8e6e973f71419937e16bea262a266b8
Author: Adam Jackson <ajax@redhat.com>
Date: Wed Jun 29 14:07:32 2016 -0400
configure: Tell AC_REPLACE_FUNCS where to find replacements
Fixes weird link errors of the form:
CCLD Xvfb
../../Xext/.libs/libXext.a(xvmc.o): In function `xf86XvMCRegisterDRInfo':
/home/ajax/git/xserver/Xext/xvmc.c:828: undefined reference to `strlcpy'
/home/ajax/git/xserver/Xext/xvmc.c:829: undefined reference to `strlcpy'
../../os/os.O: In function `siHostnameAddrMatch':
/home/ajax/git/xserver/os/access.c:1821: undefined reference to `strlcpy'
../../os/os.O: In function `AuthAudit':
/home/ajax/git/xserver/os/connection.c:555: undefined reference to `strlcpy'
/home/ajax/git/xserver/os/connection.c:574: undefined reference to `strlcpy'
../../os/os.O:/home/ajax/git/xserver/os/log.c:972: more undefined references to `strlcpy' follow
collect2: error: ld returned 1 exit status
Makefile:688: recipe for target 'Xvfb' failed
make[3]: *** [Xvfb] Error 1
Makefile:749: recipe for target 'all-recursive' failed
make[2]: *** [all-recursive] Error 1
Makefile:608: recipe for target 'all-recursive' failed
make[1]: *** [all-recursive] Error 1
Makefile:776: recipe for target 'all-recursive' failed
make: *** [all-recursive] Error 1
Signed-off-by: Adam Jackson <ajax@redhat.com>
Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
commit d135100d6b17e54262a12aeaebe0fe2fe48da3bb
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Tue Jun 28 11:42:41 2016 +1000
xkb: add a cause to the xkb indicator update after a keymap change
Regression introduce by ac164e58870d which calls
XkbUpdateAllDeviceIndicators() with two NULL arguments. A few layers down into
the stack and we triggered a NULL-pointer dereference. In theory a NULL cause
is acceptable since we don't actually change modifier state here. Instead of
updating all places to check for NULL just set the cause to the client
request and go to the pub.
https://bugs.freedesktop.org/show_bug.cgi?id=96384
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Julien Cristau <jcristau@debian.org>
Reviewed-by: Daniel Stone <daniels@collabora.com>
commit b83dede9cb930cf55249ad8e935f3c4d4328e2d9
Author: Alex Goins <agoins@nvidia.com>
Date: Thu Jun 16 20:06:56 2016 -0700
modesetting: Implement PRIME syncing as a source
Implements (Start/Stop)FlippingPixmapTracking, PresentSharedPixmap, and
RequestSharedPixmapNotifyDamage, the source functions for PRIME
synchronization and double buffering. Allows modesetting driver to be used
as a source with PRIME synchronization.
v1: N/A
v2: N/A
v3: N/A
v4: Initial commit
v5: Move disabling of reverse PRIME on sink to sink commit
v6: Rebase onto ToT
v7: Unchanged
Reviewed-by: Dave Airlie <airlied@redhat.com>
Signed-off-by: Alex Goins <agoins@nvidia.com>
commit 44cb9578c0e5e10568826bc3ecbed97d358bba3c
Author: Alex Goins <agoins@nvidia.com>
Date: Thu Jun 16 20:06:55 2016 -0700
modesetting: Disable Reverse PRIME for i915
Reverse PRIME seems to be designed with discrete graphics as a sink in
mind, designed to do an extra copy from sysmem to vidmem to prevent a
discrete chip from needing to scan out from sysmem.
The criteria it used to detect this case is if we are a GPU screen and
Glamor accelerated. It's possible for i915 to fulfill these conditions,
despite the fact that the additional copy doesn't make sense for i915.
Normally, you could just set AccelMethod = none as an option for the device
and call it a day. However, when running with modesetting as both the sink
and the source, Glamor must be enabled.
Ideally, you would be able to set AccelMethod individually for devices
using the same driver, but there seems to be a bug in X option parsing that
makes all devices on a driver inherit the options from the first detected
device. Thus, glamor needs to be enabled for all or for none until that bug
(if it's even a bug) is fixed.
Nonetheless, it probably doesn't make sense to do the extra copy on i915
even if Glamor is enabled for the device, so this is more user friendly by
not requiring users to disable acceleration for i915.
v1: N/A
v2: N/A
v3: N/A
v4: Initial commit
v5: Unchanged
v6: Rebase onto ToT
v7: NULL check and free drmVersionPtr
Reviewed-by: Dave Airlie <airlied@redhat.com>
Signed-off-by: Alex Goins <agoins@nvidia.com>
commit f6fef2a171366156c4c6807de7fe086f04f41b7b
Author: Alex Goins <agoins@nvidia.com>
Date: Thu Jun 16 20:06:54 2016 -0700
modesetting: Blacklist USB transport devices from PRIME sync
UDL (USB 2.0 DisplayLink DRM driver) and other drivers for USB transport devices
have strange semantics when it comes to vblank events, due to their inability to
get the actual vblank info.
When doing a page flip, UDL instantly raises a vblank event without waiting for
vblank. It also has no support for DRM_IOCTL_WAIT_VBLANK, and has some strange
behavior with how it handles damage when page flipping.
It's possible to get something semi-working by hacking around these issues,
but even then there isn't much value-add vs single buffered PRIME, and it
reduces maintainability and adds additional risks to the modesetting driver
when running with more well-behaved DRM drivers.
Work needs to be done on UDL in order to properly support synchronized
PRIME. For now, just blacklist it, causing RandR to fall back to
unsynchronized PRIME.
This patch originally blacklisted UDL by name, but it was pointed out that there
are other USB transport device drivers with similar limitations, so it was
expanded to blacklist all USB transport devices.
v1: N/A
v2: N/A
v3: Initial commit
v4: Move check to driver.c for consistency/visibility
v5: Refactor to accomodate earlier changes
v6: Rebase onto ToT
v7: Expand to blacklist all USB transport devices, not just UDL
Signed-off-by: Alex Goins <agoins@nvidia.com>
Reviewed-by: Hans de Goede <hdegoede@redhat.com>
Reviewed-by: Dave Airlie <airlied@redhat.com>
commit 500853086dd5fbfe6d2b3e30923fdc4d8c262cf0
Author: Alex Goins <agoins@nvidia.com>
Date: Thu Jun 16 20:06:53 2016 -0700
modesetting: Suspend and resume flipping with DPMS
DPMS would prevent page flip / vblank events from being raised, freezing
the screen until PRIME flipping was reinitialized. To handle DPMS cleanly,
suspend PRIME page flipping when DPMS mode is not on, and resume it when
DPMS mode is on.
v1: Initial commit
v2: Moved flipping_active check from previous commit to here
v3: Unchanged
v4: Unchanged
v5: Move flipping_active check to sink support commit
v6: Rebase onto ToT
v7: Unchanged
Reviewed-by: Dave Airlie <airlied@redhat.com>
Signed-off-by: Alex Goins <agoins@nvidia.com>
commit 80e64dae8af1eb3bb225b00fd800c6924883cf46
Author: Alex Goins <agoins@nvidia.com>
Date: Thu Jun 16 20:06:52 2016 -0700
modesetting: Implement PRIME syncing as a sink
Implements (Enable/Disable)SharedPixmapFlipping and
SharedPixmapNotifyDamage, the sink functions for PRIME synchronization and
double buffering. Allows modesetting driver to be used as a sink with PRIME
synchronization.
Changes dispatch_slave_dirty to flush damage from both scanout pixmaps.
Changes drmmode_set_scanout_pixmap*() functions to
drmmode_set_target_scanout_pixmap*() that take an additional parameter
PixmapPtr *target. Then, treat *target as it did prime_pixmap. This allows
me to use it to explicitly set both prime_pixmap and prime_pixmap_back
individually. drmmode_set_scanout_pixmap() without the extra parameter
remains to cover the single-buffered case, but only works if we aren't
already double buffered.
driver.c:
Add plumbing for rr(Enable/Disable)SharedPixmapFlipping and
SharedPixmapNotifyDamage.
Change dispatch_dirty_crtc to dispatch_dirty_pixmap, which functions the
same but flushes damage associated with a ppriv instead of the crtc, and
chanage dispatch_slave_dirty to use it on both scanout pixmaps if
applicable.
drmmode_display.h:
Add flip_seq field to msPixmapPrivRec to keep track of the event handler
associated with a given pixmap, if any.
Add wait_for_damage field to msPixmapPrivRec to keep track if we have
requested a damage notification from the source.
Add enable_flipping field to drmmode_crtc_private_rec to keep track if
flipping is enabled or disabled.
Add prime_pixmap_back to drmmode_crtc_private_rec to keep track of back
buffer internally.
Add declarations for drmmode_SetupPageFlipFence(),
drmmode_EnableSharedPixmapFlipping(),
drmmode_DisableSharedPixmapFlipping, drmmode_SharedPixmapFlip(), and
drmmode_SharedPixmapPresentOnVBlank().
Move slave damage from crtc to ppriv.
drmmode_display.c:
Change drmmode_set_scanout_pixmap*() functions to
drmmode_set_target_scanout_pixmap*() that take an additional parameter
PixmapPtr *target for explicitly setting different scanout pixmaps.
Add definitions for functions drmmode_SharedPixmapFlip(),
drmmode_SharedPixmapPresentOnVBlank(),
drmmode_SharedPixmapPresent(),
drmmode_SharedPixmapVBlankEventHandler(),
drmmode_SharedPixmapVBlankEventAbort(),
drmmode_EnableSharedPixmapFlipping(), and
drmmode_DisableSharedPixmapFlipping,
drmmode_InitSharedPixmapFlipping(), and
drmmode_FiniSharedPixmapFlipping, along with struct
vblank_event_args.
The control flow is as follows:
pScrPriv->rrEnableSharedPixmapFlipping() makes its way to
drmmode_EnableSharedPixmapFlipping(), which sets enable_flipping to
TRUE and sets both scanout pixmaps prime_pixmap and
prime_pixmap_back.
When setting a mode, if prime_pixmap is defined, modesetting
driver will call drmmode_InitSharedPixmapFlipping(), which if
flipping is enabled will call drmmode_SharedPixmapPresent() on
scanout_pixmap_back.
drmmode_SharedPixmapPresent() requests that for the source to
present on the given buffer using master->PresentSharedPixmap(). If
it succeeds, it will then attempt to flip to that buffer using
drmmode_SharedPixmapFlip(). Flipping shouldn't fail, but if it
does, it will raise a warning and try drmmode_SharedPixmapPresent()
again on the next vblank using
drmmode_SharedPixmapPresentOnVBlank().
master->PresentSharedPixmap() could fail, in most cases because
there is no outstanding damage on the mscreenpix tracked by the
shared pixmap. In this case, drmmode_SharedPixmapPresent() will
attempt to use master->RequestSharedPixmapNotifyDamage() to request
for the source driver to call slave->SharedPixmapNotifyDamage() in
response to damage on mscreenpix. This will ultimately call
into drmmode_SharedPixmapPresentOnVBlank() to retry
drmmode_SharedPixmapPresent() on the next vblank after
accumulating damage.
drmmode_SharedPixmapFlip() sets up page flip event handler by
packing struct vblank_event_args with the necessary parameters, and
registering drmmode_SharedPixmapVBlankEventHandler() and
drmmode_SharedPixmapVBlankEventAbort() with the modesetting DRM
event handler queue. Then, it uses the drmModePageFlip() to flip on
the next vblank and raise an event.
drmmode_SharedPixmapPresentOnVBlank() operates similarly to
drmmode_SharedPixmapFlip(), but uses drmWaitVBlank() instead of
drmModePageFlip() to raise the event without flipping.
On the next vblank, DRM will raise an event that will ultimately be
handled by drmmode_SharedPixmapVBlankEventHandler(). If we flipped,
it will update prime_pixmap and prime_pixmap_back to reflect that
frontTarget is now being displayed, and use
drmmode_SharedPixmapPresent(backTarget) to start the process again
on the now-hidden shared pixmap. If we didn't flip, it will just
use drmmode_SharedPixmapPresent(frontTarget) to start the process
again on the still-hidden shared pixmap.
Note that presentation generally happens asynchronously, so with
these changes alone tearing is reduced, but we can't always
guarantee that the present will finish before the flip. These
changes are meant to be paired with changes to the sink DRM driver
that makes flips wait on fences attached to dmabuf backed buffers.
The source driver is responsible for attaching the fences and
signaling them when presentation is finished.
Note that because presentation is requested in response to a
vblank, PRIME sources will now conform to the sink's refresh rate.
At teardown, pScrPriv->rrDisableSharedPixmapFlipping() will be
called, making its way to drmmode_FiniSharedPixmapFlipping().
There, the event handlers for prime_pixmap and prime_pixmap_back
are aborted, freeing the left over parameter structure. Then,
prime_pixmap and prime_pixmap back are unset as scanout pixmaps.
Register and tear down slave damage per-scanout pixmap instead of
per-crtc.
v1: Initial commit
v2: Renamed PresentTrackedFlippingPixmap to PresentSharedPixmap
Renamed flipSeq to flip_seq
Warn if flip failed
Use SharedPixmapNotifyDamage to retry on next vblank after damage
v3: Refactor to accomodate moving (rr)StartFlippingPixmapTracking and
(rr)(Enable/Disable)SharedPixmapFlipping to rrScrPrivRec from ScreenRec
Do damage tracking on both scanout pixmaps
v4: Tweaks to commit message
v5: Revise for internal storage of prime pixmap ptrs
Move disabling for reverse PRIME from source commit to here
Use drmmode_set_target_scanout_pixmap*() to set scanout pixmaps
internally to EnableSharedPixmapFlipping().
Don't support flipping if ms->drmmode.pageflip == FALSE.
Move flipping_active check to this commit
v6: Rebase onto ToT
v7: Unchanged
Reviewed-by: Dave Airlie <airlied@redhat.com>
Signed-off-by: Alex Goins <agoins@nvidia.com>
commit 378c85a8848679eaa3c2881f3ba8b686e59df25e
Author: Alex Goins <agoins@nvidia.com>
Date: Thu Jun 16 20:06:51 2016 -0700
modesetting: Always load ms->drmmode.pageflip
ms->drmmode.pageflip was only loaded from options if ms->drmmode.glamor was
defined, otherwise it would always assume FALSE.
PRIME Synchronization requires ms->drmmode.pageflip even if we aren't using
glamor, so load it unconditionally.
v1: N/A
v2: N/A
v3: N/A
v4: N/A
v5: Initial commit
v6: Rebase onto ToT
v7: Unchanged
Reviewed-by: Dave Airlie <airlied@redhat.com>
Signed-off-by: Alex Goins <agoins@nvidia.com>
commit b773a9c8126222e5fed2904d012fbf917a9f22fd
Author: Alex Goins <agoins@nvidia.com>
Date: Thu Jun 16 20:06:50 2016 -0700
modesetting: Always tear down scanout pixmap
drmmode_set_scanout_pixmap_(cpu/gpu) would only do teardown if ppix ==
NULL. This meant that if there were consecutive calls to
SetScanoutPixmap(ppix != NULL) without calls to SetScanoutPixmap(ppix ==
NULL) in between, earlier calls would be leaked. RRReplaceScanoutPixmap()
does this today.
Instead, when setting a scanout pixmap, always do teardown of the existing
scanout pixmap before setting up the new one. Then, if there is no new one
to set up, stop there.
This maintains the previous behavior in all cases except those with
multiple consecutive calls to SetScanoutPixmap(ppix != NULL).
v1: N/A
v2: N/A
v3: N/A
v4: N/A
v5: Initial commit
v6: Rebase onto ToT
v7: Unchanged
Reviewed-by: Dave Airlie <airlied@redhat.com>
Signed-off-by: Alex Goins <agoins@nvidia.com>
commit f4c37eeee7953df1fe0e3196eda452acf0078e61
Author: Alex Goins <agoins@nvidia.com>
Date: Thu Jun 16 20:06:49 2016 -0700
modesetting: Internal storage of scanout pixmaps
modesetting relied on randr_crtc->scanout_pixmap being consistent with
calls to SetScanoutPixmap, which is very fragile and makes a lot of
assumptions about the caller's behavior.
For example, RRReplaceScanoutPixmap(), when dropping off with !size_fits,
will set randr_crtc->scanout_pixmap = NULL and then call SetScanoutPixmap.
Without this patch, drmmode_set_scanout_pixmap_(cpu/gpu) will think that
there is no scanout pixmap to tear down, because it's already been set to
NULL.
By keeping track of the scanout pixmap in its internal state, modesetting
can avoid these types of bugs and reduce constraints on calling
conventions.
v1: N/A
v2: N/A
v3: N/A
v4: N/A
v5: Initial commit
v6: Rebase onto ToT
v7: Unchanged
Reviewed-by: Dave Airlie <airlied@redhat.com>
Signed-off-by: Alex Goins <agoins@nvidia.com>
commit 1bdbc7e764ed7bf7c1ae46287dec368aa7c7e80d
Author: Alex Goins <agoins@nvidia.com>
Date: Thu Jun 16 20:06:47 2016 -0700
randr/xf86: Add PRIME Synchronization / Double Buffer
Changes PRIME to use double buffering and synchronization if all required
driver functions are available.
rrcrtc.c:
Changes rrSetupPixmapSharing() to use double buffering and
synchronization in the case that all required driver functions are
available. Otherwise, falls back to unsynchronized single buffer.
Changes RRCrtcDetachScanoutPixmap() to properly clean up in the case of
double buffering.
Moves StopPixmapTracking() from rrDestroySharedPixmap() to
RRCrtcDetachScanoutPixmap().
Changes RRReplaceScanoutPixmap() to fail if we are using double buffering,
as it would need a second ppix parameter to function with double buffering,
and AFAICT no driver I've implemented double buffered source support in uses
RRReplaceScanoutPixmap().
randrstr.h:
Adds scanout_pixmap_back to struct _rrCrtc to facilitate PRIME
double buffering.
xf86Crtc.h:
Adds current_scanout_back to _xf86Crtc to facilitate detection
of changes to it in xf86RandR12CrtcSet().
xf86RandR12.c:
Changes xf86RandR12CrtcSet() to detect changes in
scanout_pixmap_back.
Adds scanout_pixmap_back to struct _rrCrtc to facilitate PRIME double
buffering.
v1: Initial commit
v2: Rename PresentTrackedFlippingPixmap to PresentSharedPixmap
v3: Refactor to accomodate moving (rr)StartFlippingPixmapTracking and
(rr)(Enable/Disable)SharedPixmapFlipping to rrScrPrivRec from ScreenRec
Add fallback if flipping funcs fail
v4: Detach scanout pixmap when destroying scanout_pixmap_back, to avoid
dangling pointers in some drivers
v5: Disable RRReplaceScanoutPixmap for double-buffered PRIME, it would need an
ABI change with support for 2 pixmaps if it were to be supported, but AFAICT
no driver that actually supports double-buffered PRIME uses it.
Refactor to use rrEnableSharedPixmapFlipping() as a substitute for
rrCrtcSetScanoutPixmap() in the flipping case.
Remove extraneous pSlaveScrPriv from DetachScanoutPixmap()
Remove extraneous protopix and pScrPriv from rrSetupPixmapSharing()
v6: Rebase onto ToT
v7: Unchanged
Reviewed-by: Dave Airlie <airlied@redhat.com>
Signed-off-by: Alex Goins <agoins@nvidia.com>
commit b601f96a5915a2c486b389483b291797e6fdf617
Author: Alex Goins <agoins@nvidia.com>
Date: Thu Jun 16 20:06:46 2016 -0700
xf86: Add PRIME flipping functions to Screen
Adds typedefs for (*RRStartFlippingPixmapTrackingProcPtr),
(*RREnableSharedPixmapFlippingProcPtr),
and (*RRDisableSharedPixmapFlippingProcPtr) in randrstr.h.
Adds typedefs for (*PresentSharedPixmapProcPtr),
(*SharedPixmapNotifyDamageProcPtr),
(*RequestSharedPixmapNotifyDamageProcPtr), and
(*StopFlippingPixmapTrackingProcPtr) in scrnintstr.h.
Adds RR(Enable/Disable)SharedPixmapFlipping, and
RRStartFlippingPixmapTracking to rrScrnPrivRec.
Adds StopFlippingPixmapTracking, PresentSharedPixmap,
SharedPixmapNotifyDamage, and RequestSharedPixmapNotifyDamage to ScreenRec.
rrScrnPrivRec used for functions that use RandR-private data types, and
ScreenRec used for the rest.
RREnableSharedPixmapFlipping will allow the sink driver to setup for
flipping between two shared pixmaps.
RRDisableSharedPixmapFlipping will allow the sink driver to do teardown
associated with flipping between two shared pixmaps.
(RRStart/Stop)FlippingPixmapTracking are merely the double-buffered
equivalents of (Start/Stop)PixmapTracking, allowing the source driver to do
whatever setup and teardown necessary for presenting on the two shared
pixmaps.
PresentSharedPixmap is a function exposed by the source driver for the X
server or sink driver to call to request a present on a given shared
pixmap. This way, presents can be driven by the sink's vblank instead of a
timer or similar mechanism.
SharedPixmapNotifyDamage and RequestSharedPixmapNotifyDamage are OPTIONAL
(even for double-buffered PRIME) functions exposed by the sink driver and
the source driver, respectively. By calling
master->RequestSharedPixmapNotifyDamage(ppix), the sink driver can request
for the source driver to call slave->SharedPixmapNotifyDamage(ppix) in
response to damage on the master screen pixmap tracked by ppix.
v1: Initial commit
v2: Rename PresentTrackedFlippingPixmap to PresentSharedPixmap
Add SharedPixmapNotifyDamage / RequestSharedPixmapNotifyDamage
v3: Add RRCrtcPtr as a parameter to StartFlippingPixmapTracking
Move functions that use RandR-private data types to rrScrnPrivRec.
v4: Unchanged
v5: Add front and back parameters to RREnableSharedPixmapFlippingProcPtr
v6: Rebase onto ToT
v7: Unchanged
Reviewed-by: Dave Airlie <airlied@redhat.com>
Signed-off-by: Alex Goins <agoins@nvidia.com>
commit ef1578e736887aadf209172f48daa9eaec25b3db
Author: Jon Turney <jon.turney@dronecode.org.uk>
Date: Sun Feb 28 00:53:24 2016 +0000
hw/xwin: Fix a typo in "Remove Shadow DirectDraw engine"
Commit 7a22912e "Remove Shadow DirectDraw engine" contained a typo, changing
the fullscreen && DirectDraw check in WM_DISPLAYCHANGE to fullscreen ||
DirectDraw
This causes disruptive depth changes to be improperly handled
Signed-off-by: Jon Turney <jon.turney@dronecode.org.uk>
Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
commit 0a0c1bd93259c208184d6ad974ba55658191af0c
Author: Jon Turney <jon.turney@dronecode.org.uk>
Date: Fri Feb 26 18:03:04 2016 +0000
hw/xwin: Fix a crash trying to reload window icons when not in multiwindow mode
ReloadEnumWindowsProc() accesses window privates, which are only valid in
multiwindow mode, but is called in all modes.
Fix this potential crash by not doing this unless in multiwindow mode.
Reproduction steps:
1/ XWin -mwextwm
2/ Run a client which creates an X window e.g. xterm
3/ Right click on notification area icon, and choose 'Reload .XWinrc' from the menu
Signed-off-by: Jon Turney <jon.turney@dronecode.org.uk>
Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
commit 91ae2571458c50d9f782190d9f80815b770aefac
Author: Colin Harrison <colin.harrison@virgin.net>
Date: Fri Feb 26 16:46:15 2016 +0000
hw/xwin: Fix a crash which occurs if focus returns to XWin after xkbcomp has failed
If WM_FOCUS is received while the "core devices failed" fatal error (due to
xkbcomp failing) is displayed, winRestoreModeKeyState() attempts to
dereference a NULL InputInfo.keyboard->key pointer.
Signed-off-by: Colin Harrison <colin.harrison@virgin.net>
Reviewed-by: Jon Turney <jon.turney@dronecode.org.uk>
commit 4b123e0f61eb55e59d30bf442499cf3b3f621c3b
Author: Jon Turney <jon.turney@dronecode.org.uk>
Date: Tue Aug 4 16:05:05 2015 +0100
hw/xwin: Make window maximizable if a maximium size larger than virtual desktop size is specified
Firefox 38 has a WM_NORMAL_HINTS with a maximum size of 32767x32767.
Don't remove the maximize control from the window frame if the maximum size
is bigger than the virtual desktop size, as maximizing the window will not
exceed the maximium size.
Signed-off-by: Jon Turney <jon.turney@dronecode.org.uk>
Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
commit 504bf495f9b3adea1ba650469223511f81709714
Author: Jon Turney <jon.turney@dronecode.org.uk>
Date: Wed Jul 8 19:12:22 2015 +0100
hw/xwin: Detect invalid options in combination with -nodecoration
Detect invalid options in combination with -nodecoration
These are particularly problematic as -nodecoration implies a default of
-nomultimonitors, for some reason, which will gives rendering issues with
-multiwindow.
Signed-off-by: Jon Turney <jon.turney@dronecode.org.uk>
Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
commit e1b983b55e4cefcf976c8f92d608af8216a56927
Author: Jon Turney <jon.turney@dronecode.org.uk>
Date: Tue Nov 11 11:46:25 2014 +0000
hw/xwin: Default to -noresize when -fullscreen is used
Currently, just using -fullscreen fails in winValidateArgs(), as the default
-resize=randr is incompatible with -fullscreen.
Set the default resize mode to -noresize if -fullscreen is used.
Also, rename enum value notAllowed -> resizeNotAllowed for clarity.
Signed-off-by: Jon Turney <jon.turney@dronecode.org.uk>
Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
commit 42f7cd5d92f2046e1b5c264b3d76c3afda624a55
Author: Jon Turney <jon.turney@dronecode.org.uk>
Date: Sat Oct 11 14:49:16 2014 +0100
hw/xwin: Tell LogInit() to backup previous logfile as .old
Future work: Do we really need to call LogInit() in so many different
places?
Signed-off-by: Jon Turney <jon.turney@dronecode.org.uk>
Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
commit 197419838273eddbd0bd34890771799f4bebbc07
Author: Jon Turney <jon.turney@dronecode.org.uk>
Date: Fri Sep 26 13:18:33 2014 +0100
hw/xwin: Downgrade some uninformative, always-emitted log output to debug
Downgrade from error to debug some uninformative, always-emitted log output
about thread synchronization during initialization
Signed-off-by: Jon Turney <jon.turney@dronecode.org.uk>
Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
commit 17c8bf348eea4f12ce7cb4ca7db0d0576e28c982
Author: Jon Turney <jon.turney@dronecode.org.uk>
Date: Tue Apr 28 16:04:40 2015 +0100
hw/xwin: Check for just the hostname in window title
When -hostintitle is enabled, only use the hostname, not a FQDN from
WM_CLIENT_MACHINE, when checking if the window title already contains it
Also restructure GetWindowName() to fix a potential memory leak.
Signed-off-by: Jon Turney <jon.turney@dronecode.org.uk>
Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
commit c05c4360eea245b3ef5f3a355b95dcd63244ef70
Author: Jon Turney <jon.turney@dronecode.org.uk>
Date: Mon Sep 22 14:40:41 2014 +0100
hw/xwin: Use _NET_WM_NAME for window titles in multiwindow mode
Use _NET_WM_NAME in preference to WM_NAME for window title
Update window title when _NET_WM_NAME property changes
We should always have been doing this, but some qt5 examples only set
_NET_WM_NAME, so now it's become more important...
Signed-off-by: Jon Turney <jon.turney@dronecode.org.uk>
Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
commit 866d8299abc4315d4836292aeac4abe0b686fc10
Author: Jon Turney <jon.turney@dronecode.org.uk>
Date: Thu Mar 13 17:53:44 2014 +0000
hw/xwin: Remove decorations from _NET_WM_WINDOW_TYPE_SPLASH type windows
In multiwindow mode, remove decorations from _NET_WM_WINDOW_TYPE_SPLASH type
windows.
Some programs use _NET_WM_WINDOW_TYPE_SPLASH_SCREEN in error, so also accept
that as equivalent.
Signed-off-by: Jon Turney <jon.turney@dronecode.org.uk>
Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
commit 356b9129067dd0e1dc62e893d47a1e9b033885bd
Author: Jon Turney <jon.turney@dronecode.org.uk>
Date: Thu Apr 7 17:40:56 2016 +0100
hw/xwin: Use Bool type in winShowWindowOnTaskbar() prototype
Use the Bool type from X11/Xdefs.h for winShowWindowOnTaskbar().
This is the boolean type we should be using inside the X server, rather than
BOOL, which evaluates to either the Win32 API type, or the Xlib API type,
depending on the context...
Signed-off-by: Jon Turney <jon.turney@dronecode.org.uk>
Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
commit 7397a2191f333a8632109873cc60d13ca4d550b0
Author: Olivier Fourdan <ofourdan@redhat.com>
Date: Tue Jun 21 13:54:35 2016 +0200
xwayland-input: Fake crossing to rootwin
This partially reverts commit c1565f3.
When the pointer moves from an X11 window to a Wayland native window,
no LeaveNotify event is emitted which can lead to various unexpected
behaviors like tooltips remaining visible after the pointer has left the
window.
Yet the pointer_handle_leave() is called and so is the DIX CheckMotion()
but since the pointer enters a Wayland native window with no other
Xwayland window matching, DoEnterLeaveEvents() does not get invoked and
therefore no LeaveNotify event is sent to the X11 client at the time the
pointer leaves the window for a Wayland native surface.
Restore the XYToWindow() handler in xwayland-input that was previously
removed with commit c1565f3 and use that handler to pretend that the
pointer entered the root window in this case so that the LeaveNotify
event is emitted.
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=96437
Signed-off-by: Olivier Fourdan <ofourdan@redhat.com>
Acked-by: Daniel Stone <daniels@collabora.com>
Acked-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 111a045dcf0912dc5b178c18acda479b3972876b
Author: Adam Jackson <ajax@redhat.com>
Date: Tue Jun 21 11:45:17 2016 -0400
Revert "XDMCP: For IPv6 add link local addresses to the end of the list"
This reverts commit fdd448cd39b4ca84a28d73fc628911070437b703.
commit fdd448cd39b4ca84a28d73fc628911070437b703
Author: Reinhard Max <max@suse.de>
Date: Thu Apr 28 15:21:15 2016 +0200
XDMCP: For IPv6 add link local addresses to the end of the list
For link local addresses the XDMCP server would need to either know the
interface thru a scope identifier or try all available interfaces. If
they don't this address will fail in which case the XDMCP server could
still try the other addresses passed - however some only try the first
address and then give up.
Even if this seems to be the wrong place to fix this it seems to be
easier than fixing all display servers.
[ajax: Cleaned up commit message]
Reviewed-by: Adam Jackson <ajax@redhat.com>
commit ce82ae1964b2115a780786676c614546297a79c9
Author: Adam Jackson <ajax@redhat.com>
Date: Tue Feb 2 14:10:49 2016 -0500
res: Account for GLXPixmap references too
GLX_EXT_tetxure_from_pixmap operates on a GLXPixmap, which takes a
reference on the backing pixmap; that GLXPixmap might be long-lived, so
we should account for it in ResQueryClientPixmapBytes.
Acked-by: Michel Dänzer <michel.daenzer@amd.com>
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit 5d6ad0d3a7611c4dff2d79b6af9eb5c0885656ef
Author: Adam Jackson <ajax@redhat.com>
Date: Tue Feb 2 13:49:37 2016 -0500
res: Fix accounting of redirected window pixmaps for Composite
The previous change removed the special case that matched resources of
CompositeClientWindowType and walked back from that to the window
pixmap. That was intentional, since that logic was broken anyway. CCWTs
don't map 1:1 to references on the backing pixmap; a window redirected
by multiple clients (say, by the server since it's on the synthetic
visual, and then manually by a compositor) would have a window pixmap
refcount of 1, but would have those bytes accounted twice.
The right thing is to have Composite wrap window accounting, and add the
pixmap bytes once and only once for the redirection reference.
Note that the view from the client can still be non-intuitive in the
face of Composite. xcompmgr, for example, holds _two_ references to
each window pixmap (one each from CompositeNameWindowPixmap and
RenderCreatePicture), so a synthetic-visual window will have its bytes
split 2/3 to xcompmgr and 1/3 to the server-client. Nothing to be done
about that, and at least this way we're not over-accounting.
Acked-by: Michel Dänzer <michel.daenzer@amd.com>
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit 4f8a72034c4a2654bfc16d929e09a69d1cc138ef
Author: Adam Jackson <ajax@redhat.com>
Date: Tue Feb 2 13:46:42 2016 -0500
res: Simplify QueryClientPixmapBytes
I suspect this code predates the common resource hooks for computing
sizes. It's ugly in any case since the Resource extension shouldn't
need to know which extensions can take a reference on pixmaps. Instead,
let's just walk every resource for the client and sum up all the pixmap
bytes that way.
This might be slightly slower since we're calling the size func once for
every resource. On the other hand, it might be slightly faster since we
only walk the resource table once instead of 3-5 times. Probably a
wash, and not really a performance path in any case.
Acked-by: Michel Dänzer <michel.daenzer@amd.com>
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit 263c5333a54107efac702a54d7e6329ae25ff4e0
Author: Michel Dänzer <michel.daenzer@amd.com>
Date: Fri Dec 25 18:32:46 2015 +0900
xfree86/modes: Simplify in_range logic in xf86_crtc_set_cursor_position
Consolidate to a single if/else statement and eliminate the redundant
local variable in_range and assignments to x/y.
Reviewed-by: Adam Jackson <ajax@redhat.com>
commit a991b1ec30344c16d318d2c0640f9e5d380193e0
Author: Michel Dänzer <michel.daenzer@amd.com>
Date: Mon Feb 1 16:07:22 2016 +0900
xfree86/modes: Disambiguate driverIsPerformingTransform
The driver can now specify exactly which aspects of the transform it
wants to handle via XF86DriverTransform* flags.
Since the driver can now choose whether it wants to receive transformed
or untransformed cursor coordinates, xf86CrtcTransformCursorPos no
longer needs to be available to drivers, so make it static.
Reviewed-by: Adam Jackson <ajax@redhat.com>
commit aad96f85005f8eab27df62049d619092865a9b16
Author: Michel Dänzer <michel.daenzer@amd.com>
Date: Fri Dec 25 18:28:47 2015 +0900
xfree86/modes: Fix HW cursor clipping for driverIsPerformingTransform (v2)
Even if the driver is handling the transform, we still need to transform
the cursor position for clipping, otherwise we may hide the HW cursor
when the cursor is actually inside the area covered by the CRTC.
v2: Use crtc_x/y local variables for clarity
Reviewed-by: Adam Jackson <ajax@redhat.com>
commit 828887b6f4a997b6468da565a88b6fe9afcda191
Author: Keith Packard <keithp@keithp.com>
Date: Tue Jun 14 13:45:27 2016 -0700
ephyr: Process only the last expose or configure available from the server
Delay expose or configure processing until the event queue is empty so
that we don't end up processing a long series of events one at a
time. Expose events already have a check waiting for the last in a
series, this further improves that by discarding multiple
series of events.
Signed-off-by: Keith Packard <keithp@keithp.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
commit c17a41794507d6d04c850e9e1bc04fc60c31de18
Author: Keith Packard <keithp@keithp.com>
Date: Sat Jun 4 19:55:07 2016 -0700
ephyr: Process queued X events before blocking [v2]
If we end up reading all pending X events in the course of other server
execution, then our notify FD callback won't get invoked and we won't
process them. Fix this by noting that there are queued events in the
block handler, setting the poll timeout to zero and queuing a work
proc to clear the event queue.
v2: use a work proc to clear the event queue rather than doing it in
the block handler directly.
Signed-off-by: Keith Packard <keithp@keithp.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
commit f3248eba6e2d0c099025f8e9a4874b431246eac7
Author: Keith Packard <keithp@keithp.com>
Date: Tue Jun 14 13:19:49 2016 -0700
ephyr: Handle window resize when using glamor
Under glamor, we need to re-create the screen pixmap at the new size
so that we can ask glamor for the associated texture. Fortunately, we
can simply use ephyr_glamor_create_screen_resources to create the new
pixmap.
Because this is being done after the server has started, we need to
walk the window heirarchy and reset any windows pointing at the old
pixmap. I could easily be convinced that this TraverseTree should be
moved to miSetScreenPixmap.
Signed-off-by: Keith Packard <keithp@keithp.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
commit 235d21670dcff224807ff719c7fa86212058ec46
Author: Keith Packard <keithp@keithp.com>
Date: Tue Jun 14 13:16:03 2016 -0700
ephyr: Don't configure window while responding to configure events
This leads to and endless sequence of window resizes.
Signed-off-by: Keith Packard <keithp@keithp.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
commit fb1edccf3c90c626f120b3c399657f24d3f7901e
Author: Keith Packard <keithp@keithp.com>
Date: Thu May 26 12:11:46 2016 -0700
dix: Call screen block/wakeup handlers closest to blocking [v3]
The screen block and wakeup handlers are the only ones which provide a
well known ordering between the wrapping layers; placing these as
close as possible to the server blocking provides a way for the driver
to control the flow of execution correctly.
Switch the shadow code to run in the screen block handler so that it
now occurrs just before the server goes to sleep.
Switch glamor to call down to the driver after it has executed its own
block handler piece, in case the driver needs to perform additional
flushing work after glamor has called glFlush.
These changes ensure that the following modules update the screen in
the correct order:
animated cursors (uses RegisterBlockAndWakeupHandlers dynamically)
composite (dynamic wrapping)
misprite (dynamic wrapping)
shadow (static wrapping)
glamor (static wrapping)
driver (static wrapping)
It looks like there's still a bit of confusion between composite and
misprite; if composite updates after misprite, then it's possible
you'd exit the block handler chain with the cursor left hidden. To fix
that, misprite should be wrapping during ScreenInit time and not
unwrapping. And composite might as well join in that fun, just to make
things consistent.
[v2] Unwrap BlockHandler in shadowCloseScreen (ajax)
[v3] ephyr: Use screen block handler for flushing changes
ephyr needs to make sure it calls glXSwapBuffers after glamor finishes
its rendering. As the screen block handler is now called last, we have
to use that instead of a registered block/wakeup handler to make sure
the GL rendering is done before we copy it to the front buffer.
Signed-off-by: Keith Packard <keithp@keithp.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
commit a134d1e7eada0ac90fb622f45833c87b72c9aa06
Author: Guilherme Quentel Melo <gqmelo@gmail.com>
Date: Tue May 10 00:29:58 2016 +0000
glx: avoid memory leak when using indirect rendering
When multiple processes are using GL with indirect rendering a race
condition can make drawables refcount never drop to zero.
This situation could happen when there are many X clients using indirect
GLX:
1 - client1: calls glXMakeCurrent
2 - client2: calls glXMakeCurrent
This is the first context switch for this client. So old_context_tag=0
3 - client1: calls glXRender
For the client, its context is already current.
For the server side lastGLContext points to client2's context.
Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Guilherme Quentel Melo <gqmelo@gmail.com>
commit 266cf39a8f108e2f365a9772f4ee4d9fca88eb36
Merge: fa7b70a9b8 848089e0dd
Author: Adam Jackson <ajax@redhat.com>
Date: Mon Jun 20 11:21:40 2016 -0400
Merge remote-tracking branch 'hans/for-master'
commit fa7b70a9b895789ec57562bbba0bc052fc91d134
Author: Keith Packard <keithp@keithp.com>
Date: Tue Jun 14 17:36:16 2016 -0700
kdrive: Only enable threaded input if we have input devices
When there aren't any devices, the input thread is going to be pretty
lonely, so don't bother to even start it.
Signed-off-by: Keith Packard <keithp@keithp.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 6f2a5b8cdf7b1e913a1e0581e65195dd10f04ca3
Author: Jason Gerecke <killertofu@gmail.com>
Date: Fri Jun 17 08:44:41 2016 -0700
xwayland: Expose all NBUTTONS buttons on the pointer
The call to 'InitButtonClassDeviceStruct' which initializes the pointer
buttons only results in the first three buttons being created due to a
hardcoded '3'. In order to expose all the buttons defined in the
btn_labels array, we subtitute 'NBUTTONS' in its place.
Signed-off-by: Jason Gerecke <jason.gerecke@wacom.com>
Reviewed-by: Olivier Fourdan <ofourdan@redhat.com>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 72df6e2a3a5020696902b70fe940934ef0a681c4
Author: Jason Gerecke <killertofu@gmail.com>
Date: Fri Jun 17 08:44:40 2016 -0700
xwayland: Use correct labels when initializing pointer valuators
Signed-off-by: Jason Gerecke <jason.gerecke@wacom.com>
Reviewed-by: Olivier Fourdan <ofourdan@redhat.com>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit dab5b3922c50f73712a8ea0cb9742c4bc7d7ab1d
Author: Jason Gerecke <killertofu@gmail.com>
Date: Fri Jun 17 08:44:39 2016 -0700
xwayland: Fix whitespace errors
Substitute a few errant tab characters with eight spaces to conform to the
prevailing style.
Signed-off-by: Jason Gerecke <jason.gerecke@wacom.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 848089e0dde38f043c85332785520946103e77c1
Author: Lyude Paul <cpaul@redhat.com>
Date: Mon Jun 13 15:31:02 2016 -0400
modesetting: Clear drmmode->fb_id before unflipping
[fix copied from 40191d82370e in xf86-video-ati]
Without this, we end up setting rotated CRTCs back to their previous
framebuffer right after we perform a rotation. Reproducer:
- Have two monitors connected at the same resolution
- Rotate one monitor from normal straight to inverted
- Watch as the monitor you didn't rotate either freezes or shows intense
flickering
Signed-off-by: Lyude <cpaul@redhat.com>
Reviewed-by: Hans de Goede <hdegoede@redhat.com>
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
commit 4313122dea0df9affc280ee698e929489061ccc6
Author: Hans de Goede <hdegoede@redhat.com>
Date: Wed Jun 1 15:14:32 2016 +0200
modesetting: Only add main fb if necessary
If we're doing reverse-prime; or doing rotation the main fb is not used,
and there is no reason to add it in this case.
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Reviewed-by: Dave Airlie <airlied@redhat.com>
commit 877453212166fdc912e0d687cdecee11aba563b5
Author: Hans de Goede <hdegoede@redhat.com>
Date: Wed Jun 1 15:11:05 2016 +0200
modesetting: Remove unnecessary fb addition from drmmode_xf86crtc_resize
drmmode_set_mode_major() is the only user of drmmode->fb_id and will
create it if necessary.
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Reviewed-by: Dave Airlie <airlied@redhat.com>
commit 210d83ad492f0e91889472eaae549106d9b4ebf5
Author: Hans de Goede <hdegoede@redhat.com>
Date: Wed Jun 1 15:07:22 2016 +0200
modesetting: Set ppix->fb_id to 0 after removing the fb
This ensures the fb gets re-added when a shared pixmap is re-used for
a second drmmode_set_scanout_pixmap_cpu call.
Note currently the xserver never re-uses a shared pixmap in this way,
so this is mostly a sanity fix.
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Reviewed-by: Dave Airlie <airlied@redhat.com>
commit b8ef71fb07a8ba9587aeaca942b4de20b59266ca
Author: Hans de Goede <hdegoede@redhat.com>
Date: Wed Jun 1 14:59:38 2016 +0200
modesetting: Properly cleanup fb for reverse-prime-offload
drmmode_set_scanout_pixmap_gpu(pix) adds drmmod->fb_id through a call
to drmmode_xf86crtc_resize(), but on a subsequent
drmmode_set_scanout_pixmap_gpu(NULL) it would not remove the fb.
This keeps the crtc marked as busy, which causes the dgpu to not
being able to runtime suspend, after an output attached to the dgpu
has been used once. Which causes burning through an additional 10W
of power and the laptop to run quite hot.
This commit adds the missing remove fb call, allowing the dgpu to runtime
suspend after an external monitor has been plugged into the laptop.
Note this also makes drmmode_set_scanout_pixmap_gpu(NULL) match the
behavior of drmmode_set_scanout_pixmap_cpu(NULL) which was already
removing the fb.
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Reviewed-by: Dave Airlie <airlied@redhat.com>
commit 15595d29c2c3992f260a3314f26fa691f1e5cec8
Author: Nikhil Mahale <nmahale@nvidia.com>
Date: Thu May 26 21:50:16 2016 +0530
randr: Adjust master's last set time with slaves
In prime configurations master's last set time may not be latest
and greatest, adjust it with slaves last set time, pick up greatest
one. Otherwise xserver may end with events which has
lastSetTime < lastConfigTime even if that's not
the case and confuse xrandr client.
[hdegoede: rebase on "xrandrprovider: Do not use separate lists for unbound /
source / offload slaves"]
Reviewed-by: Hans de Goede <hdegoede@redhat.com>
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
commit 5c7af02b103790ac1fb6a71822788892c70290b6
Author: Hans de Goede <hdegoede@redhat.com>
Date: Fri May 13 15:58:10 2016 +0200
xrandrprovider: Do not use separate lists for unbound / source / offload slaves
A single provider can be both a offload and source slave at the same time,
the use of seperate lists breaks in this case e.g. :
xrandr --listproviders
Providers: number : 2
Provider 0: id: 0x7b cap: 0xf, Source Output, Sink Output, Source Offload, Sink Offload crtcs: 3 outputs: 2 associated providers: 0 name:modesetting
Provider 1: id: 0x46 cap: 0xf, Source Output, Sink Output, Source Offload, Sink Offload crtcs: 2 outputs: 5 associated providers: 0 name:modesetting
xrandr --setprovideroutputsource 1 0x7b
xrandr --listproviders
Providers: number : 2
Provider 0: id: 0x7b cap: 0xf, Source Output, Sink Output, Source Offload, Sink Offload crtcs: 3 outputs: 2 associated providers: 1 name:modesetting
Provider 1: id: 0x46 cap: 0xf, Source Output, Sink Output, Source Offload, Sink Offload crtcs: 2 outputs: 5 associated providers: 1 name:modesetting
xrandr --setprovideroffloadsink 1 0x7b
xrandr --listproviders
Providers: number : 3
Provider 0: id: 0x7b cap: 0xf, Source Output, Sink Output, Source Offload, Sink Offload crtcs: 3 outputs: 2 associated providers: 2 name:modesetting
Provider 1: id: 0x46 cap: 0xf, Source Output, Sink Output, Source Offload, Sink Offload crtcs: 2 outputs: 5 associated providers: 2 name:modesetting
Provider 2: id: 0x46 cap: 0xf, Source Output, Sink Output, Source Offload, Sink Offload crtcs: 2 outputs: 5 associated providers: 2 name:modesetting
Not good. The problem is that the provider with id 0x46 now is on both
the output_slave_list and the offload_slave_list of the master screen.
This commit fixes this by unifying all 3 lists into a single slaves list.
Note that this does change the struct _Screen definition, so this is an ABI
break. I do not expect any of the drivers to actually use the removed / changed
fields so a recompile should suffice.
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Reviewed-by: Dave Airlie <airlied@redhat.com>
commit bab0f450a719a11799491043b82c2f293fed27fe
Author: Chris Wilson <chris@chris-wilson.co.uk>
Date: Sat Feb 14 09:58:44 2015 +0000
present: Fix presentation of flips out of order
The flip queue currently only holds events submitted to the driver for
flipping, awaiting the completion notifier. It is short. We therefore
can speed up interrupt processing by keeping the small number of events
ready to be flipped on the end of the flip queue. By appending the
events to the flip_queue in the order that they become ready, we also
resolve one issue causing Present to display frames out of order.
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Reviewed-and-tested-by: Mario Kleiner <mario.kleiner.de@gmail.com>
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
commit fbe660b7652b945bdd8e3eb0780179d83cc7de96
Author: Chris Wilson <chris@chris-wilson.co.uk>
Date: Sat Feb 14 09:58:43 2015 +0000
present: Improve scaling of vblank handler
With large numbers of queued vblank, the list iteration on every
interupt dominates processing time. If we reorder the list to be in
ascending event order, then not only is also likely to be in order for
notification queries (i.e. the notification will be near the start of
the list), we can also stop iterating when past the target event_id.
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Reviewed-and-tested-by: Mario Kleiner <mario.kleiner.de@gmail.com>
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
commit c6511d0142040654140bdedd6f03d43af0abba21
Author: Maarten Lankhorst <maarten.lankhorst@canonical.com>
Date: Wed Oct 2 15:47:54 2013 +0200
exa: only draw valid trapezoids
Fixes freedesktop.org bug https://bugs.freedesktop.org/show_bug.cgi?id=67484
If t->bottom is close to MIN_INT, removing top can wraparound, so do the check properly.
A similar fix should also be applied to pixman.
Signed-off-by: Maarten Lankhorst <maarten.lankhorst@canonical.com>
Reviewed-by: Hans de Goede <hdegoede@redhat.com>
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
commit 2d6230e77348e550c90e00c007b113ce38c81d12
Author: Keith Packard <keithp@keithp.com>
Date: Tue Jun 14 17:09:07 2016 -0700
glamor: Use DestroyPixmap instead of FreePicture for glyph atlas pixmap
Nice of FreePicture to take a void * instead of a PicturPtr so that
this error wasn't caught by the compiler.
Noticed when resetting the X server left a dangling pixmap around.
Signed-off-by: Keith Packard <keithp@keithp.com>
Reviewed-by: Michel Dänzer <michel.daenzer@amd.com>
commit edd24aa50b17849b904a3ac5429e333bac9bac9c
Author: Olivier Fourdan <ofourdan@redhat.com>
Date: Mon Jun 6 09:22:28 2016 +0200
wayland: clear resource for pixmap on unrealize
On cursor unrealize, the associated pixmap is destroyed, make sure we
clear the pointer from the private resource and check for the value
being non-null when setting or destroying the cursor.
Signed-off-by: Olivier Fourdan <ofourdan@redhat.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=96246
commit 941aeb3b92e644923bd112eef8023f033a140ee6
Author: Olivier Fourdan <ofourdan@redhat.com>
Date: Fri May 13 08:58:58 2016 +0200
randr: Do not update ConnectionInfo if NULL
RRScreenSizeNotify() will update the connection information block, but
if this occurs during initialization before ConnectionInfo is even
initialized, this will lead to a crash.
Simply check for ConnectionInfo prior to update it to avoid the crash.
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=95337
Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Olivier Fourdan <ofourdan@redhat.com>
commit 6a6bbc3b756706bdade01434f1ee8d8cbe7dd854
Author: Olivier Fourdan <ofourdan@redhat.com>
Date: Thu May 12 14:51:51 2016 +0200
xwayland: Restore wl_display_roundtrip() in InitInput
This partially revert commit 984be78
The rountrip in Xwayland's InitInput() is unlikely the culprit for the
crash reported in bug 95337, even though it's triggered from
InitInput().
Startup goes like this:
xwl_screen_init()
xwl_output_create()
wl_display_roundtrip()
InitInput()
wl_display_roundtrip()
ConnectionInfo initialized
What happens in bug 95337 is that some output data is already available
when we reach InitInput()'s wl_display_roundtrip() and therefore we end
up trying to update the ConnectionInfo's data from RR routines before
ConnectionInfo is actually initialized.
Removing the wl_display_roundtrip() from InitInput() will not fix the
issue (although it would make it less lileky to happen), because
xwl_screen_init() also does a wl_display_roundtrip() after creating the
output, so the race that led to bug 95337 remains.
However, re-setting the xwl_screen->expecting_event to 0 again in
InitInput() still doesn't seem right. so this part is not restored
(thus a partial revert).
Signed-off-by: Olivier Fourdan <ofourdan@redhat.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=95337
commit 6cb34816afa95d9214199c363f9b4bb5ecbae77b
Author: Adam Jackson <ajax@redhat.com>
Date: Fri Apr 29 14:22:52 2016 -0400
xace: Remove the audit hooks and tune dispatch
There are no in-tree consumers of the audit hooks, and they are in any
case redundant with the dtrace dispatch hooks. Neither is there any
in-tree user of the core request dispatch hook. The extension hook is
only used for non-default security cases, but in the absence of LTO we
always have to take the function call into XaceHookDispatch to find out
that there's no callback registered.
Cc: Eamon Walsh <ewalsh@tycho.nsa.gov>
Signed-off-by: Adam Jackson <ajax@redhat.com>
Reviewed-by: Keith Packard <keithp@keithp.com>
commit da9fec4eddd554b4b709ba58b4436aef5a76cd51
Author: Eric Biggers <ebiggers3@gmail.com>
Date: Thu Jun 9 19:45:15 2016 -0500
Allow ConstantDeceleration < 1.0
As documented in xorg.conf(5), a value of ConstantDeceleration between 0
and 1 will speed up the pointer. However, values less than 1 actually
had no effect. Fix this.
Note that this bug only affected "ConstantDeceleration" as configured
through xorg.conf, not "Device Accel Constant Deceleration" as configured
through xinput. The property handler AccelSetDecelProperty() also did
not need to be changed, as it did not limit the values of the property.
Fixes: https://bugs.freedesktop.org/show_bug.cgi?id=92766
Signed-off-by: Eric Biggers <ebiggers3@gmail.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 7cf80b9714864c3c4eb9898ff1b7d657ecd16df7
Author: Adam Jackson <ajax@redhat.com>
Date: Wed Jun 1 14:27:23 2016 -0400
xfree86: Don't swallow ±iglx command line flag
We want to notice that it's set, but still pass it through to dix.
Return 0 to indicate this.
Signed-off-by: Adam Jackson <ajax@redhat.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 4653793de3860f2d83a39919af348527bc719794
Author: Olivier Fourdan <ofourdan@redhat.com>
Date: Wed Jun 8 17:10:11 2016 +0200
wayland: Remove unused field in xwl_screen
Can't find any reference of pointer_limbo_window in the code, let's
remove it.
Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Olivier Fourdan <ofourdan@redhat.com>
commit c69bd15e00aea2610834d05f63777f9bf20eca34
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Wed Jun 1 14:38:54 2016 +1000
Allow compile-time selection of a fallback input driver
A new --with-fallback-input-driver=foo option allows selecting a
fallback driver for the server if the driver configured for the device
is not found. Note that this only applies when the device has a driver
assigned and that module fails to load, devices without a driver are
ignored as usual.
This avoids the situation where a configuration assigns e.g. the
synaptics driver but that driver is not available on the system,
resulting in a dead device. A fallback driver can at least provides some
functionality.
This becomes more important as we move towards making other driver true
leaf nodes that can be installed/uninstalled as requested. Specifically,
wacom and synaptics, a config that assigns either driver should be
viable even when the driver itself is not (yet) installed on the system.
It is up to the distributions to make sure that the fallback driver is
always installed. The fallback driver can be disabled with
--without-fallback-input-driver and is disabled by default on non-Linux
systems because we don't have generic drivers on those platforms.
Default driver on Linux is libinput, evdev is the only other serious
candidate here.
Sample log output:
[ 3274.421] (II) config/udev: Adding input device SynPS/2 Synaptics TouchPad (/dev/input/event4)
[ 3274.421] (**) SynPS/2 Synaptics TouchPad: Applying InputClass "touchpad weird driver"
[ 3274.421] (II) LoadModule: "banana"
[ 3274.422] (WW) Warning, couldn't open module banana
[ 3274.422] (II) UnloadModule: "banana"
[ 3274.422] (II) Unloading banana
[ 3274.422] (EE) Failed to load module "banana" (module does not exist, 0)
[ 3274.422] (EE) No input driver matching `banana'
[ 3274.422] (II) Falling back to input driver `libinput'
.. server proceeds to assign libinput, init the device, world peace and rainbows
everywhere, truly what a sight. Shame about the banana though.
Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit a6b6e8ba026acedef6336b17adf06aebddd5f22f
Author: Dave Airlie <airlied@gmail.com>
Date: Fri May 6 10:46:14 2016 +1000
prime: clean up slave bo properly. (v3)
This is an ABI break, in that we now pass NULL to a function that hasn't
accepted it before.
Alex Goins had a different patch for this but it wasn't symmetrical, it
freed something in a very different place than it allocated it, this
attempts to retain symmetry in the releasing of the backing bo.
v2: use a new toplevel API, though it still passes NULL to something
that wasn't expecting it.
v3: pass -1 instead of 0.
Signed-off-by: Dave Airlie <airlied@redhat.com>
Tested-by: Hans de Goede <hdegoede@redhat.com>
Reviewed-by: Hans de Goede <hdegoede@redhat.com>
Reviewed-by: Alex Goins <agoins at nvidia.com>
commit aa5390aa83be55f887e3b4f78681b4f3d3386eb5
Author: Adam Jackson <ajax@redhat.com>
Date: Mon May 9 14:18:32 2016 -0400
xfree86: Remove redundant parse of AIGLX server flag
Not visible in the patch, but the same stanza is repeated below inside
the #ifdef GLXEXT. There's no reason to bother with checking it if we
built without GLXEXT so remove the unconditional one.
Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit 166d4c817897f5aa197f639bf06b5b3e04994496
Author: Michel Dänzer <michel.daenzer@amd.com>
Date: Fri Jun 3 10:25:20 2016 +0900
xwayland: Call eglBindAPI after eglInitialize
Current Mesa Git master checks that the EGL display actually supports
the API passed to eglBindAPI, which can only succeed after
eglInitialize.
Signed-off-by: Michel Dänzer <michel.daenzer@amd.com>
Reviewed-by: Pekka Paalanen <pekka.paalanen@collabora.co.uk>
commit d798b8318adf298bc23166e74f31e49805f0d881
Author: Michel Dänzer <michel.daenzer@amd.com>
Date: Fri Jun 3 10:25:19 2016 +0900
glamor: Call eglBindAPI after eglInitialize
Current Mesa Git master checks that the EGL display actually supports
the API passed to eglBindAPI, which can only succeed after
eglInitialize.
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=96344
Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Michel Dänzer <michel.daenzer@amd.com>
commit 5bcdd1cc753d8e60c249eeacba695653af1a39d8
Author: Adam Jackson <ajax@redhat.com>
Date: Tue Jun 7 15:52:15 2016 -0400
dix: Update some comments to reflect the new non-SIGIO input model
Signed-off-by: Adam Jackson <ajax@redhat.com>
Reviewed-by: Keith Packard <keithp@keithp.com>
commit 48a9b29b0a09b865492d60e8a7cd2a94864fbb3f
Author: Adam Jackson <ajax@redhat.com>
Date: Tue Jun 7 15:52:14 2016 -0400
xfree86: Undocument UseSIGIO in xorg.conf
The doc text is wrong at this point, input processing isn't going to
vary based on this, so we shouldn't say it does. The only thing this
_does_ get used for is DRI1 SwapBuffers (on everything but savage), and
if you disable it you're not going to get DRI1 at all, so we really
shouldn't even mention it.
Still, leave the option wired up to the parser so we don't break any
DRI1-driver-using setup relying on it being disabled, and so we don't
complain about unused options elsewhere.
Signed-off-by: Adam Jackson <ajax@redhat.com>
Acked-by: Keith Packard <keithp@keithp.com>
commit 2725dd024de33e96555cbf6ff28184a64d515c3c
Author: Adam Jackson <ajax@redhat.com>
Date: Tue Jun 7 15:52:13 2016 -0400
dri1: Hide the SIGIO details from drivers
Not being used, and not likely to be useful.
Signed-off-by: Adam Jackson <ajax@redhat.com>
Acked-by: Keith Packard <keithp@keithp.com>
commit 95ce2bccdcdc88355262674a636c342c946914da
Author: Adam Jackson <ajax@redhat.com>
Date: Tue Jun 7 15:52:12 2016 -0400
dmx: Remove SIGIO input support here too
This code was broken anyway. Note that DEVICE_OFF would make dmx think
_no_ devices were using SIGIO anymore, which means 'xinput disable' on
your mouse would probably do weird things to your keyboard too. Rather
than try to repair that and keep SIGIO working on this one niche DDX,
just rip it out and use the thread model like everyone else.
Signed-off-by: Adam Jackson <ajax@redhat.com>
Acked-by: Keith Packard <keithp@keithp.com>
commit 6178b1c91cfc9e860914acc6f0be2f2d2e07a124
Author: Adam Jackson <ajax@redhat.com>
Date: Tue Jun 7 15:52:11 2016 -0400
dix: Use OsSignal() not signal()
As the man page for the latter states:
The effects of signal() in a multithreaded process are unspecified.
We already have an interface to call sigaction() instead, use it.
Signed-off-by: Adam Jackson <ajax@redhat.com>
Reviewed-by: Keith Packard <keithp@keithp.com>
commit 8174daa6bd3f0c792425a5ebef63a6a9ce7d00a4
Author: Keith Packard <keithp@keithp.com>
Date: Sun Jun 5 12:32:19 2016 -0700
os: Do timers under input lock, not blocked signals
Timer processing can happen on either the main thread or the input
thread. As a result, it must be done under the input lock.
Signals are unrelated to timers now that SIGIO isn't used for input
processing, so stop blocking signals while processing timers.
Signed-off-by: Keith Packard <keithp@keithp.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 88e981e7088198fabea6c322c58f371d91578b6a
Author: Olivier Fourdan <ofourdan@redhat.com>
Date: Wed Mar 9 10:33:50 2016 +0100
xwayland: sync event queue to check compositor reply
Read and dispatch pending Wayland events to make sure we do not miss a
possible reply from the compositor prior to discard a key repeat.
Signed-off-by: Olivier Fourdan <ofourdan@redhat.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 26ad25a0ed1d99f3cacb711793c830cb5249580e
Author: Olivier Fourdan <ofourdan@redhat.com>
Date: Wed Mar 9 11:17:27 2016 +0100
xwayland: refactor Wayland event handling
To be able to reuse some code.
Signed-off-by: Olivier Fourdan <ofourdan@redhat.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 239705a6feefaddf90be9541a054ebd8c8c10d81
Author: Olivier Fourdan <ofourdan@redhat.com>
Date: Wed Mar 9 10:31:58 2016 +0100
xwayland: add a server sync before repeating keys
Key repeat is handled by the X server, but input events need to be
processed and forwarded by the Wayland compositor first.
Make sure the Wayland compositor is actually processing events, to
avoid repeating keys in Xwayland while the Wayland compositor cannot
deal with input events for whatever reason, thus not dispatching key
release events, leading to repeated keys while the user has already
released the key.
Bugzilla: https://bugzilla.gnome.org/show_bug.cgi?id=762618
Signed-off-by: Olivier Fourdan <ofourdan@redhat.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
commit fda5675f9d257d583ea0683adf863c5e1e51e30c
Author: Olivier Fourdan <ofourdan@redhat.com>
Date: Wed Mar 9 10:31:13 2016 +0100
xkb: add hook to allow/deny AccessX key repeat
The xserver generates the key repeat by itself.
But when used with another server processing inputs first (e.g. a
Wayland compositor), the other server may be busy dealing with some
other things and not queue up key release events in time.
Add a vfunc in XkbSrvInfo to possibly add a check before re-emitting a
keypress event in the AccessX timer handler, so that the key repeat has
a chance to be denied if the server processing the input is not ready.
Signed-off-by: Olivier Fourdan <ofourdan@redhat.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 3735ab965a4642273d070840bda4e827991e5219
Merge: 7c77c42fe8 43dbc556f3
Author: Keith Packard <keithp@keithp.com>
Date: Thu Jun 2 07:47:16 2016 -0700
Merge remote-tracking branch 'daenzer/for-master'
commit 7c77c42fe87316e5c68611f03b0bda96656c4a4c
Author: Keith Packard <keithp@keithp.com>
Date: Fri May 27 17:36:57 2016 -0700
dix: Don't update current time in the middle of input event processing
In patch 137ac094e7ab8c871f3b36e40ad826ac797f0e26, Adam moved an
expensive call to UpdateCurrentTime out of the main dispatch
loop. That's a good change as the original fix from Chase was a bit
expensive. However, it breaks grab processing and so a couple of the
calls to UpdateCurrenTime need to be removed.
Input event processing can generate a stream of events; a button press
that activates a grab will send a press followed by a sequence of
enter/leave events. All of these should have the same time stamp on
the wire as they occur at the 'same' time.
More importantly, the grab time recorded in the device is pulled from
currentTime after all of the events are delivered, so if currentTime
doesn't match the time in the device event, then future grab
modifications will fail as the time marked in the device will be
'later' than the grab time known to the client (which is defined as
the timestamp from the activating input event).
A bit of history here -- it used to be that currentTime was driven
*entirely* by input events; those timestamps didn't even have to be
related to the system time in any way. Then we started doing ICCCM
stuff and people got confused when PropertyNotify events would have
the same timestamp even when delivered minutes apart because no input
events were delivered.
We added code in the server to go update the time, but only if no
input events were pending (so that the clock "wouldn't" go
backwards). The only places where this is necessary is in request
processing which may generate an event with a timestamp, and there
only at the very top of the request processing code so that the whole
request would be processed at the 'same time', just like events.
cc: Chase Douglas <chase.douglas@canonical.com>
cc: Peter Hutterer <peter.hutterer@who-t.net>
cc: Adam Jackson <ajax@redhat.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
Tested-by: Michel Dänzer <michel.daenzer@amd.com>
Acked-by: Peter Hutterer <peter.hutterer@who-t.net>
commit ce6546337487c052b5dd3c04d3d8d4b09d691c3d
Author: Keith Packard <keithp@keithp.com>
Date: Tue May 31 09:38:17 2016 -0700
os: Initialize NotifyFds earlier in startup
If the server calls AbortServer during the first-time initialization
(which can happen if you start the server on an already using
DISPLAY), then the dbus code will shut down and call the notify fd
interface. If the notify fd list hasn't been initialized, the server
will crash.
Signed-off-by: Keith Packard <keithp@keithp.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
commit f0756793e4c30278164d7a5cc483ce6a311c58dc
Author: Keith Packard <keithp@keithp.com>
Date: Tue May 31 09:14:17 2016 -0700
os: Lock input while messing with input device list
The list of input devices may be changed by hotplugging while the
server is active, and those changes may come from either the main
thread or the input thread. That means the list of input devices needs
to be protected by a mutex.
This prevents input drivers from receiving I/O ready callbacks after
removing a device.
Signed-off-by: Keith Packard <keithp@keithp.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
commit a779fda224bee0c4d27636503367e55ae93b33c2
Author: Jonas Ådahl <jadahl@gmail.com>
Date: Tue May 24 18:46:42 2016 +0800
xwayland: Use the CLOCK_MONOTONIC clock
By default the X server will try CLOCK_MONOTONIC_COARSE before
CLOCK_MONOTONIC, while A Wayland compositor may only support getting
their timestamps from the CLOCK_MONOTONIC clock. This causes various
issues since it may happen that a timestamp from CLOCK_MONOTONIC
retrieved before a sending an X request will still be "later" than the
timestamp the X server than gets after receiving the request, due to the
fact that CLOCK_MONOTONIC_COARSE has a lower resolution.
To avoid these issues, make Xwayland always use CLOCK_MONOTONIC, so
that it becomes possible for Wayland compositor only supporting
CLOCK_MONOTONIC and X server to use the same clock.
Signed-off-by: Jonas Ådahl <jadahl@gmail.com>
Acked-by: Daniel Stone <daniels@collabora.com>
Tested-by: Olivier Fourdan <ofourdan@redhat.com>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 43dbc556f3a4d743b9121d6cfc21961be4a9da56
Author: Michel Dänzer <michel.daenzer@amd.com>
Date: Thu Dec 24 16:43:44 2015 +0900
xfree86/modes: Remove xf86_reload_cursors v2
No longer needed now that xf86CursorResetCursor is getting called for
each CRTC configuration change.
v2: Keep xf86_reload_cursors as a deprecated empty inline function
until all drivers stop calling it. (Adam Jackson)
Reviewed-by: Adam Jackson <ajax@redhat.com>
commit e156c0ccb530897d3a428255bd5585f7ea7b9b41
Author: Michel Dänzer <michel.daenzer@amd.com>
Date: Wed Mar 30 18:23:04 2016 +0900
os: Use strtok instead of xstrtokenize in ComputeLocalClient
Fixes leaking the memory pointed to by the members of the array returned
by xstrtokenize.
Reviewed-by: Adam Jackson <ajax@redhat.com>
commit 5ff75da317539e87cca429185d710d0eeb9d9222
Author: Michel Dänzer <michel.daenzer@amd.com>
Date: Thu May 26 19:01:59 2016 +0900
glamor: Cannot use copies when accessing outside of composite source
Commit b64108fa ("glamor: Check for composite operations which are
equivalent to copies") failed to copy conditions from exaComposite which
ensure that the composite operation doesn't access outside of the source
picture.
This fixes rendercheck regressions from the commit above.
Reviewed-by: Keith Packard <keithp@keithp.com>
commit 84e0d5d63c393fc36e91433cd7897e776e82528c
Author: Michel Dänzer <michel.daenzer@amd.com>
Date: Fri May 27 16:58:19 2016 +0900
xfree86/modes: Assign xf86_config->cursor in xf86_load_cursor_image v2
Fixes a crash on startup in the radeon driver's drmmode_show_cursor()
due to xf86_config->cursor == NULL, because no CRTC was enabled yet, so
xf86_crtc_load_cursor_image was never called.
(Also use scrn->pScreen instead of xf86ScrnToScreen(scrn))
v2: Set xf86_config->cursor at the beginning of xf86_load_cursor_image
instead of at the end.
Reviewed-by: Keith Packard <keithp@keithp.com>
commit 28b2c880a9dbfd91e82397a0f22482d258a8b670
Author: Keith Packard <keithp@keithp.com>
Date: Sun May 29 19:11:50 2016 -0700
xfree86: Provide xf86BlockSIGIO and xf86ReleaseSIGIO as wrappers for input mutex
Threaded input doesn't use SIGIO anymore, but existing drivers using
xf86BlockSIGIO and xf86ReleaseSIGIO probably want to lock the input
mutex during those operations. Provide inline functions to do this
which are marked as 'deprecated' so that drivers will get warnings
until they are changed.
Signed-off-by: Keith Packard <keithp@keithp.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 2bed654be7001407ae65f7128440340fd3c1f083
Author: Keith Packard <keithp@keithp.com>
Date: Sun May 29 19:05:13 2016 -0700
dix: Remove bogus input_mutex and input_mutex_count definitions from globals.c
These are local to inputthread.c; the ones in globals.c aren't
declared in any header file.
Signed-off-by: Keith Packard <keithp@keithp.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 06bdc3bc1aeca2635d0f711ac7eef34796e28339
Author: Keith Packard <keithp@keithp.com>
Date: Sun May 29 01:14:59 2016 -0700
os: fix input_mutex_count off-by-one in input_force_unlock
input_force_unlock was mis-using input_mutex_lock and leaving it set
to -1. As this is executed from OsInit at each server generation, on
the second time through, the mutex would be left locked (!) due to the
trylock call. This caused input to fail after the first server reset.
Signed-off-by: Keith Packard <keithp@keithp.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
commit de3620065945f199a203afb831cac99bb8bff75b
Author: Keith Packard <keithp@keithp.com>
Date: Fri May 27 17:51:01 2016 -0700
xfree86: Remove event reading code from xf86Wakeup
Oops. This didn't get removed when xfree86 was converted over to use
the input thread.
Signed-off-by: Keith Packard <keithp@keithp.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
commit c9703007ea77a8aa5aba4e7bc7367814526056fe
Author: Keith Packard <keithp@keithp.com>
Date: Sat May 28 10:34:07 2016 -0700
Add ax_pthread.m4 to m4/
Threaded input requires AX_PTHREAD, which is provided by this file.
Signed-off-by: Keith Packard <keithp@keithp.com>
Acked-by: Peter Hutterer <peter.hutterer@who-t.net>
commit c07b796b47ae7f5a616d5e8e02ab0f84dc438a93
Author: Keith Packard <keithp@keithp.com>
Date: Sun May 29 18:38:18 2016 -0700
xfree86: Bump ABI versions
threaded input can affect drivers that use OsBlockSIGIO when dealing
with cursors.
Signed-off-by: Keith Packard <keithp@keithp.com>
Requested-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 24e4c6db25aef7a057f3f384f1e2ce67e66fa40e
Author: Keith Packard <keithp@keithp.com>
Date: Sun May 29 18:43:00 2016 -0700
test: Actually verify that two equivalent touch points are the same
I typo'd when fixing this at Peter's request and left off the '2' from
the second variable name.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 1338bfa81c6eddc66f07c15225c3feff062182ce
Author: Keith Packard <keithp@keithp.com>
Date: Fri May 27 01:56:39 2016 -0700
test: Make touch test reflect new ability to realloc touch array [v2]
Threaded input allows the input code to call malloc while processing
events. In this case, that's in the middle of processing touch events
and needing to resize the touch buffer.
This test was expecting the old behaviour where touch points would get
dropped if the buffer was full. The fix is to check for the new
behaviour instead.
[v2]
* make sure two finding two equivalent touches return the same touch
object
* check to make sure the queue resizes by the expected amount
Changes provided by Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Keith Packard <keithp@keithp.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 8b9b4387e8473810f6174519ee76818fcaae725d
Author: Keith Packard <keithp@keithp.com>
Date: Fri May 27 10:55:02 2016 -0700
glamor: Adjust for drawable x/y in composite's copy optimization
Patch b64108fa305e956e4edaae9d53071ff0abee268e added a short cut that
identifies composite operations that can be performed with a simple
copy instead.
glamor_copy works in absolute coordinates, so the dx and dy values
passed in need to be converted from drawable-relative to absolute by
adding the drawable x/y values.
Signed-off-by: Keith Packard <keithp@keithp.com>
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
commit 0d16a0c3b95d4ac446a07d8b95e634de5cb8055f
Author: Keith Packard <keithp@keithp.com>
Date: Thu May 26 10:22:17 2016 -0700
os: Increase default client buffer to 16kB
This matches a change made in xcb and improves performance for a small
increase in memory usage.
Signed-off-by: Keith Packard <keithp@keithp.com>
Reviewed-by: Hans de Goede <hdegoede@redhat.com>
commit 714736124f2bfba9ede076eff3bf017f986ce6c4
Author: Keith Packard <keithp@keithp.com>
Date: Fri May 27 02:02:48 2016 -0700
modesetting: Use new xf86CurrentCursor API
Use this instead of the (now deprecated) cursor pointer in the
xf86CrtcConfigRec.
Signed-off-by: Keith Packard <keithp@keithp.com>
Reviewed-by: Michel Dänzer <michel.daenzer@amd.com>
commit e69061e605c66084056cf2064dcc5d4c6c8aa0cf
Author: Keith Packard <keithp@keithp.com>
Date: Tue Dec 8 14:26:50 2015 -0800
kdrive: Use threaded input
Signed-off-by: Keith Packard <keithp@keithp.com>
Acked-by: Peter Hutterer <peter.hutterer@who-t.net>
commit a977c9c4d07a04c0c7b3713a21eefb92a8d3005b
Author: Keith Packard <keithp@keithp.com>
Date: Tue Dec 8 14:53:08 2015 -0800
xfree86: Use threaded input mechanism [v2]
Switch the XFree86 DDX over to threaded input
v2: Rewrite comment in xf86Helper about silken mouse
Signed-off-by: Keith Packard <keithp@keithp.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
commit f84703b50cc908a127f4ad923ebbf56f8f244c0d
Author: Keith Packard <keithp@keithp.com>
Date: Tue Dec 8 14:20:21 2015 -0800
dix: Reallocate touchpoint buffer at input event time [v2]
Now that input is threaded, malloc can be used at event time to resize
the touchpoint buffer as needed.x
v2: Remove "Need to grow the queue means dropping events."
from comment as it no longer applies. (Peter Hutterer)
Signed-off-by: Keith Packard <keithp@keithp.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
commit e2df803fcabd7c2d2fc7991c794856378dcb5489
Author: Keith Packard <keithp@keithp.com>
Date: Tue Dec 8 19:53:36 2015 -0800
mi: Grow event queue while reading events
Now that events are read at normal process time, we can use malloc to
grow the event queue instead of discarding events.
Signed-off-by: Keith Packard <keithp@keithp.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 30ac7567980a1eb79d084a63e0e74e1d9a3af673
Author: Keith Packard <keithp@keithp.com>
Date: Tue Dec 8 11:37:51 2015 -0800
Create a threaded mechanism for input [v7]
The current SIGIO signal handler method, used at generation of input events,
has a bunch of oddities. This patch introduces an alternative way using a
thread, which is used to select() all input device file descriptors.
A mutex was used to control the access to input structures by the main and input
threads. Two pipes to emit alert events (such hotplug ones) and guarantee the
proper communication between them was also used.
Co-authored-by: Fernando Carrijo <fcarrijo@freedesktop.org>
Signed-off-by: Tiago Vignatti <tiago.vignatti@nokia.com>
v2: Fix non-Xorg link. Enable where supported by default.
This also splits out the actual enabling of input threads to
DDX-specific patches which follow
v3: Make the input lock recursive
v4: Use regular RECURSIVE_MUTEXes instead of rolling our own
Respect the --disable-input-thread configuration option by
providing stubs that expose the same API/ABI.
Respond to style comments from Peter Hutterer.
v5: use __func__ in inputthread debug and error mesages.
Respond to style comments from Peter Hutterer.
v6: use AX_PTHREAD instead of inlining pthread tests.
Suggested by Emil Velikov <emil.l.velikov@gmail.com>
v7: Use pthread_sigmask instead of sigprocmask when using threads
Suggested by Adam Jackson <ajax@redhat.com>
Signed-off-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
commit 728c9570a05f03bd90343ff6f5b1a8fd3988864c
Author: Keith Packard <keithp@keithp.com>
Date: Wed Dec 9 14:27:05 2015 -0800
xkb: Hold input lock across injected key event processing
This makes the code more consistent with other versions of
out-of-queue event processing
Signed-off-by: Keith Packard <keithp@keithp.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 05d549d60440126105d5a70272e72ea2319724bd
Author: Keith Packard <keithp@keithp.com>
Date: Thu Dec 17 22:21:46 2015 -0800
xfree86: Remove unnecessary errno save/restore in xf86ReadInput
When this code was called from SIGIO, saving and restoring errno could
possibly have made sense in some strange environment. Now that this
will not be called from a signal handler, there is no reason to do that.
Signed-off-by: Keith Packard <keithp@keithp.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 0bbb5aabf794720fa99ae5ea3f55138ded159705
Author: Keith Packard <keithp@keithp.com>
Date: Mon May 16 21:33:41 2016 -0500
kdrive: Don't lock input across read in KdNotifyFd
We won't need these locks with the new threaded input code as it holds
the input lock across all of the input device I/O operations.
Signed-off-by: Keith Packard <keithp@keithp.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 6a5a4e60373c1386b311b2a8bb666c32d68a9d99
Author: Keith Packard <keithp@keithp.com>
Date: Tue Dec 8 14:39:46 2015 -0800
Remove SIGIO support for input [v5]
This removes all of the SIGIO handling support used for input
throughout the X server, preparing the way for using threads for input
handling instead.
Places calling OsBlockSIGIO and OsReleaseSIGIO are marked with calls
to stub functions input_lock/input_unlock so that we don't lose this
information.
xfree86 SIGIO support is reworked to use internal versions of
OsBlockSIGIO and OsReleaseSIGIO.
v2: Don't change locking order (Peter Hutterer)
v3: Comment weird && FALSE in xf86Helper.c
Leave errno save/restore in xf86ReadInput
Squash with stub adding patch (Peter Hutterer)
v4: Leave UseSIGIO config parameter so that
existing config files don't break (Peter Hutterer)
v5: Split a couple of independent patch bits out
of kinput.c (Peter Hutterer)
Signed-off-by: Keith Packard <keithp@keithp.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 8cf832c288dec13cbf3c25478a8ccef52d61f3db
Author: Keith Packard <keithp@keithp.com>
Date: Mon May 16 21:28:48 2016 -0500
kdrive: Remove unneeded AddEnabledDevice/RemoveEnabledDevice calls
kdrive uses the NotifyFd interface, which handles all of the necessary
fd configuration in the OS layer. Having it also use the old
EnableDevice interfaces is incorrect.
Signed-off-by: Keith Packard <keithp@keithp.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 4fca18dc03669bada75175df289fbee41275208e
Author: Adam Jackson <ajax@redhat.com>
Date: Mon May 9 13:28:08 2016 -0400
xfree86: Add IndirectGLX server flag (v2)
Not all display managers make it easy (or possible) to modify the
command line flags passed to the server, so add a way to get to it from
xorg.conf.
v2: Fix the FlagOptions list to not have IGLX after the terminator (Alan
Coopersmith)
Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit 181a4bd0cc436f89582408196038ff37032f9bac
Author: Keith Packard <keithp@keithp.com>
Date: Fri May 13 16:19:38 2016 -0700
glamor: Preserve GL_RED bits in R channel when destination is GL_RED [v2]
A1 and A8 pixmaps are usually stored in the Red channel to conform
with more recent GL versions. When using these pixmaps as mask values,
that works great. When using these pixmaps as source values, then the
value we want depends on what the destination looks like.
For RGBA or RGB destinations, then we want to use the Red channel
for A values and leave RGB all set to zero.
For A destinations, then we want to leave the R values in the Red
channel so that they end up in the Red channel of the output.
This patch adds a helper function, glamor_bind_texture, which performs
the glBindTexture call along with setting the swizzle parameter
correctly for the Red channel. The swizzle parameter for the Alpha
channel doesn't depend on the destination as it's safe to leave it
always swizzled from the Red channel.
This fixes incorrect rendering in firefox for this page:
https://gfycat.com/HoarseCheapAmericankestrel
while not breaking rendering for this page:
https://feedly.com
v2: Add change accidentally left in patch for missing
glDisable(GL_COLOR_LOGIC_OP).
Found by Emil Velikov <emil.l.velikov@gmail.com>
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=63397
Signed-off-by: Keith Packard <keithp@keithp.com>
Tested-by: Michel Dänzer <michel.daenzer@amd.com>
commit b07bc700b3cf2f5c8912fc5b9e0dad2baf395525
Author: Keith Packard <keithp@keithp.com>
Date: Sat May 14 08:22:17 2016 -0700
glamor: glamor_make_current sooner in glamor_composite_with_shader
glamor_make_current is supposed to be called before any GL APIs.
Signed-off-by: Keith Packard <keithp@keithp.com>
Reviewed-by: Michel Dänzer <michel.daenzer@amd.com>
commit 743b6f231e999d8b2909228412266dc13cc433c5
Author: Keith Packard <keithp@keithp.com>
Date: Fri May 13 04:25:43 2016 -0700
glamor: Disable logic ops when doing compositing [v4]
If the logic op gets left enabled, it overrides the blending
operation, causing incorrect contents on the display.
v2: Disable only on non-ES2, but disable even for PictOpSrc
v3: Found another place this is needed in
glamor_composite_set_shader_blend
v4: Remove change dependent on new glamor_set_composite_texture
API. This belongs in a different patch.
Found by Emil Velikov <emil.l.velikov@gmail.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
Reviewed-by: Michel Dänzer <michel.daenzer@amd.com>
commit f5670b4a7eb3b43fa20017f89192394930eae6f4
Author: Keith Packard <keithp@keithp.com>
Date: Wed Mar 9 11:13:14 2016 -0800
xfree86: Set xf86CrtcConfigRec cursor pointer to NULL in HideCursor
This makes the cursor pointer held by xf86Cursors.c get reset to NULL
whenever the cursor isn't displayed, and means that the reference
count held in xf86Cursor.c is sufficient to cover the reference in
xf86Cursors.c.
As HideCursor may be called in the cursor loading path after
UseHWCursor or UseHWCursorARGB when HARDWARE_CURSOR_UPDATE_UNHIDDEN
isn't set in the Flags field, the setting of the cursor pointer had to
be moved to the LoadCursor paths.
LoadCursorARGBCheck gets the cursor pointer, but LoadCursorImageCheck
does not. For LoadCursorImageCheck, I added a new function,
xf86CurrentCursor, which returns the current cursor. With this new
function, we can eliminate the cursor pointer from the
xf86CrtcConfigRec, once drivers are converted over to use it.
Signed-off-by: Keith Packard <keithp@keithp.com>
Acked-by: Peter Hutterer <peter.hutterer@who-t.net>
commit b64108fa305e956e4edaae9d53071ff0abee268e
Author: Michel Dänzer <michel.daenzer@amd.com>
Date: Wed May 25 19:09:23 2016 +0900
glamor: Check for composite operations which are equivalent to copies
Increases x11perf -compwinwin500 numbers by a factor of 10 for me with
radeonsi.
Conditions copied from exaComposite().
Signed-off-by: Michel Dänzer <michel.daenzer@amd.com>
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
commit 4711ebc174206b5a50e6ae8a7f974cd835e4ebd3
Author: Michel Dänzer <michel.daenzer@amd.com>
Date: Tue May 24 18:12:42 2016 +0900
glamor: Fix sampling outside of RGBx source/mask pictures
RENDER requires that sampling outside of any source/mask picture results
in alpha == 0.0.
The OpenGL border colour cannot set alpha = 0.0 if the texture format
doesn't have an alpha channel, so we have to use the RepeatFix handling
in that case.
Also, only force alpha = 1.0 when sampling inside of RGBx source/mask
pictures.
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=94514
Signed-off-by: Michel Dänzer <michel.daenzer@amd.com>
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
commit 4d649d51770cace4d7c1e51d9a199ac7a056c30a
Author: Keith Packard <keithp@keithp.com>
Date: Wed May 18 16:03:48 2016 -0500
mi: Remove miPointerRec from API
This moves the definition of miPointerRec from mipointrst.h to
mipointer.c so that it is no longer visible in the API, allowing it to
be changed while the API/ABI is frozen.
Reviewed-by: Pekka Paalanen <pekka.paalanen@collabora.co.uk>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 3f9015b6dc9e7e9c97f8717dea6af9f4d8523f2e
Author: Keith Packard <keithp@keithp.com>
Date: Wed May 18 16:03:47 2016 -0500
xwayland: Move sprite invalidation logic into mipointer
This creates a function that invalidates the current sprite and forces
a sprite image reload the next time the sprite is checked, moving that
logic out of the xwayland sources and allowing the miPointerRec
structure to be removed from the server API.
Signed-off-by: Keith Packard <keithp@keithp.com>
Reviewed-by: Pekka Paalanen <pekka.paalanen@collabora.co.uk>
commit 4e124203f2260daaf54155f4a05fe469733e0b97
Author: Adam Jackson <ajax@redhat.com>
Date: Tue May 3 11:24:58 2016 -0400
damage: Make damageRegionProcessPending take a damage not a drawable
In the case where there's no damage monitor on the drawable, we look
that fact up twice: once before rendering to decide whether to compute
damage, and again after to decide whether to append it. This is wasted
effort, as the layer below us is effectively not allowed to change
whether there's a damage monitor for the drawable, but there's no way
the compiler can know that.
Instead, look it up once up front, and change the check macros and
damageRegionProcessPending to take a damage not a drawable.
v2: Explicitly pass pDamage to the macros as well (Michel Dänzer)
Signed-off-by: Adam Jackson <ajax@redhat.com>
Reviewed-by: Michel Dänzer <michel.daenzer@amd.com>
commit 1bb932bf1417ff319a594d7e40f6813a26936784
Author: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
Date: Sat May 7 00:43:33 2016 -0700
XQuartz: Fix default CFBundleVersion
m4/shell variable name collision broke the case when the configure
option was not used
Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
commit 2fbf5c2f91d33efbda573c4be036248b1d8ed7f1
Author: Andrew Comminos <andrew@comminos.com>
Date: Tue Dec 29 23:41:27 2015 -0800
Input: Send XI2 FocusOut NotifyPointer events to the pointer window.
This changes XInput 2's propagation of NotifyPointer focus out events to
include the pointer window as well, similar to core events. This fixes
a potential permanent focus in GDK when the focus moves to PointerRoot.
Fixes: https://bugs.freedesktop.org/show_bug.cgi?id=93539
Signed-off-by: Andrew Comminos <andrew@comminos.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 984be789d5935bc7f695dc61234ef0251ed33679
Author: Olivier Fourdan <ofourdan@redhat.com>
Date: Wed May 11 09:15:19 2016 +0200
xwayland: don't check events as early as InitInput
If data is received during XWayland startup, it will be read early in
InitInput() before the connection data is initialized, causing a crash.
Remove the wayland rountrips from InitInput() as this is done again in
xwl_screen_init() where it seems more appropriate.
Signed-off-by: Olivier Fourdan <ofourdan@redhat.com>
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=95337
Reviewed-by: Adam Jackson <ajax@redhat.com>
commit 3f569435e10df515c6f86289dc986bfc59c6bc18
Author: Adam Jackson <ajax@redhat.com>
Date: Thu Mar 31 16:56:44 2016 -0400
glx: Stop tracking hasUnflushedCommands
This is only meaningful for indirect contexts, and all it does is
(maybe) prevent a flush when switching away from an indirect context.
Indirect contexts aren't worth optimizing for, and Mesa tracks whether
a flush is needed anyway.
Careful readers will note that ReadPixels would reset the flag even
though it doesn't imply a flush!
Reviewed-by: Eric Anholt <eric@anholt.net>
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit 0ebb58f6b6f66afbc3a48bd10693fe190aed8694
Author: Adam Jackson <ajax@redhat.com>
Date: Thu Mar 31 16:20:40 2016 -0400
glx: Remove some redundant zero-init of GLX context state
The context is already calloc'd.
Reviewed-by: Eric Anholt <eric@anholt.net>
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit d5ba09598210063926aeff55ac58d2b7020d9a03
Author: Adam Jackson <ajax@redhat.com>
Date: Thu Mar 31 15:51:39 2016 -0400
glx/dri2: Implement dri2FlushFrontBuffer explicitly
No functional change.
Reviewed-by: Eric Anholt <eric@anholt.net>
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit 0ba4e251a1012bd5a2eab83e2c51006ec3805394
Author: Adam Jackson <ajax@redhat.com>
Date: Thu Mar 31 15:50:34 2016 -0400
glx: Code motion
No functional change, just rearranging some code to make later commits
more obvious.
Reviewed-by: Eric Anholt <eric@anholt.net>
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit f523ebb5492a2e12b76a8b5b7f1b0e5efd4a8040
Author: Adam Jackson <ajax@redhat.com>
Date: Mon Apr 18 12:56:17 2016 -0400
dix: Remove pointless client-state callbacks
Private storage is pre-zeroed by the private system itself.
Signed-off-by: Adam Jackson <ajax@redhat.com>
Reviewed-by: Eric Anholt <eric@anholt.net>
commit 140c2f1a54dbc2503311e9a011e841aa1f277cbd
Author: Michel Dänzer <michel.daenzer@amd.com>
Date: Fri Apr 1 18:24:00 2016 +0900
EXA: Honour op parameter to exaGlyphs even if maskFormat == NULL
Reported-by: Uli Schlachter <psychon@znc.in>
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=94775
Signed-off-by: Michel Dänzer <michel.daenzer@amd.com>
Reviewed-by: Uli Schlachter <psychon@znc.in>
commit 7f0494671f95cfa33f6f2c7c74b20a21f239f8c5
Author: Dave Airlie <airlied@redhat.com>
Date: Fri May 6 05:41:58 2016 +1000
modesetting: fix build with glamor disabled.
Fix build without --enable-glamor.
Caught by the arm tinderbox.
Signed-off-by: Dave Airlie <airlied@redhat.com>
Reviewed-by: Mark Kettenis <kettenis@openbsd.org>
Tested-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 66fdeb880aac0966be9aa41219047ade0148c35f
Author: Emil Velikov <emil.l.velikov@gmail.com>
Date: Mon May 2 23:47:22 2016 +0100
xfree86: drop unneeded strdup for modulepath/logfile
The destination variable is never freed, thus we even plug some memory
leaks.
v2: Rebase against updated xf86CheckPrivs() helper.
Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>
commit 032b1d79b7d04d47814a5b3a9fdd162249fea74c
Author: Emil Velikov <emil.l.velikov@gmail.com>
Date: Mon May 2 23:47:21 2016 +0100
xfree86: use the xf86CheckPrivs() helper for modulepath/logfile
v2: Rebase against updated xf86CheckPrivs() helper.
Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>
commit 0fdd47560468e7b6147c666cc6b9eebcecb68572
Author: Emil Velikov <emil.l.velikov@gmail.com>
Date: Mon May 2 23:47:20 2016 +0100
xfree86: factor out the check priviliges and print a big warning
Current message was quite off "file specified must be a relative path"
and alike. Just factor it out and use "path/file" as needed.
v2: Rework error message, drop "Using default", print actual arg value.
Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>
commit 2378adde6770385c06f7efcd32f270d00d49ce3f
Author: Dave Airlie <airlied@gmail.com>
Date: Fri Apr 29 14:01:33 2016 +1000
modesetting: set capabilities up after glamor and enable offload caps.
This moves the capabilites setting to after glamor is initialised, and
enables the offload caps in cases where they work. This enables DRI2
PRIME support with modesetting.
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
commit 258588224d6b35de12f97d9092efa5cb3e426550
Author: Dave Airlie <airlied@gmail.com>
Date: Fri Apr 29 14:01:32 2016 +1000
xf86Crtc: don't set the root window property on slave GPUs.
Slave GPUs don't have a root window to set this on, so don't.
This fixes some crashes I saw just playing around.
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
commit a41a171bcbae9aeafac2865faa904f15d9b59925
Author: Dave Airlie <airlied@gmail.com>
Date: Fri Apr 29 14:01:31 2016 +1000
modesetting: set driverPrivate to NULL after closing fd.
Otherwise ms_ent_priv will return NULL and things will fall apart.
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
commit fc1f61b75c9712e24ff665f95d62771f39eba1c7
Author: Dave Airlie <airlied@gmail.com>
Date: Fri Apr 29 14:01:30 2016 +1000
randr/provider: only allow slave gpu to be offload sources.
The other way around makes no sense.
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
commit 2d0f151c6195ba94d0320b55227a108e6301a74c
Author: Alex Goins <agoins@nvidia.com>
Date: Fri Apr 29 14:01:29 2016 +1000
modesetting: Consistent whitespace in driver.c
For some reason a couple of the dirty functions in driver.c used 8
spaces per tab instead of 4 like the rest of the file. Fix this to make
it more consistent and give me more room to work in ms_dirty_update in
subsequent commits.
v1: N/A
v2: N/A
v3: N/A
v4: Initial commit
Signed-off-by: Alex Goins <agoins@nvidia.com>
Reviewed-by: Dave Airlie <airlied@redhat.com>
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
commit 137ac094e7ab8c871f3b36e40ad826ac797f0e26
Author: Adam Jackson <ajax@redhat.com>
Date: Fri Apr 1 22:44:26 2016 -0400
dix: Push UpdateCurrentTimeIf down out of the main loop
This was added in:
commit 312910b4e34215aaa50fc0c6092684d5878dc32f
Author: Chase Douglas <chase.douglas@canonical.com>
Date: Wed Apr 18 11:15:40 2012 -0700
Update currentTime in dispatch loop
Unfortunately this is equivalent to calling GetTimeInMillis() once per
request. In the absolute best case (as on Linux) you're only hitting the
vDSO; on other platforms that's a syscall. Either way it puts a pretty
hard ceiling on request throughput.
Instead, push the call down to the requests that need it; basically,
grab processing and event generation.
Cc: Chase Douglas <chase.douglas@canonical.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit ac164e58870d70640381e68b776eb95578c7fbd3
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Wed May 4 20:36:18 2016 +1000
xkb: after changing the keymap, force an indicator update
When NumLock is on and a new keymap is applied, the next modifier state
change will turn off that LED (but leave the state enabled). The cause
for this is a bit convoluted:
* the SLI explicitState is copied from the current state in
ProcXkbGetKbdByName. Thus, if NumLock is on, that state is 0x2.
* on the next modifier key press (e.g. Shift), XkbApplyState() calls into
XkbUpdateIndicators() -> XkbUpdateLedAutoState() to update SLIs (if any)
for the currently changed modifier. But it does so with a mask only for
the changed modifier (i.e. for Shift).
* XkbUpdateLedAutoState() calculates the state based on this mask and
ends up with 0 because we don't have a Shift LED and we masked out the
others.
* XkbUpdateLedAutoState() compares that state with the previous state
(which is still 0x2) and then proceeds to turn the LED off
This doesn't happen in the normal case because either the mask
encompasses all modifiers or the state matches of the masked-out
modifiers matches the old state.
Avoid this issue by forcing an SLI update after changing the keymap.
This updates the sli->effectiveState and thus restores everything to
happy working order.
https://bugzilla.redhat.com/show_bug.cgi?id=1047151
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Daniel Stone <daniels@collabora.com>
commit 059d5ef30490233f410ca87084c7697b87e5b05e
Author: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
Date: Tue May 3 23:43:06 2016 -0700
XQuartz: Update copyright years
Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
commit d6ba4f2c52da150a9a92bdb00efe7902d17033bd
Author: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
Date: Tue May 3 23:42:34 2016 -0700
XQuartz: Add --with-bundle-version and --with-bundle-version-string configure options
Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
commit c1614928c10a8f8400f99acfd1b7f96d503af7ec
Author: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
Date: Tue May 3 23:21:38 2016 -0700
XQuartz: Add --with-sparkle-feed-url configure option
Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
commit 299b01eabf827a7435b5d6004d50637ac710bbc7
Author: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
Date: Tue May 3 23:14:24 2016 -0700
XQuartz: Update release feed URL to use new https URL
Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
commit 16d6733c63727d910eb516d7f6950f4675281f2d
Author: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
Date: Tue May 3 23:24:44 2016 -0700
XQuartz: Fix the help text for --with-bundle-id-prefix
Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
commit 214a66b661dcb56ebb9776e34049753f65c7510a
Author: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
Date: Tue May 3 23:16:46 2016 -0700
XQuartz: Remove --with-launchd-id-prefix
It's been deprecated for years.
Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
commit 2285fe78c04714561a0d1a164a41a38c48263f89
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri Apr 22 15:04:37 2016 +1000
xfree86: add support for MatchIsTabletPad
The tablet pads have been separate kernel devices for a while now and
libwacom has labelled them with the udev ID_INPUT_TABLET_PAD for over a year
now. Add a new MatchIsTabletPad directive to apply configuration options
specifically to the Pad part of a tablet.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Adam Jackson <ajax@redhat.com>
commit fa02b05645080c285da5972262a8d37403e39d7e
Author: Dave Airlie <airlied@redhat.com>
Date: Tue May 3 06:54:57 2016 +1000
modesetting: port clean start code from amdgpu. (v2)
Both radeon and amdgpu don't set the mode until the first blockhandler,
this means everything should be rendered on the screen correctly by
then.
This ports this code, it also removes the tail call of EnterVT from
ScreenInit, it really isn't necessary and causes us to set a dirty mode
with -modesetting always anyways.
v2: reorder set desired modes vs block handler as done for amdgpu.
Reviewed-by: Eric Anholt <eric@anholt.net>
Signed-off-by: Dave Airlie <airlied@redhat.com>
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
commit caabc4e85540dcd4225f2780b5616f7d870fbb06
Author: Dave Airlie <airlied@redhat.com>
Date: Tue May 3 06:54:56 2016 +1000
modesetting: add support for background none.
This adds support using glamor for background None.
loosely based off the amdgpu code. relies on the glamor_finish code.
Acked-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
commit c33250945b45adc447154239f0cf48fb9b2d7335
Author: Adam Jackson <ajax@redhat.com>
Date: Fri Apr 8 11:26:36 2016 -0400
kdrive: Nuke a bunch of dead code
gcc6 says:
keyboard.c:46:21: warning: ‘linux_to_x’ defined but not used
Only referenced by a bunch of long if-0'd code, so chuck it all out.
Reviewed-by: Julien Cristau <jcristau@debian.org>
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit a5dd7b890f4f3a5245639591c73303c5a087b38a
Author: Adam Jackson <ajax@redhat.com>
Date: Fri Apr 8 11:24:50 2016 -0400
dix: Squash some new gcc6 warnings
-Wlogical-op now tells us:
devices.c:1685:23: warning: logical ‘and’ of equal expressions
Reviewed-by: Julien Cristau <jcristau@debian.org>
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit 23dfa017298ceceac818f83779858e490c7757b6
Author: Andreas Schwab <schwab@suse.de>
Date: Thu Apr 28 14:47:33 2016 +0200
x86emu: Change include order to avoid conflict with system header
R_SP is also defined in <sys/ucontext.h> on m68k. Also remove duplicate
definitions.
Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Andreas Schwab <schwab@suse.de>
commit aa4e757130010dd3202f10ec6cb0c306c1dbcfbc
Author: Dave Airlie <airlied@redhat.com>
Date: Fri Mar 11 09:22:00 2016 +1000
glamor: add glamor_finish API
Some drivers are calling glFinish, they really should be doing this.
This also is needed for some reverse prime scenarios.
Signed-off-by: Dave Airlie <airlied@redhat.com>
Reviewed-by: Michel Dänzer <michel.daenzer@amd.com>
Reviewed-by: Eric Anholt <eric@anholt.net>
commit f48b0534f110397246809d279225afedb28aa233
Author: Marek Chalupa <mchqwerty@gmail.com>
Date: Mon Apr 25 11:33:00 2016 +0200
xwayland-shm: fortify fallocate against EINTR
If posix_fallocate or ftruncate is interrupted by signal while working,
we return -1 as fd and the allocation process returns BadAlloc error.
That causes xwayland clients to abort with 'BadAlloc (insufficient
resources for operation)' even when there's a lot of resources
available.
Fix it by trying again when we get EINTR.
Signed-off-by: Marek Chalupa <mchqwerty@gmail.com>
Reviewed-by: Pekka Paalanen <pekka.paalanen@collabora.co.uk>
commit 4cc32880737c2d3e568fdb4867b2dba10fb3998a
Author: Alexandre Courbot <acourbot@nvidia.com>
Date: Wed Mar 23 13:47:37 2016 +0900
configure.ac: Keep environment CFLAGS when testing
DRI2 detection could fail if configure is invoked with a sysroot passed
as CFLAGS. Ideally configure should invoke gcc with the sysroot argument
passed to the configure script, but for some reason this is not done by
AC_COMPILE_IFELSE.
Fix this by ensuring CFLAGS are preserved when checking for stuff.
Signed-off-by: Alexandre Courbot <acourbot@nvidia.com>
Reviewed-by: Emil Velikov <emil.velikov@collabora.com>
commit 16e4bce9e5257c50c80c66efee0d07c2483619e1
Author: Simon Thum <simon.thum@gmx.de>
Date: Fri Apr 8 13:24:39 2016 +0200
dix/ptraccel: Remove float literals
This was fine back when valuators were integer. Device
properties are float (not double), so some instances remain.
Signed-off-by: Simon Thum <simon.thum@gmx.de>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit c8e5fc30575a309c25970fc68b9184c07bb74df4
Author: Simon Thum <simon.thum@gmx.de>
Date: Tue Apr 5 14:29:47 2016 +0200
dix/ptraccel: Fix memory leak in InitPredictableAccelerationScheme
This was quite unlikely except in situations where a proper startup
would have been impossible anyway, but since automated checks don't
grade likelyhood just fix it.
Detected by Jeremy Huddleston's clang checks.
Signed-off-by: Simon Thum <simon.thum@gmx.de>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit f641ae412287ecb7a3437987e2ba1646a8443aa4
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Wed Mar 9 10:45:48 2016 +1000
Xi: don't deliver emulated motion events for non-emulating touches
The touchpoint knows whether it should be emulating or not and we have a check
for that later. Check for this before we generate the event and try to deliver
it, lest we trigger a bug warning.
https://bugzilla.redhat.com/show_bug.cgi?id=1282252
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 577bebe2067293bb154068e99a2ef085b066cb67
Author: Emil Velikov <emil.l.velikov@gmail.com>
Date: Sun Apr 17 20:30:46 2016 +0100
xfree86/parser: simplify #ifdef ladder
Rather than 'hacking' around symbol names and providing macros such as
'Local' just fold things and make the code more readable.
Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
commit 537276a5b86b7341169ea4eb36d479a503ba5d84
Author: Emil Velikov <emil.l.velikov@gmail.com>
Date: Sun Apr 17 20:30:45 2016 +0100
xfree86/parser: reuse StringToToken() in xf86getToken()
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>
commit 944ea03d5be2ffe22a3f1c4c287760261c31235f
Author: Emil Velikov <emil.l.velikov@gmail.com>
Date: Sun Apr 17 20:30:44 2016 +0100
xfree86/parser: move StringToToken() definition further up
... so that we can use it without the forward declaration. Plus we're
doing to reuse it in the next commit ;-)
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>
commit b93be14b7d339e4e46d941729dad853452fae8c0
Author: Emil Velikov <emil.l.velikov@gmail.com>
Date: Sun Apr 17 20:30:43 2016 +0100
xfree86/parser: annotate xf86ConfigSymTabRec as constant data
Add the const notation to all the static storage as well as the
functions that use it - xf86getToken(), xf86getSubTokenWithTab(),
StringToToken() and xf86getStringToken().
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>
commit 3981dcdd489b60fbf356534a509ca93dcbedf769
Author: Emil Velikov <emil.l.velikov@gmail.com>
Date: Sun Apr 17 20:34:43 2016 +0100
dri3: remove unused file dri3int.h
Copied during the prototyping stage and never used.
Cc: Keith Packard <keithp@keithp.com>
Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
commit a1b13cda6169a98d694451fec75e63352e9d90bd
Author: Adam Jackson <ajax@redhat.com>
Date: Wed Jan 6 09:09:21 2016 -0500
xfree86: Remove xf86RegisterRootWindowProperty
All consumers have been ported to the root window callback, so this can
all be nuked.
Reviewed-by: Michel Dänzer <michel.daenzer@amd.com>
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit e89c7f1c2a0ea3480b21446e413073c1427285ae
Author: Adam Jackson <ajax@redhat.com>
Date: Wed Jan 6 09:04:15 2016 -0500
xfree86: Create EDID atom from the root window callback (v2)
v2: Fix swapped callback args
Reviewed-by: Michel Dänzer <michel.daenzer@amd.com>
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit 8e3010d7d8e8c49c8859b576de1808ae7b2859be
Author: Adam Jackson <ajax@redhat.com>
Date: Wed Jan 6 08:54:47 2016 -0500
xfree86: Remove a never-hit diagnostic message
Practically speaking, the EDID major version is never not 1.
Reviewed-by: Michel Dänzer <michel.daenzer@amd.com>
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit 7961377567f15dfad9d96c5c0a0992b38013d973
Author: Adam Jackson <ajax@redhat.com>
Date: Wed Jan 6 08:47:37 2016 -0500
xfree86: Make xf86SetDDCproperties work more than once (v2)
We can call this more than once via xf86OutputSetEDID since hotplug is
actually a thing in RANDR 1.2, but xf86RegisterRootWindowProperty merely
adds the data to a list to be applied to the root at CreateWindow time,
so calls past the first (for a given screen) would have no effect until
server regen.
Once we've initialised pScrn->pScreen is filled in, so we can just set
the property directly.
v2: Removed pointless version check, deobfuscate math (Walter Harms)
Reviewed-by: Michel Dänzer <michel.daenzer@amd.com>
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit 8be83fff04a009109a956837ca983a96fd279711
Author: Adam Jackson <ajax@redhat.com>
Date: Wed Jan 6 08:35:43 2016 -0500
xfree86: Remove some leftovers from DisplayID support
Reviewed-by: Michel Dänzer <michel.daenzer@amd.com>
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit 0cd2a24b61ef1583fc6b3fec7d01c7481cc97d52
Author: Adam Jackson <ajax@redhat.com>
Date: Wed Jan 6 08:30:07 2016 -0500
xfree86: Unexport xf86Initialising, remove xf86ServerIsInitialising
Neither of these are used from outside the server.
Reviewed-by: Michel Dänzer <michel.daenzer@amd.com>
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit e70ee11a39b957141fbc565d79d128a46fac5f34
Author: Adam Jackson <ajax@redhat.com>
Date: Tue Jan 5 16:27:41 2016 -0500
xfree86: Create VT atoms from the root window callback (v2)
v2: Fix swapped callback args
Reviewed-by: Michel Dänzer <michel.daenzer@amd.com>
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit da9ee1eddd65d00788cef8a3becfad948c0a2168
Author: Adam Jackson <ajax@redhat.com>
Date: Tue Jan 5 16:11:42 2016 -0500
xfree86: Create seat atom from the root window callback (v2)
v2: Fix swapped callback args
Reviewed-by: Michel Dänzer <michel.daenzer@amd.com>
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit 2c3a3afb5104714b637c1c4aea195df73e0fa918
Author: Adam Jackson <ajax@redhat.com>
Date: Tue Jan 5 15:56:42 2016 -0500
dix: Add RootWindowFinalizeCallback
Reviewed-by: Michel Dänzer <michel.daenzer@amd.com>
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit 8437955515ad59b0bfcd6598248e7f0ffc706370
Author: Olivier Fourdan <ofourdan@redhat.com>
Date: Thu Mar 17 09:53:58 2016 +0100
glamor: fix wrong offset on composite rectangles
When using PictOpSrc, the destination is wrongly shifted back to (0, 0).
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=94568
Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Olivier Fourdan <ofourdan@redhat.com>
commit e8e5d839968e22cf42a6e1982a07b02c6f4a4562
Author: Olivier Fourdan <ofourdan@redhat.com>
Date: Fri Apr 1 13:38:11 2016 +0200
xwayland: Fix compiler warning in GLAMOR Xv
XvWindowMask is defined as 0x00020000 and cannot fit in the XvAdaptor
type which is defined as an unsigned char, thus causing a compiler
warning:
xwayland-glamor-xv.c: In function ‘xwl_glamor_xv_add_adaptors’:
xwayland-glamor-xv.c:339:16: warning: large integer implicitly
truncated to unsigned type [-Woverflow]
This XvWindowMask value is actually not used for XvAdaptor itself but by
the server in its xf86xv implementation, so we don't even need that mask
in our xwayland-glamor-xv implementation.
Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Olivier Fourdan <ofourdan@redhat.com>
commit f9b5bbaa3a7fce1a4efb2084b8d9d82b98d4ee83
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Tue Mar 8 15:42:42 2016 +1000
xkb: fix SlowKeys release/reject beeps
Wrong use of the mask here caused a beep whenever a key was rejected but
also when it was released after being accepted. Fix the mask to check
for the correct enabled controls.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Daniel Stone <daniels@collabora.com>
commit a6288f0954cf97499e78849a87847062ee962c17
Author: Jon Turney <jon.turney@dronecode.org.uk>
Date: Tue Nov 3 19:07:43 2015 +0000
hw/xwin: xcbify internal window manager
Convert the code for the multiwindow mode internal window manager to xcb
xcb conversion avoids xlib/xserver namespace collision and _XSERVER64 type
sizing issues
v2: Various fixes
v3: Don't include X11/extensions/windowswmstr.h, which uses the Display type
and thus depends on Xlib.h, just for _WINDOWSWM_NATIVE_HWND
v4: Fix indentation, add some error handling.
Fix a bug with ConfigureNotify handling
v5: Fix a bug which prevented WM_NORMAL_HINTS from being checked
Signed-off-by: Jon Turney <jon.turney@dronecode.org.uk>
Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
commit 8114b8127f01fc81390fc13e3d09bcc50e41a66f
Author: Jon Turney <jon.turney@dronecode.org.uk>
Date: Wed Jul 1 16:30:36 2015 +0100
hw/xwin: In multiwindow mode, do window minimization entirely in the WM
Remove winMinimizeWindow(), implement as UpdateState() in the WM instead,
which uses getHwnd() to map a Window XID to a HWND (like everything else in
the WM), rather than peering into the servers internal data structures.
Signed-off-by: Jon Turney <jon.turney@dronecode.org.uk>
Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
commit 6a64b9d7af70dc7ff2cac8b35a1f7b0797823733
Author: Jon Turney <jon.turney@dronecode.org.uk>
Date: Mon Nov 2 17:55:19 2015 +0000
hw/xwin: xcbify code for converting X11 icon to Win32 icon
Convert the code for converting an X11 icon to Win32 icon from Xlib to xcb.
v2: some warning fixes in winXIconToHICON()
v3: declaration-after-statement warning fixes
v4: printf format fixes
v5: convert in place rather than in a library
This also avoids the xlib/xserver namespace collision issues, so
winmultiwindowicons.h can be included everywhere it should be, which fixes
compilation with -Werror=implicit-function-declaration
Signed-off-by: Jon Turney <jon.turney@dronecode.org.uk>
Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
commit 0a69c1e2fa0ea63b02fff98e68d9f56a369e882b
Author: Jon Turney <jon.turney@dronecode.org.uk>
Date: Wed Mar 30 18:31:38 2016 +0100
xwin/glx: Build fix for warnings about missing WGL extensioons
Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Jon Turney <jon.turney@dronecode.org.uk>
commit b08526eecf1e165ed9ec2e6b571a5a616a9b696e
Author: Adam Jackson <ajax@redhat.com>
Date: Wed Mar 16 11:38:13 2016 -0400
glx: Implement GLX_EXT_libglvnd (v2)
For the dri2 backend, we depend on xfree86 already, so we can walk the
options for the screen looking for a vendor string from xorg.conf. For
the swrast backend we don't have that luxury, so just say mesa. This
extension isn't really meaningful on Windows or OSX yet (since libglvnd
isn't really functional there yet), so on those platforms we don't say
anything and return BadValue for the token from QueryServerString.
v2: Use xnf* allocators when parsing options (Eric and Emil)
Reviewed-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Emil Velikov <emil.velikov@collabora.com>
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit 2e8781ead3067b195baec2e76a28091575679383
Author: Adam Jackson <ajax@redhat.com>
Date: Wed Mar 23 15:41:24 2016 -0400
glx: Compute the GLX extension string from __glXScreenInit
Now that the enable bits are in the screen base class we can compute
this in one place, rather than making every backend do it.
Reviewed-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Emil Velikov <emil.velikov@collabora.com>
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit e21de4bf3c5ff8cbb9c5ea023d04162e5e56b3df
Author: Adam Jackson <ajax@redhat.com>
Date: Wed Mar 23 15:36:52 2016 -0400
glx: Move glx_enable_bits up to the GLX screen base class
Reviewed-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Emil Velikov <emil.velikov@collabora.com>
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit 23cce73221c0b96e7778da34616f8c3f4d6aa819
Author: Adam Jackson <ajax@redhat.com>
Date: Wed Mar 23 15:13:51 2016 -0400
xquartz/glx: Remove unused fields from the glx screen subclass
dmt:~/git/xserver% git grep -E '\<(index|num_vis)\>' hw/xquartz/GL
hw/xquartz/GL/indirect.c: int index;
hw/xquartz/GL/indirect.c: int num_vis;
Reviewed-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Emil Velikov <emil.velikov@collabora.com>
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit 36bcbf76dcc7e88cac093f8fb656c525bfeaf65d
Author: Adam Jackson <ajax@redhat.com>
Date: Wed Mar 23 15:26:23 2016 -0400
glx: Enable GLX 1.4 unconditionally
Reviewed-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Emil Velikov <emil.velikov@collabora.com>
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit 2a72789ee8e88f612dff48ebe2ebe9fecda7a95d
Author: Adam Jackson <ajax@redhat.com>
Date: Wed Mar 16 16:28:13 2016 -0400
xwin/glx: Drop GLWIN_NO_WGL_EXTENSIONS hack
This doesn't seem very useful, and we're about to implement 1.4 across
the board, so some WGL extensions will become required.
Reviewed-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Emil Velikov <emil.velikov@collabora.com>
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit 77bdaa1313aa55191b49ec73c1e377928ca294fe
Author: Adam Jackson <ajax@redhat.com>
Date: Tue Mar 22 14:40:37 2016 -0400
glx: Use __glXInitExtensionEnableBits in all backends (v2)
On xquartz this enables SGI_make_current_read, which is a mostly
harmless lie as CGL doesn't implement it, as well as SGIX_pbuffer, which
is fine because no pbuffer-enabled configs are created.
On xwin this enables SGIX_pbuffer and ARB_multisample in all cases.
Again this is harmless if the backend doesn't support the features,
since no fbconfigs will be created to expose them.
It also adds SGIX_visual_select_group to both xquartz and xwin.
Amusingly, both were filling in the appropriate field in the fbconfig
already.
v2: Warn about missing WGL extensions (Emil)
Reviewed-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Emil Velikov <emil.velikov@collabora.com>
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit 15af78fc56569dc3b6a7f2c5a6a49edb602111b7
Author: Adam Jackson <ajax@redhat.com>
Date: Wed Mar 23 15:19:15 2016 -0400
glx: Enable GLX_SGI_make_current_read in the core
GLX 1.3 implies equivalent functionality, so this is safe to enable
unconditionally, and bindContext always takes both drawable and readable
arguments in any case. Mesa stopped exporting the __DRI_READ_DRAWABLE
extension in 8.0 (when the DRI1 drivers were removed) so this will
restore the extension string.
Reviewed-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Emil Velikov <emil.velikov@collabora.com>
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit 9b2fc6d98691966f1c9186edad956f78c31f3698
Author: Adam Jackson <ajax@redhat.com>
Date: Wed Mar 23 14:57:25 2016 -0400
xwin/glx: Enable GLX_SGI_make_current_read unconditionally (v2)
This seems to be fairly universal these days, and if it doesn't exist
the only thing you break is separate drawable and readable, which is a
rare feature to use. So pretend it's always there and just throw an
error on MakeCurrent if it isn't, and don't consider it when computing
the GLX version number.
v2: Fix type-o for glxWinScreen (Jon Turney)
Reviewed-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Emil Velikov <emil.velikov@collabora.com>
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit b2ef7df476af619903ef7f6b6962b371ae14306c
Author: Adam Jackson <ajax@redhat.com>
Date: Sat Mar 19 13:44:10 2016 -0400
xquartz/glx: Error out for MakeContextCurrent(draw != read)
CGL doesn't have a way to express this directly, unlike EGL WGL and GLX.
It might be implementable, but it's never actually worked, and it's a
fairly niche feature so we're better off throwing an error if someone
attempts it.
Reviewed-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Emil Velikov <emil.velikov@collabora.com>
Reviewed-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit f95645c6f70019316f8ad77b7beb84530fc0505f
Author: Adam Jackson <ajax@redhat.com>
Date: Tue Mar 22 14:37:19 2016 -0400
glx: Don't enable EXT_texture_from_pixmap unconditionally
Not all backend servers implement this. Those that don't happen to not
use __glXInitExtensionEnableBits, but we'd like that to change, so fix
it up before we switch them over.
Reviewed-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Emil Velikov <emil.velikov@collabora.com>
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit 410aec82556def5395f51299bcefbeb7d0bda604
Author: Adam Jackson <ajax@redhat.com>
Date: Tue Mar 22 14:29:06 2016 -0400
glx: Remove server-side mention of GLX_MESA_swap_control
This extension is direct-only and has no GLX protocol. We don't even
track an enable bit for it, trying to turn it on is pointless.
Reviewed-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Emil Velikov <emil.velikov@collabora.com>
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit 3a21da59e59cf11a9113d71e3431c4bd394ff1e8
Author: Adam Jackson <ajax@redhat.com>
Date: Wed Mar 16 19:05:17 2016 -0400
glx: Remove default server glx extension string
This existed only to be strdup'd and then immediately freed.
Reviewed-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Emil Velikov <emil.velikov@collabora.com>
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit 44e1c97ca6fe992bbb6ef9ecb0b82a113adfa57e
Author: Olivier Fourdan <ofourdan@redhat.com>
Date: Mon Mar 21 09:53:17 2016 +0100
xwayland: Pretend we support viewport in vidmode
Some games (namely openttd) will raise an XError and fail with a
BadValue if their request to XF86VidModeSetViewPort fails.
Support only the default zoom and viewport, fail for everything else.
Signed-off-by: Olivier Fourdan <ofourdan@redhat.com>
Reviewed-by: Hans de Goede <hdegoede@redhat.com>
commit 6e3a6e30a6ac66942a0756a5d079993181f02e34
Author: Olivier Fourdan <ofourdan@redhat.com>
Date: Thu Mar 17 14:39:45 2016 +0100
xwayland: do not include frequency in mode name
Some applications (e.g. using lwjgl) try to parse the output of the
xrandr command and get confused with the mode name returned by Xwayland,
because it contains "@[frequency]" (e.g. "1024x640@60.0Hz").
Remove the @[frequency] part of the mode name to match what is found in
usual mode names on regular X servers to please those applications.
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=94589
Signed-off-by: Olivier Fourdan <ofourdan@redhat.com>
Reviewed-by: Daniel Stone <daniels@collabora.com>
commit 418fe365b45a143680d3b4143dc60f7cdc5a3507
Author: Michel Dänzer <michel.daenzer@amd.com>
Date: Thu Mar 24 17:34:23 2016 +0900
xfree86/modes: Make sure the HW cursor is hidden when it should be
When the HW cursor is hidden (e.g. because xf86CursorResetCursor
triggers a switch from HW cursor to SW cursor), the driver isn't
notified of this for disabled CRTCs. If the HW cursor was shown when the
CRTC was disabled, it may still be displayed when the CRTC is enabled
again.
Prevent this by explicitly hiding the HW cursor again after setting a
mode if it's currently supposed to be hidden.
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=94560
Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Michel Dänzer <michel.daenzer@amd.com>
commit adefbaee499b9679c6cac21f52ec6545af2b36b5
Author: Adam Jackson <ajax@redhat.com>
Date: Mon Mar 28 18:11:09 2016 +0900
os: Treat ssh as a non-local client (v4)
By the time we get to ComputeLocalClient, we've already done
NextAvailableClient → ReserveClientIds → DetermineClientCmd (assuming
we're built with #define CLIENTIDS), so we can look up the name of the
client process and refuse to treat ssh's X forwarding as if it were
local.
v2: (Michel Dänzer)
* Only match "ssh" itself, not other executable names starting with
that prefix.
* Ignore executable path for the match.
v3: (Michel Dänzer)
* Use GetClientCmdName (Mark Kettenis)
* Perform check on Windows as well, but only ignore path on Cygwin
(Martin Peres, Emil Velikov, Jon Turney)
v4: (Michel Dänzer)
* Cut of any colon and whatever comes after it. (Adam Jackson)
* Add bugzilla reference.
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=93261
Signed-off-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Michel Dänzer <michel.daenzer@amd.com>
commit 1c90797565385426ad63bd2108085c8466695c0b
Author: Sonny Jiang <sonny.jiang@amd.com>
Date: Mon Mar 28 16:36:50 2016 +0900
DRI2: add Polaris PCI IDs
Signed-off-by: Sonny Jiang <sonny.jiang@amd.com>
Reviewed-by: Alex Deucher <alexander.deucher@amd.com> (Polaris10)
Reviewed-by: Michel Dänzer <michel.daenzer@amd.com> (Polaris11)
(Ported from Mesa commit f00c840578a70e479ffb99f6b64c73dc420179fa)
Signed-off-by: Michel Dänzer <michel.daenzer@amd.com>
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
commit 3b385105b2d19a1c55e9779ae88d775185eea231
Author: Michel Dänzer <michel.daenzer@amd.com>
Date: Thu Mar 24 17:42:47 2016 +0900
present: Only requeue for next MSC after flip failure
This code was added to deal with the driver present hook failing, in
which case we need to wait for the next MSC before executing the
presentation.
However, it could also take effect in cases where the driver incorrectly
thinks the current MSC matches the target one (e.g. due to the kernel
interface only supporting 32-bit MSC values), in which case it could
result in the presentation getting requeued over and over.
To prevent such issues, check specifically for the target MSC
immediately following the current MSC.
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=94596
Signed-off-by: Michel Dänzer <michel.daenzer@amd.com>
Reviewed-by: Keith Packard <keithp@keithp.com>
commit 8ac0e05cc6c6e87b223ba7cb31d8856771c5d41a
Author: Adam Jackson <ajax@redhat.com>
Date: Wed Mar 23 14:42:08 2016 -0400
vfb: Re-add LD_EXPORT_SYMBOLS_FLAG to LDFLAGS
Accidentally removed, breaks Xvfb on cygwin.
Reviewed-by: Yaakov Selkowitz <yselkowitz@users.sourceforge.net>
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit a288cf58a0dc0f965a6f964c76bb86bb1989d797
Author: Dave Airlie <airlied@redhat.com>
Date: Wed Mar 16 10:45:54 2016 +1000
glamor: swizzle RED to 0 for alpha textures
I'm pretty sure Eric suspected this could cause a problem, and we
couldn't find a test. Well loading feedly in firefox seems to trigger
badness that this solves.
bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=94554
Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
Tested-by: Timo Aaltonen <tjaalton@ubuntu.com>
commit 4583fa9a6cd3095d7497c075d68e7430ea3c5cb0
Author: Ángel González <ingenit@zoho.com>
Date: Mon Oct 15 22:04:22 2012 +0200
security: Fix reversed comment
Commit 6045506be0cebca4ebbe943ae77f020aafa703d4 changed back
the behavior to only allow the trusted extensions to the untrusted clients,
but left the 8b5d21cc1d1f4e9d20e5d5eca44cb1e60a419763
comment intended for Security*Un*trustedExtensions saying that
"untrusted clients shouldn't have access to these".
Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Ángel González <ingenit@zoho.com>
commit b78897d0a04a833720698901fbac9535570875e4
Author: Evgeny M. Zubok <evgeny.zubok@tochka.ru>
Date: Thu Apr 8 03:58:21 2010 -0700
xfree86: Change VBE version early-out to 1.2. (#22672)
Reporter has an S3 Trio with DDC and VESA 1.2.
Signed-off-by: Corbin Simpson <MostAwesomeDude@gmail.com>
Reviewed-by: Matt Turner <mattst88@gmail.com>
commit 184fbf7541012090b8716c7eaf00895efd16d0ac
Author: Adam Jackson <ajax@redhat.com>
Date: Mon Mar 14 11:37:32 2016 -0400
xfree86: Finish removing font modules
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit 69d1528bc35073331e281448dfb04eb4240ff472
Author: Adam Jackson <ajax@redhat.com>
Date: Thu Apr 26 16:42:20 2012 -0400
xfree86: Font modules aren't a real thing
There are no longer any loadable font modules (not that they ever did
much in the first place), so stop pretending they're a defined ABI
surface.
Signed-off-by: Adam Jackson <ajax@redhat.com>
Reviewed-by: Julien Cristau <jcristau@debian.org>
commit 4f8151c7a4bcf2d55848e70c83b2f9ce458cf316
Author: Adam Jackson <ajax@redhat.com>
Date: Mon Mar 14 11:20:39 2016 -0400
Fix the typo from the previous patch, d'oh
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit 75eecf28ae3709181a51571132b0accd9cae316e
Author: Chris Wilson <chris@chris-wilson.co.uk>
Date: Sun Mar 13 13:54:01 2016 +0000
Xext/vidmode: Reduce verbosity of GetModeLine debug messages
In commit f175cf45aebcdda53f3ae49c0eaf27da1f194e92
Author: Olivier Fourdan <ofourdan@redhat.com>
Date: Wed Feb 10 09:34:34 2016 +0100
vidmode: move to a separate library of its own
the verbosity of some old debug messages (which print the reply to every
GetModeLine client request and others) was increased leading to lots of
log spam. Downgrade the logging back to DebugF.
[ajax: Fix a typo so it compiles.]
Reviewed-by: Adam Jackson <ajax@redhat.com>
References: https://bugs.freedesktop.org/show_bug.cgi?id=94515
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Olivier Fourdan <ofourdan@redhat.com>
commit 744c292ae49dd1f9d33b860d2b4f0ae27023809b
Author: Adam Jackson <ajax@redhat.com>
Date: Fri Mar 11 13:50:32 2016 -0500
vidmode: Remove stray vidmodeproc.h from EXTRA_DIST
Was removed from the tree in:
commit f175cf45aebcdda53f3ae49c0eaf27da1f194e92
Author: Olivier Fourdan <ofourdan@redhat.com>
Date: Wed Feb 10 09:34:34 2016 +0100
vidmode: move to a separate library of its own
but not removed from the Makefile, which broke 'make dist'.
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit 47bc7fcaa567b0d9e2627b4a21b112e96f81725b
Author: Dave Airlie <airlied@gmail.com>
Date: Tue Feb 9 16:54:22 2016 +1000
present: fail flipping if we have any slave outputs
Due to the way present currently works, we don't ever check with the
secondary adapters if we can flip at all.
We shouldn't flip if the secondary adapters are attached to the pixmap
currently, however using the current check_flip callback isn't possible
as it passes the Window to the driver (something we shouldn't be doing),
so the slave driver can never get it's own screen ptr back.
For now to fix the problem just block flips if we have any slaves
configured. We can fix the ABI up later, but this fix can be backported
to stable.
Signed-off-by: Dave Airlie <airlied@redhat.com>
Reviewed-by: Keith Packard <keithp@keithp.com>
commit 316948734c2bba72d42c4cf4530932b5862c109f
Author: Michel Dänzer <michel.daenzer@amd.com>
Date: Fri Mar 11 12:21:06 2016 +0900
glamor: Make context current in glamor_pixmap_fbo_cache_put
Without this, we may be manipulating the context of another screen.
In a system with two GPUs using glamor, this fixes lots of
(EE) glamor256: GL error: GL_INVALID_OPERATION in glBindTexture(non-gen name)
spew since 0b4c0c75 ('glamor: Replace "finish access" shader with texture
swizzling').
Signed-off-by: Michel Dänzer <michel.daenzer@amd.com>
Reviewed-by: Dave Airlie <airlied@redhat.com>
commit ef3005da3d5dc92b3ee5a0ee78164e739a3216dc
Author: Adam Jackson <ajax@redhat.com>
Date: Thu Jan 21 12:47:57 2016 -0500
glx: Implement GLX_EXT_fbconfig_packed_float
The tokens for this are already defined by GLX_ARB_fbconfig_float, which
we already support, so just add the extension to the list and let the
driver provide those configs if it wants.
Reviewed-by: Eric Anholt <eric@anholt.net>
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit d15cb654b6ba365dac9a62064e277adebde2fdab
Author: Adam Jackson <ajax@redhat.com>
Date: Mon May 18 13:00:02 2015 -0400
glx: Implement GLX_EXT_stereo_tree
This is correct as it is, but only because we know no DRI drivers
implement stereo.
v2: Use new ATTRIB macro
Reviewed-by: James Jones <jajones@nvidia.com>
Reviewed-by: Eric Anholt <eric@anholt.net>
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit a18238877bbf9aab95843d849a6f434275e9cd6c
Author: Adam Jackson <ajax@redhat.com>
Date: Thu Mar 3 16:50:02 2016 -0500
glx: Add GLX_SCREEN to the GetDrawableAttributes response
libglvnd would like to use this to map from drawable to screen, so it
can know which driver to dispatch to. Refer to the spec proposal here:
https://lists.freedesktop.org/archives/mesa-dev/2016-March/109543.html
Reviewed-by: Eric Anholt <eric@anholt.net>
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit 47c1d6b7abcfb1c6b478367bbc2e869c91485bc0
Author: Adam Jackson <ajax@redhat.com>
Date: Thu Mar 10 12:29:34 2016 -0500
glx: Macroize building the attribute list in DoGetDrawableAttributes
No functional change, just a little easier to read and harder to get
wrong.
Reviewed-by: Eric Anholt <eric@anholt.net>
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit c01094c5312fbd84146dd83122e5256a8e57d092
Author: Eric Anholt <eric@anholt.net>
Date: Mon Feb 1 13:58:15 2016 -0800
ephyr: Fix redisplay with glamor on GLES.
glamor_transfer.c is still totally broken, though.
Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Eric Anholt <eric@anholt.net>
commit 0b4c0c75d06f3dbe92be1a26a637e9f05529cb3d
Author: Eric Anholt <eric@anholt.net>
Date: Mon Feb 1 13:58:14 2016 -0800
glamor: Replace "finish access" shader with texture swizzling.
For pictures without alpha, and for most other formats for GLES2, we
would make a temporary FBO, make another temporary texture, upload our
GLAMOR_MEMORY pixmap to the texture, then run the "finish access" shader
across it to swizzle its values around into the temporary FBO (which we
would use for a single Render operation and then throw away).
We can simplify everything by using GL_ARB_texture_swizzle (or its
GLES3 counterpart). It's just not worth the complexity to try to
improve the performance of this already low-performance path (SHM
pixmaps + Render) on GLES2.
Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Eric Anholt <eric@anholt.net>
commit b0cc04992ced5d96bb5c52fc1e5c868797cc0a17
Author: Eric Anholt <eric@anholt.net>
Date: Mon Feb 1 13:58:13 2016 -0800
glamor: Drop dead large-pixmap handling code in temp picture uploads.
The glamor_pixmap_ensure_fbo() in glamor_pixmap_upload_prepare() will
always fail on a large pixmap, so we can just be explicit about
bailing out here and then dump the rest of this garbage.
Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Eric Anholt <eric@anholt.net>
commit 094b1bea8bd08eec029e4d61ba40d81441c37905
Author: Eric Anholt <eric@anholt.net>
Date: Mon Feb 1 13:58:12 2016 -0800
glamor: Drop unused PBO code in temporary picture uploading.
Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Eric Anholt <eric@anholt.net>
commit 6112fecc3a4fd7dfb0ef77a98cfd1f7c91ccea0c
Author: Eric Anholt <eric@anholt.net>
Date: Mon Feb 1 13:58:11 2016 -0800
glamor: Generalize the a1-to-a8 conversion path.
Pixman is quite qualified to allocate our temporary memory, and all we
need to do is decide what formats to convert from and to.
Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Eric Anholt <eric@anholt.net>
commit 8f1411c3847a742f84ff07c4a0bb610801f5bfee
Author: Eric Anholt <eric@anholt.net>
Date: Mon Feb 1 13:58:10 2016 -0800
glamor: Drop the REVERT_UPLOADING_1_5_5_5 path.
There was only a pretty special case that could have even worked --
you've got a GLES2 renderer, you've got a SHM pixmap, it's 1555 (not
the usual 565 for 16-bit), and you're little endian (BE was broken,
since GL's 5_5_5_1 picks the 1 bit from the lowest bit of the short,
and on BE we weren't doing the conversion path that swaps around the
channels). This is just not worth the complexity.
Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Eric Anholt <eric@anholt.net>
commit 2cc7a0815e5e2c2b1b1267cae9c348a8e95b1082
Author: Eric Anholt <eric@anholt.net>
Date: Mon Feb 1 13:58:09 2016 -0800
glamor: Drop the GLES2 REVERT_UPLOADING_2_10_10_10 paths.
These just smash your 2_10_10_10 data into 8888, despite what the
comments said. That's not valid rendering, so just ditch this path
and fall back to software. One might also note in the code being
removed here that the REVERT_UPLOADING_10_10_10_2 path wasn't even
connected.
Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Eric Anholt <eric@anholt.net>
commit f667d5177024d3fdfb1b51694bdaeba6cee67962
Author: Eric Anholt <eric@anholt.net>
Date: Mon Feb 1 13:58:08 2016 -0800
glamor: Merge the two GL-type-from-pictformat paths.
It clarifies what the difference is between the two paths, and would
potentially encourage us to handle GLES extensions that expose
additional types.
Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Eric Anholt <eric@anholt.net>
commit c7574c63c618d3a017105c380542eb04341b04a2
Author: Eric Anholt <eric@anholt.net>
Date: Mon Feb 1 13:58:07 2016 -0800
glamor: Propagate that is_upload is always true.
Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Eric Anholt <eric@anholt.net>
commit 1bed5ef2b80c77c1bb9b62971367bea864fd8f66
Author: Eric Anholt <eric@anholt.net>
Date: Mon Feb 1 13:58:06 2016 -0800
glamor: Drop dead fbo handling from GLAMOR_MEMORY pict uploads.
The previous commit asserts that we don't have one.
Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Eric Anholt <eric@anholt.net>
commit ee7ca670b1695d64bc12cb37302913acc066a569
Author: Eric Anholt <eric@anholt.net>
Date: Mon Feb 1 13:58:05 2016 -0800
glamor: Make sure that GLAMOR_MEMORY pixmaps don't retain an FBO.
glamor_composite_choose_shader() may upload our scratch pixmaps to get
a Render operation completed. We don't want to hang onto GL memory
for our scratch pixmaps, since we'll just have to reallocate them at a
new w/h next time around, and the contents will be updated as well.
Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Eric Anholt <eric@anholt.net>
commit a96c6d4658e3f386002f96eede660af3b01e5209
Author: Eric Anholt <eric@anholt.net>
Date: Mon Feb 1 13:58:04 2016 -0800
glamor: Simplify temporary picture uploading call stack.
glamor_upload_sub_pixmap_to_texture() only had the one caller, so we
can merge it in, fix its silly return value, and propagate a bunch of
constants.
Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Eric Anholt <eric@anholt.net>
commit 25ce263fd88684be9370025f93ba3a2bfc72ff1a
Author: Olivier Fourdan <ofourdan@redhat.com>
Date: Wed Mar 9 16:45:18 2016 +0100
glamor: do not build Xv support when --disable-xv
Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Olivier Fourdan <ofourdan@redhat.com>
commit da7724d3d277c6c8a814881785b716896802629a
Author: Olivier Fourdan <ofourdan@redhat.com>
Date: Wed Mar 9 16:21:18 2016 +0100
xwayland: add glamor Xv adaptor
This adds an Xv adaptor using glamor.
Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Olivier Fourdan <ofourdan@redhat.com>
commit d11fdff50c91575e977a63617806a61bca98cd35
Author: Jon Turney <jon.turney@dronecode.org.uk>
Date: Fri Jan 3 13:21:40 2014 +0000
hw/xwin: Tidy-up of winmsg.h
- winVMsg() has no uses, so remove
- winMsgVerb() has only one use, with default verbosity, so remove
- winMsg() is identical to LogMessage()
- Put winDrvMsg() and winDrvMsgVerb() under XWIN_XF86CONFIG
- Include what you use Xfuncproto.h for _X_ATTRIBUTE_PRINTF
Signed-off-by: Jon Turney <jon.turney@dronecode.org.uk>
Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
commit 519b98765f0c7d083a744ae7beb641753e4eb751
Author: Jon Turney <jon.turney@dronecode.org.uk>
Date: Thu Mar 3 22:32:28 2016 +0000
hw/xwin: Remove GC privates, unused since native GDI engine removal
Unused since native GDI engine removal in commit 8465ee78
Signed-off-by: Jon Turney <jon.turney@dronecode.org.uk>
Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
commit 9d28ff2a9be86662f56463aa1fd46d12988e30fa
Author: Jon Turney <jon.turney@dronecode.org.uk>
Date: Fri Jul 31 20:23:59 2015 +0100
hw/xwin: Use NULL rather than NoopDDA for unimplemented engine functions
Signed-off-by: Jon Turney <jon.turney@dronecode.org.uk>
Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
commit a309085a56de4d30dfbc44d9ff5302c7d9fdbf73
Author: Jon Turney <jon.turney@dronecode.org.uk>
Date: Fri Jul 31 20:20:00 2015 +0100
hw/xwin: Remove unused FinishCreateWindowsWindow engine function
This only ever had an (unused) implementation in the DDNL engine, which was
removed in commit 57bbf6e2.
Signed-off-by: Jon Turney <jon.turney@dronecode.org.uk>
Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
commit fa6f9d06a3d1a90134d9349f5ce4ec5b4eeff5e3
Author: Jon Turney <jon.turney@dronecode.org.uk>
Date: Fri Jul 31 20:12:37 2015 +0100
hw/xwin: Remove unused HotKeyAltTab engine function
This was only ever used by the primaryfb engine, removed in commit c79f824b
Signed-off-by: Jon Turney <jon.turney@dronecode.org.uk>
Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
commit 7bd25aa8437ec410e7a7de1b0636ba33298fc8d6
Author: Jon Turney <jon.turney@dronecode.org.uk>
Date: Fri Jul 31 19:44:34 2015 +0100
hw/xwin: Return FALSE to indicate failure in winSetEngine()
Return FALSE to indicate failure in winSetEngine(), if it couldn't find a
drawing engine to use
Signed-off-by: Jon Turney <jon.turney@dronecode.org.uk>
Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
commit 52e05b9282f0f220d7c762793ce0b8f606a45deb
Author: Jon Turney <jon.turney@dronecode.org.uk>
Date: Tue Feb 23 23:09:43 2016 +0000
hw/xwin: Remove WM_WM_MAP message, which is now unused
Signed-off-by: Jon Turney <jon.turney@dronecode.org.uk>
Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
commit c42217aa3d372acaa5ca7c64895edbfbd20c8475
Author: Jon Turney <jon.turney@dronecode.org.uk>
Date: Mon Nov 2 20:24:33 2015 +0000
hw/xwin: Remove WM_(UN|)MANAGE messages, which are now never sent
Remove fAnotherWMRunning which tracks this message (although since it was
never initialized, I doubt this worked reliably), and the only use of that,
which was to prevent winMWExtWMRestackWindows() from being used when the
internalwm is running
Signed-off-by: Jon Turney <jon.turney@dronecode.org.uk>
Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
commit b6bdf368420355332e41c604c523584bd39933f9
Author: Jon Turney <jon.turney@dronecode.org.uk>
Date: Mon Nov 2 20:51:51 2015 +0000
hw/xwin: Remove allowOtherWM, which is now always FALSE
Signed-off-by: Jon Turney <jon.turney@dronecode.org.uk>
Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
commit 8407d3096287868b5c5e50ca5a98d470918c85a9
Author: Jon Turney <jon.turney@dronecode.org.uk>
Date: Mon Nov 2 20:34:09 2015 +0000
hw/xwin: Remove winIsInternalWMRunning(), which now always returns FALSE
Also remove then unused variables and IsRaiseonClick()
v2:
Also remove unused pScreenInfo variable in winMWEXtWMRestackFrame()
Signed-off-by: Jon Turney <jon.turney@dronecode.org.uk>
Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
commit 2779a28a86a13831b334e8678cd4e838b3b38472
Author: Jon Turney <jon.turney@dronecode.org.uk>
Date: Mon Nov 2 20:07:04 2015 +0000
hw/xwin: Remove fInternalWM flag
Remove the fInternalWM flag as it is now always FALSE after removing the
-internalwm option
v2:
Also remove then unused pRLWinPriv local from pRLWinPriv()
Signed-off-by: Jon Turney <jon.turney@dronecode.org.uk>
Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
commit 98238ece5756801a8a67b9235e42cb9ab2318633
Author: Jon Turney <jon.turney@dronecode.org.uk>
Date: Mon Nov 2 19:37:40 2015 +0000
hw/xwin: Ignore the obsolete, undocumented -internalwm option
Signed-off-by: Jon Turney <jon.turney@dronecode.org.uk>
Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
commit cdeaebad9889d81d2698b8a10fec5e55d8dec7a1
Author: Jon Turney <jon.turney@dronecode.org.uk>
Date: Tue Mar 1 21:37:05 2016 +0000
hw/xwin: Remove the long-broken -silent-dup-error option
Signed-off-by: Jon Turney <jon.turney@dronecode.org.uk>
Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
commit 24042b4e367803dd64f3fcdc1bef7b2bf36c4145
Author: Michel Dänzer <michel.daenzer@amd.com>
Date: Mon Dec 21 17:54:08 2015 +0900
modesetting: Allow CRTC transforms to actually take effect
Setting crtc->transformPresent to FALSE was preventing the transform
from actually taking effect and putting RandR into a confused state.
Now that the RandR 1.2 cursor code handles transforms correctly, we can
allow them to properly take effect.
Reviewed-by: Keith Packard <keithp@keithp.com>
commit b04767c84deafc44993723add4b1c5163fc11711
Author: Michel Dänzer <michel.daenzer@amd.com>
Date: Wed Oct 21 18:33:46 2015 +0900
xfree86: Re-set current cursor after RandR 1.2 CRTC configuration change
Add xf86CursorResetCursor, which allows switching between HW and SW
cursor depending on the current state.
Call it from xf86DisableUnusedFunctions, which is called after any CRTC
configuration change such as setting a mode or disabling a CRTC. This
makes sure that SW cursor is used e.g. while a transform is in use on
any CRTC or while there are active PRIME output slaves, and enables HW
cursor again once none of those conditions are true anymore.
Reviewed-by: Keith Packard <keithp@keithp.com>
commit a4ffa8721debb34bd36fd4624890d9c26886c618
Author: Michel Dänzer <michel.daenzer@amd.com>
Date: Thu Dec 24 12:56:03 2015 +0900
xfree86/modes: Check for CRTC transforms in xf86_use_hw_cursor(_argb) (v2)
We currently don't handle transforms for the HW cursor image, so return
FALSE to signal a software cursor must be used if a transform is in use
on any CRTC.
v2: Check crtc->transformPresent instead of crtc->transform_in_use. The
latter is TRUE for rotation as well, which we handle correctly.
Reviewed-by: Keith Packard <keithp@keithp.com>
commit c3e4e9fc5d84bfc17b3ed63f67488ea25ba150ce
Author: Michel Dänzer <michel.daenzer@amd.com>
Date: Thu Dec 24 16:20:49 2015 +0900
xfree86/modes: Refactor xf86_use_hw_cursor_argb to use xf86_use_hw_cursor (v2)
This reduces code duplication.
v2: No functional change this time.
Reviewed-by: Keith Packard <keithp@keithp.com>
commit a3e681eafa5355b8bb3b099d47983f14f0d5e197
Author: Michel Dänzer <michel.daenzer@amd.com>
Date: Tue Feb 23 17:19:03 2016 +0900
glamor: Source pictures are always depth 32
We were using the destination pixmap depth to determine the source
picture format.
Fixes incorrect text rendering with some MATE desktop GTK3 themes.
Reviewed-by: Adam Jackson <ajax@redhat.com>
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=94246
Signed-off-by: Michel Dänzer <michel.daenzer@amd.com>
commit b05ae79ee3bebef9790c97eedc033d1ffb3ec39a
Author: Michel Dänzer <michel.daenzer@amd.com>
Date: Tue Feb 23 17:19:02 2016 +0900
glamor: Factor out glamor_set_color_depth from glamor_set_color
The former takes explicit screen and depth parameters instead of
deriving them from a pixmap.
Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Michel Dänzer <michel.daenzer@amd.com>
commit 947e94a341fa153258e9e86060b83af95934672b
Author: Hans de Goede <hdegoede@redhat.com>
Date: Wed Feb 10 16:40:43 2016 +0100
glamor: Fix XvPutImage when src_y != 0
We already take src_y into account when uploading the src data by
starting at the top line of the src data when uploading.
Adjust src_y accordingly when rendering.
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
commit 40a164b8f4e720b0d6ebf228ee175eb397ffeec2
Author: Rui Matos <tiagomatos@gmail.com>
Date: Fri Mar 4 16:24:48 2016 +0100
build: Enable vidmode independently from Xorg
This allows building Xwayland without Xorg and still include the
vidmode extension.
v2: Use PKG_CHECK_EXISTS instead of PKG_CHECK_MODULES
Signed-off-by: Rui Matos <tiagomatos@gmail.com>
Reviewed-by: Emil Velikov <emil.l.velikov@gmail.com>
commit 2be527b1d4ce2b0412c4484539a8c9607645ec6d
Author: Julien Cristau <jcristau@debian.org>
Date: Mon Mar 7 23:20:34 2016 +0100
xfixes: avoid double free if AddResource fails
pChc is already freed through CursorFreeHideCount →
deleteCursorHideCount.
Reviewed-by: Rémi Cardona <remi@gentoo.org>
Signed-off-by: Julien Cristau <jcristau@debian.org>
commit 4217db89ecd480fda2ee74fecba06c6713c2a0f0
Author: Julien Cristau <jcristau@debian.org>
Date: Mon Mar 7 23:20:33 2016 +0100
render: free already allocated formats in PictureInit failure case
Probably pointless, if this fails you're not likely to get far...
Reviewed-by: Rémi Cardona <remi@gentoo.org>
Signed-off-by: Julien Cristau <jcristau@debian.org>
commit 054f80717812d4781741cd05393623fe6f6c627f
Author: Julien Cristau <jcristau@debian.org>
Date: Mon Mar 7 23:20:32 2016 +0100
record: don't call RecordDeleteContext when AddResource fails
Reviewed-by: Rémi Cardona <remi@gentoo.org>
Signed-off-by: Julien Cristau <jcristau@debian.org>
commit d0c1a5bc61a3d151f2234aa3820862f16c0f00c7
Author: Julien Cristau <jcristau@debian.org>
Date: Mon Mar 7 23:20:31 2016 +0100
xwin: no need to free auth data if AddResource fails
This is taken care of by SecurityDeleteAuthorization
Reviewed-by: Rémi Cardona <remi@gentoo.org>
Signed-off-by: Julien Cristau <jcristau@debian.org>
commit acf263df81ad6813e0233033610fb44521cab1b4
Author: Julien Cristau <jcristau@debian.org>
Date: Mon Mar 7 23:20:30 2016 +0100
modesetting: avoid double free if AddResource fails
ms_dri2_frame_event_client_gone or ms_dri2_frame_event_drawable_gone
already free the resource.
Reviewed-by: Rémi Cardona <remi@gentoo.org>
Signed-off-by: Julien Cristau <jcristau@debian.org>
commit 164753f158e78f615f903467bfd234d7c58244ef
Author: Julien Cristau <jcristau@debian.org>
Date: Mon Mar 7 23:20:29 2016 +0100
dmx/glxProxy: don't free the glx pixmap twice if AddResource fails
Reviewed-by: Rémi Cardona <remi@gentoo.org>
Signed-off-by: Julien Cristau <jcristau@debian.org>
commit 59b9c3d5e4bf05aeaaac2ee4ea12c301a67aae2c
Author: Julien Cristau <jcristau@debian.org>
Date: Mon Mar 7 23:20:28 2016 +0100
glx: don't call pGlxDraw->destroy() if AddResource fails
AddResource will have called DrawableGone, which takes care of the
destruction.
Reviewed-by: Rémi Cardona <remi@gentoo.org>
Signed-off-by: Julien Cristau <jcristau@debian.org>
commit ac97fb2b804809c39b12fe0032d96fb076657258
Author: Julien Cristau <jcristau@debian.org>
Date: Mon Mar 7 23:20:27 2016 +0100
dri3: return an error if AddResource fails
Reviewed-by: Rémi Cardona <remi@gentoo.org>
Signed-off-by: Julien Cristau <jcristau@debian.org>
commit 119d5c0e2f800737c949ef760c5fe25d963200bf
Author: Julien Cristau <jcristau@debian.org>
Date: Mon Mar 7 23:20:26 2016 +0100
xvmc: Fix unchecked AddResource
Reviewed-by: Rémi Cardona <remi@gentoo.org>
Signed-off-by: Julien Cristau <jcristau@debian.org>
commit a2c3c34b44b866440a152511e682c98879ee13b7
Author: Jonas Ådahl <jadahl@gmail.com>
Date: Tue Mar 8 20:05:33 2016 +0800
xwayland: Correctly detect whether posix_fallocate exists
We had HAVE_POSIX_FALLOCATE checks, but no such macros were ever
defined anywhere. This commit makes it so that this macro is defined if
the posix_fallocate is detected during configure.
Signed-off-by: Jonas Ådahl <jadahl@gmail.com>
Reviewed-by: Julien Cristau <jcristau@debian.org>
commit 939ce0bae68b682b57675f65c901653c1a094ebb
Author: Julien Cristau <jcristau@debian.org>
Date: Tue Mar 1 21:39:01 2016 +0100
xv: fix double free in AddResource failure case
XvdiDestroyVideoNotifyList already frees the list if AddResource fails,
so don't do it twice. And set tpn->client to NULL explicitly to avoid
confusing uninitialized memory with a valid value.
Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Julien Cristau <jcristau@debian.org>
commit 05e1bcf56e1c511a1ef539acfe11e37727e1179e
Author: Adam Jackson <ajax@redhat.com>
Date: Tue Mar 1 14:09:30 2016 -0500
dri1: Fix unchecked AddResource
Signed-off-by: Adam Jackson <ajax@redhat.com>
Reviewed-by: Julien Cristau <jcristau@debian.org>
commit 093f9505c12565cc19bdf6e33b263f31d104c3ef
Author: Adam Jackson <ajax@redhat.com>
Date: Tue Mar 1 14:09:29 2016 -0500
xv: Fix unchecked AddResource
Reviewed-by: Julien Cristau <jcristau@debian.org>
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit ac4d8c7cee13947b688ebb26035f06f7744db201
Author: Olivier Fourdan <ofourdan@redhat.com>
Date: Tue Mar 1 17:03:44 2016 +0100
vidmode: build without xf86vidmodeproto
git commit f175cf45:
vidmode: move to a separate library of its own
introduced a regression where the xserver would not build when
xf86vidmodeproto is not installed even if the configure option
"--disable-xf86vidmode" is specified.
Fix build failure when xf86vidmodeproto is not installed.
Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Olivier Fourdan <ofourdan@redhat.com>
commit 9c88cb9b059111e0531852f3fa8fa571c0306f57
Author: Laércio de Sousa <laerciosousa@sme-mogidascruzes.sp.gov.br>
Date: Thu Feb 25 16:37:57 2016 -0300
kdrive/ephyr: map host X server's keymap into Xephyr, if supported
Currently Xephyr doesn't inherit host X server's keymap, which
may lead to keymap mismatches when using a non-US keyboard in a
window inside Xephyr. This patch makes Xephyr change its keymap
to match host X server's one (unless XKB support is disabled),
using xcb-xkb to retrieve the needed XKB controls.
This implementation is analogous to Xnest one at commit 83fef4235.
Supersedes: https://patchwork.freedesktop.org/patch/67504
Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Laércio de Sousa <laerciosousa@sme-mogidascruzes.sp.gov.br>
commit daa6d2d58f65b9301b1b1f3c6df07719ecb5c03d
Author: Laércio de Sousa <laerciosousa@sme-mogidascruzes.sp.gov.br>
Date: Fri Feb 12 14:18:02 2016 -0200
config/udev: distinguish between real keyboards and other key devices
This patch introduces a new flag ATTR_KEY for hotplugged input devices,
so we can better distinguish between real keyboards (i.e. devices with
udev property ID_INPUT_KEYBOARD="1") and other key input devices like
lid switches, power buttons, etc.
All supported hotplug backends (udev, hal, and wscons) will set both
flags ATTR_KEY and ATTR_KEYBOARD for real keyboards, but udev backend
will set ATTR_KEY, but not ATTR_KEYBOARD, for non-keyboard key input
devices (hal and wscons will set both flags in any case). With this
distinction, kdrive input hotplugging mechanism will be allowed to only
grab real keyboards, as other key input devices are currently not
supported.
In order to don't break current behaviour, this patch will replace all
ATTR_KEYBOARD occurrences with ATTR_KEY in hw/xfree86/common/xf86Xinput.c.
[ajax: Just add ATTR_KEY, don't re-number the other attributes]
Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Laércio de Sousa <laerciosousa@sme-mogidascruzes.sp.gov.br>
commit 851ff9ec04b73412c7dbad7b4911a1feac21f354
Author: Laércio de Sousa <laerciosousa@sme-mogidascruzes.sp.gov.br>
Date: Fri Feb 12 14:18:01 2016 -0200
ephyr: enable option -sw-cursor by default in multi-seat mode
Option -seat passed to Xephyr requires -sw-cursor to be passed as well,
otherwise the mouse cursor will remain invisible for the given seat.
This patch takes care of enabling -sw-cursor if -seat is passed.
Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Laércio de Sousa <laerciosousa@sme-mogidascruzes.sp.gov.br>
commit 40e32e9fc9f3a1bd8287ee03dd399d8161cb98dd
Author: Laércio de Sousa <laerciosousa@sme-mogidascruzes.sp.gov.br>
Date: Fri Feb 12 14:18:00 2016 -0200
kdrive: add options to set default XKB properties
This patch introduces convenient command-line options -xkb-rules,
-xkb-model, -xkb-layout, -xkb-variant, and -xkb-options, to set default
values for these properties.
These options can be handful for cases in which compile-time default
values don't match user locale, since kdrive doesn't support InputClass
matching rules yet and not all Linux distros provide default rules to
store these values in udev properties (which by the way is a discouraged
practice).
Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Laércio de Sousa <laerciosousa@sme-mogidascruzes.sp.gov.br>
commit 0cf3d72be6bd99cd2c66b7885339322c7e5bf73d
Author: Laércio de Sousa <laerciosousa@sme-mogidascruzes.sp.gov.br>
Date: Fri Feb 12 14:17:59 2016 -0200
kdrive: introduce input hot-plugging support for udev and hal backends (#33140)
This patch introduces input hot-plugging support for kdrive-based
applications in multi-seat context. This feature is enabled by passing
-seat option with desired seat name. All keyboard/mouse devices assigned
to that seat will be automatically grabbed by kdrive.
It supports udev and hal backends for input hot-plugging support.
Another patches may be required for wscons backend.
Fixes: https://bugs.freedesktop.org/show_bug.cgi?id=33140
Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Laércio de Sousa <laerciosousa@sme-mogidascruzes.sp.gov.br>
commit 2116f03be04240e961649ca750a7aa5438b8446c
Author: Olivier Fourdan <ofourdan@redhat.com>
Date: Mon Feb 8 17:48:26 2016 +0100
xwayland: fix a crash on output removal
On output removal, the CRTC that was added in xwl_output_create()
is not removed in xwl_output_destroy() and would cause a segmentation
fault later on in ProcRRGetMonitors():
(EE) Segmentation fault at address 0x100000001
(EE)
(EE) 10: ? (?+0x29) [0x29]
(EE) 9: /usr/bin/Xwayland (_start+0x29) [0x423299]
(EE) 8: /lib64/libc.so.6 (__libc_start_main+0xf0) [0x7fdd80e7f580]
(EE) 7: /usr/bin/Xwayland (dix_main+0x3b3) [0x544ef3]
(EE) 6: /usr/bin/Xwayland (Dispatch+0x31e) [0x54109e]
(EE) 5: /usr/bin/Xwayland (ProcRRGetMonitors+0x9b) [0x4ca18b]
(EE) 4: /usr/bin/Xwayland (RRMonitorMakeList+0x269) [0x4c9ba9]
(EE) 3: /usr/bin/Xwayland (RRMonitorSetFromServer+0x118) [0x4c9198]
(EE) 2: /usr/bin/Xwayland (MakeAtom+0x30) [0x530710]
(EE) 1: /lib64/libc.so.6 (__restore_rt+0x0) [0x7fdd80e93b1f]
(EE) 0: /usr/bin/Xwayland (OsSigHandler+0x29) [0x5792d9]
Remove the output CRTC in xwl_output_destroy() to avoid the crash.
Signed-off-by: Olivier Fourdan <ofourdan@redhat.com>
Reviewed-by: Daniel Stone <daniels@collabora.com>
commit 1bee4e254ca0305cb23e574b4c8b250d276ee998
Author: Michel Dänzer <michel.daenzer@amd.com>
Date: Thu Feb 18 17:33:19 2016 +0900
present: Call present_restore_screen_pixmap from present_set_abort_flip
After present_set_abort_flip, the screen pixmap will be used for all
screen drawing, so we need to restore the current flip pixmap contents
to the screen pixmap here as well.
Improves flashing / stutter e.g. when something like a popup menu appears
on top of a flipping fullscreen window or when switching out of
fullscreen.
Note that this means present_set_abort_flip now relies on screen->root
being non-NULL, but that's already the case in other present code.
Reviewed-by: Keith Packard <keithp@keithp.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
commit 4611e902c291b8a789f374cff3300f74645bc2b2
Author: Michel Dänzer <michel.daenzer@amd.com>
Date: Thu Feb 18 17:20:45 2016 +0900
present: Factor code for restoring screen pixmap out of present_unflip (v2)
The following fix will use the refactored function.
The logic in the refactored function is slightly simplified, exploiting
the fact that this function is only ever called with a valid flip
pixmap.
v2: Assert that flip_pixmap is non-NULL instead of testing and bailing
on NULL, preserve test for flip_window being non-NULL before calling
present_set_tree_pixmap for it (Keith Packard)
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk> (v1)
Reviewed-by: Keith Packard <keithp@keithp.com>
commit 72328e5eb98a3f27e1f0a0e17beae6db447bd87c
Author: Michel Dänzer <michel.daenzer@amd.com>
Date: Thu Feb 18 18:23:47 2016 +0900
present: Only update screen pixmap from flip pixmap once per unflip
present_unflip may be called several times from present_check_flip_window
during the same unflip. We can only copy to the screen pixmap the first
time, otherwise we may scribble over other windows. The flip pixmap
contents don't get updated after the first time anyway.
Fixes at least the following problems, which were introduced by commit
806470b9 ("present: Copy unflip contents back to the Screen Pixmap"):
On xfwm4 without compositing, run glxgears and put its window into
fullscreen mode to start flipping. While in fullscreen, open the xfwm4
window menu by pressing Alt-Space. The window menu was invisible most
of the time because it was getting scribbled over by a repeated unflip
copy.
When switching a flipping window out of fullscreen, a repeated unflip
copy could leave artifacts of the flip pixmap on the desktop.
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=94325
Reviewed-by: Keith Packard <keithp@keithp.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
commit 43eb5b6047c9b35c337e553ec054f08bdc835abb
Author: Michel Dänzer <michel.daenzer@amd.com>
Date: Tue Dec 8 12:52:17 2015 +0900
dri3: Refuse to work for remote clients (v2)
Prevents clients forwarded via SSH from hanging while waiting for the
reply from the DRI3Open request.
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=93261
v2: Return BadMatch instead of BadRequest (Keith Packard)
Reviewed-by: Keith Packard <keithp@keithp.com>
commit 6070a749d953951bacbfb149c5c36451293aad35
Author: Olivier Fourdan <ofourdan@redhat.com>
Date: Wed Feb 10 09:35:39 2016 +0100
xwayland: add partial xvidmode extension support
Older games (mostly those based on SDL 1.x) rely on the XVidMode
extension and would refuse to run without.
Add a simple, limited and read-only xvidmode support that reports the
current mode used so that games that rely on xvidmode extension can run
on XWayland.
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=87806
Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Olivier Fourdan <ofourdan@redhat.com>
commit b430f53bb753f9b064ab62d014820c1c3c76a841
Author: Olivier Fourdan <ofourdan@redhat.com>
Date: Fri Feb 5 09:48:25 2016 +0100
vidmode: remove redundant DIX function
The API signature of the DIX xf86VidModeGetGammaRampSize() is now
identical to the xf86cmap's xf86GetGammaRampSize() and all it does is
actually call xf86GetGammaRampSize() so we can save one vfunc.
Remove uneeded xf86VidModeGetGammaRampSize() function.
Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Olivier Fourdan <ofourdan@redhat.com>
commit 48fccde2bfb60efdbf45a96fa53bcd9a6570bf89
Author: Olivier Fourdan <ofourdan@redhat.com>
Date: Fri Feb 5 09:48:24 2016 +0100
vidmode: remove redundant check
The DIX already checks for VidModePrivateKey to get the vfunc, so
checking for this again in the DDX is redundant.
Remove the redundant function xf86VidModeAvailable() from the DDX.
Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Olivier Fourdan <ofourdan@redhat.com>
commit f175cf45aebcdda53f3ae49c0eaf27da1f194e92
Author: Olivier Fourdan <ofourdan@redhat.com>
Date: Wed Feb 10 09:34:34 2016 +0100
vidmode: move to a separate library of its own
XVidMode extension might be useful to non hardware servers as well (e.g.
Xwayand) so that applications that rely on it (e.g. lot of older games)
can at least have read access to XVidMode.
But the implementation is very XFree86 centric, so the idea is to add
a bunch of vfunc that other non-XFree86 servers can hook up into to
provide a similar functionality.
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=87806
Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Olivier Fourdan <ofourdan@redhat.com>
commit 17097e083b2392c8989474f6e0da8cc234329e9c
Author: Olivier Fourdan <ofourdan@redhat.com>
Date: Fri Feb 5 09:48:22 2016 +0100
vidmode: rename DDX functions
To avoid confusion as to what belongs on the DDX and what not.
Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Olivier Fourdan <ofourdan@redhat.com>
commit ddfb8c009ac651209eb0087aaf86b54e1446e8b2
Author: Olivier Fourdan <ofourdan@redhat.com>
Date: Fri Feb 5 09:48:21 2016 +0100
vidmode: move display mode definitions
To be able to reuse the VidMode extension in a non-hardware server, the
display mode definitions need to be accessible from DIX.
Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Olivier Fourdan <ofourdan@redhat.com>
commit e29a64de662112b8ebcd3f20c89df0e8c51890ef
Author: Olivier Fourdan <ofourdan@redhat.com>
Date: Fri Feb 5 09:48:20 2016 +0100
vidmode: remove mode access from public API
The mode access functions (namely VidModeCreateMode(),
VidModeCopyMode(), VidModeGetModeValue() and VidModeSetModeValue()) are
used only in xf86VidMode code and do not need to be available anywhere
else.
Remove these functions from the public VidMode API and move them as
static where they are used.
Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Olivier Fourdan <ofourdan@redhat.com>
commit b7962ade5265a21ac7c60da6cc07ece15ef7e648
Author: Olivier Fourdan <ofourdan@redhat.com>
Date: Fri Feb 5 09:48:19 2016 +0100
vidmode: use appropriate DisplayModePtr type
The API uses an untyped pointer (void *) where a DisplayModePtr is
expected.
Clean up the API to use the appropriate type, as DisplayModePtr is
really all that will be passed there.
Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Olivier Fourdan <ofourdan@redhat.com>
commit 12f714fd95dc9d912c0bf2524005a73ec6e8ee4f
Author: Olivier Fourdan <ofourdan@redhat.com>
Date: Fri Feb 5 09:48:18 2016 +0100
vidmode: remove VidModeGetMonitor()
VidModeGetMonitor() is used solely in ProcXF86VidModeGetMonitor() to
get a untyped monitor pointer that is passed back straight again to
VidModeGetMonitorValue().
This is actually useless as VidModeGetMonitorValue() could as well get
the monitor from the ScreenPtr just like VidModeGetMonitor() does.
Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Olivier Fourdan <ofourdan@redhat.com>
commit f6f7e21133c13c34f306a191137d566e83b40929
Author: Olivier Fourdan <ofourdan@redhat.com>
Date: Fri Feb 5 09:48:17 2016 +0100
vidmode: use ScreenPtr instead of screen index
New code passes ScreenPtr instead of the screen index.
Change the VidMode functions to take a ScreenPtr.
Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Olivier Fourdan <ofourdan@redhat.com>
commit 6e898ef080df93e885ead9d6fee8854b34e0216f
Author: Olivier Fourdan <ofourdan@redhat.com>
Date: Fri Feb 5 09:48:16 2016 +0100
vidmode: get rid of the CloseScreen wrapper
As we rely on dixRegisterPrivateKey() to allocate the memory for us that
will be free automatically, we do not need the CloseScreen wrapper
anymore.
Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Olivier Fourdan <ofourdan@redhat.com>
commit 341f3bccafde71754a9ed2303df9908e509c6d31
Author: Olivier Fourdan <ofourdan@redhat.com>
Date: Fri Feb 5 09:48:15 2016 +0100
vidmode: use appropriate API
dixRegisterPrivateKey() can allocate memory that will be freed when the
screen is teared down.
No need to calloc() and free the memory ourself using a broken ref
counting method.
Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Olivier Fourdan <ofourdan@redhat.com>
commit d8882954570aba656d5a7be7d357feaba21cb099
Author: Chris Wilson <chris@chris-wilson.co.uk>
Date: Fri Feb 12 11:59:53 2016 +0000
dri2: Allow many blocked clients per-drawable
This patch was motivated by the need to fix the use-after-free in
dri2ClientWake, but in doing so removes an arbitrary restriction that
limits DRI2 to only blocking the first client on each drawable. In order
to fix the use-after-free, we need to avoid touching our privates in the
ClientSleep callback and so we want to only use that external list as
our means of controlling sleeps and wakeups. We thus have a list of
sleeping clients at our disposal and can manage multiple events and
sources.
Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
commit bc3634010c096dffd1935c0c6cf8ba37534ae3d8
Author: Chris Wilson <chris@chris-wilson.co.uk>
Date: Fri Feb 12 11:59:52 2016 +0000
dix: Add ClientSignalAll()
This is a variant of ClientSignal() that signals all clients with an
optional matching sleeping client, function and closure.
Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
commit 9fecc4cd571641f8920f25473ce5abb3fdca8b40
Author: Jon Turney <jon.turney@dronecode.org.uk>
Date: Tue Jan 12 16:18:35 2016 +0000
xwin: Remove unhelpful debug about WM message queue size
Signed-off-by: Jon Turney <jon.turney@dronecode.org.uk>
Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
commit f7d1e5acdf5ed4ab4ed5c18727aa6f3d379ef560
Author: Jon Turney <jon.turney@dronecode.org.uk>
Date: Tue Aug 11 15:45:57 2015 +0100
xwin: Add SKIPTASKBAR hint to _NET_WM_WINDOW_TYPE_DOCK type windows
Signed-off-by: Jon Turney <jon.turney@dronecode.org.uk>
Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
commit e7f87f8f76e5ac9479a71e3daf2cfdefd4b5f684
Author: Jon Turney <jon.turney@dronecode.org.uk>
Date: Thu Jul 2 19:21:11 2015 +0100
xwin: In multiwindow mode, look up the HWND for the parent window
Rather than only looking at the foreground window to see if it matches
the WM_TRANSIENT_FOR window XID, lookup that XID and fetch the HWND from
the window privates.
Signed-off-by: Jon Turney <jon.turney@dronecode.org.uk>
Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
commit 856a28f63739bffe32f5a8156fd2680e5c5259a1
Author: Jon Turney <jon.turney@dronecode.org.uk>
Date: Thu Jul 2 13:32:40 2015 +0100
xwin: Factor out MessageName() debug helper
Factor out the MessageName() debug helper for message id -> text, and
use it on message queue and dequeue.
Reorder in numerical order to match winwindow.h
Add missing WM_WM_ICON_EVENT
Signed-off-by: Jon Turney <jon.turney@dronecode.org.uk>
Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
commit 8c2006ddc5abbd4ac374dabf1cfdd3df8fc88779
Author: Jon Turney <jon.turney@dronecode.org.uk>
Date: Mon Feb 22 17:41:14 2016 +0000
xwin: Keyboard layout updates
layout zh_TW doesn't exist (anymore), try something else for that.
layout it variant mac doesn't seem to exist anymore, try to handle
Macintosh keyboards (running under Parallels on Mac) and other oddities
in a more generic way, by falling back to matching only on the language
identifer part of the input locale identifer.
v2:
Fix typo of 0xa0000 for 0xa000
Signed-off-by: Jon Turney <jon.turney@dronecode.org.uk>
Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
commit 8c97a0078e7fe22e6159fa53490dfca2f4d267a9
Author: Colin Harrison <colin.harrison@virgin.net>
Date: Wed Nov 19 22:33:39 2014 +0000
xwin: Add a tentative entry for the Korean keyboard to the list of known keyboard layouts
Signed-off-by: Colin Harrison <colin.harrison@virgin.net>
Reviewed-by: Jon Turney <jon.turney@dronecode.org.uk>
commit a4d8a64c4ba467964476c4a1486da698bd6aed9e
Author: Jon Turney <jon.turney@dronecode.org.uk>
Date: Tue Feb 10 14:36:37 2015 +0000
xwin: Update to XRANDR 1.2 internal interface to ensure an output is reported by XRANDR
If using the X server internal XRANDR 1.0 interface, it seems we must
register a display size with RRRegisterSize() in order to make
RRGetInfo() call RRScanOldConfig() to generate an output and crtc for
us.
Without this, the following GDM bug means that an XDMCP session to GDM
cannot be started.
https://bugzilla.gnome.org/show_bug.cgi?id=736054
Instead, use the more recent XRANDR 1.2 internal interface to explicitly
create the output and crtc, and maintain a single mode which represents
the current display size.
Also don't emit a RRScreenSizeNotify when a RRScreenSizeSize is done
which has no effect, this seems to throw the GDM greeter into a loop...
v2: Maintain reference count for the mode we maintain more correctly, to
avoid double free causing a crash on shutdown
Connect crtc to output, so a subsequent RRSetCrtcConfig request doesn't
change anything, so we don't fail due to our lack of rrSetConfig or
rrCrtcSet hooks.
See https://cygwin.com/ml/cygwin-xfree/2015-02/msg00032.html
v3:
Raise limit on X display size from 4Kx4K to 32Kx32K
Signed-off-by: Jon Turney <jon.turney@dronecode.org.uk>
Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
commit 008efebda801b9b80e2ab3f2c95aeef8c82102ee
Author: Jon Turney <jon.turney@dronecode.org.uk>
Date: Sat Oct 18 17:31:57 2014 +0100
xwin: Use WM_CLIPBOARDUPDATE clipboard API
Windows Vista and later have a saner clipboard API where the clipboard
viewer linked list is no longer maintained by applications. Use it
where available.
Signed-off-by: Jon Turney <jon.turney@dronecode.org.uk>
Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
commit de7f1fd6f8f10f07b366ae5428a8c65a224bda98
Author: Jon Turney <jon.turney@dronecode.org.uk>
Date: Wed Jul 9 14:26:54 2014 +0100
xwin: Check that window position is visible on non-rectangular virtual desktops
Improve the check that window position is visible to work correctly for
non-rectangular virtual desktops
Signed-off-by: Jon Turney <jon.turney@dronecode.org.uk>
Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
commit a9e73131b6453e0fa2da5360e84af7a2eae3b205
Author: Jon Turney <jon.turney@dronecode.org.uk>
Date: Thu May 8 11:40:39 2014 +0100
xwin: Correctly interpret WM_HINTS, WM_NORMAL_HINTS properties on x86_64
Signed-off-by: Jon Turney <jon.turney@dronecode.org.uk>
Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
commit d7cef6fbe23381b31c163468f349feee2f1b1eba
Author: Jon Turney <jon.turney@dronecode.org.uk>
Date: Thu Mar 13 18:04:17 2014 +0000
xwin: Improve handling of no-decoration motif hint
When motif decoration hint asks for no decoration, don't add sysmenu,
mimimize or maximimize controls.
(This fixes a problem with e.g. fbpanel having a minimize control, but
gtk's panel_configure_event() doesn't like the state we put the window
into when we minimize it, causing it to spin)
Signed-off-by: Jon Turney <jon.turney@dronecode.org.uk>
Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
commit f75404be3ad94c8da493688397712c65ea66cb90
Author: Jon Turney <jon.turney@dronecode.org.uk>
Date: Fri Mar 28 16:57:48 2014 +0000
xwin: XGetWMNormalHints() returns non-zero on success
XGetWMNormalHints() doesn't actually return a Status value. On success
it returns a non-zero value, not Success.
Signed-off-by: Jon Turney <jon.turney@dronecode.org.uk>
Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
commit 9dc32746f2cd161b512cce8f39c95287bdf1a3a3
Author: Jon Turney <jon.turney@dronecode.org.uk>
Date: Tue Nov 10 10:27:07 2015 +0000
xwin: Fix format warnings when ./configured --enable-debug --enable-windowswm
Fix format warnings (mainly pointer format fixes) which show up when
./configured --enable-debug --enable-windowswm
Signed-off-by: Jon Turney <jon.turney@dronecode.org.uk>
Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
commit b4ac7b142fa3c536e9b283cfd34b94d82c03aac6
Author: Michel Dänzer <michel.daenzer@amd.com>
Date: Wed Feb 24 16:52:59 2016 +0900
present: Only requeue if target MSC is not reached after an unflip
While present_pixmap decrements target_msc by 1 for present_queue_vblank,
it leaves the original vblank->target_msc intact. So incrementing the
latter for requeueing resulted in the requeued presentation being
executed too late.
Also, no need to requeue if the target MSC is already reached.
This further reduces stutter when a popup menu appears on top of a
flipping fullscreen window.
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Signed-off-by: Michel Dänzer <michel.daenzer@amd.com>
commit e7a35b9e16aa12970908f5d55371bb1b862f8f24
Author: Michel Dänzer <michel.daenzer@amd.com>
Date: Wed Feb 24 16:52:58 2016 +0900
present: Requeue if flip driver hook fails and target MSC not reached
For flipping, we wait for the MSC before the target MSC and then call
the driver flip hook. If the latter fails, we have to wait for the
target MSC before falling back to a copy, or else it's executed too
early.
Fixes glxgears running at unbounded framerate (not synchronized to the
refresh rate) in fullscreen if the driver flip hook fails.
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Signed-off-by: Michel Dänzer <michel.daenzer@amd.com>
commit 1a9f8c4623c4e6b6955cb6d5f44d29c244dfd32a
Author: Michel Dänzer <michel.daenzer@amd.com>
Date: Wed Feb 24 16:52:57 2016 +0900
present: Move msc_is_(equal_or_)after to the top of present.c
To make them usable from any other function in the file. No functional
change.
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Signed-off-by: Michel Dänzer <michel.daenzer@amd.com>
commit 0461bca0cb2f7918c77ed45d2cbc756cf65021be
Author: Laércio de Sousa <laerciosousa@sme-mogidascruzes.sp.gov.br>
Date: Mon Feb 22 16:04:12 2016 -0300
kdrive/evdev: update keyboard LEDs (#22302)
Implement missing parts in kdrive evdev driver for
correct update of evdev keyboard LEDs.
Fixes: https://bugs.freedesktop.org/show_bug.cgi?id=22302
[ajax: Fixed deref-before-null-check bug]
Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Laércio de Sousa <laerciosousa@sme-mogidascruzes.sp.gov.br>
commit 30b7d7995ef70b7473e0fb170eb8ae23b8d1f4a7
Author: Jon TURNEY <jon.turney@dronecode.org.uk>
Date: Mon Feb 22 16:20:00 2016 +0000
Fix build on Cygwin by ensuring WIN32 check triggers only on MinGW
The type of fd_mask was changed in Cygwin 2.4.0 headers from 'long' to
'unsigned long'. This exposes an existing problem with winauth.c, which
includes Xwindows.h (which includes windows.h, which defines WIN32),
before including osdep.h, which causes the now conflicting definition of
fd_mask in osdep.h to be exposed:
In file included from ../os/osdep.h:198:18: error: conflicting types for
‘fd_mask’ typedef long int fd_mask; /usr/include/sys/select.h:46:23:
note: previous declaration of ‘fd_mask’ was here typedef unsigned long
fd_mask;
Adjust the include guards in osdep.h to make sure we only use WIN32
guarded code when not compiling for Cygwin (i.e. WIN32 && !__CYGWIN__)
This isn't a very elegant, but unfortunately appears to be the best
solution, since it doesn't seem to be possible to write the test in a
positive form.
Future work: Should also audit of all the other uses of WIN32 in
xserver, and make sure they are correct.
Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Jon Turney <jon.turney@dronecode.org.uk>
commit 544b4149268561d3d794aa540172831fa7550a20
Author: Jonas Ådahl <jadahl@gmail.com>
Date: Fri Feb 19 15:08:12 2016 +0800
xwayland: Prefix shm tmp file names with xwayland
Prefix the temporary file names used for allocating pixmaps with
"xwayland-" instead of "weston-". This makes it less confusing while
looking at the file names of the currently open fds of the Xwayland
process.
Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Jonas Ådahl <jadahl@gmail.com>
commit 5627708e5f447d0e360bbc9eb8d1c4e58c5046d0
Author: Marc-Andre Lureau <marcandre.lureau@gmail.com>
Date: Fri Feb 12 22:52:07 2016 +0100
dri2: add virtio-gpu pci ids
Add virtio-gpu legacy + 1.0 pci ids, allowing them to use
modesetting + glamor with dri2.
Signed-off-by: Marc-André Lureau <marcandre.lureau@gmail.com>
Reviewed-by: Dave Airlie <airlied@redhat.com>
commit e957a2e5dd288f515f3e93724823542c20333f6a
Author: Daniel Stone <daniels@collabora.com>
Date: Fri Feb 12 16:36:59 2016 +0000
dix: Add hybrid full-size/empty-clip mode to SetRootClip
216bdbc735 removed the SetRootClip call in the XWayland output-hotplug
handler when running rootless (e.g. as a part of Weston/Mutter), since
the root window has no storage, so generating exposures will result in
writes to invalid memory.
Unfortunately, preventing the segfault also breaks sprite confinement.
SetRootClip updates winSize and borderSize for the root window, which
when combined with RRScreenSizeChanged calling ScreenRestructured,
generates a new sprite-confinment area to update it to the whole screen.
Removing this call results in the window geometry being reported
correctly, but winSize/borderSize never changing from their values at
startup, i.e. out of sync with the root window geometry / screen
information in the connection info / XRandR.
This patch introduces a hybrid mode, where we update winSize and
borderSize for the root window, enabling sprite confinement to work
correctly, but keep the clip emptied so exposures are never generated.
Signed-off-by: Daniel Stone <daniels@collabora.com>
Tested-by: Olivier Fourdan <ofourdan@redhat.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
commit dbe8d03c42f01332b3dc41fe9290aed142f1436f
Author: Keith Packard <keithp@keithp.com>
Date: Tue Feb 16 20:03:57 2016 -0800
randr: Send ConfigNotify when manual monitor list changes
This lets clients know that the layout of the monitors on the screen
has changed so they can adapt appropriately.
Signed-off-by: Keith Packard <keithp@keithp.com>
Reviewed-by: Dave Airlie <airlied@redhat.com>
commit eddf848c44349c7ebc7da9957bffb3630f3faaa9
Author: Adam Jackson <ajax@redhat.com>
Date: Wed Feb 10 11:13:04 2016 -0500
dri2: Use the work queue to manage client sleeps
In commit e43abdce964f5ed9689cf908af8c305b39a5dd36
Author: Chris Wilson <chris@chris-wilson.co.uk>
Date: Wed Feb 3 09:54:46 2016 +0000
dri2: Unblock Clients on Drawable release
we try to wake up any blocked clients at drawable destruction. But by
the time we get there, CloseDownConnection has already torn down state
that AttendClient wants to modify.
Using ClientSleep instead of IgnoreClient puts a wakeup function on a
workqueue, and the queue will be cleared for us in CloseDownClient
before (non-neverretain) resource teardown.
Tested-by: Chris Wilson <chris@chris-wilson.co.uk>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit b3e9c534e2b0dc2c9acd2fe9b942e1fc5227339b
Author: Adam Jackson <ajax@redhat.com>
Date: Mon Feb 8 17:36:03 2016 -0500
os: unifdef STREAMSCONN
Removed from xtrans in 2012, and never wired up in the modular build
anyway.
Signed-off-by: Adam Jackson <ajax@redhat.com>
Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
commit e43abdce964f5ed9689cf908af8c305b39a5dd36
Author: Chris Wilson <chris@chris-wilson.co.uk>
Date: Wed Feb 3 09:54:46 2016 +0000
dri2: Unblock Clients on Drawable release
If the Window is destroyed by another client, such as the window
manager, the original client may be blocked by DRI2 awaiting a vblank
event. When this happens, DRI2DrawableGone forgets to unblock that
client and so the wait never completes.
Note Present/xshmfence is also suspectible to this race.
Testcase: dri2-race/manager
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
commit a722d617a092f08f69086630f5cfb598d4a21cc7
Author: Adam Jackson <ajax@redhat.com>
Date: Wed Dec 9 09:10:13 2015 -0500
autogen: Set a default subject prefix for patches
Per discussion at XDC2015, we want this so we can easily distinguish
which module a patch is for. There's no way to set this in the
server-side config, so setting a default at autogen time is about the
best we can do.
Reviewed-by: Eric Anholt <eric@anholt.net>
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit 7bb64d8c1de9659f11da7917772919b071e9db82
Author: Jan Burgmeier <jan.burgmeier@unicon-software.com>
Date: Thu Feb 4 14:06:43 2016 +0100
Fix XineramaQueryScreens for reverse prime
Make sure we account for slave CRTCs when building the monitor list,
since that's what rrxinerama uses to fake Xinerama geometry.
[ajax: Slightly more informative commit message.]
Bugzilla: https://bugs.freedesktop.org/92313
Reviewed-by: Dave Airlie <airlied@redhat.com>
commit 87d5534f701242d7c23aa20545a6292a0779c89c
Author: Rui Matos <tiagomatos@gmail.com>
Date: Wed Feb 3 16:14:09 2016 +0100
xwayland: Clear pending cursor frame callbacks on pointer enter
The last cursor frame we commited before the pointer left one of our
surfaces might not have been shown. In that case we'll have a cursor
surface frame callback pending which we need to clear so that we can
continue submitting new cursor frames.
Signed-off-by: Rui Matos <tiagomatos@gmail.com>
Reviewed-by: Bryce Harrington <bryce@osg.samsung.com>
Acked-by: Pekka Paalanen <pekka.paalanen@collabora.co.uk>
Reviewed-by: Daniel Stone <daniels@collabora.com>
Reviewed-by: Jonas Ådahl <jadahl@gmail.com>
commit b7d392931a309d0fe754869efb456ccd0385f3aa
Author: Chris Wilson <chris@chris-wilson.co.uk>
Date: Wed Feb 3 09:54:43 2016 +0000
dri2: Only invalidate the immediate Window upon SetWindowPixmap
All callers of SetWindowPixmap will themselves be traversing the Window
heirarchy updating the backing Pixmap of each child and so we can forgo
doing the identical traversal inside the DRI2SetWindowPixmap handler.
Reported-by: Loïc Yhuel <loic.yhuel@gmail.com>
Link: http://lists.x.org/archives/xorg-devel/2015-February/045638.html
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
commit da69f2f15a9917c3ed04e305061683c41338126e
Author: Laércio de Sousa <laerciosousa@sme-mogidascruzes.sp.gov.br>
Date: Fri Dec 11 11:43:14 2015 -0200
ephyr: don't load ephyr input driver if -seat option is passed
When used for single-GPU multi-seat purposes, there's no need to enable
ephyr virtual input devices, since Xephyr is supposed to handle its own
hardware devices.
Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Laércio de Sousa <laerciosousa@sme-mogidascruzes.sp.gov.br>
commit 7213e99cbc38a60f0076bc2115b144798ea4c3ba
Author: Laércio de Sousa <laerciosousa@sme-mogidascruzes.sp.gov.br>
Date: Fri Dec 11 11:43:13 2015 -0200
ephyr: ignore Xorg multiseat command line options
Multi-seat-capable display managers commonly pass command-line options
like "-novtswitch", "-sharevts", or "-layout seatXXXX" to Xorg server,
but Xephyr currently refuses to start if these options are passed to it,
which may break Xephyr-based single-GPU multiseat setups.
[ajax: shortened summary]
Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Laércio de Sousa <laerciosousa@sme-mogidascruzes.sp.gov.br>
commit edd443f69ea385a957b8eae0b066ad8e77fb947b
Author: Laércio de Sousa <laerciosousa@sme-mogidascruzes.sp.gov.br>
Date: Fri Dec 11 11:43:11 2015 -0200
kdrive: don't let evdev driver overwrite existing device names
KDrive evdev driver deliberately name grabbed devices as "Evdev mouse"
or "Evdev keyboard". This patch will make it skip this step if grabbed
devices are already named (i.e. from udev).
Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Laércio de Sousa <laerciosousa@sme-mogidascruzes.sp.gov.br>
commit 0b80da0d18713df4712c05973388b6226bb0227f
Author: Laércio de Sousa <laerciosousa@sme-mogidascruzes.sp.gov.br>
Date: Fri Dec 11 11:43:07 2015 -0200
kdrive: set "evdev" driver for input devices automatically, if available.
If kdrive input driver "evdev" is available, no other driver was
explicitly set for a given input device, and its kernel device node is
/dev/input/event*, this patch will make kdrive set "evdev" driver
automatically for such device.
Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Laércio de Sousa <laerciosousa@sme-mogidascruzes.sp.gov.br>
commit 6d6fd688ecf95f2e84f2af276d681ff42f9d5610
Author: Laércio de Sousa <laerciosousa@sme-mogidascruzes.sp.gov.br>
Date: Fri Dec 11 11:43:06 2015 -0200
kdrive: fix up NewInputDeviceRequest() implementation
This patch simplifies NewInputDeviceRequest() implementation in
kinput.c, making use of improved KdParseKbdOptions() /
KdParsePointerOptions() and merging several "if (ki)"/"if (pi)" clauses.
Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Laércio de Sousa <laerciosousa@sme-mogidascruzes.sp.gov.br>
commit 2c3e8768443caa66d78775ea79bb16a5faae3a3c
Author: Eric Anholt <eric@anholt.net>
Date: Wed Jan 27 11:26:16 2016 -0800
glamor: Flip around conditionals in RepeatNone fixups.
Signed-off-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Dave Airlie <airlied@redhat.com>
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
commit e82c8c81df80de487aa795d69e874a0811c537ea
Author: Eric Anholt <eric@anholt.net>
Date: Wed Jan 27 11:21:05 2016 -0800
glamor: Cut down a bunch of conditional handling for RepeatFix.
For hardware that doesn't do actual jumps for conditionals (i915,
current vc4 driver), this reduces the number of texture fetches
performed (assuming the driver isn't really smart about noticing that
the same sampler is used on each side of an if just with different
coordinates).
No performance difference on i965 with x11perf -magpixwin100 (n=40).
Improves -magpixwin100 by 12.9174% +/- 0.405272% (n=5) on vc4.
Signed-off-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Dave Airlie <airlied@redhat.com>
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
commit 2c3273861cdf874b165ce5a1953102187f71b48e
Author: Eric Anholt <eric@anholt.net>
Date: Wed Jan 27 11:15:27 2016 -0800
glamor: Clarify how the repeat values being passed around work.
Signed-off-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Dave Airlie <airlied@redhat.com>
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
commit 990a8ee01324332ee9b4a4bb124ce8f73be24349
Author: Eric Anholt <eric@anholt.net>
Date: Wed Jan 27 11:10:14 2016 -0800
glamor: Clean up formatting of RepeatFix shader code.
All sorts of weird indentation, and some cuddled conditional
statements deep in the if tree.
Signed-off-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Dave Airlie <airlied@redhat.com>
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
commit 20cb5b2d65ce63ea7934b77f1520387550c778a8
Author: Eric Anholt <eric@anholt.net>
Date: Wed Jan 27 10:24:17 2016 -0800
glamor: Clarify some logic in RepeatFix handling.
wh ratios are != 1.0 only when large, so with that we can simplify
down how we end up with RepeatFix being used.
Signed-off-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Dave Airlie <airlied@redhat.com>
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
commit 07f0d90e4a8b05ef968b1ef47acda7c9f4580340
Author: Eric Anholt <eric@anholt.net>
Date: Tue Jan 26 17:29:48 2016 -0800
glamor: Simplify the pixmap box looping.
We had a double loop across h and w, and passed the current x and y
out to callers who then used w to multiply/add to an index. Instead,
just single loop across w * h.
Signed-off-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Dave Airlie <airlied@redhat.com>
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
commit 0dbce65b08f4812dcaa4b77cd37aebac334c47a2
Author: Eric Anholt <eric@anholt.net>
Date: Tue Jan 26 15:56:27 2016 -0800
glamor: Reuse the glamor_program_alpha_* enums for Render.
This is a step toward using glamor_program.c for Render acceleration.
Signed-off-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Dave Airlie <airlied@redhat.com>
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
commit 9b676786de32f06aedf9d4c9535c10fda247335a
Author: Eric Anholt <eric@anholt.net>
Date: Tue Jan 26 15:47:01 2016 -0800
glamor: Drop extra SHADER_IN type for no mask present.
We can just hand in a constant mask and the driver will optimize away
the multiplication for us.
Signed-off-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Dave Airlie <airlied@redhat.com>
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
commit 03f34f85563c81e1655626e10f75fd7e21393c92
Author: Eric Anholt <eric@anholt.net>
Date: Tue Jan 26 15:19:50 2016 -0800
glamor: Convert XV to using glamor_program.c.
One less custom path! By following the common glamor_program.c use
pattern, we get the ability to handle large pixmaps as the
destination. It's also one less place where glamor_utils.h coordinate
transformation happens.
Signed-off-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Dave Airlie <airlied@redhat.com>
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
commit f368a0ba3aa58e5260d839d11d2f3aef75feaeaf
Author: Eric Anholt <eric@anholt.net>
Date: Tue Jan 26 14:52:08 2016 -0800
glamor: Simplify XV vertex setup.
We were clipping the drawn rectangle to each clip box, then expanding
the box to a big triangle to avoid tearing, then drawing each triangle
to the destination through a scissor. If we're using a scissor for
clipping, though, then we don't need to clip the drawn primitive on
the CPU in the first place.
Signed-off-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Dave Airlie <airlied@redhat.com>
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
commit 294e45b60d99cf7d11c657288bbe2670b56775f3
Author: Eric Anholt <eric@anholt.net>
Date: Tue Jan 26 14:18:48 2016 -0800
glamor: Set up XV sampler uniforms once at program build time.
No sense doing it on every draw.
Signed-off-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Dave Airlie <airlied@redhat.com>
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
commit 5d7bef2eedfd965359dd4eebb6ab806cdad5b83f
Author: Eric Anholt <eric@anholt.net>
Date: Tue Jan 26 13:39:18 2016 -0800
glamor: Drop dead glamor_pict_format_is_compatible().
This hasn't been used since 2f80c7791bb0b11f261cb1e3e0d89163dcdd0342
(GLAMOR_SEPARATE_TEXTURE removal).
Signed-off-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Dave Airlie <airlied@redhat.com>
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
commit 4494a450405cf539743cbcfe6907bf5bdd2d80cb
Author: Eric Anholt <eric@anholt.net>
Date: Tue Jan 26 15:08:17 2016 -0800
glamor: Drop comment about dead yInverted flag.
Wait long enough, and you don't need to think about it at all.
Signed-off-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Dave Airlie <airlied@redhat.com>
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
commit f7c24e6ac345aab91df5fc959f239a33f37113b1
Author: Eric Anholt <eric@anholt.net>
Date: Tue Jan 26 13:34:00 2016 -0800
glamor: Rename the *y_inverted helpers to not say "inverted".
Signed-off-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Dave Airlie <airlied@redhat.com>
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
commit 1fcb6f4cbf3d6514716435a0e79c0e6d53c31a3a
Author: Eric Anholt <eric@anholt.net>
Date: Tue Jan 26 13:31:59 2016 -0800
glamor: Drop dead *_from_x_coord_y() functions.
They've been dead since the yInverted removal
(e310387f443b6333edf02c8980daa303505382b4).
Signed-off-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Dave Airlie <airlied@redhat.com>
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
commit 9ef11f13af7f552dadb4a90c248e525a257e0a2c
Author: Eric Anholt <eric@anholt.net>
Date: Thu Jan 21 16:01:14 2016 -0800
glamor: Clarify when Render fallbacks happen due to an unsupported op.
Signed-off-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Dave Airlie <airlied@redhat.com>
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
commit b8229cc5f5298a37a4735dd002b0e0ebfc8bc75a
Author: Eric Anholt <eric@anholt.net>
Date: Wed Jan 27 11:35:03 2016 -0800
glamor: Label programs before linking them.
i965 does most of its compiling at link time, so our debug output for
its shaders didn't have the name on.
Signed-off-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Dave Airlie <airlied@redhat.com>
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
commit 68f236ebd4b268a9e525d623986999d230feb453
Author: Eric Anholt <eric@anholt.net>
Date: Wed Jan 27 16:11:17 2016 -0800
ephyr: Make sure we have GLX_ARB_create_context before calling it.
This should fix aborts()s from epoxy on old software stacks.
Signed-off-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Dave Airlie <airlied@redhat.com>
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
commit 623ff251dd025929f5bb6174ca86580c5e707261
Author: Adam Jackson <ajax@redhat.com>
Date: Tue Dec 8 17:41:38 2015 -0500
xephyr: Remove DRI1
This only worked if the backend server supported DRI1, which is
stunningly unlikely these days.
Signed-off-by: Adam Jackson <ajax@redhat.com>
Reviewed-by: Eric Anholt <eric@anholt.net>
commit 953b71270cf12c59c8a836c9be403d07fb01fa22
Author: Adam Jackson <ajax@redhat.com>
Date: Tue Dec 8 17:41:37 2015 -0500
xfree86: Build parser for DRI config file subsection unconditionally
This applies regardless of which DRI you're asking for. Worse, leaving
it out means breaking the config file syntax in a pointless way, since
non-DRI servers can safely just parse it and ignore it.
Reviewed-by: Eric Anholt <eric@anholt.net>
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit 1a48a5863e4bceee6b99c1feda1b2c584ff3657c
Author: Adam Jackson <ajax@redhat.com>
Date: Tue Dec 8 17:41:36 2015 -0500
xfree86: Remove ancient DRI build instructions
Reviewed-by: Eric Anholt <eric@anholt.net>
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit d8ecbe563991cc689e95a8cb9d510e920eaceea0
Author: Dave Airlie <airlied@redhat.com>
Date: Wed Jan 27 16:46:06 2016 -0800
ephyr: catch X errors if we try to create a core context and fail.
This stops Xephyr failing on GLXBadFBConfig.
Signed-off-by: Dave Airlie <airlied@redhat.com>
Reviewed-by: Dave Airlie <airlied@redhat.com>
commit 50ca286d79f6304b972ea74487308e7794a170fb
Author: Timo Aaltonen <tjaalton@ubuntu.com>
Date: Wed Jan 27 14:18:50 2016 +0200
dri2: Sync i915_pci_ids.h and i965_pci_ids.h from mesa
Adds Skylake, Kabylake and Broxton allowing them to use
modesetting + glamor with dri2.
Signed-off-by: Timo Aaltonen <timo.aaltonen@canonical.com>
Reviewed-by: Andreas Boll <andreas.boll.dev@gmail.com>
commit bf23db42a4e5943129501223a47b48884cdeb62f
Author: Adam Jackson <ajax@redhat.com>
Date: Wed Jan 27 11:50:13 2016 -0500
modesetting: Require sufficiently new libdrm
Bugzilla: https://bugs.freedesktop.org/93883
Signed-off-by: Adam Jackson <ajax@redhat.com>
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
Reviewed-by: Julien Cristau <jcristau@debian.org>
commit 6978c8ee666a9224213173e7680e2d71b1094bab
Author: Dave Airlie <airlied@redhat.com>
Date: Tue Jan 19 08:06:25 2016 +1000
xwayland: add support for use core profile for glamor. (v2)
This adds support to Xwayland to try and use OpenGL core
profile for glamor first.
v1.1: use version defines.
v2: let glamor work out core profile itself.
Signed-off-by: Dave Airlie <airlied@redhat.com>
Reviewed-by: Eric Anholt <eric@anholt.net>
commit 79c3925532bc0d098c9a4da6d5117bdada56e0af
Author: Dave Airlie <airlied@redhat.com>
Date: Tue Jan 19 07:59:59 2016 +1000
glamor: add core profile support to EGL glamor. (v2)
v1.1: use version defines.
v2: let glamor work it out itself
Signed-off-by: Dave Airlie <airlied@redhat.com>
Reviewed-by: Eric Anholt <eric@anholt.net>
commit 98c3504dcfcec227b9c7798a0bd287941cec0691
Author: Keith Packard <keithp@keithp.com>
Date: Wed Sep 10 19:05:08 2014 -0700
ephyr: Create 3.1 core profile context if possible (v3)
On desktop GL, ask for a 3.1 core profile context if that's available,
otherwise create a generic context.
v2: tell glamor the profile is a core one.
v2.1: add/use GL version defines
v3: let glamor work out core itself
Signed-off-by: Keith Packard <keithp@keithp.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
Reviewed-by: Eric Anholt <eric@anholt.net>
commit 564d9f0f8c17bb3c13aa3ca36da7825454dc5de3
Author: Dave Airlie <airlied@redhat.com>
Date: Mon Jan 11 14:00:35 2016 +1000
glamor: add core profile support. (v2)
Glamor works out from the profile if it is
core.
This flag is used to disable quads for rendering.
v1.1: split long line + make whitespace conform (Michel)
v1.2: add GL 3.1 version defines
v2: move to having glamor work out the profile.
Signed-off-by: Dave Airlie <airlied@redhat.com>
Reviewed-by: Eric Anholt <eric@anholt.net>
commit e6754dcb59ee21abb42421a28f4e467295584f67
Author: Keith Packard <keithp@keithp.com>
Date: Wed Sep 10 19:02:55 2014 -0700
glamor: Use GL_RED instead of GL_ALPHA if we have texture_swizzle (v3)
GL_RED is supported by core profiles while GL_ALPHA is not; use GL_RED
for one channel objects (depth 1 to 8), and then swizzle them into the
alpha channel when used as a mask.
[airlied: updated to master, add swizzle to composited glyphs and xv paths]
v2: consolidate setting swizzle into the texture creation code, it
should work fine there. Handle swizzle when setting color as well.
v3: Fix drawing to a8 with Render (changes by anholt, reviewed by airlied).
Signed-off-by: Keith Packard <keithp@keithp.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
Reviewed-by: Eric Anholt <eric@anholt.net>
commit 5042b0652b9fe5fed57a233880c3429ba390d86d
Author: Eric Anholt <eric@anholt.net>
Date: Wed Jan 20 12:33:25 2016 -0800
glamor: Drop duplicated GLAMOR_DEFAULT_PRECISIONs in render accel.
We only need it once at the top of the shader, so just put it
there.
Signed-off-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Dave Airlie <airlied@redhat.com>
commit 1fd82c764d5b24107e60f2173e30e5d24a2f2667
Author: Dave Airlie <airlied@redhat.com>
Date: Tue Jan 19 02:01:09 2016 +0000
glamor: don't do copy if we have 0 boxes to copy.
This happens if you run twm + mplayer + xclock and drag
the clock over the mplayer. If we don't catch it, we cause
an illegal draw elements command to be passed to GL.
Signed-off-by: Dave Airlie <airlied@redhat.com>
Reviewed-by: Eric Anholt <eric@anholt.net>
commit e7308b6c77561df44c04f81509f8ada678705d94
Author: Dave Airlie <airlied@redhat.com>
Date: Tue Jan 12 18:13:46 2016 +1000
glamor: Add support for CA rendering in a single pass.
It's been on the list to add dual source blending support to avoid the
two pass componentAlpha code. Radeon has done this for a while in
EXA, so let's add support to bring glamor up to using it.
This adds dual blend to both render and composite glyphs paths.
Initial results show close to doubling of speed of x11perf -rgb10text.
v2: Fix breakage of all of CA acceleration for systems without
GL_ARB_blend_func_extended. Add CA support for all the ops we
support in non-CA mode when blend_func_extended is present. Clean
up some comments and formatting. (changes by anholt)
Signed-off-by: Dave Airlie <airlied@redhat.com>
Signed-off-by: Eric Anholt <eric@anholt.net>
commit cab14a9a08ff06bc4cbef79c7be8f1d07c07ebf9
Author: Eric Anholt <eric@anholt.net>
Date: Thu Jan 21 12:01:02 2016 -0800
glamor: Drop the composite_with_copy path entirely.
I originally inherited this from the EXA code, without determining
whether it was really needed. Regular composite should end up doing
the same thing, since it's all just shaders anyway. To the extent
that it doesn't, we should fix composite.
Signed-off-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Dave Airlie <airlied@redhat.com>
commit 510c8605641803f1f5b5d2de6d3bb422b148e0e7
Author: Eric Anholt <eric@anholt.net>
Date: Thu Jan 21 11:30:15 2016 -0800
glamor: Fix copy-like Render operations between 15 and 16 depth.
Reading and writing to 16-depth pixmaps using PICT_x1r5g5b5 ends up
failing, unless you're doing a straight copy at the same bpp where the
misinterpretation matches on both sides.
Fixes rendercheck/blend/over and renderhceck/blend/src in piglit.
Please cherry-pick this to active stable branches.
Signed-off-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Dave Airlie <airlied@redhat.com>
commit bc415fb1e0031ad23bda6e9c3f4664532876a0e5
Author: Adam Jackson <ajax@redhat.com>
Date: Wed Jan 20 15:43:10 2016 -0500
glx: Fix GLX_EXT_create_context_es2_profile support
As of v4 of this extension, any GLES version number may be requested (to
enable GLES3 and later). To comply with this, simply remove the API
version checks and leave it to the DRI driver to validate. This happens
to also enable using GLES1 in direct contexts, so if that's the dire
situation you find yourself in, your client driver at least stands a
chance of working.
v4 also specifies that both extension strings should be advertised for
compatibility with clients written against v1 of the extension spec, so
add the es_profile bit to the extension list and enable it whenever we
would enable es2_profile.
Reviewed-by: Ilia Mirkin <imirkin@alum.mit.edu>
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit 49aa5e3ea4eecea0562c05a4e52962985a56e510
Author: Keith Packard <keithp@keithp.com>
Date: Wed Sep 10 16:17:52 2014 -0700
glamor: Use vertex array objects
Core contexts require the use of vertex array objects, so switch both glamor
and ephyr/glamor over.
Signed-off-by: Keith Packard <keithp@keithp.com>
Reviewed-by: Eric Anholt <eric@anholt.net>
Signed-off-by: Dave Airlie <airlied@redhat.com>
commit d99204fb5e09ce7be36485d4226f7ad6d6eb24cc
Author: Dave Airlie <airlied@redhat.com>
Date: Tue Jan 19 10:34:14 2016 +1000
glamor/xv: add vbo support (v2.1)
This converts the Xv code to using VBOs instead of
client ptrs. This is necessary to move towards using
the core profile later.
v2: put all boxes into single vbo, use draw arrays
to offset things. (Eric)
v2.1: brown paper bag with releasing vbo.
Reviewed-by: Eric Anholt <eric@anholt.net>
Signed-off-by: Dave Airlie <airlied@redhat.com>
commit 5582ad1b9b29934498cf3fef305d3a988130cd52
Author: Dave Airlie <airlied@redhat.com>
Date: Mon Jan 11 14:00:04 2016 +1000
glamor: use vbos in gradient/picture code.
This converts two client arrays users to using vbos,
this is necessary to move to using core profile later.
Reviewed-by: Eric Anholt <eric@anholt.net>
Signed-off-by: Dave Airlie <airlied@redhat.com>
commit 25eca80265654cfbf8768024e027426fedeb0918
Author: Michel Dänzer <michel.daenzer@amd.com>
Date: Fri Jan 15 18:22:21 2016 +0900
present: Handle wraparound when comparing MSC values
When a window moves from one CRTC to another, present_window_to_crtc_msc
updates window_priv->msc_offset according to the delta between the
current MSC values of the old and new CRTC:
window_priv->msc_offset += new_msc - old_msc;
window_priv->msc_offset is initially 0, so if new_msc < old_msc,
window_priv->msc_offset wraps around and becomes a large number. If the
window_msc parameter passed in is small (in particular if it's 0, such as
is the case when the client just wants to know the current window MSC
value), the returned CRTC MSC value may still be a large number. In that
case, the existing MSC comparisons in pixmap_present weren't working as
intended, resulting in scheduling a wait far into the future when the
target MSC had actually already passed. This would result in the client
(e.g. the Chromium browser) hanging when moving its window between CRTCs.
In order to fix this, introduce msc_is_(equal_or_)after helper functions
which take the wraparound into account for comparing two MSC values.
Signed-off-by: Michel Dänzer <michel.daenzer@amd.com>
Reviewed-by: Keith Packard <keithp@keithp.com>
Reviewed-by: Martin Peres <martin.peres@linux.intel.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 1db6de7b6a6ee240eb50a13fe1fa1e135d7cb93b
Author: Michel Dänzer <michel.daenzer@amd.com>
Date: Tue Jan 12 15:42:47 2016 +0900
glamor: Disable debugging messages other than GL API errors
According to Nicolai Hähnle, the relevant specification says "All
messages are initially enabled unless their assigned severity is
DEBUG_SEVERITY_LOW", so we need to explicitly disable the messages we
don't want to get. Failing that, we were accidentally logging e.g.
shader stats intended for shader-db.
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=93659
Tested-by: Laurent Carlier <lordheavym@gmail.com>
Reviewed-by: Emil Velikov <emil.l.velikov@gmail.com>
Signed-off-by: Michel Dänzer <michel.daenzer@amd.com>
Reviewed-by: Eric Anholt <eric@anholt.net>
commit 8116fd8a760b5935645def1b2c3b155c05927850
Author: Dave Airlie <airlied@redhat.com>
Date: Tue Jan 12 14:19:24 2016 +1000
glamor: store old fonts in double width textures.
There is a problem with some fonts that the height necessary
to store the font is greater than the max texture size, which
causes a fallback to occur. We can avoid this by storing two
macro columns side-by-side in the texture and adjusting
the calculations to suit.
This fixes
xfd -fn -*-*-*-*-*-*-*-*-*-*-*-*-*-*
falling back here, when it picks
-arabic-newspaper-medium-r-normal--32-246-100-100-p-137-iso10646-1
Reviewed-by: Keith Packard <keithp@keithp.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
commit 64081d0eacf3e53a029b8e8b63096cc153e98549
Author: Dave Airlie <airlied@redhat.com>
Date: Mon Jan 11 17:02:57 2016 +1000
glamor: fallback if font is too large for FBO size.
running xfontsel on haswell here, with a max texture size
of 8kx8k, one font wants 9711 height. This fallsback to
sw in this case.
A proper solution probably involves using an array texture.
Reviewed-by: Keith Packard <keithp@keithp.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
commit 6dcb73375e0ce389315d55587623eb84e9d13543
Author: Adam Jackson <ajax@redhat.com>
Date: Wed Jan 6 10:03:23 2016 -0500
os: Failure to remove a non-existent log file is not an error
Signed-off-by: Adam Jackson <ajax@redhat.com>
Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
commit 862cbf4c870c9ed913206c6ef4988bdb470e1c39
Author: Thomas Klausner <wiz@NetBSD.org>
Date: Wed Nov 11 13:32:05 2015 +0100
Fix build when XSERVER_PLATFORM_BUS is not defined.
Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Thomas Klausner <wiz@NetBSD.org>
commit 63f83d1b7f496d05b409352749cdb6674d71cf80
Author: Thomas Klausner <wiz@NetBSD.org>
Date: Tue Jan 5 12:51:41 2016 -0500
Fix uninitialized variable warnings reported by clang
v2: Move initializing pos into the first clause of the for statement. We
have to keep this macro equivalent to a plain for statement from the
user's perspective, otherwise callers need to {} things to keep control
flow correct. [ajax]
Signed-off-by: Thomas Klausner <wiz@NetBSD.org>
Acked-by: Michel Dänzer <michel.daenzer@amd.com>
commit ba71b69f94f00a6f6910597185610668e79c10be
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Fri Jan 1 17:34:41 2016 -0800
Avoid segfault in CloseWellKnownConnections when using -displayfd
When -displayfd is looping through the possible display ids to use,
if it can't open all the listening sockets for one (say when :0 is
already in use), it calls CloseWellKnownConnections to close all
the ListenTransConns entries before the point that ListenTransFds
was allocated & initialized, so CloseWellKnownConnections would
segfault trying to read entries from a NULL ListenTransFds pointer.
Introduced by commit 7b02f0b8
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Keith Packard <keithp@keithp.com>
commit edcb6426f20c3be5dd5f50b76a686754aef2f64e
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Fri Jan 1 18:11:14 2016 -0800
Use unique logfile names when starting server with -displayfd
Fixes https://bugs.freedesktop.org/show_bug.cgi?id=93212
Previously all X servers started with -displayfd would overwrite
Xorg.0.log - now a temporary name of Xorg.pid-<pid>.log is used
until after -displayfd finds an open display - then it is renamed
to the traditional Xorg.<display>.log name.
Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
commit fe8562f5316d8c74ca074ad145295c65ddff5fc2
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Fri Jan 1 18:10:08 2016 -0800
modesetting should not reference gbm when it's not defined
Fixes build errors of:
present.c: In function 'ms_do_pageflip':
present.c:410:17: error: 'drmmode_bo' has no member named 'gbm'
new_front_bo.gbm = glamor_gbm_bo_from_pixmap(screen, new_front);
^
present.c:412:22: error: 'drmmode_bo' has no member named 'gbm'
if (!new_front_bo.gbm) {
^
present.c: In function 'ms_present_check_flip':
present.c:536:36: error: 'drmmode_bo' has no member named 'gbm'
if (drmmode_crtc->rotate_bo.gbm)
^
Introduced by commit 13c7d53d
Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
commit 792176417f7e62a99c4f07801f74f804d6080de2
Author: Adam Jackson <ajax@redhat.com>
Date: Tue Jan 5 12:03:54 2016 -0500
Revert "Fix uninitialized variable warnings reported by clang"
Crashes at startup:
dmt:~/git/xserver% ./hw/kdrive/ephyr/Xephyr :1
(EE) Backtrace:
(EE) 0: ./hw/kdrive/ephyr/Xephyr (OsSigHandler+0x29) [0x47c8f9]
(EE) 1: /lib64/libc.so.6 (__restore_rt+0x0) [0x7f38d4de6b1f]
(EE) 2: ./hw/kdrive/ephyr/Xephyr (InitNotifyFds+0x17) [0x478697]
(EE) 3: ./hw/kdrive/ephyr/Xephyr (OsInit+0x1e) [0x47c99e]
(EE) 4: ./hw/kdrive/ephyr/Xephyr (dix_main+0x11c) [0x446efc]
(EE) 5: /lib64/libc.so.6 (__libc_start_main+0xf0) [0x7f38d4dd2580]
(EE) 6: ./hw/kdrive/ephyr/Xephyr (_start+0x29) [0x427099]
(EE) 7: ? (?+0x29) [0x29]
(EE)
(EE) Segmentation fault at address 0x0
This reverts commit a221d4737c167589da44595c795d54f2c36b439a.
commit a221d4737c167589da44595c795d54f2c36b439a
Author: Thomas Klausner <wiz@NetBSD.org>
Date: Wed Dec 16 08:36:24 2015 +0100
Fix uninitialized variable warnings reported by clang
Signed-off-by: Thomas Klausner <wiz@NetBSD.org>
Acked-by: Michel Dänzer <michel.daenzer@amd.com>
commit f3593918a0507cc080875788b2776ebe4f57c694
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Wed Dec 16 09:21:39 2015 +1000
xfree86: move check for driver->PreInit up
No real change, but if the driver is broken and doesn't provide a PreInit
function, then we don't need to worry about logind.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Keith Packard <keithp@keithp.com>
commit fc4fbe8224fdc8d7774120b6e978c652a70a50ee
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri Dec 11 09:31:30 2015 +1000
xfree86: add NoMatchFoo directives for InputClass sections
InputClass sections use various MatchFoo directives to decide which device to
apply to. This usually works fine for specific snippets but has drawbacks for
snippets that apply more generally to a multitude of devices.
This patch adds a NoMatchFoo directive to negate a match, thus allowing
snippets that only apply if a given condition is not set. Specifically, this
allows for more flexible fallback driver matching, it is now possible to use a
snippet that says "assign driver foo, but only if driver bar wasn't already
assigned to it". For example:
Section "InputClass"
Identifier "libinput for tablets"
MatchIsTablet "true"
NoMatchDriver "wacom"
Driver "libinput"
EndSection
The above only assigns libinput to tablet devices if wacom isn't already
assigned to this device, making it possible to select a specific driver by
installing/uninstalling it.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Benjamin Tissoires <benjamin.tissoires@gmail.com>
commit eb671b804e902011ba901d0833a215799177bad0
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri Dec 11 07:26:02 2015 +1000
xfree86: whitespace fix
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 3d68d1f26709ecb5ce22a9baa0d3d8162574ed6a
Author: Siim Põder <siim@p6drad-teel.net>
Date: Mon Jun 8 22:14:12 2015 +0000
vfb: add randr support (v2)
The motivation for getting this is chrome remote desktop that runs under
Xvfb and wants to use RANDR to adjust screen size according to the
remote desktop client screen size. Apparently there are other use cases
as well, the bug mentions gnome-settings-daemon testing.
[ajax: massaged commit message]
Fixes: https://bugs.freedesktop.org/show_bug.cgi?id=26391
Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Lambros Lambrou <lambroslambrou@google.com>
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
Signed-off-by: Michal Srb <msrb@suse.com>
Signed-off-by: Siim Põder <siim@p6drad-teel.net>
commit e98b36bc69d805ab52aba95b070a614427d46e05
Author: Adam Jackson <ajax@redhat.com>
Date: Tue Dec 8 16:22:16 2015 -0500
randr: Silence unused variable warning
Signed-off-by: Adam Jackson <ajax@redhat.com>
Reviewed-by: Michel Dänzer <michel.daenzer@amd.com>
commit 8c49c883dc196ea57e3f64425c2a5b0a8ce3ba75
Author: Adam Jackson <ajax@redhat.com>
Date: Tue Dec 8 15:08:34 2015 -0500
sync: Don't allow creating a system counter before sync is initialized
It probably doesn't work very well since there's other extension setup
we're not doing on this path, and in any event it's not a thing that
happens currently.
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit b5f04a79df8b5aab8b558461261d14721f0b3e41
Author: Adam Jackson <ajax@redhat.com>
Date: Tue Dec 8 15:56:17 2015 -0500
glxproxy: Silence shadowed-variable warnings
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit 18729a211a5fdd4f733e44eded754a0e6210b687
Author: Adam Jackson <ajax@redhat.com>
Date: Tue Dec 8 15:53:35 2015 -0500
glxproxy: Silence set-but-unused-variable warnings
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit bc996fa4e3c06f65eafe0a88ef491dbf01f31422
Author: Adam Jackson <ajax@redhat.com>
Date: Tue Dec 8 16:04:44 2015 -0500
dmx: Run 'doxygen -u' to upgrade the doxygen config file
Also change the dot font setting back to the default of Helvetica as
doxygen no longer ships FreeSans.
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit a55e0bc56fd8f9da8f066dc344af19535dd092ca
Author: Adam Jackson <ajax@redhat.com>
Date: Tue Dec 8 16:00:19 2015 -0500
dmx: Silence unused variable warning in dmxcompat
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit 2730ccb803c55af74dbdd1bfd982fc23e643554d
Author: Adam Jackson <ajax@redhat.com>
Date: Tue Dec 8 15:37:12 2015 -0500
dmx: Silence lex/yacc-related config parser warnings
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit 718223d27452862eedcf1bee6278eae6040d45ea
Author: Laércio de Sousa <laerciosousa@sme-mogidascruzes.sp.gov.br>
Date: Thu Dec 3 08:05:59 2015 -0200
systemd-logind.c: don't parse VT settings for non-seat0 X servers
Since non-seat0 X servers no longer touch VTs, I believe these settings
are unnecessary.
Signed-off-by: Laércio de Sousa <laerciosousa@sme-mogidascruzes.sp.gov.br>
Reviewed-by: Hans de Goede <hdegoede@redhat.com>
commit 7c0ba32ddd5f1d5c65279365fa307dec3433caf3
Author: Bob Ham <bob.ham@collabora.com>
Date: Fri Dec 4 12:30:47 2015 +0000
xserver: Fix configure.ac check for libsystemd/-daemon
The configure script looks for the libsystemd-daemon pkg-config
module. If the configure script finds it, the script will add
libsystemd-daemon to a list of modules which are used to consolidate
CFLAGS and LIBS.
The check for libsystemd-daemon was altered to fallback to libsystemd
if libsystemd-daemon was not found (libsystemd-daemon was brought into
libsystemd). Unfortunately, the configure script still adds
"libsystemd-daemon" to the list of modules to consolidate, instead of
"libsystemd". With this patch, we set a variable depending on which
pkg-config module is found and add that to the module list instead.
Changes since v1:
- Rearranged logic so that we do a versioned check for libsystemd
first, then look for libsystemd-daemon.
- Cleaned up the check a bit, only performing the module checks if we
don't have --with-systemd-daemon=no, in a similar style to
--with-dtrace.
- Changed the variable name to LIBSYSTEMD_DAEMON as per feedback.
Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Bob Ham <bob.ham@collabora.com>
commit 530d3e5ca0a02039b04ec6a677bbb4e05b78e5f4
Author: Michel Dänzer <michel.daenzer@amd.com>
Date: Thu Dec 3 17:04:09 2015 +0900
prime: Damage full destination rectangle when we start dirty tracking
This makes sure that the destination pixmap contents will be fully
initialized. Without this, a PRIME output starts out with garbage.
Signed-off-by: Michel Dänzer <michel.daenzer@amd.com>
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
commit 2a52c06e235bd79f91851121f53f7c1808fde321
Author: Adam Jackson <ajax@redhat.com>
Date: Mon Dec 7 17:03:02 2015 -0500
x86emu: Squash a warning
Apologies, should have caught this one when applying the previous x86emu
patch.
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit 59b618227ebd024e57720aaaea17596953f5b80e
Author: Julian Pidancet <julian.pidancet@gmail.com>
Date: Sun Jul 1 18:49:25 2012 +0100
x86emu: Correctly handle 0x66 prefix for some instructions
(Sorry for double posting)
I repost this patch because I havn't got any replies from maintainers
since I posted the initial patch back in March.
Some instructions are not emulated correctly by x86emu when they
are prefixed by the 0x66 opcode.
I've identified problems in the emulation of these intructions: ret,
enter, leave, iret and some forms of call.
Most of the time, the problem is that these instructions should push or
pop 32-bit values to/from the stack, instead of 16bit, when they are
prefixed by the 0x66 special opcode.
The SeaBIOS project aims to produce a complete legacy BIOS
implementation as well as a VGA option ROM, entirely written in C and
using the GCC compiler.
In 16bit code produced by the GCC compiler, the 0x66 prefix is used
almost everywhere. This patch is necessary to allow the SeaBIOS VGA
option ROM to function with Xorg when using the vesa driver.
SeaBIOS currently use postprocessing on the ROM assembly output to
replace the affected instruction with alternative unaffected instructions.
This is obviously not very elegant, and this fix in x86emu would be
more appropriate.
v2: - Decrement BP instead of EBP in accordance with the Intel Manual
- Assign EIP instead of IP when poping the return address from the
stack in 32-bit operand size mode in ret_far_IMM, ret_far, and iret
- When poping EFLAGS from the stack in iret in 32-bit operand size
mode, apply some mask to preserve Read-only flags.
v3: - Rebase
Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Julian Pidancet <julian.pidancet@gmail.com>
commit 72f0724cdc65dc9abbbf70b9feb6cce7c2b9f8a0
Author: Chris Wilson <chris@chris-wilson.co.uk>
Date: Sun Feb 8 09:47:42 2015 +0000
present: Do not replace Pixmaps on redirected Window on unflip
When unflipping, we may find that our flip window has been redirected.
If we replace the redirected Window with the Screen Pixmap we then have
mutliple fullscreen Windows believing that their own the Screen Pixmap -
multiple fullscreen Windows that are being flipped by Clients, and so
continue to flip causing popping between e.g. the compositor and the
game.
[ajax: Fix up present_execute() hunk to account for changes introduced
in fe07ec19e212a68076560d243a2a935c54589068]
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Reviewed-by: Michel Dänzer <michel.daenzer@amd.com>
commit 180b09912c0d2c4a43b5a08678bcad4b818924c7
Author: Chris Wilson <chris@chris-wilson.co.uk>
Date: Sun Feb 8 09:47:41 2015 +0000
present: When cancelling a pending synchronous flip, requeue it
The vblank event request for a synchronous flip is scheduled for the
vblank before the target flip msc (so that the flip itself appears at
the right frame). If we cancel that flip and so wish to schedule a
copy instead, that copy needs to be postponed by a frame in order for it
be performed at the requested time.
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Reviewed-by: Michel Dänzer <michel.daenzer@amd.com>
commit b2d55338f6b8f43ebcb49994abad123a797248cf
Author: Chris Wilson <chris@chris-wilson.co.uk>
Date: Sun Feb 8 09:47:40 2015 +0000
present: Requery pending flips with the right sync_flip mode
When verifying whether a pending flip is still valid, we need to pass
down the orignal sync_flip mode (e.g. if the driver only supports sync
flips, verifying a async flip will falsely fail).
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Reviewed-by: Michel Dänzer <michel.daenzer@amd.com>
commit 548a3d5fd69bb059bbaf26ededdc94c212712cd7
Author: Dave Airlie <airlied@gmail.com>
Date: Mon Nov 16 09:05:27 2015 +1000
modesetting: create entities for pci and old probe. (v2)
This moves the code from the platform case into
a common function, and calls that from the
other two.
v2: Emil convinced me we don't need to lookup pEnt
here, so let's not bother.
Reported-by: Mark Kettenis <mark.kettenis@xs4all.nl>
Reviewed-by: Mark Kettenis <kettenis@openbsd.org>
Signed-off-by: Dave Airlie <airlied@redhat.com>
commit 771016f0705909c908917b4ccaeafc950ba93c05
Author: Dave Airlie <airlied@gmail.com>
Date: Mon Nov 16 09:05:26 2015 +1000
modesetting: drop platform_dev pointer.
This isn't used anywhere, so no point storing it until we need it.
Reviewed-by: Mark Kettenis <kettenis@openbsd.org>
Signed-off-by: Dave Airlie <airlied@redhat.com>
commit 19b0249a5e07b9fc008e5d8709d7e489874415de
Author: Arkadiusz Miśkiewicz <arekm@maven.pl>
Date: Mon Nov 16 11:06:57 2015 +0100
Xorg.wrap: activate libdrm based detection for KMS drivers
Xorg.wrap includes code guarded with WITH_LIBDRM for detecting KMS drivers.
Unfortunately it is never activated since code missed to include file
which defines WITH_LIBDRM.
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=92894
Signed-off-by: Arkadiusz Miśkiewicz <arekm@maven.pl>
Reviewed-by: Michel Dänzer <michel.daenzer@amd.com>
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
commit 5bccde749db93296b7784e4cdc5e54c4443656c1
Author: Michel Dänzer <michel.daenzer@amd.com>
Date: Wed Dec 2 18:21:12 2015 +0900
randr: Stop dirty tracking for shared pixmap being destroyed
Otherwise, we leave a dangling reference to the destroyed pixmap in the
master screen's pixmap_dirty_list.
Fixes regression from commit cf5d6414 ("randr: Factor out shared pixmap
destruction").
Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Michel Dänzer <michel.daenzer@amd.com>
commit 2e3d9623ae3f562f81e513cb183ca1b1b68f279c
Author: Adam Jackson <ajax@redhat.com>
Date: Wed Dec 2 10:42:36 2015 -0500
Revert "hw/xfree86: Use NotifyFd for device and other input fd wakeups"
Reported to break libinput:
http://lists.freedesktop.org/archives/xorg-devel/2015-December/048091.html
This reverts commit 1df07dc36ca145c59f51176d9ab2651112506d75.
commit 7b02f0b87ec2fa0cc5a65307a1fd55c671cec884
Author: Keith Packard <keithp@keithp.com>
Date: Wed Nov 11 22:02:17 2015 -0800
os: Use NotifyFd interface for listen descriptors
Replace the custom path for dealing with new incoming connections with
the general-purpose NotifyFd API.
Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 1df07dc36ca145c59f51176d9ab2651112506d75
Author: Keith Packard <keithp@keithp.com>
Date: Wed Nov 11 22:02:16 2015 -0800
hw/xfree86: Use NotifyFd for device and other input fd wakeups
Remove code in xf86Wakeup for dealing with device and other input and
switch to using the new NotifyFd interface.
Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit e51ea53b26bd9ec05b9209825960af28d0b6bbe1
Author: Keith Packard <keithp@keithp.com>
Date: Wed Nov 11 22:02:15 2015 -0800
render: Use OsTimer for animated cursor timing
This replaces the block/wakeup handlers with an OsTimer. This also
avoids problems with performing rendering during the wakeup handler.
Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 49c0f2413d32fdfe36e45861fcb32aaeab633094
Author: Keith Packard <keithp@keithp.com>
Date: Wed Nov 11 22:02:14 2015 -0800
os/xdmcp: Replace xdmcp block/wakeup handlers with timer and NotifyFd
This removes the block and wakeup handlers and replaces them with a
combination of a NotifyFd callback and timers.
Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 6a121f55381ecbb9cdaaef36ba6135890f3e006f
Author: Keith Packard <keithp@keithp.com>
Date: Wed Nov 11 22:02:13 2015 -0800
Xext/xselinux: Use NotifyFd interface
Replace block/wakeup handlers with SetNotifyFd. Much nicer now.
Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit f933a1b38ed1c65cc39fce1ee37aa18e3022c3f0
Author: Keith Packard <keithp@keithp.com>
Date: Mon Nov 23 17:36:53 2015 -0800
hw/xwayland: Use NotifyFd handler to monitor wayland socket
Replace the block/wakeup handler with a NotifyFd callback instead.
Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 8543d4d8bc0526d1c910913b76259e5dee108e74
Author: Keith Packard <keithp@keithp.com>
Date: Wed Nov 11 22:02:11 2015 -0800
modesetting: Use NotifyFd for drm event monitoring
Replace the block/wakeup handlers with a NotifyFd callback.
Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 58354fcf472cefc35b9c19cf84bf079cadfa2e1d
Author: Keith Packard <keithp@keithp.com>
Date: Wed Nov 11 22:02:10 2015 -0800
kdrive/ephyr: Use NotifyFd for XCB connection input [v2]
Eliminates polling every 20ms for device input.
v2: rename ephyrPoll to ephyrXcbNotify and fix the API so it can be
used directly for SetNotifyFd. Thanks to Daniel Martin
<consume.noise@gmail.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
Cc: Daniel Martin <consume.noise@gmail.com>
commit 483c2a1adf044ba1da844687b908c1c802060d2d
Author: Keith Packard <keithp@keithp.com>
Date: Wed Nov 11 22:02:09 2015 -0800
hw/kdrive: Use NotifyFd for kdrive input devices
This switches the kdrive code to use FD notification for input
devices, rather than the block and wakeup handlers.
Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 21c1680e83865a52d88cf8c80fb236d212931e5c
Author: Keith Packard <keithp@keithp.com>
Date: Wed Nov 11 22:02:08 2015 -0800
hw/kdrive: Use NotifyFd interface for kdrive/linux APM monitoring
Replace the block/wakeup handlers with a NotifyFd callback
Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 8c8f3567fe4b4e372e22420810443c43e008da2c
Author: Keith Packard <keithp@keithp.com>
Date: Wed Nov 11 22:02:07 2015 -0800
config: Use NotifyFd interface for udev
This uses the NotifyFd interface to monitor the udev file descriptor
rather than adding another block/wakeup handler
Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit bf920b2390dc27947f87dd0b228518290a5ed85d
Author: Keith Packard <keithp@keithp.com>
Date: Wed Nov 11 22:02:06 2015 -0800
config: Use NotifyFd for dbus interface
This uses the NotifyFd interface to monitor the dbus socket rather
than a block/wakeup handler.
Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 91ea0965dd4dfeba0a914c47ad4a64768e983b1b
Author: Keith Packard <keithp@keithp.com>
Date: Wed Nov 11 22:02:04 2015 -0800
dix: Move InitFonts up above screen initialization
Font initialization was split into two stages, the first was to set up
font privates with a call to ResetFontPrivateIndex, then much later
the call to InitFonts to set up all of the FPEs. Doing the full font
initialization before initializing the video drivers means that we can
move the call to ResetFontPrivateIndex inside InitFonts.
Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 4020aacd1fc5b9c63369f011aeb9120af9c55218
Author: Keith Packard <keithp@keithp.com>
Date: Wed Nov 11 22:02:03 2015 -0800
os: Implement support for NotifyFd X_NOTIFY_WRITE
This adds the ability to be notified when a file descriptor is
available for writing.
Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 0c41b7af4ab0c8d22b88f201293f59524d1e7317
Author: Keith Packard <keithp@keithp.com>
Date: Wed Nov 11 22:02:02 2015 -0800
os: Add NotifyFd interfaces
This provides a callback-based interface to monitor file
descriptors beyond the usual client and device interfaces.
Modules within the server using file descriptors for reading and/or
writing can call
Bool SetNotifyFd(int fd, NotifyFdProcPtr notify_fd, int mask, void *data);
mask can be any combination of X_NOTIFY_READ and X_NOTIFY_WRITE.
When 'fd' becomes readable or writable, the notify_fd function will be
called with the 'fd', the ready conditions and 'data' values as arguments,
When the module no longer needs to monitor the fd, it will call
void RemoveNotifyFd(int fd);
RemoveNotifyFd may be called from the notify function.
Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit e10ba9e4b52269b2ac75c4802dce4ca47d169657
Author: Keith Packard <keithp@keithp.com>
Date: Wed Nov 11 22:02:01 2015 -0800
Remove non-smart scheduler. Don't require setitimer.
This allows the server to call GetTimeInMillis() after each request is
processed to avoid needing setitimer. -dumbSched now turns off the
setitimer.
Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit c7f4aef8f45e500c900d59f68c653477148907ea
Author: agoins <agoins@nvidia.com>
Date: Wed Nov 25 18:39:31 2015 -0800
randr: Cleanup rrSetupPixmapSharing()
protopix is completely redundant with mscreenpix. Get rid of it.
We don't need rrScrPriv, so remove it.
[ajax: also squash an unused variable in RRCrtcDetachScanoutPixmap,
though it'll come back when the rest of this series lands]
Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Alex Goins <agoins@nvidia.com>
commit 8d3f0e964e399dcfa8eb5e85d405217fdc5dbcd4
Author: agoins <agoins@nvidia.com>
Date: Wed Nov 25 18:39:27 2015 -0800
xf86: Bump ABI version to 21
Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Alex Goins <agoins@nvidia.com>
commit 7006b4e7ff759c899d5391b7d12db889cbc0b535
Author: agoins <agoins@nvidia.com>
Date: Wed Nov 25 18:39:26 2015 -0800
randr: Factor out shared pixmap creation
The old version of rrCreateSharedPixmap(), in addition to actually creating
a shared pixmap with scanout, also set up pixmap tracking on the source
driver.
I will be needing to create multiple shared pixmaps for PRIME double
buffering, so factor the part that does shared pixmap creation into its own
function, the new rrCreateSharedPixmap(). Rename the old
rrCreateSharedPixmap() to rrSetupPixmapSharing(), a function that
replicates the old functionality of rrCreateSharedPixmap() using the new
rrCreateSharedPixmap().
Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Alex Goins <agoins@nvidia.com>
commit cf5d6414e0c21140f763d618bde1e91ad2b1cb49
Author: agoins <agoins@nvidia.com>
Date: Wed Nov 25 18:39:25 2015 -0800
randr: Factor out shared pixmap destruction
Shared pixmap destruction is done by unrefing the master pixmap twice: once
for the original reference, and once for the reference implicitly added by
PixmapShareToSlave. Then, unrefing the slave pixmap once.
When I add PRIME double buffering and synchronization, I will need to do
this in multiple places. To avoid duplication of code and comments
explaining it everywhere, factor it out into its own function and use that
in place of where it was before.
Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Alex Goins <agoins@nvidia.com>
commit ab9837cc6a11f46b9df780f131b69de3822c3dd9
Author: Olivier Fourdan <ofourdan@redhat.com>
Date: Tue Dec 1 17:16:03 2015 +0100
xwayland: Update screen size on output removal
When unplugging an output, it's still listed in xrandr and the size
of the root window still includes the removed output.
The RR output should be destroyed when its Wayland counterpart is
destroyed and the screen dimensions must be updated in both the done
and the destroy handlers.
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=92914
Signed-off-by: Olivier Fourdan <ofourdan@redhat.com>
Reviewed-by: Marek Chalupa <mchqwerty@gmail.com>
commit 07941a50a547f2ca094e242588298695f48903ed
Author: Jonas Ådahl <jadahl@gmail.com>
Date: Wed Oct 7 12:01:53 2015 +0800
xwayland: Always update the wl_pointer cursor on pointer focus
In Wayland, a client (in this case XWayland) should set the cursor
surface when it receives pointer focus. Not doing this will leave the
curser at whatever it was previously.
When running on XWayland, the X server will not be the entity that
controls what actual pointer cursor is displayed, and it wont be notified
about the pointer cursor changes done by the Wayland compositor. This
causes X11 clients running via XWayland to end up with incorrect pointer
cursors because the X server believes that, if the cursor was previously
set to the cursor C, if we receive Wayland pointer focus over window W
which also has the pointer cursor C, we do not need to update it. This
will cause us to end up with the wrong cursor if cursor C was not the
same one that was already set by the Wayland compositor.
This patch works around this by, when receiving pointer focus, getting
the private mipointer struct changing the "current sprite" pointer to
an invalid cursor in order to trigger the update path next time a cursor
is displayed by dix.
Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Jonas Ådahl <jadahl@gmail.com>
commit 51a4399b94f9adfac5f7718d4cbf73f793dcca56
Author: Olivier Fourdan <ofourdan@redhat.com>
Date: Mon Nov 23 08:51:48 2015 +0100
xwayland: Do not set root clip when rootless
Otherwise the server may try to draw onto the root window when closing
down, but when running rootless the root window has no storage thus
causing a memory corruption.
Thanks to Adam Jackson <ajax@redhat.com> for helping tracking this down!
Reviewed-by: Adam Jackson <ajax@redhat.com>
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=93045
Signed-off-by: Olivier Fourdan <ofourdan@redhat.com>
Tested-by: Marek Chalupa <mchqwerty@gmail.com>
commit 5b2ca3413203210d112a08a4e20d14382abae437
Author: Marek Chalupa <mchqwerty@gmail.com>
Date: Fri Nov 27 14:27:46 2015 +0100
xwayland: check if creating xwl_output succeeded
check return values of RR.*Create calls
v2. do not bail out if we don't have any output
Signed-off-by: Marek Chalupa <mchqwerty@gmail.com>
Reviewed-by: Olivier Fourdan <ofourdan@redhat.com>
commit 646ebea456b4c5251ae997eab8d9b971f97de836
Author: Marek Chalupa <mchqwerty@gmail.com>
Date: Fri Nov 27 14:59:27 2015 +0100
xwayland: fix memory leaks on error paths in xwl_realize_window
don't leak memory when realizing window fails
v2. take care of all memory allocation and return values,
not just one leak
Signed-off-by: Marek Chalupa <mchqwerty@gmail.com>
Reviewed-by: Olivier Fourdan <ofourdan@redhat.com>
commit e6b106715f24112d1dc7a84c6e37df4b5debb2d0
Author: Richard PALO <richard@NetBSD.org>
Date: Tue Nov 17 07:02:07 2015 +0100
Replace 'sun' with '__sun'
Globally replace #ifdef and #if defined usage of 'sun' with '__sun'
such that strict ISO compiler modes such as -ansi or -std=c99 can be used.
Signed-off-by: Richard PALO <richard@NetBSD.org>
Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
commit 44d0fd435a4eaf45e252b4f00409152a6d599dfc
Author: Egbert Eich <eich@suse.de>
Date: Tue Nov 24 17:37:36 2015 +0100
kdrive/UnregisterFd: Fix off by one
The number of FDs has been decremented already, therefore the
number contained the index of the top one that is to me moved down.
This problem was introduced by:
commit 1110b71e360195aab040d835b54540ab558638c5
Author: Chris Clayton <chris2553@googlemail.com>
kdrive: fix build error on gcc 4.8 for out-of-bounds array access
The reason for the warning was likely a confused compiler.
Hoping to reduce the confusion by moving the decrement behind the end
if the copy loop.
Signed-off-by: Egbert Eich <eich@suse.de>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
commit eb36924ead40564325aa56d54a973dc8fb4eae83
Author: Adam Jackson <ajax@redhat.com>
Date: Tue Nov 24 08:31:21 2015 -0500
dix: Remove redundant ChangeWindowProperty
Use dixChangeWindowProperty(serverClient, ...) instead.
Signed-off-by: Adam Jackson <ajax@redhat.com>
Reviewed-by: Keith Packard <keithp@keithp.com>
commit 4affa75a90d2455c81087b930126ad7adfd019f0
Author: Adam Jackson <ajax@redhat.com>
Date: Thu Nov 19 12:21:08 2015 -0500
xnest: Fix needless build dependency on xcb-util-keysyms
This was added in:
commit 43014795087a0a8774dd9687f5967329b15f06a2
Author: Olivier Fourdan <ofourdan@redhat.com>
Date: Mon Jan 5 16:44:22 2015 +0100
Synchronize capslock in Xnest and Xephyr
Which is fine if you're building both, but if you don't happen to have
xcb-util-keysyms' headers installed Xnest will configure as enabled but
fail to build.
Fortunately <X11/X.h> has a corresponding #define, so use that instead.
Signed-off-by: Adam Jackson <ajax@redhat.com>
Reviewed-by: Olivier Fourdan <ofourdan@redhat.com>
commit fee0827a9a695600765f3d04376fc9babe497401
Author: Daniel Stone <daniels@collabora.com>
Date: Fri Nov 20 15:37:31 2015 +0000
XWayland: Use FocusIn events for keyboard enter
wl_keyboard::enter is the equivalent of FocusIn + KeymapNotify: it
notifies us that the surface/window has now received the focus, and
provides us a set of keys which are currently down.
We should use these keys to update the current state, but not to send
any events to clients.
Signed-off-by: Daniel Stone <daniels@collabora.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 816015648ffe660ddaa0f7d4d192e555b723c372
Author: Daniel Stone <daniels@collabora.com>
Date: Fri Nov 20 15:37:30 2015 +0000
Input: Add focus-in event source
Add a new event source type for keypress events synthesised from focus
notifications (e.g. KeymapNotify from the parent server, when running
nested). This is used to keep the keys-down array in sync with the host
server's, without sending actual keypress events to clients.
Signed-off-by: Daniel Stone <daniels@collabora.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit c3788394e9190130a8eed44c5c93eeb93c2a9893
Author: Daniel Stone <daniels@collabora.com>
Date: Fri Nov 20 15:37:29 2015 +0000
Input: Add DeviceEventSource enum
Add a flag to DeviceEvents, giving the source of the event. Currently
this only supports a 'normal' flag, but will be used later to add a
'focus-in' flag, noting events synthesised from key/button arrays on
focus-in notifications.
Signed-off-by: Daniel Stone <daniels@collabora.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 2e61901e46d28ce2f436219ad1a495aa0dcd0fba
Author: Daniel Stone <daniels@collabora.com>
Date: Fri Nov 20 15:37:28 2015 +0000
XKB: Split filter execution into a separate function
Move the giant state machine which maps from a key action to actually
running the filters into a separate function, to be used when adding
KeyFocusIn.
Signed-off-by: Daniel Stone <daniels@collabora.com>
Tested-by: Giulio Camuffo <giuliocamuffo@gmail.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 71ba82690158f46d50a455e69a83ee0d685bb274
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Mon Nov 23 07:59:24 2015 +1000
xfree86: fix minor memory leak
xf86*StrOption returns a strdup
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Hans de Goede <hdegoede@redhat.com>
commit 51984dddfcc7133ed3c1f20d03514aa98c9a7831
Author: Eric Anholt <eric@anholt.net>
Date: Thu Jun 18 11:14:41 2015 -0700
glamor: Delay making pixmaps shareable until we need to.
If a pixmap isn't getting exported as a dmabuf, then we don't need to
make an EGLImage/GBM bo for it. This should reduce normal pixmap
allocation overhead, and also lets the driver choose non-scanout
formats which may be much higher performance.
On Raspberry Pi, where scanout isn't usable as a texture source, this
improves x11perf -copypixwin100 from about 4300/sec to 5780/sec under
xcompmgr -a, because we no longer need to upload our x11perf window to
a tiled temporary in order to render it to the screen.
v2: Just use pixmap->usage_hint instead of a new field. Drop the
changes that started storing gbm_bos in the pixmap priv due to
lifetime issues.
v3: Fix a missing gbm_bo_destroy() on the pixmap-from-fd success path.
Signed-off-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Michel Dänzer <michel.daenzer@amd.com>
commit 7cd495a88807698b4ebaf9c1fb3db6edf31dd7e6
Author: Eric Anholt <eric@anholt.net>
Date: Thu Oct 15 13:25:12 2015 -0700
glamor: Make glamor_get_name_from_bo static.
Signed-off-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Michel Dänzer <michel.daenzer@amd.com>
commit 6be33fd044949330e0b2b4185882c9664d2f90b4
Author: Eric Anholt <eric@anholt.net>
Date: Thu Jun 18 11:26:46 2015 -0700
glamor: Simplify DRI3 pixmap-from-fd, using GBM.
This GBM import path was introduced in 10.2, which we already require.
Signed-off-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Michel Dänzer <michel.daenzer@amd.com>
commit 1b8f16d8e659fb483453e1123a9fa876adb758ff
Author: Eric Anholt <eric@anholt.net>
Date: Thu Jun 18 11:21:10 2015 -0700
glamor: Use real types for glamor_egl's public gbm functions.
I think void * was just used to avoid needing to #include gbm.h, but
we can just forward-declare the structs and be fine.
Signed-off-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Michel Dänzer <michel.daenzer@amd.com>
commit f80758f32a7b922baf8fbf3ac6d8c9aae5fea1c4
Author: Eric Anholt <eric@anholt.net>
Date: Thu Jun 18 11:15:40 2015 -0700
glamor: Use the GBM function for getting an FD from a GBM BO.
We were rolling ioctl calls ourselves, when there's a nice interface
for it.
Signed-off-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Michel Dänzer <michel.daenzer@amd.com>
commit ff2850424c99652506d0d6bc43506b4c16bf2ad5
Author: Eric Anholt <eric@anholt.net>
Date: Sun Oct 18 19:26:14 2015 -0700
glamor: Hook up EGL DestroyPixmap through the normal wrap chain.
One less layering violation (EGL should call glamor, if anything, not
the other way around).
v2: Move glamor.c's DestroyPixmap wrapping up above the
glamor_egl_screen_init() call, since glamor.c's DestroyPixmap
needs to be the bottom of the stack (it calls fb directly and
doesn't wrap). Caught by Michel.
Signed-off-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Michel Dänzer <michel.daenzer@amd.com>
commit e91fd30049ba9ebfb6ee8aded74eebe006af3f57
Author: Eric Anholt <eric@anholt.net>
Date: Sun Oct 18 21:34:45 2015 -0700
glamor: Unexport glamor_destroy_textured_pixmap().
This is just a bit of the DestroyPixmap chain.
Signed-off-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Michel Dänzer <michel.daenzer@amd.com>
commit 3dd202933fd94615aeeaec7e4cfd05a68954a3f3
Author: Eric Anholt <eric@anholt.net>
Date: Sun Oct 18 21:28:19 2015 -0700
glamor: Remove glamor_egl_destroy_textured_pixmap().
The DestroyPixmap chain and CloseScreen chain all do pixmap teardown
already, and calling it manually would be redundant.
Signed-off-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Michel Dänzer <michel.daenzer@amd.com>
commit 9d2b76652f0bca5680b9e3ae2aacd508d5525684
Author: Eric Anholt <eric@anholt.net>
Date: Fri Jun 19 15:56:13 2015 -0700
modesetting: No need to free the EGLImage just before freeing the pixmap.
DestroyPixmap handles that just fine. This also lets us drop our use
of the manual image destruction function (Note that the radeon driver
still uses it in a similar fashion, though).
Signed-off-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Michel Dänzer <michel.daenzer@amd.com>
commit 98a1993536add730b7ec29a9e37f62b1cd70ad31
Author: Eric Anholt <eric@anholt.net>
Date: Sun Oct 18 19:16:20 2015 -0700
glamor: No need to glFlush before destroying a pixmap.
I assume this was a workaround for an old, broken, closed driver. The
driver doesn't get to throw away rendering just because the rendering
context's shared-across-processes render target is getting freed from
the local address space. If the rendering isn't to a shared render
target, then we *do* want to throw away the rendering to it.
Signed-off-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Michel Dänzer <michel.daenzer@amd.com>
commit 9a5972801f7789833062e5711e77483b643eef92
Author: Eric Anholt <eric@anholt.net>
Date: Thu Nov 5 16:35:56 2015 -0800
glamor: Fix segfault in fallback picture uploading.
If the source/mask pixmap is a pixmap that doesn't have an FBO
attached, and it doesn't match the Render operation's size, then we'll
composite it to a CPU temporary (not sure why). We would take the
PictFormatShort from the source Picture, make a pixmap of that depth,
and try to look up the PictFormat description from the depth and the
PictFormatShort. However, the screen's PictFormats are only attached
to the screen's visuals' depths. So, with an x2r10g10b10 short format
(depth 30), we wouldn't find the screen's PictFormat for it
(associated with depth 32).
Instead of trying to look up from the screen, just use the pFormat
that came from our source picture. The only time we need to look up a
PictFormat when we're doing non-shader gradients, which we put in
a8r8g8b8.
Signed-off-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Michel Dänzer <michel.daenzer@amd.com>
commit e7aa4d3c7420d45cca2b7e1e69e22cebc64d5b74
Author: Eric Anholt <eric@anholt.net>
Date: Thu Nov 5 16:03:14 2015 -0800
glamor: Fix assert failures when fallback picture upload alloc fails.
If the glTexImage (or glTexSubImage) out-of-memories, error out
cleanly so that we can fall back to software.
Signed-off-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Michel Dänzer <michel.daenzer@amd.com>
commit ff8ef975df9cd99ec6f0b8b8047445091bf35ef0
Author: Eric Anholt <eric@anholt.net>
Date: Thu Nov 5 15:13:55 2015 -0800
glamor: Fix rendering when core font texture allocation fails.
Signed-off-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Michel Dänzer <michel.daenzer@amd.com>
commit a6b05d10da2fe476f46e6dc4ad8a603964735905
Author: Eric Anholt <eric@anholt.net>
Date: Thu Nov 5 15:05:11 2015 -0800
glamor: Fix crashes when the glyph atlas allocation fails.
We already have a fallback path, so we just need to jump to it when we
hit the failure.
Signed-off-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Michel Dänzer <michel.daenzer@amd.com>
commit de959ec939b262cb1cb4c0b6146826e3092843f9
Author: Eric Anholt <eric@anholt.net>
Date: Thu Nov 5 14:47:42 2015 -0800
glamor: Handle GL_OUT_OF_MEMORY when allocating texture images.
The spec allows general undefined behavior when GL_OOM is thrown. But
if the driver happens to throw the error at this point, it probably
means the pixmap was just too big, so we should delete that texture
and have this pixmap fall back to software.
Signed-off-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Michel Dänzer <michel.daenzer@amd.com>
commit 74be466d40080545117628c376cb59b696db33bc
Author: Eric Anholt <eric@anholt.net>
Date: Mon Nov 9 15:47:05 2015 -0800
glamor: Avoid GL errors from mapping with size == 0.
GL 4.5 / GLES 3.0 require throwing GL errors at map time, and Mesa
before that might throw errors accidentally if a malloc(0) call was
made to return the mapping.
Signed-off-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Rob Clark <robdclark@gmail.com>
commit a6cddb8c04ddc3c48aae3f3611ad9f336fecb09d
Author: Michael Stapelberg <stapelberg@google.com>
Date: Tue Nov 3 03:51:48 2015 -0800
Also dump passive grabs on XF86LogGrabInfo
Signed-off-by: Michael Stapelberg <stapelberg@google.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit f2ceb683c2da1ec08c8e07d7ec146f14864f2386
Author: Adam Jackson <ajax@redhat.com>
Date: Mon Nov 9 16:22:12 2015 -0500
Post-release version bump for 1.19
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit 43fb888bd01cf9d3d277e77a52a3d0c93ccff8bd
Author: Adam Jackson <ajax@redhat.com>
Date: Mon Nov 9 16:00:26 2015 -0500
xserver 1.18.0
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit 2203735887ab548b3ee004400d1b89149aae412c
Author: Axel Davy <axel.davy@ens.fr>
Date: Wed Nov 4 18:42:42 2015 +0100
present: Fix Async swap logic
According to the spec, PresentOptionAsync should only
trigger a different behaviour when the target msc has been reached.
In this case if the driver is able to do async swaps, we use
them to avoid a screen copy.
When the target msc hasn't been reached yet, we want to use sync swaps.
v2: Fix indentation and simplify checks for Async flips
Signed-off-by: Axel Davy <axel.davy@ens.fr>
Reviewed-by: Michel Dänzer <michel.daenzer@amd.com>
commit 3f35909acba117dc8934920d788c7ce612bce444
Author: Jammy Zhou <Jammy.Zhou@amd.com>
Date: Wed Oct 28 18:39:10 2015 +0800
present: Execute right away if target_msc equals current_msc
It is according to the protocol:
"If 'options' contains PresentOptionAsync, and the 'target-msc'
is less than or equal to the current msc for 'window', then
the operation will be performed as soon as possible, not
necessarily waiting for the next vertical blank interval."
Signed-off-by: Jammy Zhou <Jammy.Zhou@amd.com>
Reviewed-by: Michel Dänzer <michel.daenzer@amd.com>
Reviewed-by: Axel Davy <axel.davy@ens.fr>
commit 7d1e4783853f9830344d101ceab087feb19995be
Author: Daniel Martin <consume.noise@gmail.com>
Date: Thu Oct 29 14:58:11 2015 +0100
modesetting: Remove XF86_CRTC_VERSION checks
The ifdef checks for XF86_CRTC_VERSION >= 3/5 are remnants from the
out-of-tree driver. Within the tree, we can rely on:
xf86Crtc.h:#define XF86_CRTC_VERSION 6
Signed-off-by: Daniel Martin <consume.noise@gmail.com>
Reviewed-by: Emil Velikov <emil.l.velikov@gmail.com>
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
commit 45c83a266d18eb515313aa3f1a4d7ff6af53be5d
Author: Daniel Martin <consume.noise@gmail.com>
Date: Thu Oct 29 14:58:10 2015 +0100
modesetting: Free output_ids in drmmode_set_mode_major()
We calloc() output_ids. Let's free() it, too.
Signed-off-by: Daniel Martin <consume.noise@gmail.com>
Reviewed-by: Emil Velikov <emil.l.velikov@gmail.com>
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
commit 2674d424020bd71d4f99b8d8de8b0b21aa490d54
Author: Daniel Martin <consume.noise@gmail.com>
Date: Thu Oct 29 14:58:09 2015 +0100
modesetting: Handle failures in setting a CRTC to a DRM mode properly
This fixes a bug where running the card out of PPLL's when hotplugging
another monitor would result in all of the displays going blank and
failing to work properly until X was restarted or the user switched to
another VT.
[Michel Dänzer: Pass errno instead of -ret to strerror()]
[Daniel Martin: Add \n to log message]
Picked from xf86-video-ati
7186a87 Handle failures in setting a CRTC to a DRM mode properly
Signed-off-by: Daniel Martin <consume.noise@gmail.com>
Reviewed-by: Emil Velikov <emil.l.velikov@gmail.com>
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
commit 250666586e2b6f3ed1371340452dc2be2d094d40
Author: Adam Jackson <ajax@redhat.com>
Date: Thu Oct 29 10:08:17 2015 -0400
vidmode: Drop the unused event code
As the code says, this is "far from complete". So far, in fact, that
it's been basically untouched for twenty years (XFree86 3.1!). As far
as I can tell it was never enabled in any XFree86 build, and certainly
has never been enabled since Xorg 7.0.
Also, K&R.
Signed-off-by: Adam Jackson <ajax@redhat.com>
Reviewed-by: Emil Velikov <emil.l.velikov@gmail.com>
commit 478efe285a440c33b053bdf0bfbfdd482f429f01
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Tue Oct 27 19:44:28 2015 -0700
Xserver.man: document more transports for -nolisten & -listen options
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
commit 8fc295bde9a736f3c8c047031a6698d140d5266f
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Tue Oct 27 19:44:27 2015 -0700
Xorg.man: update to reflect -nolisten tcp becoming default
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
commit 75157b7dbf4ed4db0492328a44e4e67dda83f769
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Tue Oct 27 19:44:26 2015 -0700
Xorg.man: move XLOCAL details to X(7) man page instead
These settings affect clients, not server, so belong there, next to
the information about how to set $DISPLAY.
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
commit 50c167164700e8ead9b7ccf9f9eafc7541baac75
Author: Martin Peres <martin.peres@linux.intel.com>
Date: Mon Jul 20 10:37:30 2015 +0300
os: make sure the clientsWritable fd_set is initialized before use
In WaitForSomething(), the fd_set clientsWritable may be used
unitialized when the boolean AnyClientsWriteBlocked is set in the
WakeupHandler(). This leads to a crash in FlushAllOutput() after
x11proto's commit 2c94cdb453bc641246cc8b9a876da9799bee1ce7.
The problem did not manifest before because both the XFD_SIZE and the
maximum number of clients were set to 256. As the connectionTranslation
table was initalized for the 256 clients to 0, the test on the index not
being 0 was aborting before dereferencing the client #0.
As of commit 2c94cdb453bc641246cc8b9a876da9799bee1ce7 in x11proto, the
XFD_SIZE got bumped to 512. This lead the OutputPending fd_set to have
any fd above 256 to be uninitialized which in turns lead to reading an
index after the end of the ConnectionTranslation table. This index would
then be used to find the client corresponding to the fd marked as
pending writes and would also result to an out-of-bound access which
would usually be the fatal one.
Fix this by zeroing the clientsWritable fd_set at the beginning of
WaitForSomething(). In this case, the bottom part of the loop, which
would indirectly call FlushAllOutput, will not do any work but the next
call to select will result in the execution of the right codepath. This
is exactly what we want because we need to know the writable clients
before handling them. In the end, it also makes sure that the fds above
MaxClient are initialized, preventing the crash in FlushAllOutput().
Thanks to everyone involved in tracking this one down!
Reported-by: Karol Herbst <freedesktop@karolherbst.de>
Reported-by: Tobias Klausmann <tobias.klausmann@mni.thm.de>
Signed-off-by: Martin Peres <martin.peres@linux.intel.com>
Tested-by: Tobias Klausmann <tobias.klausmann@mni.thm.de>
Tested-by: Martin Peres <martin.peres@linux.intel.com>
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=91316
Cc: Ilia Mirkin <imirkin@alum.mit.edu>
Cc: Olivier Fourdan <ofourdan@redhat.com
Cc: Adam Jackson <ajax@redhat.com>
Cc: Alan Coopersmith <alan.coopersmith@oracle.com
Cc: Chris Wilson <chris@chris-wilson.co.uk>
Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
commit bb78c464f09f515db557182a458b12b63c3b52d7
Author: Adam Jackson <ajax@redhat.com>
Date: Tue Oct 27 13:28:37 2015 -0400
build: Remove stale miext/cw include paths
Signed-off-by: Adam Jackson <ajax@redhat.com>
Reviewed-by: Emil Velikov <emil.l.velikov@gmail.com>
commit 524844c8c18e226aad30feb371b19ef491d83449
Author: Julien Cristau <jcristau@debian.org>
Date: Tue Oct 27 13:23:13 2015 +0100
Xext: fix build with --disable-xace
Regression from 990cf5b2828f73dc7a07f1e38f608af39acfd81d
Signed-off-by: Julien Cristau <jcristau@debian.org>
Cc: Andrew Eikum <aeikum@codeweavers.com>
Cc: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Andrew Eikum <aeikum@codeweavers.com>
commit ac2f27f1a9fa8cd88c5dbe7ec0f96238eecf2c3e
Author: Michel Dänzer <michel.daenzer@amd.com>
Date: Tue Oct 27 11:51:49 2015 +0900
DRI2: Sync radeonsi_pci_ids.h from Mesa
Fixes DRI2 client driver name mapping for newer AMD GPUs with the
modesetting driver, allowing the DRI2 extension to initialize.
Signed-off-by: Michel Dänzer <michel.daenzer@amd.com>
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
commit d8b7a900cf912cadb5915b3924dd6ce5a74505e7
Author: Adam Jackson <ajax@redhat.com>
Date: Mon Oct 26 13:47:04 2015 -0400
xserver 1.17.99.902 (1.18 RC2)
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit 47b00fa4bf3b67736957296492310f7fdd6c0a25
Author: Adam Jackson <ajax@redhat.com>
Date: Wed Oct 21 12:15:34 2015 -0400
xfree86: Use same inb/outb asm code for i386 amd64 and ia64
This matches the GCCUSESGAS path from the old monolith build (where that
macro was actually set), and fixes the build on modern OSX.
Reviewed-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit c99fb550e06207e83ec89463fe32bd6bceca45f8
Author: Dave Airlie <airlied@gmail.com>
Date: Sun Sep 13 07:45:15 2015 +1000
xf86: don't add gpus from udev if autoAddGPU is set
At startup the server wasn't adding devices, but nothing
was blocking hotplug devices by the look of it.
bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=91388
Signed-off-by: Dave Airlie <airlied@redhat.com>
Reviewed-by: Hans de Goede <hdegoede@redhat.com>
commit 912f1fe2bb1b640d55fc44fcf636b6ca40d7f40b
Author: Chris Wilson <chris@chris-wilson.co.uk>
Date: Sun Apr 5 10:32:03 2015 +0100
Xv: Only stop the adaptors when the Pixmap is finally destroyed
Pixmaps are reference counted and DestroyPixmap is called for the
removal of every reference. However, we only want to stop the adaptors
writing into the Pixmap just before the Pixmap is finally destroyed,
similar to how Windows are handled.
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
commit 413cb2ff1d754b5f19d77ff19cddf40793989c03
Author: Chris Wilson <chris@chris-wilson.co.uk>
Date: Mon Feb 16 09:49:18 2015 +0000
present: Fix missed notify MSC computation
Only treat divisor==0 as async to immediately report the actual vblank.
If the user species a non-zero divisor, we should compute the missed
vblank properly or else we report too early.
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Reviewed-by: Mario Kleiner <mario.kleiner.de@gmail.com>
commit 702c0a247f5523b43652befaf6be548ddbbe9dee
Author: Alberto Milone <alberto.milone@canonical.com>
Date: Thu Dec 12 10:00:09 2013 +0100
randr: make RROutputChanged change the main protocol screen not the gpu screen
We only set changes on the main protocol screen as, for example
in RRSetChanged() and RRTellChanged(), therefore we should follow
the same logic when reporting that an output changed in
RROutputChanged().
This means that RRTellChanged() will then update the relevant
timestamps also when events come from gpu screens.
[ajax: Fix mixed code and decls]
Reviewed-by: Dave Airlie <airlied@redhat.com>
Signed-off-by: Alberto Milone <alberto.milone@canonical.com>
commit 2092f12a243b9f7682f542b593b77c96d455ec89
Author: Hans de Goede <hdegoede@redhat.com>
Date: Wed Oct 21 11:36:06 2015 +0200
linux: Do not call FatalError from xf86CloseConsole
FatalError ends up calling xf86CloseConsole itself, so calling FatalError
from within xf86CloseConsole is not a good idea.
Make switch_to log errors using xf86Msg(X_WARNING, ...) and return success
(or failure).
This makes switch_to match the other error checking done in xf86CloseConsole
which all logs warnings and continues.
Add checking of the return value in xf86OpenConsole and call
FatalError there when switch_to fails, to preserve the error-handling
behavior of xf86OpenConsole.
BugLink: https://bugzilla.redhat.com/show_bug.cgi?id=1269210
Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
commit ee06f674bbcd796324d6daf69bfb5d8856e94008
Author: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
Date: Thu Oct 15 22:28:49 2015 -0700
Xi: Silence some tautological warnings
xichangehierarchy.c:424:23: warning: comparison of constant 536870911 with expression of type 'uint16_t'
(aka 'unsigned short') is always false [-Wtautological-constant-out-of-range-compare,Semantic Issue]
if (stuff->length > (INT_MAX >> 2))
~~~~~~~~~~~~~ ^ ~~~~~~~~~~~~~~
xichangehierarchy.c:438:26: warning: comparison of constant 536870911 with expression of type 'uint16_t'
(aka 'unsigned short') is always false [-Wtautological-constant-out-of-range-compare,Semantic Issue]
if ((any->length > (INT_MAX >> 2)) || (len < (any->length << 2)))
~~~~~~~~~~~ ^ ~~~~~~~~~~~~~~
Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 113c0bb4fd764da8c08d8f30abe350c7650c9fc2
Author: Samuel Thibault <samuel.thibault@ens-lyon.org>
Date: Mon Oct 19 23:15:36 2015 +0200
hurd: fix xorg-wrapper build
hurd does not have any PATH_MAX limitation. misc.h provides a default value
which is fine here.
Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Samuel Thibault <samuel.thibault@ens-lyon.org>
commit f9a04d19aef77bf787b8d322305a6971d24a6ba1
Author: Keith Packard <keithp@keithp.com>
Date: Mon Sep 21 07:16:12 2015 +0100
fonts: Continue when font calls return Suspended more than once
Patch 3ab6cd31cbdf8095b2948034fce5fb645422d8da fixed Xinerama
interactions with font servers by not putting clients to sleep
multiple times. However, it introduced additional changes dealing with
libXfont routine returning Suspended more than once for the same
request. This additional change was to abandon processing of the
current request and free the closure data by jumping to
'xinerama_sleep' in each of the functions.
Font library functions shouldn't return Suspended more than once,
except for ListFontsWithInfo, which produces multiple replies, and
thus ends up returning Suspended many times during processing.
With the jump to xinerama_sleep occurring after the first reply was
processed, the closure for the request was freed and future calls into
the ListFontsWithInfo callback resulted in dereferencing freed
memory.
This patch removes the added branches, reverting the code to its
previous behaviour, which permitted multiple Suspended returns and
simply waited for the client to be signaled again so that the callback
could continue processing the request.
Signed-off-by: Keith Packard <keithp@keithp.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
commit 5b582a4a0350c253d729efb31b710851ae9a958e
Merge: 1d4aa67242 27ad21254f
Author: Adam Jackson <ajax@redhat.com>
Date: Mon Oct 19 12:23:22 2015 -0400
Merge remote-tracking branch 'jeremyhu/master'
commit 1d4aa672424d8b1629fda11400b88607b5066965
Author: Julien Cristau <jcristau@debian.org>
Date: Mon Oct 19 15:42:30 2015 +0200
xorg-wrapper: when starting the server as root, reset its environment
When the server is privileged, we shouldn't be passing the user's
environment directly.
Clearing the environment is recommended by the libdbus maintainers, see
https://bugs.freedesktop.org/show_bug.cgi?id=52202
v2: rename envp to empty_envp (Jeremy)
Reviewed-by: Hans de Goede <hdegoede@redhat.com>
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=83849
Signed-off-by: Julien Cristau <jcristau@debian.org>
commit 08c4912406b965bbac0a3a52413c374a073c051b
Author: Samuel Thibault <samuel.thibault@ens-lyon.org>
Date: Mon Oct 19 14:47:43 2015 +0200
xorg-wrapper: fix build without libdrm
Signed-off-by: Samuel Thibault <samuel.thibault@ens-lyon.org>
Reviewed-by: Hans de Goede <hdegoede@redhat.com>
commit a4cd8ee5f8e8de776c7f764656770311cdbde0d2
Author: Samuel Thibault <samuel.thibault@ens-lyon.org>
Date: Mon Oct 19 14:47:42 2015 +0200
hurd: disable detecting drm
Signed-off-by: Samuel Thibault <samuel.thibault@ens-lyon.org>
Reviewed-by: Hans de Goede <hdegoede@redhat.com>
commit 27ad21254f257bac6c647315d749ee69f20c24e0
Author: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
Date: Sun Oct 18 23:01:53 2015 -0700
XQuartz: Cleanup formatting of DarwinEQInit that was butchered by automation a few years ago
Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
commit 3db7e332d374bf8cee581c31b7d50d7ac0509187
Author: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
Date: Sun Oct 18 23:03:23 2015 -0700
XQuartz: Make sure that darwin_all_modifier_mask_additions is 0-terminated
Found by ASan
X.Org X Server 1.17.99.901 Build Date: 20151018
================================================================
==40471==ERROR: AddressSanitizer: global-buffer-overflow on address 0x000101fed7a4 at pc 0x000101584030 bp 0x70000029f920 sp 0x70000029f918
READ of size 4 at 0x000101fed7a4 thread T7
#0 0x10158402f in DarwinEQInit darwinEvents.c:377
#1 0x10157f3bc in InitInput darwin.c:566
#2 0x101be87ad in dix_main main.c:268
#3 0x10159131b in server_thread quartzStartup.c:66
#4 0x7fff8a535c12 in _pthread_body (/usr/lib/system/libsystem_pthread.dylib+0x3c12)
#5 0x7fff8a535b8f in _pthread_start (/usr/lib/system/libsystem_pthread.dylib+0x3b8f)
#6 0x7fff8a533374 in thread_start (/usr/lib/system/libsystem_pthread.dylib+0x1374)
0x000101fed7a4 is located 0 bytes to the right of global variable 'darwin_all_modifier_mask_additions' defined in 'darwinEvents.c:181:12'
(0x101fed7a0) of size 4
SUMMARY: AddressSanitizer: global-buffer-overflow darwinEvents.c:377 DarwinEQInit
Shadow bytes around the buggy address:
0x1000203fdaa0: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
0x1000203fdab0: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
0x1000203fdac0: f9 f9 f9 f9 00 00 00 00 00 00 f9 f9 f9 f9 f9 f9
0x1000203fdad0: 00 00 00 00 00 00 00 00 f9 f9 f9 f9 00 00 00 00
0x1000203fdae0: 00 00 f9 f9 f9 f9 f9 f9 00 00 00 00 00 f9 f9 f9
=>0x1000203fdaf0: f9 f9 f9 f9[04]f9 f9 f9 f9 f9 f9 f9 00 00 00 00
0x1000203fdb00: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
0x1000203fdb10: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
0x1000203fdb20: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
0x1000203fdb30: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
0x1000203fdb40: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
Shadow byte legend (one shadow byte represents 8 application bytes):
Addressable: 00
Partially addressable: 01 02 03 04 05 06 07
Heap left redzone: fa
Heap right redzone: fb
Freed heap region: fd
Stack left redzone: f1
Stack mid redzone: f2
Stack right redzone: f3
Stack partial redzone: f4
Stack after return: f5
Stack use after scope: f8
Global redzone: f9
Global init order: f6
Poisoned by user: f7
Container overflow: fc
Array cookie: ac
Intra object redzone: bb
ASan internal: fe
Left alloca redzone: ca
Right alloca redzone: cb
Thread T7 created by T0 here:
#0 0x10242ee99 in wrap_pthread_create
(/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/lib/clang/7.0.0/lib/darwin/libclang_rt.asan_osx_dynamic.dylib+0x37e99)
#1 0x101591089 in create_thread quartzStartup.c:78
#2 0x101590ed9 in QuartzInitServer quartzStartup.c:95
#3 0x1015697eb in X11ApplicationMain X11Application.m:1277
#4 0x101575dc0 in X11ControllerMain X11Controller.m:984
#5 0x10159171a in server_main quartzStartup.c:127
#6 0x101540fc0 in do_start_x11_server bundle-main.c:436
#7 0x101544869 in _Xstart_x11_server mach_startupServer.c:189
#8 0x101545c96 in mach_startup_server mach_startupServer.c:398
#9 0x7fff8d1b70f3 in mach_msg_server (/usr/lib/system/libsystem_kernel.dylib+0x110f3)
#10 0x1015416e7 in main bundle-main.c:774
#11 0x7fff8bd975ac in start (/usr/lib/system/libdyld.dylib+0x35ac)
#12 0x0 (<unknown module>)
Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
commit ec6294116cc41ff1c3be081b626952fb7e614244
Author: Jeremy Huddleston <jeremyhu@apple.com>
Date: Sun Oct 18 23:12:52 2015 -0700
osinit: Silence -Wunused-variable warnings
osinit.c:161:24: warning: unused variable 'devnull' [-Wunused-variable,Unused Entity Issue]
static const char *devnull = "/dev/null";
^
osinit.c:162:10: warning: unused variable 'fname' [-Wunused-variable,Unused Entity Issue]
char fname[PATH_MAX];
^
Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
commit 0a5d54f721de7e3ab3b6f4b080190a92bbe3429b
Author: Jeremy Huddleston <jeremyhu@apple.com>
Date: Sun Oct 18 23:12:51 2015 -0700
dix: Silence -Wunused-variable warning by moving window.c off of legacy region defines
window.c:223:15: warning: unused variable 'pScreen' [-Wunused-variable,Unused Entity Issue]
ScreenPtr pScreen = pWin->drawable.pScreen;
^
Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
commit e09875701b980b8c4578fb310a922c9934c34eef
Author: Jeremy Huddleston <jeremyhu@apple.com>
Date: Sun Oct 18 23:12:50 2015 -0700
glx: Fix header length error checking in __glXDisp_RenderLarge
glxcmds.c:2206:46: warning: comparison of unsigned expression < 0 is always false [-Wtautological-compare,Semantic Issue]
if ((cmdlen = safe_pad(hdr->length)) < 0)
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ^ ~
Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
commit 5dc415048e4091b18cd7d123ebeae8f95ed5a4f5
Author: Jeremy Huddleston <jeremyhu@apple.com>
Date: Sun Oct 18 23:12:49 2015 -0700
randr: Silence -Wshift-negative-value warnings
rrtransform.c:199:23: warning: shifting a negative signed value is undefined [-Wshift-negative-value,Semantic Issue]
rot_cos = F(-1);
^~~~~
rrtransform.c:114:14: note: expanded from macro 'F'
^~~~~~~~~~~~~~
../render/picture.h:200:24: note: expanded from macro 'IntToxFixed'
^~~~~~~~~~~~~~~~~~~~~~
/opt/X11/include/pixman-1/pixman.h:130:56: note: expanded from macro 'pixman_int_to_fixed'
~~~ ^
Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
commit 9a2a05a9a7ba02921fa29844c4cad41243c41326
Author: Jeremy Huddleston <jeremyhu@apple.com>
Date: Wed Oct 14 15:13:42 2015 -0700
xdmcp: Declare XdmcpFatal _X_NORETURN
xdmcp.c:1404:1: warning: function 'XdmcpFatal' could be declared with attribute 'noreturn'
[-Wmissing-noreturn,Semantic Issue]
Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
commit a7a00e4bd8153e0386c7e58d6b30a7a96f15fdb0
Author: Jeremy Huddleston <jeremyhu@apple.com>
Date: Wed Oct 14 15:13:39 2015 -0700
security: Silence some benign -Wformat warnings
XID may be either 'unsigned long' or 'unsigned int' depending on:
typedef unsigned long CARD64;
typedef unsigned int CARD32;
typedef unsigned long long CARD64;
typedef unsigned long CARD32;
typedef unsigned long XID;
typedef CARD32 XID;
so when building with -Wformat, we get some warnings that are benign. This silences them.
security.c:215:52: warning: format specifies type 'int' but the argument has type 'XID' (aka 'unsigned long')
[-Wformat,Format String Issue]
SecurityAudit("revoked authorization ID %d\n", pAuth->id);
~~ ^~~~~~~~~
%lu
CC dpmsstubs.lo
security.c:553:25: warning: format specifies type 'int' but the argument has type 'XID' (aka 'unsigned long')
[-Wformat,Format String Issue]
client->index, pAuth->id, pAuth->trustLevel, pAuth->timeout,
^~~~~~~~~
security.c:553:55: warning: format specifies type 'int' but the argument has type 'CARD32' (aka 'unsigned long')
[-Wformat,Format String Issue]
client->index, pAuth->id, pAuth->trustLevel, pAuth->timeout,
^~~~~~~~~~~~~~
security.c:554:10: warning: format specifies type 'int' but the argument has type 'XID' (aka 'unsigned long')
[-Wformat,Format String Issue]
pAuth->group, eventMask);
^~~~~~~~~~~~
security.c:554:24: warning: format specifies type 'int' but the argument has type 'Mask' (aka 'unsigned long')
[-Wformat,Format String Issue]
pAuth->group, eventMask);
^~~~~~~~~
security.c:781:19: warning: format specifies type 'unsigned int' but the argument has type 'Mask' (aka 'unsigned
long')
[-Wformat,Format String Issue]
requested, rec->id, cid,
^~~~~~~~~
security.c:781:30: warning: format specifies type 'unsigned int' but the argument has type 'XID' (aka 'unsigned long')
[-Wformat,Format String Issue]
requested, rec->id, cid,
^~~~~~~
security.c:863:23: warning: format specifies type 'unsigned int' but the argument has type 'XID' (aka 'unsigned long')
[-Wformat,Format String Issue]
rec->pWin->drawable.id, wClient(rec->pWin)->index,
^~~~~~~~~~~~~~~~~~~~~~
security.c:893:31: warning: format specifies type 'unsigned int' but the argument has type 'XID' (aka 'unsigned long')
[-Wformat,Format String Issue]
rec->pWin->drawable.id,
^~~~~~~~~~~~~~~~~~~~~~
security.c:915:39: warning: format specifies type 'unsigned int' but the argument has type 'XID' (aka 'unsigned long')
[-Wformat,Format String Issue]
rec->client->index, rec->pWin->drawable.id,
^~~~~~~~~~~~~~~~~~~~~~
Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
commit aa73d587fece225753d8e6b8773a9c8b85823bd9
Author: Jeremy Huddleston <jeremyhu@apple.com>
Date: Wed Oct 14 15:13:38 2015 -0700
xres: Silence -Wunused-function warnings when building !COMPOSITE or !RENDER
xres.c:422:1: warning: unused function 'ResFindCompositeClientWindowPixmaps' [-Wunused-function,Unused Entity Issue]
ResFindCompositeClientWindowPixmaps (void *value, XID id, void *cdata)
^
Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
commit 85eb90ea45e89033b97bf71a13c5c70fec8f6871
Author: Jeremy Huddleston <jeremyhu@apple.com>
Date: Wed Oct 14 15:13:36 2015 -0700
xdmauth: Correct miscall of abs() to instrad call labs()
xdmauth.c:230:13: warning: absolute value function 'abs' given an argument of type 'long' but has parameter of
type
'int'
which may cause truncation of value [-Wabsolute-value,Semantic Issue]
if (abs(now - client->time) > TwentyFiveMinutes) {
^
xdmauth.c:230:13: note: use function 'labs' instead [Semantic Issue]
if (abs(now - client->time) > TwentyFiveMinutes) {
^~~
labs
xdmauth.c:302:9: warning: absolute value function 'abs' given an argument of type 'long' but has parameter of type
'int' which
may cause truncation of value [-Wabsolute-value,Semantic Issue]
if (abs(client->time - now) > TwentyMinutes) {
^
xdmauth.c:302:9: note: use function 'labs' instead [Semantic Issue]
if (abs(client->time - now) > TwentyMinutes) {
^~~
labs
Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
commit 9f0fcd14b52f8481cbb3b3b9c6e06f64ff003cc8
Author: Jeremy Huddleston <jeremyhu@apple.com>
Date: Wed Oct 14 15:13:35 2015 -0700
randr: Correct a miscall of abs() to instead call fabs()
rrtransform.c:124:22: warning: using integer absolute value function 'abs' when
argument is of floating point type [-Wabsolute-value,Semantic Issue]
if ((v = abs(f_transform->m[j][i])) > max)
^
rrtransform.c:124:22: note: use function 'fabs' instead [Semantic Issue]
if ((v = abs(f_transform->m[j][i])) > max)
^~~
fabs
Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
commit 610dd8a58a75bb6a5b7d7abbae476d1cc4be519e
Author: Jeremy Huddleston <jeremyhu@apple.com>
Date: Wed Oct 14 15:13:34 2015 -0700
mi: Correct a miscall of abs() to instead call fabs()
miarc.c:1714:9: warning: using integer absolute value function
'abs' when
argument is of floating point type [-Wabsolute-value,Semantic Issue]
if (abs(parc->angle2) >= 360.0)
^
miarc.c:1714:9: note: use function 'fabs' instead [Semantic Issue]
if (abs(parc->angle2) >= 360.0)
^~~
fabs
Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
commit 4513f924a7065edbd267cf96837af94ce5a58a6f
Author: Ken Thomases <ken@codeweavers.com>
Date: Mon Oct 12 16:45:41 2015 -0700
XQuartz: Fix how we calculate the height of the OSX menu bar
+[NSScreen mainScreen] does not mean the primary display. It used to mean the
one with the key window. When "Displays have separate spaces" is enabled, it
means the active screen, the one whose menu bar is mostly opaque. As such, it
may not be the screen whose lower-left corner is located at (0, 0). That's
why its max-Y is not necessarily comparable to its height. That only works
for the primary display.
This code could use [[NSScreen screens] firstObject]. This is always the
primary display, the one whose lower-left corner is at (0, 0).
Once that's done, the above change should be reverted. The height of the
visible frame would be the full height of the screen minus the menu bar _and
the Dock_ if the Dock is along the bottom of the screen.
Actually, there's a theoretically-simpler approach: use
-[NSMenu menuBarHeight]. That replaces a long-deprecated method
+[NSMenuView menuBarHeight]. However, there was a bug in Tiger that led to
the former not working while the latter still worked. I haven't actually
checked recently.
CrossOver's still-kicking X server code uses this code, which tries all of
the above:
NSScreen* primaryScreen = [[NSScreen screens] objectAtIndex:0];
aquaMenuBarHeight = [[NSApp mainMenu] menuBarHeight];
if (!aquaMenuBarHeight) aquaMenuBarHeight = [NSMenuView menuBarHeight];
if (!aquaMenuBarHeight) aquaMenuBarHeight =
NSHeight([primaryScreen frame]) - NSMaxY([primaryScreen visibleFrame]);
Reviewed-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
Signed-off-by: Ken Thomases <ken@codeweavers.com>
commit 6e6827aac33eddeacfb37ef3d7b0397b1446bf66
Author: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
Date: Mon Oct 12 02:06:10 2015 -0700
XQuartz: Remove InfoPlist.strings
Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
commit df80e2649aa47957986554928e6bf41b86c15240
Author: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
Date: Mon Oct 12 02:04:11 2015 -0700
XQuartz: Relax App Transport Security for communicating with the update server
Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
commit 880d4e78b1823bcc0e66e68270af1a475f097bb5
Author: Jonas Ådahl <jadahl@gmail.com>
Date: Wed Oct 7 12:02:39 2015 +0800
xwayland: Set physical screen size to something
When we have a single output, just set it to the physical size of that
output. Otherwise try to approximate it calculating a mean m.m. per
dot. Last fallback is to default to 96 DPI.
Signed-off-by: Jonas Ådahl <jadahl@gmail.com>
Reviewed-by: Daniel Stone <daniels@collabora.com>
commit 216bdbc7351e2078d94857a3323f6cd8f0d2f191
Author: Jonas Ådahl <jadahl@gmail.com>
Date: Wed Oct 7 12:02:38 2015 +0800
xwayland: Update actual screen and root window size on output hot plug
When a new output is hot-plugged we need to not only update our internal
screen dimensions, but also the dix screen dimensions, screenInfo
dimensions and the root window dimensions.
https://bugs.freedesktop.org/show_bug.cgi?id=92273
Signed-off-by: Jonas Ådahl <jadahl@gmail.com>
Reviewed-by: Daniel Stone <daniels@collabora.com>
commit 211d4c2d353b5e379716484055a3f58235ea65f4
Author: Chris Wilson <chris@chris-wilson.co.uk>
Date: Wed Dec 14 15:55:22 2011 +0000
render: Propagate allocation failure from createSourcePicture()
All the callers were already checking for failure, except that
createSourcePicture() itself was failing to check whether it
successfully allocated the Picture.
[ajax: Rebase, fix line wrap of preceding line]
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com>
commit 8a26a4aff570744347a8bed19f693bf631be464e
Author: Alexandr Shadchin <alexandr.shadchin@gmail.com>
Date: Sun Nov 27 02:49:02 2011 +0600
bsd: Remove LINKKIT
Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Alexandr Shadchin <Alexandr.Shadchin@gmail.com>
commit ab3e34bf9ddff90261fbbe0e2604887459cd70ad
Author: Alexandr Shadchin <alexandr.shadchin@gmail.com>
Date: Sun Nov 27 02:49:01 2011 +0600
xfree86: Remove 386BSD
Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Alexandr Shadchin <Alexandr.Shadchin@gmail.com>
commit c877048c8509a03f6aa69e533ab86c1039cfb6df
Author: Jon TURNEY <jon.turney@dronecode.org.uk>
Date: Thu Jun 30 15:30:40 2011 +0100
glx: Synchronize Xserver glx/rensize.c with mesa src/glx/compsize.c
Noticed while investigating https://bugs.freedesktop.org/show_bug.cgi?id=30102
Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
commit d08ac3660651c8614a1780750b76c48eeb0870b7
Author: Jamey Sharp <jamey@minilop.net>
Date: Thu May 12 15:21:52 2011 -0700
kdrive: Delete unused TOUCHSCREEN define.
There's nothing in configure to enable this, and KdTsPhyScreen isn't
defined anywhere.
[ajax: Rebase, also clean up Xfbdev]
Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Jamey Sharp <jamey@minilop.net>
commit e31fe8115ee080b58b2e96a5106f38e64944ce5e
Author: Olivier Fourdan <ofourdan@redhat.com>
Date: Wed Sep 23 15:35:58 2015 +0200
xwayland: Adjust screen size with rotation
bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=92076
Signed-off-by: Olivier Fourdan <ofourdan@redhat.com>
Tested-by: Artem Chudinov <arzeth0@gmail.com>
Reviewed-by: Dave Airlie <airlied@redhat.com>
commit f6ce23fbfc8804204fa103f98b94478387b94040
Author: Fredrik Höglund <fredrik@kde.org>
Date: Thu Sep 10 23:33:20 2015 +0200
present: Don't stash the MSC value when present_get_ust_msc fails
Otherwise we stash an uninitalized value, and later use it to compute
the msc_offset for the window. Also initialize ust and crtc_msc so we
never use uninitalized values when present_get_ust_msc fails.
This fixes clients getting stuck waiting indefinitely for an idle
event when a CRTC is turned off.
Signed-off-by: Fredrik Höglund <fredrik@kde.org>
Reviewed-by: Michel Dänzer <michel.daenzer@amd.com>
commit c1f5f9022f31ca4d662cc125fa80cb25386da6d1
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Sun Sep 27 18:41:35 2015 -0700
glamor: Get rid of an extraneous ; at the end of a C source line
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Signed-off-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Michel Dänzer <michel.daenzer@amd.com>
commit 10e9116b3f709bec6d6a50446c1341441a0564e4
Author: Rui Matos <tiagomatos@gmail.com>
Date: Tue Jul 15 15:57:20 2014 +0200
xwayland-input: Always set the xkb group index on modifiers events
While we have keyboard focus, the server's xkb code is already locking
and latching modifiers appropriately while processing keyboard
events.
Since there is no guaranteed order between wl_keyboard key and
modifiers events, if we got the modifiers event with a locked or
latched modifier and then process the key press event for that
modifier we would wrongly unlock/unlatch. To prevent this, we ignore
locked and latched modifiers while any of our surfaces has keyboard
focus.
But we always need to set the xkb group index since this might be
triggered programatically by the wayland compositor at any time.
Reviewed-by: Daniel Stone <daniels@collabora.com>
commit f937032ee6526af3c9206a2d8c6eacdeeb490d3b
Author: Andreas Wettstein <wettstein509@solnet.ch>
Date: Sat Feb 15 17:37:24 2014 +0100
xkb: Keyboard mouse button emulation should not suppress other keyboard events
With this change, when a key mapped to an action to emulate mouse button
presses and releases is held down, other keys pressed during that time are
still processed normally. This is a prerequisite for proper support of
ISOLock.
Signed-off-by: Andreas Wettstein <wettstein509@solnet.ch>
Reviewed-by: Daniel Stone <daniel@fooishbar.org>
commit 5447ac45bc090e8f3269979af4db55f619c5f278
Author: Andreas Wettstein <wettstein509@solnet.ch>
Date: Sat Feb 15 17:36:51 2014 +0100
xkb: Suppress autorepeat for Set and Lock of Mods, Groups, and Controls
The autorepeat for these actions was not correctly implemented, as the key
repeat would be mistakenly interpreted as key releases. Rather than fixing
this, this change simply disables autorepeat for Set/Lock actions, for two
reasons:
- Autorepeating Set/Lock keys make complicate the interactions of actions.
- Autorepeating Set/Lock keys have no apparent benefit, but hurt in the real
world for layouts such as de(neo): Neo has a Level5 shift on the LSGT key,
and a Level5 lock on Level5 of the same key. This is unusable if LSGT
autorepeats. However, disabling autorepeat for key LSGT completely is not
ideal for users that have a "usual" layout besides Neo, where LSGT carries
symbols.
Signed-off-by: Andreas Wettstein <wettstein509@solnet.ch>
Reviewed-by: Daniel Stone <daniel@fooishbar.org>
commit fbac451724f7e1b8ce6b6e0505cc33ccd41c5158
Author: Arcady Goldmints-Orlov <arcadyg@nvidia.com>
Date: Thu Oct 4 14:22:13 2012 -0700
Fix alphamap interactions with wfb
Set a destructor function on pixman images and call fbFinishAccess()
from there, rather than directly from free_pixman_pict(). This ensures
that fbFinishAccess() gets called even if pixman still has a reference
to the image after free_pixman_pict(), as is the case for alphamaps.
[ajax: Squash an unused variable warning in the non-wfb build]
Reviewed-by: Aaron Plattner <aplattner@nvidia.com>
Signed-off-by: Arcady Goldmints-Orlov <arcadyg@nvidia.com>
Reviewed-by: Søren Sandmann <ssp@redhat.com>
commit 19a87257f92e7f57a167fc03fba014ee22d8e1ab
Author: Emil Velikov <emil.l.velikov@gmail.com>
Date: Fri Sep 25 14:04:34 2015 +0100
glamor: move 'dri3_capable' extension checks after eglMakeCurrent
Otherwise we'll fail and/or crash as no context is bound.
Fixes: 64e6124f27e (glamor: move GL_OES_EGL_image check next to EGL_EXT_image_dma_buf_import)
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=92105
Cc: Michel Dänzer <michel@daenzer.net>
Cc: Nick Sarnie <commendsarnex@gmail.com>
Reported-by: Nick Sarnie <commendsarnex@gmail.com>
Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>
Tested-by: Nick Sarnie <commendsarnex@gmail.com>
Reviewed-by: Michel Dänzer <michel.daenzer@amd.com>
commit dca5770af9e20bb1148374ebfd60931a81b148a2
Merge: a31bbc450a 21f384b7b8
Author: Adam Jackson <ajax@redhat.com>
Date: Fri Sep 25 10:23:28 2015 -0400
Merge remote-tracking branch 'mchalupa/output-bugs'
commit a31bbc450a08622aadafc264b3efe57e465eaecb
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Tue Sep 22 19:25:43 2015 -0700
protocol.txt: Add MIT-SHM 1.2 requests
Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
commit 424ba5de56e2ddf173bb0d26daa821f12897f18f
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Tue Sep 22 19:25:42 2015 -0700
protocol.txt: Add DRI3 1.0 requests
Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
commit 7e6b7c799455fdeac082cf2a064fe1ba432e92ca
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Tue Sep 22 19:25:41 2015 -0700
protocol.txt: Add Present 1.0 requests
Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
commit fd653194be731e4e32f95f38446e0dcbf56d04c9
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Tue Sep 22 19:25:40 2015 -0700
protocol.txt: Add RANDR 1.5 requests
Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
commit 1ea8fb96bc6a95d98dd67fc9d4c4e4b858383d34
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Tue Sep 22 19:25:39 2015 -0700
protocol.txt: Remove extensions that died before Xorg was born
Adobe-DPS-Extension, DEC-XTRAP, X3D-PEX, XIE
Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
commit 21f384b7b8b571151805674c9d384e2ad7f8b7ea
Author: Marek Chalupa <mchqwerty@gmail.com>
Date: Thu May 21 15:43:43 2015 +0200
xwayland: do not add output into output_list multiple times
output.done event can be sent even on some property change, not only
when announcing the output. Therefore we must check if we already have it
otherwise we may corrupt the list by adding it multiple times.
This fixes bug when xwayland looped indefinitely in output.done handler
and that can be reproduced following these steps (under X without
multi-monitor setup):
1) run weston --output-count=2
2) run xterm, move it so that half is on one output
and half on the other
3) close second output, try run weston-terminal
weston sends updated outputs which trigger this bug.
v2. factor out common code into function
move expecting_events into right branch
Signed-off-by: Marek Chalupa <mchqwerty@gmail.com>
commit 95014ad2a7815282efdecc895bf14742b4b3ccb3
Author: Dima Ryazanov <dima@gmail.com>
Date: Tue May 12 10:21:18 2015 -0700
xwayland: Remove the output from the list after destroying it
[Marek Chalupa]: rebased to master
Signed-off-by: Dima Ryazanov <dima@gmail.com>
commit 550984c95ef0bee1886dbb54e35edc0852772e2f
Author: Dima Ryazanov <dima@gmail.com>
Date: Fri May 15 22:38:28 2015 -0700
xwayland: Destroy xwl_output when wl_output gets removed
This makes Xwayland correctly handle a monitor getting unplugged.
[Marek]: use xorg_list_for_each_entry_safe
Signed-off-by: Dima Ryazanov <dima@gmail.com>
Signed-off-by: Marek Chalupa <mchqwerty@gmail.com>
commit 6ca496b7c3ccfd677c8c1bee88cc509a5e3c9e04
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Mon Sep 21 22:36:41 2015 -0700
dri2: better checks for integer overflow in GetBuffers*
Check for integer overflow before using stuff->count in a multiplication,
to avoid compiler optimizing out due to undefined behaviour, but only
after we've checked to make sure stuff->count is in the range of the
request we're parsing.
Reported-by: jes@posteo.de
Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
commit 6c2c6fb5a7b44f50811722eb8621afb272aff2e8
Author: Keith Packard <keithp@keithp.com>
Date: Mon Sep 21 07:16:14 2015 +0100
Xext, os: Remove OS-internal usages within XACE and XSELinux
These extensions were accessing internal OS functions and
structures. Expose the necessary functionality to them and remove
their use of osdep.h
Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 9af111fe045d82192bacc722940e1d92a8ba4cbd
Author: Keith Packard <keithp@keithp.com>
Date: Mon Sep 21 07:16:13 2015 +0100
Xext/xselinux: Warning fixes
There's a 'const char *' adventure here that I'm mostly ignoring; some
client information gets const poisoned. Worked around by adding a
couple of casts. Ick.
Added an _X_ATTRIBUTE_PRINTF to SELinuxLog.
Ignore a couple of unused return values.
Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 9ee05c8987245350976ebc0df4953c60da6bcc70
Author: Jon TURNEY <jon.turney@dronecode.org.uk>
Date: Thu Aug 13 13:11:31 2015 +0100
debug output format fix in RRMonitorCrtcName()
xorg/xserver/randr/rrmonitor.c:35:5: error: format ‘%x’ expects argument of type ‘unsigned int’, but argument 3 has type ‘RRCrtc’ [-Werror=format=]
RRCrtc is XID is CARD32, which inside the server is unsigned long or int
depending on architecture, so a cast is required.
Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
commit fe253296035277f7a3adfad6eb239fee41714d22
Author: Jon TURNEY <jon.turney@dronecode.org.uk>
Date: Thu Aug 13 13:11:37 2015 +0100
debug output format fix in xf86Helper.c
xserver/hw/xfree86/common/xf86Helper.c:1834:12: error: format ‘%ld’ expects argument of type ‘long int’, but argument 3 has type ‘Atom’ [-Werror=format=]
xserver/hw/xfree86/common/xf86Helper.c:1834:12: error: format ‘%ld’ expects argument of type ‘long int’, but argument 4 has type ‘Atom’ [-Werror=format=]
Atom is unfortunately unsigned long or unsigned int depending on the
architecture, so a cast is required.
Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
commit dc2998bf060957b1fdd6bd2ea4f76c5154233a1b
Author: Dima Ryazanov <dima@gmail.com>
Date: Tue May 12 10:21:19 2015 -0700
xwayland: Remove a useless out-of-memory check
snprintf does not allocate memory, so we can never get an out-of-memory
error.
(Also, the error handler would free xwl_output after it was already
registered as an event listener.)
Signed-off-by: Dima Ryazanov <dima@gmail.com>
Reviewed-by: Marek Chalupa <mchqwerty@gmail.com>
commit b469fc72d2dd0cf60760fa0828ed73771c2a0512
Author: Adam Jackson <ajax@redhat.com>
Date: Wed Feb 25 16:03:13 2015 -0500
composite: Factor out backing store transition
No functional change.
Reviewed-by: Keith Packard <keithp@keithp.com>
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit 6da3f5d04f6a1cda0c858280f9561f9fbc323275
Author: Dave Airlie <airlied@redhat.com>
Date: Wed Sep 23 11:19:00 2015 +1000
glx: fix regression with copy sub buffer disappearing
So copy sub buffer isn't a core extensions it's a driver extension
which means we are using totally the wrong interface to query for it
here, which means bad things happen when you roll out this code,
for instance MESA_copy_sub_buffer stops working.
This is just the hack I'm sticking in Fedora to avoid the regression
for now, but hopefully will inspire us.
Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
commit 5e9457c41c05b65da7e39bd8944ec761479f19dd
Author: Eric Anholt <eric@anholt.net>
Date: Mon May 5 11:10:07 2014 -0700
fbdevhw: Fix a const qualifier warning
We're passing string literals to these functions.
Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Eric Anholt <eric@anholt.net>
commit 88355cedfc9b3940b9fe1599fbf6e0272c57f8a9
Author: Eric Anholt <eric@anholt.net>
Date: Mon May 5 11:10:08 2014 -0700
kdrive: Remove dead debug arrays.
These have never been used in the history of the tree, and were
producing string literal const loss warnings.
Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Eric Anholt <eric@anholt.net>
commit e6f8a0340b72113474ccfbf1ea447558b705995a
Author: Eric Anholt <eric@anholt.net>
Date: Mon May 5 11:10:06 2014 -0700
x86emu: Fix some set-but-not-used warnings.
Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Eric Anholt <eric@anholt.net>
commit fca98ce5e7d6424265c35a1219c2240d3342f627
Author: Egbert Eich <eich@freedesktop.org>
Date: Fri Feb 7 16:21:48 2014 +0100
libxf86config: libxf86config_internal -> libxf86config
Now since the installable libxf86config is gone, rename
libxf86config_internal to libxf86config.
Signed-off-by: Egbert Eich <eich@freedesktop.org>
Reviewed-by: Keith Packard <keithp@keithp.com>
commit dabf7c3590b427c185089128ecfd967f188f2658
Author: Egbert Eich <eich@freedesktop.org>
Date: Fri Feb 7 16:21:47 2014 +0100
libxf86config: Remove
The library used by the Xserver to read and parse the configuration file
could be built so that it culd be installed as a separate lib and used
by external programs.
Apparently there has not been any interest in this for quite a while as
this library has been broken for a long time now in the sense that it
was calling functions provided by the Xserver which were not implemented
for the external library.
Since this library is useless as it is anyway when built let's drop
support for it.
Signed-off-by: Egbert Eich <eich@freedesktop.org>
Reviewed-by: Keith Packard <keithp@keithp.com>
commit c7f84c880bbbb508016ad80390a11961b1c4214d
Author: Chris Wilson <chris@chris-wilson.co.uk>
Date: Mon Jan 27 09:44:48 2014 +0000
render: Fix leak of filter params
==11097== 2,048 (+1,640) bytes in 32 (+26) blocks are definitely lost in loss record 1,570 of 1,719
==11097== at 0x4C2A2DB: malloc (in /usr/lib/valgrind/vgpreload_memcheck-amd64-linux.so)
==11097== by 0x225EF3: SetPicturePictFilter (filter.c:339)
==11097== by 0x22DF4F: ProcRenderSetPictureFilter (render.c:1773)
==11097== by 0x15D25D: Dispatch (dispatch.c:432)
==11097== by 0x14C7B9: main (main.c:298)
[ajax: Fixed whitespace]
Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
commit 98e170971c6b06d64a5bc7418bf6ae6ae985a3ae
Author: Ville Syrjälä <ville.syrjala@linux.intel.com>
Date: Mon Oct 14 17:07:29 2013 +0300
xfree86: Fix the 1792x1344-75 EST III mode
The correct refresh rate for this mode is 75, not 85.
Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
commit 91c7acfc3447a0073dd1db260cf05115d94ce7e8
Author: Michal Srb <msrb@suse.com>
Date: Mon Oct 7 17:57:14 2013 +0300
randr: Allow RRSelectInput for ProviderChange and ResourceChange events
[ajax: To be clear, we already have code to emit these events, and it
looks like it works, but to get them you'd have had to also ask for one
of the other notify types. This makes it possible to listen for e.g.
ProviderChange alone.]
Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Michal Srb <msrb@suse.com>
commit 5437949a51fa6d9c9c83336d46ae57398f390ee3
Author: Egbert Eich <eich@freedesktop.org>
Date: Sat Oct 5 13:57:13 2013 +0200
fbdevhw: Disable FBIOBLANK ioctl if not supported
Some ioctls may not be supported by the kernel however their failure
is non-fatal to the driver. Unfortunately we only know once we try
to execute the ioctl however the sematics of the fbdev driver API
doesn't allow upper layers to disable the call.
Instead of changing the fbdevHW driver API just disable the call to
this ioctl on the module level when detecting such a case.
Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Egbert Eich <eich@freedesktop.org>
commit 49fe4ee7b7085b616028d6afe67767a60a8adf82
Author: Matt Turner <mattst88@gmail.com>
Date: Thu Feb 7 17:29:00 2013 -0800
compiler.h: Remove dead STANDALONE_MMIO
The only drivers I can find that used this are the r128 and radeon DRI
drivers. r128 is dead and the radeon driver wasn't including Xorg's
compiler.h and still worked.
Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Matt Turner <mattst88@gmail.com>
commit d2a6962474978437545120ebc1fcfb909d901d55
Author: Andy Ritger <aritger@nvidia.com>
Date: Wed Jun 20 11:52:34 2012 -0700
mi: Log an error if mieqProcessInputEvents() recurses.
v2:
Uses BUG_WARN_MSG to also provide a stack trace. (Peter Hutterer)
Signed-off-by: Keith Packard <keithp@keithp.com>
Signed-off-by: Andy Ritger <aritger@nvidia.com>
commit cc57ab4fc8b9dc15531f0dd9f5b352fa99a80cd0
Author: Andy Ritger <aritger@nvidia.com>
Date: Wed Jun 20 11:52:33 2012 -0700
Remove static qualifier on mieqProcessInputEvents()'s 'event'
This isn't necessary.
Signed-off-by: Andy Ritger <aritger@nvidia.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 44ea291b78b39ed5fd03f9693ac9525b866e183b
Author: Tomas Carnecky <tomas.carnecky@gmail.com>
Date: Mon May 21 19:47:01 2012 +0000
Remove NO_LIBCWRAPPER define
I'll just refer to 1faba79 (Death to libcwrapper., 2007-12-03).
Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Tomas Carnecky <tomas.carnecky@gmail.com>
commit 1e95a7df5f2e919ce59c5188d2ad1b30c3ac8595
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu Mar 15 13:46:56 2012 +1000
dix: put warning in for scroll increments of 0
If the increment is 0 but this is a scroll axis, it's definitely a bug.
Nonetheless, it has happened, so put a warning in and a return statement
that we avoid the infinite loop and hopefully be able to reproduce later.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Keith Packard <keithp@keithp.com>
commit 63efa2e7e91349dfecc849d30c5de84b3c911fe9
Author: Bryce Harrington <bryce@canonical.com>
Date: Wed Nov 30 12:54:29 2011 -0800
test: Fix typo and drop documentation references to glib.
The X server doesn't use glib for the tests any more.
Signed-off-by: Bryce Harrington <bryce@canonical.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com>
commit 4c7cefe24001279a558dd875949d40ede49ef702
Author: Dave Airlie <airlied@redhat.com>
Date: Thu Oct 20 11:44:28 2011 +0100
exa: initialise mask_off_x and mask_off_y
These get used at the end of the function in a calculation,
even though the result isn't used its not pretty.
Pointed out by coverity.
Signed-off-by: Dave Airlie <airlied@redhat.com>
Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
commit 668cce3f5a175109442f0ef9b50354db95e66b44
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Fri Sep 23 14:11:17 2011 -0400
dmx: fix typo in the title
[ajax: fix typo in the commit message]
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
commit 7ed0c3912e1cbab960df308b9d4ea618be757fd2
Author: Andrea Canciani <ranma42@gmail.com>
Date: Wed Jul 27 10:52:31 2011 +0200
render: Allow single-stop gradients
The Render specification allows single-stop gradients and pixman 0.22
(X server requires >= 0.27.2 now) can rasterize them correctly.
[ajax: update commit message]
Signed-off-by: Andrea Canciani <ranma42@gmail.com>
Reviewed-by: Soren Sandmann <ssp@redhat.com>
commit 3d9f578e6f0d13ecada7dc677fe61a4dd3d05e18
Author: Cyril Brulebois <kibi@debian.org>
Date: Mon Jun 6 02:25:11 2011 +0200
doc: Convert an \fP pair into appropriate tags.
Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Cyril Brulebois <kibi@debian.org>
commit d97ffef1ab95546634a74618ed2661cfd6d980b1
Author: Cyril Brulebois <kibi@debian.org>
Date: Mon Jun 6 02:25:10 2011 +0200
doc: Try to avoid repetitions.
Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Cyril Brulebois <kibi@debian.org>
commit 2cce6ffc350d3840337a4d045d5cf14bb7bf2b32
Author: Cyril Brulebois <kibi@debian.org>
Date: Mon Jun 6 02:25:08 2011 +0200
doc: Fix punctuation.
[ajax: s/ponct/punct/]
Signed-off-by: Cyril Brulebois <kibi@debian.org>
Reviewed-by: Jamey Sharp <jamey@minilop.net>
commit e7e3320098cad585d46f74d8a0c6946a080b0263
Author: Cyril Brulebois <kibi@debian.org>
Date: Mon Jun 6 02:25:07 2011 +0200
doc: Fix extraneous >
It looks like it serves no special purpose.
Reviewed-by: Jamey Sharp <jamey@minilop.net>
Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Signed-off-by: Cyril Brulebois <kibi@debian.org>
commit 9b4f10d7490f6610a65d401958296c95ce891c8b
Author: Cyril Brulebois <kibi@debian.org>
Date: Mon Jun 6 02:25:06 2011 +0200
doc: Fix grammar and typos.
Reviewed-by: Jamey Sharp <jamey@minilop.net>
Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Signed-off-by: Cyril Brulebois <kibi@debian.org>
commit 5b92a0a84a067b653cc457d8ec0fe25f36a9d207
Author: Cyril Brulebois <kibi@debian.org>
Date: Mon Jun 6 02:25:05 2011 +0200
doc: Fix alignment.
Reviewed-by: Jamey Sharp <jamey@minilop.net>
Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Signed-off-by: Cyril Brulebois <kibi@debian.org>
commit 0b8fca667b45f00249a3dd9ee79d2a77a4177b24
Author: Cyril Brulebois <kibi@debian.org>
Date: Mon Jun 6 02:24:59 2011 +0200
doc: Fix typo.
Signed-off-by: Cyril Brulebois <kibi@debian.org>
Reviewed-by: Jamey Sharp <jamey@minilop.net>
Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
commit 1226f7ddd78da5dc8b6f6442600ac2deb3986e8d
Author: Cyril Brulebois <kibi@debian.org>
Date: Mon Jun 6 02:25:01 2011 +0200
doc: Get rid of RCS tags.
Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Cyril Brulebois <kibi@debian.org>
commit 4803f7139131cee7bbf50b32d667d6e60302df09
Author: Cyril Brulebois <kibi@debian.org>
Date: Sun Jun 5 23:32:26 2011 +0200
man: Fix case for MIT-unspecified.
include/site.h says that COMPILEDDISPLAYCLASS is MIT-unspecified, rather
than MIT-Unspecified. Fix the manpage accordingly.
Signed-off-by: Cyril Brulebois <kibi@debian.org>
Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
commit 593270038d8983b99aa0aaa24509da3cb944be5c
Author: Tiago Vignatti <tiago.vignatti@nokia.com>
Date: Tue Sep 7 15:50:26 2010 +0300
dix: remove dead extensions to protocol.txt
lbx and mbe.
Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Tiago Vignatti <tiago.vignatti@nokia.com>
commit 3cd56dd2cfbfcce6ba68c22450d51139208993ab
Author: Robert Hooker <sarvatt@ubuntu.com>
Date: Fri Dec 3 23:42:27 2010 -0500
Add new GLX events errors and requests to protocol.txt
Based off of glproto 1.4.11.
Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Robert Hooker <robert.hooker@canonical.com>
commit 272ba9f021c6d08ebd6a2d96da3737f5630bcbd5
Author: Robert Hooker <sarvatt@ubuntu.com>
Date: Fri Dec 3 23:39:51 2010 -0500
Add DRI2 2.2/2.3 events and requests to protocol.txt
Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Robert Hooker <robert.hooker@canonical.com>
commit 64e6124f27e9900809d0009b95c7c0b5b8788e6b
Author: Emil Velikov <emil.l.velikov@gmail.com>
Date: Tue Sep 22 15:35:40 2015 +0100
glamor: move GL_OES_EGL_image check next to EGL_EXT_image_dma_buf_import
We're using the former only as the latter is present. Thus in some cases
we might incorrectly error out if it's missing.
Namely - glamor_glx, glamor_egl without gbm, EGL_KHR_gl_texture_2D_image
or EGL_EXT_image_dma_buf_import.
Fixes 58d54ee82df(glamor: explicitly check for GL_OES_EGL_image)
Cc: Eric Anholt <eric@anholt.net>
Reviewed-by: Adam Jackson <ajax@redhat.com>
Suggested-by: Eric Anholt <eric@anholt.net>
Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>
commit aa5606be1c0ea72b38de48ca333c7da5436368ef
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Fri May 15 10:25:46 2015 -0700
Make configure test for LD_NO_UNDEFINED_FLAG on Solaris work w/autoconf 2.69
After upgrading from autoconf 2.68 to 2.69, this test started failing with
"conftest.c", line 149: undefined symbol: NULL
so use a raw 0 pointer to avoid header dependencies in the autoconf
generated test case.
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Mark Kettenis <kettenis@openbsd.org>
commit fa0bb01899d586e02cf51892c17edd22e462a46c
Author: Adam Jackson <ajax@redhat.com>
Date: Mon Sep 21 15:23:23 2015 -0400
rootless: Fix bogus handling of broken root clip
gcc quite correctly complains about this:
In file included from ../../include/scrnintstr.h:51:0,
from rootlessValTree.c:98:
In function 'RegionUninit.isra.1',
inlined from 'RegionEmpty' at ../../include/regionstr.h:194:5,
inlined from 'RootlessMiValidateTree' at rootlessValTree.c:490:9:
../../include/regionstr.h:166:9: warning: attempt to free a non-heap object 'RegionBrokenData' [-Wfree-nonheap-object]
free((_pReg)->data);
So that'd crash if you ever got there. RegionNull will do almost the
same thing only without the free(), so let's do that instead; it might
still not be an entirely sane way to recover, but it at least won't
crash.
Reviewed-by: Keith Packard <keithp@keithp.com>
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit b25f7d0c165c4d32c73fbdf9080012503d319ba1
Merge: db1089eafc 1ba4fde101
Author: Adam Jackson <ajax@redhat.com>
Date: Mon Sep 21 17:34:48 2015 -0400
Merge commit '1ba4fde1015fc6da19dfbfdf0f77f1071416e215'
This is ofourdan/xwayland, minus:
xwayland: Always update the wl_pointer cursor on pointer focus
which was rejected for ABI and design issues.
commit db1089eafc1c5371fa0030202de588d2e2b4f8e5
Author: Keith Packard <keithp@keithp.com>
Date: Mon Sep 21 07:16:17 2015 +0100
os/xdmcp: Just send XDMCP keepalive packets once every three minutes
There was a complicated scheme to increase the time between keepalives
from 3 minutes up to as much as 24 hours in an attempt to reduce
network traffic from idle X terminals. X terminals receiving X
traffic, or receiving user input would use the 3 minute value; X
terminals without any network traffic would use a longer value.
However, this was actually broken -- any activity in the X server,
either client requests or user input, would end up resetting the
keepalive timeout, so a user mashing on the keyboard would never
discover that the XDMCP master had disappeared and have the session
terminated, which was precisely the design goal of the XDMCP keepalive
mechanism.
Instead of attempting to fix this, accept the cost of a pair of XDMCP
packets once every three minutes and just perform keepalives
regularly.
This will also make reworking the block and wakeup handler APIs to
eliminate select masks easier.
Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit a3a40291330bad10401fe2bcdbc097ce742b026a
Author: Keith Packard <keithp@keithp.com>
Date: Mon Sep 21 07:16:16 2015 +0100
os/xdmcp: Remove dead 'restart' code
The X server used to wait for the user to hit a key or move the mouse
before restarting the session after a keepalive failure. This,
presumably, was to avoid having the X server continuously spew XDMCP
protocol on the network while the XDM server was dead.
Switching into this state was removed from the server some time before
XFree86 4.3.99.16, so the remaining bits of code have been dead for
over a decade, and no-one ever noticed.
Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 3cd7d33380953f2a315dd79ab74d7340c83fd80a
Author: Egbert Eich <eich@freedesktop.org>
Date: Tue Mar 31 09:06:46 2015 +0200
randr: Remove senseless checks for xf86RandR12Key
When xf86RandR12Key is not set we will not get to the places where
these tests are done as the functions in question are not called.
In most cases we would have crashed before these checks anyway.
Signed-off-by: Egbert Eich <eich@freedesktop.org>
Reviewed-by: Keith Packard <keithp@keithp.com>
commit 245040f0d0b937efe14d947468a641a95398776a
Author: Chris Wilson <chris@chris-wilson.co.uk>
Date: Mon Oct 6 10:02:22 2014 +0100
randr/prime: Don't stop on the first pipe when disabling ReplaceScanoutPixmap
As we define sizeFits based on whether a CRTC is active, and skip trying
to redirect the scanout on a disable pipe, we then attempt to undo it
later and fail because crtc->scanout_pixmap != DRI2_Pixmap and
!sizeFits. Paper over this failure by skipping unredirected CRTC when
disabling.
v2: Unwind upon failure
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=84653
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Dave Airlie <airlied@redhat.com>
Reported-by: Christoph Haag <haagch@frickel.club>
Tested-by: Christoph Haag <haagch@frickel.club>
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
commit 9d65a0de95a20632f2a6a04ba596dcdd76d9f5e2
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Fri Sep 18 08:44:07 2015 -0700
Remove DECnet from Xserver.man
DECnet support died in modularization (X11R7.0)
Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
commit 82eb490b0a341729f25d0c42a937fe29d99da521
Author: Aaron Plattner <aplattner@nvidia.com>
Date: Thu Sep 17 16:04:33 2015 -0700
privates: Clear screen-specific keys during CloseScreen
The modesetting driver corrupts memory when used after a server regeneration
because not enough memory is allocated for its pixmap privates. This happens
because its call to dixRegisterScreenSpecificPrivateKey() does nothing because
key->initialized is still TRUE from the first server generation. However, the
key is not in the screen's linked list of screen-specific privates because
that's freed and reallocated during the server generation loop in dix_main().
Fix this by clearing key->initialized before CloseScreen and add a call to
dixFreeScreenSpecificPrivates() for GPU screens.
v2: Just set key->initialized to FALSE and move dixFreeScreenSpecificPrivates()
calls to after CloseScreen.
v3: Move dixFreeScreenSpecificPrivates() calls back to just before CloseScreen.
Signed-off-by: Aaron Plattner <aplattner@nvidia.com>
Reviewed-by: Keith Packard <keithp@keithp.com>
commit 18a93da9b1f429bc54a8b236fcdd38dab58375cd
Author: Jasper St. Pierre <jstpierre@mecheye.net>
Date: Wed Feb 18 12:41:25 2015 -0800
test/xi1: Update .gitignore
Reviewed-by: Adam Jackson <ajax@redhat.com>
commit cdd1d58159140759052ec043bc9828d94ba97bc7
Author: Jon TURNEY <jon.turney@dronecode.org.uk>
Date: Mon Jul 6 17:15:44 2015 +0100
mingw: Fix NO_LOCAL_CLIENT_CRED build
Commit 4b4b9086 "os: support new implicit local user access mode [CVE-2015-3164
2/3]" carefully places the relevant code it adds under !NO_LOCAL_CLIENT_CRED,
but unfortunately doesn't notice that NO_LOCAL_CLIENT_CRED is defined as a
side-effect in the middle of GetLocalClientCreds(), so many of these checks
precede its definition.
Move the check if NO_LOCAL_CLIENT_CRED should be defined to configure.ac, so it
always occurs before it's first use.
v2:
Move check to configure.ac
v3:
Use AC_CACHE_CHECK and name cache varaible appropriately
[ajax: Massaged commit message]
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Reviewed-by: Ray Strode <rstrode@redhat.com>
commit f8a2c087c89ed5b638a2e62987f255d3f04f914e
Author: Javier Jardón <jjardon@gnome.org>
Date: Sun Mar 22 03:52:03 2015 +0000
configure.ac: Add support for new versions of systemd
... that only provide a unique libsystemd.pc file
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Javier Jardón <jjardon@gnome.org>
commit 67dd34fa734085ed67ba7790820fe4743d48b60f
Author: Adam Jackson <ajax@redhat.com>
Date: Wed Jun 10 13:20:59 2015 -0400
render: Simplify SProcRenderScale
Since ProcRenderScale throws BadImplementation anyway it's pointless to
waste time carefully swapping the request.
Signed-off-by: Adam Jackson <ajax@redhat.com>
Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
commit a579e6ba7763749d51d16e3a54941e06939df07a
Author: Ian Scott <ian.scott@arteris.com>
Date: Thu May 21 16:13:12 2015 -0700
Xephyr: Paint with subimage for non-Glamor & non-XSHM case
This improves the case for when we paint an area without SHM.
xcb_image_subimage() is used to create a subimage for the damaged area, which
is converted to native format if necessary.
Signed-off-by: Ian Scott <ian.scott@arteris.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
commit a6c0564f7f00aa66fd19180f75b6b09904444f06
Author: Laércio de Sousa <laerciosousa@sme-mogidascruzes.sp.gov.br>
Date: Mon Mar 23 10:58:03 2015 -0300
ephyr: move host_has_extension() implementation to hostx.c
This is a trivial patch that moves host_has_extension() implementation
from ephyr.c to hostx.c so that it can be called by hostx.c internal
functions. Also rename function to hostx_has_extension() for consistency.
Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Laércio de Sousa <laerciosousa@sme-mogidascruzes.sp.gov.br>
commit 9414ba3683231afe9bee0f941c53998dea218615
Author: Jürg Billeter <j@bitron.ch>
Date: Sun Feb 8 11:34:18 2015 +0100
ephyr: fix -no-host-grab argument processing
Signed-off-by: Jürg Billeter <j@bitron.ch>
Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
commit 1f915e8b524dd02011158aa038935970684c7630
Author: Daniel Drake <drake@endlessm.com>
Date: Wed May 20 13:16:12 2015 -0600
Keep SIGALRM restart flag after Popen
Commit 94ab7455 added SA_RESTART to the SIGALRM handler. However, the
Popen code tears down and recreates the SIGALRM handler via OsSignal(),
and this flag is dropped at this time.
Clean the code to use just a single codepath for creating this signal
handler, always applying SA_RESTART.
[ajax: Fixed commit id]
Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Daniel Drake <drake@endlessm.com>
commit 94ab7455abc213fc96760e29ab2e943ec682fb22
Author: Daniel Drake <drake@endlessm.com>
Date: Tue May 12 16:39:22 2015 -0600
Allow system call restarts upon signal interruption
The X server frequently deals with SIGIO and SIGALRM interruptions.
If process execution is inside certain blocking system calls
when these signals arrive, e.g. with the kernel blocked on
a contended semaphore, the system calls will be interrupted.
Some system calls are automatically restartable (the kernel re-executes
them with the same parameters once the signal handler returns) but
only if the signal handler allows it.
Set SA_RESTART on the signal handlers to enable this convenient
behaviour.
Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Daniel Drake <drake@endlessm.com>
commit 1ba4fde1015fc6da19dfbfdf0f77f1071416e215
Author: Boyan Ding <stu_dby@126.com>
Date: Mon Aug 4 21:16:34 2014 +0800
xwayland: Activate and enable device on first capability reporting
Commit 2172714c changed behavior of capability handling, but it only
solved part of the problem. If Xwayland is launched without a capability
(e.g. no pointer device is connected when Xwayland was spinned up), and
later that capability comes, the device added will not be automatically
initialized. This patch initializes the device when the capability is
reported for the first time, thus avoiding the problem.
Fixes: https://bugs.freedesktop.org/show_bug.cgi?id=81819
Signed-off-by: Boyan Ding <stu_dby@126.com>
Reviewed-by: Daniel Stone <daniels@collabora.com>
commit f1995de1c43733a9e586605674c4071357a58e78
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri Aug 28 14:28:11 2015 +1000
xwayland: call through to miPointerWarpCursor on warp_cursor
This is (eventually) called during
InitializeSprite() → *pScreen->SetCursorPosition → miPointerSetCursorPosition
when a device is set to floating. We don't do anything special outselves, but
we need to pass on to the next layer to make sure the device is initialized
properly. Otherwise, pScreen stays NULL and eventually crashes the server when
we try to clean up behind us.
Test case: grab a device → floats it, ungrab again → crash
Reported-by: Jason Gerecke <killertofu@gmail.com>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Olivier Fourdan <ofourdan@redhat.com>
commit 373599ab008f0ecf8f3fb62455a5474f5ec8f499
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri Aug 28 14:28:10 2015 +1000
xwayland: fix crash on enter/leave for a grabbed slave device
When grabbed, the slave device is floating, i.e. the master device is NULL.
CheckMotion() isn't happy with NULL. Make sure we pass the right device in,
either the master device when the device is attached, or the device itself
when it is floating.
Reported-by: Jason Gerecke <killertofu@gmail.com>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Olivier Fourdan <ofourdan@redhat.com>
commit f1ba8858d5baa63cde6361492e6d349ce1b38d21
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri Aug 28 14:28:09 2015 +1000
xwayland: use the device pointer we already have
No functional changes.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Olivier Fourdan <ofourdan@redhat.com>
commit 44f250a7e8eb86d3f41da5d186d839e7a14648a3
Author: Carlos Garnacho <carlosg@gnome.org>
Date: Wed May 27 18:42:00 2015 +0200
xwayland: Remove related touchpoints when unrealizing windows
These sequences are forgotten to all purposes.
Signed-off-by: Carlos Garnacho <carlosg@gnome.org>
Reviewed-by: Olivier Fourdan <ofourdan@redhat.com>
commit b7cd48f71d269101e28ae6855b895057378715f9
Author: Carlos Garnacho <carlosg@gnome.org>
Date: Wed May 27 18:41:59 2015 +0200
xwayland: Implement the wl_touch interface
A DeviceIntPtr with touch valuators is also created in order to deliver
the translated touch events. The lifetime of xwl_touch structs is tied
to the wayland ones, finishing in either wl_touch.up() or wl_touch.cancel()
Signed-off-by: Carlos Garnacho <carlosg@gnome.org>
Reviewed-by: Olivier Fourdan <ofourdan@redhat.com>
commit d96eccc057094be31c1ee4e3b3246675934cb19d
Author: Carlos Garnacho <carlosg@gnome.org>
Date: Wed May 27 18:41:58 2015 +0200
xwayland: Add xwl_touch struct
This struct holds information about each individual, ongoing touchpoint.
A list of these is held by the xwl_seat.
Signed-off-by: Carlos Garnacho <carlosg@gnome.org>
Reviewed-by: Olivier Fourdan <ofourdan@redhat.com>
commit c1565f3ca663aa4ba4316d7248737ab817116fbd
Author: Jasper St. Pierre <jstpierre@mecheye.net>
Date: Sat Feb 21 11:53:59 2015 -0800
xwayland-input: Remove our XYToWindow handler
This was built as a hack for simple Wayland compositors like Weston
which were lazy and didn't want to configure windows server-side when
moved.
Since comboboxes and menus are separate toplevel O-R windows, this hack
breaks input as it needs to be traced normally, not simply sent to the
focused window.
X11 toolkits really do need their windows to be configured correctly
for their O-R windows comboboxes or menus other things, so let's fix
the lazy compositors and remove this.
I have tested this patch with both Weston and Mutter and neither of
them require any changes, and it fixes comboboxes and menus.
If somebody then wants to revert 73698d4, that's fine by me, so we
reduce the amount of API that DDXen have.
Signed-off-by: Jasper St. Pierre <jstpierre@mecheye.net>
Reviewed-by: Daniel Stone <daniels@collabora.com>
commit 58d54ee82dfae5486bc09d04d2760c922d54d631
Author: Emil Velikov <emil.l.velikov@gmail.com>
Date: Wed Sep 16 22:10:22 2015 +0100
glamor: explicitly check for GL_OES_EGL_image
Otherwise we'll fail miserably later on as we try to use
glEGLImageTargetTexture2DOES.
Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>
Reviewed-by: Michel Dänzer <michel.daenzer@amd.com>
commit 139e36dd5cbab80a9296129f3d25379dc01442b3
Author: Ilia Mirkin <imirkin@alum.mit.edu>
Date: Fri Sep 4 18:56:19 2015 -0400
modesetting: fix up output naming convention
A user on a nouveau-driven card ran into a problem where DVI-D-1 and
DVI-I-1 were aliasing. The simplest fix is to provide the full connector
names. While we're at it, rename the output names to match what is in
the kernel, and start counting the connectors from 1 rather than 0. The
only deviation is HDMI vs HDMI-A, which kept its original name.
This will break backwards compatibility with existing xorg.conf's that
reference output names, but the alternative is to create a separate
counting system, further disconnecting from the kernel names.
Signed-off-by: Ilia Mirkin <imirkin@alum.mit.edu>
Reviewed-by: Dave Airlie <airlied@redhat.com>
commit a907ead7864ac5720854fa3333b66fd5187d5eaf
Author: Marek Chalupa <mchqwerty@gmail.com>
Date: Thu Aug 20 07:43:51 2015 +0200
xwayland: implement repeat_info event
xwayland windows ignored any key repeating settings
advertised by a compositor
v2. don't hardcode version 4 of seat
use AutoRepeatModeOn/Off
v3. use min(version, 4) when binding seat
Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Marek Chalupa <mchqwerty@gmail.com>
commit e8e3368298c98a1292bb1c727e2f3d56539e2eac
Author: Felix Janda <felix.janda@posteo.de>
Date: Mon Aug 17 20:25:53 2015 +0200
On linux use <termios.h> instead of <termio.h>
<termio.h> is obsolete. Using <termios.h> instead fixes building with
musl libc.
Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Felix Janda <felix.janda@posteo.de>
commit dfa8b37cfb2589f2474f6fcc755dde77bfdd6fed
Author: Adam Jackson <ajax@redhat.com>
Date: Wed Jul 29 11:30:15 2015 -0400
glxproxy: Fix an obvious thinko in QueryExtensionsString
gcc 5.1 throws a rather amusing warning here:
glxcmdsswap.c: In function ‘__glXSwapQueryExtensionsString’:
glxcmdsswap.c:439:1: warning: function might be candidate for attribute
‘noreturn’ [-Wsuggest-attribute=noreturn]
__glXSwapQueryExtensionsString(__GLXclientState * cl, GLbyte * pc)
This is entirely accurate, albeit curiously phrased: swapping some bits
hanging off the end of a null pointer will make Xdmx crash, so from the
perspective of code generation the function will indeed not return.
Reviewed-by: Keith Packard <keithp@keithp.com>
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit 75ee874e432d959a70fbc2c9208d20dbfa5cbc5f
Author: Jon TURNEY <jon.turney@dronecode.org.uk>
Date: Fri May 1 17:06:47 2015 +0100
Build fix for DMX
./../dix/.libs/libdix.a(pixmap.o): In function `PixmapStartDirtyTracking':
xorg/xserver/dix/pixmap.c:194: undefined reference to `RRTransformCompute'
I'm not quite sure how 0db457b fixes this
Move RANDR_LIB to after DIX_LIB, so the reference to RRTransformCompute in
DIX_LIB is satisfied.
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Tested-by: Olivier Fourdan <ofourdan@redhat.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 634e357be2ec400f63bd5c42f706b709b6ddabc3
Author: Ingo Schwarze <schwarze@usta.de>
Date: Sun Aug 30 15:26:40 2015 +0200
remove bogus \/ escapes
some X manuals use then escape sequence \/ when they want to render
a slash. That's bad because \/ is not a slash but an italic
correction, never producing any output, having no effect at all in
terminal output, and only changing spacing in a minor way in typeset
output.
Signed-off-by: Matthieu Herrb <matthieu@herrb.eu>
Reviewed-by: Mark Kettenis <kettenis@openbsd.org>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit c74c074d8e4981eb4509e120e14d15387bdc94ef
Author: Olivier Fourdan <ofourdan@redhat.com>
Date: Mon Aug 31 08:18:59 2015 +0200
dix: export ResourceClientBits()
ResourceClientBits() might be used by the modules as well, need to
mark the symbol as visible to that the linker can resolve it at
run time.
/usr/bin/X: symbol lookup error:
/usr/lib64/xorg/modules/extensions/libglx.so: undefined symbol:
ResourceClientBits
bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=91763
Signed-off-by: Olivier Fourdan <ofourdan@redhat.com>
Reviewed-by: Keith Packard <keithp@keithp.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit dbfed3a291619c2530f314394bd73d71e2567e78
Author: Keith Packard <keithp@keithp.com>
Date: Tue Sep 1 19:03:33 2015 -0700
Bump version to 1.17.99.901 (1.18 RC1)
Signed-off-by: Keith Packard <keithp@keithp.com>
commit bcb60a49c5e74aa11d0256874659afddea91e53d
Author: Jon TURNEY <jon.turney@dronecode.org.uk>
Date: Tue Jul 7 23:11:07 2015 +0100
debug output format fix in TouchEventHistoryPush()
xserver/build.x86_64/../dix/touch.c:468:16: error: format ‘%d’ expects argument of type ‘int’, but argument 3 has type ‘size_t’ [-Werror=format=]
%zu is C99, but is already used in a few places. Perhaps doc/c-extensions needs
to mention it.
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 1f96a0d273e56d01cd240e6a4ef8765e0ffe058c
Author: Jon TURNEY <jon.turney@dronecode.org.uk>
Date: Fri May 1 17:40:06 2015 +0100
debug output format fix in ephyrProcessMouseMotion()
xorg/xserver/hw/kdrive/ephyr/ephyr.c:979:9: error: format ‘%d’ expects argument of type ‘int’, but argument 4 has type ‘ScreenPtr’ [-Werror=format=]
This looks like a genuine bug, and ephyrCursorScreen->myNum was meant here
rather than ephyrCursorScreen
v2:
Insert a ":" as well
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 8cc88fbe9e4699cd2570641eb2752977b5505d16
Author: Jon TURNEY <jon.turney@dronecode.org.uk>
Date: Fri May 1 17:33:35 2015 +0100
debug output format fix in DRISwapContext()
xorg/xserver/hw/xfree86/dri/dri.c:1695:19: error: format ‘%x’ expects argument of type ‘unsigned int’, but argument 4 has type ‘DRIContextPrivPtr’ [-Werror=format=] ^
xorg/xserver/hw/xfree86/dri/dri.c:1695:19: error: format ‘%x’ expects argument of type ‘unsigned int’, but argument 5 has type ‘DRIContextPrivPtr’ [-Werror=format=]
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 27cf5840272810ae20fdae550db71ec48cf1b02d
Author: Jon TURNEY <jon.turney@dronecode.org.uk>
Date: Tue Jul 7 23:29:51 2015 +0100
debug output format fix in TI.c
xserver/hw/xfree86/ramdac/TI.c:118:12: error: format ‘%d’ expects argument of type ‘int’, but argument 4 has type ‘long unsigned int’ [-Werror=format=]
xserver/hw/xfree86/ramdac/TI.c:118:12: error: format ‘%d’ expects argument of type ‘int’, but argument 5 has type ‘long unsigned int’ [-Werror=format=]
xserver/hw/xfree86/ramdac/TI.c:118:12: error: format ‘%d’ expects argument of type ‘int’, but argument 6 has type ‘long unsigned int’ [-Werror=format=]
Use %lu for an unsigned long
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 6cc0f3d95d62e33a5d86f865159cc3526d3a9dc5
Author: Jon TURNEY <jon.turney@dronecode.org.uk>
Date: Tue Jul 7 23:20:29 2015 +0100
debug output format fix in xf86Events.c
xserver/hw/xfree86/common/xf86Events.c:183:5: error: format ‘%x’ expects argument of type ‘unsigned int’, but argument 3 has type ‘void *’ [-Werror=format=]
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
commit d206c240c0b85c4da44f073d6e9a692afb6b96d2
Author: Olivier Fourdan <ofourdan@redhat.com>
Date: Tue Jul 7 18:19:50 2015 +0200
configurable maximum number of clients
Make the maximum number of clients user configurable, either from the command
line or from xorg.conf
This patch works by using the MAXCLIENTS (raised to 512) as the maximum
allowed number of clients, but allowing the actual limit to be set by the
user to a lower value (keeping the default of 256).
There is a limit size of 29 bits to be used to store both the client ID and
the X resources ID, so by reducing the number of clients allowed to connect to
the X server, the user can increase the number of X resources per client or
vice-versa.
Parts of this patch are based on a similar patch from Adam Jackson
<ajax@redhat.com>
This now requires at least xproto 7.0.28
Signed-off-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Olivier Fourdan <ofourdan@redhat.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 7ecdfbf0af3547295b245efa754123db65cabb43
Merge: bca4f4b56c a0b4f30b1f
Author: Keith Packard <keithp@keithp.com>
Date: Mon Aug 17 18:53:25 2015 -0700
Merge remote-tracking branch 'airlied/modesetting-zaphod'
commit bca4f4b56c7619d17f9df46f7aac392ea01a9429
Author: Keith Packard <keithp@keithp.com>
Date: Mon Aug 17 18:37:10 2015 -0700
mi: Always initialize edge1 and edge2 in miLineArc
This eliminates a warning generated when miLineArcD is inlined and the
compiler can't figure out that edge1 and edge2 are always initialized
before being used.
Signed-off-by: Keith Packard <keithp@keithp.com>
Reviewed-by: Dave Airlie <airlied@redhat.com>
commit 5daf1295cb4f71510da595721d10f7ea3b74d1b9
Author: Keith Packard <keithp@keithp.com>
Date: Mon Aug 17 18:35:20 2015 -0700
dixfont.h: Include fontutil.h before GetGlyphs is #defined
This eliminates the duplicate declaration of dixGetGlyphs when
fontutil.h gets included after dixfont.h has defined GetGlyphs as
dixGetGlyphs.
Signed-off-by: Keith Packard <keithp@keithp.com>
Reviewed-by: Dave Airlie <airlied@redhat.com>
commit d4710004367ab8eab794a12385ca7ed3acc9a0e0
Author: Dave Airlie <airlied@redhat.com>
Date: Thu Aug 13 09:25:37 2015 +1000
rootless: rename w->_w to avoid shadow warnings
fixes:
In file included from rootlessWindow.c:51:0:
rootlessWindow.c: In function 'RootlessResizeWindow':
rootlessCommon.h:198:19: warning: declaration of 'w' shadows a parameter [-Wshadow]
WindowPtr w = pWin; \
^
rootlessWindow.c:1292:9: note: in expansion of macro 'HUGE_ROOT'
HUGE_ROOT(pWin);
^
rootlessWindow.c:1262:35: note: shadowed declaration is here
unsigned int w, unsigned int h, WindowPtr pSib)
^
In file included from rootlessWindow.c:51:0:
rootlessCommon.h:207:19: warning: declaration of 'w' shadows a parameter [-Wshadow]
WindowPtr w = pWin; \
^
rootlessWindow.c:1296:9: note: in expansion of macro 'NORMAL_ROOT'
NORMAL_ROOT(pWin);
^
rootlessWindow.c:1262:35: note: shadowed declaration is here
unsigned int w, unsigned int h, WindowPtr pSib)
^
Signed-off-by: Dave Airlie <airlied@redhat.com>
Reviewed-by: Keith Packard <keithp@keithp.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 7f506b8099d23c2f045ad26cc5cff00109b69d7b
Author: Dave Airlie <airlied@redhat.com>
Date: Thu Aug 13 09:25:36 2015 +1000
rootless: fix warnings due to lack of const keeping.
Signed-off-by: Dave Airlie <airlied@redhat.com>
Reviewed-by: Keith Packard <keithp@keithp.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit b923443816320d0636d6fd40c3c1125b93332907
Author: Dave Airlie <airlied@redhat.com>
Date: Thu Aug 13 09:25:35 2015 +1000
mioverlay.c: remove shadowed pScreen.
This is already defined at the function entry.
fixes warning:
CC mivaltree.lo
mioverlay.c: In function 'miOverlayWindowExposures':
mioverlay.c:993:23: warning: declaration of 'pScreen' shadows a previous local [-Wshadow]
ScreenPtr pScreen = pWin->drawable.pScreen;
^
mioverlay.c:986:15: note: shadowed declaration is here
ScreenPtr pScreen = pWin->drawable.pScreen;
Signed-off-by: Dave Airlie <airlied@redhat.com>>
Reviewed-by: Keith Packard <keithp@keithp.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit a0b4f30b1f584d2957c9c99e430da5740d2d4ab2
Author: Mario Kleiner <mario.kleiner.de@gmail.com>
Date: Wed Aug 5 00:08:40 2015 +0200
modesetting: Add more missing options to man page.
Descriptions for Options PageFlip and SWCursor.
Signed-off-by: Mario Kleiner <mario.kleiner.de@gmail.com>
Reviewed-by: Dave Airlie <airlied@redhat.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
commit 19e1dc8f6ea6d7ff5ba4a5caa0e2f40a47879408
Author: Dave Airlie <airlied@redhat.com>
Date: Wed Jul 22 03:56:13 2015 +0100
modesetting: add zaphod support (v3)
This adds zaphod and ZaphodHeads support
to the the in-server modesetting driver.
this is based on a request from Mario,
and on the current radeon driver, along
with some patches from Mario to bring things
up to the state of the art in Zaphod.
v2: fixup vblank fd registring.
v3: squash Mario's fixes.
modesetting: Allow/Fix use of multiple ZaphodHead outputs per x-screen.
modesetting: Take shift in crtc positions for ZaphodHeads configs into account.
modesetting: Add ZaphodHeads description to man page.
small cleanups (airlied).
Reviewed-and-tested-by: Mario Kleiner <mario.kleiner.de@gmail.com>
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
commit 533fb627398e20f863234d780f4463e37007515b
Author: Adam Jackson <ajax@redhat.com>
Date: Tue Aug 4 13:17:02 2015 -0400
xwayland: Don't (double) destroy input resources in CloseScreen
By the time we get here we've already done CloseDownDevices, so on the
second regeneration you get:
Invalid read of size 4
at 0x43402A: RemoveDevice (devices.c:1125)
by 0x427902: xwl_seat_destroy (xwayland-input.c:568)
by 0x42649C: xwl_close_screen (xwayland.c:116)
by 0x4B7F67: CursorCloseScreen (cursor.c:187)
by 0x536003: AnimCurCloseScreen (animcur.c:106)
by 0x539831: present_close_screen (present_screen.c:64)
by 0x43E486: dix_main (main.c:351)
by 0x30D70206FF: (below main) (libc-start.c:289)
Address 0x980e1a0 is 64 bytes inside a block of size 904
at 0x4A07D6A: free (in /usr/lib64/valgrind/vgpreload_memcheck-amd64-linux.so)
by 0x434158: RemoveDevice (devices.c:1157)
by 0x42F77B: CloseDeviceList (devices.c:1017)
by 0x430246: CloseDownDevices (devices.c:1047)
by 0x43E3EB: dix_main (main.c:333)
by 0x30D70206FF: (below main) (libc-start.c:289)
Signed-off-by: Adam Jackson <ajax@redhat.com>
Reviewed-by: Daniel Stone <daniels@collabora.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 11f4cc47a815c5d6284b1338e748e2605b2dd779
Author: Adam Jackson <ajax@redhat.com>
Date: Tue Aug 4 13:17:01 2015 -0400
xwayland: Don't (double) destroy RANDR resources in CloseScreen
By the time we get here we've already been through FreeAllResources,
which has already torn down the RANDR objects, so on the second
regeneration you get:
Invalid read of size 4
at 0x51C6F0: RRCrtcDestroy (rrcrtc.c:659)
by 0x4285F5: xwl_output_destroy (xwayland-output.c:191)
by 0x426464: xwl_close_screen (xwayland.c:112)
by 0x4B7F77: CursorCloseScreen (cursor.c:187)
by 0x536013: AnimCurCloseScreen (animcur.c:106)
by 0x539841: present_close_screen (present_screen.c:64)
by 0x43E496: dix_main (main.c:351)
by 0x30D70206FF: (below main) (libc-start.c:289)
Address 0x4cc6640 is 0 bytes inside a block of size 728 free'd
at 0x4A07D6A: free (in /usr/lib64/valgrind/vgpreload_memcheck-amd64-linux.so)
by 0x51BCCF: RRCrtcDestroyResource (rrcrtc.c:689)
by 0x45CD91: doFreeResource (resource.c:872)
by 0x45DE56: FreeClientResources (resource.c:1138)
by 0x45DF06: FreeAllResources (resource.c:1153)
by 0x43E3BD: dix_main (main.c:321)
by 0x30D70206FF: (below main) (libc-start.c:289)
Signed-off-by: Adam Jackson <ajax@redhat.com>
Reviewed-by: Daniel Stone <daniels@collabora.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit ea03e314f98e5d8ed7bf7a508006a3d84014bde5
Author: Eric Anholt <eric@anholt.net>
Date: Mon Jul 27 13:54:00 2015 -0700
glamor: Don't try to free the pixmap priv if we fail to allocate FBO.
Fixes a regression since a2a2f6e34bd49e7ae31779274d52e800595660bc. I
missed this in testing on x86, because we never fail to allocate an
FBO. We do hit this path on VC4, though.
Signed-off-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Dave Airlie <airlied@redhat.com>
commit 6916d32ab3ec1aa922094abce7fac22884ee4e83
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Sun Jul 19 08:24:39 2015 -0700
Xserver.man: -retro is used when starting the server, not the stipple
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Michel Dänzer <michel.daenzer@amd.com>
Signed-off-by: Eric Anholt <eric@anholt.net>
commit 0a458a908ec071a4da5d22c760581e0c5ec885ce
Author: Michel Dänzer <michel.daenzer@amd.com>
Date: Wed Jul 22 15:37:23 2015 +0900
glamor: Make our EGL context current before calling into GL in glamor_init
Without this, the context of another screen may be current, or no context
at all if glamor_egl_init failed for another screen.
Signed-off-by: Michel Dänzer <michel.daenzer@amd.com>
Signed-off-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Dave Airlie <airlied@redhat.com>
Reviewed-by: Eric Anholt <eric@anholt.net>
commit a8a0f6464a33c12c1de495d74fd478c0d952643e
Author: Aaron Plattner <aplattner@nvidia.com>
Date: Thu Jul 16 15:12:52 2015 -0700
xfree86: Bump video driver ABI version to 20
Commit 90db5edf119187f8b1b9207c8c384d6cd7ef9edc modified the signature of
StartPixmapTrackingProcPtr, so drivers implementing that need to use the updated
definition.
Signed-off-by: Aaron Plattner <aplattner@nvidia.com>
Signed-off-by: Eric Anholt <eric@anholt.net>
commit 2fcfa532532fbe4a7f668556808e6245ff4e36bc
Merge: cb695b0f3b 7b0f940625
Author: Eric Anholt <eric@anholt.net>
Date: Fri Jul 17 10:15:01 2015 -0700
Merge remote-tracking branch 'ajax/xserver-next' into master
commit cb695b0f3b8def4d1ac02458fe630b65f6a5a3e6
Author: Armin K <krejzi@email.com>
Date: Thu Jul 16 14:54:48 2015 +0200
xfree86/os-support/linux: Fix make distcheck
Header was added in 1dba5a0b194653b0effb01a918bd7338b0c6bcb9
but not in Makefile.am, resulting in missing header in the
distribution tarball.
Signed-off-by: Eric Anholt <eric@anholt.net>
commit 29efa905ec1e22d66b517378c6e5ad47a09d6977
Author: Robert Ancell <robert.ancell@canonical.com>
Date: Thu Jul 16 12:26:05 2015 +1200
modesetting: Use correct types for return values of glamor BO exports.
glamor_name_from_pixmap and glamor_fd_from_pixmap return CARD16 and
CARD32 values via pointers. The current code uses uint16_t and
uint32_t which will probably be the same but it's safer to use the
datatypes as specified by the function.
Signed-off-by: Robert Ancell <robert.ancell@canonical.com>
Signed-off-by: Eric Anholt <eric@anholt.net>
commit db5337afb248edf81087cf8d74006fc496d70589
Author: Dave Airlie <airlied@redhat.com>
Date: Wed Jul 15 17:56:11 2015 +1000
glamor: make current in prepare paths
Lots of the accel paths only make current once they start
doing someting, so a lot of them call the bail paths without
make current, which means on PRIME systems for example
we end up in the wrong context.
Add a prepare pixmap in the prepare fallback path.
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=90667
Signed-off-by: Dave Airlie <airlied@redhat.com>
Signed-off-by: Eric Anholt <eric@anholt.net>
Reviewed-and-Tested-by: Michel Dänzer <michel.daenzer@amd.com>
Reviewed-by: Eric Anholt <eric@anholt.net>
commit 1a18513a4eb3fa22459dd9f7d8f0e275aff679ec
Author: Michel Dänzer <michel.daenzer@amd.com>
Date: Fri Jul 10 15:28:52 2015 +0900
glamor: Use glamor_prepare_access_box() for PutImage/GetImage fallback
Fixes slow text display in xdvi.
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=91260
Signed-off-by: Michel Dänzer <michel.daenzer@amd.com>
Signed-off-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Dave Airlie <airlied@redhat.com>
Reviewed-by: Eric Anholt <eric@anholt.net>
commit fde13565c1b2462ee38f2a446ad3c9157261afa2
Author: Eric Anholt <eric@anholt.net>
Date: Thu Jul 2 13:57:05 2015 -0700
glamor: Drop unused box translation/bounds code.
These are dead since the glamor_copy.c replacement.
Signed-off-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Michel Dänzer <michel.daenzer@amd.com>
Reviewed-by: Dave Airlie <airlied@redhat.com>
commit ab5aa270c79d70f095bc7abadeef227b4062027c
Author: Eric Anholt <eric@anholt.net>
Date: Thu Jul 2 13:52:05 2015 -0700
glamor: Move cache_format to glamor_fbo.c, where it's used.
Signed-off-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Michel Dänzer <michel.daenzer@amd.com>
Reviewed-by: Dave Airlie <airlied@redhat.com>
commit 0ca783e8ee5dfb086fbfa64d26173bcca78b4010
Author: Eric Anholt <eric@anholt.net>
Date: Thu Jul 2 13:50:42 2015 -0700
glamor: Drop another dead function.
This hasn't been used since the format swap/revert stuff for pictures
was added back in 2012.
Signed-off-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Michel Dänzer <michel.daenzer@amd.com>
Reviewed-by: Dave Airlie <airlied@redhat.com>
commit c1111710628cc2a9dfaee0d74ea9fceee990095b
Author: Eric Anholt <eric@anholt.net>
Date: Thu Jul 2 13:33:01 2015 -0700
glamor: Take transforms into account when preparing for a fallback.
This function takes the start x/y and the destination's width/height,
so it only works if there's no transform. We could potentially
transform this box and take its bounds with some rounding, but this at
least gets us to read out enough data.
Note that this does the same overshoot on destination pictures with a
transform attached, but that seems unlikely to be used anyway.
v2: Add XXX comment for the commit message note (Suggested by Michel).
Signed-off-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Michel Dänzer <michel.daenzer@amd.com> (v1)
Reviewed-by: Dave Airlie <airlied@redhat.com> (v1)
commit c16e086dace81151f399485e5c686617a43d5b94
Author: Eric Anholt <eric@anholt.net>
Date: Thu Jul 2 13:25:40 2015 -0700
glamor: Drop dead drm_stride field.
Signed-off-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Michel Dänzer <michel.daenzer@amd.com>
Reviewed-by: Dave Airlie <airlied@redhat.com>
commit 8097c887023b72744cb2cb943c2deca7ca0c404a
Author: Eric Anholt <eric@anholt.net>
Date: Thu Jul 2 13:11:20 2015 -0700
glamor: Drop tracking of the last picture attached to pixmaps.
Signed-off-by: Eric Anholt <eric@anholt.net>
Acked-by: Michel Dänzer <michel.daenzer@amd.com>
Reviewed-by: Dave Airlie <airlied@redhat.com>
commit 0dbdb83b0d0254ac67fb33da8bf9ebc0ef4e8081
Author: Eric Anholt <eric@anholt.net>
Date: Thu Jul 2 12:55:27 2015 -0700
glamor: Use the actual picture's format when uploading memory pixmaps.
The pixmap->picture is just the *last* picture attached to the pixmap,
so you'd potentially be looking at the wrong one when trying to
temporarily upload to avoid a composite fallback.
There's some trickiness in glamor_render.c when we're dealing with the
upload of a GLAMOR_MEMORY pixmap as both the source and mask using
different formats, where we smash the source's format to a new value
so that the mask can use the same uploaded bits. Dropping most of
that should be safe, since it will be uploaded as the source first, so
the smashed format will still be used.
Signed-off-by: Eric Anholt <eric@anholt.net>
Acked-by: Michel Dänzer <michel.daenzer@amd.com>
Reviewed-by: Dave Airlie <airlied@redhat.com>
commit 1fd11c46aa086e4b80cb1bafa87c6b19a8014fd1
Author: Eric Anholt <eric@anholt.net>
Date: Thu Jul 2 12:49:36 2015 -0700
glamor: Move glamor_render.c pict handling to glamor_picture.c
These functions aren't used by anything else, and are specific to the
temporary-upload-as-a-weird-format path of glamor_render.c, called
through glamor_upload_picture_to_texture().
Signed-off-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Michel Dänzer <michel.daenzer@amd.com>
Reviewed-by: Dave Airlie <airlied@redhat.com>
commit 53aed06fb45aed4145754cd622508563ad262c4a
Author: Eric Anholt <eric@anholt.net>
Date: Thu Jul 2 12:48:01 2015 -0700
glamor: Drop dead glamor_upload_bits_to_pixmap_texture() proto.
Signed-off-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Michel Dänzer <michel.daenzer@amd.com>
Reviewed-by: Dave Airlie <airlied@redhat.com>
commit b51e079e1877411fde72372c3953d71e42ac1d6e
Author: Eric Anholt <eric@anholt.net>
Date: Thu Jul 2 12:40:05 2015 -0700
glamor: Use the new upload/download interface for XV uploads.
We don't need any of its weird handling of picture formats, since our
XV pixmaps don't have any pictures attached.
Signed-off-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Michel Dänzer <michel.daenzer@amd.com>
Reviewed-by: Dave Airlie <airlied@redhat.com>
commit 1bd966d16d87ed908547144c68850f2cdee05469
Author: Eric Anholt <eric@anholt.net>
Date: Thu Jul 2 12:21:41 2015 -0700
glamor: Ignore picture formats when choosing color for core rendering.
Attaching a picture to a pixmap doesn't change its GL format, so it
doesn't change how core rendering should be assigning colors to it.
(Imagine XCreatePixmap(), optional XCreatePicture(pixmap) with various
formats, XFillRectangle, XGetImage(). If the XGetImage results
changed, this would be wrong).
Fixes all failures in "rendercheck -t fill" and, as a result, the
remaining failures in "rendercheck -t blend -o src -f
a8r8g8b8,x2r10g10b10"
Signed-off-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Michel Dänzer <michel.daenzer@amd.com>
Reviewed-by: Dave Airlie <airlied@redhat.com>
commit 5a81de8284f851751a8943aa6a905377be315c7b
Author: Eric Anholt <eric@anholt.net>
Date: Wed Jul 8 12:18:28 2015 -0700
glamor: Don't try to do rendering with unsupported formats.
I'm amazed we've made it as far as we have without these checks: if
you made an unusual format picture that wasn't the normal a8r8g8b8 or
x8r8g8b8 or a8, we'd go ahead and try to render with it, ignoring that
the sampler would fetch totally wrong bits.
Fixes 260 tests in rendercheck -t blend -o src -f a8r8g8b8,x2r10g10b10
Signed-off-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Michel Dänzer <michel.daenzer@amd.com>
Reviewed-by: Dave Airlie <airlied@redhat.com>
commit 0d7cbd6f5a2b5c9c690979da9c1483e8f6133903
Author: Hans de Goede <hdegoede@redhat.com>
Date: Fri Jul 3 20:42:48 2015 +0200
glamor_egl: Properly free resources on init-error and exit
glamor_egl_init() was not undoing any of the init steps on init error,
add an glamor_egl_cleanup() function and use this both on error and on exit
to cleanup the various resources.
Even on a clean exit eglTerminate() was not being called, causing the fd
dup()-ed by eglInitialize() to stay open, call eglTerminate() from the new
glamor_egl_cleanup() to fix this.
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Signed-off-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Eric Anholt <eric@anholt.net>
commit 80b6652c9fb9cdff91e92fa16c07e2cc63b06f44
Author: Eric Anholt <eric@anholt.net>
Date: Tue Jul 7 17:21:55 2015 -0700
glamor: Drop a bunch of glamor_priv == NULL checks.
Now that it's always non-null when the pixmap is non-null, we don't
need so much of this. glamor_get_pixmap_private() itself still
accepts a NULL pixmap and returns NULL, because of glamor_render.c
Signed-off-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Michel Dänzer <michel.daenzer@amd.com>
Reviewed-by: Keith Packard <keithp@keithp.com>
commit a2a2f6e34bd49e7ae31779274d52e800595660bc
Author: Eric Anholt <eric@anholt.net>
Date: Tue Jun 30 16:20:18 2015 -0700
glamor: Ask the server to always allocate our private.
This avoids a lot of screwing around to attach our privates later. It
means that non-glamor pixmaps now gain 120 bytes of glamor privates on
64-bit (which has quite a bit of fixable bloat), and glamor pixmaps
take one less pointer of storage (not counting malloc overhead).
Note that privates start out zero-filled, which matches the callocs we
were doing when making our own privates, and in the case of an fb
pixmap that has a priv where it didn't before, the type ends up being
GLAMOR_MEMORY as we would want.
v2: Clarify that the GLAMOR_MEMORY enum must be 0 (as it was
previosuly), so that the new pixmap private behavior is as
expected. Suggested by keithp.
Signed-off-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Michel Dänzer <michel.daenzer@amd.com> (v1)
Reviewed-by: Keith Packard <keithp@keithp.com>
commit d278c30e68d79e86a3e2207b629d1e461856f907
Author: Eric Anholt <eric@anholt.net>
Date: Tue Jun 30 20:35:59 2015 -0700
glamor: Drop dead glamor_is_large_picture().
It died as of keithp's new glyphs code.
Signed-off-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Michel Dänzer <michel.daenzer@amd.com>
Reviewed-by: Keith Packard <keithp@keithp.com>
commit cd608a516d2c59ebfb95fadfecf68227888c0e4e
Author: Eric Anholt <eric@anholt.net>
Date: Tue Jun 30 20:25:06 2015 -0700
glamor: Reuse the glamor_is_memory helper.
Signed-off-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Michel Dänzer <michel.daenzer@amd.com>
Reviewed-by: Keith Packard <keithp@keithp.com>
commit 7b0f940625a0f6eee2ef91dfbfa4a206246940f5
Author: Adam Jackson <ajax@redhat.com>
Date: Fri Dec 19 13:46:37 2014 -0500
atom: make FreeAtom static
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit 2d2cf9e322a5ec3ead175edc136cdaeea00ec1b1
Author: Adam Jackson <ajax@redhat.com>
Date: Fri Dec 19 12:57:41 2014 -0500
atom: Bump initial table size
We're always creating ~230 atoms at startup, might as well tune it so we
don't hit the realloc path before Dispatch.
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit 995ff11422eb49160abfe276f471e412b16cab9d
Author: Adam Jackson <ajax@redhat.com>
Date: Tue May 19 11:31:25 2015 -0400
glx: Implement GLX_ARB_context_flush_control
This extension allows clients to opt out of the implicit glFlush on
context release, which is quite nice for performance for clients using
multiple contexts. The server doesn't really need to be aware of the
client's decision, at least for direct contexts, but it does need to not
reject the context attribute out of hand.
This patch won't do anything unless built against a Mesa that defines
the __DRI2_FLUSH_CONTROL extension (and a new enough glxext.h, but
that's been there since 10.3 at least).
Reviewed-by: James Jones <jajones@nvidia.com>
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit 2d7194334a9f84e417ec90e220b2fe476f704612
Author: Adam Jackson <ajax@redhat.com>
Date: Fri May 15 11:27:31 2015 -0400
glx/swrast: Do more GLX extension setup
This gets you nice things like core contexts when using Xvfb.
Also, no, MESA_copy_sub_buffer is not enabled automatically.
Reviewed-by: James Jones <jajones@nvidia.com>
Reviewed-by: Jon Turney <jon.turney@dronecode.org.uk>
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit cbd3cfbad3f07b20e90ea9498110f255813eb441
Author: Adam Jackson <ajax@redhat.com>
Date: Tue Jun 2 13:58:30 2015 -0400
dix: Restore PaintWindow screen hook
Removes the last cpp conditional on ROOTLESS from dix code.
Reviewed-by: Jasper St. Pierre <jstpierre@mecheye.net>
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit 74d64ceea02bffad1caf3d1a727edbd38d968059
Author: Adam Jackson <ajax@redhat.com>
Date: Tue Jun 2 13:58:30 2015 -0400
mi: Remove questionable optimization from the rootless path
This is effectively a revert of 7b506fdc840aebed6b5acb91437a2cb620b5bddc
except the coding style reindent broke that. The code makes no sense in
any case. drawable can never be null since it's the first member of
WindowRec, and we're never called with a null window. Neither can it be
an UNDRAWABLE_WINDOW since those are InputOnly windows; the rootless
code does not set the root window to either UNDRAWABLE or InputOnly, so.
Reviewed-by: Jasper St. Pierre <jstpierre@mecheye.net>
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit 315661a425018a546f7bcc18ad3e5f4578473ca6
Author: Adam Jackson <ajax@redhat.com>
Date: Tue Jun 2 13:58:30 2015 -0400
fb: Make rootless-agnostic
Reviewed-by: Jasper St. Pierre <jstpierre@mecheye.net>
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit 1594fb912996e9776d9e36383bd1d9f5dd2877eb
Author: Adam Jackson <ajax@redhat.com>
Date: Tue Jun 2 13:58:30 2015 -0400
rootless: Build unconditionally
It's not a lot of code, and if you're doing things to the core that
affect rootless you should be alerted early.
Reviewed-by: Jasper St. Pierre <jstpierre@mecheye.net>
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit bdc917a41691250701ccc9a0b087448b50892fa9
Author: Adam Jackson <ajax@redhat.com>
Date: Tue Jun 2 13:58:30 2015 -0400
rootless: Genericize the config header a bit
ROOTLESS_RESIZE_GRAVITY is an optimization, so let's default it to off
unless the backing window system is known to support it.
ROOTLESS_PROTECT_ALPHA looks like it has different values for xquartz
and win32, but hilariously rootlessGC.c merely checks if it is defined,
not what the value is. It's effectively the more conservative path
anyway, so let's just turn it on.
Reviewed-by: Jasper St. Pierre <jstpierre@mecheye.net>
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit 6f3332b9f411fd7ac9cab0085faa56f6c2ff3323
Author: Adam Jackson <ajax@redhat.com>
Date: Tue Jun 2 13:58:30 2015 -0400
dix: unifdef pWin->rootlessUnhittable
No reason to vary the dix ABI over this.
Reviewed-by: Jasper St. Pierre <jstpierre@mecheye.net>
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit 36fac0dd1a9a9cf41b631cf7e1ea015bcf920db7
Author: Adam Jackson <ajax@redhat.com>
Date: Fri May 23 13:23:20 2014 -0400
xfixes: Unexport xfixes.h
There's nothing a driver could want to use this for.
Acked-by: Chris Wilson <chris@chris-wilson.co.uk>
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit 4da66d9e0399141feffd5f002e4195a438fe5020
Author: Adam Jackson <ajax@redhat.com>
Date: Tue Jul 8 14:27:02 2014 -0400
vidmode: Hide implementation details
Also remove vidmodeproc.h from the SDK since no drivers are using it.
Acked-by: Chris Wilson <chris@chris-wilson.co.uk>
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit 49d7bae7f4c6a93f92df828440e3478513f930f4
Author: Adam Jackson <ajax@redhat.com>
Date: Tue Jul 8 14:18:07 2014 -0400
xge: Hide some implementation details
Acked-by: Chris Wilson <chris@chris-wilson.co.uk>
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit 2377690709de11087edc9d1116c9feaeb8f118ed
Author: Adam Jackson <ajax@redhat.com>
Date: Tue Jul 8 14:03:13 2014 -0400
dga: Hide a bunch of implementation details
Acked-by: Chris Wilson <chris@chris-wilson.co.uk>
Reviewed-by: Aaron Plattner <aplattner@nvidia.com>
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit b5fbe9c6327fac88c09afce598238a7534521b69
Author: Adam Jackson <ajax@redhat.com>
Date: Tue Jul 8 13:37:34 2014 -0400
xfree86: Hide some pre-randr mode validation details
Acked-by: Chris Wilson <chris@chris-wilson.co.uk>
Reviewed-by: Aaron Plattner <aplattner@nvidia.com>
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit 70b402be2626d4f4afb02b6f5baa543262548bd7
Author: Adam Jackson <ajax@redhat.com>
Date: Fri May 30 16:19:08 2014 -0400
render: Hide/unexport some implementation details
Acked-by: Chris Wilson <chris@chris-wilson.co.uk>
Reviewed-by: Aaron Plattner <aplattner@nvidia.com>
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit a1c80bb7d5871e1c5ee21fc650834858054103bf
Author: Adam Jackson <ajax@redhat.com>
Date: Fri May 30 15:49:38 2014 -0400
randr: Unexport some implementation details
Acked-by: Chris Wilson <chris@chris-wilson.co.uk>
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit b51f7f8582ab6c3cc9fa56c8d9721d0f240915e7
Author: Adam Jackson <ajax@redhat.com>
Date: Fri May 23 13:37:41 2014 -0400
dix: Unexport various implementation details
Acked-by: Chris Wilson <chris@chris-wilson.co.uk>
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit c4a0d6c9139d2c0107b80420cc2342614bbe95ef
Author: Adam Jackson <ajax@redhat.com>
Date: Wed Oct 22 10:47:03 2014 -0400
dri3: static cleanup
Also remove unused window private key.
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit a69e9027e167a83281b96e13f3a77100876b72ae
Author: Adam Jackson <ajax@redhat.com>
Date: Wed Oct 22 10:44:36 2014 -0400
dri3: Remove unbuilt dri3_event.c
The config notifies live in present, not dri3.
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit 91f0d71c18254746e1d519f0d19d11f756a9588c
Author: Adam Jackson <ajax@redhat.com>
Date: Wed Oct 22 10:38:11 2014 -0400
parser: static cleanup
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit c732bb2799ad7ff6b0cdd9c65487466e6a9b76e7
Author: Adam Jackson <ajax@redhat.com>
Date: Wed Oct 22 10:31:29 2014 -0400
present: static cleanup
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit 0db457b2b5b6e314e912efc62f158f8f0b8d48af
Author: Adam Jackson <ajax@redhat.com>
Date: Wed Jul 8 15:56:55 2015 -0400
dmx: Fix the build
Broken since:
commit 4fd81823fafcd103e8d890f4c0f7c2f90e822336
Author: Dave Airlie <airlied@gmail.com>
Date: Tue Jun 30 14:54:42 2015 +1000
prime: add rotation support for offloaded outputs (v2)
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit 90db5edf119187f8b1b9207c8c384d6cd7ef9edc
Author: Dave Airlie <airlied@gmail.com>
Date: Tue Jun 30 14:54:42 2015 +1000
prime: add rotation support for offloaded outputs (v2)
One of the lacking features with output offloading was
that screen rotation didn't work at all.
This patch makes 0/90/180/270 rotation work with USB output
and GPU outputs.
When it allocates the shared pixmap it allocates it rotated,
and any updates to the shared pixmap are done using a composite
path that does the rotation. The slave GPU then doesn't need
to know about the rotation and just displays the pixmap.
v2:
rewrite the sync dirty helper to use the dst pixmap, and
avoid any strange hobbits and rotations.
This breaks ABI in two places.
Signed-off-by: Dave Airlie <airlied@redhat.com>
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 991712f1e8deeb6289ee0abd9910e279d6396246
Merge: 0cd228073a 3c859112d3
Author: Keith Packard <keithp@keithp.com>
Date: Wed Jul 8 10:43:31 2015 -0700
Merge remote-tracking branch 'ofourdan/for-keith'
commit 0cd228073ad3b7eb72cef8b61128324895ee6cd4
Author: Jon TURNEY <jon.turney@dronecode.org.uk>
Date: Mon Jun 29 15:08:51 2015 +0100
hw/xwin: printf format fixes for Pixel type
Pixel is CARD32, so inside the server has type unsigned int (x86_64) or unsigned
long (x86)
Cast to unsigned int and use a %u format
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
commit e3cfeb949a9c9363beacdb00acdd9723ed54fac2
Author: Jon TURNEY <jon.turney@dronecode.org.uk>
Date: Fri Feb 6 20:22:11 2015 +0000
hw/xwin: printf format fixes for WPARAM and LPARAM types
Some Win32 API types are different fundamental types in the 32-bit and 64-bit
This problem is then further compounded by the fact that whilst both 32-bit
Cygwin and 32-bit MinGW use the ILP32 data model, 64-bit MinGW uses the LLP64
data model, but 64-bit Cygwin uses the LP64 data model.
This makes it impossible to write printf format specifiers which are correct for
all those targets, so we use some macros to provide the correct specifier for
the target.
LPARAM and WPARAM are integer types which can contain a pointer
LPARAM is long in ILP32 and long long in LLP64
WPARAM is unsigned int in ILP32 and unsigned long long in LLP64
Generally, these are just used to passs integer parameters, so for simplicity,
cast to int and use an int-compatible format
In the specific case of WM_CHANGECBCHAIN, they are used to pass HWND, so cast to
that type and print using an appropriate format.
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
commit 4f8661fac985306c56330cae69ffc19e5dd0af61
Author: Jon TURNEY <jon.turney@dronecode.org.uk>
Date: Fri Feb 6 19:19:41 2015 +0000
hw/xwin: printf format fixes for LONG type
Some Win32 API types are different fundamental types in the 32-bit and 64-bit
versions.
This problem is then further compounded by the fact that whilst both 32-bit
Cygwin and 32-bit MinGW use the ILP32 data model, 64-bit MinGW uses the LLP64
data model, but 64-bit Cygwin uses the LP64 data model.
This makes it impossible to write printf format specifiers which are correct for
all those targets
In the Win32 API, DWORD is an signed, 32-bit type. It is defined in terms of a
long, except in the LP64 data model, where it is an int.
It should always be safe to cast it to int and use %d.
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
commit aa83c61f510121da20b56e8f7de700193f7d16b5
Author: Jon TURNEY <jon.turney@dronecode.org.uk>
Date: Fri Feb 6 19:46:45 2015 +0000
hw/xwin: printf format fixes for DWORD type
Some Win32 API types are different fundamental types in the 32-bit and 64-bit
versions.
This problem is then further compounded by the fact that whilst both 32-bit
Cygwin and 32-bit MinGW use the ILP32 data model, 64-bit MinGW uses the LLP64
data model, but 64-bit Cygwin uses the LP64 data model.
This makes it impossible to write printf format specifiers which are correct for
all those targets
In the Win32 API, DWORD is an unsigned, 32-bit type. It is defined in terms of
an unsigned long, except in the LP64 data model, where it is an unsigned int.
It should always be safe to cast it to unsigned int and use %u or %x.
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
commit 487f2595c9dd9a5c3c600168a108963e87602561
Author: Jon TURNEY <jon.turney@dronecode.org.uk>
Date: Fri Feb 6 20:48:26 2015 +0000
hw/xwin: printf format fixes in xevents.c
Window and Atom types derive from XID, which is always unsigned long in client
code, so use %ld format specifier
XTextProperty.nitems is of type unsigned long, so use %lu format specifier
ulReturnBytesLeft is of type unsigned long, so use %lu format specifier
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
commit 98798fcf0d1dc66c539abb2ecec0acc676d0b574
Author: Jon TURNEY <jon.turney@dronecode.org.uk>
Date: Fri Feb 6 20:42:54 2015 +0000
hw/xwin: printf format fix in winProcessXEventsTimeout()
remainingTime is computed as a long int, so use %ld format specifier
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
commit 5b6f511c2fcad4edaccedbeb9842680cf3aeffb1
Author: Jon TURNEY <jon.turney@dronecode.org.uk>
Date: Fri Feb 6 20:40:46 2015 +0000
hw/xwin: printf format fix in winCreateDefColormap()
Use %lu for unsigned long
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
commit eb679671560b21206a47476dfbc23518d8d46588
Author: Jon TURNEY <jon.turney@dronecode.org.uk>
Date: Fri Feb 6 20:38:26 2015 +0000
hw/xwin: printf format fixes in winAllocatePrivates()
serverGeneration is of type unsigned long, so use %lu format specifier
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
commit 0d6c499b9976d305e13685eb79b4bb7cd4250f58
Author: Jon TURNEY <jon.turney@dronecode.org.uk>
Date: Fri Feb 6 20:27:11 2015 +0000
hw/xwin: printf format fixes in winConfigKeyboard()
struct winInfoRec.keyboard members are of type long, not type int
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
commit ba468e003e32c406f4885c8cb3deeb1c8175cd45
Author: Jon TURNEY <jon.turney@dronecode.org.uk>
Date: Mon Jun 29 14:25:49 2015 +0100
hw/xwin: printf format fixes for XID type
XID inside the server has type unsigned int (x86_64) or unsigned long (x86)
Follow the example of the rest of the server and cast to unsigned int and use
a %u or %x format.
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
commit dcb797b31f0affdc4b08b000dd92ec38fa261953
Author: Jon TURNEY <jon.turney@dronecode.org.uk>
Date: Thu Oct 2 14:28:46 2014 +0100
hw/xwin: printf format fixes for HWND type
HWND derives from HANDLE, a pointer type, so we should use the %p format
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
commit f1d14266672c8130e992dd9d0c08fd1cef0f08cb
Author: Jon TURNEY <jon.turney@dronecode.org.uk>
Date: Wed Oct 1 22:12:26 2014 +0100
hw/xwin: Ensure format warnings in winclipboard/
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
commit 38f340b13e693a0d456a9ab22a6474c8f55375fa
Author: Jon TURNEY <jon.turney@dronecode.org.uk>
Date: Mon Jun 29 15:30:36 2015 +0100
hw/xwin: Remove GetTickCount() from various pieces of debugging output
The use of %d format for the DWORD return value of GetTickCount() isn't
portable, but it doesn't seem to be worth fixing it when this information isn't
very useful (and is redundant to the timestamping of log messages we now have)
Instead just remove these uses of GetTickCount()
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
commit 732e3b9c08532f40656010eac9d128601cc88c3f
Author: Michel Dänzer <michel.daenzer@amd.com>
Date: Mon Jul 6 18:45:51 2015 -0700
Instead of one glTexSubImage2D call for each glyph.
This significantly reduces the amount of time it takes for xterm to start
up on a fresh X server with the radeonsi driver.
v2: Use GLYPHWIDTHBYTESPADDED instead of hardcoding 4 bytes glyph
alignment (Keith Packard)
Reviewed-by: Keith Packard <keithp@keithp.com>
Signed-off-by: Michel Dänzer <michel.daenzer@amd.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit ac94cdb9df94dd26688de6d3d9143ac48f7b3c7b
Author: Julien Cristau <jcristau@debian.org>
Date: Thu Jul 2 20:16:21 2015 +0200
mi: fix typo in warning about overflowing queue
Debian bug#726041
Reported-by: Vincent Hobeïka <vincent.hobeika@gmail.com>
Signed-off-by: Julien Cristau <jcristau@debian.org>
Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit e3624aa5fde658c44724a7ea21f5df9e3c586923
Author: Dave Airlie <airlied@gmail.com>
Date: Wed Jul 1 20:41:15 2015 +1000
xserver: fix build with glamor disabled.
This fixes modesetting when glamor is disabled.
Signed-off-by: Dave Airlie <airlied@redhat.com>
Signed-off-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Adam Jackson <ajax@redhat.com>
commit 3703c88ac18063a35fd8c0fc52fee52d8c669638
Author: Eric Anholt <eric@anholt.net>
Date: Wed Jul 1 16:23:45 2015 -0700
glamor: Use GL_ARB_debug_output to log GL errors.
This should help people debugging when glamor does something stupid on
their driver.
Signed-off-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Michel Dänzer <michel.daenzer@amd.com>
commit f4dfd282d311e5f23631d33e0251bad1854b1ab9
Author: Eric Anholt <eric@anholt.net>
Date: Wed Jul 1 14:46:55 2015 -0700
glamor: Add an assert to catch the previous bug.
Signed-off-by: Eric Anholt <eric@anholt.net>
Acked-by: Michel Dänzer <michel.daenzer@amd.com>
commit c268d2fc33318f9ea0019053fa5de18f193e704e
Author: Keith Packard <keithp@keithp.com>
Date: Thu Jul 2 17:06:27 2015 -0600
glamor: Fix bad rendering of glyphs after an a1 glyph upload. (v3)
Fixes regressions since Eric's "don't make an FBO for the glyph atlas"
change. The a1 upload was a fallback, as expected. However, fallback
reads use glReadPixels() because there's no glGetTexSubImage2D() to
match glTexSubImage2D(). We were just binding the 0 FBO value, so the
glReadPixels() would throw a GL error instead of getting any data.
After the fallback was done we'd write back the undefined data to the
atlas, blowing away the entire rest of the atlas because we didn't
specify any bounds on our prepare.
To fix the fallbacks to actually work, we'd need a prepare path that
allocates some memory memory do a full glGetTexImage() into, then
memcpy out of that. Instead, just dodge the general fallback by
implementing the specific upload we need to do here, which should also
be *much* faster at uploading a1 glyphs since it's not
readpixels/texsubimaging back and forth.
v3: Use CopyPlane to a temp pixmap for the upload
v4: Rewrite anholt's commit message to be from keithp's perspective
(changes by anholt)
Signed-off-by: Keith Packard <keithp@keithp.com>
Signed-off-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Eric Anholt <eric@anholt.net>
commit 5c440817f7c128c9a9d78ef9672f22641dbeeaa1
Author: Eric Anholt <eric@anholt.net>
Date: Tue Jun 30 15:01:53 2015 -0700
glamor: Use ARRAY_SIZE in a couple more places for consistency.
Signed-off-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
commit 7b6edb52435f474c43130f6ac4c6b2d2b28814f5
Author: Eric Anholt <eric@anholt.net>
Date: Tue Jun 30 14:59:55 2015 -0700
glamor: Mark a bunch of single-file data static.
This gives the compiler a chance to optimize when the data is never
changed -- for example, with pict_format_combine_tab, the compiler
ends up inlining the 24 bytes of data into just 10 more bytes of code.
Signed-off-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
commit 3fe6731b17ae953d49db4c1bf95e0022244513e1
Author: Eric Anholt <eric@anholt.net>
Date: Tue Jun 30 14:50:43 2015 -0700
glamor: Make a bunch of single-file glamor functions static.
Signed-off-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
commit a8e84e8c3b2047775fe2da9371329290eee23655
Author: Eric Anholt <eric@anholt.net>
Date: Tue Jun 30 14:45:43 2015 -0700
glamor: Drop dead glamor_es2_pixmap_read_prepare().
It's been unused since I killed glamor_download_pixmap_to_cpu().
Signed-off-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
commit cad56dc62dbf2ba097cc0fa61217897ba40d8d66
Author: Eric Anholt <eric@anholt.net>
Date: Tue Jun 30 14:41:27 2015 -0700
glamor: Restore the hook to glamor_composite_rectangles().
It was apparently accidentally dropped in keithp's removal of _nf
functions in 90d326fcc687e6d6d4b308f6272ededcf8145a17.
Signed-off-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
commit 7adb38a0d18de2e8b0762d9dd82b851883ad75fe
Author: Eric Anholt <eric@anholt.net>
Date: Tue Jun 30 14:25:16 2015 -0700
glamor: Fix up some weird formatting in _glamor_create_fbo_array().
Signed-off-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
commit 835067a4095e5e48703aa6561fea3ee95923e832
Author: Eric Anholt <eric@anholt.net>
Date: Tue Jun 30 14:14:50 2015 -0700
glamor: Drop a redundant check.
Above, we've already checked for ->fbo && ->fbo->fb and returned.
Signed-off-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
commit 47b868492c7ff0909ff71e3ee1aaa79daaade513
Author: Eric Anholt <eric@anholt.net>
Date: Thu Feb 5 12:34:41 2015 -0800
glamor: Simplify some temp pixmap extents calculations.
Signed-off-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
commit bfb6a290afabe492d93ec8024fac6b28f672d7d0
Author: Eric Anholt <eric@anholt.net>
Date: Thu Feb 5 11:46:32 2015 -0800
glamor: Drop a dead flag to glamor_create_fbo_array().
v2: Don't forget to set priv->block_w/block_h like the wrapper used
to.
Signed-off-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org> (v1)
commit fe3fedf280596c2c2e69dddd30bb9ff17dbe611e
Author: Eric Anholt <eric@anholt.net>
Date: Thu Feb 5 11:33:54 2015 -0800
glamor: Drop dead GLAMOR_FBO_DOWNLOADED flag.
Signed-off-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
commit 447274094147f31025700a2ff6f94e3b0c96fa17
Author: Eric Anholt <eric@anholt.net>
Date: Thu Feb 5 11:20:50 2015 -0800
glamor: Move doxygen for private structs into the structs.
This should hopefully keep the comments more up to date with the
structure comments. While I'm here, I've reworded a few of them to be
more accurate, and dropped a bunch of stale comments.
Signed-off-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
commit 33d6384b29db1b28a9d1a035dc7cc82da8f33c99
Author: Eric Anholt <eric@anholt.net>
Date: Thu Feb 5 11:18:24 2015 -0800
glamor: Drop the dead "PBO" field in an FBO cache struct.
PBOs are only used at the whole pixmap level.
Signed-off-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
commit 1734aa285663d83070e6313bb976f976aa2bea4c
Author: Eric Anholt <eric@anholt.net>
Date: Wed Feb 4 18:07:06 2015 -0800
glamor: Remove dead gl_tex flag in the fbo struct.
This used to be used in the old copy_area path.
Signed-off-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
commit 82d23fc7290a2986efbc2982eeaa0de0ad5ad0d1
Author: Eric Anholt <eric@anholt.net>
Date: Wed Feb 4 18:02:34 2015 -0800
glamor: Propagate the fact that pbo_valid is never set.
The code to set it was deleted in keithp's big rewrite.
Signed-off-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
commit 0e3f1252dacdc3194a99a2d090b5c13f070f8799
Author: Eric Anholt <eric@anholt.net>
Date: Fri Jun 19 18:40:47 2015 -0700
glamor: Avoid using GL_QUADS on VC4.
Improves text rendering from about 284k glyphs per second to 320k
glyphs per second. There's no GL extension for probing this, because
of the philosophy of "Don't expose whether things are really in
hardware or not."
Signed-off-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Dave Airlie <airlied@redhat.com>
commit f47e3f539568d19e22d10d7dd4ec09c7d570e716
Author: Eric Anholt <eric@anholt.net>
Date: Fri Jun 19 18:36:28 2015 -0700
glamor: Use proper Bools for some boolean values.
Signed-off-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Dave Airlie <airlied@redhat.com>
commit 4001a7465e6fb27fc82fa20ea5a65283d33a5e2e
Author: Eric Anholt <eric@anholt.net>
Date: Fri Jun 19 16:56:35 2015 -0700
glamor: Provide a fallback path for using an index buffer to do quads.
Improves x11perf -aa10text performance by 1377.59% +/- 23.8198% (n=93)
on Intel with GLES2.
Signed-off-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Dave Airlie <airlied@redhat.com>
commit e8fc929d4a140666420a64d592371f5d3eb10cca
Author: Eric Anholt <eric@anholt.net>
Date: Fri Jun 19 17:26:46 2015 -0700
glamor: Use GL_EXT_map_buffer_range if present.
We were only looking for the desktop GL version of the extension, so
GLES2 missed out.
Signed-off-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Dave Airlie <airlied@redhat.com>
commit 4fc4cde0ce7d1a35bab3b3bbd787d688cd415d78
Author: Eric Anholt <eric@anholt.net>
Date: Fri Jun 19 16:34:55 2015 -0700
glamor: Use the normal GL_QUADS drawing helper in the render code.
We use this for all of our other performance-sensitive rendering, too.
Signed-off-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Dave Airlie <airlied@redhat.com>
commit c5e6fffbdd88ad714454b9de1ac1c3eb9f6bf196
Author: Eric Anholt <eric@anholt.net>
Date: Fri Jun 19 17:05:28 2015 -0700
glamor: Drop CloseScreen-time GL resource cleanup code.
These will all be freed when the context is freed.
Signed-off-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Dave Airlie <airlied@redhat.com>
commit 3d6dcad00d67bff407385ad37c7efde7b73ba719
Author: Eric Anholt <eric@anholt.net>
Date: Fri Jun 19 19:04:16 2015 -0700
glamor: Fix text rendering on GLES2.
The GL_QUADS helper takes a number of quads, not a number of vertices.
Signed-off-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Dave Airlie <airlied@redhat.com>
commit b4061cf5f76241157b2dc81dec053012075311c0
Author: Peter Harris <pharris@opentext.com>
Date: Tue May 12 14:19:15 2015 -0400
Fix border tile origin when background is ParentRelative
According to
http://www.x.org/releases/X11R7.7/doc/xproto/x11protocol.html#requests:CreateWindow
"The border tile origin is always the same as the background tile
origin."
ChangeWindowAttributes goes to some effort to make sure it repaints
the border tile whenever the background origin may have changed, but
miPaintWindow was ignoring the background origin.
Found by xts XChangeWindowAttributes-3
Signed-off-by: Peter Harris <pharris@opentext.com>
Reviewed-by: Keith Packard <keithp@keithp.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 8a8d51358cea782147bb9b5b2e0902b1e47fcf4a
Merge: b22534d8e6 13c7d53df8
Author: Keith Packard <keithp@keithp.com>
Date: Mon Jun 29 21:04:53 2015 -0700
Merge remote-tracking branch 'airlied/for-keithp'
commit b22534d8e653575196180970292eaade33c090a8
Merge: 0a625adeec 780a69aff0
Author: Keith Packard <keithp@keithp.com>
Date: Mon Jun 29 21:04:11 2015 -0700
Merge remote-tracking branch 'jwrdecoede/for-keith'
commit 0a625adeec465d6c7dcdb8622c53157b4e932bb0
Merge: 84128c10bb 790311cec3
Author: Keith Packard <keithp@keithp.com>
Date: Mon Jun 29 21:01:34 2015 -0700
Merge remote-tracking branch 'anholt/glamor-next'
commit 84128c10bb6d34f78f7a4148b3c640748efe58e1
Merge: 9003a3e5c5 8c86dd5160
Author: Keith Packard <keithp@keithp.com>
Date: Mon Jun 29 20:59:31 2015 -0700
Merge remote-tracking branch 'whot/for-keith'
commit 13c7d53df8dac45ea2a685826cd45a39bcb51657
Author: Kenneth Graunke <kenneth@whitecape.org>
Date: Mon Jan 26 21:29:23 2015 -0800
modesetting: Implement page flipping support for Present.
Based on code by Keith Packard, Eric Anholt, and Jason Ekstrand.
v2:
- Fix double free and flip_count underrun (caught by Mario Kleiner).
- Don't leak flip_vblank_event on the error_out path (Mario).
- Use the updated ms_flush_drm_events API (Mario, Ken).
v3: Hack around DPMS shenanigans. If all monitors are DPMS off, then
there is no active framebuffer; attempting to pageflip will hit the
error_undo paths, causing us to drmModeRmFB with no framebuffer,
which confuses the kernel into doing full modesets and generally
breaks things. To avoid this, make ms_present_check_flip check that
some CRTCs are enabled and DPMS on. This is an ugly hack that would
get better with atomic modesetting, or some core Present work.
v4:
- Don't do pageflipping if CRTCs are rotated (caught by Jason Ekstrand).
- Make pageflipping optional (Option "PageFlip" in xorg.conf.d), but
enabled by default.
v5: Initialize num_crtcs_on to 0 (caught by Michel Dänzer).
[airlied: took over]
v6: merge async flip support from Mario Kleiner
free sequence after failed vblank queue
handle unflip while DPMS'ed off (Michel)
move flip tracking into its own structure, and
fix up reference counting issues, and add comments.
Signed-off-by: Dave Airlie <airlied@redhat.com>
Acked-by: Eric Anholt <eric@anholt.net>
Signed-off-by: Kenneth Graunke <kenneth@whitecape.org>
commit 4342369e843ca2c6ca0a8c42475893cffb077a54
Author: Dave Airlie <airlied@redhat.com>
Date: Fri Jun 26 09:20:13 2015 +1000
modesetting: don't try and load dri2
Since we are shipped with the server and the server has it built-in,
don't bother trying to load it.
Don't remove or invert the if statement on purpose as a later
patch adds stuff in here.
Reviewed-by: Michel Dänzer <michel.daenzer@amd.com>
Reviewed-by: Eric Anholt <eric@anholt.net>
Signed-off-by: Dave Airlie <airlied@redhat.com>
commit edec6394a47be590f3133f6a90186356afd00829
Author: Dave Airlie <airlied@redhat.com>
Date: Fri Jun 26 09:19:37 2015 +1000
modesetting: drop unused struct in vblank.c
this isn't used anywhere here.
Reviewed-by: Eric Anholt <eric@anholt.net>
Signed-off-by: Dave Airlie <airlied@redhat.com>
commit bf262b43007050180d336defd48251de80894801
Author: Kenneth Graunke <kenneth@whitecape.org>
Date: Mon Jan 26 21:25:58 2015 -0800
modesetting: Implement an ms_drm_abort_seq() function.
This is a specialization of ms_drm_abort that matches based on the drm
event queue's sequence number.
Based on code by Keith Packard.
Reviewed-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Dave Airlie <airlied@redhat.com>
Signed-off-by: Kenneth Graunke <kenneth@whitecape.org>
commit b8ccc5d36b0436bac57f07969ff3eb8d479a8511
Author: Jason Ekstrand <jason.ekstrand@intel.com>
Date: Tue Jan 13 17:00:28 2015 -0800
glamor: Add a new glamor_gbm_bo_from_pixmap() function.
v2: Rebase on commit e0788a03144 (drop "base").
Reviewed-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Dave Airlie <airlied@redhat.com>
commit f2171d0a20d3b3858a282c51c1561432de1b29ef
Author: Kenneth Graunke <kenneth@whitecape.org>
Date: Tue Jan 6 21:02:44 2015 -0800
modesetting: Make ms_crtc_on non-static.
I want to use this in present.c.
Reviewed-by: Dave Airlie <airlied@redhat.com>
Reviewed-by: Eric Anholt <eric@anholt.net>
Signed-off-by: Kenneth Graunke <kenneth@whitecape.org>
commit f6853baebaec6a68078fa7f90486e9547d59dcbd
Author: Kenneth Graunke <kenneth@whitecape.org>
Date: Sun Feb 8 17:21:58 2015 -0800
modesetting: Improve the ms_flush_drm_events() API.
Previously, ms_flush_drm_events() returned a boolean value, and it was
very easy to interpret the meaning incorrectly. Now, we return an
integer value.
The possible outcomes of this call are:
- poll() raised an error (formerly TRUE, now -1 - poll's return value)
- poll() said there are no events (formerly TRUE, now 0).
- drmHandleEvent() raised an error (formerly FALSE, now the negative
value returned by drmHandleEvent).
- An event was successfully handled (formerly TRUE, now 1).
The nice part is that this allows you to distinguish errors (< 0),
nothing to do (= 0), and success (1). We no longer conflate errors
with success.
v2: Change ms_present_queue_vblank to < 0 instead of <= 0, fixing an
unintentional behavior change. libdrm may return EBUSY if it's
received EINTR for more than a second straight; just keep retrying
in that case. Suggested by Jasper St. Pierre.
Reviewed-by: Dave Airlie <airlied@redhat.com>
Signed-off-by: Kenneth Graunke <kenneth@whitecape.org>
commit 7328fb3f2b468048faf4ed4c29db720b5bf00b05
Author: Dave Airlie <airlied@gmail.com>
Date: Wed Jun 10 13:41:02 2015 +1000
modesetting: reverse prime support (v1.1)
This adds support for reverse prime to the modesetting driver.
Reverse prime is where we have two GPUs in the display chain,
but the second GPU can't scanout from the shared pixmap, so needs
an extra copy to the on screen pixmap.
This allows modesetting to support this scenario while still
supporting the USB offload one.
v1.1:
fix comment + ret = bits (Eric)
Reviewed-by: Eric Anholt <eric@anholt.net>
Signed-off-by: Dave Airlie <airlied@redhat.com>
commit 1f10ee221edb87561900f5d2b1336db1c4a9f05c
Author: Dave Airlie <airlied@gmail.com>
Date: Wed Jun 10 13:38:39 2015 +1000
glamor: egl: add function to back a pixmap with a dma-buf. (v1.1)
Rather than create the pixmap, this uses the file descriptor
to change an existing pixmaps backing store.
This is required for reverse prime slaves, where we create
the slave pixmap, then set the backing store.
v1.1: use local pScreen (Eric)
Reviewed-by: Eric Anholt <eric@annholt.net>
Signed-off-by: Dave Airlie <airlied@redhat.com>
commit a79fbfd707e1d745b670def08287241c87e11c28
Author: Dave Airlie <airlied@gmail.com>
Date: Tue Jun 9 17:15:44 2015 +1000
modesetting: add output master support
This allows a glamor enabled master device to have
slave USB devices attached.
Tested with modesetting on SNB + USB.
It relies on the previous patch to export linear
buffers from glamor.
Acked-by: Eric Anholt <eric@anholt.net>
Signed-off-by: Dave Airlie <airlied@redhat.com>
commit ea0e4d752b778c1f2132f8d29542f7dabc296415
Author: Dave Airlie <airlied@gmail.com>
Date: Wed Jun 10 14:46:22 2015 +1000
glamor: add support for allocating linear buffers (v2)
We need this for doing USB offload scenarios using glamor
and modesetting driver.
unfortunately only gbm in mesa 10.6 has support for the
linear API.
v1.1: fix bad define
v2: update the configure.ac test as per amdgpu. (Michel)
set linear bos to external to avoid cache. (Eric)
Reviewed-by: Eric Anholt <eric@anholt.net>
Signed-off-by: Dave Airlie <airlied@redhat.com>
commit 5c555605386c76be2f02193d434a4617218b67be
Author: Dave Airlie <airlied@redhat.com>
Date: Thu Jun 11 14:29:48 2015 +1000
xf86: restrict when we auto add devices as gpu devices.
Michel pointed out I broke Zaphod with the initial auto add
gpu devices change,
Fix this, by only auto adding GPU devices if we are screen 0
and there are no other screens in the layout. Anyone who
wants to assign GPU devices can specify it in the xorg.conf
for this use case.
Signed-off-by: Dave Airlie <airlied@redhat.com>
Tested-by: Michel Dänzer <michel.daenzer@amd.com>
commit 5064ee276fe0f6cebc33ea08e57f1de91f092d88
Author: Dave Airlie <airlied@redhat.com>
Date: Fri Jun 12 15:13:47 2015 +1000
xf86Rotate: remove unused macros.
These macros aren't used anywhere.
v1.1: drop comment (Aaron)
Signed-off-by: Dave Airlie <airlied@redhat.com>
commit 8218dadd30eb0c87efbac6db5d8e3862a236b6a4
Author: Dave Airlie <airlied@redhat.com>
Date: Tue Jun 9 15:30:22 2015 +1000
cursor: drop ARGB_CURSOR
I doubt anyone builds with this turned off or has done for a long
time.
It helps my eyes bleed slightly less when reading the code, I've left
the define in place as some drivers use it.
Reviewed-by: Aaron Plattner <aplattner@nvidia.com>
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
commit 3c859112d38860764bcdb205ab461d00db502f45
Author: Chris Wilson <chris@chris-wilson.co.uk>
Date: Tue Jun 23 15:05:31 2015 +0200
xwayland: keep temp files out of the client mask
Xwayland opens anonymous files for its sharing buffers, move these
file descriptors out of the range of the client select mask to avoid
reaching the maximum number of clients prematurely.
https://bugs.freedesktop.org/show_bug.cgi?id=91072
Tested-by: Olivier Fourdan <fourdan@gmail.com>
Reviewed-by: Michel Dänzer <michel.daenzer@amd.com>
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
commit 8c86dd51606486f4794c503b9c05c6875bdc693a
Author: Laércio de Sousa <laerciosousa@sme-mogidascruzes.sp.gov.br>
Date: Tue Jun 23 08:41:57 2015 -0300
configure.ac: fix code misplacing for KDRIVE_{KBD, MOUSE, EVDEV} auto-detection
KDrive input drivers "kbd", "mouse", and "evdev" should be automatically built
for linux systems. However, due to a code misplacing in configure.ac, the
auto-detection test is being performed AFTER the corresponding AC_DEFINEs' calls,
so that the drivers are NOT being built, regardless the test result.
This bug should be affecting previous xorg-server releases. Please consider
backporting this patch to all maintained ones!
Signed-off-by: Laércio de Sousa <laerciosousa@sme-mogidascruzes.sp.gov.br>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 780a69aff0ff57ef813179a2f09556eaf488cdfc
Author: David Herrmann <dh.herrmann@gmail.com>
Date: Mon Jun 22 21:13:05 2015 +0200
systemd-logind: do not rely on directed signals
Right now, Xorg does not install DBus matches for "PauseDevice" /
"ResumeDevice". Therefore, it should usually not receive those DBus
signals from logind. It is just a coincidence that systemd-logind sends
those signals in a directed manner right now. Therefore, dbus-daemon
bypasses the broadcast matches.
However, this is not ABI and Xorg should not rely on this. systemd-logind
is free to send those signals as broadcasts, in which case Xorg will
freeze the VT. Fix this by always installing those matches.
Cc: Hans de Goede <hdegoede@redhat.com>
Cc: Keith Packard <keithp@keithp.com>
Reported-by: Jan Alexander Steffens <jan.steffens@gmail.com>
Signed-off-by: David Herrmann <dh.herrmann@gmail.com>
Reviewed-by: Hans de Goede <hdegoede@redhat.com>
Tested-by: Hans de Goede <hdegoede@redhat.com>
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
commit d3352d098724e96be8fb8538a3640ce271d8f8b9
Author: Hans de Goede <hdegoede@redhat.com>
Date: Mon Jun 22 13:51:21 2015 +0200
Xorg.wrap.man: Fix spelling mistake in Xorg.wrap.1
This commit fixes a small mistake in Xorg.wrap.1 .
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
commit 790311cec30ac3d35e580b9f1266236f558033d4
Author: Eric Anholt <eric@anholt.net>
Date: Sun May 31 16:08:10 2015 -0700
glamor: Don't try to disable attrib divisors without the extension.
Fixes epoxy assertion failures on vc4.
Signed-off-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Keith Packard <keithp@keithp.com>
commit 9c679d06055cc62aa9209318705e87dc33fba4c8
Author: Eric Anholt <eric@anholt.net>
Date: Sun May 31 16:07:01 2015 -0700
glamor: Skip actual FBO setup in our glyph atlas.
VC4 (and many GLES2 renderers) can't render to GL_ALPHA, so our pixmap
would end up as GLAMOR_MEMORY and our dereference of the FBO would
setfault. Instead, tell the pixmap creation that we don't need an FBO
at all. Our glyph upload path was already glTexImage for non-a1, and
a more general software fallback for a1 (since the glyph is also in
system memory).
Signed-off-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Keith Packard <keithp@keithp.com>
commit 077bb1bdea0fa9af846c02896df680293cf9e25c
Author: Eric Anholt <eric@anholt.net>
Date: Sun May 31 15:46:55 2015 -0700
glamor: Clean up some declarations in glyph rendering.
Signed-off-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Keith Packard <keithp@keithp.com>
commit bf7a3bcb00d0dce22ff3fe42fe6236beeab4403b
Author: Eric Anholt <eric@anholt.net>
Date: Sun May 31 15:28:39 2015 -0700
glamor: Actually allow glyphs of dimension 65 to 128 in the cache.
The cache was trying to allow glyph_max_dim in, but since we were
putting over 64x64 into HW memory, it would end up in the
single-glyph-per-render bail_one path.
Signed-off-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Keith Packard <keithp@keithp.com>
commit f4c3cac010cff0980905eeedd8e8d7baf0aff91b
Author: Alexander Volkov <a.volkov@rusbitech.ru>
Date: Wed Jun 17 12:41:35 2015 +0300
Xi: call UpdateDeviceState() even when the client is missing
The client window can be closed in the middle of a touch sequence,
e.g. Qt 4 closes popup windows on MousePress and Qt 5.5 will do it
on TouchBegin. In this case the state of mouse buttons will not be
updated on TouchEnd because ProcessTouchEvent() calls UpdateDeviceState()
only when the event has been sent to the client. It results in a
stuck left mouse button.
This patch leads to calling UpdateDeviceState() in case the client
can't be found.
Signed-off-by: Alexander Volkov <a.volkov@rusbitech.ru>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 9003a3e5c55903ce4e371b2d5cb5030b5f97ae0e
Author: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
Date: Tue Jun 9 23:41:12 2015 -0700
XQuartz: Silence -Wformat-security for NSRunAlertPanel
Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
commit 3a6fa115759c787ec34483437021ad1e55c52423
Author: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
Date: Tue Jun 9 23:34:50 2015 -0700
XQuartz: Silence -Wunused-function
quartzKeyboard.c:741:1: warning: unused function 'macroman2ucs' [-Wunused-function,Unused Entity Issue]
macroman2ucs(unsigned char c)
^
1 warning generated.
Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
commit 9fe7f5ccada37e2d2a2fa92064b92a0334a3fcdd
Author: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
Date: Tue Jun 9 23:30:50 2015 -0700
XQuartz: Silence -Wunused-variable
X11Controller.m:939:9: warning: unused variable 'remain' [-Wunused-variable,Unused Entity Issue]
int remain;
^
Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
commit 0b9c32489131a5723bd78decf5d2557b94207cf4
Author: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
Date: Tue Jun 9 23:29:40 2015 -0700
XQuartz: Silence -Wpointer-bool-conversion
X11Controller.m:417:17: error: address of function 'asl_log_descriptor' will always evaluate to 'true'
[-Werror,-Wpointer-bool-conversion,Value Conversion Issue]
if (asl_log_descriptor) {
~~ ^~~~~~~~~~~~~~~~~~
X11Controller.m:417:17: note: prefix with the address-of operator to silence this warning [Semantic Issue]
if (asl_log_descriptor) {
^
&
Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
commit 77611066397747411f348e4a77871da5cff3b71e
Author: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
Date: Sun Jun 1 04:29:19 2014 -0700
XQuartz: GLX: Use __glXEnableExtension to build extensions list
Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
commit 990cf5b2828f73dc7a07f1e38f608af39acfd81d
Author: Andrew Eikum <aeikum@codeweavers.com>
Date: Thu Jun 4 13:24:53 2015 -0500
dix: Send KeyPress and KeyRelease events to the XACE_KEY_AVAIL hook
While it's documented in the XACE spec, the XACE_KEY_AVAIL hook is
currently never actually invoked by the xserver.
This hook was added in 13c6713c82 (25 Aug 2006), but as the keyboard
processing was moved into XKB, the hook was forgotten and silently
dropped. The code calling this hook was removed by 7af53799c (4 Jan
2009), but it was probably already unused before that.
This patch re-adds support for this hook. The "count" hook parameter is
unused.
Signed-off-by: Andrew Eikum <aeikum@codeweavers.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 5dc2a9aae46352f1f35d3ba122da04727789a15d
Author: Andrew Eikum <aeikum@codeweavers.com>
Date: Thu Jun 4 13:23:19 2015 -0500
xace: Add XaceHookIsSet helper function
Signed-off-by: Andrew Eikum <aeikum@codeweavers.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit c88a325899381d1133e63e6c33c29db079e20a87
Author: Hans de Goede <hdegoede@redhat.com>
Date: Wed Jan 21 10:13:20 2015 +0100
systemd-logind: Only use systemd-logind integration together with keeptty
systemd-logind integration does not work when starting X on a new tty, as
that detaches X from the current session and after hat systemd-logind revokes
all rights any already open fds and refuses to open new fds for X.
This means that currently e.g. "startx -- vt7" breaks, and breaks badly,
requiring ssh access to the system to kill X.
The fix for this is easy, we must not use systemd-logind integration when
not using KeepTty, or iow we may only use systemd-logind integration together
with KeepTty.
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Tested-by: Aaron Plattner <aplattner@nvidia.com>
commit 81bcada14e339fe2a2fb3f3a040566d94dc20bad
Author: Hans de Goede <hdegoede@redhat.com>
Date: Wed May 13 13:17:09 2015 +0200
linux: Add a may_fail paramter to linux_parse_vt_settings
linux_parse_vt_settings() was split out of xf86OpenConsole so that it can
be called earlier during systemd-logind init, but it is possible to run
the xserver in such a way that xf86OpenConsole() is never used.
The FatalError calls in linux_parse_vt_settings() may stop the Xorg xserver
from working when e.g. no /dev/tty0 is present in such a setup.
This commit adds a may_fail parameter to linux_parse_vt_settings() which
can be used to make linux_parse_vt_settings() fail silenty with an error
return in this case, rather then calling FatalError().
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 1dba5a0b194653b0effb01a918bd7338b0c6bcb9
Author: Hans de Goede <hdegoede@redhat.com>
Date: Wed Jan 21 09:31:39 2015 +0100
linux: Add linux_parse_vt_settings and linux_get_keeptty helpers
systemd-logind integration does not work when starting X on a new tty, as
that detaches X from the current session and after hat systemd-logind revokes
all rights on any already open fds and refuses to open new fds for X.
This means that currently e.g. "startx -- vt7" breaks, and breaks badly,
requiring ssh access to the system to kill X.
The fix for this is easy, we must not use systemd-logind integration when
not using KeepTty, or iow we may only use systemd-logind integration together
with KeepTty.
But the final KeepTty value is not known until the code to chose which vtno to
run on has been called, which currently happens after intializing
systemd-logind.
This commit is step 1 in fixing the "startx -- vt7" breakage, it factors out
the linux xf86OpenConsole bits which set xf86Info.vtno and keepTty so that
these can be called earlier. Calling this earlier is safe as this code has
no side effects other than setting xf86Info.vtno and keepTty.
Note this basically only moves a large chunk of xf86OpenConsole() into
linux_parse_vt_settings() without changing a single line of it, this is
hard to see in the diff because the identation level has changed.
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
commit fa12f2c150b2f50de9dac4a2b09265f13af353af
Author: Dave Airlie <airlied@redhat.com>
Date: Thu May 28 16:21:37 2015 +1000
glamor: don't do render ops with matching source/dest (v3)
XRender defines this, GL really doesn't like it.
kwin 4.x and qt 4.x seem to make this happen for the
gradient in the titlebar, and on radeonsi/r600 hw
this draws all kinds of wrong.
v2: bump this up a level, and check it earlier.
(I assume the XXXX was for this case.)
v3: add same code to largepixmap paths (Keith)
Reviewed-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Jasper St. Pierre <jstpierre@mecheye.net>
Signed-off-by: Dave Airlie <airlied@redhat.com>
commit cbb7eb73b5399e31a7afb800363504d539df0ecf
Author: Rui Matos <tiagomatos@gmail.com>
Date: Wed May 27 12:08:45 2015 +0200
xwayland: Throttle our cursor surface updates with a frame callback
In some extreme cases with animated cursors at a high frame rate we
could end up filling the wl_display outgoing buffer and end up with
wl_display_flush() failing.
In any case, using the frame callback to throttle ourselves is the
right thing to do.
Signed-off-by: Rui Matos <tiagomatos@gmail.com>
Reviewed-by: Daniel Stone <daniels@collabora.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 806470b9f623089dc81b985f250f0c3a4e8edbe8
Author: Chris Wilson <chris@chris-wilson.co.uk>
Date: Fri Feb 6 08:25:42 2015 +0000
present: Copy unflip contents back to the Screen Pixmap
As we unflip after the flip Window no longer passes the pixel ownership
test for the full Screen Pixmap, we can no longer utilize that Window to
copy the contents back to the backing pixmap. To first flip means that
the Window was originally backed by the Screen Pixmap and wholly covered
the Pixmap, thus we need to copy the last frame contents to the Screen
Pixmap when the flip chain is complete.
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Reviewed-and-Tested-by: Michel Dänzer <michel.daenzer@amd.com>
commit baa50f60acd9e9f4293107435645ab072b6110e1
Author: Vicente Olivert Riera <Vincent.Riera@imgtec.com>
Date: Mon Jan 12 17:10:02 2015 +0000
backtrace.c: Fix word cast to a pointer
backtrace.c uses a word size provided by libunwind. In some
architectures like MIPS, libunwind makes that word size 64-bit for all
variants of the architecture.
In the lines #90 and #98, backtrace.c tries to do a cast to a pointer,
which fails in all MIPS variants with 32-bit pointers, like MIPS32 or
MIPS64 n32, because it's trying to do a cast from a 64-bit wide variable
to a 32-bit pointer:
Making all in os
make[2]: Entering directory
`/home/test/test/1/output/build/xserver_xorg-server-1.15.1/os'
CC WaitFor.lo
CC access.lo
CC auth.lo
CC backtrace.lo
backtrace.c: In function 'xorg_backtrace':
backtrace.c:90:20: error: cast to pointer from integer of different size
[-Werror=int-to-pointer-cast]
if (dladdr((void *)(pip.start_ip + off), &dlinfo) &&
dlinfo.dli_fname &&
^
backtrace.c:98:13: error: cast to pointer from integer of different size
[-Werror=int-to-pointer-cast]
(void *)(pip.start_ip + off));
^
cc1: some warnings being treated as errors
make[2]: *** [backtrace.lo] Error 1
make[2]: *** Waiting for unfinished jobs....
Making the cast to a pointer-sized integer, and then to a pointer fixes
the problem.
Related:
https://bugs.freedesktop.org/show_bug.cgi?id=79939
Signed-off-by: Vicente Olivert Riera <Vincent.Riera@imgtec.com>
Reviewed-by: Keith Packard <keithp@keithp.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 76636ac12f2d1dbdf7be08222f80e7505d53c451
Author: Ray Strode <rstrode@redhat.com>
Date: Tue May 5 16:43:44 2015 -0400
xwayland: default to local user if no xauth file given. [CVE-2015-3164 3/3]
Right now if "-auth" isn't passed on the command line, we let
any user on the system connect to the Xwayland server.
That's clearly suboptimal, given Xwayland is generally designed
to be used by one user at a time.
This commit changes the behavior, so only the user who started the
X server can connect clients to it.
Signed-off-by: Ray Strode <rstrode@redhat.com>
Reviewed-by: Daniel Stone <daniels@collabora.com>
Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 4b4b9086d02b80549981d205fb1f495edc373538
Author: Ray Strode <rstrode@redhat.com>
Date: Tue May 5 16:43:43 2015 -0400
os: support new implicit local user access mode [CVE-2015-3164 2/3]
If the X server is started without a '-auth' argument, then
it gets started wide open to all local users on the system.
This isn't a great default access model, but changing it in
Xorg at this point would break backward compatibility.
Xwayland, on the other hand is new, and much more targeted
in scope. It could, in theory, be changed to allow the much
more secure default of a "user who started X server can connect
clients to that server."
This commit paves the way for that change, by adding a mechanism
for DDXs to opt-in to that behavior. They merely need to call
LocalAccessScopeUser()
in their init functions.
A subsequent commit will add that call for Xwayland.
Signed-off-by: Ray Strode <rstrode@redhat.com>
Reviewed-by: Daniel Stone <daniels@collabora.com>
Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit c4534a38b68aa07fb82318040dc8154fb48a9588
Author: Ray Strode <rstrode@redhat.com>
Date: Tue May 5 16:43:42 2015 -0400
xwayland: Enable access control on open sockets [CVE-2015-3164 1/3]
Xwayland currently allows wide-open access to the X sockets
it listens on, ignoring Xauth access control.
This commit makes sure to enable access control on the sockets,
so one user can't snoop on another user's X-over-wayland
applications.
Signed-off-by: Ray Strode <rstrode@redhat.com>
Reviewed-by: Daniel Stone <daniels@collabora.com>
Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit ad02d0df75318660c3f7cd6063eac409327fe560
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Wed May 6 15:25:28 2015 +1000
test: add tests for new valuator mask features
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Hans de Goede <hdegoede@redhat.com>
commit da10d0cb4283ad5a9c4290555751f61795d11b49
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Tue May 5 14:48:41 2015 +1000
dix: hook up the unaccelerated valuator masks
If present, access the unaccelerated valuator mask values for DGA and XI2 raw
events.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Hans de Goede <hdegoede@redhat.com>
commit 4c2f2cb4c8ca1ab894a65828fdd39aea9b014f69
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Tue May 5 14:18:54 2015 +1000
dix: Add unaccelerated valuators to the ValuatorMask
Allows a mask to carry both accelerated and unaccelerated motion at the same
time.
This is required for xf86-input-libinput where the pointer acceleration
happens in libinput already, but parts of the server, specifically raw events
and DGA rely on device-specific unaccelerated data.
To ease integration add this as a second set to the ValuatorMask rather than
extending all APIs to carry a second, possibly NULL set of valuators.
Note that a valuator mask should only be used in either accel/unaccel or
standard mode at any time. Switching requires either a valuator_mask_zero()
call or unsetting all valuators one-by-one. Trying to mix the two will produce
a warning.
The server has a shortcut for changing a mask with the
valuator_mask_drop_unaccelerated() call. This saves us from having to loop
through all valuators on every event, we can just drop the bits we know we
don't want.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Hans de Goede <hdegoede@redhat.com>
commit 3f0d3201f38ef9d1651fcaf94e45c640786edcc0
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Mon Apr 13 13:52:28 2015 -0700
dix: fix indentation
from 9ff89a2e469ab0ac5af57d0fc115127feb1c0d99
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit f82dc6bd91a545a844fb688ba3552e4f5df8a0d2
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Tue Mar 24 09:43:17 2015 +1000
xfree86: drop if 0 hunk
Disabled in 2005. bye bye.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit fc59c8fe8d941b0ec1e98c59bc57b1f97dba149d
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Tue May 5 15:54:20 2015 +1000
config: remove 10-evdev.conf, let the evdev driver install that file
Now that we have two likely drivers that fight for control over the input
devices (evdev and libinput) let's move the respective driver assignment to
each package. So you get what you install.
https://bugs.freedesktop.org/show_bug.cgi?id=89023
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Hans de Goede <hdegoede@redhat.com>
commit bf6344e1913a5d24c2d68eaca999ea3d71e1b707
Author: Keith Packard <keithp@keithp.com>
Date: Thu May 14 14:58:29 2015 -0700
Revert "glx/dri2: Disable AIGLX if indirect GLX is disabled"
This reverts commit d61ae18074e53c2cdfb13cc37693b526160d6ca7.
If the DRI2 provider is disabled, then we don't advertise the correct
GLX extensions to clients, and things like GLES fail.
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=90442
Reviewed-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Michel Dänzer <michel.daenzer@amd.com>
commit b0d2e010316d710eb4052963de3a1e2dc7ba356e
Author: Keith Packard <keithp@keithp.com>
Date: Fri Oct 10 09:25:51 2014 +0200
glamor: Replace CompositeGlyphs code [v2]
New composite glyphs code uses the updated glamor program
infrastructure to create efficient shaders for drawing render text.
Glyphs are cached in two atlases (one 8-bit, one 32-bit) in a simple
linear fashion. When the atlas fills, it is discarded and a new one
constructed.
v2: Eric Anholt changed the non-GLSL 130 path to use quads instead of
two triangles for a significant performance improvement on hardware
with quads. Someone can fix the GLES quads emulation if they want to
make it faster there.
v3: Eric found more dead code to delete
Signed-off-by: Keith Packard <keithp@keithp.com>
Reviewed-by: Eric Anholt <eric@anholt.net>
commit 1b745e0c1ff45e014aa21c3d8edf93227bec99bf
Author: Keith Packard <keithp@keithp.com>
Date: Mon Oct 13 11:40:06 2014 -0700
glamor: Adapt glamor_program API to handle render acceleration
This extends the existing API to support options needed for render
accleration, including an additional fragment, 'combine', (which
provides a place to perform the source IN mask operation before the
final OP dest state) and an additional 'defines' parameter which
provides a way to add target-dependent values without using a uniform.
Signed-off-by: Keith Packard <keithp@keithp.com>
Reviewed-by: Eric Anholt <eric@anholt.net>
commit ff3195aadde95c8e89f77f389a7dfb418dd2426c
Author: Keith Packard <keithp@keithp.com>
Date: Mon Oct 20 21:31:56 2014 -0700
glamor: Compute GLSL version from GL_SHADING_LANGUAGE_VERSION (v3)
Use code from Piglit project to compute GLSL version for either GL or
GLES. The Piglit code was originally written by Chad Versace.
v2: bail if the parse fails (requested by Eric Anholt)
v3: Use version 1.20 for GLES until we fix our programs (Eric Anholt)
Signed-off-by: Keith Packard <keithp@keithp.com>
Reviewed-by: Eric Anholt <eric@anholt.net>
commit dcb3d74ba8861e7b0a592e92b5b2247b84e843f3
Author: Keith Packard <keithp@keithp.com>
Date: Mon Oct 13 12:35:40 2014 -0700
glamor: Remove destination drawable argument from glamor_set_texture
This argument wasn't used at all.
Signed-off-by: Keith Packard <keithp@keithp.com>
Reviewed-by: Eric Anholt <eric@anholt.net>
commit 2bf34fe8d9b7628d164392c2d11ace78f7cf17b9
Author: Keith Packard <keithp@keithp.com>
Date: Mon Oct 13 12:32:27 2014 -0700
glamor: Pass depth to glamor_pm_is_solid and glamor_set_planemask
Instead of passing the destination drawable, just pass the depth, as
the underlying functions need only that to check whether the planemask
is going to work.
This API change will allow higher level functions to not need the
destination pixmap.
Signed-off-by: Keith Packard <keithp@keithp.com>
Reviewed-by: Eric Anholt <eric@anholt.net>
commit 910ddf85219f114744e8996a4ac044c4eafc62ac
Author: Egbert Eich <eich@freedesktop.org>
Date: Tue May 12 09:52:48 2015 -0700
Xephyr: Fix broken image when endianess of client machine and host-Xserver differ
The image is created in the native byte order of the machine Xephyr is
rendered on however drawn in the image byte order of the Xephyr server.
Correct byte order in the xcb_image_t structure and convert to native
before updating the window.
If depths of Xephyr and host server differ this is already taken care of
by the depth conversion routine.
It is a terrible wase to always convert and transmit the entire image
no matter of the size of the damaged area. One should probably use
sub-images here. For now we leave this as an exercise.
Signed-off-by: Egbert Eich <eich@freedesktop.org>
Reviewed-by: Keith Packard <keithp@keithp.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit c65eda5e6676d942e80eaf2650a670174c8bd84a
Author: Egbert Eich <eich@freedesktop.org>
Date: Tue Mar 31 09:14:28 2015 +0200
Xephyr: Fix screen image draw for the non-Glamor & non-XHSM case
xcb_image_put() prints the entire image, therefore don't use an offset.
Signed-off-by: Egbert Eich <eich@freedesktop.org>
Reviewed-by: Keith Packard <keithp@keithp.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 66212ca0d2f194fd16db65e863f0a2d613e180ea
Author: Egbert Eich <eich@freedesktop.org>
Date: Tue Mar 31 09:14:27 2015 +0200
Xephyr: Fix compile when debugging is enabled
Signed-off-by: Egbert Eich <eich@freedesktop.org>
Reviewed-by: Keith Packard <keithp@keithp.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit b536d56aef21739b6da44693bbf19d0e7541392d
Author: Egbert Eich <eich@freedesktop.org>
Date: Tue Mar 31 09:14:26 2015 +0200
Xephyr: Print default server display number if none is specified
Signed-off-by: Egbert Eich <eich@freedesktop.org>
Reviewed-by: Keith Packard <keithp@keithp.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 5af73f490870da9265eeb9b3ce59a2be026be0c8
Author: Egbert Eich <eich@suse.de>
Date: Tue Mar 31 09:14:25 2015 +0200
Xephyr: Don't crash when no command line argument is specified
The DDX specific command line parsing function only gets called
if command line arguments are present. Therefore this function
is not suitable to initialize mandatory global variables.
Replace main() instead.
Signed-off-by: Egbert Eich <eich@freedesktop.org>
Reviewed-by: Keith Packard <keithp@keithp.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 00f79416b19f0cde68291aced44ab07b9b76f7b8
Author: Jonathan Gray <jsg@jsg.id.au>
Date: Wed Apr 15 21:29:58 2015 +1000
glamor: fix build when DRI3 is not defined
Signed-off-by: Jonathan Gray <jsg@jsg.id.au>
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 7c609c911a3a33b7e4ddad46b8fc42878a073ee7
Author: Jonathan Gray <jsg@jsg.id.au>
Date: Wed Apr 15 21:29:07 2015 +1000
glamor: remove const from the return type of glamor_get_drawable_location()
Fixes a build error with gcc 4.2.1 on OpenBSD due to
-Werror=return-type from xorg-macros.
error: type qualifiers ignored on function return type
Signed-off-by: Jonathan Gray <jsg@jsg.id.au>
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 145ae03814cb3b700b6fe1fd19f8fb15da84d1c8
Author: Michel Dänzer <michel.daenzer@amd.com>
Date: Tue Mar 17 10:21:13 2015 +0900
modesetting: Include dix-config.h from dumb_bo.c
Fixes mmap failures with 32-bit builds.
Signed-off-by: Michel Dänzer <michel@daenzer.net>
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 4962c8c08842d9d3ca66d254b1ce4cacc4fb3756
Author: Michel Dänzer <michel.daenzer@amd.com>
Date: Tue Mar 17 10:21:12 2015 +0900
Add AC_SYS_LARGEFILE defines to dix-config.h
Without this, AC_SYS_LARGEFILE doesn't actually have any effect.
Signed-off-by: Michel Dänzer <michel@daenzer.net>
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 0409b6e6d63e9cfb5dc71bb27de4b1ed0152dd9b
Merge: c39c3a9750 23702dd268
Author: Keith Packard <keithp@keithp.com>
Date: Mon May 11 16:50:43 2015 -0700
Merge remote-tracking branch 'evelikov/master'
commit c39c3a97508dc384c0757a0990c07b5d7b2fe97a
Merge: 6b65e96189 7470578520
Author: Keith Packard <keithp@keithp.com>
Date: Mon May 11 16:34:48 2015 -0700
Merge remote-tracking branch 'ajax/xserver-next'
commit 6b65e961894b9ed53066d22cfd218b12c3f361ca
Author: Robert Ancell <robert.ancell@canonical.com>
Date: Wed May 6 15:07:21 2015 +1200
xwayland: Fix error strings
Fix missing newlines from error string and fix grammar.
Signed-off-by: Robert Ancell <robert.ancell@canonical.com>
Reviewed-by: Daniel Stone <daniels@collabora.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit d7091a21d90cf463ae39ec5e8741123218ec5686
Merge: c3ce9d8fd4 8fb8bbb306
Author: Keith Packard <keithp@keithp.com>
Date: Mon May 11 15:49:34 2015 -0700
Merge remote-tracking branch 'airlied/for-keithp'
commit c3ce9d8fd404ca1d4697a104ce4899525dd43c51
Author: Adel Gadllah <adel.gadllah@gmail.com>
Date: Fri May 1 17:43:41 2015 +0200
modesetting: Fix software cursor fallback
The code in drmmode_set_cursor does not properly handle the case where
drmModeSetCursor2 returns any other error than EINVAL and silently fails to set
a cursor.
So only return when the drmModeSetCursor2 succeeds (i.e returns 0) and disable
the cursor2 usage on EINVAL.
References: https://bugzilla.redhat.com/show_bug.cgi?id=1205725
Signed-off-by: Adel Gadllah <adel.gadllah@gmail.com>
Reviewed-by: Michel Dänzer <michel@daenzer.net>
Reviewed-by: Rob Clark <robdclark@gmail.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 81a51a6cace6fdb54999ccdf1533dc28a2222bb9
Author: Dima Ryazanov <dima@gmail.com>
Date: Wed Apr 29 22:39:18 2015 -0700
xwayland: Implement smooth scrolling
We don't even need to simulate button clicks; it's done automatically.
This also fixes scrolling in Qt5 apps.
Signed-off-by: Dima Ryazanov <dima@gmail.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 9ff89a2e469ab0ac5af57d0fc115127feb1c0d99
Author: Jason Gerecke <killertofu@gmail.com>
Date: Wed Apr 29 15:08:58 2015 +1000
dix: Do not allow device transform to be set on valuatorless devices
If a device does not have any valuators, it makes no sense to set the
device transformation. Return a BadMatch error to let the caller know
that they're trying something stupid.
Signed-off-by: Jason Gerecke <jason.gerecke@wacom.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit fa62ca68ef8be7f63cd0b899dfae3366ca9350cf
Author: Rui Matos <tiagomatos@gmail.com>
Date: Sat Apr 25 21:19:25 2015 +0200
dix/events: Set currentTime to the given time stamp in NoticeTime
The refactoring in commit efc1035ca958f2c9d266338a308518a0834b1773
removed the actual update of currentTime.
Signed-off-by: Rui Matos <tiagomatos@gmail.com>
Acked-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Keith Packard <keithp@keithp.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 26e50e8b2cbd01d050b5ecc02d47488b53ecc08b
Merge: 28ff661e73 c7b49bdbb9
Author: Keith Packard <keithp@keithp.com>
Date: Mon May 11 15:36:53 2015 -0700
Merge remote-tracking branch 'jturney/mingw-build-fixes'
commit 7470578520e90b6402b2509cd0c51fd4fd84849f
Author: Brent Collins <bcollins@trustedcs.com>
Date: Thu May 7 15:10:19 2015 -0400
shm: Fix xselinux resource initialization for xinerama pixmaps
This is necessary to avoid a NULL pointer deference when the pixmap is
used later.
[ajax: massaged commit message, fixed it to compile]
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=89748
Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Brent Collins <bcollins@trustedcs.com>
commit bcec9f867d19e954a46c2654a79782bff6c65fce
Author: Chris Wilson <chris@chris-wilson.co.uk>
Date: Sat Feb 14 10:36:44 2015 +0000
shm: Fix use-after-free in ShmDestroyPixmap
We pass the pPixmap->drawable.id to the ShmDetachSegment function after
the pPixmap is freed. Fortunately, we don't use the value inside
ShmDetachSegment and can simply pass zero instead.
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Reviewed-by: Michel Dänzer <michel@daenzer.net>
commit d61ae18074e53c2cdfb13cc37693b526160d6ca7
Author: Chris Wilson <chris@chris-wilson.co.uk>
Date: Wed Mar 4 12:16:29 2015 +0000
glx/dri2: Disable AIGLX if indirect GLX is disabled
There is no point in setting up the acceleration for indirect GLX if
indirect GLX is itself disabled.
Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
commit 1af15aaf278edcf6f6de94774350e34a80883c24
Author: Olivier Fourdan <ofourdan@redhat.com>
Date: Fri Apr 10 10:07:38 2015 +0200
dix: Fix image byte order on big endian hardware
Make sure X_BIG_ENDIAN/X_LITTLE_ENDIAN are defined before actually using
them.
Otherwise, image byte order could be wrong on big endian hardware even
though endianess detection is correct.
Reported-by: Tim Waugh <twaugh@redhat.com>
Signed-off-by: Olivier Fourdan <ofourdan@redhat.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
commit 28159eff6badf6181b255f26d1f444abe81c05b7
Author: Jason Gerecke <killertofu@gmail.com>
Date: Thu Apr 30 18:06:14 2015 -0700
xfree86: Return NULL from xf86CompatOutput if no compat_output is defined
If no compat_output is defined, we inadvertently (attempt to) return
whatever data is at index -1. Instead, return NULL since that's what
callers are expecting.
Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Jason Gerecke <jason.gerecke@wacom.com>
commit cad831f39861435cb94f4c90a73f7f0b62d1a4a1
Author: Robert Ancell <robert.ancell@canonical.com>
Date: Wed May 6 15:07:21 2015 +1200
xwayland: Fix error strings
Fix missing newlines from error string and fix grammar.
Signed-off-by: Robert Ancell <robert.ancell@canonical.com>
Reviewed-by: Daniel Stone <daniels@collabora.com>
commit 8fb8bbb3062f1a06621ab7030a9e89d5e8367b35
Author: Dave Airlie <airlied@redhat.com>
Date: Mon Mar 23 11:33:23 2015 +1000
modesetting: add tile property support (v2.1)
This adds tiling support to the server modesetting driver,
it retrieves the tile info from the kernel and translates
it into the server format and exposes the property.
v2.1: fix resetting tile property (Chris)
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Signed-off-by: Dave Airlie <airlied@redhat.com>
commit 9257b1252da9092ddc676fec9aabe2b33dfad272
Author: Dave Airlie <airlied@redhat.com>
Date: Wed Jan 28 17:35:21 2015 +1000
modesetting: add dynamic connector hotplug support (MST) (v3)
This is ported from the same code in the ati and intel drivers,
It uses the same option name as nvidia and the other DDXes to
disable tearing down outputs as it is hard to avoid racing with clients.
v2: address two issues with DeleteUnusedDP12 enabled, reported
by Daniel Martin,
a) check we have a mode_output before destroying it
b) only delete *unused* displays (thanks Aaron for clarifying)
so we check if the output has a crtc and if it does we don't
delete it.
v3: drop the option to delete unused displays, just encode
behaviour into the randr spec.
Signed-off-by: Dave Airlie <airlied@redhat.com>
commit 33422d160bff3117b413a62d82b168e84f1aa8f6
Author: Dave Airlie <airlied@redhat.com>
Date: Wed Jan 28 17:25:00 2015 +1000
modesetting: stop caching mode resources
There is no need to cache the mode resources and with dynamic
connectors for mst support we don't want to. So first clean that
up before adding dynamic connector support.
Reviewed-by: Keith Packard <keithp@keithp.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
commit a9ac02f6949357619684dd98ff6cf05489e62e55
Author: Dave Airlie <airlied@redhat.com>
Date: Wed Apr 1 12:13:51 2015 +1000
xf86Crtc/monitors: create initial monitors for tiled outputs
This creates an automatic monitor for a tiled monitor at startup.
Reviewed-by: Keith Packard <keithp@keithp.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
commit afd18bce6a81106a12fd750d5fa09d05c09d37a8
Author: Dave Airlie <airlied@redhat.com>
Date: Wed Apr 1 14:32:00 2015 +1000
xf86Crtc: setup tiled monitors correctly in right of
This puts the tiles of the monitor in the right place at
X server startup.
Reviewed-by: Keith Packard <keithp@keithp.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
commit e472dd89420f671685c11b06d376ff146d54c3b8
Author: Adam Jackson <ajax@redhat.com>
Date: Tue Jul 28 11:07:13 2009 -0400
xf86Crtc: right-of placement by default.
Change the X server default to do right-of placement
at startup. This gives an option to allow drivers to
override this placement, which has been used for server
drivers where both heads are not in the same physical
place.
Been in Fedora for a few years, but for tiled monitors
we really want something along these lines.
This is an ABI break.
Reviewed-by: Keith Packard <keithp@keithp.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
commit 69e4b8e602ecc7b69c75988a447ec5b509b22402
Author: Dave Airlie <airlied@redhat.com>
Date: Tue Mar 31 16:56:42 2015 +1000
xfree86: attempt to autoconfig gpu slave devices (v3)
This allows us to skip the screen section, the first
Device section will get assigned to the screen,
any remaining ones will get assigned to the GPUDevice
sections for the screen.
v2: fix the skipping unsuitable screen logic (Aaron)
v3: fix segfault if not conf file (me, 5s after sending v2)
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
commit 3b6930c5d02d8fc0d22fe7955e1ef2af61727705
Author: Dave Airlie <airlied@redhat.com>
Date: Tue Mar 31 16:42:36 2015 +1000
xserver: add xorg.conf support for gpu devices. (v2.1)
This allows gpu devices to be specified in xorg.conf Screen sections.
Section "Device"
Driver "intel"
Identifier "intel0"
Option "AccelMethod" "uxa"
EndSection
Section "Device"
Driver "modesetting"
Identifier "usb0"
EndSection
Section "Screen"
Identifier "screen"
Device "intel0"
GPUDevice "usb0"
EndSection
This should allow for easier tweaking of driver options which
currently mess up the GPU device discovery process.
v2: add error handling for more than 4 devices, (Emil)
fixup CONF_ defines to consistency
add MAX_GPUDEVICES define
(yes there is two defines, this is consistent
with everywhere else).
remove braces around slp (Mark Kettenis)
man page fixups (Aaron)
v2.1: fixup whitespace (Aaron)
Reviewed-by: Keith Packard <keithp@keithp.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
commit c7b49bdbb9321fe9a7dc35f47b91cac85516988f
Author: Colin Harrison <colin.harrison@virgin.net>
Date: Fri Mar 20 14:25:17 2015 +0000
os/utils.c: Fix prototype for Win32TempDir()
xorg/xserver/os/utils.c: In function ‘Win32TempDir’:
xorg/xserver/os/utils.c:1643:1: warning: old-style function definition [-Wold-style-definition]
Signed-off-by: Colin Harrison <colin.harrison@virgin.net>
Reviewed-by: Jon TURNEY <jon.turney@dronecode.org.uk>
commit a9b4b7b79682dd367ce26c29aa5dc85807201851
Author: Colin Harrison <colin.harrison@virgin.net>
Date: Fri Mar 20 14:25:53 2015 +0000
os/utils.c: Don't try to build os_move_fd() for WIN32
Signed-off-by: Colin Harrison <colin.harrison@virgin.net>
Reviewed-by: Jon TURNEY <jon.turney@dronecode.org.uk>
commit 2b114d6a516ee584ff89b96b12acf91799b6d677
Author: Jon TURNEY <jon.turney@dronecode.org.uk>
Date: Fri Mar 20 14:29:58 2015 +0000
hw/xnest: Fix build for MinGW
Include the wrapped windows.h via X11/Xwindows.h before xcb_keysyms.h to avoid
type clashes caused by the unwrapped windows.h that includes.
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
commit 5bf3e5c8326fb81655827dbd4c527f1a2ba09511
Author: Jon TURNEY <jon.turney@dronecode.org.uk>
Date: Wed Mar 18 13:29:22 2015 +0000
hw/xwin/winclipboard: Link xwinclip with -lpthread
Link xwinclip with -lpthread to fix build for MinGW
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
commit 8363ef2764fe9c6877d1cb21d3ce7b6cf869f00d
Author: Colin Harrison <colin.harrison@virgin.net>
Date: Fri Mar 20 14:06:49 2015 +0000
os/xdmcp.c: Include Xtrans.h when building for WIN32
Xtrans.h must be included on WIN32 to prototype _XSERVTransWSAStartup()
xserver/os/xdmcp.c: In function ‘get_addr_by_name’:
xserver/os/xdmcp.c:1483:5: error: implicit declaration of function ‘_XSERVTransWSAStartup’ [-Werror=implicit-function-declaration]
Signed-off-by: Colin Harrison <colin.harrison@virgin.net>
Reviewed-by: Jon TURNEY <jon.turney@dronecode.org.uk>
commit 28ff661e73f4bdf0a9b7c84e70fa0a08fd30e482
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Fri Apr 3 19:06:21 2015 -0700
Remove empty stub of $host_cpu case statement in configure.ac
Left behind when commit 5c12399b6c3a8d moved the xorg_bus_* settings
elsewhere.
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Thomas Klausner <wiz@NetBSD.org>
commit d4e85afac6578d5babc8bf97e00e85b00746fca9
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Fri Apr 3 19:01:40 2015 -0700
Accept x86_64 as well as i*86 for $host_cpu in Solaris on x86
Needed when using a compiler that defaults to 64-bit output when
configure is checking for $host_cpu.
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Thomas Klausner <wiz@NetBSD.org>
commit 0018784cdde19444a8f970bc414796fc2a523a51
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Sat Mar 21 17:59:13 2015 -0700
Convert hw/dmx to new *allocarray functions
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Matt Turner <mattst88@gmail.com>
commit dc5acaa28ab9ed091f087e56046400d63f1f192a
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Sat Mar 21 17:30:05 2015 -0700
Convert hw/kdrive to new *allocarray functions
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Matt Turner <mattst88@gmail.com>
commit ae2dc01cf1a371db69d5deb987f4185e7c3ccedd
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Sat Mar 21 17:23:33 2015 -0700
Convert hw/xnest & hw/vfb to new *allocarray functions
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Matt Turner <mattst88@gmail.com>
commit 4cb1034906eeec8c8442d70918bea0f4eb1f6e44
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Sat Mar 21 17:12:06 2015 -0700
Convert hw/xfree86 to new *allocarray functions
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Matt Turner <mattst88@gmail.com>
commit f59236c2865d22c6f0b2d1ba303213afd10cd02e
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Sat Mar 21 15:05:30 2015 -0700
Convert glamor & glx to new *allocarray functions
v2: fixup whitespace
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Matt Turner <mattst88@gmail.com>
Reviewed-by: Michel Dänzer <michel.daenzer@amd.com>
commit 7ac280287491fe06127d9fefc504217e21c780e6
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Sat Mar 21 14:58:50 2015 -0700
Convert mi & miext to new *allocarray functions
v2: remove now useless parentheses
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Matt Turner <mattst88@gmail.com>
commit 70f4a0e6bd18055cc9cb6685253bf5e07b125657
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Sat Mar 21 14:40:39 2015 -0700
Convert exa & fb to new *allocarray functions
v2: fixup whitespace
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Matt Turner <mattst88@gmail.com>
Reviewed-by: Michel Dänzer <michel.daenzer@amd.com>
commit 4fe6b03b97ab8dbb32e4908e46be350d7f7d336f
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Sat Mar 21 14:36:07 2015 -0700
Convert XKB to new *allocarray functions
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Matt Turner <mattst88@gmail.com>
Acked-by: Daniel Stone <daniels@collabora.com>
commit 1c56ac63c040280498c4a9d67b48c35b60070821
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Sat Mar 21 13:42:12 2015 -0700
Convert top level extensions to new *allocarray functions
v2: remove now useless parentheses
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Matt Turner <mattst88@gmail.com>
commit b9e665c8b2f048feb3064ce412e0b3e9eb6797b0
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Sat Mar 21 10:52:29 2015 -0700
Convert dix/* to new *allocarray functions
v2: remove now useless parentheses
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Matt Turner <mattst88@gmail.com>
commit df4e41fdb47cdeab5155224557ed8ab4ec4dc659
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Sat Mar 21 10:08:25 2015 -0700
Convert os/* to new *allocarray functions
v2: remove now useless parentheses
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Matt Turner <mattst88@gmail.com>
commit ae75d50395fdd7a6bc382ba73e923c460764c702
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Sat Mar 21 09:28:07 2015 -0700
Add no-fail equivalents of allocarray & reallocarray
v2: Remove extra 's' from comment
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Matt Turner <mattst88@gmail.com>
commit c213b29d14aaf2f4523d638abc762eaaa873cf83
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Sat Mar 21 08:58:04 2015 -0700
Add xallocarray() helper macro
Uses reallocarray to perform integer overflow detection when allocating
an array, using NULL as the previous pointer to force a new allocation.
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Matt Turner <mattst88@gmail.com>
commit 0887c9463fc7d36d7874e7f978df4109542f7307
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Sat Mar 21 08:42:19 2015 -0700
Import reallocarray() from OpenBSD
Wrapper for realloc() that checks for overflow when multiplying
arguments together, so we don't have to add overflow checks to
every single call. For documentation on usage, see:
http://www.openbsd.org/cgi-bin/man.cgi/OpenBSD-current/man3/calloc.3
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Acked-by: Matt Turner <mattst88@gmail.com>
commit b96dc999968320ad6322b50c79d847efcfcd02b2
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Sat Mar 21 15:21:14 2015 -0700
Add XNFcallocarray() to allow xnfcalloc() to check for overflow
The xnfcalloc() macro took two arguments but simply multiplied them
together without checking for overflow and defeating any overflow
checking that calloc() might have done. Let's not do that.
The original XNFcalloc() function is left for now to preserve driver
ABI, but is marked as deprecated so it can be removed in a future round
of ABI break/cleanup.
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Matt Turner <mattst88@gmail.com>
commit f3ba909753cd216fc9eca4618a76cc283ccbf51e
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Sat Mar 21 11:07:24 2015 -0700
Let calloc handle multiplication
It's going to multiply anyway, so if we have non-constant values, might
as well let it do the multiplication instead of adding another multiply,
and good versions of calloc will check for & avoid overflow in the process.
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Matt Turner <mattst88@gmail.com>
commit a28202a148508837911c5932a0d14af4b145bece
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Sat Mar 21 08:19:30 2015 -0700
Remove remaining doc references to Xalloc, Xrealloc, and Xfree
Functions were removed in commit cad9b053d52f62432
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Matt Turner <mattst88@gmail.com>
commit 2a6d253b3f2ec4775412b4ae96a96b0b668ec827
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Sat Feb 28 10:04:09 2015 -0800
Remove apSolaris.shar (old "aperture" kernel driver for Solaris)
Modern Solaris releases provide this functionality in the OS via the
xsvc driver. Since the move to libpciaccess, nothing in Xorg uses
this aperture driver any more.
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
commit b1029716e41e252f149b82124a149da180607c96
Author: Ray Strode <rstrode@redhat.com>
Date: Thu Apr 16 11:28:16 2015 -0400
systemd-logind: don't second guess D-Bus default timeout
At the moment, the X server uses a non-default timeout for D-Bus
messages to systemd-logind. The only timeouts normally used with
D-Bus are:
1) Infinite
2) Default
Anything else is just as arbitrary as Default, and so rarely makes
sense to use instead of Default.
Put another way, there's little reason to be fault tolerant against
a local root running daemon (logind), that in some configurations, the
X server already depends on for proper functionality.
This commit changes systemd-logind to just use the default timeouts.
Downstream-bug: https://bugzilla.redhat.com/show_bug.cgi?id=1209347
Signed-off-by: Ray Strode <rstrode@redhat.com>
Reviewed-by: Hans de Goede <hdegoede@redhat.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 792e9251670ce94210df5c6d354059bbb97f4478
Author: Ray Strode <rstrode@redhat.com>
Date: Thu Apr 16 11:28:15 2015 -0400
systemd-logind: filter out non-signal messages from message filter
It's possible to receive a message reply in the message filter if a
previous message call timed out locally before the reply arrived.
The message_filter function only handles signals, at the moment, and
does not properly handle message replies.
This commit changes the message_filter function to filter out all
non-signal messages, including spurious message replies.
Downstream-bug: https://bugzilla.redhat.com/show_bug.cgi?id=1209347
Signed-off-by: Ray Strode <rstrode@redhat.com>
Reviewed-by: Hans de Goede <hdegoede@redhat.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 41932dfbc841a1adc6512d41085ea3f8ebecb42c
Author: Keith Packard <keithp@keithp.com>
Date: Wed Apr 8 07:45:28 2015 -0700
mi: Partial pie-slice filled arcs may need more space for spans
The mi filled arc code estimates that a filled arc will produce no
more spans than the arc is tall. This is true for most arcs except
for pie-slice arcs strictly between 180 and 360 degrees where the missing
portion of the arc faces up or down such that we get two spans on some
scanlines.
For those, we need to reserve room for another height/2 spans. This
patch just does it for all partial pie-sliced arcs to make the test
easier to understand; it's just over-allocating a bit of memory, so
that's safe.
Signed-off-by: Keith Packard <keithp@keithp.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
commit 21e7d2bb5cd810688bb905b6ed092497ca8a2c59
Author: Hans de Goede <hdegoede@redhat.com>
Date: Wed Apr 8 14:07:52 2015 +0200
Re-enable non serverfd input devices immediately on vtenter
Non serverfd input devices will never get a systemd-logind dbus resume signal,
causing them to never get re-enabled.
This commit changes xf86VTEnter() to enable them immediately, fixing this.
BugLink: https://bugs.freedesktop.org/show_bug.cgi?id=89756
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit f1da6bf5d94911e78d2e27e6accf0c6e3aefb331
Author: Keith Packard <keithp@keithp.com>
Date: Tue Mar 31 17:07:43 2015 -0700
Require randrproto version 1.5.0 or newer
Signed-off-by: Keith Packard <keithp@keithp.com>
Reviewed-by: Dave Airlie <airlied@redhat.com>
commit e36236eade412dd3894f75f78a7b3d7c1037e6c3
Author: Aaron Plattner <aplattner@nvidia.com>
Date: Tue Dec 30 09:13:16 2014 -0800
xfree86: Add GPU screens even if there are no active GDevs
xf86platformProbeDev creates GPU screens for any platform devices that were not
matched by a GDev in the loop above, but only if there was at least one device.
This means that it's impossible to configure a device as a GPU screen if there
is only one platform device that matches that driver.
Instead, create a GPU screen (if possible) for any platform device that was not
claimed by the GDev loop.
Signed-off-by: Aaron Plattner <aplattner@nvidia.com>
Reviewed-by: Maarten Lankhorst <maarten.lankhorst@ubuntu.com>
Acked-by: Alex Deucher <alexander.deucher@amd.com>
commit 4ecda362594d771f401de467c2d58c0f552227a8
Author: Aaron Plattner <aplattner@nvidia.com>
Date: Tue Dec 30 09:13:15 2014 -0800
xfree86: Fix xf86_check_platform_slot's handling of PCI
If a PCI entity is found, xf86_check_platform_slot performs a device ID check
against the xf86_platform_device passed in. However, it just returns
immediately without checking the rest of the entities first. This leads to this
situation happening:
1. The nvidia driver creates an entity 0 with bus.type == BUS_PCI
2. The intel driver creates entity 1 for its platform device, opening
/dev/dri/card0
3. xf86platformProbeDev calls probeSingleDevice on the Intel platform device,
which calls doPlatformProbe, which calls xf86_check_platform_slot.
4. xf86_check_platform_slot compares the Intel platform device against the
NVIDIA PCI entity. Since they don't have the same device ID, it returns
TRUE.
5. doPlatformProbe calls xf86ClaimPlatformSlot, which creates a duplicate entity
for the Intel one.
Fix this by only returning FALSE if the PCI ID matches, and continuing the loop
otherwise. In the scenario above, this allows it to continue on to find the
Intel platform device that matches the second entity.
Signed-off-by: Aaron Plattner <aplattner@nvidia.com>
Reviewed-by: Maarten Lankhorst <maarten.lankhorst@ubuntu.com>
Acked-by: Alex Deucher <alexander.deucher@amd.com>
commit e608f3521eaaab972a3eea62aa04a65958351c1c
Merge: d3b9c47c84 5de1383070
Author: Keith Packard <keithp@keithp.com>
Date: Tue Mar 31 09:06:08 2015 -0700
Merge remote-tracking branch 'airlied/for-keithp'
commit d3b9c47c849d039493c5e0ca5c3af8affe738746
Author: Jon Turney <jon.turney@dronecode.org.uk>
Date: Sun Mar 29 23:18:49 2015 +0100
Fix XQuartz build
Fix XQuartz build since commit e036cbfc "Make PseudoramiXExtensionInit()
prototype more generally available"
Add #include "nonsdk_extinit.h" to xprScreen.c
Add #include "nonsdk_extinit.h" to miinitext.c under INXQUARTZ to provide
declarations used under INXQUARTZ
Signed-off-by: Jon Turney <jon.turney@dronecode.org.uk>
Reviewed-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
Tested-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 5de13830709a7f2d4d112d71e062f710ef466ab6
Author: Keith Packard <keithp@keithp.com>
Date: Tue Dec 16 09:56:50 2014 -0800
randr: Use Monitor list for Xinerama
This replaces the CRTC-based Xinerama implementation with one which
uses Monitors instead, allowing clients to manipulate the Xinerama
configuration through the RandR Monitor list.
Reviewed-by: Dave Airlie <airlied@redhat.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 7e1f86d42b54fb7f6492875e47a718eaeca3069b
Author: Keith Packard <keithp@keithp.com>
Date: Tue Dec 16 01:59:03 2014 -0800
randr: Add Monitor support (v1.1)
Store the user-defined monitors in the RandR screen private.
Generate a list of monitors from both the user-defined ones and from
any outputs not mentioned in one of the user-defined monitors. This list
covers both the outputs in the main screen as well as any slaves.
v1.1: airlied: fix up primary skipping bug,
fix wrong height initialiser
add get_active flag from updated protocol.
Reviewed-by: Dave Airlie <airlied@redhat.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 9c2b4f8e0e2b5d4b5e1102d6eea7bdb4211baa68
Author: Dave Airlie <airlied@redhat.com>
Date: Tue Mar 31 11:18:44 2015 +1000
xf86Crtc: add tile prop setting
Add support for drivers to set the tiling
property. This is used by clients to
work out the monitor tiles for DisplayID
monitors.
Reviewed-by: Keith Packard <keithp@keithp.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
commit 7088816fee0ca7d609c7bca41ef8c3fc938556f5
Merge: 95e83ff87a e977b404d7
Author: Keith Packard <keithp@keithp.com>
Date: Fri Mar 27 06:45:56 2015 -0700
Merge remote-tracking branch 'anholt/glamor-next'
commit e977b404d7d1c6cd2be2168f4fdce0ae31cd1f9f
Author: Keith Packard <keithp@keithp.com>
Date: Sat Jan 17 07:44:27 2015 +1300
glamor: * 1/size is faster than / size in VS
Pass the inverse of the texture size to glamor vertex shaders so that
we multiply by that instead of dividing by the size as multiplication
is generally faster than division.
Signed-off-by: Keith Packard <keithp@keithp.com>
Signed-off-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Matt Turner <mattst88@gmail.com>
commit 82634d2b69950e7e9a066c8c96bf2624ac26193a
Author: Jon TURNEY <jon.turney@dronecode.org.uk>
Date: Mon Feb 9 13:45:44 2015 +0000
ephyr: Avoid a segfault with 'DISPLAY= Xephyr -glamor'
ephyr_glamor_connect() returns NULL if we failed, but applying
xcb_connection_has_error() to NULL is not permitted.
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Signed-off-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Daniel Martin <consume.noise@gmail.com>
commit 391bcf77db96ff227e504c213aa5d5db09b6a050
Author: Adam Jackson <ajax@redhat.com>
Date: Mon Feb 23 11:58:59 2015 -0500
glamor: Fix up indentation
Signed-off-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
commit 0669babf2b5b50cbc185b0f714671b2c2b368778
Author: Matt Turner <mattst88@gmail.com>
Date: Wed Mar 4 13:42:48 2015 -0800
glamor: Perform texture2D() separately from swizzle.
The texture2D() happens in each branch, so we may as well do it as early
as possible and hide some of its latency in the branching instructions.
Moving it outside the (uniform) control flow reduces the number of
instructions in the fs_source shader from 64 to 46 and in the
set_alpha_source shader from 69 to 47 on Haswell.
Signed-off-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Eric Anholt <eric@anholt.net>
commit 9e9fcf578063b4155aab4adab83f8d956bde5d1a
Author: Eric Anholt <eric@anholt.net>
Date: Wed Feb 4 14:38:15 2015 -0800
glamor: Add a helper function for the common GL_QUADS fallback pattern.
We should do better than this with an index buffer, but for now at
least make it so that we don't have to copy the same code to new
places.
Signed-off-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Keith Packard <keithp@keithp.com>
commit 909a406aa239b8d231d6f63ce05a3e4a2bc3cb07
Author: Eric Anholt <eric@anholt.net>
Date: Sun Dec 28 19:39:45 2014 -1000
glamor: Don't optimize out scissor updates in CopyArea.
This possibly is a minor hit for immediate mode renderers (no
difference on copypixin100 on my hsw, n=12), but it gives important
information about drawing bounds to a deferred renderer (3.1x
improvement in copypixwin100 on vc4).
Signed-off-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Keith Packard <keithp@keithp.com>
commit 6ba6cc57e17aefb7db0201a1f3180ab55076eb48
Author: Eric Anholt <eric@anholt.net>
Date: Sat Dec 27 09:00:58 2014 -1000
glamor: Just set the logic op to what we want at the start of all rendering.
By dropping the unconditional logic op disable at the end of
rendering, this fixes GL errors being thrown in GLES2 contexts (which
don't have logic ops). On desktop, this also means a little less
overhead per draw call from taking one less trip through the
glEnable/glDisable switch statement of doom in Mesa.
The exchange here is that we end up taking a trip through it in the
XV, Render, and gradient-generation paths. If the glEnable() is
actually costly, we should probably cache our logic op state in our
screen, since there's no way the GL could make that switch statement
as cheap as the caller caching it would be.
v2: Don't forget to set the logic op in Xephyr's drawing.
Signed-off-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Keith Packard <keithp@keithp.com>
commit 8102927282d5134493e5009a876a6b01a68d1f97
Author: Jon TURNEY <jon.turney@dronecode.org.uk>
Date: Thu Feb 5 12:52:02 2015 +0000
glamor: Fix build when configured --enable-glamor --disable-xshmfence
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Signed-off-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Eric Anholt <eric@anholt.net>
commit 4218a1e066cf39bb980ebbc9f69536c85232da5c
Author: Olivier Fourdan <ofourdan@redhat.com>
Date: Thu Feb 5 11:59:22 2015 +0100
glamor: check max native ALU instructions
When using glamor (either in Xephyr or Xwayland) on hardware with too
low instructions limit, glamor fallbacks to sw due to large shaders.
This makes glamor unbearably slow on such hardware.
Check reported value for GL_MAX_PROGRAM_NATIVE_ALU_INSTRUCTIONS_ARB
and fail in glamor_init() if the limit is lower than 128.
Fixes: https://bugs.freedesktop.org/show_bug.cgi?id=88316
Signed-off-by: Olivier Fourdan <ofourdan@redhat.com>
Signed-off-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Eric Anholt <eric@anholt.net>
commit e0788a03144186522fd0ef0e9c954e2744b40275
Author: Keith Packard <keithp@keithp.com>
Date: Wed Oct 29 23:47:23 2014 -0700
glamor: Eliminate GLAMOR_TEXTURE_LARGE pixmap type
Initialize full pixmap private for all pixmaps, including block
dimensions and counts so that no checks are needed when walking the
fbos.
Signed-off-by: Keith Packard <keithp@keithp.com>
Signed-off-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Eric Anholt <eric@anholt.net>
commit cc731ce0ca4d6c5c8d9c1130864e652a814644b4
Author: Keith Packard <keithp@keithp.com>
Date: Wed Oct 29 23:20:11 2014 -0700
glamor: Create inline tests for small/large pixmaps
This will let us eliminate the pixmap types shortly
Signed-off-by: Keith Packard <keithp@keithp.com>
Signed-off-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Eric Anholt <eric@anholt.net>
commit 020fcc582837b80b20843a09c1e28fa96096fe6b
Author: Keith Packard <keithp@keithp.com>
Date: Wed Oct 29 23:08:57 2014 -0700
glamor: Eliminate separate 'large' pixmap private structure
Just embed the large elements in the regular pixmap private and
collapse the union to a single struct.
Signed-off-by: Keith Packard <keithp@keithp.com>
Signed-off-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Eric Anholt <eric@anholt.net>
commit 9ef5cbf8ab8a51941d469bfcaca6cbfb7838d1ef
Author: Keith Packard <keithp@keithp.com>
Date: Wed Oct 29 22:54:27 2014 -0700
glamor: Remove unused glamor_pixmap_private_atlas_t
Signed-off-by: Keith Packard <keithp@keithp.com>
Signed-off-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Eric Anholt <eric@anholt.net>
commit af687396f1875de0a45683aad4fd5a9a2e00f10d
Author: Keith Packard <keithp@keithp.com>
Date: Wed Oct 29 22:50:53 2014 -0700
glamor: Remove screen private and pixmap ptrs from pixmap private and fbo
There's no reason to waste memory storing redundant copies of the same
pointer all over the system; just pass in pointers as necessary to
each function.
Signed-off-by: Keith Packard <keithp@keithp.com>
Signed-off-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Eric Anholt <eric@anholt.net>
commit 1eb954c3830d46c27bf2a61f825b59f12092728c
Author: Keith Packard <keithp@keithp.com>
Date: Wed Oct 29 21:31:32 2014 -0700
glamor: Remove remaining support for FBOs not matching pixmap size
The core rendering code already requires that FBOs be allocated at
exactly the pixmap size so that tiling and stippling work
correctly. Remove the allocation support for that, along with the
render code.
Signed-off-by: Keith Packard <keithp@keithp.com>
Signed-off-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Eric Anholt <eric@anholt.net>
commit adb847faeb51c567933fab97b97e79ee3d184dc8
Author: Keith Packard <keithp@keithp.com>
Date: Wed Oct 29 20:49:49 2014 -0700
glamor: Eliminate GLAMOR_TEXTURE_PACK pixmap type
This is not used anywhere
Signed-off-by: Keith Packard <keithp@keithp.com>
Signed-off-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Eric Anholt <eric@anholt.net>
commit 2f80c7791bb0b11f261cb1e3e0d89163dcdd0342
Author: Keith Packard <keithp@keithp.com>
Date: Wed Oct 29 20:48:40 2014 -0700
glamor: Eliminate GLAMOR_SEPARATE_TEXTURE pixmap type
This was only used to signal when we couldn't ask the DDX to draw to a
pixmap; now that we have no DDX-based fallbacks, we don't need to have
this type.
Signed-off-by: Keith Packard <keithp@keithp.com>
Signed-off-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Eric Anholt <eric@anholt.net>
commit c6ab13566798c7adff23a609575a7ac2d1ce2df6
Author: Keith Packard <keithp@keithp.com>
Date: Wed Oct 29 20:44:31 2014 -0700
glamor: Remove ddx fallback check functions
With no DDX-based fallback support, we can remove these functions as
they are no longer called.
Signed-off-by: Keith Packard <keithp@keithp.com>
Signed-off-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Eric Anholt <eric@anholt.net>
commit 90d326fcc687e6d6d4b308f6272ededcf8145a17
Author: Keith Packard <keithp@keithp.com>
Date: Wed Oct 29 20:40:21 2014 -0700
glamor: Remove _nf rendering functions
These were used by the non-standard glamor implementation in the intel
driver.
Signed-off-by: Keith Packard <keithp@keithp.com>
Signed-off-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Eric Anholt <eric@anholt.net>
commit 697f8581e04a93862a6049cc982d01d25f9a0410
Author: Keith Packard <keithp@keithp.com>
Date: Wed Oct 29 20:30:12 2014 -0700
glamor: Eliminate GLAMOR_USE_SCREEN and GLAMOR_USE_PICTURE_SCREEN
Remove these defines as we start to remove support for non-standard
glamor layering as used by the intel driver.
v2: Rebase on the blockhandler change and the Xephyr init failure
change (by anholt), fix stray NO_DRI3 addition to xwayland.
Signed-off-by: Keith Packard <keithp@keithp.com>
Signed-off-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Eric Anholt <eric@anholt.net>
commit 28ff815c4b32c88bd9007fd79f2acf3682a4b4db
Author: Keith Packard <keithp@keithp.com>
Date: Wed Oct 29 20:20:29 2014 -0700
glamor: Eliminate GLAMOR_CREATE_PIXMAP_MAP and GLAMOR_MEMORY_MAP
GLAMOR_MEMORY_MAP was only used with GLAMOR_CREATE_PIXMAP_MAP, and
GLAMOR_CREATE_PIXMAP_MAP doesn't appear to be used anywhere, so just
remove both of them.
v2: Fix a stray whitespace bug that was introduced (change by anholt).
Signed-off-by: Keith Packard <keithp@keithp.com>
Signed-off-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Eric Anholt <eric@anholt.net>
commit 0e1372e1bd8f79fa295738bc1e983cb3648ba4be
Author: Maarten Lankhorst <maarten.lankhorst@ubuntu.com>
Date: Mon Jan 19 12:37:55 2015 +0100
glamor: GL_TEXTURE_MAX_LEVEL is not available on GLES2
Remove the calls to GL_TEXTURE_MAX_LEVEL. Setting the filtering is
a sufficient hint to the driver about texture mipmap allocation.
Signed-off-by: Maarten Lankhorst <maarten.lankhorst@ubuntu.com>
Signed-off-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
commit c1f35c3d862f77cbd2fb871be5613fb0ca7e508b
Author: Maarten Lankhorst <maarten.lankhorst@ubuntu.com>
Date: Mon Jan 12 15:29:34 2015 +0100
glamor: Use GL_FRAMEBUFFER instead of GL_READ_FRAMEBUFFER
The latter might not be available on GLES2.
Signed-off-by: Maarten Lankhorst <maarten.lankhorst@ubuntu.com>
Signed-off-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Eric Anholt <eric@anholt.net>
commit b66501b4fd9c392e0f971ea356b27eb71c9c9e79
Author: Maarten Lankhorst <maarten.lankhorst@ubuntu.com>
Date: Mon Jan 19 12:36:52 2015 +0100
glamor: do not check for gl errors in glamor_build_program
According to Eric Anholt the check for glGetError is not needed here.
Because a opengl error might be set before this function is called
keeping the check could result in glamor_build_program returning
failure when building the shader succeeded.
Signed-off-by: Maarten Lankhorst <maarten.lankhorst@ubuntu.com>
Signed-off-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Eric Anholt <eric@anholt.net>
commit 7c6f483670770e4e534cafd4e70d0b1490f4cca6
Author: Maarten Lankhorst <maarten.lankhorst@ubuntu.com>
Date: Mon Jan 19 12:32:54 2015 +0100
glamor: only use (un)pack_subimage when available
Check for GL_EXT_unpack_subimage and GL_NV_pack_subimage to
check if GL_(UN)PACK_ROW_LENGTH is available. Set the offsets
manually to prevent calls to GL_(UN)PACK_SKIP_*.
v2: Check support for GL_NV_pack_subimage as suggested by Matt Turner.
Signed-off-by: Maarten Lankhorst <maarten.lankhorst@ubuntu.com>
Signed-off-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Eric Anholt <eric@anholt.net>
commit 4f534c26c64cc1edd33b04d30e4df818b7ae55d9
Author: Olivier Fourdan <ofourdan@redhat.com>
Date: Wed Jan 28 16:08:26 2015 +0100
xwayland: Add dependency on glamor libs
So that Xwayland gets re-linked each time glamor is modified.
Signed-off-by: Olivier Fourdan <ofourdan@redhat.com>
Signed-off-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Eric Anholt <eric@anholt.net>
commit 251a067993658fd02f158fef36476f898c238e3c
Author: Olivier Fourdan <ofourdan@redhat.com>
Date: Mon Feb 2 10:41:06 2015 +0100
ephyr: Fail if glamor is requested but not usable
Signed-off-by: Olivier Fourdan <ofourdan@redhat.com>
Signed-off-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
Reviewed-by: Eric Anholt <eric@anholt.net>
commit 23702dd2689e2e1e65be5767ac0303a985bb04a0
Author: Emil Velikov <emil.l.velikov@gmail.com>
Date: Thu Mar 19 12:26:29 2015 +0000
randr: coding style fixes
In most of xserver code-base we define new functions at column 0, with
their return type provided on the previous line. Two functions did not
follow this rule so update them, and get them wrapped up to 80 as an
added bonus.
Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
commit 739e8fac0e9d8d4c1653e53a8f3ce2d38b3de320
Author: Emil Velikov <emil.l.velikov@gmail.com>
Date: Thu Mar 19 12:22:18 2015 +0000
randr: wrap long line
Also make use of total_name_len variable for consistency.
Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
commit 363cd0e0b499ea8c32b2aa5cf7ea0f0a56b4c3ef
Author: Emil Velikov <emil.l.velikov@gmail.com>
Date: Thu Mar 19 12:19:23 2015 +0000
randr: use local variables where possible
This will allow us to make the code more readable, and the lines will
fit within 80 columns.
Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
commit 93ef0e580e9cdbe739046a0873971d402525ef00
Author: Emil Velikov <emil.l.velikov@gmail.com>
Date: Thu Mar 19 12:40:06 2015 +0000
randr: use randr: prefix in ErrorF()
To provide some information about the origin of the message.
Cc: Dave Airlie <airlied@redhat.com>
Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
commit a08ee773983c44ebb893f10a1dcfa443f2734277
Author: Emil Velikov <emil.l.velikov@gmail.com>
Date: Thu Mar 19 12:36:50 2015 +0000
randr: remove chatty error messages
All of these seem like left over from developments stage. Remove them as
they can cause excessive flood in the logs.
Cc: Dave Airlie <airlied@redhat.com>
Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
commit a34d29c2edd786f0baa0e7c334f4174eeecb71d2
Author: Emil Velikov <emil.l.velikov@gmail.com>
Date: Sun Mar 8 17:56:58 2015 +0000
configure.ac: remove remaining TLS references
No longer used with the removal of the GL dispatch (glapi) from libglx a
few releases ago.
Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
Reviewed-by: Eric Anholt <eric@anholt.net>
commit 95e83ff87ab0149ab01c9299524dfbe37d9b21a2
Author: Jon TURNEY <jon.turney@dronecode.org.uk>
Date: Thu Jul 12 02:00:43 2012 +0100
Don't allow both RandR XINERAMA and pseudoramiX XINERAMA extensions to register
Prevent RRXinerama from activating if PseudoramiX is, so we don't get XINERAMA
listed twice in the list of extensions. I think this is otherwise benign, as
the PseudoramiX XINERAMA gets registered first and thus handles all requests.
Perhaps AddExtension() ought to warn us if the extension name is already
registered?
This appears to be a long-standing bug seen in XQuartz, and now in XWin as well.
Future work: Perhaps since RRXinerama isn't actually doing anything useful but
faking it when we have one screen, it seems that the PseudoramiX code could be
also used in that case.
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
commit 234fe391802b114e96d60a6630f717f8e4fb726c
Author: Jon TURNEY <jon.turney@dronecode.org.uk>
Date: Fri Nov 7 13:38:20 2014 +0000
hw/xwin: Report OS version in log
Report OS version in log
Report if WoW64 is in use
Manifest for compatbility with Windows versions, so we don't get lied to by GetVersionEx()
Also, make the description in the manifest a bit more generic
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
commit 7a22912edbda826778463f8fefa9c8e689858bbe
Author: Jon TURNEY <jon.turney@dronecode.org.uk>
Date: Thu Nov 6 15:22:58 2014 +0000
hw/xwin: Remove Shadow DirectDraw engine
Maybe a long time ago this made some kind of sense, but now there's no good
reason to ever use this, rather than the Shadow DirectDraw NonLocking engine.
Also remove screen private data members used by other removed engines.
Also remove no longer needed OS version check in winDetectSupportedEngines()
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
commit 55a84be085e9f479f7907bed5fb68fc66ce81ae8
Author: Jon TURNEY <jon.turney@dronecode.org.uk>
Date: Sat Mar 3 20:13:19 2012 +0000
hw/xwin: Only set native positions if XINERAMA is enabled
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
commit 23e07d71b607c99c3a0a0ea362c70dcae73485c6
Author: Jon TURNEY <jon.turney@dronecode.org.uk>
Date: Thu Nov 6 14:28:17 2014 +0000
hw/xwin: Register native screens with pseudoramiX
Update man page to document pseudo-xinerama
v2: Make the use of PseudoramiXExtensionInit() match the prototype
v3: Update for nonsdk_extinit.h
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
commit e036cbfccbe33775524a469082306913843c63df
Author: Jon TURNEY <jon.turney@dronecode.org.uk>
Date: Thu Nov 6 13:54:11 2014 +0000
Make PseudoramiXExtensionInit() prototype more generally available
Make PseudoramiXExtensionInit() prototype available to hw/xwin
Rather than avoiding a reference to it being pulled in to Xorg by sdksyms by
hiding this prototype behind the INXQUARTZ define, which is only defined when
building Xquartz, introduce nonsdk_extinit.h and move it there.
(The only remaining use of INXQUARTZ is in mi/miiniext.c, in order
to do PseudoramiXExtensionInit() at the point apparently needed by Xquartz)
Also remove duplicate declaration of noPseudoramiXExtension from pseudoramiX.h
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
commit 3aad9b7556391b0f55e46ba13ced5e58d8fd47f7
Author: Jon TURNEY <jon.turney@dronecode.org.uk>
Date: Mon Nov 7 20:54:10 2011 +0000
hw/xwin: Turn on -hostintitle by default
Turn on -hostintitle by default
Provide -nohostintitle to disable if needed
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
commit b2aaf69e62f4109ffb8aaf39e9bd2571abb29dfb
Author: Jon TURNEY <jon.turney@dronecode.org.uk>
Date: Thu Jun 28 14:22:07 2012 +0100
hw/xwin: Report Cygwin version information in log
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
commit d02f9611c8d3bafca4be17c65efca3c5527f71e2
Author: Jon TURNEY <jon.turney@dronecode.org.uk>
Date: Mon Mar 16 16:29:29 2015 +0000
hw/xwin/glx: Improve code generator to deal with latest Khronos OpenGL registry XML
Improve the parsing of the <proto> XML element
Include all text from the param element, in the order it appears in the xml
document, as part of the formal parameter declaration
This is needed to correctly handle the XML description added in svn r27498 of
glPathGlyphIndexRangeNV()'s baseAndCount parameter of type GLuint[2]
This fixes the way the parameter declaration is generated so it is in the
correct form 'GLuint baseAndCount_[2]' and not 'GLuint baseAndCount[2]_'
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
commit 5071cb7e0ac5f17c48ed7f3f3b6f242dec802f66
Author: Jon TURNEY <jon.turney@dronecode.org.uk>
Date: Mon Mar 16 16:14:10 2015 +0000
hw/xwin/glx: Refactor parsing of the <proto> XML element
Factor out duplicated code used in parsing of the <proto> XML element in the
code generator
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
commit d3080d421bf0d91daea2e39bfc391c43d7fdad75
Author: Jon TURNEY <jon.turney@dronecode.org.uk>
Date: Thu Feb 5 20:29:48 2015 +0000
os: Teach vpnprintf() how to handle "%*.*s"
XdmcpFatal uses the format specifier %*.*s, which vpnprintf() doesn't
understand, which causes a backtrace and prevents the reason for the XDMCP
failure being logged.
See also:
https://bugs.freedesktop.org/show_bug.cgi?id=66862
https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=758574
"%*.*s" is also currently used in a few other places, so teach vpnprintf() how
to handle it
$ fgrep -r "%*.*s" *
hw/dmx/config/scanner.l: fprintf(stderr, "parse error on line %d at token \"%*.*s\"\n",
hw/dmx/dmxlog.c: ErrorF("(%s) dmx[i%d/%*.*s]: ", type,
hw/dmx/input/dmxinputinit.c: dmxLogCont(dmxInfo, "\t[i%d/%*.*s",
os/access.c: ErrorF("Xserver: siAddrMatch(): type = %s, value = %*.*s -- %s\n",
os/access.c: ("Xserver: siCheckAddr(): type = %s, value = %*.*s, len = %d -- %s\n",
os/xdmcp.c: FatalError("XDMCP fatal error: %s %*.*s\n", type,
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
commit 491cf02e191e70c5ce24c19da880bb79bebfc03c
Author: Jon TURNEY <jon.turney@dronecode.org.uk>
Date: Tue Feb 10 14:37:26 2015 +0000
os: XDMCP options like -query etc. should imply -listen tcp
In X server 1.17, the default configuration is now -nolisten tcp. In this
configuration, XDMCP options don't work usefully, as the X server is not
listening on the port for the display that it tells the display manager to
connect to.
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
commit f42520c5f151bda25e52ae8b0408a421c3fba7e5
Author: Jon TURNEY <jon.turney@dronecode.org.uk>
Date: Wed Feb 4 17:04:45 2015 +0000
ephyr: Avoid a segfault with 'DISPLAY= Xephy -glamor'
ephyr_glamor_connect() returns NULL if we failed, but applying
xcb_connection_has_error() to NULL is not permitted.
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Reviewed-by: Daniel Martin <consume.noise@gmail.com>
Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
commit 0a78b599b34cc8b5fe6fe82f90e90234e8ab7a56
Author: Jürg Billeter <j@bitron.ch>
Date: Sat Feb 7 18:13:21 2015 +0100
int10: Fix error check for pci_device_map_legacy
pci_device_map_legacy returns 0 on success.
Signed-off-by: Jürg Billeter <j@bitron.ch>
Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 21b896939c5bb242f3aacc37baf12379e43254b6
Author: Egbert Eich <eich@freedesktop.org>
Date: Tue Mar 3 16:27:05 2015 +0100
symbols: Fix sdksyms.sh to cope with gcc5
Gcc5 adds additional lines stating line numbers before and
after __attribute__() which need to be skipped.
Signed-off-by: Egbert Eich <eich@freedesktop.org>
Tested-by: Daniel Stone <daniels@collabora.com>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 7ea64fb4374504bd3d524fc08c90efdab9f253ea
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Mon Mar 9 09:55:57 2015 -0700
Clear ListenTransConns entries in CloseWellKnownConnections
Since _XSERVTransClose frees the connection pointer passed to it,
remove that pointer from the array, so we don't try to double free it
if we come back into CloseWellKnownConnections again.
Should fix https://bugzilla.yoctoproject.org/show_bug.cgi?id=6665 in which
the shutdown section of the main() loop called CloseWellKnownConnections()
and then moved on to ddxGiveUp(), which failed to release the VT and thus
called AbortServer(), which called CloseWellKnownConnections() again.
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 6d3cf35a6f0856ac44a7be560e2265461f9bb32b
Author: Emil Velikov <emil.l.velikov@gmail.com>
Date: Mon Mar 9 12:00:52 2015 +0000
autogen.sh: use quoted string variables
Place quotes around the $srcdir, $ORIGDIR and $0 variables to prevent
fall-outs, when they contain space.
Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 5c4202ea85aaea2a4dc7eb29776357a2ba13e191
Author: Michal Srb <msrb@suse.com>
Date: Thu Feb 19 14:57:27 2015 +0200
Expose GetMaster to modules.
Add _X_EXPORT to GetMaster function. It is required by tigervnc's VNC module.
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit f485a1af64bb00c696ea9f79961786bd791eaec1
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Tue Dec 16 14:43:29 2014 +1000
Drop valuator mask argument from GetKeyboardEvents
Nothing was using it and if anyone had they would've gotten a warning and
noticed that it doesn't actually work. Drop this, it has been unused for years.
Input ABI 22
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Daniel Stone <daniel@fooishbar.org>
commit 9d9bd38fe1454590c303dc936ddac913808bf881
Author: Dave Airlie <airlied@redhat.com>
Date: Tue Feb 17 14:40:27 2015 +1000
os/access: fix regression in server interpreted auth
This was reported on irc on Fedora when rawhide went to 1.17.1.
regression occured in: 2566835b4374edb3e5a8353d4f7c9e7ec4851c57
os: Eliminate uninitialized value warnings from access.c
siAddrMatch doesn't need addr to be a useful value, it checks
some things like localuser without having an address at all.
Signed-off-by: Dave Airlie <airlied@redhat.com>
Tested-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 3a06faf3fcdb7451125a46181f9152e8e59e9770
Author: Keith Packard <keithp@keithp.com>
Date: Tue Feb 10 22:16:49 2015 -0800
Mark development version for 1.18
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 4a758f59a8a65c313244e06852745c8e180ff247
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Fri Dec 12 22:38:26 2014 -0800
dmx: include header for DMXExtensionInit() in dmx.c
Gets rid of gcc 4.8 warning:
dmx.c:1193:1: warning: no previous prototype for ‘DMXExtensionInit’ [-Wmissing-prototypes]
DMXExtensionInit(void)
^
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Rémi Cardona <remi@gentoo.org>
Reviewed-by: Keith Packard <keithp@keithp.com>
commit a0e44ddfb0c641e7896a55abf26621ae3d17e337
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Fri Dec 12 22:33:54 2014 -0800
dmx: constify GCOps & GCFuncs pointers
Gets rid of 16 instances of gcc 4.8 warnings:
In file included from dmxgc.c:41:0:
dmx.h:327:23: warning: assignment discards ‘const’ qualifier from
pointer target type [enabled by default]
(_saved)->_entry = (_actual)->_entry; \
^
dmxgc.h:80:5: note: in expansion of macro ‘DMX_WRAP’
DMX_WRAP(funcs, &dmxGCFuncs, _pGCPriv, (_pGC)); \
^
dmxgc.c:192:5: note: in expansion of macro ‘DMX_GC_FUNC_EPILOGUE’
DMX_GC_FUNC_EPILOGUE(pGC);
^
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Rémi Cardona <remi@gentoo.org>
Reviewed-by: Keith Packard <keithp@keithp.com>
commit 9682c47e228962e4008855c4da7467748742685e
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Fri Dec 12 22:20:24 2014 -0800
dmx: Mark glxIsExtensionSupported as a const char *
Gets rid of 9 instances of gcc 4.8 warning:
glxcmds.c: In function ‘CreateContext’:
glxcmds.c:378:13: warning: passing argument 1 of ‘glxIsExtensionSupported’
discards ‘const’ qualifier from pointer target type [enabled by default]
else if (glxIsExtensionSupported("GLX_SGIX_fbconfig")) {
^
In file included from glxserver.h:49:0,
from glxcmds.c:41:
glxscreens.h:53:12: note: expected ‘char *’ but argument is of type
‘const char *’
extern int glxIsExtensionSupported(char *ext);
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Rémi Cardona <remi@gentoo.org>
Reviewed-by: Keith Packard <keithp@keithp.com>
commit 45ec646d77086eeb5f94766b055a93b5c75bdef0
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Fri Dec 12 22:16:49 2014 -0800
dmx: remove redundant redeclarations of variables from other headers
Gets rid of these gcc 4.8 warnings:
dmxcb.c:50:12: warning: redundant redeclaration of ‘PanoramiXPixWidth’
[-Wredundant-decls]
extern int PanoramiXPixWidth;
^
In file included from dmxcb.c:49:0:
../../Xext/panoramiXsrv.h:12:22: note: previous declaration of
‘PanoramiXPixWidth’ was here
extern _X_EXPORT int PanoramiXPixWidth;
^
dmxcb.c:51:12: warning: redundant redeclaration of ‘PanoramiXPixHeight’
[-Wredundant-decls]
extern int PanoramiXPixHeight;
^
In file included from dmxcb.c:49:0:
../../Xext/panoramiXsrv.h:13:22: note: previous declaration of
‘PanoramiXPixHeight’ was here
extern _X_EXPORT int PanoramiXPixHeight;
^
dmxcb.c:52:12: warning: redundant redeclaration of ‘PanoramiXNumScreens’
[-Wredundant-decls]
extern int PanoramiXNumScreens;
^
In file included from dmxcb.c:49:0:
../../Xext/panoramiXsrv.h:11:22: note: previous declaration of
‘PanoramiXNumScreens’ was here
extern _X_EXPORT int PanoramiXNumScreens;
^
dmxpict.c:60:12: warning: redundant redeclaration of ‘RenderErrBase’
[-Wredundant-decls]
extern int RenderErrBase;
^
In file included from ../../render/glyphstr.h:29:0,
from ../../render/picturestr.h:28,
from dmx.h:65,
from dmxpict.c:42:
../../render/picture.h:176:22: note: previous declaration of ‘RenderErrBase’
was here
extern _X_EXPORT int RenderErrBase;
^
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Rémi Cardona <remi@gentoo.org>
Reviewed-by: Keith Packard <keithp@keithp.com>
commit 1033b85196e0f25877b4b9081993aff16bf32138
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Fri Dec 12 22:13:28 2014 -0800
dmx: remove redundant declaration of dmxFontPrivateIndex from dmxfont.h
Gets rid of 8 instances of gcc 4.8 warning:
In file included from glxcmds.c:38:0:
../../../hw/dmx/dmxfont.h:57:12: warning: redundant redeclaration of
‘dmxFontPrivateIndex’ [-Wredundant-decls]
extern int dmxFontPrivateIndex;
^
In file included from glxcmds.c:35:0:
../../../hw/dmx/dmx.h:388:12: note: previous declaration of
‘dmxFontPrivateIndex’ was here
extern int dmxFontPrivateIndex; /**< Private index for Fonts */
^
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Rémi Cardona <remi@gentoo.org>
Reviewed-by: Keith Packard <keithp@keithp.com>
commit ac64a653fb4935a799baca7545ba6ca401e20fa1
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Fri Dec 12 22:09:14 2014 -0800
dmx: glxproxy prototype cleanup
Gets rid of 107 -Wmissing-prototypes & -Wredundant-decls warnings
from gcc 4.8
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Rémi Cardona <remi@gentoo.org>
Reviewed-by: Keith Packard <keithp@keithp.com>
commit bd563fd48f909094d6660854e97811ad7e676ddf
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Fri Dec 12 21:11:17 2014 -0800
dmx: more unshadowing of variables
Gets rid of gcc 4.8 warnings:
dmxinputinit.c: In function ‘dmxInputScanForExtensions’:
dmxinputinit.c:877:14: warning: declaration of ‘display’ shadows a global declaration [-Wshadow]
Display *display;
^
In file included from ../../../include/windowstr.h:60:0,
from dmxinputinit.c:72:
../../../include/opaque.h:52:30: warning: shadowed declaration is here [-Wshadow]
extern _X_EXPORT const char *display;
^
glxcmds.c: In function ‘__glXCreatePbuffer’:
glxcmds.c:3397:21: warning: declaration of ‘pc’ shadows a parameter [-Wshadow]
CARD32 *pc = (CARD32 *) (be_req + 1);
^
glxcmds.c:3314:52: warning: shadowed declaration is here [-Wshadow]
__glXCreatePbuffer(__GLXclientState * cl, GLbyte * pc)
^
glxscreens.c: In function ‘CalcServerVersionAndExtensions’:
glxscreens.c:139:35: warning: declaration of ‘req’ shadows a previous local [-Wshadow]
xGLXQueryServerStringReq *req;
^
glxscreens.c:68:26: warning: shadowed declaration is here [-Wshadow]
xGLXQueryVersionReq *req;
^
glxscreens.c:140:36: warning: declaration of ‘reply’ shadows a previous local [-Wshadow]
xGLXQueryServerStringReply reply;
^
glxscreens.c:69:27: warning: shadowed declaration is here [-Wshadow]
xGLXQueryVersionReply reply;
^
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Rémi Cardona <remi@gentoo.org>
Reviewed-by: Keith Packard <keithp@keithp.com>
commit 57e08fae82f733304200a473f55b86e689404c13
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Fri Dec 12 21:07:12 2014 -0800
dmx: attempt to untangle nested loops using same index variable
This doesn't just make gcc sad, it makes my brain sad.
Change from:
for (i = 0; i < dmxNumScreens; i++) {
int i;
for (i = 0; i < nconfigs; i++) {
for (j = 0; j < dmxScreen->beNumVisuals; j++) {
to the easier to follow:
for (i = 0; i < dmxNumScreens; i++) {
for (j = 0; j < nconfigs; j++) {
for (k = 0; k < dmxScreen->beNumVisuals; k++) {
Gets rid of gcc 4.8 warning:
dmxinit.c: In function ‘InitOutput’:
dmxinit.c:765:17: warning: declaration of ‘i’ shadows a previous local [-Wshadow]
int i;
^
dmxinit.c:608:9: warning: shadowed declaration is here [-Wshadow]
int i;
^
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Rémi Cardona <remi@gentoo.org>
Reviewed-by: Keith Packard <keithp@keithp.com>
commit 0fbebad72428abbc9fc3fa9f406f7a7e1b9d95b2
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Fri Dec 12 20:53:33 2014 -0800
dmx: remove unused variables
Gets rid of gcc 4.8 warnings:
dmxscrinit.c: In function ‘dmxBEScreenInit’:
dmxscrinit.c:83:15: warning: unused variable ‘gcvals’ [-Wunused-variable]
XGCValues gcvals;
^
dmxwindow.c: In function ‘dmxResizeWindow’:
dmxwindow.c:860:19: warning: variable ‘pSibPriv’ set but not used [-Wunused-but-set-variable]
dmxWinPrivPtr pSibPriv;
^
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Rémi Cardona <remi@gentoo.org>
Reviewed-by: Keith Packard <keithp@keithp.com>
commit f358f0d50cadaf10f7d97e21da00419a4a37c4e1
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Fri Dec 12 19:09:36 2014 -0800
dmx: fix printf format argument warnings
Gets rid of these gcc 4.8 warnings:
dmxinit.c: In function ‘dmxErrorHandler’:
dmxinit.c:167:16: warning: format ‘%x’ expects argument of type ‘unsigned int’,
but argument 3 has type ‘XID64’ [-Wformat=]
ev->resourceid);
^
dmxinit.c:171:16: warning: format ‘%x’ expects argument of type ‘unsigned int’,
but argument 3 has type ‘XID64’ [-Wformat=]
ev->resourceid);
^
dmxinit.c:175:16: warning: format ‘%x’ expects argument of type ‘unsigned int’,
but argument 3 has type ‘XID64’ [-Wformat=]
ev->resourceid);
^
dmxinit.c:181:12: warning: format ‘%d’ expects argument of type ‘int’,
but argument 3 has type ‘long unsigned int’ [-Wformat=]
ev->serial);
^
dmxinit.c:183:12: warning: format ‘%d’ expects argument of type ‘int’,
but argument 3 has type ‘long unsigned int’ [-Wformat=]
dpy->request);
^
dmxinit.c: In function ‘InitOutput’:
dmxinit.c:637:9: warning: format ‘%d’ expects argument of type ‘int’,
but argument 3 has type ‘long unsigned int’ [-Wformat=]
dmxLog(dmxInfo, "Generation: %d\n", dmxGeneration);
^
dmxprop.c: In function ‘dmxPropertyCheckOtherWindows’:
dmxprop.c:223:24: warning: format ‘%lu’ expects argument of type ‘long
unsigned int’, but argument 4 has type ‘Window’ [-Wformat=]
dmxScreen->name, win, tp.value);
^
dmxprop.c: In function ‘dmxPropertyWindow’:
dmxprop.c:364:16: warning: format ‘%lu’ expects argument of type ‘long
unsigned int’, but argument 5 has type ‘Window’ [-Wformat=]
other->index, other->name, other->scrnWin);
^
dmxprop.c:364:16: warning: format ‘%lu’ expects argument of type ‘long
unsigned int’, but argument 8 has type ‘Window’ [-Wformat=]
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Rémi Cardona <remi@gentoo.org>
Reviewed-by: Keith Packard <keithp@keithp.com>
commit 11af200b004b4810c9267e3e16449c3175c64d4a
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Fri Dec 12 18:58:01 2014 -0800
dmx: move format strings inline so gcc can check
Gets rid of gcc 4.8 warnings:
dmxprint.c: In function ‘dmxConfigPrintPair’:
dmxprint.c:284:25: warning: format not a string literal,
argument types not checked [-Wformat-nonliteral]
p->ysign < 0 ? '-' : '+', p->y);
^
dmxprint.c:289:9: warning: format not a string literal,
argument types not checked [-Wformat-nonliteral]
dmxConfigOutput(addSpace, 0, p->comment, format, p->x, p->y);
^
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Rémi Cardona <remi@gentoo.org>
Reviewed-by: Keith Packard <keithp@keithp.com>
commit 5e01eac10e915568324aff81b51d3af558757042
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Fri Dec 12 18:52:05 2014 -0800
dmx: Add _X_ATTRIBUTE_PRINTF to dmxConfigLog() & dmxConfigOutput()
Gets rid of gcc 4.8 warnings:
dmxparse.c: In function ‘dmxConfigLog’:
dmxparse.c:61:5: warning: function might be possible candidate for
‘gnu_printf’ format attribute [-Wsuggest-attribute=format]
vprintf(format, args); /* RATS: All calls to dmxConfigLog from
^
dmxprint.c: In function ‘dmxConfigOutput’:
dmxprint.c:149:9: warning: function might be possible candidate for
‘gnu_printf’ format attribute [-Wsuggest-attribute=format]
pos += vfprintf(str, format, args); /* assumes no newlines! */
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Rémi Cardona <remi@gentoo.org>
Reviewed-by: Keith Packard <keithp@keithp.com>
commit 9e002dfcd71439fd81563db1f70e8c1964d52fab
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Tue Dec 9 18:27:11 2014 -0800
Get rid of const warnings in XSERVER_INPUT_EVENT dtrace probe calls
Use typedefs to work around dtrace dropping const qualifiers from probe
arguments when generating Xserver-dtrace.h. Add new probes.h header to
avoid having to replicate these typedefs in every file with dtrace probes.
Gets rid of these warnings from gcc 4.8:
getevents.c:1096:9:
warning: passing argument 6 of '__dtrace_Xserver___input__event' discards
'const' qualifier from pointer target type [enabled by default]
getevents.c:1096:9:
warning: passing argument 7 of '__dtrace_Xserver___input__event' disards
'const' qualifier from pointer target type [enabled by default]
getevents.c:1651:9:
warning: passing argument 6 of '__dtrace_Xserver___input__event' disards
'const' qualifier from pointer target type [enabled by default]
getevents.c:1651:9:
warning: passing argument 7 of '__dtrace_Xserver___input__event' disards
'const' qualifier from pointer target type [enabled by default]
getevents.c:1791:9:
warning: passing argument 6 of '__dtrace_Xserver___input__event' disards
'const' qualifier from pointer target type [enabled by default]
getevents.c:1791:9:
warning: passing argument 7 of '__dtrace_Xserver___input__event' disards
'const' qualifier from pointer target type [enabled by default]
getevents.c:1921:9:
warning: passing argument 6 of '__dtrace_Xserver___input__event' disards
'const' qualifier from pointer target type [enabled by default]
getevents.c:1921:9:
warning: passing argument 7 of '__dtrace_Xserver___input__event' disards
'const' qualifier from pointer target type [enabled by default]
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 20079c36cf7d377938ca5478447d8b9045cb7d43
Author: Olivier Fourdan <ofourdan@redhat.com>
Date: Fri Jan 16 08:44:45 2015 +0100
xkb: Check strings length against request size
Ensure that the given strings length in an XkbSetGeometry request remain
within the limits of the size of the request.
Signed-off-by: Olivier Fourdan <ofourdan@redhat.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 81c90dc8f0aae3b65730409b1b615b5fa7280ebd
Author: Olivier Fourdan <ofourdan@redhat.com>
Date: Fri Jan 16 20:08:59 2015 +0100
xkb: Don't swap XkbSetGeometry data in the input buffer
The XkbSetGeometry request embeds data which needs to be swapped when the
server and the client have different endianess.
_XkbSetGeometry() invokes functions that swap these data directly in the
input buffer.
However, ProcXkbSetGeometry() may call _XkbSetGeometry() more than once
(if there is more than one keyboard), thus causing on swapped clients the
same data to be swapped twice in memory, further causing a server crash
because the strings lengths on the second time are way off bounds.
To allow _XkbSetGeometry() to run reliably more than once with swapped
clients, do not swap the data in the buffer, use variables instead.
Signed-off-by: Olivier Fourdan <ofourdan@redhat.com>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 28f6427aec1f5a1982e1c01eff45af0d401bf659
Author: Keith Packard <keithp@keithp.com>
Date: Mon Feb 2 07:41:06 2015 +0100
Update to version 1.17.0
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 697b696e5e24d0679f133183a3bb0852025377c2
Author: Dave Airlie <airlied@redhat.com>
Date: Fri Jan 30 09:59:49 2015 +1000
config/udev: Respect seat assignments when assigned devices
Jonathan Dieter posted a few patches to do this inside the Xorg
server but it makes no sense to do it there, just have the code
we use to probe the device list at startup check seat assignments
using the same code we check at hotplug time.
Bugilla: https://bugzilla.redhat.com/show_bug.cgi?id=1183654
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Acked-by: Hans de Goede <hdegoede@redhat.com>
Tested-by: Jonathan Dieter <jdieter@lesbg.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit df1b401f57ad4b4925bad66684445b476562f26f
Author: Dave Airlie <airlied@redhat.com>
Date: Wed Jan 7 09:19:27 2015 +1000
randr: attempt to fix primary on slave output (v2)
If the user wants to set one of the slave devices as
the primary output, we shouldn't fail to do so,
we were returning BadMatch which was tripping up
gnome-settings-daemon and bad things ensues.
Fix all the places we use primaryOutput to work
out primaryCrtc and take it into a/c when slave
gpus are in use.
v2: review from Aaron, fix indent, unhide has_primary from
macro. I left the int vs Bool alone to be consistent with
code below, a future patch could fix both.
Signed-off-by: Dave Airlie <airlied@redhat.com>
Reviewed-by: Aaron Plattner <aplattner@nvidia.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 62fcd364ac8c71a2db1db84b17b17cade6832492
Author: Adel Gadllah <adel.gadllah@gmail.com>
Date: Sat Jan 3 21:12:25 2015 +0100
dri2: Set vdpau driver name if ddx does not provide any driver name
Currently when the ddx does not set any driver name we set DRI2 driver but
not the VDPAU driver name. The result is that VDPAU drivers will not get found
by libvdpau when the modesetting driver is being used.
Just assume that the VDPAU driver matches the DRI2 driver name, this is true
for nouveau, r300, r600 and radeonsi i.e all VDPAU drivers currently supported
by mesa.
Signed-off-by: Adel Gadllah <adel.gadllah@gmail.com>
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit fe4c774c572e3f55a7417f0ca336ae1479a966ad
Author: Nikhil Mahale <nmahale@nvidia.com>
Date: Sat Jan 24 17:06:59 2015 -0800
os: Fix timer race conditions
Fixing following kind of race-conditions -
WaitForSomething()
|
----> // timers -> timer-1 -> timer-2 -> null
while (timers && (int) (timers->expires - now) <= 0)
// prototype - DoTimer(OsTimerPtr timer, CARD32 now, OsTimerPtr *prev)
DoTimer(timers, now, &timers)
|
|
----> OsBlockSignals(); .... OS Signal comes just before blocking it,
.... timer-1 handler gets called.
// timer-1 gets served and scheduled again;
// timers -> timer-2 -> timer-1 -> null
....
*prev = timer->next;
timer->next = NULL; // timers -> null
// timers list gets corrupted here and timer-2 gets removed from list.
Fixes: https://bugs.freedesktop.org/show_bug.cgi?id=86288
Signed-off-by: Nikhil Mahale <nmahale@nvidia.com>
Reviewed-by: Julien Cristau <jcristau@debian.org>
v2: Apply warning fixes from Keith Packard <keithp@keithp.com>
Reviewed-by: Aaron Plattner <aplattner@nvidia.com>
Signed-off-by: Aaron Plattner <aplattner@nvidia.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 58f28b0427f0a0c0c445f314bd42721ca8e1e844
Author: Keith Packard <keithp@keithp.com>
Date: Fri Jan 23 10:59:39 2015 -0800
Update to version 1.16.99.902
Signed-off-by: Keith Packard <keithp@keithp.com>
commit fef2f6357b40b238ae01c4c80b0d29b17b839686
Author: Jason Ekstrand <jason@jlekstrand.net>
Date: Tue Jan 13 15:08:38 2015 -0800
modesetting: Return the crtc for a drawable even if it's rotated
All of our checks for what crtc we are on take rotation into account so we
select the correct crtc. The only problem is that we weren't returning it
we were rotated. This caused X to think DRI3 apps were not on any crtc and
limit them to 1 FPS.
Signed-off-by: Jason Ekstrand <jason.ekstrand@intel.com>
Reviewed-by: Keith Packard <keithp@keithp.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 3dcd591fa9b71a3dce58d612ca5970209d8386eb
Author: Jason Ekstrand <jason@jlekstrand.net>
Date: Tue Jan 13 15:08:37 2015 -0800
modesetting: Add support for using RandR shadow buffers
This replaces the stubs for shadow buffer creation/allocation with actual
functions and adds a shadow_destroy function. With this, we actually get
shadow buffers and RandR now works properly. Most of this is copied from
the xf86-video-intel driver and modified for modesetting.
v2 Jason Ekstrand <jason.ekstrand@intel.com>:
- Fix build with --disable-glamor
- Set the pixel data pointer in the pixmap header for dumb shadow bo's
- Call drmmode_create_bo with the right bpp
v2 Jason Ekstrand <jason.ekstrand@intel.com>:
- Make shadow buffers per-crtc and leave shadow_enable alone
Signed-off-by: Jason Ekstrand <jason.ekstrand@intel.com>
Reviewed-by: Keith Packard <keithp@keithp.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 7c656bfcae1d68aeffd5e202b3c1569885f5d13d
Author: Jason Ekstrand <jason@jlekstrand.net>
Date: Tue Jan 13 15:08:36 2015 -0800
modesetting: Add drmmode_bo_has_bo and drmmode_bo_map helper function
Signed-off-by: Jason Ekstrand <jason.ekstrand@intel.com>
Reviewed-by: Keith Packard <keithp@keithp.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit b4703a5a6e529b78810db8d8782317f0b4e2f265
Author: Jason Ekstrand <jason@jlekstrand.net>
Date: Tue Jan 13 15:08:35 2015 -0800
modesetting: Refactor drmmode_glamor_new_screen_pixmap
The original drmmode_glamor_new_screen_pixmap function was specific to the
primary screen pixmap. This commit pulls the guts out into a new, more
general, drmmode_set_pixmap_bo function for setting a buffer on a pixmap.
The new function also properly tears down the glamor bits if the buffer
being set is NULL. The drmmode_glamor_new_screen_pixmap function is now
just a 3-line wrapper around drmmode_set_pixmap_bo.
v2 Jason Ekstrand <jason.ekstrand@intel.com>:
- Re-arranged code in drmmode_set_pixmap_bo and
drmmode_glamor_handle_new_screen_pixmap so that glamor_set_screen_pixmap
only gets called for the screen pixmap
- Guard the call to glamor_set_screen_pixmapa with a drmmode->glamor check
Signed-off-by: Jason Ekstrand <jason.ekstrand@intel.com>
Reviewed-by: Keith Packard <keithp@keithp.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit bb23fbf5bb278113c9c481875423b4d128180972
Author: Adam Jackson <ajax@redhat.com>
Date: Mon Jan 5 16:48:11 2015 -0500
dix: make RegionInit legal C++
The CVE fix in:
commit 97015a07b9e15d8ec5608b95d95ec0eb51202acb
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Wed Jan 22 22:37:15 2014 -0800
dix: integer overflow in RegionSizeof() [CVE-2014-8092 3/4]
offended the C++ demons:
../../include/regionstr.h:147:45: error: invalid conversion from 'void*' to
'pixman_region16_data_t* {aka pixman_region16_data*}' [-fpermissive]
Normally this isn't a problem, because around here we have the sense and
common decency to not use C++, but this does make tigervnc fail to build,
which is a little rude of us.
Signed-off-by: Adam Jackson <ajax@redhat.com>
Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 082931014811e587a9734cbf4d88fd948979b641
Author: Chris Wilson <chris@chris-wilson.co.uk>
Date: Sat Jan 17 10:09:54 2015 +0000
dri2: SourceOffloads may be for DRI3 only
As a DDX may declare offload support without supporting DRI2
(because it is using an alternative acceleration mechanism like DRI3),
when iterating the list of offload_source Screens to find a matching
DRI2 provider we need to check before assuming it is DRI2 capable.
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=88514
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Reviewed-by: Dave Airlie <airlied@redhat.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit f27d743c1899f307ec8063febbb3198c8945d372
Author: Carlos Olmedo Escobar <carlos.olmedo.e@gmail.com>
Date: Wed Jan 21 01:44:54 2015 +0100
Avoid possible null pointer dereference.
Signed-off-by: Carlos Olmedo Escobar <carlos.olmedo.e@gmail.com>
Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 437d2ec5f250f8ab4b44cbae56f938719802e1cc
Author: Carlos Sánchez de La Lama <csanchezdll@gmail.com>
Date: Wed Jan 21 10:22:05 2015 +0100
randr: swap num-preferred field on RRGetOutputInfo reply
Fixes: https://bugs.freedesktop.org/show_bug.cgi?id=88614
Signed-off-by: Carlos Sánchez de La Lama <csanchezdll@gmail.com>
Reviewed-by: Dave Airlie <airlied@redhat.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 3d12941b408de7a3bdc579e34e119f8aa81ea926
Author: Keith Packard <keithp@keithp.com>
Date: Thu Jan 22 22:28:34 2015 -0800
drivers/modesetting: Save current BlockHandler on return in msBlockHandler
If the BlockHandler chain is modified while it is active, we need to
re-fetch the current value and store it in our private for use the
next time through.
Signed-off-by: Dave Airlie <airlied@redhat.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit b3e496c6d21058147de9a11b78860e73c74db3cb
Author: Dave Airlie <airlied@redhat.com>
Date: Fri Jan 23 16:28:28 2015 +1000
glamor: use screen blockhandler rather than dix one (v3)
This adds glamor into the block handler call chain
in the correct place.
This should fix interactions between glamor and drivers
requiring damage from glamor.
v2: okay don't consolidate, just leave things wierd for now
remove blcokhandler in screen close.
v3: block handler wrapping the right way.
Signed-off-by: Dave Airlie <airlied@redhat.com>
Reviewed-by: Keith Packard <keithp@keithp.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 5af2f5b7d2f955586d0cb40eb30812f1893db22e
Author: Markus Wick <markus@selfnet.de>
Date: Thu Jan 15 22:03:18 2015 +0100
xwayland: Set glamor filter to nearest
glEGLImageTargetTexture2DOES only set the first level.
Mesa handles this new texture as incomplete and renders a black screen.
We also want to prevent linear filtering.
https://bugs.freedesktop.org/show_bug.cgi?id=81800
Signed-off-by: Markus Wick <markus@selfnet.de>
Reviewed-and-Tested-by: Michel Dänzer <michel.daenzer@amd.com>
Reviewed-by: Eric Anholt <eric@anholt.net>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 5f2e8ac51ccbf7c02f25c8cb7617df0238418cd1
Merge: 4e12d7b6f4 4301479508
Author: Keith Packard <keithp@keithp.com>
Date: Sat Jan 10 14:51:57 2015 +1300
Merge remote-tracking branch 'whot/for-keith'
commit 4e12d7b6f4489fa06475465993a3e1e1d896390b
Author: Jasper St. Pierre <jstpierre@mecheye.net>
Date: Sun Jan 4 23:27:32 2015 -0800
modesetting: Update the cursor without hiding it
In the new KMS APIs, the legacy drmModeSetCursor ioctl actually waits
for a vblank after changing the cursor image before returning, meaning
that the X server, in attempting to hide the cursor before updating
its image, actually makes that hide *visible* for a full vblank.
It's unknown why the X server does this by default, but turn it off.
If we're with a legacy driver that doesn't support the modern
drmModeSetCursor by waiting for a vblank before returning, we're going
to get a tiny bit of tearing on the cursor plane. But between tearing
with a new cursor image and tearing with a blank cursor image, I'd
rather the former.
The only proper solution to this is an atomic ioctl that page flips
all planes, including the cursor plane, at vblank time and at the same
time.
Signed-off-by: Keith Packard <keithp@keithp.com>
Reviewed-by: Keith Packard <keithp@keithp.com>
commit 43014795087a0a8774dd9687f5967329b15f06a2
Author: Olivier Fourdan <ofourdan@redhat.com>
Date: Mon Jan 5 16:44:22 2015 +0100
Synchronize capslock in Xnest and Xephyr
In Xnest or Xephyr, pressing CapsLock when focus is on another
window does not update the state in the nested X server.
This is because when synchronizing the lock modifier, sending a
keypress or a key release only is not sufficient to toggle the state,
unlike regular modifiers, one has to emulate a full press/release
to lock or unlock the modifier.
Signed-off-by: Olivier Fourdan <ofourdan@redhat.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 24b943132f90bc72ce8b5dc954fe9ee8484edfc2
Author: Olivier Fourdan <fourdan@xfce.org>
Date: Fri Jan 2 18:50:17 2015 +0100
Fix subwindow in Xi emulated events
Bug: 70790
Signed-off-by: Olivier Fourdan <fourdan@xfce.org>
commit b058dec281568d6a9c5b5e230c20eed096cbdc6d
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Mon Jan 5 11:19:46 2015 +1000
mi: fix accidental x/y coordinate swap
Reported-by: Adam Greenblatt <adam.greenblatt@gmail.com>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Eric Anholt <eric@anholt.net>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 23a11fd85e12e94d29ee6d33715ac49684867b16
Author: Keith Packard <keithp@keithp.com>
Date: Sun Jan 4 19:13:35 2015 -0800
doc: Create a script to filter xmlto output
This reduces the build log spam while still preserving the xmlto
status to catch build failures correctly.
Signed-off-by: Keith Packard <keithp@keithp.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 1c01633877caa4239f901f02fbe113926318d030
Merge: 3573855514 e774663fa5
Author: Keith Packard <keithp@keithp.com>
Date: Sun Jan 4 17:02:25 2015 -0800
Merge remote-tracking branch 'ajax/xserver-next'
commit 3573855514557a518de40a93b3c578f28c7d9c2b
Author: Olivier Fourdan <ofourdan@redhat.com>
Date: Wed Dec 3 13:49:37 2014 +0100
Remove explicit dependency on $(WAYLAND_LIBS)
Xwayland Makefile explicitely set its dependencies on
WAYLAND_LIBS. If the ibrairies are installed in a non-standard
path, WAYLAND_LIBS contains '-L/path/to/the/lib' which will fail
at build time with:
"No rule to make target '-L/path/to/the/lib', needed by 'Xwayland'.
Stop"
Remove that explicit dependency to avoid the problem (LDADD ought
to be enough to get the right libraries linked).
Signed-off-by: Olivier Fourdan <ofourdan@redhat.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit de89c6b8c6e81bad131c7f432e355cb42d233e87
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Tue Dec 16 13:59:45 2014 +1000
xfree86: rename Xorg.bin to Xorg
If the suid wrapper is enabled, /usr/bin/Xorg is just a shell script that
execs either /usr/libexec/Xorg.bin directly or the Xorg.wrap binary which then
execve's /usr/libexec/Xorg.bin.
Either way, we end up with Xorg.bin, which is problematic for two reasons:
* ps shows the command as Xorg.bin
* _COMM and _EXE in systemd's journal will both show Xorg.bin as well
There's not much we can do about the path, but having the actual command stay
as Xorg means better compatibility to existing scripts. And, the reason for
this path: the command
journalctl _COMM=Xorg
works universally, regardless of whether the wrapper is used or not.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Keith Packard <keithp@keithp.com>
Acked-by: Hans de Goede <hdegoede@redhat.com>
commit ee21be1324de1d6ef14e529fed7b75992e971beb
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu Dec 11 10:32:45 2014 +1000
dix: offset touch root coordinates by ScreenRec origins (#86655)
For two ScreenRecs abs pointer positioning was working fine, but touch events
stuck to the lower/right edge on any screen but the one with a 0/0 origin.
Cause is a missing offset by the screen coordinates, causing the root
coordinates in the event to desktop-wide, not screen-wide.
Offset properly, just like we do for pointer events.
X.Org Bug 86655 <http://bugs.freedesktop.org/show_bug.cgi?id=86655>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit dc777c346d5d452a53b13b917c45f6a1bad2f20b
Author: Keith Packard <keithp@keithp.com>
Date: Sat Jan 3 08:46:45 2015 -0800
dix: Allow zero-height PutImage requests
The length checking code validates PutImage height and byte width by
making sure that byte-width >= INT32_MAX / height. If height is zero,
this generates a divide by zero exception. Allow zero height requests
explicitly, bypassing the INT32_MAX check.
Signed-off-by: Keith Packard <keithp@keithp.com>
Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
commit 924996c41c419dda0f02a96aafdf52f7670ff4ea
Author: Michele Baldessari <michele@redhat.com>
Date: Wed Dec 3 11:53:10 2014 -0500
ephyr: Implement per-screen colormaps
Xephyr's pseudocolor emulation added in:
commit 81a3b6fe27567b4f91033ece69996aa6bf8d01a3
Author: Matthew Allum <breakfast@10.am>
Date: Mon Nov 8 22:39:47 2004 +0000
Add support to Xephyr for lower depths than hosts
only tracks one global colormap for the whole (Xephyr) display. Move
this to per-screen state so each screen's colormap can be correct.
[ajax: rebased to 1.17, cleaned up commit message]
Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Michele Baldessari <michele@redhat.com>
Reviewed-by: Eric Anholt <eric@anholt.net>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 7b076fdfc0e7a98430b6cb1c43079c137d7d3a6c
Author: Carl Worth <cworth@cworth.org>
Date: Thu Dec 11 19:09:48 2014 -0800
os/xsha1.c: Add license and copyright attribution.
I'm interested in copying this code to the mesa project, but before
doing that it seems prudent to have the license and copyright
attributions in place before copying that. To get this list of names I
went through:
git log -- os/xsha1.c
and:
git log -- render/glyph.c
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 66726064204b869a24e5a8dc6e24daa5acb92bab
Author: Kenneth Graunke <kenneth@whitecape.org>
Date: Tue Dec 30 11:51:43 2014 -0800
modesetting: Fix build with --disable-glamor.
present.c: In function 'ms_present_flush':
present.c:204:9: error: implicit declaration of function
'glamor_block_handler'
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=87858
Signed-off-by: Kenneth Graunke <kenneth@whitecape.org>
Reviewed-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Jasper St. Pierre <jstpierre@mecheye.net>
Reviewed-by: Rob Clark <robdclark@gmail.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit d723928870eea9fc2554abe137d6e57f7ad29e98
Author: Keith Packard <keithp@keithp.com>
Date: Sat Dec 27 09:11:33 2014 -0800
glamor: Fix nlines in glamor_xv_put_image when src_y is odd
The number of lines of video to update in the texture needs to be
computed from the height of the updated source, not the full height of
the source.
Signed-off-by: Keith Packard <keithp@keithp.com>
Reviewed-by: Eric Anholt <eric@anholt.net>
commit 09230a2d435aa7f893ad5022220e3eb39ffb6db5
Author: Kenneth Graunke <kenneth@whitecape.org>
Date: Thu Dec 11 13:37:14 2014 -0800
modesetting: Add vblank synchronization support when using Present.
modesetting hooked up vblank support for DRI2, but was missing support
for vblanks in Present.
This is mostly copy and pasted from Keith's code in the intel driver.
v2: Use ms_crtc_msc_to_kernel_msc in ms_present_queue_vblank to hook
up the vblank_offset workaround for bogus MSC values (which the
DRI2 code already did).
Also simplify the ms_present_get_crtc function. vblank.c already
implements the functionality; we just need to convert types.
v3: Fix ms_flush_drm_events return code. I'd copied code where 0 meant
success into a function that returned a boolean, so the return code
was always backwards.
Also add DebugPresent calls in ms_present_vblank_{handler,abort}.
Signed-off-by: Kenneth Graunke <kenneth@whitecape.org>
Reviewed-by: Keith Packard <keithp@keithp.com>
Tested-by: Jason Ekstrand <jason.ekstrand@intel.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 3b5be33fc55b3090d996014fa56603edb9c1d411
Author: Kenneth Graunke <kenneth@whitecape.org>
Date: Thu Dec 11 13:48:04 2014 -0800
modesetting: Include glamor.h from driver.h.
We basically want it throughout the driver.
Signed-off-by: Kenneth Graunke <kenneth@whitecape.org>
Reviewed-by: Keith Packard <keithp@keithp.com>
Tested-by: Jason Ekstrand <jason.ekstrand@intel.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 7d1fc04d27857c999bd732d54a0b36f5079449b8
Author: Kenneth Graunke <kenneth@whitecape.org>
Date: Thu Dec 18 17:58:18 2014 -0800
modesetting: Check DPMS mode in ms_covering_crtc().
crtc->enabled is insufficient; we should also make sure DPMS is on.
Signed-off-by: Kenneth Graunke <kenneth@whitecape.org>
Reviewed-by: Keith Packard <keithp@keithp.com>
Tested-by: Jason Ekstrand <jason.ekstrand@intel.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 8affaade2c127ea08989c86e7d71cc9da3db1824
Author: Kenneth Graunke <kenneth@whitecape.org>
Date: Thu Dec 18 17:55:29 2014 -0800
modesetting: Track the CRTC's DPMS mode.
We don't want to try to vblank synchronize to monitors which are off.
In order to handle that properly, we need to know the CRTC's DPMS mode.
Signed-off-by: Kenneth Graunke <kenneth@whitecape.org>
Reviewed-by: Keith Packard <keithp@keithp.com>
Tested-by: Jason Ekstrand <jason.ekstrand@intel.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit b51f804b1ca826699296aff9de27d19257d78dae
Author: Kenneth Graunke <kenneth@whitecape.org>
Date: Thu Dec 18 17:22:00 2014 -0800
present: If present_queue_vblank() fails, do present_execute().
Previously, if present_queue_vblank() failed, we simply dropped the
present request on the floor, and returned an error. This was rather
mean to clients - after presenting, they wait for a PresentComplete
event to come back. But since the present never happens, they end up
waiting forever, and lock up in poll().
This patch falls back to present_execute if present_queue_vblank fails.
We still print a debugging message to warn when queueing fails, which
allows us to continue debugging problems, but makes Present robust
enough to not lock up people's compositing manager when vblank bugs
happen.
v2: Don't do present_queue_vblank() /and/ present_execute() (a bug that
snuck in during last minute tidying).
Signed-off-by: Kenneth Graunke <kenneth@whitecape.org>
Reviewed-by: Keith Packard <keithp@keithp.com>
Tested-by: Jason Ekstrand <jason.ekstrand@intel.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit f9e22cefcb9684bf495ada3ec4b0231ab2dc6cff
Author: Dima Ryazanov <dima@gmail.com>
Date: Mon Dec 22 11:35:29 2014 -0800
Fix "Back", "Forward", and other special mouse buttons in XWayland.
Currently, the indexes are off by 4 because of the scroll buttons.
Signed-off-by: Dima Ryazanov <dima@gmail.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 70a6f65f9e2b26ef7539dcacfcfea927bc1f13fd
Author: Michel Dänzer <michel.daenzer@amd.com>
Date: Thu Dec 25 11:42:03 2014 +0900
glamor: Make sure Xvideo source image data is properly aligned
_glamor_upload_bits_to_pixmap_texture currently ignores the stride
parameter, but __glamor_upload_pixmap_to_texture uses 4-byte alignment
via glPixelStorei(GL_UNPACK_ALIGNMENT, 4).
Also fix up the stride argument passed in though, in case it starts
being used properly in the future.
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=87455
Signed-off-by: Michel Dänzer <michel.daenzer@amd.com>
Reviewed-by: Keith Packard <keithp@keithp.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 11b85ab2fc944c0645df43180a6c7e2d6a06483a
Author: Michel Dänzer <michel.daenzer@amd.com>
Date: Wed Dec 24 11:46:46 2014 +0900
glamor: Make glamor_purge_fbo static
Only called from glamor_fbo.c now.
Signed-off-by: Michel Dänzer <michel.daenzer@amd.com>
Reviewed-by: Keith Packard <keithp@keithp.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 8323d2e90150bb86a12d00a16269c69a24efc896
Author: Michel Dänzer <michel.daenzer@amd.com>
Date: Wed Dec 24 11:46:18 2014 +0900
glamor: Call glamor_pixmap_destroy_fbo from glamor_set_pixmap_private
Calling glamor_purge_fbo directly was incorrect for large pixmaps.
Fixes use-after free with large pixmaps:
==2029== Invalid write of size 8 ~
==2029== at 0x85F93AD: __xorg_list_del (list.h:184)
==2029== by 0x85F93AD: xorg_list_del (list.h:204)
==2029== by 0x85F93AD: glamor_fbo_expire (glamor_fbo.c:280)
==2029== by 0x85F95CA: glamor_pixmap_fbo_cache_put (glamor_fbo.c:159)
==2029== by 0x85D7AB5: glamor_destroy_textured_pixmap (glamor.c:228)
==2029== by 0xC1BDDC4: radeon_glamor_destroy_pixmap (radeon_glamor.c:272)
==2029== by 0x519D00: damageDestroyPixmap (damage.c:1473)
==2029== by 0x4DD307: XvDestroyPixmap (xvmain.c:370)
==2029== by 0x4DB975: ShmDestroyPixmap (shm.c:258)
==2029== by 0x5098F6: FreePicture (picture.c:1425)
==2029== by 0x85E678E: glamor_composite_clipped_region (glamor_render.c:1558)
==2029== by 0x85F763A: glamor_composite_largepixmap_region (glamor_largepixmap.c:1347)
==2029== by 0x85E7964: _glamor_composite (glamor_render.c:1679)
==2029== by 0x85E7A38: glamor_composite (glamor_render.c:1758)
==2029== Address 0x1141d3c0 is 0 bytes inside a block of size 64 free'd
==2029== at 0x4C29E90: free (vg_replace_malloc.c:473)
==2029== by 0x85D7167: glamor_set_pixmap_private (glamor.c:570)
==2029== by 0xC1BDDC4: radeon_glamor_destroy_pixmap (radeon_glamor.c:272)
==2029== by 0x519D00: damageDestroyPixmap (damage.c:1473)
==2029== by 0x4DD307: XvDestroyPixmap (xvmain.c:370)
==2029== by 0x4DB975: ShmDestroyPixmap (shm.c:258)
==2029== by 0x45B246: doFreeResource (resource.c:875)
==2029== by 0x45BD5E: FreeResource (resource.c:905)
==2029== by 0x43444B: ProcFreePixmap (dispatch.c:1422)
==2029== by 0x43856E: Dispatch (dispatch.c:432)
==2029== by 0x43C96F: dix_main (main.c:298)
==2029== by 0x6CFAB44: (below main) (libc-start.c:287)
Signed-off-by: Michel Dänzer <michel.daenzer@amd.com>
Reviewed-by: Keith Packard <keithp@keithp.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 0d37c7e4b5d63308a60ca59c9de981b380af8689
Author: Keith Packard <keithp@keithp.com>
Date: Fri Dec 19 18:40:19 2014 -0800
modesetting: Detect whether damage tracking is needed
Call drmModeDirtyFB and check the return value to detect whether the
driver support for damage tracking is present, only initialize it in
that case.
Signed-off-by: Keith Packard <keithp@keithp.com>
Reviewed-by: Jason Ekstrand <jason.ekstrand@intel.com>
commit 7804305673ca63720e8736c0c88afa711ebe208a
Author: Keith Packard <keithp@keithp.com>
Date: Fri Dec 19 19:34:34 2014 -0800
modesetting: Fix damage tracking auto-disable code
dispatch_dirty_region was only returning -EINVAL error codes,
otherwise it would return 0. The kernel returns -ENOSYS when the
driver doesn't support damage tracking, so dispatch_dirty would never
see the error and never disable damage tracking.
Pass all errors back from dispatch_dirty_region and let dispatch_dirty
deal with them.
Signed-off-by: Keith Packard <keithp@keithp.com>
Reviewed-by: Jason Ekstrand <jason.ekstrand@intel.com>
commit 826e7c2b36f192fbbe7ddff37eb559f4d6301146
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Wed Dec 17 20:50:02 2014 -0800
Solaris: Move shared declarations to xf86_OSlib.h
Gets rid of gcc 4.8 warnings:
xf86AutoConfig.c:211:9: warning: nested extern declaration of
'xf86SolarisFbDev' [-Wnested-externs]
sun_VTsw.c:44:1: warning: no previous prototype for 'xf86VTRelease'
[-Wmissing-prototypes]
sun_VTsw.c:59:1: warning: no previous prototype for 'xf86VTAcquire'
[-Wmissing-prototypes]
and ensures caller & definition stay in sync.
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Keith Packard <keithp@keithp.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit bebcac0cf790b220e849e8905139d0744a606928
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Wed Dec 17 20:50:01 2014 -0800
Move RTLD_DI_SETSIGNAL code into a separate block to quiet warning
Gets rid of gcc 4.8 warning:
osinit.c:211:9: warning: ISO C90 forbids mixed declarations and code
[-Wdeclaration-after-statement]
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Keith Packard <keithp@keithp.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 2c7111235ca5c3bd23cd824589dfbc0ebd477585
Author: Keith Packard <keithp@keithp.com>
Date: Sat Dec 13 22:22:30 2014 -0800
modesetting: Enable Xv when using glamor
This just calls the existing function to create the relevant Xv
adaptor and hook it up.
Signed-off-by: Keith Packard <keithp@keithp.com>
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
commit 5a541bd5e7adc9fdcc1883558be9218f82a284e0
Author: Keith Packard <keithp@keithp.com>
Date: Tue Dec 16 23:14:34 2014 -0800
modesetting: [v2] Don't re-enable the cursor when loading the image
Hidden cursors also have their image updated; re-enabling the cursor
each time the image is set will cause it to re-appear.
* Unifies the code that was in drmmode_load_cursor_argb and
drm_mode_show_cursor and moves it to a new drmmode_set_cursor
* Add a new boolean, 'cursor_up', to the per-crtc
private data to track whether the cursor should be displayed.
* Call drmmode_set_cursor from drm_mode_show_cursor and, if
the cursor should be displayed, from drm_mode_load_cursor_argb.
v2: Call drmModeSetCursor2 when loading a new cursor image if the
cursor should be displayed.
Signed-off-by: Keith Packard <keithp@keithp.com>
Reviewed-by: Michel Dänzer <michel.daenzer@amd.com>
commit 0f5fdaf600bfeada966aea942cb3e347d4efee30
Author: Michel Dänzer <michel.daenzer@amd.com>
Date: Thu Dec 11 16:50:40 2014 +0900
glamor: Make sure glamor_egl_close_screen wraps glamor_close_screen
The other way around fails to destroy the screen pixmap EGL image:
==1782== 80 (32 direct, 48 indirect) bytes in 1 blocks are definitely lost in loss record 981 of 2,171
==1782== at 0x4C28C20: malloc (vg_replace_malloc.c:296)
==1782== by 0xF9D4BD2: dri2_create_image_from_dri (egl_dri2.c:1264)
==1782== by 0xF9D4BD2: dri2_create_image_dma_buf (egl_dri2.c:1764)
==1782== by 0xF9D4BD2: dri2_create_image_khr (egl_dri2.c:1798)
==1782== by 0xF9C7937: eglCreateImageKHR (eglapi.c:1494)
==1782== by 0x85D5655: _glamor_egl_create_image (glamor_egl.c:134)
==1782== by 0x85D5655: glamor_egl_create_textured_pixmap (glamor_egl.c:302)
==1782== by 0x85D579B: glamor_egl_create_textured_screen (glamor_egl.c:225)
==1782== by 0xC1BE05D: radeon_glamor_create_screen_resources (radeon_glamor.c:67)
==1782== by 0xC1B6153: RADEONCreateScreenResources_KMS (radeon_kms.c:258)
==1782== by 0x4B2105: xf86CrtcCreateScreenResources (xf86Crtc.c:709)
==1782== by 0x43C823: dix_main (main.c:223)
==1782== by 0x6CFAB44: (below main) (libc-start.c:287)
Signed-off-by: Michel Dänzer <michel.daenzer@amd.com>
Reviewed-by: Keith Packard <keithp@keithp.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit c8d4c0a25dba49d1486761438b96374672b29645
Author: Michel Dänzer <michel.daenzer@amd.com>
Date: Thu Dec 11 16:50:39 2014 +0900
glamor: Make glamor_destroy_textured_pixmap idempotent
For robustness against drivers which may call both
glamor_(egl_)destroy_textured_pixmap and glamor_destroy_pixmap.
Signed-off-by: Michel Dänzer <michel.daenzer@amd.com>
Reviewed-by: Keith Packard <keithp@keithp.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 0355e280a39dee68981b2cbebfa2573cfde2f5bd
Author: Michel Dänzer <michel.daenzer@amd.com>
Date: Thu Dec 11 16:50:38 2014 +0900
glamor: Make glamor_set_pixmap_private not crash if the pixmap has no fbo
Signed-off-by: Michel Dänzer <michel.daenzer@amd.com>
Reviewed-by: Keith Packard <keithp@keithp.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 45b333525e4626523f2b3b7bb360404b6366750d
Author: Michel Dänzer <michel.daenzer@amd.com>
Date: Thu Dec 11 16:50:37 2014 +0900
glamor: Fix use-after-free in glamor_destroy_textured_pixmap
==25551== Invalid read of size 8
==25551== at 0x85D5F2C: glamor_egl_destroy_pixmap_image (glamor_egl.c:527)
==25551== by 0x85D7750: glamor_destroy_pixmap (glamor.c:235)
==25551== by 0xC1BDD9B: radeon_glamor_destroy_pixmap (radeon_glamor.c:278)
==25551== by 0x5098F6: FreePicture (picture.c:1425)
==25551== by 0x85DD7A9: glamor_unrealize_glyph_caches (glamor_glyphs.c:257)
==25551== by 0x85D7B50: glamor_close_screen (glamor.c:586)
==25551== by 0x4B1A82: xf86CrtcCloseScreen (xf86Crtc.c:734)
==25551== by 0x4CFFC7: CursorCloseScreen (cursor.c:187)
==25551== by 0x513A44: AnimCurCloseScreen (animcur.c:106)
==25551== by 0x51529B: present_close_screen (present_screen.c:64)
==25551== by 0x43CA83: dix_main (main.c:351)
==25551== by 0x6CFAB44: (below main) (libc-start.c:287)
==25551== Address 0x83dafa0 is 96 bytes inside a block of size 152 free'd
==25551== at 0x4C29E90: free (vg_replace_malloc.c:473)
==25551== by 0x85D76B4: glamor_destroy_textured_pixmap (glamor.c:225)
==25551== by 0x85D7750: glamor_destroy_pixmap (glamor.c:235)
==25551== by 0xC1BDD9B: radeon_glamor_destroy_pixmap (radeon_glamor.c:278)
==25551== by 0x5098F6: FreePicture (picture.c:1425)
==25551== by 0x85DD7A9: glamor_unrealize_glyph_caches (glamor_glyphs.c:257)
==25551== by 0x85D7B50: glamor_close_screen (glamor.c:586)
==25551== by 0x4B1A82: xf86CrtcCloseScreen (xf86Crtc.c:734)
==25551== by 0x4CFFC7: CursorCloseScreen (cursor.c:187)
==25551== by 0x513A44: AnimCurCloseScreen (animcur.c:106)
==25551== by 0x51529B: present_close_screen (present_screen.c:64)
==25551== by 0x43CA83: dix_main (main.c:351)
Signed-off-by: Michel Dänzer <michel.daenzer@amd.com>
Reviewed-by: Keith Packard <keithp@keithp.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 913416b718e73e7416c2128a82d2e5e5cd962d28
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Tue Dec 9 10:15:08 2014 -0800
Solaris: delete undocumented, unuseful -protect0 flag
Solaris already makes the page at address 0 inaccessible by default to
catch NULL pointer bugs, we don't need a double secret undocumented flag
to try to make our own hacky attempt at it.
As a bonus, deleting this code removes gcc warning of:
sun_init.c: In function 'xf86OpenConsole':
sun_init.c:103:17: warning: declaration of 'fd' shadows a previous local [-Wshadow]
int fd = -1;
^
sun_init.c:89:9: warning: shadowed declaration is here [-Wshadow]
int fd;
^
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Mark Kettenis <kettenis@openbsd.org>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 7b784df51bd6be38238d7101b1f5e320eb4aa5b8
Author: Kenneth Graunke <kenneth@whitecape.org>
Date: Tue Dec 9 12:43:57 2014 -0800
modesetting: Use GBM for buffer allocations if Glamor supports it.
For performance, Glamor wants to render to tiled buffers, not linear
ones. Using GBM allows us to pick the 3D driver's preferred tiling
modes.
v2: Declare drmmode->gbm as void * if !GLAMOR_HAS_GBM.
v3: Just use a forward declaration of struct gbm_device.
Signed-off-by: Kenneth Graunke <kenneth@whitecape.org>
Tested-by: Jason Ekstrand <jason.ekstrand@intel.com>
Reviewed-by: Keith Packard <keithp@keithp.com>
commit cfef64b0cabe7677c7584a72d7432c20343d9361
Author: Dave Airlie <airlied@redhat.com>
Date: Tue Dec 9 12:28:38 2014 -0800
glamor: Add an accessor for the GBM device.
(Originally written by Dave Airlie; split into a separate patch by
Kenneth Graunke.)
Signed-off-by: Dave Airlie <airlied@redhat.com>
Signed-off-by: Kenneth Graunke <kenneth@whitecape.org>
Tested-by: Jason Ekstrand <jason.ekstrand@intel.com>
Reviewed-by: Keith Packard <keithp@keithp.com>
commit 980535757d38db5c812c8afa32726d8cc36abfa4
Author: Kenneth Graunke <kenneth@whitecape.org>
Date: Tue Dec 9 15:20:44 2014 -0800
modesetting: Create a drmmode_bo wrapper; use it for front_bo.
This code is going to be extended to support GBM BOs soon. This small
abstraction removes a lot of direct dumb_bo access, so we can add that
support in one place, rather than putting conditionals at every
pitch/handle/etc access.
Signed-off-by: Kenneth Graunke <kenneth@whitecape.org>
Tested-by: Jason Ekstrand <jason.ekstrand@intel.com>
Reviewed-by: Keith Packard <keithp@keithp.com>
commit c6388964b079b3828c0b64951ff03008dda8f44a
Author: Kenneth Graunke <kenneth@whitecape.org>
Date: Tue Dec 9 11:26:39 2014 -0800
modesetting: Drop dumb_bo::map_count field and dead unmap code.
The drm kernel API for dumb BOs apparently doesn't include an unmap
ioctl, so we can't do much here. It looks like this code was copied
from libkms, which was also unfinished.
We may as well delete the dead variable that simply gets incremented
and never read.
Signed-off-by: Kenneth Graunke <kenneth@whitecape.org>
Tested-by: Jason Ekstrand <jason.ekstrand@intel.com>
Reviewed-by: Keith Packard <keithp@keithp.com>
commit 87cc0c0d317c5eac4fcf9bf4a7ad36454c05f6b8
Author: Kenneth Graunke <kenneth@whitecape.org>
Date: Tue Dec 9 11:17:30 2014 -0800
modesetting: Move dumb_bo into its own source files.
Eventually, drmmode_display will be able to use GBM for handling
buffers, and won't need dumb_bo. Keeping the display related logic
and buffer object abstraction in separate files seems a bit tidier.
Signed-off-by: Kenneth Graunke <kenneth@whitecape.org>
Tested-by: Jason Ekstrand <jason.ekstrand@intel.com>
Reviewed-by: Keith Packard <keithp@keithp.com>
commit af4f94b08eb8e5961799a8a74a06449fd3fe8ad9
Author: Kenneth Graunke <kenneth@whitecape.org>
Date: Tue Dec 9 15:18:39 2014 -0800
modesetting: Create helper for glamor_egl_create_textured_screen call.
This will need to change when we add GBM support; by pulling it into a
helper function, we should only have to edit one place.
Signed-off-by: Kenneth Graunke <kenneth@whitecape.org>
Tested-by: Jason Ekstrand <jason.ekstrand@intel.com>
Reviewed-by: Keith Packard <keithp@keithp.com>
commit b4324c6a2382dc96295bdb061316f699e4ffabb9
Author: Kenneth Graunke <kenneth@whitecape.org>
Date: Tue Dec 9 14:38:39 2014 -0800
modesetting: Move ModifyPixmapHeader calls out of if/else branches.
Both branches called ModifyPixmapHeader with essentially the same
parameters. By using new_pixels in the shadowfb case, we can make
them completely the same, and move them out a level, for simplicity.
Signed-off-by: Kenneth Graunke <kenneth@whitecape.org>
Tested-by: Jason Ekstrand <jason.ekstrand@intel.com>
Reviewed-by: Keith Packard <keithp@keithp.com>
commit 35e9924484ec7bafb749c88ed7f78e6a71f8dfb3
Author: Kenneth Graunke <kenneth@whitecape.org>
Date: Tue Dec 9 13:01:09 2014 -0800
modesetting: Stop using glamor_egl_create_textured_screen_ext().
The _ext variant takes an additional pointer argument, which it now
ignores, thanks to Keith's recent patches.
Signed-off-by: Kenneth Graunke <kenneth@whitecape.org>
Tested-by: Jason Ekstrand <jason.ekstrand@intel.com>
Reviewed-by: Keith Packard <keithp@keithp.com>
commit 91651e7c15892aa846fc406fbb13b37f094dd3f0
Author: Michel Dänzer <michel.daenzer@amd.com>
Date: Wed Dec 10 16:21:44 2014 +0900
glamor: Reinstate glamor_(egl_)destroy_textured_pixmap
They are part of the ABI.
Signed-off-by: Michel Dänzer <michel.daenzer@amd.com>
Reviewed-by: Keith Packard <keithp@keithp.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit e774663fa5209ff469d920821934bb1f5964a72f
Author: Michele Baldessari <michele@redhat.com>
Date: Wed Dec 3 11:30:29 2014 -0500
ephyr: Implement per-screen colormaps
Xephyr's pseudocolor emulation added in:
commit 81a3b6fe27567b4f91033ece69996aa6bf8d01a3
Author: Matthew Allum <breakfast@10.am>
Date: Mon Nov 8 22:39:47 2004 +0000
Add support to Xephyr for lower depths than hosts
only tracks one global colormap for the whole (Xephyr) display. Move
this to per-screen state so each screen's colormap can be correct.
[ajax: rebased to 1.17, cleaned up commit message]
Reviewed-by: Adam Jackson <ajax@redhat.com>
Reviewed-by: Eric Anholt <eric@anholt.net>
Signed-off-by: Michele Baldessari <michele@redhat.com>
commit cadd70c809232c9a6601fb8baab665a7ab10045d
Author: Adam Jackson <ajax@redhat.com>
Date: Tue Dec 2 14:52:35 2014 -0500
glx: Add hack for GLX-1.2-style naked windows to GetDrawableAttributes
Some people like to call this on bare Window XIDs and expect reasonable
results. I sure wish they wouldn't, but since they do, if we're given
a window without any glx decoration just fill in as much as we can. This
means you won't actually get an answer for GLX_FBCONFIG_ID and friends,
but there's not much to be done about that, and it matches what NVIDIA's
driver seems to do.
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=54080
Reviewed-by: Eric Anholt <eric@anholt.net>
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit f452b4a47b3bebf883e84df804e8d54830ccfe83
Author: Adam Jackson <ajax@redhat.com>
Date: Tue Dec 2 14:47:45 2014 -0500
glx: Dynamically compute attribute slot in GetDrawableAttributes
No functional change.
Reviewed-by: Eric Anholt <eric@anholt.net>
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit c1455f76c6b1aa4ecaacb2221a687244285aa44b
Author: Neil Roberts <neil@linux.intel.com>
Date: Mon Dec 1 16:06:17 2014 -0500
glx: Add implementation of __GLXContext->loseCurrent for direct ctxts
This adds a dummy implementation for the loseCurrent function in
__GLXContext for direct contexts which just returns GL_TRUE. Without
this then the X server can crash if receives a MakeCurrent message for
a direct context because it will attempt to call loseCurrent when
cleaning up the client in the callback for ClientStateGone.
[ajax: added assumed s-o-b line]
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=86531
Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Neil Roberts <neil@linux.intel.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 6704bb0ed7a10dabe8ef3bb3adf8b8a7f29a78f0
Merge: 8aa23f27c7 1559a94395
Author: Keith Packard <keithp@keithp.com>
Date: Tue Dec 9 11:47:11 2014 -0800
Merge remote-tracking branch 'alanc/master'
commit 1559a94395258fd73e369f1a2c98a44bfe21a486
Author: Keith Packard <keithp@keithp.com>
Date: Tue Dec 9 09:31:00 2014 -0800
dix: GetHosts bounds check using wrong pointer value [CVE-2014-8092 pt. 6]
GetHosts saves the pointer to allocated memory in *data, and then
wants to bounds-check writes to that region, but was mistakenly using
a bare 'data' instead of '*data'. Also, data is declared as void **,
so we need a cast to turn it into a byte pointer so we can actually do
pointer comparisons.
Signed-off-by: Keith Packard <keithp@keithp.com>
Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
commit 9802a0162f738de03585ca3f3b8a8266494f7d45
Author: Keith Packard <keithp@keithp.com>
Date: Tue Dec 9 09:30:59 2014 -0800
Missing parens in REQUEST_FIXED_SIZE macro [CVE-2014-8092 pt. 5]
The 'n' parameter must be surrounded by parens in both places to
prevent precedence from mis-computing things.
Signed-off-by: Keith Packard <keithp@keithp.com>
Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
commit 61b17c0f10307e25e51e30e6fb1d3e3127f82d86
Author: Keith Packard <keithp@keithp.com>
Date: Tue Dec 9 09:30:58 2014 -0800
glx: Can't mix declarations and code in X.org sources [CVE-2014-8098 pt. 9]
We're using compiler compatibility settings which generate warnings
when a variable is declared after the first statement.
Signed-off-by: Keith Packard <keithp@keithp.com>
Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
commit b20912c3d45cbbde3c443e6c3d9e189092fe65e1
Author: Keith Packard <keithp@keithp.com>
Date: Tue Dec 9 09:30:57 2014 -0800
dbe: Call to DDX SwapBuffers requires address of int, not unsigned int [CVE-2014-8097 pt. 2]
When the local types used to walk the DBE request were changed, this
changed the type of the parameter passed to the DDX SwapBuffers API,
but there wasn't a matching change in the API definition.
At this point, with the API frozen, I just stuck a new variable in
with the correct type. Because we've already bounds-checked nStuff to
be smaller than UINT32_MAX / sizeof(DbeSwapInfoRec), we know it will
fit in a signed int without overflow.
Signed-off-by: Keith Packard <keithp@keithp.com
Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
commit 8aa23f27c7e29c62d23867440b0bb00fc288b5ba
Author: Keith Packard <keithp@keithp.com>
Date: Mon Dec 8 12:59:31 2014 -0800
glamor: Free existing EGL image when assigning new one
When reallocating the framebuffer on screen resize, the old EGL image
was getting leaked. Check for an existing EGL image and free it in
this case.
Signed-off-by: Keith Packard <keithp@keithp.com>
Revewied-by: Zhigang Gong <zhigang.gong@linux.intel.com>
commit c22433d55ea16e4879b092ee28d284fc895c9956
Author: Keith Packard <keithp@keithp.com>
Date: Fri Dec 5 11:02:11 2014 -0800
glamor: Remove redundant reference to screen pixmap EGL image
There's no reason to store this in the egl screen private as the
screen pixmap will always hold a reference to it anyways.
Signed-off-by: Keith Packard <keithp@keithp.com>
Revewied-by: Zhigang Gong <zhigang.gong@linux.intel.com>
commit 5064ffab631dcbc4265079fb32a02d3e2f1c4cd8
Author: Keith Packard <keithp@keithp.com>
Date: Fri Dec 5 10:58:28 2014 -0800
glamor: Always destroy EGL image associated with destroyed pixmap
There were three paths that called eglDestroyImageKHR:
* The front buffer
* The intel driver's flip buffer
* pixmaps under DRI3
This patch unifies the second two by having glamor_destroy_pixmap
always destroy any associaged EGL image. This allows us to stop
storing the back_pixmap pointer in glamor as that was only used to
make sure that buffer was freed at server reset time.
v2: check for valid pixmap_priv before using it in
glamor_egl_destroy_pixmap_image
Signed-off-by: Keith Packard <keithp@keithp.com>
Reviewed-by: Zhigang Gong <zhigang.gong@linux.intel.com>
commit 7e7630bbb775573eea2a2335adb9d190c3e1e971
Author: Robert Morell <rmorell@nvidia.com>
Date: Wed Nov 12 18:51:43 2014 -0800
glx: Fix mask truncation in __glXGetAnswerBuffer [CVE-2014-8093 6/6]
On a system where sizeof(unsigned) != sizeof(intptr_t), the unary
bitwise not operation will result in a mask that clears all high bits
from temp_buf in the expression:
temp_buf = (temp_buf + mask) & ~mask;
Signed-off-by: Robert Morell <rmorell@nvidia.com>
Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
commit e883c170c15493ab3637c0a01890f5a7ca4e16a5
Author: Adam Jackson <ajax@redhat.com>
Date: Mon Nov 10 12:13:48 2014 -0500
glx: Pass remaining request length into ->varsize (v2) [CVE-2014-8098 8/8]
v2: Handle more multiplies in indirect_reqsize.c (Julien Cristau)
Reviewed-by: Julien Cristau <jcristau@debian.org>
Reviewed-by: Michal Srb <msrb@suse.com>
Reviewed-by: Andy Ritger <aritger@nvidia.com>
Signed-off-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
commit 984583a497c813df5827ae22483133e704fee79c
Author: Adam Jackson <ajax@redhat.com>
Date: Mon Nov 10 12:13:47 2014 -0500
glx: Length checking for non-generated single requests (v2) [CVE-2014-8098 7/8]
v2:
Fix single versus vendor-private length checking for ARB_imaging subset
extensions. (Julien Cristau)
v3:
Fix single versus vendor-private length checking for ARB_imaging subset
extensions. (Julien Cristau)
Reviewed-by: Michal Srb <msrb@suse.com>
Reviewed-by: Andy Ritger <aritger@nvidia.com>
Signed-off-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Julien Cristau <jcristau@debian.org>
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
commit 44ba149f28ece93c2fbfc9cc980588de5322dd4b
Author: Adam Jackson <ajax@redhat.com>
Date: Mon Nov 10 12:13:46 2014 -0500
glx: Length-checking for non-generated vendor private requests [CVE-2014-8098 6/8]
Reviewed-by: Keith Packard <keithp@keithp.com>
Reviewed-by: Michal Srb <msrb@suse.com>
Reviewed-by: Andy Ritger <aritger@nvidia.com>
Signed-off-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
commit afe177020d1fb776c6163f21eddc82cb185b95ca
Author: Adam Jackson <ajax@redhat.com>
Date: Mon Nov 10 12:13:45 2014 -0500
glx: Request length checks for SetClientInfoARB [CVE-2014-8098 5/8]
Reviewed-by: Keith Packard <keithp@keithp.com>
Reviewed-by: Julien Cristau <jcristau@debian.org>
Reviewed-by: Michal Srb <msrb@suse.com>
Reviewed-by: Andy Ritger <aritger@nvidia.com>
Signed-off-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
commit c91e4abc3b892f42802efa20fef7ada442c2d3f5
Author: Adam Jackson <ajax@redhat.com>
Date: Mon Nov 10 12:13:44 2014 -0500
glx: Top-level length checking for swapped VendorPrivate requests [CVE-2014-8098 4/8]
Reviewed-by: Keith Packard <keithp@keithp.com>
Reviewed-by: Julien Cristau <jcristau@debian.org>
Reviewed-by: Michal Srb <msrb@suse.com>
Reviewed-by: Andy Ritger <aritger@nvidia.com>
Signed-off-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
commit a33a939e6abb255b14d8dbc85fcbd2c55b958bae
Author: Adam Jackson <ajax@redhat.com>
Date: Mon Nov 10 12:13:43 2014 -0500
glx: Length checking for RenderLarge requests (v2) [CVE-2014-8098 3/8]
This is a half-measure until we start passing request length into the
varsize function, but it's better than the nothing we had before.
v2: Verify that there's at least a large render header's worth of
dataBytes (Julien Cristau)
Reviewed-by: Michal Srb <msrb@suse.com>
Reviewed-by: Andy Ritger <aritger@nvidia.com>
Signed-off-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
commit 698888e6671d54c7ae41e9d456f7f5483a3459d2
Author: Adam Jackson <ajax@redhat.com>
Date: Mon Nov 10 12:13:42 2014 -0500
glx: Integer overflow protection for non-generated render requests (v3) [CVE-2014-8093 5/6]
v2:
Fix constants in __glXMap2fReqSize (Michal Srb)
Validate w/h/d for proxy targets too (Keith Packard)
v3:
Fix Map[12]Size to correctly reject order == 0 (Julien Cristau)
Reviewed-by: Keith Packard <keithp@keithp.com>
Reviewed-by: Michal Srb <msrb@suse.com>
Reviewed-by: Andy Ritger <aritger@nvidia.com>
Signed-off-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
commit be09e0c988ffdb0371293af49fb4ea8f49ed324a
Author: Julien Cristau <jcristau@debian.org>
Date: Mon Nov 10 12:13:41 2014 -0500
glx: Length checking for GLXRender requests (v2) [CVE-2014-8098 2/8]
v2:
Remove can't-happen comparison for cmdlen < 0 (Michal Srb)
Reviewed-by: Adam Jackson <ajax@redhat.com>
Reviewed-by: Michal Srb <msrb@suse.com>
Reviewed-by: Andy Ritger <aritger@nvidia.com>
Signed-off-by: Julien Cristau <jcristau@debian.org>
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
commit 2a5cbc17fc72185bf0fa06fef26d1f782de72595
Author: Adam Jackson <ajax@redhat.com>
Date: Mon Nov 10 12:13:40 2014 -0500
glx: Add safe_{add,mul,pad} (v3) [CVE-2014-8093 4/6]
These are paranoid about integer overflow, and will return -1 if their
operation would overflow a (signed) integer or if either argument is
negative.
Note that RenderLarge requests are sized with a uint32_t so in principle
this could be sketchy there, but dix limits bigreqs to 128M so you
shouldn't ever notice, and honestly if you're sending more than 2G of
rendering commands you're already doing something very wrong.
v2: Use INT_MAX for consistency with the rest of the server (jcristau)
v3: Reject negative arguments (anholt)
Reviewed-by: Keith Packard <keithp@keithp.com>
Reviewed-by: Julien Cristau <jcristau@debian.org>
Reviewed-by: Michal Srb <msrb@suse.com>
Reviewed-by: Andy Ritger <aritger@nvidia.com>
Signed-off-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
commit 13d36923e0ddb077f4854e354c3d5c80590b5d9d
Author: Adam Jackson <ajax@redhat.com>
Date: Mon Nov 10 12:13:39 2014 -0500
glx: Fix image size computation for EXT_texture_integer [CVE-2014-8098 1/8]
Without this we'd reject the request with BadLength. Note that some old
versions of Mesa had a bug in the same place, and would _send_ zero
bytes of image data; these will now be rejected, correctly.
Reviewed-by: Keith Packard <keithp@keithp.com>
Reviewed-by: Julien Cristau <jcristau@debian.org>
Reviewed-by: Michal Srb <msrb@suse.com>
Reviewed-by: Andy Ritger <aritger@nvidia.com>
Signed-off-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
commit 717a1b37767b41e14859e5022ae9e679152821a9
Author: Adam Jackson <ajax@redhat.com>
Date: Mon Nov 10 12:13:38 2014 -0500
glx: Additional paranoia in __glXGetAnswerBuffer / __GLX_GET_ANSWER_BUFFER (v2) [CVE-2014-8093 3/6]
If the computed reply size is negative, something went wrong, treat it
as an error.
v2: Be more careful about size_t being unsigned (Matthieu Herrb)
v3: SIZE_MAX not SIZE_T_MAX (Alan Coopersmith)
Reviewed-by: Julien Cristau <jcristau@debian.org>
Reviewed-by: Michal Srb <msrb@suse.com>
Reviewed-by: Andy Ritger <aritger@nvidia.com>
Signed-off-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
commit ab2ba9338aa5e85b4487bc7fbe69985c76483e01
Author: Adam Jackson <ajax@redhat.com>
Date: Mon Nov 10 12:13:37 2014 -0500
glx: Be more strict about rejecting invalid image sizes [CVE-2014-8093 2/6]
Before this we'd just clamp the image size to 0, which was just
hideously stupid; if the parameters were such that they'd overflow an
integer, you'd allocate a small buffer, then pass huge values into (say)
ReadPixels, and now you're scribbling over arbitrary server memory.
Reviewed-by: Keith Packard <keithp@keithp.com>
Reviewed-by: Julien Cristau <jcristau@debian.org>
Reviewed-by: Michal Srb <msrb@suse.com>
Reviewed-by: Andy Ritger <aritger@nvidia.com>
Signed-off-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
commit 23fe7718bb171e71db2d1a30505c2ca2988799d9
Author: Adam Jackson <ajax@redhat.com>
Date: Mon Nov 10 12:13:36 2014 -0500
glx: Be more paranoid about variable-length requests [CVE-2014-8093 1/6]
If the size computation routine returns -1 we should just reject the
request outright. Clamping it to zero could give an attacker the
opportunity to also mangle cmdlen in such a way that the subsequent
length check passes, and the request would get executed, thus passing
data we wanted to reject to the renderer.
Reviewed-by: Keith Packard <keithp@keithp.com>
Reviewed-by: Julien Cristau <jcristau@debian.org>
Reviewed-by: Michal Srb <msrb@suse.com>
Reviewed-by: Andy Ritger <aritger@nvidia.com>
Signed-off-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
commit f4afd53f2aeaddf509bf9f71d1716dd273fd6e14
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Sun Feb 9 22:42:47 2014 -0800
Add REQUEST_FIXED_SIZE testcases to test/misc.c
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 2df83bb122debc3c20cfc3d3b0edc85cd0270f79
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Sun Feb 9 21:28:05 2014 -0800
Add request length checking test cases for some Xinput 2.x requests
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
commit d153a85f7478a7a67ccb02fbca6390b0ab1732ee
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Sun Feb 9 21:27:27 2014 -0800
Add request length checking test cases for some Xinput 1.x requests
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
commit a0ece23a8bd300c8be10812d368dc8058c97c63e
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Sun Jan 26 20:02:20 2014 -0800
xfixes: unvalidated length in SProcXFixesSelectSelectionInput [CVE-2014-8102]
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 5d3a788aeb2fbd3ca2812747dc18c94a8b981c63
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Sun Jan 26 19:51:29 2014 -0800
render: unvalidated lengths in Render extn. swapped procs [CVE-2014-8100 2/2]
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
commit b5f9ef03df6a650571b29d3d1c1d2b67c6e84336
Author: Julien Cristau <jcristau@debian.org>
Date: Tue Oct 28 10:30:04 2014 +0100
render: check request size before reading it [CVE-2014-8100 1/2]
Otherwise we may be reading outside of the client request.
Signed-off-by: Julien Cristau <jcristau@debian.org>
Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
commit 3df2fcf12499ebdb26b9b67419ea485a42041f33
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Sun Jan 26 19:38:09 2014 -0800
randr: unvalidated lengths in RandR extension swapped procs [CVE-2014-8101]
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
commit d155b7a8e38e74aee96bf52c20c8b6a330d7d462
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Sun Jan 26 19:33:34 2014 -0800
present: unvalidated lengths in Present extension procs [CVE-2014-8103 2/2]
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Julien Cristau <jcristau@debian.org>
commit 0a6085aaf3581cca558d960ea176ddf3a41a2213
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Sun Jan 26 19:28:05 2014 -0800
dri3: unvalidated lengths in DRI3 extension swapped procs [CVE-2014-8103 1/2]
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 32a95fb7c7dbe22c9441c62762dfa4a8ec54d6c3
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Sun Jan 26 19:23:17 2014 -0800
Xv: unvalidated lengths in XVideo extension swapped procs [CVE-2014-8099]
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 7553082b9b883b5f130044f3d53bce2f0b660e52
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Sun Jan 26 17:18:54 2014 -0800
xcmisc: unvalidated length in SProcXCMiscGetXIDList() [CVE-2014-8096]
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 73c63afb93c0af1bfd1969bf6e71c9edca586c77
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Sun Jan 26 10:54:41 2014 -0800
Xi: unvalidated lengths in Xinput extension [CVE-2014-8095]
Multiple functions in the Xinput extension handling of requests from
clients failed to check that the length of the request sent by the
client was large enough to perform all the required operations and
thus could read or write to memory outside the bounds of the request
buffer.
This commit includes the creation of a new REQUEST_AT_LEAST_EXTRA_SIZE
macro in include/dix.h for the common case of needing to ensure a
request is large enough to include both the request itself and a
minimum amount of extra data following the request header.
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 2ef42519c41e793579c9cea699c866fee3d9321f
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Wed Jan 22 23:12:04 2014 -0800
dbe: unvalidated lengths in DbeSwapBuffers calls [CVE-2014-8097]
ProcDbeSwapBuffers() has a 32bit (n) length value that it uses to read
from a buffer. The length is never validated, which can lead to out of
bound reads, and possibly returning the data read from out of bounds to
the misbehaving client via an X Error packet.
SProcDbeSwapBuffers() swaps data (for correct endianness) before
handing it off to the real proc. While doing the swapping, the
length field is not validated, which can cause memory corruption.
v2: reorder checks to avoid compilers optimizing out checks for overflow
that happen after we'd already have done the overflowing multiplications.
Reported-by: Ilja Van Sprundel <ivansprundel@ioactive.com>
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 6692670fde081bbfe9313f17d84037ae9116702a
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Wed Jan 22 23:40:18 2014 -0800
dri2: integer overflow in ProcDRI2GetBuffers() [CVE-2014-8094]
ProcDRI2GetBuffers() tries to validate a length field (count).
There is an integer overflow in the validation. This can cause
out of bound reads and memory corruption later on.
Reported-by: Ilja Van Sprundel <ivansprundel@ioactive.com>
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Julien Cristau <jcristau@debian.org>
commit e0e11644622a589129a01e11e5d105dc74a098de
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Wed Jan 22 23:44:46 2014 -0800
dix: integer overflow in REQUEST_FIXED_SIZE() [CVE-2014-8092 4/4]
Force use of 64-bit integers when evaluating data provided by clients
in 32-bit fields which can overflow when added or multiplied during
checks.
Reported-by: Ilja Van Sprundel <ivansprundel@ioactive.com>
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 97015a07b9e15d8ec5608b95d95ec0eb51202acb
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Wed Jan 22 22:37:15 2014 -0800
dix: integer overflow in RegionSizeof() [CVE-2014-8092 3/4]
RegionSizeof contains several integer overflows if a large length
value is passed in. Once we fix it to return 0 on overflow, we
also have to fix the callers to handle this error condition
v2: Fixed limit calculation in RegionSizeof as pointed out by jcristau.
Reported-by: Ilja Van Sprundel <ivansprundel@ioactive.com>
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Julien Cristau <jcristau@debian.org>
commit bc8e20430b6f6378daf6ce4329029248a88af08b
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Mon Jan 6 23:30:14 2014 -0800
dix: integer overflow in GetHosts() [CVE-2014-8092 2/4]
GetHosts() iterates over all the hosts it has in memory, and copies
them to a buffer. The buffer length is calculated by iterating over
all the hosts and adding up all of their combined length. There is a
potential integer overflow, if there are lots and lots of hosts (with
a combined length of > ~4 gig). This should be possible by repeatedly
calling ProcChangeHosts() on 64bit machines with enough memory.
This patch caps the list at 1mb, because multi-megabyte hostname
lists for X access control are insane.
Reported-by: Ilja Van Sprundel <ivansprundel@ioactive.com>
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
commit eeae42d60bf3d5663ea088581f6c28a82cd17829
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Wed Jan 22 21:11:16 2014 -0800
dix: integer overflow in ProcPutImage() [CVE-2014-8092 1/4]
ProcPutImage() calculates a length field from a width, left pad and depth
specified by the client (if the specified format is XYPixmap).
The calculations for the total amount of memory the server needs for the
pixmap can overflow a 32-bit number, causing out-of-bounds memory writes
on 32-bit systems (since the length is stored in a long int variable).
Reported-by: Ilja Van Sprundel <ivansprundel@ioactive.com>
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 90cc925c5991fcb203f72d00b04419cd754a9b2c
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Fri Jan 17 18:54:03 2014 -0800
unchecked malloc may allow unauthed client to crash Xserver [CVE-2014-8091]
authdes_ezdecode() calls malloc() using a length provided by the
connection handshake sent by a newly connected client in order
to authenticate to the server, so should be treated as untrusted.
It didn't check if malloc() failed before writing to the newly
allocated buffer, so could lead to a server crash if the server
fails to allocate memory (up to UINT16_MAX bytes, since the len
field is a CARD16 in the X protocol).
Reported-by: Ilja Van Sprundel <ivansprundel@ioactive.com>
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 3e7218a6c23354d66f508b18164cac98a346b3ee
Merge: 6f4c398a0e bc71081f0e
Author: Keith Packard <keithp@keithp.com>
Date: Mon Dec 8 18:07:55 2014 -0800
Merge remote-tracking branch 'jturney/indirect-glx-fixes'
commit 6f4c398a0e632b0c92e3cb8ee03ca7f5b5cc018e
Merge: aae6460694 5920433c3a
Author: Keith Packard <keithp@keithp.com>
Date: Mon Dec 8 18:04:08 2014 -0800
Merge remote-tracking branch 'jturney/master'
commit aae6460694ac3667abb8c34fdf3a7dae524827a4
Author: Mario Kleiner <mario.kleiner.de@gmail.com>
Date: Sat Dec 6 05:40:08 2014 +0100
present: Fix use of vsynced pageflips and honor PresentOptionAsync. (v4)
Pageflips for Pixmap presents were not synchronized to vblank on
drivers with support for PresentCapabilityAsync, due to some
missing init for vblank->sync_flips. The PresentOptionAsync
flag was completely ignored for pageflipped presents.
Vsynced flips only worked by accident on the intel-ddx, as that
driver doesn't have PresentCapabilityAsync support.
On nouveau-ddx, which supports PresentCapabilityAsync, this
always caused non-vsynced pageflips with pretty ugly tearing.
This patch fixes the problem, as tested on top of XOrg 1.16.2
on nouveau and intel.
v4: Add additional PresentCapabilityAsync caps check, as
suggested by Eric Anholt.
Please also apply to XOrg 1.17 and XOrg 1.16.2 stable.
Applying on top of XOrg 1.16.2 requires cherry-picking
commit 2051514652481a83bd7cf22e57cb0fcd40333f33
which trivially fixes lack of support for protocol option
PresentOptionCopy - get two bug fixes for the price of one!
Signed-off-by: Mario Kleiner <mario.kleiner.de@gmail.com>
Reviewed-by: Eric Anholt <eric@anholt.net>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 32d3100bd78efe41d468f7d66861296aee468b6f
Author: Mario Kleiner <mario.kleiner.de@gmail.com>
Date: Sat Dec 6 05:40:07 2014 +0100
present: Avoid crashes in DebugPresent(), a bit more info.
DebugPresent() crashed the server when a dri3 drawable
was closed while a pageflipped present was still pending,
due to vblank->window-> Null-Ptr deref, so debug builds
caused new problems to debug.
E.g.,
glXSwapBuffers(...);
glXDestroyWindow(...);
-> Pageflip for non-existent window completes -> boom.
Also often happens when switching desktop compositor on/off
due to Present unflips, or when logging out of session.
Also add info if a Present is queued for copyswap or pageflip,
if the present is vsynced, and the serial no of the Present
request, to aid debugging of pageflip and vsync issues. The
serial number is useful as Mesa's dri3/present backend encodes
its sendSBC in the serial number, so one can easily correlate
server debug output with Mesa and with the SBC values returned
to actual OpenGL client applications via OML_sync_control and
INTEL_swap_events extension, makes debugging quite a bit more
easy.
Please also cherry-pick this for a 1.16.x stable update.
Signed-off-by: Mario Kleiner <mario.kleiner.de@gmail.com>
Reviewed-by: Eric Anholt <eric@anholt.net>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 32ca85c9e075e40b8a4712a79a51702facba0332
Author: Daniel Martin <consume.noise@gmail.com>
Date: Fri Nov 28 11:20:50 2014 +0100
modesetting: Remove unused params from drmmode_output_init()
drmmode_output_init() doesn't touch (the int*) num_dvi and num_hdmi.
Remove both parameters.
Signed-off-by: Daniel Martin <consume.noise@gmail.com>
Reviewed-by: Eric Anholt <eric@anholt.net>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit c0ea476b9bb91f03061b891ffb897c438fa03879
Author: Daniel Martin <consume.noise@gmail.com>
Date: Fri Nov 28 11:20:49 2014 +0100
modesetting: Fix ifdefs s/HAVE_UDEV/CONFIG_UDEV_KMS/
We don't define HAVE_UDEV, that's a remnant from xf86-video-modesetting.
But, we have CONFIG_UDEV_KMS.
Signed-off-by: Daniel Martin <consume.noise@gmail.com>
Reviewed-by: Eric Anholt <eric@anholt.net>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 8a16620dcd7a22fd9b38876ffc711629c4fbda0a
Author: Daniel Martin <consume.noise@gmail.com>
Date: Fri Nov 28 11:20:48 2014 +0100
modesetting: Create new EGL screen in drmmode_xf86crtc_resize
If we don't glamor_egl_create_textured_screen_ext() in
drmmode_xf86crtc_resize() we end up with a black screen and no client
window(s) visible.
Signed-off-by: Daniel Martin <consume.noise@gmail.com>
Reviewed-by: Eric Anholt <eric@anholt.net>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 0d63fa5850fe9d8b045b8f1a83e72b75f9065a7a
Author: Daniel Martin <consume.noise@gmail.com>
Date: Fri Nov 28 11:20:47 2014 +0100
modesetting: Move Bool glamor into drmmode struct
Move the boolean glamor from struct modesetting into struct drmmode for
later re-use in drmmode_display.
Signed-off-by: Daniel Martin <consume.noise@gmail.com>
Reviewed-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Keith Packard <keithp@keithp.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 62a4eeaa25099872682d6c2f9f13a0e73fc5ce1e
Author: Daniel Martin <consume.noise@gmail.com>
Date: Fri Nov 28 11:20:46 2014 +0100
config/udev: Prefix and shift "removing GPU" message
The message "removing GPU device ..." appeared even if the removal was
skipped (when path == NULL). Move it below the path check and make it a
LogMessage with config/udev prefix.
Signed-off-by: Daniel Martin <consume.noise@gmail.com>
Reviewed-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Keith Packard <keithp@keithp.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit bc71081f0e3d8ce3aecf2cb168431dbc9fe6a87b
Author: Jon TURNEY <jon.turney@dronecode.org.uk>
Date: Fri Apr 18 12:17:06 2014 +0100
glx: Fix crash when a client exits without deleting GL contexts
With the previous patches applied, we now have crash due to use-after-free when
a client exits without deleting all it's GL contexts
On client exit, CloseDownClient first calls glxClientCallback() with
ClientStateGone, which calls __glXFreeContext() directly.
Subsequently CloseDownClient() frees all the clients resources, which leads to
ContextGone() being called for a context resource where the context has already
been freed.
Fix this by modifiying glxClientCallback() to free the context resource.
Also make __glXFreeContext() static, as calling it directly leads to this
problem, instead the context resource should be released.
With the previous patches applied, this can be demonstrated with e.g. glxinfo,
which doesn't delete it's context before exit.
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Reviewed-by: Adam Jackson <ajax@redhat.com>
commit 5c606c0a89e74fa223a99864be11cc3be60a159b
Author: Jon TURNEY <jon.turney@dronecode.org.uk>
Date: Fri Apr 18 12:17:05 2014 +0100
glx: Flush context which is being made non-current due to drawable going away
Some sequences of glean tests fail with GLXBadCurrentWindow when using indirect
rendering, e.g. glean -t 'fpexceptions getString'.
Flush a context which is being made non-current due to the drawable on which is
it is current going away. Waiting until another context is made current is too
late, as the drawable no longer exists.
v2: Rewrite for direct GL dispatch
v3: Inline FlushContext(), doesn't need to be a separate function
e.g. LIBGL_ALWAYS_INDIRECT=1 ./glean -r results -o --quick -t "fpexceptions
getString" fails with a BadContextTag error.
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Reviewed-by: Adam Jackson <ajax@redhat.com>
commit 437b27494f127854d75e59b4e2aac264e9f913e9
Author: Jon TURNEY <jon.turney@dronecode.org.uk>
Date: Fri Apr 18 12:17:04 2014 +0100
Revert "glx: Simplify glXDestroyContext"
This reverts commit 7f5adf73a0f9a951a6df201532b4031d38054369.
This seems to miss the whole point of the idExists flag, as it makes the
lifetime of that being true the same as the lifetime of the Context resource.
The previously current context tag is always given in a MakeContextCurrent
request, even if that context tag is no longer valid (for example, the context
has been deleted), so this leads to BadContextTag errors.
See fd.o bug #30089 for the makecurrenttest.c testcase, and some discussion of
previous manifestations of this bug.
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Reviewed-by: Adam Jackson <ajax@redhat.com>
commit 4b0d0df34f10a88c10cb23dd50087b59f5c4fece
Author: Peter Harris <pharris@opentext.com>
Date: Mon Nov 17 14:31:24 2014 -0500
Fix overflow of ConnectionOutput->size and ->count
When (long) is larger than (int), and when realloc succeeds with sizes
larger than INT_MAX, ConnectionOutput->size and ConnectionOutput->count
overflow and become negative.
When ConnectionOutput->count is negative, InsertIOV does not actually
insert an IOV, and FlushClient goes into an infinite loop of writev(fd,
iov, 0) [an empty list].
Avoid this situation by killing the client when it has more than INT_MAX
unread bytes of data.
Signed-off-by: Peter Harris <pharris@opentext.com>
Reviewed-by: Keith Packard <keithp@keithp.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 802932d112a3f6a09420be9e4a13fa78ac43840b
Author: Adam Jackson <ajax@redhat.com>
Date: Mon Nov 17 15:28:58 2014 -0500
render: fix ChangePicture when Xinerama is active (v2) (#49170)
ChangePicture takes wire XIDs, but didn't do any Xinerama translation,
which meant setting a clip pixmap or a separate alpha picture would
result in those elements pointing at the instance of the pixmap on
screen 0. Which is, you know, bad.
v2: This one actually builds.
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=49170
Signed-off-by: Adam Jackson <ajax@redhat.com>
Reviewed-by: Keith Packard <keithp@keithp.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit c2994001680a7dcf9c167886d49b7326c97cd5d1
Author: Aaron Plattner <aplattner@nvidia.com>
Date: Fri Nov 21 08:39:02 2014 -0800
os: "Server terminated successfully" is not an error
ErrorFSigSafe calls LogVMessageVerbSigSafe with the message type set to X_ERROR.
That generates this in the log:
(EE) Server terminated successfully (0). Closing log file.
People periodically report this as an error, sometimes quoting this "error"
rather than an earlier error that actually caused a problem.
v2: Use X_INFO instead of X_NOTICE
Signed-off-by: Aaron Plattner <aplattner@nvidia.com>
Reviewed-by: Keith Packard <keithp@keithp.com>
Reviewed-by: Eric Anholt <eric@anholt.net>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit b09d59342804db7dbb8056dca43dd39f54e290aa
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Wed Nov 26 13:01:29 2014 -0800
Add -iglx & +iglx to Xserver.man
Covers the current state after commits 99f0365b1fbdfd9238b9f,
d0da0e9c3bb8fe0cd4879, & e3aa13b8d63ea2fba6eb4 were all applied.
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: James Jones <jajones@nvidia.com>
Reviewed-by: Robert Morell <rmorell@nvidia.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit c52a2b1ebad56820af932dfbc871701a8b04fd9c
Author: Adam Jackson <ajax@redhat.com>
Date: Tue Nov 11 12:30:07 2014 -0500
mi: Fix regression in arc drawing
xts' XDrawArcs/15 regressed (turning into a server-side infinite loop)
after:
commit 7679afd4da8b86aed27e5916ba723116a3c8bb4a
Author: Adam Jackson <ajax@redhat.com>
Date: Fri Sep 26 12:01:37 2014 -0400
mi: Fold mifpolycon.c into miarc.c
The reason is miarc.c provided its own definitions (sigh) of min/max,
that both accept int arguments and return an int. Since miFillSppPoly
uses a double (sigh) and some min-involving math for its loop index
variable, things do not go well.
Since the integer versions of min/max are redundant, nuke 'em.
Signed-off-by: Adam Jackson <ajax@redhat.com>
Reviewed-by: Aaron Plattner <aplattner@nvidia.com>
Tested-by: Keith Packard <keithp@keithp.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit ec0ac8970b508adcbc3d104b14a127118e4979d0
Merge: 65cc0982af 0f88d4e793
Author: Keith Packard <keithp@keithp.com>
Date: Mon Nov 24 15:39:51 2014 -0800
Merge remote-tracking branch 'whot/for-keith'
commit 65cc0982afb1d47d17e655efaef40d4a82e7574a
Author: Keith Packard <keithp@keithp.com>
Date: Mon Oct 13 10:31:52 2014 -0700
glamor: Don't insert fbos from external objects into fbo cache
Mark fbos created from external buffers so that when the associated
pixmap is destroyed, they aren't put into the fbo cache for later
re-use and are instead freed immediately.
Signed-off-by: Keith Packard <keithp@keithp.com>
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
commit 0f88d4e7937116dbc438f98ddf1f3d94cfc5bead
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Wed Nov 12 10:29:36 2014 +1000
mi: fix documentation for miPointerSetPosition
Changed when we added barriers, documentation didn't get updated.
Reported-by: Dave Airlie <airlied@redhat.com>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Dave Airlie <airlied@redhat.com>
commit 6a117af7e7ef6eac796ff0680a915c866fce4019
Author: John Hunter <zhaojunwang@pku.edu.cn>
Date: Mon Nov 3 15:45:38 2014 +0800
fix an annotation mistake
Signed-off-by: John Hunter <zhaojunwang@pku.edu.cn>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 732fd7e571b81d63aa44d6e4cf55883479e88f2f
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri Oct 31 09:45:12 2014 +1000
Drop trailing whitespaces
sed -i "s/[ ]\+$//g" **/*.(c|h)
happy reviewing...
git diff -w is an empty diff.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 96143d6dc35c98cb6b4e409dd89687e4ced3c1f0
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri Oct 31 09:32:35 2014 +1000
dix: silence compiler warning comparing CARD32 to -1
window.c:3246:36: warning: comparison of constant -1 with expression of type
'CARD32' (aka 'unsigned int') is always true
[-Wtautological-constant-out-of-range-compare]
if (optional->backingBitPlanes != ~0L)
~~~~~~~~~~~~~~~~~~~~~~~~~~ ^ ~~~
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Michel Dänzer <michel@daenzer.net>
commit 04ca16997994c7561ed8948b89fc1c922233da13
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri Oct 31 09:29:33 2014 +1000
dix: silence compiler warning
inpututils.c:243:26: warning: comparison of constant 256 with expression of
type 'KeyCode' (aka 'unsigned char') is always false
[-Wtautological-constant-out-of-range-compare]
if (modkeymap[i] >= MAP_LENGTH)
~~~~~~~~~~~~ ^ ~~~~~~~~~~
MAP_LENGTH depends on MAX_BUTTONS which is somewhat arbitrarily chosen. We
don't expect this to ever change, but just in case leave the condition there
so the code is correct if we drop the number down.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 79b9d33545034f2952ebc7e444c201693b45f44b
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri Oct 31 09:26:28 2014 +1000
xwayland: declare fatal log handler as noreturn
xwayland.c:661:1: warning: function 'xwl_log_handler' could be declared with
attribute 'noreturn' [-Wmissing-noreturn]
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit adee4f239b5074d318dfc48beb0ec4e91973b449
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri Oct 31 09:24:50 2014 +1000
xfree86: drop double-typedef of DBusConnection
Just include dbus.h, it's been typedef'd there since 2003.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 25315ee555dfeb96d9ed83064b1022ed852b612e
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri Oct 31 09:16:28 2014 +1000
Xext: fix clang compiler warning
shm.c:1150:24: warning: equality comparison with extraneous parentheses
[-Wparentheses-equality]
if ((shmdesc->addr == ((char *) -1))) {
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 995ecfb51d4ab8197e4591d5c0957e08a0bd6a59
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu Oct 30 09:00:21 2014 +1000
include: change RegionSize() to take a size_t
/usr/include/xorg/regionstr.h:130:36: warning: implicit conversion changes
signedness: 'int' to 'unsigned long' [-Wsign-conversion]
return (sizeof(RegDataRec) + ((n) * sizeof(BoxRec)));
^ ~
Really only just pushes the problem to the caller, but maybe that motivates
someone to fix it.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 3ccec1b5ba6a26a30f82ba3aa9c5218dfa336869
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu Oct 30 08:56:55 2014 +1000
include: fix documentation for list.h
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
commit 5920433c3a30f5f1c0ba1ab39a0c2ff388df6b23
Author: Colin Harrison <colin.harrison@virgin.net>
Date: Sat Sep 27 11:50:11 2014 +0100
hw/xwin: Don't allocate one wchar_t too much for unicode text placed on the Windows clipboard
The count of wchar_t returned by MultiByteToWideChar() includes the terminating
null character, so don't add one to it.
Also, reduce the scope of various length variables
Signed-off-by: Colin Harrison <colin.harrison@virgin.net>
Reviewed-by: Jon TURNEY <jon.turney@dronecode.org.uk>
commit d172cd630dae9c991b84b4c367a4caf8199266ac
Author: Jon TURNEY <jon.turney@dronecode.org.uk>
Date: Mon Apr 28 12:48:15 2014 +0100
hw/xwin: Fix hang on shutdown when we own the clipboard.
If we are the clipboard owner when we are shutdown, we recieve a
WM_RENDERALLFORMATS, to render the clipboard, so it's contents will remain
available to other applications. Unfortunately, this is far too late to do
anything useful with, as the server is waiting for the clipboard thread to exit,
and so can't process requests to convert clipboard contents.
Change so we just do nothing on WM_RENDERALLFORMATS. (I'm not convinced that
WM_RENDERALLFORMATS has ever worked usefully, in any case).
(To make this work, I guess we would need to rearrange the way shutdown works
completely: first synchronously stop the clipboard, then stop the X server)
We also then receive a WM_DRAWCLIPBOARD, perhaps telling us that the available
clipboard formats have changed (as ones which haven't been rendered are now
removed), but the clipboard owner is now the system, not us, which we have to
arrange to ignore.
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
commit 94d433c8cb64c9167050d02473176f888decf1d8
Author: Jon TURNEY <jon.turney@dronecode.org.uk>
Date: Fri Feb 21 23:20:00 2014 +0000
hw/xwin: Fix clipboard thread restart
It seems that the clipboard thread restart mechanism has been broken for a
while, which can be demonstrated using XDMCP with KDM (e.g. to a Kubutunu 12.04
host)
KDM kills all attached clients, including the clipboard integration client,
which restarts, but then exits on WM_QUIT.
Using PostQuitMessage() in WM_DESTROY is unhelpful, as we may not actually be
quitting the thread, if we just destroyed the window because the clipboard
thread is about to retry, because he WM_QUIT message sticks around, and is
noticed the next time we look at the window message queue and confuses us into
thinking we need to quit.
Sending a WM_DESTROY is apparently never correct anyhow, see [1]
So:
1/ Use DestroyWindow() to destroy the clipboard messaging window when cleaning
up for retry or exit in winClipboardProc (the clipboard thread main proc)
2/ Send a special WM_WM_QUIT message in winClipboardWindowDestroy() from the X
server thread when the X server is resetting.
3/ When processing that WM_WM_QUIT message in the clipboard thread, cause the
clipboard window to PostQuitMessage(), which causes the clipboard thread to
exit.
[1] http://blogs.msdn.com/b/oldnewthing/archive/2011/09/26/10216420.aspx
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
commit b4a08e642b977b4bbc892ff1d96ecc0cf6e2ca54
Author: Jon TURNEY <jon.turney@dronecode.org.uk>
Date: Thu Nov 21 15:18:48 2013 +0000
hw/xwin: Improve reliability of clipboard X->Windows pastes
Sometimes, particularly with large clipboard pastes to Windows, we could end up
waiting for the timeout to expire, rather than pasting the data.
Various changes to improve reliability:
1. Use XFlush() not XSync() in winProcessXEventsTimeout().
It makes no sense to ensure we have received replies to outstanding requests if
we are going to wait for them using select()
2. Add XFlush() to winClipboardProc()
Make sure we have sent any requests before we wait using select()
3. Don't use FD_ISSET() to check which fd is ready
This looks like a Cygwin select() bug in that it sometimes returns 0 with an
empty fd set before the timeout expires, but a fd appears to be ready.
Add select() return value to debug output when we are warning that this has
happened.
4. Drain event queues before entering select()
Unconditionally drain event queues before entering select(). This seems to be
the recommended way of writing select() and X event processing loops.
winClipboardFlushXEvents() checks using XPending(), and
winClipboardFlushWindowsMessageQueue() checks using PeekMessage() so this is
safe against blocking, but means that may not need to enter select() at all
sometimes.
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
commit c03f9e23c2b75af410b2fc76ca3f1aa9e979dcc4
Author: Jon TURNEY <jon.turney@dronecode.org.uk>
Date: Tue Sep 24 15:09:22 2013 +0100
hw/xwin: Add controls for enabling/disabling monitoring of PRIMARY selection
xwinclip: Add -noprimary option
Xwin: Add -primary and -noprimary options and tray-menu control
v2:
Use Bool type for fPrimarySelection
Add -noprimary to usage message
Fix indentation in hw/xwin/winwndproc.c
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
commit 851b50419907276fdc781b6be2d42b38849bbd77
Author: Jon TURNEY <jon.turney@dronecode.org.uk>
Date: Tue Sep 24 16:02:37 2013 +0100
hw/xwin: Retrieve TARGETS to avoid unnecessary failing conversion attempts
See http://cygwin.com/ml/cygwin-xfree/2013-07/msg00016.html
It looks like the change in a9aca218f557c723e637287272819a7c17174e1e had some
unforseen consequences.
If the X11 selection contents are not convertable to COMPOUND_TEXT, UTF8_STRING
or STRING format (for example, if it is an image), after those conversion
attempts have failed, we sit in winProcessXEventsTimeout() until the timeout
expires.
It also seems that maybe gnuplot doesn't respond correctly to this sequence of
conversion requests and doesn't reply to some of them, which also causes us to
sit in winProcessXEventsTimeout() until the timeout expires.
The Windows application which has requested the clipboard contents via
GetClipboardContents() is blocked until we return from WM_RENDERFORMAT, so
sitting waiting for this timeout to expire should be avoided.
So instead, explicitly request conversion to the TARGETS target, choose
the most preferred format, and request conversion to that.
Also: if there is no owned selection, there is nothing to paste, so don't bother
trying to convert it.
v2: Fix compilation with -Werror=declaration-after-statement
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
commit 4db1241037e3fe8f0a46888377b8fef40bae9065
Author: Jon TURNEY <jon.turney@dronecode.org.uk>
Date: Tue Sep 24 13:30:32 2013 +0100
hw/xwin: In SelectionNotify, don't pointlessly retrieve just the size of the property
Don't pointlessly retrieve just the size of the property, if we are then going
to assume we can retrieve the whole property in one request anyhow...
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
commit c5ad92077e7eb32590fafa92d697cc4173f7e57b
Author: Jon TURNEY <jon.turney@dronecode.org.uk>
Date: Tue Sep 24 12:23:42 2013 +0100
hw/xwin: In SelectionNotify, delete the property containing returned data after we have retrieved it
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
commit ff018d88b9f0fe23ba96c81b53d58532baf4df42
Author: Jon TURNEY <jon.turney@dronecode.org.uk>
Date: Thu Oct 2 14:10:50 2014 +0100
hw/xwin: Remove some redundant clipboard externs, now defined in winglobals.h
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
commit 63bb5c5ef16edf652179770294dcca4fc07dc992
Author: Thierry Reding <treding@nvidia.com>
Date: Wed Oct 29 16:59:27 2014 +0100
xv: Add missing gcstruct.h include
Commit ea3f3b0786d5 (xv: Move xf86 XV color key helper to core.) added
code that uses internals of struct _GC. This structure is defined in the
include/gcstruct.h header which wasn't included by the source file, only
gc.h was. That caused the following build failure:
CC xvmain.lo
Xext/xvmain.c: In function 'XvFillColorKey':
Xext/xvmain.c:1114:13: error: dereferencing pointer to incomplete type
(*gc->ops->PolyFillRect) (pDraw, gc, nbox, rects);
^
Fix this by including the correct header file.
Signed-off-by: Thierry Reding <treding@nvidia.com>
Tested-by: Keith Packard <keithp@keithp.com>
Reviewed-by: Keith Packard <keithp@keithp.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 882f2d10d99a04a96afc0ce0c8937e16bec3afb5
Author: Axel Davy <axel.davy@ens.fr>
Date: Wed Oct 29 13:31:42 2014 +0100
Fix present_notify to return right away when querying current or past msc.
When the target msc is past or is the current one, we want to get immediate
feedback. This patch fixes this behaviour.
Signed-off-by: Axel Davy <axel.davy@ens.fr>
Reviewed-by: Keith Packard <keithp@keithp.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 72a0754f4605493fd60471557422f88a97eb356a
Author: Aaron Plattner <aplattner@nvidia.com>
Date: Wed Oct 29 19:19:18 2014 -0700
xfree86: Bump ABI versions (video: 19, extension: 9)
Among other things, commit b851ca968b7cce6d1a6438c05d3d5c8832249704 added a
NameWindowPixmap function pointer to ScreenRec, shifting some of the fields
around.
Signed-off-by: Aaron Plattner <aplattner@nvidia.com>
Reviewed-by: Keith Packard <keithp@keithp.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit b227d974569b4c315a72b85fe839c5f455396678
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu Oct 30 08:54:11 2014 +1000
include: fix compiler warning about casting int to uint16_t
/usr/include/xorg/misc.h:141:30: warning: implicit conversion loses integer
precision: 'int' to 'uint16_t' (aka 'unsigned short') [-Wconversion]
return ((x & 0xff) << 8) | ((x >> 8) & 0xff);
~~~~~~ ~~~~~~~~~~~~~~~~~~^~~~~~~~~~~~~~~~~~~
Function sig is a uint16_t, so just force the cast.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit e9db7682028bb0464c211c1f7bb6983fcfb6f37b
Author: Keith Packard <keithp@keithp.com>
Date: Tue Oct 28 21:32:24 2014 -0700
Update to version 1.16.99.901
1.17 RC1
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 5ff74d68b0cce85e041251efdc76595eac3c89e4
Author: Keith Packard <keithp@keithp.com>
Date: Tue Oct 28 21:31:40 2014 -0700
xfree86: Include 'drivers' directory with distribution
Even if we don't build it locally, make sure it gets included with the release.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit f36f16f0551aa091c1ff154875aebe3d29cf51e7
Author: Keith Packard <keithp@keithp.com>
Date: Tue Oct 28 21:30:23 2014 -0700
dri2: Distribute new pci_ids headers
Create hw/xfree86/dri2/pci_ids/Makefile.am which includes all of the new
pci id files in the tarballs. Build that from configure.ac, and run it
from dri2/Makefile.am
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 65dd1ba7b3e00243a76ec691e566ef7c8dd94855
Author: Keith Packard <keithp@keithp.com>
Date: Wed Oct 22 14:48:10 2014 -0700
dix: Untwist transformAbsolute logic, eliminate uninitialized value warnings
tranformAbsolute has a pretty simple job, that of running the X/Y
values from a device through the transformation matrix. The tricky bit
comes when the current device state doesn't include one of the
values. In that case, the last delivered value is back-converted to
device space and used instead.
The logic was twisted though, confusing GCC's uninitialized value
detection logic and emitting warnings.
This has been fixed by changing the code to:
1) Detect whether the ValuatorMask includes X/Y values
2) If either are missing, back-convert the current values into ox/oy
3) When X/Y are present, set ox/oy to the current value
4) Transform
5) Store X/Y values if changed or if they were set before.
Signed-off-by: Keith Packard <keithp@keithp.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 0fbbdb37c87b5824729f65c7fbac05223024fd27
Author: Adam Jackson <ajax@redhat.com>
Date: Wed Oct 22 13:19:18 2014 -0400
composite: Wrap GetSpans
GetSpans should flush composition from children to parent, just like
GetImage and SourceValidate. Fortunately no one is likely to have
noticed, since to hit this you're already deep into failure town.
Signed-off-by: Adam Jackson <ajax@redhat.com>
Reviewed-by: Keith Packard <keithp@keithp.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit da70c7d556bbf21ad495c26e982e2e0f2d7de6c1
Author: Keith Packard <keithp@keithp.com>
Date: Wed Oct 22 14:27:26 2014 -0700
xkb: Initialize 'bad' Atom in _XkbSetNamesCheck
When _XkbCheckAtoms returns NULL for an error, it always sets the
error return code, but GCC can't figure that out, so just initialize
the local variable, 'bad', in _XkbSetNamesCheck to eliminate the warning.
Signed-off-by: Keith Packard <keithp@keithp.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 2566835b4374edb3e5a8353d4f7c9e7ec4851c57
Author: Keith Packard <keithp@keithp.com>
Date: Wed Oct 22 14:24:55 2014 -0700
os: Eliminate uninitialized value warnings from access.c
The ConvertAddr function doesn't reliably set the 'addr' return value,
and so callers are getting flagged for using potentially uninitialized
values. Initialize the value in the callers to NULL and then go ahead
and check for NULL values before using them.
Signed-off-by: Keith Packard <keithp@keithp.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 1b94fd77792310c80b0a2bcf4bf6d4e4c4c23bca
Author: Alex Orange <crazycasta@gmail.com>
Date: Fri Oct 3 15:41:38 2014 -0600
fb: Fix Bresenham algorithms for commonly used small segments.
Fixes: https://bugs.freedesktop.org/show_bug.cgi?id=54168
Fix errors introducted in 863d528a9f76d0e8f122aebf19f8564a4c67a938. Said
patch does indeed remove the problematic writes to bad memory, however
it also introduces errors in the algoritm. This patch has the effect of
reverting said patch and adding an if in the proper location to catch
the out of bounds memory write without causing problems to the overall
algorithm.
Signed-off-by: Alex Orange <crazycasta@gmail.com>
Reviewed-by: Peter Harris <pharris@opentext.com>
Tested-by: Peter Harris <pharris@opentext.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit ea5b2b0a2e2143ad1414fcbdc081b5d584588346
Author: Jon TURNEY <jon.turney@dronecode.org.uk>
Date: Tue Oct 21 15:03:55 2014 +0100
os: -displayfd should check ports up to 65535
-displayfd should check ports up to 65535
Noticed during https://cygwin.com/ml/cygwin-xfree/2014-07/msg00024.html
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 3a123fbdda56b24dc01a2308137144dc960e0d61
Merge: 9b29fa957a 7ea4a21fee
Author: Keith Packard <keithp@keithp.com>
Date: Mon Oct 27 15:39:26 2014 -0700
Merge remote-tracking branch 'jturney/master'
Conflicts:
hw/xwin/winpixmap.c
Adam removed a pile of windows code, including this file.
commit 9b29fa957a397664463c7c78fbcc2f34d1993271
Author: Chris Wilson <chris@chris-wilson.co.uk>
Date: Thu Oct 16 14:09:08 2014 +0100
Xext/shm: Detach SHM segment after Pixmap is released
The GPU may still have a reference to the SHM segment which would only
be finally released when the Pixmap is destroy. So we can only detach
the SHM segment (and thereby making the memory unaccessible) after the
backend has had a chance to flush any remaining references.
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=85058
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Reported-and-tested-by: gedgon@gmail.com
Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 5adc20179e9818d51e1cd79bfc8a8271786c3949
Author: Keith Packard <keithp@keithp.com>
Date: Mon Oct 27 15:28:14 2014 -0700
modesetting: Skip kernel work-around on error in crtc to kernel msc
ms_crtc_msc_to_kernel_msc attempts to work around kernel
inconsistencies in reporting msc values by comparing the expected
value with the reported value. If the kernel fails to
actually provide its current values, then just skip the work around
steps as there's really nothing better we can do.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 59b12c454d9c4b5a26c6ad87c53abc671b15ce37
Merge: 5574a0a07e cac4b064f9
Author: Keith Packard <keithp@keithp.com>
Date: Mon Oct 27 14:48:55 2014 -0700
Merge remote-tracking branch 'anholt/modesetting-dri2-no-pageflip'
commit 5574a0a07e83ff989c074c44d3ea9db0a819f472
Author: Keith Packard <keithp@keithp.com>
Date: Mon Oct 27 13:38:21 2014 -0700
composite: Skip SetWindowPixmap when pixmap isn't changing
Check the current window pixmap to see if it matches the new pixmap
and avoid calling SetWindowPixmap in that case.
x11perf -ucreate highlights an instance where compCreateWindow reassigns
the same Pixmap to the Window. Currently this triggers an expensive
invalidation of the entire window hierachy, making sure that DRI2
clients are kept informed of the handle changes. However, as the backing
Pixmap for the Window is actually unchanged, there is no need to
do anything in this case.
Signed-off-by: Keith Packard <keithp@keithp.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Tested-by: Chris Wilson <chris@chris-wilson.co.uk>
commit df6a3a07f60c40bab2b59b9b3ba0c20c8fb7e95d
Author: Yogish Kulkarni <yogishk@nvidia.com>
Date: Wed Oct 22 12:55:28 2014 +0530
Skip SetCursor when vtSema is FALSE.
Consider below sequence -
1) Cursor is removed : isUp will be FALSE if HW cursor is set.
2) VT switched away from X : vtSema becomes FALSE.
3) xf86CursorSetCursor is called with non-null CursorPtr :
Saves the passed in CursorPtr, fallbacks to SW cursor and invokes
spriteFuncs->SetCursor which saves the area under cursor and restores
the cursor. This sets isUp to TRUE and as vtSema is FALSE saved data
is garbage.
4) VT switched to X : vtSema becomes TRUE. xf86Cursor enable fb access
is called which will remove the SW cursor, i.e copies saved data in #3
to screen.
This results to momentary garbage data on screen. Hence when !vtSema
skip spriteFuncs->SetCursor.
X.Org Bug 85313 <https://bugs.freedesktop.org/show_bug.cgi?id=85313>
Signed-off-by: Yogish Kulkarni <yogishk@nvidia.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit cac4b064f9f66435430f61568c6a516c54bf3c40
Author: Eric Anholt <eric@anholt.net>
Date: Mon Dec 30 17:23:38 2013 -0800
modesetting: Add support for DRI2 with glamor.
This is derived from the intel driver DRI2 code, with swapchain and
pageflipping dropped, functions renamed, and vblank event management
shared code moved to a vblank.c for reuse by Present.
This allows AIGLX to load, which means that you get appropriate
visuals exposed in GL, along with many extensions under
direct-rendering that require presence in GLX (which aren't supported
in glxdriswrast.c).
v2: Drop unused header includes in pageflip.c, wrap in #ifdef GLAMOR.
Drop triple-buffering, which was totally broken in practice (I'll
try to fix this later). Fix up some style nits. Document the
general flow of pageflipping and why, rename the DRI2 frame event
type enums to reflect what they're for, and handle them in a
single switch statement so you can understand the state machine
more easily.
v3: Drop pageflipping entirely -- it's unstable on my Intel laptop
(not that the normal 2D driver is stable with pageflipping for
me), and I won't get it fixed before the merge window. It now
passes all of the OML_sync_control tests from Jamey and Theo
(except for occasional warns in timing -fullscreen -divisor 2).
v4: Fix doxygen at the top of vblank.c
Signed-off-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Adam Jackson <ajax@redhat.com>
commit 7064b00d478646cb428e427df2d3f91d7022c582
Author: Eric Anholt <eric@anholt.net>
Date: Mon Dec 30 00:25:37 2013 -0800
modesetting: Export two functions I want to reuse from DRI2/Present.
This renames dumb_get_bo_from_handle(), since it wasn't using a handle
(GEM terminology) but a dmabuf fd.
Signed-off-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Adam Jackson <ajax@redhat.com>
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
commit 34a98c8103a6f725283d0d1ee4084bf387b93019
Author: Eric Anholt <eric@anholt.net>
Date: Wed Oct 8 04:12:49 2014 -0700
dri2: Automatically fill in the driver name if the DDX doesn't provide it.
This will be used by the modesetting driver to support DRI2 across all
hardware that can support glamor, and could potentially be used by
other drivers that have to support DRI2 on sets of hardware with
multiple Mesa drivers.
This logic is the same as what's present in the Mesa driver loader,
except for the lack of nouveau_vieux support (which requires a
predicate on the device).
v2: Fix duplicated assignment of info->driverName.
Signed-off-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Adam Jackson <ajax@redhat.com>
commit 470d97e1d176981dbd8087c621e54caab0d6c73c
Author: Eric Anholt <eric@anholt.net>
Date: Tue Dec 31 13:52:49 2013 -0800
dri2: Import a copy of Mesa's PCI ID -> driver name mappings.
This comes from Mesa commit acdcef6788beaa2a1532e13ff84c3e246b8025ed
Previously, each driver had to tell DRI2 what GL driver object should
be loaded. Originally for a 2D driver that was a matter of giving the
constant string for the vendor name, same as the driver's name. For a
driver that's trying to handle multiple generations of hardware with
different Mesa driver filenames, the driver had to bake in a mapping
from PCI ID to the appropriate driver name in Mesa, which seems like a
pretty awful layering violation (and one that was fixed with DRI3)
As of January, Mesa now handles the mapping from a DRI fd to the
driver name on its own, but the AIGLX loader still relies on DRI2 for
choosing the filename. Instead of propagating the PCI ID list from
each 2D driver to the modesetting driver, import a central copy of the
PCI ID list so that drivers can stop handling this themselves. (Some
day, when AIGLX transitions to EGL, we can drop the DRI2 filename
setup entirely).
Signed-off-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Adam Jackson <ajax@redhat.com>
commit 839f05329ddb6f9b5b988edf3a2c3a1f856727f7
Author: Adam Jackson <ajax@redhat.com>
Date: Fri Feb 28 16:35:10 2014 -0500
dix: Retype and repack GC
LP64: 160 bytes before, 128 after.
Signed-off-by: Adam Jackson <ajax@redhat.com>
Reviewed-by: Keith Packard <keithp@keithp.com>
commit 73e2383b7350723256894c5076d0c731aec5cd1f
Author: Adam Jackson <ajax@redhat.com>
Date: Fri Jun 20 13:31:20 2014 -0400
dix: Always store GC client clip as a region (v2)
Again, this changes FixesCreateRegionFromGC to throw BadMatch when fed a
GC with no client clip.
v2: Fix Xnest and some variable names (Keith)
Reviewed-by: Keith Packard <keithp@keithp.com>
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit e7b9295551d55b42b416ba70cce11dae79ece5e7
Author: Adam Jackson <ajax@redhat.com>
Date: Fri Sep 26 13:41:59 2014 -0400
fb: Hide fbPush{Pattern,Fill}
Reviewed-by: Keith Packard <keithp@keithp.com>
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit e31d16a82d83738740f67743b759c006d9845e79
Author: Adam Jackson <ajax@redhat.com>
Date: Fri Sep 26 13:32:37 2014 -0400
fb: Hide fbDots
Reviewed-by: Keith Packard <keithp@keithp.com>
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit 5db0f067ed4ff24c48cdb7998e4a52ad80037cb7
Author: Adam Jackson <ajax@redhat.com>
Date: Fri Sep 26 13:30:06 2014 -0400
fb: Hide Bresenham line details
Reviewed-by: Keith Packard <keithp@keithp.com>
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit b184a863c111834e28564d963c0733a30833f128
Author: Adam Jackson <ajax@redhat.com>
Date: Tue Jul 8 12:23:48 2014 -0400
fb: Hide some zero-width line details
Reviewed-by: Keith Packard <keithp@keithp.com>
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit 266cd552bd54fd3e7a83ae7178a303285857631e
Author: Adam Jackson <ajax@redhat.com>
Date: Tue Jul 8 12:13:13 2014 -0400
fb: Hide glyph implementation details
Reviewed-by: Keith Packard <keithp@keithp.com>
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit e572bcc7f4236b7e0f23ab762f225b3bce37db59
Author: Adam Jackson <ajax@redhat.com>
Date: Mon Jun 23 15:24:35 2014 -0400
fb: Remove even/odd tile slow-pathing
Again, clearly meant to be a fast path, but this turns out not to be the
case.
Reviewed-by: Keith Packard <keithp@keithp.com>
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit 836bb27726441e048bb300664343a136bc596a5b
Author: Adam Jackson <ajax@redhat.com>
Date: Tue Jun 17 12:25:42 2014 -0400
fb: Remove unused fbReduceRasterOp
Appears to have been cargo-culted in from cfb and then never used.
Reviewed-by: Keith Packard <keithp@keithp.com>
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit 167ccd33e0d2c4bd68aebcdba5a512d24c5eb49a
Author: Adam Jackson <ajax@redhat.com>
Date: Tue Jun 17 12:21:19 2014 -0400
fb: Move fbStipple*Bits near their only consumer
And remove fbStippleTable since gcc can't figure that out itself.
Reviewed-by: Keith Packard <keithp@keithp.com>
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit 7430fdb689678b98ac63f5a8dad13719bac777e0
Author: Adam Jackson <ajax@redhat.com>
Date: Tue Dec 17 14:46:38 2013 -0500
fb: Remove even/odd stipple slow-pathing
This is clearly meant to be a fast path, but it appears to be a net
loss at this point.
If you really wanted to ricer-tune here, note that the inner loop of
fbBltOne is a bit too complicated for gcc (at least 4.8.2), it doesn't
specialize the loop for the handful of legal values of bitsPerDst, which
means computing at runtime what could have been const-propped.
Reviewed-by: Keith Packard <keithp@keithp.com>
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit a1983736853814d34450c0a0de1c4f6ee308423d
Author: Adam Jackson <ajax@redhat.com>
Date: Tue Jun 17 11:24:06 2014 -0400
fb: FB_SHIFT is 5 (and FB_UNIT is 32)
The other paths don't build or work, PCI and other buses are almost
always 32 bit data paths, and X doesn't really support pixels bigger
than that anyway.
Reviewed-by: Keith Packard <keithp@keithp.com>
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit 3d35bd6b79957a3441abd87a377f0beb058997ed
Author: Adam Jackson <ajax@redhat.com>
Date: Mon Mar 24 12:01:54 2014 -0400
fb: Eliminate fbLaneTable, staticize fb{8,16,32}Lane
gcc doesn't appear to be smart enough to fold away the indirection here,
even if you make fbLaneTable const.
Reviewed-by: Keith Packard <keithp@keithp.com>
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit 86ce6262975a7d53d9331723beb49cbe7bd02b48
Author: Adam Jackson <ajax@redhat.com>
Date: Fri Sep 26 12:39:38 2014 -0400
mi: Fold micursor.c into mipointer.c
Reviewed-by: Keith Packard <keithp@keithp.com>
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit 3b63900e90f44cf85a4d3391d23407b3bb6db52b
Author: Adam Jackson <ajax@redhat.com>
Date: Fri Sep 26 12:34:15 2014 -0400
mi: Fold mipolyutil.c into mipoly.c
Reviewed-by: Keith Packard <keithp@keithp.com>
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit 21b041ef48c49ff6fc06f6e4482ffe54cb763493
Author: Adam Jackson <ajax@redhat.com>
Date: Fri Sep 26 12:27:22 2014 -0400
mi: Fold mipoly{con,gen}.c into mipoly.c
Reviewed-by: Keith Packard <keithp@keithp.com>
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit 7679afd4da8b86aed27e5916ba723116a3c8bb4a
Author: Adam Jackson <ajax@redhat.com>
Date: Fri Sep 26 12:01:37 2014 -0400
mi: Fold mifpolycon.c into miarc.c
Also put mifpoly.h on a diet, and stop including it from places that
don't need it.
Reviewed-by: Keith Packard <keithp@keithp.com>
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit f307ef10f4c33da4b5ae59800931741b0a431d75
Author: Adam Jackson <ajax@redhat.com>
Date: Mon Jul 21 17:22:07 2014 -0400
mi: Fold mispans.c into miwideline.c
Reviewed-by: Keith Packard <keithp@keithp.com>
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit 707965407a3c907058b89610e73e02989fd0b552
Author: Adam Jackson <ajax@redhat.com>
Date: Fri May 23 12:10:29 2014 -0400
mi: Unexport arc fill implementation details
Reviewed-by: Keith Packard <keithp@keithp.com>
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit ce8fff5cd681523088c14b97ce4fb6e4fb658321
Author: Adam Jackson <ajax@redhat.com>
Date: Fri May 23 12:06:03 2014 -0400
mi: Unexport subpixel polygon implementation details
Reviewed-by: Keith Packard <keithp@keithp.com>
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit a085ba82bde375b5c884a40b410b563815c58a9e
Author: Adam Jackson <ajax@redhat.com>
Date: Fri May 23 11:55:05 2014 -0400
mi: Unexport span group implementation details
Reviewed-by: Keith Packard <keithp@keithp.com>
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit c15c886ee70f9144bc4603b918310f229312aadc
Author: Adam Jackson <ajax@redhat.com>
Date: Fri May 23 11:50:07 2014 -0400
mi: Unexport polygon edge table implementation details
Reviewed-by: Keith Packard <keithp@keithp.com>
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit 9bdc9b0113915de3d536b2b3f025915379c2126f
Author: Adam Jackson <ajax@redhat.com>
Date: Fri May 23 11:21:28 2014 -0400
mi: Unexport wide line details
XAA wanted these, once upon a time, but that's gone now.
Reviewed-by: Keith Packard <keithp@keithp.com>
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit d181e52ceb9ae44e1faa8d5af8805f43328da6c2
Author: Keith Packard <keithp@keithp.com>
Date: Fri Oct 24 11:56:23 2014 -0700
glamor: Free converted bits in _glamor_upload_bits_to_pixmap_texture fast path
When uploading bits to a texture which need reformatting to match a
supported GL format, a temporary buffer is allocated to hold the
reformatted bits. This gets freed in the general path, but is not
freed in the fast path because that includes an early return before
the call to free.
This patch removes the early return and places the general case under
an 'else' block, so that both paths reach the call to free.
Signed-off-by: Keith Packard <keithp@keithp.com>
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
commit 55b27ed70cf9dfa9b9dffe46e9a3191bfda38f7c
Author: Andreas Hartmetz <ahartmetz@gmail.com>
Date: Sat Oct 4 18:13:04 2014 +0200
glamor: Don't free memory we are going to use.
glamor_color_convert_to_bits() returns its second argument on
success, NULL on error, and need_free_bits already makes sure that
"bits" aliasing converted_bits is freed in the success case.
Looks like the memory leak that was supposed to be fixed in
6e50bfa706cd3ab884c933bf1f17c221a6208aa4 only occurred in the error
case.
Reviewed-by: Michel Dänzer <michel.daenzer@amd.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 16a32c53f6e9ad1f3284d4596edfa33e9efb740e
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Thu Oct 9 05:42:09 2014 -0700
If fork fails in System(), don't fallthrough to exec()
In the unlikely event of a failure in creating processes, signal
masks will fall from the panels above you. Secure your mask before
telling your child what to do, since it won't exist, and you will
instead cause the server itself to be replaced by a shell running
the target program.
Found by Coverity #53397: Missing break in switch
Execution falls through to the next case statement or default;
this might indicate a common typo.
In System: Missing break statement between cases in switch statement (CWE-484)
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Matthieu Herrb <matthieu@herrb.eu>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 7e5bc49d1ed2c78c321da79bdbc99b90c5f95b38
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Thu Oct 9 05:42:08 2014 -0700
Allocate enough room for both reset & flags attributes
ctx_attribs had room for 3 pairs of attributes, but if both flags & reset
attributes were being returned it was storing 4 pairs in the array.
Found by Coverity #53442: Out-of-bounds write
This could cause an immediate crash or incorrect computations.
In create_driver_context: Out-of-bounds write to a buffer (CWE-119)
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit cffd4e4a4ee615d8583eae78b35017e0d1bfa4f0
Author: Adam Jackson <ajax@redhat.com>
Date: Thu Oct 9 09:58:06 2014 +0200
mi: Mark the span blit routines as _X_COLD
On gcc, __attribute__((cold)) means:
- consider calls to the function to be unlikely for branch prediction
- optimize the function for size
- emit the function in a dedicated cold text section
It's not worth deleting these routines even though there are no longer
in-tree consumers, but we can at least keep them out of i$ at runtime.
Signed-off-by: Adam Jackson <ajax@redhat.com>
Reviewed-by: Keith Packard <keithp@keithp.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit de55aafa8f6a9e0dec364bec920d6f91ef2b39f0
Merge: 462bf87c4d c79f824bf6
Author: Keith Packard <keithp@keithp.com>
Date: Thu Oct 23 17:28:24 2014 -0700
Merge remote-tracking branch 'ajax/xwin'
commit 462bf87c4d1c2211dd49a5ce62d01ff84ff33970
Author: Adam Jackson <ajax@redhat.com>
Date: Wed Oct 8 17:20:33 2014 +0200
render: Always store client clip as a region
This does have one semantic change. FixesCreateRegionFromPicture used to
throw BadImplementation if you tried to create a region from a picture
with no client clip. I changed that to BadMatch here since that more
honestly describes what's going on.
Signed-off-by: Adam Jackson <ajax@redhat.com>
Reviewed-by: Keith Packard <keithp@keithp.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 3f4edd2e3ff84c38df563b09c2e8c32404db38f7
Author: Adam Jackson <ajax@redhat.com>
Date: Wed Oct 8 17:18:32 2014 +0200
xinerama: Fix access mode in GetImage's drawable lookup
Signed-off-by: Adam Jackson <ajax@redhat.com>
Reviewed-by: Julien Cristau <jcristau@debian.org>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 942e18e17e334d7a25f8c1dcc6f5c3711eeb6a7d
Author: William ML Leslie <william.leslie.ttg@gmail.com>
Date: Wed May 21 10:28:52 2014 +1000
Xephyr: option to disable grabbing the host
This patch makes it possible to use C-S key combinations
within Xephyr without losing access to the host window manager's
commands.
Signed-off-by: Keith Packard <keithp@keithp.com>
Reviewed-by: Eric Anholt <eric@anholt.net>
commit 7ea4a21feed5ac5e71cc6d8141c97d6362402c5d
Author: Jon TURNEY <jon.turney@dronecode.org.uk>
Date: Fri Sep 19 13:37:50 2014 +0100
configure.ac: Force --disable-libdrm on Cygwin
This is now needed to avoid trying to build the modesetting driver by default
when building the Xorg DDX on Cygwin.
http://tinderbox.x.org/builds/2014-09-18-0011/logs/xserver/#build
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Reviewed-by: Adam Jackson <ajax@redhat.com>
commit 883927d2e8733f4070b2a8bcc5ec8cc2d7a661b3
Author: Jon TURNEY <jon.turney@dronecode.org.uk>
Date: Tue Sep 30 13:55:59 2014 +0100
configure.ac: Avoid "Your OS is unknown" warning when configuring for Cygwin
Don't emit "Your OS is unknown" warning when configuring with --enable-xorg to
build the XOrg DDX for Cygwin.
The list of supported OSes is getting a bit unwieldy, so just remove it.
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Reviewed-by: Adam Jackson <ajax@redhat.com>
commit 549b3175afc46cee6e1b61841f854a5272eaf1f7
Author: Jon TURNEY <jon.turney@dronecode.org.uk>
Date: Thu Oct 2 15:37:50 2014 +0100
hw/xwin: Fix unused variable warning in winCreateMsgWindow()
winmsgwindow.c:99:11: warning: variable ‘winClass’ set but not used [-Wunused-but-set-variable]
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
commit 5adfb566fe05bcf5f40b4adc1457862936d6d038
Author: Jon TURNEY <jon.turney@dronecode.org.uk>
Date: Fri Oct 3 14:22:30 2014 +0100
hw/xwin: Fix redundant declaration warning in winprefslex.l
winprefslex.l:40:12: warning: redundant redeclaration of ‘yyparse’ [-Wredundant-decls]
winprefsyacc.h:130:5: note: previous declaration of ‘yyparse’ was here
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
commit 8f062f73805765f5769dfd7b738c8dd10062fba6
Author: Jon TURNEY <jon.turney@dronecode.org.uk>
Date: Fri Oct 3 14:12:57 2014 +0100
hw/xwin: Fix warning in yyerror()
winprefsyacc.y:257:3: warning: nested extern declaration of ‘yylineno’ [-Wnested-externs]
Promote yylineno declaration to file scope
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
commit f0f0c92a08f0ccf5a7ac447d117eb0341fe136d6
Author: Jon TURNEY <jon.turney@dronecode.org.uk>
Date: Fri Oct 3 14:00:06 2014 +0100
hw/xwin: Fix const warning in winPrefsLoadPreferences()
winprefs.c:643:14: warning: assignment discards ‘const’ qualifier from pointer target type [enabled by default]
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
commit 593c6b19349538ec3b89bc48eb3f0bb4c0cebb23
Author: Jon TURNEY <jon.turney@dronecode.org.uk>
Date: Thu Oct 2 15:35:54 2014 +0100
hw/xwin: Fix const warnings in winprefsyacc.y
winprefsyacc.y:174:5: warning: passing argument 1 of ‘AddMenuLine’ discards ‘const’ qualifier from pointer target type [enabled by default]
winprefsyacc.y:67:13: note: expected ‘char *’ but argument is of type ‘const char *’
winprefsyacc.y:174:5: warning: passing argument 3 of ‘AddMenuLine’ discards ‘const’ qualifier from pointer target type [enabled by default]
winprefsyacc.y:67:13: note: expected ‘char *’ but argument is of type ‘const char *’
winprefsyacc.y:175:5: warning: passing argument 3 of ‘AddMenuLine’ discards ‘const’ qualifier from pointer target type [enabled by default]
winprefsyacc.y:67:13: note: expected ‘char *’ but argument is of type ‘const char *’
winprefsyacc.y:178:5: warning: passing argument 3 of ‘AddMenuLine’ discards ‘const’ qualifier from pointer target type [enabled by default]
winprefsyacc.y:67:13: note: expected ‘char *’ but argument is of type ‘const char *’
winprefsyacc.c:1737:9: warning: passing argument 1 of ‘yyerror’ discards ‘const’ qualifier from pointer target type [enabled by default]
winprefsyacc.y:82:12: note: expected ‘char *’ but argument is of type ‘const char *’
winprefsyacc.c:1854:3: warning: passing argument 1 of ‘yyerror’ discards ‘const’ qualifier from pointer target type [enabled by default]
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
commit 394ad259596801860d32d531408a07b63e469427
Author: Jon TURNEY <jon.turney@dronecode.org.uk>
Date: Thu Oct 2 14:31:35 2014 +0100
hw/xwin: Fix const warning in winCheckDisplayNumber()
InitOutput.c:1032:19: warning: assignment discards ‘const’ qualifier from pointer target type [enabled by default]
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
commit 701492e5d9487545afeb5ebfcebccc0408ca7bc4
Author: Jon TURNEY <jon.turney@dronecode.org.uk>
Date: Thu Oct 2 14:30:56 2014 +0100
hw/xwin: Fix warning in winXIconToHICON()
winmultiwindowicons.c:403:29: warning: passing argument 8 of ‘XGetWindowProperty’ from incompatible pointer type [enabled by default]
/usr/include/X11/Xlib.h:2688:12: note: expected ‘Atom *’ but argument is of type ‘long unsigned int *’
Looks like this has been wrong since I added it in 527cf131 :-(
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
commit a14f1d94d5bb87055f7e4812e9ef75771ea65bc5
Author: Jon TURNEY <jon.turney@dronecode.org.uk>
Date: Thu Oct 2 14:09:40 2014 +0100
hw/xwin: Fix format warnings with debug printing of pointers on 64-bit
Fix various pieces of debug output, mainly under --enable-debug, which use a
"%08x" printf format for a pointer type. Use "%p" format for 64-bit portability.
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
commit 03d462ddd2cacce92dc9e6bad00710d899509387
Author: Jon TURNEY <jon.turney@dronecode.org.uk>
Date: Thu Oct 2 12:04:20 2014 +0100
hw/xwin: Fix warnings in glx/glshim.c
glext.h currently requires GL_GLEXT_PROTOTYPES in order to prototype
glCompressedTexImmage* functions
generated_gl_shim.c:2859:6: warning: no previous prototype for 'glCompressedTexImage3DARB' [-Wmissing-prototypes]
generated_gl_shim.c:2866:6: warning: no previous prototype for 'glCompressedTexImage2DARB' [-Wmissing-prototypes]
generated_gl_shim.c:2873:6: warning: no previous prototype for 'glCompressedTexImage1DARB' [-Wmissing-prototypes]
generated_gl_shim.c:2880:6: warning: no previous prototype for 'glCompressedTexSubImage3DARB' [-Wmissing-prototypes]
generated_gl_shim.c:2887:6: warning: no previous prototype for 'glCompressedTexSubImage2DARB' [-Wmissing-prototypes]
generated_gl_shim.c:2894:6: warning: no previous prototype for 'glCompressedTexSubImage1DARB' [-Wmissing-prototypes]
generated_gl_shim.c:2901:6: warning: no previous prototype for 'glGetCompressedTexImageARB' [-Wmissing-prototypes]
Also, explicitly prototype glXGetProcAddressARB(), as glx/glxdri*.c does, as
it's not practical to include glx.h here...
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
commit 329e8125aa3b4c83121f8290a5436c2cb4c1cf96
Author: Jon TURNEY <jon.turney@dronecode.org.uk>
Date: Wed Oct 1 12:14:43 2014 +0100
hw/xwin: Fix compilation with -Werror=declaration-after-statement
xevents.c: In function 'winClipboardInitMonitoredSelections':
xevents.c:129:5: error: 'for' loop initial declarations are only allowed in C99 mode
for (int i = 0; i < CLIP_NUM_SELECTIONS; ++i)
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
commit 97c3298caab7c5a5396fcbde02d862e5380d7d2e
Author: Jon TURNEY <jon.turney@dronecode.org.uk>
Date: Wed Oct 1 12:02:04 2014 +0100
hw/xwin: Fix compilation with -Werror=return-type
winshadddnl.c: In function ‘winRedrawScreenShadowDDNL’:
winshadddnl.c:991:9: error: ‘return’ with no value, in function returning non-void [-Werror=return-type]
Just wrong in 1c34e774
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
commit 61a292adf45405641de1c522a04c148e0a152acd
Author: Keith Packard <keithp@keithp.com>
Date: Thu Oct 9 15:17:17 2014 +0200
glx: check return from __glXGetAnswerBuffer
This function can return NULL; make sure every caller tests for that.
Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit d634ecdf82f244ff8ce75d351fc175792d254e5c
Merge: 6622f0cb17 7ebf480f5e
Author: Keith Packard <keithp@keithp.com>
Date: Thu Oct 9 15:08:31 2014 +0200
Merge remote-tracking branch 'ajax/dead-code'
commit 6622f0cb1761501f3287ffa8d3cbca3fd30f9f0c
Merge: f12e7f4980 5ecd7866f7
Author: Keith Packard <keithp@keithp.com>
Date: Thu Oct 9 15:05:26 2014 +0200
Merge remote-tracking branch 'ajax/mi-cleanup'
commit f12e7f4980416b74988052a04d0f2487b2c4a7e9
Merge: da887726ee aaf5e2d643
Author: Keith Packard <keithp@keithp.com>
Date: Thu Oct 9 14:21:19 2014 +0200
Merge remote-tracking branch 'anholt/modesetting-glamor'
commit da887726eeaece0396962dd3912578d3372881b1
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Sun Sep 21 09:49:06 2014 -0700
Use unique display name for each xi2 test program [v3]
make -j 8 check was sporadically failing in different xi2 tests.
After adding the asserts in the previous commit to catch xkb failure
it became easier to catch the failures and see that multiple tests
were running at once trying to write to /tmp/server-(null).xkm and
then delete it, and interfering with each other.
Putting a unique string into the display variable let them each write
to their own file and not interfere with others.
v2: Fix Linux bits:
Add #include <errno.h> to get a declaration of
program_invocation_name on Linux.
Use only the last portion of the pathname so that the resulting
display name doesn't contain any slashes.
v3: use program_invocation_short_name on Linux
This is the same as program_invocation_name, except is has
stripped off any path prefix.
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 5ecd7866f7587d620f000e802a262c7cd4b9df33
Author: Adam Jackson <ajax@redhat.com>
Date: Thu Sep 11 10:11:39 2014 -0400
misc: Fold together some redundant conditionals
Reviewed-by: Julien Cristau <jcristau@debian.org>
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit 5b07f1db6de9f08f757206454da03ee0ae872bfc
Author: Adam Jackson <ajax@redhat.com>
Date: Thu Sep 18 16:05:40 2014 -0400
fb: fb{Map,Unmap}Window -> fb{Realize,Unrealize}Window
Make the function names match the screen slot name.
Reviewed-by: Julien Cristau <jcristau@debian.org>
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit 9ed83a694b6492c9db226b115ed282cb127e798e
Author: Adam Jackson <ajax@redhat.com>
Date: Thu Sep 18 15:36:57 2014 -0400
mi: miSlideAndSizeWindow -> miResizeWindow
Make the function name match the screen slot name.
Reviewed-by: Julien Cristau <jcristau@debian.org>
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit 939ca767c7603923a91fd37901175a42e802d40e
Author: Adam Jackson <ajax@redhat.com>
Date: Thu Sep 18 14:50:28 2014 -0400
dix: Remove an obfuscatory macro
Reviewed-by: Julien Cristau <jcristau@debian.org>
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit d138d9ccc62a9472925574089f346bf9aa3dab1f
Author: Adam Jackson <ajax@redhat.com>
Date: Mon Sep 15 13:05:24 2014 -0400
dix: Remove some pointless casting of NULL
Reviewed-by: Julien Cristau <jcristau@debian.org>
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit 277330075bfbd4343c4efdd136e0be716e1a491f
Author: Adam Jackson <ajax@redhat.com>
Date: Mon Sep 15 12:30:44 2014 -0400
dix: Remove an empty if
Reviewed-by: Julien Cristau <jcristau@debian.org>
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit 81d76a835b2f647e3051b1d93606e59db7998d76
Author: Adam Jackson <ajax@redhat.com>
Date: Mon Sep 15 12:10:55 2014 -0400
dix: Lower backStorage to a bit instead of a pointer
Reviewed-by: Julien Cristau <jcristau@debian.org>
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit 322ba42c23a3a107f7a62fb1c449792b616e5eba
Author: Adam Jackson <ajax@redhat.com>
Date: Mon Sep 15 12:05:26 2014 -0400
dix: Remove DIXsaveUnder bit from the Window
Reviewed-by: Julien Cristau <jcristau@debian.org>
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit 1e56b2dfc6377234ffdcdf206528d476b04d13af
Author: Adam Jackson <ajax@redhat.com>
Date: Fri Sep 12 12:51:13 2014 -0400
mi: Move pScreen->SendGraphicsExpose up to dix
No DDX is overriding this and it's fairly absurd to expose it as a
screen operation anyway.
Reviewed-by: Julien Cristau <jcristau@debian.org>
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit 5d3bd8a3dc6456ea1ccf7b5f71b972379d7565ec
Author: Adam Jackson <ajax@redhat.com>
Date: Fri Sep 12 11:56:28 2014 -0400
mi: Drop plane argument from miHandleExposures
This existed to be passed to the bs recovery routine; since we back all
planes, we don't care.
Reviewed-by: Julien Cristau <jcristau@debian.org>
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit 7eddc80bc4a6c1902746a9fbe79ab553f9fd5821
Author: Adam Jackson <ajax@redhat.com>
Date: Tue Aug 5 14:07:17 2014 -0400
mi: Simplify composite border clip redirection interface
There's not really a good reason for mi to not just call the composite
code directly.
Reviewed-by: Keith Packard <keithp@keithp.com>
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit 7b35dc9b1533d4b99a3f84f460ac66354a6fe347
Author: Adam Jackson <ajax@redhat.com>
Date: Tue Sep 23 10:35:37 2014 -0400
mi: Deobfuscate miOverlayWindowExposures
Reviewed-by: Julien Cristau <jcristau@debian.org>
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit fb34f273481b90a90a988f0f5c5a2d642a5661b8
Author: Adam Jackson <ajax@redhat.com>
Date: Tue Sep 23 10:30:56 2014 -0400
mi: Deobfuscate miWindowExposures
Reviewed-by: Julien Cristau <jcristau@debian.org>
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit 0d30d44a8cdacfbc99d8193f76c133b803464622
Author: Adam Jackson <ajax@redhat.com>
Date: Thu Sep 11 12:44:54 2014 -0400
dix: Drop the third argument from WindowExposuresProcPtr
A careful read shows that it was always NULL. It hasn't always been; as
the DDX spec indicates, it was the "occluded region that has backing
store", but since that backing store code is long gone, we can nuke it.
mi{,Overlay}WindowExposures get slightly simpler here, and will get even
simpler in just a moment.
Reviewed-by: Julien Cristau <jcristau@debian.org>
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit aaf5e2d643af590366b2d02ad1c2db05d1fc4131
Author: Eric Anholt <eric@anholt.net>
Date: Sat Dec 28 11:32:10 2013 -0800
modesetting: Add support for rendering using glamor.
By default modesetting now tries to enable X acceleration using
glamor, but falls back to normal shadowfb if GL fails to initialize.
Signed-off-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Keith Packard <keithp@keithp.com>
commit 6d41bdb23ca92803e3a51dc317d2b80cdb92f43a
Author: Eric Anholt <eric@anholt.net>
Date: Tue Aug 26 16:59:37 2014 -0700
modesetting: Deduplicate some scrn setup.
Signed-off-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Keith Packard <keithp@keithp.com>
commit 20a3b482191711bc15be0410ccc3651924271349
Author: Eric Anholt <eric@anholt.net>
Date: Wed Oct 8 00:41:13 2014 -0700
modesetting: Fix some weird formatting after x-indent-all.sh.
Signed-off-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Keith Packard <keithp@keithp.com>
commit 3119acdab9eecff90b8fd9a265e2a456e7bc8779
Author: Eric Anholt <eric@anholt.net>
Date: Wed Oct 8 00:39:15 2014 -0700
modesetting: Run x-indent-all.sh.
As I was editing code, the top-level .dir-locals.el was making my new
stuff conflict with the existing style. Make it consistently use the
xorg style, instead.
Signed-off-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Keith Packard <keithp@keithp.com>
commit c79f824bf6617816aaf10393beec8dddfa591f7b
Author: Adam Jackson <ajax@redhat.com>
Date: Thu Sep 25 15:49:26 2014 -0400
xwin: Remove primary DirectDraw engine
Again, as the documentation says, "unsupported, obsolete".
Reviewed-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit 8465ee788fd541fa37681aa0a44103c7f944d437
Author: Adam Jackson <ajax@redhat.com>
Date: Thu Sep 25 15:37:33 2014 -0400
xwin: Remove native GDI engine (v2)
As the man page says, "unsupported, experimental, and barely
functional". The last even minor updates to any of this were back in
2004, presumably it's not getting better any time soon.
This is also the only GC ops implementation in the tree that actually
falls all the way down to the spans routines for everything, so that's
pretty nice to be rid of.
v2: Fix stray break statement (Jon)
Reviewed-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit e2a3e91a56cb598f2c8257614d92ccd46b7fc094
Author: Adam Jackson <ajax@redhat.com>
Date: Fri Jul 25 11:01:22 2014 -0400
rootless: remove redundant RootlessShapedWindowIn
miShapedWindowIn is identical. Which you would expect, since neither
one takes an actual WindowPtr argument, so they couldn't possibly make
reference to rootlessness.
Reviewed-by: Julien Cristau <jcristau@debian.org>
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit 7e8ac6dcd24d56e384ad09c7c23259cb3f4f8dc6
Author: Adam Jackson <ajax@redhat.com>
Date: Thu Sep 11 12:30:15 2014 -0400
xquartz: Remove useless DRIWindowExposures
Reviewed-by: Keith Packard <keithp@keithp.com>
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit a8c6fc46c088bedb36c6441b78c98ca4cb9761b4
Author: Adam Jackson <ajax@redhat.com>
Date: Thu Sep 11 10:24:27 2014 -0400
kdrive: Remove vestigial reference to fbInitValidateTree
Reviewed-by: Keith Packard <keithp@keithp.com>
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit 7ebf480f5eb75e06271ec924769e51bdcbbdc69c
Author: Adam Jackson <ajax@redhat.com>
Date: Fri Feb 28 12:34:49 2014 -0500
xfree86: Remove some can't-happen printf from xf86CreateRootWindow
Reviewed-by: Keith Packard <keithp@keithp.com>
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit 3689be96ac125c9bfca9d37de4878f05f4e2f584
Author: Adam Jackson <ajax@redhat.com>
Date: Tue Jun 10 12:54:41 2014 -0400
vfb: Don't reimplement micmap so much
We know we're atop fb which is atop micmap, the only thing we need to
hook is InstallColormap to handle the xwd colormap change.
Reviewed-by: Keith Packard <keithp@keithp.com>
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit 692676debbc2227054d67078c6442f1ab1811192
Author: Adam Jackson <ajax@redhat.com>
Date: Mon Jun 16 12:35:28 2014 -0400
loader: Remove some baklava code
Reviewed-by: Keith Packard <keithp@keithp.com>
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit c695a1430b80bac0b95e4d7f559e1bd223ecb1ef
Author: Adam Jackson <ajax@redhat.com>
Date: Tue Jul 8 14:38:34 2014 -0400
input: Remove unused SetKeySymsMap
Reviewed-by: Daniel Stone <daniels@collabora.com>
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit 645063cd9384a26353775e92a79ed8710c6ca66c
Author: Adam Jackson <ajax@redhat.com>
Date: Tue Mar 4 12:51:49 2014 -0500
exa, kdrive: Remove redundant BitsPerPixel macros
We already get this from servermd.h
Reviewed-by: Keith Packard <keithp@keithp.com>
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit cccba52d152a7d233c0b762a54844ecef831483e
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Sun Sep 21 09:49:05 2014 -0700
Abort xi2 tests if ActivateDevice() fails
I was getting segfaults in xi2 tests from trying to copy XKB keyboard
state to NULL pointers with a stack of:
key=key@entry=0) at xkbActions.c:1189
sendevent=sendevent@entry=0 '\000') at devices.c:420
at protocol-xiquerydevice.c:338
which turned out to be due to xkbcomp failure, which was logged in the
test logs as:
XKB: Failed to compile keymap
Keyboard initialization failed. This could be a missing or incorrect setup of xkeyboard-config.
but which was overlooked because the ActivateDevice() return code wasn't
checked and the tests went forward assuming the structures were all
correctly initialized. This catches the failure closer to the point of
failure, to save debugging time.
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 95a5b92e37f73f497d547fd91c543c16d2cc73de
Author: Keith Packard <keithp@keithp.com>
Date: Thu Oct 2 10:26:53 2014 -0700
xfree86: Remove remaining return FALSE from configServerFlags
Remove the error return path from the FLAG_PIXMAP path and leave the
default value in place. There's no point skipping the rest of this
function.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit e9651e3dbc32650fcaf90888b4cbef81da77cfcd
Merge: 9bc01dfc70 4433bc6d53
Author: Keith Packard <keithp@keithp.com>
Date: Thu Oct 2 10:24:33 2014 -0700
Merge remote-tracking branch 'ajax/dead-code'
commit 9bc01dfc7070a40f5948588895b3a11dd1636d0e
Author: Axel Davy <axel.davy@ens.fr>
Date: Sat Sep 27 23:17:13 2014 +0200
Fix present_pixmap when using present_notify_msc
Calling present_notify_msc could cancel a pending pixmap presentation.
Signed-off-by: Axel Davy <axel.davy@ens.fr>
Reviewed-by: Keith Packard <keithp@keithp.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit b3e9791fd375eb71b6150a77b8009b046b213004
Author: Daniel Martin <consume.noise@gmail.com>
Date: Sat Sep 20 09:07:41 2014 +0200
xfree86: Delete file modinit.h
All references to modinit.h have been remove with:
a1d41e3 Move extension initialisation prototypes into extinit.h
Signed-off-by: Daniel Martin <consume.noise@gmail.com>
Reviewed-by: Eric Anholt <eric@anholt.net>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 2aeb9d8f8b22ceb1de883c231a0a75d4c75d3f4a
Author: Daniel Martin <consume.noise@gmail.com>
Date: Sat Sep 20 09:07:40 2014 +0200
security: Remove XpExtension from SecurityTrustedExtensions
There's no XPrint extension (anymore).
Signed-off-by: Daniel Martin <consume.noise@gmail.com>
Reviewed-by: Keith Packard <keithp@keithp.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 12c19bbff4b7b2d0b350a7b93b38ebbf69748534
Author: Daniel Martin <consume.noise@gmail.com>
Date: Sat Sep 20 09:07:39 2014 +0200
dix: Remove XpExtension leftovers from protocol.txt
There's no XPrint extension (anymore).
Signed-off-by: Daniel Martin <consume.noise@gmail.com>
Reviewed-by: Keith Packard <keithp@keithp.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit d3d845ca9e92f0a2ccde93f4242d7769cfe14164
Author: Michel Dänzer <michel.daenzer@amd.com>
Date: Thu Sep 25 15:27:22 2014 +0900
glamor: Use GL_STREAM_READ also for read/write access to a PBO
Otherwise the CPU may end up reading from non-cacheable memory, which is
very slow.
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=84178
Signed-off-by: Michel Dänzer <michel.daenzer@amd.com>
Reviewed-by: Markus Wick <markus@selfnet.de>
Reviewed-by: Eric Anholt <eric@anholt.net>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 78c27d12e1f4857bfcfc92afbb69d5dd989232b9
Merge: 6e50bfa706 1d6334dd0c
Author: Keith Packard <keithp@keithp.com>
Date: Mon Sep 29 13:04:49 2014 -0700
Merge remote-tracking branch 'jturney/xwin-clipboard-refactoring'
commit 6e50bfa706cd3ab884c933bf1f17c221a6208aa4
Author: Michel Dänzer <michel.daenzer@amd.com>
Date: Wed Sep 24 16:48:10 2014 +0900
glamor: Fix leak of converted_bits in _glamor_upload_bits_to_pixmap_texture
==9530== 808,575,600 bytes in 5,904 blocks are definitely lost in loss record 4,602 of 4,602
==9530== at 0x4C28C20: malloc (vg_replace_malloc.c:296)
==9530== by 0xAD29C98: _glamor_upload_bits_to_pixmap_texture (glamor_pixmap.c:771)
==9530== by 0xAD2AE95: glamor_upload_sub_pixmap_to_texture (glamor_pixmap.c:1031)
==9530== by 0xAD2BD55: glamor_upload_pixmap_to_texture (glamor_pixmap.c:1057)
==9530== by 0xAD1C2E6: glamor_composite_choose_shader (glamor_render.c:1025)
==9530== by 0xAD1C629: glamor_composite_with_shader (glamor_render.c:1174)
==9530== by 0xAD1DA77: glamor_composite_clipped_region (glamor_render.c:1542)
==9530== by 0xAD1E849: _glamor_composite (glamor_render.c:1689)
==9530== by 0xAD1ED90: glamor_composite (glamor_render.c:1758)
==9530== by 0x519FD6: damageComposite (damage.c:502)
==9530== by 0xAD27AA3: glamor_trapezoids (glamor_trapezoid.c:147)
==9530== by 0xAD27B51: glamor_trapezoids (glamor_trapezoid.c:101)
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=84176
Signed-off-by: Michel Dänzer <michel.daenzer@amd.com>
Reviewed-by: Eric Anholt <eric@anholt.net>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 4433bc6d53e651b3dc4112099a153c2574f30797
Author: Adam Jackson <ajax@redhat.com>
Date: Thu May 1 12:48:15 2014 -0400
x86emu: Undefine _NO_INLINE
Never defined by the server.
Reviewed-by: Eric Anholt <eric@anholt.net>
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit 1c3cb68d0cd15d29fd3aaa9eedbfa772ec8e3a47
Author: Adam Jackson <ajax@redhat.com>
Date: Tue Jul 29 14:15:24 2014 -0400
xfree86: Remove pointless xf86PrintMarkers
Reviewed-by: Eric Anholt <eric@anholt.net>
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit 30fa6da6f140d713041942a81f5d6da6736e4f7f
Author: Adam Jackson <ajax@redhat.com>
Date: Tue Jul 29 14:07:39 2014 -0400
xfree86: configServerFlags never fails, make it return void
Reviewed-by: Eric Anholt <eric@anholt.net>
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit 2bf9db1930528255a37f9787aeb82e2851f814c2
Author: Adam Jackson <ajax@redhat.com>
Date: Tue Jul 29 14:02:01 2014 -0400
xfree86: Remove unused xf86Info.useDefaultFontPathFrom
Reviewed-by: Eric Anholt <eric@anholt.net>
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit fffea07b4cb0992fed2cca33be08440ea94090d9
Author: Adam Jackson <ajax@redhat.com>
Date: Tue Jul 29 13:48:10 2014 -0400
xfree86: Remove xf86Info.log (v2)
SUBCLASS ALL THE THINGS
v2: Remove the enum too (anholt)
Reviewed-by: Eric Anholt <eric@anholt.net>
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit 2f5cfbee5409b088156d4cd84a3376499e291631
Author: Adam Jackson <ajax@redhat.com>
Date: Tue Jul 8 14:50:22 2014 -0400
xfree86: Remove DisplayID support
Not actually wired up so it's fairly useless.
Reviewed-by: Eric Anholt <eric@anholt.net>
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit b56fcce761534d3e28b7ea19e2a13213c3157a1f
Author: Adam Jackson <ajax@redhat.com>
Date: Tue Jun 17 10:36:44 2014 -0400
xfree86: Remove useless back-pointer to pScrn from colormap code
Reviewed-by: Eric Anholt <eric@anholt.net>
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit ef22655311efa0d5a5395ba2f19aa20d71a05a4f
Author: Adam Jackson <ajax@redhat.com>
Date: Fri May 2 13:36:13 2014 -0400
xfree86: Remove spurious xf86ConfigError
READABLE.
Reviewed-by: Eric Anholt <eric@anholt.net>
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit 35f0257360fa6e11b9ecc08e467163718e012bb1
Author: Adam Jackson <ajax@redhat.com>
Date: Tue Mar 4 11:12:16 2014 -0500
xfree86: Remove Option "TextClockFreq"
No modern driver pays attention to this. Presumably there existed
hardware once where you couldn't just read the right values out of the
CRTC.
Reviewed-by: Eric Anholt <eric@anholt.net>
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit 6755aa2c1244fee11846c1e0b274bd34900e3299
Author: Adam Jackson <ajax@redhat.com>
Date: Fri Jul 25 12:31:54 2014 -0400
xfree86: Remove xv clip notify driver hook
Nothing's using it.
Reviewed-by: Eric Anholt <eric@anholt.net>
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit e89ccacea9a1e4bc3693bb78e717343addd517e5
Author: Adam Jackson <ajax@redhat.com>
Date: Thu Jan 23 10:27:58 2014 -0500
mi: Remove Windows 8-bpp colormap compatibility
Nice, but not something our Windows servers build, and not something
that belongs in mi anyway.
Reviewed-by: Eric Anholt <eric@anholt.net>
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit 7cd192edc195c089c6df32e9f22e57da7467b6fd
Author: Adam Jackson <ajax@redhat.com>
Date: Mon Jun 16 11:55:30 2014 -0400
loader: Deobfuscate RTLD_* macro stuff
POSIX requires that these be named correctly, no need to be clever.
Reviewed-by: Mark Kettenis <kettenis@openbsd.org>
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit cc59be38b7eff52a1d003b390f2994c73ee0b3e9
Author: Keith Packard <keithp@keithp.com>
Date: Fri Sep 12 11:33:48 2014 -0700
os: Don't listen to 'tcp' by default. Add '-listen' option. [v2]
This disables the tcp listen socket by default. Then, it
uses a new xtrans interface, TRANS(Listen), to provide a command line
option to re-enable those if desired.
v2: Leave unix socket enabled by default. Add configure options.
Signed-off-by: Keith Packard <keithp@keithp.com>
Reviewed-by: Hans de Goede <hdegoede@redhat.com>
commit 8ada3fb32cd7dd8948eb55620de18ba03df6131d
Author: Keith Packard <keithp@keithp.com>
Date: Sat Sep 20 10:04:11 2014 -0700
Require xtrans 1.3.5 or newer
This version of xtrans offers the TRANS(Listen) function.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 18935b41e13b34571ffda84bde5257b8e84e6d1f
Author: Keith Packard <keithp@keithp.com>
Date: Sat Sep 20 04:04:43 2014 -0700
XSERVER_DTRACE needs request names from registry too
The dtrace code in the server wants to log the name of each executed
request, which it gets from the registry. Use that as an additional
indication of when that portion of the registry should be included in
the server build.
See:
http://tinderbox.x.org/builds/2014-09-19-0003/logs/xserver/#build
Signed-off-by: Keith Packard <keithp@keithp.com>
Reviewed-by: Dave Airlie <airlied@gmail.com>
commit 28337cb14e4347e1dd7936c5393a22e042866687
Author: Jon TURNEY <jon.turney@dronecode.org.uk>
Date: Fri Sep 19 14:22:13 2014 +1000
xserver: Move 'pragma GCC diagnostic' outside functions
$ gcc --version
gcc (Gentoo 4.4.3-r2 p1.2) 4.4.3
/jhbuild/checkout/xorg/xserver/os/log.c: In function ‘LogInit’:
/jhbuild/checkout/xorg/xserver/os/log.c:199: error: #pragma GCC diagnostic not allowed inside functions
/jhbuild/checkout/xorg/xserver/os/log.c:201: warning: format not a string literal, argument types not checked
/jhbuild/checkout/xorg/xserver/os/log.c:212: error: #pragma GCC diagnostic not allowed inside functions
/jhbuild/checkout/xorg/xserver/os/log.c:214: warning: format not a string literal, argument types not checked
etc.
Reviewed-by: Dave Airlie <airlied@redhat.com>
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Signed-off-by: Dave Airlie <airlied@redhat.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 7e6bd546846964fd9b8c2a06dea4782a552b62d7
Author: Keith Packard <keithp@keithp.com>
Date: Wed Aug 6 12:58:38 2014 -0700
glamor: Remove shader-based trapezoid implementation. Fixes Bug 76213.
I can't find any performance benefit to using the GL path and the code
renders this trapezoid incorrectly:
top: FIXED 29.50
bottom: FIXED 30.00
left top: POINT 0.00, 29.50
left bottom: POINT 0.00, 30.50
right top: POINT -127.50, 29.50
right bottom: POINT 52.50, 30.00
This should render a solid line from 0,30 to 52,30 but draws nothing.
The code also uses an area computation for trapezoid coverage which
does not conform to the Render specification which requires a specific
point sampling technique.
Signed-off-by: Keith Packard <keithp@keithp.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
commit b2452311bd1d67b4d78612570d4a25c685c78a0c
Author: Keith Packard <keithp@keithp.com>
Date: Tue Aug 19 12:52:05 2014 -0700
glamor: Check large pixmap users in glamor_largepixmap.c
This enables the assertion that all users of the large pixmap member
are restricted to pixmaps which are actually large.
Signed-off-by: Keith Packard <keithp@keithp.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
commit 5fc3e99f537b10dd9c2adfd37cf2c4ba5ed4bd44
Author: Keith Packard <keithp@keithp.com>
Date: Tue Aug 19 12:44:41 2014 -0700
glamor: Handle compositing from large to small pixmaps
glamor_composite_largepixmap_region is given the job of dealing with
compositing between a mixture of large and small pixmaps. However, it
was assuming that the destination pixmap was large and fetching
members of the large structure even for small pixmaps.
This manifested with assertion failures when compositing from a large
pixmap to a small pixmap.
Fixed by using the pixmap size for the destination block size for
small pixmaps.
Signed-off-by: Keith Packard <keithp@keithp.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
commit 6e78d7f5e6edf56180e2ecfd25300bb2523876ab
Author: Keith Packard <keithp@keithp.com>
Date: Tue Aug 19 12:41:45 2014 -0700
glamor: Don't abuse large_pixmap members for regular pixmaps
glamor_compute_clipped_regions_ext wants to treat small and large
pixmaps uniformly and did that by writing into the large pixmap
union member in small pixmaps to construct something that looks like a
one texture large pixmap.
Instead of doing that, simply allocate the necessary elements locally
on the stack and use them from there.
Signed-off-by: Keith Packard <keithp@keithp.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
commit bab319763c9734da3cff7b91a582f54989dc4cbe
Author: Keith Packard <keithp@keithp.com>
Date: Tue Aug 19 12:39:07 2014 -0700
glamor: Add macro __glamor_large in glamor_largepixmap.c
For now, this simply fetches the large member of the pixmap private.
It will be changed to assert that the pixmap is large once bugs
related to that have been fixed.
Signed-off-by: Keith Packard <keithp@keithp.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
commit 16e429f1f96f984b1ff575875a7a4d7d29b482e2
Author: Keith Packard <keithp@keithp.com>
Date: Tue Aug 19 12:34:41 2014 -0700
glamor: Change SET_PIXMAP_FBO_CURRENT from macro to static inline
This is the last function-like macro in glamor_priv.h; change to
static inline like all of the other functions there.
Signed-off-by: Keith Packard <keithp@keithp.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
commit ea7357de90792cbceca6d8d9fdc144e7df8a0fba
Author: Keith Packard <keithp@keithp.com>
Date: Wed Sep 10 14:01:59 2014 -0700
present: Clear pending flip pixmaps at CloseScreen
If a flip is active at server reset time, the associated window will
get destroyed which will queue an unflip operation. If that isn't
synchronous, then it won't have finished by the time CloseScreen is
called.
Calling present_flip_idle will signal the fence and remove the
reference to the fence and pixmap, freeing these in the X server and
allowing a DRM client to clean up as well.
This also rewords other comments in present_flip_destroy, removing
scary words about needing synchronous operation (everything in this
function is synchronous now) and describing what effect we actually
need from present_set_abort_flip.
Signed-off-by: Keith Packard <keithp@keithp.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
commit 2051514652481a83bd7cf22e57cb0fcd40333f33
Author: Keith Packard <keithp@keithp.com>
Date: Wed Sep 10 14:02:13 2014 -0700
present: Support PresentOptionCopy
We added this option to the present protocol before 1.0 but somehow
never implemented it in the server. It's pretty simple; just don't
ever do flips if the application specifies Copy.
Signed-off-by: Keith Packard <keithp@keithp.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
commit 69d8572ae4cd1bce17223ea8aff87916a974c861
Author: Keith Packard <keithp@keithp.com>
Date: Wed Sep 10 15:21:32 2014 -0700
Build required portions of registry.c automatically [v2]
Instead of making the inclusion of the registry code a global
conditional, split the registry into two pieces; the bits required by
the X-Resource extension (the resource names) and the bits required by
the XCSECURITY extension (the protocol names). Build each set of code
if the related extension is being built.
v2: Check for both XCSECURITY and XSELINUX.
Signed-off-by: Keith Packard <keithp@keithp.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
commit a11fc2493e85e4a532f4954805a7c6d1c601b08f
Author: Keith Packard <keithp@keithp.com>
Date: Wed Sep 10 15:04:00 2014 -0700
dix: Close protocol.txt after we're done loading extension names
Don't leave this file open during the whole server execution process;
close it once all of the extensions are initialized.
Signed-off-by: Keith Packard <keithp@keithp.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
commit 9e07f3a3d28b01402beecb3280c94fc525bd8075
Author: Keith Packard <keithp@keithp.com>
Date: Wed Sep 10 15:41:08 2014 -0700
test: Only build hashtable tests if building X-Resource extension
The hash table functions are only included in the server when the
X-Resource extension is built, so don't try to build and test them
unless the X-Resource extension is being built.
Signed-off-by: Keith Packard <keithp@keithp.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
commit 670ee0757febfb965d718fce2d5688717def667d
Author: Adam Jackson <ajax@redhat.com>
Date: Tue Sep 16 11:10:58 2014 -0400
ephyr: Properly implement hardware cursors (v3)
When dix hands us a new cursor we proxy it through to the host server;
since we keep the host XID on the cursor bits private we can switch
among them with just ChangeWindowAttributes.
v2:
Use xcb-renderutil for argb format lookup (Uli, Keith)
Fall back to core cursors for host RENDER < 0.5 (Keith)
Drop useless ephyrEnableCursor
Consistently create/destroy the cursor image GC on both paths
Treat null cursor from dix as invisible
v3:
Initialize the invisible cursor's image (Keith)
Signed-off-by: Adam Jackson <ajax@redhat.com>
Reviewed-by: Keith Packard <keithp@keithp.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit f839caadd4e567bf89f893aa7e5ba1327b712b4b
Author: Adam Jackson <ajax@redhat.com>
Date: Wed Sep 17 11:07:22 2014 -0400
loader: Remove compatibility with ancient XFree86 version numbering
Pretty sure I'm guilty of adding this. I think I was thinking of trying
to be compatible with some really old binary-only driver that I had
vague aspirations of reverse-engineering, but since I haven't gotten
around to it in the intervening decade...
Signed-off-by: Adam Jackson <ajax@redhat.com>
Reviewed-by: Eric Anholt <eric@anholt.net>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit af40913797e6595fb5466c2ff3110e9526a37b9f
Author: Julien Cristau <jcristau@debian.org>
Date: Wed Sep 17 07:41:27 2014 +0200
xwayland: always include drm.xml in tarballs
Move drm.xml out of the automake conditional so make dist includes it
even if glamor-egl is disabled.
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=83960
Signed-off-by: Julien Cristau <jcristau@debian.org>
Reviewed-by: Eric Anholt <eric@anholt.net>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit eaee6572beefca240c42791f9a3a6e547bedd410
Merge: e3aa13b8d6 b84d25fd53
Author: Keith Packard <keithp@keithp.com>
Date: Wed Sep 17 15:49:24 2014 -0700
Merge remote-tracking branch 'anholt/modesetting-import'
commit e3aa13b8d63ea2fba6eb47ddd0a7dde5a6d2b661
Author: Jon TURNEY <jon.turney@dronecode.org.uk>
Date: Wed Sep 17 15:38:39 2014 -0700
Update help text since -iglx is now the default
This should have been part of d0da0e9c3bb8fe0cd4879ecb24d21715bfaa209b
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Signed-off-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Eric Anholt <eric@anholt.net>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit b84d25fd53e97105b99495af84abaacc4c901967
Author: Eric Anholt <eric@anholt.net>
Date: Tue Aug 26 11:22:02 2014 -0700
modesetting: Drop remaining old-xserver compatibility.
Signed-off-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Keith Packard <keithp@keithp.com>
commit 7b0965a826612988dd721ddbd67cfbec392b67b5
Author: Eric Anholt <eric@anholt.net>
Date: Tue Aug 26 11:37:46 2014 -0700
modesetting: Drop use of compat-api.h
Signed-off-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Keith Packard <keithp@keithp.com>
commit 2feda3b6b58f46cef91ea41312aac9021a703777
Author: Eric Anholt <eric@anholt.net>
Date: Tue Aug 26 11:06:23 2014 -0700
modesetting: Connect the driver to the build.
v2: Fix libdrm version check, and use XORG_VERSION_* instead of a
static 1.0.0 version for the driver module.
Signed-off-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Keith Packard <keithp@keithp.com>
commit 30dcc10f6c9c4bacbc0e3652917c298ca9fb3898
Author: Adam Jackson <ajax@redhat.com>
Date: Mon May 5 11:18:33 2014 -0400
xfree86: Clean up some more alpha awareness
Since the sparse stuff is gone none of these variables get used for
anything, they're just dead side-effect-less execution.
Reviewed-by: Eric Anholt <eric@anholt.net>
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit 2e21c081d34d52ee49ac00a294d2e74caf529818
Author: Adam Jackson <ajax@redhat.com>
Date: Fri May 2 13:00:21 2014 -0400
xfree86: Remove the memory of MTRR awareness
pciaccess does this for us, and none of our internal hooks really
remain. This does remove a cleanup pass from the BSD code, but the case
it's covering (a previous server leaving MTRRs around) can't happen
anymore.
Reviewed-by: Eric Anholt <eric@anholt.net>
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit c42712ab4d8eec56704ad5422d8f54befeb1e886
Author: Adam Jackson <ajax@redhat.com>
Date: Fri May 2 12:58:23 2014 -0400
xfree86: Remove xf86CheckMTRR
Die die die die die.
Reviewed-by: Eric Anholt <eric@anholt.net>
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit 8686463de7e1ef9814824d46526d8177a7a492a0
Author: Adam Jackson <ajax@redhat.com>
Date: Fri May 2 12:55:37 2014 -0400
xfree86: Remove xf86ReadBIOS
Not being used externally or internally anymore.
Reviewed-by: Eric Anholt <eric@anholt.net>
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit 21b216ad6ce2e9c89359b95e4196e42d91bf9420
Author: Adam Jackson <ajax@redhat.com>
Date: Fri May 2 12:46:45 2014 -0400
int10: Port off xf86ReadBIOS
If the linux vm86 backend changes look somewhat horrifying to you,
that's because you have taste.
Reviewed-by: Eric Anholt <eric@anholt.net>
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit 96c0da812a563d8229dc1396ac801329b3bcba91
Author: Adam Jackson <ajax@redhat.com>
Date: Fri May 2 12:39:01 2014 -0400
xfree86: Remove xf86LinearVidMem
The only driver even pretending to check the result is mach64 anyway.
Reviewed-by: Eric Anholt <eric@anholt.net>
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit ec0e29ed5bc71516de7feb226b548ce45cb9ffdf
Author: Adam Jackson <ajax@redhat.com>
Date: Fri May 2 12:32:02 2014 -0400
xfree86: Remove {set,undo}WC from VidMemInfo
Now that mapMem is gone this can never actually get called.
Reviewed-by: Eric Anholt <eric@anholt.net>
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit 9db2af6f757ef9680c70eb731698b7c9f9aca203
Author: Adam Jackson <ajax@redhat.com>
Date: Fri May 2 12:14:10 2014 -0400
xfree86: Remove xf86{Map,Unmap}VidMem
This API sucks. Fortunately it's mostly unused at this point. geode,
sis, and xgi need minor patches to use the corresponding pciaccess code,
neomagic will (more explicitly) lose its non-PCI support, and newport
will need to be ported to /dev/mem or the platform bus or something.
This should also make it pretty clear that alpha's sparse memory support
was basically not a thing anymore, very few tears shed.
Reviewed-by: Eric Anholt <eric@anholt.net>
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit 6d6aa8ab6b6d62d65f1354b4cd9af0bf4f2e81d7
Author: Eric Anholt <eric@anholt.net>
Date: Tue Aug 26 11:43:54 2014 -0700
modesetting: Update for the platform device API change.
Signed-off-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Keith Packard <keithp@keithp.com>
commit 9c080f44960d2338c7a59eee132a02d45186bfb0
Author: Eric Anholt <eric@anholt.net>
Date: Tue Aug 26 11:41:46 2014 -0700
modesetting: Drop use of "pointer" for "void *"
The xserver doesn't have that typedef.
Signed-off-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Keith Packard <keithp@keithp.com>
commit a10ea01475c6d0795b1a00cfd8be9912f4b54235
Author: Eric Anholt <eric@anholt.net>
Date: Tue Aug 26 11:24:31 2014 -0700
modesetting: xserver already checks XEXTPROTO >= 7.2.99.901.
Signed-off-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Keith Packard <keithp@keithp.com>
commit c7e8d4a6ee9542f56cd241cf7a960fb8223a6b22
Author: Eric Anholt <eric@anholt.net>
Date: Tue Aug 26 11:21:24 2014 -0700
modesetting: unifdef MODESETTING_OUTPUT_SLAVE_SUPPORT
The server will always have it.
v2: Clean up some weird formatting from the unifdeffing.
Signed-off-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Keith Packard <keithp@keithp.com>
commit 0c07bfb38e61a8a6ad511dc8827e2dd20d68665d
Author: Eric Anholt <eric@anholt.net>
Date: Mon Aug 25 15:42:45 2014 -0700
modesetting: Merge modesetting's COPYING into the xserver's.
Signed-off-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Keith Packard <keithp@keithp.com>
commit 1d6334dd0ca99923b6b55c5c047ef6b5c325f66c
Author: Jon TURNEY <jon.turney@dronecode.org.uk>
Date: Wed Jun 19 13:09:35 2013 +0100
hw/xwin: Undefine _XSERVER64 in hw/xwin/winclipboard
Including any server header might define the macro _XSERVER64 on 64 bit
machines. That macro must _NOT_ be defined for Xlib client code, otherwise bad
things happen. So let's undef that macro if necessary.
Remove server directories from include path to ensure no server includes are
included
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
commit 7ca93301940647219dbed2d14fcd3f37e49fb477
Author: Jon TURNEY <jon.turney@dronecode.org.uk>
Date: Tue Jun 18 19:53:52 2013 +0100
hw/xwin: Only add to XSetIOErrorHandler() handler chain once
Only use XSetIOErrorHandler() to add to the global XSetIOErrorHandler() chain
once. If we do it every restart, then we make a loop in the handler chain, and
we end up with a thread spinning in that loop when the server shuts down...
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
commit 5819a02d461349dbfc86317c742406d2217f7f0c
Author: Jon TURNEY <jon.turney@dronecode.org.uk>
Date: Tue Jun 18 19:35:20 2013 +0100
hw/xwin: Add a basic manpage for xwinclip
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
commit 492c924c8531b013d50637e29213da287b9a7fa2
Author: Jon TURNEY <jon.turney@dronecode.org.uk>
Date: Tue Jun 18 19:28:53 2013 +0100
hw/xwin: In clipboard function prototypes, use Window type, not int type
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
commit 4a38c3bda2b0a868d7611f9423d8a0f304b435aa
Author: Jon TURNEY <jon.turney@dronecode.org.uk>
Date: Tue Jun 18 19:18:08 2013 +0100
hw/xwin: Remove XOpenDisplay() retry code
Remove XOpenDisplay() retry code. This isn't a sensible thing for the
application to be doing, and XWin server needs to retry much more than just
XOpenDisplay().
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
commit 4fc62aef8079266f8878cb355e6eb894000d8b8b
Author: Jon TURNEY <jon.turney@dronecode.org.uk>
Date: Wed Jun 19 14:00:28 2013 +0100
hw/xwin: Improve comment about why we can't XCloseDisplay()
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
commit 89eb7bdcad092821b61a48832e1db82975a2252b
Author: Jon TURNEY <jon.turney@dronecode.org.uk>
Date: Wed Jun 19 13:59:40 2013 +0100
hw/xwin: Remove setjmp()/longjmp() error constants
Check specially that setjmp() returned a value which we don't pass to longjmp()
seems a bit over-complex.
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
commit d0353bbe57aab910a6ef7da8778023a9d39c37df
Author: Jon TURNEY <jon.turney@dronecode.org.uk>
Date: Thu Jun 20 00:04:16 2013 +0100
hw/xwin: Move WIN_MSG_QUEUE_FNAME to where it's used
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
commit fa0da5a020c2ea9366568375b7f35d3f2ddad680
Author: Jon TURNEY <jon.turney@dronecode.org.uk>
Date: Thu Jun 20 13:04:35 2013 +0100
hw/xwin: Use header for prototypes in textconv.c
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
commit cbe133752d1e817246b532a274fda3f7d74ebca1
Author: Jon TURNEY <jon.turney@dronecode.org.uk>
Date: Thu Jun 20 12:50:18 2013 +0100
hw/xwin: Remove unused X includes from internal.h and add them where needed
Also removing server headers we might clash with and no longer need. Make
a few adjustments to allow for this change:
- provide a prototype of ErrorF()
- use the MAX() macro provided by sys/param.h, not the max() macro provided by misc.h
- use the X 'Bool' type rather than the unwrapped Windows 'BOOL' type
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
commit 52f3cf3c612b2f33e39fd6f985b840a0d7192a50
Author: Jon TURNEY <jon.turney@dronecode.org.uk>
Date: Wed Jun 19 18:09:07 2013 +0100
hw/xwin: Remove standard includes from internal.h and add them where needed
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
commit 5992550c4cf8818d1c47c1e474c3d8c3383983fa
Author: Jon TURNEY <jon.turney@dronecode.org.uk>
Date: Mon Jun 17 19:01:19 2013 +0100
hw/xwin: Add xwinclip test client
Add xwinclip test client, which includes stubs for winDebug(), ErrorF()
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
commit 5ae674ae6d6c0b02fd86c5e7b23b8c38b19f180a
Author: Jon TURNEY <jon.turney@dronecode.org.uk>
Date: Mon Jun 17 20:03:04 2013 +0100
hw/xwin: Changes in error logging to make libwinclipboard more useful as a library
Consistently use ErrorF() rather than winErrorFVerb()
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
commit e1cf2b47bea9ff3e64c0ef1e4d0744d9df4bc1b7
Author: Jon TURNEY <jon.turney@dronecode.org.uk>
Date: Mon Jun 17 19:58:20 2013 +0100
hw/xwin: Look up atoms in winClipboardProc()
Look up all atoms of interest in clipboard code in winClipboardProc() and pass
them down.
This avoids the need to check serverGeneration to notice when we need to
invalidate cached atom values.
Also consistently use cached atom values everywhere, rather than sometimes just
doing XInternAtom() again.
Remove WIN_LOCAL_PROPERTY as unused now, as we only refer to CYGX_CUT_BUFFER
once and do that directly.
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
commit be61a1fc7e25a380f8d506e13b22017492a71913
Author: Jon TURNEY <jon.turney@dronecode.org.uk>
Date: Mon Jun 17 19:07:05 2013 +0100
hw/xwin: Add fUseUnicode as parameter to winClipboardProc()
Add fUseUnicode as parameter to winClipboardProc()
Access g_fUseUnicode global when calling it
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
commit 126c1cfaa5b5978026d44a1f8b044d367056965b
Author: Jon TURNEY <jon.turney@dronecode.org.uk>
Date: Mon Jun 17 18:27:56 2013 +0100
hw/xwin: Separate libwinclipboard interface and internal header files
Rename the libwinclipboard internal header from winclipboard.h to internal.h
Put libwinclipboard's public interface into winclipboard.h
This lets winclipboardinit.c partake of that public interface, and all X server
headers without clashes
winInitClipboard() prototype belongs in a server header
v2: Remove duplicate declaration of winClipboardWindowDestroy()
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
commit 30c535219ef2c251d90a1a1d3d07c8a7ec936da9
Author: Jon TURNEY <jon.turney@dronecode.org.uk>
Date: Tue Jun 18 00:32:53 2013 +0100
hw/xwin: Return a shutdown flag from winClipboardProc() if we should stop trying
Return a shutdown flag from winClipboardProc(), and use it in
winClipboardThreadProc() to determine if we should stop.
Currently this is set if the clipboard messaging window received a WM_QUIT.
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
commit 88d44597046086953032fec7e035fc036596e255
Author: Jon TURNEY <jon.turney@dronecode.org.uk>
Date: Mon Jun 17 00:38:47 2013 +0100
hw/xwin: Move clipboard integration code down to a subdirectory
Move clipboard integration code down to a subdirectory and build as a
convenience library
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
commit e965001a732a6b573c374f6a3503e172df01e8ec
Author: Jon TURNEY <jon.turney@dronecode.org.uk>
Date: Mon Jun 17 13:18:16 2013 +0100
hw/xwin: Make g_hwndClipboard static
Move winFixClipboardChain() into winclipboardthread.c
Add winCLipboardWindowDestroy() function to access it for WM_DESTROY
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
commit 03a59e7f787a160c6cc07c7a37df64a793242ef2
Author: Jon TURNEY <jon.turney@dronecode.org.uk>
Date: Mon Jun 17 02:01:39 2013 +0100
hw/xwin: Add remaining clipboard globals to winglobals.h
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
commit 8f9fba5bc1499804a6c4a3287d99fe7dab8d6b8f
Author: Jon TURNEY <jon.turney@dronecode.org.uk>
Date: Mon Jun 17 02:01:27 2013 +0100
hw/xwin: Hoist use of winSetAuthorization() and winGetDisplayName() up one level
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
commit a3c1e405cb78df9ef18a1158dcaed3c27b3cbffe
Author: Jon TURNEY <jon.turney@dronecode.org.uk>
Date: Sun Jun 16 22:35:22 2013 +0100
hw/xwin: Eliminate g_pClipboardDisplay and g_iClipboardWindow globals
Eliminate the g_pClipboardDisplay and g_iClipboardWindow globals used to make
those values available to the clipboard wndproc, by passing them in via the
WM_CREATE message instead.
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
commit 229a0a83a44c94ce76eb937d58dc1773a38baa3e
Author: Jon TURNEY <jon.turney@dronecode.org.uk>
Date: Sun Jun 16 22:13:26 2013 +0100
hw/xwin: Move winClipboardCreateMessagingWindow() to winclipboardthread.c
Move winClipboardCreateMessagingWindow() from winclipboardinit.c to
winclipboardthread.c, the only place that uses it, and make it static.
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
commit a70c2384a2689cc0346868bb27366c008c01758d
Author: Jon TURNEY <jon.turney@dronecode.org.uk>
Date: Mon Feb 13 19:58:37 2012 +0000
hw/xwin: Remove SetSelectionOwner wrapper, use XFixesSetSelectionOwnerNotify event instead
Use the XFixesSetSelectionNotify event instead of a SetSelectionOwner wrapper,
the completely equivalent client-side mechanism.
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
commit ab55746c1b179172a82b7a89ec6429b268a1f166
Author: Jon TURNEY <jon.turney@dronecode.org.uk>
Date: Mon Jun 17 01:55:46 2013 +0100
hw/xwin: Remove g_fClipboardLaunched, it's value is identical to g_fClipboardStarted
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
commit 42d13810822f6b48771d77b09c0ef7cc2356ede5
Author: Jon TURNEY <jon.turney@dronecode.org.uk>
Date: Mon Jun 17 01:30:09 2013 +0100
hw/xwin: Hoist setting of g_fClipboardStarted flag up one level
Hoist the setting of g_fClipboardStarted flag up one level.
Also move up the clearing of the g_fClipboardLaunched at the end of clipboard
function.
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
commit 290dbff0753ddf60f04da92d5a408c567a2ee3e0
Author: Jon TURNEY <jon.turney@dronecode.org.uk>
Date: Mon Jun 17 01:55:03 2013 +0100
hw/xwin: winProcEstablishConnection doesn't need to check if clipboard started
winProcEstablishConnection doesn't need to check if clipboard has already been
started.
It should be clear that we start the thread only once when the wrapper tells us
to, as the wrapper unhooks itself thereafter.
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
commit 91e55691ef07735bb866c0f4d3c1a6e2ca167992
Author: Jon TURNEY <jon.turney@dronecode.org.uk>
Date: Sun Jun 16 23:57:17 2013 +0100
hw/xwin: Hoist clipboard thread restart up one level
Hoist clipboard thread restart up one level.
Note that currently g_fClipboardLaunched is set the first time in the
winProcEstablishConnection wrapper, and subsequent times when the clipboard
thread restarts itself.
Try to clarify this and just set g_fClipboardLaunched before starting the
thread.
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
commit 0bb6eae4e34634abb2679004ace94504a4d65964
Author: Jon TURNEY <jon.turney@dronecode.org.uk>
Date: Mon Jun 17 00:07:01 2013 +0100
hw/xwin: Push winClipboardShutdown() into winclipboardinit.c
Push winClipboardShutdown() into winclipboardinit.c
This lets us make g_ptClipboardProc static
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
commit 6343b531d786dd4a9bb52050c9ef267a04374b57
Author: Jon TURNEY <jon.turney@dronecode.org.uk>
Date: Wed Jan 1 17:54:48 2014 +0000
hw/xwin: Remove left-over pthread_exit() in clipboard code
Commit c1bf3baa44fbd8af33a2b3ce045324485b85a7a7 removed all but one of the
pthread_exit() calls which used to call winClipboardThreadExit()
Fix the final remaining one to exit via done label on IOError instead.
Also fix a comment and report pre-flush failure to log, but do not exit
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
commit d3427717f2c6a473dc3d20631dff653e4e37228e
Author: Adam Jackson <ajax@redhat.com>
Date: Wed Jul 2 12:09:52 2014 -0400
xwayland: Snap damage reports to the bounding box
Instead of sending every little rect. Lets x11perf run to completion,
makes 'while true; do gtkperf -a; done' take longer to crash.
This is effectively a resend of the same logic against the old
xfree86+xwayland branch:
http://lists.x.org/archives/xorg-devel/2013-October/038453.html
Reviewed-by: Daniel Stone <daniel@fooishbar.org>
Reviewed-by: Kristian Høgsberg <krh@bitplanet.net>
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit 5ecc0315a2b9bea44ace886f5706a7a3f5cbc4f6
Author: Jasper St. Pierre <jstpierre@mecheye.net>
Date: Mon Jun 30 13:53:50 2014 -0400
xwayland: Implement throttling for surfaces based on the frame event
This implements simple throttling that keeps us to one attach per
frame. There isn't really an active performance benefit, since the
buffers will be redrawn only once per frame anyway, but it does cut down
on the chatty network traffic. Since the Wayland sockets might fill
up as well, the cut down on the volume of data we send out also provides
us with a big stability benefit.
Namely, mutter is a lot more stable running gtkperf, a fairly intensive
X11 application, after this change.
Reviewed-by: Daniel Stone <daniel@fooishbar.org>
Signed-off-by: Jasper St. Pierre <jstpierre@mecheye.net>
commit 6c442fc4f7d84508665dfdee8a75ec91f50395dc
Author: Jasper St. Pierre <jstpierre@mecheye.net>
Date: Mon Jun 30 15:28:16 2014 -0400
xwayland-input: Fix a crasher for a race with the Wayland compositor
If something quickly maps and unmaps a window, then we'll immediately
create and destroy the Wayland surface that cooresponds to that
window. If our mouse pointer is over the window when the surface is
created, we'll receive a enter on the window.
Since resource creation and destruction is not synchronous, that
means that the compositor will queue up an event for a resource that's
eventually destroyed. On the client-side, when we receive this message,
we note that the resource isn't allocated, and get a NULL surface in our
enter handler. We immediately try to dereference this, and then crash.
This was caused by running gtkperf while moving the window a lot.
Reviewed-by: Daniel Stone <daniel@fooishbar.org>
Signed-off-by: Jasper St. Pierre <jstpierre@mecheye.net>
commit 1d32004ed5a3a20b2d5879867e213122dced69d0
Author: Michel Dänzer <michel.daenzer@amd.com>
Date: Wed Sep 10 16:20:48 2014 +0900
glamor: Make glyph mask cache per-screen
It references a pixmap, which is a per-screen resource.
Fixes broken text rendering in xfwm4-tweak-settings in Zaphod mode.
Signed-off-by: Michel Dänzer <michel.daenzer@amd.com>
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 710d314ad16cf1eaca3b97b1736ff0ca43e598c4
Author: Michel Dänzer <michel.daenzer@amd.com>
Date: Wed Sep 10 16:20:47 2014 +0900
glamor: Track glyph caching information per screen
This is necessary because the glyph caches are per screen.
Fixes broken menu text in gnome-terminal in Zaphod mode.
Signed-off-by: Michel Dänzer <michel.daenzer@amd.com>
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit a4e8e6dff9a0c26944a325e4017faa68d93ae5b8
Author: Michel Dänzer <michel.daenzer@amd.com>
Date: Wed Sep 10 16:20:46 2014 +0900
glamor: Move 'glyph caches realized' check to glamor_realize_glyph_caches
And rename the boolean to reflect what it's about.
Signed-off-by: Michel Dänzer <michel.daenzer@amd.com>
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 0acff6e4374340dc391014f396f190daf73d579c
Author: Michel Dänzer <michel.daenzer@amd.com>
Date: Wed Sep 10 16:20:45 2014 +0900
glamor: Call glamor_glyphs_init from glamor_create_screen_resources
The comment above glamor_glyphs_init was already saying so.
Signed-off-by: Michel Dänzer <michel.daenzer@amd.com>
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 54a1d4db825be90fb7be138e3267a15922d62f03
Merge: 8f8dcfee20 f92df22a03
Author: Keith Packard <keithp@keithp.com>
Date: Thu Sep 11 18:27:41 2014 -0700
Merge remote-tracking branch 'jturney/master'
commit 8f8dcfee2085ba82107a8bf3872a0bb241493409
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Thu Sep 4 23:18:03 2014 -0700
Make list tests actually test lists
Coverity scan detected that asserts were setting values, not checking them:
CID 53252: Side effect in assertion (ASSERT_SIDE_EFFECT)
assignment_where_comparison_intended: Assignment item->b = i * 2
has a side effect. This code will work differently in a non-debug build.
Did you intend to use a comparison ("==") instead?
CID 53259: Side effect in assertion (ASSERT_SIDE_EFFECT)
assignment_where_comparison_intended: Assignment item->a = i
has a side effect. This code will work differently in a non-debug build.
Did you intend to use a comparison ("==") instead?
CID 53260: Side effect in assertion (ASSERT_SIDE_EFFECT)
assignment_where_comparison_intended: Assignment item->a = i
has a side effect. This code will work differently in a non-debug build.
Did you intend to use a comparison ("==") instead?
CID 53261: Side effect in assertion (ASSERT_SIDE_EFFECT)
assignment_where_comparison_intended: Assignment item->b = i * 2
has a side effect. This code will work differently in a non-debug build.
Did you intend to use a comparison ("==") instead?
Fixing those to be == caused test_nt_list_insert to start failing as
part assumed append order, part assumed insert order, so it had to be
fixed to use consistent ordering.
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit d0da0e9c3bb8fe0cd4879ecb24d21715bfaa209b
Author: Eric Anholt <eric@anholt.net>
Date: Thu Sep 4 10:59:40 2014 -0700
glx: Disable indirect GLX contexts by default.
Almost every situation of someone running indirect GLX is a mistake
that results in X Server crashes. Indirect GLX is the cause of
regular security vulnerabilities, and rarely provides any capability
to the user. Just disable it unless someone wants to enable it for
their special use case (using +iglx on the command line).
Signed-off-by: Eric Anholt <eric@anholt.net>
Acked-by: Keith Packard <keithp@keithp.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit bf338efc678258d2d366dff2ed873752f98f0bfc
Author: Keith Packard <keithp@keithp.com>
Date: Thu Sep 4 08:36:07 2014 -0700
glx/present: Only send GLX_BufferSwapComplete for PresentCompleteKindPixmap
Present didn't provide the 'kind' argument to the
present_complete_notify hook that GLX uses to construct
GLX_BufferSwapComplete events, so GLX was reporting events for
PresentCompleteKindMSC notifications, which resulted in duplicate
GLX_BufferSwapComplete events and crashes in clutter.
See the gnome bug: https://bugzilla.gnome.org/show_bug.cgi?id=733282
Signed-off-by: Keith Packard <keithp@keithp.com>
Reviewed-by: Eric Anholt <eric@anholt.net>
commit 7a0c79c8c478bf22ee71c1ea35886a6f555ef2bb
Author: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Tue Sep 2 22:03:14 2014 +0200
os/log: adjust gcc version conditions for #pragma
In commit e67f2d7e0f9189beb2907fa06cff5ecc7f35f922 ("gcc 4.2.1 doesn't
support #pragma GCC diagnostic ignored"), some compile time
conditionals were added around the #pragma usage. Those conditionals
ensure that the #pragma are not used on gcc <= 4.2.
However, the usage of #pragma diagnostic inside functions was only
added in gcc 4.6, and a build failure is therefore experienced with
gcc 4.5:
log.c: In function 'LogInit':
log.c:199:9: error: #pragma GCC diagnostic not allowed inside functions
log.c:201:9: warning: format not a string literal, argument types not checked
log.c:212:9: error: #pragma GCC diagnostic not allowed inside functions
log.c:214:17: warning: format not a string literal, argument types not checked
$ ./host/usr/bin/powerpc-linux-gnu-gcc -v
[...]
gcc version 4.5.2 (Sourcery G++ Lite 2011.03-38)
This patch therefore adjusts the compile time conditionals to make
sure the #pragma is not used on gcc <= 4.5, and only used on gcc >=
4.6.
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Acked-by: Keith Packard <keithp@keithp.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit da4bad620a6f1a58978f5279fda74da3c1c1d443
Author: Dave Airlie <airlied@gmail.com>
Date: Tue Jul 30 13:50:48 2013 +1000
pixmap: fix reverse optimus support with multiple heads
For doing reverese optimus to multiple outputs on a secondary GPU
the GPU can store the blits into a large screen pixmap, unfortunately
this means we need a destination offset into the dirty code, so
add a new API that just adds this interface.
Signed-off-by: Dave Airlie <airlied@redhat.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit e1cc0d3df1fdb6c4393ac455ca038e1e0680bb22
Author: Maks Naumov <maksqwe1@ukr.net>
Date: Thu Aug 21 12:58:16 2014 -0700
glx: Fix 'y ' value in swrastGetDrawableInfo()
Signed-off-by: Maks Naumov <maksqwe1@ukr.net>
Reviewed-by: Eric Anholt <eric@anholt.net>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit f92df22a037cb8b672dab2e7aef18a22275f5660
Author: Jon TURNEY <jon.turney@dronecode.org.uk>
Date: Fri Jul 18 15:08:17 2014 +0100
hw/xwin/glx: Remove an incorrect assertion in glxWinDrawableSwapBuffers
The piglit test glx_make_current triggers this assertion, by making the context
current on a different drawable before issuing a glXSwapBuffers()
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
commit b21321e515fc778f87077b7ce47922c43a4ba103
Author: Jon TURNEY <jon.turney@dronecode.org.uk>
Date: Mon Jul 14 19:41:25 2014 +0100
hw/xwin/glx: Downgrade "forcing window to exist" message to debug
It happens whenever a GLX client uses GL on a window before it's been mapped, so
don't log it like an error.
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
commit 31d089633683ea2a2716651c3c48e1456cc595bf
Author: Jon TURNEY <jon.turney@dronecode.org.uk>
Date: Wed Jul 16 13:44:33 2014 +0100
hw/xwin/glx: Fix a couple of typo bugs in indirect.c
fbConfigToPixelFormatIndex()'s drawableTypeOverride parameter is a drawable
type bitmask, not a drawable type enum value
WGL_SWAP_COPY_ARB is a value of the WGL_SWAP_METHOD_ARB attribute for
wglChoosePixelFormatARB(), not an attribute itself
also remove duplicate error reporting for wglChoosePixelFormat() and fix a
comment
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
commit b1ea714cdce8444c6ad7778dae04e35c6bcc1750
Author: Jon TURNEY <jon.turney@dronecode.org.uk>
Date: Sun Apr 27 22:10:31 2014 +0100
hw/xwin/glx: Update .gitignore
Update to align with rewrite of wrapper generation script in commit
583a1146233f16d861706926706e5feec3baffba
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
commit d1d3bd359670a8f55c9350fd905af32ba6e67d33
Author: Jon TURNEY <jon.turney@dronecode.org.uk>
Date: Sun Mar 30 20:51:36 2014 +0100
hw/xwin/glx: Don't override the server supported GL extensions string.
Don't override the server supported GL extensions string.
The string reported to the client is the intersection of client, server and GL
implementation extensions.
Overriding the server supported GL extensions string like this causes extensions
which are supported by the client and implementation, but not by the server, to
be erroneously reported, so don't change it.
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
commit c99cd058a89bbfc9ceab3c91b93451f70351ddce
Author: Jon TURNEY <jon.turney@dronecode.org.uk>
Date: Tue Mar 4 22:37:13 2014 +0000
hw/xwin: Add an idempotency guard to glwindows.h
Add an idempotency guard to glwindows.h
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
commit 1c34e774eff6c5a22501833444a10440cf3f915a
Author: Jon TURNEY <jon.turney@dronecode.org.uk>
Date: Mon Nov 11 15:09:18 2013 +0000
hw/xwin: Fix a potential crash in winRedrawScreenShadowDDNL()
Seen during shutdown when using '-fullscreen' and '-depth 8'
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
commit 16d9da08861fe504de4be8c31708592e30687156
Author: Jon TURNEY <jon.turney@dronecode.org.uk>
Date: Thu Feb 18 23:36:27 2010 -0600
hw/xwin: Improve choice of display name used by internal clients
Choose the display name used to connect to internal clients and exported into
environment of processes started from the traymenu so that it uses a transport
we know is working
This should mean the server can start correctly with -multiwindow and/or
-clipboard and any two of -nolisten inet6, -nolisten inet and -nolisten unix
(the server will correctly refuse to start if all 3 are used, as it must be
listening on at least one socket)
v2:
Place prototype for winGetDisplayName() in windisplay.h, and include it where
needed.
v3:
Include xwin-config.h, so that _XSERVER64 is defined, just in case anything
relies on that.
v4:
Replace grovelling around in the server's list of listeners with new Xtrans
TransIsListening() interface, added in Xtrans 1.3.3
See also [1]
[1] https://sourceware.org/bugzilla/show_bug.cgi?id=10725
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Reviewed-by: Yaakov Selkowitz <yselkowitz@users.sourceforge.net>
Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
commit 95357539c1178a97d8a167461806a280d2803ec4
Author: Jon TURNEY <jon.turney@dronecode.org.uk>
Date: Wed Jan 1 20:34:36 2014 +0000
hw/xwin: Makefile.am cleanup
- Rename XWIN_GLX_LINK_FLAGS -> XWIN_GLX_SYS_LIBS for consistency
- Rename MULTIWINDOW_LIBS -> MULTIWINDOW_SYS_LIBS for consistency
- Don't link with XWin with $(MAIN_LIB), it provides it's own main()
- Put one library per line for more intelligible diffs when one is added
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
commit aa40d0c07173209a2c13b332f1168e0df499a19e
Author: Jon TURNEY <jon.turney@dronecode.org.uk>
Date: Fri Jun 13 16:16:51 2014 +0100
hw/xwin/glx: When generating shims, limit the considered features to GL version <=1.2
This fixes a problem when using Khronos registry data since the change of
2013-08-16 removed glBlend(Color|Equation) from GL1.2 and added them to
GL_ARB_imaging.
If shim generation considers all features, no shims are generated for
glBlend(Color|Equation) as they are first emitted for GL 1.4 (which we ignore as
shims are only generated for GL version <=1.2), then emission for GL_ARB_imaging
is skipped as they have already been emitted.
Also improve feature name matching so it is exact, not on an initial substring,
so 'GL_ARB_texture_compression_bptc' and 'GL_ARB_texture_compression_rgtc'
aren't matched by 'GL_ARB_texture_compression'.
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
commit 35dc7c75150733dbcef8a18b6796f49a7c48ebee
Merge: 3a51418b2d 5f3485b06e
Author: Eric Anholt <eric@anholt.net>
Date: Mon Aug 25 15:52:58 2014 -0700
Merge branch 'modesetting-import' into master
This reintroduces a "hardware" driver to the xfree86 directory.
Unlike the drivers that xorg used to include in the source tree, that
needed independent release schedules to get hardware support out the
door, the modesetting driver shouldn't change much as new hardware
gets released. A lot of what this driver needs to do is just keep up
with server ABI changes.
This import was done by taking xf86-video-modesetting-0.9.0, and
running this script with 'git-filter-branch -f --tree-filter
~/bin/modesetting-filter':
mkdir -p hw/xfree86/drivers/modesetting
rm -f README autogen.sh configure.ac Makefile.am .gitignore
rm -f man/Makefile.am
mv man/modesetting.man hw/xfree86/drivers/modesetting/
mv COPYING hw/xfree86/drivers/modesetting/
mv src/* hw/xfree86/drivers/modesetting/
commit 3a51418b2db353519a1779cf3cebbcc9afba2520
Author: Laércio de Sousa <laerciosousa@sme-mogidascruzes.sp.gov.br>
Date: Mon Aug 18 08:45:43 2014 -0300
ephyr: set screen size & origin from host X server output's CRTC geometry
If a given output is passed via new -output option, Xephyr will query
host X server for its info. If the following conditions are met:
a. RandR extension is enabled in host X server;
b. supported RandR version in host X server is 1.2 or newer;
c. the given output name is valid;
d. the given output is connected;
then Xephyr will get output's CRTC geometry and use it to set its own
screen size and origin. It's just like starting Xephyr in fullscreen mode,
but restricted to the given output's CRTC geometry (fake "Zaphod mode").
This is the main feature needed for Xephyr-based single-card multiseat
setups where we don't have separate screens to start Xephyr in fullscreen
mode safely.
Signed-off-by: Laércio de Sousa <laerciosousa@sme-mogidascruzes.sp.gov.br>
Reviewed-by: Keith Packard <keithp@keithp.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 84b02469ef97e6f85d074d220a517d752180045f
Author: Laércio de Sousa <laerciosousa@sme-mogidascruzes.sp.gov.br>
Date: Mon Aug 18 08:45:42 2014 -0300
ephyr: enable screen window placement following kdrive -screen option extended syntax
With this patch, one can launch Xephyr with option "-screen WxH+X+Y"
to place its window origin at (X,Y). This patch relies on a previous
one that extends kdrive -screen option syntax to parse +X+Y substring
as expected.
If +X+Y is not passed in -screen argument string, let the WM place
the window for us, as before.
Signed-off-by: Laércio de Sousa <laerciosousa@sme-mogidascruzes.sp.gov.br>
Reviewed-by: Keith Packard <keithp@keithp.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 376f4de8ae927748417046390c24afbda24b0583
Author: Laércio de Sousa <laerciosousa@sme-mogidascruzes.sp.gov.br>
Date: Mon Aug 18 08:45:41 2014 -0300
kdrive: add support to +X+Y syntax in -screen option parsing
This patch enhances current -screen option parsing for kdrive-based
applications. It can parse strings like
<WIDTH>x<HEIGHT>+<XOFFSET>+<YOFFSET>, storing X and Y offsets
in KdScreenInfo instances.
For negative values, this patch supports +-X+-Y (not -X-Y) syntax.
It will allow e.g. proper Xephyr window placement for multiseat
purposes.
Signed-off-by: Laércio de Sousa <laerciosousa@sme-mogidascruzes.sp.gov.br>
Reviewed-by: Keith Packard <keithp@keithp.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit fe5018e0564118a7a8198fa286186fdb9ed818c7
Author: Takashi Iwai <tiwai@suse.de>
Date: Tue Aug 19 15:57:22 2014 -0500
fb: Fix invalid bpp for 24bit depth window
We have a hack in fb layer for a 24bpp screen to use 32bpp images, and
fbCreateWindow() replaces its drawable.bitsPerPixel field
appropriately. But, the problem is that it always replaces when 32bpp
is passed. If the depth is 32, this results in bpp < depth, which is
actually invalid.
Meanwhile, fbCreatePixmap() has a more check and it creates with 24bpp
only when the passed depth <= 24 for avoiding such a problem.
This oneliner patch just adds the similar check in fbCreateWindow().
This (hopefully) fixes the long-standing broken graphics mess of
cirrus KMS with 24bpp.
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Reviewed-by: Keith Packard <keithp@keithp.com>
commit 5d133276de9c50146e80ffc69edd429c2afe98e6
Author: Thierry Reding <treding@nvidia.com>
Date: Thu Feb 13 13:36:12 2014 +0100
xfree86: Allow non-PCI devices as primary
On platforms that don't support PCI or have no GPU attached to the PCI
bus, there can still be a primary device on a non-PCI bus.
Signed-off-by: Thierry Reding <treding@nvidia.com>
Reviewed-by: Rob Clark <robdclark@gmail.com>
Tested-by: Rob Clark <robdclark@gmail.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 2f0183222b4279266e6ef60b923738ff55f0afba
Author: Thierry Reding <treding@nvidia.com>
Date: Thu Feb 13 13:31:31 2014 +0100
xfree86: Fallback to first platform device as primary
When neither of the various bus implementations was able to find a
primary bus and device, fallback to using the platform bus as primary
bus and the first platform device as primary device.
Signed-off-by: Thierry Reding <treding@nvidia.com>
Reviewed-by: Rob Clark <robdclark@gmail.com>
Tested-by: Rob Clark <robdclark@gmail.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 33aeec8a11bc75a06d32956bbdd9efb216790a02
Author: Keith Packard <keithp@keithp.com>
Date: Thu Jan 30 16:24:35 2014 -0800
dri3: Don't enable the DRI3 extension unless some screen supports it
There's no reason to advertise this extension unless one of the
hardware drivers actually supports it. Not listing it means it's
slightly easier for users to tell what's going on.
On the other hand, not listing it means we may have applications that
only check for the extension and not for appropriate per-screen
support. I don't think that's a real risk as DRI3 is only useful for
systems with deep knowledge of the hardware.
Signed-off-by: Keith Packard <keithp@keithp.com>
Reviewed-by: Eric Anholt <eric@anholt.net>
commit 0d7306ffe2e069f0091c4f174f138127100abb43
Author: Michel Dänzer <michel.daenzer@amd.com>
Date: Wed Aug 13 17:10:21 2014 +0900
glamor: Don't call glamor_copy_fbo_cpu() for GLAMOR_DRM_ONLY pixmaps
It results in a crash.
Signed-off-by: Michel Dänzer <michel.daenzer@amd.com>
Reviewed-by: Eric Anholt <eric@anholt.net>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit c2548d71f7a754251d89696ae49aab2fe07446df
Author: Joerg Sonnenberger <joerg@NetBSD.org>
Date: Mon Aug 11 10:36:01 2014 +0200
Fix format string.
Reviewed-by: Keith Packard <keithp@keithp.com>
Signed-off-by: Thomas Klausner <wiz@NetBSD.org>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit d4111239e698f0126123830429d74da7d24910ed
Author: Keith Packard <keithp@keithp.com>
Date: Wed Aug 13 11:30:11 2014 -0700
glamor: Free Xv put image data immediately after use
The Xv StopVideo callback is not invoked on textured video ports, so
the temporary pixmaps allocated for the video planes are never freed.
Freeing the storage immediately after use is a simple solution to this
problem which doesn't appear to have any visible performance impact.
Signed-off-by: Keith Packard <keithp@keithp.com>
Reviewed-by: Eric Anholt <eric@anholt.net>
commit c47ee880e742e15fdbd5f5ac3eba64db6228c09f
Author: Eric Anholt <eric@anholt.net>
Date: Mon Aug 11 15:23:02 2014 -0700
glamor: Don't try to set up core fonts textures when we won't use them.
This happens to avoid GL errors on hardware without
EXT_texture_integer (which implies < GLSL 130, and thus glamor_text.c
programs not compiling anyway).
Signed-off-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit d09c9ddb866dea31e2adf82be329d5d3489718f5
Merge: 606b701c56 ab32ee3589
Author: Keith Packard <keithp@keithp.com>
Date: Tue Aug 12 16:34:24 2014 -0700
Merge remote-tracking branch 'jeremyhu/master'
commit 606b701c563c10f01dec147e061fa00cda784a9d
Author: Michel Dänzer <michel.daenzer@amd.com>
Date: Wed Aug 6 10:30:25 2014 +0900
glamor: Add glamor_copy_fbo_cpu() for CopyArea to non-GPU destination
This provides a speedup e.g. when the destination is an SHM pixmap.
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=76285
Signed-off-by: Michel Dänzer <michel.daenzer@amd.com>
Reviewed-by: Eric Anholt <eric@anholt.net>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 1e30fc1b99bda040038e4fd56d1b27c686b44c75
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Mon Aug 4 10:47:03 2014 +1000
xkb: ignore floating slave devices when updating from master (#81885)
Introduced in 45fb3a934dc0db51584aba37c2f9d73deff9191d. When a device is
enabled, the master's locked state is pushed to the slave. If the device is
floating, no master exists and we triggered a NULL-pointer dereference
in XkbPushLockedStateToSlaves.
X.Org Bug 81885 <http://bugs.freedesktop.org/show_bug.cgi?id=81885>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Daniel Stone <daniel@fooishbar.org>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 4599a4492ca6a1c87cd9c537c54fbda11f13c15c
Author: Daphne Pfister <daphnediane@mac.com>
Date: Wed Jul 23 21:51:57 2014 -0400
os: Regenerate os/oscolor.c from app/rgb #52289
Regenerate os/oscolor.c from rgb.txt. This adds the following
colors: aqua, lime, fuchsia, crimson, indigo, olive, rebecca
purple, silver and teal. It also adds versions of gray, grey,
green, maroon and purple prefixed with web and x11 for the
colors that are different between X11 and HTML/CSS web colors.
Fixes: https://bugs.freedesktop.org/show_bug.cgi?id=52289
Related: https://bugs.freedesktop.org/show_bug.cgi?id=80371
Signed-off-by: nobody
Tested-by: Keith Packard <keithp@keithp.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit ee9f766abf6fbe0cc36234bfe727aba924e9b5fd
Author: Keith Packard <keithp@keithp.com>
Date: Mon Jul 28 12:09:51 2014 -0700
xfree86: [v2] Remove duplicate InputInfoPtr typedef from xf86Xinput.h
GCC 4.2 doesn't accept 2 typedef declarations of the same type, so
remove the extra one from xf86Xinput.h and have xf86Xinput.h #include
xf86.h to make sure everyone using just that file gets the typedef.
Signed-off-by: Keith Packard <keithp@keithp.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Matthieu Herrb <matthieu@herrb.eu>
commit ab32ee35890be51137b56525826ffe219b63eb88
Author: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
Date: Mon Aug 11 13:15:24 2014 -0700
XQuartz: Better support turning off "Displays have separate Spaces" on OS X Mavericks
http://xquartz.macosforge.org/trac/ticket/1876
Follow-up to: 1c10b37380d228b35db8a8616a6312ac54f5e59b
Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
commit dfbc6a1a78ff3192baae6f7f2af98b6e51422f75
Author: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
Date: Wed Jul 23 11:53:33 2014 -0700
ListenOnOpenFD: Remove Resets since this is intended to be for hotplugging connections
pharris says that the resets should not be done in the hotplugging case.
This may fix a crash reported against XQuartz:
http://xquartz.macosforge.org/trac/ticket/869
Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
Reviewed-by: Peter Harris <pharris@opentext.com>
commit 3714f5401690b288045090c4bcd9cb01c6e4860e
Author: Eric Anholt <eric@anholt.net>
Date: Sun Apr 6 07:57:44 2014 +0100
kdrive: Remove a dead struct.
It's never been used in the history of the tree.
Signed-off-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Keith Packard <keithp@keithp.com>
commit ef258fa4fd0c215b1327fb3d94b37e75af9fae6b
Author: Eric Anholt <eric@anholt.net>
Date: Wed Jul 30 21:11:51 2014 -0700
xv: Drop the ClientPtr from the interface to the DDX.
Nobody was using it.
v2: Merge the hunk that was accidentally in the previous commit into
this one.
Signed-off-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Keith Packard <keithp@keithp.com>
commit 850b268e2b9e49445a22e041a356d8ff26ae2147
Author: Eric Anholt <eric@anholt.net>
Date: Sat Apr 5 10:55:45 2014 +0100
xv: Remove the no-op AllocatePort/FreePort interfaces.
v2: Fix accidentally squashed-in change for dropping client from the
arguments, which should have been in the next commit.
Signed-off-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Keith Packard <keithp@keithp.com> (v2)
commit 41d4a626c6ceb15d5b008dca00c6f5032ddd9556
Author: Eric Anholt <eric@anholt.net>
Date: Sat Apr 5 10:35:52 2014 +0100
kdrive: Don't bother explicitly clearing new window privates to NULL.
Privates are initially cleared to zero by dixInitPrivates().
Signed-off-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Keith Packard <keithp@keithp.com>
commit e311318b35ef4f82996c6e277137569005893b44
Author: Eric Anholt <eric@anholt.net>
Date: Sat Apr 5 09:11:03 2014 +0100
kdrive: Remove dead KXVPaintRegion().
It's been unused since mach64 was deleted, and now there's a helper in
core XV.
Signed-off-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Keith Packard <keithp@keithp.com>
commit 7eac142fb6e8abb011ce59feda3c2d7b04f2b225
Author: Eric Anholt <eric@anholt.net>
Date: Sat Apr 5 09:09:17 2014 +0100
xv: Fix malloc-failure cases in the fill color key helper.
Signed-off-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
commit ea3f3b0786d58b2ba6a9bbf0a32e734670f54b73
Author: Eric Anholt <eric@anholt.net>
Date: Sat Apr 5 09:07:18 2014 +0100
xv: Move xf86 XV color key helper to core.
Color key overlay implementations want to reuse this code, and XF86's
had bugs (to be fixed in the next commit).
Signed-off-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Keith Packard <keithp@keithp.com>
commit b01cfe5f23766b9c13ed6bd889263d5d7a8a351d
Author: Eric Anholt <eric@anholt.net>
Date: Fri Apr 4 22:58:37 2014 +0100
xv: Move CloseScreen setup from a DIX hook to normal wrapping.
Signed-off-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Keith Packard <keithp@keithp.com>
commit 6a71ee79aabe6b611cae443a49786824a0322313
Author: Eric Anholt <eric@anholt.net>
Date: Fri Apr 4 18:02:14 2014 +0100
xv: Drop unused XvdiVideoStopped().
Signed-off-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Keith Packard <keithp@keithp.com>
commit 4a095902a37cb98d7954d0873dcf1376cbab54b8
Author: Eric Anholt <eric@anholt.net>
Date: Fri Apr 4 18:01:07 2014 +0100
xv: Drop unused XvdiPreemptVideo().
Signed-off-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Keith Packard <keithp@keithp.com>
commit e7dde86f2343832c52ef74f5c4fe44a72054c79b
Author: Eric Anholt <eric@anholt.net>
Date: Fri Apr 4 17:54:58 2014 +0100
xv: Move the DDX XV screen private allocation into the DDXes.
XV was going against convention by having the core infrastructure
allocate the private on behalf of the DDX. I was interested in this
because I was trying to make multiple pieces of DDX be able to
allocate adaptors, and that wasn't going to work if DDX-specific code
was hung off of a single global screen private.
Signed-off-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Keith Packard <keithp@keithp.com>
commit a146c6d4212ed199002e40419b4aa22da8f49e3a
Author: Eric Anholt <eric@anholt.net>
Date: Fri Apr 4 13:12:34 2014 +0100
xv: Drop the ddQueryAdaptors() interface.
The core was passing pointers to pxvs's nAdaptors and pAdaptors, and
the two hardware implementations were copying pxvs's nAdaptors and
pAdaptors into those pointers.
Signed-off-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Keith Packard <keithp@keithp.com>
commit cb42805c6675bbb9f0b37609fe2ffecc07f46290
Author: Eric Anholt <eric@anholt.net>
Date: Fri Dec 27 21:54:26 2013 -0800
xv: Move common code for adaptor cleanup to xvmain.c
Since any DDX XV screen cleanup would need this same code for freeing
the tree of pointers for xv adaptors, move it to the dix.
v2: Unconditionalize the pPorts freeing, to match the block above it.
Signed-off-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Keith Packard <keithp@keithp.com> (v1)
commit 8cb0da29404d3fed13c1cbedb5c6164e4733ea82
Author: Eric Anholt <eric@anholt.net>
Date: Fri Dec 27 20:59:12 2013 -0800
xv: Remove dead VIDEO_NO_CLIPPING from the xorg and kdrive DDXes.
As far as I can see, nothing has ever used this flag except possibly
the i.mx6 xorg ddx debug during bringup.
Signed-off-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Keith Packard <keithp@keithp.com>
commit a6ec7d5278405d69e60cca2964006fb7ce32c556
Author: Eric Anholt <eric@anholt.net>
Date: Fri Dec 27 20:53:00 2013 -0800
xv: Remove dead VIDEO_INVERT_CLIPLIST from the xorg and kdrive DDXes.
As far as I can see (looking at trees on my disk, plus googling for
the term), nothing has ever used this flag
Signed-off-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Keith Packard <keithp@keithp.com>
commit e6c8c7e46c79b2837a7d0b12079a47734eff1eb7
Author: Egbert Eich <eich@freedesktop.org>
Date: Mon Aug 4 19:16:30 2014 +0200
BellProc: Send bell event on core protocol bell when requested
XKB allows to override the BellProc() ringing the 'keyboard bell':
instead an event is sent to an X client which can perform an
appropriate action.
In most cases this effectively prevents the core protocol bell
from ringing: if no BellProc() is set for the device, no attempt
is made to ring a bell.
This patch ensures that an XKB bell event is sent also when
the core protocol bell is rung end thus an appropriate action
can be taken by a client.
Signed-off-by: Egbert Eich <eich@freedesktop.org>
Acked-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit e8373e4b6a793b48487b1a82d798d97b5c9a10a3
Author: Keith Packard <keithp@keithp.com>
Date: Thu Jul 31 19:57:53 2014 -0700
Add X_BYTE_ORDER to xorg-server.h
Drivers don't get to use dix-config.h, they use xorg-server.h
instead. Add X_BYTE_ORDER to that file so drivers can see the value.
Signed-off-by: Keith Packard <keithp@keithp.com>
Reviewed-by: Michel Dänzer <michel.daenzer@amd.com>
commit e31564e1a21e73f4d20d6471da4fc7a9b63e4062
Author: Michel Dänzer <michel@daenzer.net>
Date: Thu Jul 31 08:35:13 2014 -0700
Check for dix-config.h or xorg-server.h before using X_BYTE_ORDER
Now that servermd.h depends on X_BYTE_ORDER being defined in
dix-config.h or xorg-server.h, check to make sure one of those has
been included before using the value.
Reviewed-by: Keith Packard <keithp@keithp.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 61afe950e6a1a640ad9c5368549914ea32b90d48
Author: Keith Packard <keithp@keithp.com>
Date: Mon Jul 21 19:27:20 2014 -0700
xfree86/modes: rotation damage is automatically destroyed on close
Don't try to destroy rotation_damage in the xf86RotateCloseScreen; it
will have been destroyed when the screen pixmap was destroyed.
Signed-off-by: Keith Packard <keithp@keithp.com>
Reviewed-by: Eric Anholt <eric@anholt.net>
commit 40dc81154ad38514793f2181447d597b57d39e80
Author: Keith Packard <keithp@keithp.com>
Date: Sun Jul 20 18:57:42 2014 -0700
present: Avoid crash at server shutdown
When a present flip operation is still in process during server reset,
the call to present_set_abort_flip may not happen until the screen is
being closed, at which point there is no root window to set pixmaps
for. Check to make sure there's a window before resetting window pixmaps.
Signed-off-by: Keith Packard <keithp@keithp.com>
Reviewed-by: Eric Anholt <eric@anholt.net>
commit 627bce80894647c681b146a709aad4c390b4374e
Author: Keith Packard <keithp@keithp.com>
Date: Sun Jul 20 18:53:52 2014 -0700
present: Make window MSC offset 0 initially
The MSC offset used by a window is adjusted as the window moves
between screens, and between shown/unshown. The value shouldn't
matter, but it's helpful for debugging to have window MSC values be
the same as the CRTC MSC at first.
This patch introduces a unique CRTC value so that Present can detect
the first time a window is a PresentPixmap destination and set the MSC
offset to zero, rather than using the fake MSC value as the previous
window MSC.
Signed-off-by: Keith Packard <keithp@keithp.com>
Reviewed-by: Eric Anholt <eric@anholt.net>
commit bd4198b01f2baf2284e61ea7ebf4600f554800e9
Author: Keith Packard <keithp@keithp.com>
Date: Fri Jul 18 11:19:01 2014 -0700
xfree86: Avoid compiler warning for unused vars without systemd
When systemd isn't being used, systemd_logind_release_fd is defined
as an empty macro, leaving the arguments unused. Fix the compiler
warnings by simply removing the local variables and referencing the
structure within the macro call.
Signed-off-by: Keith Packard <keithp@keithp.com>
Reviewed-by: Eric Anholt <eric@anholt.net>
commit b063a185ab9d2c54669fb6e036fdbae3707c9e4b
Author: David Ung <davidu@nvidia.com>
Date: Tue Jul 29 15:01:39 2014 -0700
randr: Fix logic in RRPointerToNearestCrtc
RRPointerToNearestCrtc is suppose to snap to the nearest Crtc,
but best_x and best_y is always positive, hence when calling
SetCursorPosition it will make the cursor even further away.
Correct delta x/y to allow negative values and also use
"width/height -1" in the calculation. Also choose the closest
Crtc by setting the "best" value.
Signed-off-by: David Ung <davidu@nvidia.com>
Reviewed-by: Keith Packard <keithp@keithp.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 90803042bcbb9dc6261b5d112acf5613829d9f70
Author: Keith Packard <keithp@keithp.com>
Date: Wed Jul 30 10:13:53 2014 -0700
Fix files including xorg-server.h by mistake
A few files in the server are including xorg-server.h, which is only
for use by Xorg server drivers. This fixes those errors and then adds
a check to make sure it doesn't happen again.
Signed-off-by: Keith Packard <keithp@keithp.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
commit a08e7a098aa37351294a25fe62b7ff6e95622e64
Author: Adam Jackson <ajax@redhat.com>
Date: Tue Jun 24 14:21:57 2014 -0400
dri1: Remove unused DRI{,Post}ValidateTree
i810, mga, savage, and tdfx do reference these slots, but only to set
them to NULL, so while this does have API impact it's not actually used.
Reviewed-by: Keith Packard <keithp@keithp.com>
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit 5486c834fa3eebd79a4811143e513d6a92b7e504
Author: Adam Jackson <ajax@redhat.com>
Date: Tue Jun 24 14:16:55 2014 -0400
xquartz: Remove unused DRI{,Post}ValidateTree
Cargo-culted from DRI1, not actually used for anything.
Reviewed-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
Reviewed-by: Keith Packard <keithp@keithp.com>
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit a5e7701058c676231d2bc3f9a0c7c0fa9da7ad45
Author: Adam Jackson <ajax@redhat.com>
Date: Wed May 28 14:48:14 2014 -0400
xkb: Remove some fascinating paranoia from event emission
XkbInterestPtrs are created by clients that already exist, meaning,
clients that have already had ProcVector installed as something other
than InitialProcVector.
Reviewed-by: Daniel Stone <daniel@fooishbar.org>
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit ac3af4bd21394291ef6dd9cfcdd8ce6fceefec40
Author: Adam Jackson <ajax@redhat.com>
Date: Tue Jun 17 12:58:41 2014 -0400
xfree86: Remove unused HardEdges
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit 4100687ea667970733c3aa69f704be0e3747f9fd
Author: Adam Jackson <ajax@redhat.com>
Date: Mon Jun 23 15:42:23 2014 -0400
xfree86: Remove useless #include "fb.h"
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit 2d451c5cdc7f81ea0c94c3542fab45027f829736
Author: Adam Jackson <ajax@redhat.com>
Date: Thu May 22 14:04:16 2014 -0400
xfree86: Remove pointless xf86RandRCreateScreenResources
Given the #if 0 this was wrapping for no effect.
Reviewed-by: Keith Packard <keithp@keithp.com>
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit a8cca7bd5ad7ea36a9585f4927ed53cfa6db1daf
Author: Adam Jackson <ajax@redhat.com>
Date: Fri May 2 11:43:14 2014 -0400
xfree86: Remove protectMem from VidMemInfo
Never filled in.
Reviewed-by: Keith Packard <keithp@keithp.com>
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit e4cf1e58f5745dd39a9dd5eb29acd1cb28710094
Author: Adam Jackson <ajax@redhat.com>
Date: Fri May 2 11:11:14 2014 -0400
xfree86: Remove unused xf86{Map,Unmap}LegacyIO
I ported these to pciaccess in:
commit 858fbbb40d7c69540cd1fb5315cebf811c6e7b3f
Author: Adam Jackson <ajax@redhat.com>
Date: Fri Sep 16 13:33:04 2011 -0400
pci: Port xf86MapLegacyIO to pciaccess
As of yet there are still no drivers using them, and there's not a lot
of value in having the wrappers when they just trivially call pciaccess
anyway. Nuke 'em.
Reviewed-by: Keith Packard <keithp@keithp.com>
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit 96206cf47752af3fc8ca14dc1e03c59ed482167f
Author: Adam Jackson <ajax@redhat.com>
Date: Tue Jul 8 13:19:08 2014 -0400
xfree86: Remove deprecated PCI types
Reviewed-by: Keith Packard <keithp@keithp.com>
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit 46fd5a28ef7191b5ad0244f849c756dd2c5f43b6
Author: Adam Jackson <ajax@redhat.com>
Date: Fri May 2 11:09:53 2014 -0400
xfree86: Remove some unused pre-pciaccess types
Reviewed-by: Keith Packard <keithp@keithp.com>
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit 3bb9f9862b5bea3720ba7922714af729cab38776
Author: Adam Jackson <ajax@redhat.com>
Date: Fri Feb 28 13:31:08 2014 -0500
xfree86: Remove xf86ConfigActivePciEntity
The giant OBSOLETE DO NOT USE comment has been there since 2000,
probably it's safe to nuke by now.
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit 51531a67179e342f6ad798de21accf014748a04f
Author: Adam Jackson <ajax@redhat.com>
Date: Tue Jun 10 13:10:28 2014 -0400
vgahw: Nuke unused vgaCmap.c
Never been built since m12n, can't be needed.
Reviewed-by: Keith Packard <keithp@keithp.com>
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit 2db71b232c4756773562182cadb7ccdf5194a62d
Author: Adam Jackson <ajax@redhat.com>
Date: Tue Jun 10 13:00:11 2014 -0400
saver: Don't open-code IsMapInstalled
Reviewed-by: Keith Packard <keithp@keithp.com>
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit dd0e8491f75afbd72bea17172a042aa45ff7e30b
Author: Adam Jackson <ajax@redhat.com>
Date: Fri Jun 20 12:36:10 2014 -0400
render: Remove unused CopyPicture
Arguably this would be useful API, but it's never called, and a careful
reading of the CPClipMask path reveals that callers would be fairly
disappointed.
Reviewed-by: Keith Packard <keithp@keithp.com>
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit 578026fcd58d12dd0be4c0976ee5ecf95a9d61f0
Author: Adam Jackson <ajax@redhat.com>
Date: Tue May 20 12:43:59 2014 -0400
os: Remove LocalClientCred
The comment lies, shm hasn't used this code since:
commit fdef7be5c8d5989e0aa453d0a5b86d0a6952e960
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Tue Oct 9 18:44:04 2007 -0700
Sun bug 6589829: include zoneid of shm segment in access [...]
Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit cad9b053d52f62432dfd70e42e0240de77027cae
Author: Adam Jackson <ajax@redhat.com>
Date: Tue Jul 8 13:24:25 2014 -0400
os: Remove deprecated malloc/free wrappers
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit d5b279977236c4f80a8ba81db1f81a314484facf
Author: Adam Jackson <ajax@redhat.com>
Date: Thu May 22 13:58:45 2014 -0400
miext/shadow: Remove shadowInit
This code is nonsensical. You end up creating a screen-sized pixmap
that's totally detached from everything else, which you then listen for
damage on, which means you'll never hear any damage, which means your
shadow update hooks will never get called. Any driver using this would
be sorely disappointed.
Reviewed-by: Keith Packard <keithp@keithp.com>
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit cf4793d99ecee4dfd6094e02b1ccb89eb744d313
Author: Adam Jackson <ajax@redhat.com>
Date: Fri Feb 28 15:36:31 2014 -0500
miext/shadow: Remove ancient backwards-compatibility hack
Here's a trip down memory lane. Back when we merged kdrive we adopted
kdrive's version of shadow, which used damage directly instead of
hand-rolling it. However a couple of Xorg drivers referred to the
accumulated damage region in the shadow private directly, so I added a
hack to copy the damage region around.
That was 9148d8700b7c5afc2644e5820c57c509378f93ce, back in early 2006.
Eight years is unusually patient for me. The neomagic and trident drivers
were still relying on this, but they've been modified to ask the damage
code for the region instead.
Reviewed-by: Keith Packard <keithp@keithp.com>
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit 35eabf2e5272e17e6765027d4baea43b34c66933
Author: Adam Jackson <ajax@redhat.com>
Date: Tue Jul 8 14:11:22 2014 -0400
mi: Remove apparently unused miSegregateChildren
This came in between XFree86 4.3 and 4.4, I'm not entirely sure what it
was meant to do.
Reviewed-by: Keith Packard <keithp@keithp.com>
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit 150acef3af9bb43cb60cbcc558ef3ad4a710e624
Author: Adam Jackson <ajax@redhat.com>
Date: Mon May 19 13:46:12 2014 -0400
kdrive: Remove some dead bits of the man page
Reviewed-by: Keith Packard <keithp@keithp.com>
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit 71ef49062ee33ac49033fbcd67bab88120882668
Author: Adam Jackson <ajax@redhat.com>
Date: Fri Feb 28 14:05:25 2014 -0500
dix: Make some LBX-era code more obvious
isItTimeToYield in the conditional effectively didn't do anything here.
Take it out, and remove the comment since LBX proxies aren't a thing for
us anymore.
Reviewed-by: Keith Packard <keithp@keithp.com>
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit a317e0a974c1597d55fe05a38b4a495c4e4e8d71
Author: Adam Jackson <ajax@redhat.com>
Date: Fri May 2 11:50:17 2014 -0400
bsd: Remove some reference arm code behind #if 0
git history is reference enough, thanks.
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit 8a60d1c3f4a62675cad005107f56413f946ecd77
Author: Keith Packard <keithp@keithp.com>
Date: Mon Jul 28 11:10:15 2014 -0700
glamor: Eliminate diagonal tearing in xv
This uses a single large triangle and a scissor to draw the video
instead of two triangles.
Signed-off-by: Keith Packard <keithp@keithp.com>
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
commit 29eaa61cb210e0c67004bc567af0c15d48aad626
Author: Adam Jackson <ajax@redhat.com>
Date: Tue Jul 22 11:05:32 2014 -0400
mi: Remove semi-arbitrary arch awareness in packed coordinate macros
The majority of arches end up on the right-shift path here. I can't
think of any arch where that'd be slower than a divide, and semantically
it makes more sense to think of this as a shift operation anyway.
Signed-off-by: Adam Jackson <ajax@redhat.com>
Reviewed-by: Keith Packard <keithp@keithp.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 6ddd164508f81e9582b66061b385bd34ac1ccb7e
Author: Adam Jackson <ajax@redhat.com>
Date: Tue Jul 22 10:59:13 2014 -0400
xfree86: Unify the ppc/sparc mmio-swap-or-not conditionals
Map SPARC_MMIO_IS_BE and PPC_MMIO_IS_BE to MMIO_IS_BE and use the same
macros for both since they're identical.
Reviewed-by: Julien Cristau <jcristau@debian.org>
Signed-off-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 8ffd1c066ab1e993d8964aef12a7c585329c677c
Author: Adam Jackson <ajax@redhat.com>
Date: Tue Jul 22 10:59:12 2014 -0400
xfree86: Clean up some silly __sparc macro usage
The top of this file already defines __sparc__ if __sparc is defined.
Reviewed-by: Julien Cristau <jcristau@debian.org>
Signed-off-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 1c1711b57f2c278c0df03bf9e7e9a1776a546968
Author: Adam Jackson <ajax@redhat.com>
Date: Tue Jul 22 10:59:11 2014 -0400
xfree86: Pull generic barrier() definition up to top level
And remove the redundant redecl from the nds32 section.
Reviewed-by: Julien Cristau <jcristau@debian.org>
Signed-off-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit c73929bbfc14ba80397c53ca98d3b503c807ae78
Author: Adam Jackson <ajax@redhat.com>
Date: Tue Jul 22 10:59:10 2014 -0400
xfree86: Remove MMIO_ONB* and friends
Non-barrier-emitting MMIO writes. They appear to be utterly unused,
burn it all down.
Reviewed-by: Julien Cristau <jcristau@debian.org>
Signed-off-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 9b33e31d4160dc484ee569740f883f4d34e10653
Author: Adam Jackson <ajax@redhat.com>
Date: Tue Jul 22 10:59:09 2014 -0400
xfree86: Clean up powerpc barrier decls
I think the externs are there for the non-gcc case? And maybe there was
some assembly code to implement that once? Whatever, at this point on
ppc the compiler is either gcc or willing to pretend. The macros below
the decls take care of the actual eieio so the externs can just go.
Also remove a comment that maybe made sense once upon a time.
Reviewed-by: Julien Cristau <jcristau@debian.org>
Signed-off-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit b5141a1fab4d45c1af62db8dc712deb9776668a9
Author: Adam Jackson <ajax@redhat.com>
Date: Tue Jul 22 10:59:08 2014 -0400
xfree86: Simplify a bunch of OS and arch conditionals
All of this is inside #ifdef __GNUC__, between that and configure.ac we
can assume there's a unixy thing under us. Given that there's no real
reason to limit the arch paths to particular OSes, so let's not.
The final #elif here, combined with the ones before it, effectively said
"if not (alpha amd64 sparc* mips* ppc* arm* nds32 m68k sh hppa s390 m32r)",
and as the comment above it hints, it's meant to cover i386 (and happens to
also cover itanic). Flip the conditional around to be sensible.
Reviewed-by: Julien Cristau <jcristau@debian.org>
Signed-off-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 6d3ba80f197b04b6e0814190cf5c678c786c14d6
Author: Adam Jackson <ajax@redhat.com>
Date: Tue Jul 22 10:59:07 2014 -0400
xfree86: Remove pre-2.6 Linux ppc support
2.6.0 was December 2003, you've had plenty of time to get your head in
the game.
Reviewed-by: Julien Cristau <jcristau@debian.org>
Signed-off-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit e242e82eba17414603c8806fffc9ecd235eebabb
Author: Adam Jackson <ajax@redhat.com>
Date: Tue Jul 22 10:59:06 2014 -0400
xfree86: Remove a useless !__SUNPRO_C guard
You can't tell from context here, but this is all inside #ifdef
__GNUC__, so this conditional can't do squat.
Reviewed-by: Julien Cristau <jcristau@debian.org>
Signed-off-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 93745a6c1afc830759219f8632ec565d83c7bc12
Author: Adam Jackson <ajax@redhat.com>
Date: Tue Jul 22 10:59:05 2014 -0400
xfree86: Undef GCCUSESGAS
Can't be needed, we've never defined it in modular xserver.
Reviewed-by: Julien Cristau <jcristau@debian.org>
Signed-off-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit b1d9bc8d1d828b0dedda46da98628b47915e6a04
Author: Adam Jackson <ajax@redhat.com>
Date: Tue Jul 22 10:59:04 2014 -0400
xfree86: Remove an unlikely bit of #pragma
__USLC__ appears to mean the SCO OpenServer compiler, which configure.ac
doesn't think is an OS the xfree86 ddx supports. The conditionals
surrounding these pragmas effectively mean "if not gcc and not Sun C",
and probably arbitrary pragmas aren't supported by arbitrary compilers.
Reviewed-by: Julien Cristau <jcristau@debian.org>
Signed-off-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit f7f9ccef1dc251a1b95ca698ac39bd0a47f0c8fa
Author: Adam Jackson <ajax@redhat.com>
Date: Tue Jul 22 10:59:03 2014 -0400
xfree86: Undef __HIGHC__
MetaWare High C++ compiler? xfree86 cvs history shows this being added
in a commit whose text is, classically, "updates". metaware.com
redirects to a 404 on synopsys.com, which to me indicates it's not super
important to them, and their order form won't even tell you how much the
thing costs. At any rate if this is worth worrying about it's worth
letting autoconf worry about for us.
Reviewed-by: Julien Cristau <jcristau@debian.org>
Signed-off-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 80446086b9cfcc5e23a400d7fa38ec773fae68fc
Author: Adam Jackson <ajax@redhat.com>
Date: Tue Jul 22 10:59:02 2014 -0400
xfree86: Undef FAKEIT
I guess this is meant to stub out all I/O port calls? Whatever, it's
not been defined by the buildsystem at least as far back as monolith
6.8.2.
Reviewed-by: Julien Cristau <jcristau@debian.org>
Signed-off-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 8002b1a8cb18ecc6526e8ebfd769767f8991ebd6
Author: Adam Jackson <ajax@redhat.com>
Date: Tue Jul 22 10:59:01 2014 -0400
xfree86: Remove a few random ppc decls
Whatever these are, they're not something grep can find, they must not
be used.
Reviewed-by: Julien Cristau <jcristau@debian.org>
Signed-off-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 5f5af5d6692b625f6231c8bca3ac801f2ac75717
Author: Adam Jackson <ajax@redhat.com>
Date: Tue Jul 22 10:59:00 2014 -0400
xfree86: Remove remaining unused unaligned accessors
Reviewed-by: Julien Cristau <jcristau@debian.org>
Signed-off-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit d28b788e11182d134bce5a414359841b37b62ac0
Author: Adam Jackson <ajax@redhat.com>
Date: Tue Jul 22 10:58:59 2014 -0400
xfree86: Move generic unaligned helpers into int10 code
This is the only place they're actually used (well, aside from some XAA
code in the s3 driver, but one s3 and 2 XAA).
Reviewed-by: Julien Cristau <jcristau@debian.org>
Signed-off-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 956a8d5c92a66ddd8d00e63a95b17cfd376fe424
Author: Adam Jackson <ajax@redhat.com>
Date: Tue Jul 22 10:58:58 2014 -0400
xfree86: Remove unused unaligned int64 helpers
Reviewed-by: Julien Cristau <jcristau@debian.org>
Signed-off-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit da2b2671863655776d60102ddc7af61470d14022
Author: Adam Jackson <ajax@redhat.com>
Date: Tue Jul 22 10:58:57 2014 -0400
xfree86: Unspecialize gcc variants of unaligned memory access
Yes yes, very clever, memmove works fine on gcc too, let's just do the
portable thing since none of this is performance code.
Reviewed-by: Julien Cristau <jcristau@debian.org>
Signed-off-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit e03c902e03dea7a6a98ad5fb00580b9404b67c4d
Author: Adam Jackson <ajax@redhat.com>
Date: Tue Jul 22 10:58:56 2014 -0400
xfree86: Undefine NO_INLINE
Nothing in the server defines this, nor do any drivers.
Reviewed-by: Julien Cristau <jcristau@debian.org>
Signed-off-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit f63b8e44ab278dd65be93146790bf150717fc1c8
Author: Adam Jackson <ajax@redhat.com>
Date: Tue Jul 22 10:58:55 2014 -0400
xfree86: Remove MMIO_MOVE32
Only used by mach64's XAA code, which isn't built if XAA isn't
available, and it isn't.
Reviewed-by: Julien Cristau <jcristau@debian.org>
Signed-off-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 1100935650cc0032709d095d6d5a5f136bec99b9
Author: Adam Jackson <ajax@redhat.com>
Date: Tue Jul 22 10:58:54 2014 -0400
xfree86: Remove nds32_flush_icache
I guess this might have been needed for elfloader, except we didn't
support nds32 back then, so I assume this was cargo-culted from
ppc_flush_icache, which is also dead now.
Reviewed-by: Julien Cristau <jcristau@debian.org>
Signed-off-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit eb76228080da6fb28c34c903a9854aebe157d2c7
Author: Adam Jackson <ajax@redhat.com>
Date: Tue Jul 22 10:58:53 2014 -0400
xfree86: Remove #include "compiler.h" from places that don't need it
Reviewed-by: Julien Cristau <jcristau@debian.org>
Signed-off-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 4afedf545b673282f2e214c0e2c759c9be9b9a2a
Author: Ross Burton <ross.burton@intel.com>
Date: Wed Jul 9 11:33:23 2014 +0100
configure.ac: add option for xshmfence
xshmfence is usable outside of DRI3, and is currently autodetected which isn't
good for distributions where deterministic builds are desired.
Signed-off-by: Ross Burton <ross.burton@intel.com>
Reviewed-by: Matt Turner <mattst88@gmail.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 2172714c67d8701aa54c202e89f246f1dddac80a
Author: Carlos Garnacho <carlosg@gnome.org>
Date: Tue Jul 22 17:55:25 2014 +0200
xwayland: Only disable/enable devices on capabilities change
Anytime a capability is first reported, the device is created, but after
that, it is only disabled/enabled.
This is a closer behavior to what Xorg does on VT switch, at the expense
of maybe leaving a dangling "physical" device if a capability goes for good.
Otherwise, any DeviceIntPtr (re)created after server initialization will be
left floating, and bad things happen when the wayland enter event handler
tries to update cursor position based on a floating device.
Signed-off-by: Carlos Garnacho <carlosg@gnome.org>
Reviewed-by: Daniel Stone <daniel@fooishbar.org>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 556cdf8fe870bc23e0393c0eed15c86f49a0b9f8
Merge: 83701c4ee8 1faa766705
Author: Keith Packard <keithp@keithp.com>
Date: Thu Jul 24 16:51:00 2014 -0700
Merge remote-tracking branch 'jeremyhu/master'
commit 83701c4ee8f79f69f4286ef262cd3ae3922629b9
Author: Adam Jackson <ajax@redhat.com>
Date: Mon Jul 21 10:21:07 2014 -0400
xfree86: Remove i2c multimedia modules
These came in with the GATOS merge I think. The only driver using them
was radeon, and then only in UMS mode. The radeon driver dropped UMS
support from the main branch about two years ago, the UMS branch hasn't
been touched in about fifteen months, and does not build against 1.16 in
any case, so this is all dead code.
Signed-off-by: Adam Jackson <ajax@redhat.com>
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
Reviewed-by: Daniel Stone <daniels@collabora.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 4302484ef2e67b2e05756c7ee0834dce938f1b44
Author: Adam Jackson <ajax@redhat.com>
Date: Mon Jul 21 10:06:53 2014 -0400
dix: Remove arch awareness from servermd.h (v2)
At this point we have no architectures where image byte order is
different from bitmap bit order, or where either of those two are not
also the native word endianness. Hooray, one more place where we don't
have to worry about enabling new CPU architectures.
v2: Rebase to master to handle the addition of ppc64le, arc, and xtensa,
and use autoconf's endianness detection instead of gcc predefines.
Signed-off-by: Adam Jackson <ajax@redhat.com>
Reviewed-by: Daniel Stone <daniels@collabora.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 860cd209679a2e56460977882b3b3826ddcb8710
Author: Adam Jackson <ajax@redhat.com>
Date: Mon Jul 21 10:06:52 2014 -0400
dix: Remove a weird case of little-endian s390
I really don't think this was ever correct, but I'm also not sure what
non-Linux Unix this was meant to enable. The only one I know of was
OS/390 / z/OS / OpenEdition, but I think that was big-endian too.
At any rate this is all about to go away, so this is just removing an
edge case.
Signed-off-by: Adam Jackson <ajax@redhat.com>
Reviewed-by: Daniel Stone <daniels@collabora.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit f593d76de76a645e29af5dd457ad1fd5a30736cc
Author: Adam Jackson <ajax@redhat.com>
Date: Mon Jul 21 10:06:51 2014 -0400
dix: Remove wacky sparc special casing (v2)
This appears to be defining sparc if ever __sparc or __sparc__ were
defined, which is almost reasonable, but these days we want to be using
the __arch__ style. Why any of this would ever be triggered on m68k is
truly a mystery for the ages.
v2: Fix commit message, as noted by nix
Signed-off-by: Adam Jackson <ajax@redhat.com>
Reviewed-by: Daniel Stone <daniels@collabora.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 17c3347f14822b9f7da4253c71f6ed51be2b38d1
Author: Adam Jackson <ajax@redhat.com>
Date: Mon Jul 21 10:06:50 2014 -0400
dix: Default GLYPHPADBYTES to 4
This effectively no longer varied across architectures anyway.
Signed-off-by: Adam Jackson <ajax@redhat.com>
Reviewed-by: Daniel Stone <daniels@collabora.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 094b76735cb99b9f26e21f32170614454c644653
Author: Adam Jackson <ajax@redhat.com>
Date: Mon Jul 21 10:06:49 2014 -0400
dix: Remove some cfb leftovers
These macros meant something in cfb, but not in fb.
Signed-off-by: Adam Jackson <ajax@redhat.com>
Reviewed-by: Daniel Stone <daniels@collabora.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit fee9a1536651ace9324b956df809ef22a63938f8
Author: Adam Jackson <ajax@redhat.com>
Date: Mon Jul 21 10:06:48 2014 -0400
dix: Remove some dead macros
Signed-off-by: Adam Jackson <ajax@redhat.com>
Reviewed-by: Daniel Stone <daniels@collabora.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 634aa310c5130ef4d38f339bb26b01b5a7bad4e9
Author: Adam Jackson <ajax@redhat.com>
Date: Mon Jul 21 10:06:47 2014 -0400
dix: (Don't) change BITMAP_SCANLINE_UNIT on Linux s390{, x}
Every other architecture sets this to 32, and I can't think of any
benefit s390 would derive from changing it. It is, at any rate,
something the client already copes with, and the only internal code
impact seems to be some complicated math in miGetPlane, which you never
hit if you're using fb.
Signed-off-by: Adam Jackson <ajax@redhat.com>
Reviewed-by: Daniel Stone <daniels@collabora.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit f6469f1910c72add358b7263d69bd116b4450ece
Author: Adam Jackson <ajax@redhat.com>
Date: Mon Jul 21 10:06:46 2014 -0400
dix: Remove some XFree86 3.x leftovers
Signed-off-by: Adam Jackson <ajax@redhat.com>
Reviewed-by: Daniel Stone <daniels@collabora.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 5aaacb501ff26bad391664cc7367bfe5164f72c7
Author: Adam Jackson <ajax@redhat.com>
Date: Mon Jul 21 10:06:45 2014 -0400
dix: Remove an ancient IBM configuration
Whatever unix this was meant to be is either no longer in circulation,
or is AIX, which we don't claim to support anyway.
Signed-off-by: Adam Jackson <ajax@redhat.com>
Reviewed-by: Daniel Stone <daniels@collabora.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 06268a0c55b7ce2737bdaa39f11cce07efa8bfa3
Author: Aaron Plattner <aplattner@nvidia.com>
Date: Sat Jul 19 09:59:07 2014 -0700
xfree86: Remove stale /usr/share/X11/xorg.conf.d hard-code from the xorg.conf man page
I forgot that the old behavior of searching in /usr/share/X11/xorg.conf.d was
documented in the man page.
Signed-off-by: Aaron Plattner <aplattner@nvidia.com>
Fixes: acc0b5edd1dc ("xfree86: Only support one sysconfigdir")
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 1faa76670572e3478965fd2cd9ab60ab2d865e3a
Author: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
Date: Sat Jul 19 17:08:09 2014 -0700
mieq: Fix a crash regression in mieqProcessDeviceEvent
(lldb) bt
* thread #6: tid = 0x92d4eb, 0x00000001001dee94 X11.bin`mieqProcessDeviceEvent(dev=0x0000000000000000, event=0x0000000100298bb0,
screen=0x0000000000000000) + 36 at mieq.c:519, stop reason = EXC_BAD_ACCESS (code=1, address=0x44)
* frame #0: 0x00000001001dee94 X11.bin`mieqProcessDeviceEvent(dev=0x0000000000000000, event=0x0000000100298bb0, screen=0x0000000000000000) + 36 at
mieq.c:519
frame #1: 0x00000001001df3eb X11.bin`mieqProcessInputEvents + 555 at mieq.c:631
frame #2: 0x0000000100017674 X11.bin`ProcessInputEvents + 20 at darwinEvents.c:422
frame #3: 0x0000000100175eaa X11.bin`Dispatch + 154 at dispatch.c:357
frame #4: 0x0000000100181b4a X11.bin`dix_main(argc=4, argv=0x00007fff5fbff750, envp=0x00007fff5fbff650) + 1594 at main.c:296
frame #5: 0x000000010001ba80 X11.bin`server_thread(arg=0x0000000101208220) + 64 at quartzStartup.c:66
frame #6: 0x00007fff89bb9899 libsystem_pthread.dylib`_pthread_body + 138
frame #7: 0x00007fff89bb972a libsystem_pthread.dylib`_pthread_start + 137
frame #8: 0x00007fff89bbdfc9 libsystem_pthread.dylib`thread_start + 13
Regression from: 9fb08310b51b46736f3ca8dbc04efdf502420403
Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
commit cff12936275db2f71f6d24f9ea0985a0d14af454
Author: Keith Packard <keithp@keithp.com>
Date: Fri Jul 18 21:46:23 2014 -0700
glamor: sync_fence_set_triggered should use glFlush, not glFinish
I intended to use glFlush all along, but somehow managed to type
glFinish instead. glFlush is sufficient (for a single-queue GPU) to
ensure serialization between queued rendering in the X server and
future rendering from the client.
Signed-off-by: Keith Packard <keithp@keithp.com>
Reviewed-by: Jasper St. Pierre <jstpierre@mecheye.net>
commit cfa302d6224d10860e60491333950544c4fb9b04
Author: Keith Packard <keithp@keithp.com>
Date: Fri Jul 18 11:16:27 2014 -0700
glamor: Add support for SHM sync fences
This hooks up SHM sync fences to complete the requirements for DRI3
running on Glamor.
Signed-off-by: Keith Packard <keithp@keithp.com>
Reviewed-by: Eric Anholt <eric@anholt.net>
commit ac3acab1311c47cc73e2681e575f0407284c3c66
Author: Colin Walters <walters@verbum.org>
Date: Fri Jul 18 09:13:54 2014 -0400
xf86platformBus: Add assertion to avoid (fatal) compiler warning
Compilation of -video-intel started failing in gnome-continuous,
it's because xserver has -Werror=return-type on, and gcc can't
prove this function always returns a value:
/usr/include/xorg/xf86platformBus.h:119:1: error: control reaches end of non-void function [-Werror=return-type]
Let's add assertions to the accessor functions to fix this.
Reviewed-by: Keith Packard <keithp@keithp.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 5c2e9fa3d6c4bdf626fededce866056ba8eca502
Merge: e678b4971b 6d49548849
Author: Keith Packard <keithp@keithp.com>
Date: Thu Jul 17 20:06:21 2014 -0700
Merge remote-tracking branch 'anholt/glamor-next'
commit 6d4954884908ea9894fcfe9836db1ba7bb45be61
Merge: 9ddcb20f47 55f5bfb578
Author: Eric Anholt <eric@anholt.net>
Date: Thu Jul 17 18:00:44 2014 -0700
Merge remote-tracking branch 'origin/master' into glamor-next
I've done this merge manually to resolve the minor conflict in glamor.c.
Signed-off-by: Eric Anholt <eric@anholt.net>
commit 9ddcb20f47b5e199989c8990512b0bca1354af86
Author: Eric Anholt <eric@anholt.net>
Date: Mon Jun 16 07:24:09 2014 +0100
glamor: Drop the "are we doing a series of blits or draws" logic.
It's unused since keithp's copy acceleration code completely replaced
glamor_copyarea.c and removed the blit path.
Signed-off-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Keith Packard <keithp@keithp.com>
commit b03a581d8cbe3f29140935063b865285e2a00333
Author: Eric Anholt <eric@anholt.net>
Date: Mon Jun 16 07:15:58 2014 +0100
glamor: Remove a dead prototype.
The corresponding code was deleted in
2ff41008494e6c5909c058f1f80b4f66617dada1 (2012)
Signed-off-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Keith Packard <keithp@keithp.com>
commit b5f94df319469ad44b0e88374a0d389414803f7a
Author: Eric Anholt <eric@anholt.net>
Date: Mon Jun 16 07:06:30 2014 +0100
glamor: Drop dead glamor_restore_pixmap_to_texture().
Unused since the glamor_prepare.c replacement of glamor_finish_access().
Signed-off-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Keith Packard <keithp@keithp.com>
commit 98155bd9d9b2a15a4dbcf80b2b57a7636efb14da
Author: Eric Anholt <eric@anholt.net>
Date: Mon Jun 16 07:01:28 2014 +0100
glamor: Drop dead glamor_download_pixmap_to_cpu()
Signed-off-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Keith Packard <keithp@keithp.com>
commit b6181007de357da58125e022992f165b10eda65d
Author: Eric Anholt <eric@anholt.net>
Date: Mon Jun 16 07:04:01 2014 +0100
glamor: Drop dead get/pub sub pixmap functions.
These were replaced by the new glamor_prepare.c code.
Signed-off-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Keith Packard <keithp@keithp.com>
commit e310387f443b6333edf02c8980daa303505382b4
Author: Eric Anholt <eric@anholt.net>
Date: Sun Jan 12 10:19:10 2014 -0800
glamor: Remove always-true yInverted flag.
All users of glamor had the same value set, and it complicated things
for no reason.
Signed-off-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Keith Packard <keithp@keithp.com>
commit d71ecbb458c15fda608654b78d99683ebeab3c60
Author: Eric Anholt <eric@anholt.net>
Date: Sun Apr 6 07:22:26 2014 -0700
glamor: Drop constant arguments to glamor_solid().
After keithp's change to drop the old glamor_fill() code, nothing ever
changed these values.
Signed-off-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Keith Packard <keithp@keithp.com>
commit db9bff5c389f96991df8d6c62df1174e62e937d3
Author: Eric Anholt <eric@anholt.net>
Date: Wed Apr 2 12:09:47 2014 -0700
glamor: Drop unnecessary glTexParameteri() in upload of texture data.
We're not drawing, and we're not initially setting up the texture for
later drawing.
Signed-off-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Keith Packard <keithp@keithp.com>
commit 1140a89d7762540965ff865d154cb0528049066f
Author: Eric Anholt <eric@anholt.net>
Date: Wed Apr 2 12:12:06 2014 -0700
glamor: Use MIN/MAX macros to clean up glamor_transfer.c
Signed-off-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Keith Packard <keithp@keithp.com>
commit 2ab0fba9df695f19f0b43321d01395736f865c69
Author: Eric Anholt <eric@anholt.net>
Date: Wed Apr 2 13:41:09 2014 -0700
glamor: Drop unnecessary glTexParameteri() in SetSpans().
If this path needed the filters set, so would all the other
glDrawArrays() callers. But they don't.
Signed-off-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Keith Packard <keithp@keithp.com>
commit e678b4971b666e65a99c141e0a5f33969aa701b7
Author: Keith Packard <keithp@keithp.com>
Date: Tue Jul 15 17:31:59 2014 -0700
xfree86: Provide backward-compatibilty API for OdevAttributes
This allows drivers to compile using the old OdevAttributes API
against a new server. It generates compiler errors if the caller uses
the wrong or undefined attribute types, or if the caller provides an
incorrect default value for an integer attribute.
Signed-off-by: Keith Packard <keithp@keithp.com>
Reviewed-by: Hans de Goede <hdegoede@redhat.com>
commit 60c05ce1ab5d9dc7c034b6b3723f43a42ea637d8
Author: Keith Packard <keithp@keithp.com>
Date: Tue Jul 15 17:31:58 2014 -0700
config: Replace OdevAttributes linked list with struct
OdevAttributes are a fixed set of values with known types; instead of
storing them in a linked list and requiring accessor/settor functions,
replace the list header, struct OdevAttributes, with a struct that
directly contains the values. This provides for compile-time
typechecking of the values, eliminates a significant amount of code
and generally simplifies using this datatype.
Signed-off-by: Keith Packard <keithp@keithp.com>
Reviewed-by: Hans de Goede <hdegoede@redhat.com>
commit 55f5bfb578e934319d1308cbb56c900c5ac7cfa7
Author: Keith Packard <keithp@keithp.com>
Date: Wed Jul 16 16:03:23 2014 -0700
glamor: Fix temp picture coordinates in glamor_composite_clipped_region
To understand this patch, let's start at the protocol interface where
the relationship between the coordinate spaces is documented:
static Bool
_glamor_composite(CARD8 op,
PicturePtr source,
PicturePtr mask,
PicturePtr dest,
INT16 x_source,
INT16 y_source,
INT16 x_mask,
INT16 y_mask,
INT16 x_dest, INT16 y_dest,
CARD16 width, CARD16 height, Bool fallback)
The coordinates are passed to this function directly off the wire and
are all relative to their respective drawables. For Windows, this means
that they are relative to the upper left corner of the window, in
whatever pixmap that window is getting drawn to.
_glamor_composite calls miComputeCompositeRegion to construct a clipped
region to actually render to. In reality, miComputeCompositeRegion clips
only to the destination these days; source clip region based clipping
would have to respect the transform, which isn't really possible. The
returned region is relative to the screen in which dest lives; offset by
dest->drawable.x and dest->drawable.y.
What is important to realize here is that, because of clipping, the
composite region may not have the same position within the destination
drawable as x_dest, y_dest. The protocol coordinates now exist solely to
'pin' the three objects together.
extents->x1,y1 Screen origin of clipped operation
width,height Extents of the clipped operation
x_dest,y_dest Unclipped destination-relative operation coordinate
x_source,y_source Unclipped source-relative operation coordinate
x_mask,y_mask Unclipped mask-relative operation coordinate
One thing we want to know is what the offset is from the original
operation origin to the clipped origin
Destination drawable relative coordinates of the clipped operation:
x_dest_clipped = extents->x1 - dest->drawable.x
y_dest_clipped = extents->y1 - dest->drawable.y
Offset from the original operation origin:
x_off_clipped = x_dest_clipped - x_dest
y_off_clipped = y_dest_clipped - y_dest
Source drawable relative coordinates of the clipped operation:
x_source_clipped = x_source + x_off_clipped;
y_source_clipped = y_source + y_off_clipped;
Mask drawable relative coordinates of the clipped operation:
x_mask_clipped = x_source + x_off_clipped;
y_mask_clipped = y_source + y_off_clipped;
This is where the original code fails -- it doesn't subtract the
destination drawable location when computing the distance that the
operation has been moved by clipping. Here's what it does when
constructing a temporary source picture:
temp_src =
glamor_convert_gradient_picture(screen, source,
extent->x1 + x_source - x_dest,
extent->y1 + y_source - y_dest,
width, height);
...
x_temp_src = -extent->x1 + x_dest;
y_temp_src = -extent->y1 + y_dest;
glamor_convert_gradient_picture needs source drawable relative
coordinates, but that is not what it's getting; it's getting
screen-relative coordinates for the destination, adjusted by the
distance between the provided source and destination operation
coordinates. We want x_source_clipped and y_source_clipped:
x_source_clipped = x_source + x_off_clipped
= x_source + x_dest_clipped - x_dest
= x_source + extents->x1 - dest->drawable.x - x_dest
x_temp_src/y_temp_src are supposed to be the coordinates of the original
operation translated to the temporary picture:
x_temp_src = x_source - x_source_clipped;
y_temp_src = y_source - y_source_clipped;
Note that x_source_clipped/y_source_clipped will never be less than
x_source/y_source because all we're doing is clipping. This means that
x_temp_src/y_temp_src will always be non-positive; the original source
coordinate can never be strictly *inside* the temporary image or we
could have made the temporary image smaller.
x_temp_src = x_source - x_source_clipped
= x_source - (x_source + x_off_clipped)
= -x_off_clipped
= x_dest - x_dest_clipped
= x_dest - (extents->x1 - dest->drawable.x)
Again, this is off by the destination origin within the screen
coordinate space.
The code should look like:
temp_src =
glamor_convert_gradient_picture(screen, source,
extent->x1 + x_source - x_dest - dest->pDrawable->x,
extent->y1 + y_source - y_dest - dest->pDrawable->y,
width, height);
x_temp_src = -extent->x1 + x_dest + dest->pDrawable->x;
y_temp_src = -extent->y1 + y_dest + dest->pDrawable->y;
Signed-off-by: Keith Packard <keithp@keithp.com>
Reviewed-by: Markus Wick <markus@selfnet.de>
commit 16fbad3c7a22d2fb33549bcd422de985a60982b8
Author: Keith Packard <keithp@keithp.com>
Date: Thu Jul 17 16:17:53 2014 -0700
Post 1.16 version bump to 1.16.99.1
And we're off towards 1.17; this version bump serves to keep
development versions distinct from stable versions.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit bfa5c73a36230f77fb211f185152212541c9d56d
Author: Keith Packard <keithp@keithp.com>
Date: Wed Jun 4 22:00:45 2014 -0700
ephyr: Free damage structure at server reset time
The usual mechanism for freeing a damage structure when the pixmap is
destroyed does not work for the screen pixmap as it isn't freed in the
normal way.
The existing driver cleanup function, scrfini, is called after the
wrapped CloseScreen functions, including damageCloseScreen, are called
and thus ephyr can't free the damage structure at that point.
Deal with this by providing an early CloseScreen hook in KdCloseScreen
which ephyr can use to free the damage structure before damage itself
shuts down.
Signed-off-by: Keith Packard <keithp@keithp.com>
Reviewed-by: Jamey Sharp <jamey@minilop.net>
commit 3319e7041ff89bb01b16a1dbbac85e28b1976ae3
Author: Keith Packard <keithp@keithp.com>
Date: Fri Apr 18 14:24:29 2014 -0700
hw/xfree86: Let xf86Rotate leave the BlockHandler unwrapped when possible
When no shadow frame buffer is needed, the rotate block handler
doesn't need to be called any more. Remove it from the chain.
Signed-off-by: Keith Packard <keithp@keithp.com>
Reviewed-by: Eric Anholt <eric@anholt.net>
commit 79a2733005202af43821d8fd8e4c9fb77bf8f69e
Author: Keith Packard <keithp@keithp.com>
Date: Fri Apr 18 14:11:17 2014 -0700
hw/xfree86: Fix VGA arbiter screen proc wrapping
Change the screen proc epilog code to re-fetch the current screen
function in case a nested proc changes how things work. This isn't a
problem with the current code as all of the wrapping layers that are
set up at server init time (like the VGA arbiter) leave themselves in
the screen proc chain forever. But, this makes the code conform with
the expected norms.
Signed-off-by: Keith Packard <keithp@keithp.com>
Reviewed-by: Eric Anholt <eric@anholt.net>
commit a1189fe322724ab1b524aaad5b700287777252bd
Author: Keith Packard <keithp@keithp.com>
Date: Fri Apr 18 13:57:55 2014 -0700
mi: Fix block handler wrapping in miSprite
miSpriteBlockHandler was leaving the BlockHandler wrapped until just
before calling any nested block handler. If any code executed before
that added or removed block handlers, the wrapping chain would have
been broken.
Signed-off-by: Keith Packard <keithp@keithp.com>
Reviewed-by: Eric Anholt <eric@anholt.net>
commit 08fc33042c858568e7244eb9ad25a8d0270754f0
Author: Keith Packard <keithp@keithp.com>
Date: Fri Apr 18 13:55:50 2014 -0700
hw/xfree86: Fix block handler wrapping in xf86Rotate
xf86Rotate, it was delaying unwrapping the BlockHandler until after
calling xf86RotateRedisplay. If there was a software cursor on the
screen, the redisplay operation would cause cursor to be removed from
the frame buffer and the misprite block handler to be inserted into
the block handler chain with the misprite screen private saved block
handler now set to xf86RotateBlockHandler.
When xf86RotateRedisplay returned, xf86RotateBlockHandler would then
set screen->BlockHandler to its saved value, call down and then reset
screen->BlockHandler to xf86RotateBlockHandler. miSpriteBlockHandler
would never be called after that, which meant that the software cursor
will now disappear from the screen whenever rendering overlapped and
would only reappear when the cursor was moved.
To correct this, all that is needed is to move the restoration of
screen->BlockHandler to the top of xf86RotateBlockHandler, before the
call to xf86RotateRedisplay.
Signed-off-by: Keith Packard <keithp@keithp.com>
Reviewed-by: Eric Anholt <eric@anholt.net>
commit c75fee79ace394f6f51aa6fdda1c0436eb8a2026
Author: Keith Packard <keithp@keithp.com>
Date: Fri Apr 18 13:54:11 2014 -0700
Document how to correctly wrap screen procedures
This adds a large comment to include/scrnintstr.h which should serve
to document the correct way to wrap any screen procedure, with a
particular focus on how to dynamically add/remove wrapping layers
while the server is running.
Signed-off-by: Keith Packard <keithp@keithp.com>
Reviewed-by: Eric Anholt <eric@anholt.net>
commit 5eb77697ea35e7dc8cb8af2c3b5d8ffdba0fb632
Author: Peter Harris <pharris@opentext.com>
Date: Mon Mar 10 18:31:33 2014 -0400
Avoid starting a comment with */*
Even though -Wcomment doesn't mind it (in gcc or clang), the appearance
of */* confuses the syntax highlighter of some editors (eg. vim), and
causes warnings in MSVC.
Signed-off-by: Peter Harris <pharris@opentext.com>
Reviewed-by: Keith Packard <keithp@keithp.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 8b36e1ec8dd9f53e9f4e10422c2100844e9e549c
Author: Keith Packard <keithp@keithp.com>
Date: Thu Jul 17 00:03:33 2014 -0700
Update to version 1.16.0
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 4dbb641bb2d4037f107b58b31e80963dc8b72c0e
Author: Hans de Goede <hdegoede@redhat.com>
Date: Mon Jul 14 14:01:47 2014 +0200
config_odev_add_attribute*: Check for right attribute type
Don't allow setting string attributes to integers and vice versa.
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Reviewed-by: Keith Packard <keithp@keithp.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 25eca7ce35973577c8d85704c270f7fb53e6732e
Author: Hans de Goede <hdegoede@redhat.com>
Date: Mon Jul 14 14:01:46 2014 +0200
Fix ODEV_ATTRIB_DRIVER overlapping with ODEV_ATTRIB_FD
Looks like the value of ODEV_ATTRIB_DRIVER was not updated when the patch
adding it got rebased on top of a newer server version.
This fixes the xserver crashing when systemd-logind integration is used.
https://bugzilla.redhat.com/show_bug.cgi?id=1118540
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Reviewed-by: Keith Packard <keithp@keithp.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 9a19bf06b5b409fa0d5b5932e29cd4c5545052c5
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Mon Jul 14 15:05:58 2014 +1000
Revert "dix: fix up coordinate scaling when external monitors are present"
This reverts commit d90b5f83010248be65b2039b0b2d0b9e6a4e93cf.
Reverting for two reasons:
* the scaling does not work on devices that don't advertise resolution, and
the default resolution used (100 units/mm) is higher than most devices,
resulting in a significant slowdown of the touchpads.
* the scaling is still affected by resolution changing. The patch worked
before acceleration but since it maps into resolution-dependent dx/dy
coordinates the acceleration may distort the movement after the fact. So the
same input data generates different movements depending on the resolution.
This can't easily be fixed for all affected devices as synaptics has its own
velocity calculation method whereas wacom doesn't. So anything in the server
won't work for both at the same time.
Revert this for now, until a more integrated solution can be implemented.
commit acc0b5edd1dc560b5c39dc44872b46581ec23903
Author: Aaron Plattner <aplattner@nvidia.com>
Date: Fri Jul 11 15:56:35 2014 -0700
xfree86: Only support one sysconfigdir
When the X server is compiled with --prefix set to something other than /usr,
then it ends up with a nonstandard sysconfigdir in its .pc file. This causes
various other components to install their xorg.conf.d snippets there.
However, the X server first looks for /usr/share/X11/xorg.conf.d before looking
in sysconfigdir. That means that if the system administrator installed anything
that created that path, the user's custom sysconfigdir is not searched.
Rather than doing that, just look in the configured sysconfdir and nowhere else.
Signed-off-by: Aaron Plattner <aplattner@nvidia.com>
Reviewed-by: Julien Cristau <jcristau@debian.org>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 578b9283bcc129d0a35fabe2637c7622085ef1e8
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu Jul 10 10:39:50 2014 +1000
xfree86: don't force the screensaver off on DPMS unblank, merely suggest it
Commit 41d4beb2616ceb3f1a1b8694733e85bae70de59a added symmetry to the
screensaver/DPMS invocations so that one (en|dis)ables the other. Having
dependencies between DPMS and the screensaver is subject to further arguments,
but in this particular case using SCREENSAVER_FORCER is detrimental.
SCREENSAVER_FORCER(ScreenSaverReset) resets the idle time for all
devices on DPMS unblank.
It prevents at least one use-case that GNOME tries to implement:
GNOME displays a notification before suspending. If the display is
currently blanked, GNOME lights it up to display the message. With the
original patch in place DPMS unblank also resets the device idle times, thus
restarting the timeout ad infinitum.
Switch this to a more suggestive SCREENSAVER_OFF(ScreenSaverReset). This keeps
the symmetry in blanking mode (DPMS and screensaver turn each other on/off as
expected) but does not reset the idle time on the devices.
https://bugzilla.gnome.org/show_bug.cgi?id=731241
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Hans de Goede <hdegoede@redhat.com>
Reviewed-By: Egbert Eich <eich@freedesktop.org>
commit daa1a9d22db8e83d1933d8403acf72626199ee2a
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Mon Jul 7 08:27:44 2014 +1000
os: prevent negative array index access (#80890)
If an empty string is provided to LogMessageVerbSigSafe, the length of the
printed string is 0.
Read-only access only and the only effect it had was adding a linebreak or not.
X.Org Bug 80890 <http://bugs.freedesktop.org/show_bug.cgi?id=80890>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 9de3cc8daa4c6e877d30a0e8ccfe0cc159f1dbe3
Merge: 9308eafb7d a5499870e2
Author: Keith Packard <keithp@keithp.com>
Date: Mon Jul 7 16:53:07 2014 -0700
Merge remote-tracking branch 'jturney/master'
commit 9308eafb7d303739b81634ed2ee0da88554fd429
Author: Keith Packard <keithp@keithp.com>
Date: Mon Jul 7 16:28:26 2014 -0700
Update to version 1.15.99.904
One more RC to get the non-PCI patches tested before release
Signed-off-by: Keith Packard <keithp@keithp.com>
commit b6cc489838dca0bcec7e9dbb4663b871e8cb7bc8
Author: Thierry Reding <treding@nvidia.com>
Date: Thu Feb 13 21:09:49 2014 +0100
xfree86: Make error message more readable
While at it also replace a tab by four spaces for consistency.
Reviewed-by: Aaron Plattner <aplattner@nvidia.com>
Tested-By: Aaron Plattner <aplattner@nvidia.com>
Signed-off-by: Thierry Reding <treding@nvidia.com>
Reviewed-by: Rob Clark <robdclark@gmail.com>
Tested-by: Rob Clark <robdclark@gmail.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit eeefecd9df88920d4dca4100a84a135f7f53dd82
Author: Thierry Reding <treding@nvidia.com>
Date: Thu Feb 13 13:54:23 2014 +0100
xfree86: Support driver loading via OutputClass
Use the OutputClass configuration to determine what drivers to autoload
for a given device.
Reviewed-by: Aaron Plattner <aplattner@nvidia.com>
Tested-By: Aaron Plattner <aplattner@nvidia.com>
Signed-off-by: Thierry Reding <treding@nvidia.com>
Tested-by: Rob Clark <robdclark@gmail.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit a270bb18baa6e3b45fa4a105a8d2be51ac5270bc
Author: Thierry Reding <treding@nvidia.com>
Date: Thu Feb 13 13:42:05 2014 +0100
xfree86: Introduce OutputClass configuration
The OutputClass section provides a way to match output devices to a set
of given attributes and configure them. For now, only matching by kernel
driver name is supported. This can be used to determine what DDX module
to load for non-PCI output devices. DDX modules can ship an xorg.conf.d
snippet (e.g. in /usr/share/X11/xorg.conf.d) that looks like this:
Section "OutputClass"
Identifer "NVIDIA Tegra open-source driver"
MatchDriver "tegra"
Driver "opentegra"
EndSection
This will cause any device that's driven by the kernel driver named
"tegra" to use the "opentegra" DDX module.
See the OUTPUTCLASS section in xorg.conf(5) for more details.
Reviewed-by: Aaron Plattner <aplattner@nvidia.com>
Tested-By: Aaron Plattner <aplattner@nvidia.com>
Signed-off-by: Thierry Reding <treding@nvidia.com>
Tested-by: Rob Clark <robdclark@gmail.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 856bb80cea695106a8f6767d00918b38795b51c6
Author: Thierry Reding <treding@nvidia.com>
Date: Wed Feb 12 16:43:29 2014 +0100
xfree86: Store kernel driver name in platform device attribute
When opening a DRM device, query the version and store the driver name
as a new attribute for future reference.
Reviewed-by: Aaron Plattner <aplattner@nvidia.com>
Tested-By: Aaron Plattner <aplattner@nvidia.com>
Signed-off-by: Thierry Reding <treding@nvidia.com>
Reviewed-by: Rob Clark <robdclark@gmail.com>
Tested-by: Rob Clark <robdclark@gmail.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 5a4e15c3f6fb8d674879e54458328e9f595d9451
Author: Thierry Reding <treding@nvidia.com>
Date: Fri Feb 14 15:45:33 2014 +0100
xfree86: Make driver matching consistent
Most of the driver enumeration functions take an array and a maximum
number of entries that they are allowed to fill in. Upon success, they
return the number of entries filled in. This allows them to be easily
used to consecutively.
One exception is the xf86MatchDriverFromFiles() function, which doesn't
return a value, so callers have to manually search the array for the
first empty entry.
This commit modifies the xf86MatchDriverFromFiles() to behave the same
way as others, which makes it easier to deal with.
Reviewed-by: Aaron Plattner <aplattner@nvidia.com>
Tested-By: Aaron Plattner <aplattner@nvidia.com>
Tested-by: Rob Clark <robdclark@gmail.com> (on arm / platform device)
Signed-off-by: Thierry Reding <treding@nvidia.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit a61ca6f006d70343c88fe45206fae0669d1e8971
Author: Tomasz Borowik <timon37@gmail.com>
Date: Thu Jul 3 13:04:44 2014 -0700
glamor: Fix stack corruption in glamor_init
glGet on GL_MAX_VIEWPORT_DIMS returns two values
Reviewed-by: Markus Wick <markus@selfnet.de>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 10d2805dbc6b96a159b8c5acedcd53f34df362bf
Author: Keith Packard <keithp@keithp.com>
Date: Thu Jun 26 14:12:24 2014 -0700
fb: Don't free NULL pixmap in fbCloseScreen. Bug #80313
We fixed fbCloseScreen to use the FreePixmap function so that the
private counts would be updated correctly during CloseScreen. Xvfb
calls FreePixmap and sets devPrivate to NULL before fbCloseScreen is
called; not checking devPrivate before calling would result in a NULL
pointer dereference.
Signed-off-by: Keith Packard <keithp@keithp.com>
Reviewed-by: Julien Cristau <jcristau@debian.org>
commit a5499870e2f88822f52b1b54cad0db69856597c0
Author: Yaakov Selkowitz <yselkowitz@users.sourceforge.net>
Date: Sun Apr 6 04:47:15 2014 -0500
hw/xwin: link dynamically and export symbols
With my patch to fix shared libXfont to work correctly on Cygwin/Win32,
there is no need for -static anymore. But, XWin.exe must export its
symbols in order for them to override libXfont's stubs.
Signed-off-by: Yaakov Selkowitz <yselkowitz@users.sourceforge.net>
Reviewed-by: Jon TURNEY <jon.turney@dronecode.org.uk>
commit 5f3485b06e180674af640e7e9d7d56f67b61735b
Author: Maarten Lankhorst <maarten.lankhorst@canonical.com>
Date: Thu Jun 26 10:37:19 2014 +0200
bump to 0.9.0
commit a3b44ad8db1fa2f3b81c1ff9498f31c5323edd37
Author: Thierry Reding <treding@nvidia.com>
Date: Wed Jun 25 16:03:29 2014 +0200
exa: Fix a warning when enabling DEBUG_TRACE_FALL
The format string wants a picture and a character, but the argument list
contains only a character, causing GCC to complain. Add the missing
argument.
Signed-off-by: Thierry Reding <treding@nvidia.com>
Reviewed-by: Keith Packard <keithp@keithp.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 2f113d68f6c1572576bc57ecca12e44cc9e438eb
Author: Kristian Høgsberg <krh@bitplanet.net>
Date: Mon Jun 16 11:34:55 2014 -0700
xwayland: Add glamor and DRI3 support
Reviewed-by: Axel Davy <axel.davy@ens.fr>
Signed-off-by: Kristian Høgsberg <krh@bitplanet.net>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit fd16555c2fc606fc43236050deba558c20e184e8
Author: Michel Dänzer <michel.daenzer@amd.com>
Date: Tue Jun 24 16:09:19 2014 +0900
Revert "glamor: Fix coordinates handling for composite source/mask pictures"
This reverts commit 4e9aabb6fc15d8052934f20c6a07801c197ec36a.
It broke kwin decorations with XRender compositing.
Signed-off-by: Michel Dänzer <michel.daenzer@amd.com>
Reviewed-by: Eric Anholt <eric@anholt.net>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 18744907d0766b1b57be12df5adafd0f93221006
Author: Chris Wilson <chris@chris-wilson.co.uk>
Date: Tue Jun 10 07:45:05 2014 +0100
dri2: Invalidate DRI2Buffers upon SetWindowPixmap updates
When transitioning to a redirected or unredirected Window, the Composite
layer modifies the Window's Pixmap. However, the DRI2Buffer for the
Drawable is still pointing to the backing bo of the old Pixmap with the
result that rendering goes astray.
This now also effects DRI2 Drawables that are touched by PresentPixmap.
v2: Fixup the function name after rebasing
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Reinis Danne <reinis.danne@gmail.com>
Reviewed-by: Dave Airlie <airlied@redhat.com>
Cc: Keith Packard <keithp@keithp.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 4d92fab39c4225e89f2d157a1f559cb0618a6eaa
Author: Chris Wilson <chris@chris-wilson.co.uk>
Date: Wed Jun 18 11:14:43 2014 +0100
dri2: Use the PrimeScreen when creating/reusing buffers
This fixes a segfault when we attempt to call ds->ReuseBufferNotify()
passing a Prime DRI2BufferPtr to the master backend.
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=80001
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Reviewed-by: Dave Airlie <airlied@redhat.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 0d9ad781807022d78239327ed508758a3f88b090
Author: Eric Anholt <eric@anholt.net>
Date: Mon Jun 16 08:06:53 2014 +0100
glamor: Fix GLES2 non-VBO temporary memory allocation.
We'd get a request for like 16 bytes, claim to have allocated
GLAMOR_VBO_SIZE, and then not reallocate when something a request
bigger than 16 came along. The intent was to always allocate at least
GLAMOR_VBO_SIZE.
Fixes segfaults with Xephyr -glamor_gles2 and running gnome-terminal.
Signed-off-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Keith Packard <keithp@keithp.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 736bed2aaf4bb672b6c7b33146fe84700baf22bd
Merge: ce581ac3fa d90b5f8301
Author: Keith Packard <keithp@keithp.com>
Date: Mon Jun 23 14:18:03 2014 -0700
Merge remote-tracking branch 'whot/for-keith'
commit ce581ac3fa80c4c52d87bd54fa92bc566b7d6adc
Author: Axel Davy <axel.davy@ens.fr>
Date: Wed Jun 18 22:22:09 2014 -0400
present: fix bad logic in cancelling scheduled operations.
If we present several pixmaps in advance for different msc, the later one
shouldn't cancel the previous ones.
This reverts a change made by commit
e6f5d9d7b7efdacea0f22f1808efca849bcede4c
Without this fix, vblank_mode=0 glxgears doesn't update
with the present fallback.
Signed-off-by: Axel Davy <axel.davy@ens.fr>
Reviewed-by: Keith Packard <keithp@keithp.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit adb7bc3386559dfee34b359dadcbb6796bc416e7
Author: Dinar Valeev <dvaleev@suse.com>
Date: Mon Feb 24 11:36:54 2014 +0100
arch: Fix image and bitmap byte order for ppc64le
So far PPC was big endian for sure. For ppc64le this is no longer
true.
Signed-off-by: Egbert Eich <eich@freedesktop.org>
Reviewed-by: Mark Kettenis <kettenis@openbsd.org>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit ea47341792cf06eda5bbdf0aca48aacc024a5be0
Merge: 334faabe68 a11bbd875f
Author: Keith Packard <keithp@keithp.com>
Date: Mon Jun 23 13:50:54 2014 -0700
Merge remote-tracking branch 'anholt/glamor-fixes'
commit 334faabe682a422075ba214501c7554dd5ee5563
Author: Frank Binns <frank.binns@imgtec.com>
Date: Tue Jun 10 13:43:31 2014 +0100
present: restore screen pixmap when aborting a flip
If a 2D application is started on top of a fullscreen 3D application, which
is flipping, then we need to stop flipping and restore the root window, and
possibly the flip window, to using the screen pixmap. Normally this would
be done as part of an unflip. However, in the case that there is a pending
flip there is no mechanism to abort so the unflip is deferred until the
pending flip completes. This provides a window of opportunity for the 2D
application to draw to the wrong pixmap.
Restore the screen pixmap at the point a pending flip is marked as aborted,
thus avoiding this issue.
Reviewed-by: Keith Packard <keithp@keithp.com>
Signed-off-by: Frank Binns <frank.binns@imgtec.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit d90b5f83010248be65b2039b0b2d0b9e6a4e93cf
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri May 30 09:56:37 2014 +1000
dix: fix up coordinate scaling when external monitors are present
The goal of all this is to get an x/y motion reflecting the motion
on the device, i.e. a circle on the device is a circle on the screen.
This is currently done by scaling the y coordinate depending on the screen
ratio vs device ratio. Depending on that ratio the movement on the y axis may
be accelerated (ratio < 1) or slowed (ratio > 1). This leads to the weird
effect that changing the screen ratio by plugging a new monitor changes the
speed of the touchpad.
Use a different algorithm: calculate the physical movement on the device, map
that to the same-ish distance on the screen, then convert that back into a
device-specific vector. This way we get the same mapping regardless of the
current screen dimensions.
Since the pointer accel code doesn't take device resolution into account, make
sure we apply our crazy mapping before we accelerate. This way we accelerate
resolution-independent.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Hans de Goede <hdegoede@redhat.com>
commit 382ff4a306b97b0ddcdac03ce8611b026ca5323b
Author: Keith Packard <keithp@keithp.com>
Date: Tue Jun 17 15:50:48 2014 -0700
present: Remove executing vblank from window list. Bug# 79709.
Once the vblank is actually getting executed, it's lifetime is no
longer tied to the window, and so it shouldn't be controlled by window
destruction. In particular, if the vblank is queued for flip, it will
get stored in the flip_pending field, and will be correctly destroyed
when the flip completes.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 199d9a6a942af9b443616f6ef6d26052ef3f48b9
Author: Eric Anholt <eric@anholt.net>
Date: Fri Dec 27 11:12:27 2013 -0800
xephyr: Allow initializing glamor with gles2 (on GLX).
This should be useful for glamor development, so you can test both
paths (which are significantly different, and apparently
glamor_gradient.c was broken on GLES2 as of the import).
Signed-off-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Keith Packard <keithp@keithp.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
commit 98b6158bc1e32aaca375829452266e013a520e14
Author: Eric Anholt <eric@anholt.net>
Date: Sun Apr 6 07:44:20 2014 +0100
glamor: Share code for put_image handling.
The difference between the two is that XF86 has the clip helper that
lets you upload less data when rendering video that's clipped. I
don't think that's really worth the trouble, especially in a world of
compositors, so I've dropped it to get to shared code.
It turns out the clipping code was broken on xf86-video-intel anyway.
To reproduce, run without a compositor, and use another window to clip
the top half of your XV output on the glamor XV adaptor: the rendering
got confused about which half of the window was being drawn to.
Signed-off-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Adam Jackson <ajax@redhat.com>
commit 34884e16bf7c97434e7883d025c6814e083b0def
Author: Eric Anholt <eric@anholt.net>
Date: Sat Apr 5 12:30:28 2014 +0100
ephyr: Add support for XV using glamor.
Signed-off-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Adam Jackson <ajax@redhat.com>
commit 23d303bf905e76a70bda942037bdfbdcd06e55d2
Author: Eric Anholt <eric@anholt.net>
Date: Sat Apr 5 12:57:16 2014 +0100
kdrive: Mark XV names const to avoid warnings.
No code modifies it at runtime, and it's common to store string
literals to it.
Signed-off-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Adam Jackson <ajax@redhat.com>
commit 65efc14b6ae1ee73bf6db379d7826b6bc9fd6d33
Author: Eric Anholt <eric@anholt.net>
Date: Sat Apr 5 11:50:51 2014 +0100
glamor: Split the XV code into XF86-dependent parts and generic.
I want to expose this from Xephyr as well, both to be able to test XV
changes rapidly, and beause the XV passthrough to the host's overlay
really doesn't work out well when we glXSwapBuffers() over the
colorkey.
Signed-off-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Adam Jackson <ajax@redhat.com>
commit a5662193f1c3dd63f615d96d1a300f70086ccbc6
Author: Eric Anholt <eric@anholt.net>
Date: Sat Apr 5 12:26:33 2014 +0100
kdrive: Simplify the adaptor setup interface.
Now that we don't have to worry about the generic adaptors code,
there's no need to have a list of pointers to different sets of
adaptors.
Signed-off-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Adam Jackson <ajax@redhat.com>
commit 55aad7399d4470bc46c064aafe07d12a6c293982
Author: Eric Anholt <eric@anholt.net>
Date: Fri Apr 4 12:09:01 2014 +0100
kdrive: Remove dead generic XV adaptors code.
I couldn't find any callers in the history of the tree.
Signed-off-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Adam Jackson <ajax@redhat.com>
commit 0edc0a78fbfac4578b0f809aef17332c1eb461e3
Author: Eric Anholt <eric@anholt.net>
Date: Sun Apr 6 08:12:35 2014 +0100
kdrive: Do a little more cleanup from the XV struct deduplication.
Signed-off-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Adam Jackson <ajax@redhat.com>
commit 1d90e8811a7d4db328c0c944bec0aa3ed6afb70d
Author: Eric Anholt <eric@anholt.net>
Date: Fri Dec 27 21:34:44 2013 -0800
xorg: Remove duplicated definitions of some XV-related structs.
These were field-for-field identical, so we can just typedef them to
be the same, and memcpy their contents.
v2: Fix missed strdup().
Signed-off-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Adam Jackson <ajax@redhat.com>
commit a6aaa51752f301de24abce264976ba3c3a50863c
Author: Keith Packard <keithp@keithp.com>
Date: Fri Mar 21 14:55:47 2014 -0700
glamor: Remove stubbed-out glamor_stipple function
This function isn't used anymore.
Signed-off-by: Keith Packard <keithp@keithp.com>
Reviewed-by: Eric Anholt <eric@anholt.net>
commit ef2bf0e645ed8242a0b637ed6a9d5b8c03b6b481
Author: Keith Packard <keithp@keithp.com>
Date: Fri Mar 21 14:30:33 2014 -0700
glamor: Remove 'tiling' shader code
The core rendering paths all use the glamor_program fill functions now
Signed-off-by: Keith Packard <keithp@keithp.com>
Reviewed-by: Eric Anholt <eric@anholt.net>
commit 18c09e60bf16b28060ade5d24110f2aa6bc19b57
Author: Keith Packard <keithp@keithp.com>
Date: Sun Mar 16 20:49:28 2014 -0700
glamor: Replace glamor_solid_boxes and glamor_solid with GC using code
This provides glamor_solid_boxes and glamor_solid using regular GC
operations instead of calling directly to underlying rendering
functions. This will allow the old rendering code to be removed.
Signed-off-by: Keith Packard <keithp@keithp.com>
Reviewed-by: Eric Anholt <eric@anholt.net>
commit bd3b2c48f69a5169aefb261c041462271c69a07a
Author: Keith Packard <keithp@keithp.com>
Date: Thu Apr 3 14:22:52 2014 -0700
glamor: Add accelerated stipple support
This copies the stipple to a 8bpp pixmap and uses that to paint the
texture from.
v2: Create deep stipple pixmap without GLAMOR_CREATE_FBO_NO_FBO
v3: Fix stipple origin sign (matches tiles now). Track changes
to original stipple with damage. This isn't required by the
X spec, but java appears to depend on it, so we'll just do it.
When Glamor switches to 8bpp bitmaps, we'll be able to render
directly from them and not need this anymore.
v4: Review comments from Eric:
* Remove stray whitespace change
* Avoid "large" pixmap for stipple by using GLAMOR_CREATE_NO_LARGE
* Wrap to 80 columns
v5: Don't crash when stipple damage tracker is destroyed
The stipple damage tracker is automatically destroyed when the
associated stipple pixmap is destroyed. When this happens, just
clear the pointer from the GC rather than calling
glamor_invalidate_stipple; that function would call
DamageUnregister on the now invalid stipple damage pointer and
crash.
Signed-off-by: Keith Packard <keithp@keithp.com>
Reviewed-by: Eric Anholt <eric@anholt.net>
commit d18f5801c9a632dd4d9f8b7912491b6623e943d5
Author: Keith Packard <keithp@keithp.com>
Date: Wed Apr 2 14:07:20 2014 -0700
glamor: Add glamor_program based 0-width dashed lines
This makes sure the pixelization for dashed lines matches non-dashed
lines, while also speeding them up.
v2: Switch to glamor_make_current
v3: Create dash pattern pixmap without GLAMOR_CREATE_FBO_NO_FBO
v4: Adopt suggestions from Eric's review:
- Drops power-of-two alignment of our line vertex data, simplifying
the code.
- Stops reading from the VBO. While on keithp's and my machines the
VBO is mapped cached, on many implementations it will be mapped WC,
making those reads extremely expensive.
- Style fixes (line wrapping, spaces around operators).
v5: Adopt suggestions from Markus' review:
- Use max when computing zero-width dashed line length.
Don't open code max here.
- Embed CoordModePrevious into VBO writing for dashed lines
Instead of pre-computing the coord mode previous results, just
embed this in the loop which fills the vertex buffer. Saves
re-writing the request buffer, and shortens the code a bit
v6: Export glamor_destroy_gc for UXA
UXA needs to call glamor_destroy_gc from its GCFuncs, so export
it.
Signed-off-by: Keith Packard <keithp@keithp.com>
Reviewed-by: Eric Anholt <eric@anholt.net>
commit dc9fa9080a1cb994b4e54a341d2245f442dac576
Author: Keith Packard <keithp@keithp.com>
Date: Sun Mar 23 20:59:02 2014 -0700
glamor: Use glamor_program and GL_LINES for 0-width lines
GL lines are nearly X compliant; you just need to fill in the last
pixel when the client hasn't requested CapNotLast.
v2: switch to glamor_make_current
v3: use miPolylines instead of custom glamor fallback path. Wrap
code to 80 columns.
Signed-off-by: Keith Packard <keithp@keithp.com>
Reviewed-by: Eric Anholt <eric@anholt.net>
commit 51075ebd37dca8d17c42425fb756ad3090e157c4
Author: Keith Packard <keithp@keithp.com>
Date: Fri Mar 21 18:03:07 2014 -0700
glamor: Use glamor_program for glamor_push_pixels
This uses the same shaders as glamor_poly_glyph_blt.
v2: Wrap some long lines (changes by anholt).
Signed-off-by: Keith Packard <keithp@keithp.com>
Reviewed-by: Eric Anholt <eric@anholt.net>
commit 45ebc4e3fac7f1a85167d05e2833949b89f02d64
Author: Keith Packard <keithp@keithp.com>
Date: Sat Mar 15 13:31:18 2014 -0700
glamor: Add glamor_program based copy acceleration
Paints with textures, using a temporary buffer for overlapping copies
Performs CPU to GPU transfers for pixmaps in memory. Accelerates copy
plane when both objects are in the GPU. Includes copy_window
acceleration too.
v2: Use NV_texture_barrier for non-overlapping copies within the same
drawable
v3: Switch to glamor_make_current
v4: Do overlap check on the bounding box of the region rather than
on individual boxes
v5: Use Eric Anholt's re-written comments which provide a more accurate
description of the code
v6: Use floating point uniform for copy plane bit multiplier. This
avoids an int to float conversion in the copy plane fragment shader.
Use round() instead of adding 0.5 in copy plane. round() and +0.5
end up generating equivalent code, and performance measurements
confirm that they are the same speed. Round() is a bit clearer
though, so we'll use it.
Signed-off-by: Keith Packard <keithp@keithp.com>
Reviewed-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Markus Wick <markus@selfnet.de>
commit 0e08a79599c773f77c0667d557376a5ccee3f89c
Author: Keith Packard <keithp@keithp.com>
Date: Wed Apr 2 14:05:35 2014 -0700
glamor: Directly reference the private key records
There's no reason to use a pointer here, it just wastes time.
Signed-off-by: Keith Packard <keithp@keithp.com>
Reviewed-by: Eric Anholt <eric@anholt.net>
commit 15e4d14dfae054c026b7e965ac33985e5cf6a168
Author: Keith Packard <keithp@keithp.com>
Date: Sat Mar 15 13:27:14 2014 -0700
glamor: Replace fallback preparation code
These offer a simpler and more efficient means for temporarily
transitioning to CPU-accessible memory for fallback implementations.
v2: Do not attempt fallbacks with GLAMOR_DRM_ONLY pixmaps
glamor cannot transfer pixels for GLAMOR_DRM_ONLY pixmaps using
glReadPixels and glTexSubImage2D, and so there's no way to perform
fallback operations with these pixmaps.
v3: Clear ->pbo field when deleting the PBO. Otherwise, we'd reuse
the old name next time we fall back on the pixmap, which would
potentially conflict with some other pixmap that genned a new
name, or just do a lazy allocation of the name (compat GL context,
like we currently use) or error out (core GL context, like we hope
to use some day). Also, style fixes. Changes by anholt, acked by
keithp.
Signed-off-by: Keith Packard <keithp@keithp.com>
Reviewed-by: Eric Anholt <eric@anholt.net>
commit 3ac481c9dac591ffc33812ab047fc793d8a43d4f
Author: Keith Packard <keithp@keithp.com>
Date: Wed May 7 10:31:16 2014 -0700
mi: Draw multiple lines in one FillSpans call in miZeroLine
miZeroLine allocates enough space to draw a line spanning the entire
width/height of the target drawable. When drawing multiple shorter
lines, this leaves most of the space in that buffer unfilled. Let
multiple lines be drawn into the buffer if there is plenty of space.
Speeds up glamor fallback zero-width lines:
Before
6000000 trep @ 0.0020 msec (508000.0/sec): 1-pixel line
6000000 trep @ 0.0020 msec (492000.0/sec): 10-pixel line
6000000 trep @ 0.0023 msec (427000.0/sec): 100-pixel line
4000000 trep @ 0.0035 msec (282000.0/sec): 500-pixel line
After:
600000000 trep @ 0.0000 msec (43400000.0/sec): 1-pixel line
140000000 trep @ 0.0001 msec (13000000.0/sec): 10-pixel line
16000000 trep @ 0.0008 msec (1300000.0/sec): 100-pixel line
4000000 trep @ 0.0038 msec (261000.0/sec): 500-pixel line
(500 pixel lines do not change in performance because the buffer can
only one one of them.)
Signed-off-by: Keith Packard <keithp@keithp.com>
Reviewed-by: Eric Anholt <eric@anholt.net>
commit ea678a73c5688f73071d5581b6406808b7a0230f
Author: Keith Packard <keithp@keithp.com>
Date: Fri Apr 25 22:43:51 2014 -0700
mi: Fill spans for multiple arcs in miPolyFillArc
This allocates span data for multiple arcs and draws the
whole set in one call, rather than doing them one at a time. For
modern hardware, this is a significant performance improvement.
v2: Limit the number of spans per buffer to 4M to avoid
integer overflow in computing the malloc size.
Signed-off-by: Keith Packard <keithp@keithp.com>
Reviewed-by: Eric Anholt <eric@anholt.net>
commit a7fce36affb8211990e5b4956adea4d75f0e73c9
Author: Keith Packard <keithp@keithp.com>
Date: Wed May 7 09:58:26 2014 -0700
mi: Make miPolyArc draw fast zero-width when possible
Instead of forcing drivers to figure out when to call miZeroPolyArc,
have miPolyArc call that when possible.
This involved renaming the existing miPolyArc call to miWideArc and
creating a new miPolyArc wrapper function as miZeroPolyArc falls back
to miWideArc when the arc is too large to be drawn with the zero-width
code (ellipses larger than 800x800).
Signed-off-by: Keith Packard <keithp@keithp.com>
Reviewed-by: Eric Anholt <eric@anholt.net>
commit bf1429b2034a577c994ff16b60d809d05ca99241
Author: Keith Packard <keithp@keithp.com>
Date: Wed May 7 09:56:39 2014 -0700
mi: Create miPolylines as a general-purpose line drawing function
Instead of requiring all drivers to figure out which mi function to
call for each of the four cases, create a single wrapper in mi that
handles them correctly. Now drivers can simply use miPolylines in all
cases.
Signed-off-by: Keith Packard <keithp@keithp.com>
Reviewed-by: Eric Anholt <eric@anholt.net>
commit 14d82a2bc3179160803c62c20746630d14e1b7d7
Author: Keith Packard <keithp@keithp.com>
Date: Thu Mar 13 23:29:54 2014 -0700
ephyr: Deal with non-root visual for window
glx will sometimes select a non-root visual, deal with that by
creating a suitable colormap and using that instead of attempting to
use the default colormap.
Signed-off-by: Keith Packard <keithp@keithp.com>
Reviewed-by: Eric Anholt <eric@anholt.net>
commit a11bbd875f3f90a3d02d727778cb1d3524cf59fd
Author: Eric Anholt <eric@anholt.net>
Date: Fri May 30 10:39:30 2014 -0700
glamor: Don't leak a prepare_access_gc() in putimage fallbacks.
It turns out putimage doesn't use the GC tile or stipple anyway, so
there's no need to do this.
Signed-off-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Keith Packard <keithp@keithp.com>
commit 8da1e4e2bf28c3610cdbe1770a57be89578d37f5
Author: Markus Wick <markus@selfnet.de>
Date: Wed May 14 23:08:18 2014 +0200
glamor: Choose max fbo size by texture + viewport size
The max size of renderbuffers and texture often match by accident, but
as we always use textures, we should check for the right flag. Also
check for viewport size as this may be lower and we want to render to
almost every pixmap.
Signed-off-by: Markus Wick <markus@selfnet.de>
Signed-off-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Eric Anholt <eric@anholt.net>
commit 3778fab34bc00334edec4f845d0c6d43440f265a
Author: Markus Wick <markus@selfnet.de>
Date: Wed May 14 23:08:17 2014 +0200
glamor: Fix no-mipmap allocations
With GL_TEXTURE_MIN_FILTER, we configure not to use mipmaps, but
there's no real way until GL_ARB_texture_storage to dictate whether
memory should be allocated for mipmap levels or not.
GL_TEXTURE_MAX_LEVEL is a stronger hint to the driver than the
filtering that we really don't want mipmap allocations. Stops VARM
wasting warnings from the nvidia driver.
Signed-off-by: Markus Wick <markus@selfnet.de>
Signed-off-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Keith Packard <keithp@keithp.com>
commit 1095c262502332bc570a9b288b01da51c1fa10ec
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Fri Jun 6 17:54:22 2014 -0700
config: show default path in help for --with-xkb-bin-directory
Now shows:
--with-xkb-bin-directory=DIR
Directory containing xkbcomp program (default:
${bindir})
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit e27a839bf0488d5b1cc2e2a887f2ea0e3d790790
Author: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
Date: Thu Jun 5 20:38:44 2014 -0700
mi: Build fix: mieqProcessDeviceEvent returns void
mieq.c:520:9: error: void function 'mieqProcessDeviceEvent' should not return a value [-Wreturn-type,Semantic Issue]
return 0;
^ ~
1 error generated.
Regression-from: 9fb08310b51b46736f3ca8dbc04efdf502420403
Found-by: Tinderbox
Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 08820f03768e904f1746ef93ca01660330dc5406
Author: Keith Packard <keithp@keithp.com>
Date: Wed Jun 4 22:28:57 2014 -0700
Update to version 1.15.99.903
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 9fb08310b51b46736f3ca8dbc04efdf502420403
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Wed May 21 10:07:31 2014 +1000
mi: don't process events from disabled devices (#77884)
Once a device is disabled, it doesn't have a sprite pointer anymore. If an
event is still in the queue and processed after DisableDevice finished, a
dereference causes a crash. Example backtrace (crash forced by injecting an
event at the right time):
(EE) 0: /opt/xorg/bin/Xorg (OsSigHandler+0x3c) [0x48d334]
(EE) 1: /lib64/libpthread.so.0 (__restore_rt+0x0) [0x37fcc0f74f]
(EE) 2: /opt/xorg/bin/Xorg (mieqMoveToNewScreen+0x38) [0x609240]
(EE) 3: /opt/xorg/bin/Xorg (mieqProcessDeviceEvent+0xd4) [0x609389]
(EE) 4: /opt/xorg/bin/Xorg (mieqProcessInputEvents+0x206) [0x609720]
(EE) 5: /opt/xorg/bin/Xorg (ProcessInputEvents+0xd) [0x4aeb58]
(EE) 6: /opt/xorg/bin/Xorg (xf86VTSwitch+0x1a6) [0x4af457]
(EE) 7: /opt/xorg/bin/Xorg (xf86Wakeup+0x2bf) [0x4af0a7]
(EE) 8: /opt/xorg/bin/Xorg (WakeupHandler+0x83) [0x4445cb]
(EE) 9: /opt/xorg/bin/Xorg (WaitForSomething+0x3fe) [0x491bf6]
(EE) 10: /opt/xorg/bin/Xorg (Dispatch+0x97) [0x435748]
(EE) 11: /opt/xorg/bin/Xorg (dix_main+0x61d) [0x4438a9]
(EE) 12: /opt/xorg/bin/Xorg (main+0x28) [0x49ba28]
(EE) 13: /lib64/libc.so.6 (__libc_start_main+0xf5) [0x37fc821d65]
(EE) 14: /opt/xorg/bin/Xorg (_start+0x29) [0x425e69]
(EE) 15: ? (?+0x29) [0x29]
xf86VTSwitch() calls ProcessInputEvents() before disabling a device, and
DisableDevice() calls mieqProcessInputEvents() again when flushing touches and
button events. Between that and disabling the device (which causes new events
to be refused) there is a window where events may be triggered and enqueued.
On the next call to PIE that event is processed on a now defunct device,
causing the crash.
The simplest fix to this is to discard events from disabled devices. We flush
the queue often enough before disabling that when we get here, we really don't
care about the events from this device.
X.Org Bug 77884 <http://bugs.freedesktop.org/show_bug.cgi?id=77884>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reported-by: Maarten Lankhorst <maarten.lankhorst@canonical.com>
Tested-by: Maarten Lankhorst <maarten.lankhorst@canonical.com>
Reviewed-by: Keith Packard <keithp@keithp.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit e6f5d9d7b7efdacea0f22f1808efca849bcede4c
Author: Keith Packard <keithp@keithp.com>
Date: Mon Jan 27 11:23:58 2014 -0800
present: Queue flips for later execution
When a flip (or unflip) is pending and a flip request comes in, leave
it queued until the pending flip completes and then execute it.
This fixes a bug where an application submitting back-to-back
present_pixmap requests for sequential frames would alternate between
flipping and copying as the pending flip would cause the new
present_pixmap request to not use a flip.
Signed-off-by: Keith Packard <keithp@keithp.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Tested-by: Frank Binns <frank.binns@imgtec.com>
commit 2f5cf9ff9a0f713b7e038636484c77f113a5f10a
Author: Frank Binns <frank.binns@imgtec.com>
Date: Thu Apr 24 11:37:48 2014 +0100
xfixes: disable cursor on X server reset
The initial state of the cursor is set to disabled but this was
never be re-disabled during X server reset. This meant any
application run after an X server reset would have the cursor
displayed even if it hadn't requested this to be the case.
Signed-off-by: Frank Binns <frank.binns@imgtec.com>
Reviewed-by: Keith Packard <keithp@keithp.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit b92d86a982504af2605042c19ef796d135074ee1
Author: Brendan King <brendan.king@imgtec.com>
Date: Thu Apr 24 11:37:47 2014 +0100
dix: fix pixmap leak on server reset
The server is leaking a pixmap (created by CreateDefaultStipple()) on
reset. The leak is caused by some X Server graphics contexts not being
freed on reset by the machine independent cursor code in the server,
which in turn is caused by the cursor cleanup code
(miSpriteDeviceCursorCleanup()) not being called.
Ensures the DeviceCursorCleanup() function is called when the associated
input device is closed on server reset.
Signed-off-by: Frank Binns <frank.binns@imgtec.com>
Reviewed-by: Keith Packard <keithp@keithp.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit a99c061aafd4aaa5728c776dca7d0a1789ac739a
Author: Brendan King <brendan.king@imgtec.com>
Date: Thu Apr 24 11:37:46 2014 +0100
dix: reference the cursor just once in InitializeSprite()
The new current cursor was being referenced twice, resulting in a
memory leak when the current server generation ended.
Signed-off-by: Frank Binns <frank.binns@imgtec.com>
Reviewed-by: Keith Packard <keithp@keithp.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 444a1f7a8802999e27ecf5f6eb598df2206f7277
Author: Brendan King <brendan.king@imgtec.com>
Date: Thu Apr 24 11:37:45 2014 +0100
fb: fix screen pixmap leak on server reset
Call FreePixmap() instead of free() to destroy the screen pixmap in
fbCloseScreen().
Signed-off-by: Frank Binns <frank.binns@imgtec.com>
Reviewed-by: Keith Packard <keithp@keithp.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 7ca458493aa2f0aa091c989ea0768611e0730bf5
Author: Chris Wilson <chris@chris-wilson.co.uk>
Date: Wed May 28 08:14:00 2014 +0100
xfree86: Report Present as a built-in module
This is so that drivers can do a runtime check that Present is available,
similar to existing runtime checks performed by the drivers for DRI.
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 746be5a03ebbda4ab411ca3efb2ed95f99e9ea46
Author: Chris Wilson <chris@chris-wilson.co.uk>
Date: Wed May 28 08:13:59 2014 +0100
xfree86: Report DRI3 as a built-in module
This is so that drivers can do a runtime check that DRI3 is available,
similar to existing runtime checks performed by the drivers for DRI and
DRI2.
v2: Only add DRI3 to the list if the module was actually built into the
server (Mark Kettenis).
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Mark Kettenis <mark.kettenis@xs4all.nl>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit b5526141f78df15bc5df2497bc4b4a17f1a6368d
Merge: dc8d068847 a205ec3ab7
Author: Keith Packard <keithp@keithp.com>
Date: Mon Jun 2 13:08:23 2014 -0700
Merge remote-tracking branch 'jturney/master'
commit dc8d0688471695ec5a8db5fef93fbcfc064891d5
Author: Max Filippov <jcmvbkbc@gmail.com>
Date: Mon Jun 2 01:17:31 2014 +0400
xtensa: add support for xtensa architecture
Signed-off-by: Max Filippov <jcmvbkbc@gmail.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit a6ffdc69c4ac45bc39924159c7fab5f02f720f1f
Merge: 63c48de63b 1c10b37380
Author: Keith Packard <keithp@keithp.com>
Date: Mon Jun 2 11:30:24 2014 -0700
Merge remote-tracking branch 'jeremyhu/master'
commit 63c48de63becdee680e90cb2363984c2f8f77fd1
Author: Søren Sandmann <soren.sandmann@gmail.com>
Date: Fri May 30 16:50:35 2014 -0400
xfree86: Add "modesetting" to list of fallback drivers
To make X -configure work properly, the output of fixup_video_driver_list()
should be in order of preference. Otherwise, the config file may use
the incorrect driver for some devices.
In particular, the drivers that work for all (or many) devices need to be
last in the list. Since the modesetting driver works for many devices,
it needs to be considered a fallback driver.
Signed-off-by: Søren Sandmann <ssp@redhat.com>
Acked-by: Daniel Stone <daniels@collabora.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit ab47ec9636b21a7f542d2e8612834915e7c8cc64
Merge: 0df871cf34 cfaf2abbac
Author: Keith Packard <keithp@keithp.com>
Date: Mon Jun 2 11:22:48 2014 -0700
Merge remote-tracking branch 'whot/for-keith'
commit 0df871cf34ee5f1a85586206027de9b02fb364ec
Author: Robert Ancell <robert.ancell@canonical.com>
Date: Thu May 22 10:43:52 2014 +1200
Fix overflow checking extension versions
The easiest way to check for the version of an extension is to send the maximum
possible version numbers in the QueryVersion request. The X server overflows on
these as it assumes you will send a reasonable version number.
Reviewed-by: Keith Packard <keithp@keithp.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 4cbd3fabaa41e89579530bceb01b9239fa2afdb7
Author: Adam Jackson <ajax@redhat.com>
Date: Wed May 21 09:22:49 2014 -0400
configure: Require sufficiently new wayland-client for xwayland ddx
The explicit release requests were added in 1.3.0, don't try to build
against older.
Signed-off-by: Adam Jackson <ajax@redhat.com>
Reviewed-by: Jasper St. Pierre <jstpierre@mecheye.net>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit a205ec3ab77c6765d44f77c526a832345fef77b0
Author: Jon TURNEY <jon.turney@dronecode.org.uk>
Date: Sat Apr 5 15:15:46 2014 +0100
configure: Restore DEFAULT_LOGDIR to xwin-config.h, it is used
Commit f37a46913489397d8628ffe578c8d4ed50b6ca72 removed this from
xwin-config.h.in for some reason, but it is used.
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
commit aaaa41345674a1c76a70836394cb5e57f82e9a26
Author: Jon TURNEY <jon.turney@dronecode.org.uk>
Date: Sun Apr 27 20:55:51 2014 +0100
hw/xwin: Update for __glXLastContext -> lastGLContext
Update for __glXLastContext -> lastGLContext.
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
commit 1c10b37380d228b35db8a8616a6312ac54f5e59b
Author: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
Date: Sat May 31 17:45:02 2014 -0700
XQuartz: Update logic to account for title bar on every display in Mavericks
<rdar://problem/14205847>
http://xquartz.macosforge.org/trac/ticket/832
Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
commit ad0ff649c68b18c4b95b078c2d1d1e7de71a7c6f
Author: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
Date: Sat May 31 17:22:51 2014 -0700
XQuartz: Dead code removal (ENABLE_DEBUG_LOG)
Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
commit e281288d5afedb154f52c31f70a350a013ecfb06
Author: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
Date: Sat May 31 13:04:43 2014 -0700
XQuartz: Bump to 2.7.7
Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
commit cfaf2abbac3f01e57d00845d8908bf01559263f9
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Sat May 24 20:05:53 2014 +1000
man: drop specific mention of DontZap in -retro (#71113)
DontZap off is the default anyway, don't mention it specifically to avoid
confusion
X.Org Bug 71113 <http://bugs.freedesktop.org/show_bug.cgi?id=71113>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit e48a132b6d187f355abd7021be47edde972e7091
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Sat May 24 20:02:56 2014 +1000
xfree86: fix wrong DontZap documentation (#71113)
X.Org Bug 71113 <http://bugs.freedesktop.org/show_bug.cgi?id=71113>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 548fc937b22d4dfe7f96e0bd77522261603a2c2f
Author: Robert Ancell <robert.ancell@canonical.com>
Date: Thu May 22 10:43:52 2014 +1200
Fix overflow checking extension versions
The easiest way to check for the version of an extension is to send the maximum
possible version numbers in the QueryVersion request. The X server overflows on
these as it assumes you will send a reasonable version number.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Keith Packard <keithp@keithp.com>
commit db2e708f31a162c6c66643d3559dd5f3e21ee06b
Author: Adam Jackson <ajax@redhat.com>
Date: Thu Sep 27 17:44:42 2012 -0400
glx: Require at least one True/DirectColor visual
Mesa no longer supports rendering to anything less. GLX 1.2 requires
that the server advertise at least one GLX visual. GLX 1.3 and 1.4 are
more subtle: they require at least one fbconfig capable of window
rendering, and _also_ require that window-capable fbconfigs have a
non-zero value for the GLX_VISUAL_ID. In either case we should refuse
to init GLX if there's not at least one GL-capable visual on at least
one screen.
Signed-off-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit d7a2df0a7499864cb005b098b79c1bdf884f6600
Author: Steven McDonald <steven@steven-mcdonald.id.au>
Date: Sun May 18 13:42:08 2014 +0200
Xi: block SIGIOs while copying device classes around
I've been seeing sporadic (anywhere from once every few days to 3-4
times a day) crashes and freezes in X. The problematic behaviour isn't
always the same, but I chose a particular incident to debug, and found
that X was segfaulting in updateMotionHistory, on line 575 of
dix/getevents.c.
After some further investigation, I found that the bug was being
triggered when a SIGIO was received in DeepCopyPointerClasses, between
the AllocValuatorClass call (line 540) and updating the to->valuator
pointer (line 545). AllocValuatorClass calls realloc() on to->valuator,
so between these lines, it's not guaranteed to point to allocated
memory.
It seems the SIGIO handler is calling updateMotionHistory, which is
reading the memory pointed to by to->valuator and getting a wrong value
for last_motion, which updates buff to point to wildly the wrong place
and thus generates a segfault when a memcpy() is done into buff.
I am attaching a patch which I've been running on that machine for the
past three days, and haven't yet observed any more crashing or freezing
behaviour. The patch simply calls OsBlockSIGIO while
DeepCopyDeviceClasses is in progress, as the state of the X server's
device data structures is not guaranteed to be in a consistent state
during that time.
Debian bug#744303 <https://bugs.debian.org/744303>
Signed-off-by: Julien Cristau <jcristau@debian.org>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit d3a3ee7a0e5cbd3fcaba77d2d5664e1524eda11c
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu May 8 09:39:36 2014 +1000
os: automatically switch to sigsafe logging when needed
If we're smart enough to warn, we should be smart enough to just pass it
through to the right function. Worst case we lose some formatting specifiers
which pnprintf will complain about anyway. And in most cases it won't matter.
This requires renaming pnprintf to vpnprintf and changing the size_t to int to
be compatible with Xvscnprintf. pnprintf is internal only, the others are
exported API so we can't change them as easily.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Keith Packard <keithp@keithp.com>
commit 6d684f916b4c33327d32ef1f48803bf90357287f
Author: Adam Jackson <ajax@redhat.com>
Date: Wed May 21 09:23:19 2014 -0400
shadowfb: Fix initialization
This has to run at initial CreateWindow time, at CreateScreenResources
the root window doesn't actually exist yet.
Tested-by: Michael Thayer <michael.thayer@oracle.com>
Signed-off-by: Adam Jackson <ajax@redhat.com>
Reviewed-by: Michael Thayer <michael.thayer@oracle.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit d9e99edd4dcf109492abdaa73ccf8f29d5bfd159
Author: Adam Jackson <ajax@redhat.com>
Date: Wed Apr 30 13:49:06 2014 -0400
glxproxy: Fix memory leak on error path in CreateGLXPixmap (#50281) (v2)
v2: Fix another path spotted by keithp
Signed-off-by: Adam Jackson <ajax@redhat.com>
Reviewed-by: Jasper St. Pierre <jstpierre@mecheye.net>
Reviewed-by: Keith Packard <keithp@keithp.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit dff1f5e1a9608eda2992fc9e3304edee7b5bee9b
Author: Adam Jackson <ajax@redhat.com>
Date: Wed Apr 30 13:49:05 2014 -0400
dmx: Fix memory leak in dmxBELoadFont (#50281)
Signed-off-by: Adam Jackson <ajax@redhat.com>
Reviewed-by: Jasper St. Pierre <jstpierre@mecheye.net>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 3dba171f5e82101aa8ea2e47d2253c3410907f6a
Author: Michal Srb <msrb@suse.com>
Date: Tue Apr 15 18:54:35 2014 +0300
dri2: Fix detection of wrong prime_id in GetScreenPrime.
Checking the iterating variable ("slave") against null can not detect if the
xorg_list_for_each_entry finished without break being invoked - slave variable
will be always non-null. This caused segfault whenever someone tried to use
DRI_PRIME with incorrect id while having at least one render offloading slave
configured.
Restructurize the GetScreenPrime to work as expected.
Reviewed-by: Dave Airlie <airlied@redhat.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit c08d2b8ccb0158dbf1f529f80cc3236e66236cce
Author: Alexey Brodkin <Alexey.Brodkin@synopsys.com>
Date: Thu May 1 15:39:29 2014 +0300
ARC: Add support for ARC architecture
Xorg server could be built for and run on Synopsys DesignWare ARC cores.
These changes are required for successful building and execution of the server.
Both little-endian and big-endian flavors of ARC cores are supported.
Signed-off-by: Alexey Brodkin <abrodkin@synopsys.com>
Acked-by: Adam Jackson <ajax@redhat.com>
Reviewed-by: Egbert Eich <eich@freedesktop.org>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 042bae0b49f6192ec3cb8bb51423c90c44638134
Author: Adam Jackson <ajax@redhat.com>
Date: Wed May 21 10:16:39 2014 -0400
Use own thunk function instead of shadowUpdatePackedWeak
I plan to remove the Weak functions from a future server.
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit d5587cf3acb7ad6f81e1c095f1b88f8fb25ee953
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Wed May 14 10:32:30 2014 +1000
config: revert quirk for the Evoluent Vertical Mouse
This quick makes the mouse behaviour more obvious (LMR buttons generate LMR
events) but goes against the manufacturer's intended defaults:
Top button - left click.
Wheel button - .middle click (e.g., for pan and rotate in CAD programs).
Middle button - right click.
Bottom button - back.
Thumb button - forward.
from http://www.evoluent.com/vm3.html
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 01e18af17f8dc91451fbd0902049045afd1cea7e
Author: Dave Airlie <airlied@redhat.com>
Date: Mon May 12 14:55:04 2014 -0700
rrcrtc: brackets are hard, lets go shopping.
Slaving two outputs on a secondary GPU to a primary GPU testing
picked this up, in that we'd try to resize to the totally the
wrong thing, then as usual segfault in the rotation code.
Signed-off-by: Dave Airlie <airlied@redhat.com>
Reviewed-by: Aaron Plattner <aplattner@nvidia.com>
commit 6dd86f3cba7cca67f3a9102db2e90722d32a34cb
Author: Eric Anholt <eric@anholt.net>
Date: Mon May 5 17:01:14 2014 -0700
glamor: Don't forget to check whether we can fall back in polysegment.
Part of the _nf contract is that glamor will only return FALSE if
glamor has checked that UXA can actually map the pixmaps (UXA only
allocates the BO itself in the screen pixmap and DRI2 cases, and can't
map it otherwise). Fixes server segfaults zooming in and out of
libreoffice spreadsheets.
Signed-off-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Keith Packard <keithp@keithp.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit fb24ac0a2c317099bdf7d1d8e4b7c443e3ee644f
Author: Laércio de Sousa <lbsousajr@gmail.com>
Date: Fri May 9 09:09:16 2014 -0300
xfree86: fix warnings after MatchSeat patch
This patch fixes some compile warnings that arise after
commit 7070ebeebaca1b51f8a2801989120784a1c374ae
(xfree86: add new key MatchSeat to xorg.conf sections "Device", "Screen", and "ServerLayout")
available at git repository
git://people.freedesktop.org/~whot/xserver for-keith
Signed-off-by: Keith Packard <keithp@keithp.com>
commit bbfed454b2a0fd5e2723524d145cb7c6e5aa9193
Author: Eric Anholt <eric@anholt.net>
Date: Thu May 8 08:45:22 2014 -0700
glamor: Stop disabling asserts by default.
Disabling asserts is something the user gets to manage.
Signed-off-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Michel Dänzer <michel.daenzer@amd.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 8e2fefe3ef247f8b5d74e32e8d37c619b06fc60c
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Tue Apr 29 16:52:01 2014 +1000
Xi: don't copy a DeviceEvent into an InternalEvent
==26141== Invalid read of size 8
==26141== at 0x58FAEA: DeliverEmulatedMotionEvent (exevents.c:1484)
An InternalEvent is bigger than a DeviceEvent, thus copying one to the other
reads past the allocated boundary. Shouldn't have any real effect since we
shouldn't access anything past the DeviceEvent boundary if the event type is
correct.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Keith Packard <keithp@keithp.com>
commit d7ac9aff061f2961e6b76557dda97b57988ce362
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Wed Apr 30 10:55:26 2014 +1000
mi: start calculating the sprite trace from the first child of root
Introduced in
73698d41e41ce76bef2d9a90b46ac0c24ae148dd "Make XYToWindow a screen function"
Moving the code into miwindow.c changed the start of the loop from
RootWindow()->firstChild to DeepestSpriteWindow(). This function is only
supposed to be called from miXYToWindow which resets spriteTraceGood to 1,
thus DeepestSpriteWindow() is always the root window anyway.
What got dropped was the firstChild as the first window to handle, so we may
end up with the root window twice in the sprite trace.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Keith Packard <keithp@keithp.com>
commit d60724b752613ce2ad11c6ae102bf4513f9768ff
Merge: a5b9757142 15460eaed2
Author: Keith Packard <keithp@keithp.com>
Date: Thu May 8 12:58:41 2014 -0700
Merge commit 'who/for-keith'
Skipping two unreviewed patches; will mark them reviewed and cherry pick
commit a5b9757142a2ab471ca26651dce9cc5f5e351f3d
Author: Keith Packard <keithp@keithp.com>
Date: Fri Apr 25 15:07:03 2014 -0700
glamor: Publish change_window_attributes and copy_window
Because uxa doesn't just use glamor directly, it keeps these two
functions from being wrapped so that they get called
automatically. Publishing these will allow uxa to call them directly.
Signed-off-by: Keith Packard <keithp@keithp.com>
Signed-off-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Eric Anholt <eric@anholt.net>
commit 4711182033ec579caff8c930d420f90ecdbe54cf
Author: Keith Packard <keithp@keithp.com>
Date: Fri Apr 25 20:25:56 2014 -0700
glamor: Work around libXfont when it fails to use defaultChar
GetGlyphs is supposed to always return the full list of characters
when there is a default character available. However, if an
application opens a 16-bit two dimensional font and then draws with
8-bit requests, the bitmapGetGlyphs function in libXfont versions up
through 1.4.7 will return zero glyphs if there is no 0th row.
While this is a bug in libXfont and should be fixed there, it's easy
to protect glamor from it by simply falling through to the case that
handles GetGlyphs failures for fonts without a default character.
Signed-off-by: Keith Packard <keithp@keithp.com>
Signed-off-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Eric Anholt <eric@anholt.net>
commit 91767a32874790f8a8c7340be0e81a0b719ca4f6
Author: Keith Packard <keithp@keithp.com>
Date: Fri Apr 25 23:38:35 2014 -0700
glamor: Fix uxa-entry point for ImageText16
Was interpreting the incoming chars as 8-bits instead of 16-bits,
resulting in the wrong characters being drawn.
Signed-off-by: Keith Packard <keithp@keithp.com>
Signed-off-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Eric Anholt <eric@anholt.net>
commit 15460eaed28b5353a94a17091d7795cfaeda9146
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri May 2 14:14:58 2014 +1000
systemd-logind: let the logind code decided whether to close an fd
We can only request one fd per device from systemd-logind. If a fd is re-used
by the same device, releasing the fd from one device doesn't mean we can close
it. The systemd code knows when it's really released, so let it close the fd.
Test case: xorg.conf section for an input device with hotplugging enabled.
evdev detects the duplicate and closes the hotplugged device, which closes the
fd. The other instance of evdev thinks the fd is still valid so now you're
playing a double lottery. First, which client(s) will get the evdev fd?
Second, which requests will be picked up by evdev and which ones will be
picked up by the client? You'll never know, but the fun is in finding out.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Hans de Goede <hdegoede@redhat.com>
commit 219ce9e6c34bfc946005fb8e81ab4fb74ae1d25a
Author: Dave Airlie <airlied@redhat.com>
Date: Fri May 2 13:16:05 2014 +1000
modesetting: fix build regression against older servers.
Signed-off-by: Dave Airlie <airlied@redhat.com>
commit 795af9ff017113788b4bb6d9dbeb5370c5b8165c
Author: Dave Airlie <airlied@redhat.com>
Date: Fri May 2 13:14:30 2014 +1000
modesetting: fix use after free.
Signed-off-by: Dave Airlie <airlied@redhat.com>
commit 42a4873cc7fe0c7a729e48f806e877c4dac5c07f
Author: Keith Packard <keithp@keithp.com>
Date: Wed Apr 30 09:32:29 2014 -0700
hw/xfree86: Video Driver ABI version 18.0
With the change in the cursor interface in
4c3932620c29c91dfbbc8eb09c84efcaa7ec873e, we need to bump the video
driver ABI number to ensure that drivers are rebuilt to match the new
interface.
Signed-off-by: Keith Packard <keithp@keithp.com>
Reviewed-by: Aaron Plattner <aplattner@nvidia.com>
commit a6f5ffd5879e7fb052d343592951cc476b699bb4
Author: Laércio de Sousa <lbsousajr@gmail.com>
Date: Thu Apr 3 11:19:15 2014 -0300
xfree86: add short description about MatchSeat key in xorg.conf man page
Signed-off-by: Laércio de Sousa <lbsousajr@gmail.com>
Reviewed-by: Dave Airlie <airlied@redhat.com>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 7070ebeebaca1b51f8a2801989120784a1c374ae
Author: Oleg Samarin <osamarin68@gmail.com>
Date: Thu Apr 3 11:19:14 2014 -0300
xfree86: add new key MatchSeat to xorg.conf sections "Device", "Screen", and "ServerLayout"
This patch introduces a new key MatchSeat in xorg.conf (also applies to
any .conf file in xorg.conf.d). It will allow targeting a given
"Device", "Screen", and/or "ServerLayout" section to a particular
seat only (specified by option "-seat" in X server command line),
so that other seats won't be affected.
Without this patch, one needs to write a separate xorg.conf.custom
file and pass it to X server via "-config" option, if one wants that
these settings only apply for the right seat. However, in some cases,
this solution is undesirable or even impossible (e.g. when using GDM,
which doesn't allow X server command line customization).
Example file (/etc/X11/xorg.conf.d/seat1.conf), which would be ignored
by X server unless it was started with "-seat seat1" option:
Section "Device"
Identifier "card0"
Driver "nvidia"
Option "NoLogo" "True"
MatchSeat "seat1"
EndSection
Signed-off-by: Oleg Samarin <osamarin68@gmail.com>
Signed-off-by: Laércio de Sousa <lbsousajr@gmail.com>
Reviewed-by: Dave Airlie <airlied@redhat.com>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 29b1484bb9555e45067669cbfe68a3c40596f4ff
Author: Laércio de Sousa <lbsousajr@gmail.com>
Date: Thu Apr 3 11:19:13 2014 -0300
xfree86: allow fallback to PCI bus probe for graphics devices on non-seat0 X servers (#66851)
Currently non-seat0 X servers only probe platform bus for graphics devices,
which is OK for most KMS-compliant drivers. However, for non-KMS drivers
(like NVIDIA proprietary ones), graphics devices can't be reached
by platform bus probe, resulting in a "No devices detected" error.
This patch allows a fallback to PCI bus probe for non-seat0 X servers
in case no platform bus graphics device is found.
Fixes: https://bugs.freedesktop.org/show_bug.cgi?id=66851
Signed-off-by: Laércio de Sousa <lbsousajr@gmail.com>
Reviewed-by: Hans de Goede <hdegoede@redhat.com>
Reviewed-by: Dave Airlie <airlied@redhat.com>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 2535b76c0d32bc1dd0ddaca06a419a68a4757df1
Author: Robert Ancell <robert.ancell@canonical.com>
Date: Wed Apr 23 08:19:35 2014 +1200
os: Add -displayfd into -help text
Add -displayfd into -help text. It was mentioned in the man page but seem to have been missed from the -help text.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit a26578dbb93dbaab1910b52f9fa1c87f8c9e6d1e
Author: Ray Strode <rstrode@redhat.com>
Date: Thu Apr 24 13:38:29 2014 -0400
selinux: don't checkout for AVCs on select() EINTR
wakeup handlers are called even when select() returns EINTR,
and when they're called the passed fd set is undefined.
This commit fixes the selinux wakeup handler to avoid checking
for AVCs over the netlink socket spuriously.
Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Ray Strode <rstrode@redhat.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit bcb17b99873f020f2639b860ce99d260def0cd97
Author: Ray Strode <rstrode@redhat.com>
Date: Thu Apr 24 13:38:28 2014 -0400
dbus: don't dispatch dbus events on select() EINTR
wakeup handlers are called even when select() returns EINTR,
and when they're called the passed fd set is undefined.
This commit fixes the dbus wakeup handler to avoid dispatching
into dbus spuriously.
Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Ray Strode <rstrode@redhat.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 6bd7ad914470322ddd02b50078e159234ebec643
Merge: b92a9289fe e06fbe4dc8
Author: Keith Packard <keithp@keithp.com>
Date: Tue Apr 29 09:37:37 2014 -0700
Merge remote-tracking branch 'whot/for-keith'
commit e06fbe4dc81110e01d36f958849c4ab5f2a9df0e
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Mon Apr 28 07:57:00 2014 +1000
dix: remove a now-superfluous comment
Obsolete since 93945b0a74aa8156a88f52b8ba77f1210042f396
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 6a848122def0f2a439e21c50f22814db11760132
Author: Michal Srb <msrb@suse.com>
Date: Wed Apr 2 17:14:05 2014 +0300
input: Remove invalid bug checks.
Commit 2f1aedcaed8fd99b823d451bf1fb02330c078f67 added several bug checks. Some
of them are not correct.
Checks in Init(Ptr|String|Bell|Led|Integer)FeedbackClassDeviceStruct verify
that no feedback struct was set yet, but that is not required. If any feedback
structs are already present, the function will chain them behind the new one.
Signed-off-by: Michal Srb <msrb@suse.com>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit f073b5e58262d5fcc0102d773091d11d175227ce
Author: Hans de Goede <hdegoede@redhat.com>
Date: Tue Mar 18 15:48:22 2014 +0100
Add support for server managed fds
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
commit b92a9289fef4831e9af69e5f6f64b5454f550559
Author: Thierry Reding <thierry.reding@gmail.com>
Date: Wed Feb 12 17:11:40 2014 +0100
xfree86: int10: Fix build on ARM
Commit 7353ec7cb6fc235b03e59e35425201429c83ee72 "xfree86: Switch int10
code to stdint types" uses designated initializers to setup the fields
of the X86EMU_pioFuncs.
This breaks compilation on ARM, since out{b,w,l}() are redefined using
the preprocessor and therefore cause the compiler to complain about
non-existent fields being assigned to.
It seems like the compiler.h header that contains these redefinitions
isn't actually needed in xf86x86emu.c, so the easiest "fix" is to not
include it.
Signed-off-by: Thierry Reding <treding@nvidia.com>
Reviewed-by: Rob Clark <robdclark@gmail.com>
commit 774fea38c48671ed44e54278f0280bae04822491
Author: Rob Clark <robdclark@gmail.com>
Date: Thu Apr 3 15:35:53 2014 -0400
int10: fix build error
Fixes:
stub.c:66:1: error: conflicting types for 'xf86int10Addr'
In file included from stub.c:14:0:
xf86int10.h:72:53: note: previous declaration of 'xf86int10Addr' was here
Signed-off-by: Rob Clark <robdclark@gmail.com>
commit b241934238feedcb86c113fe3beb69a7470de02d
Author: Rob Clark <robdclark@gmail.com>
Date: Thu Apr 3 14:54:02 2014 -0400
default to stub int10 implementation on arm
There should be no reason to need a real int10 implementation on arm,
and switching to stub is an easy way to fix:
xf86x86emu.c: In function 'xf86Int10ExecSetup':
xf86x86emu.c:56:9: error: unknown field 'xf_outb' specified in initializer
xf86x86emu.c:57:9: error: unknown field 'xf_outw' specified in initializer
xf86x86emu.c:58:9: error: unknown field 'xf_outl' specified in initializer
which is caused by the following in compiler.h:
#define outb xf_outb
#define outw xf_outw
#define outl xf_outl
Signed-off-by: Rob Clark <robdclark@gmail.com>
Acked-by: Daniel Stone <daniels@collabora.com>
commit 4c3932620c29c91dfbbc8eb09c84efcaa7ec873e
Author: Keith Packard <keithp@keithp.com>
Date: Fri Apr 25 08:22:15 2014 -0700
hw/xfree86: Restore API compatibility for cursor loading functions
Create load_cursor_image_check, load_cursor_argb_check,
LoadCursorImageCheck and LoadCursorARGBCheck that can return failure
and use them in preference to the old unchecked variants.
Signed-off-by: Keith Packard <keithp@keithp.com>
Reviewed-by: Hans de Goede <hdegoede@redhat.com>
Reviewed-by: Michael Thayer <michael.thayer@oracle.com>
commit 99f0365b1fbdfd9238b9f5cc28491e4e6c7324f1
Author: Eric Anholt <eric@anholt.net>
Date: Wed Apr 23 09:52:17 2014 -0700
Add a command line argument for disabling indirect GLX.
The attack surface for indirect GLX is huge, and it's of no use to
most people (if you get an indirect GL context, you're better served
by a immediate X error than actually trying to use an indirect GL
context and finding out that it doesn't support doing anything you
want, slowly). This flag gives you a chance to disable indirect GLX
in environments where you just don't need it.
I put in both the '+' and '-' arguments right now, so that it's easy
to patch the value to change the default policy.
Signed-off-by: Eric Anholt <eric@anholt.net>
Acked-by: Julien Cristau <jcristau@debian.org>
Reviewed-by: Keith Packard <keithp@keithp.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit a4d96afdbddb7a636df8e336059d3a5624f2e6ae
Author: Zhigang Gong <zhigang.gong@intel.com>
Date: Wed Apr 23 18:54:43 2014 +0900
glamor: Fallback to system memory when fail to allocate one big fbo.
Even when create a pixmap which smaller than the max_fbo_size,
it may fail due to some low level driver limitation. If that is
the case, we don't need to crash the xserver. We just need to
fallback to system memory.
See the related bug at:
https://bugs.freedesktop.org/show_bug.cgi?id=71190
Signed-off-by: Zhigang Gong <zhigang.gong@intel.com>
Reviewed-by: Michel Dänzer <michel.daenzer@amd.com>
Tested-by: Kai Wasserbach <kai@dev.carbon-project.org>
Tested-by: Erich Seifert <eseifert@error-reports.org>
Signed-off-by: Michel Dänzer <michel.daenzer@amd.com>
Signed-off-by: Eric Anholt <eric@anholt.net>
commit 21e0e373858bd7f3458172ebd465397e33b90162
Author: Michel Dänzer <michel.daenzer@amd.com>
Date: Wed Apr 23 18:54:42 2014 +0900
glamor: Fix memory leak in _glamor_copy_n_to_n()
It would leak the memory allocated for the region rects in some cases.
Found with valgrind.
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
Reviewed-by: Zhigang Gong <zhigang.gong@linux.intel.com>
Signed-off-by: Michel Dänzer <michel.daenzer@amd.com>
Signed-off-by: Eric Anholt <eric@anholt.net>
commit 4e9aabb6fc15d8052934f20c6a07801c197ec36a
Author: Anthony Waters <awaters1@gmail.com>
Date: Wed Apr 23 18:54:41 2014 +0900
glamor: Fix coordinates handling for composite source/mask pictures
There were actually two issues with the original code I believe, the
first is that the call to glamor_convert_gradient_picture wasn't
properly referencing the coordinates of the source/mask pictures. The
second, was that the updated references (x_temp/y_temp) were also
improperly set, they should always be 0 because the temp pictures are
new ones that start at (0, 0). The reason it worked in certain cases
and it didn't in others (notably the tray icons) was due to the
numbers working out based on the call to glamor_composite. In the
cases that it did work extent->x1 would equal x_dest and extent->y1
would equal y_dest, making it so what was actually passed into
glamor_convert_gradient_picture and the settings for x_temp/y_temp
were correct. However, for the case when extent->x1 wouldn't equal
x_dest and extent->y1 wouldn't equal y_dest (for example with the tray
icons) then the wrong parameters get passed into
glamor_convert_gradient_picture and x_temp/y_temp are set improperly.
Fixes issues with tray icons not appearing properly in certain cases.
Bug:
https://bugs.freedesktop.org/show_bug.cgi?id=64738
Signed-Off-by: Anthony Waters <awaters1@gmail.com>
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
Reviewed-by: Zhigang Gong <zhigang.gong@linux.intel.com>
Signed-off-by: Michel Dänzer <michel.daenzer@amd.com>
Signed-off-by: Eric Anholt <eric@anholt.net>
commit 5062b4fadd977d044e54b53b7f3e02e466eac9a9
Author: Keith Packard <keithp@keithp.com>
Date: Sun Mar 16 20:44:48 2014 -0700
glamor: Add glamor_transfer based glamor_get_image and glamor_put_image
These use the upload_boxes and download_boxes helpers to provide
reasonably efficient image transfer.
Fixes segfaults in Xephyr with x11perf -reps 1.
Performance improvements:
Improves -putimage10 by 548.218% +/- 88.601% (n=10).
Improves -putimage500 by 3.71014% +/- 1.5049% (n=10).
Improves -getimage10 by 8.37004% +/- 4.58274% (n=10).
No statistically significant difference on -getimage500 (n=10).
v2: Fix rebase failures, don't forget to check/prepare the gc in
putimage fallbacks (changes by anholt).
Signed-off-by: Keith Packard <keithp@keithp.com>
Signed-off-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Eric Anholt <eric@anholt.net>
commit 747160016ba2d0cd42ad6b174cbf927d67c01875
Author: Keith Packard <keithp@keithp.com>
Date: Tue Apr 22 16:33:45 2014 -0700
glamor: Wire alpha to 1 for pictures without alpha bits
When sourcing a picture that has no alpha values, make sure any
texture fetches wire the alpha value to one. This ensures that bits
beyond the depth of the pixmap, or bits other than the RGB values
aren't used.
Signed-off-by: Keith Packard <keithp@keithp.com>
Signed-off-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Eric Anholt <eric@anholt.net>
commit a69907288d59792fd783f2f1756cde03d4a06f97
Author: Michel Dänzer <michel.daenzer@amd.com>
Date: Mon Apr 21 17:47:15 2014 +0900
glx: If DRI2GetBuffers changes the GL context, call it again
By changing the context, it may also invalidate the DRI2 buffer
information, so we need to get that again.
Fixes crashes due to use-after-free with LIBGL_ALWAYS_INDIRECT=1
glxgears and piglit.
Signed-off-by: Michel Dänzer <michel.daenzer@amd.com>
Signed-off-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Adam Jackson <ajax@redhat.com>
commit f6abfece3e59fa8c2e14a61430133816837855f8
Author: Eric Anholt <eric@anholt.net>
Date: Thu Apr 17 18:50:13 2014 -0700
glamor: Move a make_current before the first GL call entrypoint.
Fixes a usage of the wrong context with swrast GLX's GetImage entrypoint.
Reviewed-by: Michel Dänzer <michel.daenzer@amd.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
commit 707726b155a2a086d12e0a6abef7f1e59def5370
Author: Eric Anholt <eric@anholt.net>
Date: Fri Apr 4 07:03:46 2014 +0100
glamor: Do the same MakeCurrent(None) for GLX as we do for EGL.
Signed-off-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Michel Dänzer <michel.daenzer@amd.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
commit 482b06a95a0a2c9a58bc196eb3dd928d796853df
Author: Eric Anholt <eric@anholt.net>
Date: Fri Apr 4 07:03:31 2014 +0100
glamor: Explain the weird EGL_NO_CONTEXT code.
Signed-off-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Michel Dänzer <michel.daenzer@amd.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
commit fab0a4a4c9dad2275bb398d09632f4274b5e16f2
Author: Eric Anholt <eric@anholt.net>
Date: Fri Mar 14 17:31:18 2014 -0700
glamor: Replace glamor_get/put_context() with just glamor_make_current().
Now that we have the DIX global state for the current context, we
don't need to track nesting to try to reduce MakeCurrent overhead.
v2: Fix a mistaken replacement of a put_context with make_current in
glamor_fill_spans_gl() (caught by keithp).
Signed-off-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Michel Dänzer <michel.daenzer@amd.com> (v1)
Reviewed-by: Adam Jackson <ajax@redhat.com> (v1)
commit 11ff12d4e74c0b514cb62cc47df9770c91e5002a
Author: Eric Anholt <eric@anholt.net>
Date: Fri Mar 14 17:29:31 2014 -0700
glamor: Stop unsetting the EGL context in put_context().
This matches the Xephyr behavior. Now that we know when to reset the
context in the presence of GLX, we don't need to try to keep our stuff
from being smashed by GLX.
Signed-off-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Michel Dänzer <michel.daenzer@amd.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
commit b5e394b3f5d80749af0148611df2eb009e7bf823
Author: Eric Anholt <eric@anholt.net>
Date: Fri Mar 14 17:20:12 2014 -0700
glamor: Use lastGLContext to coordinate the context with GLX.
This gets us some more context changes that are needed to make sure
the two sides render to the right drawables and manipulate the right
objects.
Signed-off-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Michel Dänzer <michel.daenzer@amd.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
commit ab6e958a2e611b03e475c16d10beb9961d8dffc8
Author: Eric Anholt <eric@anholt.net>
Date: Wed Apr 9 10:23:01 2014 -0700
glx: Make sure that DRI2/swrast calls haven't changed the GL context.
These functions are called from the GL driver, in some series of GL
calls by GLX. If some server component (like glamor CreatePixmap for
GetBuffers()) changes the GL context on us, we need to set it back or
the later GL calls will land in the glamor context instead of the GLX
context.
Signed-off-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Michel Dänzer <michel.daenzer@amd.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
commit f3f2fb6baac3d2b248eb4b0da13fe95e9dc3de7d
Author: Eric Anholt <eric@anholt.net>
Date: Wed Apr 9 11:25:32 2014 -0700
glx: Refactor DRI2CopyRegion calls.
I needed to add some code to each one, so it's a good time to make a
helper func.
Signed-off-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Michel Dänzer <michel.daenzer@amd.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
commit 008f1ab31e8ac6be8f3fb11f19cdf8674be318dd
Author: Eric Anholt <eric@anholt.net>
Date: Thu Apr 17 18:28:54 2014 -0700
glx: Unconditionally clear lastGLContext on loseCurrent().
This hook calls unbindContext in the DRI driver interface, which
unsets the dispatch table, regardless of whether the context argument
was the current one or not.
Signed-off-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Michel Dänzer <michel.daenzer@amd.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
commit 789509ef5324ce9141222fa92dea51b5cc777209
Author: Eric Anholt <eric@anholt.net>
Date: Thu Apr 17 18:23:51 2014 -0700
glx: Move GLX MakeCurrent lastGLContext updates next to makeCurrent().
We want to make sure that lastGLContext is set correctly during
makeCurrent, because we may have recursive GL context changes in the
DRI2 interfaces due to glamor.
Signed-off-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Michel Dänzer <michel.daenzer@amd.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
commit abf12027063dbe22bec1d055ad8db365cf07395a
Author: Eric Anholt <eric@anholt.net>
Date: Thu Apr 17 18:18:49 2014 -0700
glx: Move the GLX variable caching what GL context is current to dix.
GLX is trying to track whether the context it wants is current, to
avoid the glFlush() (and the rest of the overhead) that occurs on all
MakeCurrent calls. However, its cache can be incorrect now that
glamor exists. This is a step toward getting glamor to coordinate
with GLX.
Signed-off-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Michel Dänzer <michel.daenzer@amd.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
commit f12221cbd8ff33070fa2ca086bccf7ed32115f0e
Author: Eric Anholt <eric@anholt.net>
Date: Wed Apr 16 16:16:21 2014 -0700
glamor: Fix a missing set of the GL context.
Signed-off-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Keith Packard <keithp@keithp.com>
Reviewed-by: Michel Dänzer <michel.daenzer@amd.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
commit e924034269532979f1e88947ee9c33d30461edae
Author: Eric Anholt <eric@anholt.net>
Date: Mon Apr 21 10:56:38 2014 -0700
glamor: Fix accelerated rendering of GTK's ARGB vs xBGR composites.
There is some complicated code to support tweaking the format as we
upload from a SHM pixmap (aka the GTK icon cache), but if we weren't
sourcing from a SHM pixmap we just forgot to check that the formats
matched at all.
We could potentially be a little more discerning here (xRGB source and
ARGB mask would be fine, for example), but this will all change with
texture views anyway, so just get the rendering working for 1.16
release.
Fixes the new rendercheck gtk_argb_xbgr test.
v2: Squash in keithp's fix for checking that we have a non-NULL
pixmap, and reword the comment even more.
Signed-off-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Keith Packard <keithp@keithp.com>
commit 4bbee6761d49478fa40ec5daa2797f13ae96ce5c
Author: Jamey Sharp <jamey@minilop.net>
Date: Fri Apr 18 09:31:09 2014 -0700
Make glamor build with --enable-debug.
Bad anholt, no biscuit. Broken in commit
4c9a20072552c52b3763bd73e7a7e9b9cb8b4993.
Signed-off-by: Jamey Sharp <jamey@minilop.net>
Cc: Eric Anholt <eric@anholt.net>
Signed-off-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Eric Anholt <eric@anholt.net>
commit ba2432a020a9f9bd0892f643117795336ba0fc16
Author: Adam Jackson <ajax@redhat.com>
Date: Thu Apr 10 11:34:28 2014 -0400
xfixes: Forbid manipulating clip for source-only pictures (#28968)
Just throw BadPicture instead of crashing. It's not currently a
meaningful thing to do anyway, RenderSetPictureRectangles would error if
you tried (which this patch changes to BadPicture as well for
consistency). The problem with trying to do it is if the clip is
specified as a pixmap then we try to convert it to a region, and
->BitmapToRegion requires a ScreenPtr, and source-only pictures don't
have one.
I can imagine a use for client clip on source-only pictures, so if we
really wanted to allow this, probably the way forward is to always store
the clip as a region internally, and when setting the clip _from_ a
pixmap, look up BitmapToRegion relative to the pixmap not the picture.
But since clearly nobody can be relying on it working...
Signed-off-by: Adam Jackson <ajax@redhat.com>
Reviewed-by: Hans de Goede <hdegoede@redhat.com>
Reviewed-by: Keith Packard <keithp@keithp.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 70e564104b69bc53d29633f392f2c1ab94caddc9
Author: Dominik Behr <dbehr@chromium.org>
Date: Tue Apr 1 20:36:13 2014 -0700
xf86RandR12: use correct gamma size when allocating gamma table
When setting crtc->gamma_size to randr_crtc->gammaSize we should
use randr_crtc->gammaSize to allocate new gamma table in crtc.
Currently, if randr_crtc->gammaSize > crtc->gammaSize the subsequent
memcpy will overwrite memory beyond the end of gamma table.
Signed-off-by: Dominik Behr <dbehr@chromium.org>
Reviewed-by: Stéphane Marchesin <marcheu@chromium.org>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 35d275c7519570ceaf82cd5e7a663a8a5be4d441
Author: Eric Anholt <eric@anholt.net>
Date: Fri Apr 4 08:38:33 2014 +0100
os: Initialize the set of signals to be suppressed during our handler.
Fixes a valgrind complaint:
==8805== Syscall param rt_sigaction(act->sa_mask) points to uninitialised byte(s)
==8805== at 0x5EB8315: __libc_sigaction (sigaction.c:66)
==8805== by 0x5B13DA: busfault_init (busfault.c:145)
==8805== by 0x5A60A2: OsInit (osinit.c:191)
==8805== by 0x46EBA2: dix_main (main.c:163)
Signed-off-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 19e5a13970ad9d440c0789395e94931429ef4fbb
Author: YunQiang Su <wzssyqa@gmail.com>
Date: Sat Oct 12 13:22:35 2013 +0800
Fix hw/xfree86/common/compiler.h for mips64
Mark mips64 as 64bit
Use long as PORT_SIZE
Signed-off-by: YunQiang Su <wzssyqa@gmail.com>
Reviewed-by: Matt Turner <mattst88@gmail.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit f466fb2432292d74123d701764c432d3aa75ef1d
Author: Adam Jackson <ajax@redhat.com>
Date: Thu Apr 10 11:45:37 2014 -0400
xres: Fix size estimation for <8bpp pixmaps (#69057)
Just use floats, it's not like this is a performance path.
Signed-off-by: Adam Jackson <ajax@redhat.com>
Reviewed-by: Julien Cristau <jcristau@debian.org>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 5df66822c9f6bac1ed3952971958068600ccd095
Author: Keith Packard <keithp@keithp.com>
Date: Mon Apr 21 21:38:28 2014 -0700
shadowfb: Fix compilation errors
Ok, that's embarassing -- I didn't even make sure Adam's patch
compiled. These are minimal fixes to make it build.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 2dcb1672620ef5f16111517e9e7a98cf97deb678
Author: Adam Jackson <ajax@redhat.com>
Date: Thu Apr 10 13:42:42 2014 -0400
shadowfb: Port to miext/damage (#31303, #65547)
Somewhat shocking how much simpler this is, isn't it? We no longer need
to wrap the screen or GC or Picture, because damage does it for us,
which is doubly great since the old shadowfb code didn't wrap _enough_
things (border updates and Render glyphs, at least). The only real
difference now between this and shadow is a) shadow will let you track
arbitrary pixmaps, and b) shadow's update hook runs off the BlockHandler
whereas shadowfb is immediate.
Tested on nouveau.
Signed-off-by: Adam Jackson <ajax@redhat.com>
Reviewed-by: Keith Packard <keithp@keithp.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 8edeac202ecbace859b7889dd811424471dcca73
Author: Peter Harris <pharris@opentext.com>
Date: Wed Apr 16 20:24:34 2014 -0400
composite: Fix memory leak in compCopyWindow
Signed-off-by: Peter Harris <pharris@opentext.com>
Reviewed-by: Keith Packard <keithp@keithp.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 935ea0d7b5e18ad8f22ee074a08cbdc7390d0f5d
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Mon Apr 21 15:18:45 2014 -0700
dmxConfigCanvasUpdate: Delay dereference until after checking for NULL
Flagged by cppcheck 1.64:
[hw/dmx/config/xdmxconfig.c:306] -> [hw/dmx/config/xdmxconfig.c:323]:
(warning) Possible null pointer dereference: fs - otherwise
it is redundant to check it against null.
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Keith Packard <keithp@keithp.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 983e30361f49a67252d0b5d82630e70724d69dbf
Author: Peter Harris <pharris@opentext.com>
Date: Fri Apr 11 17:44:59 2014 -0400
fb: Fix origin of source picture in fbGlyphs
If a source picture doesn't repeat and a mask format is specified, the
incorrect calulation of the origin of the glyphs caused the glyphs to
not be drawn at all.
Noticed when running gtk-demo from RHEL 6.5 and selecting "Rotated
Text".
Signed-off-by: Peter Harris <pharris@opentext.com>
Reviewed-by: Keith Packard <keithp@keithp.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
/* Test for this bug
cc -std=c99 -o glyph glyph.c `pkg-config --cflags --libs xcb-render`
*/
// 16 x 16 pictfmt_a8 "glyph"
static const char glyph[] = {
0xff, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0xff,
0, 0xff, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0xff, 0,
0, 0, 0xff, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0xff, 0, 0,
0, 0, 0, 0xff, 0, 0, 0, 0, 0, 0, 0, 0, 0xff, 0, 0, 0,
0, 0, 0, 0, 0xff, 0, 0, 0, 0, 0, 0, 0xff, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0xff, 0, 0, 0, 0, 0xff, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0xff, 0, 0, 0xff, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0xff, 0xff, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0xff, 0xff, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0xff, 0, 0, 0xff, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0xff, 0, 0, 0, 0, 0xff, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0xff, 0, 0, 0, 0, 0, 0, 0xff, 0, 0, 0, 0,
0, 0, 0, 0xff, 0, 0, 0, 0, 0, 0, 0, 0, 0xff, 0, 0, 0,
0, 0, 0xff, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0xff, 0, 0,
0, 0xff, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0xff, 0,
0xff, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0xff,
};
static struct {
uint8_t len;
uint8_t pad[3];
uint16_t deltax, deltay;
uint8_t glyph;
uint8_t pad2[3];
} elt = { len:1, glyph:1, deltax:WIN_SIZE/2 - GLYPH_SIZE/2, deltay:WIN_SIZE/2 - GLYPH_SIZE/2 };
int main(int argc, char *argv[])
{
int screen;
xcb_connection_t *c = xcb_connect(NULL, &screen);
if (!c || xcb_connection_has_error(c)) {
fprintf(stderr, "Cannot open default display \"%s\"\n", getenv("DISPLAY"));
return EXIT_FAILURE;
}
// Find root window and depth
const xcb_setup_t *setup = xcb_get_setup(c);
if (screen >= setup->roots_len)
screen = 0;
xcb_screen_iterator_t si = xcb_setup_roots_iterator(setup);
for (int i=0; i < screen; i++)
xcb_screen_next(&si);
xcb_window_t root = si.data->root;
uint8_t depth = si.data->root_depth;
xcb_visualid_t visual = si.data->root_visual;
// Find picture formats
xcb_render_query_pict_formats_reply_t *qpf;
qpf = xcb_render_query_pict_formats_reply(c, xcb_render_query_pict_formats(c), NULL);
if (!qpf) {
fprintf(stderr, "Cannot query RENDER picture formats\n");
return EXIT_FAILURE;
}
xcb_render_pictformat_t fmt_a8 = 0;
xcb_render_pictforminfo_iterator_t pfi =
xcb_render_query_pict_formats_formats_iterator(qpf);
for (int i = 0; i < xcb_render_query_pict_formats_formats_length(qpf); i++) {
if (pfi.data->depth == 8 &&
pfi.data->type == XCB_RENDER_PICT_TYPE_DIRECT &&
pfi.data->direct.alpha_mask == 0xFF) {
fmt_a8 = pfi.data->id;
break;
}
xcb_render_pictforminfo_next(&pfi);
}
if (!fmt_a8) {
fprintf(stderr, "Cannot find a8 RENDER picture format\n");
return EXIT_FAILURE;
}
xcb_render_pictformat_t fmt_visual = 0;
xcb_render_pictscreen_iterator_t psi =
xcb_render_query_pict_formats_screens_iterator(qpf);
for (int i = 0; i < xcb_render_query_pict_formats_screens_length(qpf); i++) {
xcb_render_pictdepth_iterator_t pdi =
xcb_render_pictscreen_depths_iterator(psi.data);
for (int j = 0; i < xcb_render_pictscreen_depths_length(psi.data); i++) {
xcb_render_pictvisual_iterator_t pvi =
xcb_render_pictdepth_visuals_iterator(pdi.data);
for (int k = 0; k < xcb_render_pictdepth_visuals_length(pdi.data); i++) {
if (pvi.data->visual == visual) {
fmt_visual = pvi.data->format;
goto found_visual;
}
xcb_render_pictvisual_next(&pvi);
}
xcb_render_pictdepth_next(&pdi);
}
xcb_render_pictscreen_next(&psi);
}
found_visual:
if (!fmt_visual) {
fprintf(stderr, "Cannot find visual RENDER picture format\n");
return EXIT_FAILURE;
}
xcb_render_glyphset_t glyphset = xcb_generate_id(c);
xcb_render_create_glyph_set(c, glyphset, fmt_a8);
uint32_t glyph_ids[] = {1};
xcb_render_add_glyphs(c, glyphset, 1, glyph_ids,
&(xcb_render_glyphinfo_t){width:GLYPH_SIZE, height:GLYPH_SIZE}, sizeof(glyph), glyph);
// Create window, pixmap, and gc
xcb_window_t window = xcb_generate_id(c);
uint32_t list[] = { si.data->black_pixel, XCB_EVENT_MASK_EXPOSURE };
xcb_create_window(c, XCB_COPY_FROM_PARENT, window, root, 0, 0, WIN_SIZE, WIN_SIZE,
0, XCB_WINDOW_CLASS_INPUT_OUTPUT, XCB_COPY_FROM_PARENT,
XCB_CW_BACK_PIXEL | XCB_CW_EVENT_MASK, list);
xcb_map_window(c, window);
xcb_render_picture_t winpic = xcb_generate_id(c);
xcb_render_create_picture(c, winpic, window, fmt_visual, 0, NULL);
xcb_pixmap_t pixmap = xcb_generate_id(c);
xcb_create_pixmap(c, depth, pixmap, window, GLYPH_SIZE, GLYPH_SIZE);
xcb_render_picture_t pixpic = xcb_generate_id(c);
xcb_render_create_picture(c, pixpic, pixmap, fmt_visual, 0, NULL);
xcb_render_fill_rectangles(c, XCB_RENDER_PICT_OP_SRC, pixpic,
(xcb_render_color_t){green:0xFFFF, alpha:0xFFFF}, 1,
&(xcb_rectangle_t){width:GLYPH_SIZE, height:GLYPH_SIZE} );
xcb_flush(c);
for (xcb_generic_event_t *ev = xcb_wait_for_event(c); ev; ev = xcb_wait_for_event(c)) {
int type = ev->response_type;
free(ev);
if (type == XCB_EXPOSE) {
xcb_clear_area(c, 0, window, 0, 0, 0, 0);
xcb_render_composite_glyphs_8(c, XCB_RENDER_PICT_OP_SRC, pixpic, winpic, fmt_a8,
glyphset, 0, 0, sizeof(elt), (uint8_t *)&elt);
xcb_flush(c);
}
}
return EXIT_SUCCESS;
}
commit 80a0b29c3b61ba9024bd0278ea8cc51686afe3f4
Author: Michel Dänzer <michel.daenzer@amd.com>
Date: Fri Apr 11 11:01:51 2014 +0900
glamor: Add remaining header files to SOURCES
It wasn't possible to build glamor from tarballs.
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=64297#c9
Signed-off-by: Michel Dänzer <michel.daenzer@amd.com>
Reviewed-by: Keith Packard <keithp@keithp.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit ea15f8b4c90ebef21d4031bf7f412ef9241d5438
Author: Jasper St. Pierre <jstpierre@mecheye.net>
Date: Mon Apr 21 16:30:49 2014 -0400
dixfonts: Turn a missing directory ErrorF into a DebugF
On systems without these directories, we don't need to be complaining
loudly.
Reviewed-by: Kristian Hoegsberg <krh@bitplanet.net>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit ba5c2b6c876a15fe18bc1ff1ab4e773c46bc9009
Merge: 9c86d5f4f6 66b6024740
Author: Keith Packard <keithp@keithp.com>
Date: Mon Apr 21 14:59:51 2014 -0700
Merge remote-tracking branch 'krh/xwayland-for-keithp'
commit 9c86d5f4f6f5d6d135a9f2f8eae904c6441e84e5
Author: Kristian Høgsberg <krh@bitplanet.net>
Date: Tue Mar 25 14:57:12 2014 -0700
.gitignore: Add new autotools file 'test-driver'
Automake 1.12 introduces a new parallel test framework that uses a shell
script helper and generates *.log and *.trs files. Add to .gitignore.
Signed-off-by: Kristian Høgsberg <krh@bitplanet.net>
Reviewed-by: Gaetan Nadon <memsize@videotron.ca>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 28fa5dd5cad3a5fb51018250dfa2b605a8aea85c
Author: Julien Cristau <jcristau@debian.org>
Date: Mon Apr 14 15:27:19 2014 +0200
configure: require xproto 7.0.26 for pointer typedef removal
Signed-off-by: Julien Cristau <jcristau@debian.org>
Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit d2274f2f46db300ac75ca0fdcba7f5655865b8b6
Author: Julien Cristau <jcristau@debian.org>
Date: Mon Apr 14 15:27:18 2014 +0200
configure: require fontsproto 2.1.3 for pointer typedef removal
Signed-off-by: Julien Cristau <jcristau@debian.org>
Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 6d892ad112fc887e184f50c5dc2ba593668e9e11
Author: Robert Morell <rmorell@nvidia.com>
Date: Fri Apr 18 18:29:44 2014 -0700
randr: Implement RandR 1.4 request swapping
The protocol handlers all have support for swapping variable data and
replies, but the top-level dispatch plumbing was missing.
Signed-off-by: Robert Morell <rmorell@nvidia.com>
Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit ed4ee7c34a7fbb58a449647fb8d968618c499a61
Author: Robert Morell <rmorell@nvidia.com>
Date: Fri Apr 18 18:29:43 2014 -0700
randr: Fix size checks for SetProvider* reqs
Both xRRSetProviderOutputSourceReq and xRRSetProviderOffloadSinkReq are
fixed-size requests, so the length on the wire should match exactly.
Signed-off-by: Robert Morell <rmorell@nvidia.com>
Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 668321e7e5acb41c0c7b299f57165e86dc74d7ed
Author: Robert Morell <rmorell@nvidia.com>
Date: Fri Apr 18 18:29:42 2014 -0700
randr: Fix crash for NULL swap dispatch procs
The previous code was checking the wrong table for function pointers.
Signed-off-by: Robert Morell <rmorell@nvidia.com>
Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 66b602474047c499b8a888267a489790fc9f9d85
Author: Kristian Høgsberg <krh@bitplanet.net>
Date: Mon Apr 21 11:14:51 2014 -0700
xwayland: Remove left-over ErrorF logging
Reviewed-by: Jasper St. Pierre <jstpierre@mecheye.net>
Signed-off-by: Kristian Høgsberg <krh@bitplanet.net>
commit 138bf5ac9703b410a6066c303feea067680edf5a
Author: Jamey Sharp <jamey@minilop.net>
Date: Fri Apr 18 12:22:19 2014 -0700
DRI2SwapBuffers: Fix uninitialized target SBC.
Fixes Piglit test "swapbuffersmsc-return swap_interval 0".
Ensure that *swap_target gets initialized on any 'return Success' path,
even if the swap request can't be completed by the driver and the server
falls back to a simple blit. That path can also be triggered by setting
swap_interval to 0, which disables sync to vertical retrace.
We originally found this bug because for some reason SDL2 automatically
sets swap_interval to 0, when we were trying to test OML_sync_control in
an SDL2 test application. We then discovered that the above-mentioned
Piglit test has been failing for the same reason since it was
introduced.
Signed-off-by: Jamey Sharp <jamey@minilop.net>
Signed-off-by: Theo Hill <Theo0x48@gmail.com>
Reviewed-by: Keith Packard <keithp@keithp.com>
Reviewed-by: Eric Anholt <eric@anholt.net>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 4927af4475bc7d020190d9f468c90366525c1109
Author: Jamey Sharp <jamey@minilop.net>
Date: Fri Apr 18 12:22:18 2014 -0700
DRI2SwapBuffers: Don't reuse swap_target variable.
swap_target is an out-parameter that needs to be set to the value that
SBC will take on after this SwapBuffers request completes.
However, it was also being used as a temporary variable to hold the MSC
at which the SwapBuffers request got scheduled to occur. This confusion
makes it harder to reason about whether swap_target is being set
correctly for its out-parameter usage. (Hint: It isn't.)
For the latter use, it makes more sense to use the existing target_msc
variable, which already has the right value unless target_msc, divisor,
and remainder are all 0, in which case we can set it using swap_interval
as usual.
Signed-off-by: Jamey Sharp <jamey@minilop.net>
Signed-off-by: Theo Hill <Theo0x48@gmail.com>
Reviewed-by: Keith Packard <keithp@keithp.com>
Reviewed-by: Eric Anholt <eric@anholt.net>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit d2c6e801b548674b8636e6a64b42c9038d46263c
Author: Kristian Høgsberg <krh@bitplanet.net>
Date: Tue Apr 8 09:23:42 2014 -0700
configure.ac: Remove check for WAYLAND_SCANNER_RULES
This makes configure fail if the wayland autoconf macros aren't found.
We don't need the scanner for shm-only xwayland so just drop this line for
now.
Reviewed-by: Daniel Stone <daniel@fooishbar.org>
Reviewed-by: Gaetan Nadon <memsize@videotron.ca>
Reviewed-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
Signed-off-by: Kristian Høgsberg <krh@bitplanet.net>
commit f618455c802abb77de8d64eb442422cfe5e26ea8
Author: Kristian Høgsberg <krh@bitplanet.net>
Date: Tue Apr 8 09:19:13 2014 -0700
xwayland: Build without xshmfence
Reviewed-by: Daniel Stone <daniel@fooishbar.org>
Signed-off-by: Kristian Høgsberg <krh@bitplanet.net>
commit 552d40b26a082df6f1816bb461793b8fa8b553c6
Author: Kristian Høgsberg <krh@bitplanet.net>
Date: Tue Apr 8 09:17:51 2014 -0700
xwayland: Build without GLX extension
Reviewed-by: Daniel Stone <daniel@fooishbar.org>
Signed-off-by: Kristian Høgsberg <krh@bitplanet.net>
commit c7011249d2abe6cc7af82ee4b79d8f6873444707
Author: Keith Packard <keithp@keithp.com>
Date: Fri Apr 18 15:12:14 2014 -0700
xkb: Verify reads of compiled keymap header and TOC
Check the return values from fread to make sure the elements are
actually getting read from the file.
Signed-off-by: Keith Packard <keithp@keithp.com>
Reviewed-by: Jamey Sharp <jamey@minilop.net>
commit 0af8788579c2f52cc1172952c9004483bf863932
Author: Keith Packard <keithp@keithp.com>
Date: Fri Apr 18 15:09:50 2014 -0700
os: Ignore log file write failures
There's no place to log the message if writing to the log file fails,
and we surely don't want to crash in that case, so just ignore errors
and keep going.
Signed-off-by: Keith Packard <keithp@keithp.com>
Reviewed-by: Jamey Sharp <jamey@minilop.net>
commit 7abd28685066369ded807f59493c1159cfb286bf
Author: Keith Packard <keithp@keithp.com>
Date: Fri Apr 18 15:05:00 2014 -0700
os: Make sure that writing our pid to the lock file actually worked
There's no sense verifying that we can create the lock file and then
ignoring the return value from write.
Signed-off-by: Keith Packard <keithp@keithp.com>
Reviewed-by: Jamey Sharp <jamey@minilop.net>
commit d72f691c0c9cace857975a6608a4cb431c8b6846
Author: Keith Packard <keithp@keithp.com>
Date: Fri Apr 18 15:00:30 2014 -0700
os: FatalError if -displayfd writes fail
When the server is started with the -displayfd option, check to make
sure that the writes succeed and give up running if they don't.
Signed-off-by: Keith Packard <keithp@keithp.com>
Reviewed-by: Jamey Sharp <jamey@minilop.net>
commit 4957e986841225e9984daca76f1a0ee08df125bb
Author: Keith Packard <keithp@keithp.com>
Date: Fri Apr 18 15:00:35 2014 -0700
os: Clear the -displayfd option after closing the file
Failing to clear this means that we'll attempt to write the display
number to a random file descriptor on subsequent X server generations.
Signed-off-by: Keith Packard <keithp@keithp.com>
Reviewed-by: Jamey Sharp <jamey@minilop.net>
commit 0c0feddbcda238efa82a47f456ef3008ffa53195
Author: Keith Packard <keithp@keithp.com>
Date: Fri Apr 18 14:54:02 2014 -0700
kdrive: Ignore failure to chown console tty to current user
I'm not sure what we'd do in this case anyways, other than fatal
error.
Signed-off-by: Keith Packard <keithp@keithp.com>
Reviewed-by: Jamey Sharp <jamey@minilop.net>
commit 696e08f8e820449bb4b0ce7a60bf5b5bc5097935
Author: Keith Packard <keithp@keithp.com>
Date: Fri Apr 18 14:50:14 2014 -0700
kdrive: Explicitly ignore errors from the -switchCmd script
Make it clear that we intentionally ignore the -switchCmd return
value. This keeps GCC from emitting a warning when the server is
compiled with -D_FORTIFY_SOURCE=2.
Signed-off-by: Keith Packard <keithp@keithp.com>
Reviewed-by: Jamey Sharp <jamey@minilop.net>
commit 570b1c79942b237022be3594ae3a25e7b833cb73
Author: Keith Packard <keithp@keithp.com>
Date: Fri Apr 18 14:47:00 2014 -0700
test: [v2] Validate server log reading more carefully in signal-logging test
Check return value from fgets and strchr instead of assuming they
worked.
[v2]
Don't do any necessary work inside the assert call.
Also make sure the return value was long enough.
Signed-off-by: Keith Packard <keithp@keithp.com>
Reviewed-by: Jamey Sharp <jamey@minilop.net>
commit 3119aae80782b7ff5613c719fbcc8a01feab1134
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Fri Apr 4 14:59:21 2014 -0400
test: create a link to the generated hw/xfree86/sdksyms.c at build time
Automake 1.14 gives us warning about source code specified in _SOURCES
that comes from directories other than the current one. It suggests to enable
the subdir-objects feature which only supports code in sub directories.
The test directory needs source from hw/xfree86 which is neither under test
nor under a sub directory of test. In 1.14 we get a warning, in 2.0 it will
break as it will overwrite the object code in xfree86.
The solution in this case is to create a link to hw/xfree86/sdksyms.c at build
time. It's just like any other built source file.
There are no links created in git.
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
Reviewed-by: Keith Packard <keithp@keithp.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 58ef01648b18f85ad79620da110ece2339f638c3
Author: Adam Jackson <ajax@redhat.com>
Date: Thu Apr 17 10:49:46 2014 -0400
dri1: Don't bother asking the loader about drmGetLibVersion
This was added for DRM_IOCTL_SET_VERSION support, which has been around
for over ten years now. Since we require ≥2.3.0 in configure.ac this
would really only protect you if you managed to build against a modern
libdrm but run against one that's more than 7½ years old, which, doctor
it hurts when I do this.
Archaeology: http://cgit.freedesktop.org/~ajax/dri/commit/xc/programs/Xserver/GL/dri/dri.c?id=77d62efca033dced96ab7998b7c62a4e2df907d5
Signed-off-by: Adam Jackson <ajax@redhat.com>
Reviewed-by: Eric Anholt <eric@anholt.net>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 461ed561b9f75cee43c0dfd39228716f977956e7
Author: Hans de Goede <hdegoede@redhat.com>
Date: Fri Apr 18 11:30:16 2014 +0200
Xorg.wrap manpages: use __appmansuffix__ instead of hardcoding 1
Cc: Gaetan Nadon <memsize@videotron.ca>
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Reviewed-by: Gaetan Nadon <memsize@videotron.ca>
commit 584961c86427b400a5ba65b0f145d00748d2da1e
Author: Hans de Goede <hdegoede@redhat.com>
Date: Fri Apr 18 11:26:00 2014 +0200
man/Makefile.am: Fix Xorg.wrap.man Xwrapper.config.man missing from make dist
Fix suggested by: Gaetan Nadon <memsize@videotron.ca>
Cc: Gaetan Nadon <memsize@videotron.ca>
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Reviewed-by: Gaetan Nadon <memsize@videotron.ca>
commit ec01d51a9973a9cf5f32f14f00058f1fdc9ed25e
Author: Guillem Jover <guillem@hadrons.org>
Date: Mon Apr 14 18:13:25 2014 +0200
Xorg.wrap: Make the console check portable
Handle the unported case by issuing a build-time and run-time warning.
And add support for FreeBSD kernel based systems, by using the
VT_GETINDEX ioctl to check if the file descriptor is on a virtual
console.
Signed-off-by: Guillem Jover <guillem@hadrons.org>
Reviewed-by: Hans de Goede <hdegoede@redhat.com>
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
commit 3a469917b585914ba2421e305f3b6a837b232e93
Author: Guillem Jover <guillem@hadrons.org>
Date: Mon Apr 14 18:13:24 2014 +0200
Xorg.wrap: Clarify error messages
Not printing the program name produces very confusing messages that
might be difficult to attribute while trying to diagnose problems,
let's be explicit about who we are.
Also add a missing "/" between SUID_WRAPPER_DIR and "Xorg.bin".
Signed-off-by: Guillem Jover <guillem@hadrons.org>
Reviewed-by: Hans de Goede <hdegoede@redhat.com>
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
commit 50b6e1b0d786d95ee8eab030b0d1fd7420e2fbeb
Author: Guillem Jover <guillem@hadrons.org>
Date: Mon Apr 14 18:13:23 2014 +0200
Xorg.wrap: Use <drm.h> instead of hardcoding libdrm include path
The libdrm.pc file gives us the correct include path, do not try to
hardcode it on the source, as it might vary on the installed system,
for example on Debian-based systems it's under /user/include/libdrm/.
Signed-off-by: Guillem Jover <guillem@hadrons.org>
Reviewed-by: Hans de Goede <hdegoede@redhat.com>
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
commit 7bffceb9f939c0bf5529b00500cbb14ae01bb61a
Author: Guillem Jover <guillem@hadrons.org>
Date: Mon Apr 14 18:13:22 2014 +0200
Xorg: Add Xorg.wrap to hw/xfree86/.gitignore
Signed-off-by: Guillem Jover <guillem@hadrons.org>
Reviewed-by: Hans de Goede <hdegoede@redhat.com>
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
commit 208157a76c6f340e0161e18ac77149d7110af2f5
Author: Julien Cristau <jcristau@debian.org>
Date: Sun Apr 13 19:14:34 2014 +0200
configure: fix help text for dmx
As of 93fa64e17d7bd600ebf18ecab85f5b2d17fe30ce it's disabled by default,
so stop saying it's automatically enabled in configure --help.
Signed-off-by: Julien Cristau <jcristau@debian.org>
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
Reviewed-by: Hans de Goede <hdegoede@redhat.com>
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
commit c917fa411502d402b9c69de30f6a88e102bb8610
Author: Keith Packard <keithp@keithp.com>
Date: Tue Apr 8 01:01:28 2014 -0700
glamor: Always allocate precisely the requested pixmap size
Using a pixmap as a tile or stipple means that we must have the
underlying FBO match the pixmap geometry exactly. We may want to add
some complexity here to migrate pixmaps into exact sized objects as
necessary, but for now, make the server work correctly by skipping
this optimization.
Signed-off-by: Keith Packard <keithp@keithp.com>
Reviewed-by: Eric Anholt <eric@anholt.net>
commit 3028ae6c9aa37168e249e0d847b29f8e3efb05b2
Merge: bd3de10f86 ec6007e6f7
Author: Keith Packard <keithp@keithp.com>
Date: Wed Apr 9 21:59:17 2014 -0700
Merge remote-tracking branch 'jeremyhu/master'
commit bd3de10f86a511886b0748d55fa19860314a0150
Author: Keith Packard <keithp@keithp.com>
Date: Tue Apr 8 14:25:18 2014 -0700
Bump to version 1.15.99.902. Closing the 1.16 merge window.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 6ec04a75deb1695820e337abbefe1929d5928f15
Author: Keith Packard <keithp@keithp.com>
Date: Fri Apr 4 16:28:43 2014 -0700
dri3: Fix dri3_open API change by adding new dri3_open_client
Xwayland will eventually need the current client in dri3_open. Simply
changing that API is not an option though as other drivers that
implement DRI3 will not have a matching function signature and will
crash when called.
Add a new dri3_open_client function pointer and bump
DRI3_SCREEN_INFO_VERSION so that drivers can be aware of the new
function which will be used in preference to the old function when
available.
Signed-off-by: Keith Packard <keithp@keithp.com>
Reviewed-by: Eric Anhole <eric@anholt.net>
commit ec6007e6f7772a90713c9c51c64359229961ce27
Author: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
Date: Sun Apr 6 05:32:00 2014 -0700
XQuartz: Ensure we wait for the server thread to terminate
AKA: XQuartz 2.7.5 doesn't delete its /tmp/.X$d-lock
http://xquartz.macosforge.org/trac/ticket/823
Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
commit 901fbfbbbd71c0d82080957f8ba09eebbc786f2b
Author: Michael Thayer <michael.thayer@oracle.com>
Date: Mon Mar 31 11:21:42 2014 +0200
Add a return value to load_cursor_argb() to allow it to report failure
load_cursor_argb() may need to be able to fail and have the server fall back
to a software cursor in at least the following circumstances.
1) The hardware can only support some ARGB cursors and this does not just
depend on cursor size.
2) Virtual hardware may not wish to pass through a cursor to the host at a
particular time but may wish to accept the same cursor at another time.
This patch adds a return value to the API and makes the server do the
software fall-back on failure.
Signed-off-by: Michael Thayer <michael.thayer@oracle.com>
Reviewed-by: Dave Airlie <airlied@redhat.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 62ab4102260fd3342a0e5ae3a4f77b430af64f4e
Author: Michael Thayer <michael.thayer@oracle.com>
Date: Mon Mar 31 11:19:16 2014 +0200
Set a flag property on the root window to say if the X server VT is active
An X11 client may need to know whether the X server virtual terminal is
currently the active one. This change adds a root window property which
provides that information. Intended interface user: the VirtualBox Guest
Additions.
Signed-off-by: Michael Thayer <michael.thayer@oracle.com>
Reviewed-by: Dave Airlie <airlied@redhat.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit b851ca968b7cce6d1a6438c05d3d5c8832249704
Author: Daniel Stone <daniels@collabora.com>
Date: Thu Apr 3 18:22:50 2014 +0100
Add pScreen->NameWindowPixmap hook
This hook allows drivers to be notified when a pixmap gains a new ID.
(ABI break.)
Signed-off-by: Daniel Stone <daniels@collabora.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit b4d0bec22c15930abf13a7fb9d684208ccd56b1d
Merge: 3c34dd3603 6e539d8817
Author: Keith Packard <keithp@keithp.com>
Date: Thu Apr 3 15:35:01 2014 -0700
Merge remote-tracking branch 'krh/xwayland-for-keithp'
commit 6e539d8817f738289dc2dea13d0720116287ab9d
Author: Kristian Høgsberg <krh@bitplanet.net>
Date: Tue Mar 11 16:11:39 2014 -0700
Xwayland DDX
Started out as an Xorg module to be used from Xorg drivers to let
Xorg run under a wayland server. The idea was to be able to reuse the
2D acceleration from the Xorg driver. Now with glamor being credible,
a better plan is to just make Xwayland its own DDX, similar to Xwin
and Xquartz. This is a much better fit, as much of the code in the
original approach had to hack around Xorg doing Xorg things like take
over the VT, probe input devices and read config files. Another big win
is that Xwayland dosn't need to be setuid root.
The Xwayland support for DRI3, Glamor and render nodes was done by
Axel Davy <axel.davy@ens.fr>, who also did a lot of work on the rebase
to the Xwayland DDX.
Contributions from:
Christopher James Halse Rogers <christopher.halse.rogers@canonical.com>
Corentin Chary <corentin.chary@gmail.com>
Daniel Stone <daniel@fooishbar.org>
Kristian Høgsberg <krh@bitplanet.net>
Robert Bragg <robert@linux.intel.com>
Scott Moreau <oreaus@gmail.com>
Tiago Vignatti <tiago.vignatti@intel.com>
Giovanni Campagna <gcampagn@redhat.com>
Jonas Ådahl <jadahl@gmail.com>
Ray Strode <rstrode@redhat.com>
Trevor McCort <tjmccort@gmail.com>
Rui Matos <tiagomatos@gmail.com>
Axel Davy <axel.davy@ens.fr>
Jasper St. Pierre <jstpierre@mecheye.net>
Signed-off-by: Kristian Høgsberg <krh@bitplanet.net>
Reviewed-by: Axel Davy <axel.davy@ens.fr>
commit 3c34dd3603989c0365654ca1b6809395c7f3b169
Author: Keith Packard <keithp@keithp.com>
Date: Tue Apr 1 21:15:48 2014 -0700
glamor: Add glamor_program based poly_text and image_text
Accelerates text painting with GPU-based geometry computation and stippling
v2: Simplify get_glyphs, expand single character variable names to
more descriptive ones. (Markus Wick)
v3: Rebase against the glamor_prepare_* un-renaming (changes by anholt).
Improves x11perf -f8text by 417.908% +/- 11.0144% (n=10)
Signed-off-by: Keith Packard <keithp@keithp.com>
Signed-off-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Eric Anholt <eric@anholt.net>
commit 5f700c3ac31db52f02f6ef11ea7823a8ce4f6f6f
Author: Keith Packard <keithp@keithp.com>
Date: Tue Apr 1 21:15:47 2014 -0700
glamor: Use glamor_program for glamor_glyphblt
This constructs suitable shaders using the glamor_program
infrastructure for poly glyph blt, and then gets rid of the no-op
wrapper of miImageGlyphBlt.
Improves x11perf -f8text by 11.6221% +/- 1.04585% (n=10)
Signed-off-by: Keith Packard <keithp@keithp.com>
Signed-off-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Eric Anholt <eric@anholt.net>
commit 3411e8c538476443cafbb70082ef7457932e4a38
Author: Keith Packard <keithp@keithp.com>
Date: Tue Apr 1 21:15:46 2014 -0700
glamor: Add glamor_program based poly_fill_rect
This accelerates poly_fill_rect using GPU-based geometry computation
Improves x11perf -rect100 by 41.5127% +/- 7.63888% (n=10)
Improves x11perf -rect10 by 3745.72% +/- 94.7503% (n=6)
v2: Rebase on skipping the prepare rewrite for now, and fix the GLSL
1.20 and GLES2 cases (changes by anholt).
Signed-off-by: Keith Packard <keithp@keithp.com>
Signed-off-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Eric Anholt <eric@anholt.net>
commit 0a6d31161811c422799d6f065ea2842d42707530
Author: Keith Packard <keithp@keithp.com>
Date: Tue Apr 1 21:15:45 2014 -0700
glamor: Add glamor_program based fill/set/get spans
This accelerates spans operations using GPU-based geometry computation
-wellipse500 goes from about 4k/sec before the patch, to ~8k/sec in
the GLES2 fallback loop, to ~100k/sec in desktop mode.
v2: Rebase on skipping the prepare rewrite for now, and fix the GLSL
1.20 and GLES2 cases (changes by anholt).
Signed-off-by: Keith Packard <keithp@keithp.com>
Signed-off-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Eric Anholt <eric@anholt.net>
commit d78c257f523908760c1b872cc4bef3d42eb31f50
Author: Keith Packard <keithp@keithp.com>
Date: Tue Apr 1 21:15:43 2014 -0700
glamor: Add simple upload/download functions in glamor_transfer
These use glTexSubimage2D for upload and glReadPixels for
download. There are a variety of interfaces to the basic function as
needed by the callers.
Signed-off-by: Keith Packard <keithp@keithp.com>
Signed-off-by: Eric Anholt <eric@anholt.net>
commit 693e6bea897e4c9473a9f22dd8b90df3437e04a1
Author: Keith Packard <keithp@keithp.com>
Date: Tue Apr 1 21:15:42 2014 -0700
glamor: Use plain GLSL 1.20 features for fill code.
This prevents performance regressions from losing acceleration support
on older hardware as we transition to using glamor_program.c for
acceleration.
Signed-off-by: Keith Packard <keithp@keithp.com>
Signed-off-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Eric Anholt <eric@anholt.net>
commit 5b76b3978d792c92b23a691204b473209782476e
Author: Keith Packard <keithp@keithp.com>
Date: Tue Apr 1 21:15:42 2014 -0700
glamor: Compute supported GLSL version and save in screen private
This currently computes the GLSL version in a fairly naïve fashion,
and leaves that in the screen private for other users. This will let
us update the version computation in one place later on.
v2: Drop an accidental rebase-squashed hunk (change by anholt).
Signed-off-by: Keith Packard <keithp@keithp.com>
Signed-off-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Eric Anholt <eric@anholt.net>
commit 3c2c59eed3c68c0e5a93c38cf01eedad015e3157
Author: Keith Packard <keithp@keithp.com>
Date: Tue Apr 1 21:15:41 2014 -0700
fb: Publish fbGlyphs and fbUnrealizeGlyph
This lets other code jump directly into the fb code for fallbacks
Signed-off-by: Keith Packard <keithp@keithp.com>
Signed-off-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Eric Anholt <eric@anholt.net>
commit 9dffcda804b2609f0b319d35dd47fd401d4fafce
Author: Keith Packard <keithp@keithp.com>
Date: Tue Apr 1 20:54:22 2014 -0700
glamor: Bail from composite when pixmap cannot be uploaded
I think the sense of the return value was just flipped here; if you
return TRUE, then the calling code assumes that the pixmap *has* been
uploaded and that an FBO is available. When it tries to use it, it
crashes though. Returning false makes the caller bail back to software.
Signed-off-by: Keith Packard <keithp@keithp.com>
Signed-off-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Eric Anholt <eric@anholt.net>
commit 15fec3bc3a2d29c903f35b5a30ac09e196eb36b1
Author: Keith Packard <keithp@keithp.com>
Date: Tue Apr 1 20:54:21 2014 -0700
glamor: Remove warning message when pixmap cannot be stored in a texture
This happens when you have 4bpp pixmaps; it's not an error, so stop
flooding the log file when it happens.
Signed-off-by: Keith Packard <keithp@keithp.com>
Signed-off-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Eric Anholt <eric@anholt.net>
commit 5f177f3582323b6c1791e9e2c107548b607369de
Author: Keith Packard <keithp@keithp.com>
Date: Tue Apr 1 20:54:20 2014 -0700
glamor: Public polyLines function is glamor_poly_lines_nf
There was a spurious declaratoin in glamor.h for glamor_poly_line_nf
Signed-off-by: Keith Packard <keithp@keithp.com>
Signed-off-by: Eric Anholt <eric@anholt.net>
commit 6aac97198f60de9d4e415fb4fa2fc11cac6c6790
Author: Keith Packard <keithp@keithp.com>
Date: Tue Apr 1 20:54:19 2014 -0700
glamor: Initialize XV shaders from glamor_xv_init instead of glamor_init
The glamor_init calls to glamor_init_xv_shader were never getting run
because GLAMOR_XV was never defined. Instead of trying to make that
work, fix glamor_xv_init to make the call instead.
Further, just get rid of the glamor_fini_xv_shader function entirely
as the shader program will be destroyed when the context is destroyed
at server reset time.
Signed-off-by: Keith Packard <keithp@keithp.com>
Signed-off-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Eric Anholt <eric@anholt.net>
commit 1707faf36d49a63efc462dfef133a555fe093832
Author: Keith Packard <keithp@keithp.com>
Date: Tue Apr 1 20:54:18 2014 -0700
glamor: SetWindowPixmap is not related to RENDER
Move the configuration of screen->SetWindowPixmap out from under it.
Signed-off-by: Keith Packard <keithp@keithp.com>
Signed-off-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Eric Anholt <eric@anholt.net>
commit 8d88b90953471ead3b480b6ae9d7280b8bd6b216
Author: Keith Packard <keithp@keithp.com>
Date: Tue Apr 1 20:54:15 2014 -0700
glamor: glamor_poly_point_nf cannot fail for non-DDX pixmaps
All of the glamor _nf functions must check to see if the DDX can
access the pixmap directly before returning failure back to the
driver; this restructures the point code to split out the _nf checking
from the _gl code.
Signed-off-by: Keith Packard <keithp@keithp.com>
Signed-off-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Eric Anholt <eric@anholt.net>
commit d5dd1d6371021c2aad94e33c5837ccd4bf9bf0f4
Author: Eric Anholt <eric@anholt.net>
Date: Fri Mar 21 13:13:27 2014 -0700
Revert "glx: Make sure we get an FBConfig the root window's visual."
This reverts commit b5a61239e2fef167c229154d7919ff862503e3f3.
Not only did I screw up and introduce a warning, it turns out
glXChooseFBConfig() explicitly ignores this attribute. Thanks, GLX.
Signed-off-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Julien Cristau <jcristau@debian.org>
commit 84f977467b514af88019ab2791bf7a74530b54df
Merge: 9d20d18fb9 98924719d5
Author: Keith Packard <keithp@keithp.com>
Date: Thu Apr 3 10:44:28 2014 -0700
Merge remote-tracking branch 'whot/for-keith'
commit 98924719d524bf87cdf301063cd744d1271c33ff
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Wed Apr 2 13:55:10 2014 +1000
Revert "xkb: ProcesssPointerEvent must work on the VCP if it gets the VCP"
This was the wrong fix to the problem, and it triggered a change in XKB
behavior: previously a button event would unlock a latched modifier, now it
doesn't anymore.
https://bugs.freedesktop.org/show_bug.cgi?id=73155
Note that the new behavior is is strictly spec compliant but we've had the
other behavior for a long time so we shouldn't break it.
The bug this patch originally fixed was a null-pointer dereference when
releasing button events on server shutdown. This was addressed by the commit
below, so the need for this patch has gone away anyway.
commit 3e4be4033aed78b2bb3a18d51f0963989efd1af3
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri Jan 25 11:47:32 2013 +1000
dix: when shutting down slave devices, shut down xtest devices last
This reverts commit 2decff6393a44b56d80d53570718f95354fde454.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Hans de Goede <hdegoede@redhat.com>
commit 9d65c515d83d2158b5949e249777ca2a02b31901
Author: Hans de Goede <hdegoede@redhat.com>
Date: Tue Apr 1 11:24:17 2014 +0200
xf86LogInit: log to XDG_DATA_HOME when not running as root
When no logfile was specified (xf86LogFileFrom == X_DEFAULT) and we're not
running as root log to $XDG_DATA_HOME/xorg/Xorg.#.log as Xorg won't be able to
log to the default /var/log/... when it is not running as root.
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit e738276e96590b2230dd9d9f5a3f9485f592e1e6
Author: Kristian Høgsberg <krh@bitplanet.net>
Date: Mon Mar 31 18:04:07 2014 -0700
glamor: Expose glamor_destroy_pixmap()
When we create a glamor pixmap by calling glamor_create_pixmap()
directly, we need to call glamor_destroy_pixmap() to destroy it.
Signed-off-by: Kristian Høgsberg <krh@bitplanet.net>
Reviewed-by: Keith Packard <keithp@keithp.com>
commit d14803437582668f5ffea14071ea962b6b8e450d
Author: Kristian Høgsberg <krh@bitplanet.net>
Date: Mon Mar 31 18:00:54 2014 -0700
glamor: Add new GLAMOR_CREATE_PIXMAP_NO_TEXTURE pixmap create flag
This flag lets a DDX allocate a glamor pixmap without allocating the
texture that backs it. The DDX can then allocate the texture itself
and then set it later.
Signed-off-by: Kristian Høgsberg <krh@bitplanet.net>
Reviewed-by: Keith Packard <keithp@keithp.com>
commit fe204185bc801bb17785dc8d1cde09d48b5e257f
Author: Kristian Høgsberg <krh@bitplanet.net>
Date: Mon Mar 31 17:59:18 2014 -0700
glamor: Move glamor_egl_screen_init() prototype to glamor.h
A DDX that implements the glamor EGL functions need to pull in this
prototype but shouldn't need to pull in glamor_priv.h
Signed-off-by: Kristian Høgsberg <krh@bitplanet.net>
Reviewed-by: Keith Packard <keithp@keithp.com>
commit 9ba2084321b1ac8d271feefee4f5b968d34226d6
Author: Kristian Høgsberg <krh@bitplanet.net>
Date: Thu Mar 27 23:47:59 2014 -0700
dri3: Allow asynchronous implementation for dri3_open
By passing the client pointer to the dri3_open implementation, we allow
the clients to implement the open callback asynchronously. If the
client ignore count is positive after returning from dri3_open, we
assume that authentication is in progress and doesn't send the reply.
The code to send the reply is moved into a helper function, which the
implementation can call upon receiving its authenticaion reply.
Signed-off-by: Kristian Høgsberg <krh@bitplanet.net>
Reviewed-by: Keith Packard <keithp@keithp.com>
commit 4ba7b594464887ae68623e150348d90812eec36c
Author: Kristian Høgsberg <krh@bitplanet.net>
Date: Thu Mar 27 22:15:28 2014 -0700
composite: Add exception mechanism for implicit redirection policy
Normally composite will decide to add implicit redirection when a
window with an alternate visual is a parent of a window with a regular
visual or vice versa. This uses extra pixmap memory and incurs an extra
copy. This exception mechanism provides a way for a DDX to override this
if the DDX knows that its acceleration architecture will render correctly.
The relevant case is that of an RGB window reparented into a ARGB parent
frame window. If the DDX knows that the acceleration architecture in use
will pad the alpha channel to opaque when rendering to the RGB window,
the implicit redirection can be avoided.
This patch adds a new composite function:
CompositeRegisterImplicitRedirectionException()
which lets a DDX register a pair of parent and child window visuals, that
will not be implicitly redirected even if the normal policy would have
made that choice.
Signed-off-by: Kristian Høgsberg <krh@bitplanet.net>
Reviewed-by: Keith Packard <keithp@keithp.com>
commit 73698d41e41ce76bef2d9a90b46ac0c24ae148dd
Author: Keith Packard <keithp@keithp.com>
Date: Mon Mar 31 23:55:25 2014 -0700
Make XYToWindow a screen function
This allows DDXen to override the window picking to account for
native windows not seen by the X server. The bulk of the picking logic
is exposed as a new helper function, miSpriteTrace(). This function
completes the sprite trace filled out by the caller, and can be set up
to start the search from a given toplevel window.
v2: Leave existing XYToWindow API in place for API compatibility
Signed-off-by: Keith Packard <keithp@keithp.com>
Reviewed-by: Kristian Høgsberg <krh@bitplanet.net>
commit f37a46913489397d8628ffe578c8d4ed50b6ca72
Author: Hans de Goede <hdegoede@redhat.com>
Date: Wed Mar 26 12:24:49 2014 +0100
configure: Change DEFAULT_LOGPREFIX to really be a filename prefix
Rather then a full path prefix, this is a preparation patch for adding
support for logging to another location when not running as root.
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 9d20d18fb9dcc74bfa5392a2da40fd41b3e640d3
Merge: 8468e24430 bc348bd2c4
Author: Keith Packard <keithp@keithp.com>
Date: Mon Mar 31 23:24:56 2014 -0700
Merge remote-tracking branch 'jturney/master'
commit 8468e24430988058b150dc1daef3aad6ba9fa698
Author: Adam Jackson <ajax@redhat.com>
Date: Thu Mar 27 11:48:39 2014 -0400
mi: Hush extension initialization (#75870)
Printing these as ErrorF is fairly obnoxious, since it means the
non-hardware servers now spew stuff to the console for entirely routine
events. And actually, printing these at all is fairly obnoxious, since
a) we're printing a line for every extension, whether it's enabled or
not, and b) we're not actually initializing the extension at this point.
Signed-off-by: Adam Jackson <ajax@redhat.com>
Reviewed-by: Daniel Stone <daniel@fooishbar.org>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit a2880699e8f1f576e1a48ebf25e8982463323f84
Author: Keith Packard <keithp@keithp.com>
Date: Tue Mar 25 08:21:16 2014 -0700
fb: fix fast-path blt detection
The width parameter is used to disable the blit fast-path (memcpy) when
source and destination rows overlap in memory. This check was added in [0].
Unfortunately, the calculation to determine if source and destination
lines overlapped was incorrect:
(1) it converts width from pixels to bytes, but width is actually in
bits, not pixels.
(2) it adds this byte offset to dst/srcLine, which implicitly converts
the offset from bytes to sizeof(FbBits).
Fix both of these by converting addresses to byte pointers and width
to bytes and doing comparisons on the resulting byte address.
For example:
A 32-bpp 1366 pixel-wide row will have
width = 1366 * 32 = 43712 bits
bpp = 32
(bpp >> 3) = 4
width * (bpp >> 3) = 174848 FbBits
(FbBits *)width => 699392 bytes
So, "careful" was true if the destination line was within 699392 bytes,
instead of just within its 1366 * 4 = 5464 byte row.
This bug causes us to take the slow path for large non-overlapping rows
that are "close" in memory. As a data point, XGetImage(1366x768) on my
ARM chromebook was taking ~140 ms, but with this fixed, it now takes
about 60 ms.
XGetImage() -> exaGetImage() -> fbGetImage -> fbBlt()
[0] commit e32cc0b4c85c78cd8743a6e1680dcc79054b57ce
Author: Adam Jackson <ajax@redhat.com>
Date: Thu Apr 21 16:37:11 2011 -0400
fb: Fix memcpy abuse
The memcpy fast path implicitly assumes that the copy walks
left-to-right. That's not something memcpy guarantees, and newer glibc
on some processors will indeed break that assumption. Since we walk a
line at a time, check the source and destination against the width of
the blit to determine whether we can be sloppy enough to allow memcpy.
(Having done this, we can remove the check for !reverse as well.)
v3: Convert to byte units
This first checks to make sure the blt is byte aligned, converts all
of the data to byte units and then compares for byte address range
overlap between source and dest.
Signed-off-by: Keith Packard <keithp@keithp.com>
Reviewed-by: Daniel Kurtz <djkurtz@chromium.org>
commit bc348bd2c42f3f18786085ccef2f010eff5bf3d2
Author: Jon TURNEY <jon.turney@dronecode.org.uk>
Date: Mon Mar 11 14:34:32 2013 +0000
Handle -displayfd and an explicit display number sensibly
Handle -displayfd and an explicit display number sensibly, e.g. use the
explicitly specified display number, and write it to the displayfd
v2: displayfd might be 0, so use -1 as invalid value
v3: Rebase for addition of NoListenAll flag
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Reviewed-by: Kristian Høgsberg <krh@bitplanet.net>
commit a3730271d52542757ec0f41acc29e7730501f666
Author: Jon TURNEY <jon.turney@dronecode.org.uk>
Date: Mon Mar 24 17:32:10 2014 +0000
Fix build when configured --enable-debug
Include os.h for ErrorF() to fix implicit-function-declaration warnings when
configured with --enable-debug.
hw/xfree86/parser/DRI.c: In function 'xf86parseDRISection':
hw/xfree86/parser/DRI.c:87:5: error: implicit declaration of function 'ErrorF' [-Werror=implicit-function-declaration]
hw/xfree86/parser/Extensions.c: In function 'xf86parseExtensionsSection':
hw/xfree86/parser/Extensions.c:77:5: error: implicit declaration of function 'ErrorF' [-Werror=implicit-function-declaration]
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Reviewed-by: Julien Cristau <jcristau@debian.org>
commit 5870bd398d6073938d821c060eccf24adc07a2f1
Author: Jon TURNEY <jon.turney@dronecode.org.uk>
Date: Mon Mar 24 17:32:09 2014 +0000
Fix ephyr build with --disable-glamor
See http://tinderbox.x.org/builds/2014-03-23-0010/logs/xserver/#build
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Tested-by: Julien Cristau <jcristau@debian.org>
Reviewed-by: Julien Cristau <jcristau@debian.org>
commit 432fc37e2ca833f1ec3cb614cbdc3a7ae13f22b7
Author: Jon TURNEY <jon.turney@dronecode.org.uk>
Date: Mon Feb 24 20:45:51 2014 +0000
Build fbcmap_mi.c once, rather than once for each DDX
Build fbcmap_mi.c once, rather than once for each DDX, and make it part of libfb
or libwfb convenience library.
Since 84e8de1271bb11b5b4b9747ae4647f47333a8ab7 we don't have fbcmap.c
This is a sort of revert of 17d85387d1e6851d35474b65929e268ca64ef65b
v2: Remove libkdrivestubs.la from configure.ac
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Reviewed-by: Gaetan Nadon <memsize@videotron.ca>
commit f23dd02b969089b66685f70887f19041049f7a24
Author: Jon TURNEY <jon.turney@dronecode.org.uk>
Date: Fri Feb 21 18:11:33 2014 +0000
Build Xi/stubs.c once as a convenience library, rather than once for each DDX which wants to use it
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Reviewed-by: Gaetan Nadon <memsize@videotron.ca>
commit 45b223e1c2bdc447263a9de7af62c93f4058c33c
Author: Jon TURNEY <jon.turney@dronecode.org.uk>
Date: Wed Sep 7 12:50:20 2011 +0100
Build dpmsstubs.c once as a convenience library, rather than once for each DDX which wants to use it
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Reviewed-by: Gaetan Nadon <memsize@videotron.ca>
commit 7b2a517ba99f6756e98c4aef47d9b9399b997157
Author: Julien Cristau <jcristau@debian.org>
Date: Wed Mar 26 23:24:20 2014 +0100
Xephyr: restore initial window resize lost in xcb conversion
The XResizeWindow call wasn't replaced by the xcb equivalent, so we
were no longer setting the initial window size, only wm size hints.
Regression from commit a2b73da "Xephyr: start converting hostx.c over to
xcb"
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=74849
Signed-off-by: Julien Cristau <jcristau@debian.org>
Reported-by: Laércio de Sousa <lbsousajr@gmail.com>
Tested-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Reviewed-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 1b5d7e78460ed686ba2da398dab341d4867fd4a0
Author: Keith Packard <keithp@keithp.com>
Date: Wed Mar 12 14:35:27 2014 -0700
glamor: Add glamor_program PolyPoint implementation
This accelerates poly point when possible by off-loading all geometry
computation to the GPU.
Improves x11perf -dot performance by 28109.5% +/- 1022.01% (n=3)
Signed-off-by: Keith Packard <keithp@keithp.com>
Signed-off-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Eric Anholt <eric@anholt.net>
commit 72a4beff6d3aed767df9a30bca0c1d860715928f
Author: Keith Packard <keithp@keithp.com>
Date: Sat Mar 22 15:20:49 2014 -0700
glamor: Move glamor_poly_segment to separate glamor_segment.c file
There's no reason to mix PolyPoint and PolySegment in the same file.
Signed-off-by: Keith Packard <keithp@keithp.com>
Signed-off-by: Eric Anholt <eric@anholt.net>
Reviewed-off-by: Eric Anholt <eric@anholt.net>
commit 029b64c30a8bdf87edfdb1c988f4e8dcee1bb4ef
Author: Keith Packard <keithp@keithp.com>
Date: Wed Mar 12 14:27:59 2014 -0700
glamor: Add infrastructure for generating shaders on the fly
This just adds a bunch of support code to construct shaders from
'facets', which bundle attributes needed for each layer of the
rendering system. At this point, that includes only the primitive and
the fill stuff.
v2: Correct comment in glamor transform about 1/2 pixel correction needed
for GL_POINT. (Eric Anholt)
v3: Rebase on Markus's cleanups (change by anholt)
Signed-off-by: Keith Packard <keithp@keithp.com>
Signed-off-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Eric Anholt <eric@anholt.net>
commit 0ca7223742e9ec0594203b3a99b11441730cca1a
Author: Keith Packard <keithp@keithp.com>
Date: Thu Mar 13 23:12:27 2014 -0700
glamor: Add helper functions to walk pixmap tiling
This adds a few helper functions to make pixmap fbo access symmetrical
between the single fbo and tiled cases.
Signed-off-by: Keith Packard <keithp@keithp.com>
Reviewed-by: Eric Anholt <eric@anholt.net>
Signed-off-by: Eric Anholt <eric@anholt.net>
commit 209d004469391420130262059af43a813b2c07d7
Author: Keith Packard <keithp@keithp.com>
Date: Thu Mar 13 23:11:40 2014 -0700
glamor: Add bounding box to one-fbo pixmaps
This lets code treat the one-fbo pixmaps more symmetrically with the
tiled pixmaps.
Signed-off-by: Keith Packard <keithp@keithp.com>
Reviewed-by: Eric Anholt <eric@anholt.net>
Signed-off-by: Eric Anholt <eric@anholt.net>
commit 82f91433e277e3711678c1b16be85e89b6c7d530
Author: Keith Packard <keithp@keithp.com>
Date: Tue Mar 18 21:23:24 2014 -0700
glamor: Get testing code using small FBOs working again
Glamor has a mode where pixmaps will be constructed from numerous
small FBOs. This allows testing of the tiled pixmap code without
needing to create huge pixmaps.
However, the render glyph code assumed that it could create a pixmap
large enough for the glyph atlas. Instead of attempting to fix that
(which would be disruptive and not helpful), I've added a new pixmap
creation usage, GLAMOR_CREATE_NO_LARGE which forces allocation of a
single large FBO.
Now that we have pixmaps with varying FBO sizes, I then went around
and fixed the few places using the global FBO max size and replaced
that with the per-pixmap FBO tiling sizes, which were already present
in each large pixmap.
Xephyr has been changed to pass GLAMOR_CREATE_NO_LARGE when it creates
the screen pixmap as it doesn't want to deal with tiling either.
Signed-off-by: Keith Packard <keithp@keithp.com>
Signed-off-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Eric Anholt <eric@anholt.net>
commit 11e2f0de71fa341f8b0b1da0a1b9ccbfa6550a50
Author: Keith Packard <keithp@keithp.com>
Date: Tue Mar 18 21:35:41 2014 -0700
mi: miPutImage with XYPixmap failed at depth 32 on 64-bit machines
The X server still has 'unsigned long' in a few places to hold 32 bit
values. One of those is in miPutImage where it's holding the temporary
planemask for XYPixmap format images.
It computed the highest plane in the source image with 1 << (depth -
1). On 64-bit machines, taking that value and storing it in an
unsigned long promotes it to a signed 64-bit value
(0xffffffff80000000).
Then, it loops over that value, shifting one bit right each time,
waiting for it to go to zero.. That takes 64 iterations, and ends up
with some mystic planemask values *and* walking off the end of the
source image data and out into space.
A simple cast is all that is required to compute the correct initial
plane mask (0x0000000080000000), at which point the loop operates
correctly once again.
Checking the fbPutImage code, I note that this same bug was fixed
in 2006 by Aaron Plattner in commit
f39fd4242902eaa862321d39337f429dd14ebacf
Signed-off-by: Keith Packard <keithp@keithp.com>
Signed-off-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Aaron Plattner <aplattner@nvidia.com>
commit ae87b536155207e6e28b68963593a7ab09792e08
Author: Keith Packard <keithp@keithp.com>
Date: Sat Mar 15 23:53:53 2014 -0700
dix: Allow NULL stipple in ChangeGC
miOpqStipDrawable resets the stipple after painting. When that stipple
was NULL, ChangeGC needs to handle that and not crash.
Signed-off-by: Keith Packard <keithp@keithp.com>
Signed-off-by: Eric Anholt <eric@anholt.net>
Reviewed-off-by: Eric Anholt <eric@anholt.net>
commit 2e040f41de18f4d46e649561b6efb043195fdfbe
Author: Markus Wick <markus@selfnet.de>
Date: Tue Mar 18 09:42:55 2014 +0100
glamor: Drop feature dependent optimization on startup.
We don't care that much about startup time to write different code paths...
Signed-off-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Eric Anholt <eric@anholt.net>
commit 2e75d974bcfdd879d7417cc02892b78eaea5e888
Author: Markus Wick <markus@selfnet.de>
Date: Tue Mar 18 09:42:54 2014 +0100
glamor: Remove unneeded unbindings.
They are already cleared in glamor_put_vbo_space.
Signed-off-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Eric Anholt <eric@anholt.net>
commit 7c4e1472966d9d3d6432621c3114f491a5378604
Author: Markus Wick <markus@selfnet.de>
Date: Tue Mar 18 09:42:53 2014 +0100
glamor: Always keep GL_ELEMENT_ARRAY_BUFFER bound to the same IB.
We never used glDrawElements() with a different index buffer.
Signed-off-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Eric Anholt <eric@anholt.net>
commit 82168b1e6ede48898be8a64b1c93b7d82ef65702
Author: Markus Wick <markus@selfnet.de>
Date: Tue Mar 18 09:42:52 2014 +0100
glamor: Select VBO path by ARB_mbr extension.
The mbr path was hard coded enabled for desktop gl and disabled for
gles. But there are both desktop without mbr and GLES with mbr.
v2: Don't forget to update the fini path, too (change by anholt)
Signed-off-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Eric Anholt <eric@anholt.net>
commit 53df6e8c3bd7025883b9614a549fbf268c110b74
Author: Markus Wick <markus@selfnet.de>
Date: Tue Mar 18 09:42:51 2014 +0100
glamor: Update GL requirements to 2.1.
We will never ever run on OpenGL 1.2 as we use shaders everywhere.
2.0 may be enough, but we also often use PBOs and our big shaders
won't fit into the first GLSL limits.
Signed-off-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Eric Anholt <eric@anholt.net>
commit 15d36444acc7a2890ade8e320dc16d627a9d2035
Author: Markus Wick <markus@selfnet.de>
Date: Tue Mar 18 09:42:50 2014 +0100
glamor: Use epoxy_gl_version() instead of rolling our own.
Signed-off-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Eric Anholt <eric@anholt.net>
commit 9d87f66e862a521553d48aa73e5ee97431d36ad3
Author: Markus Wick <markus@selfnet.de>
Date: Tue Mar 18 09:42:49 2014 +0100
glamor: Use epoxy_has_gl_extension() instead of rolling our own.
Signed-off-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Eric Anholt <eric@anholt.net>
commit 708fe0625f31ad39ba54f27f04d17ed2aa621cad
Author: Markus Wick <markus@selfnet.de>
Date: Tue Mar 18 09:42:48 2014 +0100
glamor: Use glsl "fract/mod" instead of "while" in gradient shaders.
This fixes gtkperf. It seemed to hang forever.
Signed-off-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Eric Anholt <eric@anholt.net>
commit 84ff8960722fa9baf6ad70756b9c335bf2a5e515
Author: Eric Anholt <eric@anholt.net>
Date: Tue Mar 18 09:42:47 2014 +0100
kdrive: Remove duplicated definitions of some XV-related structs.
v2: Fix crash because of removed strdup. (by Markus Wick)
Signed-off-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Eric Anholt <eric@anholt.net> (v2)
commit 370c8c75ca6aebb5d93d2ab87c9c8ffac21fc57d
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Wed Mar 19 11:28:57 2014 -0400
xfree86: glamor_egl subdir must be distributed - breaks distcheck
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
Signed-off-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Eric Anholt <eric@anholt.net>
commit 870bbf85e63a59f252f3ea9d63e28f083359d990
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Wed Mar 19 14:17:15 2014 -0400
ephyr: typo where "()" should be "$()" in the Makefile - breaks make dist
make[3]: Entering directory `/home/nadon/xorg/src/xserver/hw/kdrive/ephyr'
make[3]: *** No rule to make target `()', needed by `distdir'. Stop.
make[3]: Leaving directory `/home/nadon/xorg/src/xserver/hw/kdrive/ephyr'
make[2]: *** [distdir] Error 1
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
Signed-off-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Eric Anholt <eric@anholt.net>
commit dc48bd653c7e1013e2d69e3f59ae3cbc0c893473
Author: Hans de Goede <hdegoede@redhat.com>
Date: Mon Mar 24 16:32:01 2014 +0100
systemd-logind: Monitor systemd-logind going away
When we're using server managed-fds through systemd-logind, systemd-logind
*must* keep running while we are using it, as it does things like drmSetMaster
and drmDropMaster for us on vt-switch.
On a systemd-logind restart, we cannot simply re-connect since we will then
get a different fd for the /dev/dri/card# node, and we've tied a lot of
state to the old fd. I've discussed this with the systemd people, and in the
future there may be a restart mechanism were systemd-logind passed fds from
the old logind to the new logind. But for now there answer is simply:
"Don't restart systemd-logind", and there never really is a good reason to
restart it.
So to ensure unpleasentness if people do decide to restart systemd-logind
anyways (or when it crashes), monitor logind going away and make this a fatal
error. This avoids getting a hard-hung machine on the next vt-switch and will
hopefully quickly educate users to not restart systemd-logind while they have
an X session using it active.
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
commit c0d3a13e7ee42be26d6d1923c9f3ae0355497869
Author: Hans de Goede <hdegoede@redhat.com>
Date: Mon Mar 24 16:31:59 2014 +0100
Buildsys: Create SUID_WRAPPER_DIR before using it
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 6289f71494453d34614b7ff1238840681c2472af
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Tue Mar 25 14:00:13 2014 -0400
suid: adding Xorg.sh.in to EXTRA_DIST is redundant
All files specified in AC_CONFIG_FILES get distributed automatically.
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
commit b82ef51509bf24e8eafeb615a3e2f4fcd559554e
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Tue Mar 25 13:49:02 2014 -0400
suid: add generated Xorg.sh to hw/xfree86/.gitignore
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
commit ca8f26f63694c27fa488a3b58ea6f00b7dd50f81
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Tue Mar 25 13:48:52 2014 -0400
suid: replace deprecated AC_HELP_STRING with AS_HELP_STRING
Fixes automake warning.
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
commit bda6fdc71c25b0c3f3747f445103a1995a5713f4
Merge: e46820fb89 78167a98a8
Author: Keith Packard <keithp@keithp.com>
Date: Tue Mar 25 16:06:03 2014 -0700
Merge remote-tracking branch 'whot/for-keith'
commit e46820fb897600800b5f3297a59039556774e9c5
Author: Emil Velikov <emil.l.velikov@gmail.com>
Date: Thu Sep 26 20:28:37 2013 +0100
miinitext: introduce LoadExtensionList() to replace over LoadExtension()
Looping around LoadExtension() meant that ExtensionModuleList was reallocated
on every extension. Using LoadExtensionList() we pass an array thus the
function can do the reallocation in one go, and then loop and setup the
ExtensionModuleList.
Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>
Reviewed-by: Keith Packard <keithp@keithp.com>
v2: Update ephyr [Keith Packard]
v3: Eliminate const warnings in LoadExtensionList [Keith Packard]
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 78167a98a8631ee3fad145ddc051ceb8487b9683
Author: Adam Jackson <ajax@redhat.com>
Date: Fri Nov 8 09:44:24 2013 -0500
xkb: Restore XkbCopyDeviceKeymap
Removed in d35a02a767017f13db4bd4742eef49293d5a30ea, tigervnc 1.2.80 and
xf86-video-nested need it for now.
Signed-off-by: Adam Jackson <ajax@redhat.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 215f3d2e0f2a4ef6fc2f2c08fb991e1f00b747c8
Author: Kristian Høgsberg <krh@bitplanet.net>
Date: Wed Mar 19 20:46:41 2014 -0700
os: Add AddClientOnOpenFD() to create a new client for an file descriptor
When the Xwayland server is socket-activated, we need to connect and
initialize the window manager before the activating client gets to
proceed with connecting. We do this by passing a socket file
descriptor for the window manager connection to the Xwayland server,
which then uses this new function to set it up as an X client.
Signed-off-by: Kristian Høgsberg <krh@bitplanet.net>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit d415b9d69fdaab4ce3fc05d3d26b2d8413403aa4
Author: Emil Velikov <emil.l.velikov@gmail.com>
Date: Thu Sep 26 20:16:31 2013 +0100
miinitext: avoid allocating a sentinel ExtensionModule
With all the logic now in place there is no need to allocate a separate
ExtensionModule to be used as a sentinel.
Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>
Reviewed-by: Keith Packard <keithp@keithp.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
commit b421ac8e026f464fdba2082aaedc00c19fb8b6c7
Author: Emil Velikov <emil.l.velikov@gmail.com>
Date: Thu Sep 26 20:11:40 2013 +0100
miinitext: constify staticExtensions
The array is readonly and should not be tampered with.
Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>
Reviewed-by: Keith Packard <keithp@keithp.com>
commit 5ff34b5a0b3b333bf0f0334717cc8630cc785510
Author: Emil Velikov <emil.l.velikov@gmail.com>
Date: Thu Sep 26 20:08:56 2013 +0100
miinitext: drop sentinel detection during LoadExtension
All the sentinels from the extension lists were removed, thus the only
case were this would trigger is when the code is broken badly.
Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>
Reviewed-by: Keith Packard <keithp@keithp.com>
commit 6fea450d41a03d32c10c7da162dfaadd8ead4ece
Author: Emil Velikov <emil.l.velikov@gmail.com>
Date: Thu Sep 26 20:08:16 2013 +0100
miinitext: move AddStaticExtensions() to LoadExtension()
Separate the function from NewExtensionModule() as the former does
only memory reallocation. No functional change.
Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>
Reviewed-by: Keith Packard <keithp@keithp.com>
commit bf087659f0fb747c471e26c5b287c35877818040
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Sat Mar 22 14:30:04 2014 -0700
Add necessary headers for major()/minor() on Solaris to xf86Xinput.c
Without these, after commit fdb4ec86c29d85c, it fails to build on Solaris,
with errors of:
xf86Xinput.c: In function 'xf86stat':
xf86Xinput.c:816:5: error: implicit declaration of function 'major' [-Werror=implicit-function-declaration]
xf86Xinput.c:817:5: error: implicit declaration of function 'minor' [-Werror=implicit-function-declaration]
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit d9fdae5f4a648a10653e18dbc602646f3e22e522
Merge: 99bee6c054 0e5d2996ac
Author: Keith Packard <keithp@keithp.com>
Date: Sat Mar 22 14:09:00 2014 -0700
Merge remote-tracking branch 'jturney/master'
commit 99bee6c0549b36ef15f625bab3997cbd70c7b879
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Fri Jan 17 09:54:01 2014 -0500
Default font path: remove the check for ${sysconfdir}/X11/fontpath.d
The location ${sysconfdir}/X11/fontpath.d is unknown at configuration time
(only at make time) as evidenced by the configuration output:
checking for ${prefix}/etc/X11/fontpath.d... no
Unlike font-util for the X fonts, there is no mechanism to query where
fontpath.d is. Fedora have chosen /etc/X11 and others have followed, but this
is not a standard. It might also be installed at another location, it may or may
not be under the xserver installation prefix. We just don't know. Debian does
not use this at all.
Distros are using --with-default-path when they support fontpath.d, so they
never relied on the server default as it never worked.
The patch essentially is a noop, which leaves the door open for anyone who
could potentially provide a reliable implementation of choosing fontpath.d
when applicable.
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 1782316744866a181ed92486bb4dca6ac46d40bd
Merge: 4fb31e4824 2b77b208da
Author: Keith Packard <keithp@keithp.com>
Date: Sat Mar 22 13:46:15 2014 -0700
Merge remote-tracking branch 'jwrdecoede/for-keith'
commit 0e5d2996ac872aca5995897fc518bdf9116bd246
Author: Jon TURNEY <jon.turney@dronecode.org.uk>
Date: Wed Sep 11 13:36:18 2013 +0100
hw/xwin: Fix WM_ENDSESSION crash on x86_64
We need to include xwin-config.h into winmsgwindow.c, so that _XSERVER64 is
defined, so that the layout of ScreenRec type is correct, so that it's privates
can be accessed correctly, so that the WM_GIVEUP message can be sent to the
screen window.
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
commit 896b53ffa72d91d7d604967028291525562b60dd
Author: Jon TURNEY <jon.turney@dronecode.org.uk>
Date: Sun Jun 16 13:55:51 2013 +0100
hw/xwin: Improve NET_WM_ICON validation
Check that we don't overrun the end of the property data while converting icons
See http://cygwin.com/ml/cygwin-xfree/2013-06/msg00040.html for testcase.
Also, some warning fixes in winXIconToHICON()
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
commit ab61d070024a4776f011e71d762d4c6c0cf58b12
Author: Jon TURNEY <jon.turney@dronecode.org.uk>
Date: Sun Mar 31 18:29:07 2013 +0100
hw/xwin: Remove obsolete control handling for About dialog
Remove the unused, cygwin-specific handling for ChangeLog, UG and CG buttons in
the About... Dialog. The buttons themselves were removed in commmit
34269a90ea2087f883f5dc8805894fc4998e4b81.
Also remove those window control IDs which are now obsolete.
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
commit 3b4d472b72601922bac264283eb6b611d8d524fc
Author: Oliver Schmidt <oschmidt-mailinglists@gmx.de>
Date: Wed Sep 7 14:00:56 2011 +0100
hw/xwin: Minimize redraw events after resizing/moving windows in multiwindow mode
In multiwindow mode the modal moving/resizing of windows causes a lot of redraw
events to be sent to the X clients after the user releases the mouse button.
During the moving/resizing client windows are not redrawn as long as the mouse
button is pressed, but all redraw/resizing events are queued and executed step
after step after the moving/resizing ends.
Some clients collect and combine multiple redraw or resizing events, other
clients (e.g. xterm) simply execute each redraw or sizing event.
The enclosed patch minimizes the events for clients to only one event after the
user releases the mouse button to end the moving/resizing. This improves the
user experience and reduces strange screen flickerings, especially on slow
platforms.
The enclosed patch modifies winmultiwindowwndproc.c such that the windows events
WM_ENTERSIZEMOVE and WM_EXITSIZEMOVE that are sent by Windows when the modal
window resizing/moving begins or ends are considered. Only after WM_EXITSIZEMOVE
is the redraw/resizing executed.
Signed-off-by: Oliver Schmidt <oschmidt-mailinglists@gmx.de>
Reviewed-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
commit 03e1cc6f250a3f5cf17b34639adbbc9850c681cd
Author: Jon TURNEY <jon.turney@dronecode.org.uk>
Date: Mon Nov 7 20:54:10 2011 +0000
hw/xwin: Add '@<WM_CLIENT_MACHINE>' to window name when it's useful to do so
Enhance GetWindowName() so it appends the result of XGetWMClientMachine() when
it is available and useful to do so
Add -hostintitle option to control this behaviour. Add documentation for this
option to man page and -help text.
Also, fix warning in UpdateName()
v2: Provide a HOST_NAME_MAX definition for MinGW
v3: Use '@host' rather than ' (on host)'. Don't add host if it's already in the
title.
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Reviewed-by: Yaakov Selkowitz <yselkowitz@users.sourceforge.net>
Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
commit 6804acfe4fabc8ff8491bbc7edb6260440d3d4d3
Author: Colin Harrison <colin.harrison@virgin.net>
Date: Fri Mar 14 15:44:54 2014 +0000
hw/xwin: Remove prototype for non-existent winMWExtWMUpdateIcon()
winMWExtWMUpdateIcon() was removed in commit 527cf13135cfd279733060e0028bbfbe02be5167
Signed-off-by: Colin Harrison <colin.harrison@virgin.net>
Reviewed-by: Jon TURNEY <jon.turney@dronecode.org.uk>
commit 7fb5d765ba1e28eb775b847cef3d6079eba3bac1
Author: Colin Harrison <colin.harrison@virgin.net>
Date: Fri Mar 14 15:40:43 2014 +0000
hw/xwin: Use AllocDevicePair()
Use AllocDevicePair() rather than allocating Windows keyboard and pointer
devices individually.
Signed-off-by: Colin Harrison <colin.harrison@virgin.net>
Reviewed-by: Jon TURNEY <jon.turney@dronecode.org.uk>
commit 061e5eba00a9a0dc27ff76946dc5f77004fc6a56
Author: Colin Harrison <colin.harrison@virgin.net>
Date: Fri Mar 14 15:36:59 2014 +0000
hw/xwin: Consistently use 'L' for long int constants
Signed-off-by: Colin Harrison <colin.harrison@virgin.net>
Reviewed-by: Jon TURNEY <jon.turney@dronecode.org.uk>
commit 46df614784cbbffcf6368859285e949010f1ceb8
Author: Colin Harrison <colin.harrison@virgin.net>
Date: Fri Mar 14 15:36:24 2014 +0000
hw/xwin: Remove an unneeded include
Signed-off-by: Colin Harrison <colin.harrison@virgin.net>
Reviewed-by: Jon TURNEY <jon.turney@dronecode.org.uk>
commit d48749492dc492fd7430ffdfd29842153618f778
Author: Colin Harrison <colin.harrison@virgin.net>
Date: Fri Mar 14 15:34:04 2014 +0000
hw/xwin: Use boolean AND rather than bitwise AND in WIN_POLLING_MOUSE_TIMER_ID
For clarity, use boolean AND rather than bitwise AND in
WIN_POLLING_MOUSE_TIMER_ID processing.
Signed-off-by: Colin Harrison <colin.harrison@virgin.net>
Reviewed-by: Jon TURNEY <jon.turney@dronecode.org.uk>
commit 80ac4a85d56130d09bbc72ed071759a361ded689
Author: Colin Harrison <colin.harrison@virgin.net>
Date: Fri Mar 14 15:23:16 2014 +0000
hw/xwin: Fix declaration after statement warning in ddxGiveUp()
Signed-off-by: Colin Harrison <colin.harrison@virgin.net>
Reviewed-by: Jon TURNEY <jon.turney@dronecode.org.uk>
commit cf59f4888e202c6a68176bd3de1f837ca8480370
Author: Colin Harrison <colin.harrison@virgin.net>
Date: Fri Mar 14 15:09:24 2014 +0000
hw/xwin: Fix typo in comment
Signed-off-by: Colin Harrison <colin.harrison@virgin.net>
Reviewed-by: Jon TURNEY <jon.turney@dronecode.org.uk>
commit 561bca469d3ade1ff14faddaf70bf12dcdc6aa74
Author: Jon TURNEY <jon.turney@dronecode.org.uk>
Date: Thu Mar 13 22:38:43 2014 +0000
hw/xwin: Fix const discarded warning in winGenerateAuthorization()
Fix const discarded warning in winGenerateAuthorization() in !XCSECURITY case
In function ‘winGenerateAuthorization’:
hw/xwin/winauth.c:123:38: warning: passing argument 2 of ‘GenerateAuthorization’ discards ‘const’ qualifier from pointer target type [enabled by default]
hw/xwin/winauth.c:99:1: note: expected ‘char *’ but argument is of type ‘const char *’
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
commit 44fe1b8ea284df6bbaef67e246016d104665b2fe
Author: Kristian Høgsberg <krh@bitplanet.net>
Date: Wed Mar 19 14:03:13 2014 -0700
os: Add a mechanism to prevent creating any listen sockets
A socket-activated server will receive its listening sockets from the
parent process and should not create its own sockets. This patch
introduces a NoListen flag that can be set by a DDX to prevent
the server from creating the sockets. When NoListen is enabled, we
also disable the server lock checking, since the parent process is
responsible for checking the lock before picking the display name and
creating the sockets.
Signed-off-by: Kristian Høgsberg <krh@bitplanet.net>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Daniel Stone <daniel@fooishbar.org>
commit 62d584d63190c6c8cef5fd49d87b1cb29358a434
Author: Kristian Høgsberg <krh@bitplanet.net>
Date: Tue Mar 18 22:05:58 2014 -0700
os: Always compile ListenOnOpenFD() and export it
This function was written to allow the X server to inherit the listen
socket from launchd on OS X. The code is not specific to OS X though
and will be useful for on-demand launched Xwayland servers.
Signed-off-by: Kristian Høgsberg <krh@bitplanet.net>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Daniel Stone <daniel@fooishbar.org>
commit 797781c7bfd7a0df354fb85aa73df4560828b90b
Author: Kristian Høgsberg <krh@bitplanet.net>
Date: Wed Mar 19 10:27:39 2014 -0700
test: Don't add TEST_LDADD to list test
The list test case is always enabled, even if Xorg is disabled.
TEST_LDADD pulls in Xorg files which breaks linking when Xorg is disabled.
The list test doesn't need any libraries, so just remove list_LDADD.
Signed-off-by: Kristian Høgsberg <krh@bitplanet.net>
Cc: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 4fb31e4824d46edc80bb49b4065152899faa5ac6
Merge: d18d3f6d18 0e531fbb97
Author: Keith Packard <keithp@keithp.com>
Date: Wed Mar 19 06:43:14 2014 -0700
Merge remote-tracking branch 'whot/for-keith'
commit 0e531fbb97868b9a869044fc5a4f6cb58de6751e
Author: Kristian Høgsberg <krh@bitplanet.net>
Date: Wed Mar 12 16:31:25 2014 +1000
xkb: add XkbLoadKeymapFromString
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Kristian Høgsberg <krh@bitplanet.net>
commit d18d3f6d18aa7827748f7ba14efd405b525883d0
Merge: 81a4952d3d 6649d0059e
Author: Keith Packard <keithp@keithp.com>
Date: Mon Mar 17 17:29:56 2014 -0700
Merge remote-tracking branch 'anholt/glamor-megaseries'
commit 6649d0059e1bc136b84a9e457ae81c07521fadc0
Author: Michel Dänzer <michel.daenzer@amd.com>
Date: Mon Mar 17 13:16:48 2014 +0900
glamor: Move up glamor_priv->flags assignment in glamor_init()
It wasn't assigned yet when it was tested for GLAMOR_NO_DRI3.
Signed-off-by: Michel Dänzer <michel.daenzer@amd.com>
Signed-off-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Eric Anholt <eric@anholt.net>
commit b5a61239e2fef167c229154d7919ff862503e3f3
Author: Eric Anholt <eric@anholt.net>
Date: Fri Mar 14 13:10:04 2014 -0700
glx: Make sure we get an FBConfig the root window's visual.
Signed-off-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Keith Packard <keithp@keithp.com>
commit 9999a660135fafe5f1fdf9452e5ca74ffb069dc2
Author: Markus Wick <markus@selfnet.de>
Date: Thu Mar 13 11:17:39 2014 +0100
glamor: don't reset the GLSL program
We don't use fixed function rendering, so there is no need to reset
the program at all. This lets the driver avoid checking for state
changes between draw calls when we rebind the same program.
Improves xephyr x11perf -f8text performance by 6.03062% +/- 1.64928%
(n=20)
Signed-off-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Eric Anholt <eric@anholt.net>
commit aa2635b804e7d28322f62d802190bdf0bb799634
Author: Markus Wick <markus@selfnet.de>
Date: Thu Mar 13 00:24:04 2014 +0100
glamor: remove disabled code
This block was disabled since 2011, so there is likely no need to keep it any more.
Signed-off-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Eric Anholt <eric@anholt.net>
commit 6227f07b69b8ab3cd39cf9d257daf2a7202b4ef5
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Tue Mar 11 17:28:10 2014 -0700
Remove duplicate assignment of repeat_type_uniform_location
Flagged by cppcheck 1.64:
[glamor/glamor_gradient.c:987] -> [glamor/glamor_gradient.c:991]:
(performance) Variable 'repeat_type_uniform_location' is
reassigned a value before the old one has been used.
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Eric Anholt <eric@anholt.net>
Signed-off-by: Eric Anholt <eric@anholt.net>
commit 1a4b24993974200e26345ea6c501d4aa093169db
Author: Eric Anholt <eric@anholt.net>
Date: Thu Feb 20 15:50:03 2014 -0800
glamor: Apply debug labels to our shaders.
This will help tools like fips, apitrace, or INTEL_DEBUG=shader_time
provide useful information about the shaders in use.
Signed-off-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Markus Wick <markus@selfnet.de>
commit d07d2c3c5f95fd644ef563004dfa7f3c53904168
Author: Eric Anholt <eric@anholt.net>
Date: Sat Jan 11 21:26:01 2014 -0800
glamor: Don't forget to unmap our PBOs before using them to upload.
From the GL_ARB_vertex_buffer_object spec:
After the client has specified the contents of a mapped data store,
and before the data in that store are dereferenced by any GL commands,
the mapping must be relinquished by calling
boolean UnmapBufferARB(enum target);
Our mappings were only getting reaped at PBO destroy time, after the
upload. If the GL implementation wasn't coherent, it would have used
stale data to do the texture upload.
Signed-off-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Markus Wick <markus@selfnet.de>
commit 64146e4560fdf3c3a40d023ac8e22259915b05ad
Author: Eric Anholt <eric@anholt.net>
Date: Sat Jan 11 21:11:18 2014 -0800
glamor: Add an assert about an invariant the upload code relies on.
Signed-off-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Markus Wick <markus@selfnet.de>
commit 7eb2bafe22dcc90c2fb94d2d9cae370b683dba7c
Author: Eric Anholt <eric@anholt.net>
Date: Fri Jan 10 15:54:25 2014 +0800
glamor: Fix ignoring the ALU during SetSpans().
Signed-off-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Markus Wick <markus@selfnet.de>
commit 923c8db7ed1adfe4689f0a36496262faca44b79d
Author: Eric Anholt <eric@anholt.net>
Date: Thu Jan 9 11:36:30 2014 +0800
glamor: Improve the performance of line fallbacks.
If the lines aren't solid-filled vert/horiz solid-filled rectangles,
we fall back. libreoffice has some diagonal lines, and the
performance of the fallback path was atrocious. Just fall back to
mi's spans instead, so that we don't do an upload/download.
Improves x11perf -seg100 by 863.652% +/- 9.8968% (n=5)
Signed-off-by: Eric Anholt <eric@anholt.net>
commit b6953045566dae15437d4220e68986db7a6b4ca7
Author: Eric Anholt <eric@anholt.net>
Date: Thu Jan 9 10:53:04 2014 +0800
glamor: Improve the performance of PolyGlyphBlt.
Using the same idea as the previous PushPixels code, just make points
for each point in the glyph. This is an advantage over the pushpixels
fallback because we can batch the BO mappings and draw calls across
glyphs.
Improves performance of x11perf -f8text by 773.389% +/- 3.50754% (n=10).
Signed-off-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Markus Wick <markus@selfnet.de>
commit b885a639144cdadcb0dae8249a168db158770604
Author: Eric Anholt <eric@anholt.net>
Date: Sun Jan 5 21:54:48 2014 +0800
glamor: Improve the performance of PushPixels by, well, pushing pixels.
Otherwise, mi will fall back to GetSpans()ing the bitmap, walking the
bitmap, computing spans to be filled, and calling FillSpans().
Improves x11perf -f8text by 759.373% +/- 3.33096% (n=166)
Signed-off-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Markus Wick <markus@selfnet.de>
commit ab68982dcc53d29d5e3c5ea092bd91dab09e54c9
Author: Eric Anholt <eric@anholt.net>
Date: Sat Jan 11 00:06:21 2014 +0800
glamor: Add missing prepares on the GC during fb fallbacks.
We had regressions in CopyPlane reported by xts5, because we were
(successfully!) dereferencing the null pixmap->devPrivate.ptr for a
tile or stipple without having done a prepare.
Signed-off-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Markus Wick <markus@selfnet.de>
commit 93f1824a0b19346f0e1759bedfa9cf10772067af
Author: Eric Anholt <eric@anholt.net>
Date: Sat Jan 11 00:00:00 2014 +0800
glamor: Rely on nested mappings to handle src==dst and !prepare bugs.
Now that the core deals with that for us, we can avoid all this extra
carefulness.
Signed-off-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Markus Wick <markus@selfnet.de>
commit 4c9a20072552c52b3763bd73e7a7e9b9cb8b4993
Author: Eric Anholt <eric@anholt.net>
Date: Fri Jan 10 23:43:09 2014 +0800
glamor: Allow nested mapping of pixmaps.
The common pattern is to do nested if statements making calls to
prepare_access() and then pop those mappings back off in each set of
braces. Some cases checked for src == dst to avoid leaking mappings,
but others didn't. Others didn't even do the nested mappings, so a
failure in the outer map would result in trying to umap the inner and
failing.
By allowing nested mappings, we can fix both problems by not requiring
the care from the caller, plus we can allow a simpler nesting of all
the prepares in one if statement.
v2: Add a comment about nested unmap behavior, and just reuse the
glamor_access_t enum.
Signed-off-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Markus Wick <markus@selfnet.de>
commit d86eacedab443f172baccf544d17e09090f71f3c
Author: Eric Anholt <eric@anholt.net>
Date: Fri Jan 10 23:39:02 2014 +0800
glamor: Drop unused GLAMOR_ACCESS_WO.
Nothing was using it, and it was going to complicate the
glamor_prepare_access bugfixing I'm going to do next.
Signed-off-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Markus Wick <markus@selfnet.de>
commit c36b903f240664f7222cfefc480e60fca936de6a
Author: Eric Anholt <eric@anholt.net>
Date: Thu Mar 13 10:09:08 2014 -0700
glamor: Drop stale comment.
The old Xephyr codebase was using the GL window system framebuffer for
the screen pixmap, but that meant you couldn't texture from it to do
operations sourcing from the screen, so in the version that landed I
instead had the screen just be a plain texture.
Signed-off-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Keith Packard <keithp@keithp.com>
commit f7cd1189d068471373f51d932c558f8151182d58
Author: Eric Anholt <eric@anholt.net>
Date: Fri Jan 10 22:42:02 2014 +0800
glamor: Replace some goofy enum-likes with a real enum.
This unpacks the bitfield into an int size, but my experience has been
that packing bitfields doesn't matter for performance.
v2: Convert more comparisons against numbers or implicit bool
comparisons to comparisons against the enum names, and fix up some
comments.
Signed-off-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Markus Wick <markus@selfnet.de>
commit 575e3e1bf08c418430da86228d2774e8fda4b8c0
Author: Eric Anholt <eric@anholt.net>
Date: Mon Jan 6 07:22:47 2014 +0800
glamor: Fix up doxygen for glamor_fill.c.
Signed-off-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Markus Wick <markus@selfnet.de>
commit 53996e252e51c8053537f485616a078cb7b0f738
Author: Eric Anholt <eric@anholt.net>
Date: Mon Jan 6 07:05:02 2014 +0800
glamor: Rename more solid fill variables to clean up the code.
Now the error path of allocation is more obvious: We leave things in
the a-few-boxes-at-a-time stack memory state.
Signed-off-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Markus Wick <markus@selfnet.de>
commit ec3ab2f67baa00326a4964ed2047e8a137915578
Author: Eric Anholt <eric@anholt.net>
Date: Mon Jan 6 07:01:17 2014 +0800
glamor: Rename a variable to be more descriptive.
The "valid_" prefix was used above to describe our allocation that
gets reused multiple times, which is totally unrelated.
Signed-off-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Markus Wick <markus@selfnet.de>
commit 01e30d2043f5df104947908f14a377dc77896a98
Author: Eric Anholt <eric@anholt.net>
Date: Mon Jan 6 06:55:15 2014 +0800
glamor: Fix some integer overflow errors.
Imagine a nbox that was (UINT_MAX + small number) / (4 * 2 *
sizeof(float)). We'd malloc a few bytes after the integer overflow,
but glamor_set_normalize_vcoords would write over gigabytes of heap.
Signed-off-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Markus Wick <markus@selfnet.de>
commit 20bcda977755559294c3a951f80af2ec861595fc
Author: Eric Anholt <eric@anholt.net>
Date: Mon Jan 6 06:53:46 2014 +0800
glamor: Drop bogus _X_UNLIKELY.
nbox > 4 is actually quite common for spans handling.
Signed-off-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Markus Wick <markus@selfnet.de>
commit ad3dd80720676dcdc11ab5db63ccbed7c9509d7e
Author: Eric Anholt <eric@anholt.net>
Date: Mon Jan 6 06:52:32 2014 +0800
glamor: Fix stack overflow in glamor_solid vertex handling.
ARRAY_SIZE(vertices) is 32 (floating point values), so we need to
divide by the number of floats in a box like we do in the overflow
case below.
Signed-off-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Markus Wick <markus@selfnet.de>
commit d036d22a95b8516a817dd4fa4dd35be363709636
Author: Eric Anholt <eric@anholt.net>
Date: Sat Jan 4 13:28:52 2014 -0800
glamor: Drop duplicated lines for getting pixmap state in GetImage.
No change in generated code size -- apparently the compiler figured it
out.
Signed-off-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Markus Wick <markus@selfnet.de>
commit e23dd41195dfaf1f3e303197845a071d01523618
Author: Eric Anholt <eric@anholt.net>
Date: Mon Dec 30 18:41:57 2013 -0800
glamor: Return the stride/size for glamor_dri3_name_from_pixmap(), too.
Just like for a caller of glamor_dri3_fd_from_pixmap(), otherwise the
consumer of that named buffer has no idea what GL chose for the
stride.
Signed-off-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Markus Wick <markus@selfnet.de>
commit 4e21b7ee49bc8f33c6211411d80aa70b16998adc
Author: Eric Anholt <eric@anholt.net>
Date: Mon Dec 30 18:33:09 2013 -0800
glamor: Drop the body of the function for enabling DRI3 extensions.
The flag is already being set at glamor_egl_screen_init() time, so no
need for the driver to separately call this. That said, leave the
function around to keep the ABI compatibility.
Signed-off-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Markus Wick <markus@selfnet.de>
commit 92e2125c5219c7b270785f063fe2560583b2baff
Author: Eric Anholt <eric@anholt.net>
Date: Mon Dec 30 18:29:50 2013 -0800
sync: Add a header include necessary to use misyncstr.h
Signed-off-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Keith Packard <keithp@keithp.com>
commit 12b2adaaeb091ad48825f439fa0359e5641c86d1
Author: Eric Anholt <eric@anholt.net>
Date: Sat Dec 28 13:46:17 2013 -0800
glamor: Do glyph private init at screeninit time, and other stuff at CSR.
This hasn't actually been a problem, since the server hasn't allocated
any glyphs before our glyph private initialization during
CreateScreenResources. But it's generally not X Server style to do
things this way.
Now that glamor itself drives both parts of glyphs setup, DDX drivers
no longer need to tell glamor to initialize glyphs. We do retain the
old public symbol so they can keep running with no changes.
Signed-off-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Markus Wick <markus@selfnet.de>
commit df1ef90fa0f98c779c3f312130183dbf32f1e447
Author: Eric Anholt <eric@anholt.net>
Date: Fri Dec 27 18:45:44 2013 -0800
glamor: Move the EGL image to the normal pixmap private.
There's no reason to hide EGL from the rest of glamor, now that we
have epoxy.
Signed-off-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Markus Wick <markus@selfnet.de>
commit 732faea542c5ecab353536f93bab5dc6c6068d0a
Author: Eric Anholt <eric@anholt.net>
Date: Fri Dec 27 18:27:56 2013 -0800
glamor: Use epoxy_has_egl_extension() instead of rolling our own.
Signed-off-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Markus Wick <markus@selfnet.de>
commit a895f6a16588024e03218d8d0e77dd8bd8494329
Author: Eric Anholt <eric@anholt.net>
Date: Sun Jan 5 02:45:05 2014 -0800
glamor: Drop the set of the context to NULL at the end of glamor ops.
The theory here was that it (which I copied from EGL) existed to fix
up context switching with indirect GLX. But indirect GLX won't even
try to set the context again unless its lastContext field is cleared,
so we need to solve this a different way.
Signed-off-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Keith Packard <keithp@keithp.com>
commit f31911ff8f3f3707101b7771d5dc994ed1ca5c70
Author: Eric Anholt <eric@anholt.net>
Date: Thu Feb 27 17:55:50 2014 -0800
xephyr: Don't forget to glViewport() before drawing the screen.
Fixes misrendering with cairogears. I had noticed the failure while
trying to figure out what was going on with traps. Cairogears was
apparently putting its results on the screen through putimage, which
is a texture upload, so the last GL drawing was done to the size of
the cairogears window, not the size of the xephyr screen.
Signed-off-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Keith Packard <keithp@keithp.com>
commit 8b6c79e19cfabd9f343884ddd91a738720c94583
Author: Kristian Høgsberg <krh@bitplanet.net>
Date: Wed Mar 12 17:20:17 2014 +1000
xkb: add KeymapOrDefault
Helper function to return a default map if the keymap compilation failed.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Kristian Høgsberg <krh@bitplanet.net>
commit cb9a1d01468732196fd25c6422991e784639ffce
Author: Kristian Høgsberg <krh@bitplanet.net>
Date: Wed Mar 12 17:18:22 2014 +1000
xkb: factor out xkb loading to LoadXkm
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Kristian Høgsberg <krh@bitplanet.net>
commit 4391cf27f40ec53d41ac7e437cde49848eb32bde
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Wed Mar 12 16:08:15 2014 +1000
xkb: add a callback to xkbcomp
This provides a callback to write to xkbcomp's buffer once everything is
prepared.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Kristian Høgsberg <krh@bitplanet.net>
commit 6ebd838d80074075827dedb75ed4169ea1946be3
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Wed Mar 12 17:17:25 2014 +1000
xkb: constify XkbDDXOpenConfigFile
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Kristian Høgsberg <krh@bitplanet.net>
commit 2b77b208daf9402472ba7fb709156a14eb487299
Author: Hans de Goede <hdegoede@redhat.com>
Date: Wed Mar 12 16:00:23 2014 +0100
xf86Xinput: release server managed fd before removing the device from the list
So that the fd in use test in systemd_logind_release_fd works properly.
Note we cannot change the test inside systemd_logind_release_fd as it must
work for devices which were never added to the xf86InputDevs too.
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 0e972b6037d3709c13d46adef9d14b702f477abc
Author: Hans de Goede <hdegoede@redhat.com>
Date: Wed Mar 12 14:57:24 2014 +0100
systemd-logind: Correctly deal with InputDevs sharing a device-node
InputDevices may share a single device-node, this happens ie with Wacom
tablets.
This patch makes take_fd and release_fd properly deal with this, together
with the earlier patch for updating the fd in all matching xf86InputDevs
on pause / resume this completes support for such shared device-nodes.
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 8d3f63dbe9bfd816beb6475fd0e00df4dbba269f
Author: Hans de Goede <hdegoede@redhat.com>
Date: Wed Mar 12 12:58:22 2014 +0100
systemd-logind: Add a systemd_logind_set_input_fd_for_all_devs helper
And use it where appropriate.
Setting the fd for all matching InputDevices is necessary when we've
multiple InputDevices sharing a single device-node, such as happens with
Wacom tablets.
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 4e3d9690e1868d286dcb766b429f9c99313f2401
Author: Hans de Goede <hdegoede@redhat.com>
Date: Wed Mar 12 13:19:32 2014 +0100
systemd_logind_find_info_ptr_by_devnum: Move to higher inside the file
This is a preparation patch for adding support for server managed fds
for InputDevices where multiple input devices share the same device node (and
thus also their major and minor).
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
commit ddc3888bbaaddc47706a9cb96459738683d72cb3
Author: Hans de Goede <hdegoede@redhat.com>
Date: Wed Mar 12 12:45:40 2014 +0100
systemd_logind_find_info_ptr_by_devnum: Add a start argument
Modify systemd_logind_find_info_ptr_by_devnum to take a start argument, so
that it can be used to find all occurences of a devnum in an InputInfo list,
rather then just the first.
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 40e3c79a591909ab64822cc86fd07513317bf19b
Author: Hans de Goede <hdegoede@redhat.com>
Date: Tue Mar 11 11:38:09 2014 +0100
Remove config_odev_add_*attribute checks in various places
Note that there are more callers but those were already not doing any
error checking.
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 92ff79f1a804d63d2f2bb59dfbf3a2869627609a
Author: Hans de Goede <hdegoede@redhat.com>
Date: Tue Mar 11 11:28:15 2014 +0100
config_odev*: Use XNF alloc functions
config_odev* functions are called in code-paths were we already use
XNF* functions in other places, so which are not oom safe already.
Besides that oom is something which should simply never happen, so aborting
when it does is as good a response as any other.
While switching to XNF functions also fixup an unchecked strdup case.
Note the function prototypes are kept unchanged, as they are part of the
server ABI.
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
commit e7b84ca46944895971a8f048c7e34869b7de01c0
Author: Hans de Goede <hdegoede@redhat.com>
Date: Wed Mar 5 16:41:14 2014 +0100
Xorg: Add a suid root wrapper
With the recent systemd-logind changes it is possible to install the Xorg
binary without suid root rights and still have everything working as it
should *if* the user only has cards which are supported by kms.
This commit adds a little suid root wrapper, which is a bit weird, first we
strip the suid-root bit of the Xorg binary, and then we add a wrapper ?
The function of this wrapper is to see if a system still needs root-rights,
if it does not (it supports kms and the kms drivers are properly loaded),
then it will immediately drop all elevated rights before executing the real
Xorg binary. If it finds (some) cards which don't support kms, or no cards
at all, then it will execute the Xorg server with elevated rights so that
ie the nvidia binary driver and the vesa driver can keep working normally.
To make it possible for security concious users who don't need the root
rights to completely remove the wrapper, Xorg is started in a 3 step process
when the wrapper is enabled during build time:
1) A simple shell script which checks if the wrapper is there, if it is
it executes the wrapper, if not it directly executes the real Xorg binary
2) The wrapper gets executed, does its checks, normally drops all elevated
rights and then executes the real Xorg binary
3) The real Xorg binary does its thing
This allows distributions to put the wrapper binary in a separate package, and
will allow users to remove this package. IE the plan with Fedora is to make
"legacy" drivers depend on the wrapper pkg, and since our default install
contains some legacy drivers it will be part of the default install, but
users can later yum remove it (which will also automatically remove the
legacy driver packages as those won't work without it anyways).
The wrapper is loosely modelled after the existing Debian Xwrapper, it
uses the same config-file + config-file format, and also allows restricting
Xserver execution (through the wrapper) to console users only.
There also is a new needs_root_rights config file directive, which can
be used to override the auto-detection the wrapper does.
Hopefully this will allow Debian to replace their own wrapper with this
upstream one.
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
commit d35a02a767017f13db4bd4742eef49293d5a30ea
Author: Rui Matos <tiagomatos@gmail.com>
Date: Fri Mar 7 14:32:27 2014 -0800
xkb: Repurpose XkbCopyDeviceKeymap to apply a given keymap to a device
This will also make it useful for cases when we have a new keymap to
apply to a device but don't have a source device.
Reviewed-by: Kristian Høgsberg <krh@bitplanet.net>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 361f405d3c866bc4d22ef84975fe771691156336
Author: Rui Matos <tiagomatos@gmail.com>
Date: Fri Mar 7 14:32:28 2014 -0800
xkb: Factor out a function to copy a keymap's controls onto another
Reviewed-by: Kristian Høgsberg <krh@bitplanet.net>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 81a4952d3dcab9ca3a1ee399c773f5ac352036c4
Merge: 96a28e9c91 795066477e
Author: Keith Packard <keithp@keithp.com>
Date: Tue Mar 11 22:04:36 2014 -0700
Merge remote-tracking branch 'whot/for-keith'
commit 795066477ee81b5b82e490eac8bed6b656d01f17
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Wed Feb 26 07:54:56 2014 +1000
config: search for PnPID on all parents (#75513)
The PnPID for a device may not be on the immediate parent, so search up the
device tree until we find one.
X.Org Bug 75513 <http://bugs.freedesktop.org/show_bug.cgi?id=75513>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Tested-by: Benjamin Tissoires <benjamin.tissoires@gmail.com>
commit 45fb3a934dc0db51584aba37c2f9d73deff9191d
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Wed Feb 26 16:20:08 2014 +1000
xkb: push locked modifier state down to attached slave devices
Whenever the master changes, push the locked modifier state to the attached
slave devices, then update the indicators. This way, when NumLock or CapsLock
are hit on any device, the LED will light up on all devices. Likewise, a new
keyboard attached to a master device will light up with the correct
indicators.
The indicators are handled per-keyboard, depending on the layout, i.e. if one
keyboard has grp_led:num set, the NumLock LED won't light up on that keyboard.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Daniel Stone <daniel@fooishbar.org>
commit 656841798c99bcd79da47c03ec666a48b855541f
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Wed Feb 26 16:16:10 2014 +1000
xkb: factor out state update into a function
No functional changes
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Daniel Stone <daniel@fooishbar.org>
commit dda2468e579762dbd1fed2c75b5587d98f841e9c
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Wed Feb 26 16:03:19 2014 +1000
xkb: factor out the StateNotify flag check
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Daniel Stone <daniel@fooishbar.org>
commit fdb4ec86c29d85c1f68418a26e64bcc05b9c14ae
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Tue Mar 11 14:21:27 2014 +1000
xfree86: handle xorg.conf devices with logind
Only devices from the config backend have their attributes set, devices from
the xorg.conf only have Option "Device". That option is also set by the
config backend, so use it.
And since the config backend sets our major/minor but xorg.conf devices don't
have that set, make sure we try to stat it first where needed.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Hans de Goede <hdegoede@redhat.com>
commit 4754af9ddbd55c5637b56bd9f37d0d3414c839a8
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Tue Mar 11 14:20:51 2014 +1000
config: only free odev->attrib_name for string types
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Hans de Goede <hdegoede@redhat.com>
commit 96a28e9c914d7ae9b269f73a27b99cbd3c465ac8
Author: Eric Anholt <eric@anholt.net>
Date: Thu Mar 6 18:50:07 2014 -0800
glx: Clear new FBConfig attributes to 0 by default.
The visualSelectGroup wasn't getting set (since our DRI drivers don't
use it), and and since it's the top priority in the sort order, you
got random sorting of your visuals unless malloc really returned you
new memory. This manifested as Xephyr -glamor rendering to a
multisampled window on my system, which as you might guess was
slightly lower performance than expected.
Signed-off-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Michel Dänzer <michel.daenzer@amd.com>
commit 2843a2f9b58a4aae2949111722c5c1bf3878674b
Author: Eric Anholt <eric@anholt.net>
Date: Tue Feb 25 16:56:54 2014 -0800
glamor: Use buffer_storage
v2:
- Make the default buffer size a #define. (by Markus Wick)
- Fix the return offset for mapping with buffer_storage. (oops!)
v3:
- Avoid GL error at first rendering from unmapping no buffer.
- Rebase on the glBindBuffer(GL_ARRAY_BUFFER, 0) change.
v4: Rebase on Markus's vbo init changes.
v5: Fix missing put_context() in the buffer_storage fallback path.
Signed-off-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Markus Wick <markus at selfnet.de>
commit 9b86f7a1ab7904fbbe04283b6461a31470c77972
Author: Eric Anholt <eric@anholt.net>
Date: Sun Jan 12 07:54:51 2014 -0800
glamor: Fix requested composite VBO size.
The argument to setup_composte_vbo is the number of verts.
v2: Drop the now-unused vert_stride value.
Signed-off-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Markus Wick <markus at selfnet.de>
commit d310d566b18e55bce27301e9ac78a7894d5194dd
Author: Eric Anholt <eric@anholt.net>
Date: Mon Jan 6 09:29:57 2014 +0800
glamor: Extract the streamed vertex data code used by Render.
We should be uploading any vertex data using this kind of upload
style, since it saves a bunch of extra copies of our vertex data.
v2:
- Add a simple comment about what the function does.
- Use get_vbo_space()'s return in trapezoids, instead of dereffing
glamor_priv->vb (by Markus Wick).
- Fix the double-unmapping by moving put_vbo_space() outside of
flush_composite_rects().
- Remove the rest of the composite_vbo_offset usage, and just always
use get_vbo_space()'s return value.
v3:
- Fix failure to put_vbo_space in traps when no prims were
generated.
- Unbind the VBO from put_vbo_space(). Keeps callers from
forgetting to do so.
v4:
- Split out some changes into the previous 3 commits while trying to
track down a regression.
- Fix regression due to rebase fail where glamor_priv->vbo_offset
wasn't incremented.
v5:
- Fix GLES2 VBO sizing.
- Add a comment about resize behavior.
- Move glamor_vbo.c init code to glamor_vbo.c from
glamor_render.c. (Derived from Markus's changes, but the GLES2 fix
dropped almost all of the code in the functions).
v6:
- Drop the initial BufferData on GLES2 (it happens at put() time).
- Don't forget to set vbo_offset to the size on GLES2.
- Use char * instead of void * in the cast to return the vbo_offset.
- Resize the default FBO to 512kb, to be similar to previous
behavior. +1.66124% +/- 0.284223% (n=679) on aa10text.
Signed-off-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Markus Wick <markus at selfnet.de>
commit ffc8423077d8b5af36ab59f59e4e18109586aec9
Author: Eric Anholt <eric@anholt.net>
Date: Thu Mar 6 17:05:31 2014 -0800
glamor: Track the next vertex offset as we go for AA traps.
Signed-off-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Markus Wick <markus at selfnet.de>
commit ca307fd18d4dfded04979903737ec5dd03487625
Author: Eric Anholt <eric@anholt.net>
Date: Thu Mar 6 17:03:14 2014 -0800
glamor: Track the next vertex offset as we go for non-AA traps.
v2: Use sizeof(float) instead of 4.
Signed-off-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Markus Wick <markus at selfnet.de>
commit 03a33048a74d986e27668a4d01861ead0f8be76b
Author: Eric Anholt <eric@anholt.net>
Date: Thu Mar 6 16:57:46 2014 -0800
glamor: Track the next vertex offset as we go in render accel.
I want to extract the VBO mapping code, and as part of that I need to
get the global vbo_offset munging to stop.
Signed-off-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Markus Wick <markus at selfnet.de>
commit 438d8aceec2d4af48917a7dfecacf11cd4f4b5ce
Author: Eric Anholt <eric@anholt.net>
Date: Thu Mar 6 13:29:08 2014 -0800
glamor: Move glamor_emit_composite_vert() to traps, where it's used.
It's only used in the nonantialiased, triangle-based trapezoids path.
Signed-off-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Markus Wick <markus at selfnet.de>
commit bce5ec4f411134114c6ee2715f293a2250ee8800
Author: Eric Anholt <eric@anholt.net>
Date: Tue Dec 24 12:14:04 2013 -0800
glamor: Don't forget to set GL_INVALIDATE_RANGE_BIT on GL_ARB_mbr.
We don't need any current contents of the buffer, and this allows an
implementation to make a temporary BO for a streamed upload if it
wants to.
Signed-off-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Markus Wick <markus at selfnet.de>
commit 25be6b384298a7769fedb6d9b5bdc370398c9c95
Author: Eric Anholt <eric@anholt.net>
Date: Sun Jan 12 07:18:50 2014 +0800
glamor: Fix a mismatched glamor_get/put_context().
We don't call GL in this function any more, so we can just drop the
get.
Signed-off-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Markus Wick <markus at selfnet.de>
commit bd09292debbb810db06b187d4e61c9416b5e565e
Author: Eric Anholt <eric@anholt.net>
Date: Fri Dec 27 14:03:26 2013 -0800
glamor: Add a note about the state of GL_ARB_map_buffer_range.
GLES2 Xephyr is failing due to lack of glMapBuffer() with the read
bits set, and I decided to see if we can just switch everything to
glMapBufferRange(). I'm undecided, and it largely depends on whether
we find people are interested in using glamor for the windows X server.
Signed-off-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Markus Wick <markus at selfnet.de>
commit ca507d215f54e878055de8da13877bc0225bece1
Author: Eric Anholt <eric@anholt.net>
Date: Tue Dec 24 16:07:12 2013 -0800
glamor: Fix a spelling mistake in GLAMOR_PIXMAP_FBO_NOT_EXACT_SIZE.
Signed-off-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Markus Wick <markus at selfnet.de>
commit 4e86f4236b32b61796d820714dc12457dbc92e28
Author: Eric Anholt <eric@anholt.net>
Date: Mon Dec 23 18:16:01 2013 -0800
glamor: remove dead global variable.
Signed-off-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Markus Wick <markus at selfnet.de>
commit 7f15e5aed79803fa6057fbfda7dfbacacc2e019d
Author: Hans de Goede <hdegoede@redhat.com>
Date: Mon Mar 3 16:58:54 2014 +0100
Require video drivers to report that they support server managed fds
This makes how we handle video drivers identical to what we do for input
drivers, and this should make live easier for old non kms drivers.
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Reviewed-by: Dave Airlie <airlied@redhat.com>
commit 76af81bdf8ade158d7cef718ff6cf31cbf641a9a
Author: Hans de Goede <hdegoede@redhat.com>
Date: Mon Mar 3 16:07:16 2014 +0100
xf86platformBus: Make doPlatformProbe accept a NULL gdev argument
And use it from xf86platformAddDevice too, instead of directly calling
drvp->platformProbe.
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Reviewed-by: Dave Airlie <airlied@redhat.com>
commit 749d25f6f0faed00a4cd906171ea6f96d76591e7
Author: Hans de Goede <hdegoede@redhat.com>
Date: Fri Mar 7 04:59:47 2014 -0500
systemd-logind: Fix vt-enter not working when using a legacy video driver
If there is only a single non kms video device (tested with the vesa driver),
then we will never get a resume signal for a drm node, so also call vtenter
when we get a resume for an input device.
Notes:
1) vtenter checks if it is ok to do the vtenter, so if there are kms video
devices the calls for input device resumes are a nop
2) This assumes that there will always be at least one server event fd
supporting input device. Since all non legacy input-drivers will be patched
to supported server fds this seems a safe assumption.
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
commit c6dea929a4951c3c048554a1ef54cf8143d9577a
Author: Hans de Goede <hdegoede@redhat.com>
Date: Mon Mar 3 17:00:57 2014 +0100
config_odev_add*_attribute: Don't add the attribute to the list twice
Don't do the xorg_list_append a 2nd time when updating existing attributes,
while at it add a helper function for this to avoid code duplication.
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 2f2967173ba0b0a4f7ab013edeaaf11e7c181beb
Author: Hans de Goede <hdegoede@redhat.com>
Date: Mon Mar 3 09:51:36 2014 +0100
hashtabletest: Fix warning: format ‘%ld’ expects argument of type ...
This fixes the following compiler warning:
hashtabletest.c: In function ‘print_xid’:
hashtabletest.c:15:5: warning: format ‘%ld’ expects argument of type ‘long int’, but argument 2 has type ‘XID’ [-Wformat=]
printf("%ld", *x);
^
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Reviewed-by: Eric Anholt <eric@anholt.net>
commit b972851ce47b5e3b681a212a43dd71aab94e7a1b
Author: Dave Airlie <airlied@gmail.com>
Date: Mon Mar 10 08:58:37 2014 +1000
xserver: fix build since system-logind.h
on tinderbox and irc
Reviewed-by: Hans de Goede <hdegoede@redhat.com>
Reviewed-by: Matthieu Herrb <matthieu@herrb.eu>
Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 1c61d38528a573caadee2468ee59ea558c822e09
Merge: 5350ae1d38 bf3543739d
Author: Keith Packard <keithp@keithp.com>
Date: Fri Mar 7 22:07:19 2014 -0800
Merge remote-tracking branch 'jwrdecoede/for-keith'
commit 5350ae1d38f3c69a26421e0866ede0d2ccc3aea4
Author: Jon TURNEY <jon.turney@dronecode.org.uk>
Date: Fri Mar 7 15:59:10 2014 +0000
Fix xephyr build in --disable-glamor case
It broke after commit 9fe052d90cca90fdf750d3a45b151be2ac7f0ebd
"xephyr: Build support for rendering with glamor using a -glamor
option."
See http://tinderbox.x.org/builds/2014-03-07-0004/logs/xserver/#build
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Signed-off-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Eric Anholt <eric@anholt.net>
commit 78e508c9379b3976ac8e76b7aaa90ba86ad4e443
Author: Andrew Eikum <aeikum@codeweavers.com>
Date: Mon Dec 30 09:15:41 2013 -0600
dix: Clear any existing selections before initializing privates
If there is a selection left over from a previous execution of the
main loop, and that selection has privates allocated for it, the X
server will crash. This is because dixResetPrivates() resets the
privates refcounts to zero without accounting for the reference held
by the selection object. When the selection is then deleted in
InitSelections() after the call to dixResetPrivates(), the refcount
for its privates type goes negative and bad things happen.
To fix this, we should delete any existing selections before calling
dixResetPrivates(). This will properly release the selection's
privates and avoid the crash.
A more thorough description of the problem and a test case to
reproduce the crash is available at a previous mail:
"Negative Selection devPrivates refcount?"
By Andrew Eikum to xorg-devel on 10 Dec 2013
http://lists.freedesktop.org/archives/xorg-devel/2013-December/039492.html
Signed-off-by: Andrew Eikum <aeikum@codeweavers.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit da08316605b26830b4d8f8fb2d9e69471cdc80ab
Author: Eric Anholt <eric@anholt.net>
Date: Tue Dec 31 00:07:42 2013 -0800
glamor: Add support for DRI3.
The render-nodes case is untested.
v2: Add a flag for wayland to suppress the native DRI3 support.
Wayland isn't running as a master itself, so it can't do the auth
on its own and has to ask the compositor to do it for us. Dropped
XXX about randr provider -- the conclusion from discussion with
keithp was that if the driver's dri3_open for a provider on a
different screen, that's a core dri3 bug.
v3: Don't put quite so much under GLAMOR_NO_DRI3, and add a comment
explaining what this is about.
Signed-off-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Adam Jackson <ajax@redhat.com>
commit fb4a1e6ef6f80a7670e92cab2bc490d4afd80a9b
Author: Eric Anholt <eric@anholt.net>
Date: Mon Dec 30 18:49:46 2013 -0800
glamor: Rename the DRI-related pixmap functions.
There was confusion over whether they should have egl in the name, and
they had DRI3 in the name even though they're useful to have without
DRI3.
v2: Just rename glamor_name_from_pixmap for now -- I'd accidentally
conflict-resolved in adding new parameters from a later commit.
Signed-off-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Adam Jackson <ajax@redhat.com>
commit 2d20f75b60276508424997d9fa8c5b97d8f1d92b
Author: Eric Anholt <eric@anholt.net>
Date: Fri Dec 27 22:19:07 2013 -0800
xorg: Connect up the glamor XV code, xorg DDX-only for now.
Porting this code to be non-xorg-dependent is going to take
significant hacking, so just dump it in the glamoregl module for the
moment, so I can hack on it while regression testing.
v2: Fix compiler warnings by adding #include dix-config.h at the top,
don't try to auto-init (I'll try to fix the xv ABI later).
v3: Fix last minute breakage of having reintroduced xf86ScrnToScreen
(one of the compat macros). Just use the drawable's pScreen instead.
Signed-off-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Adam Jackson <ajax@redhat.com>
commit 8d1cca30638f8a12c09efee27e9dedd90322b40e
Author: Eric Anholt <eric@anholt.net>
Date: Fri Dec 27 16:44:15 2013 -0800
xorg: Build a glamor_egl module.
This is not exposing the API we want long term, but it should get
existing DDX drivers up and running while we massage the API into
shape.
v2: Use LIBADD instead of LDFLAGS to fix deps on libglamor.la, and use
version 0.5.1 (the point it was forked from the external repo).
Signed-off-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Adam Jackson <ajax@redhat.com>
commit fa2e78788327c41bfd45b3de3c71bf9c26dcc85e
Author: Eric Anholt <eric@anholt.net>
Date: Fri Dec 20 10:41:43 2013 -0800
xephyr: Pass incoming XCB events to the Xlib event filter.
This is the same thing that Qt ended up doing to get DRI2's event
mangling to happen despite using an XCB event loop.
Signed-off-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Keith Packard <keithp@keithp.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
commit 9fe052d90cca90fdf750d3a45b151be2ac7f0ebd
Author: Eric Anholt <eric@anholt.net>
Date: Wed Dec 18 13:24:14 2013 -0800
xephyr: Build support for rendering with glamor using a -glamor option.
v2: Avoid making the Ximage for the screen that we'll never use, and
drive the screen pixmap creation for glamor ourselves.
Signed-off-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Keith Packard <keithp@keithp.com> (v1)
Reviewed-by: Adam Jackson <ajax@redhat.com>
commit b634e909895f6001e7d9543e1350b20c82c8c01c
Author: Jon TURNEY <jon.turney@dronecode.org.uk>
Date: Thu Jun 27 23:56:23 2013 +0100
hw/xwin: More closely follow ICCCM for setting input focus
In multiwindow mode, more closely follow ICCCM section 4.1.7 when setting X
input focus to a window when the native Windows window acquires input focus:
- If InputHint is FALSE, don't use XSetInputFocus()
- If the window supports the WM_TAKE_FOCUS protocol, send a WM_TAKE_FOCUS message
This helps JDK 1.7 clients acquire the focus correctly.
Also, factor out checking client support for a given WM_PROTOCOLS protocol as a
separate function.
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
commit 0fc84a2bb6970f6b05a19cd8b32a7f3f7fd148b3
Author: Colin Harrison <colin.harrison@virgin.net>
Date: Fri Feb 28 15:02:14 2014 +0000
hw/xwin: Remove unnecessary casts from malloc/realloc/calloc calls
Remove unnecessary casts from malloc/realloc/calloc calls. This is the style
used for the majority of X server code.
Signed-off-by: Colin Harrison <colin.harrison@virgin.net>
Reviewed-by: Jon TURNEY <jon.turney@dronecode.org.uk>
commit 94f709cfce62e716f8d3adea388625850de71e78
Author: Colin Harrison <colin.harrison@virgin.net>
Date: Fri Feb 28 14:23:00 2014 +0000
hw/xwin: Add missing FORCEEXIT token to XWin configuration file lexer
Somehow this was left out of commmit f3fad371cce0f3836514ad5b29e59fa1ca0627a7
Signed-off-by: Colin Harrison <colin.harrison@virgin.net>
Reviewed-by: Jon TURNEY <jon.turney@dronecode.org.uk>
commit 6432d44020443bbda90bd46ffcb572b51be803a1
Author: Colin Harrison <colin.harrison@virgin.net>
Date: Fri Feb 28 14:21:46 2014 +0000
hw/xwin: Silence bell when volume is zero
Allow the bell to be turned off with X server option '-f 0', or by 'xset b off'.
Signed-off-by: Colin Harrison <colin.harrison@virgin.net>
Reviewed-by: Jon TURNEY <jon.turney@dronecode.org.uk>
commit 7e37c4f727609d2d992ca46ffce56311c8d8225c
Author: Colin Harrison <colin.harrison@virgin.net>
Date: Fri Feb 28 14:21:06 2014 +0000
hw/xwin: Fix typo in comment
'i' before 'e' except after 'c'
Signed-off-by: Colin Harrison <colin.harrison@virgin.net>
Reviewed-by: Jon TURNEY <jon.turney@dronecode.org.uk>
commit d75195b62677f5b0f17bbe089b3aea5b295d5f2c
Author: Colin Harrison <colin.harrison@virgin.net>
Date: Fri Feb 28 14:20:48 2014 +0000
hw/xwin: Align parameter names in prototypes with definition
A follow up to commits 2d9123fd, 451c5d91 and efe96a17, which changed the
parameter name in the definition from index to i, to fix shadowing index() but
didn't adjust the prototype declaration.
Signed-off-by: Colin Harrison <colin.harrison@virgin.net>
Reviewed-by: Jon TURNEY <jon.turney@dronecode.org.uk>
commit e53568e2c5004a434a16e3971fb2cd0823e6487b
Author: Jon TURNEY <jon.turney@dronecode.org.uk>
Date: Wed Jan 1 16:43:38 2014 +0000
hw/xwin: Just generate the WGL wrappers we need
Just generate the WGL wrappers we need, rather than for everything in wgl.xml
This avoids generating a lot of unused wrappers, and also avoids compilation
requiring a wglext.h at least as new as wgl.xml
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
commit dec5e9899bfee2a83f8a64f975790ecd2390256d
Author: Yaakov Selkowitz <yselkowitz@users.sourceforge.net>
Date: Wed Apr 10 18:04:17 2013 +0100
hw/xwin: Fix implicit-function-declaration warning in XwinExtensionInit() when compiled with XWIN_GLX_WINDOWS defined
InitOutput.c: In function ‘XwinExtensionInit’:
InitOutput.c:170:9: error: implicit declaration of function ‘glxWinPushNativeProvider’ [-Werror=implicit-function-declaration]
glxWinPushNativeProvider();
^
InitOutput.c:170:9: warning: nested extern declaration of ‘glxWinPushNativeProvider’ [-Wnested-externs]
Signed-off-by: Yaakov Selkowitz <yselkowitz@users.sourceforge.net>
Reviewed-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
commit bf3543739db18c6cd52908f7c693cb64f43e3f23
Author: Hans de Goede <hdegoede@redhat.com>
Date: Sat Feb 1 13:21:15 2014 +0100
xf86OpenSerial: Add support server managed fds
Try to get a server managed fd from the Options before trying to open the
device node ourselves.
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
commit d9a4059d400bf288aadd17c04885cb9b0fb93989
Author: Hans de Goede <hdegoede@redhat.com>
Date: Tue Jan 14 15:47:48 2014 +0100
config-udev: Don't try to add drm devices twice
Before this commit we were trying to add most drm devices twice, once
from xf86platformProbe() and once from config_udev_init().
This results in somewhat confusing messages in Xorg.log, ie:
(II) xfree86: Adding drm device (/dev/dri/card0)
Later followed by:
(II) config/udev: Adding drm device (/dev/dri/card0)
By filtering out duplicate drm devices we avoid these confusing messages.
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Acked-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 687afa3f6475060e6c460aa9496ba1a6a7982102
Author: Hans de Goede <hdegoede@redhat.com>
Date: Fri Jan 31 15:21:38 2014 +0100
systemd-logind: Add delayed input device probing
With systemd-logind we cannot probe input devices while switched away, so
if we're switched away, put the pInfo on a list, and probe everything on
that list on VT-Enter.
This is using an array grown by re-alloc, rather than a xorg_list since
creating a new data-type to store a pInfo + list-entry just for this seems
overkill.
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
commit cac39219898f5e5a59ff8d8d6524f5fe0d111469
Author: Hans de Goede <hdegoede@redhat.com>
Date: Tue Jan 14 15:37:33 2014 +0100
systemd-logind: Hookup systemd-logind integration
This commits makes the changes necessary outside of the systemd-logind core
to make the server use systemd-logind managed fds for input devices and drm
nodes.
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 82863656ec449644cd34a86388ba40f36cea11e9
Author: Hans de Goede <hdegoede@redhat.com>
Date: Tue Jan 7 12:15:12 2014 +0100
systemd-logind: Add systemd-logind "core"
This commits add the bulk of the systemd-logind integration code, but does
not hook it up yet other then calling its init and fini functions, which
don't do that much.
Note the configure bits check for udev since systemd-logind use will only be
supported in combination with udev. Besides that it only checks for dbus
since all communication with systemd-logind is happening over dbus, so
no further libs are needed.
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 5fb641a29bfb4a33da964e1e9af523f3472015c6
Author: Hans de Goede <hdegoede@redhat.com>
Date: Mon Jan 13 12:03:46 2014 +0100
hotplug: Extend OdevAttributes for server-managed fd support
With systemd-logind support, the xserver, rather than the drivers will be
responsible for opening/closing the fd for drm nodes.
This commit adds a fd member to OdevAttributes to store the fd to pass it
along to the driver.
systemd-logind tracks devices by their chardev major + minor numbers, so
also add OdevAttributes to store the major and minor.
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Reviewed-by: Dave Airlie <airlied@redhat.com>
commit a8d802cb019da0549da57576ba0cc2cef1c8a98c
Author: Hans de Goede <hdegoede@redhat.com>
Date: Sun Feb 2 13:54:33 2014 +0100
OdevAttribute: Remove unowned flag from OdevAttributes head
The OdevAttributes struct should just be a head of the attributes list, and
not contain various unrelated flags. Instead add a flags field to
struct xf86_platform_device and use that.
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Reviewed-by: Dave Airlie <airlied@redhat.com>
commit bc9d17fb566d57eabe4a3372773654fcf6ae5b44
Author: Hans de Goede <hdegoede@redhat.com>
Date: Sun Feb 2 15:28:31 2014 +0100
OdevAttribute: Add support for integer attributes
Add a couple of new functions for dealing with storing integer values into
OdevAttributes.
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Reviewed-by: Dave Airlie <airlied@redhat.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 350559dcdcd8b0de57801302e385e25debcb91f1
Author: Hans de Goede <hdegoede@redhat.com>
Date: Mon Feb 3 15:47:35 2014 +0100
OdevAttribute: config_odev_add_attribute: replace existing values
If an attribute already exists replace its value rather than adding a
duplicate attribute with the new value to the list.
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Reviewed-by: Dave Airlie <airlied@redhat.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 10c64e80569bbd35e97916a067f553cab27454b5
Author: Hans de Goede <hdegoede@redhat.com>
Date: Sun Feb 2 11:25:34 2014 +0100
OdevAttribute: Add config_odev_get_attribute helper
Add a config_odev_get_attribute helper, and replace the diy looping over all
the attributes done in various places with calls to this helper.
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Reviewed-by: Dave Airlie <airlied@redhat.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 3346166a6596115421702c1f7e2732215674ab8e
Author: Hans de Goede <hdegoede@redhat.com>
Date: Mon Jan 13 11:57:38 2014 +0100
xf86Xinput: Modify API for server-managed fd support
With systemd-logind support, the xserver, rather than the drivers will be
responsible for opening/closing the fd for input devices.
This commit adds a new capabilities field to the InputDriverRec and a
XI86_DRV_CAP_SERVER_FD flag for drivers to indicate that they support server
managed fds.
This commit adds a new XI86_SERVER_FD flag to indicate to drivers when the
server is managing the fd and they should not open/close it. Note that even
if drivers declare they support server managed fds there is no guarantee they
will actually get them.
Since this changes the input driver ABI, this commit bumps it.
systemd-logind tracks devices by their chardev major + minor numbers, since
we are breaking ABI anyways also add major and minor fields for easy storage /
retrieval of these.
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 6b79f28f5cb259f2168ecc3034fe2161e969bf7d
Author: Hans de Goede <hdegoede@redhat.com>
Date: Wed Jan 22 11:32:56 2014 +0100
linux: xf86OpenConsole: Don't detach from controlling tty when it is our vt
Detaching from our controlling tty makes little sense when it is the same
as the vt we're asked to run on. So automatically assume -keeptty in this case.
This is useful to do because when not running as root the server can only make
various VT related ioctls when it does not detach from the tty.
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 701b7ab34984b0f9f0c357b0ff8b53c5132c6324
Author: Hans de Goede <hdegoede@redhat.com>
Date: Thu Jan 16 10:37:28 2014 +0100
linux: xf86OpenConsole remove root-rights check for keeptty option
There is no reason why keeptty cannot be used without root-rights.
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 98f59a33dfc2d47a57c68420f226dc0c17992164
Author: Dave Airlie <airlied@redhat.com>
Date: Fri Feb 28 12:04:30 2014 +1000
modesetting: fix cursor rendering with hotspots.
older kernels report EINVAL not ENOSYS, doh.
Signed-off-by: Dave Airlie <airlied@redhat.com>
commit 2029c028fcffbe1aa175ab75636ae954a211c82a
Author: Adam Jackson <ajax@redhat.com>
Date: Tue Feb 25 09:06:55 2014 -0500
modesetting: Don't (brokenly) double-track software cursor
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit caf1dec2a76fbbd21259fe4cc809e24a55ff79b4
Author: David Sodman <dsodman@chromium.org>
Date: Mon Feb 10 09:07:33 2014 -0800
V2: Add check for link from output to crtc before optimizing out a CrtcSet call
The function RRCrtcSet call checks to see if the config being set is
already configured, but, doesn't check that the selected outputs are
connected to the crtc before skipping. This means that the following
sequence will omit the final CrtcSet call to the driver:
CRTC c1 connect to output o
CRTC c2 connect to output o
CRTC c1 connect to output o
This change adds the check to ensure that each of the calls are made to
the driver.
Signed-off-by: David Sodman <dsodman@chromium.org>
Reviewed-by: Stéphane Marchesin <marcheu@chromium.org>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 249565a07d1d243e27440e2a5ecf4c95490903c6
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Sun Feb 9 23:13:51 2014 -0800
Fix test/os to work on Solaris
Due to bad decisions made decades ago at AT&T, on SVR4 OS'es the signal()
function resets the signal handler before calling the signal handler
(equivalent to sigaction flag SA_RESETHAND). This is why the X server
has a OsSignal() helper function in os/utils.c that uses the portable
POSIX sigaction function to provide BSD/Linux semantics in a signal()
style API, so we switch to use that in this test case, allowing it to
pass on Solaris.
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 0031f6b073c7a4cca553c1d3e185a63436a75cbe
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Sun Feb 9 23:13:50 2014 -0800
Fix test/signal-logging to work on Solaris
For some reason, Solaris libc sprintf() doesn't add "0x" to the %p output
as glibc does, causing the test to fail for not matching the exact output.
Since the 0x is desirable, we add it ourselves to the test string.
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit e67f2d7e0f9189beb2907fa06cff5ecc7f35f922
Author: Matthieu Herrb <matthieu.herrb@laas.fr>
Date: Sun Feb 9 11:20:59 2014 +0100
gcc 4.2.1 doesn't support #pragma GCC diagnostic ignored
Signed-off-by: Matthieu Herrb <matthieu@herrb.eu>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 1940508a4af33d44a7a8ef24bbdcd1e31e228dab
Merge: c85ea92af1 ddeca92749
Author: Keith Packard <keithp@keithp.com>
Date: Mon Feb 24 16:27:52 2014 -0800
Merge remote-tracking branch 'herrb/master'
commit c85ea92af145c98a4a3fc6cf7b9eac796a48cc2e
Author: Keith Packard <keithp@keithp.com>
Date: Mon Feb 24 09:51:39 2014 -0800
Bump to 1.15.99.901
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 0840a303c47b9b10ba8e24e62956da0f1675e963
Merge: 0f10cfd4b9 3d71df48e7
Author: Keith Packard <keithp@keithp.com>
Date: Mon Feb 24 09:40:23 2014 -0800
Merge remote-tracking branch 'anholt/glamor-pull-request'
commit fac2bcf1da09fba8bc8b22631e31f3c5b2737efd
Author: Dave Airlie <airlied@redhat.com>
Date: Mon Jan 20 11:06:42 2014 +1000
modesetting: try and use hotspot cursor support
Signed-off-by: Dave Airlie <airlied@redhat.com>
commit 4aab7aa7c1a15af7211996fa30e17a645f120ff9
Author: Dave Airlie <airlied@redhat.com>
Date: Fri Feb 21 12:48:42 2014 +1000
modesetting: move closing fd to after we check outputs
On something like cirrus, start X, then attempt to start a second
X while the first is running, if fbdev is installed it'll fail
hard.
Signed-off-by: Dave Airlie <airlied@redhat.com>
commit 0f10cfd4b903d4db293ec47c8a9a0d8b33965803
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu Feb 20 13:18:05 2014 +1000
Xi: check for invalid modifiers for XI2 passive grabs
The other values are checked correctly, but if a modifier was outside the
allowed range, it would go unnoticed and cause a out-of-bounds read error for
any mask equal or larger than 256. The DetailRec where we store the grab masks
is only sized to 8 * sizeof(Mask).
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
commit ec6a44612565e0716bd5b2e2b80a8d381691feb6
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Wed Feb 19 13:48:06 2014 -0500
test: remove source file from hashtabletest LDADD
LDADD is for libraries and not for source code.
Introduced in commit: ccb3e78124fb05defd0c9b438746b79d84dfc3ae
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 31b0be69e5eea3d1c82d6610bd37bbdb4dca779c
Author: Thierry Reding <treding@nvidia.com>
Date: Wed Feb 19 17:16:48 2014 +0100
test/input: Fix alignment assertion for doubles
The code previously tried to compute the offset of a field in the
valuator by subtracting the address of the valuator from the _value_ of
the field (rather than the field's address). The correct way to do it
would have been (note the &'s):
assert(((void *) &v->axisVal - (void *) v) % sizeof(double) == 0);
assert(((void *) &v->axes - (void *) v) % sizeof(double) == 0);
That's essentially what the offsetof() macro does. Using offsetof() has
the added benefit of not using void pointer arithmetic and therefore
silencing a warning on some compilers.
Signed-off-by: Thierry Reding <treding@nvidia.com>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 9368bdec1d37127e97411b684f0b1fce5ee97907
Author: Laércio de Sousa <lbsousajr@gmail.com>
Date: Mon Feb 17 08:43:49 2014 +1000
Get rid of config/non-seat0.conf.multi-seat
This file is deprecated by commits c73c36b53 and 46cf2a6093.
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 3d71df48e70884deccb293cf1fcffbdba8efd94b
Author: Eric Anholt <eric@anholt.net>
Date: Fri Dec 27 14:21:05 2013 -0800
glamor: Move the EGL DRI3 code to GLAMOR_HAS_GBM.
There's nothing dependent on the presence of DRI3 code in the server
for this, but it does rely on GBM.
Signed-off-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Keith Packard <keithp@keithp.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
commit 80cdbb20f9dcdfdf3e77ecf5cdd7dfb1a87d1a83
Author: Eric Anholt <eric@anholt.net>
Date: Fri Dec 27 13:21:21 2013 -0800
glamor: Fix linking of the gradient shaders on GLES2.
GLES2 sensibly doesn't allow you to attach multiple shaders for the
same stage to a single program. This means we have to attach the
whole thing in one glShaderSource call.
Signed-off-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Keith Packard <keithp@keithp.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
commit 76bd0f994959f30a37d41eaf06f43f23c3b23faf
Author: Eric Anholt <eric@anholt.net>
Date: Fri Dec 27 13:09:25 2013 -0800
glamor: Don't bother keeping references to shader stages for gradients.
They never get reattached to any other program, so saving them to
unreference later is a waste of code.
Signed-off-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Keith Packard <keithp@keithp.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
commit 6e62cdf66d2f0baa4a26eff6f4917f73baf3b008
Author: Eric Anholt <eric@anholt.net>
Date: Fri Dec 27 11:29:27 2013 -0800
glamor: Fix typo in setting v_position's attrib location.
Assuming it was the first attribute assigned by the GL, it would have
ended up with location 0 anyway.
Signed-off-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Keith Packard <keithp@keithp.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
commit f8d384fa8f0fa2a3ac04c4ad21fb04400490e8e6
Author: Eric Anholt <eric@anholt.net>
Date: Fri Dec 27 02:13:27 2013 -0800
glamor: Move shader precision stuff from build time to shader compile time.
This is the last desktop-versus-ES2 build ifdef in core glamor.
Signed-off-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Keith Packard <keithp@keithp.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
commit 1adac62a7d9da099c779e65527ece611cf4d2f2c
Author: Eric Anholt <eric@anholt.net>
Date: Fri Dec 27 02:10:53 2013 -0800
glamor: Unifdef the picture-format-to-format-and-type functions.
Signed-off-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Keith Packard <keithp@keithp.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
commit 3747c260816a36352bb91ce06befcbffbbd747c7
Author: Eric Anholt <eric@anholt.net>
Date: Fri Dec 27 16:12:15 2013 -0800
glamor: Move glamor_get_tex_format_type_from_pictformat to a .c file.
A pair of 150 lines of inlined switch statements in a header file is
crazy.
Signed-off-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Keith Packard <keithp@keithp.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
commit 0e4f3414189b1820443b35248e4c9e03f0c2e34e
Author: Eric Anholt <eric@anholt.net>
Date: Fri Dec 27 02:04:11 2013 -0800
glamor: Unifdef the cache format indices.
We only ask for GL_RGB on desktop GL as far as I can see, but now if
GLES2 did happen to ask for GL_RGB it would return a cache index
instead of -1.
Signed-off-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Keith Packard <keithp@keithp.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
commit d63283860a7c04a12838dead0dfd6d04fb73a093
Author: Eric Anholt <eric@anholt.net>
Date: Fri Dec 27 01:23:15 2013 -0800
glamor: Pass pixmaps around to unifdef glamor_iformat_for_depth().
v2: Just pass in the PicturePtr to glamor_pict_format_is_compatible()
(suggestion by keithp)
Signed-off-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Keith Packard <keithp@keithp.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
commit f3f4fc7a65589a200a086ea7b1527f91941bc19b
Author: Eric Anholt <eric@anholt.net>
Date: Fri Dec 27 01:17:10 2013 -0800
glamor: Add a screen argument to drop an ifdef from glamor_set_alu().
Signed-off-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Keith Packard <keithp@keithp.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
commit 9553020b7184ed7a7ef3f02d60556d519ea3e769
Author: Eric Anholt <eric@anholt.net>
Date: Wed Dec 25 11:39:13 2013 -0800
glamor: Drop a bunch of GLES2 ifdefs.
Now that we're using epoxy, we can write code using both desktop and
ES symbols and decide what to use at runtime.
v2: Fix a spelling mistake (latter), since the lines were moved
anyway (noticed by Rémi Cardona). Fix condition invert in
glamor_set_composite_texture (caught by Michel Dänzer).
Signed-off-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Keith Packard <keithp@keithp.com> (v1)
Reviewed-by: Adam Jackson <ajax@redhat.com> (v1)
commit c3c8a5f36034b6a2ce48d1d42e3de5af36406c38
Author: Eric Anholt <eric@anholt.net>
Date: Wed Dec 25 11:36:35 2013 -0800
glamor: yInverted is a boolean value, so use the Bool type.
Signed-off-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Keith Packard <keithp@keithp.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
commit 12cbfeed81d3ae73e10ee8a2b6619fb4f403b8f6
Author: Eric Anholt <eric@anholt.net>
Date: Mon Dec 23 18:00:46 2013 -0800
glamor: Drop fixed function transformation matrix setup.
gl_ModelViewProjection and friends aren't used in our shaders, so this
setup didn't do anything.
Signed-off-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Keith Packard <keithp@keithp.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
commit 62965d278c347ff323f2262d767978794e32f841
Author: Eric Anholt <eric@anholt.net>
Date: Mon Dec 23 17:50:46 2013 -0800
glamor: Drop useless glEnable/glDisable(GL_TEXTURE_2D) calls.
Those calls are only for enabling texture handling in the fixed
function pipeline, while everything we do is with shaders.
Signed-off-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Keith Packard <keithp@keithp.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
commit 4afe15d8bfd575c010ed1868697a7922a37ab378
Author: Eric Anholt <eric@anholt.net>
Date: Wed Dec 18 15:27:52 2013 -0800
glamor: Put in a pluggable context switcher for GLX versus EGL.
The GLX side just gets the context from the current state. That's
also something I want to do for EGL, so that the making a context is
separate from initializing glamor, but I think I need the modesetting
driver in the server before I think about hacking on that more.
The previous code was rather incestuous, along with pulling in xf86
dependencies to our dix code. The new code just initializes itself
from the current state.
Signed-off-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Keith Packard <keithp@keithp.com>
commit 781c692cf970642865f0e537f4905c43192f9935
Author: Eric Anholt <eric@anholt.net>
Date: Wed Dec 18 13:10:24 2013 -0800
glamor: Rename glamor_get/put_dispatch to glamor_get/put_context.
It used to be the thing that returned your dispatch table and happeend
to set up the context, but now it just sets up the context.
Signed-off-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Keith Packard <keithp@keithp.com>
commit 0373b3f4f7c7aec633468b37f9236a2734dbcc74
Author: Eric Anholt <eric@anholt.net>
Date: Wed Dec 18 12:18:20 2013 -0800
glamor: Convert to using libepoxy.
Libepoxy hides all the GL versus GLES2 dispatch handling for us, with
higher performance.
v2: Squash in the later patch to drop the later of two repeated
glamor_get_dispatch()es instead (caught by keithp)
Signed-off-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Keith Packard <keithp@keithp.com>
commit f34dc7fa96457ea6a0703493d74e63cca357712e
Author: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
Date: Fri Feb 14 00:31:38 2014 -0800
XQuartz: pointer -> void *
Fix build regression from 60014a4a98ff924ae7f6840781f768c1cc93bbab
Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
commit 72237e0908527e9261b91c7db99f32d895947d8d
Author: Keith Packard <keithp@keithp.com>
Date: Thu Feb 13 15:25:56 2014 -0800
DIST_SUBDIRS needs to include glamor, even if it isn't built
Otherwise, glamor won't get cleaned for 'make distclean'
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 783991b1beeb71d91068601789d179d10eb8b544
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Thu Feb 13 17:36:34 2014 -0500
config: fails to create tarball as xorg-server.conf file removed
Just need to update EXTRA_DIST
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 02fbae85e7aa17b213e1411fe558256998d367c4
Author: Alex Deucher <alexander.deucher@amd.com>
Date: Wed Feb 12 13:06:51 2014 -0500
modesetting: query cursor size from the kernel
Use new drm caps. This allows hw cursors to work
correctly on gpus with non-64x64 cursors.
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
commit 30c3852bda7f60b0ffb1bb2f6ed8ba8800001b32
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Sun Feb 9 16:56:40 2014 -0800
Delete stray ; in struct _DeviceChangedEvent
Caused Solaris Studio cc to complain in every file which included it:
"../include/eventstr.h", line 179: warning: syntax error:
empty member declaration
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 5300212ce8e9364ba26497605f3edc089af20130
Merge: ae796d43c9 0b193b3ac9
Author: Keith Packard <keithp@keithp.com>
Date: Sun Feb 9 16:05:42 2014 -0800
Merge remote-tracking branch 'whot/for-keith'
commit 0b193b3ac94e078d9291d1b1dfd4814e5f2d9e34
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu Feb 6 07:59:07 2014 +1000
xfree86: use xnfstrdup in the Xorg -configure code
Just for consistency, I'm pretty sure the code is generally not happy for
malloc failures anyway.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Hans de Goede <hdegoede@redhat.com>
Reviewed-by: Keith Packard <keithp@keithp.com>
commit 7b1b7fb3be47672454837a3f7be2d1440433ec27
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Wed Feb 5 15:12:22 2014 +1000
mi: fix printf warning about size_t format specifier
mieq.c:290:26: warning: format '%u' expects argument of type 'unsigned int',
but argument 2 has type 'size_t' [-Wformat=]
pnprintf supports size_t since 5ea21560dd071ea4ab87430000d087fd5fe1f092
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Hans de Goede <hdegoede@redhat.com>
Reviewed-by: Keith Packard <keithp@keithp.com>
commit ddeca927498c9df3b5e62c7bf05e31e2a3aeaa52
Author: Mark Kettenis <kettenis@openbsd.org>
Date: Sun Dec 15 14:31:10 2013 +0100
sync: Avoid ridiculously long timeouts
On OpenBSD, passing a timeout longer than 100000000 seconds to select(2) will
make it fail with EINVAL. As this is original 4.4BSD behaviour it is not
inconceivable that other systems suffer from the same problem. And Linux,
though not suffering from any 4.4BSD heritage, briefly did something similar:
<https://lkml.org/lkml/2012/8/31/263>
So avoid calling AdjustWaitForDelay() instead of setting the timeout to
(effectively) ULONG_MAX milliseconds.
Signed-off-by: Mark Kettenis <kettenis@openbsd.org>
Reviewed-by: Matthieu Herrb <matthieu@herrb.eu>
commit ae796d43c934ba378c9a618adc81c6729a14b2f8
Author: Keith Packard <keithp@keithp.com>
Date: Thu Feb 6 19:17:50 2014 -0800
ephyr: Repaint entire screen when colormap is updated
Any time the colormap is changed, the entire screen needs to be
repainted to match.
Signed-off-by: Keith Packard <keithp@keithp.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
Reviewed-by: Eric Anholt <eric@anholt.net>
commit 9eecc9ac73aa06dca1420e0a89fb0cbd432a9bd7
Author: David Heidelberger <david.heidelberger@ixit.cz>
Date: Fri Feb 7 02:06:04 2014 +0100
configure.ac: add missing "test"
Signed-off-by: Keith Packard <keithp@keithp.com>
Reviewed-by: Hans de Goede <hdegoede@redhat.com>
commit 08c7df9b0870fadf7b4655825459ff2e5a5c47da
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Mon Feb 3 17:38:24 2014 -0800
__glGetProcAddress: explictly cast function pointers to void *
Fixes Solaris Studio compiler warning & error:
"glxext.c", line 557: warning: assignment type mismatch:
pointer to void "=" pointer to function(void) returning void
"glxext.c", line 559: error: operands have incompatible types:
pointer to void ":" pointer to function(void) returning void
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 76eedb039fc8d515a76c1df944fd5a85ac674019
Author: Eric Anholt <eric@anholt.net>
Date: Mon Jan 27 11:36:08 2014 -0800
xfree86: Fix a compiler warning on 64-bit.
asm/mtrr.h makes this an unsigned long on 32, but a u64 on 64. Cast
it to a long to win.
Signed-off-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 9f8f6657cdd3a5b166771695addb6fe76d93c378
Author: Eric Anholt <eric@anholt.net>
Date: Mon Jan 27 11:36:07 2014 -0800
glx: Delete dead NV program string functions.
These have been throwing a compiler warning about missing prototypes,
since the generated code to define the prototypes stopped being
generated (possibly because the code was dead).
Signed-off-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 0c774d53c5c1e8845e7da9b01814d7b98f621f51
Author: Eric Anholt <eric@anholt.net>
Date: Mon Jan 27 11:36:06 2014 -0800
glx: Reduce compiler warnings by not requesting GL extension prototypes.
They're not officially in the ABI, so you shouldn't use them anyway.
Signed-off-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 87c4551c9cc9e382e6cfb59df1759d27c776abc8
Author: Eric Anholt <eric@anholt.net>
Date: Mon Jan 27 11:36:05 2014 -0800
glx: Stop relying on libGL ABI bugs for glGetCompressedTexImage().
In theory, the linux libGL ABI exposes just GL 1.2 plus GLX 1.3. But,
thanks to libglapi, we're letting glGetCompressedTexImageARB() be
exposed too. The GLX code was inappropriately relying on it by using
GL_GLEXT_PROTOTYPES.
Signed-off-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit bf4f02337c97ffc3f7fbba9dba8ab72fa6c4a5fd
Author: Jon TURNEY <jon.turney@dronecode.org.uk>
Date: Mon Jan 6 14:13:24 2014 +0000
glx: Remove left-over glthread.c
Commit be668096 "glx: convert to direct GL dispatch (v2)" removes glthread.c
from Makefile.am along with the rest of the dispatch table code, but doesn't
remove glthread.c itself.
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Reviewed-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 7305153643622269e14f3564f7a8a66ecaf49f78
Author: Adam Jackson <ajax@redhat.com>
Date: Wed Feb 5 11:10:47 2014 -0500
configure: Don't add GLX_SYS_LIBS to XORG_SYS_LIBS
libglx.so is linked against libGL.so, but Xorg itself should not be.
Signed-off-by: Adam Jackson <ajax@redhat.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit c64130c13bd6914a998a8e8b808a6cedd18f9384
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Wed Feb 5 15:10:27 2014 +1000
dix: fix a -Wshadow warning
dispatch.c: In function 'SetVendorString':
dispatch.c:481:29: warning: declaration of 'string' shadows a global declaration [-Wshadow]
SetVendorString(const char *string)
^
dispatch.c:135:21: warning: shadowed declaration is here [-Wshadow]
typedef const char *string;
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Hans de Goede <hdegoede@redhat.com>
Reviewed-by: Keith Packard <keithp@keithp.com>
commit 72967d6c153b0d1109df23967e1a05c3c397a1e0
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Wed Feb 5 14:32:23 2014 +1000
xfree86: unconstify driver in the XF86ConfInputClassRec
No const value is ever assigned to it, let's not pretend it's const.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Hans de Goede <hdegoede@redhat.com>
Reviewed-by: Keith Packard <keithp@keithp.com>
commit f14d6647c0883d4e7e4de7645d7a18e4d301845e
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Wed Feb 5 14:30:50 2014 +1000
xfree86: unconstify another string
Only Xorg -configure uses a hardcoded value here, so let's not change the rest
of the server for that.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Hans de Goede <hdegoede@redhat.com>
Reviewed-by: Keith Packard <keithp@keithp.com>
commit 46ae9d67e4118fa79bef0f9119d20559dfd6b6c0
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Wed Feb 5 14:24:54 2014 +1000
xfree86: un-constify inp_driver/inp_identifier
The only place this isn't allocated is during Xorg -configure where we just
statically assing "mouse"/"kbd" and the identifiers for it. Everywhere else
it's strdup'd and then free'd already.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Hans de Goede <hdegoede@redhat.com>
Reviewed-by: Keith Packard <keithp@keithp.com>
commit 93bf9544712a39f10557533993d8826b2b67fc9a
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Wed Feb 5 14:16:01 2014 +1000
xfree86: device name and driver are not const char
Allocated in one place, freed in another.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Hans de Goede <hdegoede@redhat.com>
Reviewed-by: Keith Packard <keithp@keithp.com>
commit 25d10464f440b8b34594b7c988a99a830ea39a29
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri Jan 24 18:16:54 2014 +1000
dix: fix button state check before changing a button mapping
dev->button->down is a bitmask, not a normal array. Use the helper function to
check, we technically allow the mapping to change after the physical button
has been pressed (but not yet processed yet), so only check BUTTON_PROCESSED.
From XSetPointerMapping(3):
"If any of the buttons to be altered are logically in the down state,
XSetPointerMapping returns MappingBusy, and the mapping is not changed."
Reported-by: Ilja Van Sprundel <ivansprundel@ioactive.com>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Daniel Stone <daniel@fooishbar.org>
commit 73926622b91fde01148727f26d6aad5e6827c1d2
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri Jan 24 18:33:54 2014 +1000
include: make the various button array lengths more obvious
No functional changes, just making a better case for why MAP_LENGTH is 256.
"But can't we remove MAP_LENGTH then?" I hear you say? "Why, yes. Go for it!"
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Daniel Stone <daniel@fooishbar.org>
commit 87ca80a7196949597113225405f3e4ee03bbee13
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri Jan 24 18:32:54 2014 +1000
dix: prevent a driver from initializing or submitting buttons > MAX_BUTTONS
The server internally relies on arrays with a MAX_BUTTONS maximum size (which
is the max the core protocol can transport). Make sure a driver adheres to
that.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Daniel Stone <daniel@fooishbar.org>
commit 14fb6cf92c009d726f0a6b6e8b89cc48f2dd50eb
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu Jan 30 09:16:23 2014 +1000
Revert "xfree86/common: handle string constants in xf86Xinput configuration"
This reverts commit 22592855e90d23013ba7f9e945d567725cb44bf3.
What warning was this supposed to fix?
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Hans de Goede <hdegoede@redhat.com>
commit a553444b5841522836f7437ebb96e40be270fd8b
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu Jan 30 09:12:41 2014 +1000
Revert "xfree86/parser: make strings in xf86MatchGroup const"
This reverts commit f71de60355cc76810657f40c7b5461af86b34bf7.
What warnings?
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Hans de Goede <hdegoede@redhat.com>
commit 45f1d527f39a296104f2fa79a774446e7e1560e0
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu Jan 30 09:01:09 2014 +1000
input: un-constify dev->name
Fallout from fecc7eb1cf66db64728ee2d68cd9443df7e70879, and reverts most of the
rest of that patch.
The device name is allocated and may even change during PreInit. The const
warnings came from the test codes, the correct fix here is to fix the test
code.
touch.c: In function ‘touch_init’:
touch.c:254:14: warning: assignment discards ‘const’ qualifier from pointer target type [enabled by default]
dev.name = "test device";
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Hans de Goede <hdegoede@redhat.com>
commit 675f215af291135ee3ece5414e4a5a2e89bf4ed3
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu Jan 30 08:52:32 2014 +1000
Revert "os: xstrtokenize takes and returns const char * now"
This reverts commit d0339a5c66846c9f14e3b584e34688520a0916ab.
seriously, what the fuck? Are we making xstrdup() return a const char now too?
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Hans de Goede <hdegoede@redhat.com>
commit ce3df579e3f24a169189b288230959527e059080
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu Jan 30 08:50:06 2014 +1000
input: un-constify InputAttributes
Introduced in fecc7eb1cf66db64728ee2d68cd9443df7e70879 and reverts most of
that but it's helpfully mixed with other stuff.
InputAttributes are not const, they're strdup'd everywhere but the test code
and freed properly. Revert the const char changes and fix the test up instead.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Hans de Goede <hdegoede@redhat.com>
commit 2fc38d1e299587d25ca8225051e0ea9403164b15
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Wed Jan 29 11:16:51 2014 +1000
xkb: add a call to init an XkbRMLVOSet from const chars
Just forcing everything to const char* is not helpful, compiler warnings are
supposed to warn about broken code. Forcing everything to const when it
clearly isn't less than ideal.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Hans de Goede <hdegoede@redhat.com>
commit 6307d60dd592f4b438f880d02bde9fd8d50ae264
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Wed Jan 29 10:47:49 2014 +1000
Xi: remove superfluous cast.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Hans de Goede <hdegoede@redhat.com>
commit 83e38eb73fd8c852513aac2da2975b4c01070ec2
Author: Arun Raghavan <arun@accosted.net>
Date: Mon Jan 6 20:29:50 2014 +0530
edid: Add quirk for Sony Vaio Pro 13
The detailed timings are for a 15.6" display when max image size
correctly reports 13.3".
Signed-off-by: Arun Raghavan <arun@accosted.net>
Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit bf83843b92ce21d11f6ff1a407ff3d014e017c9b
Author: Hans de Goede <hdegoede@redhat.com>
Date: Thu Dec 19 14:10:18 2013 +0100
xf86Events: add Enable/DisableInputDeviceForVTSwitch functions
Factor this code out into functions so that it can be re-used for the
systemd-logind device pause/resume paths.
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 48b489769e78fa20911630173ab708feecb0fb0e
Author: Hans de Goede <hdegoede@redhat.com>
Date: Thu Dec 19 11:28:40 2013 +0100
xf86Events: refactor xf86VTLeave error handling
Use kernel goto style error handling for xf86VTSwitchAway() failure. This
makes it much easier to read the straight path.
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 78f0667d6df9cc43a397d9f1490e540936a435d6
Author: Hans de Goede <hdegoede@redhat.com>
Date: Thu Dec 19 11:26:36 2013 +0100
xf86Events: split xf86VTSwitch into xf86VTLeave and xf86VTEnter functions
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 33cec8af55d829cd77b297ae356ed7a00ce8523c
Author: Hans de Goede <hdegoede@redhat.com>
Date: Tue Dec 17 09:29:07 2013 +0100
dbus-core: Attempt to connect to dbus ASAP
For systemd-logind integration we need the dbus connection to be available
before enumerating input and gfx devices.
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Reviewed-by: Daniel Stone <daniel@fooishbar.org>
commit 480590b90c3966536451d2a2fecc42a66082ed77
Author: Hans de Goede <hdegoede@redhat.com>
Date: Wed Dec 4 11:10:06 2013 +0100
dbus-core: Make dbus-core no longer mutually exclusive with udev
With systemd-logind the dbus-core will be used for more then just config, so
it should be possible to build it even when using a non dbus dependent config
backend.
This patch also removes the config_ prefix from the dbus-core symbols.
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Reviewed-by: Daniel Stone <daniel@fooishbar.org>
commit c29454ae9d2e8e647732077fdfd97b351095f122
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu Dec 12 12:48:57 2013 +1000
config: drop the dbus API
This API has been disabled by default since 1.4, the first release it came in.
There a no known users of it and even its direct replacement (HAL) has
been superseeded by udev on supported platforms since 1.8.
This code is untested, probably hasn't been compiled in years and should not
be shipped.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Reviewed-by: Hans de Goede <hdegoede@redhat.com>
Reviewed-by: Daniel Stone <daniel@fooishbar.org>
commit 46cf2a60934076bf568062eb83121ce90b6ff596
Author: Laércio de Sousa <lbsousajr@gmail.com>
Date: Thu Dec 12 14:22:48 2013 -0200
xfree86: Keep a non-seat0 X server from touching VTs (#71258)
Updated patch following Hans de Goede's advice.
If -seat option is passed with a value different from seat0,
X server won't call xf86OpenConsole().
This is needed to avoid any race condition between seat0 and
non-seat0 X servers. If a non-seat0 X server opens a given VT
before a seat0 one which expects to open the same VT, one can
get an inactive systemd-logind graphical session for seat0.
This patch was first tested in a multiseat setup with multiple
video cards and works quite well.
I suppose it can also make things like DontVTSwitch and -sharevts
meaningless for non-seat0 seats, so it may fix bug #69477, too.
Fixes: https://bugs.freedesktop.org/show_bug.cgi?id=71258
https://bugs.freedesktop.org/show_bug.cgi?id=69477 (maybe)
See also: http://lists.x.org/archives/xorg-devel/2013-October/038391.html
https://bugzilla.redhat.com/show_bug.cgi?id=1018196
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Reviewed-by: Hans de Goede <hdegoede@redhat.com>
commit b3d3ffd19937827bcbdb833a628f9b1814a6e189
Author: Łukasz Stelmach <l.stelmach@samsung.com>
Date: Mon Nov 25 11:54:07 2013 +0100
configure.ac: enable systemd socket activation in libxtrans
Signed-off-by: Łukasz Stelmach <l.stelmach@samsung.com>
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Acked-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 435098a0dce6bca8870ec9725bf0af0969cd84fa
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Tue Jan 28 20:27:52 2014 -0800
Add RANDR 1.4 requests & events to dix/protocol.txt
Checked against randrproto.txt & randr.h
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit c1ac89c793614797e08d3d8e7fc9ba55be899130
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Tue Jan 28 20:27:51 2014 -0800
xf86DeleteScreen: move check for NULL pScrn before first dereference
Flagged by cppcheck 1.62:
[hw/xfree86/common/xf86Helper.c:220] -> [hw/xfree86/common/xf86Helper.c:231]:
(warning) Possible null pointer dereference: pScrn - otherwise it is
redundant to check it against null.
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit e6733ae91b7be52930f22a87de15fa05819ef948
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Tue Jan 28 20:27:50 2014 -0800
On realloc failure, free font_path_string instead of leaking it
Flagged by cppcheck 1.62:
[dix/dixfonts.c:1792]: (error) Common realloc mistake:
'font_path_string' nulled but not freed upon failure
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 910b5b245425f0a866a703303b78768b0de5cb2b
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Tue Jan 28 20:27:49 2014 -0800
Link libvgahw with $(PCIACCESS_LIBS) as well
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit da1660deeb9032ecca61f4bcdc9fc2eec2ada445
Merge: 0fbb3d711e 9fc19168e7
Author: Keith Packard <keithp@keithp.com>
Date: Mon Jan 27 19:02:15 2014 -0800
Merge remote-tracking branch 'whot/for-keith'
commit 0fbb3d711efec5222a57b45a70d28fc98380f3a1
Merge: 7ddef4f703 b98e49379c
Author: Keith Packard <keithp@keithp.com>
Date: Mon Jan 27 14:11:09 2014 -0800
Merge remote-tracking branch 'anholt/glamor-reformat'
Conflicts:
Makefile.am
Conflict caused by adding PSEUDORAMIX and GLAMOR directory defines in
separate branches
commit 7ddef4f7033c10b6e92866182d4475a4d49c5083
Author: Keith Packard <keithp@keithp.com>
Date: Wed Jan 22 14:30:28 2014 -0800
Add _XITYPEDEF_POINTER to dix-config.h
Just like the pointer type from Xdefs.h, the Pointer type from
XIproto.h collides with local declarations of variables using the same
name. XIproto.h can use _XITYPEDEF_POINTER to avoid declaring the
unnecessary pointer type.
Signed-off-by: Keith Packard <keithp@keithp.com>
Reviewed-by: Eric Anholt <eric@anholt.net>
commit 0b5a87f37d5dcd2ebff977a3b9a50a75ace93c83
Author: Keith Packard <keithp@keithp.com>
Date: Wed Jan 22 19:17:24 2014 -0800
pseudoramiX: Only compile on XQUARTZ and XWIN
PseudoramiXExtensionInit() is not defined in extinit.h if it won't be
used and we get a compiler warning when compiling the pseudoramiX code.
Signed-off-by: Keith Packard <keithp@keithp.com>
Reviewed-by: Eric Anholt <eric@anholt.net>
commit 61cb6c9aa95aa369573c4e02c023bbc33c7678c9
Author: Keith Packard <keithp@keithp.com>
Date: Wed Jan 22 19:16:36 2014 -0800
pseudoramiX: Add _X_ATTRIBUTE_PRINTF attributes to debug functions.
Signed-off-by: Keith Packard <keithp@keithp.com>
Reviewed-by: Eric Anholt <eric@anholt.net>
commit 9e45a1a030a5e70318441f33a132269a19a43df5
Author: Keith Packard <keithp@keithp.com>
Date: Fri Nov 15 18:00:53 2013 +0900
Warning fixes in glx
Signed-off-by: Keith Packard <keithp@keithp.com>
Reviewed-by: Eric Anholt <eric@anholt.net>
commit b98e49379c8d7cecce991207048489f51b10028c
Author: Eric Anholt <eric@anholt.net>
Date: Wed Dec 18 15:00:19 2013 -0800
glamor: Remove more out-of-tree compat code.
Signed-off-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Zhigang Gong <zhigang.gong@linux.intel.com>
Reviewed-by: Keith Packard <keithp@keithp.com>
commit 40a8186f0f78b7c36ef7e3d902c53bdc9bb7c650
Author: Eric Anholt <eric@anholt.net>
Date: Fri Dec 27 12:22:08 2013 -0800
glamor: Remove an extra copy of RegionNil().
Signed-off-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Zhigang Gong <zhigang.gong@linux.intel.com>
Reviewed-by: Keith Packard <keithp@keithp.com>
commit d26f5335151a9e962afa4bbf29ca5b94660a33ca
Author: Eric Anholt <eric@anholt.net>
Date: Wed Dec 18 11:35:53 2013 -0800
glamor: Hook the module back up to the build.
For now we're just building an uninstalled library. The extra EGL
stubs are required so that we can get the DIX building and usable
without pulling in the xf86 DDX code in glamor_egl.c.
Signed-off-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Zhigang Gong <zhigang.gong@linux.intel.com>
Reviewed-by: Keith Packard <keithp@keithp.com>
commit 54e78ec31e030d488765341a0c143c5a060c3768
Author: Eric Anholt <eric@anholt.net>
Date: Wed Jan 22 15:03:26 2014 -0800
glamor: Convert use of the old "pointer" typedef to "void *".
Reviewed-by: Keith Packard <keithp@keithp.com>
commit 3c3a4eeaa1f24b7534b332739158a2a36987ea6b
Author: Eric Anholt <eric@anholt.net>
Date: Wed Dec 18 11:45:33 2013 -0800
glamor: Silence warnings for non-debug builds.
Signed-off-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Zhigang Gong <zhigang.gong@linux.intel.com>
Reviewed-by: Keith Packard <keithp@keithp.com>
commit 9af66851e2770bcd8408a0e5ddf8bb8ea816feaa
Author: Eric Anholt <eric@anholt.net>
Date: Fri Jan 24 10:58:04 2014 -0800
glamor: Disable definitions of GL extension prototypes to avoid warnings.
We're not using the extension prototypes, since you have to dlsym them
anyway. Disabling their definitions prevents them from being defined
twice (once by gl.h, once by glext.h).
Signed-off-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Zhigang Gong <zhigang.gong@linux.intel.com>
commit a7b8ce8b4207a93c0455a0b796cfc47917c04a9c
Author: Eric Anholt <eric@anholt.net>
Date: Wed Dec 18 11:41:33 2013 -0800
glamor: Drop xfree86 dependencies from this dix module.
Signed-off-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Zhigang Gong <zhigang.gong@linux.intel.com>
Reviewed-by: Keith Packard <keithp@keithp.com>
commit 7759e4d090f56cdcad1c8a2acb2c1be20021de5d
Author: Eric Anholt <eric@anholt.net>
Date: Wed Dec 18 11:43:48 2013 -0800
glamor: Disable the XV code for now.
We're going to want to make this DIX code instead of XF86 if at all
possible, but for now just disable it so we can work on the rest of
the build.
Signed-off-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Zhigang Gong <zhigang.gong@linux.intel.com>
Reviewed-by: Keith Packard <keithp@keithp.com>
commit b3acb47e98023da898ffc4b6a5bac38a78bd7727
Author: Adam Jackson <ajax@redhat.com>
Date: Wed Oct 30 11:30:23 2013 -0400
glamor: Use dix-config.h not project config.h
v2: Also edit the one in glamor_egl.c (by anholt)
v3: Also edit the one in glamor_eglmodule.c (by anholt)
Signed-off-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Zhigang Gong <zhigang.gong@linux.intel.com>
Reviewed-by: Keith Packard <keithp@keithp.com>
commit 6cc0b7b01599b94af07e9fc8b16134f751ede077
Author: Adam Jackson <ajax@redhat.com>
Date: Wed Oct 30 11:05:40 2013 -0400
glamor/egl: Remove glapi awareness
We only needed this because glx was directly bashing glapi tables.
Since that's not the case anymore, we should just MakeCurrent like a
real GL app.
v2: Hand-resolve against rebase onto newer server (by anholt)
Signed-off-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Zhigang Gong <zhigang.gong@linux.intel.com>
Reviewed-by: Keith Packard <keithp@keithp.com>
commit 0c5a7c208601110a0b36d24cdacb4d844af03f75
Author: Eric Anholt <eric@anholt.net>
Date: Tue Dec 17 16:32:17 2013 -0800
glamor: Remove compat code for building out of tree.
Signed-off-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Zhigang Gong <zhigang.gong@linux.intel.com>
Reviewed-by: Keith Packard <keithp@keithp.com>
commit 82efb90efba685678638f94804d773b59ca1643f
Author: Adam Jackson <ajax@redhat.com>
Date: Wed Oct 30 09:56:46 2013 -0400
glamor: Remove copy of sna's compiler.h
Xfuncproto.h has equivalents for these already.
v2: Adjust a couple more likelies after the rebase (anholt)
Signed-off-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Zhigang Gong <zhigang.gong@linux.intel.com>
Reviewed-by: Keith Packard <keithp@keithp.com>
commit 714926b090344a17a2f7aee9f4bc6aea4e45f48c
Author: Eric Anholt <eric@anholt.net>
Date: Thu Jan 9 18:23:39 2014 +0800
glamor: Fix up some indentation damage on header prototypes.
Signed-off-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Zhigang Gong <zhigang.gong@linux.intel.com>
Reviewed-by: Keith Packard <keithp@keithp.com>
commit 7f6e865359c2d055db4eb7d82b4779b3d7c5d264
Author: Eric Anholt <eric@anholt.net>
Date: Fri Dec 27 11:46:30 2013 -0800
glamor: Fix some indent damage of putting a ' ' after the '*' for pointers.
Signed-off-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Zhigang Gong <zhigang.gong@linux.intel.com>
Reviewed-by: Keith Packard <keithp@keithp.com>
commit 5f57d436c391c51f3f90958b033f6ee3eb7a1136
Author: Eric Anholt <eric@anholt.net>
Date: Tue Dec 24 15:59:14 2013 -0800
glamor: Fix some mangling of shader strings by indent.
Signed-off-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Zhigang Gong <zhigang.gong@linux.intel.com>
Reviewed-by: Keith Packard <keithp@keithp.com>
commit d84d71029ae9e462559d64eff7259e2cc7732fac
Author: Eric Anholt <eric@anholt.net>
Date: Wed Dec 18 11:59:07 2013 -0800
glamor: Apply x-indent.sh.
Signed-off-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Zhigang Gong <zhigang.gong@linux.intel.com>
Reviewed-by: Keith Packard <keithp@keithp.com>
commit e8e9a54c47deedbc13b8969ed29e16463b0314a0
Author: Eric Anholt <eric@anholt.net>
Date: Wed Dec 18 11:56:15 2013 -0800
glamor: Touch up some code so indent doesn't get confused.
Signed-off-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Zhigang Gong <zhigang.gong@linux.intel.com>
Reviewed-by: Keith Packard <keithp@keithp.com>
commit 9fc19168e7ca6308275bf8769d1ccb982f88465b
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Fri Jan 24 23:42:49 2014 -0800
Check for calloc() failure in add_master()
Reported-by: Ilja Van Sprundel <ivansprundel@ioactive.com>
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 76b3be75b62657e346731444736f7e4d200beb5b
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri Jan 24 16:51:02 2014 +1000
Xi: fix modifier offset in XIPassiveGrab swapping function
The request is followed by mask_len 4-byte units, then followed by the actual
modifiers.
Also fix up the swapping test, which had the same issue.
Reported-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
commit c1ce807d9f18f215332d7eeb844e8c640f71c53c
Author: Keith Packard <keithp@keithp.com>
Date: Wed Jan 22 11:01:59 2014 -0800
dix: Praise clients which haven't run for a while, rather than idle clients
A client which is ready, but hasn't run for a while, should receive
the same benefit as one which has simply been idle for a while. Use
the smart_stop_tick to see how long it has been since a client has
run instead of smart_check_tick, which got reset each time a client
was ready, even if it didn't get to run.
Reported-by: Chris Wilson <chris@chris-wilson.co.uk>
Signed-off-by: Keith Packard <keithp@keithp.com>
Tested-by: Chris Wilson <chris@chris-wilson.co.uk>
commit 76b275d7acbfd6b28cb9e74fa4862faa6d08217d
Author: Keith Packard <keithp@keithp.com>
Date: Sun Jan 12 10:53:31 2014 -0800
test/signal-formatting: Ignore compiler warnings
The signal formatting tests intentionally include code which generates
warnings with the current X server warning flags. Turn the compiler
warnings off
Signed-off-by: Keith Packard <keithp@keithp.com>
Reviewed-by: Eric Anholt <eric@anholt.net>
commit 12ea81792868c10a89a06ce9a9e8f707be283569
Author: Keith Packard <keithp@keithp.com>
Date: Sun Jan 12 10:44:22 2014 -0800
test/hashtabletest: Clean up -Wshadow errors
Declare 'XID id' local to each scope it is used in, rather than having
the first use be a function-wide declaration.
Signed-off-by: Keith Packard <keithp@keithp.com>
Reviewed-by: Eric Anholt <eric@anholt.net>
commit 7104f0f338fa96824a463331d6099a76ee3c21ac
Author: Keith Packard <keithp@keithp.com>
Date: Sun Jan 12 10:42:37 2014 -0800
test/xi2: Clean up -Wshadow warnings
protocol-common declares a bunch of pretty generic names; fix shadows
of these names.
Signed-off-by: Keith Packard <keithp@keithp.com>
Reviewed-by: Eric Anholt <eric@anholt.net>
commit 92a9495800cf59b917c30d5fbaf4b7eca10d19cf
Author: Keith Packard <keithp@keithp.com>
Date: Sun Jan 12 10:42:01 2014 -0800
kdrive/ephyr: Remove extra 'i' variable in ProcXF86DRIGetDrawableInfo
Just re-use the top-level one
Signed-off-by: Keith Packard <keithp@keithp.com>
Reviewed-by: Eric Anholt <eric@anholt.net>
commit 988877065486d0f25cc85be5be05f4523cc883c7
Author: Keith Packard <keithp@keithp.com>
Date: Sun Dec 15 01:57:09 2013 -0800
randr: Eliminate -Wshadow warnings
Don't use rrScrPriv for nested screen private fetching.
Eliminate a duplicate fetch of the randr screen private in rrCheckPixmapBounding.
Signed-off-by: Keith Packard <keithp@keithp.com>
Reviewed-by: Eric Anholt <eric@anholt.net>
commit f46c487625e1ffbc78df5153128c68bd6bc41104
Author: Keith Packard <keithp@keithp.com>
Date: Sun Dec 15 01:56:36 2013 -0800
hw/xnest: Eliminate shadowed names
Just rename stuff; nothing fancy here.
Signed-off-by: Keith Packard <keithp@keithp.com>
Reviewed-by: Eric Anholt <eric@anholt.net>
commit 1f3676a81ef2c52699bdfcf1fb9da7e4e79b00b7
Author: Keith Packard <keithp@keithp.com>
Date: Sun Dec 15 01:55:43 2013 -0800
hw/vfb: Rename screenInfo parameter to screen_info
Avoid shadowing the global screenInfo value.
Signed-off-by: Keith Packard <keithp@keithp.com>
Reviewed-by: Eric Anholt <eric@anholt.net>
commit 89c0fa3d6c8ae67084a30395085db6d872d9d6de
Author: Keith Packard <keithp@keithp.com>
Date: Sun Dec 15 01:55:06 2013 -0800
kdrive: Fix -Wshadow errors
Just rename stuff to avoid conflicts.
Signed-off-by: Keith Packard <keithp@keithp.com>
Reviewed-by: Eric Anholt <eric@anholt.net>
commit 9c108b3ccdb4086002b83d9ad66f5619e9ec95bb
Author: Keith Packard <keithp@keithp.com>
Date: Sun Dec 15 01:53:50 2013 -0800
exa: Fix -Wshadow warnings
In exa_accel, there was a duplicate fetch of a pixmap private field.
exa_render just had a regular shadowed value.
Signed-off-by: Keith Packard <keithp@keithp.com>
Reviewed-by: Eric Anholt <eric@anholt.net>
commit 04e320a4e4e1f46bf95e36078d93b4d18a0ef855
Author: Keith Packard <keithp@keithp.com>
Date: Sun Dec 15 01:52:58 2013 -0800
composite: Remove duplicate window pixmap fetch
There's nothing between the previous fetch and this one that could
cause the window pixmap to have changed.
Signed-off-by: Keith Packard <keithp@keithp.com>
Reviewed-by: Eric Anholt <eric@anholt.net>
commit 07b03e721e4dbec1a640c9b3bb8a2d5902587e63
Author: Keith Packard <keithp@keithp.com>
Date: Sun Dec 15 01:41:19 2013 -0800
xfree86: Fix -Wshadow warnings
Just rename variables to eliminate -Wshadow warnings.
Signed-off-by: Keith Packard <keithp@keithp.com>
Reviewed-by: Eric Anholt <eric@anholt.net>
commit 3c94b89f149c2d63424faed0d44a6911393c3569
Author: Keith Packard <keithp@keithp.com>
Date: Sun Dec 15 01:40:04 2013 -0800
Xi: Use 'void *' instead of 'Pointer' (which is going away)
There's no reason for XI to declare 'typedef char *Pointer' in a
shared header file; assume it will eventually go away and stop using
it here.
Signed-off-by: Keith Packard <keithp@keithp.com>
Reviewed-by: Eric Anholt <eric@anholt.net>
commit 08d0481e299c28b64a0db9bb0782ba2b551028fd
Author: Keith Packard <keithp@keithp.com>
Date: Sun Dec 15 01:12:22 2013 -0800
os: Fix -Wshadow errors
Rename variables to avoid shadowing globals
Signed-off-by: Keith Packard <keithp@keithp.com>
Reviewed-by: Eric Anholt <eric@anholt.net>
commit 1487145b41390e689f8b03c1e8a2df70e00cf519
Author: Keith Packard <keithp@keithp.com>
Date: Fri Dec 13 11:25:45 2013 -0800
Add 'FONT_PATH_NAME_ELEMENT_CONST' to dix-config.h and xorg-server.h
This signals to the fontsproto code that the X server has been fixed
to allow the name member in a FontPathElement struct to be declared
const to eliminate piles of warnings when assigning string constants
to them.
Signed-off-by: Keith Packard <keithp@keithp.com>
Reviewed-by: Eric Anholt <eric@anholt.net>
commit 1ad8d12e7fcd7d55a37099d7426e3290297ba6d3
Author: Keith Packard <keithp@keithp.com>
Date: Fri Dec 13 11:24:00 2013 -0800
Ignore a couple of format-nonliteral warnings
These are generated in code which uses sprintf as a convenient way to
construct strings from various pieces.
Signed-off-by: Keith Packard <keithp@keithp.com>
Reviewed-by: Eric Anholt <eric@anholt.net>
commit 9ef53e2267ea3dd60651961f66c65e8b00b7d823
Author: Keith Packard <keithp@keithp.com>
Date: Wed Dec 11 11:55:37 2013 -0800
include: GetClientResolutions is declared in font.h
No need to have a duplicate definition here.
Signed-off-by: Keith Packard <keithp@keithp.com>
Reviewed-by: Eric Anholt <eric@anholt.net>
commit 25ebb9dbc9df659dec2bf6c27654a5bad2d11f94
Merge: 409e8e29fb 71baa466b1
Author: Keith Packard <keithp@keithp.com>
Date: Wed Jan 22 11:33:53 2014 -0800
Merge remote-tracking branch 'whot/for-keith'
commit 409e8e29fbe16122ba5a4249256fc56e2e68ea93
Merge: 457bc83549 d6c8d75097
Author: Keith Packard <keithp@keithp.com>
Date: Wed Jan 22 11:32:35 2014 -0800
Merge remote-tracking branch 'dlespiau/20131216-4k'
commit 457bc83549e58bb87de96bed02988db3275a7611
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Sat Jan 4 00:09:45 2014 -0800
If EAGAIN == EWOULDBLOCK, only need to check errno for one of them
Solaris <sys/errno.h> has:
#define EWOULDBLOCK EAGAIN
so checking (errno == EAGAIN || errno == EWOULDBLOCK) is overkill.
This leads cppcheck 1.62 to complain:
[xserver/os/io.c:365] -> [xserver/os/io.c:365]: (style) Same expression on both sides of '||'.
[xserver/os/io.c:941] -> [xserver/os/io.c:941]: (style) Same expression on both sides of '||'.
This quiets it, and reduces the number of calls Solaris Studio cc
generates to the __errno() function to get the thread-specific errno value.
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 044a6ef2ff5f2c83a80b11e747f62f48830b526b
Merge: 0b932cf47a 77df653ae3
Author: Keith Packard <keithp@keithp.com>
Date: Wed Jan 22 11:28:54 2014 -0800
Merge remote-tracking branch 'jeremyhu/master'
commit 0b932cf47a4df8ea0f7488e285d218fe7c10dd77
Merge: 1d76b02fac 295d41fa2a
Author: Keith Packard <keithp@keithp.com>
Date: Wed Jan 22 11:27:36 2014 -0800
Merge remote-tracking branch 'anholt/xserver-unifdef'
commit 1d76b02fac79c0360ae201e4d1a8ba0e9a00e810
Merge: 771f390efd 4dd62d7807
Author: Keith Packard <keithp@keithp.com>
Date: Wed Jan 22 11:22:35 2014 -0800
Merge remote-tracking branch 'anholt/glamor-external-rebase'
commit 771f390efdf48cb7c44fe20857f06f8ffff3b2ce
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Sat Dec 21 19:58:32 2013 -0500
autoconf: fix warning by replacing AC_WARN with AC_MSG_WARN
A warning about the macro generating the warnings to the user...
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit c3819da87ff2e8c6292066f965c098704edc442c
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Sat Dec 21 19:58:31 2013 -0500
xorg-tls: fix warning, replace AC_TRY_COMPILE with AC_COMPILE_IFELSE
The code produced in the configure script is identical.
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 02d866a088a2fc60c6aaebe23c48b372f6b6aa9b
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Sat Dec 21 19:58:30 2013 -0500
autoconf: fix warning, replace AC_TRY_COMPILE with AC_COMPILE_IFELSE
The code produced in the configure script is identical.
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit e38c98fe74394a138ebadb29b1cfe1d4ea7f7071
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Sat Dec 21 19:58:29 2013 -0500
autoconf: fix warning, replace AC_TRY_LINK with AC_LINK_IFELSE
The code produced in the configure script is identical.
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 4993590c90b1289171a2ca0e74d9c4310f5318c7
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Sat Dec 21 19:58:28 2013 -0500
autoconf: fix warning by replacing deprecated AC_HELP_STRING
We can also make do without the workaround introduced in 2005.
The 2.60 autoconf minimum version covers that now.
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 1d4dbc2f2b4d2acca2691c3c7464a45aac59d73f
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Wed Dec 4 13:28:04 2013 -0500
libtool: bump minimum required version to 2.2
LT_PREREQ([2.2])
LT_INIT
AC_CONFIG_MACRO_DIR([m4]) is recommended to locate local macros,
which is fully used starting automake 1.14.
ACLOCAL_AMFLAGS in Makefile.am is deprecated since automake 1.14.
The comment is to prevent developers from removing the statement
as suggested in 1.14 which would break earlier versions.
Automake 1.14 is already in use by many.
This patch works on versions prior and post 1.14
References:
Building the X Window System from Source:
http://www.x.org/wiki/Building_the_X_Window_System/#index2h3
Discussion on xorg minimum autotools requirements:
http://lists.x.org/archives/xorg-devel/2013-October/038325.html
Tested with autoconf 2.60, automake 1.10.3 and libtool 2.2
The same upgrade will be applied to libraries and drivers.
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 71baa466b1f6b02fe503f9a3089b7b9d61aa0f80
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Mon Jan 13 17:00:23 2014 +1000
os: restrict display names to digits
We call atoi() on the server's display to get the socket but otherwise use the
unmodified display for log file name, xkb paths, etc. This results in
Xorg :banana being the equivalent of Xorg :0, except for the log files being
in /var/log/Xorg.banana.log. I'm not sure there's a good use-case for this
behaviour.
Check the display for something that looks reasonable, i.e. digits only, but
do allow for :0.0 (i.e. digits, followed by a period, followed by one or two
digits).
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Keith Packard <keithp@keithp.com>
commit 77df653ae3d8448be21221711851acde12c6bc1a
Author: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
Date: Wed Jan 1 11:10:41 2014 -0800
XQuartz: Avoid passing uninitialized pointers to X11ApplicationSetWindowMenu in AppleWMSetWindowMenu
Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
commit 3bc608a361a01043b226fb9aaebf88f6fd852925
Author: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
Date: Wed Jan 1 11:04:07 2014 -0800
XQuartz: Check for allocated memory before using it in AppleWMSetWindowMenu
Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
commit 64327226ddfba8f0653615cd678d2d4336fb993d
Author: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
Date: Wed Jan 1 11:00:40 2014 -0800
XQuartz: Silence a clang static analysis warning about a memory leak
It seems the alanyzer can't comprehend dixSetPrivate().
quartz.c:119:12: warning: Potential leak of memory pointed to by 'displayInfo'
return quartzProcs->AddScreen(index, pScreen);
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
commit b2f6b3497c33a4897afae80a2cf69c596b9f81e8
Author: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
Date: Wed Jan 1 10:55:10 2014 -0800
XQuartz: Silence a clang static analysis warning about a possible memory leak on exit
stub.c:356:9: warning: Potential leak of memory pointed to by 'newargv'
asl_log(aslc, NULL, ASL_LEVEL_ERR,
^~~~~~~
stub.c:356:9: warning: Potential leak of memory pointed to by 'newenvp'
asl_log(aslc, NULL, ASL_LEVEL_ERR,
^~~~~~~
2 warnings generated.
Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
commit a03f096a85537d9e881cedaa6cb71aca43a97086
Author: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
Date: Wed Jan 1 10:47:52 2014 -0800
XQuartz: Validate length in appledri before swapping
Avoids potential memory corruption from bad requests
Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
commit b3572c0d1ab7888ac26d6b2b8be6d1d19ed9af3f
Author: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
Date: Wed Jan 1 10:39:56 2014 -0800
XQuartz: Validate screen in AppleDRIQueryDirectRenderingCapable requests
Return an error to the caller rather than crashing the server on
invalid screens.
Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
commit 959e8f23af7850fcaf40d6c67f5228241a36a9ab
Author: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
Date: Sun Dec 29 12:45:23 2013 -0800
XQuartz: Simplify hook_run to quiet static analyzer
x-hook.c:96:9: warning: Called function pointer is an uninitalized pointer value
(*fun[i])(arg, data[i]);
^~~~~~~~~~~~~~~~~~~~~~~
1 warning generated.
Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
commit f79af1941776fd6f1ec26c50603fcc35ca7d514b
Author: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
Date: Sun Dec 29 12:41:18 2013 -0800
XQuartz: Mark applicationWillTerminate: noreturn
X11Controller.m:938:1: warning: method 'applicationWillTerminate:' could be declared with attribute 'noreturn'
[-Wmissing-noreturn,Semantic Issue]
{
^
Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
commit ea80279e292e59a9fe9651489f03e9f2f39810d9
Author: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
Date: Sun Dec 29 12:36:51 2013 -0800
XQuartz: Fix get_proc_address signature
indirect.c:675:28: warning: incompatible pointer types passing 'glx_gpa_proc (*)(const char *)' to parameter of type
'glx_gpa_proc' (aka 'glx_func_ptr (*)(const char *)') [-Wincompatible-pointer-types,Semantic Issue]
__glXsetGetProcAddress(&get_proc_address);
^~~~~~~~~~~~~~~~~
../../../glx/glxserver.h:122:42: note: passing argument to parameter 'get_proc_address' here [Semantic Issue]
void __glXsetGetProcAddress(glx_gpa_proc get_proc_address);
^
Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
commit 2e3ebec9520719a8e5c3c92390e83bcb5216f978
Author: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
Date: Sun Dec 29 12:31:23 2013 -0800
XQuartz: Fix darwinfb.h header guard
./darwinfb.h:28:9: warning: '_DARWIN_FB_H' is used as a header guard here, followed by #define of a different macro
[-Wheader-guard,Lexical or Preprocessor Issue]
^~~~~~~~~~~~
./darwinfb.h:29:9: note: '_DARWIN_DB_H' is defined here; did you mean '_DARWIN_FB_H'? [Lexical or Preprocessor Issue]
^~~~~~~~~~~~
_DARWIN_FB_H
Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
commit 9da6c0918f40359f28fe8889d5b7cae7efcc8377
Author: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
Date: Sun Dec 29 12:22:55 2013 -0800
XQuartz: Silence some static analyzer warnings by annotating referencing counts
Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
commit 2d2d49dab5c5718989de97d7227aac793479745e
Author: Keith Packard <keithp@keithp.com>
Date: Sun Dec 29 15:18:28 2013 -0800
Clean up a few function prototypes to not place formals in /**/
This just removes the comment markers from around the formals in
several function prototypes near where pointer -> void * changes were
made. There are plenty more of these to fix.
Signed-off-by: Keith Packard <keithp@keithp.com>
Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
commit 60014a4a98ff924ae7f6840781f768c1cc93bbab
Author: Keith Packard <keithp@keithp.com>
Date: Sun Dec 15 01:05:51 2013 -0800
Replace 'pointer' type with 'void *'
This lets us stop using the 'pointer' typedef in Xdefs.h as 'pointer'
is used throughout the X server for other things, and having duplicate
names generates compiler warnings.
Signed-off-by: Keith Packard <keithp@keithp.com>
Reviewed-by: Eric Anholt <eric@anholt.net>
commit 93fa64e17d7bd600ebf18ecab85f5b2d17fe30ce
Author: Keith Packard <keithp@keithp.com>
Date: Wed Dec 11 12:18:49 2013 -0800
Don't build dmx by default
It's clearly un-loved, having piles and piles of warnings. If someone
wants to fix it up to compile without warnings, we can re-enable it.
Signed-off-by: Keith Packard <keithp@keithp.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
commit 319dff750f99a28a1544bcb81d52172c641ad1ca
Author: Keith Packard <keithp@keithp.com>
Date: Wed Dec 11 12:18:16 2013 -0800
hw/xfree86: nobus.c shouldn't define a static function
Having this function be static generates a compiler warning.
Signed-off-by: Keith Packard <keithp@keithp.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
commit 7915791bac3ff609e94f355fbb637d7c570a5b32
Author: Keith Packard <keithp@keithp.com>
Date: Wed Dec 11 12:17:45 2013 -0800
kdrive/ephyr; Don't redeclare monitorResolution
It's already declared in globals.h
Signed-off-by: Keith Packard <keithp@keithp.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
commit aa47a4409660634d80c3423ad49b70ca929a8756
Author: Keith Packard <keithp@keithp.com>
Date: Wed Dec 11 12:16:51 2013 -0800
kdrive/ephyr: ddxUseMsg is supposed to return
I'm not sure why ephyr thinks that ddxUseMsg shouldn't return, but
it's not declared to exit.
Signed-off-by: Keith Packard <keithp@keithp.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
commit 86d68825c2b75ea9e10954fec00b44b33b38d8b2
Author: Keith Packard <keithp@keithp.com>
Date: Wed Dec 11 11:55:01 2013 -0800
vfb: Remove unused pXWDCmap variable
Signed-off-by: Keith Packard <keithp@keithp.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
commit 7353ec7cb6fc235b03e59e35425201429c83ee72
Author: Keith Packard <keithp@keithp.com>
Date: Wed Dec 11 11:32:19 2013 -0800
xfree86: Switch int10 code to stdint types
CARD32 is not type compatible with uint32_t and ends up generating a
pile of warnings. Fix this by replacing all of the CARD* types with
stdint types.
Signed-off-by: Keith Packard <keithp@keithp.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
commit 93b15b1a47eb414338e8b229f25f11bdca099471
Author: Keith Packard <keithp@keithp.com>
Date: Wed Dec 11 11:31:46 2013 -0800
xfree86: Don't complain when the SDK dependency file doesn't exist yet
It won't exist until the build is complete, so don't complain about it
Signed-off-by: Keith Packard <keithp@keithp.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
commit eda935627116dd106b99dbcc95d90a723a2de330
Author: Keith Packard <keithp@keithp.com>
Date: Sat Nov 16 23:35:21 2013 -0800
xkb: Make XkbWriteCountedString take a const char * input parameter
Signed-off-by: Keith Packard <keithp@keithp.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
commit d0339a5c66846c9f14e3b584e34688520a0916ab
Author: Keith Packard <keithp@keithp.com>
Date: Sat Nov 16 23:34:59 2013 -0800
os: xstrtokenize takes and returns const char * now
Signed-off-by: Keith Packard <keithp@keithp.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
commit c608560dbbac18837cb00ef0d774a66ea7706534
Author: Keith Packard <keithp@keithp.com>
Date: Sat Nov 16 23:33:59 2013 -0800
xfree86/vbe: Make VBEValidateModes take const char **
mode names are now const
Signed-off-by: Keith Packard <keithp@keithp.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
commit 3835e8b0a1cc7b1e971bcc3f9453422fec014b10
Author: Keith Packard <keithp@keithp.com>
Date: Sat Nov 16 23:33:18 2013 -0800
xfree86/shadowfb: GCFuncs and GCOps are now const
Change GC private to match and fix resulting warnings
Signed-off-by: Keith Packard <keithp@keithp.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
commit f71de60355cc76810657f40c7b5461af86b34bf7
Author: Keith Packard <keithp@keithp.com>
Date: Sat Nov 16 23:32:40 2013 -0800
xfree86/parser: make strings in xf86MatchGroup const
and fix resulting warnings
Signed-off-by: Keith Packard <keithp@keithp.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
commit 2a93e75ff81b095bc9cdb80906e23ec705d52df5
Author: Keith Packard <keithp@keithp.com>
Date: Sat Nov 16 23:31:55 2013 -0800
xfree86/int10: mark printk as _X_ATTRIBUTE_PRINTF
Signed-off-by: Keith Packard <keithp@keithp.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
commit 7fe436a7b786ff02ed55cf9ed65edfd2fe07ac22
Author: Keith Packard <keithp@keithp.com>
Date: Sat Nov 16 23:31:06 2013 -0800
xfree86/fbdevhw: Fix warnings
Unused fPtr variable. Deal with string constants.
Signed-off-by: Keith Packard <keithp@keithp.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
commit 6990de00eb23478d9343660ad3981fb1d33f8be4
Author: Keith Packard <keithp@keithp.com>
Date: Sat Nov 16 23:30:29 2013 -0800
xfree86/exa: xf86GetOptValString returns const char * now
fix exaDDXDriverInit to match.
Signed-off-by: Keith Packard <keithp@keithp.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
commit 017307f0b41476c3c73a9414a7ce9eb42373c3f4
Author: Keith Packard <keithp@keithp.com>
Date: Sat Nov 16 23:29:30 2013 -0800
xfree86/dri: Mark DRIDrvMsg and dri_drm_debug_print _X_ATTRIBUTE_PRINTF
And fix resulting warnings.
v2: (Adam Jackson) Cast handles through uintptr_t to avoid size change warnings
Signed-off-by: Keith Packard <keithp@keithp.com>
Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
commit 22592855e90d23013ba7f9e945d567725cb44bf3
Author: Keith Packard <keithp@keithp.com>
Date: Sat Nov 16 23:28:48 2013 -0800
xfree86/common: handle string constants in xf86Xinput configuration
Signed-off-by: Keith Packard <keithp@keithp.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
commit 3a163d2af48a7cf8fd5c2db6ac68166a5fdbeb8d
Author: Keith Packard <keithp@keithp.com>
Date: Sat Nov 16 23:28:16 2013 -0800
xfree86/common: Const GC funcs and ops in xf86VAarbiter
Signed-off-by: Keith Packard <keithp@keithp.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
commit 8a9aa44a45377d8953d11a0b035c86eb139283ba
Author: Keith Packard <keithp@keithp.com>
Date: Sat Nov 16 23:26:19 2013 -0800
xfree86/config: Kludge around const strings
defaultFontPath is now a const char * so that it can be initialized
from a string constant. This patch kludges around that by inserting
suitable casts to eliminate warnings. Fixing this 'correctly' would
involve inserting some new variables and conditionals to use them.
Signed-off-by: Keith Packard <keithp@keithp.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
commit 86647e7279163b13492d39ecb9c44414b752a61e
Author: Keith Packard <keithp@keithp.com>
Date: Sat Nov 16 23:25:50 2013 -0800
config/udev: handle const strings
Signed-off-by: Keith Packard <keithp@keithp.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
commit b7633c6ff2c273621df6c0fac9c269f8ab217a46
Author: Keith Packard <keithp@keithp.com>
Date: Sat Nov 16 23:24:03 2013 -0800
composite: Remove unused pScreen variables
Signed-off-by: Keith Packard <keithp@keithp.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
commit 5bc5684d4cb4905cd82fe1c036cc8a48c3c4868f
Author: Keith Packard <keithp@keithp.com>
Date: Fri Nov 15 06:02:05 2013 -0800
test: Warning cleanup
const char in test/xfree86.c. Cast values to (intmax_t) for %ju format
in test/signal-logging.c.
Signed-off-by: Keith Packard <keithp@keithp.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
commit fecc7eb1cf66db64728ee2d68cd9443df7e70879
Author: Keith Packard <keithp@keithp.com>
Date: Fri Nov 15 06:00:44 2013 -0800
xi: More warning cleanup for input
Lots more const char stuff.
Remove duplicate defs of CoreKeyboardProc and CorePointerProc from
test/xi2/protocol-common.c
Signed-off-by: Keith Packard <keithp@keithp.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
commit af04cf6968b16cc9efd17905471047e7de62058a
Author: Keith Packard <keithp@keithp.com>
Date: Fri Nov 15 05:55:38 2013 -0800
Xext: Clean up warnings in hashtable code
Make keys const void *
Signed-off-by: Keith Packard <keithp@keithp.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
commit 00438c9f943b219ba33055969ae7f9ba07214b2a
Author: Keith Packard <keithp@keithp.com>
Date: Fri Nov 15 05:41:54 2013 -0800
exa: Clean up warnings
Declare GC ops/funcs as const.
Use 'typeof' in the 'swap' macro to capture the right type.
Signed-off-by: Keith Packard <keithp@keithp.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
commit 6e51645b4796fc3a02206fefd416b84beb2fcdf7
Author: Keith Packard <keithp@keithp.com>
Date: Fri Nov 15 05:28:47 2013 -0800
xkb: Clean up warnings
Add const to lots of strings.
Signed-off-by: Keith Packard <keithp@keithp.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
commit abce3206cbc82f632abae5344e0ce46622e00f24
Author: Keith Packard <keithp@keithp.com>
Date: Fri Nov 15 05:19:24 2013 -0800
os: Clean up warnings
Just const char stuff.
Signed-off-by: Keith Packard <keithp@keithp.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
commit a1cb69dc28fdbfbdfaf954e0bec221f759462399
Author: Keith Packard <keithp@keithp.com>
Date: Fri Nov 15 22:05:44 2013 +0900
Xext: Clean up warnings
GC funcs and ops are const.
Remove unused variables.
Signed-off-by: Keith Packard <keithp@keithp.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
commit 2f6e8eb70d527541178433933d6230466421bd15
Author: Keith Packard <keithp@keithp.com>
Date: Fri Nov 15 22:02:58 2013 +0900
damage: Clean up warnings
GC funcs and ops are const now, so all wrappers need to declare them
as such.
Signed-off-by: Keith Packard <keithp@keithp.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
commit c706fb0db86d6946482700d65ad6803c4daaa6f9
Author: Keith Packard <keithp@keithp.com>
Date: Fri Nov 15 22:00:29 2013 +0900
Clean up warnings in mi.
A coupel of unused variables, and some debug code with mis-matching
printf format and variable types.
Signed-off-by: Keith Packard <keithp@keithp.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
commit d89b42bda46d36fc0879611cc3b3566957ce36d0
Author: Keith Packard <keithp@keithp.com>
Date: Fri Nov 15 21:57:05 2013 +0900
Clean up warnings in DIX
As usual, mostly const char changes. However, filter_device_events had
a potentially uninitialized value, 'raw', which I added a bunch of
checks for. I suspect most of those are 'can't happen', but it's hard
to see that inside the function.
Signed-off-by: Keith Packard <keithp@keithp.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
commit d6da9f23cca562fc0c6ae398665ab7fa770a4fa8
Author: Keith Packard <keithp@keithp.com>
Date: Fri Nov 15 18:07:54 2013 +0900
hw/xfree86: More const declarations for strings
Signed-off-by: Keith Packard <keithp@keithp.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
commit 644725ac5e28a00d8c24372f55ae7e7e2fe0cb2e
Author: Keith Packard <keithp@keithp.com>
Date: Fri Nov 15 18:06:37 2013 +0900
Just remove dpms functsion from xf86.h
Signed-off-by: Keith Packard <keithp@keithp.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
commit c85e26d59901fbf8c7a437cf934b51fa64160073
Author: Keith Packard <keithp@keithp.com>
Date: Fri Nov 15 17:55:15 2013 +0900
Bunch of DMX warning fixes
Signed-off-by: Keith Packard <keithp@keithp.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
commit 493d992501b586d95823e045d1dc994bd6c00d27
Author: Keith Packard <keithp@keithp.com>
Date: Fri Nov 15 17:43:46 2013 +0900
More warning fixes in hw/xfree86
Signed-off-by: Keith Packard <keithp@keithp.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
commit c78be3a4b714deb7ad75cacd54042ca1b51d6261
Author: Keith Packard <keithp@keithp.com>
Date: Fri Nov 15 17:36:26 2013 +0900
xfree86 warning reduction
This gets the easy warnings, mostly constant string problems.
Signed-off-by: Keith Packard <keithp@keithp.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
commit 1ce15ed5bae60a184c6bd9440e3c017488a5f415
Author: Keith Packard <keithp@keithp.com>
Date: Sat Nov 16 23:44:51 2013 -0800
Xext: _X_EXPORT DPMSSet and DPMSSupported
These are needed by drivers, and it's better to export them from here
rather than redefining them in hw/xfree86 and exporting them from there.
Signed-off-by: Keith Packard <keithp@keithp.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
commit 1f407763be28745f18d224077d6b07b9431ee16b
Author: Keith Packard <keithp@keithp.com>
Date: Sat Nov 16 23:43:49 2013 -0800
include: Make xkbrules structures all const char *
This lets them be initialized with string constants
Signed-off-by: Keith Packard <keithp@keithp.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
commit e1e01d2e33c632e395d7e396f73fba8ae606b15a
Author: Keith Packard <keithp@keithp.com>
Date: Fri Nov 15 16:56:15 2013 +0900
xfree86/common: Warning fixes. Mostly const string handling.
Also removes DPMS functiosn from Xext/dpmsproc.h
Signed-off-by: Keith Packard <keithp@keithp.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
commit 27b44949a3d2e34ac10e801bd8a8fc2c28791e7e
Author: Keith Packard <keithp@keithp.com>
Date: Fri Nov 15 16:24:15 2013 +0900
hw/xfree86: Lots of constant string support
Make lots of string pointers 'const char' so that we can use constant
strings with them without eliciting warnings.
Signed-off-by: Keith Packard <keithp@keithp.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
commit 6f77e2645ea36e324ccc664aae1d36464418bdea
Author: Keith Packard <keithp@keithp.com>
Date: Fri Nov 15 13:40:30 2013 +0900
hw/xfree86: Make strings in DriverRec and ScrnInfoRec const
This avoids compiler warnings when initializing with string constants.
Signed-off-by: Keith Packard <keithp@keithp.com>
Reviewed-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Adam Jackson <ajax@redhat.com>
commit e81902872176fa9848211fcd7a5eafa4f861a1b7
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu Jan 9 15:29:23 2014 +1000
ephyr: don't allow a shift+ctrl keygrab if mod1 was enabled
Xephyr wants ctrl+shift to grab the window, but that conflicts with
ctrl+alt+shift key combos. Remember the modifier state on key presses and
releases, if mod1 is pressed, we need ctrl, shift and mod1 released
before we allow a shift-ctrl grab activation.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit b2d5ee2e3684951b611fd2068d57cc65fd8305a3
Author: Carlos Garnacho <carlosg@gnome.org>
Date: Thu Jan 2 21:33:30 2014 +0100
Xi: Ensure DeviceChanged is emitted after grabs are deactivated
When a grab on a slave device is deactivated, the master device must
be checked, just in case there were events from other devices while
the slave device was stolen away by the passive grab. This may
introduce misbehaviors on mismatching valuators and device features
later on UpdateDeviceState().
Signed-off-by: Carlos Garnacho <carlosg@gnome.org>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 863d2ad5c02cccde9a4d1a392a7cae78d001c8a9
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Mon Jan 6 17:10:40 2014 -0800
CheckPassiveGrabsOnWindow() needs to handle NULL return value from AllocGrab()
CheckPassiveGrabsOnWindow() calls AllocGrab() which can fail and return NULL.
This return value is not checked, and can cause NULL pointer dereferences.
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 5493a67ec256d22a8a41597a345d8e1c54d6e335
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Mon Jan 6 17:10:39 2014 -0800
GrabDevice() needs to handle NULL return value from AllocGrab()
GrabDevice() calls AllocGrab() which can fail and return NULL.
This return value is not checked, and can cause NULL pointer dereferences.
Reported-by: Ilja Van Sprundel <ivansprundel@ioactive.com>
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 3a113815a0cc86d64789494e905da9778174f738
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Mon Jan 6 17:10:38 2014 -0800
If AllocGrab() fails to set up grab, don't copy to a NULL grab
If either the initial calloc or the xi2mask_new fails, grab is NULL,
but if a src grab is passed in, it was always being written to by
CopyGrab (and if that failed, dereferenced again in teardown).
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
commit a92c6406e7f6c0b74fb1cb9361ad904facc0f722
Author: Keith Packard <keithp@keithp.com>
Date: Thu Jan 9 11:10:11 2014 +0800
Bump release to 1.15.99.900
The merge window for 1.16 is open
Signed-off-by: Keith Packard <keithp@keithp.com>
commit d6c8d7509727060b8e2358b9ed1c0e17b2ec3401
Author: Damien Lespiau <damien.lespiau@intel.com>
Date: Wed Jul 31 19:16:45 2013 +0100
xfree86: Use the TMDS maximum frequency to prune modes
Instead of only relying on the Range section, we can do better on
HDMI to find out what is the max dot clock the monitor supports. The
HDMI CEA vendor block adds a TMDS max freq we can use.
This makes X not prune 4k resolutions on HDMI.
v2: Replace X_INFO by X_PROBED in the message that prints the max
TMDS frequency (Chris Wilson)
Reviewed-by: Chris Wilson <chris at chris-wilson.co.uk>
Signed-off-by: Damien Lespiau <damien.lespiau@intel.com>
commit 95c2287465138ac251bf792f354cee3626e76b44
Author: Damien Lespiau <damien.lespiau@intel.com>
Date: Wed Aug 7 15:16:21 2013 +0100
xfree86: Refactor xf86MonitorIsHDMI() using xf86MonitorFindHDMIBlock()
Reviewed-by: Chris Wilson <chris at chris-wilson.co.uk>
Signed-off-by: Damien Lespiau <damien.lespiau@intel.com>
commit a279fb3ff3f3cfc41530aff1d9ff5620279348f6
Author: Damien Lespiau <damien.lespiau@intel.com>
Date: Wed Jul 31 19:11:45 2013 +0100
xfree86: Add a xf86MonitorFindHDMIBlock()
The HDMI CEA vendor specific block has some interesting information,
such as the maximum TMDS dot clock.
v2: Don't parse CEA blocks with invalid offsets, remove spurious
brackets (Chris Wilson)
v3: Fix the looping through the CEA data blocks, it had a typo using the
wrong variable coming from the code it was ported from.
Replace x << 16 + y << 8 + z by x << 16 | y << 8 | z
(Chris Wilson)
v4: Remove the stray ';' at the end of "if (*end == 0)".
(Dominik Behr on IRC)
Reviewed-by: Chris Wilson <chris at chris-wilson.co.uk>
Signed-off-by: Damien Lespiau <damien.lespiau@intel.com>
commit 295d41fa2aa97b74c1b9ffd7ef4ccf52f3e97dde
Author: Eric Anholt <eric@anholt.net>
Date: Mon Dec 16 10:52:19 2013 -0800
glx: unifdef swrast dri_interface.h values from Mesa 7.1.
We can't remove all the ifdefs (__DRI_TEX_BUFFER_VERSION) because
configure.ac is only checking for that version of Mesa in the absence
of dri2.
Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
commit 4ab1a2797ba366179f8a2e621334dd45df2a5a65
Author: Eric Anholt <eric@anholt.net>
Date: Tue Nov 5 11:41:06 2013 -0800
glx: unifdef for DRI2 dri_interface.h things in mesa 9.2.
Thanks to configure.ac's check, we know that we have a new enough
dri_interface.h that we don't need to conditionalize all this code.
Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
commit 2ea973e12f5d954211e1d10085a4c74581b43aca
Author: Keith Packard <keithp@keithp.com>
Date: Fri Dec 27 09:50:55 2013 -0800
Bump version to 1.15.0
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 2eb9915eea358f941702d3dad7434197991885c5
Author: Keith Packard <keithp@keithp.com>
Date: Thu Dec 12 15:48:08 2013 -0800
present: Set complete notify mode to Skip as needed
Skipped present pixmap calls were not setting the mode to
PresentCompleteModeSkip for skipped operations.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit e487babd525ef1bd016ec7b283fa08cf9e6c6f4f
Author: Keith Packard <keithp@keithp.com>
Date: Thu Dec 12 14:52:35 2013 -0800
present: Don't abandon presents which are already queued for flip
Presents which are not marked 'queued' and are in the window present
list are waiting for the flip event; discarding those won't work very
well (it'll end up trashing displayed content for the next frame), so
skip over those when looking for duplicate frame presents
Signed-off-by: Keith Packard <keithp@keithp.com>
commit ca3a5b2a8f9f627bbaa9883e16512a21c2a0b81d
Author: Keith Packard <keithp@keithp.com>
Date: Thu Dec 12 14:17:40 2013 -0800
present: Handle PresentOptionAsync for copy mode
Check for Async flag and execute immediately if set, otherwise wait
for the next appropriate vblank before copying.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit a68df147421da21528b5be2d34678383922fa352
Author: Keith Packard <keithp@keithp.com>
Date: Thu Dec 19 14:31:07 2013 -0800
Bump version to 1.14.99.905 (1.15 RC5)
Another week, another RC. This should be the last before 1.15 final
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 4b1ead9d3400acc3402c2480d7cc0527750c32f0
Merge: 4d62646142 929795d50d
Author: Keith Packard <keithp@keithp.com>
Date: Thu Dec 19 14:14:59 2013 -0800
Merge remote-tracking branch 'whot/for-keith'
commit 4dd62d7807b47efbc9065ae8f17f73e1ec6e9d26
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Tue Dec 10 11:13:32 2013 -0500
libglamoregl: remove -I$(top_srcdir)/src
Automake always provide -I. It is at the beginning of the list of compiler
options.
Not needed either to find glamor_egl.c source.
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
Reviewed-by: Zhigang Gong <zhigang.gong@linux.intel.com>
commit 08c23ff8aefe80f2940ecb90adda27156084f57c
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Tue Dec 10 11:13:31 2013 -0500
Make: remove cruft copied over from the X server makefiles
In toplevel makefile:
nostdinc: only xserver, no other X modules
aclocaldir: no local macros to install
xkb_path: xserver only
"Gross hack": xserver only
In src/makefile:
SOLARIS_ASM_CFLAGS; server only
XORG_INCS: undefined variable
DIX_CFLAGS: undefined variable
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
Reviewed-by: Zhigang Gong <zhigang.gong@linux.intel.com>
commit b8055bd1f6c9dea0fe8f7a786d2a1522f5f32129
Author: Dave Airlie <airlied@redhat.com>
Date: Fri Dec 13 11:33:46 2013 +1000
glamor: fix leak in xv code.
This loop needed to go one higher, not sure if this fixes the leak
MrCooper was seeing on irc, but it fixes a leak.
Signed-off-by: Dave Airlie <airlied@redhat.com>
Reviewed-by: Michel Dänzer <michel.daenzer@amd.com>
Reviewed-by: Zhigang Gong <zhigang.gong@linux.intel.com>
commit 752a79562eb13f59fa54b4181d65367c8488c0a5
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Sun Dec 8 16:43:08 2013 -0500
Fix glamor_egl->egl_create_image_khr makes pointer from integer
This is a warning, but a real problem can occur on some system.
Reported-by: Fabio Pedretti <fabio.ped@libero.it>
Reviewed-by: Axel Davy <davyaxel@free.fr>
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
Reviewed-by: Zhigang Gong <zhigang.gong@linux.intel.com>
commit 7cfd9cc23270c0246d584e167fe14bf5af4571df
Author: Axel Davy <axel.davy@ens.fr>
Date: Thu Dec 5 08:49:15 2013 +0100
Add DRI3 support to glamor
This implements some DRI3 helpers to help the DDXs using
glamor to support DRI3.
Signed-off-by: Axel Davy <axel.davy@ens.fr>
Reviewed-by: Zhigang Gong <zhigang.gong@linux.intel.com>
commit 06ba3fdfd6162a64c149ea6fda85f9f56d7f3c31
Author: Zhigang Gong <zhigang.gong@intel.com>
Date: Tue Nov 19 15:16:57 2013 +0800
Fixed some compilation warning/error or error checking.
There is one compilation error ,cast int to pointer, when built without
libgbm, reported by Gaetan Nadon.
And some error checking after memory allocation, reported by Seth Arnold.
There are still some similar issues in the largepixmap implementation.
They are relatively more complicate due to the heavy usage of RegionXXX
APIs which may allocate implicitly. Will fix them in the future.
Signed-off-by: Zhigang Gong <zhigang.gong@intel.com>
Tested-by: Gaetan Nadon <memsize@videotron.ca>
commit a5321ea431376feca2dcd55cf04925dc492270fc
Author: Axel Davy <axel.davy@ens.fr>
Date: Mon Nov 18 22:52:22 2013 +0100
Allow to create textured pixmaps from gbm_bo without using gem names
This implements glamor_egl_create_textured_pixmap_from_gbm_bo,
which is similar to glamor_egl_create_textured_pixmap, except
it takes a gbm_bo as argument.
Signed-off-by: Axel Davy <axel.davy@ens.fr>
Reviewed-by: Zhigang Gong <zhigang.gong@linux.intel.com>
commit 403004fe799f293bf299fe78da821635b19d9a1a
Author: Fabio Pedretti <fabio.ped@libero.it>
Date: Mon Nov 4 12:08:42 2013 +0100
glamor: remove unused variable
Reviewed-by: Zhigang Gong <zhigang.gong@linux.intel.com>
commit 842cd7eb4353492bc9c29439f975c3bd33445cbd
Author: Maarten Lankhorst <maarten.lankhorst@canonical.com>
Date: Wed Nov 6 10:25:27 2013 +0100
fixup picture in SetWindowPixmap
When creating a window with recordmydesktop running, the following may happen:
create picture 0x1cd457e0, with drawable 0x1327d1f0
(SetWindowPixmap is called)
destroy picture 0x1cd457e0, with drawable 0x1cd65820
Obtaining format for pixmap 0x1327d1f0 and picture 0x1cd457e0
==7989== Invalid read of size 4
==7989== at 0x8CAA0CA: glamor_get_tex_format_type_from_pixmap (glamor_utils.h:1252)
==7989== by 0x8CAD1B7: glamor_download_sub_pixmap_to_cpu (glamor_pixmap.c:1074)
==7989== by 0x8CA8BB7: _glamor_get_image (glamor_getimage.c:66)
==7989== by 0x8CA8D2F: glamor_get_image (glamor_getimage.c:92)
==7989== by 0x29AEF2: miSpriteGetImage (misprite.c:413)
==7989== by 0x1E7674: compGetImage (compinit.c:148)
==7989== by 0x1F5E5B: ProcShmGetImage (shm.c:684)
==7989== by 0x1F686F: ProcShmDispatch (shm.c:1121)
==7989== by 0x15D00D: Dispatch (dispatch.c:432)
==7989== by 0x14C569: main (main.c:298)
==7989== Address 0x1cd457f0 is 16 bytes inside a block of size 120 free'd
==7989== at 0x4C2B60C: free (in /usr/lib/valgrind/vgpreload_memcheck-amd64-linux.so)
==7989== by 0x228897: FreePicture (picture.c:1477)
==7989== by 0x228B23: PictureDestroyWindow (picture.c:73)
==7989== by 0x234C19: damageDestroyWindow (damage.c:1646)
==7989== by 0x1E92C0: compDestroyWindow (compwindow.c:590)
==7989== by 0x20FF85: DbeDestroyWindow (dbe.c:1389)
==7989== by 0x185D46: FreeWindowResources (window.c:907)
==7989== by 0x1889A7: DeleteWindow (window.c:975)
==7989== by 0x17EBF1: doFreeResource (resource.c:873)
==7989== by 0x17FC1B: FreeClientResources (resource.c:1139)
==7989== by 0x15C4DE: CloseDownClient (dispatch.c:3402)
==7989== by 0x2AB843: CheckConnections (connection.c:1008)
==7989==
(II) fail to get matched format for dfdfdfdf
The fix is to update the picture pointer when the window pixmap is changed,
so it moves the picture around with the window rather than the pixmap.
This makes FreePicture work correctly.
Signed-off-by: Maarten Lankhorst <maarten.lankhorst@canonical.com>
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=71088
Reviewed-by: Zhigang Gong <zhigang.gong@linux.intel.com>
commit 2925db6616944c8d1e911caee0637a00e5586576
Author: Zhigang Gong <zhigang.gong@linux.intel.com>
Date: Sat Nov 2 00:08:11 2013 +0800
Fixed an incorrect printf format.
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=69573
Signed-off-by: Zhigang Gong <zhigang.gong@linux.intel.com>
commit 644e05562e401f192c93964be06c33fe92099089
Author: Brian Paul <brianp@vmware.com>
Date: Sat Oct 19 16:10:54 2013 -0600
Remove useless return statement
Reviewed-by: Zhigang Gong <zhigang.gong@linux.intel.com>
commit 8c51eb8239247c98057eb9daf06c905a1dc0588c
Author: Brian Paul <brianp@vmware.com>
Date: Sat Oct 19 16:10:53 2013 -0600
Remove redundant dispatch->glEnable(GL_TEXTURE_2D)
The same call was already made a few lines earlier.
Reviewed-by: Zhigang Gong <zhigang.gong@linux.intel.com>
commit 3bf1eb577e2d2b4d55d38b5a0043b0efb9abb385
Author: Brian Paul <brianp@vmware.com>
Date: Sat Oct 19 16:10:52 2013 -0600
Fix _glamor_set_spans() bug (re-used 'n' variable)
n was used as a function parameter. But inside the for (i=1..n) loop,
n got reassigned as REGION_NUM_RECTS() and then decremented to zero by
the while loop. This caused the for loop to only iterate once instead
of 'n' times.
This patch renames the n parameter to numPoints.
Found by code inspection. Untested.
Reviewed-by: Zhigang Gong <zhigang.gong@linux.intel.com>
commit 2f62bd46cc002af57f8fe3246b9aea9e0c0bbcc9
Author: Grigori Goronzy <greg@chown.ath.cx>
Date: Wed Oct 2 00:37:57 2013 +0200
glamor_render: fix PictFilters
Add Fast/Good/Best and appropriately map to Nearest and
Bilinear. Additionally, add a fallback path for unsupported filters.
Notably, this fixes window shadow rendering with Compiz, which uses
PictFilterConvolution for some odd reason.
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
Reviewed-by: Zhigang Gong <zhigang.gong@linux.intel.com>
commit 5695708ecd2a26fcb9c05985c6758e719071995a
Author: Grigori Goronzy <greg@chown.ath.cx>
Date: Wed Oct 2 00:37:56 2013 +0200
Use GL_STATIC_DRAW for element index buffer
The buffer never changes anyway.
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
Reviewed-by: Zhigang Gong <zhigang.gong@linux.intel.com>
commit 8afa008ec4b393666bb3c506a711b4d50cc4e756
Author: Grigori Goronzy <greg@chown.ath.cx>
Date: Wed Oct 2 00:37:55 2013 +0200
Use glDrawRangeElements instead of glDrawElements
This lets us explicitly specify the range of vertices that are used,
which the OpenGL driver can use for optimization. Particularly,
it results in lower CPU overhead with Mesa-based drivers.
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
Reviewed-by: Zhigang Gong <zhigang.gong@linux.intel.com>
commit 229601e080aefad21927c1449cd520733317858b
Author: Zhigang Gong <zhigang.gong@linux.intel.com>
Date: Fri Sep 27 05:25:54 2013 +0800
Shoud return null subpixmap if we fail to get a valid map address.
The patch is prepared by Raul Fernandes.
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=86693
Signed-off-by: Zhigang Gong <zhigang.gong@linux.intel.com>
commit e3d1d4e3caaab8076eba89b58d037d24e203e506
Author: Dave Airlie <airlied@redhat.com>
Date: Mon Sep 23 06:42:24 2013 +0100
glamor: add initial Xv support
This does YV12 and I420 for now, not sure if we can do packed without
a GL extension.
Signed-off-by: Dave Airlie <airlied@redhat.com>
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
commit 39e95cd0f50cf471d8220d5428788d5be6a59d3f
Author: Michel Dänzer <michel.daenzer@amd.com>
Date: Fri Sep 20 10:41:10 2013 +0200
Reset traps_count and ptrap when necessary for the next trapezoid cliprect
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=64912
Signed-off-by: Michel Dänzer <michel.daenzer@amd.com>
Reviewed-by: He Junyan <junyan.he@inbox.com>
Reviewed-by: Zhigang Gong <zhigang.gong@linux.intel.com>
commit 61fca4342a65be2dbc7f890f2e67da56a50db978
Author: Michel Dänzer <michel.daenzer@amd.com>
Date: Tue Sep 17 13:25:02 2013 +0200
Fix RegionContainsRect test for PutImage
The return value of RegionContainsRect() is not a boolean but an enum
indicating that the region contains the rectangle completely, partially
or not at all. We can only take the PutImage fastpath when the region
contatins the rectangle completely.
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=65964
Signed-off-by: Michel Dänzer <michel.daenzer@amd.com>
Reviewed-by: Zhigang Gong <zhigang.gong@linux.intel.com>
commit 2ea618f2cf906fec9807b321f9e8ef3a4706c708
Author: Christian König <christian.koenig at amd.com>
Date: Mon Aug 26 14:57:47 2013 +0800
Use GBM_LIBS and GBM_CFLAGS
Signed-off-by: Christian König <christian.koenig at amd.com>
Reviewed-by: Michel Dänzer <michel.daenzer at amd.com>
commit 7e818f7d39cfef2701fe9cf95c7854ee8c9f3be6
Author: Armin K <krejzi@email.com>
Date: Wed Mar 13 18:49:32 2013 +0100
First attempt to make libglamor.so shared versioned library
As recommended by Michel in this thread reply:
http://lists.freedesktop.org/archives/glamor/2013-March/000305.html
v2: Correct shared library location in glamor.pc.in
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=62259
Reviewed-by: Michel Dänzer <michel.daenzer@amd.com>
commit b0318b6de7a2f8c5d9e75b55211dcc0b12f811fc
Author: Armin K <krejzi@email.com>
Date: Wed Mar 13 18:28:58 2013 +0100
Properly dist necesary headers
Reviewed-by: Michel Dänzer <michel.daenzer@amd.com>
commit fc179bb863778c03288bebaa258358ccbdb6aa0c
Author: Armin K <krejzi@email.com>
Date: Wed Mar 13 18:28:57 2013 +0100
Silence Automake 1.13 warnings
warning: 'INCLUDES' is the old name for 'AM_CPPFLAGS' (or '*_CPPFLAGS')
Reviewed-by: Michel Dänzer <michel.daenzer@amd.com>
commit 97416e3f144606728a963aa2a337b1283e156ad2
Author: Michel Dänzer <michel.daenzer@amd.com>
Date: Wed Mar 13 17:15:33 2013 +0100
glamoregl: Use xf86ScreenToScrn()
Fixes crashes when glamor is used for a GPU screen with xserver 1.13 or
newer.
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=57200#c17
Signed-off-by: Michel Dänzer <michel.daenzer@amd.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
commit 4c5bfd529f6f182a3f0ac1b9bb5c3170a297f460
Author: Dave Airlie <airlied@redhat.com>
Date: Sat Dec 29 06:42:30 2012 +0000
glamor_utils: fix unlikely define use
using a define across a split line expression is failure, compiling
with warnings shows this up.
Signed-off-by: Dave Airlie <airlied@redhat.com>
commit 6b954880c25af353dd4679cfdad6664b107d4df6
Author: Dave Airlie <airlied@redhat.com>
Date: Sat Dec 29 06:42:10 2012 +0000
glamor: add compiler.h
This is also required for distchecking.
Signed-off-by: Dave Airlie <airlied@redhat.com>
commit efbdc9e90f36494b07508aeaba40c9eb01eab398
Author: Dave Airlie <airlied@redhat.com>
Date: Sat Dec 29 06:28:17 2012 +0000
glamor: fix make distcheck part 1
This just adds the headers, then it falls over on the sdk_HEADERS
as it overrides proper install paths by the looks of it.
Signed-off-by: Dave Airlie <airlied@redhat.com>
commit 80f5e21daeed79654d6e1976f2766eb528f01d47
Author: Zhigang Gong <zhigang.gong@linux.intel.com>
Date: Tue Nov 13 10:08:02 2012 +0800
glamor_compositerects: Need to initialize region before fallback.
As we need to call DamageRegionAppend even for fallback path,
we must initialize the region before do that. Pointed by
Igor Vagulin.
https://bugs.freedesktop.org/show_bug.cgi?id=56940
Signed-off-by: Zhigang Gong <zhigang.gong@linux.intel.com>
commit 14e02f5132d7b4f50c8d9f8e5c6a0f285a3f3c14
Author: Michel Dänzer <michel.daenzer@amd.com>
Date: Wed Oct 31 16:56:00 2012 +0100
Don't use glBlitFramebufferEXT for overlapping copies.
According to the GL_EXT_framebuffer_blit spec, the result of doing so is
undefined. But we need well-defined results. :)
Signed-off-by: Michel Dänzer <michel.daenzer@amd.com>
commit e846f48f489e33e270db682b1b6c8e6f03fdf313
Author: Zhigang Gong <zhigang.gong@linux.intel.com>
Date: Wed Aug 8 20:43:38 2012 +0800
Increase vbo size to 64K verts.
This commit will benefit vertex stressing cases such as
aa10text/rgb10text, and can get about 15% performance gain.
Signed-off-by: Zhigang Gong <zhigang.gong@linux.intel.com>
Acked-by: Junyan <junyan.he@linux.intel.com>
commit b8f0a2188295f6cc2c997b6639b6928323eae617
Author: Zhigang Gong <zhigang.gong@linux.intel.com>
Date: Wed Aug 8 20:11:43 2012 +0800
Silence compilation warnings.
After increase to gcc4.7, it reports more warnings, now
fix them.
Signed-off-by: Zhigang Gong <zhigang.gong@linux.intel.com>
Tested-by: Junyan He<junyan.he@linux.intel.com>
commit 50614451adafc816ae5ffbe9c2a97a58f493b927
Author: Zhigang Gong <zhigang.gong@linux.intel.com>
Date: Wed Aug 8 20:08:12 2012 +0800
glamor_largepixmap: Fixed a bug in repeat clipping.
If the repeat direction only has one block, then we need to set the
dx/dy to cover all the extent. This commit also silence some compilation
warnings.
Signed-off-by: Zhigang Gong <zhigang.gong@linux.intel.com>
commit 7eb434918bd7d58162c53fac9316aceda136cb6f
Author: Michel Dänzer <michel.daenzer@amd.com>
Date: Tue Aug 7 18:16:58 2012 +0200
Prefer KHR_surfaceless_context EGL extension over KHR_surfaceless_opengl/gles2.
Current Mesa Git only advertises the former instead of the latter.
Signed-off-by: Michel Dänzer <michel.daenzer@amd.com>
Signed-off-by: Zhigang Gong <zhigang.gong@linux.intel.com>
commit 59653fa08a67a0694b3408407f5f92af99470739
Author: Michel Dänzer <michel.daenzer@amd.com>
Date: Tue Aug 7 18:13:32 2012 +0200
Print space between name of missing EGL extension and 'required'.
Signed-off-by: Michel Dänzer <michel.daenzer@amd.com>
Signed-off-by: Zhigang Gong <zhigang.gong@linux.intel.com>
commit c3096c5a568c9c7b5f8a68ca882d866b8fb8e3ad
Author: Junyan He <junyan.he@linux.intel.com>
Date: Tue Aug 7 05:01:59 2012 +0800
Fallback to pixman when trapezoid mask is big.
The trapezoid generating speed of the shader is relatively
slower when the trapezoid area is big. We fallback when
the trapezoid's width and height is bigger enough.
The big traps number will also slow down the render because
of the VBO size. We fallback if ntrap > 256
Signed-off-by: Junyan He <junyan.he@linux.intel.com>
Reviewed-By: Zhigang Gong <zhigang.gong@linux.intel.com>
commit f62f4d53ef91ba05cc9456b1468cd1b24252454f
Author: Zhigang Gong <zhigang.gong@linux.intel.com>
Date: Thu Aug 2 18:07:07 2012 +0800
glamor_glyphs: When dst arg point to a NULL buffer, dont't flush.
This is a corner case, when we render glyphs via mask cache, and
when we need to upload new glyphs cache, we need to flush both the
mask and dest buffer. But we the dest arg may point to a NULL buffer
at that time, we need to check it firstly. If the dest buffer is NULL.
Then we don't need to flush both the dest and mask buffer.
This commit fix a potential crash.
Signed-off-by: Zhigang Gong <zhigang.gong@linux.intel.com>
commit e7af7cb76dade31b9e40cede7ac21d32bc95831c
Author: Zhigang Gong <zhigang.gong@linux.intel.com>
Date: Wed Aug 1 18:27:29 2012 +0800
glamor_trapezoid: workaround a glsl like problem.
It seems that the following statement cann't run as expected on SNB.
bool trap_left_vertical = (abs(trap_left_vertical_f - 1.0) <= 0.0001);
Have to rewrite it to another style to let the vertical edge trapezoid
to be rendered correctly.
Reviewed-by: Junyan He <junyan.he@linux.intel.com>
Signed-off-by: Zhigang Gong <zhigang.gong@linux.intel.com>
commit 5512c14e346a988f6eb8cdf9385a868ef705450c
Author: Junyan He <junyan.he@linux.intel.com>
Date: Fri Jul 20 05:52:57 2012 +0800
Fix the problem of VBO leak.
In some cases we allocate the VBO but have no vertex to
emit, which cause the VBO fail to be released. Fix it.
Signed-off-by: Junyan He <junyan.he@linux.intel.com>
commit 9f78e22fa62d8f1a08d6a0688e2eafba35206a3b
Author: Junyan He <junyan.he@linux.intel.com>
Date: Fri Jul 20 05:52:50 2012 +0800
Just use the shader to generate trapezoid if PolyMode == Imprecise
The precise mode of trapezoid rendering need to sample the trapezoid on
the centre points of an (2*n+1)x(2*n-1) subpixel grid. It is computationally
expensive in shader, and we use inside area ratio to replace it.
The result has some difference, and we just use it if the polymode == Imprecise.
Signed-off-by: Junyan He <junyan.he@linux.intel.com>
commit fe024a78220a6d61c6b1df89166da953b19b633a
Author: Junyan He <junyan.he@linux.intel.com>
Date: Fri Jul 20 05:52:43 2012 +0800
Change the trapezoid render to use VBO.
Because some uniform variables need to be set for every
trapezoid rendering, we can not use vbo to render multi
trapezoids one time, which have performance big loss.
We now add attributes which contain the same value to bypass
the uniform variable problem. The uniform value for one
trapezoid will be set to the same value to all the vertex
of that trapezoid as an attribute, then in FS, it is still
a constant.
Signed-off-by: Junyan He <junyan.he@linux.intel.com>
commit 9dff3378e5c39b346985924f9ab6291069cc7b6e
Author: Zhigang Gong <zhigang.gong@linux.intel.com>
Date: Mon Jul 16 17:27:22 2012 +0800
Added the missed header file for xorg 1.13 compat.
Signed-off-by: Zhigang Gong <zhigang.gong@linux.intel.com>
commit bc1b412b3b0bb716702ec89ae512f2b5ec62c17a
Author: Zhigang Gong <zhigang.gong@linux.intel.com>
Date: Mon Jul 16 11:25:09 2012 +0800
Synch with xorg 1.13 change.
As xorg 1.13 change the scrn interaces and remove those
global arrays. Some API change cause we can't build. Now
fix it.
Signed-off-by: Zhigang Gong <zhigang.gong@linux.intel.com>
commit 4c27ca4700e4ba4ae19d77377a7776eb32f74647
Author: Zhigang Gong <zhigang.gong@linux.intel.com>
Date: Fri Jul 13 09:20:02 2012 +0800
gles2: Fixed the compilation problem and some bugs.
Previous patch doesn't set the offset to zero for GLESv2
path. Now fix it.
This patch also fix a minor problem in pixmap uploading
preparation. If the revert is not REVERT_NORMAL, then we
don't need to prepare a fbo for it. As current mesa i965
gles2 driver doesn't support to set a A8 texture as a fbo
target, we must fix this problem. As some A1/A8 picture
need to be uploaded, this is the only place a A8 texture
may be attached to a fbo.
This patch also enable the shader gradient for GLESv2.
The reason we disable it before is that some glsl linker
doesn't support link different objects which have cross
reference. Now we don't have that problem.
Signed-off-by: Zhigang Gong <zhigang.gong@linux.intel.com>
commit 006fe0e66df4b214ca5c50241b3cca22d31161df
Author: Michel Dänzer <michel.daenzer@amd.com>
Date: Thu Jul 12 18:57:06 2012 +0800
Stream vertex data to VBOs.
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Signed-off-by: Zhigang Gong <zhigang.gong@linux.intel.com>
commit 551ca11c77d0524ceb37eb26caf0c25e4d7d806f
Author: Michel D=C3=A4nzer <michel.daenzer@amd.com>
Date: Wed Jul 11 15:01:15 2012 +0800
Fix translation of clip region for composite fallback.
Fixes incorrectly clipped rendering. E.g. the cursor in Evolution
composer windows became invisible.
Signed-off-by: Michel Daenzer <michel.daenzer@amd.com>
Signed-off-by: Zhigang Gong <zhigang.gong@linux.intel.com>
commit 88c317fb1e6a9056acab4a76c0ee0bf283e001ce
Author: Zhigang Gong <zhigang.gong@linux.intel.com>
Date: Wed Jul 4 17:59:25 2012 +0800
glamor_glyphs: Don't merge extents for different lists.
If we merge all lists's extent together, than we may have
some fail overlap checking. Here is a simple:
A E
B F
C
D
The first list has vertical "ABCD". And the second list
has two char "EF". When detecting E, it can successfully
find it doesn't overlap with previous glyphs. But after
that, the original code will merge the previous extent with
E's extent, then the extent will cover "F", so when detecting
F, it will be treated as overlapped.
We can simply solve this issue by not merge extent from different
list. We can union different list's extent to a global region.
And then do the intersect checkint between that region and
current glyph extent, then we can avoid that fail checking.
Signed-off-by: Zhigang Gong <zhigang.gong@linux.intel.com>
commit 32a7438bf79573100862ad91c5722d12623a8bf9
Author: Zhigang Gong <zhigang.gong@linux.intel.com>
Date: Tue Jul 3 18:24:07 2012 +0800
glamor_copyarea: Use blitcopy if current state is not render.
Practically, for pure 2D blit, the blit copy is much faster
than textured copy. For the x11perf copywinwin100, it's about
3x faster. But if we have heavy rendering/compositing, then use
textured copy will get much better (>30%)performance for most
of the cases.
So we simply add a data element to track current state. For
rendering state we use textured copy, otherwise, we use blit
copy.
Signed-off-by: Zhigang Gong <zhigang.gong@linux.intel.com>
commit 0706423bcfd7a589bab3b41fe9f13d0b636ecdef
Author: Zhigang Gong <zhigang.gong@linux.intel.com>
Date: Tue Jul 3 18:11:12 2012 +0800
glamor_glyphs: Use cache picture to store mask picture if possible.
By default, mask picture is newly created, and each time we need to
clear the whole mask picture, and then composite glyphs to the mask
picture and then composite the mask picture to destination.
Testing results shows that the filling of the mask picture takes a
big portion of the rendering time. As we don't really need to clear
the whole region, we just need to clear the real overlapped region.
This commit is to solve this issue. We split a large glyphs list to
serval lists and each list is non-overlapped or overlapped.
we can reduce the length of overlapped glyphs to do the glyphs_via_mask
to 2 or 3 glyphs one time for most cases. Thus it give us a case to allocate a
small portion of the corresponding cache directly as the mask picture.
Then we can rendering the glyphs to this mask picture, and latter we
can accumulate the second steps, composite the mask to the dest with
the other non-overlapped glyphs's rendering process.
It also make us implement a batch mask cache blocks clearing
algorithm to avoid too frequently small region clearing.
If there is no any overlapping, this method will not get performance gain.
If there is some overlapping, then this algorithm can get about 15% performance
gain.
Signed-off-by: Zhigang Gong <zhigang.gong@linux.intel.com>
commit 4d1a2173f2e5a200d1535a4a459fffd75cd5f779
Author: Zhigang Gong <zhigang.gong@linux.intel.com>
Date: Wed Jun 27 12:53:40 2012 +0800
glamor_compositerects: Implement optimized version.
Don't call miCompositeRects. Use glamor_composite_clipped_region
to render those boxes at once.
Also add a new function glamor_solid_boxes to fill boxes at once.
Signed-off-by: Zhigang Gong <zhigang.gong@linux.intel.com>
commit dd7924339803b51332e3fe94d36eb48549e9d24d
Author: Zhigang Gong <zhigang.gong@linux.intel.com>
Date: Tue Jun 26 20:00:21 2012 +0800
optimize: Use likely and unlikely.
Signed-off-by: Zhigang Gong <zhigang.gong@linux.intel.com>
commit d5f03ba0109bc50e159c82d3d67cffa8fc174134
Author: Zhigang Gong <zhigang.gong@linux.intel.com>
Date: Tue Jun 26 19:56:27 2012 +0800
create_pixmap: use texture for large glyphs.
As we only cache glyphs smaller than 64x64, we need to use
texutre for the large glyphs.
Signed-off-by: Zhigang Gong <zhigang.gong@linux.intel.com>
commit 90dd6ddbab864aa6c3add55c46a85d7db2c125f6
Author: Zhigang Gong <zhigang.gong@linux.intel.com>
Date: Tue Jun 26 17:19:16 2012 +0800
glamor_copyarea: Fixed a bug introduced by 996194...
Default return value should be FALSE.
Signed-off-by: Zhigang Gong <zhigang.gong@linux.intel.com>
commit b8dd2a597de455ae985302d1b93d865ef9f37c7b
Author: Zhigang Gong <zhigang.gong@linux.intel.com>
Date: Tue Jun 26 16:24:32 2012 +0800
glamor_glyphs: Slightly performance tuning.
As glamor_glyphs never fallback, we don't need to keep the
underlying glyphs routines, just override the ps->glys
Signed-off-by: Zhigang Gong <zhigang.gong@linux.intel.com>
commit 3873d412f018b975feaa000cb7ef337feaeee37d
Author: Zhigang Gong <zhigang.gong@linux.intel.com>
Date: Tue Jun 26 15:39:24 2012 +0800
glamor_render: Don't allocate buffer for vbo each time.
We can reuse the last one if the last one is big enough
to contain current vertext data. In the meantime, Use
MapBufferRange instead of MapBuffer.
Testing shows, this patch brings some benefit for
aa10text/rgb10text. Not too much, but indeed faster.
Signed-off-by: Zhigang Gong <zhigang.gong@linux.intel.com>
commit 682f5d2989306856c0c193b0b4abd8c104a9ba92
Author: Zhigang Gong <zhigang.gong@linux.intel.com>
Date: Tue Jun 26 13:09:05 2012 +0800
glamor_largepixmap: Walkaround for large texture's upload.
I met a problem with large texture (larger than 7000x7000)'s
uploading on SNB platform. The map_gtt get back a mapped VA
without error, but write to that virtual address triggers
BUS error. This work around is to avoid that direct uploading.
Signed-off-by: Zhigang Gong <zhigang.gong@linux.intel.com>
commit 37d4022f01483eefe06b5f12e13ca2ed4003c8f0
Author: Zhigang Gong <zhigang.gong@linux.intel.com>
Date: Mon Jun 25 23:24:37 2012 +0800
glamor_render: Optimize the two pass ca rendering.
For the componentAlpha with PictOpOver, we use two pass
rendering to implement it. Previous implementation call
two times the glamor_composite_... independently which is
very inefficient. Now we change the control flow, and do
the two pass internally and avoid duplicate works.
For the x11perf -rgb10text, this optimization can get about
30% improvement.
Signed-off-by: Zhigang Gong <zhigang.gong@linux.intel.com>
commit 21916cf84f0cd9ada8701650d39b5cf67646eaf7
Author: Zhigang Gong <zhigang.gong@linux.intel.com>
Date: Mon Jun 25 16:37:22 2012 +0800
glamor_composite_glyph: Optimize glyphs with non-solid pattern.
Signed-off-by: Zhigang Gong <zhigang.gong@linux.intel.com>
commit c1bd50d58d2c7b39e2b5c529bd86fde1ab14d8e6
Author: Zhigang Gong <zhigang.gong@linux.intel.com>
Date: Thu Jun 21 19:30:51 2012 +0800
glamor_glyphs: Detect fake or real glyphs overlap.
To split a glyph's extent region to three sub-boxes
as below.
left box 2 x h
center box (w-4) x h
right box 2 x h
Take a simple glyph A as an example:
*
__* *__
*****
* *
~~ ~~
The left box and right boxes are both 2 x 2. The center box
is 2 x 4.
The left box has two bitmaps 0001'b and 0010'b to indicate
the real inked area.
The right box also has two bitmaps 0010'b and 0001'b.
And then we can check the inked area in left and right boxes with
previous glyph. If the direction is from left to right, then we
need to check the previous right bitmap with current left bitmap.
And if we found the center box has overlapped or we overlap with
not only the previous glyph, we will treat it as real overlapped
and will render the glyphs via mask.
If we only intersect with previous glyph on the left/right edge.
Then we further compute the real overlapped bits. We set a loose
check criteria here, if it has less than two pixel overlapping, we
treat it as non-overlapping.
With this patch, The aa10text boost fom 1660000 to 320000.
Almost double the performance! And the cairo test result is the
same as without this patch.
Signed-off-by: Zhigang Gong <zhigang.gong@linux.intel.com>
commit ea4c22716ca1544e924c7462db6a2797afebff59
Author: Zhigang Gong <zhigang.gong@linux.intel.com>
Date: Thu Jun 21 19:29:06 2012 +0800
glamor_render: Don't fallback when rendering glyphs with OpOver.
Signed-off-by: Zhigang Gong <zhigang.gong@linux.intel.com>
commit 7acbe895618837305cf4050731ccd1cd3bc11589
Author: Zhigang Gong <zhigang.gong@linux.intel.com>
Date: Thu Jun 21 19:27:07 2012 +0800
glamor_create_pixmap: Allocate glyphs pixmap in memory.
As we have glyphs atlas cache, we don't need to hold each
glyphs on GPU. And for the subsequent optimization, we need
to store the original glyphs pixmap on system memory.
Signed-off-by: Zhigang Gong <zhigang.gong@linux.intel.com>
commit 1e4fc85a71cc6498a7e11872026062fceb5bbdf1
Author: Zhigang Gong <zhigang.gong@linux.intel.com>
Date: Thu Jun 21 19:26:28 2012 +0800
glamor_fbo: fix a memory leak for large pixmap.
Signed-off-by: Zhigang Gong <zhigang.gong@linux.intel.com>
commit 2122e60bf9027b63ddc59c0aa2a441af3687cb3a
Author: Junyan He <junyan.he@linux.intel.com>
Date: Fri Jun 15 09:00:15 2012 +0800
Fix a bug for trapezoid clip
We find in some cases the trapezoid will be render as a triangle and
the left edge and right edge will cross with each other just bellow
the top or over the bottom. The distance between the cross poind and
the top or bottom is less than pixman_fixed_1_minus_e, so after the
fixed converted to int, the cross point has the same value with the
top or botton and the triangle should not be affected. But in our
clip logic, the cross point will be clipped out. So add a logic
to fix this problem.
Signed-off-by: Junyan He <junyan.he@linux.intel.com>
commit 6ed418d17b5143f32b3b415103f3157a1b05e3db
Author: Zhigang Gong <zhigang.gong@linux.intel.com>
Date: Fri Jun 15 13:31:30 2012 +0800
gles2_largepixmap: force clip for a non-large pixmap.
One case we need force clip when download/upload a drm_texture
pixmap. Actually, this is only meaningful for testing purpose.
As we may set the max_fbo_size to a very small value, but the
drm texture may exceed this value but the drm texture pixmap
is not largepixmap. This is not a problem with OpenGL. But for
GLES2, we may need to call glamor_es2_pixmap_read_prepare to
create a temporary fbo to do the color conversion. Then we have
to force clip the drm pixmap here to avoid large pixmap handling
at glamor_es2_pixmap_read_prepare.
Signed-off-by: Zhigang Gong <zhigang.gong@linux.intel.com>
commit c41d5c79e7d8772be38b77122817fb872f2d721d
Author: Zhigang Gong <zhigang.gong@linux.intel.com>
Date: Fri Jun 15 09:03:42 2012 +0800
glamor_emit_composite_vert: Optimize to don't do two times vert coping.
We change some macros to put the vert to the vertex buffer
directly when we cacluating it. This way, we can get about
4% performance gain.
This commit also fixed one RepeatPad bug, when we RepeatPad
a not eaxct size fbo. We need to calculate the edge. The edge
should be 1.0 - half point, not 1.0.
Signed-off-by: Zhigang Gong <zhigang.gong@linux.intel.com>
commit 8656ddbbe7a38e5cd15e6d006bba19778e34e9e9
Author: Zhigang Gong <zhigang.gong@linux.intel.com>
Date: Fri Jun 15 08:46:24 2012 +0800
glamor_glyphs: Before get upload to cache flush is needed.
When we can't get a cache hit and have to evict one cache
entry to upload new picture, we need to flush the previous
buffer. Otherwise, we may get corrupt glyphs rendering result.
This is the reason why user-font-proxy may fail sometimes.
Signed-off-by: Zhigang Gong <zhigang.gong@linux.intel.com>
commit 016995334e6acfad41574a9270b716db98ec697f
Author: Zhigang Gong <zhigang.gong@linux.intel.com>
Date: Fri Jun 15 08:43:37 2012 +0800
copyarea: Cleanup the error handling logic.
Should use ok rather than mixed ok or ret.
Signed-off-by: Zhigang Gong <zhigang.gong@linux.intel.com>
commit b4a499b7db068117801770b7ab80416014822101
Author: Zhigang Gong <zhigang.gong@linux.intel.com>
Date: Tue Jun 12 18:21:10 2012 +0800
trapezoid: Fallback to sw-rasterize for largepixmap.
Signed-off-by: Zhigang Gong <zhigang.gong@linux.intel.com>
commit 8f31aed48ca9412f8f5df9c3d47d938c7c90bccb
Author: Junyan He <junyan.he@linux.intel.com>
Date: Tue Jun 5 03:21:03 2012 +0800
Use the direct render path for A1
Because when mask depth is 1, there is no Anti-Alias at all,
in this case, the directly render can work well and it is faseter.
Signed-off-by: Junyan He <junyan.he@linux.intel.com>
commit fa74a213ad175cb0920905a8011c62efdd348d45
Author: Junyan He <junyan.he@linux.intel.com>
Date: Mon Jun 4 07:52:05 2012 +0800
Add the trapezoid direct render logic
We firstly get the render area by clipping the trapezoid
with the clip rect, then split the clipped area into small
triangles and use the composite logic to generate the result
directly. This manner is fast but have the problem that
some implementation of GL do not implement the Anti-Alias
of triangles fill, so the edge sometimes has sawtooth. It is
not acceptable when use trapezoid to approximate circles and
wide lines.
Signed-off-by: Junyan He <junyan.he@linux.intel.com>
commit 5f1560c84aa386bb12dc6ec3daeb93e0f63c09c2
Author: Junyan He <junyan.he@linux.intel.com>
Date: Mon Jun 4 07:22:27 2012 +0800
Modilfy the composite logic to two phases
We seperate the composite to two phases, firstly to
select the shader according to source type and logic
op, setting the right parameters. Then we emit the
vertex array to generate the dest result.
The reason why we do this is that the shader may be
used to composite no only rect, trapezoid and triangle
render function can also use it to render triangles and
polygens. The old function glamor_composite_with_shader
do the whole two phases work and can not match the
new request.
Signed-off-by: Junyan He <junyan.he@linux.intel.com>
commit 0b0391765f3ca0192b00f4970c9453934d529397
Author: Junyan He <junyan.he@linux.intel.com>
Date: Mon Jun 4 03:18:40 2012 +0800
Add macro of vertex setting for triangle stripe
Add macro of vertex setting for triangle stripe draw,
and make the code clear.
Signed-off-by: Junyan He <junyan.he@linux.intel.com>
commit bd180be619c2ef469ca40cf95023340c59960540
Author: RobinHe <robinhe@robinhe-desktop.lan>
Date: Sat Jun 2 22:00:09 2012 +0800
Use shader to generate the temp trapezoid mask
The old manner of trapezoid render uses pixman to
generate a mask pixmap and upload it to the GPU.
This effect the performance. We now use shader to
generate the temp trapezoid mask to avoid the
uploading of this pixmap.
We implement a anti-alias manner in the shader
according to pixman, which will caculate the area
inside the trapezoid dividing total area for every
pixel and assign it to the alpha value of that pixel.
The pixman use a int-to-fix manner to approximate but
the shader use float, so the result may have some
difference.
Because the array in the shader has optimization problem,
we need to emit the vertex of every trapezoid every
time, which will effect the performance a lot. Need to
improve it.
Signed-off-by: Junyan He <junyan.he@linux.intel.com>
commit 6dd81c5939197eb51bc31ffbc3e6f359f2aad191
Author: RobinHe <robinhe@robinhe-desktop.lan>
Date: Sat Jun 2 21:52:25 2012 +0800
Create the file glamor_triangles.c
Create the file glamor_trapezoid.c, extract the logic
relating to trapezoid from glamor_render.c to this file.
Signed-off-by: Junyan He <junyan.he@linux.intel.com>
commit bf38ee407ba1038a25efa58b8475bcf084a21042
Author: Zhigang Gong <zhigang.gong@linux.intel.com>
Date: Mon Jun 11 14:02:59 2012 +0800
Enable large pixmap by default.
Signed-off-by: Zhigang Gong <zhigang.gong@linux.intel.com>
commit 8ca16754f7e95e47423183bbd5f72966b937f6c8
Author: Zhigang Gong <zhigang.gong@linux.intel.com>
Date: Mon Jun 11 13:05:48 2012 +0800
largepixmap: Fix the selfcopy issue.
If the source and destination are the same pixmap/fbo, and we
need to split the copy to small pieces. Then we do need to
consider the sequence of the small pieces when the copy area
has overlaps. This commit take the reverse/upsidedown into
the clipping function, thus it can generate correct sequence
and avoid corruption self copying.
Signed-off-by: Zhigang Gong <zhigang.gong@linux.intel.com>
commit 5325c800f706f46085735d608f57d513da63cddf
Author: Zhigang Gong <zhigang.gong@linux.intel.com>
Date: Mon Jun 11 11:42:46 2012 +0800
largepixmap: Support self composite for large pixmap.
The simplest way to support large pixmap's self compositing
is to just clone a pixmap private data structure, and change
the fbo and box to point to the correct postions. Don't need
to copy a new box.
Signed-off-by: Zhigang Gong <zhigang.gong@linux.intel.com>
commit 1d2d858b8daacdd349084433a8af60d559fb6a9d
Author: Zhigang Gong <zhigang.gong@linux.intel.com>
Date: Mon Jun 11 09:36:56 2012 +0800
largepixmap: Add transform/repeat/reflect/pad support.
This commit implement almost all the needed functions for
the large pixmap support. It's almost complete.
Signed-off-by: Zhigang Gong <zhigang.gong@linux.intel.com>
commit 48916a23a92366128f5a1eeb08949d8d32383c32
Author: Zhigang Gong <zhigang.gong@linux.intel.com>
Date: Mon Jun 11 02:27:00 2012 +0800
glamor_getimage: should call miGetimage if failed to get sub-image.
Signed-off-by: Zhigang Gong <zhigang.gong@linux.intel.com>
commit 56d6e7a85fbe8e50c38efda0f59f09aac52b769a
Author: Zhigang Gong <zhigang.gong@linux.intel.com>
Date: Mon Jun 11 02:24:41 2012 +0800
glamor_putimage: Correct the wrong stride value.
We should not use the destination pixmap's devkind as the input
image data's stride.
Signed-off-by: Zhigang Gong <zhigang.gong@linux.intel.com>
commit eb6f981ba4d3a4aff1b3651bdad3cd7a52233b41
Author: Zhigang Gong <zhigang.gong@linux.intel.com>
Date: Mon Jun 11 02:15:53 2012 +0800
largepixmap: Enable glamor_composite.
Now we start to enable glamor_composite on large pixmap.
We need to do a three layer clipping to split the dest/source/mask
to small pieces. This commit only support non-transformation and
repeat normal case.
Signed-off-by: Zhigang Gong <zhigang.gong@linux.intel.com>
commit e96ea02010874a3a46f212f42134083bd29fefe3
Author: Zhigang Gong <zhigang.gong@linux.intel.com>
Date: Mon Jun 11 01:52:14 2012 +0800
largepixmap: Implement infrastructure for large pixmap.
Added infrastructure for largepixmap, this commit implemented:
1. Create/Destroy large pixmap.
2. Upload/Download large pixmap.
3. Implement basic repeat normal support.
3. tile/fill/copyarea large pixmap get supported.
The most complicated part glamor_composite still not implemented.
Signed-off-by: Zhigang Gong <zhigang.gong@linux.intel.com>
commit ace35e408cd7a79c5215bbd0f14b624d8d949e34
Author: Zhigang Gong <zhigang.gong@linux.intel.com>
Date: Mon Jun 11 01:02:30 2012 +0800
glamor_largepixmap: first commit for large pixmap.
This is the first commit to add support for large pixmap.
The large here means a pixmap is larger than the texutre's
size limitation thus can't fit into one single texutre.
The previous implementation will simply fallback to use a
in memory pixmap to contain the large pixmap which is
very slow in practice.
The basic idea here is to use an array of texture to hold
the large pixmap. And when we need to get a specific area
of the pixmap, we just need to compute/clip the correct
region and find the corresponding fbo.
We need to implement some auxiliary routines to clip every
rendering operations into small pieces which can fit into
one texture.
The complex part is the transformation/repeat/repeatReflect
and repeat pad and their comination. We will support all of
them step by step.
This commit just add some necessary data structure to represent
the large pixmap, and doesn't change any rendering process.
This commit doesn't add real large pixmap support.
Signed-off-by: Zhigang Gong <zhigang.gong@linux.intel.com>
commit 4c174f4c9ce1514ef226e9de97e5c87a46a75524
Author: Junyan He <junyan.he@linux.intel.com>
Date: Tue May 15 10:08:03 2012 +0800
Fix the problem of x_source and y_source causing radial error
The x_source and y_source cause some problem in
gradient. The old way to handle it by recaulate P1 P2
to minus the x_source and y_source, but this causes
problem in radial shader. Now we modify the manner to
set the texture coordinates: (x_source, y_source) -->
(x_source + width, y_source + height) to handle all the
cases.
Reviewed-by: Zhigang Gong <zhigang.gong@linux.intel.com>
Signed-off-by: Junyan He <junyan.he@linux.intel.com>
Signed-off-by: Zhigang Gong <zhigang.gong@linux.intel.com>
commit 553910d08b93ef80cc25fcbfd7876726778bc655
Author: Junyan He <junyan.he@linux.intel.com>
Date: Tue May 15 10:07:55 2012 +0800
Fix the problem of vertical and horizontal case error in linear gradient.
1. The vertical and horizontal judgement in linear
gradient have problem when p1 point and p2 point
distance is very small but the gradient pict have a
transform matrix which will convert the X Y coordinates
to small values. So the judgement is not suitable.
Because this judgement's purpose is to assure the
divisor not to be zero, so we simply it to enter
horizontal judgement when p1 and p2's Y is same.
Vertical case is deleted. 2. Delete the unused p1 p2
uniform variable.
Reviewed-by: Zhigang Gong <zhigang.gong@linux.intel.com>
Signed-off-by: Junyan He <junyan.he@linux.intel.com>
Signed-off-by: Zhigang Gong <zhigang.gong@linux.intel.com>
commit 41aa93c393c8760aae357725db63fa4a8f798557
Author: Junyan He <junyan.he@linux.intel.com>
Date: Tue May 15 10:07:46 2012 +0800
Fix the problem of set the same stop several times.
Some gradient set the stops at the same position, for
example: firstly 0.5 to red color and then set 0.5 to
blue. This kind of setting will cause the shader work
not correctly because the percentage caculating need to
use the stop[i] - stop[i-1] as dividend. The previous
patch we just kill some stop if the distance between
them is 0. But this cause the problem that the color
for next stop is wrong. We now modify to handle it in
the shader to avoid the 0 as dividend.
Reviewed-by: Zhigang Gong <zhigang.gong@linux.intel.com>
Signed-off-by: Junyan He <junyan.he@linux.intel.com>
Signed-off-by: Zhigang Gong <zhigang.gong@linux.intel.com>
commit 09de37ec1c0543c8073f934274c84b3b7d5f31ae
Author: Junyan He <junyan.he@linux.intel.com>
Date: Tue May 15 10:07:35 2012 +0800
Fix a bugy macro definition.
The macro like "#define LINEAR_SMALL_STOPS 6 + 2" causes
the problem. When use it to define like "GLfloat
stop_colors_st[LINEAR_SMALL_STOPS*4];" The array is
small than what we supposed it to be. Cause memory
corruption problem and cause the bug of render wrong
result. Fix it.
Signed-off-by: Junyan He <junyan.he@linux.intel.com>
Signed-off-by: Zhigang Gong <zhigang.gong@linux.intel.com>
commit d900f553c2bb8d6e01529524fb7125918291c406
Author: Junyan He <junyan.he@linux.intel.com>
Date: Tue May 15 10:07:24 2012 +0800
Extract the gradient related code out.
1. Extract the logic of gradient from the glamor_render.c
to the file glamor_gradient.c.
2. Modify the logic of gradient pixmap gl draw. Use the
logic like composite before, but the gradient always just
have one rect to render, so no need to set the VB and EB,
replace it with just call glDrawArrays. 3.Kill all the
warning in glamor_render.c
Reviewed-by: Zhigang Gong<zhigang.gong@linux.intel.com>
Signed-off-by: Junyan He <junyan.he@linux.intel.com>
Signed-off-by: Zhigang Gong <zhigang.gong@linux.intel.com>
commit 81692804645394b43832c8ec586e8e67f3e4f606
Author: Zhigang Gong <zhigang.gong@linux.intel.com>
Date: Tue May 15 15:25:41 2012 +0800
glamor_set_destination_pixmap_priv_nc: set drawable's width x height.
Previous implementation set the whole fbo's width and height as the
viewpoint. This may increase the numerical error as we may only has
a partial region as the valid pixmap. So add a new marco
pixmap_priv_get_dest_scale to get proper scale factor for the
destination pixmap. For the source/mask pixmap, we still need to
consider the whole fbo's size.
Signed-off-by: Zhigang Gong <zhigang.gong@linux.intel.com>
commit 7f55e48499ea7bed73cb1adeac00c480263583f8
Author: Zhigang Gong <zhigang.gong@linux.intel.com>
Date: Tue May 15 10:52:37 2012 +0800
Remove the texture cache code.
Caching texture objects is not necessary based on previous testing.
To keep the code simple, we remove it.
Signed-off-by: Zhigang Gong <zhigang.gong@linux.intel.com>
commit c5b3c2cedc8b2e486b1e3727f288c42869310387
Author: Zhigang Gong <zhigang.gong@linux.intel.com>
Date: Tue May 15 10:42:41 2012 +0800
Added strict warning flags to CFLAGS.
We miss the strict warning flags for a long time, now add it back.
This commit also fixed most of the warnings after enable the strict
flags.
Signed-off-by: Zhigang Gong <zhigang.gong@linux.intel.com>
commit 6839996b0b0fe5f4e6ef28d1dfe527092d60d28a
Author: Zhigang Gong <zhigang.gong@linux.intel.com>
Date: Sat Apr 28 18:23:09 2012 +0800
We should not call gradient finalization code if we disable it.
Signed-off-by: Zhigang Gong <zhigang.gong@linux.intel.com>
commit 1035fc72b9017eb2466760133ca7bbc9155c8c46
Author: Zhigang Gong <zhigang.gong@linux.intel.com>
Date: Sat Apr 28 14:55:34 2012 +0800
Fixed all unused variables warnings.
Signed-off-by: Zhigang Gong <zhigang.gong@linux.intel.com>
commit 33e11cd6149294060269ed693de67b135868e094
Author: Zhigang Gong <zhigang.gong@linux.intel.com>
Date: Sat Apr 28 14:54:38 2012 +0800
Fixed an uninitialized problem at gradient shader functions.
Signed-off-by: Zhigang Gong <zhigang.gong@linux.intel.com>
commit c0f75c657f36642faea4ff8c51f7e4f6971c3d19
Author: Zhigang Gong <zhigang.gong@linux.intel.com>
Date: Sat Apr 28 14:51:27 2012 +0800
Fixed one typo bug when fixup a mask picture.
Signed-off-by: Zhigang Gong <zhigang.gong@linux.intel.com>
commit 5c1f15fac26b86b6cb73776db1a644d6af570da7
Author: Zhigang Gong <zhigang.gong@linux.intel.com>
Date: Sat Apr 28 14:13:47 2012 +0800
Added some copyright and author information.
Signed-off-by: Zhigang Gong <zhigang.gong@linux.intel.com>
commit 0d846d95699fadcddcc77b8d6e432e969467dab2
Author: Zhigang Gong <zhigang.gong@linux.intel.com>
Date: Sat Apr 28 13:43:39 2012 +0800
Added --enable-debug configuration option.
For release version, we disable asserts.
Signed-off-by: Zhigang Gong <zhigang.gong@linux.intel.com>
commit 503f8ec1a670e73f41314a5e94cdde8782d7cbab
Author: Zhigang Gong <zhigang.gong@linux.intel.com>
Date: Sat Apr 28 13:42:48 2012 +0800
Remove unecessary header file.
Signed-off-by: Zhigang Gong <zhigang.gong@linux.intel.com>
commit 9dfd10dc75efdf4c26b7ff46b55e4a2d2453803b
Author: Zhigang Gong <zhigang.gong@linux.intel.com>
Date: Fri Apr 27 15:34:15 2012 +0800
glamor_render: Fix the repeat none for GLES2.
As GLES2 doesn't support clamp to the border, we have to
handle it seprately from the normal case.
Signed-off-by: Zhigang Gong <zhigang.gong@linux.intel.com>
commit 9fcd123aed80430b220fc4141eaa3723d7cb611e
Author: Zhigang Gong <zhigang.gong@linux.intel.com>
Date: Thu Apr 26 20:35:09 2012 +0800
glamor_blockhandler: Don't do glFinish every time.
To do glfinish every time bring some performance overhead.
Signed-off-by: Zhigang Gong <zhigang.gong@linux.intel.com>
commit 1f83411c9a69a44944fd8afe0c167cece60c1ecb
Author: Zhigang Gong <zhigang.gong@linux.intel.com>
Date: Thu Apr 26 19:59:58 2012 +0800
glamor_copyarea: Return earlier if have zero nbox.
Almost all callers will check whether the regions is empty
before call to this internal API, but it seems the
glamor_composite_with_copy may call into here with a zero
nbox. A little weird, as the miComputeCompositeRegion return
a Non-NULL, but the region is empty.
Also remove a unecessary glflush.
So let's check it here.
Signed-off-by: Zhigang Gong <zhigang.gong@linux.intel.com>
commit 20cbaa61cdca41e61526a57f13475cb31e17e5dd
Author: Zhigang Gong <zhigang.gong@linux.intel.com>
Date: Thu Apr 26 19:57:21 2012 +0800
glamor_render: Have to use eaxct size pixmap for transformation.
Use partial texture as the pixmap for the transformation
source/mask may introduce extra errors. have to use
eaxct size.
Signed-off-by: Zhigang Gong <zhigang.gong@linux.intel.com>
commit 6e50ee9c108e6d7ce4ebfcd08cfc97896e8e194e
Author: Zhigang Gong <zhigang.gong@linux.intel.com>
Date: Thu Apr 26 18:31:07 2012 +0800
glamor_fbo: Added a threshold value for the fbo cache pool.
Currently set it to 256MB. If cache pool watermark increases
to this value, then don't push any fbo to this pool, will purge
the fbo directly.
Signed-off-by: Zhigang Gong <zhigang.gong@linux.intel.com>
commit 540846204cce9239233c5608a29bfe0607d77e44
Author: Zhigang Gong <zhigang.gong@linux.intel.com>
Date: Thu Apr 26 18:28:17 2012 +0800
Fixed a1 bug.
It seems that mesa has bugs when uploading bitmap to texture.
We switch to convert bitmap to a8 format and then upload the
a8 texture.
Also added a helper routine to dump 1bpp pixmap.
Signed-off-by: Zhigang Gong <zhigang.gong@linux.intel.com>
commit 9f53cc1c3369fc61630b238f1b347a92fabf5a5a
Author: Zhigang Gong <zhigang.gong@linux.intel.com>
Date: Wed Apr 25 22:35:12 2012 +0800
glamor_render.c: Fixed repeatPad and repeatRelect.
We should use difference calculation for these two repeat mode
when we are a sub region within one texture.
Signed-off-by: Zhigang Gong <zhigang.gong@linux.intel.com>
commit 67cf3838e4acd788b0ce413dcbe9896e2ca20e56
Author: Zhigang Gong <zhigang.gong@linux.intel.com>
Date: Wed Apr 25 19:50:57 2012 +0800
gradient: Don't need fixup flag when creating pixmap.
Gradient can use a larger texture/fbo directly, don't need
an eaxct size texture.
Signed-off-by: Zhigang Gong <zhigang.gong@linux.intel.com>
commit 8a85071edbd90780b286fa4b19205540fb276815
Author: Zhigang Gong <zhigang.gong@linux.intel.com>
Date: Wed Apr 25 18:58:16 2012 +0800
glamor_copyarea: Don't access a DRM only pixmap.
As EGL image/gbm only support ARGB8888 image, we don't support
other format. We may change the way to use gbm directly latter.
But now, we have to face this limitation, and thus if a client
create a 16bpp drawable, and call get texture from pixmap then
a copy to here may occur and thus we have to force retur a TRUE
without do nothing.
Signed-off-by: Zhigang Gong <zhigang.gong@linux.intel.com>
commit 0b6867dddbed186c46048c610299ac0dde6a9ef0
Author: Zhigang Gong <zhigang.gong@linux.intel.com>
Date: Wed Apr 25 13:54:40 2012 +0800
Disable A8 texture format for GLES2.
As PVR's GLES2 implementation doesn't support A8 texture as
rendering target, we disable it for now.
Signed-off-by: Zhigang Gong <zhigang.gong@linux.intel.com>
commit 6b664dda69afa6c47ca083739093fa15fc674380
Author: Zhigang Gong <zhigang.gong@linux.intel.com>
Date: Wed Apr 25 13:51:58 2012 +0800
gradient: Disable gradient for gles2.
As PVR glsl compiler seems doesn't support external fragment
function, and fails at compile gradient shader. Disable it
for now. We may need to modify gradient shader to don't use
external function.
Signed-off-by: Zhigang Gong <zhigang.gong@linux.intel.com>
commit 686a322c76fa20ed45d5bbfc9742024300e83e7d
Author: Junyan He <junyan.he@linux.intel.com>
Date: Wed Apr 18 08:04:26 2012 +0800
Fix the bug caused by gradient picture set the stops at the same percentage.
Fix the bug caused by gradient picture set the stops at
the same percentage. The (stops[i] - stops[i-1]) will
be used as divisor in the shader, which will cause
problem. We just keep the later one if stops[i] ==
stops[i-1].
Signed-off-by: Junyan He <junyan.he@linux.intel.com>
Signed-off-by: Zhigang Gong <zhigang.gong@linux.intel.com>
commit 3d96929596fd3a6da41aab5cb9d7fb1cf28b2a03
Author: Junyan He <junyan.he@linux.intel.com>
Date: Wed Apr 25 14:25:39 2012 +0800
Fix the problem of memory leak in gradient pixmap generating.
Fix the problem of memory leak in gradient pixmap
generating. The problem caused by we do not call
glDeleteShader when destroy a shader program. This patch
will split the gradient pixmap generating to three
category. If nstops < 6, we will use the no array version
of the shader, which has the best performance. Else if
nstops < 16, we use array version of the shader, which is
compiled and linked at screen init stage. Else if nstops >
16, we dynamically create a new shader program, and this
program will be cached until bigger nstops.
Signed-off-by: Zhigang Gong <zhigang.gong@linux.intel.com>
commit 05da99106b81465488c9879cfd709fd4f0c7b9e5
Author: Zhigang Gong <zhigang.gong@linux.intel.com>
Date: Wed Apr 25 11:59:47 2012 +0800
glamor_putimage: Optimize for direct uploading and fallback path.
This commit optimize two cases:
1. When the clip contains the whole area, we can directly upload
the texel data to the pixmap, and don't need to do one extra
clipped copy.
2. At fallback path, we don't read back the whole pixmap, just
need a sub region.
Signed-off-by: Zhigang Gong <zhigang.gong@linux.intel.com>
commit ea70ebe0ac9fe5b3d0ad553f9aeb4d2829bf9a62
Author: Zhigang Gong <zhigang.gong@linux.intel.com>
Date: Wed Apr 25 11:56:43 2012 +0800
Fixed one potential texture size mismatch problem.
There are two cases which we may use a wrong texture size.
1. A pixmap is modified by the client side after it created
it. Then the pixmap's width may mismatch the original fbo/tex's
size. Thus we need to check this condition when preparing
upload the pixmap.
2. We provide two API to download/upload sub region of a
textured pixmap. The caller may pass in a larger width then
the original pixmap's size, this may happen at putimage
and setspans. We need to validate the width and height
when do the downloading/uploading.
Signed-off-by: Zhigang Gong <zhigang.gong@linux.intel.com>
commit 08e8c00fe6a21741ff9f38652c2b9fd2310f1ce5
Author: Zhigang Gong <zhigang.gong@linux.intel.com>
Date: Wed Apr 25 09:27:06 2012 +0800
glamor_getimage: Don't fallback to miGetImage.
As miGetImage is very inefficient, we don't fallback to it.
If the format is not ZPixmap, we download the required sub-
region, and then call fbGetImage to do the conversion.
This way is much faster than previous.
Signed-off-by: Zhigang Gong <zhigang.gong@linux.intel.com>
commit 9bcddff93b79fd8978426d9832a5edd60ac410c0
Author: Zhigang Gong <zhigang.gong@linux.intel.com>
Date: Fri Apr 13 18:15:49 2012 +0800
pending_op: Remove the pending operations handling.
We have disabled this feature for a long time, and previous
testing shows that this(pending fill) will not bring observed
performance gain. Now remove it.
Signed-off-by: Zhigang Gong <zhigang.gong@linux.intel.com>
commit 1761768f49a356f50645da53305e6b4bdef5c5f4
Author: Zhigang Gong <zhigang.gong@linux.intel.com>
Date: Sun Apr 15 23:50:09 2012 +0800
glamor_upload_pixmap: Use glTexImage2D for a fully update.
Currently, intel's mesa dri driver will not check pbo for
a TexSubImage2D. So we use glTexImage2D if we are a fully
updating.
Signed-off-by: Zhigang Gong <zhigang.gong@linux.intel.com>
commit 2806f1eaced851e4c88055c53d706f7beef8b555
Author: Zhigang Gong <zhigang.gong@linux.intel.com>
Date: Sun Apr 15 23:49:38 2012 +0800
glamor_setspans: Reuse glamor_upload_sub_pixmap.
Signed-off-by: Zhigang Gong <zhigang.gong@linux.intel.com>
commit e15bc1207480d7d198862861d40af58903b4d0f0
Author: Zhigang Gong <zhigang.gong@linux.intel.com>
Date: Sun Apr 15 23:18:47 2012 +0800
code clean up.
Remove unused variables.
Signed-off-by: Zhigang Gong <zhigang.gong@linux.intel.com>
commit 65c5605c9693c8d30e597ac029be936495f23927
Author: Zhigang Gong <zhigang.gong@linux.intel.com>
Date: Sun Apr 15 23:16:51 2012 +0800
glamor_getspans: Reuse glamor_download_sub_pixmap.
Signed-off-by: Zhigang Gong <zhigang.gong@linux.intel.com>
commit 68a5cc6f371e1f07ce176e154331dafaf5d9ef0e
Author: Zhigang Gong <zhigang.gong@linux.intel.com>
Date: Sun Apr 15 19:46:09 2012 +0800
glamor_render: Don't download whole picture when fallback.
Signed-off-by: Zhigang Gong <zhigang.gong@linux.intel.com>
commit e38eb675321dce1bbc39cbd177a6398de567dd79
Author: Zhigang Gong <zhigang.gong@linux.intel.com>
Date: Sun Apr 15 19:43:44 2012 +0800
glamor_put_sub_pixmap: Change to use glamor_upload_sub_pixmap.
As the pixmap may be attached to a picture, we need to use
glamor_upload_sub_pixmap to process it. glamor_copy_n_to_n
will not consider the picture case.
Signed-off-by: Zhigang Gong <zhigang.gong@linux.intel.com>
commit ff3d2c796363ea603ab92995091a967a3f8636d7
Author: Zhigang Gong <zhigang.gong@linux.intel.com>
Date: Sun Apr 15 17:09:06 2012 +0800
Fixed a stride problem for textured_drm pixmap.
As a textured_drm pixmap has a drm bo attached to it, and
it's the DDX layer to set it stride value. In some case,
the stride value is not equal to PixmapBytePad(w, depth)
which is used within glamor.
Then if it is the case, we have two choice, one is to set
the GL_PACK_ROW_LENGTH/GL_UNPACK_ROW_LENGTH when we need
to download or upload the pixmap. The other option is to
change the pixmap's devKind to match the one glamor is using
when downloading the pixmap, and restore it to the drm stride
after uploading the pixmap.
We choose the 2nd option, as GLES doesn't support the first
method.
Signed-off-by: Zhigang Gong <zhigang.gong@linux.intel.com>
commit 70b71718e737872dfdbf4f6c7285d4260a099d17
Author: Zhigang Gong <zhigang.gong@linux.intel.com>
Date: Sun Apr 15 14:36:09 2012 +0800
glamor_putimage: Reuse copy area to do the clipped copy.
If no clip set, we load the bits to the pixmap directly.
Otherwise, load the bits to a temporary pixmap and call
glamor_copy_area to do the clipped copy.
Signed-off-by: Zhigang Gong <zhigang.gong@linux.intel.com>
commit e1be714312df8d596f6be268cb8a4e390e634c36
Author: Zhigang Gong <zhigang.gong@linux.intel.com>
Date: Sun Apr 15 10:30:02 2012 +0800
Fixed a unbalanced glamor_put_dispatch.
Signed-off-by: Zhigang Gong <zhigang.gong@linux.intel.com>
commit bd53e24dc32206dc978d3dc2408e1832f5a803e7
Author: Zhigang Gong <zhigang.gong@linux.intel.com>
Date: Sun Apr 15 22:47:48 2012 +0800
glamor_pixmap_priv: Always return a valid private pixmap.
If a pixmap doesn't have a private, then set its type to
GLAMOR_MEMORY, and thus it will get a valid private.
Signed-off-by: Zhigang Gong <zhigang.gong@linux.intel.com>
commit 420af44a3aaefd4848aa24a28c330cab36049078
Author: Zhigang Gong <zhigang.gong@linux.intel.com>
Date: Sat Apr 14 22:40:48 2012 +0800
Don't need to set GL_PACK_ROW_LENGTH/GL_UNPACK_ROW_LENGTH.
We already adjust the stride of the pixmap, and keep the alignment
as 4 should be ok to let the GL/GLES match the stride.
Previous version has a unbalanced PACK ROW length seting, and is
buggy, now fixed it.
Signed-off-by: Zhigang Gong <zhigang.gong@linux.intel.com>
commit 18d69fb0142088f7df230ec876c7ce2b55a41ad9
Author: Zhigang Gong <zhigang.gong@linux.intel.com>
Date: Fri Apr 13 13:47:05 2012 +0800
glamor_gl: Use GL_ALPHA for depth 8 pixmap.
Use GL_RGBA to represent a8 pixmap is not efficient.
Signed-off-by: Zhigang Gong <zhigang.gong@linux.intel.com>
commit 428f2a3f58a91300835aaa083ac0b291ce394dd0
Author: Zhigang Gong <zhigang.gong@linux.intel.com>
Date: Fri Apr 13 13:45:42 2012 +0800
glamor_pixmap_ensure_fbo: Should allocate tex if we don't have one.
Signed-off-by: Zhigang Gong <zhigang.gong@linux.intel.com>
commit cf0e206a0ff6538eb286c06098023b9e29b00c74
Author: Zhigang Gong <zhigang.gong@linux.intel.com>
Date: Wed Apr 11 18:59:27 2012 +0800
glamor_polylines: Don't fallback for non-solid fill.
As glamor_fill/fbFill will handle non-solid fill correctly.
We don't fallback it here.
Signed-off-by: Zhigang Gong <zhigang.gong@linux.intel.com>
commit b5bd9a2d902d44834fc43199167d7dee71c9b709
Author: Zhigang Gong <zhigang.gong@linux.intel.com>
Date: Wed Apr 11 18:57:33 2012 +0800
glamor_upload/download: fix 1bpp bug.
For A1 to A8's conversion, the stride is different for the
source and destination. Previous implementation use the same
stride, and may allocate less memory than required. Thus may
crash the server when uploading a A1 pixmap. Now fix it.
Tested-by: Peng Li <peng.li@intel.com>
Signed-off-by: Zhigang Gong <zhigang.gong@linux.intel.com>
commit b0e91f0f5a3a4f74800b89ed4003d300ae138151
Author: Zhigang Gong <zhigang.gong@linux.intel.com>
Date: Tue Apr 10 20:50:14 2012 +0800
glamor_pixmap_upload_texture: Support to upload a sub region of data.
Just as the downloading side, we can upload an sub region data to
a pixmap's specified region. The data could be in memory or in a
pbo buffer.
Signed-off-by: Zhigang Gong <zhigang.gong@linux.intel.com>
commit 3061f348ca2f05d88ca2391e1ad81ce8216d69f2
Author: Zhigang Gong <zhigang.gong@linux.intel.com>
Date: Tue Apr 10 10:40:17 2012 +0800
glamor_getimage: Use glamor_download_sub_pixmap_to_cpu to get image.
Reduce the duplicate logic.
Signed-off-by: Zhigang Gong <zhigang.gong@linux.intel.com>
commit 3a91f169122ea0556f628f11fb473b0feed7e44b
Author: Zhigang Gong <zhigang.gong@linux.intel.com>
Date: Tue Apr 10 10:19:30 2012 +0800
glamor_polyfillrect: Fixed a potential bug if fallback at glamor_fill.
We should advance the prect after we successfully excuted the
glamor_fill. And if failed, we need to add the failed 1 box
back to nbox.
Although, this bug will never happen currently, as glamor_fill
will never fallback.
Signed-off-by: Zhigang Gong <zhigang.gong@linux.intel.com>
commit 1f657f72cacaa1170e7e55f4b5149c69492db6a5
Author: Zhigang Gong <zhigang.gong@linux.intel.com>
Date: Mon Apr 9 20:20:45 2012 +0800
glamor_polyfillrect: Optimize fallback path.
Download/upload required region only.
Signed-off-by: Zhigang Gong <zhigang.gong@linux.intel.com>
commit cea0fe3e1f49fc8d86f0cc653c8089f1ea2c9f1f
Author: Zhigang Gong <zhigang.gong@linux.intel.com>
Date: Mon Apr 9 20:16:07 2012 +0800
fallback_optimize: Prepare for downloading/uploading subregion.
Introduced two function glamor_get_sub_pixmap/glamor_put_sub_pixmap,
can easily used to get and put sub region of a big textured pixmap.
And it can use pbo if possible.
To support download a big textured pixmap's sub region to another
pixmap's pbo, we introduce a new type of pixmap GLAMOR_MEMORY_MAP.
This type of pixmap has a valid devPrivate.ptr pointer, and that
pointer points to a pbo mapped address.
Now, we are ready to refine those
glamor_prepare_access/glamor_finish_access pairs.
Signed-off-by: Zhigang Gong <zhigang.gong@linux.intel.com>
commit d9dfc3d795b7e567d53cfeed61126164be36e233
Author: Zhigang Gong <zhigang.gong@linux.intel.com>
Date: Mon Apr 9 16:39:42 2012 +0800
glamor_download_sub_pixmap_to_cpu: New function to download subregion.
Prepare to optimize the fallback path. We choose the important
rendering pathes to optimzie it by using shader. For other pathes,
we have to fallback. We may continue to optimize more pathes in
the future, but now we have to face those fallbacks.
The original fallback is very slow and will download/upload the whole
pixmap. From this commit, I will refine it to just download/upload
needed part.
Signed-off-by: Zhigang Gong <zhigang.gong@linux.intel.com>
commit d96226ac6f34aa61fc00ad15ef58c1ed1253160e
Author: Zhigang Gong <zhigang.gong@linux.intel.com>
Date: Mon Apr 9 15:57:05 2012 +0800
glamor_es2_pixmap_read_prepare: Just prepare the required region.
Don't need to prepare the whole source pixmap.
Signed-off-by: Zhigang Gong <zhigang.gong@linux.intel.com>
commit 3dbdd40c6ce4203619f2a3492029a444bb9217af
Author: Zhigang Gong <zhigang.gong@linux.intel.com>
Date: Mon Apr 9 10:00:57 2012 +0800
glamor_color_convert: Let the caller to provide destination buffer.
As we don't need to allocate new buffer when downloading pixmap
to CPU, we change the prototype of the color converting function
and let the caller to provide the buffer to hold the result.
All the color conversion function supports store the result
just at the same place of the source.
Signed-off-by: Zhigang Gong <zhigang.gong@linux.intel.com>
commit 4dc6d4e84b4904540d7701cfc88a9c945464f833
Author: Zhigang Gong <zhigang.gong@linux.intel.com>
Date: Fri Apr 6 21:20:15 2012 +0800
glyphblt/polyops: Use miFunctions by default.
Calling to miFunctions give some opportunities to jump to
accelerated path, so we switch to call miFunctions rather
than fallback to fbFunctions directly.
commit 49e3b44aa813c98c05fcb10c19882e10d751580a
Author: Zhigang Gong <zhigang.gong@linux.intel.com>
Date: Fri Apr 6 21:17:46 2012 +0800
glamor_set_alu: Added GXclear support at glamor_solid.
We don't need to issue the glamor_fallback at the glamor_set_alu
routine, as the caller may support GXclear or other most frequent
Ops. Leave it to the caller to determine fallback or not.
Signed-off-by: Zhigang Gong <zhigang.gong@linux.intel.com>
commit 3b8b2c77fc4449c7b63fd2597f73562b33dc1722
Author: Zhigang Gong <zhigang.gong@linux.intel.com>
Date: Fri Apr 6 21:15:12 2012 +0800
getimage: Enable getimage by default.
Fixed one bug when calculate the coords, should consider the
drawable's x and y. Now enable it by default. Most of the time,
it should be more efficient than miGetImage.
Signed-off-by: Zhigang Gong <zhigang.gong@linux.intel.com>
commit c6ce44d88134115b42edc76e1ee961b57bae86ff
Author: Zhigang Gong <zhigang.gong@linux.intel.com>
Date: Fri Apr 6 17:01:57 2012 +0800
render: Enable more componentAlpha support.
Actually only PictOpAtop,PictOpAtopReverse and PictOpXor
can't be implemented by using single source blending.
All the other can be easily support. Slightly change
the code to support them. Consider those three Ops
are not frequenly used in real application. We simply
fallback them currently.
PictOpAtop: s*mask*dst.a + (1 - s.a*mask)*dst
PictOpAtopReverse: s*mask*(1 - dst.a) + dst *s.a*mask
PictOpXor: s*mask*(1 - dst.a) + dst * (1 - s.a*mask)
The two oprands in the above three ops are all reated to dst and
the blend factors are not constant (0 or 1), it's hardly to
convert it to single source blend.
Now, the rendercheck is runing more smoothly.
Signed-off-by: Zhigang Gong <zhigang.gong@linux.intel.com>
commit 3e9c35bdcbdb96a67c9f2a1ea76c382aaacca7e9
Author: Zhigang Gong <zhigang.gong@linux.intel.com>
Date: Fri Apr 6 11:02:36 2012 +0800
glamor_set_alu: Fallback for non GXcopy ops with GLES2.
As GLES2 doesn't support LogiOps, we have to fallback
here. GLES2 programing guide's statement is as below:
"In addition, LogicOp is removed as it is very
infrequently used by applications and the OpenGL ES
working group did not get requests from independent
software vendors (ISVs) to support this feature in
OpenGL ES 2.0."
So, I think, fallback here may not a big deal ;).
Signed-off-by: Zhigang Gong <zhigang.gong@linux.intel.com>
commit 1a238e89f39fd5aeaf6975399971123cd3e15f24
Author: Zhigang Gong <zhigang.gong@linux.intel.com>
Date: Thu Apr 5 22:39:41 2012 +0800
glamor_putimage: Reuse the function in pixmap.c to do the uploading.
We reuse glamor_upload_bits_to_pixmap_texture to do the
data uploading to texture in putimage. Besides to avoid
duplicate code, this also fixed the potential problem
when the data format need extra reversion which is not
supported by the finish shader, as
glamor_upload_bits_to_pixmap_texture will handle all
conditions.
Tested-by: Junyan He <junyan.he@linux.intel.com>
Signed-off-by: Zhigang Gong <zhigang.gong@linux.intel.com>
commit 0650c7d4be6d4c21510c953543599aea32780f24
Author: Zhigang Gong <zhigang.gong@linux.intel.com>
Date: Thu Apr 5 22:31:44 2012 +0800
gles2: Added 1555/2101010 formats support.
Added color conversion code to support 1555/2101010
formats,now gles2 can pass the render check with all
formats.
We use 5551 to represent 1555, and do the revertion
if downloading/uploading is needed.
For 2101010, as gles2 doesn't support reading the
identical formats. We have to use 8888 to represent,
thus we may introduce some accurate problem. But anyway,
we can pass the error checking in render check, so that
may not be a big problem.
Signed-off-by: Zhigang Gong <zhigang.gong@linux.intel.com>
commit 3add3750658107bd18592a8672caa8bed0c8931c
Author: Zhigang Gong <zhigang.gong@linux.intel.com>
Date: Thu Apr 5 21:53:44 2012 +0800
gles2: Fixed color conversion for the formats except 1555 and 2101010.
This patch fixed two major problems when we do the color convesion with
GLES2.
1. lack of necessary formats in FBO pool.
GLES2 has three different possible texture formats, GL_RGBA,
GL_BGRA and GL_ALPHA. Previous implementation only has one bucket
for all the three formats which may reuse a incorrect texture format
when do the cache lookup. After this fix, we can enable fbo safely
when running with GLES2.
2. Refine the format matching method in
glamor_get_tex_format_type_from_pictformat.
If both revertion and swap_rb are needed, for example use GL_RGBA
to represent PICT_b8g8r8a8. Then the downloading and uploading should
be handled differently.
The picture's format is PICT_b8g8r8a8,
Then the expecting color layout is as below (little endian):
0 1 2 3 : address
a r g b
Now the in GLES2 the supported color format is GL_RGBA, type is
GL_UNSIGNED_TYPE, then we need to shuffle the fragment
color as :
frag_color = sample(texture).argb;
before we use glReadPixel to get it back.
For the uploading process, the shuffle is a revert shuffle.
We still use GL_RGBA, GL_UNSIGNED_BYTE to upload the color
to a texture, then let's see
0 1 2 3 : address
a r g b : correct colors
R G B A : GL_RGBA with GL_UNSIGNED_BYTE
Now we need to shuffle again, the mapping rule is
r = G, g = B, b = A, a = R. Then the uploading shuffle is as
below:
frag_color = sample(texture).gbar;
After this commit, gles2 version can pass render check with all
the formats except those 1555/2101010.
Signed-off-by: Zhigang Gong <zhigang.gong@linux.intel.com>
commit 55fdc7b196904a4e537f429d06d36081a0c9a60d
Author: Zhigang Gong <zhigang.gong@linux.intel.com>
Date: Thu Apr 5 20:27:35 2012 +0800
glamor_utils: Added debug function to dump depth 15/16 pixmap.
Signed-off-by: Zhigang Gong <zhigang.gong@linux.intel.com>
commit 57e29ebdc13d0ef145e4c70c1406af3229a92ad8
Author: Zhigang Gong <zhigang.gong@linux.intel.com>
Date: Fri Apr 6 11:14:21 2012 +0800
glamor_render: Disable gradient shader conversion due to bug.
I found when enable the gradient shader, the firefox's tab's
background has incorrect rendering result.
Need furthr investigation, for now, just disable it.
Signed-off-by: Zhigang Gong <zhigang.gong@linux.intel.com>
commit 7036cfdd0d29f4e13d432893a4f386cd3d632de7
Author: Zhigang Gong <zhigang.gong@linux.intel.com>
Date: Fri Mar 16 16:42:46 2012 +0800
glamor_fbo: Added one macro to disable fbo cache.
Signed-off-by: Zhigang Gong <zhigang.gong@linux.intel.com>
commit 94186db527b33b2623eb26a7f1ae0c4c0fca66a4
Author: Zhigang Gong <zhigang.gong@linux.intel.com>
Date: Mon Mar 26 19:03:20 2012 +0800
glamor_fill: Should restore alu to GXcopy.
Signed-off-by: Zhigang Gong <zhigang.gong@linux.intel.com>
commit 1f4486c10bb2201830af251eede8cc4dbb857953
Author: Junyan He <junyan.he@linux.intel.com>
Date: Fri Mar 23 04:06:06 2012 +0800
Add the feature for radial gradient using shader.
Add the feature for radial gradient using shader. The
transform matrix and the 4 type of repeat mode are
supported. Less than 2/255 difference for every color
component comparing to pixman's result. Extract the
common logic of linear and radial's to another shader.
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Reviewed-by: Zhigang Gong <zhigang.gong@linux.intel.com>
Signed-off-by: Zhigang Gong <zhigang.gong@linux.intel.com>
commit 1026327cdc90bc0c801a493b7b76b3efc5f33fe2
Author: Junyan He <junyan.he@linux.intel.com>
Date: Fri Mar 23 04:05:56 2012 +0800
Add the feature of generating linear gradient picture by using shader.
Add the feature of generating linear gradient picture
by using shader. This logic will replace the original
linear gradient picture generating manner in glamor
which firstly use pixman and then upload it to GPU.
Compare it to the result generated by pixman, the
difference of each color component of each pixel is
normally 0, sometimes 1/255, and 2/255 at most. The
pixman use fixed-point but shader use float-point, so may have
difference. The feature of transform matrix and 4 types
of repeat modes have been supported. The array usage in
shader seems slow, so use 8 uniform variables to avoid
using array when stops number is not very big. This
make code look verbose but the performance improved a
lot.
We still have slightly performance regression compare to
original pixman version. There are one further optimization
opportunity which is to merge the gradient pixmap generation
and the latter compositing into one shader, then we don't need
to generate the extra texture, we can use the gradient value
directly at the compositing shader. Hope that can beat pixman
version. Will do that latter.
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Reviewed-by: Zhigang Gong <zhigang.gong@linux.intel.com>
Signed-off-by: Zhigang Gong <zhigang.gong@linux.intel.com>
commit ccf5d7f52bae664f90d2c33c9fcff099a820575f
Author: Junyan He <junyan.he@linux.intel.com>
Date: Fri Mar 23 04:05:48 2012 +0800
Prepare for modification of gradient using shader.
Prepare for modification of gradient using shader. The
gradient pixmaps now is generated by pixman and we will
replace them with shader. Add structure fields and
dispatch functions which will be needed. Some auxiliary
macro for vertex convert.
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Reviewed-by: Zhigang Gong <zhigang.gong@linux.intel.com>
Signed-off-by: Zhigang Gong <zhigang.gong@linux.intel.com>
commit a57bf66d492a0eec7b1f2a08b2f424835694e3fb
Author: Junyan He <junyan.he@linux.intel.com>
Date: Mon Mar 26 13:51:13 2012 +0800
glamor_utils: Add some assistant functions to compare pixmaps/pictures.
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Reviewed-by: Zhigang Gong <zhigang.gong@linux.intel.com>
Signed-off-by: Zhigang Gong <zhigang.gong@linux.intel.com>
commit cd75e85ff36827b8438d965750faab0615d01e86
Author: Junyan He <junyan.he@linux.intel.com>
Date: Mon Mar 5 08:24:20 2012 +0800
Fixup For list.h change in xorg
Because the file list.h in xorg/include has changed the
functions and struct names, adding xorg_ prefix before
the original name. So Modify glamor_screen_private
struct and the code which use list's functions in
glamor_fbo.c. We hack at glamor_priv.h avoid the
compile error when using old version xserver header
file.
Signed-off-by: Junyan He <junyan.he@linux.intel.com>
commit 213285f2b8c6578e01783a77d954ccc3ec313663
Author: Zhigang Gong <zhigang.gong@linux.intel.com>
Date: Fri Feb 17 16:56:05 2012 +0800
For DRI swap buffers.
This commit added two APIs to support the DRI swap buffer.
one is glamor_egl_exchange_buffers() which can swap two
pixmaps' underlying KHRimages/fbos/texs. The DDX layer should
exchange the DRM bos to make them consistent to each other.
Another API is glamor_egl_create_textured_screen_ext(), which
extent one more parameters to track the DDX layer's back pixmap
pointer. This is for the triple buffer support. When using triple
buffer, the DDX layer will keep a back pixmap rather then the
front pixmap and the pixmap used by the DRI2 client. And during
the closing screen stage, we have to dereference all the back
pixmap's glamor resources. Thus we have to extent this API to
register it when create new screen.
Signed-off-by: Zhigang Gong <zhigang.gong@linux.intel.com>
commit 8012b030c3144b02af036107179c5b4c94567292
Author: Zhigang Gong <zhigang.gong@linux.intel.com>
Date: Fri Feb 17 16:26:59 2012 +0800
glamor_copyarea: Don't use GL_CLAMP_TO_BORDER when GLES2 enabled.
We may need to modify all the shader to handle GL_CLAMP_TO_BORDER
when using GLES2. XXX, for now, we just ignore them.
Signed-off-by: Zhigang Gong <zhigang.gong@linux.intel.com>
commit 5ccf721d386a62f411d77bbc9a142e0c395162b3
Author: Zhigang Gong <zhigang.gong@linux.intel.com>
Date: Tue Feb 14 17:39:11 2012 +0800
glamor_fbo: Fix a bug when create No gl FBO pixmap.
Need to get format before goto create a new fbo.
Signed-off-by: Zhigang Gong <zhigang.gong@linux.intel.com>
commit ce634e84d4bb559f01203653c5ffd6397f4b0366
Author: Zhigang Gong <zhigang.gong@linux.intel.com>
Date: Sun Feb 12 09:18:51 2012 +0800
glamor_render: Only recalculate texture for repeat case.
Slightly optimize the fragment shader, as if we are not
repeat case and not exceed the valid texture range, then
we don't need to recalculate the coords.
Signed-off-by: Zhigang Gong <zhigang.gong@linux.intel.com>
commit 53387728ddc0c871821b68d728bb5f96a53ba227
Author: Zhigang Gong <zhigang.gong@linux.intel.com>
Date: Fri Feb 10 17:40:37 2012 +0800
glamor_tile/composite: Modify fs to re-calculate texture coords.
Then we don't need to fixup the larger pixmap to the exact
size, just need to let the shader to re-calculate the correct
texture coords.
Signed-off-by: Zhigang Gong <zhigang.gong@linux.intel.com>
commit 556adfa6b90f4c1ef12635cf78fa0bba046cf123
Author: Chris Wilson <chris@chris-wilson.co.uk>
Date: Fri Feb 10 12:54:44 2012 +0000
Fixup glx support
Renaming glamor_priv->dispatch and wrapping the access to
the dispatch table with a function that also ensured the
context was bound.
dispatch = glamor_get_dispatch(glamor_priv);
...
glamor_put_dispatch(glamor_priv);
So that we catch all places where we attempt to call into GL withouta
context. As an optimisation we can then do glamor_get_context();
glamor_put_context() around the rendering entry points to reduce the
frequency of having to restore the old context. (Along with allowing
the context to be recursively acquired and making the old context part of
the glamor_egl state.)
Reviewed-by: Zhigang Gong <zhigang.gong@linux.intel.com>
Signed-off-by: Zhigang Gong <zhigang.gong@linux.intel.com>
commit 430bc16ca03b3ea00255a4045c8e9fd11aea95ad
Author: Zhigang Gong <zhigang.gong@linux.intel.com>
Date: Fri Feb 10 16:04:07 2012 +0800
GLX: Enable glx support.
If we are using MESA as our GL library, then both xserver's
GLX and glamor are link to the same library. As xserver's
GLX has its own _glapi_get/set_context/dispatch etc, and it
is a simplified version derived from mesa thus is not
sufficient for mesa/egl's dri loader which is used by glamor.
Then if glx module is loaded before glamoregl module, the
initialization of mesa/egl/opengl will not be correct, and
will fail at a very early stage, most likely fail to map
the element buffer.
Two methodis to fix this problem, first is to modify the xserver's
glx's glapi.c to fit mesa's requirement. The second is to put
a glamor.conf as below, to the system's xorg.conf path.
Section "Module"
Load "glamoregl"
EndSection
Then glamor will be loaded firstly, and the mesa's libglapi.so
will be used. As current xserver's dispatch table is the same
as mesa's, then the glx's dri loader can work without problem.
We took the second method as it don't need any change to xorg.:)
Although this is not a graceful implementation as it depends
on the xserver's dispatch table and the mesa's dispatch table
is the same and the context set and get is using the same method.
Anyway it works.
As by default, xserver will enable GLX_USE_TLS. But mesa will not
enable it, you may need to enable that when build mesa.
Three pre-requirements to make this glamor version work:
0. Make sure xserver has commit 66e603, if not please pull the latest
master branch.
1. Rebuild mesa by enable GLX_USE_TLS.
2. Put the glamor.conf to your system's xorg.conf path and make sure
it loaded prior to glx module.
Preliminary testing shows indirect glxgears works fine.
If user want to use GLES2 for glamor by using MESA, GLX will not
work correctly.
If you are not using normal MESA, for example PVR's private GLES
implementation, then it should be ok to use GLES2 glamor and the
GLX should work as expected. In this commit, I use gbm to check
whether we are using MESA or non-mesa. Maybe not the best way.
Signed-off-by: Zhigang Gong <zhigang.gong@linux.intel.com>
commit 0a8fb8563f3cecf2019d3a35d5a61ec2b3a069cd
Author: Zhigang Gong <zhigang.gong@linux.intel.com>
Date: Fri Feb 10 15:34:43 2012 +0800
glamor_pixmap: Should bind unpack buffer to 0 after the uploading.
Signed-off-by: Zhigang Gong <zhigang.gong@linux.intel.com>
commit e03ad27dfb885e58298e1fd2accac0b6ad409fce
Author: Zhigang Gong <zhigang.gong@linux.intel.com>
Date: Sat Feb 11 07:37:17 2012 +0800
glamor_picture: Fix the wrong order of header file.
Signed-off-by: Zhigang Gong <zhigang.gong@linux.intel.com>
commit bf24c2c06870dc38b21795f4f6fc51b053134181
Author: Zhigang Gong <zhigang.gong@linux.intel.com>
Date: Fri Feb 3 11:46:01 2012 +0800
glamor_dump_pixmap: Add helper routine to dump pixmap.
For debug purpose only to dump the pixmap's content.
As this function will call glamor_prepare_access/glamor_finish_access
internally. Please use it carefully.
Signed-off-by: Zhigang Gong <zhigang.gong@linux.intel.com>
commit 91891b3711b1fe1402bb7742c20e976fab63c6fe
Author: Zhigang Gong <zhigang.gong@linux.intel.com>
Date: Fri Feb 3 11:44:51 2012 +0800
glamor_fill/tile: Fixed a tileX/tileY calculation bug.
The previous's calculation is incorrect, now fix it and then
we don't need to fallback at glamor_tile.
Signed-off-by: Zhigang Gong <zhigang.gong@linux.intel.com>
Tested-by: Peng Li <peng.li@intel.com>
commit 39d9e6c693a4c3ad12c6569f1fd56e0a87b164d2
Author: Zhigang Gong <zhigang.gong@linux.intel.com>
Date: Fri Feb 3 11:21:37 2012 +0800
prepare_access: Don't use fbo after it was downloaded.
We add a new gl_fbo status GLAMOR_FBO_DOWNLOADED to indicate
the fbo was already downloaded to CPU. Then latter the access
to this pixmap will be treated as pure CPU access. In glamor,
if we fallback to DDX/fbXXX, then we fallback everything
currently. We don't support to jump into glamor acceleration
layer between a prepare_access/finish_access. Actually, fbCopyPlane
is such a function which may call to acceleration function within
it. Then we must mark the downloaded pixmap to another state
rather than a normal fbo textured pixmap, and then stick to use
it as a in-memory pixmap.
Signed-off-by: Zhigang Gong <zhigang.gong@linux.intel.com>
Tested-by: Peng Li <peng.li@intel.com>
commit 1817b6c0cf20aa6fc1e1aa5b68e47473f341b85a
Author: Zhigang Gong <zhigang.gong@linux.intel.com>
Date: Thu Feb 2 11:21:05 2012 +0800
glamor_eglmodule: Change module name according to normalize naming rule.
As Xorg module loader will normalize module name which will
remove '_' when we put "glamor_egl" to the configure file,
then it will fail to find us.
Signed-off-by: Zhigang Gong <zhigang.gong@linux.intel.com>
commit 1ab40028740efad1ba2ee16d425b0fbdd822c6ab
Author: Zhigang Gong <zhigang.gong@linux.intel.com>
Date: Thu Feb 2 09:34:42 2012 +0800
Don't call dixSetPrivate directly.
We may change the way to set/get those private data latter.
consolidate to glamor_set_pixmap/screen_private is better
than call those dixSetPrivate directly.
Signed-off-by: Zhigang Gong <zhigang.gong@linux.intel.com>
commit bf7d79dc0ac2e97ed97e22c1d2c95e77bf959327
Author: Zhigang Gong <zhigang.gong@linux.intel.com>
Date: Tue Jan 31 18:16:58 2012 +0800
Refine CloseScreen and FreeScreen processes.
This commit move the calling to glamor_close_screen from
glamor_egl_free_screen to glamor_egl_close_screen, as this
is the right place to do this.
We should detach screen fbo and destroy the corresponding
KHR image at glamor_egl_close_screen stage. As latter
DDX driver will call DestroyPixmap to destroy screen pixmap,
if the fbo and image are still there but glamor screen private
data pointer has been freed, then it causes segfault.
This commit also introduces a new flag GLAMOR_USE_EGL_SCREEN.
if DDX driver is using EGL layer then should set this bit
when call to glamor_init and then both glamor_close_screen
and glamor_egl_close_screen will be registered correctly,
DDX layer will not need to call these two functions manually.
This way is also the preferred method within Xorg domain.
As interfaces changed, bump the version to 0.3.0.
Signed-off-by: Zhigang Gong <zhigang.gong@linux.intel.com>
Tested-by: Peng Li <peng.li@intel.com>
commit 97efbd25fed0f86338853d81b974b7f4deb9f1b4
Author: Chris Wilson <chris@chris-wilson.co.uk>
Date: Fri Jan 27 13:22:13 2012 +0000
Use CLAMP_TO_BORDER in copy_n_to_n so we can sample outside of the source
In order to reduce a composite operation to a source, we need to provide
Render semantics for the pixel values of samples outside of the source
pixmap, i.e. they need to be rgba(0, 0, 0, 0). This is provided by using
the CLAMP_TO_BORDER repeat mode, but only if the texture has an alpha
channel.
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Reviewed-by: Zhigang Gong <zhigang.gong@linux.intel.com>
commit 864153bb9eeadb539ed5e9488b829c9f3f8b9482
Author: Chris Wilson <chris@chris-wilson.co.uk>
Date: Fri Jan 27 13:22:12 2012 +0000
Do not reduce a composite to a copy if we need to sample outside of the source
In order to maintain Render semantics, samples outside of the source
should return CLEAR. The copy routines instead are based on the core
protocol and expects the source rectangle to be wholly contained within
the drawable and so does no fixup.
Fixes the rendering of GTK icons.
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Reviewed-by: Zhigang Gong <zhigang.gong@linux.intel.com>
commit 566cca59e14b223b8dcd045ccc2bbcf08d05b297
Author: Zhigang Gong <zhigang.gong@linux.intel.com>
Date: Sun Jan 29 14:14:36 2012 +0800
glamor-gles2: Fixup the pixmap before read back if it is not readable.
Signed-off-by: Zhigang Gong <zhigang.gong@linux.intel.com>
commit 36ac9b7191a4bbbe4fb25ced9ee27d1e91308a15
Author: Zhigang Gong <zhigang.gong@linux.intel.com>
Date: Sat Jan 21 14:41:44 2012 +0800
glamor-fbo: Tweek the cache bucket calculation.
And also reduce the expire count to 100 which should be
good enough on x11perf and cairo-trace testing.
Signed-off-by: Zhigang Gong <zhigang.gong@linux.intel.com>
commit a1de528c56ff1cfd05a04c4ad127456ec00707fd
Author: Zhigang Gong <zhigang.gong@linux.intel.com>
Date: Sat Jan 21 13:22:14 2012 +0800
glamor_create_fbo: Concentrate the fbo size/depth checking.
Concentrate checking the size/depth when creating fbo. Simply
the pixmap creation and the uploading fbo/texture preparing.
Also slightly change the uploading fbo's preparation. If don't
need fbo, then a fbo only has valid texture should be enough
to return.
Signed-off-by: Zhigang Gong <zhigang.gong@linux.intel.com>
commit 1bfe5957117ba5916236caa021124734228e5aa9
Author: Zhigang Gong <zhigang.gong@linux.intel.com>
Date: Fri Jan 20 20:38:29 2012 +0800
glamor-pixmap-upload: Create a uploading fbo with a texture only.
Just an initial implementation and disabled by default.
When uploading a pixmap to a texture, we don't really want
to attach the texture to any fbo. So add one fbo type
which doesn't has a gl FBO attached to it.
This commit can increase the cairo-trace's performance by
10-20%. Now the firefox-planet-gnome is 8.3s. SNA is still
the best, only take 3.5s.
Thanks for Chris to point out the A1 pixmap uploading bug.
Signed-off-by: Zhigang Gong <zhigang.gong@linux.intel.com>
commit 6fb92e67b3f3dee38d8d440c8ab9f8cc5dcef9bc
Author: Li Peng <peng.li@intel.com>
Date: Fri Jan 20 16:23:17 2012 +0800
glamor: check driver support GEM or not
glamor calls DRM_IOCTL_GEM_FLINK to get a name for a buffer object.
It only works for driver that support GEM, such as intel i915 driver.
But for pvr driver who doesn't has GEM, we can't do it this way.
According to Chris's comments, we check the has_gem as the following
method:
Here we just try to flink handle 0. If that fails with ENODEV or
ENOTTY instead of ENOENT (or EINVAL on older kernels), set has_gem=0.
Signed-off-by: Li Peng <peng.li@intel.com>
Reviewed-by: Zhigang Gong <zhigang.gong@linux.intel.com>
commit 68789b23e791d81c6987c755a56851961cbb262f
Author: Zhigang Gong <zhigang.gong@linux.intel.com>
Date: Fri Jan 20 15:56:25 2012 +0800
glamor_gles2: Consolidate gles2 pixmap format readable check to one function.
Signed-off-by: Zhigang Gong <zhigang.gong@linux.intel.com>
commit 3373d2c696028a9f2f637430c48b9de1a3776800
Author: Zhigang Gong <zhigang.gong@linux.intel.com>
Date: Fri Jan 20 12:10:06 2012 +0800
glamor_egl: Add support for the platform doesn't have gbm.
Maybe we should use eglGetDisplayDRM to get display, but current
PVR's driver is using eglGetDisplay.
Signed-off-by: Peng Li <peng.li@intel.com>
Signed-off-by: Zhigang Gong <zhigang.gong@linux.intel.com>
commit 92671e3ac8cc955379085c143ee8cf8b37e760ec
Author: Zhigang Gong <zhigang.gong@linux.intel.com>
Date: Fri Jan 20 11:58:34 2012 +0800
glamor_egl: Don't call eglDestroyImageKHR directly.
Some implementation doesn't have it.
Signed-off-by: Peng Li <peng.li@intel.com>
Signed-off-by: Zhigang Gong <zhigang.gong@linux.intel.com>
commit 125f317d90b69fa4d6f98da9badc1946f0a099ec
Author: Peng Li <peng.li@intel.com>
Date: Fri Jan 20 11:52:18 2012 +0800
glamor_gl_dispatch: fix the dispatch initialization on GLES2.
Some gles2 implementation doesn's support get_proc_address.
And we also need to avoid get those missing functions pointers
when we are GLES2.
Signed-off-by: Peng Li <peng.li@intel.com>
Signed-off-by: Zhigang Gong <zhigang.gong@linux.intel.com>
commit 64fef665c9297ddd110b8472943f96b55db120ba
Author: Zhigang Gong <zhigang.gong@linux.intel.com>
Date: Fri Jan 20 10:56:17 2012 +0800
glamor_render: Add non-Map/Unmap vertex array for GLES.
As some GLES implementations' glMapOES /glUnmapOES is
not so efficient, we implement the in memory vertex array
for them.
Signed-off-by: Zhigang Gong <zhigang.gong@linux.intel.com>
commit c244969b331e08679be9a9618d75fe5ee9cc9d86
Author: Zhigang Gong <zhigang.gong@linux.intel.com>
Date: Fri Jan 20 10:55:16 2012 +0800
glamor_init: Should set gl_flavor before sub-module intialization.
Signed-off-by: Zhigang Gong <zhigang.gong@linux.intel.com>
commit 62e536535168827be76dafb1f5b5e0807c1d5ec9
Author: Zhigang Gong <zhigang.gong@linux.intel.com>
Date: Fri Jan 20 10:04:21 2012 +0800
glamor_composite: Fix one bug when we have too more vertices.
Signed-off-by: Zhigang Gong <zhigang.gong@linux.intel.com>
commit 9c6fd931a63fb8a5300014265e4f1cacc746857a
Author: Zhigang Gong <zhigang.gong@linux.intel.com>
Date: Fri Jan 20 09:59:44 2012 +0800
glamor-fbo-pool: Enable to reuse different size fbo/texture.
Fixup three special cases, one is in tile and the other is in
composite. Both cases are due to repeat texture issue. Maybe
we can refine the shader to recalculate texture coords to
support partial texture's repeating.
The third is when upload a memory pixmap to texture, as now
the texture may not have the exact size as the pixmap, we
should not use the full rect coords.
Signed-off-by: Zhigang Gong <zhigang.gong@linux.intel.com>
commit c7e79d6acff5abd7a327d5f4d6698ae5d7583834
Author: Zhigang Gong <zhigang.gong@linux.intel.com>
Date: Thu Jan 19 20:47:55 2012 +0800
glamor-fbo-pool: Implement fbo cache mechanism.
We classify the cache according to the texture's format/width/height.
As openGL doesn't allow us to change a texture's format/width/height
after the internal texture object is already allocated, we can't
just calculate the size and then according ths size to put the
fbo to an bucket which is just like SNA does. We can only put
the fbo to the corresponding format/width/height bucket.
This commit only support the exact size match. The following patch
will remove this restriction, just need to handle the repeat/tile
case when the size is not exactly match.
Should use fls instead of ffs when decide the width/height bucket,
thanks for Chris to point this out.
Signed-off-by: Zhigang Gong <zhigang.gong@linux.intel.com>
commit 2ff41008494e6c5909c058f1f80b4f66617dada1
Author: Zhigang Gong <zhigang.gong@linux.intel.com>
Date: Wed Jan 18 19:21:36 2012 +0800
glamor_fbo: Introduce glamor fbo to manage all the fb/tex.
This is the first patch to implement a fbo/tex pool mechanism which
is like the sna's BO cache list. We firstly need to decopule the
fbo/tex from each pixmap. The new glamor_pixmap_fbo data
structure is for that purpose. It's somehow independent to each
pixmap and can be reused latter by other pixmaps once it's detached
from the current pixmap.
And this commit also slightly change the way to create a
memory pixmap. We will not create a pixmap private data structure
by default, instead we will crete that structure when a memory
pixmap is attaching a fbo to it.
Signed-off-by: Zhigang Gong <zhigang.gong@linux.intel.com>
commit ca2ddd33a114fe83584b5fa9f73b7534abdb96fa
Author: Zhigang Gong <zhigang.gong@linux.intel.com>
Date: Wed Jan 18 17:12:32 2012 +0800
glamor_set_pixmap_texture/screen_pixmap: Remove useless parameters.
As after we got a texture, no matter the texture is created
on the glamor_create_pixmap or on the egl layer, we all already
know the texture's width and height there. We don't need
to pass them in.
This commit also simply the glamor_egl_create_textured_screen to
reuse the egl_create_textured_pixmap. And also remove the useless
root image from the egl private structure. As now the root image
is bound to the screen image, we don't take care it separately
here. It will be freed at the screen closing.
Signed-off-by: Zhigang Gong <zhigang.gong@linux.intel.com>
commit 15166bba973206dcb98121eb3932660529cfc997
Author: Zhigang Gong <zhigang.gong@linux.intel.com>
Date: Wed Jan 18 17:10:26 2012 +0800
Add debug message for all the uploading path.
The previous message missed the texture restoring path.
Signed-off-by: Zhigang Gong <zhigang.gong@linux.intel.com>
commit 994a9ff7f58161bf5651f83d810eb77b7718ab00
Author: Zhigang Gong <zhigang.gong@linux.intel.com>
Date: Wed Jan 18 17:07:25 2012 +0800
glamor_create_picture: Fix the format matching method.
We should not simply set a TEXTURE_DRM pixmap to a separated
texture pixmap. If the format is compatible with current fbo
then it is just fine to keep it as TEXTURE_DRM type and we
can safely fallback to DDX layer on it.
Signed-off-by: Zhigang Gong <zhigang.gong@linux.intel.com>
commit 28fcd7cd01edfdf68c370e6c6ad0238d45477b3f
Author: Zhigang Gong <zhigang.gong@linux.intel.com>
Date: Fri Jan 13 11:18:28 2012 +0800
Rearrange data structure and remove unused fileds.
Signed-off-by: Zhigang Gong <zhigang.gong@linux.intel.com>
commit bdd72da0c525faf2aac38a7a8afa1cd88cd8dc1b
Author: Zhigang Gong <zhigang.gong@linux.intel.com>
Date: Tue Jan 10 17:04:48 2012 +0800
Release previous textre/fb when bind a new texture to a pixmap.
As we want to support DRI2 drawable which may create a new textured_drm
to a pre-existing texture_only pixmap, we have to add this logical.
Signed-off-by: Zhigang Gong <zhigang.gong@linux.intel.com>
Tested-by: He Junyan<junyan.he@linux.intel.com>
commit d7352d57b9ceb809d47c922ed8c820a44f8a0ee5
Author: Zhigang Gong <zhigang.gong@linux.intel.com>
Date: Tue Jan 10 15:24:36 2012 +0800
Add glFinish after glFlush.
Signed-off-by: Zhigang Gong <zhigang.gong@linux.intel.com>
commit 8b943ce2030b02bb8d279ce2c284cb5d2910ced6
Author: Zhigang Gong <zhigang.gong@linux.intel.com>
Date: Mon Jan 9 12:50:39 2012 +0800
Set glamor's initial version to 0.2.0.
Signed-off-by: Zhigang Gong <zhigang.gong@linux.intel.com>
commit 7329414bf2ca9873c04150a1d9386cf37f70b663
Author: Zhigang Gong <zhigang.gong@linux.intel.com>
Date: Mon Jan 9 07:16:06 2012 +0800
Silence a compilation warning.
Signed-off-by: Zhigang Gong <zhigang.gong@linux.intel.com>
commit 069a6d1746ef4c180f48a75e655e5e06e33327b5
Author: Zhigang Gong <zhigang.gong@linux.intel.com>
Date: Mon Jan 9 07:11:26 2012 +0800
glamor_composite: Allocate VBO on demand.
Use a fixed VBO is not efficient. Some times we may only has less than
100 verts, and some times we may have larger than 4K verts. We change
it to allocate VBO buffer dynamically, and this can bring about 10%
performance gain for both aa10text/rgb10text and some cairo benchmarks.
Signed-off-by: Zhigang Gong <zhigang.gong@linux.intel.com>
commit 42a0261cb3065200887f81816b1bc3850593da4c
Author: Zhigang Gong <zhigang.gong@linux.intel.com>
Date: Mon Jan 9 05:03:08 2012 +0800
glamor_getimage: Add the optimization path of getImage.
This optimization will only call glReadPixels once. It should get
some performance gain. But it seems it even get worse performance
at SNB, disable it by default.
Signed-off-by: Zhigang Gong <zhigang.gong@linux.intel.com>
commit 96085017c8da96e6d882c87b69186f5aba20131d
Author: Zhigang Gong <zhigang.gong@linux.intel.com>
Date: Mon Jan 9 05:01:48 2012 +0800
Consolidate the choose of internal texture format to one function.
Signed-off-by: Zhigang Gong <zhigang.gong@linux.intel.com>
commit a74596be0e7e02b43fb0db844b71b68f384ab599
Author: Zhigang Gong <zhigang.gong@linux.intel.com>
Date: Sun Jan 8 08:50:41 2012 +0800
Set filter to GL_NEAREST by default.
This is the fastest filter and let's use it by default.
Signed-off-by: Zhigang Gong <zhigang.gong@linux.intel.com>
commit 4cd07871a417b15b0382c07fecec497e93697a5d
Author: Zhigang Gong <zhigang.gong@linux.intel.com>
Date: Sun Jan 8 08:45:08 2012 +0800
glamor-composite: Use glDrawElements to reduce the count of vertices.
To split a rectangle (0,1,2,3) to two separated triangles need to feed
6 vertices, (0,1,2) and (0,2,3). use glDrawElements can reuse the shared
vertices.
Signed-off-by: Zhigang Gong <zhigang.gong@linux.intel.com>
commit 9dafd6fce547a6824c1de98d4309f8f2197ebbd0
Author: Zhigang Gong <zhigang.gong@linux.intel.com>
Date: Sun Jan 8 01:14:12 2012 +0800
glamor-composite: Optimize the computation of composite region.
Computing the composite region at the composite_with_shader is very
inefficient. As when we call to here from the glamor_glyph's temproary
picture, we don't need to compute this region at all. So we move this
computing out from this function and do that at the glamor_composite
function. This can get about 5% performance gain for aa10text/rgb10text.
Signed-off-by: Zhigang Gong <zhigang.gong@linux.intel.com>
commit 2511a00cdd576512f5d7f45707a4a725df2f4618
Author: Zhigang Gong <zhigang.gong@linux.intel.com>
Date: Thu Jan 5 14:26:01 2012 +0800
Fixed a configure bug.
Should check the enable-glamor-gles2 before use the variable.
And should include the config.h as the GLAMOR_GLES2 macro is
defined there.
Signed-off-by: Zhigang Gong <zhigang.gong@linux.intel.com>
commit a65e1c736aaa1bb2440a83c42c0410d9d9b58007
Author: Zhigang Gong <zhigang.gong@linux.intel.com>
Date: Wed Jan 4 14:40:24 2012 +0800
Reduce the double check of pixmap's private pointer.
As we now add the checking to the Macro, we don't need to check
the pointer outside the Macro.
Signed-off-by: Zhigang Gong <zhigang.gong@linux.intel.com>
commit e1789893e5fe07fdbd8f21b7fa8a15f6db066592
Author: Zhigang Gong <zhigang.gong@linux.intel.com>
Date: Wed Jan 4 14:37:37 2012 +0800
get_spans: Check whether have a valid fbo before check format.
If a pixmap is a pure in-memory pixmap, we do not need to
check its format. Format checking has more overhead than
checking FBO, so we change to check fbo firtly.
Signed-off-by: Zhigang Gong <zhigang.gong@linux.intel.com>
commit 057f52a04d47e6ca5f6dead9c1bc71765d4c7ae8
Author: Zhigang Gong <zhigang.gong@linux.intel.com>
Date: Wed Jan 4 14:34:39 2012 +0800
Track all picture's drawable pict format.
Even if a picture's pixmap is a pure in memory pixmap, we still need
to track its format. The reason is we may need to upload this drawable
to texture thus we need to know its real picture format.
As to the MACRO to check whether a pixmap is a picture, we should
check whether the priv is non-NULL before we touch its field.
Signed-off-by: Zhigang Gong <zhigang.gong@linux.intel.com>
commit 8a4758a358e56b1db481607ff3f7e9375238e5d8
Author: Zhigang Gong <zhigang.gong@linux.intel.com>
Date: Wed Jan 4 13:11:52 2012 +0800
Need to check pixmap priv before touch its field.
As now the pixmap may be allocated by DDX and doesn't have a
valid pixmap private field. We must check pixmap private
pointer before touch its field value. If a pixmap doesn't
have a non-NULL private pointer, it doesn't have a valid
FBO.
Signed-off-by: Zhigang Gong <zhigang.gong@linux.intel.com>
commit 9264335347da641b2626a6b9f56aa05ab313239e
Author: Zhigang Gong <zhigang.gong@linux.intel.com>
Date: Sat Dec 31 19:29:17 2011 +0800
Added more drawing functions.
As we want to take over all the possible GC ops from the DDX
layer, we need to add all the missed functions.
This commit also fixed one bug at polylines.
We simply drop the bugy optimized code now, as it did not
consider of clip info.
Signed-off-by: Zhigang Gong <zhigang.gong@linux.intel.com>
commit d42eb04c29d015fb1e4ed4e9ded4c0dd8bc7dc3c
Author: Zhigang Gong <zhigang.gong@linux.intel.com>
Date: Sat Dec 31 19:27:33 2011 +0800
Remove useless output messages.
Signed-off-by: Zhigang Gong <zhigang.gong@linux.intel.com>
commit fbccc4bbbc84a5459010d3238a00a0dd49111eec
Author: Zhigang Gong <zhigang.gong@linux.intel.com>
Date: Sat Dec 31 19:20:10 2011 +0800
Fixed a rendering bug at fillspans.
We should not change the points coords when loop for the clip
rects. Change to use another variable to store the clipped
coords and keep the original coords. This bug cause some
XTS failures. Now fix it.
Signed-off-by: Zhigang Gong <zhigang.gong@linux.intel.com>
commit 70b6341538cc11f074b02f9dd97d387418245d77
Author: Zhigang Gong <zhigang.gong@linux.intel.com>
Date: Sat Dec 31 19:14:06 2011 +0800
Fixed a bug at putImage.
fbPutImage wants the input drawable is the target drawable rather
than the backing pixmap. This bug cause some XTS failures, now
fix it.
Signed-off-by: Zhigang Gong <zhigang.gong@linux.intel.com>
commit 27c4c0457dac307500859ca7a14a1e58465d5e0b
Author: Zhigang Gong <zhigang.gong@linux.intel.com>
Date: Tue Dec 27 16:44:17 2011 +0800
Remove the assertion which is not safe sometimes.
The original version assumes that each drawable pixmap should
have a valid private pixmap pointer. But this is not true after
we create this libglamor. As the DDX layer may create a pure
software drawable pixmap which doesn't have a private pixmap
pointer.
Signed-off-by: Zhigang Gong <zhigang.gong@linux.intel.com>
commit c65dc686228262894e0afc9fbe9fe6635d420e2f
Author: Zhigang Gong <zhigang.gong@linux.intel.com>
Date: Tue Dec 27 16:42:32 2011 +0800
Export glamor_validate_gc to DDX.
This is also a function which may direct access pixmaps which
may be a glamor only pixmap and DDX doesn't know how to access
it. We have to export this API to DDX driver and let the DDX
driver use it to do the validation.
Signed-off-by: Zhigang Gong <zhigang.gong@linux.intel.com>
commit f2809745fb641239be5b0281eac569c5b371e55e
Author: Zhigang Gong <zhigang.gong@linux.intel.com>
Date: Fri Dec 23 16:21:44 2011 +0800
Flush gl operations when destroy an textured image.
Before destroy an image which was attached to a texture.
we must call glFlush to make sure the operation on that
texture has been done.
Signed-off-by: Zhigang Gong <zhigang.gong@linux.intel.com>
commit b36d264ec98440707ed3a94fab430e23d4a1582a
Author: Zhigang Gong <zhigang.gong@linux.intel.com>
Date: Fri Dec 23 16:19:39 2011 +0800
Add a new API glamor_create_gc.
As at ValidateGC stage, it may need to touch the pixmap directly, for
example the tile pixmap. We must export this interface to DDX driver
and let the DDX driver to route the processing to us. As this pixmap
may be a texture only pixmap, and DDX don't know how to handle it.
Signed-off-by: Zhigang Gong <zhigang.gong@linux.intel.com>
commit 3ba546b6998bf1c5d68ff0083017f804ffc48a93
Author: Zhigang Gong <zhigang.gong@linux.intel.com>
Date: Fri Dec 23 16:18:22 2011 +0800
Code cleanup.
Remove useless code, and after a fbCreatePixmap, we
do not need to modify its header there.
Signed-off-by: Zhigang Gong <zhigang.gong@linux.intel.com>
commit 2583620c6cd6a6fedeb7082b526f2751eb6f75b4
Author: Zhigang Gong <zhigang.gong@linux.intel.com>
Date: Fri Dec 23 14:23:56 2011 +0800
Remove useless egl functions.
We only need to create image fron external name rather
than use drm_image_mesa to create drm image, so remove
them.
Signed-off-by: Zhigang Gong <zhigang.gong@linux.intel.com>
commit 7285f2e836c56c31a42b8c18a7ebd0e8a7d78fa1
Author: Zhigang Gong <zhigang.gong@linux.intel.com>
Date: Fri Dec 16 20:15:33 2011 +0800
Make sure the devPrivate.ptr of a textured pixmap is NULL.
Just in case when wrongly fallback to DDX layer and cause
random memory corruption. Pointed out by Chris.
Signed-off-by: Zhigang Gong <zhigang.gong@linux.intel.com>
commit 5769d8603ddef6a8023f12bba1d3d3cde83e82d4
Author: Zhigang Gong <zhigang.gong@linux.intel.com>
Date: Fri Dec 16 15:04:33 2011 +0800
Export glamor_create_texture to DDX driver.
If DDX failed to create textured pixmap from its BO's handle,
it can turn to call this API to create a brand new glamor
rather than fallback to pure in memory pixmap.
Signed-off-by: Zhigang Gong <zhigang.gong@linux.intel.com>
commit 3f5d53b33978bdb848dd605a19d3fb4ea5f259e0
Author: Zhigang Gong <zhigang.gong@linux.intel.com>
Date: Fri Dec 16 15:02:54 2011 +0800
Correct the logic of glamor_egl_create_textured_pixmap.
Discussed with Chris and found the previous logic is not
good. Now change it in this commit, this API will just
try to create a textured pixmap from the handle provided
by DDX driver, if failed simply return FALSE without touch
the pixmap. And the DDX driver can choose how to do next
step.
Signed-off-by: Zhigang Gong <zhigang.gong@linux.intel.com>
commit 8c7fcefb965bfdaaf0576347da20155d0415caa5
Author: Zhigang Gong <zhigang.gong@linux.intel.com>
Date: Tue Dec 13 22:48:34 2011 +0800
glamor-for-ddx: Exports all rendering/drawing functions.
This commit exports all the rest rendering/drawing functions
to the DDX drivers. And introduce some new pixmap type. For
a pixmap which has a separated texture, we never fallback
it to the DDX layer.
This commit also adds the following new functions:
glamor_composite_rects, glamor_get_image_nf which are needed
by UXA framework. Just a simple wrapper function of miXXX.
Will consider to optimize them next few weeks.
This commit also Fixed a glyphs rendering bug pointed by Chris.
Signed-off-by: Zhigang Gong <zhigang.gong@linux.intel.com>
commit f7539d9bff0a65b9430dcae8745bf5d4409a9f04
Author: Zhigang Gong <zhigang.gong@linux.intel.com>
Date: Mon Dec 12 09:58:03 2011 +0800
Enable texture dynamic uploading.
commit 2d0ea392ec574efb96ac7a04ee72ba580417ba1e
Author: Zhigang Gong <zhigang.gong@linux.intel.com>
Date: Mon Dec 12 09:49:06 2011 +0800
Call screen's method to create pixmap.
As we may need to fallback to DDX's rendering path
during the glyphs, we have to call screen's create pixmap
method to create pixmap.
Signed-off-by: Zhigang Gong <zhigang.gong@linux.intel.com>
commit 47e86eea563601c4e1e356f7267b935fcdd542f7
Author: Zhigang Gong <zhigang.gong@linux.intel.com>
Date: Mon Dec 12 09:48:04 2011 +0800
Fallback if the pixmap is drm only.
Glamor can't do anything with a drm only pixmap.
Signed-off-by: Zhigang Gong <zhigang.gong@linux.intel.com>
commit e3d16c9ebdffe8e5793ee253cf9f72b884b42805
Author: Zhigang Gong <zhigang.gong@linux.intel.com>
Date: Mon Dec 12 07:09:03 2011 +0800
Classfy glamor pixmap to different types.
During the integration with intel driver, we introduce two
new type of pixmap, one is TEXTURE_DRM, the other is DRM_ONLY.
TEXTURE_DRM means we create a texture bind to the DRM buffer
successfully. And then the texture and the external BO is
consistent. DRM_ONLY means that we failed to create a texture
from the external DRM BO. We need to handle those different
types carefully, so we have to track them in the data structure.
Signed-off-by: Zhigang Gong <zhigang.gong@linux.intel.com>
commit 36d424feaeec765d131c015df77d24db1a36fc38
Author: Zhigang Gong <zhigang.gong@linux.intel.com>
Date: Mon Dec 12 06:56:36 2011 +0800
Call glamor_create_pixmap directly in glamor rendering path.
When glamor is rendering pixmaps, and needs to create some
temporary pixmap, it's better to use glamor version create
pixmap directly. As if goes to external DDX's create pixmap,
it may create a external DRM buffer which is not necessary.
All the case within glamor scope is to create a texture only
pixmap or a in memory pixmap.
Signed-off-by: Zhigang Gong <zhigang.gong@linux.intel.com>
commit 10ad332dedad2df13212dcd198d947a2f5c76862
Author: Zhigang Gong <zhigang.gong@linux.intel.com>
Date: Sun Dec 11 08:06:13 2011 +0800
Remove garbage file.
Signed-off-by: Zhigang Gong <zhigang.gong@linux.intel.com>
commit 92fd83872f5509a2792338b4665dc2b3e1ed68cd
Author: Zhigang Gong <zhigang.gong@linux.intel.com>
Date: Sun Dec 11 02:26:15 2011 +0800
Remove the access mode from private pixmap structure.
Change the finish_access to pass in the access mode, and remove
the access mode from the pixmap structure. This element should
not be a pixmap's property.
Signed-off-by: Zhigang Gong <zhigang.gong@linux.intel.com>
commit d135e879a6c8698bf21ae44a02315f370b961b14
Author: Zhigang Gong <zhigang.gong@linux.intel.com>
Date: Fri Dec 9 16:01:45 2011 +0800
Can't create KHR image if the depth is uncompatible.
Currently, KHR image only support one color format ARGB32.
For all other format, we have to fail to create corresponding
image and texture here.
Signed-off-by: Zhigang Gong <zhigang.gong@linux.intel.com>
commit b5630663cf9438383166f59cdfc7889571f2cd62
Author: Zhigang Gong <zhigang.gong@linux.intel.com>
Date: Fri Dec 9 15:58:19 2011 +0800
exports more rendering functions to DDX driver.
Exports all necessary rendering functions to DDx drivers, including
CopyArea, Glyphs, Composite, Triangles, ....
Signed-off-by: Zhigang Gong <zhigang.gong@linux.intel.com>
commit b5480e64ac4a72bdc31e587ff9e51d67a1a0f11d
Author: Zhigang Gong <zhigang.gong@linux.intel.com>
Date: Fri Dec 9 14:57:24 2011 +0800
Override create/destroy picture to track pict format.
When create a piccture, we need to attach a pixmap to it.
A pixmap only has a depth, which is not sufficant for glamor.
As in openGL texture only has a few internal formats which
is not sufficant to represent all the possible picture
format. So we always transform the picture format to GL_RGBA.
And when we need to read back the picture, we must know the
original picture format. So we have to override create
and destroy picture to track a pixmap's real picture format
if it is attached to a picture.
Signed-off-by: Zhigang Gong <zhigang.gong@linux.intel.com>
commit 7b2310834d83198fc88b5a5fb062cb1c9ee19ead
Author: Zhigang Gong <zhigang.gong@linux.intel.com>
Date: Tue Nov 22 18:28:10 2011 +0800
Added a missed header file.
Pointed by Chris, we must add xorg-server.h at the top
of each file before we include any other xorg header files.
Otherwise, it may cause incorrect XID length.
This commit also fixes one compilation warning in X86_64
platform.
Signed-off-by: Zhigang Gong <zhigang.gong@linux.intel.com>
commit 90eaac96aeb53b3e45b82dc7dd4e98778c8c9343
Author: Zhigang Gong <zhigang.gong@linux.intel.com>
Date: Tue Nov 15 20:17:18 2011 +0800
If caller is not using glamor screen, we can't register
the block handler.
Signed-off-by: Zhigang Gong <zhigang.gong@linux.intel.com>
commit 9ff39e53eb20673d42f42c94adb55bf9a9f1c285
Author: Zhigang Gong <zhigang.gong@linux.intel.com>
Date: Tue Nov 15 20:16:16 2011 +0800
Revert "Disable glamor_tile temporary."
The previous corruption output is caused by GLAMOR/UXA flushing
issue. Now get fixed.
This reverts commit 0d2d3e4f051e48c3499e1c972e012803a8623526.
commit 13ab4d59afb824f2a4c03280fffe79c6ba9aa26c
Author: Zhigang Gong <zhigang.gong@linux.intel.com>
Date: Fri Nov 11 14:55:12 2011 +0800
Disable glamor_tile temporary.
Enable glamor tile cause corrupted output. Need more investigation.
Signed-off-by: Zhigang Gong <zhigang.gong@linux.intel.com>
commit 9b6a484df0724d72dd27ad620672e7a762a460df
Author: Zhigang Gong <zhigang.gong@linux.intel.com>
Date: Fri Nov 11 10:26:00 2011 +0800
Add new version glamor_poly_fill_rect without internal fallback.
If need fallback, this new version just returns FALSE without
doing anything. It's the caller's responsibility to implement
fallback method.
Signed-off-by: Zhigang Gong <zhigang.gong@linux.intel.com>
commit ba1b3b53240b5d499791570ba9f598a4e421c719
Author: Zhigang Gong <zhigang.gong@linux.intel.com>
Date: Wed Nov 9 16:09:03 2011 +0800
Add new version glamor_fillspans without internal fallback.
For the purpose of incrementally intergration of existing intel
driver, for the GC operations we may don't want to use glamor's
internal fallback which is in general much slower than the
implementation in intel driver. If the parameter "fallback" is
false when call the glamor_fillspans, then if glamor found it
can't accelerate it then it will just return a FALSE rather than
fallback to a slow path.
Signed-off-by: Zhigang Gong <zhigang.gong@linux.intel.com>
commit b861aad8e2fcf6fe1fae4f26abb650bb4eb499c6
Author: Zhigang Gong <zhigang.gong@linux.intel.com>
Date: Wed Nov 2 13:44:50 2011 +0800
Initial version.
Signed-off-by: Zhigang Gong <zhigang.gong@linux.intel.com>
commit 2dbbe2565052cc024ce0e98918ed34c1239b780a
Merge: 4d62646142 7982eca622
Author: Eric Anholt <eric@anholt.net>
Date: Wed Dec 18 11:21:07 2013 -0800
Merge branch 'glamor-gongzg-merge'
commit 7982eca622bbc4b6a4845801a77da8a16138004a
Author: Eric Anholt <eric@anholt.net>
Date: Wed Dec 18 11:16:15 2013 -0800
Revert changes outside of glamor from the glamor branch.
We want to merge the external glamor code to the xserver, with the
internal history retained. However, we don't want a bunch of
non-building changes along the way, so remove all the build system and
support code outside of glamor for now.
commit 4d62646142718024b0981eb4f1fd0131e829161f
Merge: f4bfb14f53 81ba89d670
Author: Keith Packard <keithp@keithp.com>
Date: Mon Dec 16 09:27:57 2013 -0800
Merge remote-tracking branch 'jeremyhu/master'
commit f4bfb14f53a939574da1f5995f0dad949898b86a
Author: Adam Jackson <ajax@redhat.com>
Date: Thu Dec 12 10:57:40 2013 -0500
configure: Fix a typo near dri3/shmfence detection
" is not the mate of ].
Reviewed-by: Jasper St. Pierre <jstpierre@mecheye.net>
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit 8248b4af31ef71ac03158871b77f20eb456dbe38
Author: Adam Jackson <ajax@redhat.com>
Date: Fri Dec 13 15:07:48 2013 -0500
glx: Add null pointer protection to __glGetProcAddress
This can't happen when GLX is the backing window system, but can
elsewhere. We may as well protect against it at a high level.
Reviewed-by: Eric Anholt <eric@anholt.net>
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit 128449dd6498a2f74c3770f89a9dae0f70e2b351
Author: Adam Jackson <ajax@redhat.com>
Date: Fri Dec 13 11:39:16 2013 -0500
present: Don't use the major/minor version from the protocol headers
We want to advertise the version we implement, not the version the
protocol headers happen to describe.
Reviewed-by: Jasper St. Pierre <<jstpierre@mecheye.net>
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit ec6087bf070131bc3a26848fb9fb840f09b0e19d
Author: Adam Jackson <ajax@redhat.com>
Date: Fri Dec 13 11:36:38 2013 -0500
dri3: Don't use the major/minor version from the protocol headers
We want to advertise the version we implement, not the version the
protocol headers happen to describe.
Reviewed-by: Jasper St. Pierre <<jstpierre@mecheye.net>
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit e6fafd3de70d315130fb6e5732cfd02a5901b788
Author: Adam Jackson <ajax@redhat.com>
Date: Fri Dec 13 11:28:59 2013 -0500
dri3: Guard against buggy clients
There's nothing to stop a client from sending these requests to screens
without DRI3 support, and if they do, we'll crash. Let's not do that.
Reviewed-by: Jasper St. Pierre <<jstpierre@mecheye.net>
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit 81ba89d6703a22178a153aa39478ba2d4bde262b
Author: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
Date: Fri Dec 13 01:39:44 2013 -0800
configure.ac: Add PRESENT_LIB to XQUARTZ_LIBS
Undefined symbols for architecture x86_64:
"_present_extension_init", referenced from:
_staticExtensions in libXquartz.a(miinitext.o)
"_present_register_complete_notify", referenced from:
___glXregisterPresentCompleteNotify in libglx.a(glxcmds.o)
Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
commit d7c9235ee261b0f780320985233e00dec5e2689c
Author: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
Date: Sat Dec 7 01:36:33 2013 -0800
XQuartz: Use asl_log_descriptor to log stdout/stderr of child processes
Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
commit ad8111d7c971ce448905c733d65ba0cfc72bdca4
Author: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
Date: Sat Dec 7 01:14:37 2013 -0800
darwin: Don't leave stdin/stdout closed
<rdar://problem/15609419>
Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
commit 929795d50d788358d6269ce423f72c6cc40e334b
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Tue Dec 3 10:14:51 2013 +1000
dix: fix check for grab type
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 23394c7fea0f5c33333198c87ecfecc9f6c6a791
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Tue Dec 3 08:36:45 2013 +1000
Xi: ungrab device when releasing a passive grab without ButtonReleaseMask (#71878)
If an touch triggers an async button grab and that grab does not have the
ButtonReleaseMask set, the TouchEnd is never delivered, deliveries is 0 and
the grab is never deactivated.
If the grab is pointer async and keyboard sync, the keyboard events are stuck
in EnqueueEvent until some other pointer event terminates the grab.
Change this to check for the number of listeners. If we're about to deliver a
TouchEnd to a passive pointer grab, the number of listeners is already 1 -
pointer grabs always accept so other listeners were removed.
X.Org Bug 71878 <http://bugs.freedesktop.org/show_bug.cgi?id=71878>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit c1d30b5bd7f90e68bc38404fd0cc32578d6d3018
Author: Ben Gamari <bgamari.foss@gmail.com>
Date: Thu Nov 21 21:24:20 2013 -0500
Xi: Don't ActivateEarlyAccept POINTER_REGULAR listeners
Bug #71878 describes a bug resulting in the server ceasing to respond to
keyboard input after a touch event. The problem might be the following:
DeliverTouchBeginEvent tries to deliver an event to a listener of type
LISTENER_POINTER_REGULAR, taking the following if branch,
if (listener->type == LISTENER_POINTER_REGULAR ||
listener->type == LISTENER_POINTER_GRAB) {
rc = DeliverTouchEmulatedEvent(dev, ti, ev, listener, client, win,
grab, xi2mask);
if (rc == Success) {
listener->state = LISTENER_IS_OWNER;
/* async grabs cannot replay, so automatically accept this touch */
if (dev->deviceGrab.grab &&
dev->deviceGrab.fromPassiveGrab &&
dev->deviceGrab.grab->pointerMode == GrabModeAsync)
ActivateEarlyAccept(dev, ti);
}
goto out;
}
DeliverTouchEmulatedEvent succeeds. The deviceGrab meets all
three of the conditions of the inner if, enters
ActivateEarlyAccept which then fails due to,
BUG_RETURN(ti->listeners[0].type != LISTENER_GRAB &&
ti->listeners[0].type != LISTENER_POINTER_GRAB);
That is, despite listener->type == LISTENER_POINTER_REGULAR. With my
non-existent knowledge of XINPUT, it seems like the solution here
might be to only ActivateEarlyAccept when listener->type ==
LISTENER_POINTER_GRAB.
Signed-off-by: Ben Gamari <bgamari.foss@gmail.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit fe07ec19e212a68076560d243a2a935c54589068
Author: Keith Packard <keithp@keithp.com>
Date: Tue Dec 10 11:27:47 2013 -0800
present: recursively set window pixmaps on flip
Newly created windows inherit the pixmap of their parent, similarly,
reparenting a tree inherits the pixmap of the destination tree.
Making present preserve the invariant that unredirected windows always
have the same pixmap as their parent ensures that the above cases work
correctly.
v2: name the recursive function to 'set_tree_pixmap' instead of 'set_window_pixmap'
Signed-off-by: Keith Packard <keithp@keithp.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
commit b3533d0b212b6747a8f9a01931253d6bdb648ee2
Author: Keith Packard <keithp@keithp.com>
Date: Tue Dec 10 10:29:11 2013 -0800
Bump version to 1.14.99.904 (1.15 RC4)
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 9a4d7572fe3be16bb5aded5f48d4217fdf725b1d
Author: Jon TURNEY <jon.turney@dronecode.org.uk>
Date: Thu Sep 27 18:59:45 2012 +0100
hw/xwin/glx: Rewrite WGL wrappers after Xserver conversion to direct GL dispatch
v1: Rewrite by Marc Haesen of the WGL wrapper function generation script to use
Khronos group XML.
v2: Remove -dispatchheader option, since dispatch.h doesn't exist anymore, use
the private glapi interface to construct the GL dispatch table for the native
WGL thunks.
v3:
Rewrite to generate shims for the OpenGL 1.2.1 (GL 1.2 + GL_ARB_imaging
+GL_ARB_multitexture + GL_ARB_texture_compression(?)) functions the server links
directly with rather than libGL.
These shims dispatch to either the mesa GL DLL, or a thunking DLL containing
cdecl-to-stcall wrapper functions for the native GL DLL.
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Reviewed-by: Adam Jackson <ajax@redhat.com>
commit cb48877a3c4cfb1ae2248000fcd3443e3092bdaa
Author: Jon TURNEY <jon.turney@dronecode.org.uk>
Date: Fri Dec 6 14:00:21 2013 +0000
glx: Consistently use ARB-suffixed names for ARB_multitexture functions
At the moment we have a mix of ARB and non-ARB suffixed forms for ARB_multitexture functions
e.g. glMultiTexCoord1fvARB and glMultiTexCoord1dv
Consistently use the ARB-suffixed form, assuming that is present in all libGL
which provide the OpenGL 1.2.1 ABI we expect to be able to directly link with.
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Reviewed-by: Adam Jackson <ajax@redhat.com>
commit 1a021f57a1e75ab63e8f87704f0394162402c4d4
Author: Jon TURNEY <jon.turney@dronecode.org.uk>
Date: Sun Dec 1 22:25:46 2013 +0000
ephyr: Fix compilation when ./configure'd with --enable-debug
/jhbuild/checkout/xorg/xserver/hw/kdrive/ephyr/ephyr.c: In function ‘ephyrProcessMouseMotion’:
/jhbuild/checkout/xorg/xserver/hw/kdrive/ephyr/ephyr.c:946:188: error: ‘ephyrCurScreen’ undeclared (first use in this function)
/jhbuild/checkout/xorg/xserver/hw/kdrive/ephyr/ephyr.c: In function ‘ephyrProcessButtonPress’:
/jhbuild/checkout/xorg/xserver/hw/kdrive/ephyr/ephyr.c:980:186: error: ‘ephyrCurScreen’ undeclared (first use in this function)
/jhbuild/checkout/xorg/xserver/hw/kdrive/ephyr/ephyr.c: In function ‘ephyrProcessButtonRelease’:
/jhbuild/checkout/xorg/xserver/hw/kdrive/ephyr/ephyr.c:1007:186: error: ‘ephyrCurScreen’ undeclared (first use in this function)
Fix ephyr compilation when ./configure'd with --enable-debug after commit
46cf6bf5692ef751ec9d17ae2292565d4b13f14b, some instances of ephyrCurScreen were
not converted to screen->pScreen->myNum.
v2: Don't use a trivial local variable which will be unused when ./configure'd
with --disable-debug
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Reviewed-by: Adam Jackson <ajax@redhat.com>
commit 875dbcef5bfcb6a94ef8456be6151e133408793f
Author: Jon TURNEY <jon.turney@dronecode.org.uk>
Date: Fri Nov 29 14:29:20 2013 +0000
configure.ac: Link XWin with present extension if we are building with it enabled
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Reviewed-by: Adam Jackson <ajax@redhat.com>
commit e61e19959d9138d5b81b1f25b7aa3e257918170d
Author: Adam Jackson <ajax@redhat.com>
Date: Tue Dec 3 13:45:43 2013 -0500
xquartz/glx: Convert to non-glapi dispatch
CGL doesn't have anything like glXGetProcAddress, and the old code just
called down to dlsym in any case. It's a little mind-warping since
dlopening a framework actually loads multiple dylibs, but that's just
how OSX rolls.
Signed-off-by: Adam Jackson <ajax@redhat.com>
Reviewed-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
commit a668aa0e41bc33ff2db7f9c53b6dc321a96926a9
Author: Adam Jackson <ajax@redhat.com>
Date: Tue Dec 3 15:03:13 2013 -0500
drisw: Wire up GetProcAddress
Signed-off-by: Adam Jackson <ajax@redhat.com>
Reviewed-by: Keith Packard <keithp@keithp.com>
commit 4fcdfeb7bc55d00d50d7f89788d9b929946ae3d9
Author: Adam Jackson <ajax@redhat.com>
Date: Tue Dec 3 15:02:57 2013 -0500
dri2: wire up GetProcAddress
Signed-off-by: Adam Jackson <ajax@redhat.com>
Reviewed-by: Keith Packard <keithp@keithp.com>
commit 47f00b3920be9d8df8b148263d744934f3a02cd4
Author: Adam Jackson <ajax@redhat.com>
Date: Tue Dec 3 15:01:44 2013 -0500
glx: Untangle the prototypes around the GetProcAddress thunk
Signed-off-by: Adam Jackson <ajax@redhat.com>
Reviewed-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
Reviewed-by: Jon TURNEY <jon.turney@dronecode.org.uk>
commit c1fd143f2847ef425ec9891d9e1cba44a1bb007d
Author: Adam Jackson <ajax@redhat.com>
Date: Tue Dec 3 13:11:52 2013 -0500
glx: Remove function stubs
Now that we're calling non-1.2 ABI things by function pointer this is no
longer needed.
Signed-off-by: Adam Jackson <ajax@redhat.com>
Reviewed-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
Reviewed-by: Jon TURNEY <jon.turney@dronecode.org.uk>
commit 6b93e1f5ff39c6ac5b0d97d4245aeac9113eed8b
Author: Adam Jackson <ajax@redhat.com>
Date: Tue Dec 3 13:11:09 2013 -0500
glx: Convert non-generated function pointer thunking
Same concept as the generated code conversion.
Signed-off-by: Adam Jackson <ajax@redhat.com>
Reviewed-by: Jon TURNEY <jon.turney@dronecode.org.uk>
commit c4567a376083eb7b142a7f003ddf8372d376ea86
Author: Adam Jackson <ajax@redhat.com>
Date: Tue Dec 3 12:40:24 2013 -0500
glx: Convert generated code function pointer thunking
We're meant not to call these by name due to ABI. Rather than try to
generate a bunch of little stub functions that do the lookup, just
inline it all directly into the calling function.
This does not cache results. That's fine, this is not a performance
path, and if we're atop WGL then we effectively have to do this every
time anyway because wglGetProcAddress results are context-dependent.
Signed-off-by: Adam Jackson <ajax@redhat.com>
Jon TURNEY <jon.turney@dronecode.org.uk>
commit f69f4f417c6807405e45289b39a80f1b9a55f9e6
Author: Keith Packard <keithp@keithp.com>
Date: Tue Dec 10 07:09:17 2013 -0800
Depend on latest glproto (1.4.17)
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 576f3d36dd324bd0d16c9968f1ded5c5eead3569
Author: Adam Jackson <ajax@redhat.com>
Date: Mon Dec 9 13:16:01 2013 -0500
damageext: Die if we can't create the Xinerama resource type
Reviewed-by: Keith Packard <keithp@keithp.com>
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit f10f36d91db1b21c2ce5a531b4fa5f96fcbdc2f0
Author: Adam Jackson <ajax@redhat.com>
Date: Mon Sep 16 15:17:26 2013 -0400
damageext: Xineramify (v7)
v7: Don't bother making resources for the backing listeners. [keithp]
This is now slightly unlike how other resources are xineramified. We
create N+1 internal damage listeners, one that's a real resource and
reflects the protocol view, and then one per backend screen where the
report function piles onto the protocol view. The internal listeners
are not stored in the resource database directly, they just hang off the
xinerama resource. We don't wrap Subtract at the dispatch level, but we
do extend it for the Xinerama case to clip to the root window geometry.
As a result of the N+1 design here, the damage reports we generate are
not quite minimal. However they are indistinguishable from sequential
rendering events happening before the client hears damage, and we don't
need to add a post-dispatch callback just for this one extension.
Add is probably (still) somewhat broken since it will only hit screen 0,
but Add really only exists for DRI1's sake, and DRI1 disables itself
with Xinerama enabled anyway. In the absence of a use case, I'm leaving
it unwrapped under Xinerama; if someone wants to define how it ought to
work, be my guest.
Reviewed-by: Keith Packard <keithp@keithp.com>
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit 808303fe5232ba0320ae5a4310b1ed1322e85f1d
Author: Adam Jackson <ajax@redhat.com>
Date: Mon Nov 4 17:49:34 2013 -0500
fixes: Fix PanoramiXSetWindowShapeRegion for root windows (v2)
Root windows in Xinerama are in the coordinate space of their root window
pixmap, not in protocol space.
v2: Only translate for root windows, sice the window shape is
drawable-relative.
Reviewed-by: Keith Packard <keithp@keithp.com>
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit 5c10c7ea2129b70015e745523918d143cc29318d
Author: Adam Jackson <ajax@redhat.com>
Date: Mon Nov 4 17:49:33 2013 -0500
fixes: Fix PanoramiXSetPictureClipRegion for root windows (v2)
Root windows in Xinerama are in the coordinate space of their root
window pixmap, not in protocol space. This fixes 'xcompmgr -n' when
Xinerama is active.
v2: Only translate for root windows, since the clip origin is
drawable-relative.
Reviewed-by: Keith Packard <keithp@keithp.com>
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit 1dd839a425adc6e5a1dc377003ed86a374d81f0b
Author: Adam Jackson <ajax@redhat.com>
Date: Thu Nov 7 13:59:30 2013 -0500
composite: Fix COW creation for Xinerama (v2)
Say you have two 800x600 screens left/right of each other. A window
that's 200x200 at +700+0 in protocol coordinate space will appear to be
at -100+0 in the coordinate space of the right hand screen. Put another
way: windows are in the coordinate space of their root window pixmap.
We weren't doing this translation for the COW, so when rendering came in
to it you'd see the top-left chunk of the COW on all screens. Cool
effect and all, but wrong.
v2: Only translate when Xinerama is active [keithp]
Reviewed-by: Keith Packard <keithp@keithp.com>
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit 8dbe456abae1a32fb6c5c74fa456bc7301cccabe
Author: Adam Jackson <ajax@redhat.com>
Date: Tue Oct 29 10:44:07 2013 -0400
xinerama: Export the screen region
damageext wants this so it can intersect subtract requests against the
root window geometry.
Reviewed-by: Keith Packard <keithp@keithp.com>
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit c6d4c2a24140feee4ceae48c4c74fedcae9b68b3
Author: Adam Jackson <ajax@redhat.com>
Date: Fri Nov 15 15:13:31 2013 -0500
xfree86: Prefer fbdev to vesa
On UEFI machines you'd prefer fbdev to grab efifb instead of vesa trying
to initialize and failing in a way we can't unwind from. On BIOS
machines this is harmless: either there is an fbdev driver and it'll
probably be more capable, or there's not and vesa will kick in anyway.
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
Reviewed-by: Eric Anholt <eric@anholt.net>
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit 7b5d4f147fdef9edfeaa9c6565375111079efd11
Author: Adam Jackson <ajax@redhat.com>
Date: Tue Nov 5 10:12:28 2013 -0500
composite: Don't double-redirect if someone asks for backing store twice
v2: Belt-and-suspenders the unredirection path [vsyrjala]
Reviewed-by: Keith Packard <keithp@keithp.com>
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit a2b2c271e0ca87d3188ba2741b6db9bbbdc599f5
Author: Adam Jackson <ajax@redhat.com>
Date: Tue Nov 5 10:08:17 2013 -0500
composite: Automatically enable backing store support on the screen
... unless you explicitly disabled it with -bs on the command line, or
with the corresponding thing in xorg.conf.
v2: Drop a bogus hunk from compChangeWindowAttributes [vsyrjala]
v3: s/TRUE/WhenMapped/ [jcristau]
Reviewed-by: Keith Packard <keithp@keithp.com>
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit e0cac005608a2e5618c7be59701318d684e0bb93
Author: Adam Jackson <ajax@redhat.com>
Date: Tue Nov 5 09:58:17 2013 -0500
bs: Set the screen's bs support level to WhenMapped
Since we're using RedirectAutomatic to do this, we don't actually
preserve contents when unmapped.
v2: Don't say WhenMapped if Composite didn't initialize [vsyrjala]
Reviewed-by: Julien Cristau <jcristau@debian.org>
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit b61ccd5d9d368f3fbbae27ce14ac02a3db1884c4
Author: Adam Jackson <ajax@redhat.com>
Date: Tue Nov 5 10:20:04 2013 -0500
smartsched: Tweak the default scheduler intervals
A default timeslice of 20ms means a pathological client can ruin up to
two frames per scheduler tick. And a fifth of a second is just insane.
Pick two different numbers out of the hat. A 5ms slice means you can
probably keep up with two or three abusive clients, and letting it burst
to 15ms should give you about all the timeslice you need for a
fullscreen game (that's doing server-side rendering for some reason).
If you're running on a system with a 10ms granularity on SIGALRM, then
this effectively changes the intervals to 10ms and 30ms. Which is still
better, just not as better.
I suspect this is about as good as we can do without actually going
preemptive, which is an entire other nightmare.
Reviewed-by: Julien Cristau <jcristau@debian.org>
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit 66310ea2893811614b3c3aade8992624a95a6ee7
Author: Adam Jackson <ajax@redhat.com>
Date: Fri Nov 8 09:22:37 2013 -0500
dri3: Disable when Xinerama is active
Pretty sure this can't work.
Reviewed-by: Julien Cristau <jcristau@debian.org>
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit 793fd5eefb0e417614d77fe1522c6548587fbd4e
Author: Adam Jackson <ajax@redhat.com>
Date: Fri Nov 8 09:20:29 2013 -0500
dri2: Disable when Xinerama is active
Would only work on ScreenRec 0, which means it's broken.
Reviewed-by: Julien Cristau <jcristau@debian.org>
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit 2bf92108294805c5c6fef249c2f7de6ecf4975d8
Author: Adam Jackson <ajax@redhat.com>
Date: Fri Nov 8 09:06:59 2013 -0500
present: Disable when Xinerama is active
Among much else Present depends on RANDR types, and RANDR isn't properly
Xinerama-aware yet anyway.
Reviewed-by: Julien Cristau <jcristau@debian.org>
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit ac772cb187ddf7e04b8f4b3a071b90f18f4488d0
Author: Eric Anholt <eric@anholt.net>
Date: Thu Nov 14 17:40:47 2013 -0800
glx: Fix incorrect use of dri_interface.h version defines in driver probing.
If we extend __DRI_CORE or __DRI_SWRAST in dri_interface.h to allow a
new version, it shouldn't make old server code retroactively require
the new version from swrast drivers.
Notably, new Mesa defines __DRI_SWRAST version 4, but we still want to
be able to probe version 1 drivers, since we don't use any features
beyond version 1 of the struct.
Signed-off-by: Keith Packard <keithp@keithp.com>
Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
commit 6e926b18ca1b182253bac435a1d53caaff7ffff6
Author: Eric Anholt <eric@anholt.net>
Date: Thu Nov 14 17:40:46 2013 -0800
glx: Fix incorrect use of dri_interface.h version defines in extensions.
Those defines are so you can compile-time check "do I have a
dri_interface.h that defines this new field of the struct?" You don't
want the server to claim it implements the new struct just because you
installed a new copy of Mesa.
Signed-off-by: Keith Packard <keithp@keithp.com>
Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
commit 57a8ce927332e855dd29ff30210a211a907adb25
Author: Jon TURNEY <jon.turney@dronecode.org.uk>
Date: Fri Nov 29 12:26:43 2013 +0000
configure.ac: Fixup for "Require libpciaccess for int10"
On 16/11/2013 01:00, Connor Behan wrote:
> A --disable-pciaccess build will fail with an int10 module other than
> stub.
>
> Signed-off-by: Connor Behan <connor.behan-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
> ---
> configure.ac | 3 +++
> 1 file changed, 3 insertions(+)
>
> diff --git a/configure.ac b/configure.ac
> index 5e621e0..a843770 100644
> --- a/configure.ac
> +++ b/configure.ac
> @@ -1822,6 +1822,9 @@ if test "x$XORG" = xyes; then
> if test "x$CONFIG_UDEV_KMS" = xyes; then
> AC_MSG_ERROR([Platform device enumeration requires libpciaccess])
> fi
> + if test "x$INT10" != xstub; then
> + AC_MSG_ERROR([Cannot build int10 without libpciaccess])
> + fi
> fi
> AC_MSG_RESULT([$PCI])
>
This causes my build to fail where --disable-int10-module --disable-pciaccess
is the default (as INT10 still has the default value 'x86emu')
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Reviewed-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
Tested-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 653d33941b0808ef910aaa5f3aeab05d9c1a100b
Author: Keith Packard <keithp@keithp.com>
Date: Tue Nov 26 12:18:12 2013 -0800
present: Report damage when flipping
Limit damage to the 'update' region.
Signed-off-by: Keith Packard <keithp@keithp.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
commit 5cf12c9569ac3d83fe1b7a8376c15f8f0b01655e
Author: Keith Packard <keithp@keithp.com>
Date: Tue Nov 26 12:10:48 2013 -0800
present: Also set the root window pixmap when flipping
This makes sure that things like software cursors continue to work
while the screen is flipped.
Signed-off-by: Keith Packard <keithp@keithp.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
commit 4aa77378de69efdc10bced6ba650b0ebff50c112
Author: Keith Packard <keithp@keithp.com>
Date: Tue Nov 26 12:06:57 2013 -0800
present: Clear target_crtc if driver lacks Present support
If the driver doesn't have the necessary hooks for Present, then the
target_crtc needs to be set to NULL to make sure the extension uses
the present_fake code.
Signed-off-by: Keith Packard <keithp@keithp.com>
Tested-by: Fredrik Höglund <fredrik@kde.org>
Reviewed-by: Adam Jackson <ajax@redhat.com>
commit 3dd5bfe540b295bb37a2c2fd0ba4a31fb217612b
Author: Keith Packard <keithp@keithp.com>
Date: Thu Nov 21 22:48:31 2013 -0800
present: Send GLX_BufferSwapComplete events from present extension
This allows GL to support the GLX_INTEL_swap_event extension.
v2: Return GLX_BLIT_COMPLETE_INTEL for unknown swap types
Signed-off-by: Keith Packard <keithp@keithp.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
commit cde86e68fcb716f34c90f5a16eb868870f5c85e4
Author: Keith Packard <keithp@keithp.com>
Date: Mon Nov 25 23:06:08 2013 -0800
present: Set window pixmap to flipped pixmap
This makes other drawing to the window appear on the screen.
Note that no child windows can be affected because only full-screen
windows are eligible for flipping, and so we only need to set pixmap
for the window itself.
Signed-off-by: Keith Packard <keithp@keithp.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
commit 04e138846e128670d409798aa2e797c3c5503a47
Author: Keith Packard <keithp@keithp.com>
Date: Mon Nov 25 23:10:17 2013 -0800
present: Leave vblank on window list until flip complete
If the window is destroyed, then we've got cleanup work to do, even if
the vblank has already been executed -- we need to clear the window
pointer so that we don't try to deliver events to it.
Leaving it on the window list meant that when walking that list, we
need to know whether the vblank is waiting to be executed or waiting
for the flip to complete, so a new 'queued' flag was added to the
vblank to distinguish between the two states.
Signed-off-by: Keith Packard <keithp@keithp.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
commit b121d62accb8c346b4e1b1bce99586e13712f04a
Author: Keith Packard <keithp@keithp.com>
Date: Tue Nov 26 03:07:55 2013 -0800
present: Add a debug output line when skipping a pending present
When an application provides two pixmaps for the same MSC, the
previous one is skipped. This just dumps out some information at that point
Signed-off-by: Keith Packard <keithp@keithp.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
commit ae24f5bf6b31c035af50e14727966055ed8767bd
Author: Maarten Lankhorst <maarten.lankhorst@canonical.com>
Date: Tue Dec 3 17:01:28 2013 +0100
bump to 0.8.1
commit 59e324abd7cbda5d301b7b67125cd6d96684f000
Author: Thierry Reding <thierry.reding@gmail.com>
Date: Tue Nov 26 17:08:03 2013 +0100
Properly identify DSI outputs
Newer Linux kernels support DSI outputs. To be able to identify them
properly, add DSI to the list of output names.
Reviewed-by: Aaron Plattner <aplattner@nvidia.com>
Signed-off-by: Thierry Reding <treding@nvidia.com>
commit 190289f6393191bb3c58067ce1df994809475077
Author: Thierry Reding <thierry.reding@gmail.com>
Date: Tue Nov 26 17:08:02 2013 +0100
Staticise and constify output names
This array isn't used anywhere outside this file, so it can be made
static. While at it, make the array const as well.
Signed-off-by: Thierry Reding <treding@nvidia.com>
Reviewed-by: Aaron Plattner <aplattner@nvidia.com>
commit eafba23b34be31c141ddafb8380520ac9a0622ac
Author: Keith Packard <keithp@keithp.com>
Date: Thu Nov 21 22:45:18 2013 -0800
miext/sync: Handle libxshmfence API change
libxshmfence had an unfortunate 'int32_t' type for the mapped fence.
That changed to exposing a 'struct shmfence' instead, which is nice
and opaque and offers fine type checking across the API.
This patch requires the newer version of the library and uses
the new interface type.
Signed-off-by: Keith Packard <keithp@keithp.com>
Reviewed-by: Julien Cristau <jcristau@debian.org>
commit b6d7ed4d787a652e8150532f384bfdf51760f3c2
Author: Keith Packard <keithp@keithp.com>
Date: Thu Nov 21 22:12:34 2013 -0800
miext: Move SyncShm FDs out of the way of clients
Applications may end up allocating a bunch of shmfence objects, each
of which uses a file descriptor, which must be kept open lest some
other client ask for a copy of it later on.
Lacking an API that can turn a memory mapping back into a file
descriptor, about the best we can do is push the file descriptors out
of the way of other X clients so that we don't run out of the ability
to accept new connections.
This uses fcntl F_GETFD to push the FD up above MAXCLIENTS.
Signed-off-by: Keith Packard <keithp@keithp.com>
Reviewed-by: Julien Cristau <jcristau@debian.org>
commit cc63204926c6da83d9221c5f8c0dc8f5e2f2481d
Author: Keith Packard <keithp@keithp.com>
Date: Wed Nov 13 14:16:33 2013 +0900
Xext: Use SHMDIR and O_TMPFILE when creating mapping files
ShmCreateSegment asks for a file descriptor for a memory mapped file
created by the X server. This patch uses O_TMPFILE where available,
and also uses the SHMDIR directory to store the files, both for the
O_TMPFILE and mkstemp cases.
Signed-off-by: Keith Packard <keithp@keithp.com>
Reviewed-by: Julien Cristau <jcristau@debian.org>
commit 5a969f0928b84da5cfe0777dfb542caaacc915ad
Author: Keith Packard <keithp@keithp.com>
Date: Wed Nov 13 12:17:10 2013 +0900
Select directory for MIT-SHM temp files at configure time
By default, this looks through a list of directories to find one which
exists, but can be overridden with --with-shared-memory-dir=PATH
This patch doesn't actually do anything with this directory, just
makes it available in the configuration
Signed-off-by: Keith Packard <keithp@keithp.com>
Reviewed-by: Julien Cristau <jcristau@debian.org>
commit d695cb7fb6bb8fd159a332d902673edbbd2237d7
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Mon Nov 25 22:19:34 2013 -0800
Xdmx: Initialize DMX extension even if not built with GLX support
dmxAddExtensions takes an argument to determine if it should just
initialize the DMX extension, or both DMX & GLX, but if GLX wasn't
compiled in, the entire call was #ifdef'ed out, leaving the DMX
extension unavailable.
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Julien Cristau <jcristau@debian.org>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit bd70def07754357d26b86c287037eb3884631daf
Author: Connor Behan <connor.behan@gmail.com>
Date: Fri Nov 15 17:00:40 2013 -0800
configure.ac: Require libpciaccess for int10
A --disable-pciaccess build will fail with an int10 module other than
stub.
Signed-off-by: Connor Behan <connor.behan@gmail.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit a575c1dc64c10bc88bd0e963ebb8ab137f59a078
Author: Connor Behan <connor.behan@gmail.com>
Date: Fri Nov 15 17:00:20 2013 -0800
configure.ac: Require libpciaccess for platform bus support
There is currently no reason to build with --enable-config-udev-kms and
--disable-pciaccess but anyone who tries this should know that the build
will fail.
Signed-off-by: Connor Behan <connor.behan@gmail.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 361dfe74eaa2f1eddb54abdecca1d8b1b3f58704
Author: Connor Behan <connor.behan@gmail.com>
Date: Fri Nov 15 17:00:00 2013 -0800
configure.ac: Add whitespace near PCI configuration
Signed-off-by: Connor Behan <connor.behan@gmail.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 80481267662c8687e73081237913fa561e7a6561
Author: Keith Packard <keithp@keithp.com>
Date: Sat Nov 23 22:22:37 2013 -0800
Bump release to 1.14.99.903 (1.15 RC3)
Signed-off-by: Keith Packard <keithp@keithp.com>
commit f1604002a32b7f098c2a16b4a8649c694af570c8
Author: Keith Packard <keithp@keithp.com>
Date: Mon Nov 18 22:36:17 2013 -0800
miext: Ensure xshmfence is only called when driver supports it
This provides a place for drivers to insert their own FD-based
SyncFence implementations, and prevents applications from using DRI3
SyncFence creation functions unless the driver has some support for
them.
Signed-off-by: Keith Packard <keithp@keithp.com>
Tested-by: Fredrik Höglund <fredrik@kde.org>
commit 037566c57caff93fd7717f385d4b532b81f19c77
Author: Keith Packard <keithp@keithp.com>
Date: Mon Nov 18 22:33:27 2013 -0800
Xext: Recover from miSyncInitFenceFromFD failure without crashing
miSyncDestroyFence must not be called unless miSyncInitFence has been
invoked, so if miSyncInitFenceFromFD fails, we must free the fence
manually.
Signed-off-by: Keith Packard <keithp@keithp.com>
Tested-by: Fredrik Höglund <fredrik@kde.org>
commit e7000534a456fdf9cd4eaada3193846c8525f740
Author: Chris Wilson <chris@chris-wilson.co.uk>
Date: Sat Oct 5 08:47:03 2013 +0100
glx/glxdri2: Unwrap EnterVT/LeaveVT upon CloseScreen
In a similar spirit to
commit d75e8146c414bfd512ba5dbd4a83acb334bbe19b
Author: Keith Packard <keithp@keithp.com>
Date: Mon Jul 12 16:01:34 2010 -0700
Unwrap/rewrap EnterVT/LeaveVT completely, Fixes 28998
we need to unwrap our pScrn->EnterVT/LeaveVT hooks around server
regeneration or else we cause an infinite recursion on the next VT
switch afterwards.
Bugzilla: https://bugs.launchpad.net/ubuntu/+source/xserver-xorg-video-intel/+bug/1235516
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Reviewed-by: Keith Packard <keithp@keithp.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 6d5883bd7e5b765f8f0548501b825d9e56840799
Author: Keith Packard <keithp@keithp.com>
Date: Sat Nov 23 16:19:46 2013 -0800
xnest: Ignore GetImage() error in xnestGetImage() (v3)
(I found an amended version of this patch and applied the difference
here - keithp)
v3: Don't call Xsync before restoring error handler as any errors
generated by XGetImage() should be processed when this call
returns as suggested by Jamey Sharp <jamey@minilop.net>
Signed-off-by: Egbert Eich <eich@freedesktop.org>
Reviewed-by: Jamey Sharp <jamey@minilop.net>
commit 6403cbb143c67872ca9c58e3116ae7942def0ae1
Author: Keith Packard <keithp@keithp.com>
Date: Tue Nov 19 22:13:54 2013 -0800
present: When unflipping, copy to flip window rather than screen
unflip happens after the clip lists have been updated, so instead of
smashing the whole screen and drawing over other windows, just draw to
the original flip window; it'll have the right clip list and so the
copy will work just fine.
Signed-off-by: Keith Packard <keithp@keithp.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
commit 8bdd2ccc776ded3f527596b5009ef25129aa3287
Author: Keith Packard <keithp@keithp.com>
Date: Mon Nov 11 18:03:42 2013 -0800
present: Block for wait_fence in present_execute
Pend presentation until wait_fence is also triggered by having the
SyncFence trigger invoke present_execute once triggered.
Signed-off-by: Keith Packard <keithp@keithp.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
commit e5a188cb919edee2e3a03054276bce0db02f7b62
Author: Keith Packard <keithp@keithp.com>
Date: Sat Nov 9 12:36:47 2013 -0800
present: Signal destroyed flip window with vblank->window == NULL
This eliminates dereferencing freed window pointers when there is a
flip for that window in progress. The flip will complete, and then
immediately get undone (as we can't stop an in-progress flip).
Remove the vblank->window_destroyed field as we can signal this with
vblank->window == NULL instead.
Change check to vblank->window == NULL in:
present_flip_notify
Add check for vblank->window == NULL in:
present_vblank_notify
present_execute
present_flip_notify was also using vblank->window->drawable.pScreen,
so stop doing that and use vblank->screen instead.
Signed-off-by: Keith Packard <keithp@keithp.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
commit a5bcc4f7b9499caf8993f0a6ef96088553399ca3
Author: Keith Packard <keithp@keithp.com>
Date: Sat Nov 9 12:33:02 2013 -0800
present: Ignore event_id 0 from driver vblank notify
We use event_id 0 to mean 'no such event'; if a driver sends us that
event_id, make sure we don't accidentally match it.
Signed-off-by: Keith Packard <keithp@keithp.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
commit 4f3c37a1f17ffcfbbff71d217e1caad3d0148c90
Author: Keith Packard <keithp@keithp.com>
Date: Thu Nov 7 14:17:12 2013 -0800
present: Round fake MSC computations intead of truncating
If the timer fired too early, we'd sometimes mis-compute the MSC for
fake vblanks. Rounding the computation to the nearest MSC fixes this nicely.
Signed-off-by: Keith Packard <keithp@keithp.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
commit da9997f89f14ab619f244d5b2e80a423b028c789
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Tue Nov 19 08:07:09 2013 +1000
configure: allow for --enable-libunwind and --disable-libunwind
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Keith Packard <keithp@keithp.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit a307ac27382dd0c377cd1a436cb25cb5aaa54416
Author: Keith Packard <keithp@keithp.com>
Date: Fri Nov 15 13:39:52 2013 +0900
Handle new DamageUnregister API which has only one argument
API change in 1.15
Signed-off-by: Keith Packard <keithp@keithp.com>
commit d6ffce4b0e2376e1f8f04ee70b323a6aea3e517e
Author: Keith Packard <keithp@keithp.com>
Date: Fri Nov 15 13:26:36 2013 +0900
Clean up compiler warnings.
Add const to any immutable string pointers.
Rename 'range' to 'prop_range' to avoid redefined warning.
Eliminate some unused return values.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 29240e5cbf6e7f875b128fc7bfc4d56b2350835a
Merge: 0492deb8f8 8ff7e32c3e
Author: Keith Packard <keithp@keithp.com>
Date: Thu Nov 14 17:02:04 2013 +0900
Merge remote-tracking branch 'whot/for-keith'
commit 0492deb8f8238b7782e5a706ec6219d88aa1091d
Author: Adam Jackson <ajax@redhat.com>
Date: Tue Oct 29 12:09:27 2013 -0400
mieq: Bump default queue size to 512
Based on some bugzilla scraping I did around November 2012. Of xserver
bugs in Red Hat bugzilla with an EQ size message in the log, the
distribution looked like:
String | Matches
-------------------------------------
Increasing EQ size to 512 | 460
Increasing EQ size to 1024 | 52
Increasing EQ size to 2048 | 6
Increasing EQ size to 4096 | 0
Most of the "512" ones appear to be mostly harmless, some relatively
expensive path in either rendering or resource destruction simply taking
too long due to external pressures like paging or CPU contention. So
let's raise the initial queue size, both to reduce the number of
spurious abrt reports and to drop fewer events in all but the most
pathological cases.
Signed-off-by: Adam Jackson <ajax@redhat.com>
Reviewed-by: Jasper St. Pierre <jstpierre@mecheye.net>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit d1440783a7367ff0d0c47d256bbca3b3cf8a5034
Author: Dave Airlie <airlied@redhat.com>
Date: Tue Oct 29 12:09:26 2013 -0400
xfree86: return NULL for compat output if no outputs.
With outputless GPUs showing up we crash here if there are not outputs
try and recover with a bit of grace.
Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit d7ee27e5e415778240919082c83a65226c6f17e6
Author: Dan Horák <dan@danny.cz>
Date: Tue Oct 29 12:09:25 2013 -0400
test: build the touch test only when building Xorg
Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Dan Horák <dan@danny.cz>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 8ff7e32c3ef7b0c13c4ab9664f651e9782d35a85
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Wed Nov 13 17:14:11 2013 +1000
include: export key_is_down and friends
VNC needs key_is_down to check if a key is processed as down before it
simulates various key releases. Make it available, because I seriously can't
be bothered thinking about how to rewrite VNC to not need that.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Acked-by: Keith Packard <keithp@keithp.com>
commit 0ba7fc8472f1227fd1cd51bd58048f164b8ea1ab
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Tue Nov 12 14:46:04 2013 -0800
Stop including inline assembly .il file for Solaris Studio builds
Since all the inb/outb/etc. use in the X server itself (except for
xf86SlowBcopy) has been replaced by calls to libpciaccess, we no
longer need to pass inline assembly files to replace the gcc inline
assembly from hw/xfree86/common/compiler.h when building Xorg itself.
The .il files are still generated and installed in the SDK for the
benefit of drivers who may use them.
Binary diff of before and after showed that xf86SlowBcopy was the
only function changed across the Xorg binary and all modules built
in the Xserver build, it just calls the outb() function now instead
of having the outb instructions inlined, making it a slightly slower
bcopy.
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Keith Packard <keithp@keithp.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 550baf38f6096658f0bcf0ad647c4fedf93132f2
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri Oct 4 10:55:52 2013 +1000
kdrive: fix cursor jumps on CursorOffScreen behavior
This patch fixes cursor jumps when there is a grab on the Xephyr window and
the pointer moves outside the window.
So on two side-by-side 640x480 screens, a coordinate of 0/481
triggers KdCursorOffscreen.
If the delta between two screens is 0, they share the same offset for
that dimension. When searching for the new screen, the loop always rules out
the current screen. So we get to the second screen, trigger the conditions
where dy <= 0 and decide that this new screen is the correct one. The result
is that whenever KdCursorOffScreen is called, the pointer jumps to the other
screen.
Change to check for dy < 0 etc. so that the cursor stays on the same screen if
there is no other screen at the target location.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Keith Packard <keithp@keithp.com>
commit a94d945065177d73f3ee8dc0b9147264ba281136
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Tue Oct 29 14:24:41 2013 +1000
kdrive: modify ephyr events to use POINTER_DESKTOP and scale them to that
A multi-head Xephyr instance has the pointer stuck on one screen
because of bad coordinate calculation. The coordinates passed to
GetPointerEvents are per-screen, so the cursor gets stuck on the left-most
screen by default.
Adjust and mark the events as POINTER_DESKTOP, so the DIX
can adjust them accordingly.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Keith Packard <keithp@keithp.com>
commit d66832a3b8a8675f1e5f3656dcb1bbe95598f0ea
Author: Keith Packard <keithp@keithp.com>
Date: Thu Nov 14 13:21:54 2013 +1000
kdrive: handle WxH as valid geometry spec
If a screen size was specified as WxH, the loop returned early and kdOrigin
was never advanced. Thus, screen->origin was always 0 (or whatever was given
at the -origin commandline flag).
If a screen size was given with a bit depth (WxHxD), kdOrigin would always
advance by the current screen, offsetting the next screen.
Signed-off-by: Keith Packard <keithp@keithp.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit c8c5105c1d5c093675d7f571f158147f22f7572b
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Tue Oct 29 14:33:56 2013 +1000
ephyr: xcb_connect returns an error, not NULL
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Keith Packard <keithp@keithp.com>
commit 2aa67ccef6ad8f51deb94b66defc668ddb7d226c
Author: Keith Packard <keithp@keithp.com>
Date: Thu Nov 14 10:26:20 2013 +0900
Update to version 1.14.99.902
1.15 RC2
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 9309d2a009a6a3b6090fc377fc7a3eded1a34dc0
Author: Keith Packard <keithp@keithp.com>
Date: Wed Nov 13 07:01:45 2013 +0900
xext: Fix shmint.h to not use headers outside of sdk_HEADERS
shmint.h is part of sdk_HEADERS, and so can't use anything not
included in sdk_HEADERS.
busfault.h includes dix-config.h which is not. Leave the use of
struct busfault in shmint.h and move the include of busfault.h to
shm.c.
protocol-versions.h is not part of sdk_HEADERS, so instead of using
that, just use XTRANS_SEND_FDS to choose whether to expose the fd
passing requests directly.
Reported-by: Julien Cristau <jcristau@debian.org>
Signed-off-by: Keith Packard <keithp@keithp.com>
Tested-by: Knut Petersen <Knut_Petersen@t-online.de>
Reviewed-by: Julien Cristau <jcristau@debian.org>
v2: also avoid using protocol-versions.h
commit 4a251f5883b042cd902c192060a0be2b11148f2b
Author: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
Date: Fri Nov 8 14:55:33 2013 -0800
xfree86: Fix build without libpciaccess
Regression fix from commit 04ab07ca19236d6c9a947e065fb69b0dd0d16639
Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
Reviewed-by: Connor Behan <connor.behan@gmail.com>
commit 5b02d5b7aaabf1ba8dcbdfe4525b7995b4e79f92
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Thu Nov 7 21:08:56 2013 -0800
Enable XTRANS_SEND_FDS on Solaris too.
Requires passing through the __EXTENSIONS__ and _XOPEN_SOURCE defines
in order to expose the msg_control members in struct msghdr.
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
commit c4c154d18ef42dc550f2675a9ee88e07b1ca6bed
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Thu Nov 7 21:05:33 2013 -0800
Avoid conflicts with Solaris <sys/regset.h> defines that clash with our names
When building on Solaris with _XOPEN_SOURCE set to a recent XPG release,
<stdlib.h> and other core headers start including <sys/regset.h>, which
has a bunch of unfortunately named macros such as "CS", "ES", etc. for
x86 & x64 registers which clash with existing variable & struct member
names in Xorg - so #undef these so they don't interfere with our use.
(Yes, have filed a bug against the system headers for exposing these,
but this solves the problem for building on existing releases.)
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
commit d7f9be0f8541368bf1a095ad1fbe7f38be6d3d15
Author: Keith Packard <keithp@keithp.com>
Date: Mon Nov 11 15:48:41 2013 -0800
Proper spelling of MAP_ANONYMOUS is MAP_ANON.
The former doesn't exist on BSD and the latter is available everywhere
AFAIK (checked Solaris and Linux).
You also might want to wrap that line ;).
Reported-by: Mark Kettenis <mark.kettenis@xs4all.nl>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit fc84166e65c35ad75f566b135dcfc305ad5a2fde
Author: Keith Packard <keithp@keithp.com>
Date: Thu Nov 7 15:18:28 2013 -0800
Get rid of the rest of the FD passing code when XTRANS_SEND_FDS isn't set
req_fds and SetReqFds in include/dixstruct.h
ReadFdFromClient, WriteFdToClient and the FD flushing in os/io.c
Signed-off-by: Keith Packard <keithp@keithp.com>
commit a239e6faf3fce848ac0d10c48f8e817db68a493c
Merge: 43e5a43fa8 f70a8bf371
Author: Keith Packard <keithp@keithp.com>
Date: Mon Nov 11 15:26:12 2013 -0800
Merge remote-tracking branch 'jeremyhu/master'
commit 43e5a43fa8994e50cf01dd954118f4ef2c4e7933
Author: Adam Jackson <ajax@redhat.com>
Date: Thu Nov 7 12:01:41 2013 -0500
present: Don't try to initialize when building without present support
There's a --disable-present, so it'd be nice if it worked.
Signed-off-by: Adam Jackson <ajax@redhat.com>
Reviewed-by: Jasper St. Pierre <jstpierre@mecheye.net>
Reviewed-by: Mark Kettenis <kettenis@openbsd.org>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 0822a23e048b12c98c654e8b6af711c5f2c97141
Author: Keith Packard <keithp@keithp.com>
Date: Thu Nov 7 03:19:42 2013 -0800
present: Change debug output a bit to help diagnose missing vblank signals
Signed-off-by: Keith Packard <keithp@keithp.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
commit 20bb49ae9ba11d3dccfba191483cd682d9c9d96c
Author: Keith Packard <keithp@keithp.com>
Date: Wed Nov 6 23:56:26 2013 -0800
Present: Check for window/fence destroyed when idling pixmaps
A client destroying objects in the middle of an unflip can end up
having the screen flip window or fence set to NULL in the unflip
notify path. Check for these and don't try to use those objects.
Signed-off-by: Keith Packard <keithp@keithp.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
commit 41da295eb50fa08eaacd0ecde99f43a716fcb41a
Author: Keith Packard <keithp@keithp.com>
Date: Sun Nov 3 13:12:40 2013 -0800
Trap SIGBUS to handle truncated shared memory segments
If a client passes a section of memory via file descriptor and then
subsequently truncates that file, the underlying pages will be freed
and the addresses invalidated. Subsequent accesses to the page will
fail with a SIGBUS error.
Trap that SIGBUS, figure out which segment was causing the error and
then allocate new pages to fill in for that region. Mark the offending
shared segment as invalid and free the resource ID so that the client
will be able to tell when subsequently attempting to use the segment.
Signed-off-by: Keith Packard <keithp@keithp.com>
v2: Use MAP_FIXED to simplify the recovery logic (Mark Kettenis)
v3: Also catch errors in ShmCreateSegment
Conflicts:
include/dix-config.h.in
include/xorg-config.h.in
commit 719e880d7698d92f9b854b217ef9680aaa446f2e
Author: Keith Packard <keithp@keithp.com>
Date: Wed Nov 6 23:22:51 2013 -0800
Require libXtrans version 1.3.2
This has the FD passing support included
Signed-off-by: Keith Packard <keithp@keithp.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
commit bee2ec54049377e0033d49abff20d7bd069c62aa
Author: Keith Packard <keithp@keithp.com>
Date: Sun Nov 3 10:08:15 2013 -0800
Xext: Enable MIT-SHM FD-passing request definitions only when possible
Check to see if xtrans FD passing is available and use that to
advertise the appropriate version of the SHM extension
Signed-off-by: Keith Packard <keithp@keithp.com>
Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
commit ea8acfe3e2f74a46c3f1e91809b4b99af18502b7
Author: Keith Packard <keithp@keithp.com>
Date: Wed Nov 6 23:06:28 2013 -0800
Require xextproto version 7.2.99.901
This includes the MIT-SHM FD passing requests
Signed-off-by: Keith Packard <keithp@keithp.com>
Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
commit 914672fefacc15386041e7c2bc3beed4faf45e9d
Author: Keith Packard <keithp@keithp.com>
Date: Thu Nov 7 14:20:26 2013 -0800
Remove dix-config.h config variables from xorg-config.h
xorg-config.h includes dix-config, so there's no need to duplicate.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 7aad79c5a582ece301d950bd65f0bcb4b9956e86
Author: Keith Packard <keithp@keithp.com>
Date: Wed Nov 6 23:05:46 2013 -0800
Make XTrans FD passing support optional. Define only on Linux
Until other operating systems have a libXtrans port for FD passing,
disable this on non-Linux systems.
Note that this define affects how libXtrans gets built into the X
server, which is why it need only define the symbol
Signed-off-by: Keith Packard <keithp@keithp.com>
commit f70a8bf3714d89bccaad36841ef9149e91ad3bba
Author: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
Date: Sun Nov 10 11:40:27 2013 -0800
XQuartz: Don't sleep forever on exit if usleep() returns an error
Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
commit ebcc1c214c466582d7b92826b4860256fd9c582a
Author: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
Date: Sun Nov 10 11:26:49 2013 -0800
XQuartz: Update Info.plist copyright years
Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
commit 81c123ea2dd833864f7ba217791e59acca0f7c97
Author: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
Date: Mon Nov 4 12:13:45 2013 -0800
configure.ac: Move GLX section after DRI
The GLX section of configura.ac checks the state of DRI2, so it
needs to be after DRI2=auto is resolved.
Also reset libgl requirement to 7.1.0 in non-dri2 case.
Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
commit ab4b1fb38a61feb73d8336cc7a3399eb9d3d25be
Author: Andreas Schwab <schwab@suse.de>
Date: Thu Aug 15 12:03:42 2013 +0200
ARM64: Add support for aarch64
Signed-off-by: Andreas Schwab <schwab@suse.de>
Reviewed-by: Mark Kettenis <kettenis@openbsd.org>
Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 8fcf82cbf015609e00b3feb9bc567133c7aee5cf
Author: Keith Packard <keithp@keithp.com>
Date: Tue Nov 5 18:39:11 2013 -0800
Use $GL_LIBS instead of -lGL for linking
-lGL presumes that the GL library is in the system path, while
$GL_LIBS is auto-detected.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit f348935e7d2c84a438aba08eee2f2c4e0dc77d20
Author: Keith Packard <keithp@keithp.com>
Date: Tue Nov 5 18:37:12 2013 -0800
Link with xshmfence, reference miSyncShmScreenInit in sdksyms
This gets the server to link with xshmfence again, and also ensures
that the miSyncShm code is linked into the server with the reference
from sdksyms.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 5f1e832694e57986c0185048a941b3af51b2f85f
Author: Julien Cristau <jcristau@debian.org>
Date: Tue Nov 5 07:08:21 2013 -0800
os: Actually use the computed clockid in GetTimeInMicros
The selection of which clock to use for this function was not actually
getting used when fetching the final clock value.
Reported-by: Julien Cristau <jcristau@debian.org>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 903a058370645ea075ea98d380fd565efb6160c9
Author: Keith Packard <keithp@keithp.com>
Date: Mon Nov 4 19:01:26 2013 -0800
hw/xfree86: Link libdri3 only when DRI3 is defined
Don't attempt to link non-existant libraries...
Signed-off-by: Keith Packard <keithp@keithp.com>
commit aaf0e29619196a283fee7ead2020a91032d84f48
Author: Keith Packard <keithp@keithp.com>
Date: Sun Nov 3 09:56:02 2013 -0800
Disable DRI3 and sync fence FD functions if xshmfence isn't available
Make sure the server can build when the xshmfence library isn't present
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 33c85beed521c9db140cadd8c5aa9992398ee1fe
Author: Keith Packard <keithp@keithp.com>
Date: Fri Nov 1 01:01:58 2013 -0700
Set version to 1.14.99.901 (1.15 RC1)
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 9db1d66f6d2c6857de220d8f1c08965962fe1416
Author: Keith Packard <keithp@keithp.com>
Date: Fri Nov 1 01:43:59 2013 -0700
Add dri3 and present directorys to distribution
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 977e2644b1d9e13b44debcb9a372bbc832ee32a3
Merge: 66c5ee0ff4 f36f5a65f6
Author: Keith Packard <keithp@keithp.com>
Date: Fri Nov 1 00:34:18 2013 -0700
Merge remote-tracking branch 'whot/for-keith'
commit 66c5ee0ff4690e630a69656331fd9d545c99c26c
Author: Egbert Eich <eich@freedesktop.org>
Date: Wed Aug 14 18:18:56 2013 +0200
config/APM: Add option to disable building of APM support on Linux
APM support in the Xserver was used to restore the console mode
prior to a power management event. This was to ensure the mode
upon suspend/resume was one that the system firmware or kernel
could deal with.
APM support is now largely obsolete, KMS drivers don't require a
mode restoration anyhow. Therefore it should be possible to disable
this feature.
(small modification by keithp - move test for XF86PM flag after check
for APM, then move XF86PM flag to xorg-config.h.in)
Signed-off-by: Egbert Eich <eich@freedesktop.org>
Tested-by: Keith Packard <keithp@keithp.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit f36f5a65f639b6524191d888d5bf89e73027156c
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Wed Oct 30 15:40:58 2013 +1000
sync: fix corner-case in triggering idle alarms
ProcessInputEvent() resets the device idle times. If idle time was higher than
the lower bracket, this should trigger an event in the idle time wakeup
handler.
If processing is slow, the idle time may advance past the lower bracket
between the reset and the time the BlockHandler is called. In that case, we'd
never schedule a wakeup to handle the event, causing us to randomly miss
events.
Ran tests with a neg transition trigger on 5ms with 200 repeats of the test
and it succeeded. Anything below that gets a bit tricky to make sure the
server sees the same idle time as the client usleeps for.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Keith Packard <keithp@keithp.com>
commit f994d99539192a10a8c83047e11991f52e0ca677
Author: Egbert Eich <eich@freedesktop.org>
Date: Wed Aug 14 18:18:39 2013 +0200
config/ACPI: Add option to disable building of ACPI support on Linux
ACPI support in the Xserver was used to restore the console mode
prior to a power management event. This was to ensure the mode
upon suspend/resume was one that the system firmware or kernel
could deal with.
The feature depended on acpid to be running. Most of this functionality
is now take over by systemd, KMS drivers don't require a mode restoration
anyhow. Therefore it should be possible to disable this feature under
some circumstances.
Tested-by: Keith Packard <keithp@keithp.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 2aa5092b88174cb9988076ae96298217c97ad75f
Author: Egbert Eich <eich@freedesktop.org>
Date: Mon Aug 12 18:21:33 2013 +0200
DDX/Randr: Avoid server crash when xrandr SetConfig is called while switched away
A call to Xrandr SetScreenConfig (for randr 1.1) causes the Xserver to
crash when xf86SetViewport() which does not check if the hardware is
accessible.
Wrap accesses to xf86SetViewport() with if (vtSema) { ... } to avoid that.
Signed-off-by: Egbert Eich <eich@freedesktop.org>
Reviewed-by: Keith Packard <keithp@keithp.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 508e05777aba823c93a2417cc26d18c9f061ca26
Author: Egbert Eich <eich@freedesktop.org>
Date: Mon Aug 12 18:20:36 2013 +0200
DDX/Events: Distinguish between Input- and GeneralHandlers in xf86VTSwitch()
When enabling/disabling input handlers in xf86VTSwitch() we treat Input-
and GeneralHandlers equally. The result is that after a VT switch the
masks for EnabledDevices and AllSockets are equal and the distiction
between both types is lost.
Signed-off-by: Egbert Eich <eich@freedesktop.org>
Reviewed-by: Daniel Stone <daniel@fooishbar.org>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 0cb33ce34081d7d123ec565582d7d19bdb3964ad
Author: Egbert Eich <eich@freedesktop.org>
Date: Sat Oct 5 08:02:28 2013 +0200
DDX/modes: Add a sanity check when using screen sizes from EDID
EDID sometimes lies about screen sizes. Since the screen size is used
by clients to determine the DPI a wrong ration will lead to terrible
looking fonts.
Add a sanity check for the h/v ratio cutting off at 2.4. This would
still accept the cinemascope aspect ratio as valid.
Also add message suggesting to add a quirk table entry.
Signed-off-by: Egbert Eich <eich@freedesktop.org>
Reviewed-by: Keith Packard <keithp@keithp.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 41d4beb2616ceb3f1a1b8694733e85bae70de59a
Author: Egbert Eich <eich@freedesktop.org>
Date: Wed Aug 14 11:50:26 2013 +0200
DDX/DPMS: Call dixSaveScreens() also when screen is turned on
DMPS calls dixSaveScreens() when turned off but not when turned
on. In most cases this is irrelevant as DPMS is done when a
key is hit in which case dixSaveScreens() will be called to
unblank anyhow. This isn't the case if we use xset (or the
DPMS extension directly) to unblank.
Check screenIsSaved to make sure the state needs to be changed
before calling dixSaveScreens().
Signed-off-by: Egbert Eich <eich@freedesktop.org>
Reviewed-by: Keith Packard <keithp@keithp.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 623c4147650d0404cfbea0f9b7df66dc7d928e00
Author: Søren Sandmann Pedersen <ssp@redhat.com>
Date: Mon Oct 21 17:11:56 2013 -0400
ephyr: Ensure stride of private framebuffer is multiple of 4
The fb layer of X can't deal with strides that are not a multiple of
4, so when Xephyr allocates its own framebuffer it should make sure to
align it.
This fixes crashes and rendering corruption when Xephyr runs in a
depth that is different from the host X server and its screen size is
not a multiple of 4 / depth. (This is particularly easy to trigger if
you use the -resizeable option).
Reviewed-by: Eric Anholt <eric@anholt.net>
Signed-off-by: Soren Sandmann <ssp@redhat.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
commit 97cf53cc2ad7ecfdd495133bad31d0ec7d939326
Author: Søren Sandmann Pedersen <ssp@redhat.com>
Date: Mon Oct 21 16:58:54 2013 -0400
ephyr: hostx_screen_init(): Fix bits_per_pixel and bytes_per_line
When the depth of the Xephyr server matches that of the host X server,
Xephyr simply uses the buffer associated with the XImage as its
framebuffer. In this case, it is correct to get the bits_per_pixel and
bytes_per_line values returned from hostx_screen_init() from the XImage.
However, when the depth doesn't match the host, Xephyr uses a private
framebuffer that is periodically copied to the XImage. In this case,
the returned values of bits_per_pixel and bytes_per_line should be
those of the private framebuffer, not those of the XImage.
Reviewed-by: Eric Anholt <eric@anholt.net>
Signed-off-by: Soren Sandmann <ssp@redhat.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
commit 55246b67b755d4c1039d54971fe3f77ea60d604e
Author: Søren Sandmann Pedersen <ssp@redhat.com>
Date: Tue Oct 8 17:45:40 2013 -0400
xf86AddBusDeviceToConfigure(): Store device in DevToConfig[i].pVideo
After fc3ab84d the pVideo field in DevToConfig[i] is no longer
initialized, so it's always NULL. This causes the duplicate finding
algorithm in the beginning of the function to not work anymore as it
is based on this field.
The symptom of this bug is that X -configure reports
Number of created screens does not match number of detected devices.
Configuration failed.
Server terminated with error (2). Closing log file.
rather than producing a working config file.
This patch fixes that bug by initializing the field before calling
xf86PciConfigureNewDev().
Cc: tvignatti@gmail.com
Signed-off-by: Soren Sandmann <ssp@redhat.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
commit 95bf478b78e466002c382bcde7d4d62591e9215d
Merge: abf5d5ac12 bb745f2b45
Author: Keith Packard <keithp@keithp.com>
Date: Thu Oct 31 18:18:19 2013 -0700
Merge remote-tracking branch 'jeremyhu/master'
commit abf5d5ac12437ebe156b4dd500c2acd69eea3654
Author: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
Date: Thu Oct 31 08:57:56 2013 -0700
miext/damage: Partial revert of "Only wrap into the GC ops chain if there's a listener (v3)"
Fixes regression from: 4dc2a76740d921c824a4d8193f39dd373475f02a
http://lists.x.org/archives/xorg-devel/2013-May/036241.html
https://trac.macports.org/ticket/38993
Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit e4636072949a76477fe7c9d54662a0b3536b1372
Merge: 17ed7ac1fe 5c5c1b7798
Author: Keith Packard <keithp@keithp.com>
Date: Thu Oct 31 17:05:48 2013 -0700
Merge remote-tracking branch 'keithp/dri3'
commit 17ed7ac1fe7426d66f688087c09da5ff1dbb41d3
Author: Adam Jackson <ajax@redhat.com>
Date: Thu Oct 31 18:39:22 2013 -0400
glx: Lie about GLX_Y_INVERTED_EXT
Well, that was lame. The problem with reporting y inversion honestly is
that libGL asks the driver _its_ opinion of Y inversion, which it just
fabricates from whole cloth. So then when libGL goes to compare the
driver's idea of fbconfigs with that of the server - a fairly dumb idea
to begin with - nothing matches, and direct rendering fails, and
sadness.
So until the DRI drivers are fixed we should just continue to lie about
Y inversion. GLX_DONT_CARE is what libGL would make up for that
attribute if we hadn't sent it, so just send that instead.
Signed-off-by: Adam Jackson <ajax@redhat.com>
Tested-by: Keith Packard <keithp@keithp.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 5c5c1b77982a9af7279a90bc3c2be48adaa9c778
Author: Keith Packard <keithp@keithp.com>
Date: Thu Jul 11 16:11:57 2013 -0700
present: Add Present extension
Provides both a software implementation using timers and driver hooks
to base everything on vblank intervals.
Signed-off-by: Keith Packard <keithp@keithp.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
commit 563138298868f62501875d3016f03469dcffaad0
Author: Keith Packard <keithp@keithp.com>
Date: Tue Apr 9 19:59:39 2013 -0700
dri3: Add DRI3 extension
Adds DRM compatible fences using futexes.
Uses FD passing to get pixmaps from DRM applications.
Signed-off-by: Keith Packard <keithp@keithp.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
commit fdec793cdc2ef9a6ea66b311cb1068a7bd4a3be3
Author: Keith Packard <keithp@keithp.com>
Date: Thu Jan 17 13:46:55 2013 -0800
Add support for MIT-SHM AttachFd request
This passes a file descriptor from the client to the server, which is
then mmap'd
Signed-off-by: Keith Packard <keithp@keithp.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
commit 9fd35daa3160fd36f00ed354bfcbefefa1353cce
Author: Keith Packard <keithp@keithp.com>
Date: Thu Jan 17 13:43:02 2013 -0800
Add interfaces to get FDs from clients over the socket
This adds two interfaces:
void SetReqFds(ClientPtr client, int req_fds)
Marks the number of file descriptors expected for this
request. Call this before any request processing so that
any un-retrieved file descriptors will be closed
automatically.
int ReadFdFromClient(ClientPtr client)
Reads the next queued file descriptor from the connection. If
this request is not expecting any more file descriptors, or
if there are no more file descriptors available from the
connection, then this will return -1.
Signed-off-by: Keith Packard <keithp@keithp.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
commit 264fc3abe5f18341d0cf9ddb6766e10e4154e447
Author: Keith Packard <keithp@keithp.com>
Date: Thu Oct 31 13:01:46 2013 -0700
misync: Don't smash custom screen sync functions
There was a check to avoid smashing custom functions, but the sense
was backwards causing it to always smash them, and also not set them otherwise.
Signed-off-by: Keith Packard <keithp@keithp.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
commit 2d96948ab5c952b68875ac63844cf7d778d4bf63
Author: Keith Packard <keithp@keithp.com>
Date: Thu Jul 11 16:10:34 2013 -0700
os: Add GetTimeInMicros
64-bit higher resolution current time value.
Signed-off-by: Keith Packard <keithp@keithp.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
commit 0c33f47281c36726848daf513fb0483cdea57bff
Author: Keith Packard <keithp@keithp.com>
Date: Thu Jul 11 16:09:34 2013 -0700
Add swapll to byte swap 64-bit datatypes
Signed-off-by: Keith Packard <keithp@keithp.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
commit 26f013ba45b08a02bb028a461af68288a86fadb1
Author: Keith Packard <keithp@keithp.com>
Date: Thu Jul 11 16:08:41 2013 -0700
Add a RegionDuplicate function
This allocates a new region structure and copies a source region into
it in a single API rather than forcing the caller to do both steps themselves.
Signed-off-by: Keith Packard <keithp@keithp.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
commit d25c217964eb1fe54c3a54bca4cac7f47b4b9fdf
Author: Keith Packard <keithp@keithp.com>
Date: Mon Jan 14 14:24:36 2013 -0800
Clean up a couple of warnings in os/
Signed-off-by: Keith Packard <keithp@keithp.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
commit 7710f2b927ec8e3c631f72d66d494b523377b48e
Author: Keith Packard <keithp@keithp.com>
Date: Fri Jan 18 21:43:40 2013 -0800
Xext: Move MIT-SHM 'ShmDesc' to shmint.h
This data structure is required to use shared memory objects in any
extension. That includes the Xv extension, which (before this patch)
duplicated the definition of this structure in its own code.
Signed-off-by: Keith Packard <keithp@keithp.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
commit e8961b718d82f1c081ec110d8d962f64e8406b82
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Tue Oct 22 14:24:52 2013 +1000
os: use a constant for backtrace array size
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Jasper St. Pierre <jstpierre@mecheye.net>
commit f12a9ed870017f35cf6d2a82b1405e843aae42ac
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Tue Oct 29 15:24:11 2013 +1000
configure: remove a comment
94ed0ba1b5043ad9fc33b42756af447d5ab15bbd moved backtracing into the DIX, so
this comment is outdated. since no-one noticed and it's easier to just grep
than update file references, remove the comment.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Jasper St. Pierre <jstpierre@mecheye.net>
commit bb745f2b45768d0936f3960951e1a5cee8b03194
Author: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
Date: Thu Oct 31 08:50:57 2013 -0700
XQuartz: Bump bundle version to 2.7.6
Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
commit 2eedf42c229e2251035d716a96b654222155cd51
Author: Adam Jackson <ajax@redhat.com>
Date: Thu Oct 31 09:23:52 2013 -0400
dri: Fix GLX_Y_INVERTED_EXT fbconfig attribute
We're Y-inverted from GL's coordinates, so this is correct. gnome-shell
doesn't seem to check this - somewhat reasonable since the only server
that answered the other way around was Xglx - but kwin does, and
upside-down hilarity ensues.
Tested-by: maelcum on #xorg-devel
Signed-off-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 902ff0b3497d202b86bf9a411e17db7b694d6eaa
Author: Adam Jackson <ajax@redhat.com>
Date: Tue Oct 29 12:58:14 2013 -0400
xfree86: Bump video/input/extension ABIs for 1.15
Signed-off-by: Adam Jackson <ajax@redhat.com>
Reviewed-by: Julien Cristau <jcristau@debian.org>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 899451ae595f5f51a500295c624bf7ad14aca602
Author: Keith Packard <keithp@keithp.com>
Date: Wed Oct 30 08:54:24 2013 -0700
kdrive/ephyr: Don't discard one-time driver structure at server reset
KdScreenInfo is constructed at server startup time, and not
re-generated at server reset time. Freeing the 'driver' element at
reset time means this information is lost, and the server crashes
pretty quickly afterwards.
Signed-off-by: Keith Packard <keithp@keithp.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
commit 85ae44f07fa21b4a48d95d736dc8135bd4f751d0
Author: Michal Srb <msrb@suse.com>
Date: Wed Oct 30 13:33:51 2013 +0200
randr: deliver Output and Crtc events of attached output providers.
Consider all attached output providers when looking for changed outputs and
crtcs.
Reviewed-by: Dave Airlie <airlied@redhat.com>
Signed-off-by: Michal Srb <msrb@suse.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit a9ca93dcf9a711b3d60fbad31cbd44e0c82b6f42
Author: Michal Srb <msrb@suse.com>
Date: Wed Oct 30 13:33:50 2013 +0200
randr: send RRResourceChangeNotify event
Send RRResourceChangeNotify event when provider, output or crtc was created or
destroyed. I.e. when the list of resources returned by RRGetScreenResources and
RRGetProviders changes.
Reviewed-by: Dave Airlie <airlied@redhat.com>
Signed-off-by: Michal Srb <msrb@suse.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 4b39ea8a918fe6117bf34dc1cba67a4e56d0d1fb
Author: Michal Srb <msrb@suse.com>
Date: Wed Oct 30 13:33:49 2013 +0200
randr: send RRProviderChangeNotify event
Send RRProviderChangeNotify event when a provider becomes output source or
offload sink.
Reviewed-by: Dave Airlie <airlied@redhat.com>
Signed-off-by: Michal Srb <msrb@suse.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 1470c0a132806fb2ce817515ad4ddfe66eb7c98f
Merge: 04ab07ca19 9f4afe7e83
Author: Keith Packard <keithp@keithp.com>
Date: Tue Oct 29 21:00:13 2013 -0700
Merge remote-tracking branch 'whot/for-keith'
commit 9f4afe7e835cf9c513387ae01eaf8b7a6ba4aac9
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Mon Oct 28 18:32:36 2013 -0400
config: replace deprecated use of AC_OUTPUT with AC_CONFIG_FILES
Fix Automake warning: AC_OUTPUT should be used without arguments.
www.gnu.org/software/autoconf/manual/autoconf.html#Configuration-Files
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit e16dea72d6f45dd6d7788362bb7dbe76263719b1
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Wed Oct 23 15:16:25 2013 +1000
dmx: queue button events with a flags of 0
Setting POINTER_SCREEN with a unset valuator mask causes a jump to 0/0. Set
the flags to 0 so we don't generate any motion on a button event.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Keith Packard <keithp@keithp.com>
commit 04ab07ca19236d6c9a947e065fb69b0dd0d16639
Author: Connor Behan <connor.behan@gmail.com>
Date: Thu Oct 17 18:26:28 2013 -0700
xfree86: Find primary entity when bus types are nominally different
As of server 1.13, systems with DRM and Udev will have BUS_PLATFORM as
their primary bus type. However, drivers not implementing a
platformProbe function will still create entities of type BUS_PCI. We
need to account for this when checking for the primary entity.
Signed-off-by: Connor Behan <connor.behan@gmail.com>
Acked-by: Tormod Volden <debian.tormod@gmail.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit b32a4c91ccd479638c2bd2c0143b6ea170c717d1
Merge: be6680967a c671e935e7
Author: Keith Packard <keithp@keithp.com>
Date: Tue Oct 29 09:37:30 2013 -0700
Merge remote-tracking branch 'idr/glx-float-fbconfig'
commit be6680967a479eedbcab2fe1718c5f981e1029c7
Author: Adam Jackson <ajax@redhat.com>
Date: Wed Jul 10 10:00:46 2013 -0400
glx: convert to direct GL dispatch (v2)
We now expect to be linked against something that provides the GL API,
instead of manually grubbing about in the DRI driver's dispatch table.
Since the GLX we expose calls GL functions that are meant to be looked
up dynamically, also add a way to thunk through to GetProcAddress.
This includes a refresh of the generated sources, which requires a
correspondingly new Mesa.
The GetProcAddress stubs are at the moment merely enough to make this
link against Mesa 9.2, but should really be provided for everything not
in the OpenGL 1.2 ABI.
v2: Explicitly hide the GetProcAddress stubs so we can't conflict with
libGL symbols; fix leading tab/space issues [anholt]
Reviewed-by: Keith Packard <keithp@keithp.com>
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit 8aacf47e1778d8b72811b025a82452b933d3c1f2
Author: Adam Jackson <ajax@redhat.com>
Date: Fri Oct 4 12:58:19 2013 -0400
glx: Remove DRI1 AIGLX (v2)
Mesa doesn't ship DRI1 drivers as of 8.0, which is about 18 months and
three releases ago. The main reason to have wanted DRI1 AIGLX was to
get a GLX compositor working, but DRI1's (lack of) memory management API
meant that the cost of a GLX compositor was breaking direct GLX apps,
which isn't a great tradeoff.
Of the DRI1 drivers Mesa has dropped, I believe only mga stands to lose
some functionality here, since it and only it has support for
NV_texture_rectangle. Since that's required for every extant GLX
compositor I know of, I conclude that anybody with a savage, say, would
probably not notice AIGLX going away, since they wouldn't be running a
GLX compositor in the first place.
In the future we'd like to use GL in the server in a more natural way,
as just another EGL client, including in the GLX implementation itself.
Since there's no EGL implemented for DRI1 drivers, this would already
doom AIGLX on DRI1 (short of entirely forking the GLX implementation,
which I'm not enthusiastic about).
v2: Remove DRI1 from AIGLX conditionals in configure.ac [anholt]
Reviewed-by: Eric Anholt <eric@anholt.net>
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit 7f5adf73a0f9a951a6df201532b4031d38054369
Author: Adam Jackson <ajax@redhat.com>
Date: Wed Oct 2 17:38:05 2013 -0400
glx: Simplify glXDestroyContext
We can just free the resource unconditionally here. ContextGone (which
FreeResourceByType will call) already does:
cx->idExists = GL_FALSE;
if (!cx->currentClient) {
__glXFreeContext(cx);
}
Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit 53653f4889dcaea0cf67f8a4180af71eeb4b2f6b
Author: Adam Jackson <ajax@redhat.com>
Date: Mon Aug 5 15:46:11 2013 -0400
glx: Fix a corner case in DrawableGone
Losing the drawable does not change our notion of current client. Since
the GL under us doesn't understand having a current context without
current drawables (sigh), we do still need to loseCurrent so that we
re-bind the context on the next request.
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=65030
Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit 276d8057aa7f6e36c9c874257a6383f416c5cedd
Author: Adam Jackson <ajax@redhat.com>
Date: Sat Aug 3 09:47:55 2013 -0400
glx: Fix memory leak in context garbage collection (v2)
I broke this, back in:
commit a48dadc98a28c969741979b70b7a639f24f4cbbd
Author: Adam Jackson <ajax@redhat.com>
Date: Mon Mar 21 11:59:29 2011 -0400
glx: Reimplement context tags
In that, I changed the glx client state to not explicitly track the list
of current contexts for the client (since that was what we were deriving
tags from). The bug was that I removed the code for same from
glxClientCallback without noticing that it had the side effect of
effectively de-currenting those contexts, so that ContextGone could free
them. So, if you had a client exit with a context still current, the
context's memory would leak. Not a huge deal for direct clients, but
viciously bad for indirect, since the swrast context state at the bottom
of Mesa is like 15M.
Fix this by promoting Bool isCurrent to ClientPtr currentClient, so that
we have a back-pointer to chase when walking the list of contexts when
ClientStateGone happens.
v2: Explicitly call __glXFreeContext on the ClientStateGone path. Our
current context might be one we got from EXT_import_context and whose
creating client has since died. Without the explicit call, the creating
client's FreeClientResources would not free the context because it's
still current, and the using client's FreeClientResources would not free
the context because it's not an XID it created. This matches the logic
from a48dadc.
Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit 75b362763cca8b6139582ad85e3b58f0b2e30a1c
Author: Adam Jackson <ajax@redhat.com>
Date: Tue Oct 8 15:02:44 2013 -0400
glx: Only take a Pixmap reference if creating the GLXPixmap succeeded
Reviewed-by: Julien Cristau <jcristau@debian.org>
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit 4292a39c8014f9f4920bed3001802e4a3e523c5e
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Mon Oct 28 12:10:10 2013 +1000
Xi: fix logic error when calculating emulated motion events
gcc -Wlogical-op
exevents.c: In function 'DeliverEmulatedMotionEvent':
exevents.c:1480:13: warning: logical 'or' of collectively exhaustive
tests is always true [-Wlogical-op]
The relevant snippet of exevents.c:
1479 if (ti->listeners[0].type != LISTENER_POINTER_REGULAR ||
1480 ti->listeners[0].type != LISTENER_POINTER_GRAB)
1481 return;
This condition was always true, causing dropped motion events.
Reported-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
commit c671e935e7c44d4711ba9588ee96cb9796b879e6
Author: Daniel Czarnowski <daniel.czarnowski@intel.com>
Date: Mon Oct 21 19:48:38 2013 +0200
glx: Enable GLX_ARB_fbconfig_float for DRI2 drivers
v2 (idr): Maintain sort order of extension list. Fixed rebase error
(comment header for initializeExtensions was in front of
__glXDRIinvalidateBuffers). Re-write commit message.
Signed-off-by: Daniel Czarnowski <daniel.czarnowski@intel.com>
Signed-off-by: Ian Romanick <ian.d.romanick@intel.com>
Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
commit ccc8bb1153ec669f7540a174a81a8ec0e0d6dd67
Author: Daniel Czarnowski <daniel.czarnowski@intel.com>
Date: Wed Oct 23 12:53:59 2013 +0200
glx: Handle float config types in glxConvertConfigs
Replaces old use of floatMode attribute with new, extended range of
values in __DRI_ATTRIB_RENDER_TYPE. Also adds new conditions, where the
float modes support requires it. Enables support for not only float
configs, but packed float configs as well.
v2 (idr): Whitespace and formatting fixes. Refactor render type
vs. pbuffer checking to a separate function that includes a quote from
the spec. Re-write commit message. Fix compiler warnings:
glxdricommon.c: In function 'glxConvertConfigs':
glxdricommon.c:212:35: warning: pointer targets in passing argument 3 of 'core->getConfigAttrib' differ in signedness [-Wpointer-sign]
glxdricommon.c:212:35: note: expected 'unsigned int *' but argument is of type 'int *'
glxdricommon.c:230:35: warning: pointer targets in passing argument 3 of 'core->getConfigAttrib' differ in signedness [-Wpointer-sign]
glxdricommon.c:230:35: note: expected 'unsigned int *' but argument is of type 'int *'
Signed-off-by: Daniel Czarnowski <daniel.czarnowski@intel.com>
Signed-off-by: Ian Romanick <ian.d.romanick@intel.com>
Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
commit 4e5eb15b4cc170499cf87e6633c1737f0b1c514b
Author: Daniel Czarnowski <daniel.czarnowski@intel.com>
Date: Mon Oct 21 19:57:53 2013 +0200
glx: Correctly set render type enum
The type specified is bits, but the context wants an enum.
v2 (idr): Fix various whitespace and formatting problems. Rename
convFBconfRenderTypeBits2CtxRenderType to
renderTypeBitsToRenderTypeEnum. Re-write commit message.
Signed-off-by: Daniel Czarnowski <daniel.czarnowski@intel.com>
Signed-off-by: Ian Romanick <ian.d.romanick@intel.com>
Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
commit eabb523aa45f3d8940cadac197ef1225fbfd5c56
Author: Daniel Czarnowski <daniel.czarnowski@intel.com>
Date: Mon Oct 21 19:45:35 2013 +0200
glx: Allow float renderType in glXCreateContextAttribsARB
This enables GLX_RGBA_FLOAT_TYPE_ARB and
GLX_RGBA_UNSIGNED_FLOAT_TYPE_EXT as valid renderType parameters to
glXCreateContextAttribsARB.
v2 (idr) : Use C-style comments and fix word wrapping. Re-write commit
message.
Signed-off-by: Daniel Czarnowski <daniel.czarnowski@intel.com>
Signed-off-by: Ian Romanick <ian.d.romanick@intel.com>
Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
commit 7ecfab47eb221dbb996ea6c033348b8eceaeb893
Author: Eric Anholt <eric@anholt.net>
Date: Tue Oct 22 14:22:04 2013 -0700
glx: Add support for the new DRI loader entrypoint.
This is going to be exposed (and not the old entrypoint) for some DRI
drivers once the megadrivers series lands, and the plan is to
eventually transition all drivers to that. Hopefully this is
unobtrusive enough to merge to stable X servers so that they can be
compatible with new Mesa versions.
v2: typo fix in the comment
Signed-off-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 83bb366e71ef41165998eed2934208f84714a37e
Author: Strake <strake888@gmail.com>
Date: Thu Oct 17 23:20:20 2013 -0500
unbreak KdEnableInput
pi = ki = 0 here, so not follow them.
Signed-off-by: Strake <strake888@gmail.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 8db4121a3c7104548fd4a138ac1d1bdea5fd22d9
Author: Keith Packard <keithp@keithp.com>
Date: Fri Oct 18 17:31:01 2013 -0700
Update to version 1.14.99.3
Signed-off-by: Keith Packard <keithp@keithp.com>
commit e3220d7bae4548bf64e5879c981ad070ac1f78f7
Merge: 73b2660d72 2523a445a0
Author: Keith Packard <keithp@keithp.com>
Date: Fri Oct 18 17:22:52 2013 -0700
Merge commit '2523a445a09a75a8baf642608d099a5e12d5437f'
This is merging the commits along Peter's for-keith branch, without
also merging in the spurious merge at the top of that branch.
commit f8662a133690773692dfa392ecfa3b8b56af8fa9
Merge: 7cf1b595c8 2523a445a0
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri Oct 18 16:50:12 2013 +1000
Merge branch 'xsync-transition-bug-59644' into for-keith
commit 2523a445a09a75a8baf642608d099a5e12d5437f
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu Oct 17 12:02:27 2013 +1000
sync: split updating and triggering a counter up
Now that the brackets are always the nearest change points (regardless of
transition) we need to update the counters whenever we check for any updates.
Otherwise we end up with a situation where counter->value is out of date and
an alarm doesn't trigger because we're still using the value from last time
something actually triggered.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Adam Jackson <ajax@redhat.com>
Reviewed-by: Keith Packard <keithp@keithp.com>
commit e57ec99b03b2ad840c384a97ab2766ce9da0f5cc
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Wed Oct 16 16:31:15 2013 +1000
sync: always set the brackets (#59644)
The current code sets bracket_greater to the first trigger after the current
value, and bracket_less to the last trigger before the current value.
For example, the idle timer with three negative and three positive transitions
would set this:
nt1 nt2 nt3
|--------|------|--|------- idle --|---|--|-----> t
pt1 pt2 pt3
bracket_less == nt2
bracket_greater == pt2
This is an optimization so we can skip code paths in the block/wakeup handlers
if the current value doesn't meet any of the trigger requirements. Those
handlers largely do a
if (bracket_less is less than current value &&
bracket_greater is greater than current value)
return, nothing to do
However, unless the bracket values are updated at the correct time, the
following may happen:
nt
|--------------|---------- idle ------|--------> t
pt
In this case, neither bracket is set, we're past the pos transition and not
yet at the neg transition. idle may now go past nt, but the brackets are not
updated. If idle is then reset to 0, no alarm is triggered for nt. Likewise,
idle may now go past pt and no alarm is triggered.
Changing an alarm or triggering an alarm will re-calculate the brackets, so
this bug is somewhat random. If any other client triggers an alarm when the
brackets are wrongly NULL, the recalculation will set them this bug may not
appear.
This patch changes the behavior, so that the brackets are always the nearest
positive or negative transitions to the current counter value. In the example
above, nt will trigger a wakeup and a re-calculation of the brackets, so that
going past it in the negative direction will then cause the proper alarm
triggers.
Or, in Keith's words:
Timer currently past a positive trigger
No bracket values, because no trigger in range
Timer moves backwards before the positive trigger
Brackets not reset, even though there is now a trigger in range
Timer moves forward past the positive trigger
Trigger doesn't fire because brackets not set
Setting the LT bracket in this case will cause everything to get
re-evaluated when the sync value moves backwards before the trigger
value.
X.Org Bug 59644 <http://bugs.freedesktop.org/show_bug.cgi?id=59644>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Adam Jackson <ajax@redhat.com>
Reviewed-by: Keith Packard <keithp@keithp.com>
commit 06b87aa528d7a739ba20101a1f83b1a428691a01
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Wed Oct 16 10:08:46 2013 +1000
sync: if the idle time was reset, force alarms to trigger (#70476)
The time between the idle reset and the IdleTimeWakeupHandler to be called is
indeterminate. Clients with an PositiveTransition or NegativeTransition alarm
on a low threshold may miss an alarm.
Work around this by keeping a reset flag for each device. When the
WakeupHandler triggers and the reset flag is set, we force a re-calculation of
everything and pretend the current idle time is zero. Immediately after is the
next calculation with the real idle time.
Relatively reproducible test case: Set up a XSyncNegativeTransition alarm for
a threshold of 1 ms. May trigger, may not.
X.Org Bug 70476 <http://bugs.freedesktop.org/show_bug.cgi?id=70476>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Adam Jackson <ajax@redhat.com>
Reviewed-by: Keith Packard <keithp@keithp.com>
commit efc1035ca958f2c9d266338a308518a0834b1773
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Wed Oct 16 09:36:01 2013 +1000
dix: provide accessor methods for the last device event time
And now that we have the accessors, localize it. No functional changes, just
preparing for a future change.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Adam Jackson <ajax@redhat.com>
Reviewed-by: Keith Packard <keithp@keithp.com>
commit b7c9bd9cf276e92a73be57ff2ed32b47a80f13fb
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Wed Oct 16 09:21:47 2013 +1000
sync: supply the counter from IdleTimeBlockHandler
The main idletime counter has an initialized deviceid, might as well be
supplying it properly. Without this, we'd only ever check the XIAllDevices
counter, so the wait would never be adjusted for the device-specific triggers.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Adam Jackson <ajax@redhat.com>
Reviewed-by: Keith Packard <keithp@keithp.com>
commit 2efe49c1029f959fe80879bcf50df42e8b80451d
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Wed Oct 16 13:01:01 2013 +1000
sync: always call BracketValues when recalculating upper/lower brackets
Both ServertimeBracketValues and IdleTimeBracketValues copy the value into
there SysCounter privates. Call it for a NULL set as well, so we don't end up
with stale pointers and we can remove the block/wakeup handlers.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Adam Jackson <ajax@redhat.com>
Reviewed-by: Keith Packard <keithp@keithp.com>
commit 5c7cfd4c6978834551848e1be62af240102e39b5
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Tue Oct 15 10:11:20 2013 +1000
sync: compress two if statements
No functional changes, just merges a > and == condition into a >= condition.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Adam Jackson <ajax@redhat.com>
Reviewed-by: Keith Packard <keithp@keithp.com>
commit 73b2660d7273d175d279d22f8ca0c3932a14ff1c
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Mon Sep 16 21:47:16 2013 -0700
Avoid use-after-free in dix/dixfonts.c: doImageText() [CVE-2013-4396]
Save a pointer to the passed in closure structure before copying it
and overwriting the *c pointer to point to our copy instead of the
original. If we hit an error, once we free(c), reset c to point to
the original structure before jumping to the cleanup code that
references *c.
Since one of the errors being checked for is whether the server was
able to malloc(c->nChars * itemSize), the client can potentially pass
a number of characters chosen to cause the malloc to fail and the
error path to be taken, resulting in the read from freed memory.
Since the memory is accessed almost immediately afterwards, and the
X server is mostly single threaded, the odds of the free memory having
invalid contents are low with most malloc implementations when not using
memory debugging features, but some allocators will definitely overwrite
the memory there, leading to a likely crash.
Reported-by: Pedro Ribeiro <pedrib@gmail.com>
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Julien Cristau <jcristau@debian.org>
commit 8afe20d4e34adcfd29bdf43a01d55335ea2c5dba
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Mon Sep 16 21:45:29 2013 -0700
Update GLX dependencies now that DRI & DRI2 are builtins, not modules
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
commit 2704bdb24a2c7bac65b90e05f1a68438b34ecf58
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Tue Sep 3 22:53:28 2013 -0700
DMX glxproxy: Don't allocate & copy data just to free it unused
Two functions in the DMX glxproxy code loop over all the backend
screens, starting at the highest numbered and counting down to
the lowest.
Previously, for each screen, the code would allocate a buffer
large enough to read the reply from the backend, copy that reply
into the buffer, and then if it wasn't the final screen, free it.
Only the buffer from the final screen is used, to pass on to the
client in the reply.
This modifies it to just immediately discard the responses from
the screens as we loop through it, only doing the allocate & copy
work for the one buffer we pass back to the client.
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Alex Deucher <aleander.deucher@amd.com>
commit 6c06c268adbab63ebe7490489aa030724cbdc54b
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Sun Aug 18 18:02:49 2013 -0700
Skip damage calls if DamageCreate fails in exa functions
Fixes parfait errors such as:
Null pointer dereference (CWE 476): Write to null pointer pDamage
at line 1833 of miext/damage/damage.c in function 'DamageRegister'.
Function DamageCreate may return constant 'NULL' at line 1775,
called at line 232 of exa/exa_migration_mixed.c
in function 'exaPrepareAccessReg_mixed'.
Constant 'NULL' passed into function DamageRegister,
argument pDamage, from call at line 237.
Null pointer introduced at line 1775 of miext/damage/damage.c
in function 'DamageCreate'.
Null pointer dereference (CWE 476): Write to null pointer pDamage
at line 1833 of miext/damage/damage.c in function 'DamageRegister'.
Function DamageCreate may return constant 'NULL' at line 1775,
called at line 104 of exa/exa_mixed.c
in function 'exaCreatePixmap_mixed'.
Constant 'NULL' passed into function DamageRegister,
argument pDamage, from call at line 109.
Null pointer introduced at line 1775 of miext/damage/damage.c
in function 'DamageCreate'.
Checks are similar to handling results of other calls to DamageCreate.
[ This bug was found by the Parfait 1.3.0 bug checking tool.
http://labs.oracle.com/pls/apex/f?p=labs:49:::::P49_PROJECT_ID:13 ]
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
commit 7cf1b595c8c8f9776a39559d2878cf90af3f2859
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Wed Sep 4 15:34:29 2013 +1000
dix: only deliver for the current grab type
Use the grabtype to determine which type of event to send - all other events
are pointless and may result in erroneous events being delivered.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 78944d62ffc7fec6f75b6f514ab7a139ba9bc77b
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Wed Sep 4 15:34:28 2013 +1000
dix: don't attempt to deliver an event for a different grabtype
For an active grab, grab->eventMask can be either the core or the XI1 mask.
With the overlap of event filters, calling DeliverOneGrabbedEvent(XI1) for a
ProximityOut event will trigger if the client has selected for enter events -
the filter is the same for both.
Thus, we end up delivering a proximity event to a client not expecting one.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 6159811a1aaf848016dbfa7bde68df097027870c
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Wed Sep 4 15:34:27 2013 +1000
include: change grabtypes to start at 1
Avoid erroneous detection of an unset grabtype as CORE
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit be6ea80b79b3d6eb97106ea142e01acbdf059995
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Wed Sep 4 15:34:26 2013 +1000
dix: only allow button and key events to freeze a sync'd pointer
If a client calls XAllowEvents(SyncPointer) it expects events as normal until
the next button press or release event - that freezes the device. An e.g.
proximity event must thus not freeze the pointer.
As per the spec, only button and key events may do so, so narrow it to these
cases.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 93a27b2dd0d7ed51120f42456a91a7c59902ebc2
Author: Michele Baldessari <michele@acksyn.org>
Date: Sun Sep 15 19:30:38 2013 +0100
Xephyr: restore cursor visibility
Fixes: https://bugs.freedesktop.org/show_bug.cgi?id=69388
Commit c100211034ab69ce453a1644fb61c6808d7e3eda (dix: only show the cursor
if a window defines one (#58398)) broke the default cursor behaviour in
Xephyr (unless run with -retro). Restore the default cursor visibility
so that '-retro' or '-host-cursor' are not needed to have a visible
cursor.
Signed-off-by: Michele Baldessari <michele@acksyn.org>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
as of ba387cf21f7d95987211f75d8024601e7d64e322 "ephyr: Use host (HW) cursors
by default." this only applies if -sw-cursor is given on the cmdline.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 70efc799cbeec26f19831b3b14c0d4646198a077
Author: Michele Baldessari <michele@acksyn.org>
Date: Sun Sep 15 19:56:34 2013 +0100
Fix Xephyr compilation when DEBUG is enabled
When DEBUG is enabled Xephyr compilation fails:
ephyrdriext.c:343:133: error: 'is_ok' undeclared (first use in this
function)
EPHYR_LOG("leave. is_ok:%d\n", is_ok);
Just reemove bogus is_ok variable.
Signed-off-by: Michele Baldessari <michele@acksyn.org>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 5ac4bfca64bd75474e550b26bc1195a5ca245752
Author: Adam Jackson <ajax@redhat.com>
Date: Tue Sep 10 14:18:18 2013 -0400
input: calloc minimization for xi2mask_new
There's no reason to do this as (nmasks + 2) callocs, and it's a
surprisingly hot path. Turns out you hit this ~once per passive grab,
and you do a few bajillion passive grab changes every time you enter or
leave the overview in gnome-shell. According to a callgrind of Xorg
with gnome-shell-perf-tool run against it:
Ir before: 721437275
Ir after: 454227086
Signed-off-by: Adam Jackson <ajax@redhat.com>
Reviewed-by: Jasper St. Pierre <jstpierre@mecheye.net>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 44d502c6f1d03a9e548f0941cde0228b6fde8394
Author: Jon TURNEY <jon.turney@dronecode.org.uk>
Date: Sun Oct 6 16:45:52 2013 +0100
hw/xwin: Fix for "glx: Remove screen number from __GLXconfig"
Fix compilation after commit c3c976f54c3c282d6fa6c8360688e036bc43d210 "glx:
Remove screen number from __GLXconfig"
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
Reviewed-by: Adam Jackson <ajax@redhat.com>
commit 6a9bd103cb993e873cb82664b677ceed73c0bd85
Merge: ea3b7db4b7 8aae28e3cb
Author: Keith Packard <keithp@keithp.com>
Date: Mon Oct 7 17:29:38 2013 -0700
Merge remote-tracking branch 'jeremyhu/master'
commit ea3b7db4b747f883ef7b8b524ee13bf8a63add14
Author: Emil Velikov <emil.l.velikov@gmail.com>
Date: Mon Oct 7 18:29:25 2013 +0100
configure.ac: Include missing proto declarations in SDK_REQUIRED_MODULES
Commits a1d41e311c21e, 7d859bd87834d & 3ed2c6e11298c made extinit.h require
the XF86 Big Font, XRes & ScrnSaver proto headers, but failed to add them
to the SDK_REQUIRED_MODULES so pkg-config would find them for driver builds.
Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>
Reviewed-by: Daniel Stone <daniel@fooishbar.org>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 8aae28e3cbdd49bfa8d940a4a517c94a53b94f86
Author: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
Date: Sun Oct 6 09:20:45 2013 -0700
XQuartz: Dont't set screen on __GLXConfig
Fixes regression introduced by c3c976f54c3c282d6fa6c8360688e036bc43d210
Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
commit c5f8eb968efa970201712105a1ac880b517e7b6d
Author: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
Date: Sun Oct 6 09:18:15 2013 -0700
rootless: Use miCopyRegion instead of fbCopyRegion
Fixes regression introduced by e657635dbe6b92875b0e88370557c2cbab673a49
Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
commit ccbe17b1c6da1ad9d085fc8133cdd15dc7004a4a
Author: Pino Toscano <toscano.pino@tiscali.it>
Date: Wed Aug 28 17:15:03 2013 +0200
os: move <arpa/inet.h> for any !win32 system
It is needed in IPv6 configurations (for inet_pton) also when
SIOCGIFCONF is not defined.
Signed-off-by: Pino Toscano <toscano.pino@tiscali.it>
Acked-by: Samuel Thibault <samuel.thibault@ens-lyon.org>
Signed-off-by: Julien Cristau <jcristau@debian.org>
commit c079b8e675dd2762c9e07fe5d8c07612299dceb7
Author: Pino Toscano <toscano.pino@tiscali.it>
Date: Wed Aug 28 17:04:48 2013 +0200
xfree86/hurd: include <hurd.h>
Needed for using get_privileged_port.
Signed-off-by: Pino Toscano <toscano.pino@tiscali.it>
Acked-by: Samuel Thibault <samuel.thibault@ens-lyon.org>
Signed-off-by: Julien Cristau <jcristau@debian.org>
commit f0659a7f68a5a334879af01a6a63742eab1bf5de
Author: Keith Packard <keithp@keithp.com>
Date: Fri Oct 4 16:44:46 2013 -0700
Bump version to 1.14.99.2
Signed-off-by: Keith Packard <keithp@keithp.com>
commit f2d149b6d10edea7233d93c7e19f71decf11dc62
Author: Keith Packard <keithp@keithp.com>
Date: Fri Oct 4 16:43:41 2013 -0700
kdrive/ephyr: Remove duplicate ephyrExtensions and ephyrExtensionInit decls
These were duplicated when GLX support was re-added on two different branches.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit e0a678f0596f3547b98d74d5f0438b484b059458
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Sat Sep 28 15:26:38 2013 -0400
xfree86: add a comment as to why the logdir is created
Without the logdir, the xserver will write the content of the log file on the
terminal stating that it cannot be written and will stop.
Refer to https://bugs.freedesktop.org/show_bug.cgi?id=3889
Reviewed-By: Matt Dew <marcoz@osource.org>
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 5bdbf2dba3f7da4a593b286020eab0c7857e940c
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Sat Sep 28 15:26:37 2013 -0400
xfree86: Use $(MKDIR_P) for better code portability
Still true that we should not use the lower case $(mkdir_p) version.
However, remove the 2005 comment as the MKDIR_P is widely used now.
Reviewed-By: Matt Dew <marcoz@osource.org>
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit b8cfb0dc8426754b477b561bc158b8a24c143ddf
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Sat Sep 28 15:26:36 2013 -0400
Uninstall X link and CYGWIN libXorg.exe.a in local install targets
It is our duty to uninstall any files and/or directories that we installed
through install-data-local and install-exec-hook.
Currently the X symbolic link to Xorg remains on disk after running
make uninstall.
Note the exception for logdir which is usually shared by other modules.
Reviewed-By: Matt Dew <marcoz@osource.org>
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 35a528e49269c3df75486cc606e51a8c1c083c06
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Sat Sep 28 15:26:35 2013 -0400
Xorg binary: use install-exec-hook rather than install-exec-local
The former was explicitly designed to execute additional code after the binary
has been installed. The latter can be executed in any order, hence it's
current dependency on install-binPROGRAMS as a workaround.
The CYGWIN libXorg.exe.a target is an installation target rather than
a post-installation one, so it should not be done as a hook. It does not depend
on the Xorg executable being installed.
Automake:
"These hooks are run after all other install rules of the appropriate type,
exec or data, have completed. So, for instance, it is possible to perform
post-installation modifications using an install hook".
"With the -local targets, there is no particular guarantee of execution order;
typically, they are run early, but with parallel make, there is no way
to be sure of that".
Reviewed-by: Eric Anholt <eric@anholt.net>
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit a1d87576a30008253eb0cc92b44c9718f6665062
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Sat Sep 28 15:26:34 2013 -0400
Use $(LN_S) provided by AC_PROG_LN_S macro to create links
For better code portability.
Reviewed-By: Matt Dew <marcoz@osource.org>
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 28c8e1910797970dbf1d40794f1804a8fcc812bc
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Sat Sep 28 15:26:33 2013 -0400
The Xorg binary is missing the extension $(EXEEXT) in the makefile
This is not a problem on UNIX platforms, but on CYGWIN it creates a broken
link to Xorg rather than a link to Xorg.exe.
From the CYGWIN log on tinderbox, we can see that the executable Xorg.exe is
installed correctly. We can see the command used to create the link:
(cd /jhbuild/install/[...]/install/bin && rm -f X && ln -s Xorg X)
Note that the "relink" makefile target correctly appends $(EXEEXT) to Xorg.
Reviewed-By: Matt Dew <marcoz@osource.org>
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit f3b529bf25db2700addbafc7aa4fc5b126ba9929
Merge: 4399bd3832 abc2bfca16
Author: Keith Packard <keithp@keithp.com>
Date: Fri Oct 4 14:04:48 2013 -0700
Merge remote-tracking branch 'anholt/ephyr-fixes'
commit 4399bd38326b81f7b92365346504d7c6354772a9
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Mon Sep 30 13:30:46 2013 -0400
miext/shadow: missing c2p_core.h breaks "make distcheck" target.
Reviewed-by: Julien Cristau <jcristau@debian.org>
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 9ccb4a63982942fdce19609d2cadbd8e51708462
Merge: 5d2ec6933f da5e20127a
Author: Keith Packard <keithp@keithp.com>
Date: Fri Oct 4 13:54:55 2013 -0700
Merge remote-tracking branch 'whot/for-keith'
commit 5d2ec6933f6bb5116666ca1bfb07f0f20bf2a0b5
Merge: 7d3d4ae55d 6ee4d9f94a
Author: Keith Packard <keithp@keithp.com>
Date: Fri Oct 4 13:50:04 2013 -0700
Merge remote-tracking branch 'ajax/xserver-next'
commit da5e20127a5b6e11a47eb6e61f3ea87b056cdf5f
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Thu Sep 19 19:13:35 2013 -0400
test: add new os executable to .gitignore
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit c73c36b537f996574628e69681833ea37dec2b6e
Author: Laércio de Sousa <lbsousajr@gmail.com>
Date: Wed Sep 18 13:42:17 2013 -0300
xserver: enable InputClass option "GrabDevice" by default for non-seat0 seats (#69478)
This patch contributes to fill the remaining gaps which make
systemd-multi-seat-x wrapper still necessary in some multiseat setups.
This also replaces previous evdev patch that does the same thing
for that particular driver.
When option "-seat" is passed with an argument different from "seat0",
option "GrabDevice" for input devices is enabled by default
(no need of enabling it in xorg.conf's "InputClass" section).
Fixes: https://bugs.freedesktop.org/show_bug.cgi?id=69478
Signed-off-by: Laércio de Sousa <lbsousajr@gmail.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 160c2db32d0b9ee5316a44179a6af4f4722e3d0a
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Wed Sep 18 16:04:44 2013 +1000
dmx: provide enough space for axis mappings
relmap/absmap is used as a evdev-axis-to-x-axis mapping. ABS_X maps to
axis 0, ABS_Y to 1, etc. skipping over non-existing axes so that the third bit
set in the ABS_* range is axis 2, and so on. This requires us to actually have
enough space to have all the ABS_*/REL_* range.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
commit 7d3d4ae55dd6ee338439e2424ac423b1df80501b
Author: Keith Packard <keithp@keithp.com>
Date: Fri Sep 20 14:43:41 2013 -0500
damage: Must translate initial window damage by window offset
Damage is reported relative to the drawable origin, but the window
borderClip is absolute. Translate the region by the window position
before reporting damage to adjust.
Reported-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
commit 8010d3a48bd0b224dcb0883e39c2351ad364d846
Author: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
Date: Sun Sep 15 08:10:33 2013 -0700
XQuartz: pbproxy: Fix build with -DDEBUG
Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
commit 39c548da0cf0522ad246630605b96751ab6d39c0
Author: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
Date: Sun Sep 15 08:07:44 2013 -0700
XQuartz: Fix build with moved pseudoramiX
Regression from: e716baedc4d8e52a60f43ef21aba771b340d8c8b
Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
Reviewed-by: Jon TURNEY <jon.turney@dronecode.org.uk>
commit 6ee4d9f94ae2cc27c39381d7554134d9b4807a65
Author: Adam Jackson <ajax@redhat.com>
Date: Tue Jul 9 11:19:11 2013 -0400
glx: Fill in some missing attributes from DoGetFBConfigs
Reviewed-by: Eric Anholt <eric@anholt.net>
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit b257fabff00ae925bb7e70364dd1d738634087c9
Author: Adam Jackson <ajax@redhat.com>
Date: Thu Jul 4 10:31:40 2013 -0400
glx: Remove a dead comment
Reviewed-by: Eric Anholt <eric@anholt.net>
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit abd086502123086ce3d1fba25c159bb022d2750f
Author: Adam Jackson <ajax@redhat.com>
Date: Mon Jul 8 17:01:13 2013 -0400
glx: Catch another failure case in drawable creation
Reviewed-by: Eric Anholt <eric@anholt.net>
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit c3c976f54c3c282d6fa6c8360688e036bc43d210
Author: Adam Jackson <ajax@redhat.com>
Date: Mon Jul 8 12:28:56 2013 -0400
glx: Remove screen number from __GLXconfig
Not used. There's no real reason to match against this instead of
matching against fbconfig or visual ID anyway.
Reviewed-by: Eric Anholt <eric@anholt.net>
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit 1d1484e9bd55d1fa8316b1574754f28d5d31a076
Author: Adam Jackson <ajax@redhat.com>
Date: Mon Jul 8 12:09:13 2013 -0400
glx: Remove pixmapMode from __GLXconfig
This has never been filled in with anything meaningful afaict, and you
can't get to it from the client in any event.
Reviewed-by: Eric Anholt <eric@anholt.net>
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit 34e6e60105796ad015469c10921c5ff09acf7eb0
Author: Adam Jackson <ajax@redhat.com>
Date: Tue Jul 2 12:33:36 2013 -0400
glx: Remove support for NV_vertex_program and NV_fragment_program
Mesa doesn't implement these anymore, never really did outside of swrast
anyway.
Reviewed-by: Eric Anholt <eric@anholt.net>
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit acf14c1de766c4ea206cd7ce7f25b780a589d33c
Author: Adam Jackson <ajax@redhat.com>
Date: Tue Jul 2 10:35:19 2013 -0400
glx: realloc style fix in RenderLarge
Reviewed-by: Eric Anholt <eric@anholt.net>
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit 9ebf739a6864c9ec38bf72f63ef2e3b9cd1951db
Author: Adam Jackson <ajax@redhat.com>
Date: Tue Jul 2 10:30:40 2013 -0400
glx: Eliminate a small malloc from QueryContext
No reason to have that be a failure path.
Reviewed-by: Eric Anholt <eric@anholt.net>
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit b99f7975407f111b99d772cd28224d7dc1b34fe4
Author: Adam Jackson <ajax@redhat.com>
Date: Fri Nov 9 18:05:27 2012 -0500
glx: Handle failure to create the pixmap backing the pbuffer
We happen not to sanitize the width/height we pass to CreatePixmap here,
oops. It's not exploitable, but it's certainly a crash, so let's just
throw BadAlloc instead.
Reviewed-by: Eric Anholt <eric@anholt.net>
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit 22fbfdcb31f335c22053a0e29f0e73c03cd70a76
Author: Adam Jackson <ajax@redhat.com>
Date: Fri Nov 9 17:52:12 2012 -0500
glx: Implement GLX_PRESERVED_CONTENTS drawable attribute
We back pixmaps with pbuffers so they're never actually clobbered. Say
so when asked.
Reviewed-by: Eric Anholt <eric@anholt.net>
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit 2e20b8382cdf37ae5a2802f85b8f06a370f9645d
Author: Adam Jackson <ajax@redhat.com>
Date: Fri Nov 9 17:12:49 2012 -0500
glx: Implement GLX_FBCONFIG_ID in GetDrawableAttributes
Required by GLX 1.4, section 3.3.6, "Querying Attributes".
Reviewed-by: Eric Anholt <eric@anholt.net>
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit 0d76191baeee005982754ac18ca995742e32d8c1
Author: Adam Jackson <ajax@redhat.com>
Date: Fri Nov 9 17:10:57 2012 -0500
glx: Implement GLX_{WIDTH,HEIGHT} in GetDrawableAttributes
Required by GLX 1.4, section 3.3.6, "Querying Attributes".
Reviewed-by: Eric Anholt <eric@anholt.net>
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit d11f13e383dda1e9cabe32793d261d46edc44418
Author: Adam Jackson <ajax@redhat.com>
Date: Fri Nov 9 17:07:20 2012 -0500
glx: Compute number of attributes in GetDrawableAttributes on the fly
This doesn't have any effect yet, but is needed to properly build the
reply for pbuffers.
Reviewed-by: Eric Anholt <eric@anholt.net>
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit 468b57324f838144d79e3a9d85a0bde853578c4b
Author: Adam Jackson <ajax@redhat.com>
Date: Fri Nov 9 16:48:16 2012 -0500
glx: Style fixes
Reviewed-by: Eric Anholt <eric@anholt.net>
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit 2b181ad0952851f47f23dcb1a36471685313c13e
Author: Adam Jackson <ajax@redhat.com>
Date: Fri Nov 9 16:33:54 2012 -0500
glx: Pull GLX vendor string out of __GLXscreen
Given how we're currently implementing GLX this can't meaningfully vary
per-screen.
Reviewed-by: Eric Anholt <eric@anholt.net>
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit b9c489cf13e1ad35b7d9bea9de8d85e929374d17
Author: Adam Jackson <ajax@redhat.com>
Date: Wed Oct 31 10:05:24 2012 -0400
glx: Remove unused bits from the context struct
Reviewed-by: Eric Anholt <eric@anholt.net>
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit f579cc85c29f52b575c62e6ae1e16eb87c506bd3
Author: Adam Jackson <ajax@redhat.com>
Date: Thu Jul 4 10:08:40 2013 -0400
glxproxy: Don't track GLCLientm{aj,in}orVersion
Basically just a port of 62f06b0d to glxproxy.
Reviewed-by: Eric Anholt <eric@anholt.net>
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit e549ffb5f19cf044bc3e2d368a6f081f8b84bfaa
Author: Adam Jackson <ajax@redhat.com>
Date: Tue Oct 30 18:20:43 2012 -0400
dmx/glx: Remove unused __glXNop
Reviewed-by: Eric Anholt <eric@anholt.net>
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit d962b8ed272d4a8921c0dadf16cd926484e30d10
Author: Adam Jackson <ajax@redhat.com>
Date: Thu Aug 22 16:42:23 2013 -0400
damageext: Style fix
Reviewed-by: Eric Anholt <eric@anholt.net>
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit c90add0f1ce0c85aea7a60635de765848d778266
Author: Adam Jackson <ajax@redhat.com>
Date: Wed Aug 21 11:57:24 2013 -0400
damage: Remove "post-rendering" hooks
This is a revert of 974db58f5b730c3770ee461665a02dd4334d1dea. There are
no consumers of this API, we must not need it.
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Reviewed-by: Eric Anholt <eric@anholt.net>
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit 0f3f8e4295d4c05f33b93e0ffd2f6f8cd5759bf7
Author: Adam Jackson <ajax@redhat.com>
Date: Wed Aug 21 11:13:11 2013 -0400
damage: Don't rewrite Text ops to GlyphBlt ops
There's no particularly good reason to, and it breaks Xnest.
Bugzilla: http://bugs.freedesktop.org/2454
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Reviewed-by: Eric Anholt <eric@anholt.net>
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit d08966227e7d567df8d26eebc80f35f886e59a4a
Author: Adam Jackson <ajax@redhat.com>
Date: Mon Aug 26 14:03:51 2013 -0400
damage: Simplify DamageUnregister
You can only register one drawable on a given damage, so there's no
reason to require the caller to specify the drawable, the damage is
enough. The implementation would do something fairly horrible if you
_did_ pass mismatched drawable and damage, so let's avoid the problem
entirely.
v2: Simplify xf86RotateDestroy even more [anholt]
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Reviewed-by: Eric Anholt <eric@anholt.net>
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit 28708a045de7d9043d20fb06b61c44a46eb5526b
Author: Adam Jackson <ajax@redhat.com>
Date: Mon Aug 26 13:52:14 2013 -0400
damage: Implicitly unregister on destroy
There's no reason not to, and it simplifies quite a few callers.
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Reviewed-by: Eric Anholt <eric@anholt.net>
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit e657635dbe6b92875b0e88370557c2cbab673a49
Author: Adam Jackson <ajax@redhat.com>
Date: Thu Oct 18 14:24:23 2012 -0400
fb: Remove unused compatibility wrappers
Originally added in early 2009, not being used elsewhere anymore.
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit e4b15125bb06c97f1f34f7074fcdb597e718399c
Author: Adam Jackson <ajax@redhat.com>
Date: Thu Oct 18 14:24:22 2012 -0400
mipointer: Remove deprecated miPointerCurrentScreen
The only remaining use was in some debugging code in DMX.
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Mark Kettenis <kettenis@openbsd.org>
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit b5d66b9513a0f1e13f5c5bc9e0958f4eac9bf6c3
Author: Adam Jackson <ajax@redhat.com>
Date: Thu Oct 18 14:24:21 2012 -0400
xfree86: Remove deprecated unimplemented xf86MapReadSideEffects
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Mark Kettenis <kettenis@openbsd.org>
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit abbd85742a390e18497b96902a0c0d976739e3bd
Author: Adam Jackson <ajax@redhat.com>
Date: Thu Oct 18 14:24:20 2012 -0400
dix: FIXES is not optional
It's already not optional at configure time, this just makes it so at
build time too.
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit dff81687f5eac3eac9b49f58d4654cc30add2547
Author: Adam Jackson <ajax@redhat.com>
Date: Thu Oct 18 14:24:19 2012 -0400
vbe: Don't try to load the ddc submodule
DDC is built into the server now.
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit bb82191bcfa8042f8d98ec8b1c6616dc31d2c5c8
Author: Adam Jackson <ajax@redhat.com>
Date: Thu Oct 18 14:24:18 2012 -0400
misprite: Delete some dead private storage
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit 3639ab4ce25dc82a3f8592b7322198f1d2aca5f9
Author: Adam Jackson <ajax@redhat.com>
Date: Tue Oct 16 14:56:25 2012 -0400
dri2: Don't bother with xf86LoaderCheckSymbol("DRI2Connect")
The DRI2 code is now built-in to the server, even for Xorg. The only
thing this could protect against is trying to run a libglx built with
DRI2 support against an Xorg built without it, which is firmly in
"doctor it hurts when I do this" territory.
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit 13b507409f9e01adebba50e7eb801b52e52692ba
Author: Adam Jackson <ajax@redhat.com>
Date: Tue Oct 16 14:56:23 2012 -0400
list: Avoid using X types
In particular, Bool. This is not an ABI break:
/usr/include/X11/Xdefs.h:typedef int Bool;
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit dbe10ef0e35659ee0e5db73f29670a3894a3e3f5
Author: Adam Jackson <ajax@redhat.com>
Date: Tue Oct 16 14:56:22 2012 -0400
dbe: Fold the window private private into the window private
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit 1489637d567b0034a916f88079b5f360e7fce99c
Author: Adam Jackson <ajax@redhat.com>
Date: Tue Oct 16 14:56:21 2012 -0400
dbe: Fold midbe reset into dix
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit 44d770750069486a8452fb2384f9b85745268e61
Author: Adam Jackson <ajax@redhat.com>
Date: Tue Oct 16 14:56:20 2012 -0400
dbe: Drop the unused idiom support
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit 8cce0cf4d378f6fa52bc2cd277737b8986ab683c
Author: Adam Jackson <ajax@redhat.com>
Date: Tue Oct 16 14:56:19 2012 -0400
damage: Remove the 'damage window' resource type.
Note that the existing code never actually creates a resource of this
type, so it can't possibly do anything. This is clearly meant to track
window destruction and clean up any associated Damages, but that's
already handled by miext/damage's DestroyWindow wrapper.
Previous discussion:
http://lists.freedesktop.org/archives/xorg-devel/2011-March/020847.html
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit e674815e0a217ac01ec2d6a8517f8466b27fb39f
Author: Adam Jackson <ajax@redhat.com>
Date: Tue Oct 16 14:56:18 2012 -0400
dmx: Remove ShadowFB support
This has been listed as deprecated ever since DMX was merged.
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit 19d3a7cb5db3188210830efa746987ba50d839e9
Author: Adam Jackson <ajax@redhat.com>
Date: Tue Oct 16 14:56:17 2012 -0400
dix: Remove a dead parameter from DoGetImage
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit 4dca026880da90cff9734cf5787c5b57c02e7310
Author: Adam Jackson <ajax@redhat.com>
Date: Tue Oct 16 14:56:16 2012 -0400
mipointer: Remove EnqueueEvent from miPointerScreenFuncRec
No DDX overrode this, and we never actually called through that slot
anyway.
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit ad076dc6e82019defa422500710b3b42c6309e39
Author: Adam Jackson <ajax@redhat.com>
Date: Tue Oct 16 14:56:15 2012 -0400
mipointer: Flatten calls to mieqSwitchScreen
No DDX was overriding this.
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit e2b14a1d3bb27e86ff1d7aaf59af850d06263ef5
Author: Adam Jackson <ajax@redhat.com>
Date: Tue Oct 16 14:56:14 2012 -0400
os: Factor out some common code in input buffer handling
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit 65fca558848acd907483d3c85c7cd4db5560f1b4
Author: Radek Doulik <rodo@novell.com>
Date: Tue Aug 13 08:45:47 2013 +0200
xnest: Ignore GetImage() error in xnestGetImage()
When an Xnest instance is not viewable it will crash when a client in
that instance calls GetImage. This is because the Xnest server will
itself receives a BadMatch error.
This patch ignores the error. The application which has requested the
image will receive garbage - this however is fully legal according
to the specs as obscured areas will always contain garbage if there
isn't some sort of backing store as discussed in
https://bugs.freedesktop.org/show_bug.cgi?id=9488
The applied patch is a version from Dadek Doulik.
v2: Call XSync() before changing error handlers as suggested by
Daniel Stone <daniel@fooishbar.org>.
Reviewed-by: Daniel Stone <daniel@fooishbar.org>
Signed-off-by: Egbert Eich <eich@freedesktop.org>
commit b902c8abb6d03e68c93e13881a350523b5ac900c
Author: Michal Srb <msrb@novell.com>
Date: Tue Aug 6 16:56:53 2013 +0200
Xnest: Implement xnestModifyPixmapHeader
Xnest variant of ModifyPixmapHeader that creates new Pixmap in parent X
server if it's size is modified from 0x0 to anything bigger.
xnestCreatePixmap doesn't create pixmap in parent X server if it has
dimensions 0x0. If it is later resized and accessed, Xnest will be
aborted with BadDrawable error from parent X server because it will
use XID 0. This happens with ScratchPixmap, for example as used from
XaceCensorImage. Applications using XACE crash Xnest.
Reviewed-by: Adam Jackson <ajax@redhat.com>
commit 132507eba93e4dfd466d5c30c9b818cdc6f8536e
Author: Peter Harris <pharris@opentext.com>
Date: Mon Jul 15 19:44:45 2013 -0400
security: Don't count RetainPermanent clients twice
If a RetainPermanent client is subsequently killed by a KillClient
request, the reference count is decremented twice. This can cause the
server to prematurely kill other clients using the same Authorization.
Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Peter Harris <pharris@opentext.com>
commit 20c2a3bcb11b5baf564e2c73a477ba23f5ae2b10
Author: Peter Harris <pharris@opentext.com>
Date: Mon Jul 15 19:44:29 2013 -0400
mi: Avoid stack smash when drawing dashed lines
X.org Bug 54013 <https://bugs.freedesktop.org/show_bug.cgi?id=54013>
Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Peter Harris <pharris@opentext.com>
commit 9bf46610a9d20962854016032de4567974e87957
Author: Chris Wilson <chris@chris-wilson.co.uk>
Date: Fri Jun 21 22:58:31 2013 +0100
os: Immediately queue initial WriteToClient
If we immediately put the WriteToClient() buffer into the socket's write
queue, not only do we benefit from sending the response back to client
earlier, but we also avoid the overhead of copying the data into our own
staging buffer and causing extra work in the next select(). The write is
effectively free as typically we may only send one reply per client per
select() call, so the cost of the FlushClient() is the same.
shmget10: 26400 -> 110000
getimage10: 25000 -> 108000
shmget500: 3160 -> 13500
getimage500: 1000 -> 1010
The knock-on effect is that on a mostly idle composited desktop, the CPU
overhead is dominated by the memmove in WriteToClient, which is in turn
eliminated by this patch.
Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
commit ceffb34774d44ada83cc1994d20c8d65b46bd555
Author: Laurent Carlier <lordheavym@gmail.com>
Date: Sat Jun 8 00:43:56 2013 +0200
ephyr: restore GLX support
It was removed since version 1.13
Signed-off-by: Sebastien Bacher <seb128@ubuntu.com>
Acked-by: Daniel Stone <daniel@fooishbar.org>
commit f37972f4a67b49ba9649310a6778bd1bf31e0130
Author: Keith Packard <keithp@keithp.com>
Date: Wed Apr 24 14:58:27 2013 -0700
miext/sync: Fix multi-screen support in SyncFence initialization
miSyncSetup was checking to see if the screen private key had been
registered, and if so, skipping the setup of the provided screen.
Instead, it should register the private index only once, but then
initialize the screen unless it has already been initialized. This
latter step allows drivers to initialize the sync private structures
before the Sync extension itself is initialized.
Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 1c8beedfe4343377fa3504f8ab71430cc137b22c
Author: Adam Jackson <ajax@redhat.com>
Date: Wed Aug 21 14:12:52 2013 -0400
randr: Fix a copypasta bug in CRTC confinement
Reviewed-by: Michel Dänzer <michel.daenzer@amd.com>
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit 47ff382d1fce25a8b097d45b79489e891f1f1228
Merge: 6f89ae3e64 3752a81580
Author: Keith Packard <keithp@keithp.com>
Date: Mon Sep 9 15:13:42 2013 -0700
Merge remote-tracking branch 'jturney/master'
commit 6f89ae3e64c4dfeea508813e546c10ba1da3ea8e
Author: Thomas Klausner <wiz@NetBSD.org>
Date: Wed Sep 4 20:06:07 2013 +0200
Fix typo in configure warning.
Signed-off-by: Thomas Klausner <wiz@NetBSD.org>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 47218a6e09549781fd61dbf5e0d3d5c81da64323
Author: Thomas Klausner <wiz@NetBSD.org>
Date: Wed Sep 4 20:05:51 2013 +0200
Fix bug in cursor handling.
CreateCursor (Xlib call XCreatePixmapCursor) with a non-bitmap
source pixmap and a None mask is supposed to error out with BadMatch,
but didn't.
From der Mouse <mouse@Rodents-Montreal.ORG>, changed following
comments by Alan Coopersmith <alan.coopersmith@oracle.com>.
Signed-off-by: Thomas Klausner <wiz@NetBSD.org>
Reviewed-by: Jasper St. Pierre <jstpierre@mecheye.net>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 1110b71e360195aab040d835b54540ab558638c5
Author: Chris Clayton <chris2553@googlemail.com>
Date: Wed Sep 4 15:42:04 2013 +1000
kdrive: fix build error on gcc 4.8 for out-of-bounds array access
I'm getting a error building xorg-server-1.14.1.902 with thelatest snapshot
of gcc-4.8:
input.c:225:43: error: array subscript is above array bounds
[-Werror=array-bounds]
This is because kdNumInputFds can become equal to KD_MAX_INPUT_FDS in
KdRegisterFd(). This means that in KdUnregisterFd(), kdInputFds[j + 1] can
be beyond the end of the array.
Signed-off-by: Chris Clayton <chris2553@googlemail.com>
Reviewed-by: Keith Packard <keithp@keithp.com>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit abc2bfca16adcd1e5657d4ce54f4e1335d5ed53f
Author: Sebastien Bacher <seb128@ubuntu.com>
Date: Fri Aug 23 21:21:44 2013 +0200
kdrive: initialize GLX for xephyr
Like commit ac1a60e7b6f06fd075cc5bf55d6bc67206a01d29, re-add
initialization of GLX after it was accidentally dropped from non-Xorg
servers in 5f5bbbe543f65c48ecbb5cce80116a86ca3fbe86.
Signed-off-by: Sebastien Bacher <seb128@ubuntu.com>
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=62346
Reviewed-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Adam Jackson <ajax@redhat.com>
Reviewed-by: Julien Cristau <jcristau@debian.org>
Signed-off-by: Eric Anholt <eric@anholt.net>
commit aa5534ec6931ffcc81cca76b98785d57de8e0e52
Author: Eric Anholt <eric@anholt.net>
Date: Fri Aug 23 11:23:00 2013 -0700
ephyr: Do grab/ungrab for ctrl+shift, not just shift+ctrl.
Given that the window title says "ctrl+shift", having pressing those
keys in that order not ungrab you is fairly mean.
Signed-off-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Adam Jackson <ajax@redhat.com>
Reviewed-by: Julien Cristau <jcristau@debian.org>
commit 5cc15e1c427bacd73db7381df3474a23f7616624
Author: Eric Anholt <eric@anholt.net>
Date: Fri Aug 23 11:19:17 2013 -0700
ephyr: Flush the X connection when updating the window title.
Otherwise when you're doing the ctrl-shift mouse grab thing, you
don't know what state you're in until the next rendering occurs.
Signed-off-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Adam Jackson <ajax@redhat.com>
Reviewed-by: Julien Cristau <jcristau@debian.org>
commit ba387cf21f7d95987211f75d8024601e7d64e322
Author: Eric Anholt <eric@anholt.net>
Date: Fri Aug 23 11:17:14 2013 -0700
ephyr: Use host (HW) cursors by default.
Unless you're working on the sw cursor rendering code, you surely want
to have real hardware cursors.
Signed-off-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Adam Jackson <ajax@redhat.com>
Reviewed-by: Julien Cristau <jcristau@debian.org>
commit 0f5a2f13dc284dd5f0f28e2c4323b2e08d253a7d
Author: Eric Anholt <eric@anholt.net>
Date: Fri Aug 23 11:04:22 2013 -0700
ephyr: Garbage collect some DOA host window clipping code.
Introduced in 79782726617d4b5a4f9b376f21936d035fc870e1 but never used.
Signed-off-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Julien Cristau <jcristau@debian.org>
commit 090de17d361dc9828203a2562565d6499998db46
Author: Eric Anholt <eric@anholt.net>
Date: Fri Aug 23 10:56:22 2013 -0700
ephyr: Garbage collect some dead XV clipping code.
Signed-off-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Julien Cristau <jcristau@debian.org>
commit 347d0fa6961c2b3dc4efd4e7cca8ef98cd3ea06e
Author: Eric Anholt <eric@anholt.net>
Date: Fri Aug 23 10:44:23 2013 -0700
ephyr: Remove the helper libs for each of the optional components.
Note that EXTRA_DIST was always unnecessary, because automake notices
conditional compile of source files and includes them.
Copyright header is added because git noted that this was a 61%
rewrite.
Signed-off-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Julien Cristau <jcristau@debian.org>
commit 74dff87790dbb3dcb23634f1e8cd54018e5ddc9d
Author: Eric Anholt <eric@anholt.net>
Date: Fri Aug 23 10:40:52 2013 -0700
ephyr: Remove the remaining bits of host/server XV split.
Signed-off-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Julien Cristau <jcristau@debian.org>
commit 2f994dfe9d1add9ea8cb9c88ddb0d15843854788
Author: Eric Anholt <eric@anholt.net>
Date: Fri Aug 23 10:14:36 2013 -0700
ephyr: Remove the host/server split of the actual XV video operations.
I suspect there's more cleanup possible in ephyrHostXVPutImage() by
sticking a bunch of the args in the port priv earlier.
Signed-off-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Julien Cristau <jcristau@debian.org>
commit 0b7ce74315213ccd31802847e5a83e67090ded14
Author: Eric Anholt <eric@anholt.net>
Date: Fri Aug 23 10:01:23 2013 -0700
ephyr: Remove another host/server split for XV image formats.
Signed-off-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Julien Cristau <jcristau@debian.org>
commit 1dcc28bcb402d7286d18b41b469062a5c176d7eb
Author: Eric Anholt <eric@anholt.net>
Date: Thu Aug 22 17:00:41 2013 -0700
ephyr: Remove the host/server split for video encodings.
Signed-off-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Julien Cristau <jcristau@debian.org>
commit 28a37757e11068b4594f4128a0d64c6bc9a53ee0
Author: Eric Anholt <eric@anholt.net>
Date: Thu Aug 22 17:26:21 2013 -0700
ephyr: Remove the host/server split for XV formats.
Signed-off-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Julien Cristau <jcristau@debian.org>
commit 41134d393a37dd5b971b018a3888fbfea0b9c736
Author: Eric Anholt <eric@anholt.net>
Date: Thu Aug 22 17:21:37 2013 -0700
ephyr: Remove the host/server split for XV attributes.
v2: Fix leaks of xcb replies (caught by Julien)
Signed-off-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Julien Cristau <jcristau@debian.org>
commit 1342a93c49beb6e4924534304119d57fa587ad0f
Author: Eric Anholt <eric@anholt.net>
Date: Thu Aug 22 17:26:08 2013 -0700
ephyr: Remove the host/server split for XV adaptors.
Signed-off-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Julien Cristau <jcristau@debian.org>
commit fad79d2e3e53de4f25b3d1dd7accb558464a4a46
Author: Eric Anholt <eric@anholt.net>
Date: Sun Aug 18 20:08:32 2013 +0200
ephyr: Refactor XV adaptor feature detection.
This obviously wanted a helper function beforehand, but even more so
now that we have XCB.
Signed-off-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Julien Cristau <jcristau@debian.org>
commit 7a9c311add62026972419ef0b04a55680072bfeb
Author: Eric Anholt <eric@anholt.net>
Date: Sun Aug 18 20:02:53 2013 +0200
ephyr: Remove some pointless indirection in the XV code.
Now that we have XCB on the server side, we don't need to split these
functions out.
Signed-off-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Julien Cristau <jcristau@debian.org>
commit 46cf6bf5692ef751ec9d17ae2292565d4b13f14b
Author: Eric Anholt <eric@anholt.net>
Date: Sun Aug 18 18:38:29 2013 +0200
ephyr: Move event processing into ephyr.c.
No more extra event structure to translate between hostx.c and
ephyr.c!
Signed-off-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Julien Cristau <jcristau@debian.org>
commit 847c856effde482c13cdefcdca8176cee3bf67c4
Author: Eric Anholt <eric@anholt.net>
Date: Sun Aug 18 17:28:08 2013 +0200
ephyr: Move the host screen info into the kdrive screen private.
We can include xcb bits from the same place as server headers, so
there's no need to hide them any more.
Signed-off-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Julien Cristau <jcristau@debian.org>
commit 8dadc78e233f341f1ecb8d404de03d98ab210620
Author: Eric Anholt <eric@anholt.net>
Date: Sun Aug 18 16:45:06 2013 +0200
ephyr: Rename and use the proper type for what was host_screen->info.
Now that we can include server headers in talking to host X, we don't
need to hide any more.
Signed-off-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Julien Cristau <jcristau@debian.org>
commit 18d836f6dde46bcac8b794d34f76032688c28851
Author: Eric Anholt <eric@anholt.net>
Date: Sun Aug 18 14:12:45 2013 +0200
ephyr: Expose a single function for detecting extensions.
v2: Fix trying to include xcb-dri in the non-dri-build case (Noted by
Julien)
Signed-off-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Julien Cristau <jcristau@debian.org>
commit 3aacb22d6473480c31fb08f0b2527747dbf5be57
Author: Eric Anholt <eric@anholt.net>
Date: Sun Aug 18 14:01:53 2013 +0200
ephyr: Drop dead ephyrHostAtomToLocal code.
Signed-off-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Julien Cristau <jcristau@debian.org>
commit 4aaad0bfbcef018eb36839b1d034c3f60022694a
Author: Julien Cristau <jcristau@debian.org>
Date: Wed Oct 20 20:10:43 2010 +0200
Xephyr: we're not using Xlib anymore, no need to undef _XSERVER64
Drop obsolete comments about interaction between Xlib code and that
macro, and stop undefining it.
Signed-off-by: Julien Cristau <jcristau@debian.org>
Reviewed-by: Eric Anholt <eric@anholt.net>
commit 0fc2f9f04a44599f598380d4df992bec60c0e3a1
Author: Julien Cristau <jcristau@debian.org>
Date: Sat Sep 25 16:05:07 2010 +0200
Xephyr: handle errors in event loop
Signed-off-by: Julien Cristau <jcristau@debian.org>
Reviewed-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Mikhail Gusarov <dottedmag@dottedmag.net>
commit 3309a73c826f02c4b2e14180a3254546314ec323
Author: Julien Cristau <jcristau@debian.org>
Date: Fri Jun 25 14:20:57 2010 +0100
Xephyr: drop remaining Xlib dependency
Reviewed-by: Mikhail Gusarov <dottedmag@dottedmag.net>
Reviewed-by: Eric Anholt <eric@anholt.net>
Signed-off-by: Julien Cristau <jcristau@debian.org>
commit 7da2174cf93f59b7e0372a6dc9d37a510076e187
Author: Julien Cristau <jcristau@debian.org>
Date: Mon Jun 21 14:39:03 2010 +0100
Xephyr: move glx code to xcb
v2: Rebase on master, notably adding XCB for
X_GLXvop_MakeCurrentReadSGI (anholt).
v3: Fix use-after-free (caught by Julien).
Reviewed-by: Mikhail Gusarov <dottedmag@dottedmag.net> (v1)
Signed-off-by: Julien Cristau <jcristau@debian.org>
Signed-off-by: Eric Anholt <eric@anholt.net>
commit 19c2699b954e2978301c4449dfccc7ca40bf6ae6
Author: Julien Cristau <jcristau@debian.org>
Date: Wed Jun 23 18:36:00 2010 +0100
Xephyr: remove unused DRI1 code
Reviewed-by: Mikhail Gusarov <dottedmag@dottedmag.net>
Signed-off-by: Julien Cristau <jcristau@debian.org>
commit 68b7db19e8d3c1ac55a811327d3058f4c8fb45ec
Author: Julien Cristau <jcristau@debian.org>
Date: Sun Jun 20 00:07:08 2010 +0100
Xephyr: move ephyrdri over to xcb
Require new xcb-xf86dri to get fixed GetDrawableInfo.
Reviewed-by: Mikhail Gusarov <dottedmag@dottedmag.net>
Signed-off-by: Julien Cristau <jcristau@debian.org>
commit aea119cd05807ed77336f96a40f8e4607c6ce169
Author: Julien Cristau <jcristau@debian.org>
Date: Sun Jun 20 11:13:26 2010 +0100
Xephyr: use xcb-xv instead of libXv
v2: Massive, conflict-filled rebase. I think I resolved everything
right, but this host xv code makes my eyes bleed. Touch-tested XV
after the rebase (anholt).
Reviewed-by: Mikhail Gusarov <dottedmag@dottedmag.net> (v1)
Signed-off-by: Julien Cristau <jcristau@debian.org>
Signed-off-by: Eric Anholt <eric@anholt.net>
commit 3ea75a59d5fec3c4099388724942e216f2344328
Author: Julien Cristau <jcristau@debian.org>
Date: Mon Jun 21 17:20:32 2010 +0100
Xephyr: use xcb for event handling
v2: Rebase on indentation changes, squash in a simpler variant of the
later event compression patch, fix server hang or segfault on
window close by reimplementing the x_io_error_handler in the new
XCB event loop (anholt).
Reviewed-by: Mikhail Gusarov <dottedmag@dottedmag.net> (v1)
Signed-off-by: Julien Cristau <jcristau@debian.org>
Signed-off-by: Eric Anholt <eric@anholt.net>
commit ff26845252889f7cc3258a0d3aa116189acc6aae
Author: Julien Cristau <jcristau@debian.org>
Date: Thu Jun 24 23:45:16 2010 +0100
Xephyr: some more hostx.c xcb-ification
Reviewed-by: Mikhail Gusarov <dottedmag@dottedmag.net>
Reviewed-by: Eric Anholt <eric@anholt.net>
Signed-off-by: Julien Cristau <jcristau@debian.org>
commit 9b55f76a265aab0d9943a40208a38800e5782ba5
Author: Julien Cristau <jcristau@debian.org>
Date: Thu Jun 24 23:35:15 2010 +0100
Xephyr: move HostX.visual to xcb
Reviewed-by: Mikhail Gusarov <dottedmag@dottedmag.net>
Reviewed-by: Eric Anholt <eric@anholt.net>
Signed-off-by: Julien Cristau <jcristau@debian.org>
commit 126312fb4a6e06024a306341e675163108426390
Author: Julien Cristau <jcristau@debian.org>
Date: Thu Jun 24 23:26:48 2010 +0100
Xephyr: replace XKeycodeToKeysym with xcb-keysyms
Reviewed-by: Mikhail Gusarov <dottedmag@dottedmag.net>
Reviewed-by: Eric Anholt <eric@anholt.net>
Signed-off-by: Julien Cristau <jcristau@debian.org>
commit 8543d3fdfd47d2a0423f3ef8e7429c23c5d6b053
Author: Julien Cristau <jcristau@debian.org>
Date: Thu Jun 24 23:17:32 2010 +0100
Xephyr: delete unused hostx_get_extension_info function
v2: Also remove the prototype (anholt)
Reviewed-by: Mikhail Gusarov <dottedmag@dottedmag.net> (v1)
Signed-off-by: Julien Cristau <jcristau@debian.org>
Signed-off-by: Eric Anholt <eric@anholt.net>
commit d72c11b9df4a98fd80cb6635d34964483e33bc41
Author: Julien Cristau <jcristau@debian.org>
Date: Mon Jun 21 14:25:11 2010 +0100
Xephyr: delete unused proxy code
Reviewed-by: Mikhail Gusarov <dottedmag@dottedmag.net>
Reviewed-by: Eric Anholt <eric@anholt.net>
Signed-off-by: Julien Cristau <jcristau@debian.org>
commit a71ea3f96769da157dde82a591e43264820772ac
Author: Julien Cristau <jcristau@debian.org>
Date: Sun Jun 20 23:34:54 2010 +0100
Xephyr: xcb-ify visual list construction
Reviewed-by: Mikhail Gusarov <dottedmag@dottedmag.net>
Reviewed-by: Eric Anholt <eric@anholt.net>
Signed-off-by: Julien Cristau <jcristau@debian.org>
commit ac2b0348c00d692ec1bd8d6c8ab99e9198e755a7
Author: Julien Cristau <jcristau@debian.org>
Date: Sun Jun 20 23:34:39 2010 +0100
Xephyr: xcb-ify pointer/keyboard grab
Reviewed-by: Mikhail Gusarov <dottedmag@dottedmag.net>
Reviewed-by: Eric Anholt <eric@anholt.net>
Signed-off-by: Julien Cristau <jcristau@debian.org>
commit 1f93e6b350d1b9a058009052a666a2e8796708cb
Author: Julien Cristau <jcristau@debian.org>
Date: Sun Jun 20 23:34:03 2010 +0100
Xephyr: no need for XDisplayKeycodes
Reviewed-by: Mikhail Gusarov <dottedmag@dottedmag.net>
Reviewed-by: Eric Anholt <eric@anholt.net>
Signed-off-by: Julien Cristau <jcristau@debian.org>
commit 73398e5bf61c30e69a40a19a1057c2263fbb91ef
Author: Julien Cristau <jcristau@debian.org>
Date: Thu Jun 24 23:00:38 2010 +0100
Xephyr: use xcb-shape instead of XShape*
Reviewed-by: Mikhail Gusarov <dottedmag@dottedmag.net>
Reviewed-by: Eric Anholt <eric@anholt.net>
Signed-off-by: Julien Cristau <jcristau@debian.org>
commit a2b73da78de4e627965213d24a6c33f243a60eb6
Author: Julien Cristau <jcristau@debian.org>
Date: Sun Jun 20 00:05:40 2010 +0100
Xephyr: start converting hostx.c over to xcb
v2: Dropped the hostx_load_keymap changes, now that that function is
gutted (anholt).
Reviewed-by: Mikhail Gusarov <dottedmag@dottedmag.net> (v1)
Signed-off-by: Julien Cristau <jcristau@debian.org>
Signed-off-by: Eric Anholt <eric@anholt.net>
commit 762606b4cdfb57c5202ae128ce4dbb8afe172d4e
Author: Julien Cristau <jcristau@debian.org>
Date: Fri Jun 25 17:59:13 2010 +0100
Xephyr: stop loading the host's keymap
This isn't used anywhere.
v2: Rebase to the top of the patch series (anholt)
Reviewed-by: Mikhail Gusarov <dottedmag@dottedmag.net> (v1)
Signed-off-by: Julien Cristau <jcristau@debian.org>
Signed-off-by: Eric Anholt <eric@anholt.net>
commit 3752a815800626ae93f64a856f5889aa6636344e
Author: Marc Haesen <marha@users.sourceforge.net>
Date: Sat Aug 10 17:38:38 2013 +0100
hw/xwin: Remove unnecessary and incorrect HWND casts
Signed-off-by: Marc Haesen <marha@users.sourceforge.net>
Reviewed-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
commit 34932cef6cc800fbdf2f375506057ed8cd1e07f6
Author: Jon TURNEY <jon.turney@dronecode.org.uk>
Date: Mon Apr 1 13:43:00 2013 +0100
hw/xwin: Fix compilation of winauth.c with -Werror=implicit-function-declaration
/jhbuild/checkout/xorg/xserver/hw/xwin/winauth.c: In function ‘MitGenerateCookie’:
/jhbuild/checkout/xorg/xserver/hw/xwin/winauth.c:87:5: error: implicit declaration of function ‘MitAddCookie’ [-Werror=implicit-function-declaration]
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
Reviewed-by: Marc Haesen <marha@users.sourceforge.net>
commit 2a08554a0bf80b862c15676c31ecd463b616518c
Author: Jon TURNEY <jon.turney@dronecode.org.uk>
Date: Mon Jun 17 23:54:01 2013 +0100
hw/xwin: Remove unused extern g_fUseUnicode from winclipboardwndproc.c
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk
Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
Reviewed-by: Marc Haesen <marha@users.sourceforge.net>
commit 69401f38a697c941ea58351028f4cd4b810f9188
Author: Jon TURNEY <jon.turney@dronecode.org.uk>
Date: Mon Jun 17 18:37:26 2013 +0100
hw/xwin: Remove unneeded forward declaration of winProcessXEventsTimeout()
Remove unneeded forward declaration of winProcessXEventsTimeout(), the actual
definition immediately follows.
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
Reviewed-by: Marc Haesen <marha@users.sourceforge.net>
commit 9c45a1ad44f12ac25e1c3b7a18a3bceb85a2cf38
Author: Jon TURNEY <jon.turney@dronecode.org.uk>
Date: Mon Jun 17 16:58:47 2013 +0100
hw/xwin: Remove prototype for non-existent winDeinitClipboard()
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
Reviewed-by: Marc Haesen <marha@users.sourceforge.net>
commit acc46fc217352b94f77a6b5b14808ea89875a2a1
Author: Jon TURNEY <jon.turney@dronecode.org.uk>
Date: Mon Jun 17 00:40:13 2013 +0100
hw/xwin: Remove unused externs from winclipboardwrappers.c
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
Reviewed-by: Marc Haesen <marha@users.sourceforge.net>
commit fcc7767f8cd6c318861b1060ef6a3936750a0dd2
Author: Jon TURNEY <jon.turney@dronecode.org.uk>
Date: Mon Jun 10 17:31:12 2013 +0100
hw/xwin: Remove unused winProcQueryTreeOrig variable
Unused since 47c7b6d3e626497747ae2780f259a15b8e6c846f "Remove no-longer needed
tricks used to prevent the clipboard client from being killed"
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
Reviewed-by: Marc Haesen <marha@users.sourceforge.net>
commit 8fa882a980abea6f05b4b59447a187aea2c793a1
Author: Jon TURNEY <jon.turney@dronecode.org.uk>
Date: Sat Aug 10 12:41:07 2013 +0100
hw/xwin: Fix ARGB cursor conversion on x86_64
Fix erroneous use of unsigned long * for lpBits in winXCursorToHCURSOR() which
leads to ARGB cursors being vertically streched on x86_64 by interleaving blank
rows of pixels.
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
Reviewed-by: Marc Haesen <marha@users.sourceforge.net>
commit 4bfb2dce5eea4923eaf86eca33b96087b28235f5
Author: Jon TURNEY <jon.turney@dronecode.org.uk>
Date: Sun Apr 7 23:59:44 2013 +0100
hw/xwin: Fix an issue in winSetSpansNativeGDI() identifed by -Warray-bounds
The BITMAPINFO local only has room for a single RBGQUAD in bmiColors, but we
access two (black and white for a mono-color DIB). Fix by changing to a dynamic
allocation big enough for a BITMAPINFO and a RGBQUAD.
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
Reviewed-by: Marc Haesen <marha@users.sourceforge.net>
commit 784c006adb22c6693ad30dd0b1b05369cfaa7b5e
Author: Jon TURNEY <jon.turney@dronecode.org.uk>
Date: Sat Aug 10 11:55:23 2013 +0100
hw/xwin: Fix -Warray-bounds warning in winXCursorToHCURSOR()
Rewrite winXCursorToHCURSOR() so access to BITMAPINFO bmiColors member doesn't
trigger an -Warray-bounds warning.
Note that the underlying storage is allocated as a BITMAPV4HEADER, so has
sufficent room for the extra RGBQUADs bmiColors after the BITMAPINFO bmiHeader.
wincursor.c: In function 'winSetCursor':
wincursor.c:293:24: error: array subscript is above array bounds [-Werror=array-bounds]
wincursor.c:294:24: error: array subscript is above array bounds [-Werror=array-bounds]
wincursor.c:295:24: error: array subscript is above array bounds [-Werror=array-bounds]
wincursor.c:296:24: error: array subscript is above array bounds [-Werror=array-bounds]
wincursor.c:297:24: error: array subscript is above array bounds [-Werror=array-bounds]
wincursor.c:298:24: error: array subscript is above array bounds [-Werror=array-bounds]
wincursor.c:299:24: error: array subscript is above array bounds [-Werror=array-bounds]
wincursor.c:300:24: error: array subscript is above array bounds [-Werror=array-bounds]
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
Reviewed-by: Marc Haesen <marha@users.sourceforge.net>
commit 41d03c9ccce665b919b180bbb819b78c750aa325
Author: Marc Haesen <marha@users.sourceforge.net>
Date: Fri Aug 2 18:19:22 2013 +0100
hw/xwin: Correct size of _WINDOWSWM_NATIVE_HWND property on x86_64
Use the correct size of a HWND on x86_64 in XChangeProperty() and
XGetWindowProperty() calls for the _WINDOWSWM_NATIVE_HWND property.
Signed-off-by: Marc Haesen <marha@users.sourceforge.net>
Reviewed-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
commit 390cfec10ef7d52391f890c7593ac82a7d77d856
Author: Colin Harrison <colin.harrison@virgin.net>
Date: Fri Aug 9 16:48:12 2013 +0100
hw/xwin: Correct winprefs.c function signatures for x64.
Correct SetupRootMenu(), SetupSysMenu(), HandleCustomWM_INITMENU() and
HandleCustomWM_COMMAND() function signatures which use unsigned long parameters,
where just a specific HWND or HMENU handle type should have been used.
Signed-off-by: Colin Harrison <colin.harrison@virgin.net>
Reviewed-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Reviewed-by: Marc Haesen <marha@users.sourceforge.net>
commit e716baedc4d8e52a60f43ef21aba771b340d8c8b
Author: Jon TURNEY <jon.turney@dronecode.org.uk>
Date: Sat Mar 31 14:42:45 2012 +0100
Move pseudoramiX code where it can be shared between Xwin and Xquartz
Move pseudoramiX code to a separate top-level directory. Link Xwin and Xquartz
with libPseudoramiX
I'm not sure moving this to a top-level directory is appropriate, but I'm not
sure where else it fits.
Future work: pseudoramiX can probably be consolidated with the rrxinerama code
(which I think provides fake xinerama data when real XINERAMA is disabled and we
only have one screen)
v2: fix distcheck
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
Reviewed-by: Marc Haesen <marha@users.sourceforge.net>
commit ce0217b98261dcf8b20cfb743831965dda1950ec
Author: Jon TURNEY <jon.turney@dronecode.org.uk>
Date: Sat Aug 10 12:35:55 2013 +0100
hw/xwin: Fix winglobals.h for MinGW64 build
Include pthread.h in winglobals.h to fix build with latest MinGW64 headers
In file included from
winmultiwindowicons.c:47:0:
winglobals.h:92:1: error: unknown type name ‘pthread_mutex_t’
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
Reviewed-by: Marc Haesen <marha@users.sourceforge.net>
commit b27756dbe6a1be4633ec47a8fe92a4c217f68f93
Author: Jon TURNEY <jon.turney@dronecode.org.uk>
Date: Sun Aug 11 12:15:11 2013 +0100
hw/xwin: Fix inclusion of shlobj.h in MinGW64 build
Fix build with latest MinGW64 headers by wrapping Status type in shlobj.h as well
In file included from InitOutput.c:51:0:
/usr/i686-w64-mingw32/sys-root/mingw/include/shlobj.h:1231:44: error: expected identifier or ‘(’ before ‘int’
/usr/i686-w64-mingw32/sys-root/mingw/include/shlobj.h:1248:44: error: expected identifier or ‘(’ before ‘int’
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
Reviewed-by: Marc Haesen <marha@users.sourceforge.net>
commit 94d4e29aedc69431fa9b299ca1b67947173d7a24
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Mon Aug 26 15:51:46 2013 +1000
Xi: allow for XIAllowEvent requests larger than XI < 2.2 size (#68554)
XIAllowEvents changed length in XI 2.2 (for the touchid). A bug in libXi
causes libXi to always use the new request length if the server supports
2.2, regardless of the client's XIQueryVersion request.
The server takes the client's XIQueryVersion request into account though,
resulting in a BadLength error if a 2.[0,1] client calls XIAllowEvents on a
XI 2.2+ server.
Can't fix this in libXi, so work around this in the server.
X.Org Bug 68554 <http://bugs.freedesktop.org/show_bug.cgi?id=68554>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Adam Jackson <ajax@redhat.com>
commit 82939e02392cbb880313fe92957091ff89ce2f2b
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri Aug 16 15:30:59 2013 +1000
dix: check for grab type before checking XI2 mask
if the grab type isn't XI2, grab->xi2mask is random. That random data may
have the enter/leave mask set, leading to events sent to the client that the
client can't handler.
Source of these errors:
_xgeWireToEvent: Unknown extension 131, this should never happen.
Simplest reproducer:
Start Xephyr, press button inside window, move out. As the pointer leaves
the Xephyr window, the errors appear.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Adam Jackson <ajax@redhat.com>
commit 16894df1ffb6fe21bf723dd954578e8d934799ca
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri Aug 16 10:55:09 2013 +1000
Xi: replace loop with memset
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Adam Jackson <ajax@redhat.com>
commit 8f2292b683f591052da2fe94fb3831a3c9a5aa61
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri Aug 16 11:05:49 2013 +1000
include: wrap EMASKSIZE in parentheses
Otherwise things like EMASKSIZE * foo will yield interesting results.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Adam Jackson <ajax@redhat.com>
commit d803f296c616ccf55711cf0af9e7d3eae2edda16
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri Aug 23 09:04:01 2013 +1000
test: fix the gcc diagnostics pragma
pop without push restores the commandline options. The proper way is to
push, then ignore, then pop.
And while we're at it, change the pop argument to a comment - pop ignores
the argument, but be proper about it.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 05ea6307fa4f0bee3d3bf536396059f3906791a0
Author: Egbert Eich <eich@freedesktop.org>
Date: Fri Aug 16 19:52:16 2013 +0200
DIX/Xi: Pass correct client to CheckDeviceGrabAndHintWindow()
If we have a client which has registered for a DeviceButton grab
be sure to pass this to CheckDeviceGrabAndHintWindow(). Since the
order of clients is arbitrary there is no guarantee that the last
client in the list is the one that belongs to this class.
Signed-off-by: Egbert Eich <eich@freedesktop.org>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit e01a3f65d3e6d92f92ef2992b338cc9625bde082
Author: Eric Anholt <eric@anholt.net>
Date: Sat Aug 17 14:50:37 2013 +0200
ephyr: Fix warning about XID vs unsigned long * by changing function args
There's no reason to pass the data back out to the caller, since the
caller was dropping it on the floor. The original data is a CARD32,
so no need to mess with weird unsigned longs.
Signed-off-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Julien Cristau <jcristau@debian.org>
commit f1cefe020bd21c07dfcc9f204e79939499abbd35
Author: Eric Anholt <eric@anholt.net>
Date: Sat Aug 17 14:38:08 2013 +0200
ephyr: Drop is_ok logging.
The only cases that lead to !is_ok are already EPHYR_LOG_ERROR, and it
fixes set-but-unused compiler warnings.
Signed-off-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Julien Cristau <jcristau@debian.org>
commit 77c7a2014e3942b55c0b78308edf02eab33f2e60
Author: Eric Anholt <eric@anholt.net>
Date: Sat Aug 17 14:36:09 2013 +0200
kdrive: Fix const cast warnings in arguments processing.
Signed-off-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Julien Cristau <jcristau@debian.org>
commit 7107937e473a3557c37d719cb100b2e9b09075dd
Author: Eric Anholt <eric@anholt.net>
Date: Sat Aug 17 13:11:17 2013 +0200
kdrive: Fix const cast warnings in driver name handling.
Signed-off-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Julien Cristau <jcristau@debian.org>
commit 56c405d46a86853771a0b808da4c8a9ef626960c
Author: Eric Anholt <eric@anholt.net>
Date: Sat Aug 17 13:07:23 2013 +0200
kdrive: Fix a few easy cast warnings.
Signed-off-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Julien Cristau <jcristau@debian.org>
commit a9c48a07eea50468fa47ab178cdd91edb0b5727f
Author: Eric Anholt <eric@anholt.net>
Date: Sat Aug 17 13:06:23 2013 +0200
kdrive: Drop dead code.
This is unused as of the introduction of a helper in
e7150db5350bc2113ff4126019b489847a4dc217
Signed-off-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Julien Cristau <jcristau@debian.org>
commit 873ae962bdb7559c952b5955ba262285701982a8
Author: Eric Anholt <eric@anholt.net>
Date: Sat Aug 17 13:01:57 2013 +0200
ephyr: Fix dead code warning.
Signed-off-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Julien Cristau <jcristau@debian.org>
commit 34af2eebe19e2f8afe35a5614d4d44fa4fd89d6b
Author: Eric Anholt <eric@anholt.net>
Date: Sat Aug 17 13:01:32 2013 +0200
ephyr: Fix const-cast warnings for setting window title.
Signed-off-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Julien Cristau <jcristau@debian.org>
commit 7edf5066db48434739ac64e0576fbb4fdf0f37f9
Author: Eric Anholt <eric@anholt.net>
Date: Sat Aug 17 12:54:33 2013 +0200
ephyr: Fix const cast warnings in ephyrhostvideo.
Signed-off-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Julien Cristau <jcristau@debian.org>
commit fe7463b8ce0de301c2f82b108c93963424f77219
Author: Julien Cristau <jcristau@debian.org>
Date: Sat Jul 27 12:09:07 2013 +0200
dix: add missing include for DeleteWindowFromAnySelections
Fixes build error with XACE disabled:
window.c:886:5: error: implicit declaration of function 'DeleteWindowFromAnySelections' [-Werror=implicit-function-declaration]
DeleteWindowFromAnySelections(pWin);
^
Debian bug#701372
Reported-by: Matthias Klose <doko@debian.org>
Signed-off-by: Julien Cristau <jcristau@debian.org>
Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 6a49f8836a649322d38a364d9ae084be40fb2305
Author: Keith Packard <keithp@keithp.com>
Date: Sat Aug 17 12:17:36 2013 +0200
Add .dir-locals.el
Enforce X.org style with an emacs configuration file
Signed-off-by: Keith Packard <keithp@keithp.com>
commit f67d022523c59a27f3bf8791aa9ca6624318b1fd
Merge: 5a36cdd915 9680f6a12d
Author: Keith Packard <keithp@keithp.com>
Date: Tue Aug 6 07:12:12 2013 +0200
Merge commit '9680f6a12d642c2e4bfa09bf459d678214059d74'
commit 5a36cdd91530d27627e39159a89b53f9fbb75280
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Mon Aug 5 20:46:45 2013 -0700
Allow disabling XFree86-DGA, DRI, VidModeExtension extensions
Code to recognize these in extension enable/disable options was wrapped
in #ifdef XorgLoader, but that's not defined when building miinitext.c
since the great module merge of 1.13. Change to an #ifdef that is defined.
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Robert Hooker <robert.hooker@canonical.com>
Reviewed-by: Daniel Stone <daniel@fooishbar.org>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 9680f6a12d642c2e4bfa09bf459d678214059d74
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Tue Aug 6 13:14:56 2013 +1000
xfree86: de-duplicate some AM_CPPFLAGS
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
commit bbef8e46f2fed8f823ee4b97e96c3fcee28f3b75
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Tue Aug 6 13:08:13 2013 +1000
Replace INCLUDES with AM_CPPFLAGS
newer automake gets quite noisy about this.
hw/xfree86/ddc/Makefile.am:7: warning:
'INCLUDES' is the old name for 'AM_CPPFLAGS' (or '*_CPPFLAGS')
and many more of these.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
commit c218ba8423a73a7a643cb17789db8a1dd0901ca6
Author: Julien Cristau <jcristau@debian.org>
Date: Fri Aug 2 20:07:36 2013 +0200
xfree86: improve check for posix saved ids
Replace hardcoded SVR4 || linux || CSRG_BASED with an autoconf check and
the _POSIX_SAVED_IDS macro.
Suggested-by: Mark Kettenis <mark.kettenis@xs4all.nl>
Signed-off-by: Julien Cristau <jcristau@debian.org>
Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Mark Kettenis <kettenis@openbsd.org>.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 930c6ff15d437dfb0f897e8cb4253abba70819cc
Author: Julien Cristau <jcristau@debian.org>
Date: Fri Aug 2 23:46:00 2013 +0200
test: include dix-config.h in hashtabletest.c
Missing _XSERVER64 define caused inconsistent sizeof(XID) between the
test and hashtable code, leading to test failures on 64bit big endian
archs like s390x or ppc64.
Signed-off-by: Julien Cristau <jcristau@debian.org>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit b6e5c4669e0db391966deb397e8c975ec7f0124d
Author: Maarten Lankhorst <maarten.lankhorst@canonical.com>
Date: Tue Jul 30 15:31:24 2013 +0200
test/xi2: fix protocol-xiqueryversion test
The old code was broken and allowed setting client version >= XIVersion,
this was fixed in the previous patch, but updating the value for XIVersion
broke the tests, so fix the tests too.
Signed-off-by: Maarten Lankhorst <maarten.lankhorst@canonical.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 500e844a24962c9e70abb3d614f1973013b2de73
Author: Maarten Lankhorst <maarten.lankhorst@canonical.com>
Date: Tue Jul 30 14:45:21 2013 +0200
Xi: Clamp XIClient maximal version to XIVersion
Do not allow setting client version to an arbitrary value >= XIVersion.
Fixes a test error with test/xi2/protocol-xiqueryversion.c, introduced by
commit 4360514d1c "Xi: Allow clients to ask for 2.3 and then 2.2 without failing"
Signed-off-by: Maarten Lankhorst <maarten.lankhorst@canonical.com>
Reviewed-by: Keith Packard <keithp@keithp.com>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit e1ab8f239bdc6af17ef6cd0e9c6187c4e2e2f5bc
Author: Dave Airlie <airlied@redhat.com>
Date: Wed Jul 31 11:35:44 2013 +1000
xfree86/man: document AutoAddGPU
This at least mentions AutoAddGPU and hints at when you might
want to disable it.
Signed-off-by: Dave Airlie <airlied@redhat.com>
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 836daf4c7a276108a9f950e524828744aeda0a3c
Author: Dave Airlie <airlied@redhat.com>
Date: Wed Jul 31 11:24:48 2013 +1000
modesetting: change output names for secondary GPUs
if we are a secondary GPU modify the output name to avoid clashes.
Signed-off-by: Dave Airlie <airlied@redhat.com>
commit ff38bbe81ace85bf675bbaa0a9ca5f3b32ede449
Merge: bdd1e22cbd 4360514d1c
Author: Keith Packard <keithp@keithp.com>
Date: Thu Jul 25 22:50:27 2013 -0700
Merge remote-tracking branch 'whot/for-keith'
commit 4360514d1cc8e3132f93f56172d291074e8c770f
Author: Keith Packard <keithp@keithp.com>
Date: Wed Jul 10 22:42:55 2013 -0700
Xi: Allow clients to ask for 2.3 and then 2.2 without failing
This allows different sub-systems within the same application to
request different Xi versions without either getting old behaviour
everywhere or simply failing with a BadValue.
Signed-off-by: Keith Packard <keithp@keithp.com>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit bdd1e22cbde9ea2324e4e1991c9e152f22f88151
Author: Aaron Plattner <aplattner@nvidia.com>
Date: Tue Apr 30 14:14:23 2013 -0700
xfree86: detach scanout pixmaps when detaching output GPUs
Commit 8f4640bdb9d3988148e09a08d2c7e3bab1d538d6 fixed a bit of a
chicken-and-egg problem by detaching GPU screens when their providers
are destroyed, which happens before CloseScreen is called. However,
this created a new problem: the GPU screen tears down its RandR crtc
objects during CloseScreen and if one of them is active, it tries to
detach the scanout pixmap then. This crashes because
RRCrtcDetachScanoutPixmap tries to get the master screen's screen
pixmap, but crtc->pScreen->current_master is already NULL at that
point.
It doesn't make sense for an unbound GPU screen to still be scanning
out its former master screen's pixmap, so detach them first when the
provider is destroyed.
Signed-off-by: Aaron Plattner <aplattner@nvidia.com>
Reviewed-by: Dave Airlie <airlied@redhat.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 3d8756631070c440cefa31b35fea3d407f187810
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Mon Jul 22 13:43:07 2013 +1000
dix: set the valuator mask to ensure XI 1.x events have data
XI 1.x only allows for first + num valuators, so if a device sends data for
valuators 0 and 2+ only (i.e. valuator 1 is missing) we still need to get
the data for that from somewhere.
XI 1.x uses the hack of an unset valuator mask to get the right coordinates,
i.e. we set the value but don't set the mask for it so XI2 events have the
right mask.
For an absolute device in relative mode, this broke in b28a1af55cf, the
value was now always 0. This wasn't visible on the cursor, only in an XI 1.x
client. The GIMP e.g. sees jumps to x/0 every few events.
Drop the condition introduced in b28a1af55cf, data in valuators is always
absolute, regardless of the mode.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 4fb686d6a6777950f0e0d55b848cd2af4cbad372
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Wed Jul 24 11:50:00 2013 +1000
dix: check the xi2mask, not the grab type for touch listeners
grab->type is only non-zero for passive grabs. We're checking an active grab
here, so we need to check if the touch mask is set on the grab.
Test case: grab the device, then start two simultaneous touches. The
grabbing client won't see the second touchpoints because grab->type is 0
and the second touch is not an emulating pointer.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 43ac0491e36cdbb716b5c9d39c97d0aba3bebd75
Author: Jon TURNEY <jon.turney@dronecode.org.uk>
Date: Mon Apr 8 01:28:36 2013 +0100
hw/xwin: Fix numerous 64-bit format/type cast issues with debug printing of pointers
Numerous pieces of debug output cast a pointer to an int and then use a "%08x"
printf format.
Use "%p" format for 64-bit portability.
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
commit e95bb97073ca77193e4c51bd1504403fbe245533
Author: Colin Harrison <colin.harrison@virgin.net>
Date: Tue Jun 25 21:34:43 2013 +0100
hw/xwin: Fix possible crash in winMultiWindowGetClassHint
Fix a possible crash in winMultiWindowGetClassHint() when an application doesn't
null terminate the WM_CLASS property class name (which is an ICCCM conformance
bug in the application)
(Reported for running the contiki cooja simulator in multiwindow mode, although
it seems that many Java clients may have this problem, see [1])
Based on a patch by Marc Haesen.
v2: Avoid using strnlen() which is missing on MinGW
v3: Align with Xming patch
[1] http://bugs.sun.com/bugdatabase/view_bug.do?bug_id=6961123
Signed-off-by: Colin Harrison <colin.harrison@virgin.net>
Reviewed-by: Yaakov Selkowitz <yselkowitz@users.sourceforge.net>
Reviewed-by: Jon TURNEY <jon.turney@dronecode.org.uk>
commit 4bc375aa2f08bd092f60d3e358d345fc9a0d3637
Author: Jon TURNEY <jon.turney@dronecode.org.uk>
Date: Tue Jun 18 19:21:02 2013 +0100
hw/xwin: Remove obsolete WIN_XEVENTS_SHUTDOWN
Remove obsolete WIN_XEVENTS_SHUTDOWN. This event is never generated.
(I think the idea was to listen for WM_DELETE_WINDOW, but that's not a very
useful thing to do for a hidden window.)
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
commit 2663203cd6994166e107e796c4724a4ed3b59370
Author: Jon TURNEY <jon.turney@dronecode.org.uk>
Date: Tue Jun 18 18:03:05 2013 +0100
configure.ac: Check for python at configure time when building XWin with AIGLX
Check for python at configure time when building XWin with AIGLX, it's used to
generate the wrapper code for native GL functions.
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
commit 9fe360bf2be5c959fb21835955ef550098ccbbf0
Author: Jon TURNEY <jon.turney@dronecode.org.uk>
Date: Sun Jun 16 00:07:57 2013 +0100
hw/xwin: Avoid a null dereference if CreateDIBSection() fails in NetWMToWinIconAlpha()
Avoid a null dereference of DIB_pixels if CreateDIBSection() fails in
NetWMToWinIconAlpha()
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
commit 71b5f56302bbd8be62f63f0dd62cbcd33aab3ac5
Author: Jon TURNEY <jon.turney@dronecode.org.uk>
Date: Thu Feb 21 17:12:17 2013 +0000
hw/xwin: Handle WM_MOUSEHWHEEL
Handle WM_MOUSEHWHEEL tilt wheel messages, similarly to WM_MOUSEWHEEL scroll
wheel messages, to generate X button 6 and 7 presses and releases.
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
commit cf9c777ee094d660e0c95559373fd23ee910362e
Author: Jon TURNEY <jon.turney@dronecode.org.uk>
Date: Thu Feb 21 17:10:45 2013 +0000
hw/xwin: Map extra mouse buttons 1 and 2 to X buttons 8 and 9
Map extra mouse buttons 1 and 2 to X buttons 8 and 9, as conventional, leaving X
buttons 6 and 7 for tilt wheel.
Also add button labels for buttons 6, 7, 8 and 9 and change btn_labels in from a
dynamic allocation to a fixed one of the required size for all the labels we
use.
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
commit c9d7b9516f4a04cb9012c6c1e9466491a468aa07
Author: Jon TURNEY <jon.turney@dronecode.org.uk>
Date: Tue Feb 19 14:38:40 2013 +0000
hw/xwin: Remove unneeded WM_XBUTTON message defines
Remove unneeded WM_XBUTTON message defines, they have been provided by w32api
for a long time now.
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
commit 5dccfc63f9c7056e7cd30884e1d3ccea86a2f419
Author: Jon TURNEY <jon.turney@dronecode.org.uk>
Date: Mon Dec 17 22:38:00 2012 +0000
hw/xwin: Change winTranslateKey() to return it's result as it's return value
Change winTranslateKey() to return it's result as it's return value, and change
it's uses as well.
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
commit 9b4cec76f1d7792d4bf64fa069ea6b64bc42da0d
Author: Oliver Schmidt <oschmidt-mailinglists@gmx.de>
Date: Mon Nov 5 15:05:32 2012 +0000
hw/xwin: Consider left and right modifier keys independently on gaining focus
Handle left and right ctrl and shift keys independently
Assume that all modifiers are cleared when all keys are released on focus lost,
as internalKeyState doesn't record which modifier key was pressed.
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
commit 235149d0b4af9097e47b3af0ba56d4eb0179518c
Author: Jon TURNEY <jon.turney@dronecode.org.uk>
Date: Mon Apr 5 14:22:39 2010 +0100
hw/xwin: Remove an extra '\n' from some log messages
Remove an extra '\n' from internal client IOError log messages
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
commit c7aa9f7578e721b0c9e565e7a085b6aeb30bf2ac
Author: Jon TURNEY <jon.turney@dronecode.org.uk>
Date: Sat Feb 4 17:04:11 2012 +0000
hw/xwin: _NET_WM_STATE is ATOM[] not ATOM
_NET_WM_STATE is ATOM[] not ATOM, a list of window state hints, so check all of
the atoms, not just the first one
See EWMH specifcation, section "Application Window Properties"
v2: Actually use [] on the returned atom data
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
commit 682ccac90b18f293520f77db5b163fcb40328e2b
Author: Jon TURNEY <jon.turney@dronecode.org.uk>
Date: Wed Aug 31 21:35:14 2011 +0100
hw/xwin: Improve WM_ENDSESSION handling using separate messaging window thread
Currently, WM_ENDSESSION just calls GiveUp() to set the DE_TERMINATE flag. But
for the X server to exit cleanly, we also need the X server dispatch loop to be
unblocked so it can notice that DE_TERMINATE has been set and exit, removing
it's lock file and any unix domain socket.
It appears that the system will terminate the process when the last UI thread in
that process returns from processing WM_ENDSESSION for the last top-level
window.
Since WM_ENDSESSION appears to sent by the system via SendMessage()
(synchronously) and the wndproc is called to process it in the message thread
for that window (the X server thread), we can't easily terminate the X server
dispatch loop from inside the WM_ENDSESSION message processing.
So, create a messaging window, a hidden, top-level window, with a separate
thread to catch this message, and process it by calling GiveUp() and then
blocking on a mutex until the X server dispatch loop exits.
Also, notice when this is a shutdown cancel WM_ENDSESSION message and take no
action.
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
commit 15febb05d77cc7e7185c942f35459838f75cfdc0
Author: Jon TURNEY <jon.turney@dronecode.org.uk>
Date: Mon Sep 3 15:19:43 2012 +0100
Allow DDX to provide a main()
XQuartz already conditionally renames main() as dix_main() so it can provide
it's own main(). This isn't the ideal way of doing this, as it prevents libdix
built this way from being useful with any other DDX.
So instead, always name that function dix_main(), and also provide a stub main()
which just calls dix_main(), which can be overriden in the DDX.
Add a main() to XWin (XQuartz already has one, of course).
It's no longer neccessary to link XWin and XQuartz with libmain.
v2: Remove unneeded stub main hw/xwin/InitOutput.c
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Reviewed-by: Julien Cristau <jcristau@debian.org>
Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
commit d5ebe20f9ba9569351c4a41449866679fd60ba45
Merge: 21ea7ebb6a 33f7e60785
Author: Keith Packard <keithp@keithp.com>
Date: Mon Jul 22 20:34:41 2013 -0700
Merge remote-tracking branch 'alanc/master'
commit 21ea7ebb6a1ad56f3060747af0df235ca6ff27fa
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri Jul 19 08:56:38 2013 +1000
dix: scale y back instead of x up when pre-scaling coordinates
The peculiar way we handle coordinates results in relative coordinates on
absolute devices being added to the last value, then that value is mapped to
the screen (taking the device dimensions into account). From that mapped
value we get the final coordinates, both screen and device coordinates.
To avoid uneven scaling on relative coordinates, they are pre-scaled by
screen ratio:resolution:device ratio factor before being mapped. This
ensures that a circle drawn on the device is a circle on the screen.
Previously, we used the ratio to scale x up. Synaptics already does its own
scaling based on the resolution and that is done by scaling y down by the
ratio. So we can remove the code from the driver and get approximately the
same behaviour here.
Minor ABI bump, so we can remove this from synaptics.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Tested-by: Emmanuel Benisty <benisty.e@gmail.com>
commit 33f7e60785f12770ce10558c2ca7ce1323eefc59
Author: Thomas Klausner <wiz@NetBSD.org>
Date: Fri Jul 12 08:21:19 2013 +0200
Fix typo in header guard.
Signed-off-by: Thomas Klausner <wiz@NetBSD.org>
Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
commit ddc52b9cbae017f04c7a232af4e8b16c9f96823d
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Fri Jul 5 22:43:17 2013 -0700
Xephyr: Use _XEatDataWords (from Xlib 1.6) instead of _XEatData
Simplifies code and reduces risk of overflow from converting length
field in X replies from words to bytes.
One call to _XEatData is left in ephyrHostGLXGetStringFromServer where
it's already been checked for overflow, and other values have been
subtracted from it to reduce the size of data remaining to be eaten.
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
commit a3d43edf71847f4b486f971405d2b457f81b73d1
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Fri Jul 5 22:35:32 2013 -0700
glxproxy: Use _XEatDataWords (from Xlib 1.6) instead of _XEatData
Reduces risk of overflow from converting length field in X replies
from words to bytes. (Also seems to be what several calls were
already incorrectly passing to _XEatData.)
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
commit 87b0cabc145a9b5f6faffdfb544ce1c647b8ab72
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Fri Jul 5 22:32:10 2013 -0700
glxproxy: Use _XReadPad instead of _XEatData to clean up the slop
Xlib already provides a function to eat padding bytes after the
data read, so use it instead of calculating it ourselves.
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
commit 1cb182cbdc11fc1c97507c57875f1d2453f27328
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Mon Apr 15 08:41:14 2013 -0700
Xephyr: integer overflow in XF86DRIGetClientDriverName()
clientDriverNameLength is a CARD32 and needs to be bounds checked before
adding one to it to come up with the total size to allocate, to avoid
integer overflow leading to underallocation and writing data from the
network past the end of the allocated buffer.
Reported-by: Ilja Van Sprundel <ivansprundel@ioactive.com>
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Julien Cristau <jcristau@debian.org>
commit 20644e53b385c54d73242c86a7d3f981d18a3843
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Mon Apr 15 08:39:03 2013 -0700
Xephyr: integer overflow in XF86DRIOpenConnection()
busIdStringLength is a CARD32 and needs to be bounds checked before adding
one to it to come up with the total size to allocate, to avoid integer
overflow leading to underallocation and writing data from the network past
the end of the allocated buffer.
Reported-by: Ilja Van Sprundel <ivansprundel@ioactive.com>
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Julien Cristau <jcristau@debian.org>
commit c37ceda76bf9ec6f5166122e864663e10f106546
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Sun Apr 14 10:50:50 2013 -0700
Xephyr: integer overflow in ephyrHostGLXGetStringFromServer()
reply.length & reply.size are CARD32s and need to be bounds checked before
multiplying or adding to come up with the total size to allocate, to avoid
integer overflow leading to underallocation and writing data from the
network past the end of the allocated buffer.
Reported-by: Ilja Van Sprundel <ivansprundel@ioactive.com>
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
commit 5fbd8c45b46ab93522e417240aa770466c30b735
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Sun Apr 14 09:45:26 2013 -0700
Xdmx: integer overflow in GetGLXFBConfigs()
numFBConfigs & numAttribs are CARD32s and need to be bounds checked before
multiplying by structure sizes to come up with the total size to allocate,
to avoid integer overflow leading to underallocation and writing data from
the network past the end of the allocated buffer.
Reported-by: Ilja Van Sprundel <ivansprundel@ioactive.com>
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
commit c89bcd12f4fc7233830a8dbe7863c312f657da3c
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Sun Apr 14 09:33:57 2013 -0700
Xdmx: integer overflow in GetGLXVisualConfigs()
numVisuals & numProps are both CARD32 and need to be bounds checked before
multiplying by structure sizes to come up with the total size to allocate,
to avoid integer overflow leading to underallocation and writing data from
the network past the end of the allocated buffer.
Reported-by: Ilja Van Sprundel <ivansprundel@ioactive.com>
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
commit 74469895e39fa38337f59edd64c4031ab9bb51d8
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Mon Jul 15 13:06:28 2013 +1000
dix: allow a ConstantDeceleration between 0 and 1 (#66134)
A constant deceleration of x simply means (delta * 1/x). We limited that to
values >= 1.0f for obvious reasons, but can also allow values from 0-1.
That means that ConstantDeceleration is actually a ConstantAcceleration, but
hey, if someone needs it...
X.Org Bug 66134 <http://bugs.freedesktop.org/show_bug.cgi?id=66134>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Keith Packard <keithp@keithp.com>
commit 0e3be0b25fcfeff386bad132526352c2e45f1932
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri Jul 12 14:10:10 2013 +1000
dix: UpdateTouchesForGrab must only free the listener grab if it is non-NULL
If a client calls XIGrabDevice in response to a ButtonPress event (regular
event selection), the device will have a grab, but listener->grab is NULL.
Check for that, to avoid logspam.
[ 26293.863] (EE) BUG: triggered 'if (!pGrab)'
[ 26293.863] (EE) BUG: grabs.c:256 in FreeGrab()
[ 26293.863] (EE)
[ 26293.863] (EE) Backtrace:
[ 26293.864] (EE) 0: /usr/bin/Xorg (FreeGrab+0x54) [0x45d3fc]
[ 26293.864] (EE) 1: /usr/bin/Xorg (UpdateTouchesForGrab+0x135) [0x447d4e]
[ 26293.864] (EE) 2: /usr/bin/Xorg (ActivatePointerGrab+0x1ba) [0x447f3d]
[ 26293.864] (EE) 3: /usr/bin/Xorg (GrabDevice+0x3e6) [0x4503bc]
[ 26293.864] (EE) 4: /usr/bin/Xorg (ProcXIGrabDevice+0x1f9) [0x5981b1]
[ 26293.865] (EE) 5: /usr/bin/Xorg (ProcIDispatch+0x78) [0x58aa17]
[ 26293.865] (EE) 6: /usr/bin/Xorg (Dispatch+0x30d) [0x43347e]
[ 26293.865] (EE) 7: /usr/bin/Xorg (main+0x61d) [0x498175]
[ 26293.865] (EE) 8: /lib64/libc.so.6 (__libc_start_main+0xf5) [0x3df5621b75]
[ 26293.865] (EE) 9: /usr/bin/Xorg (_start+0x29) [0x423a19]
[ 26293.866] (EE) 10: ? (?+0x29) [0x29]
[ 26293.866] (EE)
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Keith Packard <keithp@keithp.com>
commit 24cbb47ca80cd7a47749ece0ff3a98657ddf3ae3
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri Jul 12 12:17:47 2013 +1000
config: provide example configuration for multi-seat setups
Seats other than seat0 need custom configuration. Provide that with a
default configuration file so we can share it across distros.
This file intentionally does not end in .conf so it won't get picked up by
the server after a normal installation. gdm, or whatever starts up the
servers will have to explicitly specifiy this config file.
This file replaces the one currently written by systemd's multi-seat-x
binary:
http://cgit.freedesktop.org/systemd/systemd/tree/src/login/multi-seat-x.c
CC: Lennart Poettering <lennart@poettering.net>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Dan Nicholson <dbn.lists@gmail.com>
commit 791121e00692e12cb4c38c8d018bd72eb5081eb7
Author: François Tigeot <ftigeot@wolfpond.org>
Date: Mon Jul 15 21:54:26 2013 +0200
Fix mouse header include on DragonFly and FreeBSD
* __FreeBSD_kernel_version doesn't exist anymore
* The removed check was for FreeBSD versions from before September 2000
which are no longer supported anyway
* Fixes: https://bugs.freedesktop.org/show_bug.cgi?id=66045
Signed-off-by: François Tigeot <ftigeot@wolfpond.org>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 59a6d3f1eb03010ab831b32b03706a1d6143c732
Author: Jon TURNEY <jon.turney@dronecode.org.uk>
Date: Thu Nov 8 13:41:13 2012 +0000
os: Remove any old logfile before trying to write to it
If we are not backing up logfiles, remove the old logfile before trying to write
a new logfile, as otherwise the operation may fail if the previous logfile was
created by a different user.
This change is useful when:
- The DDX doesn't use the logfile backup mechanism (i.e. not Xorg)
- The DDX is run by a non-root user, and then by a different non-root user
- The logfile directory doesn't have the restricted-deletion flag set
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Acked-by: Yaakov Selkowitz <yselkowitz@users.sourceforge.net>
Reviewed-by: Yaakov Selkowitz <yselkowitz@users.sourceforge.net>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 8eeaa74bc241acb41f1d3ed64971e0b01e794776
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Tue Jul 9 13:27:19 2013 +1000
dix: when ungrabbing an active grab, accept pointer grabs (#66720)
Ungrabbing a device during an active touch grab rejects the grab. Ungrabbing
a device during an active pointer grab accepts the grab.
Rejection is not really an option for a pointer-emulated grab, if a client
has a button mask on the window it would get a ButtonPress emulated after
UngrabDevice. That is against the core grab behaviour.
X.Org Bug 66720 <http://bugs.freedesktop.org/show_bug.cgi?id=66720>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Jasper St. Pierre <jstpierre@mecheye.net>
commit a2d6932ad48f2cbfcc4c5fb8272e47106d08ac78
Author: Julien Cristau <jcristau@debian.org>
Date: Mon Jul 1 19:39:30 2013 +0200
xkb: don't call atoi(NULL) when parsing argv
If the -ardelay or -arinterval options have no argument, there's no
point trying to read it.
See
http://www.forallsecure.com/bug-reports/feb3db57fc206d8df22ca53a6907f74973876272/
Reported-by: Alexandre Rebert <alexandre@cmu.edu>
Signed-off-by: Julien Cristau <jcristau@debian.org>
Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 77e51d5bbb97eb5c9d9dbff9a7c44d7e53620e68
Author: Eric Anholt <eric@anholt.net>
Date: Mon Jun 17 15:51:19 2013 -0700
Revert "DRI2: re-allocate DRI2 drawable if pixmap serial changes"
This reverts commit 3209b094a3b1466b579e8020e12a4f3fa78a5f3f. After a
long debug session by Paul Berry, it appears that this was the commit
that has been producing sporadic failures in piglit front buffer
rendering tests for the last several years.
GetBuffers may return fresh buffers with invalid contents at a couple
reasonable times:
- When first asked for a non-fake-front buffer.
- When the drawable size is changed, an Invalidate has been sent, and
obviously the app needs to redraw the whole buffer.
- After a glXSwapBuffers(), GL allows the backbuffer to be undefined,
and an Invalidate was sent to tell the GL that it should grab these
appropriate new buffers to avoid stalling.
But with the patch being reverted, GetBuffers would also return fresh
invalid buffers when the drawable serial number changed, which is
approximately "whenever, for any reason". The app is not expecting
invalid buffer contents "whenever", nor is it valid. Because the GL
usually only GetBuffers after an Invalidate is sent, and the new
buffer allocation only happened during a GetBuffers, most apps saw no
problems. But apps that do (fake-)frontbuffer rendering do frequently
ask the server for the front buffer (since we drop the fake front
allocation when we're not doing front buffer rendering), and if the
drawable serial got bumped midway through a draw, the server would
pointlessly ditch the front *and* backbuffer full of important
drawing, resulting in bad rendering.
The patch was originally to fix bugzilla:
https://bugs.freedesktop.org/show_bug.cgi?id=28365
Specifically:
To reproduce, start with a large-ish display (i.e. 1680x1050 on my
laptop), use the patched glxgears from bug 28252 to add the
-override option. Then run glxgears -override -geometry 640x480
to create a 640x480 window in the top left corner, which will work
fine. Next, run xrandr -s 640x480 and watch the fireworks.
I've tested with an override-redirect glxgears, both with vblank sync
enabled and disabled, both with gnome-shell and no window manager at
all, before and after this patch. The only problem observed was that
before and after the revert, sometimes when alt-tabbing to kill my
gears after completing the test gnome-shell would get confused about
override-redirectness of the glxgears window (according to a log
message) and apparently not bother doing any further compositing.
Signed-off-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Keith Packard <keithp@keithp.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Tested-by: Chris Wilson <chris@chris-wilson.co.uk>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 227015d6544115258b74c31b700f9bd163540e24
Merge: d9005d58c0 80054fcafb
Author: Keith Packard <keithp@keithp.com>
Date: Tue Jun 18 10:53:08 2013 -0700
Merge remote-tracking branch 'jturney/master'
commit 951d2f83fc65a136717fb8090510d053e3f3a6c0
Author: Maarten Lankhorst <maarten.lankhorst@canonical.com>
Date: Wed Jun 12 14:11:53 2013 +0200
bump to 0.8.0
Signed-off-by: Maarten Lankhorst <maarten.lankhorst@canonical.com>
commit 525ac7fb9a0d639253fc5d6556db3edb7239f932
Author: Maarten Lankhorst <maarten.lankhorst@canonical.com>
Date: Wed Jun 12 14:05:19 2013 +0200
modesetting: probe only succeeds if connectors are detected
This will prevent modesetting being used for outputless intel or nvidia cards.
Signed-off-by: Maarten Lankhorst <maarten.lankhorst@canonical.com>
commit d4791dd97b85ddac1295761bf6ab4f10c08346d7
Author: Dave Airlie <airlied@redhat.com>
Date: Tue Jun 11 10:29:25 2013 +1000
modesetting: fix adjust frame crash
When SDL called this it was totally broken, actually hook
up to the underlying drmmode function.
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=64808
Thanks to Peter Wu <lekensteyn@gmail.com> for harassing me.
Signed-off-by: Dave Airlie <airlied@redhat.com>
commit 80054fcafb095aff76f6df00d348c7fd85e8ddbc
Author: Jon TURNEY <jon.turney@dronecode.org.uk>
Date: Sat Mar 30 19:44:14 2013 +0000
hw/xwin: Update manifest to target all architectures, not just x86
Update manifest to target all architectures, not just x86
Also: Write explicit dependencies for Xwin.rc. XWin.exe.manifest and X.ico are
included the resource compiler output, so add a dependency on them to cause it
to be recompiled if they change.
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
commit 689e7ad9b0fccd582cd63796cc90a999f141f589
Author: Jon TURNEY <jon.turney@dronecode.org.uk>
Date: Sun Mar 31 18:36:37 2013 +0100
hw/xwin: Win32 Windows properties are of pointer type HANDLE, not an integer type
Win32 Windows properties are of pointer type HANDLE, not an integer type, but we
use the Windows property WINDOW_WID_PROP to store the X window XID.
Add appropriate casts to show it doesn't matter that an XID is smaller than a
pointer on 64-bit build.
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
commit e1a0945e8d4a3858838a14e64022524efd73c905
Author: Jon TURNEY <jon.turney@dronecode.org.uk>
Date: Sun Mar 31 18:35:35 2013 +0100
hw/xwin: winMultiWindowGetTransientFor() returns an XID not a WindowPtr
winMultiWindowGetTransientFor() accesses the WM_TRANSIENT_FOR property, which is
an X window XID (which we compare with WINDOW_WID_PROP) and not a WindowPtr.
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
commit be201ac257687355bf0916d7c525d598ed9b1282
Author: Jon TURNEY <jon.turney@dronecode.org.uk>
Date: Sat Mar 30 19:47:16 2013 +0000
hw/xwin: Change winIconIsOverride() to take a HICON parameter
Change winIconIsOverride() to take a HICON parameter, so some unneccessary
casts, which weren't portable to 64-bit Cygwin, can be removed.
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
commit fc40f9a92cf5981bccc45bbc0b959cc06c5accc2
Author: Jon TURNEY <jon.turney@dronecode.org.uk>
Date: Sat Mar 30 19:41:06 2013 +0000
hw/xwin: Fix uses of CreateDialogParam() for 64-bit builds
Fix uses of CreateDialogParam() to be more strictly correct, for 64-bit builds
dwInitParam parameter is LPARAM, not int
Return type of DLGPROC is INT_PTR, not WINBOOL
Also: Reporting the value of g_hDlgDepthChange is completely uninteresting, we
are just interested in GetLastError() if it is NULL
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
commit b542976846eb5d4c82910272af32ec8298da4177
Author: Jon TURNEY <jon.turney@dronecode.org.uk>
Date: Sat Mar 30 19:40:31 2013 +0000
hw/xwin: deprecated interface cygwin_conv_to_win32_path() doesn't exist in 64-bit cygwin
The deprecated interface cygwin_conv_to_win32_path() doesn't exist in 64-bit
cygwin, but both the ID_ABOUT_CHANGELOG control and the referenced file who's
path we are converting haven't existed for a while, so just remove this unused,
cygwin-specific code.
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
commit 5a47c6420cfe298143310938f08cc36a503e8d3d
Author: Jon TURNEY <jon.turney@dronecode.org.uk>
Date: Mon Apr 8 01:27:26 2013 +0100
hw/xwin: Fix a 64-bit portability issue with casting HINSTANCE result of ShellExecute() to an integer
Fix a 64-bit portability issue with casting HINSTANCE result of ShellExecute()
to an integer: Since HINSTANCE is a pointer type, use INT_PTR rather than int.
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
commit d9005d58c0413dcc3a99150c13d05163881cf782
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Tue Jun 4 14:39:33 2013 +1000
config: add a quirks file for devices needing special configuration
This is the fedora quirks file configuring the special handling some devices
need. Rather than keeping this distro-specific add it to the tree so we can
share these quirks.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Jamey Sharp <jamey@minilop.net>
commit 04ce6f6f6c880281e42c9ebf21d6f980ddae79b4
Author: Maarten Lankhorst <maarten.lankhorst@canonical.com>
Date: Thu May 30 11:23:07 2013 +0200
dix: add missing dixFreeRegistry define
Fixes a build failure on debian's udeb builds.
Signed-off-by: Maarten Lankhorst <maarten.lankhorst@canonical.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit c21344add2fc589df83b29be5831c36a372201bd
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Mon May 27 13:46:49 2013 +1000
dix: remove logspam in RefCursor()
This shouldn't have been in the patch
Reported-by: Colin Harrison <colin.harrison@virgin.net>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Keith Packard <keithp@keithp.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit cb3018d8a15add48efb3335e1f79b66378166008
Merge: c76a1b343d 6589f3b55e
Author: Keith Packard <keithp@keithp.com>
Date: Thu May 23 19:58:46 2013 -0600
Merge remote-tracking branch 'whot/unreviewed'
commit c76a1b343d6a56aa9529e87f0eda8d61355d562b
Merge: 891123ce9d 9a5ad65330
Author: Keith Packard <keithp@keithp.com>
Date: Thu May 23 19:58:36 2013 -0600
Merge remote-tracking branch 'whot/touch-grab-race-condition-56578-v3'
commit 891123ce9dac5e52685b9a921b33d8279ba52956
Merge: 7e97166c4f 49521edaf8
Author: Keith Packard <keithp@keithp.com>
Date: Thu May 23 10:30:15 2013 -0600
Merge remote-tracking branch 'whot/for-keith'
commit 6589f3b55e335eef6c658c8ba1fe15a062f7e31c
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Tue May 14 08:31:19 2013 +1000
dix: devices must have valuators before touch is initialized
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 756ab88d93542f0589c9bf46f40ccc57df64f0fd
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri Apr 26 15:10:08 2013 +1000
dix: fix device scaling to use a [min,max[ range.
defmin/defmax are screen coords and thus use a min-inclusive, max-exclusive
range. device axes ranges are inclusive, so bump the max up by one to get the
scaling right.
This fixes off-by-one coordinate errors if the coordinate matrix is used to
bind the device to a fraction of the screen. It introduces an off-by-one
scaling error in the device coordinate range, but since most devices have a
higher resolution than the screen (e.g. a Wacom I4 has 5080 dpi) the effect
of this should be limited.
This error manifests when we have numScreens > 1, as the scaling from
desktop size back to screen size drops one device unit.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 5cc2c96f824dbb28b9f8da61efc41596f8bd0561
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Sat Mar 9 20:43:51 2013 +1000
dix: pre-scale x by the screen:device:resolution ratio
commit 61a99aff9d33728a0b67920254d2d4d79f80cf39
dix: pre-scale relative events from abs devices to desktop ratio (#31636)
added pre-scaling of relative coordinates coming from absolute devices to
undo uneven scaling based on the screen dimensions.
Devices have their own device width/height ratio as well (in a specific
resolution) and this must be applied for relative devices as well to avoid
scaling of the relative events into the device's ratio.
e.g. a Wacom Intuos4 6x9 is in 16:10 format with equal horiz/vert
resolution (dpi). A movement by 1000/1000 coordinates is a perfect diagonal
on the tablet and must be reflected as such on the screen.
However, we map the relative device-coordinate events to absolute screen
coordinates based on the axis ranges. This results in an effective scaling
of 1000/(1000 * 1.6) and thus an uneven x/y axis movement - the y
axis is always faster.
So we need to pre-scale not only by the desktop dimenstions but also by the
device width/height ratio _and_ the resolution ratio.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 9a5ad65330693b3273972b63d10f2907d9ab954a
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Wed May 15 19:01:11 2013 +1000
Abstract cursor refcounting
Too many callers relied on the refcnt being handled correctly. Use a simple
wrapper to handle that case.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 35c2e263db01b2b61354298e5e85aa3cae8ac317
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Tue May 14 14:51:31 2013 +1000
dix: call UpdateDeviceState() for emulated TouchEndEvents
ProcessTouchEvents() calls UDS for all touch events, but if the event type
was switched to TouchUpdate(pending end) UDS is a noop.
Daniel Drake found this can cause stuck buttons if a touch grab is
activated, rejected and the touch event is passed to a regular listener.
This sequence causes the TouchEnd to be changed to TouchUpdate(pending end).
The actual TouchEnd event is later generated by the server once it is passed
to the next listener. UDS is never called for this event, thus the button
remains logically down.
A previous patch suggested for UDS to handle TouchUpdate events [1], however
this would release the button when the first TouchEvent is processed, not
when the last grab has been released (as is the case for sync pointer
grabs). A client may thus have the grab on the device, receive a ButtonPress
but see the button logically up in an XQueryPointer request.
This patch adds a call to UDS to TouchEmitTouchEnd(). The device state must
be updated once a TouchEnd event was sent to the last grabbing listener and
the number of grabs on the touchpoint is 0.
[1] http://patchwork.freedesktop.org/patch/13464/
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 8b9dc2628115dcb3f3601ad19b1ae157df21b9ee
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Tue May 14 07:46:25 2013 +1000
dix: devices must have valuators before touch is initialized
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit fd5ea0237db6d725a48f76b706135df9d3246b82
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Mon May 13 15:22:12 2013 +1000
Xi: fix warning - remove unused 'rc'
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 481702101b86fff003430e952dc65fb41eb56400
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri May 3 15:07:58 2013 +1000
dix: fix cursor refcounting
The cursor is referenced during CopyGrab(), thus doesn't need to be handled
manually anymore. It does need to be refcounted for temp grabs though.
The oldGrab handling in ProcGrabPointer is a leftover from the cursor in the
grab being refcounted, but the grab itself being a static struct in the
DeviceIntRec. Now that all grabs are copied, this lead to a double-free of
the cursor (Reproduced in Thunderbird, dragging an email twice (or more
often) causes a crash).
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 49521edaf8930b335afac2185209e26e7000820b
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Wed May 15 08:51:51 2013 +1000
ephyr: add -resizeable to the man page
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
commit 7a4bbfd9f2ce7aad23148ba01bb3f1071da606a3
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Wed May 15 08:46:38 2013 +1000
ephyr: fix typo in man page
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
commit 7e97166c4fc38076b6224e4dbdd632b43444149f
Author: Geert Uytterhoeven <geert@linux-m68k.org>
Date: Tue May 14 13:04:53 2013 +0200
Shadow: Switch the Amiga/Atari bitplane code to the canonical X.Org license
Also add my name to the list of authors in COPYING
Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 3093f78d17e48a506aab170a9089cd10e21af299
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri May 3 15:02:05 2013 +1000
dix: free the old grab when activating a new grab
A client may call XIGrabDevice twice, overwriting the existing grab. Thus,
make sure we free the old copy after we copied it. Free it last, to make
sure our refcounts don't run to 0 and inadvertantly free something on the
way.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 2566bdd8bc996cccde77b846819808c6239a89d2
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Wed Apr 24 14:46:06 2013 +1000
Xi: check for HAS_ACCEPTED only for grab listeners
If we have one listener left but it's not a grab, it cannot be in
LISTENER_HAS_ACCEPTED state.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 5b00fc52270e9cfdfe7ac1838a21defe50fc3d31
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Wed Apr 24 14:40:31 2013 +1000
Move TouchListenerGone call to CloseDownClient
TouchListenerGone cleans up if a client disappears. Having this in
FreeGrab() triggers cyclic removal of grabs, emitting wrong events. In
particular, it would clean up a passive grab record while that grab is
active.
Move it to CloseDownClient() instead, cleaning up before we go.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 34c9b39d9937c2e19c2dffc9748605f90d40f965
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Wed Apr 24 12:53:52 2013 +1000
dix: remove all listeners when freeing a touch
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 395124bd2782823de37e5c5b2f15dba49cff05f6
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Wed Apr 17 20:15:35 2013 +1000
dix: always copy grabs, don't reference them
Introduced in xorg-server-1.13.99.901-2-g9ad0fdb. Storing the grab pointer
in the listener turns out to be a bad idea. If the grab is not an active
grab or an implicit grab, the pointer stored is the one to the grab attached
on the window. This grab may be removed if the client calls UngrabButton or
similar while the touch is still active, leaving a dangling pointer.
To avoid this, copy the grab wherever we need to reference it later. This
is also what we do for pointer/keyboard grabs, where we copy the grab as
soon as it becomes active.
Reported-by: Maarten Lankhorst <maarten.lankhorst@canonical.com>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 925e35122ebad877395bcf13676e9dbeb254bdfa
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Tue Apr 23 15:52:18 2013 +1000
dix: AllocGrab can copy if an argument is passed in
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 4980bcef9973ba1f90f53028f061669ee5d2661b
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Tue Apr 23 15:46:04 2013 +1000
dix: freeing a null grab is a bug, complain if doing so
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit ccfa0f2d5de557546815a5e4f59552e2af46b578
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Tue Apr 23 15:39:32 2013 +1000
dix: use a temporary variable for listeners[0]
no functional changes
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 5363433a5cc64e2f83859aa1c32a89e5e1ddf9e4
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu Apr 18 10:32:11 2013 +1000
dix: drop DeviceIntRec's activeGrab struct
Obsolete since 4bc2761ad5ec2d0668aec639780ffb136605fbc8. This struct
existed so copying a passive grab could be simply done by
activeGrab = *grab
and thus have a copy of the GrabPtr we'd get from various sources but still
be able to check device->grab for NULL.
Since 4bc2761 activeGrab is a pointer itself and points to the same memory
as grabinfo->grab, leaving us with the potential of dangling pointers if
either calls FreeGrab() and doesn't reset the other one.
There is no reader of activeGrab anyway, so simply removing it is
sufficient.
Note: field is merely renamed to keep the ABI. Should be removed in the
future.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 7dbf61817d3bd4b1fc71710677e56c5d8cfcdb4e
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Wed Apr 17 20:14:56 2013 +1000
dix: use a tmp variable for the to-be-removed touch listener
No functional changes.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit a71a283934406d870bcd8dc376eb1c9ce1c8bbb4
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Wed Apr 17 20:13:34 2013 +1000
dix: invert a loop condition
Change the single if condition in the loop body to a
if (!foo) continue;
and re-indent the rest.
No functional changes.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 5174b1f98204beee79eba74c4cda5f2be0a60a8f
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu Feb 28 11:02:40 2013 +1000
dix: XAllowEvents() on a touch event means accepting it
A sync grab is the owner once it gets events. If it doesn't replay the
event it will get all events from this touch, equivalent to accepting it.
If the touch has ended before XAllowEvents() is called, we also now need to
send the TouchEnd event and clean-up since we won't see anything more from
this touch.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit e7f79c48b0faea910dc881034c00eb807fcd6210
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri Mar 1 12:52:35 2013 +1000
dix: move EmitTouchEnd to touch.c
No functional changes, this just enables it to be re-used easier.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 0eb9390f6048049136347d5a5834d88bfc67cc09
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri Mar 1 10:41:01 2013 +1000
Xi: Don't emit a TouchEnd event to a frozen device
EmitTouchEnd calls DeliverTouchEvents directly instead of through
public.processInputProc. If a device is frozen, the TouchEnd is
processed while the device is waiting for a XAllowEvents and thus ends the
touch point (and the grab) before the client decided what to do with it. In
the case of ReplayPointer, this loses the event.
This is a hack, but making EmitTouchEnd use processInputProc breaks
approximately everything, especially the touch point is cleaned up during
ProcessTouchEvents. Working around that is a bigger hack than this.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit a7d989d335f903ffd8b168cd2beeb82c78d30c21
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu Feb 28 13:07:26 2013 +1000
Xi: use public.processInputProc to replay the touch history
If a device is frozen in results to a grab, we need to enqueue the events.
This makes things complicated, and hard to follow since touch events are now
replayed in the history, pushed into EnqueueEvent, then replayed later
during PlayReleasedEvents in response to an XAllowEvents.
While the device is frozen, no touch events are processed, so if there is a
touch client with ownership mask _below_ the grab this will delay the
delivery and potentially screw gesture recognition. However, this is the
behaviour we have already anyway if the top-most client is a sync pgrab or
there is a sync grab active on the device when the TouchBegin was generated.
(also note, such a client would only reliably work in case of ReplayPointer
anyway)
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 214d11d3fcdac51fc7afbf3770516ec14f9e13c1
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Wed Feb 27 15:05:54 2013 +1000
Xi: when punting to a new owner, always create TouchEnd events
If a touch is pending_finish and we just punted it to the next owner, that
client must receive a TouchEnd event.
If we just punted to the last owner and that owner not a touch grab, we need
to end the touch since this is the last event to be sent, and the client
cannot accept/reject this.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 026627fe19aad007544eccf209f0dea05e67a7a7
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri Mar 1 09:15:37 2013 +1000
Xi: save state for early acceptance
Delivering an event changes the state to LISTENER_IS_OWNER and we thus lose
the information of early acceptance.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit d905348134c80f19793eefb761731b00559ddf3a
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu Feb 28 15:28:46 2013 +1000
Xi: if a passive async grab is activated from an emulated touch, accept
Async grabs cannot replay events, they cannot reject, so we can do an early
accept here.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 8b0d21044956f3810199d5e2f38ce33069e97be7
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu Feb 28 13:04:36 2013 +1000
Xi: fix lookup in ActivateEarlyAccept
ActivateEarlyAccept() can only be called from a grabbing client, so we can
ignore the rest. And it's easy enough to get the client from that since
9ad0fdb135a1c336771aee1f6eab75a6ad874aff.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit d08bae297f9d7651edb1923d6b0d6b14b3d674fc
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu Feb 28 13:08:27 2013 +1000
Xi: update the core listener state if we delivered the touch event
If a TouchBegin is sent to a core client, that client is now the owner.
By the time the TouchEnd is being processed, the client cannot replay
anymore, so we can assume that this is the final touch end and we can clean
up the touch record.
Note: DeliverTouchEmulatedEvent is called for all listeners and immediately
bails out if the client is not the owner and thus shouldn't yet get the
event. Thus, check the return code.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 81554d274f04951c55ea7f2e38d0455e2025e08d
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Mon Feb 25 11:21:07 2013 +1000
Xi: if we delivered a TouchEnd to a passive grab, end it
ef64b5ee97099618cf2e2cbbd3e471095695ae24 (which introduced the
TOUCH_CLIENT_ID check) has a wrong assumption that generated touch events
(TOUCH_CLIENT_ID) should not terminate passive grabs.
This is untrue, a TouchEnd may be generated in response to a TouchReject
higher up. If we _deliver_ an event to a client, terminate the passive grab.
This requires us to count the actually delivered events too (first hunk).
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 363b6387da6e669099a2da3861c73a29808295a6
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Wed Feb 13 11:26:11 2013 +1000
dix: don't prepend an activated passive grab to the listeners
If the device is currently grabbed as the result of a passive grab
activating, do not prepend that grab to the listeners (unlike active grabs).
Otherwise, a client with a passive pointer grab will prevent touch grabs
from activating higher up in the window stack.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 9cc45c18ad1511adf3fb163dd4cefbef106edb23
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Wed Feb 13 10:49:23 2013 +1000
Xi: not having an ownership mask does not mean automatic acceptance
If we only have a single touch-grabbing client, setting the client as owner
would clean up the touch once the TouchEnd was processed. If the client then
calls XIAllowTouches() it will receive a BadValue for the touch ID (since
the internal record is already cleaned up).
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 2f1aedcaed8fd99b823d451bf1fb02330c078f67
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu May 9 14:30:50 2013 +1000
input: print warnings if drivers don't initialize properly
If drivers supply incorrect values don't just quietly return False, spew to
the log so we can detect what's going on. All these cases are driver bugs
and should be fixed immediately.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Dave Airlie <airlied@redhat.com>
commit 8a88b0ab52ba375ae84463a90503db88af10e368
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu May 9 14:30:49 2013 +1000
dix: don't overwrite proximity/focus classes
InitPointerClassDeviceStruct/InitKeyboardDeviceStruct allocate a
proximity/focus class, respectively. If a driver calls
InitFocusClassDeviceStruct or InitProximityClassDeviceStruct beforehand,
the previously allocated class is overwritten, leaking the memory.
Neither takes a parameter other than the device, so we can simply skip
initialising it if we already have one.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Dave Airlie <airlied@redhat.com>
commit 34b0d07ebf4a7874fe7fd336bef5bbdd8debda1c
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri May 10 09:44:29 2013 +1000
dix: reset the OsBuffers after killing all clients
==21860== 24 bytes in 1 blocks are still reachable in loss record 85 of 397
==21860== at 0x4C2B3F8: malloc (in /usr/lib/valgrind/vgpreload_memcheck-amd64-linux.so)
==21860== by 0x61ED93: AllocateOutputBuffer (io.c:1037)
==21860== by 0x61E15A: WriteToClient (io.c:764)
==21860== by 0x457B30: ProcQueryExtension (extension.c:275)
==21860== by 0x43596B: Dispatch (dispatch.c:432)
==21860== by 0x425DAB: main (main.c:295)
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Dave Airlie <airlied@redhat.com>
commit 67c66606c760c263d7a4c2d1bba43ed6225a4e7c
Author: Robert Morell <rmorell@nvidia.com>
Date: Thu May 9 13:09:02 2013 -0700
os: Reset input buffer's 'ignoreBytes' field
If a client sends a request larger than maxBigRequestSize, the server is
supposed to ignore it.
Before commit cf88363d, the server would simply disconnect the client. After
that commit, it attempts to gracefully ignore the request by remembering how
long the client specified the request to be, and ignoring that many bytes.
However, if a client sends a BigReq header with a large size and disconnects
before actually sending the rest of the specified request, the server will
reuse the ConnectionInput buffer without resetting the ignoreBytes field. This
makes the server ignore new X clients' requests.
This fixes that behavior by resetting the ignoreBytes field when putting the
ConnectionInput buffer back on the FreeInputs list.
Signed-off-by: Robert Morell <rmorell@nvidia.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit ddc11397a56c745b5d1fb377e9d9b1fcc73802c8
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Mon Feb 27 18:36:39 2012 +1000
dix: delete all callbacks before reset
DeleteCallbackManager() introduced for better symmetry in the caller, they
do the same thing.
==20085== 24 bytes in 1 blocks are still reachable in loss record 11 of 103
==20085== at 0x4C2A4CD: malloc (vg_replace_malloc.c:236)
==20085== by 0x43A097: CreateCallbackList (dixutils.c:837)
==20085== by 0x43A1D3: AddCallback (dixutils.c:869)
==20085== by 0x4B1736: GEExtensionInit (geext.c:209)
==20085== by 0x41C8A8: InitExtensions (miinitext.c:389)
==20085== by 0x5AC918: main (main.c:208)
==2042== 8 bytes in 1 blocks are still reachable in loss record 2 of 97
==2042== at 0x4C2A4CD: malloc (vg_replace_malloc.c:236)
==2042== by 0x4C2A657: realloc (vg_replace_malloc.c:525)
==2042== by 0x4802F5: XNFrealloc (utils.c:1095)
==2042== by 0x43A17A: CreateCallbackList (dixutils.c:855)
==2042== by 0x43A1EF: AddCallback (dixutils.c:870)
==2042== by 0x4B1752: GEExtensionInit (geext.c:209)
==2042== by 0x41C8A8: InitExtensions (miinitext.c:389)
==2042== by 0x5AC9E4: main (main.c:208)
==2042==
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Keith Packard <keithp@keithp.com>
commit 6993f8b459e25b1a7a0a03e209688a28ce6c2c56
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Wed Apr 24 14:59:11 2013 +1000
Xi: free barrier code at reset time
==29423== 16 bytes in 1 blocks are definitely lost in loss record 73 of 328
==29423== at 0x4A06B6F: calloc (vg_replace_malloc.c:593)
==29423== by 0x5987C0: XIBarrierInit (xibarriers.c:908)
==29423== by 0x58F370: XInputExtensionInit (extinit.c:1300)
==29423== by 0x4F33C3: InitExtensions (miinitext.c:337)
==29423== by 0x4997DB: main (main.c:208)
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Keith Packard <keithp@keithp.com>
commit 042c6d861f7bb7038ddcdd6b59766fd9094d0e52
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Tue Apr 30 15:44:37 2013 +1000
os: Use ErrorFSigSafe from FatalError and it's friends
Backtrace logging etc. is already sigsafe, but the actual FatalError message
in response is not yet, leading to amusing logs like this:
(EE) Segmentation fault at address 0x0
(EE) BUG: triggered 'if (inSignalContext)'
(EE) BUG: log.c:499 in LogVMessageVerb()
(EE) Warning: attempting to log data in a signal unsafe manner while in
signal context.
Please update to check inSignalContext and/or use LogMessageVerbSigSafe() or
ErrorFSigSafe().
The offending log format message is:
Fatal server error:
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Keith Packard <keithp@keithp.com>
commit d9848fb4b182ca21bacf28ed7410d1a502cb000e
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu Feb 14 16:24:53 2013 +1000
os: complain about unsupported pnprintf directives
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Keith Packard <keithp@keithp.com>
commit d903d17d7f006fa333265b8476063b189c20d082
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu Feb 14 16:19:34 2013 +1000
os: support %c in pnprintf
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Keith Packard <keithp@keithp.com>
commit 58ef34ee6d0f68aa28f6f1a26e56f49ec85ed9bf
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu Feb 14 16:13:22 2013 +1000
os: support %% in pnprintf
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Keith Packard <keithp@keithp.com>
commit 5ea21560dd071ea4ab87430000d087fd5fe1f092
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu Feb 14 15:34:32 2013 +1000
os: support pnprintf length modifiers for integers
Mainly for %ld, smaller than int is propagated anyway, and %lld isn't really
used.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Keith Packard <keithp@keithp.com>
commit d3d4af5f9e505d444b6c82c6ea238206433fd24b
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Mon Feb 27 18:59:45 2012 +1000
dix: reset the registry before quitting
Heaps of these:
==2042== 15,360 bytes in 120 blocks are still reachable in loss record 94 of
97
==2042== at 0x4C2A4CD: malloc (vg_replace_malloc.c:236)
==2042== by 0x4C2A657: realloc (vg_replace_malloc.c:525)
==2042== by 0x45FB91: double_size (registry.c:65)
==2042== by 0x45FC97: RegisterRequestName (registry.c:85)
==2042== by 0x460095: RegisterExtensionNames (registry.c:179)
==2042== by 0x460729: dixResetRegistry (registry.c:334)
==2042== by 0x5AC992: main (main.c:201)
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Keith Packard <keithp@keithp.com>
commit 6f44d672aa34d343f63f0ea81ad58154a66b57ec
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Mon Feb 27 17:17:41 2012 +1000
xkb: free XkbRulesUsed and XkbRulesDflt on extension cleanup
==2547== 1 bytes in 1 blocks are still reachable in loss record 1 of 111
==2547== at 0x4C2A4CD: malloc (vg_replace_malloc.c:236)
==2547== by 0x64D1551: strdup (strdup.c:43)
==2547== by 0x4802FB: Xstrdup (utils.c:1113)
==2547== by 0x585B6C: XkbSetRulesUsed (xkbInit.c:219)
==2547== by 0x58700F: InitKeyboardDeviceStruct (xkbInit.c:595)
==2547== by 0x419FA3: vfbKeybdProc (InitInput.c:74)
==2547== by 0x425A3D: ActivateDevice (devices.c:540)
==2547== by 0x425F65: InitAndStartDevices (devices.c:713)
==2547== by 0x5ACA57: main (main.c:259)
and a few more of the above.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Keith Packard <keithp@keithp.com>
commit 623981ddaeb8836f3b0939e527c0e943f9c4e974
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri Feb 1 09:06:20 2013 +1000
If neither HAL nor udev backends are enabled, warn the user
If both are missing, input device hotplugging will not work out of the box.
While we still have a DBus-API or the user may want to set AAD off all the
time, the most likely source of this is misconfiguration (i.e. lack of the
udev/hal devel packages).
Message printed last to make it more obvious to the user.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Keith Packard <keithp@keithp.com>
commit dce40e2266200421647044ec7e856656d2ef952d
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Tue Feb 26 12:34:21 2013 +1000
Xi: always return BadMatch for XTest devices ChangeDeviceControl requests
The only controls that still do something are DEVICE_RESOLUTION and
DEVICE_ENABLE.
XTest devices have no resolution to change, and they cannot be disabled. So
skip the lot, and prevent a crash in the DDX when it's trying to
de-reference pInfo->control_proc on device with no pInfo struct.
Likewise, don't allow setting device mode or the valuators.
XTest pointers are always relative, they don't have a mode.
Test cases:
xts5/XI/ChangeDeviceControl (1/10)
xts5/XI/SetDeviceValuators (1/6)
and a few others
Reported-by: Knut Petersen <Knut_Petersen@t-online.de>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Keith Packard <keithp@keithp.com>
commit 23d1bc69f305edd5a6e2cfec3dfc84befda0881c
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu Mar 14 11:07:57 2013 +1000
dix: send the current axis value in DeviceChangedEvents (#62321)
X.Org Bug 62321 <http://bugs.freedesktop.org/show_bug.cgi?id=62321>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Keith Packard <keithp@keithp.com>
commit 27b11f5c19d67e2f6784d86cb7df86bbab3b58bb
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri Feb 15 11:19:10 2013 +1000
Xi: fix comment - XI2 grabs aren't keysym grabs
Comment dates back to a pre-release version of XI2 that supported keysym
grabs. That never made it into a release, it was ditched before.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Keith Packard <keithp@keithp.com>
commit 2746c681639f9512e6e45fb8d0151b996b6aff7f
Merge: 1e6cf8ec20 9878e097a7
Author: Keith Packard <keithp@keithp.com>
Date: Mon May 6 10:52:40 2013 -0700
Merge remote-tracking branch 'alanc/master'
commit 1e6cf8ec20d07b73a11116564aba71b4e4291dcd
Merge: dbfeaf7062 5860408a19
Author: Keith Packard <keithp@keithp.com>
Date: Mon May 6 10:20:21 2013 -0700
Merge remote-tracking branch 'jturney/unused-but-set-variable-warning-fix'
commit dbfeaf70623a83e1a3f3255c94d52e0e04702837
Author: Aaron Plattner <aplattner@nvidia.com>
Date: Tue Apr 30 14:30:18 2013 -0700
xfree86: don't enable anything in xf86InitialConfiguration for GPU screens
There's no point in turning on outputs connected to GPU screens during initial
configuration. Not only does this cause them to just display black, it also
confuses clients when these screens are attached to a master screen and RandR
reports that the outputs are already on.
Also, don't print the warning about no outputs being found on GPU screens,
since that's expected.
Signed-off-by: Aaron Plattner <aplattner@nvidia.com>
Reviewed-by: Dave Airlie <airlied@gmail.com>
commit 5860408a19d956f8cebb7ae39cfdbfcebd5e6360
Author: Jon TURNEY <jon.turney@dronecode.org.uk>
Date: Wed Apr 3 18:43:26 2013 +0100
hw/xwin: Fix unused-but-set-variable warning in ProcWindowsWMFrameGetRect()
/jhbuild/checkout/xorg/xserver/hw/xwin/winwindowswm.c: In function ‘ProcWindowsWMFrameGetRect’:
/jhbuild/checkout/xorg/xserver/hw/xwin/winwindowswm.c:322:12: error: variable ‘ir’ set but not used [-Werror=unused-but-set-variable]
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
commit bcfd523c150b34e9304d174ba812160c611f270d
Author: Jon TURNEY <jon.turney@dronecode.org.uk>
Date: Wed Apr 3 18:34:38 2013 +0100
hw/xwin: Fix unused-but-set-variable warning in winMWExtWMUpdateWindowDecoration()
/jhbuild/checkout/xorg/xserver/hw/xwin/winwin32rootlesswindow.c: In function ‘winMWExtWMUpdateWindowDecoration’:
/jhbuild/checkout/xorg/xserver/hw/xwin/winwin32rootlesswindow.c:189:11: error: variable ‘dwStyle’ set but not used [-Werror=unused-but-set-variable]
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
commit fbf819c24dc080f166cff29bf46b0feb604c6b8c
Author: Jon TURNEY <jon.turney@dronecode.org.uk>
Date: Wed Apr 3 16:40:35 2013 +0100
hw/xwin: Fix unused-but-set-variable warning in winHotKeyAltTabPrimaryDD()
/jhbuild/checkout/xorg/xserver/hw/xwin/winpfbdd.c: In function ‘winHotKeyAltTabPrimaryDD’:
/jhbuild/checkout/xorg/xserver/hw/xwin/winpfbdd.c:518:20: error: variable ‘rcSrc’ set but not used [-Werror=unused-but-set-variable]
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
commit 7dae1e59ce6077f475c04a41fa00096a74114064
Author: Jon TURNEY <jon.turney@dronecode.org.uk>
Date: Wed Apr 3 16:33:39 2013 +0100
hw/xwin: Fix unused-but-set-variable warning in winMinimizeWindow() when built !XWIN_MULTIWINDOWEXTWM
/jhbuild/checkout/xorg/xserver/hw/xwin/winmultiwindowwindow.c: In function ‘winMinimizeWindow’:
/jhbuild/checkout/xorg/xserver/hw/xwin/winmultiwindowwindow.c:813:20: error: variable ‘pScreenInfo’ set but not used [-Werror=unused-but-set-variable]
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
commit b284666f09b77f9c2f048fee22015a353152a57f
Author: Jon TURNEY <jon.turney@dronecode.org.uk>
Date: Wed Apr 3 16:27:45 2013 +0100
hw/xwin: Fix unused-but-set-variable warning in winClipboardProc()
/jhbuild/checkout/xorg/xserver/hw/xwin/winclipboardthread.c: In function ‘winClipboardProc’:
/jhbuild/checkout/xorg/xserver/hw/xwin/winclipboardthread.c:88:25: error: variable ‘atomClipboardManager’ set but not used [-Werror=unused-but-set-variable]
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
commit d414a09bb7f8d4440b36cbc6f0b4ca0eaefe5cbf
Author: Jon TURNEY <jon.turney@dronecode.org.uk>
Date: Wed Apr 3 16:25:54 2013 +0100
hw/xwin: Fix unused-but-set-variable warning in winWindowProc()
/jhbuild/checkout/xorg/xserver/hw/xwin/winwndproc.c: In function ‘winWindowProc’:
/jhbuild/checkout/xorg/xserver/hw/xwin/winwndproc.c:65:22: error: variable ‘s_hInstance’ set but not used [-Werror=unused-but-set-variable]
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
commit 7726102671690eb28138d032c8398ac903b97606
Author: Jon TURNEY <jon.turney@dronecode.org.uk>
Date: Wed Apr 3 16:24:08 2013 +0100
hw/xwin: Fix unused-but-set-variable warning in winCopyWindowNativeGDI()
/jhbuild/checkout/xorg/xserver/hw/xwin/winwindow.c: In function ‘winCopyWindowNativeGDI’:
/jhbuild/checkout/xorg/xserver/hw/xwin/winwindow.c:131:15: error: variable ‘pwinRoot’ set but not used [-Werror=unused-but-set-variable]
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
commit b9a2566a6e2f56a0335cd4a089b2066c06a67455
Author: Jon TURNEY <jon.turney@dronecode.org.uk>
Date: Wed Apr 3 16:50:38 2013 +0100
hw/xwin: Fix unused-but-set-variable warning in winFinishScreenInitFB()
/jhbuild/checkout/xorg/xserver/hw/xwin/winscrinit.c:264:11: error: variable ‘pbits’ set but not used [-Werror=unused-but-set-variable]
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
commit c97fbd39adbc0a8cb8537f40b12c091aee29221a
Author: Jon TURNEY <jon.turney@dronecode.org.uk>
Date: Wed Apr 3 16:18:27 2013 +0100
hw/xwin: Fix unused-but-set-variable warning in winIsFakeCtrl_L()
/jhbuild/checkout/xorg/xserver/hw/xwin/winkeybd.c:331:17: error: variable ‘lastMessage’ set but not used [-Werror=unused-but-set-variable]
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
commit cdb74fe17dcb3b5a9c61951f897deaf07f86775f
Author: Jon TURNEY <jon.turney@dronecode.org.uk>
Date: Wed Apr 3 16:16:06 2013 +0100
hw/xwin: Fix unused-but-set-variable warnings in windialog.c
/jhbuild/checkout/xorg/xserver/hw/xwin/windialogs.c: In function ‘winChangeDepthDlgProc’:
/jhbuild/checkout/xorg/xserver/hw/xwin/windialogs.c:432:22: error: variable ‘s_pScreen’ set but not used [-Werror=unused-but-set-variable]
/jhbuild/checkout/xorg/xserver/hw/xwin/windialogs.c: In function ‘winAboutDlgProc’:
/jhbuild/checkout/xorg/xserver/hw/xwin/windialogs.c:564:22: error: variable ‘s_pScreen’ set but not used [-Werror=unused-but-set-variable]
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
commit f2fd8ec3725a61abbc831f0a9ec28fa2b7020c47
Author: Dave Airlie <airlied@redhat.com>
Date: Wed Jan 9 12:52:13 2013 +1000
gpu: call CreateScreenResources for GPU screens
I didn't think we needed this before, but after doing some more
work with reverse optimus it seems like it should be called.
Reviewed-by: Keith Packard <keithp@keithp.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
commit 8fcb9d91b69abc72ddef31b9f2e8585580c6cad2
Author: Dave Airlie <airlied@redhat.com>
Date: Wed Jan 9 12:52:08 2013 +1000
dix: allow pixmap dirty helper to be used for non-shared pixmaps
this allows the pixmap dirty helper to be used for reverse optimus,
where the GPU wants to copy from the shared pixmap to its VRAM copy.
[airlied: slave_dst is wrong name now but pointless ABI churn at this point]
Reviewed-by: Keith Packard <keithp@keithp.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
commit 16077b81c502e04d77f81f683e0c213b9fe75393
Author: Dave Airlie <airlied@redhat.com>
Date: Wed Jan 9 12:52:03 2013 +1000
xf86crtc: don't use scrn->display for gpu screens
scrn->display is a property of the main screen really, and we don't
want to have the GPU screens use it for anything when picking modes
or a front buffer size.
This fixes a bug where when you plugged a display link device, it
would try and allocate a screen the same size as the current running
one (3360x1050 in this case), which was too big for the device. Avoid
doing this and just pick sizes based on whats plugged into this device.
Reviewed-by: Keith Packard <keithp@keithp.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
commit f0d0d75bfe62553dde353f89e46ff13dd863fbe8
Author: Dave Airlie <airlied@redhat.com>
Date: Wed Jan 9 12:51:55 2013 +1000
dix/gpu: remove asserts for output/offload from same slave
We should have no problem allowing output/offload from the same slave,
I asserted here, but in order to implement reverse optimus this makes
perfect sense. (reverse optimus is intel outputting to nvidia).
Reviewed-by: Keith Packard <keithp@keithp.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
commit 9d26e8eaf5a2d7c3e65670ac20254c60f665c463
Author: Dave Airlie <airlied@redhat.com>
Date: Wed Jan 9 14:26:35 2013 +1000
randr: report changes when we disconnect a GPU slave
When we disconnect an output/offload slave set the changed bits,
so a later TellChanged can do something.
Then when we remove a GPU slave device, sent change notification
to the protocol screen.
This allows hot unplugged USB devices to disappear in clients.
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Dave Airlie <airlied@redhat.com>
commit b724324252d13ff95f62eebd12d125b194d2ccc2
Author: Dave Airlie <airlied@redhat.com>
Date: Wed Jan 9 14:25:43 2013 +1000
randr: only respected changed on the protocol screen
We don't want to know about changes on the non-protocol screen,
we will fix up setchanged to make sure non-protocol screens update
the protocol screens when they have a change.
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Dave Airlie <airlied@redhat.com>
commit b3f70f38edebac87afe9351538365292f1aaaff3
Author: Dave Airlie <airlied@redhat.com>
Date: Wed Jan 9 14:29:47 2013 +1000
randr: make SetChanged modify the main protocol screen not the gpu screen
When SetChanged is called we now modify the main protocol screen,
not the the gpu screen. Since changed stuff should work at the protocol level.
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Dave Airlie <airlied@redhat.com>
commit f9c8248b8326ad01f33f31531c6b2479baf80f02
Author: Dave Airlie <airlied@redhat.com>
Date: Wed Jan 9 14:23:57 2013 +1000
randr: don't directly set changed bits in randr screen
Introduce a wrapper interface so we can fix things up for multi-gpu
situations later.
This just introduces the API for now.
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Dave Airlie <airlied@redhat.com>
commit 451ba4bd41b82acd4aec6236ba121e00cfeb311b
Author: Chris Wilson <chris@chris-wilson.co.uk>
Date: Thu Jan 10 03:26:33 2013 +0000
hw/xfree86: Only report SetDesiredModes() failed if at least one modeset fails
commit 6703a7c7cf1a349c137e247a0c8eb462ff7b07be
Author: Keith Packard <keithp@keithp.com>
Date: Tue Jan 8 20:24:32 2013 -0800
hw/xfree86: Require only one working CRTC to start the server.
changed the logic to try to set the mode on all connected outputs rather
than abort upon the first failure. The return error code was then
tweaked such that it reported success if it set a mode on any crtc.
However, this confuses the headless case where we never enable any crtcs
and also, importantly, never fail to set a crtc.
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=59190
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Also-written-by: Maarten Lankhorst <maarten.lankhorst@canonical.com>
Reviewed-by: Keith Packard <keithp@keithp.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 9878e097a7de2f86eff0dcfd9fe5d83b162197ec
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Wed Apr 24 15:24:31 2013 -0700
Only call xf86platformVTProbe() when it's defined
Fixes build on non-udev systems, since XSERVER_PLATFORM_BUS is only
defined in configure.ac if $CONFIG_UDEV_KMS is true.
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Dave Airlie <airlied@redhat.com>
commit e779402d531625ba4ed5d628d06c6b1e06b2ec7b
Author: Keith Packard <keithp@keithp.com>
Date: Thu Apr 25 09:02:31 2013 -0700
shadow: Define c2p_unsupported
Just make this call BUG_WARN(1) to indicate that something unexpected
happened
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 2b361fbda536f0125e4b87a6d455acc58f4e8690
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Sun Feb 10 10:24:59 2013 -0800
sparcPromPathname2Node: free name when returning error, instead of leaking it
Reported with other leaks found by cppcheck in bugzilla #50281
https://bugs.freedesktop.org/show_bug.cgi?id=50281
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Keith Packard <keithp@keithp.com>
commit 174ccd84931ece5a92a09c4a1d6a47e0958ebf7e
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Sun Feb 10 10:24:59 2013 -0800
xf86SbusCmapLoadPalette: Delay malloc until needed, avoiding leak on error
Reported with other leaks found by cppcheck in bugzilla #50281
https://bugs.freedesktop.org/show_bug.cgi?id=50281
V2: check for malloc failure
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
commit 6bca0184d167388cd417d113031317990489987d
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Sun Feb 10 10:18:02 2013 -0800
dmxVDLRead: if we opened a file, close it instead of leaking it
Reported with other leaks found by cppcheck in bugzilla #50281
https://bugs.freedesktop.org/show_bug.cgi?id=50281
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Keith Packard <keithp@keithp.com>
commit 8c5ff2e93f73b24adff741b25fc1e31b2f5dd0ac
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Sun Feb 10 10:24:59 2013 -0800
__glXDRIscreenProbe: free screen when DRI2Connect fails, instead of leaking it
Reported with other leaks found by cppcheck in bugzilla #50281
https://bugs.freedesktop.org/show_bug.cgi?id=50281
V2: goto existing error handler, instead of replicating more of it here
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Keith Packard <keithp@keithp.com>
commit 9567fa9a7269765bc59ac71b931e16df261d794d
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Sun Feb 10 10:24:59 2013 -0800
__glXDRIscreenCreateContext: free context on failure, instead of leaking it
Reported with other leaks found by cppcheck in bugzilla #50281
https://bugs.freedesktop.org/show_bug.cgi?id=50281
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
commit 7ab98bafc9a3426fd40f8ae693430491333ba4fc
Merge: 53da26afb7 5ab260317a
Author: Keith Packard <keithp@keithp.com>
Date: Wed Apr 24 14:14:45 2013 -0700
Merge remote-tracking branch 'geertu/master'
commit 53da26afb76bcce70b91c5df23d25e7e85c010cf
Merge: 5ece86e921 d8d3c78b6e
Author: Keith Packard <keithp@keithp.com>
Date: Wed Apr 24 10:27:19 2013 -0700
Merge remote-tracking branch 'whot/for-keith'
commit 5ece86e921a1df457a9baab6a2357ccda4ad6957
Merge: ef0a726bc8 22cab8a28a
Author: Keith Packard <keithp@keithp.com>
Date: Wed Apr 24 10:23:51 2013 -0700
Merge remote-tracking branch 'airlied/for-keithp-gpu-vt-owner'
commit ef0a726bc8d5c415244cb4f86d664938b0127a5d
Author: Jeremy White <jwhite@codeweavers.com>
Date: Thu Mar 21 10:58:42 2013 -0500
Eliminate the use of xf86Rename.h
Signed-off-by: Jeremy White <jwhite@codeweavers.com>
Reviewed-by: Keith Packard <keithp@keithp.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 2b539239e465faa9e8c6d96f1c6f00e593d46c18
Author: Keith Packard <keithp@keithp.com>
Date: Wed Apr 24 10:11:03 2013 -0700
Bump to 1.14.99.1
Snapshot with fix for CVE-2013-1940.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit d8d3c78b6ebdf63836951d2dbd2d3d621ff26da2
Author: Andreas Müller <schnitzeltony@googlemail.com>
Date: Tue Apr 16 14:30:43 2013 +0200
dixstruct.h: fix segfaults - char is unsigned for ARM and PowerPC architectures
see ARM related bug reports [1-3]
[1] https://github.com/archlinuxarm/PKGBUILDs/issues/446I
[2] http://www.raspberrypi.org/phpBB3/viewtopic.php?t=38568&p=321673
[3] http://lists.linuxtogo.org/pipermail/openembedded-core/2013-April/037805.html
Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
Reviewed-by: Mark Kettenis <kettenis@openbsd.org>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 7d722796c678532e8c5897c673c43184da353f44
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Wed Apr 17 19:47:42 2013 +1000
dix: plug memory leak in freeing TouchClass
==15562== 1,800 bytes in 1 blocks are definitely lost in loss record 298 of 330
==15562== at 0x4A06B6F: calloc (vg_replace_malloc.c:593)
==15562== by 0x4312C7: InitTouchClassDeviceStruct (devices.c:1644)
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
commit 5ab260317ad3b2aafff31a97df21620db52eacd1
Author: Geert Uytterhoeven <geert@linux-m68k.org>
Date: Sun Mar 10 21:04:19 2013 +0100
Xfbdev: Wire up Amiga afb4 and afb8 support
Add support for Amiga-style bitplanes, with 4 or 8 bits per pixel.
Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
Acked-by: Keith Packard <keithp@keithp.com>
commit 672bc5bb38918304cf68114a1112cd48651a5e83
Author: Geert Uytterhoeven <geert@linux-m68k.org>
Date: Sun Mar 10 17:17:26 2013 +0100
Xfbdev: Wire up Atari iplan2p4 and iplan2p8 support
Add support for Atari-style interleaved bitplanes, with 2 bytes interleave
and 4 or 8 bits per pixel.
Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
Reviewed-by: Keith Packard <keithp@keithp.com>
commit 95a3c7536c1a4afe97aaf955980034cc69af9c2f
Author: Geert Uytterhoeven <geert@linux-m68k.org>
Date: Sun Mar 10 17:17:26 2013 +0100
Xfbdev: Force shadowfb for frame buffers with non-packed pixels
Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
Reviewed-by: Keith Packard <keithp@keithp.com>
commit 0e808110df216649e05503baecd06cd5a3e50421
Author: Geert Uytterhoeven <geert@linux-m68k.org>
Date: Sun Mar 10 17:17:26 2013 +0100
Xfbdev: Reject unsupported frame buffer types
Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
Reviewed-by: Keith Packard <keithp@keithp.com>
commit cfd10576812c36f5844805eb95ed1f2d093d1691
Author: Geert Uytterhoeven <geert@linux-m68k.org>
Date: Sun Mar 10 21:03:44 2013 +0100
Shadow: Add support for Amiga afb8
Add support for Amiga-style bitplanes, with 8 bits per pixel.
Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
Acked-by: Keith Packard <keithp@keithp.com>
commit a1b8e7f1e6118b611ba9d332b8763ee2b44f550c
Author: Geert Uytterhoeven <geert@linux-m68k.org>
Date: Wed Mar 27 09:37:02 2013 +0100
Shadow: Add support for Amiga afb4
Add support for Amiga-style bitplanes, with 4 bits per pixel.
Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
Acked-by: Keith Packard <keithp@keithp.com>
commit d7181e567d1629c387b834da7eecdf618d14718e
Author: Geert Uytterhoeven <geert@linux-m68k.org>
Date: Sun Mar 10 17:16:17 2013 +0100
Shadow: Add support for Atari iplan2p8
Add support for Atari-style interleaved bitplanes, with 2 bytes interleave
and 8 bits per pixel.
Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
Acked-by: Keith Packard <keithp@keithp.com>
commit 3f7506b0fca72b2462b85bc4f613de809ae95859
Author: Geert Uytterhoeven <geert@linux-m68k.org>
Date: Sun Mar 10 21:01:02 2013 +0100
Shadow: Add support for Atari iplan2p4
Add support for Atari-style interleaved bitplanes, with 2 bytes interleave
and 4 bits per pixel.
Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
Acked-by: Keith Packard <keithp@keithp.com>
commit 87af9ab7d52578b0ea315fc4f8dfd906d19755fb
Author: Geert Uytterhoeven <geert@linux-m68k.org>
Date: Sun Mar 10 17:15:05 2013 +0100
Shadow: Add c2p core
Add Chunky-to-Planar core functionality, to be used by the Atari and Amiga
(interleaved) bitplanes code.
Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
Acked-by: Keith Packard <keithp@keithp.com>
commit 4ee2566c3e420a717be36f79126a14e15edac30f
Author: Geert Uytterhoeven <geert@linux-m68k.org>
Date: Tue Mar 12 18:10:40 2013 +0100
Xfbdev: Treat 1 bpp pseudocolor as monochrome
miCreateDefColormap() only preallocates black and white pixels if
depth > 1.
Hence override the visual, so fbdevCreateColormap() takes care of it.
Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
Reviewed-by: Keith Packard <keithp@keithp.com>
commit 6dfb94a891ed445f47832ba1364fcbf1de018f4a
Author: Geert Uytterhoeven <geert@linux-m68k.org>
Date: Tue Mar 12 14:16:10 2013 +0100
Xfbdev: Add support for monochrome visuals
Monochrome supports StaticGray, with hardcoded black and white pixels.
Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
Reviewed-by: Keith Packard <keithp@keithp.com>
commit 1049b32166760bdc00106625e213d31a8fc60bad
Author: Geert Uytterhoeven <geert@linux-m68k.org>
Date: Tue Mar 12 14:19:25 2013 +0100
Xfbdev: Handle unset fix.line_length
Older frame buffer devices may not fill in fix.line_length, in which
case it must be calculated by the application.
Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
commit 5c509c360d97bea78ef461596ab4b7bde69020ac
Author: Geert Uytterhoeven <geert@linux-m68k.org>
Date: Fri Feb 22 13:21:28 2013 +0100
Xfbdev: Make char *fbdevDevicePath const
This fixes:
hw/kdrive/fbdev/fbdev.c: In function 'fbdevInitialize':
hw/kdrive/fbdev/fbdev.c:41:25: warning: assignment discards 'const' qualifier from pointer target type [enabled by default]
Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
Reviewed-by: Keith Packard <keithp@keithp.com>
commit b08afbc53c1d583c3913b92e67db44823077b112
Author: Geert Uytterhoeven <geert@linux-m68k.org>
Date: Tue Mar 12 15:20:00 2013 +0100
KDrive: Bail out if screen initialization failed
Else we may get a segmentation fault later.
Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
Reviewed-by: Keith Packard <keithp@keithp.com>
commit e7045c9dd208a1afe36526ab21ef15f8b01c8bd2
Author: Geert Uytterhoeven <geert@linux-m68k.org>
Date: Sat Feb 23 20:09:22 2013 +0100
test/input: Fix double-aligned test in dix_valuator_alloc() on m68k
On m68k, doubles are not 64-bit aligned, just like on i386 and sh.
Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
commit 8bb0616cc2799c2c34448da6337ea8cb9438cda7
Author: Geert Uytterhoeven <geert@linux-m68k.org>
Date: Fri Feb 22 21:10:07 2013 +0100
miext/shadow/shpacked.c: Remove unused PickBit() define
Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
Reviewed-by: Keith Packard <keithp@keithp.com>
commit 6ca03b9161d33b1d2b55a3a1a913cf88deb2343f
Author: Dave Airlie <airlied@gmail.com>
Date: Wed Apr 10 16:09:01 2013 +1000
xf86: fix flush input to work with Linux evdev devices.
So when we VT switch back and attempt to flush the input devices,
we don't succeed because evdev won't return part of an event,
since we were only asking for 4 bytes, we'd only get -EINVAL back.
This could later cause events to be flushed that we shouldn't have
gotten.
This is a fix for CVE-2013-1940.
Signed-off-by: Dave Airlie <airlied@redhat.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit ddc149beaf708e84fb5573c4322d4f859c517917
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Mon Feb 27 18:50:46 2012 +1000
Stop the shouting
Meanwhile, here in the future lowercase letters have been invented.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Chase Douglas <chase.douglas@canonical.com>
commit 27356a45b4f6bad4d0bbf356e6d976d0c8dd257b
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Mon Feb 27 17:22:16 2012 +1000
dix: only allocate unused classes for master devices
Slave devices don't need these and the matching code in CloseDevice() has a
IsMaster() condition on freeing these, causing a leak.
==16111== 384 bytes in 4 blocks are definitely lost in loss record 72 of 105
==16111== at 0x4C28BB4: calloc (vg_replace_malloc.c:467)
==16111== by 0x42AEE2: AllocDevicePair (devices.c:2707)
==16111== by 0x4BAA27: AllocXTestDevice (xtest.c:617)
==16111== by 0x4BA89A: InitXTestDevices (xtest.c:570)
==16111== by 0x425F5E: InitCoreDevices (devices.c:690)
==16111== by 0x5ACB2D: main (main.c:257)
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Chase Douglas <chase.douglas@canonical.com>
commit 98b94c36d6b1d286bbd4cb414e54b4b95a1484b0
Author: Maarten Lankhorst <maarten.lankhorst@canonical.com>
Date: Mon Apr 15 16:53:48 2013 +0200
dix: copy event in TouchConvertToPointerEvent correctly
Fixes reading random memory read beyond the end of original event.
sizeof device_event: 424
sizeof internal_event: 2800
Signed-off-by: Maarten Lankhorst <maarten.lankhorst@canonical.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 4bff442ec5aa4b93a3f5c11782d4b7b9d1ae13ac
Author: Knut Petersen <Knut_Petersen@t-online.de>
Date: Tue Feb 26 07:52:59 2013 +0100
Never try to execute BellProcPtr NULL.
This prevents xts XI/XDeviceBell-2 test
from segfaulting the server.
Signed-off-by: Knut Petersen <Knut_Petersen@t-online.de>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 9003399708936481083424b4ff8f18a16b88b7b3
Author: Rui Matos <tiagomatos@gmail.com>
Date: Sat Apr 13 04:22:54 2013 +0200
Xi: fix swapped grab mode args for keyboard devices in XIGrabDevice
The protocol says that the grab_mode argument applies to the device
being grabbed and paired_device_mode to the paired master
device. GrabDevice() however takes in a pointer mode and a keyboard
mode and so we have to swap the values according the type of device
being grabbed.
Signed-off-by: Rui Matos <tiagomatos@gmail.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit d16284687ddeffde32a561b8c67b2e2e3d66aeaa
Author: Bryce Harrington <bryce@canonical.com>
Date: Wed Apr 10 23:05:40 2013 -0700
xfree86: Revert workaround for drm race condition.
Revert 70739e817b2d64bc020ea491f23a3574bdb6155e and mostly revert
c31eac647a9ecf0fb20dc98266cadf0ba923ba14.
Further investigation shows the encountered race condition is between
lightdm and plymouth-splash, as implemented in the Ubuntu distribution
within the limitations of upstart's job coordination logic, and can (and
should) be fixed within those limiations. Not in xserver itself.
This leaves some of the diagnostic improvements from the recent patch
series, in case others run into a similar situation.
Signed-off-by: Bryce Harrington <bryce@canonical.com>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 131f883f85b9b734e5e5652f16ba1d3b5f4de12f
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri Apr 12 09:14:53 2013 +1000
xfree86: change a log message
This path is technically executed through config/udev, but having two
messages in the form "config/udev: Adding drm device" makes it appear as if
the udev filters are wrong and it's trying to add the same device twice. In
fact, it's only one device, only added once, but a duplicate log message.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Dave Airlie <airlied@redhat.com>
commit 22cab8a28a433d03a4e6ba97f9a160271d73cb52
Author: Dave Airlie <airlied@gmail.com>
Date: Wed Apr 10 16:32:15 2013 +1000
xf86: don't hotplug output devices while VT switched.
We don't want to hotplug output devices while we are VT switched,
as we get races between multiple X servers on the device open, and
drm device master status. This just queues device opens until we return
from VT switch.
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Signed-off-by: Dave Airlie <airlied@redhat.com>
commit 5b359cf6135ca173d8f65cb92926332f07f91efe
Author: Dave Airlie <airlied@gmail.com>
Date: Wed Apr 10 16:32:11 2013 +1000
xf86: use new xf86VTOwner interface in a few places
This replaces some previous uses of direct xf86Screens[0] accesses.
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Signed-off-by: Dave Airlie <airlied@gmail.com>
commit d61ea1f64db45201c1a2b39c39293c5768d98092
Author: Dave Airlie <airlied@gmail.com>
Date: Wed Apr 10 16:32:02 2013 +1000
xfree86: add VT owner interface
This is just a simple interface to avoid accessing x86Screens[0]
directly.
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Signed-off-by: Dave Airlie <airlied@gmail.com>
commit 7347f39f94d8cebbf73ce1a2f94d1abdaf7ff383
Author: Maarten Lankhorst <maarten.lankhorst@canonical.com>
Date: Tue Apr 9 11:19:07 2013 +0200
Xi: Do not handle ET_TouchOwnership in ProcessTouchEvent
The event struct is different, causing memory corruption on 1.13 and 1.14,
as can be witnessed in https://bugs.freedesktop.org/show_bug.cgi?id=56578
Signed-off-by: Maarten Lankhorst <maarten.lankhorst@canonical.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit dbba50a1280cbda9ecff6f37884b4c5756c30bab
Author: Keith Packard <keithp@keithp.com>
Date: Tue Apr 9 16:23:19 2013 -0700
Xi: Use correct destination when swapping barrier events
Write the swapped values to the destination rather than the source.
Signed-off-by: Keith Packard <keithp@keithp.com>
Reviewed-by: Jasper St. Pierre <jstpierre@mecheye.net>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit b86b3d10bb2fee1a922b8831e8bb415c339f3d99
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Mon Mar 4 07:58:41 2013 +1000
dix: don't set non-exisiting flags on touch events
Unlike pointer/keyboard events, the flags field for ET_Touch* is a set of
server-internal defines that we need to convert to XI protocol defines.
Currently only two of those defines actually translate to the protocol, so
make sure we don't send internal garbage down the wire.
No effect to current clients since they shouldn't look at undefined bits
anyway.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit ecf62755086fd65898998d5a509aee5f29a9583d
Author: Jeremy White <jwhite@codeweavers.com>
Date: Thu Mar 21 10:58:57 2013 -0500
Define prototypes for hw/xfree86/modes/xf86Modes.c only in xf86Modes.h.
This removes a large number of redundant declaration warnings.
Signed-off-by: Jeremy White <jwhite@codeweavers.com>
Reviewed-by: Robert Morell <rmorell@nvidia.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit e13f29984251dbbe6076264ed710c2922312eed1
Author: Bryce Harrington <bryce@canonical.com>
Date: Tue Mar 19 12:12:46 2013 -0700
xfree86: Be verbose if waiting on opening the drm device
Signed-off-by: Bryce Harrington <bryce@canonical.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 70739e817b2d64bc020ea491f23a3574bdb6155e
Author: Bryce Harrington <bryce@canonical.com>
Date: Tue Mar 19 12:12:45 2013 -0700
xfree86: Fix race condition failure opening drm.
If other processes have had drm open previously, xserver may attempt to
open the device too early and fail, with xserver error exit "Cannot
run in framebuffer mode" or Xorg.0.log messages about "setversion 1.4
failed".
In this situation, we're receiving back -EACCES from libdrm. To address
this we need to re-set ourselves as the drm master, and keep trying to
set the interface until it works (or until we give up).
See https://bugs.launchpad.net/ubuntu/+source/libdrm/+bug/982889
Signed-off-by: Bryce Harrington <bryce@canonical.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit c31eac647a9ecf0fb20dc98266cadf0ba923ba14
Author: Bryce Harrington <bryce@canonical.com>
Date: Tue Mar 19 12:12:44 2013 -0700
xfree86: Keep trying to set interface on drm for 2 seconds.
And if we've had to delay booting due to not being able to set the
interface, fess up.
Signed-off-by: Bryce Harrington <bryce@canonical.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit d1cc210de8c13f2db9f6f284ecc652305c28801e
Author: Bryce Harrington <bryce@canonical.com>
Date: Tue Mar 19 12:12:43 2013 -0700
xfree86: Provide more details on failure
Signed-off-by: Bryce Harrington <bryce@canonical.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit f059d0dabc553a5f748d86de9115da00be5997d5
Author: Bryce Harrington <bryce@canonical.com>
Date: Tue Mar 19 12:12:42 2013 -0700
xfree86: Track error code and add label for error handling.
Signed-off-by: Bryce Harrington <bryce@canonical.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 4d7052bd7bbf49b573dc4d34ad14e7f058a0d884
Author: Bryce Harrington <bryce@canonical.com>
Date: Tue Mar 19 12:12:41 2013 -0700
xfree86: (Cleanup) Close fd if drm interface 1.4 could not be set.
Signed-off-by: Bryce Harrington <bryce@canonical.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit c64fa9a2961f82719cc7734a4222f31297a2e593
Author: Maarten Lankhorst <maarten.lankhorst@canonical.com>
Date: Wed Apr 3 12:08:44 2013 +0200
support 32 bpp pixmaps when 24 bpp fb is used.
Fixes background corruption in ubuntu.
Signed-off-by: Maarten Lankhorst <maarten.lankhorst@canonical.com>
commit 8928f8fa0bb154ce437af703ff702016f0dcf127
Author: Geert Uytterhoeven <geert@linux-m68k.org>
Date: Mon Mar 18 21:38:10 2013 +0100
kdrive/fbdev: revive randr new screen size logic
hw/kdrive/fbdev/fbdev.c: In function 'fbdevRandRSetConfig':
hw/kdrive/fbdev/fbdev.c:470:19: warning: variable 'newheight' set but not used [-Wunused-but-set-variable]
hw/kdrive/fbdev/fbdev.c:470:9: warning: variable 'newwidth' set but not used [-Wunused-but-set-variable]
Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 808c87bff710263f5a7b3c12a7e7fec54672fecd
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Mon Mar 25 14:51:58 2013 +1000
Revert "kdrive: fix "set but not used" warnings"
Partial revert of commit 4149ee8ec0193acbf3812c7ee2627b93b9a89997, better
fix coming up.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 3a9a6c972e4bc88dc3dde9399df3b0cda759cd70
Author: Maarten Lankhorst <maarten.lankhorst@canonical.com>
Date: Wed Mar 27 10:33:46 2013 +0100
bump version to 0.7.0
commit ac4c2abe985ce6816a3389c41eb23462c6ac2486
Author: vdb@picaros.org <vdb@picaros.org>
Date: Thu Mar 7 16:07:31 2013 +0100
xserver: add monitor Option "ZoomModes" [v2]
Section "Monitor"
Identifier "a21inch"
Option "PreferredMode" "1600x1200"
Option "ZoomModes" "1600x1200 1280x1024 1280x1024 640x480"
EndSection
The option's effect is to search for and mark once each named mode in
the output modes list. So the specification order is free and the zoom
modes sequence follows the order of the output modes list. All marked
modes are available via the Ctrl+Alt+Keypad-{Plus,Minus} key
combination.
See also http://bugs.freedesktop.org/show_bug.cgi?id=17954.
This option has its use for combined monitor and television setups.
It allows for easy switching between 60 Hz and 50 Hz modes even when a
monitor refuses to display the input signal.
(Includes a few minor changes suggested by Aaron for v2)
Signed-off-by: Servaas Vandenberghe <vdb@picaros.org>
Reviewed-by: Aaron Plattner <aplattner@nvidia.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 862bc2836835b93f4b2cfd2de6ca344f65484a00
Author: Maarten Lankhorst <maarten.lankhorst@canonical.com>
Date: Tue Mar 26 15:19:52 2013 +0100
modesetting: return null for get_modes if output could not be retrieved
Signed-off-by: Maarten Lankhorst <maarten.lankhorst@canonical.com>
commit 6b79a8791d35bbd1a13ebdec1c582f66c559c039
Author: Maarten Lankhorst <maarten.lankhorst@canonical.com>
Date: Tue Mar 26 15:19:33 2013 +0100
modesetting: clean up leaks
Signed-off-by: Maarten Lankhorst <maarten.lankhorst@canonical.com>
commit 2967391c6d35f03121afa8003e0fb94b62495129
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu Feb 28 10:43:05 2013 +1000
Xi: add a comment to make a condition a bit clearer
The commit message to 676447190190d8546165e21be242cf16dd69f5ae explains it,
but that doesn't stop the WTF moment when reading the code.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Keith Packard <keithp@keithp.com>
commit 2fdde2c40d83695438b6f5615f98bd7ae801b43d
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Mon Feb 25 15:21:32 2013 +1000
dix: update coords for touch events in PlayReleasedEvents
Note: this is only hit for #ifdef PANORAMIX
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Keith Packard <keithp@keithp.com>
commit 697071ab2b7f8910e01ed74618138538291cd1e8
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu Feb 28 10:30:15 2013 +1000
Xi: compress two if statements with the same body
We do the same thing here, compress them into one body.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Keith Packard <keithp@keithp.com>
commit 11bead1fa205a1353e6a33c6024c7e8ace80be7c
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Mon Feb 25 11:13:52 2013 +1000
dix: fix a comment
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Keith Packard <keithp@keithp.com>
commit fc504a44d12d537d4e07f659f1863f200a0272ad
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri Mar 1 08:26:06 2013 +1000
Xi: use a temp variable for the new listener
Instead of accessing ti->listener[0] all the time.
No functional changes.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Keith Packard <keithp@keithp.com>
commit 9978b57b8d94f061d72a67b99a02b0ba16a11429
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri Mar 1 08:43:58 2013 +1000
Xi: return !Success from DeliverTouchEmulatedEvent if we didn't deliver
All callers currently ignore the new value, so this patch has no effect.
Inverse call graph:
DeliverTouchEmulatedEvent
DeliverEmulatedMotionEvent Ignores value
DeliverTouchBeginEvent
DeliverTouchEvent
DeliverTouchEvents Ignores value
DeliverTouchEndEvent
DeliverTouchEvent
DeliverTouchEvents Ignores value
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Keith Packard <keithp@keithp.com>
commit 1754973206c09a901747e71d4abdf666293da59e
Author: Aaron Plattner <aplattner@nvidia.com>
Date: Wed Feb 20 17:27:16 2013 -0800
modesetting: match PCI class 3, any subclass
If a device is not primary, the PCI device match fails because the
xf86-video-modesetting driver looks specifically for a PCI class match of
0x30000 with a mask of 0xffffff. This fails to match, for example, a
non-primary Intel VGA device, because it is reported as having a class of
0x38000.
Fix that by ignoring the low 16 bits of the class in the pci_id_match table.
Signed-off-by: Aaron Plattner <aplattner@nvidia.com>
Reviewed on IRC by Adam Jackson <ajax@redhat.com>
commit cc3d1a5a6120e721a46c67446ba68f5596055633
Author: Piotr Dziwinski <piotrdz@gmail.com>
Date: Sat Feb 23 13:14:45 2013 +0100
glx: fix uninitialized var in __glXDRIscreenProbe
Fixes: https://bugs.freedesktop.org/show_bug.cgi?id=59825
Signed-off-by: Piotr Dziwinski <piotrdz@gmail.com>
Reviewed-by: Keith Packard <keithp@keithp.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit c2ede8f92f0d6f15b1b2a04889cb54cd1728780b
Merge: 190b032151 7050aae69c
Author: Keith Packard <keithp@keithp.com>
Date: Mon Mar 18 11:26:24 2013 -0700
Merge remote-tracking branch 'whot/for-keith'
commit 190b0321510b99d4738915f540cea5c0c51e07e2
Author: Zack Rusin <zackr@vmware.com>
Date: Thu Feb 14 15:06:57 2013 -0800
GLX/DRI2: Do not expose INTEL_swap_event without swap control
Swap events depent on the implementation of ScheduleSwap. By
unconditionally enabling GLX_INTEL_swap_event we're breaking
the system with drivers that don't support it because the apps
are forever stuck waiting for an event that will never be
delivered. So lets enable the extension only if the hooks it
depends on are actually there.
Signed-off-by: Zack Rusin <zackr@vmware.com>
Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 116f020102fd6c2a603069a639b113dfa31b48b7
Merge: cf89aa5374 0f537da72d
Author: Keith Packard <keithp@keithp.com>
Date: Mon Mar 18 11:18:58 2013 -0700
Merge remote-tracking branch 'whot/next'
commit cf89aa53748b964f9d9eceaa12a7d6f1a076d1ee
Author: Tomasz Lis <tomasz.lis@intel.com>
Date: Mon Mar 11 10:21:28 2013 +0100
Full support of sRGB capable fbconfigs.
Changes to correctly initialize the sRGB capability attribute and
transfer it between XServer and the client. Modifications include
extension string, transferring visual config attribs and fbconfig
attribs. Also, attribute is initialized in the modules which do not
really use it (xquartz and xwin).
This version advertises both ARB and EXT strings, and initializes
the capability to default value of FALSE. It has corrected required
GLX version and does not influence swrast. The sRGB capable attribute
is attached only to those configs which do have this capability.
Both ARB and EXT versions share the same GLX extension enabling bit.
Signed-off-by: Tomasz Lis <tomasz.lis@intel.com>
Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 679ccecd8bc6d797e99f3b707f8041b727ca7a49
Author: Keith Packard <keithp@keithp.com>
Date: Mon Mar 18 10:01:20 2013 -0700
Bump release to 1.14.99.0
Get us off the release number so that we don't conflict with the
stable branch.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit beb1715e96b649a0903fa61f30dd1eb69411da2f
Author: Colin Walters <walters@verbum.org>
Date: Wed Jan 4 22:37:06 2012 +0000
autogen.sh: Implement GNOME Build API
http://people.gnome.org/~walters/docs/build-api.txt
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit 7050aae69c2a55dfdbb5c6af7882307e90ba4275
Author: Robert Morell <rmorell@nvidia.com>
Date: Tue Mar 12 09:40:16 2013 -0700
list.h: Make xorg_list_init inline
Otherwise this file is emitted in every unit that includes it.
Signed-off-by: Robert Morell <rmorell@nvidia.com>
Reviewed-by: Jamey Sharp <jamey@minilop.net>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 31595b528645a7e4903eb81da0fc332d78407f25
Author: Robert Morell <rmorell@nvidia.com>
Date: Tue Mar 12 09:37:43 2013 -0700
configure.ac: Require inputproto 2.3
This picks up support for Xi pointer barriers in the protocol.
Signed-off-by: Robert Morell <rmorell@nvidia.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 3ac2e61705432951f9e1b96b42b4214e7f748f94
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Sat Mar 9 17:12:53 2013 +1000
xfixes: ifdef PanoramiXFixes* (#62015)
Fixes build failure with --disable-xinerama introduced by
482e0cb cursor: Move pointer barrier code over to XI
Reason is new include order: sdksyms.sh includes xfixes.h, which previously
did not include xfixesint.h.
As of 482e0cb xfixes.h includes xibarriers.h which includes xfixesint.h
X.Org Bug 62015 <http://bugs.freedesktop.org/show_bug.cgi?id=62015>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Tested-by: Daniel Martin <consume.noise@gmail.com>
commit 5047810a4c20fab444b8c6eb146c55dcdb0d4219
Author: Aaron Plattner <aplattner@nvidia.com>
Date: Wed Mar 6 09:40:28 2013 -0800
fb: Rename wfbDestroyGlyphCache
Renaming this function was missed in commit
9cbcb5bd6a5360a128d15b77a02d8d3351f74366, so both libfb.so and libwfb.so define
functions named fbDestroyGlyphCache.
Signed-off-by: Aaron Plattner <aplattner@nvidia.com>
Reviewed-by: Søren Sandmann <ssp@redhat.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 103b77c59e3638a45179bf6d7908f5c738d2d872
Author: Keith Packard <keithp@keithp.com>
Date: Tue Mar 5 22:31:17 2013 -0800
Version bumped to 1.14
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 0f537da72d414ed84e3cd14e3bb7e08565136bd7
Author: Andreas Wettstein <wettstein509@solnet.ch>
Date: Sun Mar 3 20:25:44 2013 +0100
xkb: Fixes to LatchMods/LatchGroup
The main problem this patch addresses is that if a latch is put on
multi-level key with a Latch/Lock/Set, it is possible that after all
keys are released, still base modifiers are set, which typically will
make the keyboard unusable. To see how it happens (without the patch),
assume that key AltGr sets Mod5 when pressed by itself, and latches Mod3
when pressed together with Shift. Now press Shift, then AltGr and
release both keys in reverse order. Mod3 is now latched, and the
LatchMods filter remains active as the second filter. Now press AltGr;
Mod5 base modifier gets set, and the SetMods filter will become active
as the first filter. Release AltGr: First, the SetMods filter will set
clearMods to Mod5, then the LatchMods filter will overwrite clearMods
with Mod3. Result: the Mod5 base modifier will remain set. This
example becomes practically relevant for the revised German standard
layout (DIN 2137-1:2012-06).
Other changes implement the latch behaviour more accurately according to
the specification. For example, releasing a modifier latching key can
at the same time clear a locked modifier, promote another modifier that
is latched to locked, and latch a third modifier. Overall, what the
code does should be straightforward to compare what the XKB protocol
specification demands, see the table in section 6.3.
Finally, releasing a key no longer cancels a latch that has not become
pending yet. In my opinion, the specification is not clear; it speaks
of "operating" a key, which the patch effectivly interprets as "press"
rather than "press or release". From my experience, using the latter
interpretation makes latches on higher levels practically unusable. In
the example given above, one would have to release AltGr always before
Shift to get the Mod3-Latch. The practical relevance of latches on
higher levels is once more given by the revised German standard layout.
Signed-off-by: Andreas Wettstein <wettstein509@solnet.ch>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit eadda231091aa6feb68207ee22f6bc3a390d4556
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri Feb 15 11:19:09 2013 +1000
xephyr: fix "set but not used warnings"
ephyrvideo.c: In function 'ephyrPutVideo':
ephyrvideo.c:1009:42: warning: variable 'drw_h' set but not used
ephyrvideo.c:1009:31: warning: variable 'drw_w' set but not used
ephyrvideo.c:1009:20: warning: variable 'drw_y' set but not used
ephyrvideo.c:1009:9: warning: variable 'drw_x' set but not used
ephyrvideo.c: In function 'ephyrGetVideo':
ephyrvideo.c:1058:42: warning: variable 'drw_h' set but not used
ephyrvideo.c:1058:31: warning: variable 'drw_w' set but not used
ephyrvideo.c:1058:20: warning: variable 'drw_y' set but not used
ephyrvideo.c:1058:9: warning: variable 'drw_x' set but not used
ephyrvideo.c: In function 'ephyrPutStill':
ephyrvideo.c:1107:42: warning: variable 'drw_h' set but not used
ephyrvideo.c:1107:31: warning: variable 'drw_w' set but not used
ephyrvideo.c:1107:20: warning: variable 'drw_y' set but not used
ephyrvideo.c:1107:9: warning: variable 'drw_x' set but not used
ephyrvideo.c: In function 'ephyrGetStill':
ephyrvideo.c:1156:42: warning: variable 'drw_h' set but not used
ephyrvideo.c:1156:31: warning: variable 'drw_w' set but not used
ephyrvideo.c:1156:20: warning: variable 'drw_y' set but not used
ephyrvideo.c:1156:9: warning: variable 'drw_x' set but not used
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Robert Morell <rmorell@nvidia.com>
commit 4149ee8ec0193acbf3812c7ee2627b93b9a89997
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri Feb 15 11:19:08 2013 +1000
kdrive: fix "set but not used" warnings
kinput.c: In function 'KdEnqueueKeyboardEvent':
kinput.c:1845:16: warning: variable 'ctrl' set but not used
kinput.c:1844:17: warning: variable 'keyc' set but not used
kinput.c: In function 'KdEnqueuePointerEvent':
kinput.c:1887:12: warning: variable 'ms' set but not used
kxv.c: In function 'KdXVDisable':
kxv.c:1181:19: warning: variable 'ScreenPriv' set but not used
mouse.c: In function 'ps2SkipInit':
mouse.c:444:9: warning: variable 'skipping' set but not used
mouse.c: In function 'ps2Init':
mouse.c:473:10: warning: variable 'waiting' set but not used
mouse.c:472:9: warning: variable 'skipping' set but not used
fbdev.c: In function 'fbdevRandRSetConfig':
fbdev.c:468:19: warning: variable 'newheight' set but not used
fbdev.c:468:9: warning: variable 'newwidth' set but not used
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Robert Morell <rmorell@nvidia.com>
commit 44fc062f85df7288c17d2d64b73aa4957b91fd6d
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Mon Feb 18 14:57:58 2013 +1000
os: document pnprintf as sigsafe snprintf
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit c100211034ab69ce453a1644fb61c6808d7e3eda
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Tue Dec 18 14:12:40 2012 +1000
dix: only show the cursor if a window defines one (#58398)
e02f864fdf "Suppress cursor display until the first XDefineCursor() request"
disabled cursor display a priori unless -retro is given.
On a plain server, caling XFixesHideCursor() and XFixesShowCursor() would
show the default root cursor, despite no client actually defining a cursor.
Change the logic, disable CursorVisible by default and only enable it from
the window's CWCursor logic. If no window ever defines a cursor, said cursor
stays invisible.
X.Org Bug 58398 <http://bugs.freedesktop.org/show_bug.cgi?id=58398>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Tested-by: Bastien Nocera <hadess@hadess.net>
Reviewed-by: Daniel Martin <consume.noise@gmail.com>
commit 6238bd68bd71323f8b4f1808f34dabe2ae447fe3
Author: Aaron Plattner <aplattner@nvidia.com>
Date: Tue Mar 5 13:04:46 2013 -0800
DPMS: include GPU screens in DPMS code
Otherwise, displays driven by GPU screens remain on all the time.
Signed-off-by: Aaron Plattner <aplattner@nvidia.com>
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit dd4ab8b572956f9457616869d6e383c8ed964c73
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Tue Mar 5 10:14:29 2013 +1000
Xi: force dtime to 0 on the first BarrierHit
dtime to the previous event is 0 on the first BarrierHit event.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Jasper St. Pierre <jstpierre@mecheye.net>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 604169af8b67afc74a292cdb9070a3a1f2d7c536
Merge: 8f4640bdb9 6ea59dc2d8
Author: Keith Packard <keithp@keithp.com>
Date: Mon Mar 4 21:09:59 2013 -0800
Merge commit '6ea59dc2d8887102bfd8d7c838d2e7ab17645aec'
commit 6ea59dc2d8887102bfd8d7c838d2e7ab17645aec
Author: Jasper St. Pierre <jstpierre@mecheye.net>
Date: Sun Mar 3 04:50:55 2013 -0500
xibarriers: Remove accidental use of the comma operator
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit bd58ebe4cf3b0ce60f87fb26a3715f774dabd349
Author: Daniel Martin <consume.noise@gmail.com>
Date: Thu Dec 20 13:50:17 2012 +0100
ephyr: Fix crash on 24bpp host framebuffer
Use bytes_per_line and bits_per_pixel from the created XImage to fix
https://bugzilla.redhat.com/show_bug.cgi?id=518960
Signed-off-by: Daniel Martin <consume.noise@gmail.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 8f4640bdb9d3988148e09a08d2c7e3bab1d538d6
Author: Dave Airlie <airlied@redhat.com>
Date: Wed Jan 9 12:58:28 2013 +1000
randr: cleanup provider properly
So in the cold plug server shutdown case, we reap the resources
before we call CloseScreen handlers, so the config->randr_provider
is a dangling pointer when the xf86CrtcCloseScreen handler is called,
however in the hot screen unplug case, we can't rely on automatically
reaped resources, so we need to clean up the provider in the xf86CrtcCloseScreen
case.
This patch provides a cleanup callback from the randr provider removal
into the DDX so it can cleanup properly, this then gets called by the automatic
code for cold plug, or if hot unplug it gets called explicitly.
Fixes a number of random server crashes on shutdown
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=58174
Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=891140
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Dave Airlie <airlied@redhat.com>
commit 3ec35c45ca17f5ed6fd02c50fc49ae7b8d128dcb
Author: Dave Airlie <airlied@redhat.com>
Date: Wed Jan 9 12:53:14 2013 +1000
xf86: actually set the compat output in the failure case
The previous fix for the previous fix, didn't fully work,
If we don't set compat_output we end up doing derferences
of arrays with -1, leading to valgrind warnings.
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Dave Airlie <airlied@redhat.com>
commit da8ee26023fc2868fe970471195a5f3c86fb574b
Author: Dave Airlie <airlied@redhat.com>
Date: Wed Jan 9 12:51:45 2013 +1000
xfree86/hotplug: cleanup properly if the screen fails to initialise
Due to another bug, the modesetting/udl driver would fail to init properly
on hotplug, when it did the code didn't clean up properly, and on removing
the device the server could crash.
Found in F18 testing.
Signed-off-by: Dave Airlie <airlied@redhat.com>
Reviewed-by: Aaron Plattner <aplattner@nvidia.com>
commit e21e183059df5975e7086850d1931edb2c1bbd06
Author: Marcin Slusarz <marcin.slusarz@gmail.com>
Date: Thu Feb 21 09:02:44 2013 +1000
os: use libunwind to generate backtraces
Libunwind generates backtraces much more reliably than glibc's "backtrace".
Before:
0: /opt/xserver/bin/X (0x400000+0x18ce36) [0x58ce36]
1: /opt/xserver/bin/X (xorg_backtrace+0x9) [0x58d119]
2: /opt/xserver/bin/X (0x400000+0x190d69) [0x590d69]
3: /lib64/libpthread.so.0 (0x7fb904268000+0x10a90) [0x7fb904278a90]
4: /lib64/libc.so.6 (ioctl+0x7) [0x7fb902fbf987]
5: /usr/lib64/libdrm.so.2 (drmIoctl+0x28) [0x7fb90405ffa8]
6: /usr/lib64/libdrm.so.2 (drmCommandWrite+0x1b) [0x7fb90406235b]
7: /usr/lib64/libdrm_nouveau.so.2 (nouveau_bo_wait+0x89) [0x7fb902009719]
8: /opt/xserver/lib/xorg/modules/drivers/nouveau_drv.so (0x7fb90220e000+0x76f3) [0x7fb9022156f3]
9: /opt/xserver/lib/xorg/modules/libexa.so (0x7fb9019c7000+0xbae0) [0x7fb9019d2ae0]
10: /opt/xserver/bin/X (0x400000+0x17d2b3) [0x57d2b3]
11: /opt/xserver/bin/X (0x400000+0xc9930) [0x4c9930]
12: /opt/xserver/bin/X (0x400000+0x3a81a) [0x43a81a]
13: /opt/xserver/bin/X (0x400000+0x3d6a1) [0x43d6a1]
14: /opt/xserver/bin/X (0x400000+0x2c2ca) [0x42c2ca]
15: /lib64/libc.so.6 (__libc_start_main+0xf5) [0x7fb902f019b5]
16: /opt/xserver/bin/X (0x400000+0x2c60d) [0x42c60d]
17: ?? [0x0]
After:
0: /opt/xserver/bin/X (OsSigHandler+0x39) [0x590d69]
1: /lib64/libpthread.so.0 (__restore_rt+0x0) [0x7fb904278a8f]
2: /lib64/libc.so.6 (ioctl+0x7) [0x7fb902fbf987]
3: /usr/lib64/libdrm.so.2 (drmIoctl+0x28) [0x7fb90405ffa8]
4: /usr/lib64/libdrm.so.2 (drmCommandWrite+0x1b) [0x7fb90406235b]
5: /usr/lib64/libdrm_nouveau.so.2 (nouveau_bo_wait+0x89) [0x7fb902009719]
6: /opt/xserver/lib/xorg/modules/drivers/nouveau_drv.so (nouveau_exa_download_from_screen+0x1a3) [0x7fb9022156f3]
7: /opt/xserver/lib/xorg/modules/libexa.so (exaGetImage+0x1f0) [0x7fb9019d2ae0]
8: /opt/xserver/bin/X (miSpriteGetImage+0x173) [0x57d2b3]
9: /opt/xserver/bin/X (compGetImage+0xb0) [0x4c9930]
10: /opt/xserver/bin/X (ProcGetImage+0x55a) [0x43a81a]
11: /opt/xserver/bin/X (Dispatch+0x341) [0x43d6a1]
12: /opt/xserver/bin/X (main+0x3ba) [0x42c2ca]
13: /lib64/libc.so.6 (__libc_start_main+0xf5) [0x7fb902f019b5]
14: /opt/xserver/bin/X (_start+0x29) [0x42c60d]
15: ? (?+0x29) [0x29]
Signed-off-by: Marcin Slusarz <marcin.slusarz@gmail.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Tested-by: Knut Petersen <knut.petersen@t-online.de>
commit 75815dbb373d5a74d57cbec9d469f9f88a8ee3ef
Author: Chris Wilson <chris@chris-wilson.co.uk>
Date: Mon Dec 3 13:25:19 2012 +0000
Add missing GTF modes
A fixed-mode output device like a panel will often only inform of its
preferred mode through its EDID. However, the driver will adjust user
specified modes for display through use of a panel-fitter allowing
greater flexibility in upscaling. This is often used by games to set a
low resolution for performance and use the panel fitter to fill the
screen.
v2: Use the presence of the 'scaling mode' connector property as an
indication that a panel fitter is attached to that pipe.
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=55564
commit e27b2e61632b220ddc36d0d0387581a9f4774f21
Author: Peter Harris <pharris@opentext.com>
Date: Tue Feb 19 16:08:52 2013 -0500
xkb: Set nIndicators in XkbGetIndicatorMap
Xlib doesn't use this value (it computes it from the reply length
instead) which is why nobody has noticed yet. But the spec
http://www.x.org/releases/X11R7.7/doc/kbproto/xkbproto.html
says that it should be set.
Signed-off-by: Peter Harris <pharris@opentext.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 3aac7a59dc6ef2d8bbf46ba5d37acdf6013e9450
Author: Daniel Martin <daniel.martin@secunet.com>
Date: Tue Dec 11 17:23:55 2012 +0100
ephyr: Add -resizeable option
With this option passed, ephyr windows can be resized like normal
windows on the fly, without the need of an explicit parent window.
Signed-off-by: Daniel Martin <daniel.martin@secunet.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit f9198e278becec158b570204cf9fc1de822ac76b
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Mon Feb 27 16:43:10 2012 +1000
dix: FreeAllAtoms() on reset
==5712== 6 bytes in 1 blocks are still reachable in loss record 17 of 585
==5712== at 0x4A074CD: malloc (vg_replace_malloc.c:236)
==5712== by 0x3D1DE885B1: strndup (strndup.c:46)
==5712== by 0x41CB71: MakeAtom (atom.c:121)
==5712== by 0x55AE3E: XIGetKnownProperty (xiproperty.c:401)
==5712== by 0x4251C9: AddInputDevice (devices.c:312)
==5712== by 0x42AC0C: AllocDevicePair (devices.c:2657)
==5712== by 0x425E6E: InitCoreDevices (devices.c:677)
==5712== by 0x5ACA05: main (main.c:257)
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Chase Douglas <chase.douglas@canonical.com>
commit 88517ced1fa2e621be2d05a319b522b3111da516
Merge: 82425c66e7 73974dd7ea
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri Feb 15 11:58:52 2013 +1000
Merge branch 'master' of git+ssh://people.freedesktop.org/~alanc/xserver into next
commit 82425c66e7a8c436b5be7ad44880dd4be6c1f06a
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu Feb 14 10:21:47 2013 +1000
xfree86: remove redundant declaration of inputInfo
xf86Cursor.c:19:18: warning: redundant redeclaration of 'inputInfo'
[-Wredundant-decls]
In file included from xf86Cursor.c:18:0:
../../../include/inputstr.h:614:57: note: previous declaration of
'inputInfo' was here
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Mark Kettenis <kettenis@openbsd.org>
commit 6133c417595a9c8fc158b0d68fd4a7a2c58fdc47
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu Feb 14 10:15:33 2013 +1000
xkb: remove unused variable 'names'
xkb.c: In function '_XkbSetNamesCheck':
xkb.c:3987:18: warning: variable 'names' set but not used
[-Wunused-but-set-variable]
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Mark Kettenis <kettenis@openbsd.org>
commit 63d00c6b146d7f5fb80f20f19066088059042a5e
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu Feb 14 10:13:53 2013 +1000
Xext: rename two shadowing variables
panoramiX.c: In function 'PanoramiXCreateConnectionBlock':
panoramiX.c:599:10: warning: declaration of 'disableBackingStore' shadows a
global declaration [-Wshadow]
In file included from ../include/windowstr.h:60:0,
from panoramiX.c:47:
../include/opaque.h:56:52: warning: shadowed declaration is here [-Wshadow]
panoramiX.c: In function 'PanoramiXConsolidate':
panoramiX.c:834:19: warning: declaration of 'pScreen' shadows a previous
local [-Wshadow]
panoramiX.c:813:15: warning: shadowed declaration is here [-Wshadow]
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Mark Kettenis <kettenis@openbsd.org>
commit 8bbea9f48f43e54c55c8b60ea36bda3134a86af2
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu Feb 14 10:09:53 2013 +1000
Xext: renaming shadowing variable
xvdisp.c: In function 'ProcXvStopVideo':
xvdisp.c:712:11: warning: declaration of 'rc' shadows a previous local
[-Wshadow]
xvdisp.c:705:17: warning: shadowed declaration is here [-Wshadow]
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Mark Kettenis <kettenis@openbsd.org>
commit 7b79a2e4a11b5c5f0ebaa495828725e235d2b08e
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu Feb 14 10:06:55 2013 +1000
fb: drop two unneeded shadowing variables
fbpict.c: In function 'fbGlyphs':
fbpict.c:188:6: warning: declaration of 'x' shadows a previous local
[-Wshadow]
fbpict.c:111:9: warning: shadowed declaration is here [-Wshadow]
fbpict.c:188:9: warning: declaration of 'y' shadows a previous local
[-Wshadow]
fbpict.c:111:12: warning: shadowed declaration is here [-Wshadow]
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Soren Sandmann <ssp@redhat.com>
Reviewed-by: Mark Kettenis <kettenis@openbsd.org>
commit 858d8b19b3a5bb59e5c5f9a9e68adce2495b5e31
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu Feb 14 10:04:06 2013 +1000
xfree86: drop unused prevSIGIO
Unused as of 5d309af2ed93e91c7d72f548a11052051efbb40f
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Mark Kettenis <kettenis@openbsd.org>
commit 592d35aef0a8089a344543cf5a425e0537c0431b
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu Feb 14 10:02:02 2013 +1000
randr: fix "set but unused" warnings
rrcrtc.c: In function 'RRCrtcDetachScanoutPixmap':
rrcrtc.c:366:9: warning: variable 'ret' set but not used
[-Wunused-but-set-variable]
rrcrtc.c: In function 'rrCheckPixmapBounding':
rrcrtc.c:505:13: warning: variable 'ret' set but not used
[-Wunused-but-set-variable]
rrcrtc.c:445:9: warning: unused variable 'i' [-Wunused-variable]
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Mark Kettenis <kettenis@openbsd.org>
commit 90642948cc78834d95f7a3bddaac7ff77b68ed7e
Merge: 9a35d4240e eda7dbff5a
Author: Keith Packard <keithp@keithp.com>
Date: Thu Feb 14 11:05:48 2013 -0800
Merge remote-tracking branch 'jeremyhu/master'
commit 9a35d4240e2aa91ac104f0f9f86f83ff9a2d3d04
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu Feb 14 16:31:13 2013 +1000
os: fix pnprintf OOB buffer read for unterminated length modifiers
Format strings with length modifiers but missing format specifier like "%0"
will read one byte past the array size.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Keith Packard <keithp@keithp.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit eda7dbff5a9f35fefe1e3dedacb82daadbf5945e
Author: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
Date: Sat Feb 9 20:53:02 2013 -0800
XORG_TLS: Pick the first option that works (ie: prefer __thread)
Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
commit 5da82f872daf25939a8fa04f1561b01f0315a623
Author: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
Date: Sat Feb 9 20:40:10 2013 -0800
os: Ensure <dix-config.h> is included in strndup.c
Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
commit 67eaf4b46f678bc904f47dfcab6655e170d843e0
Author: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
Date: Sat Feb 9 20:34:33 2013 -0800
XQuartz: Ensure <dix-config.h> is included in capabilities.c
Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
commit 955d434f4d755d00a24ae4068b9957765989d672
Author: Keith Packard <keithp@keithp.com>
Date: Wed Feb 13 21:39:37 2013 -0800
Update to version 1.3.99.902 (1.14 RC2)
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 7115f6c709898a5124b67e19c61dc01334471358
Author: Aaron Plattner <aplattner@nvidia.com>
Date: Wed Jan 23 16:58:47 2013 -0800
randr: unref the provider shared pixmap the appropriate number of times
When an RandR shared pixmap is created in rrCreateSharedPixmap, it has a refcnt
of 1. Then, PixmapShareToSlave bumps the refcnt to 2. However, there's no
corresponding PixmapUnshareFromSlave where the refcnt can be decreased again,
and there's no convenient common place where the refcnt can be decremented when
the slave pixmap is destroyed.
Fix this by just unreffing the pixmap twice in RRCrtcDetachScanoutPixmap.
Signed-off-by: Aaron Plattner <aplattner@nvidia.com>
Reviewed-by: Dave Airlie <airlied@redhat.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit da92690107d90061205340d4cdc98b73b59db9b2
Author: Aaron Plattner <aplattner@nvidia.com>
Date: Mon Feb 11 14:31:56 2013 -0800
xf86: use nt_list_for_each_entry_safe to walk InputHandlers in xf86Wakeup
This is necessary when the input handler deletes itself from the
list. Bug found by Maarten Lankhorst, this patch uses the list macros
instead of open-coding the fix.
Signed-off-by: Keith Packard <keithp@keithp.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
commit d0a14877872b6a33172fb8c8f335792a28b9499b
Author: Bryce Harrington <bryce@canonical.com>
Date: Fri Feb 8 15:56:02 2013 -0800
xfree86: Man page shouldn't say Device is mandatory anymore
man xorg.conf states that the 'Device' identifier is required in the
'Screen' section, yet current xserver defaults properly and boots up
fine without it.
Fixes: https://bugs.freedesktop.org/show_bug.cgi?id=20742
Signed-off-by: Bryce Harrington <bryce@canonical.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 5e91054aa070ea09b61325b7ec479d767b02730e
Author: Bryce Harrington <bryce@canonical.com>
Date: Fri Feb 8 15:56:01 2013 -0800
xfree86: Use fbdev/vesa driver on Oaktrail, Medfield, CDV rather than -intel
Instead of defaulting to -intel for Oaktrail, Medfield, and CDV chips,
default to -fbdev. For Poulsbo (only), attempt to use -psb if it's
installed, and fallback to fbdev otherwise. All other Intel chips
should use -intel.
This fixed an issue where -intel would load on these chips and cause a
boot failure. Newer -intel drivers avoid the boot hang, but it's still
the wrong driver to load, so why take chances.
The patch was originally created by Stefan Dirsch for OpenSUSE. We have
included it in our stable release (Ubuntu "quantal" 12.10) since
December.
ref: https://bugzilla.novell.com/show_bug.cgi?id=772279
ref: https://bugs.launchpad.net/ubuntu/+bug/1069031
Fixes: https://bugs.freedesktop.org/show_bug.cgi?id=60514
Signed-off-by: Bryce Harrington <bryce@canonical.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit c1602d1c17967bdd4db9db19b3a9c0dfca6a58aa
Author: Dave Airlie <airlied@gmail.com>
Date: Tue Feb 5 07:46:06 2013 -0800
randr: bump advertised RandR version to 1.4
Signed-off-by: Dave Airlie <airlied@redhat.com>
Reviewed-by: Aaron Plattner <aplattner@nvidia.com>
Tested-by: Aaron Plattner <aplattner@nvidia.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 9f79e93b6b3416055d08a0e8f9f16d5fd0649e36
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Wed Jan 30 03:20:07 2013 +0000
Short-cut the input device cleanup process during AbortServer()
If we're about to abort, we're already in the signal handler and cannot call
down to the default device cleanup routines (which reset, free, alloc, and
do a bunch of other things).
Add a new DEVICE_ABORT mode to signal a driver's DeviceProc that it must
reset the hardware if needed but do nothing else. An actual HW reset is only
required for some drivers dealing with the HW directly.
This is largely backwards-compatible, hence the input ABI minor bump only.
Drivers we care about either return BadValue on a mode that's not
DEVICE_{INIT|ON|OFF|CLOSE} or print an error and return BadValue. Exception
here is vmmouse, which currently ignores it and would not reset anything.
This should be fixed if the reset is required.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Keith Packard <keithp@keithp.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit b58221f9da8c549d979215271359c6cd88b5568a
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri Feb 8 14:52:02 2013 +1000
dix: support the transformation matrix for relative devices.
The transformation matrix we previously stored was a scaled matrix based on
the axis ranges of the device. For relative movements, the scaling is not
required (or desired).
Store two separate matrices, one as requested by the client, one as the
product of [scale . matrix . inv_scale]. Depending on the type of movement,
apply the respective matrix.
For relative movements, also drop the translation component since it doesn't
really make sense to use that bit.
Input ABI 19
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Keith Packard <keithp@keithp.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit b173eb2ae3349c557db1ff9e424fa540b8289bb2
Author: Keith Packard <keithp@keithp.com>
Date: Fri Feb 8 08:57:43 2013 -0800
os: Round fraction in pnprintf %f format
Truncating the fraction part leads to a test failure where -1203.30 is
printed as -1203.29. Round this to the nearest value instead by adding
0.5 before converting to an integer
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 509b3c3dc82e7abce1900d5e1cddd90f23be5a87
Author: Carlos Garnacho <carlosg@gnome.org>
Date: Wed Feb 6 14:07:22 2013 +0100
dix: Set focus field on XI2 crossing events
Set on DeviceEnterLeaveEvent() the xXIEnterEvent->focus field
similarly to how the CoreEnterLeaveEvent() function above does
for core events.
This fixes bug https://bugzilla.gnome.org/show_bug.cgi?id=677329
reported to GTK+, where focus handling on window managers with
sloppy focus or no window manager present was broken due to this
field being always set to FALSE.
Signed-off-by: Carlos Garnacho <carlosg@gnome.org>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 3e4be4033aed78b2bb3a18d51f0963989efd1af3
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri Jan 25 11:47:32 2013 +1000
dix: when shutting down slave devices, shut down xtest devices last
XTest devices are the first ones in the list, being initialised together
with the master devices. If we disable the devices in-order and a device has
a button down when being disabled, the XTest device is checked for a
required button release (xkbAccessX.c's ProcessPointerEvent). This fails if
the device is already NULL.
Instead of putting the check there, disable the devices in the reverse order
they are initialised. Disable physical slaves first, then xtest devices,
then the master devices.
Testcase: shut down server with a button still held down on a physical
device
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Keith Packard <keithp@keithp.com>
commit 0d5bb882600ee7734af034fbea935a79d21d1e70
Merge: b33fcb1497 61a99aff9d
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri Feb 8 14:10:52 2013 +1000
Merge branch 'ptraccel-fixes' into for-keith
commit 61a99aff9d33728a0b67920254d2d4d79f80cf39
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri Jan 11 14:22:07 2013 +1000
dix: pre-scale relative events from abs devices to desktop ratio (#31636)
Absolute devices may send relative events depending on the mode (synaptics
by default, wacom per option). The relative events are added to the previous
position, converted into device coordinates and then scaled into desktop
coordinates for pointer movement.
Because the device range must be mapped into the desktop coordinate range,
this results in uneven scaling depending dimensions, e.g. on a setup with
width == 2 * height, a relative movement of 10/10 in device coordinates
results in a cursor movement of 20/10 (+ acceleration)
Other commonly user-visible results:
* the touchpad changing acceleration once an external monitor as added.
* drawing a circle on a wacom tablet in relative mode gives an ellipsis in
the same ratio as the desktop dimensions.
Solution: pre-scale the incoming relative x/y coordinates by width/height
ratio of the total desktop size. Then add them to the previous
coordinates and scale back with the previous mapping, which will undo the
pre-scaling and give us the right movement.
X.Org Bug 31636 <http://bugs.freedesktop.org/show_bug.cgi?id=31636>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Keith Packard <keithp@keithp.com>
commit a6ba2b79ae8ad0fdee3f208d5e030b012df48785
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri Jan 11 08:53:24 2013 +1000
dix: unify prefix for ptraccel debugging in DebugAccelF macro
If we're already using our own custom macro, might as well use it properly.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Keith Packard <keithp@keithp.com>
commit 0d7d79406011169ad95e23c6e937f6d15a5ec3cc
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri Jan 11 08:52:08 2013 +1000
dix: use BUG_RETURN_VAL for an error message
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Keith Packard <keithp@keithp.com>
commit a0c38ea6cbad61edcfefff0e5dd6330edb706f13
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri Jan 11 08:49:15 2013 +1000
dix: add some more info to a ptraccel debug msg
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Keith Packard <keithp@keithp.com>
commit 95125a7c0cbbbae40216a0497acdd863ddc645ed
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu Jan 10 13:19:27 2013 +1000
dix: fix ptraccel debugging printfs
This is mostly sigsafe code, so use sigsave printf. And update some fields
to double that used to be int.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Keith Packard <keithp@keithp.com>
commit b33fcb149710a28fd8767b2307a97bf367de695e
Author: Andreas Wettstein <wettstein509@solnet.ch>
Date: Tue Jan 29 21:49:20 2013 +0100
xkb: Fix repeat behaviour of redirect and message actions
The redirect and the message action filter functions implicitly assumed that
when they receive an event for the same keycode they were activated for, that
this is the a release of the key that activated the filter. This is not true
if the key autorepeats. Due to the incorrect assumption, the effective key
repeat rate was effectively halved.
Signed-off-by: Andreas Wettstein <wettstein509@solnet.ch>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 8571c648a79444bcee9a0fe6e395129116372f49
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Sat Jan 26 15:53:08 2013 +1000
Xext: if a root window is given in XTestFakeInput, move to that
For absolute events, if the client specifies a screen number offset the
coordinates by that. And add a new flag so we know when _not_ to add the
screen offset in GPE.
Without this offset and the flag, GPE would simply add the offset of the
current screen if POINTER_SCREEN is set.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Keith Packard <keithp@keithp.com>
commit 9fd6cb89539fde44a41ae5183c89ef9c8831c8dd
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Tue Jan 29 15:13:44 2013 +1000
Xext: pass the current screen to miProcessDeviceEvent() from xtest calls
Not passing in a screen means we skip the screen crossing updates, so a
xtest event that changes between ScreenRecs won't do so until the next
physical event comes in or never, whichever comes earlier.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Keith Packard <keithp@keithp.com>
commit a191dbfe850ed9c6440346f59cb0078e0e844edc
Author: Sybren van Elderen <sowmestno@msn.com>
Date: Tue Jan 29 15:43:57 2013 +1000
dix: when scaling from desktop coord, take the total desktop size (#51904)
Scaled is already in desktop coordinates, take the total width into account,
not just the current screen's width.
Fixes Xdmx pointer position calculation.
X.Org Bug 51904 <http://bugs.freedesktop.org/show_bug.cgi?id=51904>
Signed-off-by: Sybren van Elderen <sowmestno@msn.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 1cb19803f0f8dfd1e0fb9d189afe2262e24a0be5
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Tue Jan 29 12:51:15 2013 +1000
include: fix typo in list description
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 3d35dfcf5bad1b0a028fbecd65cb6cf6ebf12503
Author: Ted Felix <ted@tedfelix.com>
Date: Tue Jan 29 16:36:48 2013 +1000
xfree86: bail on misformed acpi strings (#73227)
If acpid sends a string in a format that we can't parse, bail out instead of
potentially dereferencing a NULL-pointer.
X.Org Bug 73227 <http://bugs.freedesktop.org/show_bug.cgi?id=73227>
Signed-off-by: Ted Felix <ted@tedfelix.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit fdc451588816c4bc798d54e56316530e9066be80
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Tue Jan 29 11:01:29 2013 +1000
Xi: limit valuator copy to valuator array size (#59939)
mask[(MAX_VALUATORS + 7)/8] is larger than data[MAX_VALUATORS], so static
code checkers think we may be running OOB on the data array. Mask is
initialized to 0, so this should not happen, but change it anyway to shut up
code analyzer noise.
X.Org Bug 59939 <http://bugs.freedesktop.org/show_bug.cgi?id=59939>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
commit 48bc30c5413a1be0039fa77affcbbb4fe677479f
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Tue Jan 29 10:24:32 2013 +1000
Xext: avoid null-pointer dereference in XTestFakeInput (#59937)
dv is still NULL at this point, so return firstValuator instead (which is
the same value dv->firstValuator would be once initialized)
X.Org Bug 59937 <http://bugs.freedesktop.org/show_bug.cgi?id=59937>
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 1058fcf57fdcb94d92e7b5f4483b347853d5f8e6
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Sat Jan 26 14:13:33 2013 +1000
dmx: don't include dmx-config.h from xdmxconfig (#37502)
dmx-config.h is a server header which includes dix-config.h. That again
defines a bunch of server-specifics, including setting the size of XID to
32 bit.
libX11 uses unsigned long (8 bits on x86_64). XGCValues thus ends up being
16 bytes smaller in xdmxconfig than in the library, causing garbage to be
sent to the server.
X.Org Bug 37502 <http://bugs.freedesktop.org/show_bug.cgi?id=37502>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Keith Packard <keithp@keithp.com>
commit ac34281b8a487640c61f258ae45a6f17a4fb3cc0
Author: Dave Airlie <airlied@redhat.com>
Date: Thu Feb 7 12:24:20 2013 +1000
modesetting: provide dummy hooks for shadow
Since in some wierd cases the server can call these without checking they
exist.
Signed-off-by: Dave Airlie <airlied@redhat.com>
commit 73974dd7ea9ca4d4cdd5464cb813088a6ee9770b
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Sun Jan 27 15:42:02 2013 -0800
Avoid memory leak in ddc resort() if find_header() fails
Call find_header first, returning on failure before calling malloc.
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
commit b1129a1f1771c9d1653cc15aae94a614f081638a
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Sun Jan 27 14:00:54 2013 -0800
xf86XvMCScreenInit: Avoid leak if dixRegisterPrivateKey fails
Found by parfait 1.1 memory analyser:
Memory leak of pointer 'pAdapt' allocated with malloc((88 * num_adaptors))
at line 162 of hw/xfree86/common/xf86xvmc.c in function 'xf86XvMCScreenInit'.
'pAdapt' allocated at line 158 with malloc((88 * num_adaptors)).
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 563db909bcf965b6103c1807bf9f00ede957077d
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Sun Jan 27 13:55:50 2013 -0800
Avoid memory leak on realloc failure in localRegisterFreeBoxCallback
Also avoids leaving invalid pointers in structures if realloc had to
move them elsewhere to make them larger.
Found by parfait 1.1 code analyzer:
Memory leak of pointer 'newCallbacks' allocated with realloc(((char*)offman->FreeBoxesUpdateCallback), (8 * (offman->NumCallbacks + 1)))
at line 328 of hw/xfree86/common/xf86fbman.c in function 'localRegisterFreeBoxCallback'.
'newCallbacks' allocated at line 320 with realloc(((char*)offman->FreeBoxesUpdateCallback), (8 * (offman->NumCallbacks + 1))).
newCallbacks leaks when newCallbacks != NULL at line 327.
Memory leak of pointer 'newPrivates' allocated with realloc(((char*)offman->devPrivates), (8 * (offman->NumCallbacks + 1)))
at line 328 of hw/xfree86/common/xf86fbman.c in function 'localRegisterFreeBoxCallback'.
'newPrivates' allocated at line 324 with realloc(((char*)offman->devPrivates), (8 * (offman->NumCallbacks + 1))).
newPrivates leaks when newCallbacks == NULL at line 327.
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 08f75d3a9661c6c32800e1b4f150626200b889d9
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Sun Jan 27 13:50:30 2013 -0800
Avoid NULL pointer dereference in xf86TokenToOptinfo if token not found
Reported by parfait 1.1 code analyzer:
Error: Null pointer dereference (CWE 476)
Read from null pointer 'p'
at line 746 of hw/xfree86/common/xf86Option.c in function 'xf86TokenToOptName'.
Function 'xf86TokenToOptinfo' may return constant 'NULL' at line 721, called at line 745.
Null pointer introduced at line 721 in function 'xf86TokenToOptinfo'.
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
commit c1c01e350834a23161b33bd34b2fa9c01d02a65b
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Sun Jan 27 13:10:08 2013 -0800
Make xf86ValidateModes actually copy clock range list to screen pointer
Our in-house parfait 1.1 code analysis tool complained that every exit
path from xf86ValidateModes() in hw/xfree86/common/xf86Mode.c leaks the
storeClockRanges allocation made at line 1501 with XNFalloc.
Investigating, it seems that this code to copy the clock range list to
the clockRanges list in the screen pointer is just plain insane, and
according to git, has been since we first imported it from XFree86.
We start at line 1495 by walking the linked list from scrp->clockRanges
until we find the end. But that was just a diversion, since we've found
the end and immediately forgotten it, and thus at 1499 we know that
storeClockRanges is NULL, but that's not a problem since we're going to
immediately overwrite that value as the first thing in the loop.
So we move on through this loop at 1499, which takes us through the
linked list from the clockRanges variable, and for every entry in
that list allocates a new structure and copies cp to it. If we've
not filled in the screen's clockRanges pointer yet, we set it to
the first storeClockRanges we copied from cp. Otherwise, as best
I can tell, we just drop it into memory and let it leak away, as
parfait warned.
And then we hit the loop action, which if we haven't hit the end of
the cp list, advances cp to the next item in the list, and then just
for the fun of it, also sets storeClockRanges to the ->next pointer it
has just copied from cp as well, even though it's going to overwrite
it as the very first instruction in the loop body.
v2: rewritten using nt_list_* macros from Xorg's list.h header
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 89badba082c81d20fe35cb064c16e131ff288ca3
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Sun Jan 27 12:08:47 2013 -0800
Free keymap on error in Xephyr's hostx_load_keymap
Found by parfait 1.1 code analyser:
Memory leak of pointer 'keymap' allocated with XGetKeyboardMapping(HostX.dpy, min_keycode, ((max_keycode - min_keycode) + 1), &host_width)
at line 861 of hw/kdrive/ephyr/hostx.c in function 'hostx_load_keymap'.
'keymap' allocated at line 845 with XGetKeyboardMapping(HostX.dpy, min_keycode, ((max_keycode - min_keycode) + 1), &host_width).
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 48b94651205b175760904e448f94111d1ab85e13
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Sun Jan 27 11:20:45 2013 -0800
Stop leaking overlayWin in PanoramiXCompositeGetOverlayWindow error paths
Found by parfait 1.1 code analyzer:
Error: Memory leak (CWE 401)
Memory leak of pointer 'overlayWin' allocated with malloc(72)
at line 806 of composite/compext.c in function 'PanoramiXCompositeGetOverlayWindow'.
pointer allocated at line 794 with malloc(72).
<unknown> leaks when rc != 0 at line 804.
at line 816 of composite/compext.c in function 'PanoramiXCompositeGetOverlayWindow'.
pointer allocated at line 794 with malloc(72).
<unknown> leaks when pOc == NULL at line 815.
at line 825 of composite/compext.c in function 'PanoramiXCompositeGetOverlayWindow'.
pointer allocated at line 794 with malloc(72).
<unknown> leaks when cs->pOverlayWin == NULL at line 822
and compCreateOverlayWindow(pScreen) == 0 at line 823.
at line 834 of composite/compext.c in function 'PanoramiXCompositeGetOverlayWindow'.
pointer allocated at line 794 with malloc(72).
<unknown> leaks when rc != 0 at line 832.
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
commit f4a9332ad149ed15353a9c482563bdd042d0b403
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Sun Jan 27 10:06:42 2013 -0800
Handle failure to create counter in init_system_idle_counter
Check for NULL pointer (which can be returned for multiple reasons)
before trying to dereference it to add privates. To avoid memory leak
in error path, delay malloc of privates until we're ready to add them.
In case we do return NULL up through SyncInitDeviceIdleTime, handle the
possibility of getting NULL passed back down to SyncRemoveDeviceIdleTime.
As reported by parfait 1.1:
Error: Null pointer dereference (CWE 476)
Read from null pointer 'idle_time_counter'
at line 2764 of xserver/Xext/sync.c in function 'init_system_idle_counter'.
Function 'SyncCreateSystemCounter' may return constant 'NULL' at line 952, called at line 2756.
Null pointer introduced at line 952 in function 'SyncCreateSystemCounter'.
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 7fe5e6dfa5c1e71d8b7540b28c1d508687a2fbee
Author: Jasper St. Pierre <jstpierre@mecheye.net>
Date: Wed Jan 23 13:11:55 2013 -0500
protocol-versions: Bump minor version of XI
This was accidentally excluded when we added barriers.
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 70b127c9f1c53bdb42f078265e67f76b464deae2
Author: Aaron Plattner <aplattner@nvidia.com>
Date: Thu Jan 10 17:01:17 2013 -0800
config/udev: fix "removing GPU device" format string mistake
udev.c: In function 'device_removed':
udev.c:270:9: warning: format '%d' expects argument of type 'int', but argument 3 has type 'const char *' [-Wformat]
Signed-off-by: Aaron Plattner <aplattner@nvidia.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 605dfc6804a05ff2bda5692fec26c37344fd95cb
Author: Dave Airlie <airlied@gmail.com>
Date: Tue Jan 22 07:39:53 2013 +1000
xserver: fix build regression since 91ab237358c6e33da854914d3de493a9cbea7637
inputstr, double defines TouchListener typedef, maybe some gcc handles it,
but not all.
fixes tinderbox
Reported-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Signed-off-by: Dave Airlie <airlied@redhat.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 069d8ed3eb659c48dd2b0f8b7b8c11f092fdb362
Merge: 591c06277b d6dcde7a03
Author: Keith Packard <keithp@keithp.com>
Date: Sun Jan 20 15:58:38 2013 -0800
Merge remote-tracking branch 'jturney/xserver-next'
commit 591c06277bb120ab9615633f2d28addbd3a2aa5f
Merge: 6703a7c7cf fa6ab7d9b2
Author: Keith Packard <keithp@keithp.com>
Date: Sun Jan 20 15:52:26 2013 -0800
Merge remote-tracking branch 'whot/for-keith'
commit cde7cbe9674e8a771f9a4e646c1772a46a8230fb
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu Jan 10 13:20:12 2013 +1000
os: add support for %f to pnprintf
This is the lazy man's %f support. Print the decimal part of the number,
then append a decimal point, then print the first two digits of the
fractional part. So %f in sigsafe printing is really %.2f.
No boundary checks in place here.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Keith Packard <keithp@keithp.com>
commit 20def57632583aef095ca18792c7fce16d2d9004
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu Jan 10 13:24:05 2013 +1000
os: silently ignore length modifiers in pnprintf
Until we have support for them, ignore any length modifiers so we don't need
to update all callers.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Keith Packard <keithp@keithp.com>
commit f53b2012f39085d866f267dda1442a48ace3c5a5
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu Jan 17 16:19:51 2013 +1000
test/signal-logging: simplify tests using sprintf
Ever looked at your own code and thought 'WTF was I thinking?'. yeah, that.
Instead of passing in the expected string just use sprintf to print the
number for us and compare. In the end we're just trying to emulate printf
behaviour anyway.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Keith Packard <keithp@keithp.com>
commit d6dcde7a03bb38c17ffc4ec5f0ca1c161e54569f
Author: Jon TURNEY <jon.turney@dronecode.org.uk>
Date: Sat Feb 11 12:22:17 2012 +0000
hw/xwin: Stop assuming WS_EX_APPWINDOW style in WM_SHOWWINDOW
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
commit 56e94403f8f9182e05428d895a983371c7737d2a
Author: Jon TURNEY <jon.turney@dronecode.org.uk>
Date: Wed Jan 9 20:15:01 2013 +0000
hw/xwin: Use ITaskBarList interface to ensure show-on-taskbar state is updated correctly
Use ITaskBarList interface to ensure that the taskbar notices if the window has
changed it's style in a way which affects if the taskbar shows it or not.
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
commit c94d1cb0a49106f44714f4511720a197cc549164
Author: Jon TURNEY <jon.turney@dronecode.org.uk>
Date: Thu Jan 10 14:35:56 2013 +0000
hw/xwin: Ensure full styling is applied when the window is mapped
Move styling update code from WM_WM_HINTS_EVENT to a function UpdateStyle(),
which is also invoked from WM_WM_MAP3, so everything which needs to be done
to style the window happens when it is mapped
(Otherwise, the appearance of the window is sensitive to the timing of the
notification of the windows appearance hint properties being set relative to
window creation. e.g. see [1])
[1] http://sourceware.org/ml/cygwin-xfree/2012-06/msg00004.html
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
commit ef61f8cacc84080c9156675f9ce26a27e8a90ac1
Author: Jon TURNEY <jon.turney@dronecode.org.uk>
Date: Sat Mar 31 18:45:28 2012 +0100
hw/xwin: Make sure that WM_WM_HINTS_EVENT does nothing for override-redirect windows
Future work: It looks like this code could be rationalized quite a lot: It might
make sense to pull the checking for override-redirect up out of UpdateIcon() and
UpdateName() and consolidate WM_WM_MAP2 and WM_WM_MAP3
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
commit 3628559e594fcbdfcc14b1e8fa60aa841f184e19
Author: Jon TURNEY <jon.turney@dronecode.org.uk>
Date: Sun Feb 5 11:25:39 2012 +0000
hw/xwin: Add a new WM_WM_HINTS_EVENT event to update window style
Add a new WM_WM_HINTS_EVENT event to update window style if any of the
properties which affect window style change
Check PropertyNotify events for any of the window properties which we consider
to decide on the window style, and update the window style by sending a
WM_WM_HINTS_EVENT message to the WM.
This allows the styling of the window to change during it's lifetime.
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
commit 066ecbd11d516ea68d7ebc7470232d01c5717546
Author: Jon TURNEY <jon.turney@dronecode.org.uk>
Date: Thu Jan 10 14:37:45 2013 +0000
hw/xwin: Move reshape code from winUpdateWindowPosition() to the map event handler
Move reshape code, which was only used when handling a map event, from
winUpdateWindowPosition(), to put it explicitly in the map event handler.
Remove 'reshape' parameter from winUpdatePosition().
(Note that there's no handling of the ShapeNotify event to notice when the
window shape changes, instead we hook the screen SetShape procedure and reshape
the native window then)
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
commit 852d1fb042f4160fe023a015f1c9a34126bf911a
Author: Ryan Pavlik <rpavlik@iastate.edu>
Date: Sat Dec 1 16:58:40 2012 +0000
hw/xwin: Add missing include xwin-config.h to winglobals.h
winglobals.h checks if RELOCATE_PROJECTROOT is defined to see if a declaration
of g_fLogFileChanged is needed, so must include xwin-config.h
Signed-off-by: Ryan Pavlik <rpavlik@iastate.edu>
Reviewed-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
commit ab686ce029208abf970a4bcd1435bf8411a44de9
Author: Ryan Pavlik <rpavlik@iastate.edu>
Date: Wed Oct 26 17:03:25 2011 -0500
include: Add RELOCATE_PROJECTROOT to xwin-config.h header
RELOCATE_PROJECTROOT is AC_DEFINED in configure.ac, but currently has no effect
as it doesn't appear in any AC_CONFIG_HEADER header.
When packaged for Windows, we do not have a unix-style filesystem tree, where
file needed by the X server can be found in fixed, absolute paths under the
prefix (PROJECTROOT).
Instead, the filesystem tree containing files needed by the X server and clients
will be installed with the directory containing the X server executable as the
root directory of that tree.
(Typically, this will be in the Program Files directory, which does not have a
fixed name, as it can be moved, localized, or added to to indicate x86 or x64
binaries)
So, RELOCATE_PROJECTROOT is used to make a native Windows build of the X server
look for various files (fonts, xkb data) in locations relative to the X server
rather than at absolute paths, by translating those paths at run-time.
Additionally the XKEYSYMDB, XERRORDB, XLOCALEDIR env vars checked by libX11 are
set appropriately for clients started by the X server.
Signed-off-by: Ryan Pavlik <rpavlik@iastate.edu>
Reviewed-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
commit fa6ab7d9b2d7fd8184f1e068360607845f5c33ab
Merge: adde4e6448 0e1ab433f4
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri Jan 11 14:58:17 2013 +1000
Merge branch 'pointer-emulation-fixes-56558-v2' into for-keith
commit adde4e64480315dc5b47a727ee37d86f5cd8584f
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu Jan 10 10:33:05 2013 +1000
dix: typo fix in comment
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 05ed095dd8d6cf939b4ebd9a59d70ce32705df7c
Author: Benjamin Tissoires <benjamin.tissoires@gmail.com>
Date: Wed Jan 9 19:32:19 2013 +0100
dix: fix error logging occuring in signal context of GetTouchEvents
GetTouchEvents is usually called in a signal context.
Calling ErrorF for the error messages leads to X complaining about log:
(EE) BUG: triggered 'if (inSignalContext)'
(EE) BUG: log.c:484 in LogVMessageVerb()
(EE) Warning: attempting to log data in a signal unsafe manner while in signal context.
Please update to check inSignalContext and/or use LogMessageVerbSigSafe() or ErrorFSigSafe().
The offending log format message is:
%s: Attempted to start touch without x/y (driver bug)
Signed-off-by: Benjamin Tissoires <benjamin.tissoires@gmail.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit f4a58469a298c226668fd8dce375bf22331c902d
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Wed Jan 9 13:58:56 2013 +1000
xfree86: don't access the old input handler after freeing it
Introduced in 323869f3298cbbfe864af9404a8aed1bf7995d79
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Dave Airlie <airlied@redhat.com>
commit 205cfbd6d9824fb9a67c21b19bc8f1e66c9df4d2
Author: Dave Airlie <airlied@gmail.com>
Date: Sat Jan 5 18:35:42 2013 +1000
xf86: bump input ABI version to 19
The changes to miPointerSetPosition interface from int->double breaks
the SIS driver build, so time to bump this.
Signed-off-by: Dave Airlie <airlied@redhat.com>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit ad3bc571348a7007a2960bf87ae739397c5511ee
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Tue Jan 8 11:19:09 2013 +1000
xfree86: update the device state for all DGA events (#59100)
DGA only handles master devices but it does intercept slave device events as
well (since the event handlers are per event type, not per device).
The DGA code must thus call into UpdateDeviceState to reset the button/key
state on the slave device before it discards the remainder of the event.
Test case:
- Passive GrabModeSync on VCP
- Press button
- Enable DGA after ButtonPress
- AllowEvents(SyncPointer)
- Release button
The button release is handled by DGAProcessPointerEvent but the device state
is never updated, so the slave ends up with the button permanently down.
And since the master's button state is the union of the slave states, the
master has the button permanently down.
X.Org Bug 59100 <http://bugs.freedesktop.org/show_bug.cgi?id=59100>
Reported-by: Steven Elliott <selliott4@austin.rr.com>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Dave Airlie <airlied@redhat.com>
commit c5f2818edbec2f87383baa6c6be5c389b73ca6f9
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Tue Jan 8 10:13:53 2013 +1000
xfree86: set event->detail for DGA pointer events
Reported-by: Steven Elliott <selliott4@austin.rr.com>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Dave Airlie <airlied@redhat.com>
commit 519d183d78e0b0eaf47a473e94f5d8611baf8463
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Mon Jan 7 10:44:33 2013 +1000
Fix two typos "requires an string value"
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 4e13dd90144dde47550aceea4db4b4329e531279
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Wed Aug 22 10:34:07 2012 +1000
dix: don't filter RawEvents if the grab window is not the root window (#53897)
If a XI2.1+ client has a grab on a non-root window, it must still receive
raw events on the root window.
Test case: register for XI_ButtonPress on window and XI_RawMotion on root.
No raw events are received once the press activates an implicit grab on the
window.
X.Org Bug 53897 <http://bugs.freedesktop.org/show_bug.cgi?id=53897>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Keith Packard <keithp@keithp.com>
commit a2037d7080ae64ea55f7d76971716346aa3ec6d3
Author: Jon TURNEY <jon.turney@dronecode.org.uk>
Date: Wed Nov 28 22:25:35 2012 +0000
hw/xwin: Fix MinGW build of winSetAppModelID.c
Add missing #include <pthread.h>
In file included from /jhbuild/checkout/xorg/xserver/hw/xwin/winSetAppUserModelID.c:31:0:
/jhbuild/checkout/xorg/xserver/hw/xwin/winwindow.h:140:11: error: expected declaration specifiers or ‘...’ before ‘pthread_t’
/jhbuild/checkout/xorg/xserver/hw/xwin/winwindow.h:141:11: error: expected declaration specifiers or ‘...’ before ‘pthread_t’
/jhbuild/checkout/xorg/xserver/hw/xwin/winwindow.h:142:11: error: expected declaration specifiers or ‘...’ before ‘pthread_mutex_t’
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
commit f57100bb36eae3b4d75f3c315973405f705b8de6
Author: Jon TURNEY <jon.turney@dronecode.org.uk>
Date: Tue Feb 23 13:38:48 2010 +0000
hw/xwin: Process one Windows message per wakeup, rather than all of them.
De-queuing Windows messages and X events happens in the same thread of
execution. Draining the windows message queue can lead to the X event queue
overflowing if lots of those windows messages cause X events (e.g. if a keyboard
macro program has just dumped thousands of keypresses into the Windows message
queue). See the mailing list thread [1] for more details.
Processing one Windows message per wakeup, rather than all of them gives the X
server a chance to do stuff as well after each message.
[1] http://cygwin.com/ml/cygwin-xfree/2010-01/msg00056.html
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
commit e30e1ea98720acc583f34c830a1c1b7e3e88f694
Author: Jon TURNEY <jon.turney@dronecode.org.uk>
Date: Mon Dec 17 22:38:25 2012 +0000
hw/xwin: Fix some comments in winkeybd.c
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
commit 6f4a48f8a55bc54b6d3e9d80734be05750c024de
Author: Jon TURNEY <jon.turney@dronecode.org.uk>
Date: Thu Apr 1 15:08:26 2010 +0100
hw/xwin: Bring the X screen window to the front on a single left-click on the tray icon
Bring the X screen window to the front on a single left click on the tray icon,
like the comment says we do
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
commit 6703a7c7cf1a349c137e247a0c8eb462ff7b07be
Author: Keith Packard <keithp@keithp.com>
Date: Tue Jan 8 20:24:32 2013 -0800
hw/xfree86: Require only one working CRTC to start the server.
Instead of requiring every mode set to complete successfully, start up
as long as at least one CRTC is working. This avoids failures when one
or more CRTCs can't start due to mode setting conflicts.
Signed-off-by: Keith Packard <keithp@keithp.com>
Reviewed-by: Dave Airlie <airlied@redhat.com>
commit 34a571c5b9781025897ba5e5c5e2a34ae5262266
Author: Dave Airlie <airlied@redhat.com>
Date: Wed Jan 9 13:04:00 2013 +1000
modesetting: bump to 0.6.0
commit 8650ff14a52047173fa32f12f22ec6f4e38ff433
Author: Dave Airlie <airlied@redhat.com>
Date: Wed Jan 9 12:48:30 2013 +1000
modesetting: fix crashes caused by udev race conditions
So the kernel removes the device, and the driver processes the first
udev event, and gets no output back from the kernel, so it check
and don't fall over.
This fixes a couple of crashes seen when hotplugging USB devices.
Signed-off-by: Dave Airlie <airlied@redhat.com>
commit 0e1ab433f4048b3367bb2f01d16cd00502538e4d
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri Jan 4 12:26:58 2013 +1000
dix: remove already-moved hunk
Should've been removed in bc1f90a615018c05994fae3e678dd2341256cd82a, but got
left here due to a botched rebase.
Fixes stray button events sent to clients after deactivating an async
pointer grab on a pointer-emulating-touch.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Keith Packard <keithp@keithp.com>
commit 32a6d8a6b59c42f8d65002d7ca1cafb1957b656f
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu Dec 20 16:25:43 2012 +1000
dix: check for the right device's xi2 mask
events.c: In function 'DeactivatePointerGrab':
events.c:1524:51: warning: 'dev' may be used uninitialized in this function
[-Wuninitialized
dev is unset when we get here, the device to check is "mouse".
Introduced in ece8157a59751b3ed492fb2e1eb8d5f20221e195.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Keith Packard <keithp@keithp.com>
commit f59499b5d05fde83813709e9848152951592120d
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Tue Oct 30 12:44:08 2012 +1000
dix: add resource type to touch listeners
Instead of guessing what resource type the listener is and what property to
retrieve, store the resource type in the listener directly.
Breaks XIT test cases:
TouchGrabTestMultipleTaps.PassiveGrabPointerEmulationMultipleTouchesFastSuccession
Fixes https://bugs.freedesktop.org/show_bug.cgi?id=56557
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Keith Packard <keithp@keithp.com>
Reviewed-by: Chase Douglas <chase.douglas@ubuntu.com>
commit 9ad0fdb135a1c336771aee1f6eab75a6ad874aff
Author: Keith Packard <keithp@keithp.com>
Date: Tue Nov 27 11:21:17 2012 -0800
input: Record grab pointer in TouchListener
This places a pointer to the grab related to a TouchListener directly
in the TouchListener structure rather than hoping to find the grab
later on using the resource ID.
Passive grabs have resource ID in the resource DB so they can be
removed when a client exits, and those resource IDs get copied when
activated, but implicit grabs are constructed on-the-fly and have no
resource DB entry.
Signed-off-by: Keith Packard <keithp@keithp.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 91ab237358c6e33da854914d3de493a9cbea7637
Author: Keith Packard <keithp@keithp.com>
Date: Tue Nov 27 11:21:16 2012 -0800
input: Pull TouchListener declaration to top-level
No reason to have a struct declared inside another struct
Signed-off-by: Keith Packard <keithp@keithp.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 3578cc3c2e1b5cb8eb191e2d12ad88e1bc9e6e1e
Author: Andreas Wettstein <wettstein509@solnet.ch>
Date: Wed Dec 19 18:13:21 2012 +0100
xkb: Do not use base group as an array index.
The base group is not brought into range and, therefore, using it as an array
index crashed the X server. Also, at this place, we should ignore locked
groups, but not latched groups. Therefore, use sum of base and latched groups,
brought into range.
Reproducible with:
key <FK07> {
type= "ONE_LEVEL",
symbols[Group1]= [ NoSymbol ],
actions[Group1]= [ LatchGroup(group=-1, clearLocks) ]
};
And hitting F7 will exceed the group level and access arbitrary memory.
Signed-off-by: Andreas Wettstein <wettstein509@solnet.ch>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit df746a73410b892a4d41a2934cf9cd2e8ad7ba51
Author: Carlos Garnacho <carlosg@gnome.org>
Date: Wed Dec 19 18:42:39 2012 +0100
render: Unwrap early on the animated cursor BlockHandler
The loop above the previous call may end up triggering other
handlers attaching to the same function slot, so unwrapping
the handler after that could leave the just attached handler
in a dangling but not unset state.
This issue was most visible on the XO, where destroying a
window with an animated cursor set and running would trigger
this inconsistent state, never calling the miSpriteBlockHandler
again after the animated cursor is unset.
Signed-off-by: Carlos Garnacho <carlosg@gnome.org>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 0fbd779a82919d5dbf8776be9b57a76c0eae6b14
Author: Carlos Garnacho <carlosg@gnome.org>
Date: Wed Dec 19 18:42:38 2012 +0100
mi: Ensure pointer emulating touch events update the sprite
Different miPointerSpriteFuncRec implementations do a varying
business at ultimately calling miPointerUpdateSprite(), this
particularly fails when using the plain mi sprite on touch events,
where the sprite is just moved/updated on cursor changes.
So, ensure miPointerUpdateSprite() is called generically for
pointer emulating touch events as with regular motion events.
Signed-off-by: Carlos Garnacho <carlosg@gnome.org>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 8b328d4ee3873bc0a7a34f2cb9d301827244b98c
Author: Aaron Plattner <aplattner@nvidia.com>
Date: Fri Dec 21 07:37:33 2012 -0800
dix: Make small bitfields that store enums unsigned
Commit 31bf81772e146af79b0c456aae2159eba8b0280f changed the clientState field
from a signed int to a signed int 2-bit bitfield. The ClientState enum that is
expected to be assigned to this field has four values: ClientStateInitial (0),
ClientStateRunning (1), ClientStateRetained (2), and ClientStateGone (3).
However, because this bitfield is signed, ClientStateRetained becomes -2 when
assigned, and ClientStateGone becomes -1. This causes warnings:
test.c:54:10: error: case label value exceeds maximum value for type [-Werror]
test.c:55:10: error: case label value exceeds maximum value for type [-Werror]
The code here is a switch statement:
53 switch (client->clientState) {
54 case ClientStateGone:
55 case ClientStateRetained:
56 [...]
57 break;
58
59 default:
60 [...]
61 break;
62 }
It also causes bizarre problems like this:
client->clientState = ClientStateGone;
assert(client->clientState == ClientStateGone); // this assert fails
Also change the signedness of nearby bitfields to match.
Signed-off-by: Aaron Plattner <aplattner@nvidia.com>
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
Reviewed-by: Colin Harrison <colin.harrison at virgin.net>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 8f4820be7a2e0f6e286ddc85c4b75bccdbe8a730
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu Dec 20 12:44:16 2012 +1000
test/xi2: fix compiler warning
protocol-xiwarppointer.c: In function ‘ScreenSetCursorPosition’:
protocol-xiwarppointer.c:71:53: warning: declaration of ‘screen’ shadows a
global declaration [-Wshadow]
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit bd91b05b631f13afd1f7a9d6cbc4f0c5408b523a
Author: Keith Packard <keithp@keithp.com>
Date: Wed Dec 19 12:47:35 2012 -0800
Update to version 1.13.99.901 (1.14 RC1)
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 2a0b544f5c09f79e4ab04ea8103a5ecf59ee2e7b
Merge: 0eb1559eb2 ba4bb3bc1b
Author: Keith Packard <keithp@keithp.com>
Date: Wed Dec 19 12:26:00 2012 -0800
Merge remote-tracking branch 'jeremyhu/master'
commit 0eb1559eb29d11e63c2b33e317590a88d86fe313
Merge: 386e4d76ba ea1d76d1b6
Author: Keith Packard <keithp@keithp.com>
Date: Wed Dec 19 12:21:31 2012 -0800
Merge remote-tracking branch 'yselkowitz/master'
I checked this patch with diff -w to check that it only affected
whitespace.
commit 386e4d76baaffe226d2d561ff936509454eb0ac2
Merge: 014a5c8a9d 9ff2e83151
Author: Keith Packard <keithp@keithp.com>
Date: Wed Dec 19 12:17:59 2012 -0800
Merge remote-tracking branch 'alanc/master'
commit 014a5c8a9d86f2f992183bff9106354fac2c3b0e
Merge: f793b5fd3e 2eefa5d6e8
Author: Keith Packard <keithp@keithp.com>
Date: Wed Dec 19 12:09:31 2012 -0800
Merge remote-tracking branch 'whot/barriers'
Conflicts:
Xi/xichangehierarchy.c
Small conflict with the patch from
Xi: don't use devices after removing them
Was easily resolved by hand.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 9ff2e831517875f96477862f979abff394e8d551
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Tue Dec 18 00:41:08 2012 -0800
EnableDisableExtensionError: Use ARRAY_SIZE rather than sentinel
d785368e0e converted the other miinitext functions to use ARRAY_SIZE,
and removed the sentinel, but missed EnableDisableExtensionError so
passing an invalid extension name could cause the server to walk off
the end off the list looking for a sentinel that wasn't there.
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
commit ba4bb3bc1b87eb57cc34d2ad1f302c9d2a15c847
Author: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
Date: Tue Dec 18 01:29:12 2012 -0800
XQuartz: Don't add the 15bit visual any more
Mountain Lion only supports 32bit backing stores, so don't use 15bit visuals until libXplugin adapts
Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
commit c298f9c42ec05486ac88fc91a84739d7c3e3ea9e
Author: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
Date: Tue Dec 18 01:28:02 2012 -0800
XQuartz: Revert some unfortunate auto-indenting mishaps with our super-nested for-loops
Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
commit 07a91fa6c6d535f3f05d4c3bd9c4d2b8c382c475
Author: Rob Clark <robdclark@gmail.com>
Date: Wed Dec 5 23:21:27 2012 +0000
hw/dmx: fix build without GLX
Fixes this compile break that showed up on arm recently:
dmxinit.c:746:26: error: 'glxSupported' undeclared (first use in this function)
dmxinit.c:746:26: note: each undeclared identifier is reported only once for each function it appears in
Signed-off-by: Rob Clark <robdclark@gmail.com>
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
commit 5692a1e8f5befd3698134b1a5516a4dadda00115
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Thu Dec 6 16:15:50 2012 -0800
Support compilers with alternate spellings of typeof
The AC_C_TYPEOF adds a #undef typeof to its autogenerated config.h.in
template, but b8ab93dfbc7f292 didn't copy that to dix-config.h.in
when HAVE_TYPEOF was, so the macro could claim typeof support but not
make it work, when used with compilers like Solaris Studio 12.1 which
only recognize it as __typeof__.
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Acked-by: Peter Hutterer <peter.hutterer@who-t.net>
commit f793b5fd3eb16a2ada130367c2ffebeede69a322
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Tue Dec 11 13:36:02 2012 +1000
dix: don't copy the wrong event mask when activating a passive grab
GrabMask is a union of core, XI1 and XI2 masks. If a XI2 grab is activated,
the value is a random pointer value, using it as mask has unpredictable
effects.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Jasper St. Pierre <jstpierre@mecheye.net>
Reviewed-by: Keith Packard <keithp@keithp.com>
commit dd3242c87a0a58cba055eb99c0c3fcf03153e4b8
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri Dec 14 11:34:15 2012 +1000
dix: don't allow overriding a grab with a different type of grab (#58255)
If a client has a core grab, don't allow re-grabbing with type XI2, etc.
This was the intent of the original commit
xorg-server-1.5.99.1-782-g09f9a86, but ineffective.
X.Org Bug 58255 <http://bugs.freedesktop.org/show_bug.cgi?id=58255>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Keith Packard <keithp@keithp.com>
commit 2eefa5d6e870c57ac6a5930883d8cfe3a3882a43
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu Dec 13 14:42:32 2012 +1000
Xi: if a MD is removed, send a barrier leave event (if applicable)
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Jasper St. Pierre <jstpierre@mecheye.net>
commit e2423b627ef7e4d08ea0685af5e771ddd2b511ce
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu Dec 13 14:04:13 2012 +1000
Xi: don't store the window pointer in barriers, store the window ID
When a client shuts down and resources are being freed, the window may have
been freed already, so accessing it to get the window ID is bad. Plus, we
never care about the window anyway other than for stuffing it into the
event.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Jasper St. Pierre <jstpierre@mecheye.net>
commit f71c2f895c9e2f9d0d42feaac2a3e1d2deb71f67
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Wed Dec 12 15:41:32 2012 +1000
Xi: fix per-device barrier handling
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Jasper St. Pierre <jstpierre@mecheye.net>
commit 58bff17e43a80eb21b3ff6d4bb1596230e61f707
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu Dec 13 11:49:54 2012 +1000
Xi: don't use devices after removing them
RemoveDevice() frees the DeviceIntPtr, we shouldn't use the pointer after
that
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Keith Packard <keithp@keithp.com>
commit 3420a7778c7d5eaa638327f31dd460554c257bb1
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Wed Dec 12 11:02:19 2012 +1000
xfree86: print message to the log when zapping the server
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Aaron Plattner <aplattner@nvidia.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 6d508b81857edaed03c7ee06410434ea56d9b701
Merge: d982d87743 bb6f3514ca
Author: Keith Packard <keithp@keithp.com>
Date: Mon Dec 17 11:45:45 2012 -0800
Merge remote-tracking branch 'whot/for-keith'
I've looked at these patches, but I can't say I've actually
reviewed them...
commit d982d877436377597b8ed04bca1438d2edaf53ee
Merge: da3eaf6bdb 6b4aa8a359
Author: Keith Packard <keithp@keithp.com>
Date: Mon Dec 17 10:56:12 2012 -0800
Merge remote-tracking branch 'airlied/for-keithp'
commit da3eaf6bdbd7ce3bebf2c490cbe2448b4c402dba
Author: Dave Airlie <airlied@redhat.com>
Date: Mon Dec 17 15:40:17 2012 +1000
glx/dri2: initialise api to avoid indirect rendering failing randomly
Running glxinfo under indirect rendering would randomly fail against the
intel driver, as it would create a context with no attribs, and then the
api value would be passed to the driver uninitialised.
Signed-off-by: Dave Airlie <airlied@redhat.com>
Reviewed-by: Keith Packard <keithp@keithp.com>
Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit cc10ac8f0e07854647e1fd7cc70b7e9f8d919fd1
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Mon Dec 10 11:00:46 2012 +1000
Xi: fix swapping for barrier events
Protocol events don't contain pointers, so it's easier to copy everything
over, then swap in-place.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Jasper St. Pierre <jstpierre@mecheye.net>
commit 151d44149a09dd125e25b3d94f22a609f0221548
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Mon Dec 10 10:53:49 2012 +1000
Xi: swap sequence number and evtype in barrier events
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Jasper St. Pierre <jstpierre@mecheye.net>
commit d4065493b211e90b46f9d4178f23f347afd8043f
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Mon Dec 10 11:02:32 2012 +1000
tests/xi2: at protocol conversion test for barrier events
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Jasper St. Pierre <jstpierre@mecheye.net>
commit 938187f2fec006daf4cc677df26d5b0b6999b54b
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri Dec 7 15:55:59 2012 +1000
Require inputproto 2.2.99.1
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Jasper St. Pierre <jstpierre@mecheye.net>
commit 78376a9217058aa66e52a0399fc2be469d70ce32
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri Dec 7 09:26:13 2012 +1000
mi: rename mipointer's internal event list
Avoid name shadowing warnings, change the event list to a more specific
name.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Jasper St. Pierre <jstpierre@mecheye.net>
commit 88a2cccc37cac4e171f9bfc020017ddfa66ae417
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri Dec 7 09:11:13 2012 +1000
Xi: if the device is currently grabbed, flag the barrier event
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Jasper St. Pierre <jstpierre@mecheye.net>
commit 353aa515922e1095047161ec47a2722772218f20
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu Dec 6 15:09:27 2012 +1000
Xi: deliver barrier events as grabbed events where necessary
If the grab_window is the barrier window and the client owns the grab,
deliver as normal grabbed event (respecting owner_events). Otherwise,
deliver as usual.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Jasper St. Pierre <jstpierre@mecheye.net>
commit 3b161401700a2d916da0f81f99b39e75fdbe78df
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu Dec 6 14:13:26 2012 +1000
dix: ignore barrier events in FixUpEventFromWindow
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Jasper St. Pierre <jstpierre@mecheye.net>
commit a1eeb6fbecf0bd9665a9158b27c273e83b3ab351
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu Dec 6 13:25:29 2012 +1000
dix: handle barrier events properly when converting to core/XI 1.x
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Jasper St. Pierre <jstpierre@mecheye.net>
commit 1b83775f6712a7e48c49a3411a87103e8e906e67
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu Dec 6 12:39:04 2012 +1000
dix: skip delivery if it's not the right pointer barrier client
Only deliver to the client that created the barrier, not to other clients.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Jasper St. Pierre <jstpierre@mecheye.net>
commit c50db6faba4ee1c27b735c6e9c98a4276ba3c7ff
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu Dec 6 12:58:55 2012 +1000
Xi: fill in barrier root x/y after clamping to RandR outputs
x/y for barrier events should contain the actual pointer position.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Jasper St. Pierre <jstpierre@mecheye.net>
commit 21a15f9a04ec0a6c8f654eef943561e98db2475d
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Mon Dec 3 10:41:16 2012 +1000
Pass the event list through to the pointer barrier code to return it
Instead of having the pointer barrier code enqueue events separately from
GetPointerEvents, pass the event list through and let it add to it.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Jasper St. Pierre <jstpierre@mecheye.net>
commit 707b4dc61f18960611409ef5ad8947be189f7296
Author: Jasper St. Pierre <jstpierre@mecheye.net>
Date: Tue Nov 27 15:31:52 2012 -0500
barriers: Support line and ray barriers
This allows clients to add barriers that extend to the edge of the
screen. Clients are encouraged to use these instead of precise coordinates
in these cases to help prevent pointer leaks.
Signed-off-by: Jasper St. Pierre <jstpierre@mecheye.net>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 0a5a0d7c242add4d79721c1b90073b603a475534
Author: Jasper St. Pierre <jstpierre@mecheye.net>
Date: Tue Nov 27 14:29:52 2012 -0500
barriers: Replace complex intersection test with simpler math
Since barriers are axis-aligned, we can do the intersection test with
simple interpolation rather than line-segment intersection. This also
helps us out in the future when we want the barriers to extend to be
rays and lines rather than just segments.
Signed-off-by: Jasper St. Pierre <jstpierre@mecheye.net>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 6401317bdcf58b2717214ac65c8f47b0c384a7db
Author: Jasper St. Pierre <jstpierre@mecheye.net>
Date: Sun Dec 9 19:45:48 2012 -0500
barriers: Send an XI_BarrierLeave event when a barrier is destroyed
This ensures that we always complete an event sequence.
Signed-off-by: Jasper St. Pierre <jstpierre@mecheye.net>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 207e8dee00dd26ff4363edb72058b48b8a76b824
Author: Jasper St. Pierre <jstpierre@mecheye.net>
Date: Sun Dec 9 19:44:13 2012 -0500
barriers: Clean up code
Rename a variable. This is to make the diff in the next commit cleaner.
Signed-off-by: Jasper St. Pierre <jstpierre@mecheye.net>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 7fabecd8e3efe76caeb740d905a02ae4256e3246
Author: Jasper St. Pierre <jstpierre@mecheye.net>
Date: Wed Dec 5 19:58:05 2012 -0500
barriers: Send a BarrierLeave event when we leave the hitbox
Additionally, add flags when the pointer is released.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Jasper St. Pierre <jstpierre@mecheye.net>
commit dac9e13a6c874f3b99ba4cf9085ed0e63beb0871
Author: Jasper St. Pierre <jstpierre@mecheye.net>
Date: Mon Nov 26 20:37:56 2012 -0500
barriers: Increment event ID on hit box leave
We eventually want to send a new notify event on hitbox leave,
which signifies the dawn of a new barrier event ID, so it's
convenient if we can put the code here.
Signed-off-by: Jasper St. Pierre <jstpierre@mecheye.net>
Reviewed-by: Jasper St. Pierre <jstpierre@mecheye.net>
commit e3a734d081ebda4460e6c1eb7dcdd0f7c10ba9b4
Author: Jasper St. Pierre <jstpierre@mecheye.net>
Date: Sat Nov 24 21:42:56 2012 -0500
barriers: Add a couple pixels of elbow room for the hit detection
Pointers (and the hands that drive them) aren't very precise, and the
slightest amount of nudging to either side might be enough to reset
the event ID, making clients think they have an entirely new hit. Allow
for a slightly bigger "hit box" before these barriers get reset.
Signed-off-by: Jasper St. Pierre <jstpierre@mecheye.net>
Reviewed-by: Jasper St. Pierre <jstpierre@mecheye.net>
commit 3b2fbcfa6c75ab072926ab9659adf785b324ce28
Author: Jasper St. Pierre <jstpierre@mecheye.net>
Date: Thu Nov 8 01:17:40 2012 -0500
barriers: Add support for edge cases when releasing barriers
If we release a barrier, we want to ensure that we block all
other barriers afterwards, rather than capping the limit to
the two nearest barriers.
Signed-off-by: Jasper St. Pierre <jstpierre@mecheye.net>
Reviewed-by: Jasper St. Pierre <jstpierre@mecheye.net>
commit a1ee26e624e6a7030ecb37a608190cb8e3d1f65b
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu Dec 6 12:06:28 2012 +1000
barriers: Don't allow releasing the pointer on other client's barriers
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Jasper St. Pierre <jstpierre@mecheye.net>
commit 2884b249294e3e8fc749bbb81e2a897314fa0818
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu Dec 6 11:59:53 2012 +1000
barriers: Don't allow destroying other client's barriers
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Jasper St. Pierre <jstpierre@mecheye.net>
commit e130a46ab45839f91b29ee75bf19a597dfe3da28
Author: Jasper St. Pierre <jstpierre@mecheye.net>
Date: Thu Nov 1 16:06:40 2012 -0400
Add support for XI2.3: Pointer barrier events and releases.
This adds support for clients that would like to get a notification
every time a barrier is hit, and allows clients to temporarily release
a barrier so that pointers can go through them, without having to
destroy and recreate barriers.
Based on work by Chris Halse Rogers <chris.halse.rogers@canonical.com>
Signed-off-by: Jasper St. Pierre <jstpierre@mecheye.net>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 85a37ddcc2ff49adaec4075532b60e7d015f901c
Author: Jasper St. Pierre <jstpierre@mecheye.net>
Date: Sun Dec 9 22:48:18 2012 -0500
barriers: Reindent the constrainment hook
This is to make future diffs much cleaner. Best viewed with -w.
Signed-off-by: Jasper St. Pierre <jstpierre@mecheye.net>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 97da74c80e8b8eb03f7c1e34180cf5cd343bd608
Author: Jasper St. Pierre <jstpierre@mecheye.net>
Date: Sun Dec 9 22:19:14 2012 -0500
barriers: Switch to finding the nearest barrier client
When we add events, we eventually want to add more state to the
PointerBarrierClient, so return one of these instead of the dummy
public structure that's not very interesting.
Signed-off-by: Jasper St. Pierre <jstpierre@mecheye.net>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 7e16dd3628334a5991b6713d778a46c1ce3b8b78
Author: Jasper St. Pierre <jstpierre@mecheye.net>
Date: Sat Nov 24 19:39:47 2012 -0500
barriers: Switch to an explicit hook for barrier constrainment
Rather than riding on the ConstrainCursorHarder hook, which has
several issues, move to an explicit hook, which will help us with
some RANDR interaction issues.
Signed-off-by: Jasper St. Pierre <jstpierre@mecheye.net>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 2868a93945f043e1efd897d56543fe673e341faf
Author: Jasper St. Pierre <jstpierre@mecheye.net>
Date: Sun Dec 9 18:41:52 2012 -0500
barriers: Don't loop over the server to destroy a barrier
This is completely pointless as far as I can tell.
Signed-off-by: Jasper St. Pierre <jstpierre@mecheye.net>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 482e0cb35225dc3b0664f9429db19c61b0c98ef6
Author: Jasper St. Pierre <jstpierre@mecheye.net>
Date: Thu Nov 1 14:14:13 2012 -0400
cursor: Move pointer barrier code over to XI
In order to send events to specific windows associated with the barrier,
we need to move the code that handles barriers to somewhere where it's
easier to construct and send events. Rather than duplicating XSync with
its XSyncSelectAlarm, re-use the existing XI infrastructure.
For now, just move a bunch of code over, rename some things, and initialize
the new structures, but still consider it a separate codebase. Pointer barrier
requests are still handled by XFixes, so this is a weird intermediate state.
It's unknown whether we'll add explicit requests to pointer barriers inside
XI.
Signed-off-by: Jasper St. Pierre <jstpierre@mecheye.net>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
commit bb6f3514ca17d993c1af380e8d4480d61e5bbcae
Merge: f961c3a3b9 08da994a08
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Wed Dec 12 17:25:28 2012 +1000
Merge branch 'stack-smash-on-touchpoint' into for-keith
commit f961c3a3b9dfbe1201da317c24797ba7f979731e
Merge: 36740d02b9 39f19b3f3b
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Wed Dec 12 17:25:23 2012 +1000
Merge branch 'touch-selection-conflict-fixes' into for-keith
commit 39f19b3f3b8c9b714e70e339dfb0083ff629ab2a
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Tue Nov 20 11:48:31 2012 +1000
Xi: fix touch event selction conflicts (#57301)
There are limits on which client may select for touch events on a given
window, with restrictions being that no two clients can select on the same
device, but narrower selections are allowed, i.e. if one client has
XIAllDevices, a second client may still select for device X.
The current code had a dependency on which client selected first and which
device, resulting in inconsistencies when selecting for events. Fix that,
responding with the right errors regardless of who selected what first.
X.Org Bug 57301 <http://bugs.freedesktop.org/show_bug.cgi?id=57301>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit a7c97d737ef0d14ec97869082decd049637cfe7a
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Tue Nov 20 11:38:39 2012 +1000
dix: split xi2_mask_isset into a per-device function
For touch selection conflicts, we need to check not only if the mask is set
for the device, but if it is set for only that specific device (regardless
of XIAll*Devices)
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 08da994a08bb74afae81176c56fb525d0439274b
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Mon Nov 26 12:33:29 2012 +1000
dix: add FIXME, TouchRemovePointerGrab does nothing
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 00def5144557cfe8bf535f926212a8e084dc7cf6
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Mon Nov 26 14:55:13 2012 +1000
Xi: if a TouchEnd appears on a actively grabbing client, always accept
Once the TouchEnd appears on the device, the touch is done. If the client
still has a pointer grab, accept it to avoid clients with TouchOwnership
selections to wait indefinitely for the actual touch event.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit ece8157a59751b3ed492fb2e1eb8d5f20221e195
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Mon Nov 26 15:14:19 2012 +1000
dix: when deactivating pointer-only grabs, don't emulate TouchEnd events
A client with a pointer grab on a touch device must reject the touch when
detactivating the grab while the touch is active. However, such a rejecting
must not trigger a ButtonRelease event to be emulated and sent to the
client.
Set the grabbing listener's state to HAS_END, so we simply skip delivery to
that client.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit bc1f90a615018c05994fae3e678dd2341256cd82
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Mon Nov 26 12:23:54 2012 +1000
dix: only reject active grabs on ungrab and do it before actually ungrabbing
An active grab ungrabbing is the same as rejecting the grab, since the
client is no longer interested in those events. So reject any touch grab,
but do so before actually deactivating since we're interested in the
TouchEnd for the current grabbing client.
A passive grab otoh is _not_ like rejecting a grab, since it deactivates
automatically when the touch ends.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 146f48c2934fc85ec095496da5c8f0102bc7f5b5
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu Nov 22 13:49:34 2012 +1000
dix: don't call ProcessInputEvents() when accepting/rejecting touches
TouchListenerAcceptReject may be called during normal event processing, but
ProcessInputEvents is not reentrant and calling it here smashes the event
queue.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit ead21f9426122536adfb4787ac181008ae83cd4b
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Mon Nov 19 16:16:10 2012 +1000
Xi: fix typo "mechansims" → "mechanisms"
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 6b4aa8a359822cc70666de3b18744f05dd9b5f45
Author: Dave Airlie <airlied@redhat.com>
Date: Wed Dec 12 12:56:46 2012 +1000
Revert "xf86: Fix non-PCI configuration-less setups"
This reverts commit 76d9c62eb2be2010a19bf36285012d086cdd180b.
This breaks multi-GPU setups here, so lets drop it for now.
Signed-off-by: Dave Airlie <airlied@redhat.com>
commit 785af88ab0120036e0ce3d0139f3c560ff71e10b
Author: Dave Airlie <airlied@redhat.com>
Date: Wed Sep 26 16:16:40 2012 +1000
dri1: fix dri1 startup since 459c6da0f907ba33d733c7e62a116184ba2f14e5
This commit regresses dri1 since it moves the drmSetServerInfo from being
called at module load time to extension init time. However DRIScreenInit
relies on this being called before it gets control.
This patches moves the call into DRIScreenInit and seems to work here.
Signed-off-by: Dave Airlie <airlied@redhat.com>
commit 36740d02b9ca117f1404e077367fbbbe271a17d6
Author: Daniel Martin <consume.noise@gmail.com>
Date: Fri Dec 7 19:38:55 2012 +0100
xfixes: Fix minor number in QueryVersion
Due to a typo the major version number was passed as minor version to
version_compare().
Regression-from: ffd4874798ba54f86acac75779a15b4babeaa5f3
Signed-off-by: Daniel Martin <consume.noise@gmail.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit b34cffd27b9ef46e1dd477219cbb90e36d5609e3
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Mon Dec 3 11:39:08 2012 +1000
include: fix comment
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit ea1d76d1b68c7cbcedcaa1f967c5027e0cc1c7a2
Author: Yaakov Selkowitz <yselkowitz@users.sourceforge.net>
Date: Mon Nov 5 23:50:58 2012 -0600
Fix formatting of address operators
The formatter confused address operators preceded by casts with
bitwise-and expressions, placing spaces on either side of both.
That syntax isn't used by ordinary address operators, however,
so fix them for consistency.
Signed-off-by: Yaakov Selkowitz <yselkowitz@users.sourceforge.net>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 5daa442fe15d9a87112a2def673c99a5f2506dcf
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Tue Dec 4 15:28:14 2012 +1000
xkb: only post a XTest release if the XTest device has the button down
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit c4fee9d2ecd6fdd4c05b04c9f02b23f10f2938b8
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Tue Dec 4 15:03:37 2012 +1000
xkb: always post XTest button up when the physical button released (#28808)
Regression introduced by commit 2decff6393a44b56d80d53570718f95354fde454
xkb: ProcesssPointerEvent must work on the VCP if it gets the VCP
XTest buttons must be released when a physical button is released. This was
fixed in 14327858391ebe929b806efb53ad79e789361883, but
2decff6393a44b56d80d53570718f95354fde454 changed a condition that this code
didn't get triggered anymore.
"dev" for pointer events is now always the VCP which doesn't have a xkbi
struct. So move this condition out and always trigger the XTest released for
button events.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Tested-by: Frank Roscher <Frank-Roscher@gmx.net>
commit b51a1bd2766e7dc975ca8f1cacc3f8bd0e1a68a3
Merge: e9ea96d6a8 ce6b652929
Author: Keith Packard <keithp@keithp.com>
Date: Fri Nov 30 09:31:46 2012 -0800
Merge remote-tracking branch 'whot/for-keith'
commit e9ea96d6a88f197928c82b008953f1810de6f792
Author: Dave Airlie <airlied@gmail.com>
Date: Fri Nov 30 20:54:38 2012 +1000
randr: call RRProviderInit in the proper place.
No idea where this got lost across development cycles, but its
definitely missing.
Fixes: https://bugs.freedesktop.org/show_bug.cgi?id=57448
Signed-off-by: Dave Airlie <airlied@redhat.com>
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit ce6b6529290f7d42717aad3fd8a83aaaaf8962de
Merge: 6e18599d69 3b9f1c7017
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu Nov 29 14:49:22 2012 +1000
Merge branch 'high-resolution-touch-devices' into for-keith
commit 6e18599d691036eca6ff082c17727d9ffb926984
Author: Sybren van Elderen <sowmestno@msn.com>
Date: Tue Nov 27 19:27:10 2012 +0100
hw/dmx: add update_desktop_dimensions() call
The Xdmx server did not update the desktop dimensions when computing screen
origins.
Signed-off-by: Sybren van Elderen <sowmestno@msn.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 59d70b30e93f8be93db9e873423353f7e4419811
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri Nov 23 10:05:02 2012 +1000
dix: use pixman for fp1616 conversions
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Søren Sandmann <ssp@redhat.com>>
commit 2c4388a00ec308bc2d48ba751ff510cd5c1b2384
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Tue Jun 26 10:30:35 2012 +1000
xkb: fill in keycode and event type for slow keys enablement
eventType is set for the type that triggered a XkbControlsNotify event.
Technically, SlowKeys is triggered by a timer which doesn't have a matching
core event type. So we used to use 0 here.
Practically, the timer is triggered by a key press + hold and cancelled when
the key is released before the timeout expires. So we might as well set
KeyPress (keycode) in the ControlsNotify to give clients a chance to differ
between timer-triggered SlowKeys and client-triggered ones.
This is a chance in behaviour, though I suspect with little impact.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Acked-by: Daniel Stone <daniel@fooishbar.org>
commit 2dc6d9228456cbc274a1fcea478258e5ae4dc629
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu Nov 15 14:00:57 2012 +1000
When resetting device idle time, reset XIAll(Master)Devices too (#56649)
When the screen saver is forcibly deactivated, the idle time counter is
reset for all devices but not for the fake XIAllDevices and
XIAllMasterDevices. XScreenSaverQueryInfo uses XIAlldevices to fill the
"idle" field, thus returning the wrong value.
Regression introduced in
commit 6aef209ebc2e54f5465da505a780f7b4cc273ee0
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Mon Mar 12 13:51:02 2012 +1000
Change lastDeviceIdleTime to be per-device
X.Org Bug 56649 <http://bugs.freedesktop.org/show_bug.cgi?id=56649>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Tested-by: Giacomo Perale <ghepeu@virgilio.it>
Reviewed-by: Keith Packard <keithp@keithp.com>
commit a51b2c3913fc8556f6bd1c76805d045fc424c4bb
Author: Jasper St. Pierre <jstpierre@mecheye.net>
Date: Tue Nov 20 14:50:41 2012 -0500
cursor: Revise edge cases for the pointer moving towards barriers
Since barriers block the invisible line between pixels, that means
that we need to explicitly check the boundaries, or else we'll have
a potential off-by-one error. This fixes issues when trying to move
down or right across a barrier and having the pointer visibly bounce.
Signed-off-by: Jasper St. Pierre <jstpierre@mecheye.net>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 0b198248ecfbcb7e7c61688145be4005366da23d
Author: Thierry Reding <thierry.reding@avionic-design.de>
Date: Thu Nov 8 14:28:10 2012 +0100
Remove call to miInitializeBackingStore()
Recent versions of the X server no longer provide this function, which
has been obsolete for over 2 years now.
Signed-off-by: Thierry Reding <thierry.reding@avionic-design.de>
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
commit 739d6c067a9167226ce248aa82997bfc2cca7259
Author: Thierry Reding <thierry.reding@avionic-design.de>
Date: Thu Nov 8 14:28:09 2012 +0100
build: Put m4 macros in m4 subdirectory
This silences a warning from libtoolize when running the autogen.sh
script.
Signed-off-by: Thierry Reding <thierry.reding@avionic-design.de>
Signed-off-by: Dave Airlie <airlied@redhat.com>
commit 1712a45422a63f11b2146541279616fcfda09ec6
Merge: e54f71a2c7 338bec3005
Author: Keith Packard <keithp@keithp.com>
Date: Wed Nov 28 07:54:13 2012 -0800
Merge remote-tracking branch 'jturney/mingw-patches'
commit 338bec30054bb5d41cb6fdb5d37439f3c8124cad
Author: Yaakov Selkowitz <yselkowitz@users.sourceforge.net>
Date: Fri Nov 9 12:19:31 2012 -0600
hw/xwin: Fix for MinGW-w64 DirectDraw headers
mingw-w64 headers handle NONAMELESSUNION earlier than mingw.org's, so it must be
defined before including any headers. It also provides a ddraw.h, so use it.
Signed-off-by: Yaakov Selkowitz <yselkowitz@users.sourceforge.net>
Reviewed-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Reviewed-by: Keith Packard <keithp@keithp.com>
commit fb170498abc746a850864b59db2ddcba7ee29215
Author: Jon TURNEY <jon.turney@dronecode.org.uk>
Date: Tue Nov 13 13:22:44 2012 +0000
dix/dispatch.c, os/utils.c: Disable smart scheduler on WIN32
setitimer() and SIGALRM aren't available on WIN32, so smart scheduler
code cannot be built. Provide only stubs for smart scheduler timer
code, and disable smart scheduler by default.
Signed-off-by: Ryan Pavlik <rpavlik@iastate.edu>
Reviewed-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Tested-by: Yaakov Selkowitz <yselkowitz@users.sourceforge.net>
Reviewed-by: Keith Packard <keithp@keithp.com>
commit b20d2998cd9a1320ef0e45ab6b741c7e25f646e0
Author: Ryan Pavlik <rpavlik@iastate.edu>
Date: Thu Nov 3 19:25:57 2011 -0500
os/osinit.c: no getpgrp() and setpgrp() on WIN32
Signed-off-by: Ryan Pavlik <rpavlik@iastate.edu>
Reviewed-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Tested-by: Yaakov Selkowitz <yselkowitz@users.sourceforge.net>
Reviewed-by: Keith Packard <keithp@keithp.com>
commit 2c712d094a49de0b96e2e9f5bcc1043b54ad0f61
Author: Yaakov Selkowitz <yselkowitz@users.sourceforge.net>
Date: Sun Oct 14 23:05:30 2012 -0500
hw/xwin: use raise() instead of kill()
MinGW doesn't have kill(), so use raise() instead
Signed-off-by: Yaakov Selkowitz <yselkowitz@users.sourceforge.net>
Reviewed-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Reviewed-by: Keith Packard <keithp@keithp.com>
commit 98d5acc1213b2ec71c2a7bd3a3b77a1b5536e963
Author: Jon TURNEY <jon.turney@dronecode.org.uk>
Date: Fri Aug 17 13:43:29 2012 +0100
os/utils.c: Fix compilation of OsBlockSIGIO when SIGIO isn't defined
Fix compilation of OsBlockSIGIO with -Werror=return-type when SIGIO isn't
defined.
/jhbuild/checkout/xorg/xserver/os/utils.c: In function 'OsBlockSIGIO':
/jhbuild/checkout/xorg/xserver/os/utils.c:1248:1: error: control reaches end of non-void function [-Wreturn-type]
v2: Shuffle around to avoid writing unreachable code
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Tested-by: Yaakov Selkowitz <yselkowitz@users.sourceforge.net>
Reviewed-by: Keith Packard <keithp@keithp.com>
commit 8e2bac0a69173b51e17a39d70e1d154b47fd0139
Author: Ryan Pavlik <rpavlik@iastate.edu>
Date: Fri Apr 20 13:46:21 2012 +0100
os/osinit.c, os/utils.c: Exclude sigaction code when building for MinGW
MinGW doesn't have sigaction, so this patch is needed for building.
No attempt is made to actually install the fatal error signal handler, as MinGW
will simply terminate the process rather than deliver a fatal signal.
Also avoid using strsignal
Signed-off-by: Ryan Pavlik <rpavlik@iastate.edu>
Reviewed-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Tested-by: Yaakov Selkowitz <yselkowitz@users.sourceforge.net>
Reviewed-by: Keith Packard <keithp@keithp.com>
commit e54f71a2c7a1677a5c5032d1e7dc099d5204144b
Author: Chris Wilson <chris@chris-wilson.co.uk>
Date: Sat Nov 10 10:26:08 2012 +0000
xf86: select a fake output for headless servers
Following commit 37d956e3ac9513b74078882dff489f9b0a7a5a28
Author: Keith Packard <keithp@keithp.com>
Date: Mon Sep 10 11:14:20 2012 +1000
xf86: fix compat output selection for no output GPUs
headless servers can no longer startup as we no longer select a compat
output for the fake framebuffer.
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=56343
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Reviewed-by: Dave Airlie <airlied@redhat.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 76d9c62eb2be2010a19bf36285012d086cdd180b
Author: Thierry Reding <thierry.reding@avionic-design.de>
Date: Wed Oct 17 12:06:47 2012 +0200
xf86: Fix non-PCI configuration-less setups
For non-PCI video devices, such as those found on many ARM embedded
systems, the X server currently requires the BusID option to specify the
full path to the DRM device's sysfs node in order to properly match it
against the probed platform devices.
In order to allow X to start up properly if either the BusID option was
omitted or no configuration is present at all, the first video device is
used by default.
Signed-off-by: Thierry Reding <thierry.reding@avionic-design.de>
Reviewed-by: Dave Airlie <airlied@redhat.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit d50a94568e06a06df682a0028579d37a7b209d15
Merge: 87b60efb85 cf05db8dde
Author: Keith Packard <keithp@keithp.com>
Date: Tue Nov 27 15:14:26 2012 -0800
Merge remote-tracking branch 'daniels/master'
commit 87b60efb859d86fd9e96306112bc5453a549fa69
Author: Colin Harrison <colin.harrison@virgin.net>
Date: Sun Sep 2 22:39:32 2012 +0100
hw/xwin: Don't spam MotionNotify events when the mouse hasn't moved
Don't spam MotionNotify events when the mouse hasn't moved, when polling the
mouse position outside any X window
(Test with 'xev -root' after mouse polling has started.)
Signed-off-by: Colin Harrison <colin.harrison@virgin.net>
Reviewed-by: Jon TURNEY <jon.turney@dronecode.org.uk>
commit 886f4c389266bf759414f15a5e25e50b5935dc9d
Author: Jon TURNEY <jon.turney@dronecode.org.uk>
Date: Mon Jun 25 15:58:21 2012 +0100
hw/xwin: Don't log all fbConfigs and GL/WGL extensions
Don't log all fbConfigs and GL/WGL extensions, unless verbose logging
is requested
Log the number of pixelFormats which gave rise to the fbConfigs
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
commit 9b10f20f472e6b0d6114fb61c88906e349e47f2b
Author: Jon TURNEY <jon.turney@dronecode.org.uk>
Date: Fri Feb 10 13:36:46 2012 +0000
hw/xwin: Use pre-computed extent of damage for creating GDI region
When -clipupdates option is specified, use the pre-computed extent of damage,
rather than computing a GDI region which combines all the individual boxes in
the damage.
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
commit 3ab95a2a5c848e8ce4c39be243fd5e2ac6bb1c1a
Author: Jon TURNEY <jon.turney@dronecode.org.uk>
Date: Fri Feb 24 15:32:26 2012 +0000
hw/xwin: Ensure we own the clipboard before checking the format of it's contents
Ensure we own the clipboard before checking the format of it's contents, this
prevents the contents from changing underneath us.
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
commit a4f357c620ae9e2270316197a61fb8e1d5183a51
Author: Colin Harrison <colin.harrison@virgin.net>
Date: Mon Apr 9 15:48:08 2012 +0100
hw/xwin: Disable minimize button on window with skip-taskbar state
If a window has had its taskbar button removed, disable its minimize
button to prevent it becoming lost
Signed-off-by: Colin Harrison <colin.harrison@virgin.net>
Reviewed-by: Jon TURNEY <jon.turney@dronecode.org.uk>
commit a2983452ee1e2051ab54cded7a3a7735be020db6
Author: Jon TURNEY <jon.turney@dronecode.org.uk>
Date: Wed Jul 8 17:48:03 2009 +0100
hw/xwin: Process _NET_WM_STATE_SKIP_TASKBAR hint in multiwindow mode.
Set WS_EX_TOOLWINDOW style to hide window from Alt-Tab switcher
Use ITaskBarList interface to ensure that the taskbar notices if the window has
changed it's style in a way which affects if the taskbar shows it or not
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
commit de759cc38ccc8a7811923eb9620f01301aedc10e
Author: Jon TURNEY <jon.turney@dronecode.org.uk>
Date: Sun Feb 5 17:57:04 2012 +0000
hw/xwin: Add a simple interface to the ITaskbarList COM interface
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
commit 19d875187a113ca7772a770767ea2ceb2ade5a43
Author: Jon TURNEY <jon.turney@dronecode.org.uk>
Date: Wed Jan 4 17:40:14 2012 +0000
hw/xwin: Enable RANDR resize by default
Also fix erroneous use of '--resize' not '-resize', and document '-noresize' in man page
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
commit 444580673221bf3f89dfa3cbc518b5ed4ecabc23
Author: Yaakov Selkowitz <yselkowitz@users.sourceforge.net>
Date: Sat Dec 31 22:11:18 2011 -0600
hw/xwin: Enable AIGLX by default
Signed-off-by: Yaakov Selkowitz <yselkowitz@users.sourceforge.net>
Reviewed-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
commit 11bb32e561b3f1c657a99b3902f9beea786babbb
Author: Oliver Schmidt <oschmidt-mailinglists@gmx.de>
Date: Sun Jan 8 20:30:02 2012 +0000
hw/xwin: Restore non-latching modifier key state when an X window gains focus
In multiwindow mode, the state of the modifier keys was lost when a window is
created (or raised) and focus moved to that window.
For example: In window A Ctrl + some key opens a window B, then in window B Ctrl
+ some other key triggers the next action. However after the opening of window B
the Ctrl key has to be released and pressed again. If the user keeps the Ctrl
key held down when the window B is opened, the next key press X will be
interpreted as X and not as Ctrl+X.
Extended the function winRestoreModeKeyStates in winkeybd.c to consider not only
the latching modifier keys but also the modifiers Ctrl, Shift, Alt/AltGr by
using the Windows function GetAsyncKeyState.
A combined Ctrl+AltGr modifier state cannot be restored correctly, as Windows
always fakes a Ctrl-L when AltGr is pressed.
Signed-off-by: Oliver Schmidt <oschmidt-mailinglists@gmx.de>
Reviewed-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
commit 47291d0b7d7bfee74156f83badae15a0818c68ad
Author: Jon TURNEY <jon.turney@dronecode.org.uk>
Date: Mon Nov 5 14:54:51 2012 +0000
hw/xwin: Give our logical xor operator a more logical name
Also, rather than a comment about why we need a logical operator, let's have a
comment about what we are doing to the keyboard state...
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
commit 8aa27ae82109e4fab0ff3ed86ad1d152438a2585
Author: Tobias Häußler <tobias.haeussler@gmx.de>
Date: Mon Jul 18 14:48:23 2011 +0100
hw/xwin: Add correct taskbar grouping of X windows on Windows 7
I created a small patch for XWin that adds correct grouping of taskbar icons
when 'Always combine, hide labels' is set in the taskbar properties. It uses the
new taskbar APIs introduced in Windows 7 to set an application id for each
window. The id is based on the X11 class hints.
v2: Add file to _SOURCES to fix distcheck
v3 : Fix compilation with mingw-w64 w32api headers
Include propkey.h, propsys.h rather than defining necessary stuff ourselves
v4: Fix up names taskbar->propertystore, AppID->AppUserModelID, etc.
Link directly with ole32 for PropVariantClear(), prototyping it if neccessary.
v5: Put winSetAppUserModelID()-related code in a separate file.
Drop a superfluous assign to hr of ignored HRESULT of SetValue()
Signed-off-by: Tobias Häußler <tobias.haeussler@gmx.de>
Reviewed-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
commit f3aef7f9561d2723da0d1438a8b276b77a1e672e
Author: Jon TURNEY <jon.turney@dronecode.org.uk>
Date: Sun Sep 2 16:04:25 2012 +0100
hw/xwin: Fix function name in log message
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
commit 127a7068b75258d396776cc101aba0bef10a5cef
Author: Jon TURNEY <jon.turney@dronecode.org.uk>
Date: Thu Apr 14 23:10:23 2011 +0100
hw/xwin: Allow XScreenSaverSuspend() to effect Windows screen saver or monitor power off
Reset the idle timer in the block handler if screenSaverSuspended is set.
This isn't quite a complete solution. We should also set the block timeout to
something less than the idle timer timeout to ensure we will reset the idle
timer before it times out if we are blocking.
The idle timer timeout is presumably the first one to expire of the screen saver
activation or monitor low power or power down timeout, depending on
configuration.
Unfortunately this is probably not straightforward to do. Whilst
SystemParametersInfo(SPI_GETSCREENSAVETIMEOUT) is portable, apparently
SPI_GETLOWPOWERTIMEOUT and SPI_GETPOWEROFFTIMEOUT are not supported by Windows
versions 6.0 or later, and the interface for discovering equivalent value is
complex.
This doesn't matter in the case where a media player or similar application is
the one making the XScreenSaverSuspend() requests, as it will be continuously
drawing, causing the X server to become unblocked often.
In the case where slide show presentation application or similar is the one
making the XScreenSaverSuspend() request, this might be a problem.
Since "Powerpoint is Evil" [1], I think we'll leave it like this till someone
complains :-)
[1] http://www.edwardtufte.com/tufte/books_pp
v2: conditionalize on SCREENSAVER
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
commit 190f165317c4a58adf38e3e32acfe7cf04850e91
Author: Jon TURNEY <jon.turney@dronecode.org.uk>
Date: Mon Nov 5 13:02:46 2012 +0000
hw/xwin: Avoid logging an extra blank line if BUILDERSTRING is empty
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
commit ef9dbea24f5ce7e1e400463ab2a333076d98a28e
Author: Jon TURNEY <jon.turney@dronecode.org.uk>
Date: Wed Aug 31 20:57:05 2011 +0100
hw/xwin: Report which drawing engines are being enabled when checking for support
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
commit 5824166256c8e96c91e225f4ccb2b094b8fb045b
Author: Jon TURNEY <jon.turney@dronecode.org.uk>
Date: Fri Mar 12 14:38:51 2010 +0000
hw/xwin: Show any fatal error message
Report the fatal error message in the dialog we pop up, rather than just
referring the user to the logfile.
v2: Do this a better way since the "Pass the FatalError message to
OsVendorFatalError" patch has landed, and OsVendorFatalError() now gets passed
the fatal error message
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
commit cf05db8ddec948d907915e1c9569d743e8771def
Author: Sjoerd Simons <sjoerd.simons@collabora.co.uk>
Date: Tue Oct 30 17:02:58 2012 +0100
Ephyr: Find the right host screen when embedded
When Xephyr is embedded into another application (e.g. in xoo), the
input events may come from the parent Window instead of our own. So make
sure we find the host screen in that case as well instead of crashing.
Signed-off-by: Sjoerd Simons <sjoerd.simons@collabora.co.uk>
Reviewed-by: Daniel Stone <daniel@fooishbar.org>
commit ac1a60e7b6f06fd075cc5bf55d6bc67206a01d29
Author: Raphael Kubo da Costa <raphael.kubo.da.costa@intel.com>
Date: Fri Nov 16 19:51:58 2012 +0200
vfb: Initialize the GLX extension again.
This should fix a regression in the 1.13.0 release: commit
5f5bbbe543f65c48ecbb5cce80116a86ca3fbe86 removed a code path used by Xvfb
and made it use the default one when initializing extensions. However, this
meant the GLX extension was not initialized anymore since it is not part of
the `staticExtensions' array.
Since it is not possible to just add it to that array after commit
aad428b8e21c77397c623b78706eb64b1fea77c9, adopt an approach similar to
xwin's and xquartz's and initialize the extension from vfb's `InitOutput'.
Signed-off-by: Raphael Kubo da Costa <raphael.kubo.da.costa@intel.com>
Reviewed-by: Daniel Stone <daniel@fooishbar.org>
commit 353b14ea77324b3f7b3ea29d6f03618fd9916d5f
Author: Daniel Stone <daniel@fooishbar.org>
Date: Mon Nov 19 15:00:22 2012 +1100
DMX: Add DMX and GLX extensions
Unfortunately this also got lost in the extmod fallout, leaving the DMX
server not exposing the DMX or GLX extensions.
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 3556d43010f0a37bf30aa2e0ceee9a8bbcad311d
Author: Daniel Stone <daniel@fooishbar.org>
Date: Mon Nov 19 15:29:34 2012 +1100
Constify extensions in LoadExtension users
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
commit db83830eef38a86a471378121213162da180537d
Author: Daniel Stone <daniel@fooishbar.org>
Date: Mon Nov 19 15:28:07 2012 +1100
Constify argument to LoadExtension
Since we never modify it.
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 3b9f1c701787965246638c1a6fd99fb2b6078114
Author: Yuly Novikov <ynovikov@chromium.org>
Date: Mon Nov 19 21:04:57 2012 -0500
dix: Save touchpoint last coordinates before transform. #49347
DDXTouchPointInfoRec.valuators used to store axis values after transform.
This resulted in Coordinate Transformation Matrix
being applied multiple times to the last coordinates,
in the case when only pressure changes in the last touch event.
Changed DDXTouchPointInfoRec.valuators to store values before transform.
Fixes: https://bugs.freedesktop.org/show_bug.cgi?id=49347
Signed-off-by: Yuly Novikov <ynovikov@chromium.org>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit d0fd592fc7be1706084923f43fa057e50122562c
Author: Thomas Jaeger <ThJaeger@gmail.com>
Date: Sat Oct 13 23:18:50 2012 -0400
Simplify GetTouchEvents
With only one callee left, we are free to assume that
!(flags & TOUCH_CLIENT_ID)
Signed-off-by: Thomas Jaeger <ThJaeger@gmail.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit fe59774c55e5d423633405e0869c22f4ce382548
Author: Thomas Jaeger <ThJaeger@gmail.com>
Date: Sat Oct 13 23:08:27 2012 -0400
Don't use GetTouchEvents in EmitTouchEnd
As before GetTouchEvents causes unwanted side effects. Add a new
function GetDixTouchEnd, which generates a touch event from the touch
point. We fill in the event's screen coordinates from the MD's current
sprite position.
Signed-off-by: Thomas Jaeger <ThJaeger@gmail.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit cc79107a5b60d2926e16ddbee04149e8d5acc969
Author: Thomas Jaeger <ThJaeger@gmail.com>
Date: Sat Oct 13 22:51:24 2012 -0400
Don't use GetTouchEvents when replaying events
GetTouchEvents has plenty of side effects such as moving the pointer or
updating the master device, which we don't want to happen when
replaying. The only reason for calling it was to generate a DCCE event,
but GetTouchEvents doesn't even do that right (we might need a DCCE
event even when replaying a master event, or clients could interpret
valuator data incorrectly).
This discussion is moot at the moment anyway, since DeliverTouchEvents
doesn't appear to deliver DCCE events.
Signed-off-by: Thomas Jaeger <ThJaeger@gmail.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
[Added call to processInputProc instead of direct call to DeliverTouchEvents]
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 90b177e5cbb9047453af426d2abfe9c0514fe866
Author: Thomas Jaeger <ThJaeger@gmail.com>
Date: Sat Oct 13 22:43:26 2012 -0400
Update the MD's position when a touch event is received
Signed-off-by: Thomas Jaeger <ThJaeger@gmail.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 6a6c3afe71ac82a93d9fd0034dd5bbdcf0eae1ea
Merge: 14c9e245ba 6f145084d5
Author: Keith Packard <keithp@keithp.com>
Date: Sun Nov 18 21:50:20 2012 -0800
Merge remote-tracking branch 'whot/for-keith'
commit 6f145084d5b9ca4a023dfc538a69bbf30edeac4a
Author: Adam Jackson <ajax@redhat.com>
Date: Fri Nov 16 13:46:32 2012 -0500
linux: Prefer ioctl(KDSKBMUTE, 1) over ioctl(KDSKBMODE, K_OFF)
K_OFF is a slightly broken interface, since if some other process
(cough, systemd) sets the console state to K_UNICODE then it undoes
K_OFF, and now Alt-F2 will switch terminals instead of summoning the
Gnome "run command" dialog.
KDSKBMUTE separates the "don't enqueue events" logic from the keymap, so
doesn't have this problem. Try it first, then continue falling back to
older methods.
Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=859485
Tested-by: Josh Boyer <jwboyer@redhat.com>
Signed-off-by: Adam Jackson <ajax@redhat.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 0ff1c77b17062a3a3ff520709ef719316bc1d8bb
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri Nov 16 14:21:47 2012 +1000
xfixes: let PointerBarrierClient->device_ids point to allocated memory
"Fixed" up Jasper's original patch [1] to use pointers instead of
zero-length arrays but didn't actually set the pointer to anywhere.
[1] 9a536820f6174befb22431bab375ef1af0a1ec29
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-By: Jasper St. Pierre <jstpierre@mecheye.net>
commit aa9a9ad08b8a6e7e95de7c2bf45d93dd50f9ca87
Author: Daniel Martin <consume.noise@gmail.com>
Date: Wed Nov 7 11:31:01 2012 +0100
Xi: Fix modifier swapping in XIPassiveGrabDevice
XIPassiveGrabDevice uses a list of uint32_t as modifier sets.
The ModifierInfo struct represents the current modifier states and is
therefor used in XIQueryPointer and various events.
Signed-off-by: Daniel Martin <consume.noise@gmail.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit aa9da5eae109154edf740a5c1eee4bf98e8fbd4f
Author: Thomas Jaeger <ThJaeger@gmail.com>
Date: Sat Oct 13 22:39:27 2012 -0400
remove init_event
The function is identical to init_device_event from inpututils.c with
the first two arguments swapped.
Signed-off-by: Thomas Jaeger <ThJaeger@gmail.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 710065da37b68a9ec7a0c9dc995247f39e3d01e9
Author: Daniel Stone <daniel@fooishbar.org>
Date: Mon Nov 5 15:58:25 2012 +1100
XKB: Remove component listing support
No-one uses this - not xkbcomp, not GNOME, not KDE. The preferred way
to deal with component listing (which gives you RMLVO rather than
KcCGST) is to use the XML files on the client side.
Indeed, a couple of hours after making this commit, it emerged that all
*.dir files built with xkbcomp 1.1.1 (released two years ago) and later
have been catastrophically broken and nearly empty. So I think that's
reasonable proof that no-one uses them.
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit fd214aabf77c44ba0ca3fd438f0c3c8eb22c7211
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Tue Nov 6 10:27:25 2012 +1000
input: drop FP1616 macro
The double_to_f1616() functions do the same thing, and they're tested.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Keith Packard <keithp@keithp.com>
commit 14c9e245bae2447f0e57a3ea4daa8d2085fa8b8f
Author: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
Date: Sat Nov 17 11:52:10 2012 -0500
XQuartz: Opt-in to NSSupportsAutomaticGraphicsSwitching
http://xquartz.macosforge.org/trac/ticket/668
Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
commit 011f8458805e443ac9130865d2840a929a00cabf
Merge: 54ba26cb1f b4e44b285e
Author: Keith Packard <keithp@keithp.com>
Date: Mon Nov 5 17:16:07 2012 -0800
Merge remote-tracking branch 'whot/for-keith'
commit b4e44b285ed0eee1d06514215a4b01d54f40094b
Author: Carlos Garnacho <carlosg@gnome.org>
Date: Wed Oct 31 19:29:45 2012 +0100
Xi: Set modifier mask on touch events
Button mask should be out-of-band with the emulated
pointer events as touch devices don't truly have
"buttons". Even though, it's handy to have the modifier
mask from the paired keyboard on touch events.
Signed-off-by: Carlos Garnacho <carlosg@gnome.org>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 863f32c930d71073ee5f78452b78bd459d024867
Author: Carlos Garnacho <carlosg@gnome.org>
Date: Wed Oct 31 19:32:57 2012 +0100
Xi: Update the device after delivering the emulated pointer event(#56558)
Ensure emulated pointer events contain the state that applies before the
event was processed, so the device state must be updated after delivering
such emulated events.
Co-authored-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Carlos Garnacho <carlosg@gnome.org>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 9a536820f6174befb22431bab375ef1af0a1ec29
Author: Jasper St. Pierre <jstpierre@mecheye.net>
Date: Sat Nov 3 20:23:46 2012 -0400
cursor: Fix up implementation for per-device barriers
Support multiple mast devices being specified as a parameter to the
barrier. This should implement all parts of the XFixes specification,
minus the existing non-specification detail where specifying no devices
is the same as specifying XIAllDevices.
Signed-off-by: Jasper St. Pierre <jstpierre@mecheye.net>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 944213bbc7099f1e0238f39973653d459efdc2c9
Author: Jasper St. Pierre <jstpierre@mecheye.net>
Date: Sat Nov 3 20:23:45 2012 -0400
cursor: Clean up barrier finding code a bit
The current code manually unrolls the loop, by finding a barrier,
clamping it, and then repeaing the code. Since we want to modify
both passes of the loop to support device-specific barriers, make
it into an actual loop.
Signed-off-by: Jasper St. Pierre <jstpierre@mecheye.net>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 1536bc2d213713af45541a15b5e49c552d8d0592
Author: Jasper St. Pierre <jstpierre@mecheye.net>
Date: Sat Nov 3 20:23:44 2012 -0400
cursor: Clean up pointer barrier creation code a tiny bit
This will make it much simpler when we add more error paths to the code
that constructs pointer barrier clients.
Signed-off-by: Jasper St. Pierre <jstpierre@mecheye.net>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 04c885de715a7c989e48fc8cf2e61db2b401de2d
Author: Jasper St. Pierre <jstpierre@mecheye.net>
Date: Sat Nov 3 20:23:43 2012 -0400
cursor: CreatePointerBarrier has a variable request length
Support this, and swap the devices in the SProc as well. Don't
actually do anything with the devices just yet -- specifying any
should still emit a BadImplementation.
Based on a patch by Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Jasper St. Pierre <jstpierre@mecheye.net>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit d74b63f95fc622afe83c53580f1b55346d55fa7a
Author: Jasper St. Pierre <jstpierre@mecheye.net>
Date: Sat Nov 3 20:23:42 2012 -0400
cursor: Fix a minor unused variable warning
Signed-off-by: Jasper St. Pierre <jstpierre@mecheye.net>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit aad65415bff12c6860c19beac42e4165e598a40f
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu Oct 11 13:02:27 2012 +1000
dix: don't allow disabling XTest devices
Disabling a XTest device followed by an XTest API call crashes the server.
This could be fixed elsewhere but disabled devices must not send events
anyway. The use-case for disabled XTest devices is somewhat limited, so
simply disallow disabling the devices.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Keith Packard <keithp@keithp.com>
commit 5b7384a3154a95a805b040e1910e276b52aada96
Author: Alexey Ten (Lynn) <alexeyten@gmail.com>
Date: Tue Oct 23 12:32:31 2012 +0400
Apply partial matches for option (#25873)
Rules which match star (*) and option, like one below, should be applied
layout[2] option = symbols
* misc:typo = +typo(base)
This is port of patch from #19563 (https://bugs.freedesktop.org/19563)
because here we have own copy of maprules.c
X.Org Bug 25873 <http://bugs.freedesktop.org/show_bug.cgi?id=25873>
Signed-off-by: Alexey Ten (Lynn) <alexeyten@gmail.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 54ba26cb1f9c59559cc3c449abeb31b2ce23bdba
Author: Yaakov Selkowitz <yselkowitz@users.sourceforge.net>
Date: Mon Oct 29 22:37:37 2012 -0500
os: Add libnettle as a choice of SHA1 implementation
libnettle is smaller than libgcrypt, currently being released more
frequently, and has replaced the latter in gnutls-3.x (which is used
by TigerVNC, so they can avoid pulling in two crypto libraries
simultaneously).
Signed-off-by: Yaakov Selkowitz <yselkowitz@users.sourceforge.net>
Reviewed-by: Julien Cristau <jcristau@debian.org>
commit 2ff56033de2b493a11d2bdf411b7057b1b3a22d7
Author: Yaakov Selkowitz <yselkowitz@users.sourceforge.net>
Date: Tue Oct 16 02:11:59 2012 -0500
Xi: fix fprint format warning
exevents.c: In function 'ProcessTouchEvent':
exevents.c:1601:20: warning: too many arguments for format
Signed-off-by: Yaakov Selkowitz <yselkowitz@users.sourceforge.net>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
commit d631dbe9b6a1faa4cd18ab7a4a0276db02b84b77
Author: Yaakov Selkowitz <yselkowitz@users.sourceforge.net>
Date: Sat Oct 27 21:50:01 2012 -0500
Xext: fix shadow warnings
Signed-off-by: Yaakov Selkowitz <yselkowitz@users.sourceforge.net>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 20cf7918ed954a932a4cc404b3d0c4ca87a6ae16
Author: Yaakov Selkowitz <yselkowitz@users.sourceforge.net>
Date: Tue Oct 16 21:08:52 2012 -0500
Xext: fix redundant redeclaration warnings
panoramiX.c:595:13: warning: redundant redeclaration of 'CreateConnectionBlock'
../include/dix.h:167:23: note: previous declaration of 'CreateConnectionBlock' was here
xres.c:193:13: warning: redundant redeclaration of 'ResExtensionInit'
../include/extinit.h:109:13: note: previous declaration of 'ResExtensionInit'
xtest.c:60:12: warning: redundant redeclaration of 'DeviceValuator'
../Xi/exglobals.h:61:12: note: previous declaration of 'DeviceValuator' was here
Signed-off-by: Yaakov Selkowitz <yselkowitz@users.sourceforge.net>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 89447e1b50d2fb0e046102664045d1f9d4efc542
Author: Yaakov Selkowitz <yselkowitz@users.sourceforge.net>
Date: Mon Oct 15 01:33:05 2012 -0500
Xext: fix unused variable warnings in xf86bigfont.c
These were rendered unused by commit 2c7c520cfe0df30f4bc3adba59d9c62582823bf8.
Signed-off-by: Yaakov Selkowitz <yselkowitz@users.sourceforge.net>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 344eea237fc07dedfd733d14f95ed0ad26bb5f81
Author: Yaakov Selkowitz <yselkowitz@users.sourceforge.net>
Date: Tue Oct 16 02:04:34 2012 -0500
xkb: fix shadow warnings
Signed-off-by: Yaakov Selkowitz <yselkowitz@users.sourceforge.net>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 7f1d74e8a906210eafc637df81ded62c3adff748
Author: Yaakov Selkowitz <yselkowitz@users.sourceforge.net>
Date: Tue Oct 16 02:06:54 2012 -0500
render: fix shadow warnings
Signed-off-by: Yaakov Selkowitz <yselkowitz@users.sourceforge.net>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 8e86123998d26d26f0f60dcbb9836c38e5a4c3a5
Author: Yaakov Selkowitz <yselkowitz@users.sourceforge.net>
Date: Tue Oct 16 01:19:12 2012 -0500
randr: export more provider property symbols
These were added as part of commit 66d92afeaeed9f4a19267d95a1f81b9bf27162a5
but never declared or exported. Fixes warnings:
rrproviderproperty.c:255:1: warning: no previous prototype for 'RRPostProviderPendingProperties'
rrproviderproperty.c:327:1: warning: no previous prototype for 'RRConfigureProviderProperty'
Signed-off-by: Yaakov Selkowitz <yselkowitz@users.sourceforge.net>
Reviewed-by: Dave Airlie <airlied@redhat.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
commit f02e27e4fcc34413b2051e5a01edc92172fa8612
Author: Yaakov Selkowitz <yselkowitz@users.sourceforge.net>
Date: Tue Oct 16 02:16:17 2012 -0500
mi: fix shadow warnings
mibitblt.c: In function 'miGetImage':
mibitblt.c:617:20: warning: declaration of 'pt' shadows a previous local
mibitblt.c:609:17: warning: shadowed declaration is here
mispans.c: In function 'miFillUniqueSpanGroup':
mispans.c:456:33: warning: declaration of 'i' shadows a previous local
mispans.c:382:9: warning: shadowed declaration is here
mispans.c:488:17: warning: declaration of 'i' shadows a previous local
mispans.c:382:9: warning: shadowed declaration is here
Signed-off-by: Yaakov Selkowitz <yselkowitz@users.sourceforge.net>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 1fe30c00679bd36a6355b48b94b87564d528ff28
Author: Yaakov Selkowitz <yselkowitz@users.sourceforge.net>
Date: Tue Oct 16 02:21:04 2012 -0500
fb: fix shadow warnings
fbblt.c: In function 'fbBlt':
fbblt.c:76:16: warning: declaration of 'src' shadows a previous local
fbblt.c:52:13: warning: shadowed declaration is here
fbblt.c:77:16: warning: declaration of 'dst' shadows a previous local
fbblt.c:52:19: warning: shadowed declaration is here
fbbltone.c: In function 'fbBltPlane':
fbbltone.c:742:13: warning: declaration of 'w' shadows a previous local
fbbltone.c:725:9: warning: shadowed declaration is here
Signed-off-by: Yaakov Selkowitz <yselkowitz@users.sourceforge.net>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
commit e8d45f301845f70b76407577b92363934ca4f19e
Author: Yaakov Selkowitz <yselkowitz@users.sourceforge.net>
Date: Tue Oct 16 20:54:56 2012 -0500
dix: fix shadow warnings
dispatch.c: In function 'ProcCopyArea':
dispatch.c:1608:5: warning: declaration of 'rc' shadows a previous local
dispatch.c:1604:9: warning: shadowed declaration is here
dispatch.c: In function 'ProcCopyPlane':
dispatch.c:1647:5: warning: declaration of 'rc' shadows a previous local
dispatch.c:1643:9: warning: shadowed declaration is here
events.c: In function 'GetClientsForDelivery':
events.c:2030:68: warning: declaration of 'clients' shadows a global declaration
../include/dix.h:124:28: warning: shadowed declaration is here
events.c: In function 'DeliverEventToWindowMask':
events.c:2113:19: warning: declaration of 'clients' shadows a global declaration
../include/dix.h:124:28: warning: shadowed declaration is here
events.c: In function 'EventSuppressForWindow':
events.c:4420:12: warning: declaration of 'free' shadows a global declaration
Signed-off-by: Yaakov Selkowitz <yselkowitz@users.sourceforge.net>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 1aa783754e21a263b0973516850656b13fd18f0d
Author: Yaakov Selkowitz <yselkowitz@users.sourceforge.net>
Date: Tue Oct 16 14:06:30 2012 -0500
dix: fix redundant redeclaration warnings in dixfont
These functions are already declared in <X11/fonts/fontproto.h>.
Redeclaring them just for _X_EXPORT causes tons of warnings throughout
xserver, but they need to be declared somewhere to be picked up by
sdksyms.sh. Doing so in a private header limits the warnings to
sdksyms.c; fixing those as well would require changes to fontsproto.
Signed-off-by: Yaakov Selkowitz <yselkowitz@users.sourceforge.net>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 27c5966de35d4726dd9795b4828d4236851f6a88
Author: Yaakov Selkowitz <yselkowitz@users.sourceforge.net>
Date: Mon Oct 15 01:25:17 2012 -0500
xfree86: os-support: fix old-style function definition warnings
Signed-off-by: Yaakov Selkowitz <yselkowitz@users.sourceforge.net>
Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 64b961bb21369aaea694d883f361a36bc23b19b9
Author: Yaakov Selkowitz <yselkowitz@users.sourceforge.net>
Date: Wed Oct 24 23:57:11 2012 -0500
macros: clarify documentation
Signed-off-by: Yaakov Selkowitz <yselkowitz@users.sourceforge.net>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 04f980ead5e9af066143a921e0a0e98f26f28ee5
Merge: a194630f7f a4941ce496
Author: Keith Packard <keithp@keithp.com>
Date: Mon Nov 5 08:45:21 2012 -0800
Merge remote-tracking branch 'jturney/mingw-w64-w32api'
commit a4941ce4961f254ac31e2cef6dd0863866246bab
Author: Jon TURNEY <jon.turney@dronecode.org.uk>
Date: Tue Aug 21 15:31:16 2012 +0100
hw/xwin: Wrap 'Status' when including ddraw.h
Status is #defined as an alias for a type in xkbsrv.h, which conflicts with it's
use as a parameter name in rpcdce.h
This fixes compilation with MinGW-w64 w32api headers
(The MinGW-w64 w32api headers actually provide a ddraw.h, so this fix tries to
do things in a way which will still work if our private copy of ddraw.h is
eventually removed)
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
commit 57bbf6e2aead6cce76a9f5d43829b58868a26059
Author: Jon TURNEY <jon.turney@dronecode.org.uk>
Date: Mon Oct 29 14:35:45 2012 +0000
hw/xwin: Remove pointless winFinishCreateWindowsWindowDDNL()
Remove pointless winFinishCreateWindowsWindowDDNL() and the useless DirectDraw
surface pointers in the window privates
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
commit 5bc4c53d23d02d3d7297a8f00a92b6e4d5e0d6fe
Author: Jon TURNEY <jon.turney@dronecode.org.uk>
Date: Tue Sep 4 17:28:16 2012 +0100
hw/xwin: Link with libdxguid rather than defining the DirectX GUIDs ourselves
Decruftify by linking with libdxguid rather than defining the DirectX GUIDs
ourselves. This fixes compilation with MinGW-w64 w32api headers, which do not
provide GUID_SECT (which only ever did anything for gcc prior to 2.95, anyhow)
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
commit a194630f7f7b287cb4ea4a459df0745f4c0d4c1a
Merge: 74a3130426 d511a3016a
Author: Keith Packard <keithp@keithp.com>
Date: Thu Nov 1 13:38:54 2012 -0700
Merge remote-tracking branch 'whot/for-keith'
commit d511a3016a79c50cb38e7504d4831a9ae128e422
Author: Benjamin Tissoires <benjamin.tissoires@gmail.com>
Date: Fri Oct 26 16:27:34 2012 +0200
Add missing labels for multitouch valuators
ABS_MT_DISTANCE exists since kernel v2.6.38,
ABS_MT_TOOL_X|Y appeared in v3.6.
Signed-off-by: Benjamin Tissoires <benjamin.tissoires@gmail.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit ced56f322ead10d1bc93fcd1f8e0ec3ae51292a3
Author: Carlos Garnacho <carlosg@gnome.org>
Date: Thu Oct 25 15:03:50 2012 +0200
Sync TouchListener memory allocation with population in TouchSetupListeners()
The allocated TouchListener array may fall short by 1 if hitting the worst case
situation where there's an active grab, passive grabs on each window in the
sprite trace and event selection for touch in one of the windows. This may lead
to memory corruptions as the array is overflown.
Signed-off-by: Carlos Garnacho <carlosg@gnome.org>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 74a3130426d7e1b456e45daa517769cd3e4b58c0
Merge: 1ca096d5e0 f32ad6dd31
Author: Keith Packard <keithp@keithp.com>
Date: Mon Oct 29 09:09:16 2012 -0700
Merge remote-tracking branch 'jturney/master'
commit 1ca096d5e07221025c4c4110528772b7d94f15ee
Author: Michel Dänzer <michel.daenzer@amd.com>
Date: Mon Oct 29 12:57:54 2012 +0100
EXA: Track source/mask pixmaps more explicitly for Composite fallback regions.
In particular, make sure pExaScr->src/maskPix are cleared when the
corresponding pictures aren't associated with drawables, i.e. solid or gradient
pictures. Without this, we would in some cases associate the source/mask region
with unrelated pixmaps from previous Composite fallbacks, resulting in random
corruption.
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=47266
Signed-off-by: Michel Dänzer <michel.daenzer@amd.com>
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit f32ad6dd314a587c301b7f1a6e4ee74e5d8cc06c
Author: Ryan Pavlik <rpavlik@iastate.edu>
Date: Fri Oct 21 12:32:49 2011 -0500
os/utils.c: Provide only stubs for Lock/UnlockServer on WIN32
MinGW and MSVC lack the POSIX functions to compile the lock file code.
Signed-off-by: Ryan Pavlik <rpavlik@iastate.edu>
Reviewed-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Reviewed-by: Yaakov Selkowitz <yselkowitz@users.sourceforge.net>
commit 74735c5ebff15db8891808068fe8569d8ccde9e7
Author: Colin Harrison <colin.harrison@virgin.net>
Date: Sat Feb 18 20:37:19 2012 +0000
hw/xwin: fmemopen is available on cygwin but not MinGW
This is a follow-up to commit 0659437f5ec0e3f646373394f5f9c5461e2170f3.
Signed-off-by: Colin Harrison <colin.harrison@virgin.net>
Reviewed-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Reviewed-by: Yaakov Selkowitz <yselkowitz@users.sourceforge.net>
commit 748be9da20a8bf3dd99701a95eac7ee3895a28de
Author: Jon TURNEY <jon.turney@dronecode.org.uk>
Date: Tue May 1 20:08:41 2012 +0100
doc: Update documentation about Windows platforms support a bit
Update what c-extensions says about Windows platforms support a bit:
- Document that MinGW Win32 gets let off being POSIX-compilant
- Document the minimum Windows version supported
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
commit 760be785eb49fed4652950fb55dc07b0a41d87de
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Wed Oct 24 11:20:54 2012 +1000
xfree86: remove unused variable sigstate
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Keith Packard <keithp@keithp.com>
commit e7cd5cce740e653000fb1192b600268dcf77dde2
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu Oct 18 15:11:31 2012 +1000
dix: fix zaphod screen scrossing (#54654)
POINTER_SCREEN coordinates are screen-relative. For a Zaphod setup, the
coordinates after a screen crossing are already relative to the new screen's
origin. Add that offset to the coordinates before re-setting.
regression introduced by
commit bafbd99080be49a17be97d2cc758fbe623369945
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Wed Aug 8 11:34:32 2012 +1000
dix: work around scaling issues during WarpPointer (#53037)
X.Org Bug 54654 <http://bugs.freedesktop.org/show_bug.cgi?id=54654>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Keith Packard <keithp@keithp.com>
commit 676447190190d8546165e21be242cf16dd69f5ae
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Wed Oct 17 14:13:29 2012 +1000
Xi: don't deliver TouchEnd to a client waiting for TouchBegin (#55738)
If a client is still waiting for the TouchBegin, don't deliver a TouchEnd
event.
X.Org Bug 55738 <http://bugs.freedesktop.org/show_bug.cgi?id=55738>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Tested-by: Thomas Jaeger <thjaeger@gmail.com>
Reviewed-by: Keith Packard <keithp@keithp.com>
commit 3018f9c1e5109680dcf69b8f2d7807696a473bde
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri Oct 12 13:48:27 2012 +1000
Xi: set xChangeDeviceControlReply.status to Success by default
If the status is other than Success, the code will set it to the required
value.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Keith Packard <keithp@keithp.com>
commit 2decff6393a44b56d80d53570718f95354fde454
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu Oct 11 16:03:33 2012 +1000
xkb: ProcesssPointerEvent must work on the VCP if it gets the VCP
For button release events, the current code picks the VCK. Because that has
a XKB struct, it thinks this is a PointerKeys event and proceeds to send the
release event through the XTest pointer. That has no effect in normal
operation as the button is never down and an attempt is silently discarded
(normal event processing continues with the VCP).
On server shutdown, the XTest device is already removed, leading to a
null-pointer derefernce when the device is checked for whether buttons are
down (XkbFakeDeviceButton → button_is_down(xtest pointer)).
The current state has only worked by accident, the right approach here is to
handle the VCP's event as such and not switch to the keyboard.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Keith Packard <keithp@keithp.com>
commit cc1d8fa8a4ef2e34e9837a44945094fd77e40a0b
Author: Yaakov Selkowitz <yselkowitz@users.sourceforge.net>
Date: Sun Oct 14 23:38:20 2012 -0500
Configure fixes for MinGW
As for Cygwin, define FD_SETSIZE for uses of select() to be correct.
Link with libpthread.
Signed-off-by: Yaakov Selkowitz <yselkowitz@users.sourceforge.net>
Reviewed-by: Jon TURNEY <jon.turney@dronecode.org.uk>
commit 53830281b4da096f9c13107d73ec9c76ff1d14cc
Merge: abc2ef590c 9cbcb5bd6a
Author: Keith Packard <keithp@keithp.com>
Date: Fri Oct 26 18:04:34 2012 -0700
Merge remote-tracking branch 'sandmann/for-keithp'
commit abc2ef590c7cb33ebe21726f83b7347406975f95
Merge: 0e85e5e628 c5396ec05a
Author: Keith Packard <keithp@keithp.com>
Date: Fri Oct 26 17:11:58 2012 -0700
Merge remote-tracking branch 'whot/for-keith'
commit 9cbcb5bd6a5360a128d15b77a02d8d3351f74366
Author: Søren Sandmann Pedersen <ssp@redhat.com>
Date: Wed May 30 05:19:08 2012 -0400
Use new pixman_glyph_cache_t API that will be in pixman 0.28.0
This new API allows glyphs to be cached in a data structure in pixman,
and entire glyph strings to be composited in one go.
Also bump pixman dependency to 0.27.2.
Results from the cairo peformance test suite running against Xvfb with
a screen size of 1680x1050@32bpp:
Speedups
========
xlib firefox-talos-gfx 12416.63 -> 3603.93 3.45x speedup
██▌
xlib xfce4-terminal-a1 1727.57 -> 1048.85: 1.65x speedup
▋
xlib evolution 1370.49 -> 869.34: 1.58x speedup
▋
xlib gnome-terminal-vim 1832.83 -> 1251.94: 1.46x speedup
▌
xlib poppler 1519.70 -> 1204.05: 1.26x speedup
▎
xlib firefox-planet-gnome 6982.55 -> 5598.16: 1.25x speedup
▎
xlib ocitysmap 1142.77 -> 1071.53: 1.07x speedup
▏
No slowdowns were reported.
Results of x11perf -aa10text:
Before:
8000000 reps @ 0.0007 msec (1450000.0/sec)
8000000 reps @ 0.0007 msec (1460000.0/sec)
8000000 reps @ 0.0007 msec (1460000.0/sec)
8000000 reps @ 0.0007 msec (1470000.0/sec)
8000000 reps @ 0.0007 msec (1480000.0/sec)
40000000 trep @ 0.0007 msec (1460000.0/sec)
After:
32000000 reps @ 0.0002 msec (4910000.0/sec)
32000000 reps @ 0.0002 msec (4830000.0/sec)
32000000 reps @ 0.0002 msec (4890000.0/sec)
32000000 reps @ 0.0002 msec (4830000.0/sec)
32000000 reps @ 0.0002 msec (4900000.0/sec)
160000000 trep @ 0.0002 msec (4870000.0/sec)
Version 2: Destroy the glyph cache at server regen time
Acked-by: Aaron Plattner <aplattner@nvidia.com>
Reviewed-by: Keith Packard <keithp@keithp.com>
Signed-off-by: Soren Sandmann <ssp@redhat.com>
commit c5396ec05a5c6cab6608ba677f703c5227b1de13
Author: Thierry Reding <thierry.reding@avionic-design.de>
Date: Wed Oct 17 12:11:49 2012 +0200
xf86: Fix build against recent Linux kernel
Recent Linux kernels reworked the linux/input.h header file, which is
now part of the "user-space API". The include guard therefore has an
additional additional _UAPI prefix.
Instead of adding another case to the #ifdef, drop any include guard
checks and instead always undefine the BUS_* definitions on Linux.
Signed-off-by: Thierry Reding <thierry.reding@avionic-design.de>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 7d89eb4978a6649be22747c3de2886781e311647
Author: Colin Walters <walters@verbum.org>
Date: Wed Jan 4 17:37:06 2012 -0500
autogen.sh: Honor NOCONFIGURE=1
(Also while we have the patient open, use exec instead of hanging
around uselessly in waitpid)
http://people.gnome.org/~walters/docs/build-api.txt
Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Colin Walters <walters@verbum.org>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit c0a752d2864872023216005375a6a1973fadeffe
Author: Lionel Elie Mamane <lionel@mamane.lu>
Date: Tue Oct 9 03:17:49 2012 +0200
dix: fix Ungrab action #55785
UngrabAllDevices(Bool kill_client):
If we are not going to kill the client (kill_clients false),
we need to deactivate grabs of active clients, too.
(If we are going to kill the client,
no need to deactivate the grab,
as this will be done as part of the client kill.)
Fixes: X.Org Bug 55785 <http://bugs.freedesktop.org/show_bug.cgi?id=55785>
Signed-off-by: Lionel Elie Mamane <lionel@mamane.lu>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 3b67cd26149eb991b5f015061a818af65369e668
Author: Chase Douglas <chase.douglas@canonical.com>
Date: Thu Jun 7 14:12:06 2012 -0700
End physically active touches when device is disabled
Otherwise:
* We can't end the touches while device is disabled
* New touches after enabling the device may erroneously be mapped to old
logical touches
Signed-off-by: Chase Douglas <chase.douglas@canonical.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 0e85e5e62819c9e516d6e19836f9f5d7a5d53e87
Author: Colin Harrison <colin.harrison@virgin.net>
Date: Thu Oct 11 18:05:47 2012 +0100
hw/xwin: Fix no return value warning in winClipboardProc()
winclipboardthread.c: In function ‘winClipboardProc’:
winclipboardthread.c:415:9: warning: ‘return’ with no value, in function returning non-void
winclipboardthread.c:424:13: warning: ‘return’ with no value, in function returning non-void
Signed-off-by: Colin Harrison <colin.harrison@virgin.net>
Reviewed-by: Jon TURNEY <jon.turney@dronecode.org.uk>
commit 51ed6a7d46c6cc19eb9aaf838be41eb57fd8230a
Author: Colin Harrison <colin.harrison@virgin.net>
Date: Thu Oct 11 17:57:37 2012 +0100
hw/xwin: Remove unused variable in winmultiwindowwm.c
winmultiwindowwm.c: In function ‘UpdateName’:
winmultiwindowwm.c:522:14: warning: unused variable ‘pszName’ [-Wunused-variable]
Signed-off-by: Colin Harrison <colin.harrison@virgin.net>
Reviewed-by: Jon TURNEY <jon.turney@dronecode.org.uk>
commit 5886b1dc4d2ce12a238a2e3600fdb576abc6e419
Author: Colin Harrison <colin.harrison@virgin.net>
Date: Thu Oct 11 17:56:11 2012 +0100
hw/xwin: Remove unused variables in winwindow.c
winwindow.c: In function ‘winCreateWindowNativeGDI’:
winwindow.c:62:19: warning: unused variable ‘pWinPriv’ [-Wunused-variable]
winwindow.c: In function ‘winDestroyWindowNativeGDI’:
winwindow.c:85:19: warning: unused variable ‘pWinPriv’ [-Wunused-variable]
winwindow.c: In function ‘winPositionWindowNativeGDI’:
winwindow.c:108:19: warning: unused variable ‘pWinPriv’ [-Wunused-variable]
winwindow.c: In function ‘winChangeWindowAttributesNativeGDI’:
winwindow.c:213:19: warning: unused variable ‘pWinPriv’ [-Wunused-variable]
winwindow.c: In function ‘winUnmapWindowNativeGDI’:
winwindow.c:241:19: warning: unused variable ‘pWinPriv’ [-Wunused-variable]
winwindow.c: In function ‘winMapWindowNativeGDI’:
winwindow.c:265:19: warning: unused variable ‘pWinPriv’ [-Wunused-variable]
Signed-off-by: Colin Harrison <colin.harrison@virgin.net>
Reviewed-by: Jon TURNEY <jon.turney@dronecode.org.uk>
commit 08b33882f34fed0c23d54ff7361efc5833868a4b
Author: Colin Harrison <colin.harrison@virgin.net>
Date: Thu Oct 11 17:52:11 2012 +0100
hw/xwin: Remove unused variables in winvalargs.c
winvalargs.c: In function ‘winValidateArgs’:
winvalargs.c:62:10: warning: unused variable ‘fImplicitScreenFound’ [-Wunused-variable]
winvalargs.c:60:9: warning: unused variable ‘iMaxConsecutiveScreen’ [-Wunused-variable]
Signed-off-by: Colin Harrison <colin.harrison@virgin.net>
Reviewed-by: Jon TURNEY <jon.turney@dronecode.org.uk>
commit 7e665f1a21468118dababdbf6d8573f1ce1ebd47
Author: Colin Harrison <colin.harrison@virgin.net>
Date: Thu Oct 11 17:50:42 2012 +0100
hw/xwin: Remove unused variables in winwindowswm.c
winwindowswm.c: In function ‘ProcWindowsWMQueryVersion’:
winwindowswm.c:85:9: warning: unused variable ‘n’ [-Wunused-variable]
winwindowswm.c: In function ‘SProcWindowsWMQueryVersion’:
winwindowswm.c:565:9: warning: unused variable ‘n’ [-Wunused-variable]
Signed-off-by: Colin Harrison <colin.harrison@virgin.net>
Reviewed-by: Jon TURNEY <jon.turney@dronecode.org.uk>
commit e893d570aa3e9ae8df6a30ac4adaf0949a2fc733
Author: Jon TURNEY <jon.turney@dronecode.org.uk>
Date: Thu Oct 11 19:36:13 2012 +0100
Use X_ATTRIBUTE_PRINTF where suggested for os.h
InitOutput.c: In function ‘OsVendorInit’:
InitOutput.c:630:29: warning: assignment left-hand side might be a candidate for a format attribute [-Wmissing-format-attribute]
winprocarg.c: In function ‘ddxProcessArgument’:
winprocarg.c:231:29: warning: assignment left-hand side might be a candidate for a format attribute [-Wmissing-format-attribute]
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
commit e59cc83bcdca6b64c1bfb2de395d741757f615f6
Author: Jon TURNEY <jon.turney@dronecode.org.uk>
Date: Thu Oct 11 19:35:19 2012 +0100
hw/xwin: Use X_ATTRIBUTE_PRINTF where suggested for winmsg.c
winmsg.c: In function ‘winVMsg’:
winmsg.c:47:5: warning: function might be possible candidate for ‘gnu_printf’ format attribute [-Wmissing-format-attribute]
winmsg.c: In function ‘winDrvMsg’:
winmsg.c:56:5: warning: function might be possible candidate for ‘gnu_printf’ format attribute [-Wmissing-format-attribute]
winmsg.c: In function ‘winMsg’:
winmsg.c:66:5: warning: function might be possible candidate for ‘gnu_printf’ format attribute [-Wmissing-format-attribute]
winmsg.c: In function ‘winDrvMsgVerb’:
winmsg.c:77:5: warning: function might be possible candidate for ‘gnu_printf’ format attribute [-Wmissing-format-attribute]
winmsg.c: In function ‘winMsgVerb’:
winmsg.c:87:5: warning: function might be possible candidate for ‘gnu_printf’ format attribute [-Wmissing-format-attribute]
winmsg.c: In function ‘winErrorFVerb’:
winmsg.c:97:5: warning: function might be possible candidate for ‘gnu_printf’ format attribute [-Wmissing-format-attribute]
winmsg.c: In function ‘winDebug’:
winmsg.c:107:5: warning: function might be possible candidate for ‘gnu_printf’ format attribute [-Wmissing-format-attribute]
winmsg.c: In function ‘winTrace’:
winmsg.c:117:5: warning: function might be possible candidate for ‘gnu_printf’ format attribute [-Wmissing-format-attribute]
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
commit 3d6e6a394ea2d5dcb77aa706f751423315d8a7ed
Author: Jon TURNEY <jon.turney@dronecode.org.uk>
Date: Thu Oct 11 19:32:24 2012 +0100
hw/xwin: Use X_ATTRIBUTE_PRINTF where suggested for winerror.c
Also, fix the typoed name OsVenderVErrorF (sic), so it actually gets prototyped
and remove redundant declarations of it's prototype.
winerror.c: In function ‘OsVendorVErrorF’:
winerror.c:56:5: warning: function might be possible candidate for ‘gnu_printf’ format attribute [-Wmissing-format-attribute]
winerror.c: In function ‘winMessageBoxF’:
winerror.c:104:5: warning: function might be possible candidate for ‘gnu_printf’ format attribute [-Wmissing-format-attribute]
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
commit 13fb6b36b8742a79b9768944eee6d1ad66d7e4d9
Author: Jon TURNEY <jon.turney@dronecode.org.uk>
Date: Thu Oct 11 16:20:35 2012 +0100
hw/xwin: Use char strings in winClipboardUNIXtoDOS for consistency with the rest of the clipboard code
winclipboardxevents.c: In function ‘winClipboardFlushXEvents’:
winclipboardxevents.c:575:13: warning: passing argument 1 of ‘winClipboardUNIXtoDOS’ from incompatible pointer type
winclipboard.h:102:2: note: expected ‘unsigned char **’ but argument is of type ‘char **’
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
commit fa36a7cd488e4f7fb91beed8a87764b8e0c1a72f
Author: Jon TURNEY <jon.turney@dronecode.org.uk>
Date: Thu Oct 11 15:51:39 2012 +0100
hw/xwin: Fix warning about discarding const in initializing winKBLayouts
winlayouts.h:46:5: warning: initialization discards qualifiers from pointer target type
winlayouts.h:46:5: warning: initialization discards qualifiers from pointer target type
winlayouts.h:46:5: warning: initialization discards qualifiers from pointer target type
[repeated for each layout]
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
commit 0ea65df8a5f97a6fe5225226493aa01380080d2f
Author: Jon TURNEY <jon.turney@dronecode.org.uk>
Date: Thu Sep 27 17:23:43 2012 +0100
hw/xwin: Fix some of the warnings in generated gl wrapper code
Fix some of the warnings in generated gl wrapper code:
- glWinResolveHelper takes a const char * argument
- ensure formal parameter names don't collide with reserved names or shadow
global declarations (e.g. near, far, index (from string.h), remainder (from
math.h), pointer (from Xdefs.h) by postpending a '_'.
generated_gl_wrappers.c:13:3: warning: passing argument 2 of 'glWinResolveHelper' discards qualifiers from pointer target type
glwrap.c:70:1: note: expected 'char *' but argument is of type 'const char *'
[repeated many times]
generated_gl_wrappers.c: In function 'glVertexAttrib1dARBWrapper': generated_gl_wrappers.c:6884:47: warning: declaration of 'index' shadows a global declaration [-Wshadow]
generated_gl_wrappers.c:6886:3: warning: passing argument 2 of 'glWinResolveHelper' discards qualifiers from pointer target type
[repeated many times]
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
commit f7f0739311927ad177dece7119272481b75b73b4
Author: Colin Harrison <colin.harrison@virgin.net>
Date: Tue Oct 19 23:42:53 2010 +0100
hw/xwin: Warning fix in ProcWindowsWMFrameSetTitle()
winwindowswm.c: In function ‘ProcWindowsWMFrameSetTitle’:
winwindowswm.c:514: error: pointer targets in passing argument 2 of ‘strncpy’ differ in signedness
If you're going to stick random casts into your code, at least use the goddammed
right ones. :-)
Signed-off-by: Colin Harrison <colin.harrison@virgin.net>
Reviewed-by: Jon TURNEY <jon.turney@dronecode.org.uk>
commit 97c9ed026a7f7efe5fca02c188bcbdbcd7c594e9
Author: Jon TURNEY <jon.turney@dronecode.org.uk>
Date: Wed Jan 25 19:01:55 2012 +0000
hw/xwin: Fix shadowed local variable i in HandleCustomWM_COMMAND()
Fix shadowed local variable i in HandleCustomWM_COMMAND()
Also, fds are meant to be representable as an int
winprefs.c: In function ‘HandleCustomWM_COMMAND’:
winprefs.c:346:23: error: declaration of ‘i’ shadows a previous local
winprefs.c:322:7: error: shadowed declaration is here
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
commit b55d0b92fc536793a877f6073754801a7c3c2dd5
Author: Jon TURNEY <jon.turney@dronecode.org.uk>
Date: Wed Jan 25 18:56:22 2012 +0000
hw/xwin: Fix shadowed local variables in winLoadCursor()
Move shadowed local variables x and y to the places they are used
wincursor.c: In function ‘winLoadCursor’:
wincursor.c:212:11: error: declaration of ‘x’ shadows a previous local
wincursor.c:166:7: error: shadowed declaration is here
wincursor.c:212:14: error: declaration of ‘y’ shadows a previous local
wincursor.c:166:10: error: shadowed declaration is here
wincursor.c:228:11: error: declaration of ‘x’ shadows a previous local
wincursor.c:166:7: error: shadowed declaration is here
wincursor.c:228:14: error: declaration of ‘y’ shadows a previous local
wincursor.c:166:10: error: shadowed declaration is here
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
commit a8c9c3699e6dfde29eeec058d903740a499dcf3b
Author: Jon TURNEY <jon.turney@dronecode.org.uk>
Date: Thu Oct 11 19:11:36 2012 +0100
hw/xwin/glx: Fix using Mask as a formal parameter shadows a global typedef of the same name
Fix using Mask as a formal parameter shadows the typedef of the same name from X.h
indirect.c: In function 'GetShift':
indirect.c:1629:14: warning: declaration of 'Mask' shadows a global declaration [-Wshadow]
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
commit 47df98c7851fd9e97a54f0b4950340506d4a9244
Author: Jon TURNEY <jon.turney@dronecode.org.uk>
Date: Wed Jan 25 19:17:16 2012 +0000
hw/xwin: Fix using screenInfo as a formal parameter to InitOutput() shadows a global declaration
Using screenInfo as a formal parameter to InitOutput() shadows a global declaration of screenInfo.
Change the formal parameter name from screenInfo to pScreenInfo, as everywhere else uses.
InitOutput.c: In function ‘InitOutput’:
InitOutput.c:891:25: error: declaration of ‘screenInfo’ shadows a global declaration
../../include/scrnintstr.h:570:19: error: shadowed declaration is here
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
commit 97e9c34687f7dc05ee0bdef097a19e7623fb59a3
Author: Jon TURNEY <jon.turney@dronecode.org.uk>
Date: Wed Jan 25 19:07:49 2012 +0000
hw/xwin: Fix using menu as a formal parameter shadows a global variable of the same name
Using menu as a formal parameter shadows a global variable of the same name
winprefsyacc.y: In function ‘SetRootMenu’:
winprefsyacc.y:286:20: error: declaration of ‘menu’ shadows a global declaration
winprefsyacc.y:55:19: error: shadowed declaration is here
winprefsyacc.y: In function ‘SetDefaultSysMenu’:
winprefsyacc.y:293:26: error: declaration of ‘menu’ shadows a global declaration
winprefsyacc.y:55:19: error: shadowed declaration is here
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
commit efe96a17bd741f222ccb226d306b5c1dc1f25ade
Author: Jon TURNEY <jon.turney@dronecode.org.uk>
Date: Wed Jan 25 18:54:57 2012 +0000
hw/xwin: Fix using index as a formal parameter shadows index()
Using index as a formal parameter shadows index() from strings.h
winallpriv.c: In function ‘winInitCmapPrivates’:
winallpriv.c:119:45: error: declaration of ‘index’ shadows a global declaration
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
commit 451c5d9175cdeb36fd614502ff0317f968490dfc
Author: Jon TURNEY <jon.turney@dronecode.org.uk>
Date: Wed Jan 25 19:09:12 2012 +0000
hw/xwin: Fix using index as a formal parameter in winscrinit.c shadows index()
Using index as a local variable shadows index() from strings.h
winscrinit.c: In function ‘winFinishScreenInitFB’:
winscrinit.c:274:28: error: declaration of ‘index’ shadows a global declaration
winscrinit.c: In function ‘winFinishScreenInitNativeGDI’:
winscrinit.c:623:35: error: declaration of ‘index’ shadows a global declaration
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
commit 21faee4b383a12bef58f300b4ad1a3bd34d6de2d
Author: Jon TURNEY <jon.turney@dronecode.org.uk>
Date: Wed Jan 25 19:05:42 2012 +0000
hw/xwin: Fix using index as a local variable shadows index()
Using index as a local variable shadows index() from strings.h
winprefs.c: In function ‘LoadImageComma’:
winprefs.c:574:7: error: declaration of ‘index’ shadows a global declaration
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
commit 2d9123fd0c89c1a72e7281e56985196bc53507bf
Author: Jon TURNEY <jon.turney@dronecode.org.uk>
Date: Wed Jan 25 18:59:21 2012 +0000
hw/xwin: Fix using index as a formal parameter in winmonitors.c shadows index()
Fix using index as a local variable shadows global declaration of index() from strings.h
winmonitors.c: In function ‘QueryMonitor’:
winmonitors.c:59:23: error: declaration of ‘index’ shadows a global declaration
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
commit 5b0435dbdaa47404629800e4e9c5a6952a7bb260
Author: Jon TURNEY <jon.turney@dronecode.org.uk>
Date: Wed Jan 25 18:53:02 2012 +0000
hw/xwin: Fix using system as a local variable in winCheckMount() shadows system()
Using system as local variable in winCheckMount() shadows the global declaration of system() from stdlib.h
InitOutput.c: In function ‘winCheckMount’:
InitOutput.c:296:10: error: declaration of ‘system’ shadows a global declaration
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
commit 17d84c743d6b52f32c4ca0341aebaff972522945
Author: Jon TURNEY <jon.turney@dronecode.org.uk>
Date: Wed Jan 25 17:18:12 2012 +0000
hw/xwin: Remove obsolete redundant declarations of winPushPixels()
winPushPixels() and winpushpxl.c was removed in it's entirety in commit
f31bd087e8a7f65cd588bd1d022bb18e72b2a60c "Death to mfb"
wingc.c:37:1: error: redundant redeclaration of ‘winPushPixels’
win.h:1104:1: note: previous declaration of ‘winPushPixels’ was here
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
commit f06b468d96afd323e28645dde44170ab367da4f1
Author: Jon TURNEY <jon.turney@dronecode.org.uk>
Date: Wed Jan 25 17:09:18 2012 +0000
hw/xwin: Fix redundant declarations in winmultiwindowwm.c
winmultiwindowwm.c:139:14: error: redundant redeclaration of ‘display’
../../include/opaque.h:52:14: note: previous declaration of ‘display’ was here
winmultiwindowwm.c:140:13: error: redundant redeclaration of ‘ErrorF’
../../include/os.h:558:13: note: previous declaration of ‘ErrorF’ was here
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
commit 3e8269177ee01fe107830032b60a8d311d4b4b0e
Author: Jon TURNEY <jon.turney@dronecode.org.uk>
Date: Wed Jan 25 17:08:17 2012 +0000
hw/xwin: Fix redundant declarations in winclipboardwrappers.c
Fix redundant declarations in winclipboardwrappers.c.
Also remove obsolete winProcQueryTree() prototype.
winclipboardwrappers.c:64:12: error: redundant redeclaration of ‘g_iNumScreens’
winglobals.h:33:12: note: previous declaration of ‘g_iNumScreens’ was here
winclipboardwrappers.c:67:13: error: redundant redeclaration of ‘g_fXdmcpEnabled’
winglobals.h:45:13: note: previous declaration of ‘g_fXdmcpEnabled’ was here
winclipboardwrappers.c:75:27: error: redundant redeclaration of ‘winProcEstablishConnectionOrig’
winglobals.h:66:27: note: previous declaration of ‘winProcEstablishConnectionOrig’ was here
winclipboardwrappers.c:76:27: error: redundant redeclaration of ‘winProcQueryTreeOrig’
winglobals.h:67:27: note: previous declaration of ‘winProcQueryTreeOrig’ was here
winclipboardwrappers.c:77:27: error: redundant redeclaration of ‘winProcSetSelectionOwnerOrig’
winglobals.h:68:27: note: previous declaration of ‘winProcSetSelectionOwnerOrig’ was here
winclipboardwrappers.c:56:5: warning: redundant redeclaration of ‘winProcEstablishConnection’ [-Wredundant-decls]
winclipboardwrappers.c:52:5: note: previous declaration of ‘winProcEstablishConnection’ was here
winclipboardwrappers.c:57:5: warning: redundant redeclaration of ‘winProcSetSelectionOwner’ [-Wredundant-decls]
winclipboardwrappers.c:54:5: note: previous declaration of ‘winProcSetSelectionOwner’ was here
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
commit 0975fa0b391d7b8d7e8a127ebf7a863e53fcab7d
Author: Jon TURNEY <jon.turney@dronecode.org.uk>
Date: Wed Jan 25 17:06:27 2012 +0000
hw/xwin: Fix redundant declaration in winclipboardthread.c
winclipboardthread.c:51:22: error: redundant redeclaration of ‘serverGeneration’
../../include/misc.h:362:22: note: previous declaration of ‘serverGeneration’ was here
winclipboardthread.c: In function ‘winClipboardProc’:
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
commit 4a1da00c495706e0fbcec2b30aef3ad7acf5b703
Author: Jon TURNEY <jon.turney@dronecode.org.uk>
Date: Wed Jan 25 17:05:25 2012 +0000
hw/xwin: Fix redundant declaration in winclipboardinit.c
In file included from winclipboardinit.c:35:0:
winclipboard.h:81:13: error: redundant redeclaration of ‘ErrorF’
../../include/os.h:558:13: note: previous declaration of ‘ErrorF’ was here
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
commit 30f31b80f0105676359105c895bc195b9f3e704c
Author: Jon TURNEY <jon.turney@dronecode.org.uk>
Date: Wed Jan 25 16:48:45 2012 +0000
hw/xwin: Fix various warnings in code generated by lex/yacc
Remove various redundant declarations.
Instruct lex not to generate code which isn't going to be used, thus avoiding
some unused function warnings.
Note that bison <2.5 expects stdlib.h to define _STDLIB_H if it's been included,
and avoids prototyping free/malloc in that case. Some stdlib.h (e.g. newlib) may
not match precisely (e.g. defining _STDLIB_H_), so we define it after including
stdlib.h to be sure, and avoid a redudant declaration warning for those symbols.
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
commit 4231b9541c6fd26f43b605ecc9dd76622dd786f7
Author: Jon TURNEY <jon.turney@dronecode.org.uk>
Date: Wed Jan 25 16:38:49 2012 +0000
hw/xwin: Fix redundant declaration in winprefs.c
winprefs.c:63:14: error: redundant redeclaration of ‘display’
../../include/opaque.h:52:14: note: previous declaration of ‘display’ was here
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
commit 70087c55fffc3cbc52f550418e6b1230bbb1b3b3
Author: Jon TURNEY <jon.turney@dronecode.org.uk>
Date: Wed Jan 25 16:36:40 2012 +0000
hw/xwin: Fix redundant declaration warnings in winmonitors.c
Include xwin-config.h so HAVE_STRLCPY and HAVE_STRNDUP are defined, so
duplicate declarations of strlcpy(), strlcat() and strndup() aren't made
by os.h
In file included from ../../include/misc.h:111:0,
from ../../include/screenint.h:51,
from ../../include/scrnintstr.h:51,
from win.h:157,
from winmonitors.c:31:
../../include/os.h:491:15: error: redundant redeclaration of ‘strlcpy’
/usr/include/string.h:86:35: note: previous declaration of ‘strlcpy’ was here
../../include/os.h:492:15: error: redundant redeclaration of ‘strlcat’
/usr/include/string.h:85:35: note: previous declaration of ‘strlcat’ was here
../../include/os.h:496:15: error: redundant redeclaration of ‘strndup’
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
commit 9904c8fe75c96cf84d8885aa95f2743c1b25ea37
Author: Jon TURNEY <jon.turney@dronecode.org.uk>
Date: Wed Jan 25 16:09:59 2012 +0000
hw/xwin: Remove completely unused winregistry.c
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
commit a69429a17bf4630f6e26f61630a1c2b287202627
Author: Jon TURNEY <jon.turney@dronecode.org.uk>
Date: Fri Sep 7 14:58:06 2012 +0100
Fix 'make distcheck' for hw/xwin
Add some missing header files to _SOURCES so they get distributed properly
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Reviewed-by: Yaakov Selkowitz <yselkowitz@users.sourceforge.net>
commit 1d9fd7ffb03ff6e44f3a8736a94e4558203ce607
Author: Jon TURNEY <jon.turney@dronecode.org.uk>
Date: Thu Sep 6 13:51:38 2012 +0100
Fix compilation of Xorg DDX without XF86VIDMODE
Fix compilation of Xorg DDX without XF86VIDMODE since 6e74fdda, by putting
xf86vmode.c back under the XF86VIDMODE automake conditional it was accidentally
taken out of.
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Tested-by: Yaakov Selkowitz <yselkowitz@users.sourceforge.net>
Reviewed-by: Daniel Stone <daniel@fooishbar.org>
commit 25741b1aa3a0fb39cb842a43ab52935673cfdefa
Author: Jon TURNEY <jon.turney@dronecode.org.uk>
Date: Sun Sep 2 15:17:05 2012 +0100
hw/xwin: Only add GLX extension once.
Using of LoadExtension() to add GLX onto to the end of the list of extensions on
every server regeneration leads to hilarious consequences (i.e. crashing) after
the first regeneration :-)
Possibly xf86ExtensionInit() and QuartzExtensionInit() need a similar fix.
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
Tested-by: Colin Harrison <colin.harrison@virgin.net>
commit 7ceb85481280fecbf033f147f0f7834cad3890c6
Author: Jon TURNEY <jon.turney@dronecode.org.uk>
Date: Sun Sep 2 14:55:25 2012 +0100
Correct description of -displayfd option in man page.
A display number, not a port number, is written to the specified fd.
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
commit 4b7f00346daed20c96f3e8ea13ae411858a5424b
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Wed Oct 10 13:33:48 2012 +1000
dix: fix crash on shutdown if a disabled device is still grabbed (XI1 grab)
A disabled device doesn't have a sprite (less so a sprite->win) and triggers
a NULL-pointer dereference on shutdown when all active grabs are released as
part of the cleanup.
Fix this by checking for sprite being non-null and setting the focus window
to the NullWindow if it is. The rest of the patch just attempts to make
things more readable.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Keith Packard <keithp@keithp.com>
commit 0c7109f3215378bb3ed6c00c71129a63ffb4e787
Author: Denys Vlasenko <dvlasenk@redhat.com>
Date: Mon Oct 8 14:18:02 2012 +1000
os: fix typo in OsSigHandler() error message
Recieved → Received
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 0a75bd640b3dc26b89d9e342999a7f4b7e98edbf
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Wed Oct 3 13:12:27 2012 +1000
xfree86: add xf86UpdateDesktopDimensions()
This call is required for external drivers (specifically NVIDIA) that do
not share the xfree86 infrastructure to update the desktop dimensions.
Without it, the driver would update the ScreenRecs but not update the total
dimensions the input code relies on for transformation.
This call is a thin wrapper around the already-existing internal call and
should be backported to all stable series servers, with the minor ABI bump.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
CC: Andy Ritger <aritger@nvidia.com>
Reviewed-by: Aaron Plattner <aplattner@nvidia.com>
commit 09f1e5b15b769e1122f0a8d7cae0820038992312
Author: Julien Cristau <jcristau@debian.org>
Date: Sun Oct 7 18:40:35 2012 +0200
Revert "kinput: allocate enough space for null character."
This reverts commit 531785dd746d64ef7f473a83ca73bb20e74b6fca.
The above commit breaks Xephyr option parsing. Andrzej writes:
Xephyr -retro -keybd evdev,,device=/dev/input/event2,xkbrules=evdev,xkbmodel=evdev,xkblayout=pl -mouse evdev,,device=/dev/input/event1 :3
results in:
<snip>
Pointer option key (device=) of value (/dev/input/event1) not assigned!
Kbd option key (device=) of value (/dev/input/event2) not assigned!
Kbd option key (xkbrules=) of value (evdev) not assigned!
Kbd option key (xkbmodel=) of value (evdev) not assigned!
Kbd option key (xkblayout=) of value (pl) not assigned!
<snip>
The effect of the patch is that the "key=value" pairs are parsed in such
a way that the key is added an "equals" sign to it and we end up with
keys like "device=" instead of "device". This in turn has effect on
KdParsePointerOptions and KdParseKbdOptions: the key does not match
any choice presented in the "switch" statement, and so "Pointer/Kbd
option key (...) of value (...) not assigned!" happens, making all
"key=value" options inaccessible to the user. Reverting the patch makes
them available again.
Reference: http://bugs.debian.org/689246
Reported-by: Andrzej Pietrasiewicz <andrzejtp2010@gmail.com>
Signed-off-by: Julien Cristau <jcristau@debian.org>
Cc: Dave Airlie <airlied@redhat.com>
Reviewed-by: Søren Sandmann <ssp@redhat.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 7f9d78d8ffb1a312f9b3d69c05323f601571e162
Author: Keith Packard <keithp@keithp.com>
Date: Thu Oct 4 22:51:06 2012 -0700
os: Don't re-declare ConnectionInputPtr and ConnectionOutputPtr
They're declared in osdep.h, so don't redeclare them in io.c as
well. Keeps the compiler happier.
Signed-off-by: Keith Packard <keithp@keithp.com>
Reviewed-by: Dave Airlie <airlied@redhat.com>
commit d5bf6f95f31037bd49b11348b500c3c13b7e0c99
Author: Keith Packard <keithp@keithp.com>
Date: Thu Oct 4 14:42:37 2012 -0700
Fix FlushClient to write extraBuf when provided (regression fix)
In commit:
commit 092c57ab173c8b71056f6feb3b9d04d063a46579
Author: Adam Jackson <ajax@redhat.com>
Date: Fri Jun 17 14:03:01 2011 -0400
os: Hide the Connection{In,Out}put implementation details
Reviewed-by: Daniel Stone <daniel@fooishbar.org>
Signed-off-by: Adam Jackson <ajax@redhat.com>
the check for an empty output buffer was moved from one calling
location into the FlushClient implementation itself. However, this
neglected the possibility that additional data, in the form of
'extraBuf' would be passed to FlushClient from other code paths. If the
output buffer happened to be empty at that time, the extra data would
never be written to the client.
This is fixed by checking the total data to be written, which includes
both pending and extra data, instead of just the pending data.
Signed-off-by: Keith Packard <keithp@keithp.com>
Reviewed-by: Julien Cristau <jcristau@debian.org>
commit 8367dd9736d74eca971da345c2bf559ce5bbf649
Merge: 36c18bb81b 7998e26159
Author: Keith Packard <keithp@keithp.com>
Date: Thu Oct 4 13:08:35 2012 -0700
Merge remote-tracking branch 'whot/for-keith'
commit 36c18bb81be619df712778bcb99dd6f1fa38701a
Author: Stephan Schreiber <info@fs-driver.org>
Date: Wed Aug 29 20:03:58 2012 +0200
int10: fix pci_device_read_rom usage
I noticed that the build-in int10 driver always reports
"Unable to retrieve all of segment 0x0C0000."
even though the entire BIOS data is retrieved with success.
The associated code is in hw/xfree86/int10/generic.c, in the function
xf86ExtendedInitInt10():
if (pci_device_read_rom(pInt->dev, vbiosMem) < V_BIOS_SIZE) {
xf86DrvMsg(screen, X_WARNING,
"Unable to retrieve all of segment 0x0C0000.\n");
}
The function pci_device_read_rom() is from libpciaccess; its return
value is not a size but an error status code: 0 means success.
If pci_device_read_rom() returns 0 for success, the warning is generated.
The proposed patch corrects the evaluation of the return value of
pci_device_read_rom() and of the supplied BIOS size.
Debian bug#686153
Signed-off-by: Julien Cristau <jcristau@debian.org>
Reviewed-by: Dave Airlie <airlied@redhat.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 4bf3eac5fe20fb203b917a486f69514c55be595a
Author: Adam Jackson <ajax@redhat.com>
Date: Thu Sep 27 17:12:19 2012 -0400
configure: Stop using AM_MAINTAINER_MODE
All this does is make it so editing configure.ac or Makefile.am doesn't
rebuild the makefiles. Which is just stupid.
v2: Remove --enable-maintainer-mode from autogen.sh
Signed-off-by: Adam Jackson <ajax@redhat.com>
Reviewed-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Dan Nicholson <dbn.lists@gmail.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 262679d436941580485a10e30938974958f7d588
Author: Keith Packard <keithp@keithp.com>
Date: Thu Oct 4 11:42:22 2012 -0700
Set version to 1.14 development branch (1.13.99.0)
Signed-off-by: Keith Packard <keithp@keithp.com>
commit f179b13b91c8891254d31345ee04e773839e6b87
Merge: 4dd5989d15 3d2b768efa
Author: Keith Packard <keithp@keithp.com>
Date: Thu Oct 4 11:39:46 2012 -0700
Merge remote-tracking branch 'daniels/master'
commit 7998e26159893674be69183a73a89a53f5608d58
Author: Jason Gerecke <killertofu@gmail.com>
Date: Fri Sep 28 15:03:42 2012 -0700
Fix additional gcc -Wwrite-strings warning in xf86 ddx
Commit 09e4b78f missed a case.
Signed-off-by: Jason Gerecke <killertofu@gmail.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit f64254d85e731d0b4369d871a9a735b03f283ba6
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu Aug 23 15:00:24 2012 +1000
mi: drop two useless conditions in miPointerSetPosition
pDev cannot be NULL here since fill_pointer_events is the only caller.
And if the screen is NULL, then the device tries to send events before it is
fully initialised. That certainly shouldn't happen and would be a bug
elsewhere.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Keith Packard <keithp@keithp.com>
commit 314776eb369ca2e438907795ae030dd743c281fc
Author: Daniel Stone <daniel@fooishbar.org>
Date: Fri Sep 7 18:30:23 2012 +0100
Touch: Fix duplicate TouchBegin selection with virtual devices
Given the following scenario:
1) client A selects for TouchBegin on window W for device D
2) client B selects for TouchBegin on window W for XIAllDevices
3) client C selects for TouchBegin on window W with device E
Step 3 will fail with BadImplementation, because attempting to look up
XIAllDevices or XIAllMasterDevices with dixLookupDevices doesn't work.
This should succeed (or, if it was selecting for device D, fail with
BadAccess as it would be a duplicate selection).
Fix this by performing the appropriate lookup for virtual devices.
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
Cc: Peter Hutterer <peter.hutterer@who-t.net>
Cc: Chase Douglas <chase.douglas@ubuntu.com>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 3e6358ee6c33979329b78fe2097a1fdf76fb69cd
Author: Daniel Drake <dsd@laptop.org>
Date: Fri Sep 7 21:48:35 2012 -0400
Xi: Don't check for TOUCH_END, it's never set
This flag is never set, so checking for it here means that we'll
never release the simulated mouse button press after the user touches
(and releases) the touchscreen for the first time.
Fixes a problem where the XO laptop touchpad became totally
unusable after touching the screen for the first time (since X then
behaved as if the mouse button was held down all the time).
Signed-off-by: Daniel Drake <dsd@laptop.org>
Reviewed-by: Chase Douglas <chase.douglas@canonical.com>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 9d6b8365702e4648e793fea21ad22f7174558680
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri Sep 28 11:49:29 2012 +1000
dix: fix crash on XI 1.x grabs on disabled devices. (#54934)
If the device is disabled, the sprite window is NULL and dereferencing
crashes the server.
This is only triggered for XI 1.x grabs (ProcXGrabDevice) as XI2 grabs would
trigger another code path, creating a sprite for the disabled device as if
detaching it (which is wrong and fixed with this patch too).
Grabbing a disabled device doesn't make sense as it won't send events
anyway. However, the protocol specs do not prohibit it, so we need to keep
it working.
Luckily, oldWin is only used for focus out events, which aren't necessary
given that the device is disabled.
X.Org Bug 54934 <http://bugs.freedesktop.org/show_bug.cgi?id=54934>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Chase Douglas <chase.douglas@ubuntu.com>
commit 3d2b768efae9936c6929c2bc13c7a1acc074ecd3
Author: Daniel Stone <daniel@fooishbar.org>
Date: Fri Sep 7 18:17:46 2012 +0100
Touch: Fix duplicate TouchBegin selection with virtual devices
Given the following scenario:
1) client A selects for TouchBegin on window W for device D
2) client B selects for TouchBegin on window W for XIAllDevices
3) client C selects for TouchBegin on window W with device E
Step 3 will fail with BadImplementation, because attempting to look up
XIAllDevices or XIAllMasterDevices with dixLookupDevices doesn't work.
This should succeed (or, if it was selecting for device D, fail with
BadAccess as it would be a duplicate selection).
Fix this by performing the appropriate lookup for virtual devices.
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
Reviewed-by: Chase Douglas <chase.douglas@ubuntu.com>
commit e3903a9383351b061b1a99dfc653ca50de764ec4
Author: Frederic Plourde <frederic.plourde@collabora.com>
Date: Wed Sep 12 10:48:32 2012 -0400
Add glXCreateNewContext support in Xephyr #54798
Similar to how we intercept and pass through CreateContext, also pass
through newer CreateNewContext requests.
Fixes Clutter → Xephyr → VirtualBox.
Signed-off-by: Frederic Plourde <frederic.plourde@collabora.com>
Reviewed-by: Daniel Stone <daniel@fooishbar.org>
commit 11afebc92ce1a7462ff2886286504425b1c8f0ba
Author: Daniel Stone <daniel@fooishbar.org>
Date: Fri Sep 7 18:10:35 2012 +0100
Xephyr: GLX: Support MakeContextCurrent and MakeCurrentReadSGI
We need to pass these requests through to the host server in the same
way we do glXMakeCurrent. Generalise the existing MakeCurrent
submission into once that will send MakeCurrent, MakeContextCurrent or
MakeCurrentReadSGI, depending on the request and the host server's
capabilities, and add decoding/hijack support for incoming
MakeContextCurrent and MakeCurrentReadSGI requests.
Fixes Clutter → Xephyr → VirtualBox.
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
Reviewed-by: Adam Jackson <ajax@redhat.com>
Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
commit 4dd5989d15465f3f3480b521d4e36673972fa24a
Merge: 0b02150c27 506e3437c7
Author: Keith Packard <keithp@keithp.com>
Date: Mon Sep 24 11:43:01 2012 -0700
Merge remote-tracking branch 'ajax/server-1.14-abi-churn'
commit 0b02150c27e98f996e10d7489f9f67a30e4e3497
Author: Yufeng Shen <miletus@chromium.org>
Date: Mon Sep 24 14:03:31 2012 -0400
dix: fix scale_to_desktop for edge ABS events
Scale_to_desktop() converts ABS events from device coordinates
to screen coordinates:
[dev_X_min, dev_X_max] -> [screen_X_min, screen_X_max]
[dev_Y_min, dev_Y_max] -> [screen_Y_min, screen_Y_max]
An edge ABS event with X = dev_X_max (e.g., generated from the
edge of a touchscreen) will be converted to have screen X value
= screen_X_max, which, however, will be filterd out when xserver
tries to find proper Window to receive the event, because the
range check for a Window to receive events is
window_X_min <= event_screen_X < window_X_max
Events with event_screen_X = screen_X_max will fail the test get
and rejected by the Window.
To fix this, we change the device to screen coordinates mapping to
[dev_X_min, dev_X_max] -> [screen_X_min, screen_X_max-1]
[dev_Y_min, dev_Y_max] -> [screen_Y_min, screen_Y_max-1]
Reviewed-by: Chase Douglas <chase.douglas@canonical.com>
Reviewed-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
Signed-off-by: Yufeng Shen <miletus@chromium.org>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 7722bcbab2507d263c7685b15cccbfdd52fc3a24
Merge: 4dc2a76740 f54987de97
Author: Keith Packard <keithp@keithp.com>
Date: Sun Sep 23 16:04:13 2012 -0700
Merge remote-tracking branch 'jeremyhu/master'
commit 4dc2a76740d921c824a4d8193f39dd373475f02a
Author: Adam Jackson <ajax@redhat.com>
Date: Thu Sep 20 17:57:00 2012 -0400
miext/damage: Only wrap into the GC ops chain if there's a listener (v3)
before after Operation
-------- ----------------- -----------------
1148346.9 1191807.5 ( 1.04) PutImage 10x10 square
2091666.1 2180983.0 ( 1.04) ShmPutImage 10x10 square
v3: In miDamage{R,Unr}egister, bump the serial number of the affected
drawable (and all children if it's a window) so subsequent drawing
against the damage will trigger another ValidateGC pass and we wrap
in/out correctly. Spotted by Aaron Plattner.
Signed-off-by: Adam Jackson <ajax@redhat.com>
Reviewed-by: Aaron Plattner <aplattner@nvidia.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit ad0156c369a40762df6b70780358ce14e5f2c9b1
Author: Adam Jackson <ajax@redhat.com>
Date: Thu Sep 20 11:16:26 2012 -0400
dix: Remove MapUnmapEventsEnabled and friends
This hack was added to suppress events generated by Composite's internal
unmap/map cycle on redirection state change. Since that cycle was
removed in 193ecc8b4, these can go.
Signed-off-by: Adam Jackson <ajax@redhat.com>
Reviewed-by: Ville Syrjälä <syrjala@sci.fi>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 387b1ac33ca63d27e42d4f61cf248bafb7c43c17
Author: Adam Jackson <ajax@redhat.com>
Date: Thu Sep 20 11:16:25 2012 -0400
dix: Factor out DeliverUnmapNotify
Signed-off-by: Adam Jackson <ajax@redhat.com>
Reviewed-by: Keith Packard <keithp@keithp.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit d20cc0fca4e36ad9bdbda8950c4466b1976e70a1
Author: Adam Jackson <ajax@redhat.com>
Date: Thu Sep 20 11:16:24 2012 -0400
dix: Factor out DeliverMapNotify
Signed-off-by: Adam Jackson <ajax@redhat.com>
Reviewed-by: Keith Packard <keithp@keithp.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 63843cb70030812bb3a311b2e8dfb0d1b0a75176
Author: Adam Jackson <ajax@redhat.com>
Date: Thu Sep 20 11:16:23 2012 -0400
dix: Factor out MaybeDeliverMapRequest
Signed-off-by: Adam Jackson <ajax@redhat.com>
Reviewed-by: Keith Packard <keithp@keithp.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit dab7a1ec7fd97e07405e0b01dc1f1ec6e5fc2e7c
Author: Adam Jackson <ajax@redhat.com>
Date: Thu Sep 20 11:16:22 2012 -0400
dix: Fix some indentation
Signed-off-by: Adam Jackson <ajax@redhat.com>
Reviewed-by: Keith Packard <keithp@keithp.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 3d1051aecbb1955084804133cacd12c7f696833a
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu Sep 20 05:56:39 2012 +1000
dix: set the device transformation matrix
The property handler is registered after setting the property, so
dev->transform remains as all-zeros. That causes pixman_f_transform_invert()
to fail (in transformAbsolute()) and invert remains as garbage. This
may then cause a cursor jump to 0,0.
Since the axes are not yet initialized here and we need to allow for drivers
changing the matrix, we cannot use the property handler for matrix
initialization, essentially duplicating the code.
Triggered by the fix to (#49347) in 749a593e49adccdf1225be28a521412ec85333f4
https://bugzilla.redhat.com/show_bug.cgi?id=852841
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Chase Douglas <chase.douglas@ubuntu.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 1cb0261ef54b7dd6a7ef84e1c3959e424706228b
Author: Daniel Martin <consume.noise@gmail.com>
Date: Thu Sep 6 00:38:26 2012 +0200
dix: Delete mibstore.h
Since Nov 2010 (commit c4c4676) the only purpose of mibstore.h was to
define an empty function (miInitializeBackingStore()) for backward
compatibility. Time to say goodbye.
Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 08a9ed2524679ed939fa0ad466ee3faf905b8ac4
Author: Daniel Martin <consume.noise@gmail.com>
Date: Thu Sep 6 00:38:25 2012 +0200
dix: Remove refs to mi backing store from docs
Remove any reference to mibstore.h and miInitializeBackingStore() from
the documentation.
Reviewed-by: Aaron Plattner <aplattner@nvidia.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 76d8739b1f4ed07b874ae56a492d1e0aa0fd9b04
Author: Daniel Martin <consume.noise@gmail.com>
Date: Thu Sep 6 00:38:24 2012 +0200
dix: Remove #includes of mibstore.h
Remove more backing store leftovers.
Reviewed-by: Aaron Plattner <aplattner@nvidia.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 056fd15deaa85d3ed936df9a3b2e0cdcfa599da8
Author: Daniel Martin <consume.noise@gmail.com>
Date: Thu Sep 6 00:38:23 2012 +0200
dix: Delete mibstore.c
The only reference to mibstore.c was removed with commit c4c4676. Remove the
file itself too.
Reviewed-by: Aaron Plattner <aplattner@nvidia.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit f54987de97720200ee94eba1c7a737d4ad8c55c8
Author: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
Date: Thu Sep 20 21:11:21 2012 -0700
XQuartz: Add some verbose logging to debug xp_lock_window being unbalanced
Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
commit 25d26875bc9bd6fd23ae1b5280f015abf1b033b7
Author: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
Date: Thu Sep 20 21:49:40 2012 -0700
XQuartz: Avoid a possible deadlock with DRI on OS X 10.7.5 and OS X 10.8.2
<rdar://problem/12338921>
http://bugs.winehq.org/show_bug.cgi?id=31751
Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
commit 506e3437c73e5ae935ff7c056d7808fbb0c7e614
Author: Adam Jackson <ajax@redhat.com>
Date: Thu Sep 20 14:22:48 2012 -0400
dix: Fix types in WindowOptRec
No reason for these to be 64 bits on LP64.
Reviewed-by: Daniel Stone <daniel@fooishbar.org>
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit 092c57ab173c8b71056f6feb3b9d04d063a46579
Author: Adam Jackson <ajax@redhat.com>
Date: Fri Jun 17 14:03:01 2011 -0400
os: Hide the Connection{In,Out}put implementation details
Reviewed-by: Daniel Stone <daniel@fooishbar.org>
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit e2c7d70e5ddb8b17676a13ceebfbb87d14d63243
Author: Adam Jackson <ajax@redhat.com>
Date: Fri Jun 17 13:43:38 2011 -0400
dix: Extend initial connection handshake for forwarding proxies
Forwarding proxies like sshd will appear to be local, even though they
aren't really. This leads to weird behaviour for extensions that truly
require running under the same OS services as the client, like MIT-SHM
and DRI2.
Add two new legal values for the initial connection's byteOrder field,
'r' and 'R'. These act like 'l' and 'B' respectively, but have the side
effect of forcing the client to be treated as non-local. Forwarding
proxies should attempt to munge the first packet of the connection
accordingly; older servers will reject connections thusly munged, so the
proxy should fall back to passthrough if the munged connection attempt
fails.
Reviewed-by: Daniel Stone <daniel@fooishbar.org>
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit 31bf81772e146af79b0c456aae2159eba8b0280f
Author: Adam Jackson <ajax@redhat.com>
Date: Thu Sep 20 14:00:09 2012 -0400
dix: Repack ClientRec
Pick smaller types where possible, including bitfielding some Bools and
small enums, then shuffle the result to be hole-free. 192 -> 128 bytes
on LP64, 144 -> 96 bytes on ILP32.
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit ff8e3ad8074cd2c8bed49b39c40c2b4892118270
Author: Adam Jackson <ajax@redhat.com>
Date: Thu Sep 20 13:16:59 2012 -0400
dix: Pull client-is-local flag up to the ClientRec
Reviewed-by: Daniel Stone <daniel@fooishbar.org>
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit 3f7bc222638d5d38324ecbc8c2c4e39af17d110e
Author: Adam Jackson <ajax@redhat.com>
Date: Thu Jun 16 17:40:24 2011 -0400
os: Repack ConnectionOutput for LP64
Reviewed-by: Daniel Stone <daniel@fooishbar.org>
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit d01921ec18c21f21d377b60626cc2d3418b84a7c
Merge: 70e5766874 245e7e0361
Author: Keith Packard <keithp@keithp.com>
Date: Thu Sep 20 17:26:48 2012 +0200
Merge remote-tracking branch 'ajax/ioperm'
commit 5109c7f6581b3e4e23700bfd03b4daf0ba97630e
Author: Adam Jackson <ajax@redhat.com>
Date: Thu Sep 20 11:19:39 2012 -0400
xfree86: Bump video ABI to 14
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit 245e7e0361b18766583ae391a2ac1231bb1a1f84
Author: Adam Jackson <ajax@redhat.com>
Date: Tue Jun 26 14:32:31 2012 -0400
xfree86: Change the semantics of driverFunc(GET_REQUIRED_HW_INTERFACES)
This is a really awkward interface, since we're calling it well before
the driver knows what device it's going to drive. Drivers with both KMS
and UMS support therefore don't know whether to say they need I/O port
access or not, and have to assume they do.
With this change we now call it only to query whether port access might
be needed; we don't use that to determine whether to call a driver's
probe function or not, instead we call them unconditionally. If the
driver doesn't check whether port access was enabled, they might crash
ungracefully. To accomodate this, we move xorgHWAccess to be explicitly
intentionally exported (sigh xf86Priv.h) so that drivers can check that
before they attempt port access.
v2: Move initial xf86EnableIO() nearer the logic that determines whether
to call it, suggested by Simon Farnsworth.
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
Reviewed-by: Simon Farnsworth <simon.farnsworth@onelan.co.uk>
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit d88fb00d791c2b19cf9dd244276838aba3a6b442
Author: Adam Jackson <ajax@redhat.com>
Date: Tue Jun 26 13:15:45 2012 -0400
linux: Make failure to iopl non-fatal
We load the driver list, then enable I/O, then call driver probe based
on whether I/O enable succeeded. That's bad, because the loaded
security policy might forbid port access. We happen to treat that as
fatal for some reason, which means even drivers that don't need I/O
access (like kms and fbdev) don't get the chance to run. Facepalm.
How about we just make that non-fatal instead, that sounds like a much
better plan.
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
Reviewed-by: Simon Farnsworth <simon.farnsworth@onelan.co.uk>
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit 048674a6aeb61149a1b5f6b0bc3762ddf57f38ee
Author: Adam Jackson <ajax@redhat.com>
Date: Tue Jun 26 13:12:45 2012 -0400
linux: Refactor xf86{En,Dis}ableIO
Pull platform methods into their own sections for legibility, and
rewrite the ifdefs to be more concise.
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
Reviewed-by: Simon Farnsworth <simon.farnsworth@onelan.co.uk>
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit 70e5766874a919039678bb2ed75f2ccea0cb4345
Author: Dave Airlie <airlied@redhat.com>
Date: Mon Aug 27 15:22:44 2012 +1000
xf86: fix multi-seat video device support. (v2)
If we are not seat 0 the following apply:
don't probe any bus other than platform
don't probe any drivers other than platform
assume the first platform device we match on the bus is the primary GPU.
This just adds checks in the correct places to ensure this, and
with this X can now start on a secondary seat for an output device.
v2: fix Seat0 macros
Reviewed-by: Keith Packard <keithp@keithp.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
commit 37d956e3ac9513b74078882dff489f9b0a7a5a28
Author: Keith Packard <keithp@keithp.com>
Date: Mon Sep 10 11:14:20 2012 +1000
xf86: fix compat output selection for no output GPUs
This should work properly with dynamic outputs.
Reviewed-by: Dave Airlie <airlied@redhat.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
commit e0b92f5f86f8ce71ab4c80e9902e51e2525f9705
Author: Dave Airlie <airlied@gmail.com>
Date: Thu Sep 13 18:44:06 2012 +1000
config/udev: ignore change on drm devices
for input devices we handle change like remove/add, but for
drm devices we get change events when we hotplug outputs,
so lets just ignore change at this level, and let the drivers
handle it. We may in the future want to route driver udev
from here instead.
Reported-by: Timo Aaltonen <timo.aaltonen@canonical.com>
Reviewed-by: Keith Packard <keithp@keithp.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
commit 10672a5abe7d4e924844d7e41c86c24d6367a52b
Author: Dave Airlie <airlied@redhat.com>
Date: Mon Sep 10 14:48:37 2012 +1000
xf86/platform: scan pci after probing devices
This solves a race if we are trying to dynamically power off
secondary GPUs. Its not the greatest fix ever but it probably
as good as we can do for now.
The GPU probing causes the devices to be powered up, then when
we scan the PCI bus we get the correct information from the kernel,
rather than a bunch of 0xff due to the device being powered off.
drop gratuitous '&'.
Reviewed-by: Keith Packard <keithp@keithp.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
commit e47ad8a0aec7662970e7f81e6ee487330bf094c1
Author: Dave Airlie <airlied@redhat.com>
Date: Mon Sep 17 11:48:14 2012 +1000
modesetting: remove alloca usage again
this slipped back in.
Signed-off-by: Dave Airlie <airlied@redhat.com>
commit 22746df15b5f75dc85f5cf5b73932eb8a44cb89b
Author: Dave Airlie <airlied@redhat.com>
Date: Thu Sep 6 16:33:54 2012 +1000
dri2: invalidate drawable after sharing pixmap
After we share the pixmap, the backing storage may have changed,
and we need to invalidate and buffers pointing at it.
This fixes GL compositors and prime windows lacking contents initially.
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Signed-off-by: Dave Airlie <airlied@redhat.com>
commit f8eb8c1cb4f453bdbe6a81815be8ecefba2084aa
Author: Alon Levy <alevy@redhat.com>
Date: Tue Aug 28 11:46:47 2012 +1000
modesetting: add virtual connector support
[airlied: also make sure we don't crash in future.]
Signed-off-by: Alon Levy <alevy@redhat.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
commit 5eb697d88f0735e98fe9a97770ddda83202b1597
Author: Maarten Lankhorst <maarten.lankhorst@canonical.com>
Date: Thu Sep 13 08:45:14 2012 +0200
bump version to 0.5.0
commit f0bad69edd57facd6cffde8cb0863d1a735e2492
Author: Keith Packard <keithp@keithp.com>
Date: Wed Sep 5 14:45:08 2012 -0700
Version bumped to 1.13
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 856f80c8d7f22b979c72d9c70b70187df6004a03
Merge: 0db936a5b7 b8ab93dfbc
Author: Keith Packard <keithp@keithp.com>
Date: Wed Sep 5 11:02:58 2012 -0700
Merge remote-tracking branch 'jeremyhu/master'
commit 0db936a5b7125d9b73633733cb34e5e4b72f01e8
Author: Dave Airlie <airlied@redhat.com>
Date: Mon Sep 3 15:09:36 2012 +1000
xf86: call enter/leave VT for gpu screens as well
Otherwise we can't do fast user switch properly for multiple GPUs.
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
commit 18deac48db0d2387242461025904eb28a0f71fac
Author: Dave Airlie <airlied@redhat.com>
Date: Mon Aug 27 15:17:21 2012 +1000
config/udev: respect seat for hotplugged video devices.
This respects the seat tag for hotplugged video devices at X start.
Reviewed-by: Keith Packard <keithp@keithp.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
commit ec740cffeba59216f4293fba829097654cde3b11
Author: Dave Airlie <airlied@redhat.com>
Date: Mon Aug 27 15:15:19 2012 +1000
config/udev: add wrapper around check if server is not seat 0
this is a simple clean-up that is useful to stop further propogation
of this construct.
Reviewed-by: Keith Packard <keithp@keithp.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
commit 49ec57d5094be0dd2b67435ac7bb04ead780f36d
Author: Dave Airlie <airlied@redhat.com>
Date: Fri Aug 24 13:23:01 2012 +1000
dix: free default colormap before screen deletion
If we don't free this here, it gets freed later in the resource
cleanups, however it then looks up up pmap->pScreen, which we
freed already in this function. So free the default colormap
when we should.
This fixes a bug after a couple of hotplug cycles when you try
to exit the X server and it crashes.
Reviewed-by: Keith Packard <keithp@keithp.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
commit 20f601a0fbc01a4f8ab85e54ee45f78f7817cdb5
Author: Dave Airlie <airlied@redhat.com>
Date: Fri Aug 24 12:56:18 2012 +1000
xf86/crtc: don't free config->name
This is set by pre_init not screen init, so if we free it here
and then recycle the server, we lose all the providers.
I think we need to wrap FreeScreen here to do this properly,
will investigate for 1.14 most likely, safer to just leak this
on server exit for now.
Reviewed-by: Keith Packard <keithp@keithp.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
commit b8ab93dfbc7f292b5bfe7e9113e1af824ccbd1a8
Author: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
Date: Tue Aug 28 10:06:51 2012 -0700
list: Use offsetof() and typeof() to determine member offsets within a structure
Some compilers have difficulty with the previous implementation which
relies on undefined behavior according to the C standard. Using
offsetof() from <stddef.h> (which most likely just uses
__builtin_offsetof on modern compilers) allows us to accomplish this
without ambiguity.
This fix also requires support for typeof(). If your compiler does not
support typeof(), then the old implementation will be used. If you see
failures in test/list, please try a more modern compiler.
v2: Added fallback if typeof() is not present.
Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 148583d62b84832369e9df39b3e527b99ca96761
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Wed Aug 29 09:11:35 2012 +1000
tests: move GCC diagnostics pragma outside of function
This is a a gcc 4.6+ feature.
signal-logging.c:210: error: #pragma GCC diagnostic not allowed inside
functions
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Dave Airlie <airlied@redhat.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit c75c947b6e9bc725821b28835f3667c4aabef9ee
Author: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
Date: Tue Aug 28 12:43:55 2012 -0700
test/list: Fix test_xorg_list_del test
We never use child[2], so it's state is undefined.
This issue seems to have existed since the test was first
written: 92788e677be79bd04e5ef140f4ced50ad8b1bf8e
Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 486038fe16957b39d39842365c5409c494c9a8df
Author: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
Date: Mon Aug 27 22:35:51 2012 -0700
XQuartz: Bump Info.plist version to 2.7.4
Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
commit b90b3f6eac34616c46ab693fafbf6b73a04f407b
Author: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
Date: Mon Aug 27 17:15:19 2012 -0700
test: Make os test more compliant
sighandler_t is not UNIX.
Regression from: 7f09126e068015db54c56bb982b8f91065375700
Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
commit a557edca6152ad09c685a00e01534c35a1f00f2e
Merge: 6619f5c0e1 24ffcfcded
Author: Keith Packard <keithp@keithp.com>
Date: Mon Aug 27 08:06:09 2012 -0700
Merge remote-tracking branch 'whot/for-keith'
commit 24ffcfcded6b4b024958801e8a6cecad36d9a3e3
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Mon Aug 20 10:28:26 2012 +1000
os: fix typo, fsync when WIN32 is _not_ defined
Introduced in 164b38c72fe9c69d13ea4f9c46d4ccc46566d826
Reported-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Keith Packard <keithp@keithp.com>
commit d53e6e02a2595ced1882f5fcd34d08ea039b3b85
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu Aug 16 13:54:42 2012 +1000
mi: don't check for core events in miPointerSetPosition (#53568)
As of 81cfe44b1ed0de84ad1941fe2ca74bebef3fc58d, miPointerSetPosition now
returns the screen pointer of the device. This broke floating slave devices,
as soon as a motion event was submitted, miPointerSetPosition returned NULL,
crashing the server.
dev->coreEvents is only false if the device is a floating slave, in which
case it has a sprite.
X.Org Bug 53568 <http://bugs.freedesktop.org/show_bug.cgi?id=53568>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Keith Packard <keithp@keithp.com>
commit 6619f5c0e1086b57888ff7146e8ed5897b50d440
Author: Keith Packard <keithp@keithp.com>
Date: Tue Aug 21 13:46:34 2012 -0700
Relase 1.12.99.905
RC with updated ABI version numbers.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit bafbd99080be49a17be97d2cc758fbe623369945
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Wed Aug 8 11:34:32 2012 +1000
dix: work around scaling issues during WarpPointer (#53037)
In WarpPointer calls, we get input in screen coordinates. They must be
scaled to device coordinates, and then back to screen coordinates for screen
crossing and root coordinates in events.
The rounding errors introduced (and clipping in core/XI 1.x events) can lead
to the actual position being different to the requested input coordinates.
e.g. 200 scales to 199.9999, truncated to 199 in the event.
Avoid this by simply overwriting the scaled screen coordinates with the
input coordinates for the POINTER_SCREEN case.
X.Org Bug 53037 <http://bugs.freedesktop.org/show_bug.cgi?id=53037>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Keith Packard <keithp@keithp.com>
commit 1ebba43052d68d874148e63c9ae38489ddfc5ec1
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Wed Aug 15 14:49:04 2012 +1000
os: don't block signal-unsafe logging, merely warn about it.
Throw an error into the log file, but continue anyway. And after three
warnings, stop complaining. Not all input drivers will be fixed in time (or
ever) and our printf implementation is vastly inferior, so there is still a
use-case for non-sigsafe logging.
This also adds more linebreaks to the message.
CC: Chase Douglas <chase.douglas@canonical.com>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Chase Douglas <chase.douglas@canonical.com>
commit 4912b4adb666dad96b832ab2d7caaae49808723e
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Mon Aug 13 14:44:44 2012 +1000
os: add support for %d and %i to pnprintf
The mouse driver uses %i in some debug messages
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Chase Douglas <chase.douglas@canonical.com>
commit 7f8c39c8b5ef89153ecd84d16331e96d8feb18ef
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Mon Aug 13 14:24:36 2012 +1000
Add FormatInt64 to convert signed integers in signal-safe manner
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Chase Douglas <chase.douglas@canonical.com>
commit 36c1d92ec0ef0f3927034a12d4cb79dcc22bd185
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Mon Aug 13 12:24:39 2012 +1000
test: add a few tests for signal-safe logging
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Chase Douglas <chase.douglas@canonical.com>
commit b69536b475118a8787c1726355b504207bf83f8f
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Mon Aug 13 11:15:54 2012 +1000
test: assert from signal-safe number conversion
Throw an assert when the conversion fails instead of just returning. Asserts
are more informative.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Chase Douglas <chase.douglas@canonical.com>
commit 3e091e1075dc29120e54ab2ef110b04ce7383ffd
Author: Aaron Plattner <aplattner@nvidia.com>
Date: Fri Aug 17 11:26:05 2012 -0700
xfree86: Bump extension ABI to 7.0
Commit 9d457f9c55f12106ba44c1c9db59d14f978f0ae8 added an array of
DevPrivateSetRec structures in the middle of the ScreenRec, which throws off
extension modules trying to call things like pScreen->DestroyPixmap.
Signed-off-by: Aaron Plattner <aplattner@nvidia.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit ac616d8ed5a634c6b32775eb7b071a13c575fd97
Author: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
Date: Thu Aug 16 19:09:42 2012 -0700
XQuartz: Use asl_log_descriptor for children as well
This change is #if'd out due to a bug in asl_log_descriptor, but
it is left here as reference to be enabled in the future.
Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
commit ad123071e54d890d36d1373f59b8a6eb4937e936
Author: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
Date: Thu Aug 16 13:02:28 2012 -0700
XQuartz: Use asl_log_descriptor on Mountain Lion
Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
commit 7c3d2e4828deb4e8ec38e8ef88d6f92b2d931033
Author: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
Date: Thu Aug 16 19:42:54 2012 -0700
XQuartz: console_redirect: Properly zero-out the tail of the array on realloc()
We forgot to multiply by sizeof(), so it wasn't fully zeroed out.
Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
commit a32e01802ff1c938c0afe0cc007a273b9ada8610
Author: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
Date: Thu Aug 16 15:43:34 2012 -0700
XQuartz: console_redirect: Set the correct location for reading into the buffer
Prior to this change, it was possible that a large message would have some
of its data prepended to subsequent messages due to our not incorrectly
setting the location to write into the buffer.
Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
commit e3d7d5d18e3281677890064679af459e1af108cf
Author: Adam Jackson <ajax@redhat.com>
Date: Thu Jul 19 22:15:10 2012 +0000
Implement ->driverFunc
Copied from fbdev, makes it so we can run without iopl.
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit ad5fe2d9614959b68bf71e23abf7e5abac9c2734
Merge: 16d8da5ca9 99b94af1ff
Author: Keith Packard <keithp@keithp.com>
Date: Wed Aug 15 13:29:17 2012 -0700
Merge remote-tracking branch 'jeremyhu/master'
commit 16d8da5ca99211bd180f532d78d7c5943d38c8ad
Author: Paul Berry <stereotype441@gmail.com>
Date: Tue Jul 31 15:15:56 2012 -0700
glx: Skip multisampled configs when matching pre-existing X visuals.
In __glXScreenInit() we generate the set of GLX visuals in two steps:
first we match each pre-existing X visual with a corresponding
FBConfig, then we generate a new X visual to correspond to all the
remaining FBConfigs.
The first step is used for the two default 24-bit visuals (true color
and direct color) and for the 32-bit visual. If windowsystem
multisampling is enabled in Mesa, we need to ensure that none of these
three visuals gets matched to a multisampled config.
Fixes a bug with windowsystem multisampling in gnome-shell. If the X
server happens to match up a multisampled FBConfig to the 32-bit
visual, gnome-shell will try to use it to read pixels from
alpha-blended windows (such as gnome-terminal), resulting in no window
appearing on screen.
Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
Reviewed-by: Chad Versace <chad.versace@linux.intel.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 99b94af1ffbef7047f88e7d6c594242d172bec02
Author: Jeremy Huddleston <jeremyhu@apple.com>
Date: Wed Aug 15 10:28:16 2012 -0700
XQuartz: Fix build regression for GlxExtensionInit
quartz.c:153:6: error: use of undeclared identifier 'GlxExtensionInit'; did you mean 'GEExtensionInit'? [Semantic Issue]
{GlxExtensionInit, "GLX", &noGlxExtension},
Regression-from: aad428b8e21c77397c623b78706eb64b1fea77c9
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
commit c0540b4c8db676d18a9a09828f1590b0b16f9ebc
Author: Keith Packard <keithp@keithp.com>
Date: Tue Aug 7 17:49:48 2012 -0700
Kludge -- Call RandR screen before cleaning up xf86 crtcs
The core RandR screen cleanup now involves cleaning up any GPU screen
associations, and those call down into DDX to clean up the driver. If
the pointers from the xf86 structures back to the core randr
structures are set to NULL at that point, bad things happen.
This patch "knows" that the core RandR close screen is underneath the
xf86 randr close screen function, and so makes sure it gets called
first.
Signed-off-by: Keith Packard <keithp@keithp.com>
Reviewed-by: Dave Airlie <airlied@redhat.com>
commit 288b87e42cbb5db34cda848143655e84af8455da
Author: Keith Packard <keithp@keithp.com>
Date: Tue Aug 7 17:49:47 2012 -0700
Close GPU screens before core screens
This should make cleaning up the GPU screens easier as the core
screens they are associated with will still be around.
Signed-off-by: Keith Packard <keithp@keithp.com>
Reviewed-by: Dave Airlie <airlied@redhat.com>
commit 19772670e3041fe1c7f5bbf32fa039a6d8245ccb
Author: Keith Packard <keithp@keithp.com>
Date: Tue Aug 7 17:49:46 2012 -0700
Only free Render filter names on last screen close
Hotplugging screens causes the render filter names to get freed while
still in use; wait for the last core screen to be closed before
freeing them. That only happens at server reset, when we want them to
be freed.
Signed-off-by: Keith Packard <keithp@keithp.com>
Reviewed-by: Dave Airlie <airlied@redhat.com>
commit 863d528a9f76d0e8f122aebf19f8564a4c67a938
Author: Simon Schubert <2@0x2c.org>
Date: Sun Aug 12 09:40:16 2012 -0700
fb: reorder Bresenham error correction to avoid overshoot.
When fbBresSolid draws a line, it can happen that after the last
pixel, the Bresenham error term overflows, and fbBresSolid paints
another pixel before adjusting the error term.
However, if this happens on the last pixel (len=0), this extra pixel
might overshoot the boundary, and, in rare cases, lead to a segfault.
Fix this issue by adjusting for the Bresenham error term before
drawing the main pixel, not after.
Fixes: https://bugs.freedesktop.org/show_bug.cgi?id=24274
Signed-off-by: Simon Schubert <2@0x2c.or>
Tested-by: Mitch Davis <mjd+freedesktop.org@afork.com>
Signed-off-by: Matt Turner <mattst88@gmail.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit c22c936b35cee60609041ccb7ee52c00b0634d7b
Author: Keith Packard <keithp@keithp.com>
Date: Tue Aug 7 16:04:25 2012 -0700
Release 1.12.99.904
Closing the non-critical bug window for 1.13
Signed-off-by: Keith Packard <keithp@keithp.com>
commit f94ec283efc922106e7ea1d85771950c66ee8f3b
Author: Keith Packard <keithp@keithp.com>
Date: Tue Aug 7 16:18:21 2012 -0700
Distribute include/glx_extinit.h
This changed should have been in aad428b8e21c77397c623b78706eb64b1fea77c9
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 9ca67de8feab59fcf7d6e3fdec8d8a7cfbb21651
Author: Julien Cristau <jcristau@debian.org>
Date: Sat Jul 14 16:07:51 2012 +0200
Bump glproto requirement to 1.4.16
Signed-off-by: Julien Cristau <jcristau@debian.org>
Reviewed-by: Dave Airlie <airlied@redhat.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 02f94b2d446f6700f791f318c551ac835af8445a
Merge: 360fa7736b 7f09126e06
Author: Keith Packard <keithp@keithp.com>
Date: Mon Aug 6 16:52:12 2012 -0700
Merge remote-tracking branch 'whot/for-keith'
commit 360fa7736b214cae3ccd39feb4dc87b9e7e9734c
Merge: 2100e72388 ac09a4a091
Author: Keith Packard <keithp@keithp.com>
Date: Mon Aug 6 16:42:34 2012 -0700
Merge remote-tracking branch 'airlied/for-keithp'
commit 2100e72388a3dc174093d80c9723f021b4614d17
Merge: 4a6f42dda0 c37c65052f
Author: Keith Packard <keithp@keithp.com>
Date: Mon Aug 6 16:40:54 2012 -0700
Merge remote-tracking branch 'alanc/master'
commit 7f09126e068015db54c56bb982b8f91065375700
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri Aug 3 15:36:34 2012 +1000
os: don't unconditionally unblock SIGIO in OsReleaseSignals()
Calling OsReleaseSignal() inside the signal handler releases SIGIO, causing
the signal handler to be called again from within the handler.
Practical use-case: when synaptics calls TimerSet in the signal handler,
this causes the signals to be released, eventually hanging the server.
Regression introduced in 08962951de.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com>
commit cb306a8f174bec9ded95191b91797f59250e6808
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Tue Jul 31 16:09:38 2012 +1000
dix: make sure the mask is set for emulated scroll events (#52508)
If a device has smooth scrolling axes, but submits scroll button events, we
convert those to motion events and update the valuators. For legacy button
events, the valuator mask is likely unset though, causing
add_to_scroll_valuator() to return early, leaving us with an empty mask.
That again skipped the rest of the code and no events were generated.
Fix it by making sure that the scroll valuator in the mask is at least
initialized to 0.
Broke evdev wheel emulation, introduced by
54476b5e4461ff523e935961affabcf0de12c556.
X.Org Bug 52508 <http://bugs.freedesktop.org/show_bug.cgi?id=52508>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Chase Douglas <chase.douglas@canonical.com>
commit 4a6f42dda00ba3b5616f8a86f0d4c9a652c7d9d4
Author: Adam Jackson <ajax@redhat.com>
Date: Mon Jul 23 16:34:28 2012 -0400
sync: Fix logic error from b55bf248581dc66321b24b29f199f6dc8d02db1b
That commit adds two hunks, and I _think_ they're backwards. It adds
code to modify bracket_greater on NegativeTransition triggers, and
bracket_less on PositiveTransition triggers. That breaks symmetry with
the surrounding code; the code as of this commit could probably be
simplified further.
I can't keep the sync trigger rules in my head for more than about five
minutes at a time, so I'm sending this on for more eyes. RHEL 6.3's
xserver is shipping with b55bf248 reverted:
https://bugzilla.redhat.com/show_bug.cgi?id=748704#c33
And there appear to be some upstream reports of the same issue:
https://bugzilla.gnome.org/show_bug.cgi?id=658955
So I'd like to get this sorted out.
Signed-off-by: Adam Jackson <ajax@redhat.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 454d0e3a1bb14d7f2579ccb5e513cec5686160e7
Author: Dave Airlie <airlied@redhat.com>
Date: Thu Jul 26 12:56:51 2012 +1000
randr: fix xinerama output for output slaves
This fixes the xinerama geometry when output slaves are enabled.
Tested with xdpyinfo -ext XINERAMA before after slave added.
Signed-off-by: Dave Airlie <airlied@redhat.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit ac09a4a091a43188241365152e1244fd8fd93ee7
Author: Dave Airlie <airlied@redhat.com>
Date: Fri Aug 3 16:43:22 2012 +1000
dri2: fix master pixmap free and reset pointer
These are two minor changes, one to reset the pointer to NULL,
after freeing the pixmaps, one to make sure we use the right API for
the master pixmap, though I doubt it'll ever really matter.
Signed-off-by: Dave Airlie <airlied@redhat.com>
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
commit 64623ef90db649e89345f71871affe7a9606f6ea
Author: Dave Airlie <airlied@redhat.com>
Date: Fri Aug 3 16:42:44 2012 +1000
dri2: free slave pixmap on app exit
When the drawable disappears we need to free the prime master/slave combos.
This fixes a leak after a prime app is run.
Signed-off-by: Dave Airlie <airlied@redhat.com>
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
commit 1a465fef9bc21142eecca3999f0761a3c0501a09
Author: Dave Airlie <airlied@redhat.com>
Date: Fri Aug 3 16:41:45 2012 +1000
pixmap: have slave pixmap take a reference on master pixmap
Since the free routines free the master pixmap then the slave, we should
be taking a reference when we bind them together.
Fixes a use-after-free when resizing a primed gears.
Signed-off-by: Dave Airlie <airlied@redhat.com>
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
commit c37c65052f674cd58894ad0b9ec22928a62c624e
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Mon Jul 16 21:12:06 2012 -0700
Make indentation of dix/tables.c much more consistent and readable
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Acked-by: Daniel Stone <daniel@fooishbar.org>
commit 9f7ef7f7f0566f6319d8328ce0a1e6d0fa866720
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Mon Jul 16 20:53:00 2012 -0700
Fix up formatting of initializers for arrays of structs
The indenter seems to have gotten confused by initializing arrays of
structs with the struct defined inline - for predefined structs it did
a better job, so match that.
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
commit c7b7abfaa068042e396d19538215402cfbb4f1e4
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Sat Jul 14 11:21:15 2012 -0700
RRModeCreate: plug memory leak of newModes if AddResource fails
Reported by parfait 1.0:
Error: Memory leak (CWE 401)
Memory leak of pointer 'newModes' allocated with realloc(((char*)modes), ((num_modes + 1) * 8))
at line 93 of randr/rrmode.c in function 'RRModeCreate'.
pointer allocated at line 82 with realloc(((char*)modes), ((num_modes + 1) * 8)).
Error: Memory leak (CWE 401)
Memory leak of pointer 'newModes' allocated with malloc(8)
at line 93 of randr/rrmode.c in function 'RRModeCreate'.
pointer allocated at line 84 with malloc(8).
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Keith Packard <keithp@keithp.com>
commit 1eb7be863353be2cf3e83738253eb60c5fe49d19
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Sat Jul 14 09:29:52 2012 -0700
rrproperty.c: free newly allocated prop in more error paths
Reported by parfait 1.0:
Error: Memory leak (CWE 401)
Memory leak of pointer 'prop' allocated with RRCreateOutputProperty(property)
at line 220 of randr/rrproperty.c in function 'RRChangeOutputProperty'.
'prop' allocated at line 154 with RRCreateOutputProperty(property).
prop leaks when pending != 0 at line 160.
Error: Memory leak (CWE 401)
Memory leak of pointer 'prop' allocated with RRCreateOutputProperty(property)
at line 346 of randr/rrproperty.c in function 'RRConfigureOutputProperty'.
'prop' allocated at line 334 with RRCreateOutputProperty(property).
at line 350 of randr/rrproperty.c in function 'RRConfigureOutputProperty'.
'prop' allocated at line 334 with RRCreateOutputProperty(property).
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Keith Packard <keithp@keithp.com>
commit 42e655de4d95cb108aec50efec6bbdb709bb13d7
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Tue Jul 10 23:29:53 2012 -0700
rrproviderproperty.c: free newly allocated prop in more error paths
Reported by parfait 1.0:
Error: Memory leak (CWE 401)
Memory leak of pointer 'prop' allocated with RRCreateProviderProperty(property)
at line 221 of randr/rrproviderproperty.c in function 'RRChangeProviderProperty'.
'prop' allocated at line 155 with RRCreateProviderProperty(property).
prop leaks when pending != 0 at line 161.
Error: Memory leak (CWE 401)
Memory leak of pointer 'prop' allocated with RRCreateProviderProperty(property)
at line 345 of randr/rrproviderproperty.c in function 'RRConfigureProviderProperty'.
'prop' allocated at line 333 with RRCreateProviderProperty(property).
at line 349 of randr/rrproviderproperty.c in function 'RRConfigureProviderProperty'.
'prop' allocated at line 333 with RRCreateProviderProperty(property).
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Keith Packard <keithp@keithp.com>
commit 94b514d5e4b376d05e106eb3853da511256e8545
Merge: 7d87545ba7 7328900042
Author: Keith Packard <keithp@keithp.com>
Date: Mon Aug 6 15:13:17 2012 -0700
Merge remote-tracking branch 'whot/for-keith'
commit 7d87545ba7395ade507cca7bdca7052b26ed18d8
Merge: ad707a7dcc 988d7ace19
Author: Keith Packard <keithp@keithp.com>
Date: Mon Aug 6 15:11:13 2012 -0700
Merge remote-tracking branch 'jturney/master'
commit ad707a7dcc65c30e030c7600b54f734090e56a91
Merge: 5a51cb86f3 884f51e977
Author: Keith Packard <keithp@keithp.com>
Date: Mon Aug 6 15:08:01 2012 -0700
Merge remote-tracking branch 'jeremyhu/master'
commit 5a51cb86f39a6809305c403beea54c3625e36259
Author: Keith Packard <keithp@keithp.com>
Date: Tue Jul 10 23:09:47 2012 -0700
xfree86: When xf86CrtcCloseScreen is called, the randr CRTCs are gone
The RandR CRTC structures are freed when their resource IDs are
destroyed during server shut down, which is before the screen is
closed. Calling back into RandR with stale pointers just segfaults the
server.
Signed-off-by: Keith Packard <keithp@keithp.com>
Reviewed-by: Dave Airlie <airlied@redhat.com>
Tested-by: Knut Petersen <knut_petersen@t-online.de>
commit 1bf81af4a6be1113bcc3b940ab264d5c9e0f0c5d
Author: Rui Matos <tiagomatos@gmail.com>
Date: Mon Jul 30 14:32:12 2012 -0400
xf86RandR12: Don't call ConstrainCursorHarder() if panning is enabled
Panning is at odds with CRTC cursor confinement. This disables CRTC cursor
confinement as long as panning is enabled.
Fixes regression introduced in 56c90e29f04727c903bd0f084d23bf44eb1a0a11.
Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Rui Matos <tiagomatos@gmail.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit ff56f88616aa63797384c2c484b2bd0f194df96a
Author: Adam Jackson <ajax@redhat.com>
Date: Mon Jul 30 14:32:11 2012 -0400
randr: Fix up yet another corner case in preferred mode selection
Let's say - purely for the sake of argument, mind you - that you had a
server GPU with anemic memory bandwidth, and you walked up to it and
plugged in a monitor that was 1920x1080 because that's what happened to
be on the crash cart. Say the memory bandwidth is such that anything
larger than 1280x1024 gets filtered away. Now you're in trouble,
because the established timings section includes a 720x400 mode because
that's what DOS 80x25 is, and that happens to just about match the
physical aspect ratio.
Instead let's reuse the logic from the existing aspect-match path: pick
the larger mode of either the physical aspect ratio or 4:3.
Reviewed-by: Julien Cristau <jcristau@debian.org>
Signed-off-by: Adam Jackson <ajax@redhat.com>
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 531785dd746d64ef7f473a83ca73bb20e74b6fca
Author: Dave Airlie <airlied@redhat.com>
Date: Mon Jul 30 14:32:10 2012 -0400
kinput: allocate enough space for null character.
This code wasn't allocating enough space and was assigning the NULL
one past the end.
Pointed out by coverity.
Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 8843aed82e7d69422e7763a35832a2be8f26723f
Author: Vic Lee <llyzs@163.com>
Date: Mon Jul 30 14:32:09 2012 -0400
ephyr: Resize screen automatically when parent window is resized
Bugzilla: https://bugs.freedesktop.org/25804
Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Vic Lee <llyzs@163.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit b46bbafae6d0a8b3f2f7853d5c1475fc223b1ed6
Author: Adam Jackson <ajax@redhat.com>
Date: Mon Jul 30 14:32:08 2012 -0400
ephyr: Fix up some bizarre formatting
Signed-off-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 7328900042b9c1312aed48753fd6054e64613e4c
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Mon Jul 30 23:37:06 2012 -0700
XIChangeDeviceProperty: free newly allocated prop when SetProperty fails
Reported by parfait 1.0:
Error: Memory leak (CWE 401)
Memory leak of pointer 'prop' allocated with XICreateDeviceProperty(property)
at line 774 of Xi/xiproperty.c in function 'XIChangeDeviceProperty'.
'prop' allocated at line 700 with XICreateDeviceProperty(property).
prop leaks when handler != NULL at line 768
and handler->SetProperty != NULL at line 769
and checkonly != 0 at line 772
and rc != 0 at line 772.
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 4dbbcdf64563cb95f83c04b2442cb7e868384264
Author: Daniel d'Andrada <daniel.dandrada@canonical.com>
Date: Thu Jul 26 17:31:57 2012 -0300
Do sent TouchEnd to listeners that don't own an accepted touch
When the owner of a touch accepts it, the other listeners must
receive a TouchEnd.
Even though there's code implementing the logic above in
ProcessTouchOwnershipEvent(), DeliverTouchEndEvent() was refusing to send
those TouchEnd events in this situatuation.
Signed-off-by: Daniel d'Andrada <daniel.dandrada@canonical.com>
Reviewed-by: Chase Douglas <chase.douglas@canonical.com>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 02d91ccb0955252153206061a44340f051077624
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu Jun 21 15:42:17 2012 +1000
test: always add DIX_LIB and OS_LIB on XORG builds
With --disable-xorg, We also disabled a bunch of tests because of their
perceived reliance on a DDX. The cause was libtool missing some object files
that never ended up in libxservertest.la. Only the xfree86 test has a true
dependency on XORG.
DIX_LIB was pointing to dix.O (instead of libdix.la) when
DTRACE_SPECIAL_OBJECTS was defined. libdix.la should be part of XSERVER_LIBS
but dix.O is not a recognised libtool object, so it got skipped for
libxservertest.a. Only in the XORG case would we add DIX_LIB and OS_LIB
manually, thus forcing linkage with the dtrace-generated objects.
Fixing this by packaging up the dtrace-generated files as part of
libdix.la/libos.la doesn't work for Solaris (and possible others), so simply
always force linkage against the DIX_LIB/OS_LIB in the case of dtrace objects.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Tested-by: Alan Coopersmith <alan.coopersmith@oracle.com>
commit 988d7ace19a009991a4528e783d1a94c2444c66a
Author: Jon TURNEY <jon.turney@dronecode.org.uk>
Date: Thu Jul 5 09:38:44 2012 +0100
glx: Do not report the GLX_INTEL_swap_event extension for indirect swrast
Commit 84956ca4 bogusly adds GLX_INTEL_swap_event to the extensions reported
by swrast.
"DRI2 supports this now - and already enables it explicitly - but drisw does
not and should not. Otherwise toolkits like clutter will only ever SwapBuffers
once and wait forever for an event that's not coming."
(A similar bug for direct swrast is already fixed in mesa commit 25620eb1)
(Note that this may be papering over the cracks somewhat, as if we do report
GLX_INTEL_swap_event, some clutter apps fail with GLXBadDrawable calling
GLXChangeDrawableAttributes to change the setting of GLX_BUFFER_SWAP_COMPLETE_INTEL_MASK
in the GLX_EVENT_MASK, apparently after the drawable is destroyed, which suggests
a bug with GLXDrawable lifetimes)
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Reviewed-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
commit fd3d45c137bb849aa9030d732ea9277292e01d3d
Author: Jon TURNEY <jon.turney@dronecode.org.uk>
Date: Thu Jul 5 09:34:24 2012 +0100
glx: Don't note GLX_INTEL_swap_event as being required by GLX 1.4, it isn't.
Don't note GLX_INTEL_swap_event as being required by GLX 1.4, it isn't.
(This data is not currently used in the server)
(A similar change is made in mesa commit d3f7597bc9f6d5)
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Reviewed-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
commit a8464dfa28dea78201e3e4398eb3bcb745e10087
Author: Colin Harrison <colin.harrison@virgin.net>
Date: Sun Jul 22 13:15:02 2012 +0100
os: Fix TMP fall-back in Win32TempDir()
Fix Win32TempDir() in the case where we fell back to checking the TMP
environment variable. It looks like this has been wrong since forever.
Signed-off-by: Colin Harrison <colin.harrison@virgin.net>
Reviewed-by: Jon TURNEY <jon.turney@dronecode.org.uk>
commit f6e7b82acadfca8239edc0f7e72cd0f3f9cfc2c4
Author: Marc Haesen <marha@users.sourceforge.net>
Date: Sat Jul 21 21:18:44 2012 +0100
hw/xwin: Fixes to pixelFormat <-> fbConfig conversion in WGL mode
Fix FIXME in fbConfigToPixelFormat() to correctly populate RGBA-mask shift
parameters. Also request colourindex pixelFormats correctly.
Now that they are requested correctly, don't skip colorindex visuals when
converting pixelFormats to fbConfigs.
Populate transparent colour information when converting pixelFormat from
DescribePixelFormats() to a fbConfig.
Signed-off-by: Marc Haesen <marha@users.sourceforge.net>
Reviewed-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
commit 45c432871d6a244e9e558a6a4e7c36e90764135e
Author: Jon TURNEY <jon.turney@dronecode.org.uk>
Date: Sat Jul 21 14:13:37 2012 +0100
hw/xwin: Introduce winProcessXEventsTimeout() to the concept of fractions of a second
Oh this is terrible.
Currently we only compute the select timeout in whole seconds. This means if we
have less than 1 second remaining, we select with a timeout of 0 (i.e. poll)
which causes the task to spin, burning 100% CPU for the remaining timeout (and
possibly preventing the process we are waiting for from running :S)
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
commit 23cd4d0174194e10721d2e465fd1a1c52f001520
Author: Jon TURNEY <jon.turney@dronecode.org.uk>
Date: Sat Jul 21 12:33:05 2012 +0100
hw/xwin: Fix winUpdateWindowPosition() not to assume WS_EX_APPWINDOW style
Also improve it's debug output a bit
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
commit 527cf13135cfd279733060e0028bbfbe02be5167
Author: Jon TURNEY <jon.turney@dronecode.org.uk>
Date: Sat Jul 21 14:09:16 2012 +0100
hw/xwin: Make winOverrideIcon() thread-safe for icon data access
winOverrideIcon() is called from the internal WM client thread.
Accessing server-internal data structures to get icon data or window hints is
not safe, as there is no lock to ensure we do not collide with these data
structures being updated in the server thread.
Rewrite so the internal client thread uses X client calls to obtain this data
safely
We used to also set the icon inside the server when the window was initially
created. For simplicity, we simply send a message to the internal WM to update
the icon when the window is created (rather than writing different icon update
code which can work in the server thread for that one case...)
extwm mode used to do the icon update in the server. I'm not sure that actually
made much sense. Let's assume the external WM client can do it instead...
v2
Make sure that WM_WM_ICON_EVENT does nothing for override-redirect windows
v3
Reinstate check that native window actually has expected properties for an X
window before trying to update it's icon; some auxiliary windows owned by the
XWin process don't, which would cause a crash
v4
Various fixes to pixmap icon conversion:
- remove left-over malloc in winScaleXimageToWindowsIcon causing a memory leak
- don't recalculate DDBitmap stride in winScaleXimageToWindowsIcon, when we already have worked it out
- properly check that XGetWindowProperty(NET_WM_ICON) returned some data
- don't try to retrieve WM_HINTS icon_mask if it isn't set
- restore accidentally dropped calculation of effBpp, stride, maskStride of output DDBitmap
- make sure imageMask is zero-initalized before we use it to mask the DDBitmap
v5
Remove a left-over unused variable
v6
Avoid XDestroyImage(NULL) crash if XGetImage failed for icon_pixmap
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
commit 2677d89823b851fea31036f51589985bb86864b7
Author: Jon TURNEY <jon.turney@dronecode.org.uk>
Date: Sun Jul 22 17:38:55 2012 +0100
hw/xwin: Also update icon when _NET_WM_ICON property changes
_NET_WM_ICON property is also considered to decide on the window icon, so also
send a WM_WM_ICON_EVENT message to the WM if the PropertyNotify event is for
_NET_WM_ICON property
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
commit a07541f1ffc28c57a762beefb96c7bf0ac40b0a4
Author: Jon TURNEY <jon.turney@dronecode.org.uk>
Date: Sun Jul 22 16:15:12 2012 +0100
hw/xwin: Rename WM_WM_HINTS_EVENT to WM_WM_ICON_EVENT
WM_WM_HINTS_EVENT only updates the icon, so rename it to WM_WM_ICON_EVENT
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
commit 2a47c91eb382d1ff0fb009a39efa7dc9c6fd5112
Author: Jon TURNEY <jon.turney@dronecode.org.uk>
Date: Fri Jul 20 13:51:35 2012 +0100
hw/xwin: Refactor Xutf8TextPropertyToString() from GetWindowName() as a separate utility function
Simplify GetWindowName() by moving UTF-8 to wchar conversion out to it's call
site. This allows us to do extra processing on the window name in future.
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
commit 884f51e9770c9ccd3b38a14ea393ea2c7a5ef235
Author: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
Date: Wed Aug 1 18:46:08 2012 -0700
XQuartz: Fix xp_window_bring_all_to_front linking on OS versions with older libXplugin
Found-by: Tinderbox
Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
commit b4c2358e0a388730f1beda5d3a12e79755208ce6
Author: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
Date: Wed Aug 1 18:45:43 2012 -0700
pbproxy: Fix a warning about a bad method prototype
x-selection.m:1502:1: warning: method has no return type specified; defaults to 'id'
[-Wmissing-method-return-type,Semantic Issue]
- init
^
(id)
1 warning generated.
Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
commit f193907f1b2f8d17dac9b59b7e93ddbb0f4e31ca
Author: Jon TURNEY <jon.turney@dronecode.org.uk>
Date: Fri Jun 22 14:56:22 2012 +0100
Fix pseudoramiX.c compilation without darwin.h
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Reviewed-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
commit 067931ccce592e319baffa26d4f7380d8d924537
Author: Jon TURNEY <jon.turney@dronecode.org.uk>
Date: Mon Jul 23 12:16:36 2012 +0100
hw/xquartz: Various fixes for pseudoramiX.c
Various fixes, applied to panoramiX.c in commit 2b266eda, also need applying to pseudoramiX.c:
Fix panoramiX request and reply swapping
Set window and screen values in panoramix replies
Prevent buffer overrun in ProcPanoramiXGetScreenSize
These fixes seem to be necessary in order to compile pseudoramiX.c with gcc
pseudoramiX.c: In function 'ProcPseudoramiXGetState':
pseudoramiX.c:221:56: error: call to 'wrong_size' declared with attribute error: wrong sized variable passed to swap
pseudoramiX.c: In function 'ProcPseudoramiXGetScreenCount':
pseudoramiX.c:250:62: error: call to 'wrong_size' declared with attribute error: wrong sized variable passed to swap
pseudoramiX.c: In function 'ProcPseudoramiXGetScreenSize':
pseudoramiX.c:283:56: error: call to 'wrong_size' declared with attribute error: wrong sized variable passed to swap
pseudoramiX.c:284:57: error: call to 'wrong_size' declared with attribute error: wrong sized variable passed to swap
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Reviewed-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
commit aad428b8e21c77397c623b78706eb64b1fea77c9
Author: Dave Airlie <airlied@redhat.com>
Date: Thu Jul 26 09:54:08 2012 +1000
glx: drop GLX_LIBS from X server and workaround sdksyms.
We've had reports of two copies of the GLX bits, one in the server
and one in libglx.so causing problems, I didn't understand why the
X server needed a copy so drop it, however then we have to fix a missing
GlxExtensionInit that comes from sdksyms, so work around it by moving
that one declaration into a header that sdksyms doesn't scan.
Thanks to Jon Turney for debugging the actual problem.
(copyright header from extinit.h that seems most appropriate put on top).
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=52402
Tested-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Daniel Stone <daniel@fooishbar.org>
Tested-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Signed-off-by: Dave Airlie <airlied@redhat.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit afa53fe7cffd430cf11f25ca818cb955a78c0c1c
Author: Keith Packard <keithp@keithp.com>
Date: Wed Jul 25 14:29:48 2012 -0700
Version 1.12.99.903 (1.13 RC3)
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 98e3f3fde35ca805d44ee38394bfd86058f9f4b8
Author: Adam Jackson <ajax@redhat.com>
Date: Thu Jul 19 15:00:05 2012 -0400
doc: Drop XAA references from xorg.conf man page
Signed-off-by: Adam Jackson <ajax@redhat.com>
Reviewed-by: Dave Airlie <airlied@redhat.com>
Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
Reviewed-by: Daniel Stone <daniel@fooishbar.org>
Acked-by: Aaron Plattner <aplattner@nvidia.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit dea928477bf835a13b2bd2b16c0dbaaf5468130c
Author: Adam Jackson <ajax@redhat.com>
Date: Thu Jul 19 15:00:04 2012 -0400
xfree86: Drop some dead XAA decls from SDK headers
Signed-off-by: Adam Jackson <ajax@redhat.com>
Reviewed-by: Dave Airlie <airlied@redhat.com>
Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
Reviewed-by: Daniel Stone <daniel@fooishbar.org>
Acked-by: Aaron Plattner <aplattner@nvidia.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit a44a379a2a4c198dbd6ffd6cc0db376f8fb64327
Author: Adam Jackson <ajax@redhat.com>
Date: Thu Jul 19 15:00:03 2012 -0400
cw: Remove
XAA was the only consumer.
Signed-off-by: Adam Jackson <ajax@redhat.com>
Reviewed-by: Dave Airlie <airlied@redhat.com>
Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
Reviewed-by: Daniel Stone <daniel@fooishbar.org>
Acked-by: Aaron Plattner <aplattner@nvidia.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 20b4d90f32b3ca5def5be2fdf04a91ae6c47f125
Merge: 83df169538 fd228d3184
Author: Keith Packard <keithp@keithp.com>
Date: Wed Jul 25 13:52:35 2012 -0700
Merge remote-tracking branch 'jeremyhu/master'
commit fd228d318428d0d9dea52ca560a9b66660dd2d02
Author: Jeremy Huddleston <jeremyhu@apple.com>
Date: Wed Jul 25 11:40:33 2012 -0700
XQuartz: Call xp_window_bring_all_to_front if available in libXplugin
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
commit 83df169538bddcf3a61e2c5e02a4f3e10af93b60
Author: Aaron Plattner <aplattner@nvidia.com>
Date: Fri Jul 20 00:59:20 2012 -0700
dix: don't use "new" as a parameter name
"new" is a reserved word in C++.
Signed-off-by: Aaron Plattner <aplattner@nvidia.com>
Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 02811f1a9cc35c5f82accb0459cb3910165e7e45
Author: Dave Airlie <airlied@redhat.com>
Date: Thu Jul 19 14:12:59 2012 +1000
modesetting: add output slave support.
This allows the driver to operate as an output slave.
It adds scan out pixmap, and the capability
checks to make sure they available.
Signed-off-by: Dave Airlie <airlied@redhat.com>
commit fa171c5a81b1c226b5da54f35e6726d9c8e13afb
Author: Dave Airlie <airlied@redhat.com>
Date: Tue Jun 5 14:43:21 2012 +0100
modesetting: add platform bus support
commit 709dbc68cdea9d282ba318c1cbc76614e98f41c4
Author: Dave Airlie <airlied@redhat.com>
Date: Wed Jul 25 15:38:34 2012 +1000
modesetting: fix warning about close being undefined.
Signed-off-by: Dave Airlie <airlied@redhat.com>
commit 71b86ea8dd69f21d090edd4f61698ad11b952d5e
Author: Dave Airlie <airlied@redhat.com>
Date: Wed Jul 25 15:33:52 2012 +1000
modesetting: drop useless xf86PciInfo include
Signed-off-by: Dave Airlie <airlied@redhat.com>
commit 3b7f313b3d74f9df876152c55d55cbb339bf2d02
Author: Jeremy Huddleston <jeremyhu@apple.com>
Date: Tue Jul 24 00:32:30 2012 -0700
XQuartz: Fix runtime regressions introduced by extension loading changes
* GLX is now loaded
* PseudoramiX loading is back in miinitext. It needs to be loaded
before RandR.
Regression-from: 27a624bee66d2797eacf90317054207dcf248028
Regression-from: 5f5bbbe543f65c48ecbb5cce80116a86ca3fbe86
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
commit 0d64e881a31d89d28f2ded9b8e83e93632870a16
Author: Jeremy Huddleston <jeremyhu@apple.com>
Date: Mon Jul 23 23:16:29 2012 -0700
XQuartz: Build fix for __GLXscreen::createContext changes
Regression-from: 96d74138b1c0273e88933220d99a893858b649cd
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
commit 77de2994774e7be24a0bad521180628feb1027c6
Author: Keith Packard <keithp@keithp.com>
Date: Tue Jul 17 15:47:39 2012 -0700
Bump to version 1.12.99.902
Signed-off-by: Keith Packard <keithp@keithp.com>
commit beeea70495a8d5c4afc1b1eb2cc06a24ab1a986d
Merge: 6e438a0e18 6910280297
Author: Keith Packard <keithp@keithp.com>
Date: Tue Jul 17 12:17:39 2012 -0700
Merge remote-tracking branch 'alanc/master'
commit 6e438a0e183f5a6c22070746c038af53d5b935ca
Merge: 5884e7dede 75966a4186
Author: Keith Packard <keithp@keithp.com>
Date: Tue Jul 17 12:12:53 2012 -0700
Merge remote-tracking branch 'jturney/master'
commit 75966a4186955f3a4625e93796145036c5986d2e
Author: Keith Packard <keithp@keithp.com>
Date: Fri Jul 13 14:36:25 2012 -0700
xwin: Clean up os wrappers for System, Popen and Pclose on Windows
Popen and Pclose are never used on Windows, so don't bother to even
try to define them.
System(s) was defined as system(s), but the two users of that
function are in xkb, which carefully redefines that as
Win32System. Move Win32System and Win32TempDir to os/utils.c, renaming
Win32System to be just System, which simplifies the xkb code
Signed-off-by: Keith Packard <keithp@keithp.com>
Reviewed-by: Jon TURNEY <jon.turney@dronecode.org.uk>
commit 6910280297ab610100dd8e7fbe5bb5cc08968f2f
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Sat Jul 14 10:54:36 2012 -0700
Use C99 designated initializers in DRI2GetParam replies
DRI2GetParam was going through review in parallel with main batch of
C99 initialization changes - sync up now that both have landed.
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Keith Packard <keithp@keithp.com>
commit a6c5b8d3ee053cadf685b0e4de96407ad6df4dd4
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Sat Jul 14 10:50:41 2012 -0700
Use C99 designated initializers in RandR 1.4 extension Events
RandR 1.4 was going through review in parallel with main batch of
C99 initialization changes - sync up now that both have landed.
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Keith Packard <keithp@keithp.com>
commit ada04ef0ca8a1213e865ba2c000ccd6ed6d0e371
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Sat Jul 14 10:45:29 2012 -0700
Use C99 designated initializers in RandR 1.4 extension Replies
RandR 1.4 was going through review in parallel with main batch of
C99 initialization changes - sync up now that both have landed.
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Keith Packard <keithp@keithp.com>
commit fb73f7f40fa46458990038332017d4496caa0691
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Sat Jul 14 10:02:52 2012 -0700
Fix two more C99 initialization mistakes using members of same struct
Similar to 34cf559bcf99dad, use temporary variables instead of
referencing members of the struct being initialized in the middle
of the initialization.
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Keith Packard <keithp@keithp.com>
commit 5884e7dedecdd82ddbb037360cf9c85143e094b5
Author: Aaron Plattner <aplattner@nvidia.com>
Date: Mon Jul 16 17:40:31 2012 -0700
xf86: Re-export extension disable flags
These flags were unexported by commit a1d41e311c21eb6627caa0d168e070ceaf90806f,
which moved the declarations around and lost the _X_EXPORT attributes in the
process. Since drivers need these and it's late in the release cycle, just
re-export them for now.
Signed-off-by: Aaron Plattner <aplattner@nvidia.com>
Reviewed-by: Andy Ritger <aritger@nvidia.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 357ec54f46d31ff77c441c15c322152e04f89a11
Author: Jon TURNEY <jon.turney@dronecode.org.uk>
Date: Wed Mar 14 13:58:32 2012 +0000
hw/xwin: Refer to xkeyboard-config man page for XKB configuration option values
Also polish the keyboard configuration text a bit
Include man section number in references to setxkbmap
Consistently refer to 'manual page' rather using both that and 'man page'
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
commit 5940580f8c12145c1ef4c3eee898676b48d95879
Author: Jörg Mensmann <joerg_ml@bitplanet.de>
Date: Tue Apr 17 10:48:19 2012 +0100
hw/xwin: Fix command line arguments for multiple monitors.
Moving Xwin to a certain monitor using "-screen 0 @2" would fail,
printing "ddxProcessArgument - screen - Querying monitors failed".
This happened since commit 3ead1d810b0e157078db39712e02ea6dc85216d8,
because EnumDisplayMonitor() returns FALSE if its callback function
returns FALSE (which is not clearly documented), and QueryMonitor()
would then also return FALSE.
Moving back to the old behaviour, where the return value of
EnumDisplayMonitors() is ignored.
Reviewed-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
commit 18801f5e5a98d80f4811ade8c98df65175b1935a
Author: Jon TURNEY <jon.turney@dronecode.org.uk>
Date: Fri Feb 10 09:27:16 2012 +0000
hw/xwin: Remove unused WindowExposuresProcPtr storage in screen private
We don't wrap the WindowExposures screen function
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
commit 8fd30859c293035fe505da76d8d7e64131bd5bc0
Author: Jon TURNEY <jon.turney@dronecode.org.uk>
Date: Fri Feb 10 13:25:32 2012 +0000
hw/xwin: Remove long obsolete README for hw/xwin
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
commit 3568d4af4ff2490e79286d242916e81afed57b58
Author: Jon TURNEY <jon.turney@dronecode.org.uk>
Date: Thu Feb 23 22:32:09 2012 +0000
hw/xwin: Remove a pointless OS version check in winInstallKeyboardHookLL()
Checking for OS later than NT4 SP3 (which we didn't do correctly anyhow,
just checking for NT) is pointless when other code in hw/xwin assumes at
least NT 5.0
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
commit 0ed0d3979050c4ee7bef64441d50c494d58d93b0
Author: Jon TURNEY <jon.turney@dronecode.org.uk>
Date: Thu Jul 5 22:08:38 2012 +0100
hw/xwin: Remove winClipboardDetectUnicodeSupport()
This code for detecting if the Windows clipboard can support unicode
is long obsolete.
All NT versions of Windows support unicode clipboard, so any version
of Windows we can run on must support unicode clipboard.
The -nounicodeclipboard flag to disable use of unicode on the clipboard
is retained.
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
commit c98471fad7d85fc9d9959b1c48edd90415f7bf15
Author: Jon TURNEY <jon.turney@dronecode.org.uk>
Date: Thu Jul 5 18:00:06 2012 +0100
hw/xwin: Consolidate duplicated code as getHwnd() function
Consolidate code to find the native HWND of an X window, stored in the _WINDOWSWM_NATIVE_HWND
property, duplicated in UpdateName() and PreserveWin32Stack() as getHwnd()
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
commit df7636dddb4981e14ee7d128c43bb08bdf6a8727
Author: Jon TURNEY <jon.turney@dronecode.org.uk>
Date: Thu Jul 5 14:20:52 2012 +0100
hw/xwin: Correct function name in log message
Correct function name in log message winInitializeDefaultScreens -> winInitializeScreenDefaults
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
commit 9cdd3ed07425b222e8197b9a2f57ec1525c6fd54
Author: Jon TURNEY <jon.turney@dronecode.org.uk>
Date: Fri Mar 16 12:56:45 2012 +0000
hw/xwin: Tidy up some more pointless output which is always emitted
It's not very useful to log lines like the below when the About.. dialog is used
winAboutDlgProc - WM_COMMAND - IDOK or IDCANCEL
winAboutDlgProc - WM_CLOSE
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
commit eb5b4d8d809712053701f057a35bbf5348ac9059
Author: Colin Harrison <colin.harrison@virgin.net>
Date: Thu Jul 5 14:03:44 2012 +0100
hw/xwin: RANDR resize didn't occur when screen window was maximized or restored
In windowed mode, with option -resize, RANDR resize was missing when the screen
window was maximized or restored.
Signed-off-by: Colin Harrison <colin.harrison@virgin.net>
Reviewed-by: Jon TURNEY <jon.turney@dronecode.org.uk>
commit 7e07d61857c5d2ee6e3c36c81b51bb4fe378b5a0
Author: Jon TURNEY <jon.turney@dronecode.org.uk>
Date: Thu Jul 5 14:01:03 2012 +0100
hw/xwin: Bug fixes for screen sizing when the screen window is on a non-primary monitor
There is a bug that when the -screen option is used to specify a monitor for
the screen window to be located on, but no explicit size is specified
(and the -multiplemonitors option isn't specified), the screen
window size is always constrained to fit the work area of the primary
monitor (rather than the work area of the specified monitor)
This gives incorrect results if you want a screen the same size as your
non-primary monitor (e.g. by using -screen 0 @2) and your non-primary
monitor is larger than your primary monitor.
(This can be worked around by specifying -multiplemonitors and an explicit
screen size the same size as the monitor (e.g. -multiplemonitors -screen 0
1600x1200@2))
Fix to use work area for the monitor specified for the screen, rather than the
primary monitor work area (unless -multiplemonitors is used, in which case we
continue to use the virtual desktop work area instead)
Also fix the adjustment for an autohide taskbar, so that it is only done if the
taskbar is on the same monitor as the screen (or -multiplemonitors is used)
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
commit 090856b55b5895ce07f36ddebe6d8f7cb86c1826
Author: Jon TURNEY <jon.turney@dronecode.org.uk>
Date: Thu Jul 5 13:19:02 2012 +0100
hw/xwin: Tidy up some pointless output which is always emitted
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
commit 9fe9c5f868886abf671b3be3964af1965dd92472
Author: Jon TURNEY <jon.turney@dronecode.org.uk>
Date: Sun Feb 13 18:52:52 2011 +0000
hw/xwin: Don't bother reporting XORG_VERSION_CURRENT
Don't bother reporting XORG_VERSION_CURRENT, when we also
report the version number broken down into it's components
XORG_VERSION_MAJOR, XORG_VERSION_MINOR, etc. as well.
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
commit d5977e5bd2c8ee77db08d5f948f266c9661b9fb5
Author: Dave Airlie <airlied@gmail.com>
Date: Fri Jul 13 00:28:19 2012 +1000
xf86: include xf86platformBus.h in xf86AutoConfig.c
This fixes an implicit declaration,
xf86AutoConfig.c:202:5: error: implicit declaration of function 'xf86PlatformMatchDriver' [-Werror=implicit-function-declaration]
xf86AutoConfig.c:202:5: warning: nested extern declaration of 'xf86PlatformMatchDriver' [-Wnested-externs]
Signed-off-by: Dave Airlie <airlied@redhat.com>
Reviewed-by: Keith Packard <keithp@keithp.com>
commit afa3b9ccd27ff9c58f536cb3b727e85feb6a6f6a
Author: Bartosz Brachaczek <b.brachaczek@gmail.com>
Date: Fri Jul 6 02:52:40 2012 +0200
glx: Fix checking GL version
Signed-off-by: Bartosz Brachaczek <b.brachaczek@gmail.com>
Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
Signed-off-by: Dave Airlie <airlied@gmail.com>
commit 743ccf6fa0a9a4579d6de6d10e2e6040640772d9
Author: Dave Airlie <airlied@gmail.com>
Date: Thu Jul 12 19:09:15 2012 +1000
glx/dri2: don't return NULL in a function with no return.
Reported by gcc.
Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
Reviewed-by: Matt Turner <mattst88@gmail.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
commit d1a00c26becdc2490ab4660abf108eca09c30d23
Author: Dave Airlie <airlied@gmail.com>
Date: Thu Jul 12 19:05:41 2012 +1000
glx/dri2: use correct define from dri attribs.
Looks like idr renamed this and pushed the wrong one.
Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
Reviewed-by: Matt Turner <mattst88@gmail.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
commit c62205adcd48d497450655d0136f8ca5bd5cbae7
Author: Dave Airlie <airlied@gmail.com>
Date: Thu Jul 12 19:04:13 2012 +1000
glx/dri2: fix incorrect == vs =
glxdri2.c:486: warning: statement with no effect
Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
Reviewed-by: Matt Turner <mattst88@gmail.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
commit defca4c192bd7f4af2b273c7cb1fe8665888772a
Author: Dave Airlie <airlied@gmail.com>
Date: Thu Jul 12 18:52:34 2012 +1000
glx/dri2: fix typo in the notification reset for robustness.
Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
Reviewed-by: Matt Turner <mattst88@gmail.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
commit d1cae6bb804f7dfc889fd3c5d5eb116f4baf5149
Author: Dave Airlie <airlied@gmail.com>
Date: Thu Jul 12 18:51:52 2012 +1000
glx: pass screen into the convert function
when robustness is enabled, this is required.
Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
commit ea74e381ae91f45ec195a5505262e2e5a3c0e1c9
Author: Dave Airlie <airlied@gmail.com>
Date: Fri Jul 13 00:47:24 2012 +1000
xtest: add extinit.h for SyncExtensionInit
This adds the decl for SyncExtenionInit.
Signed-off-by: Dave Airlie <airlied@redhat.com>
Tested-by: Keith Packard <keithp@keithp.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 746193a7f10f11cccae05c98b933aadf58fc7375
Merge: a2d0829531 2b74949ad0
Author: Keith Packard <keithp@keithp.com>
Date: Thu Jul 12 15:10:51 2012 -0700
Merge remote-tracking branch 'jturney/xwin-extmod-removal-fixes'
commit a2d0829531249e24dbca25fc20ed30a2bb2d8ed8
Author: Michel Dänzer <michel.daenzer@amd.com>
Date: Thu Jul 12 13:16:37 2012 +0200
glx: Free DRI2 drawable reference to destroyed GLX drawable.
Otherwise the reference can lead to use after free in
__glXDRIinvalidateBuffers().
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=50019
Signed-off-by: Michel Dänzer <michel.daenzer@amd.com>
Reviewed-by: Kristian Høgsberg <krh@bitplanet.net>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 8a87acc9e57be740e3bd252567622246051a0723
Author: Michel Dänzer <michel.daenzer@amd.com>
Date: Thu Jul 12 13:16:36 2012 +0200
dri2: Add DRI2CreateDrawable2.
Same as DRI2CreateDrawable, except it can return the DRI2 specific XID of the
DRI2 drawable reference to the base drawable.
Signed-off-by: Michel Dänzer <michel.daenzer@amd.com>
Reviewed-by: Kristian Høgsberg <krh@bitplanet.net>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 2b74949ad02bd916c3ac502db3f28057f12a8117
Author: Jon TURNEY <jon.turney@dronecode.org.uk>
Date: Thu Jul 12 00:36:43 2012 +0100
Restore GLX extension to XWin
- Add an XwinExtensionInit(), similar in spirit to QuartzExtensionInit()
and xf86ExtensionInit()
- Load the GLX extension (I'm guessing XQuartz needs this adding somewhere
as well)
- Also, since we now have a proper place to install the native GL provider
where it will take priority over the the swrast provider, do so
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Reviewed-by: Daniel Stone <daniel@fooishbar.org>
Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
commit 656e5fea6c9ca15f932889edcc590dd01c881945
Merge: 8b820f221a 1720cd9bad
Author: Keith Packard <keithp@keithp.com>
Date: Thu Jul 12 08:26:35 2012 -0700
Merge remote-tracking branch 'jeremyhu/master'
commit 8b820f221ad54eb96a16c7060048abc8824371b6
Author: Daniel Stone <daniel@fooishbar.org>
Date: Wed Jul 11 17:31:53 2012 +0100
sdksyms: Fix build with --disable-xv
I hate this [redacted] script.
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
Tested-by: Keith Packard <keithp@keithp.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 06ac7937fc37cdf073b77386bed47e14cff23628
Author: Jon TURNEY <jon.turney@dronecode.org.uk>
Date: Thu Jul 12 12:37:05 2012 +0100
Restore extern to the declaration of __glXDRISWRastProvider
b86aa74 dropped the 'extern' from the declaration of __glXDRISWRastProvider
This turns out to be important to me, as without it, the final link only gets
the tentative definition of __glXDRISWRastProvider implied by the declaration,
and not the proper one from glxdriswrast.c, presumably because nothing else
references anything in the object that file generates.
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Reviewed-by: Daniel Stone <daniel@fooishbar.org>
Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
commit bcbf95b1bafa6ffe724768b9309295e2fdb4b860
Author: Jon TURNEY <jon.turney@dronecode.org.uk>
Date: Thu Jul 12 00:36:10 2012 +0100
Revert bogus GlxPushProvider() in commit a1d41e3
a1d41e3 "Move extension initialisation prototypes into extinit.h"
also includes a change to GlxExtensionInit to install the swrast GLX
provider.
Since b86aa74 "GLX: Insert swrast provider from GlxExtensionInit"
already does this (correctly, by installing the swrast provider
at the end of the chain, rather than at the beginning), and since this
would seem to have the effect of making the swrast provider the most
preferred provider, I'm guessing this wasn't intended.
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Reviewed-by: Daniel Stone <daniel@fooishbar.org>
Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
commit 1720cd9badf21e5d6b2c6c929e609ab3b0b92fd2
Author: Jeremy Huddleston <jeremyhu@apple.com>
Date: Wed Jul 11 23:54:27 2012 -0700
XQuartz: Re-add prototype for DRIExtensionInit
Regression from: a1d41e311c21eb6627caa0d168e070ceaf90806f
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
CC: Daniel Stone <daniel@fooishbar.org>
commit 1a64d3cc9c319d5e9ab2365b60469fb5b83407fc
Author: Jeremy Huddleston <jeremyhu@apple.com>
Date: Wed Jul 11 23:49:59 2012 -0700
XQuartz: Fix build failure due to incorrect PseudoramiXExtensionInit prototype
pseudoramiX.c:129:1: error: conflicting types for 'PseudoramiXExtensionInit' [Semantic Issue]
PseudoramiXExtensionInit(int argc, char *argv[])
^
../../include/extinit.h:175:13: note: previous declaration is here
extern void PseudoramiXExtensionInit(void);
^
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
commit 228f8bfe81890770f1ba109a0acca1c81a2ffee9
Author: Jeremy Huddleston <jeremyhu@apple.com>
Date: Wed Jul 11 23:49:33 2012 -0700
XQuartz: Silence an unused-variable warning
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
commit deb08658e2a6b1647a7213a316c6f3019bcdce48
Author: Maarten Lankhorst <maarten.lankhorst@canonical.com>
Date: Wed Jul 11 16:27:46 2012 +0200
xfree86: Strip dangling pointers from desiredMode
Based on the original patch by Chris Wilson, which was a better fix than mine.
We stash a copy of the desiredMode on the crtc so that we can restore it
after a vt switch. This copy is a simple memcpy and so also stashes a
references to the pointers contained within the desiredMode. Those
pointers are freed the next time the outputs are probed and mode list
rebuilt, resulting in us chasing those dangling pointers on the next
mode switch.
==22787== Invalid read of size 1
==22787== at 0x40293C2: __GI_strlen (in
/usr/lib/valgrind/vgpreload_memcheck-amd64-linux.so)
==22787== by 0x668F875: strdup (strdup.c:42)
==22787== by 0x5DBA00: XNFstrdup (utils.c:1124)
==22787== by 0x4D72ED: xf86DuplicateMode (xf86Modes.c:209)
==22787== by 0x4CA848: xf86CrtcSetModeTransform (xf86Crtc.c:276)
==22787== by 0x4D05B4: xf86SetDesiredModes (xf86Crtc.c:2677)
==22787== by 0xA7479D0: sna_create_screen_resources
(sna_driver.c:220)
==22787== by 0x4CB914: xf86CrtcCreateScreenResources (xf86Crtc.c:725)
==22787== by 0x425498: main (main.c:216)
==22787== Address 0x72c60e0 is 0 bytes inside a block of size 9 free'd
==22787== at 0x4027AAE: free (in
/usr/lib/valgrind/vgpreload_memcheck-amd64-linux.so)
==22787== by 0x4A547E: xf86DeleteMode (xf86Mode.c:1984)
==22787== by 0x4CD84F: xf86ProbeOutputModes (xf86Crtc.c:1578)
==22787== by 0x4DC405: xf86RandR12GetInfo12 (xf86RandR12.c:1537)
==22787== by 0x518119: RRGetInfo (rrinfo.c:202)
==22787== by 0x51D997: rrGetScreenResources (rrscreen.c:335)
==22787== by 0x51E0D0: ProcRRGetScreenResources (rrscreen.c:475)
==22787== by 0x513852: ProcRRDispatch (randr.c:493)
==22787== by 0x4346DB: Dispatch (dispatch.c:439)
==22787== by 0x4256E4: main (main.c:287)
Signed-off-by: Maarten Lankhorst <maarten.lankhorst@canonical.com>
Reported-by: Zdenek Kabelac <zdenek.kabelac@gmail.com>
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=36108
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 59c2c4f645b4d782599c274f4bc752de9623d308
Author: Daniel Stone <daniel@fooishbar.org>
Date: Tue Jul 10 09:10:22 2012 +0100
AllocDevicePair: Ensure XKB privates are initialised
Since we call directly into XKB and may be doing so before the extension
has been initialised, make sure its privates are set up first. XTest
had a hack to do this itself, but seems cleaner to just make sure we do
it in AllocDevicePair.
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit f937c3d50157a9a42d2f2f10590b6b139ce18a29
Author: Daniel Stone <daniel@fooishbar.org>
Date: Tue Jul 10 09:10:21 2012 +0100
Sync: Always initialise system counter list
Sync is designed to let you add system counters before the extension has
been initialised, which means the system counter list may well be full
of bees. Make sure it's initialised before we add to it, to avoid the
risk of fatal injury.
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 34cf559bcf99dad550527b5ff53f247f0e8e73ee
Author: Keith Packard <keithp@keithp.com>
Date: Tue Jul 10 15:58:48 2012 -0700
ProcGetPointerMapping uses rep.nElts before it is initialized
In:
commit d792ac125a0462a04a930af543cbc732f8cdab7d
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Mon Jul 9 19:12:43 2012 -0700
Use C99 designated initializers in dix Replies
the initializer for the .length element of the xGetPointerMappingReply
structure uses the value of rep.nElts, but that won't be set until
after this initializer runs, so we get garbage in the length element
and clients using it will generally wedge.
Easy to verify:
$ xmodmap -pp
Fixed by creating a local nElts variable and using that.
Signed-off-by: Keith Packard <keithp@keithp.com>
Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
commit 44bd27cdd13b6e6c4e6fd3873361e3308ef25ffe
Author: Keith Packard <keithp@keithp.com>
Date: Tue Jul 10 01:14:13 2012 -0700
Version 1.12.99.901 (1.13 RC1)
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 6e12cb147da58bd12a158807b2cd5afac32ae70f
Merge: 532fbc29c9 023127915e
Author: Keith Packard <keithp@keithp.com>
Date: Tue Jul 10 00:52:11 2012 -0700
Merge branch 'local-fixes'
commit 532fbc29c900469ef4867ccb7eabb953019dcab5
Author: Daniel Stone <daniel@fooishbar.org>
Date: Tue Jul 10 02:03:38 2012 +0100
GE: Remove unused RT_GECLIENT
Remove remnants of an earlier experiment which had the GE extension
handling event delivery directly. Nothing's used the resource since, so
purge it.
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
Reviewed-by: Adam Jackson <ajax@redhat.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 0e70b333d4846b166bf4a0a0c5d1a80623ba08dc
Author: Daniel Stone <daniel@fooishbar.org>
Date: Tue Jul 10 02:03:37 2012 +0100
XFree86: os-support: Remove unused xf86MakeNewMapping
No drivers used this, so it got unexported, and now it's so unused it
got culled during the link. Take the poor function out behind the shed
and put it out of its misery.
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
Reviewed-by: Adam Jackson <ajax@redhat.com>
Acked-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 43f2393746c44e9d35be6a2a3555205f8e1b4ddf
Author: Daniel Stone <daniel@fooishbar.org>
Date: Tue Jul 10 02:03:36 2012 +0100
Xinerama: Reset Composite request vector on close
Similar (identical) to how it interacts with Render and XFixes, also
call PanoramiXCompositeReset() to restore the Composite dispatch table
to how it was when it started, on reset.
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
Reviewed-by: Adam Jackson <ajax@redhat.com>
Acked-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 766a403bc7ff249fdc6b9049329b633e73738329
Author: Daniel Stone <daniel@fooishbar.org>
Date: Tue Jul 10 02:03:35 2012 +0100
XvMC: Remove unused XvMCGeneration
I wonder if this even works across multiple generations.
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
Reviewed-by: Adam Jackson <ajax@redhat.com>
Acked-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 7cef23a6dd7a5d76983cf20979e845ea6ae63a10
Author: Daniel Stone <daniel@fooishbar.org>
Date: Tue Jul 10 02:03:34 2012 +0100
Render: Remove unused glyphDepths
No-one has used this since 0a71e154.
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
Reviewed-by: Adam Jackson <ajax@redhat.com>
Acked-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 65011064d7e70aed59fb716f9ed3d76d196244ce
Author: Daniel Stone <daniel@fooishbar.org>
Date: Tue Jul 10 02:03:33 2012 +0100
Xi: Remove dead Device{Enter,Leave}WindowMask
These were an unused remnant of earlier MPX work; their only users got
cleared out in dc153271, but the mask declarations remained. Remove
them, and move DevicePropertyNotify's mask up to be contiguous with the
rest of the range.
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
Reviewed-by: Adam Jackson <ajax@redhat.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit fadfc2947075c832cd1107d2c0866ad13fa756c4
Author: Daniel Stone <daniel@fooishbar.org>
Date: Tue Jul 10 02:03:32 2012 +0100
GLX: Remove unused noGlxVisualInit
No-one ever did anything with this variable except assign its default
value to it.
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
Reviewed-by: Adam Jackson <ajax@redhat.com>
Acked-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 06e4ba8b26fb974bdd84144b3e002f0f7589e7f7
Author: Daniel Stone <daniel@fooishbar.org>
Date: Tue Jul 10 02:03:31 2012 +0100
XKB: Geom: Remove unused code
These codepaths were never called by anyone. Shame there weren't more
of them.
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
Reviewed-by: Adam Jackson <ajax@redhat.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit e191e296e6e7861978ea4a0ae9aa7b780e52732b
Author: Daniel Stone <daniel@fooishbar.org>
Date: Mon Jul 9 20:04:15 2012 +0100
Remove XAA
Commit 0c6987df in June 2008 disabled XAA offscreen pixmaps per default,
as they were broken, leaving XAA only able to accelerate operations
directly on the screen pixmap and nowhere else, eliminating acceleration
for basically every modern toolkit, and any composited environment.
So, it hasn't worked for over four years. No-one's even come close to
fixing it.
RIP.
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
Reviewed-by: Dave Airlie <airlied@redhat.com>
Reviewed-by: Alex Deucher <alexdeucher@gmail.com>
commit 66362441867f68dac97de33744bd0ca478fb65d3
Author: Daniel Stone <daniel@fooishbar.org>
Date: Tue Jul 10 02:03:29 2012 +0100
Remove last renmants of XFree86LOADER define
Not to be confused with XFree86Loader or XorgLoader. Which are both now
dead too.
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
Reviewed-by: Keith Packard <keithp@keithp.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit a15dac550918c55b08bbe0007f068cc5096ebaa1
Author: Daniel Stone <daniel@fooishbar.org>
Date: Tue Jul 10 02:03:28 2012 +0100
Remove unused setupFunc from extensions
setupFunc was used as an early callback for half-modular extensions such
as Xv, XvMC and DGA to set up hooks between the core server and the
modular component. Now we've rid ourselves of that, we can also bin
setupFunc.
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
Reviewed-by: Jamey Sharp <jamey@minilop.net>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 710318e803c6d5c6b8ae170d38c8253f5d780472
Author: Daniel Stone <daniel@fooishbar.org>
Date: Tue Jul 10 02:03:27 2012 +0100
Replace NO_HW_ONLY_EXTS with Xorg DDX test
Turns out the only thing we use NO_HW_ONLY_EXTS for is to check whether
or not we're building inside the Xorg DDX. Replace it with an
XorgLoader test instead, and remove all its users.
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
Reviewed-by: Keith Packard <keithp@keithp.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 5f5bbbe543f65c48ecbb5cce80116a86ca3fbe86
Author: Daniel Stone <daniel@fooishbar.org>
Date: Tue Jul 10 02:03:26 2012 +0100
Unify miinitext.c
Rather than having a non-Xorg and an Xorg-specific path which basically
just duplicated each other for no reason, we could ... just have one.
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 147967f67d4976a87ed07fe11b59b174907f5d43
Author: Daniel Stone <daniel@fooishbar.org>
Date: Tue Jul 10 02:03:25 2012 +0100
Remove Xorg-specific extensions from non-Xorg miinitext
miinitext.c had a completely separate codepath for non-Xorg servers,
which included tests for Xorg-specific extensions such as
XFree86-VidMode, which were external even to the Xorg DDX. So we can
just remove them, and the associated #undefs.
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 27a624bee66d2797eacf90317054207dcf248028
Author: Daniel Stone <daniel@fooishbar.org>
Date: Tue Jul 10 02:03:24 2012 +0100
Quartz: Move PseudoramiX initialisation to DDX
As PseudoramiX is a DDX-specific extension, move its loading and
initialisation to hw/xquartz. This creates a QuartzExtensionInit()
similar in spirit to xf86ExtensionInit.
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
Acked-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 79d14d9fc3d92ba866864d3a5910a8c6c8e9b64f
Author: Daniel Stone <daniel@fooishbar.org>
Date: Tue Jul 10 02:03:23 2012 +0100
Move the remnants of loadext.c to miinitext.c
There was nothing XFree86-specific or loader-specific about this, aside
from using xf86MsgVerb instead of ErrorF.
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
Reviewed-by: Jamey Sharp <jamey@minilop.net>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit a089af3477dd01a831b89c06f982679c60e42975
Author: Daniel Stone <daniel@fooishbar.org>
Date: Tue Jul 10 02:03:22 2012 +0100
Loader: Move ExtensionModule types to DIX
In preparation for gutting loadext.c, move the ExtensionModule struct to
the DIX, and unexport ExtensionModuleList (why, why, why, why was this
ever exported in the first place, tbqh).
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
Reviewed-by: Jamey Sharp <jamey@minilop.net>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 8171108602556446f12c1cfbc37c6abf3b0195eb
Author: Daniel Stone <daniel@fooishbar.org>
Date: Tue Jul 10 02:03:21 2012 +0100
Loader: Remove extension initialisation sorting
Extensions could previously declare initialisation dependencies on other
extensions, which would then get nicely sorted by the loader. We only
had one user for this, GLX, which had one pointless (Composite) and one
possibly useful dependency (DBE). As DBE is now a built-in, it will
always be sorted by GLX, so we no longer have any users for it.
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit d52ab85c7ef5058dcbd8a75eb84058908dc22906
Author: Daniel Stone <daniel@fooishbar.org>
Date: Tue Jul 10 02:03:20 2012 +0100
GLX: Remove extension init dependencies
GLX was the only user of extension init order dependencies, using them
to depend on Composite, which has always been built-in anyway, and DBE,
which is now built-in.
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 2fba9445a0357f67641e41ac334b5529c37774a2
Author: Daniel Stone <daniel@fooishbar.org>
Date: Tue Jul 10 02:03:19 2012 +0100
Add static extensions before those in modules
Make sure we add static extensions before anything in a module. This is
more or less a no-op at the moment, but will come in handy later when
extension dependency sorting is removed.
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 9a953e0e9dcb8a8e43cc27ffaef460268fbe1916
Author: Daniel Stone <daniel@fooishbar.org>
Date: Tue Jul 10 02:03:18 2012 +0100
Move DRI2 from external module to built-in
Instead of keeping a tiny amount of code in an external module, just man
up and build it into the core server.
v2: Fix test/Makefile.am to only link libdri2.la if DRI2 is set
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
Reviewed-by: Jamey Sharp <jamey@minilop.net>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit b8a3267c36e2e335b888bd4f2ef2f2c477cdfdce
Author: Daniel Stone <daniel@fooishbar.org>
Date: Tue Jul 10 02:03:17 2012 +0100
DRI2: Remove prototype for DRI2DestroyDrawable
DRI2DestroyDrawable() was still being _X_EXPORTed, but hasn't existed
since 1da1f33f last year.
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
Reviewed-by: Cyril Brulebois <kibi@debian.org>
Reviewed-by: Jamey Sharp <jamey@minilop.net>
Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 7025a909bfe4d1f5518ec6fc5f89e2c3fb6501fd
Author: Daniel Stone <daniel@fooishbar.org>
Date: Tue Jul 10 02:03:16 2012 +0100
XFree86: DRI: Don't use per-target CFLAGS
AM_CFLAGS will suffice, given we only have one target in this directory.
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
Reviewed-by: Cyril Brulebois <kibi@debian.org>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 459c6da0f907ba33d733c7e62a116184ba2f14e5
Author: Daniel Stone <daniel@fooishbar.org>
Date: Tue Jul 10 02:03:15 2012 +0100
Move DRI1 from external module to built-in
Rather than building the tiny amount of code required for XFree86-DRI as
an external module, build it in if it's enabled at configure time.
v2: Fix test/Makefile.am to only link libdri.la if DRI is set
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Keith Packard <keithp@keithp.com>
fixup for DRI1 move
Signed-off-by: Keith Packard <keithp@keithp.com>
commit b905d87ba0a9b045ea41bb1ad36a4f9f1170a1b8
Author: Daniel Stone <daniel@fooishbar.org>
Date: Tue Jul 10 02:03:14 2012 +0100
Xext: Only build one library
Now that libXextmodule.la is both empty and unused, we can just build
the one libXext.la for everyone, rather than having Xorg be special and
unique.
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
Reviewed-by: Jamey Sharp <jamey@minilop.net>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit a7a2f9f66ddc27df96557093f3dd266e24eb653b
Author: Daniel Stone <daniel@fooishbar.org>
Date: Tue Jul 10 02:03:13 2012 +0100
Remove the last remnants of extmod
extmod was originally a big pointless module. Now it's an empty,
pointless module. This commit makes it unexist.
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 6e74fdda42fb4bd80fd48e1ae6471bffbb837804
Author: Daniel Stone <daniel@fooishbar.org>
Date: Wed Jun 22 00:28:18 2011 +0100
Move XFree86-VidMode from extmod to built-in
As with DGA, move VidMode from being part of extmod to a built-in part
of the server, if compiled as such. This is initialised from
xf86ExtensionInit rather than miinitext because it's wholly dependent on
the Xorg DDX.
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 60f53e3012be795eee741ecd4be858552c5e86c8
Author: Tomas Carnecky <tom@dbservice.com>
Date: Tue Jul 10 02:03:11 2012 +0100
DGA: Remove excessive module-induced indirection
The DGA event base used to have to be passed through a function pointer,
as the code was cleaved in two with half in a module, and half in the
core server. Now that's not the case, just access DGAEventBase
directly.
v2: Deal with Alan's event initialization cleanups
Signed-off-by: Tomas Carnecky <tom@dbservice.com>
Reviewed-by: Daniel Stone <daniel@fooishbar.org>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 7a5880bc3b47e1f90a638f056ad4d40be6931977
Author: Daniel Stone <daniel@fooishbar.org>
Date: Tue Jul 10 02:03:10 2012 +0100
Move DGA from extmod to built-in
Rather than leave DGA languishing in extmod, move it to be a built-in
extension. As it's quite specific to the Xorg DDX, just move it
sideways to the rest of the DGA code in hw/xfree86/common, and
initialise it from xf86ExtensionInit, rather than miinitext.
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
Acked-by: Keith Packard <keithp@keithp.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 6fb481d1251626456914d0012d6ca5a342bfdf71
Author: Daniel Stone <daniel@fooishbar.org>
Date: Tue Jul 10 02:03:09 2012 +0100
Move SELinux from extmod to built-in
Instead of letting it languish in extmod just because we want to
configure bits of it from xf86, move XSELinux to the builtin part of
Xext, and do its configuration from xf86ExtensionInit.
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
Reviewed-by: Jamey Sharp <jamey@minilop.net>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 5d92ee4081a23a6b4d1f9ba2a98985f539f99312
Author: Tomas Carnecky <tom@dbservice.com>
Date: Tue Jul 10 02:03:08 2012 +0100
Xv: Remove excessive module-induced indirection
Xv used to call XvScreenInit and co. through function pointers, as
XvScreenInit may have been sitting on the other side of a module
boundary from xf86XvScreenInit. Why this was so is a mystery, but make
it not so any more.
Signed-off-by: Tomas Carnecky <tom@dbservice.com>
Reviewed-by: Daniel Stone <daniel@fooishbar.org>
Acked-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 2e6c5f959153cdcea4bcf719621ebec408250f54
Author: Daniel Stone <daniel@fooishbar.org>
Date: Tue Jul 10 02:03:07 2012 +0100
XFree86: sdksyms: Remove unused -DXorgLoader
We no longer have anything in the tree that checks for XorgLoader. This
was a fairly monumental hack: xvdi.h used to hide all its functions
behind #ifndef XorgLoader, solely to avoid sdksyms.sh picking up its
symbols, as it was previously a module rather than built-in.
This is no longer the case, so we can remove the define.
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 7a11b817e770cd2196814f1ac6264c6d87b76c6a
Author: Tomas Carnecky <tom@dbservice.com>
Date: Tue Jul 10 02:03:06 2012 +0100
Move Xv and XvMC from extmod to built-in
Always build these extensions into the core server, rather than letting
them languish in extmod.
Signed-off-by: Tomas Carnecky <tom@dbservice.com>
Reviewed-by: Daniel Stone <daniel@fooishbar.org>
Reviewed-by: Jamey Sharp <jamey@minilop.net>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 7d859bd87834dd79c7fa3792075496ece698c082
Author: Tomas Carnecky <tom@dbservice.com>
Date: Tue Jul 10 02:03:05 2012 +0100
Move XRes from extmod to built-in
Always build XRes support into the core server, rather than letting it
languish in extmod.
Signed-off-by: Tomas Carnecky <tom@dbservice.com>
Reviewed-by: Daniel Stone <daniel@fooishbar.org>
Reviewed-by: Jamey Sharp <jamey@minilop.net>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit ba21fc29587e4f11320b88a70433beb1fe22cdf3
Author: Tomas Carnecky <tom@dbservice.com>
Date: Tue Jul 10 02:03:04 2012 +0100
Move DPMS from extmod to built-in
Always build DPMS support into the core server, rather than letting it
languish in extmod.
Signed-off-by: Tomas Carnecky <tom@dbservice.com>
Reviewed-by: Daniel Stone <daniel@fooishbar.org>
Reviewed-by: Jamey Sharp <jamey@minilop.net>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 3ed2c6e11298c4299042cfe4578f6cc02e441d58
Author: Tomas Carnecky <tom@dbservice.com>
Date: Tue Jul 10 02:03:03 2012 +0100
Move MIT-SCREEN-SAVER from extmod to built-in
If we've built MIT-SCREEN-SAVER support, then just build it into the
main binary, rather than leaving it in extmod.
Signed-off-by: Tomas Carnecky <tom@dbservice.com>
Reviewed-by: Daniel Stone <daniel@fooishbar.org>
Reviewed-by: Jamey Sharp <jamey@minilop.net>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit b8c9ab0fea0be299d9f48ac0c4ed0474104a7556
Author: Tomas Carnecky <tom@dbservice.com>
Date: Tue Jul 10 02:03:02 2012 +0100
Move RECORD from external module to built-in
Rather than languishing in its own special module, move RECORD into the
core server.
Signed-off-by: Tomas Carnecky <tom@dbservice.com>
Reviewed-by: Daniel Stone <daniel@fooishbar.org>
Reviewed-by: Jamey Sharp <jamey@minilop.net>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit bf61bf69b2b4f9e9993ca771de100079c7696bea
Author: Tomas Carnecky <tom@dbservice.com>
Date: Tue Jul 10 02:03:01 2012 +0100
Move DBE from an external module to built-in
If DBE support is compiled in the server, just man up and build it into
the server, rather than having it as an external module.
Signed-off-by: Tomas Carnecky <tom@dbservice.com>
Reviewed-by: Daniel Stone <daniel@fooishbar.org>
Reviewed-by: Jamey Sharp <jamey@minilop.net>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit d785368e0e171080fea5447c87e81c93f515ff21
Author: Daniel Stone <daniel@fooishbar.org>
Date: Tue Jul 10 02:03:00 2012 +0100
miinitext: Use ARRAY_SIZE rather than sentinel
NULL sentinels are totally lame.
v2: numExtensionModules isn't public, so keep using the provided
sentinal - Keith Packard <keithp@keithp.com>
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
Reviewed-by: Stéphane Marchesin <stephane.marchesin@gmail.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit f48d8f58b39af0036365368d6ac35319d6d856d5
Author: Daniel Stone <daniel@fooishbar.org>
Date: Tue Jul 10 02:02:59 2012 +0100
extmod: Use ARRAY_SIZE rather than sentinel
When the array gets down to size zero (which it does in later patches),
gcc complains that the index is out of bounds. Avoid this by using
ARRAY_SIZE on extensionModules instead.
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
Reviewed-by: Stéphane Marchesin <stephane.marchesin@gmail.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit d35884da2f5a250ff6dd5131dc23ac629eccdd0c
Author: Daniel Stone <daniel@fooishbar.org>
Date: Tue Jul 10 02:02:58 2012 +0100
Add xf86ExtensionInit for DDX extension configuration
xf86ExtensionInit is called after configuration file parsing, so it can
perform the two parts of extension initialisation currently done by
extmod: enabling and disabling of extensions through an 'omit' option,
and SELinux configuration.
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 4170e4e1f8e879394c896c490d9f08a38ecfdefd
Author: Daniel Stone <daniel@fooishbar.org>
Date: Tue Jul 10 02:02:57 2012 +0100
Loader: Drop EXTERN_MODULE flag
EXTERN_MODULE was used to specify that we shouldn't worry about modules
lacking a ModuleData object. It was also completely unused. *shrug*
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit a1d41e311c21eb6627caa0d168e070ceaf90806f
Author: Daniel Stone <daniel@fooishbar.org>
Date: Tue Jul 10 02:02:56 2012 +0100
Move extension initialisation prototypes into extinit.h
Create extinit.h (and xf86Extensions.h, for Xorg-specific extensions) to
hold all our extension initialisation prototypes, rather than
duplicating them everywhere.
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit b86aa74cafddf9bca5addfeb458a23f46ddcf132
Author: Daniel Stone <daniel@fooishbar.org>
Date: Tue Jul 10 02:02:55 2012 +0100
GLX: Insert swrast provider from GlxExtensionInit
Rather than making poor old miinitext.c do it, including making DMX
have fake symbols just to keep it happy.
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
Reviewed-by: Stéphane Marchesin <stephane.marchesin@gmail.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 13552a5c4701097a1507a99ed8366ab1438844b6
Author: Daniel Stone <daniel@fooishbar.org>
Date: Tue Jul 10 02:02:54 2012 +0100
Reorder extension initialisation for non-Xorg
Reorder static extension initialisation in miinitext for non-Xorg
servers to match Xorg's order.
Tested with Xephyr; checked that the extension list was identical before
and after.
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 5079db78aea8fa42e781dd876c1ee1c31571b3ae
Author: Tomas Carnecky <tom@dbservice.com>
Date: Tue Jul 10 02:02:53 2012 +0100
Replace INITARGS with void
INITARGS was a hardcoded define to void. Since knowing the function
signature for your extensions is kinda useful, just replace it with a
hardcoded void, but leave the define there for API compatibility.
Signed-off-by: Tomas Carnecky <tom@dbservice.com>
Reviewed-by: Daniel Stone <daniel@fooishbar.org>
Reviewed-by: Cyril Brulebois <kibi@debian.org>
Reviewed-by: Jamey Sharp <jamey@minilop.net>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit bddb8c6cbe52ba9923b1d36d01f5ac9391b0ec0e
Author: Daniel Stone <daniel@fooishbar.org>
Date: Tue Jul 10 02:02:52 2012 +0100
Xinerama: Fix ExtensionInit prototype
Huh, so I guess INITARGS used to be int argc, char *argv then. Either
way, it's now void, so fix that ...
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
Reviewed-by: Cyril Brulebois <kibi@debian.org>
Reviewed-by: Jamey Sharp <jamey@minilop.net>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit eb9661fef9f59587f898371f97a0952ac14d125f
Author: Daniel Stone <daniel@fooishbar.org>
Date: Tue Jul 10 02:02:51 2012 +0100
Make extension.h self-contained, remove C++ externs
externsion.h required bits from Xfuncproto.h and dixstruct.h, but
included neither; fix that.
It also had _XFUNCPROTOBEGIN and _XFUNCPROTOEND wrappers, which is a bit
pointless for a server-only library, as it's only needed for C++.
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
Reviewed-by: Cyril Brulebois <kibi@debian.org>
Reviewed-by: Jamey Sharp <jamey@minilop.net>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 854c1fa4a1e90288d1e2f3777fac3e1a9acb1235
Author: Daniel Stone <daniel@fooishbar.org>
Date: Tue Jul 10 02:02:50 2012 +0100
Add a common ARRAY_SIZE macro to dix.h
Does what it says on the box, replacing those from Xi/ and glx/.
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
Reviewed-by: Cyril Brulebois <kibi@debian.org>
Reviewed-by: Jamey Sharp <jamey@minilop.net>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 67953d6975ef2ee573b95e7641aaf3d72e9f8379
Author: Daniel Stone <daniel@fooishbar.org>
Date: Tue Jul 10 02:02:49 2012 +0100
Xorg: Link XKB DDX library after core server libs
libxorgxkb.a contains a number of libraries which are used by XKB action
code to call back into the DDX, e.g. for VT switching, termination, grab
breaking, et al. Make sure libxkb.a comes first in the link order, so
it can mark XkbDDX* as used in order for the linker to not discard them.
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 656af2c7e73d948338683675e14cd827b46a97c4
Author: Daniel Stone <daniel@fooishbar.org>
Date: Tue Jul 10 02:02:46 2012 +0100
Don't make failure to -nolisten fatal
If failing to disable a protocol specified by -nolisten failed, we'd
throw a FatalError and bomb startup entirely. From poking at xtrans, it
looks like the only way we can get a failure here is because we've
specified a protocol name which doesn't exist, which probably doesn't
constitute a security risk.
And it makes it possible to start gdm even though you've built with
--disable-tcp-transport.
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit dc0c2dd92d5eb314582ea10830678753824375d9
Author: Daniel Stone <daniel@fooishbar.org>
Date: Tue Jul 10 02:02:45 2012 +0100
Xext: Add hashtable.h to sources to fix distcheck
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit ad4092cf7d59a89b1b2922440eef65be5c0c5ebd
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Mon Jul 9 19:12:44 2012 -0700
Replace padlength tables with inline functions from misc.h
Adds new function padding_for_int32() and uses existing pad_to_int32()
depending on required results.
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Keith Packard <keithp@keithp.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Tested-by: Daniel Stone <daniel@fooishbar.org>
commit 2b1c1300cc23912ee1c59f8dde938dd4d7287f4a
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Mon Jul 9 19:12:44 2012 -0700
ephyrGLXQueryServerString: Stop making an unused copy of server_string
ephyrGLXQueryServerString() carefully allocated a buffer padded to the
word-aligned string length for sending to the client, copied the string
to it, and then forgot to use it, potentially reading a few bytes of
garbage past the end of the server_string buffer.
Since WriteToClient already handles the necessary padding, just send
it the actual length of the original server_string, and don't bother
making a padded copy.
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Keith Packard <keithp@keithp.com>
Tested-by: Daniel Stone <daniel@fooishbar.org>
commit 7a29f6878284e2d65e69fcd157aa9ec01d21b3c0
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Mon Jul 9 19:12:44 2012 -0700
Initialize padding bits to 0 in ErrorConnMax()
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Keith Packard <keithp@keithp.com>
Tested-by: Daniel Stone <daniel@fooishbar.org>
commit bed610fcae41ddfe21fa9acde599b17d1d15f5d1
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Mon Jul 9 19:12:44 2012 -0700
Set padding bytes to 0 in WriteToClient
Clear them out when needed instead of leaving whatever values were
present in previously sent messages.
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Keith Packard <keithp@keithp.com>
Tested-by: Daniel Stone <daniel@fooishbar.org>
commit 1622dd8ab24d2fe7b9908110eb237774d4e03568
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Mon Jul 9 19:12:44 2012 -0700
Use C99 designated initializers in dix registry
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Keith Packard <keithp@keithp.com>
Tested-by: Daniel Stone <daniel@fooishbar.org>
commit 9805cedf7b0f76d3b75f94e956c4cc2dcf0d8b64
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Mon Jul 9 19:12:44 2012 -0700
Use C99 designated initializers in extension Events
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Keith Packard <keithp@keithp.com>
Tested-by: Daniel Stone <daniel@fooishbar.org>
commit 0af79b124e1317c36d1613d28755c5a8ce612e2a
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Mon Jul 9 19:12:44 2012 -0700
Use C99 designated initializers in dix Events
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Keith Packard <keithp@keithp.com>
Tested-by: Daniel Stone <daniel@fooishbar.org>
commit 483266a583b0fd8a552303f318a71502ce3ff1d2
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Mon Jul 9 19:12:43 2012 -0700
Use C99 designated initializers in xf86 extension Replies
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Keith Packard <keithp@keithp.com>
Tested-by: Daniel Stone <daniel@fooishbar.org>
commit 14501fd33ee89acf9fc1d908003ed62f383d8bae
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Mon Jul 9 19:12:43 2012 -0700
Use C99 designated initializers in Xephyr Replies
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Keith Packard <keithp@keithp.com>
Tested-by: Daniel Stone <daniel@fooishbar.org>
commit e4e827ec36fd20b7aea608db09790f76fb87e519
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Mon Jul 9 19:12:43 2012 -0700
Use C99 designated initializers in dmx Replies
v2: fix in __glXGetVisualConfigs to not re-declare local 'reply' variable
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Keith Packard <keithp@keithp.com>
Tested-by: Daniel Stone <daniel@fooishbar.org>
Fixup for Use C99 designated initializeres in dmx Replies
Signed-off-by: Keith Packard <keithp@keithp.com>
commit bd6f948c41865c2c9d3fba1000bf5f7458d3afc1
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Mon Jul 9 19:12:43 2012 -0700
Use C99 designated initializers in randr Replies
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Keith Packard <keithp@keithp.com>
Tested-by: Daniel Stone <daniel@fooishbar.org>
commit a406bd07593edb69285cf2fd91a6af4a5d956817
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Mon Jul 9 19:12:43 2012 -0700
Use C99 designated initializers in xkb Replies
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Keith Packard <keithp@keithp.com>
Tested-by: Daniel Stone <daniel@fooishbar.org>
commit 26efa09d0c7ee2f6a18547205c84be75376e688b
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Mon Jul 9 19:12:43 2012 -0700
Use C99 designated initializers in glx Replies
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Keith Packard <keithp@keithp.com>
Tested-by: Daniel Stone <daniel@fooishbar.org>
commit cc5f09c86f7bea23b7546c3491b2c52ce8100a71
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Mon Jul 9 19:12:43 2012 -0700
Use C99 designated initializers in various extension Replies
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Keith Packard <keithp@keithp.com>
Tested-by: Daniel Stone <daniel@fooishbar.org>
commit 2f5caeaddb3616dc9ff57d784f7feba589c536e7
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Mon Jul 9 19:12:43 2012 -0700
Use C99 designated initializers in Xinput Replies
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Keith Packard <keithp@keithp.com>
Tested-by: Daniel Stone <daniel@fooishbar.org>
commit 6a721e3af5e11bae1d59ca551a02470f35d9e844
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Mon Jul 9 19:12:43 2012 -0700
Use C99 designated initializers in Xext Replies
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Keith Packard <keithp@keithp.com>
Tested-by: Daniel Stone <daniel@fooishbar.org>
commit d792ac125a0462a04a930af543cbc732f8cdab7d
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Mon Jul 9 19:12:43 2012 -0700
Use C99 designated initializers in dix Replies
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Keith Packard <keithp@keithp.com>
Tested-by: Daniel Stone <daniel@fooishbar.org>
commit 69fa5630b5902aaad267fc67d0da4ca93625886a
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Mon Jul 9 19:12:43 2012 -0700
Use C99 designated initializers in SendErrorToClient
Let the compiler worry about 0-filling the rest of the fields,
instead of memsetting the whole struct and then going back to
overwrite some of the fields.
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Keith Packard <keithp@keithp.com>
Tested-by: Daniel Stone <daniel@fooishbar.org>
commit cdf5bcd420e5bcf4a4a24a275d3133a4e16ce41e
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Mon Jul 9 19:12:42 2012 -0700
Use calloc to zero fill buffers being allocated for replies & events
Ensures padding bytes are zero-filled
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Keith Packard <keithp@keithp.com>
Tested-by: Daniel Stone <daniel@fooishbar.org>
commit ef0f701c9245b0373eb0c7a84dd804af4738bb29
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Mon Jul 9 19:12:42 2012 -0700
xf86dga2.c & xf86vmode.c: Move REQUEST_SIZE_MATCH checks before using stuff
Seems silly waiting to check if the client failed to send us enough bytes
until after we've already tried using them.
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Keith Packard <keithp@keithp.com>
Tested-by: Daniel Stone <daniel@fooishbar.org>
commit 2e739a8870d91fbac7f536ffa8f6d2cee0f66cec
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Mon Jul 9 19:12:42 2012 -0700
ProcRRListOutputProperties: skip atom walk if the list is empty
pAtoms is only allocated if numProps was non-zero, so move the walk
through the property list to copy atoms to it inside the if (numProps)
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Keith Packard <keithp@keithp.com>
Tested-by: Daniel Stone <daniel@fooishbar.org>
commit 15bc13c8d088e05f14c7262348e0066929c29251
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Mon Jul 9 19:12:42 2012 -0700
ProcRRGetScreenInfo: swap configTimestamp as well
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Keith Packard <keithp@keithp.com>
Tested-by: Daniel Stone <daniel@fooishbar.org>
commit 3a013b8816bc0bb765c99e8a2bf2ea536dc62c3b
Author: Jaroslav Šmíd <jardasmid@gmail.com>
Date: Mon Jul 9 19:12:42 2012 -0700
Bug 51375: Xorg doesn't set status for RRGetOutputInfo
https://bugs.freedesktop.org/show_bug.cgi?id=51375
https://bugs.freedesktop.org/attachment.cgi?id=63397
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Keith Packard <keithp@keithp.com>
Tested-by: Daniel Stone <daniel@fooishbar.org>
commit 5b86c072d1d586ce040d8831a05cf97ff8b17821
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Mon Jul 9 19:12:42 2012 -0700
Use temporary variables instead of parts of reply structures
When passing variable pointers to functions or otherwise doing long
sequences to compute values for replies, create & use some new
temporary variables, to allow for simpler initialization of reply
structures in the following patches.
Move memsets & other initializations to group with the rest of the
filling in of the reply structure, now that they're not needed so
early in the code path.
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Keith Packard <keithp@keithp.com>
Tested-by: Daniel Stone <daniel@fooishbar.org>
commit c2fb1a7b2ab58d70b38ee03ab2fdeb4e7183a356
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Mon Jul 9 19:12:42 2012 -0700
ProcQueryKeymap: rework logic around permission to copy key states
Always initialize to zero, and then if permission is granted, copy
the current key state maps, instead of always copying and then
zeroing out if permission was denied.
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Keith Packard <keithp@keithp.com>
Tested-by: Daniel Stone <daniel@fooishbar.org>
commit dccb0858d71341e1258800b37d1bb78c0115838d
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Mon Jul 9 19:12:42 2012 -0700
Core events: invert check for permission to copy key states
Always initialize to zero, and then if permission is granted, copy
the current key state maps. Use memcpy instead of memmove for the
copy, since we're always copying to a newly allocated event on the
stack, so guaranteed not to overlap with the device map structure.
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Keith Packard <keithp@keithp.com>
Tested-by: Daniel Stone <daniel@fooishbar.org>
commit db69212df8a0bf09140368356d2d430c54afe346
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Mon Jul 9 19:12:42 2012 -0700
Rework reply initialization in ProcGetProperty & NullPropertyReply
Don't need to pass an empty reply to NullPropertyReply, let it make
it's own. Move reply initialization code in remaining replies in
ProcGetProperty to group with the rest of the fields. (Prepares
for coming C99 designated initializer conversion.)
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Keith Packard <keithp@keithp.com>
Tested-by: Daniel Stone <daniel@fooishbar.org>
commit 6be74a9080e30fc502421cd438cd0c73fb8eb0b0
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Mon Jul 9 19:12:42 2012 -0700
Fix more poorly indented/wrapped comments & code
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Keith Packard <keithp@keithp.com>
Tested-by: Daniel Stone <daniel@fooishbar.org>
commit 789d64e19a3b3d98b88bc80f677e0c37bfb5c631
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Sun May 13 00:03:35 2012 -0700
Remove unneccesary casts from WriteToClient calls
Casting return to (void) was used to tell lint that you intended
to ignore the return value, so it didn't warn you about it.
Casting the third argument to (char *) was used as the most generic
pointer type in the days before compilers supported C89 (void *)
(except for a couple places it's used for byte-sized pointer math).
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Keith Packard <keithp@keithp.com>
Tested-by: Daniel Stone <daniel@fooishbar.org>
commit 023127915e6922bc53e4c768de760d8a4f25c07c
Author: Keith Packard <keithp@keithp.com>
Date: Mon Jul 9 16:34:39 2012 -0700
Reliably reset signals at server init time
Each DDX currently calls OsReleaseSIGIO in case it was suspended when
the server regen started. This causes a BUG to occur if SIGIO was
*not* blocked at that time. Instead of relying on each DDX, make the
OS layer reliably reset all signal state at server init time, ensuring
that signals are suitably unblocked and that the various signal state
counting variables are set back to zero.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit d6756e0298e660a0aca58d75bcf79471ce07a634
Author: Keith Packard <keithp@keithp.com>
Date: Mon Jul 9 16:33:11 2012 -0700
xfree86: In InitOutput, only call OsReleaseSIGIO if OsBlockSIGIO was called
Otherwise, OsReleaseSIGIO will complain, or perhaps something worse
will happen (if SIGIO actually needs to be blocked here).
Signed-off-by: Keith Packard <keithp@keithp.com>
commit ea8b04507e5464e4817791db516a20cfed2a6724
Author: Keith Packard <keithp@keithp.com>
Date: Mon Jul 9 16:30:24 2012 -0700
privates: Resize GPU screen-specific privates too
When allocating new global privates, make sure the gpu
screens get their private offsets updated.
This only affects GPU screens that enumerate before the non-GPU
screens, which generally requires that the related device be present
when the system boots so that it can get an earlier DRM filename.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit d1c639c006526b8cab14dac582508f3f54848967
Author: Keith Packard <keithp@keithp.com>
Date: Mon Jul 9 16:29:04 2012 -0700
Add 'install-headers' target in the top-level Makefile
This target recursively locates directories with sdk headers and
installs them all. Useful when you want to build a complete new X
server and drivers without having to install the X server before the
drivers are actually working.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 329db3292223cccd4887062956622285c45a1523
Author: Dave Airlie <airlied@redhat.com>
Date: Sat Jul 7 10:10:08 2012 +0100
dri2/prime: allocate prime id at screen allocation time
Add a static mask of prime id and allocate them at screen time,
if the driver supports the prime interfaces and is a gpu screen.
This is instead of them changing due to user controlled randr commands,
as suggested by Keith.
Reviewed-by: Keith Packard <keithp@keithp.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
commit 30298012162de7f76e8a4c7b0362e98703f80011
Author: Dave Airlie <airlied@redhat.com>
Date: Tue Jun 26 10:20:52 2012 +0100
dri2: add initial prime support. (v1.2)
This adds the initial prime support for dri2 offload. The main thing is
when we get a connection from a prime client, we stored the information
and mark all drawables from that client as prime. We then create all
buffers for that drawable on the prime device dri2screen.
Then DRI2UpdatePrime is provided which drivers can call to get a shared
pixmap which they can use as the front buffer. The driver is then
responsible for doing the back->front copy to the shared buffer.
prime requires a compositing manager be run, but it handles the case where
a window get un-redirected by allocating a new pixmap and pointing the crtc
at it while the client is in that state.
Currently prime can't handle pageflipping, so always does straight copy swap,
v1.1: renumber on top of master.
v1.2: fix auth on top of master.
Reviewed-by: Keith Packard <keithp@keithp.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
commit 234022cfb3ad2a1b16ab7981ce69f9cd5ba0fbeb
Author: Dave Airlie <airlied@redhat.com>
Date: Sat Jul 7 10:20:58 2012 +0100
configure: bump dri2proto to 2.8
This is required for the prime macros.
Reviewed-by: Keith Packard <keithp@keithp.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
commit c41922940adbc8891575b3321fadf01ff4cb5854
Author: Dave Airlie <airlied@redhat.com>
Date: Tue Jun 26 10:00:21 2012 +0100
dix/randr: add a hook into screen to replace scanout pixmap
For DRI2 in some offload cases we need to set a new pixmap on the crtc,
this hook allows dri2 to call into randr to do the necessary work to set
a pixmap as the scanout pixmap for the crtc the drawable is currently on.
This is really only to be used for unredirected full screen apps in composited
environments.
Reviewed-by: Keith Packard <keithp@keithp.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
commit e2fd447e76c4a1233374c9d8fa9cae54a55dad50
Author: Dave Airlie <airlied@redhat.com>
Date: Thu Jul 5 15:50:56 2012 +0100
xf86: add callback for offloak sink setting support.
This adds support for setting the offload sink to the xf86 ddx.
Reviewed-by: Keith Packard <keithp@keithp.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
commit 22f02120eb4092e1c283f81c8040f178693ff0a4
Author: Dave Airlie <airlied@redhat.com>
Date: Tue Jun 26 09:53:54 2012 +0100
xf86: store scanout pixmap in the xf86 struct as well.
This is so we can tell the scanout pixmap has changed between calls
to the crtc set function.
Reviewed-by: Keith Packard <keithp@keithp.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
commit 426bc0a28edbe0e9153f692a02dd25f744ffa034
Author: Dave Airlie <airlied@redhat.com>
Date: Thu Jul 5 15:41:38 2012 +0100
randr: add hooks for offload sink provider protocol
This adds the protocol handler and associated providers handling
for the offload slaves, it allows two providers to be connected as
offload sink/source.
Reviewed-by: Keith Packard <keithp@keithp.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
commit 12905dfaf01088a00f4a0a78cffba03329e7b724
Author: Dave Airlie <airlied@redhat.com>
Date: Sat May 26 13:11:01 2012 +0100
dix/xf86: initial offload slave tracking (v1.1)
add the linked list and provider hooks.
v1.1: add another assert in the add path.
Reviewed-by: Keith Packard <keithp@keithp.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
commit a7c01da54ab43f9d29333ccbd79dfc001f9dc5e3
Author: Dave Airlie <airlied@redhat.com>
Date: Thu Jul 5 20:34:54 2012 +0100
xf86: make sure rotate calcs are done on the right screen boundaries
This fixes a segfault where this code believes we are outside the screen
boundaries on a slave device, but we aren't.
Reviewed-by: Keith Packard <keithp@keithp.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
commit cc02f4ef3e407be794132d004c947c9a4e14f4c2
Author: Dave Airlie <airlied@redhat.com>
Date: Tue Jun 19 16:01:16 2012 +0100
xf86/cursor: fallback to sw cursor if we have slaves present.
Current USB devices have no hw rendered cursors, so we need the
master GPU to render the cursor, so whenever we plug in a
slave device, fallback to sw rendered cursors.
Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
commit 98686512cbe1affb75222a63136854af79f1411b
Author: Dave Airlie <airlied@redhat.com>
Date: Thu Jul 5 15:50:24 2012 +0100
xf86: add output source setting callback (v2)
This adds support for the randr callback for setting the output source
for a device.
v2: drop root clip change on detach
Reviewed-by: Keith Packard <keithp@keithp.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
commit 4c92eb00f97f7b8258de8e366226880382cc9ce9
Author: Dave Airlie <airlied@redhat.com>
Date: Thu Jul 5 15:41:22 2012 +0100
randr: add output source setup
This adds the output sources to the associated list and adds the protocol
handler for the randr SetProviderOutputSource.
Reviewed-by: Keith Packard <keithp@keithp.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
commit bec4cb72c55bb6dee09c65c0844af201067a090f
Author: Dave Airlie <airlied@redhat.com>
Date: Thu May 24 15:47:22 2012 +0100
randr: hook up output slave to screen resources return
When the client asks for the screen resources list, it will now
get a list of crtc/outputs for the master + all attached slaves,
this will let randr configure all attached slave devices properly.
Keith asked I merge the two functions, but not just yet, the current
multi screen code doesn't handle primary yet properly, will fix it up later.
Reviewed-by: Keith Packard <keithp@keithp.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
commit 88bc02bfaae2c15a30c606d34cf7940e6ad5ea14
Author: Dave Airlie <airlied@redhat.com>
Date: Mon Jun 18 14:11:24 2012 +0100
xf86/crtc: add new interface to detach slave crtcs
This will detach any scanout pixmaps attached to slave crtcs.
Reviewed-by: Keith Packard <keithp@keithp.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
commit 9b8217f9ef6279fff6628631d18497bed0343ef9
Author: Dave Airlie <airlied@redhat.com>
Date: Thu Jun 14 15:24:46 2012 +0100
dix/pixmap: track dirty pixmaps in server. (v4)
This adds two functions for drivers to use directly to keep a
linked list of slave pixmaps to do damage tracking on and keep
updated. It also adds a helper function that drivers may optionally
call to do a simple copy area damage update.
v2: use damage.h not damagestr.h, fixes ephyr build.
v3: address ajax review: use slave_dst, drop unused dst member.
v4: check DamageCreate return, add SourceValidate comment,
add a comment addressing possible optimisation possibility
Reviewed-by: Keith Packard <keithp@keithp.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
commit c5cc2a8243c5e6bf454af989b7512ec7e20fc3f2
Author: Dave Airlie <airlied@redhat.com>
Date: Tue May 29 14:41:39 2012 +0100
randr: check the screen size bounds against the master
The master contains the complete screen size bounds, so check
the width/height against it.
Reviewed-by: Keith Packard <keithp@keithp.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
commit 26d848cb916c8a85f2c69d2aeb004665ba07bf00
Author: Dave Airlie <airlied@redhat.com>
Date: Tue May 29 14:35:24 2012 +0100
randr: fix tellchanged to work with slave scanouts
Tell changed need to tell only for the master pixmap,
however it gets called from various places for slave screens,
so convert to telling clients about changes on the master screen.
Reviewed-by: Keith Packard <keithp@keithp.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
commit 4bf0192d810e01c89a1903cc4bc5e639fc13a547
Author: Dave Airlie <airlied@redhat.com>
Date: Tue May 29 14:37:11 2012 +0100
randr: fixup constrain to work with slave screens.
Current code constrains the cursor to the crtcs on the master
device, for slave outputs to work we have to include their crtcs
in the constrain calculations.
Reviewed-by: Keith Packard <keithp@keithp.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
commit 2ed3f64d9d453628ab5c03b8aee006093019c933
Author: Dave Airlie <airlied@redhat.com>
Date: Wed Jun 20 12:37:26 2012 +0100
xf86: add initial scanout pixmap support (v2)
Add the simple passthrough interface for drivers to use,
so they can set scanout pixmaps.
v2: detach scanout pixmap properly.
Reviewed-by: Keith Packard <keithp@keithp.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
commit f2da2c12042d3447b1c954e7301632d174a08b4f
Author: Dave Airlie <airlied@redhat.com>
Date: Wed Jun 20 12:37:12 2012 +0100
randr: add initial scanout pixmap support (v3)
When randr notices a crtc configuration request for a slave device,
it checks if the slave allocated pixmap exists and is suitable,
if not it allocates a new shared pixmap from the master, shares
it to the slave, and starts the master tracking damage to it,
to keep it updated from the current front pixmap.
If the resize means the crtc is no longer used it will destroy
the slave pixmap.
This adds the concept of a scanout_pixmap to the randr_crtc object,
and also adds a master pixmap pointer to the pixmap object, along
with defining some pixmap helper functions for getting pixmap box/regions.
v2: split out pixmap sharing to a separate function.
v3: update for void *
Reviewed-by: Keith Packard <keithp@keithp.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
commit 0b0e7148925e1f835d4f4f06e402a97023531828
Author: Dave Airlie <airlied@redhat.com>
Date: Thu May 24 16:03:31 2012 +0100
exa: pixmap sharing infrastructure (v3)
This just adds exa interfaces for mixed exa so drivers can
share and set shared pixmaps up correctly.
v2: update for passing slave screen.
v3: update for void *
Reviewed-by: Keith Packard <keithp@keithp.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
commit fd6c1bf0a3efced3ad4623dbd4716230a5f2419e
Author: Dave Airlie <airlied@redhat.com>
Date: Thu May 24 16:03:19 2012 +0100
dix: pixmap sharing infrastructure (v3)
This is a hooks for pixmap sharing and tracking.
The pixmap sharing ones get an integer handle for the pixmap
and use a handle to be the backing for a pixmap.
The tracker interface is to be used when a GPU needs to
track pixmaps to be updated for another GPU.
v2: pass slave to sharing so it can use it to work out driver.
v3: use void * as per keithp's suggestion.
Reviewed-by: Keith Packard <keithp@keithp.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
commit 382dd45bb88fa92764bf0ecd655cb9890eb84960
Author: Dave Airlie <airlied@redhat.com>
Date: Thu May 24 15:39:05 2012 +0100
dix: add ability to link output slave gpus to the current gpu (v1.1)
Just add the interfaces to attach/detach output slaves, and
a linked list to keep track of them. Hook up the randr providers
list to include these slaves.
v1.1: add another assert to the add path.
Reviewed-by: Keith Packard <keithp@keithp.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
commit 05d2472cd242293a5fa205efff5734a3380072b4
Author: Dave Airlie <airlied@redhat.com>
Date: Thu Jun 14 15:03:02 2012 +0100
xf86dga: handle DGAAvailable for gpu screens. (v2)
v2: Split out DGAAvailable into two interfaces, one for calls from protocol
decoding and one for internal usage, after discussion with ajax and keithp.
Reviewed-by: Keith Packard <keithp@keithp.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
commit 3cbc4c10b52896324fe14d2ab56bd54577c9294c
Author: Dave Airlie <airlied@redhat.com>
Date: Wed Jun 13 14:35:49 2012 +0100
randr: expose unattached providers to the clients.
This provides the unattached provider list to the clients.
Reviewed-by: Keith Packard <keithp@keithp.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
commit d0e138c3f3e58ef127dad6c6aef48b1713b5ce58
Author: Dave Airlie <airlied@redhat.com>
Date: Wed Jun 13 14:32:05 2012 +0100
dix: attach unbound screens to protocol screen 0 (v2)
This is the default attachment, unbound gpu screens get
attached to the 0 protocol screen.
detach on hotunplug.
v2: detach after tearing down crtc/outputs.
Reviewed-by: Keith Packard <keithp@keithp.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
commit 4caad34c932115dc0a9fd9c2995ebb2d38b9359c
Author: Dave Airlie <airlied@redhat.com>
Date: Wed Jun 13 14:27:42 2012 +0100
dix: add unattached list for attaching screens to initially. (v1.1)
This list is meant for attaching unbound gpu screens to initially,
before the client side rebinds them.
v1.1: add another assert in the add path.
Reviewed-by: Keith Packard <keithp@keithp.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
commit 9b5cf2ed76b00937af12304e0e8dbd60df62067e
Author: Dave Airlie <airlied@redhat.com>
Date: Wed Jun 13 14:17:06 2012 +0100
xfree86: add framework for provider support in ddx. (v4)
This adds the framework for DDX provider support.
v2: as per keithp's suggestion remove the xf86 provider object
and just store it in the toplevel object.
v3: update for new protocol
v4: drop devPrivate, free name
Reviewed-by: Keith Packard <keithp@keithp.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
commit 66d92afeaeed9f4a19267d95a1f81b9bf27162a5
Author: Dave Airlie <airlied@redhat.com>
Date: Wed Jun 13 14:03:04 2012 +0100
randr: add provider object and provider property support (v6)
This adds the initial provider object and provider property
support to the randr dix code.
v2: destroy provider in screen close
v2.1: fix whitespace
v3: update for latest rev of protocol + renumber after 1.4 tearout.
v4: fix logic issue, thanks Samsagax on irc
v5: keithp's review: fix current_role, fix copyrights, fix master
reporting crtc/outputs.
v6: port to new randr interface, drop all set role bits for now
v7: drop devPrivate in provider, not needed, add BadMatch returns
for NULL SetProviderOffloadSink and SetProviderOutputSource, drop
the old typedef.
Reviewed-by: Keith Packard <keithp@keithp.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
commit 44eae69f1df2d00e0c9f1ea8d3c4fae06bcacfbc
Author: Dave Airlie <airlied@redhat.com>
Date: Thu Jul 5 21:11:16 2012 +0100
configure: bump randrproto min requirements to 1.4.0
Needed to build latest randr stuff.
Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
commit 4d24192bd24fb20d16d0054d77bffda883faeb79
Merge: 7c9d8cbd36 74b786f7ce
Author: Keith Packard <keithp@keithp.com>
Date: Fri Jul 6 12:17:17 2012 -0700
Merge remote-tracking branch 'airlied/for-keithp-stage1'
commit 7c9d8cbd368cac53e7aed9308292614337db3be2
Author: Torsten Kaiser <just.for.lkml@googlemail.com>
Date: Fri Jul 6 12:10:25 2012 -0700
xfree86: EDID Est III parsing skips some modes
This loop needs to count from 7 to 0, not only from 7 to 1.
The current code always skips the modes {1152, 864, 75, 0}, {1280, 1024, 85, 0},
{1400, 1050, 75, 0}, {1600, 1200, 70, 0} and {1920, 1200, 60, 0}.
Signed-off-by: Torsten Kaiser <x11@ariolc.dyndns.org>
Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 0b3abacb6430e6593c4358420ba457d8149bd32b
Author: Torsten Kaiser <just.for.lkml@googlemail.com>
Date: Fri Jul 6 12:06:13 2012 -0700
xfree86: EDID Est III parsing can walk off end of array
Using -O3 gcc notes that m could reach beyound the end of the EstIIIModes array,
if the last bits of the 11s byte where set.
Fix this, by extending the array to cover all possible bits from est.
https://bugs.freedesktop.org/show_bug.cgi?id=45623
Signed-off-by: Torsten Kaiser <x11@ariolc.dyndns.org>
Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 74b786f7cee5723468bba251a2155a65770b2ad4
Author: Dave Airlie <airlied@redhat.com>
Date: Tue Jun 5 17:45:03 2012 +0100
xfree86: add autoAddGPU option (v2)
This option is to stop the X server adding non-primary devices as
gpu screens.
v2: fix per Keith's suggestion.
Reviewed-by: Keith Packard <keithp@keithp.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
commit ef6686480ad1de6582b9ef5d13e5d4ffb3b3918c
Author: Dave Airlie <airlied@redhat.com>
Date: Tue Jun 5 17:30:39 2012 +0100
xfree86: add platform bus hotplug support (v3)
This provides add/remove support for platform devices at xfree86 ddx level.
v2: cleanup properly if no driver found.
v3: load the modesetting driver before checking driver list.
Reviewed-by: Keith Packard <keithp@keithp.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
commit b27cf30995e05da11e827ec41060051673336a7b
Author: Dave Airlie <airlied@redhat.com>
Date: Tue Jun 5 17:29:56 2012 +0100
xserver/config: add udev/drm hotplug callbacks. (v2)
This adds callbacks into the ddx for udev gpu hotplug.
v2: fix some strncmp returns.
Reviewed-by: Keith Packard <keithp@keithp.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
commit 53b66c084fbf5bf47f8121632fabdc39b9fe8337
Author: Dave Airlie <airlied@redhat.com>
Date: Tue Jun 5 17:18:10 2012 +0100
xfree86: add DDX gpu screen support. (v3)
This just adds the structures and interfaces required for adding/deleteing
gpu screens at the DDX level. The platform probe can pass a new flag
to the driver, so they can call xf86AllocateScreen and pass back the new
gpu screen flag.
It also calls the gpu screens preinit and screeninit routines at
startup.
v2: fix delete screen use after free.
v3: split out pScrn into separate patch
Reviewed-by: Keith Packard <keithp@keithp.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
commit 726d467b534a30d8cbaafb858339c638c9f83195
Author: Dave Airlie <airlied@redhat.com>
Date: Mon Jun 25 11:51:26 2012 +0100
xf86: cleanup helper code to use a pointer. (v1.1)
This is in preparation for gpu screens in here, just use
a pScrn pointer to point at the new screen.
suggested by Keith.
v1.1: fix spacing as suggested by Aaron.
Reviewed-by: Keith Packard <keithp@keithp.com>
Reviewed-by: Aaron Plattner <aplattner@nvidia.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
commit 9d179818293b466ec6f1777f0b792e1fbbeb318c
Author: Dave Airlie <airlied@redhat.com>
Date: Tue Jun 5 17:09:38 2012 +0100
dix: introduce gpu screens. (v5)
This patch introduces gpu screens into screenInfo. It adds interfaces
for adding and removing gpu screens, along with adding private fixup,
block handler support, and scratch pixmap init.
GPU screens have a myNum that is offset by GPU_SCREEN_OFFSET (256),
this is used for logging etc.
RemoveGPUScreen isn't used until "xfree86: add platform bus hotplug support".
v2: no glyph pictures for GPU screens for now.
v3: introduce MAXGPUSCREENS, fix return value check
v4: fixup myNum when renumbering screens (ajax)
v5: drop cursor privates for now.
Reviewed-by: Keith Packard <keithp@keithp.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
commit 3478af3374abffa0c226ee077fda1fcfc0751e74
Author: Dave Airlie <airlied@redhat.com>
Date: Tue Jun 5 17:01:21 2012 +0100
screen: split out screen init code. (v2)
This is a precursor for reusing this code to init gpu screens.
v2: fixup int check as per Keith's review.
Reviewed-by: Keith Packard <keithp@keithp.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
commit cf66471353ac5899383b573a3cfca407e90d501e
Author: Dave Airlie <airlied@redhat.com>
Date: Tue May 8 14:26:47 2012 +0100
xfree86: use udev to provide device enumeration for kms devices (v10)
On Linux in order for future hotplug work, we are required to interface
to udev to detect device creation/removal. In order to try and get
some earlier testing on this, this patch adds the ability to use
udev for device enumeration on Linux.
At startup the list of drm/kms devices is probed and this info is
used to load drivers.
A new driver probing method is introduced that passes the udev
device info to the driver for probing.
The probing integrates with the pci probing code and will fallback
to the pci probe and old school probe functions in turn.
The flags parameter to the probe function will be used later
to provide hotplug and gpu screen flags for the driver to behave
in a different way.
This patch changes the driver ABI, all drivers should at least
be set with a NULL udev probe function after this commit.
v2: rename to platform bus, now with 100% less udev specific,
this version passes config_odev_attribs around which are an array
of id/string pairs, then the udev code can attach the set of attribs
it understands, the OS specific code can attach its attrib, and then
the core/drivers can lookup the required attribs.
also add MATCH_PCI_DEVICES macro.
This version is mainly to address concerns raised by ajax.
v3: Address comments from Peter.
fix whitespace that snuck in.
rework to use a linked list with some core functions that
xf86 wraps.
v4: add free list, fix struct whitespace.
ajax this address most of your issues?
v5: drop probe ifdef, fix logic issue
v6: some overhaul after more testing.
Implement primaryBus for platform devices.
document hotplug.h dev attribs - drop sysname attrib
fix build with udev kms disabled
make probing work like the PCI probe code,
match against bus id if one exists, or primary device.
RFC: add new bus id support "PLAT:syspath". we probably
want to match on this a bit different, or use a different
property maybe. I was mainly wanting this for use with
specifying usb devices in xorg.conf directly, but PLAT:path
could also work I suppose.
v6.1: add missing noop platform function
v7: fix two interactions with pci probing and slot claiming, prevents
pci and platform trying to load two drivers for same slot.
v8: test with zaphod mode on -ati driver, fixup resulting issue
clean up common probe code into another function, change busid
matching to allow dropping end of strings.
v9: fix platform probing logic so it actually works.
v9.1: fix pdev init to NULL properly.
v10: address most of Keith's concerns.
v4 was thanks to Reviewed-by: Adam Jackson <ajax@redhat.com>
v5 was Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Keith Packard <keithp@keithp.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
commit 2c52d776a42a28bb3e1463edf0cfe0672d0c08a9
Author: Dave Airlie <airlied@redhat.com>
Date: Tue Jun 19 16:01:08 2012 +0100
xf86: cursor code got mangled by indenting
This fixes some really ugly code that got mangled by the indenting.
Reviewed-by: Keith Packard <keithp@keithp.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
commit 9e4b8b74b008dd72d1da7074bd7ecae677cefd20
Author: Keith Packard <keithp@keithp.com>
Date: Thu Jul 5 11:31:55 2012 -0700
privates: Allow device privates to be allocated after server start
This will permit midispcur to allocate its privates for hotplug outputs
Signed-off-by: Keith Packard <keithp@keithp.com>
Reviewed-by: Dave Airlie <airlied@redhat.com>
commit 493ad833233707b0a42e5fbdd957a24fc6e52917
Author: Keith Packard <keithp@keithp.com>
Date: Thu Jul 5 11:31:29 2012 -0700
dix: Allocate device privates separate from devices
This will allow device privates to be resized.
Signed-off-by: Keith Packard <keithp@keithp.com>
Reviewed-by: Dave Airlie <airlied@redhat.com>
commit f38b2b628322f4d763b0c7f8387d5ab0472a7d2b
Author: Keith Packard <keithp@keithp.com>
Date: Thu Jul 5 11:15:18 2012 -0700
mi: Don't save midispcur rendering resources for each cursor
Instead, only save them for the most recently drawn cursor. This saves
a bunch of storage for idle cursors.
Signed-off-by: Keith Packard <keithp@keithp.com>
Reviewed-by: Dave Airlie <airlied@redhat.com>
commit 7651176b0093cf3a4cff2277f6918a7d0451af41
Author: Keith Packard <keithp@keithp.com>
Date: Tue Jul 3 16:12:59 2012 -0700
Use screen-specific privates for exa pixmap and gc privates
Signed-off-by: Keith Packard <keithp@keithp.com>
Reviewed-by: Dave Airlie <airlied@redhat.com>
commit 7ca32f1c282cb6d4d7255f118a1e2e6f54e6b3fa
Author: Keith Packard <keithp@keithp.com>
Date: Tue Jul 3 16:05:42 2012 -0700
Use new screen-specific privates for fb window and gc privates
This ensures that only screens using fb will have this space allocated.
Signed-off-by: Keith Packard <keithp@keithp.com>
Reviewed-by: Dave Airlie <airlied@redhat.com>
commit 9d457f9c55f12106ba44c1c9db59d14f978f0ae8
Author: Keith Packard <keithp@keithp.com>
Date: Tue Jul 3 15:45:09 2012 -0700
Add screen-specific privates.
Screen-specific privates areas are only allocated for objects related
to the target screen; objects allocated for other screens will not
have the private space reserved. This saves memory in these objects
while also allowing hot-plug screens to have additional private
allocation space beyond what the core screens are using.
Drivers are encouraged to switch to this mechanism as it will reduce
memory usage in multi-GPU environments, but it is only required for
drivers which will be loaded after the server starts, like
modesetting.
Objects providing screen-specific privates *must* be managed by the
screen-specific private API when allocating or initializing privates
so that the per-screen area can be initialized properly.
The objects which support screen-specific privates are:
Windows
Pixmaps
GCs
Pictures
Extending this list to include Colormaps would be possible, but
require slightly more work as the default colormap is created before
all colormap privates are allocated during server startup, and hence
gets a bunch of special treatment.
Of particular note, glyphs are *not* capable of supporting
screen-specific privates as they are global objects, not allocated on
a screen-specific basis, and so each driver must be able to see their
privates within the glyph.
Signed-off-by: Keith Packard <keithp@keithp.com>
Reviewed-by: Dave Airlie <airlied@redhat.com>
commit ed6daa15a7dcf8dba930f67401f4c1c8ca2e6fac
Author: Ian Romanick <ian.d.romanick@intel.com>
Date: Wed Jul 4 15:21:09 2012 -0700
glx/dri2: Enable GLX_ARB_create_context_robustness
If the driver supports __DRI2_ROBUSTNESS, then enable
GLX_ARB_create_cotnext_robustness as well. If robustness values are
passed to glXCreateContextAttribsARB and the driver doesn't support
__DRI2_ROBUSTNESS, existing drivers will already generate the correct
error values (so that the correct GLX errors are generated).
Signed-off-by: Ian Romanick <ian.d.romanick@intel.com>
Reviewed-by: Dave Airlie <airlied@redhat.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 90aa2486e394c0344aceb2a70432761665a79333
Author: Ian Romanick <ian.d.romanick@intel.com>
Date: Wed Jul 4 15:21:08 2012 -0700
glx: Allow attributes and flags from GLX_ARB_create_context_robustness
The assumtion is that if the underlying provider (e.g., glxdri2.c) doesn't
support this extension, it will generate BadMatch for these flags and
attributes.
Signed-off-by: Ian Romanick <ian.d.romanick@intel.com>
Reviewed-by: Dave Airlie <airlied@redhat.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit aef0b4593e165634ca7fa0745882dad12a54ebed
Author: Ian Romanick <ian.d.romanick@intel.com>
Date: Wed Jul 4 15:21:07 2012 -0700
glx: Track the reset notification strategy for a context
Also require that the reset notification for a new context and the other
context in the share group match. There isn't yet any way to specify a
non-default reset notification strategy, but that will come.
Signed-off-by: Ian Romanick <ian.d.romanick@intel.com>
Reviewed-by: Dave Airlie <airlied@redhat.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit f8198285cfc4704bc4d56922e5a2e99030a83778
Author: Ian Romanick <ian.d.romanick@intel.com>
Date: Wed Jul 4 15:21:06 2012 -0700
glx: Add extension string tracking for GLX_ARB_create_context_robustness
Signed-off-by: Ian Romanick <ian.d.romanick@intel.com>
Reviewed-by: Dave Airlie <airlied@redhat.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 4ffbc984eac8a15925094614021de30dc8084e65
Author: Ian Romanick <ian.d.romanick@intel.com>
Date: Wed Jul 4 15:21:05 2012 -0700
glx: Reject creations of indirect contexts with unsupportable versions.
Signed-off-by: Ian Romanick <ian.d.romanick@intel.com>
Reviewed-by: Dave Airlie <airlied@redhat.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 41d5120eaf2bdf308eb904cac9b5027b003fea8d
Author: Ian Romanick <ian.d.romanick@intel.com>
Date: Wed Jul 4 15:21:04 2012 -0700
glx: Implement GLX_EXT_create_context_es2_profile
This patch builds on the infrastucture put in place for
GLX_ARB_create_context_profile. If GLX_CONTEXT_ES2_PROFILE_BIT_EXT is
specified and the requested version is 2.0, create a context with the
__DRI_API_GLES2 API.
This change assumes that any DRI2 driver can handle (possibly by saying "no
seeing an API setting other than __DRI_API_OPENGL or __DRI_API_OPENGL_CORE.
This allows enabling the extension any time GLX_ARB_create_context (and
GLX_ARB_create_context_profile) is enabled.
v2: Clean up some comments. Note that our behavior for
GLX_CONTEXT_ES2_PROFILE_BIT_EXT w/version != 2.0 matches NVIDIA's.
Signed-off-by: Ian Romanick <ian.d.romanick@intel.com>
Reviewed-by: Dave Airlie <airlied@redhat.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit cef0b808d3152a20cd98d32457dde08bd5434e7c
Author: Ian Romanick <ian.d.romanick@intel.com>
Date: Wed Jul 4 15:21:03 2012 -0700
glx: Implement GLX_ARB_create_context_profile
Most of the infrastructure was already in place. This just adds:
* Validate values specified with the GLX_CONTEXT_PROFILE_MASK_ARB
attribute.
* Select a DRI2 "api" based on the setting of
GLX_CONTEXT_PROFILE_MASK_ARB.
* Enable GLX_ARB_create_context_profile extension.
This change assumes that any DRI2 driver can handle (possibly by saying "no")
seeing an API setting other than __DRI_API_OPENGL. This allows enabling this
extension any time GLX_ARB_create_context is enabled.
Also, the validation code in __glXDisp_CreateContextAttribsARB is structured
in a very verbose manner (using a switch-statement) to ease the addition of
GLX_EXT_create_context_es2_profile.
Signed-off-by: Ian Romanick <ian.d.romanick@intel.com>
Reviewed-by: Dave Airlie <airlied@redhat.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 09a8a169d5929665778ae33e58e345fe1192b64c
Author: Ian Romanick <ian.d.romanick@intel.com>
Date: Wed Jul 4 15:21:02 2012 -0700
glx: Implement GLX SetClientInfo2ARB protocol
The protocol is almost identical to SetClientInfoARB. The only
difference is the GL versions include an extra 4 bytes for the supported
profile.
Signed-off-by: Ian Romanick <ian.d.romanick@intel.com>
Reviewed-by: Dave Airlie <airlied@redhat.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 167993254a5cbe11a1f44fad1e8ae042089c1619
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu Jul 5 16:17:56 2012 +1000
list.h: don't crash when removing an element from a NULL list
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 8aa6d49d46dacc31a85023d0159c1fb67401df73
Author: Ian Romanick <ian.d.romanick@intel.com>
Date: Wed Jul 4 15:21:01 2012 -0700
glx: Don't request prototypes for GL extension functions
The server does not want GL extension prototypes. It never links with
anything that could possibly provide implementations of these functions. It
*is* the provide, and it does not provde these symbols. All this does is
create hundreds of warnings like:
incude/GL/glext.h:5570:45: warning: redundant redeclaration of 'glMultTransposeMatrixd' [-Wredundant-decls]
include/GL/gl.h:1940:45: note: previous declaration of 'glMultTransposeMatrixd' was here
I believe this was necessary back before the AIGLX days, but that was a long,
long time ago. The warnings recently showed up with the addition of
-Wredundant-decls to the CWARNFLAGS.
v2: Update the commit message, no code changes.
Signed-off-by: Ian Romanick <ian.d.romanick@intel.com>
Cc: Adam Jackson <ajax@redhat.com>
Cc: Dave Airlie <airlied@redhat.com>
Acked-by: Keith Packard <keithp@keithp.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 258abbf823f753757e4dddc13ef495f4024680db
Author: Michal Srb <msrb@suse.com>
Date: Thu Jun 28 17:17:12 2012 +0200
Look for ModuleData only in appropriate library
LoaderSymbol calls dlsym with RTLD_DEFAULT pseudo handle making it search in
every loaded library. In addition glibc adds NODELETE flag to the library
containing the symbol.
It's used in doLoadModule to locate <modulename>ModuleData symbol, the
module's library gets the flag and is kept in memory even after it is
unloaded.
This patch adds LoaderSymbolFromModule function that looks for symbol only in
library specified by handle. That way the NODELETE flag isn't added.
This glibc behavior doesn't seem to be documented, but even if other
implementations differ, there is no reason to search ModuleData symbol outside
the module's library.
Signed-off-by: Michal Srb <msrb@suse.com>
Reviewed-by: Daniel Stone <daniel@fooishbar.org>
v2: Switch LoaderSymbolFromModule arguments order.
Correct description.
Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit d84f0f823eeeecdf0498aadd3fbb1d11dabc0837
Merge: 12bfb4cf1b d04dfe3f75
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Wed Jul 4 21:23:48 2012 +1000
Merge branch 'sigio-vt-switch-issues' into for-keith
Conflicts:
test/Makefile.am
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 12bfb4cf1bebb66d2c2eb76b93c18a2915b865e5
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Tue Jun 26 09:19:33 2012 +1000
Xi: extend PropagateMask to EMASKSIZE
Number of devices is 2 + MAXDEVICES, with index 0 and 1 reserved for
XIAll{Master}Devices. At the current size, PropagateMask would be overrun in
RecalculateDeviceDeliverableEvents().
Found by Coverity.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Dave Airlie <airlied@redhat.com>
commit a9c09f8f8e2a97e4bfe927bc4c7f29b04ee3403a
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Mon Jun 25 14:24:11 2012 +1000
dix: fix memory leak in TouchEventHistoryReplay
Don't leak if ti->history is NULL.
Found by coverity.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Dave Airlie <airlied@redhat.com>
commit 55ff20eb37f00a3ad07b5acff19d4497ab513a97
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Mon Jun 25 14:22:31 2012 +1000
dix: fix dereference before null check
Found by Coverity.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Dave Airlie <airlied@redhat.com>
commit e3f47be9fbc489e3eb5832445924810b2ff300f7
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Mon Oct 24 10:01:26 2011 +1000
xfree86: fix use-after-free issue in checkInput
*dev is the condition of the while loop we're in, reset to NULL after
freeing
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Dave Airlie <airlied@redhat.com>
commit 252a69b592001b34714d0fe7508e1898883f9d01
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Wed Jun 20 14:25:54 2012 +1000
xkb: use local variable instead of casting arg
No functional changes.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit d04dfe3f754ad3a5f158057175cbd44319c1ae51
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri Jun 22 15:18:53 2012 +1000
Drop custom sigio block/unblock functions from kdrive, ephyr and dmx
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Keith Packard <keithp@keithp.com>
commit 5d309af2ed93e91c7d72f548a11052051efbb40f
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri Jun 22 14:56:25 2012 +1000
xfree86: drop ddx-specific SIGIO blocking
The hooks are left for this cycle, we can drop it next cycle once the
drivers that need it (e.g. wacom) have been updated.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Keith Packard <keithp@keithp.com>
commit ff67135bec3ecea8cebeb46b42ece0a6671e231d
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri Jun 22 13:09:35 2012 +1000
xfree86: use OsBlockSIGIO from the ddx
We can ignore the "wasset" argument now since the DIX will keep proper
refcounting.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Keith Packard <keithp@keithp.com>
commit 6bf356ef2831baeccd7a650ed3fde0831e33c6c0
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri Jun 22 13:02:40 2012 +1000
os: add OsBlockSIGIO and OsReleaseSIGIO
Let the dix be in charge of changing the sigprocmask so we only have one
entity that changes it.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Keith Packard <keithp@keithp.com>
commit 24525d96a3b9dba67eb75042500b2f208a2cc246
Merge: 4cd91bd4c6 35e3d22915
Author: Keith Packard <keithp@keithp.com>
Date: Mon Jul 2 22:35:39 2012 -0700
Merge branch 'sigsafe-logging-varargs'
This merge includes a minor fixup for '%p' arguments; must cast to
uintptr_t instead of uint64_t as we use -Werror=pointer-to-int-cast
which complains when doing a cast (even explicitly) from a pointer
to an integer of different size.
commit 35e3d229150395a222a0f53318daf5dbeb8f6eb6
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu May 24 14:04:42 2012 +1000
Bump to ABI_XINPUT_VERSION 18
The input ABI hasn't changed, but input drivers need something to hook on if
they want to log from within signal handlers and the input ABI is the
simplest way of doing so.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 541934168dbeb17059542bb5a1da8eba7995fa05
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Mon May 28 10:10:30 2012 +1000
xfree86: constify InputDriverPtr->driverName and default_options
Already treated as const anyway by all drivers.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Chase Douglas <chase.douglas@canonical.com>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit c66089d2206bafc01307a8327ff6089edcb4ed2d
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Mon May 28 09:57:33 2012 +1000
xfree86: constify InputInfoPtr->type_name
This corresponds to XListInputDevice(3)'s "type" field (after being
converted to an Atom). Input drivers use the XI_KEYBOARD and similar
defines, even Wacom which falls out of the common defines uses constant
strings here. The use-case for having this non-const is small.
Input ABI break technically, since we never freed this information anyway it
is not a noticable change.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Chase Douglas <chase.douglas@canonical.com>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 505c8a2b2cae0318db1148417ec850d54b38f7df
Author: Chase Douglas <chase.douglas@canonical.com>
Date: Mon Apr 9 09:41:38 2012 -0700
Log in OsVendorFatalError() in a signal safe manner
The function can be called from a fatal signal handler.
Signed-off-by: Chase Douglas <chase.douglas@canonical.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit d51aebdbf99a9f240f7c318a70ba40e61cd43049
Author: Chase Douglas <chase.douglas@canonical.com>
Date: Mon Apr 9 08:30:50 2012 -0700
Log in LoaderUnload() in a signal safe manner
The function may be called from a fatal signal handler.
Signed-off-by: Chase Douglas <chase.douglas@canonical.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit c3e1168778ec20beeac9979dc57e36400c70dd63
Author: Chase Douglas <chase.douglas@canonical.com>
Date: Mon Apr 9 08:28:17 2012 -0700
Log in UnloadModuleOrDriver() in a signal safe manner
The function may be called from a fatal signal handler.
Signed-off-by: Chase Douglas <chase.douglas@canonical.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 89e3ac07aca1def155299aff6f7a57ccafb68fd7
Author: Chase Douglas <chase.douglas@canonical.com>
Date: Mon Apr 9 08:23:32 2012 -0700
Log safely in fatal signal handler
While we probably don't need to be signal safe here since we will never
return to the normal context, the logging signal context check will
cause unsafe logging to be unhandled. Using signal safe logging here
resolves the issue.
Signed-off-by: Chase Douglas <chase.douglas@canonical.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 6fd5add005d0660b591d808583d1a6c6a85f1277
Author: Chase Douglas <chase.douglas@canonical.com>
Date: Fri Apr 6 16:17:41 2012 -0700
Log mieq enqueue overflow in a signal safe manner
Signed-off-by: Chase Douglas <chase.douglas@canonical.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 7f4a69b628a6246855054a0b94d6d6dd14e8842c
Author: Chase Douglas <chase.douglas@canonical.com>
Date: Fri Apr 13 16:01:38 2012 -0700
Log messages in TouchBeginDDXTouch() in a signal-safe manner
Signed-off-by: Chase Douglas <chase.douglas@canonical.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit f752226e40890643df213a62f0c96e6a0243e754
Author: Chase Douglas <chase.douglas@canonical.com>
Date: Fri Apr 6 10:21:14 2012 -0700
Log messages in GetTouchEvents() in a signal safe manner
Signed-off-by: Chase Douglas <chase.douglas@canonical.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 82d1c6b310eaa5095eed9ee4ea958261a46a78e1
Author: Chase Douglas <chase.douglas@canonical.com>
Date: Fri Apr 6 08:32:28 2012 -0700
Warn when attempting to log in a signal unsafe manner from signal context
Also, print out the offending message format. This will hopefully help
developers track down unsafe logging.
Signed-off-by: Chase Douglas <chase.douglas@canonical.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 512bec06be6c79ca263da9de8f40430b8095b57b
Author: Chase Douglas <chase.douglas@canonical.com>
Date: Mon Apr 16 09:47:42 2012 -0700
Make BUG_WARN* signal safe
Signed-off-by: Chase Douglas <chase.douglas@canonical.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 0fa5217836cf7fd3872fccc9f3ff9ff32426c25b
Author: Chase Douglas <chase.douglas@canonical.com>
Date: Fri Apr 6 16:09:05 2012 -0700
Print backtrace in a signal-safe manner
Backtraces are often printed in signal context, such as when a segfault
occurs.
Signed-off-by: Chase Douglas <chase.douglas@canonical.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
os: print offset as unsigned int, not long unsigned int
pnprintf() takes unsigned int for %u
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit ac20815d5235e7a8e7b331365aabf5a489fc5e34
Author: Chase Douglas <chase.douglas@canonical.com>
Date: Tue Jun 5 15:39:41 2012 +1000
Add ErrorFSigSafe() alternative to ErrorF()
ErrorF() is not signal safe. Use ErrorSigSafe() whenever an error
message may be logged in signal context.
[whot: edited to "ErrorFSigSafe"]
Signed-off-by: Chase Douglas <chase.douglas@canonical.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 164b38c72fe9c69d13ea4f9c46d4ccc46566d826
Author: Chase Douglas <chase.douglas@canonical.com>
Date: Fri Apr 6 08:28:40 2012 -0700
Add LogMessageVerbSigSafe() for logging messages while in signal context
[whot: edited to use varargs, squashed commit below]
Signed-off-by: Chase Douglas <chase.douglas@canonical.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
os: fix vararg length calculation
Make %u and %x sizeof(unsigned int), %p sizeof(void*). This is printf
behaviour and we can't guarantee that void* is uint64_t anyway.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Chase Douglas <chase.douglas@canonical.com>
commit 4cd91bd4c6325b2e617ca90a725f02ac124c2372
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Sat May 12 10:11:33 2012 -0700
Enable no-undefined symbols mode in Solaris builds if -z parent is in ld
The Solaris linker recently added a -z parent flag for easier checking
of symbol definitions in plugins against the program that loads them.
If that's present, this enables it, along with -z defs to error on
undefined symbols to alert us if any modules call symbols that won't
be found at runtime.
This builds upon, and requires, the recent Cygwin work to build Xorg.
It moves a couple more modules to be after the Xorg binary in the build
order so that they can find the binary to check against, much as the
Cygwin changes did (these would be modules built on Solaris but not
Cygwin).
v2: This version only sets the flags for the xorg-server build itself,
and does not yet export them in xorg-server.pc to the drivers, since
most of the drivers are not ready to build with -no-undefined yet.
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Yaakov Selkowitz <yselkowitz@users.sourceforge.net>
commit d31942e15c619e9355ef8183223f9165902a9d56
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Sat May 12 10:10:49 2012 -0700
Add pixman to module dependencies for pixman_region_* functions
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Yaakov Selkowitz <yselkowitz@users.sourceforge.net>
commit 339f38ef380d750c4c7afd60331a559845e4184e
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Sat May 12 10:09:41 2012 -0700
Build tda9885.c functions into fi1236 to avoid libtool relinking problems
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Yaakov Selkowitz <yselkowitz@users.sourceforge.net>
commit a00066d2916b6910429cc1c7feedafbaee0d4750
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Thu Jun 28 15:15:53 2012 -0700
Add dixGetGlyphs to replace GetGlyphs from libXfont to simplify linking
No other Xfont consumer used it, and this saves us from having to link
callers against libXfont for one simple function when doing
-no-undefined symbols builds.
The function is given a new name to avoid clashing with existing libXfont
binaries, but a #define is provided to preserve the API so we don't have
to fix all the callers at the same time.
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Yaakov Selkowitz <yselkowitz@users.sourceforge.net>
commit 212b9803238d2de2e77cbe5de62d3f616ae50daf
Author: Aaron Plattner <aplattner@nvidia.com>
Date: Fri Jun 29 13:33:58 2012 -0700
randr: Fix REQUEST vs. REQUEST_SIZE_MATCH mismatch
ProcRRGetScreenSizeRange uses REQUEST(xRRGetScreenSizeRangeReq) followed by
REQUEST_SIZE_MATCH(xRRGetScreenInfoReq). This happens to work out because both
requests have the same size, so this is not a functional change, just a cosmetic
one.
Signed-off-by: Aaron Plattner <aplattner@nvidia.com>
Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 957bf959fb577b292a3e4f6bb67740ca09e7aeb9
Author: Dave Airlie <airlied@redhat.com>
Date: Wed Jun 27 14:36:04 2012 +0100
dix/render: consolidate window format matching code.
This code existed in 3 different forms, perhaps it should be
consolidated.
Reviewed-by: Keith Packard <keithp@keithp.com>
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit a7b97b0fa85d695ae19d194cfa3267159d149e5d
Author: Christopher James Halse Rogers <christopher.halse.rogers@canonical.com>
Date: Thu Jun 28 12:07:11 2012 +1000
dri2: Fix authentication for < v8 clients (v2).
The legacy logic was embarassingly wrong; AuthMagic should return errno,
so returning FALSE only when AuthMagic returns nonzero is exactly wrong.
v2: Match drmAuthMagic by returning -EINVAL rather than EINVAL
Fix trailing whitespace
https://bugs.freedesktop.org/show_bug.cgi?id=51400
Signed-off-by: Christopher James Halse Rogers <christopher.halse.rogers@canonical.com>
Tested-by: Chris Wilson <chris@chris-wilson.co.uk>
Reviewed-by: Michel Dänzer <michel.daenzer@amd.com>
Tested-by: Knut Petersen <knut_petersen@t-online.de>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 8b4f0a4fdd6c15f49458bc3a8c3135b8c389240d
Merge: 59294a2179 d642e71287
Author: Keith Packard <keithp@keithp.com>
Date: Thu Jun 28 10:38:26 2012 -0700
Merge remote-tracking branch 'jturney/master'
commit 59294a2179bd5bb996693af004b470932df00ac6
Merge: 855003c333 191b630656
Author: Keith Packard <keithp@keithp.com>
Date: Thu Jun 28 10:11:44 2012 -0700
Merge remote-tracking branch 'whot/for-keith'
commit 855003c333a0ead1db912695bc9705ef2b3144b4
Author: Keith Packard <keithp@keithp.com>
Date: Thu Jun 21 18:45:18 2012 -0700
randr: Catch two more potential unset rrScrPriv uses
Ricardo Salveti <ricardo.salveti@linaro.org> found one place where the
randr code could use the randr screen private data without checking
for null first. This happens when the X server is running with
multiple screens, some of which are randr enabled and some of which
are not. Applications making protocol requests to the non-randr
screens can cause segfaults where the server touches the unset private
structure.
I audited the code and found two more possible problem spots; the
trick to auditing for this issue was to look for functions not taking
a RandR data structure and where there was no null screen private
check above them in the call graph.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 32603f57ca03b6390b109960f8bb5ea53ac95ecb
Author: Ricardo Salveti de Araujo <ricardo.salveti@linaro.org>
Date: Thu Jun 21 00:55:53 2012 -0300
randr: first check pScrPriv before using the pointer at RRFirstOutput
Fix a seg fault in case pScrPriv is NULL at ProcRRGetScreenInfo,
which later calls RRFirstOutput.
Signed-off-by: Ricardo Salveti de Araujo <ricardo.salveti@linaro.org>
Reviewed-by: Keith Packard <keithp@keithp.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit cf196efa05bbefdeb43f6e6bcc5f6d9080fea715
Author: Dave Airlie <airlied@redhat.com>
Date: Fri Jun 22 15:24:43 2012 +0100
modesetting 0.4.0: bump configure.ac
commit 30ab80ef5421fea9d9dd0779aa138892ff62bd6e
Author: Dave Airlie <airlied@gmail.com>
Date: Fri Jun 22 15:26:28 2012 +0100
modesetting: pci probing requires interface version 1.4
Set the drm interface version to 1.4 so we get the bus id correctly.
Signed-off-by: Dave Airlie <airlied@redhat.com>
commit d642e7128790ec6b709df8d1a91333ab87598077
Author: Yaakov Selkowitz <yselkowitz@users.sourceforge.net>
Date: Thu Jun 21 20:01:49 2012 +0100
configure.ac: link XWIN with GLX_SYS_LIBS
Link XWIN with GLX_SYS_LIBS, just like all the other DDXs
Signed-off-by: Yaakov Selkowitz <yselkowitz@users.sourceforge.net>
Reviewed-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
commit 9f1edced9abc066f0ba47672d006fe50fb206371
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri Jun 15 10:00:51 2012 +1000
xfree86: always enable SIGIO on OsVendorInit (#50957)
Drivers call xf86InstallSIGIOHandler() for their fd on DEVICE_ON. That
function does not actually enable the signal if it was blocked to begin
with. As a result, if one vt-switches away from the server (SIGIO is
blocked) and then triggers a server regeneration, the signal remains
blocked and input devices are dead.
Avoid this by always unblocking SIGIO when we start the server.
X.Org Bug 50957 <http://bugs.freedesktop.org/show_bug.cgi?id=50957>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Keith Packard <keithp@keithp.com>
commit 4ba340cfaa8d430c808566495f8deda0ff1b4424
Author: Keith Packard <keithp@keithp.com>
Date: Thu Jun 21 18:42:46 2012 -0700
randr: Clean up compiler warnings about unused and shadowing variables
set but not used variables
shadowing a previous local
A hidden problem was that the VERIFY_RR_* macros define local 'rc'
variables, any other local definitions for those would be shadowed and
generate warnings from gcc. I've renamed the other locals 'ret'
instead of 'rc'.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 191b630656ba206ad78b7803c3a76f7d9567d9d8
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu Jun 21 11:25:24 2012 +1000
include: document _XkbErrCode2 macros
Why sending the number of the (implementation-dependent) error statement to
the client is a good idea is a bit beyond me, but at least document it so we
can all share the despair.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Daniel Stone <daniel@fooishbar.org>
commit 7100118c8d3314d73bfef0a262af56686b227055
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Mon Jun 18 11:28:52 2012 +1000
AC_SUBST the GLX_SYS_LIBS
libxservertest needs -lpthread from glxapi.c's pthread_once() call. Usually
this would be pulled in by the XORG_LIBS but not when building without Xorg.
This commit has no visible effect on the current tree, preparation for test
cleanups.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
commit 014ad46f1b353a95e2c4289443ee857cfbabb3ae
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu Jun 21 14:26:15 2012 +1000
os: print newline after printing display name
Much easier for scripts that try to read the display value off the file
descriptor. Plus, this restores the behaviour we had for this patch in
Fedora since server 1.6 (April 2009).
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Dave Airlie <airlied@redhat.com>
Reviewed-by: Chase Douglas <chase.douglas@canonical.com>
commit e1f86a7c77ed49e001ea42ef76ab83e87dbdf126
Author: Sergei Trofimovich <slyfox@gentoo.org>
Date: Mon Jun 18 01:13:21 2012 +0300
test/.gitignore: add hashtabletest
Signed-off-by: Sergei Trofimovich <slyfox@gentoo.org>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit c9bbf8fe574591c8e191eeef20f8994781718772
Author: Jon TURNEY <jon.turney@dronecode.org.uk>
Date: Thu Jun 21 19:38:55 2012 +0100
hw/xwin/glx: Fix glxWinCreateContext() function pointer mismatch
Fix glxWinCreateContext() function signature to align with commit 96d74138
"glx: Extend __GLXscreen::createContext to take attributes", which added more
parameters to the screen createContext function for implementing GLX_ARB_create_context
indirect.c: In function 'glxWinScreenProbe':
indirect.c:683:36: warning: assignment from incompatible pointer type
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
commit 6e85660c7503c7e88e24003562444dffde6c88ff
Author: Jon TURNEY <jon.turney@dronecode.org.uk>
Date: Mon Mar 5 23:07:56 2012 +0000
hw/xwin/glx: Update gen_gl_wrappers.py for the current glx/dispatch.h
Fix the code generator for the dispatch table initialization after
the whitespace/coding style changes to glx/dispatch.h
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
commit cb638ed9c81f07d8603b07db395e31a41fed8685
Author: Jon TURNEY <jon.turney@dronecode.org.uk>
Date: Thu Jun 21 18:55:57 2012 +0100
hw/xwin/glx: Blacklist 'GDI generic' GL renderer
If the native GL renderer is the GDI generic renderer (as can happen
if we are in safe mode, or the video driver is VGA, or we have hybrid
graphics which hasn't noticed that xwin requires 3d acceleration), don't
use it. It's not accelerated and we will probably get better conformance
and perfomance from swrast.
Fix so we don't install screen function wrappers in glxWinScreenProbe
unless we are succesful.
Also, move fbConfig dumping to after GLX version has been determined
from extensions
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
commit 8c24d20933ba9c2ef0e9a81815c3be23fa896aea
Author: Jon TURNEY <jon.turney@dronecode.org.uk>
Date: Thu Jun 21 18:05:24 2012 +0100
hw/xwin/glx: Fix glxLogExtensions to handle a null string without crashing
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
commit c08c7c8f655d7721c1e02bfeeb965b6379f72553
Author: Jon TURNEY <jon.turney@dronecode.org.uk>
Date: Fri Jun 24 13:32:10 2011 +0100
hw/xwin/glx: Create a new dispatch table rather than modifying the existing one
Create a new dispatch table rather than modifying the existing one
struct _glapi_table is not a complete type after including glapi.h, so we use
glapi_get_dispatch_table_size() to determine it's size (alternatively, we could
include glapitable.h, to complete the type)
This could possibly be written to use _glapi_create_table_from_handle() instead, but
that requires making all the wrapper functions exports
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
commit 3ef3ce069d52dcfa932c90ccd30854a8d9daa15a
Merge: a0c8716cdc ff541e0a1f
Author: Keith Packard <keithp@keithp.com>
Date: Thu Jun 21 08:52:34 2012 -0700
Merge remote-tracking branch 'alanc/master'
commit 704b847abfd29e9adde27127a15a963414f8bcf4
Author: Chase Douglas <chase.douglas@canonical.com>
Date: Fri Apr 6 10:13:45 2012 -0700
Add FormatUInt64{,Hex}() for formatting numbers in a signal safe manner
Signed-off-by: Chase Douglas <chase.douglas@canonical.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit bc85c81687a24aea738094ff11f4448fb3b3afbb
Author: Chase Douglas <chase.douglas@canonical.com>
Date: Fri Apr 6 08:03:09 2012 -0700
Save log file file descriptor for signal context logging
None of the FILE based functions are signal safe, including fileno(), so
we need to save the file descriptor for when we are in signal context.
Signed-off-by: Chase Douglas <chase.douglas@canonical.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit d3725549f0276487fba1d419094209d18e86669f
Author: Chase Douglas <chase.douglas@canonical.com>
Date: Fri Apr 6 07:43:57 2012 -0700
Add global variable inSignalContext
This will be used for checking for proper logging when in signal
context.
Signed-off-by: Chase Douglas <chase.douglas@canonical.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit a0c8716cdca139059e7aec8a3cb75726dd37a4a1
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu Jun 21 13:45:06 2012 +1000
kdrive: adjust BlockHandler/WakeupHandler to new API
Missing API update caused Xephyr to crash on startup, garbage memory
dereference when accessing timeout.
Introduced in 1f0e8bd5eb1a5539689cfc4f5a6b86b530907ec5
kdrive.c:868:27: warning: assignment from incompatible pointer type
kdrive.c:869:28: warning: assignment from incompatible pointer type
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit ff541e0a1f84bd98966148793f35afeaf71c271b
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Wed Jun 13 21:20:51 2012 -0700
Remove obsolete tab stop comments from hw/xfree86/parser/*.c
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 687536b1044a3297f6b9a45f6a2d2987daa7be59
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Tue Jun 12 22:38:46 2012 -0700
Fix some overly indented/poorly line wrapped comments in dix/events.c
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Keith Packard <keithp@keithp.com>
commit 93a378aad4a4a03f37ddafccfedeb9d6e2be2a6a
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Tue Jun 12 22:29:51 2012 -0700
OtherClientGone: Remove unreachable return statement
Now that FatalError is marked as _X_NORETURN, the compilers know we
can't get here, and the return statement added to make them happy in
the past now makes them unhappy.
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Keith Packard <keithp@keithp.com>
commit 3f97284b10c250457888902debd4d793cb4544d4
Author: Christopher James Halse Rogers <christopher.halse.rogers@canonical.com>
Date: Wed Jun 20 13:53:53 2012 +1000
dri2: Pass a ScreenPtr through to the driver's AuthMagic function. (v3)
xwayland drivers need access to their screen private data to authenticate.
Now that drivers no longer have direct access to the global screen arrays,
this needs to be passed in as function context.
v2: Don't break ABI
v3: Paint the bikeshed blue; drop fd from AuthMagic2ProcPtr prototype
Signed-off-by: Christopher James Halse Rogers <christopher.halse.rogers@canonical.com>
Reviewed-by: Kristian Høgsberg <krh@bitplanet.net>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit dae317e7265007b38012244722e3b3a06e904ed5
Author: Andy Ritger <aritger@nvidia.com>
Date: Thu Jun 14 09:15:37 2012 -0700
randr: Don't recurse into mieqProcessInputEvents() from RRTellChanged().
Call UpdateCurrentTimeIf(), not UpdateCurrentTime(), from RRTellChanged().
The latter calls ProcessInputEvents(), which can trigger a recursion
into mieqProcessInputEvents(). The former omits the call to
ProcessInputEvents().
Signed-off-by: Andy Ritger <aritger@nvidia.com>
Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 54476b5e4461ff523e935961affabcf0de12c556
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu Jun 7 16:52:20 2012 +1000
dix: if the scroll valuator reaches INT_MAX, reset to 0
Too much scrolling down may eventually trigger an overflow of the valuator.
If this happens, reset the valuator to 0 and skip this event for button
emulation. Clients will have to figure out a way to deal with this, but a
scroll event from (close to) INT_MAX to 0 is a hint of that it needs to be
ignored.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Chase Douglas <chase.douglas@canonical.com>
commit 8dc70acbf3d82611ac9ec1ec2a52edcc01934850
Merge: ffb47a123d b59adc9c24
Author: Keith Packard <keithp@keithp.com>
Date: Thu Jun 14 13:04:29 2012 -0700
Merge remote-tracking branch 'alanc/master'
commit ffb47a123ddd1233fb4229cf23483652065c5e82
Merge: db9d2b8a50 b840ba5f54
Author: Keith Packard <keithp@keithp.com>
Date: Thu Jun 14 13:01:17 2012 -0700
Merge remote-tracking branch 'idr/GLX_ARB_create_context'
commit db9d2b8a508ab812e5c717a41310faad81879b09
Author: Dave Airlie <airlied@redhat.com>
Date: Thu Jun 7 15:01:59 2012 +0100
xserver: fix build on arm tinderbox
Rob Clark got an ARM tinderbox up and running, and this code is built there
but not here, this should fix it, though I hope that code never gets executed.
Signed-off-by: Dave Airlie <airlied@redhat.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 6d86b64dbaef5a16712fd1fdc3157f716d238877
Merge: 812786f4d4 4c68f5d395
Author: Keith Packard <keithp@keithp.com>
Date: Thu Jun 14 11:05:22 2012 -0700
Merge remote-tracking branch 'whot/for-keith'
commit b59adc9c2427e5efac3513c20992723e23f92691
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Thu Jun 7 20:58:01 2012 -0700
Make stub version of fbdevHWAdjustFrame match new prototype in fbdevhw.h
Removed flags argument to match api rework in commit 1f0e8bd5eb1a55
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Dave Airlie <airlied@redhat.com>
commit 4c68f5d395c66f28b56e488cb3cd12f36820357b
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Wed May 9 09:21:28 2012 +1000
dix: disable all devices before shutdown
f3410b97cf9b48a47bee3d15d232f8a88e75f4ef introduced a regression on server
shutdown. If any button or key was held on shutdown (ctrl, alt, backspace
are usually still down) sending a raw event will segfault the server. The
the root windows are set to NULL before calling CloseDownDevices().
Avoid this by disabling all devices first when shutting down. Disabled
devices won't send events anymore.
Master keyboards must be disabled first, otherwise disabling the pointer
will trigger DisableDevice(keyboard) and the keyboard is removed from the
inputInfo.devices list and moved to inputInfo.off_devices. A regular loop
through inputInfo.devices would thus jump to off_devices and not recover.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Acked-by: Chase Douglas <chase.douglas@canonical.com>
Reviewed-by: Chase Douglas <chase.douglas@canonical.com>
commit 9c0e820216cd1631f75b037b7908d55ac091692c
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu May 10 12:55:44 2012 +1000
Xi: drop forced unpairing when changing the hierarchy
Devices are unpaired as needed on DisableDevice now.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Chase Douglas <chase.douglas@canonical.com>
commit e433d1046c222f9d969c2c28a4651ff9097614f4
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu May 10 12:42:59 2012 +1000
dix: disable non-sprite-owners first when disabling paired devices
If a sprite-owner is to be disabled but still paired, disable the paired
device first. i.e. disabling a master pointer will disable the master
keyboard first.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Chase Douglas <chase.douglas@canonical.com>
commit df1704365e700d3cf1d36a241bdfc479159a8df7
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu May 10 15:33:15 2012 +1000
dix: free the sprite when disabling the device
Disabled devices don't need sprites (they can't send events anyway) and the
device init process is currently geared to check for whether sprite is
present to check if the device should be paired/attached.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Chase Douglas <chase.douglas@canonical.com>
commit e57d6a89027c55fef987cdc259668c48a8b4ea1b
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu May 10 15:32:20 2012 +1000
dix: move freeing the sprite into a function
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Chase Douglas <chase.douglas@canonical.com>
commit 46adcefb0e08515195d8e49985a4e210395700b3
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu May 10 12:10:12 2012 +1000
dix: return early from DisableDevice if the device is already disabled
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Chase Douglas <chase.douglas@canonical.com>
commit 076f9d3a6660fa7fef4ae9decaffd2feebdd32c4
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu May 10 12:20:37 2012 +1000
dix: drop client argument from PairDevices - unused
This is a leftover from early MPX days where any keyboard could be paired
with any pointer (before the device hierarchy).
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Chase Douglas <chase.douglas@canonical.com>
commit d034605f3914e41e0d636eafff9278be1c041b2c
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu May 10 14:13:20 2012 +1000
dix: rename shadowing loop variable in TouchResizeQueue
second 'i' shadows the function-wide one, rename to 'j'
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Chase Douglas <chase.douglas@canonical.com>
commit a86f3ef511db16be5ddc723bf14e770dad23ee45
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu May 10 11:55:21 2012 +1000
dix: change "still paired warning" to use BUG_RETURN_VAL
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Chase Douglas <chase.douglas@canonical.com>
commit 4bcf43919a14cd2cd20af4099cd213ce25792edb
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu May 10 15:32:47 2012 +1000
dix: use BUG_RETURN_VAL for pairing errors
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Chase Douglas <chase.douglas@canonical.com>
Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
commit 642569fc79a1814acca1c8f529539b054bf36907
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu May 10 12:11:57 2012 +1000
Replace a few BUG_WARN with BUG_RETURN_VAL
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Chase Douglas <chase.douglas@canonical.com>
commit 11ecfb8884b7c4def0863a57868a6b9fa1b63ae5
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu May 10 11:48:05 2012 +1000
include: add BUG_RETURN_* macros
Helper functions to avoid things like
if (foo) {
BUG_WARN(foo);
return 1;
}
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Chase Douglas <chase.douglas@canonical.com>
Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
commit ff41753b1bee414b16c0f1e8d183776e87c94065
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Wed Jun 6 14:38:49 2012 +1000
xkb: warn if XKB SlowKeys have been automatically enabled
Slow keys are enabled when the XKB AccessX features are generally enabled
(ctrls->enabled_ctrls & XkbAccessXKeysMask) and either shift key is held for
8 seconds. For the unsuspecting user this appears as if the keyboard
suddenly stops working.
Print a warning to the log, so we can later tell them "told you so".
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Dan Nicholson <dbn.lists@gmail.com>
commit f20a532ba3c7b7d74530f3906c7bacf016bb8faf
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Sun May 20 00:00:59 2012 -0700
Fix statement not reached warning in _DMXXineramaActive
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Mark Kettenis <kettenis@openbsd.org>
commit 1be317c4e5d99d11a124ad4e7a90a5dcae591e20
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Wed May 23 19:27:23 2012 -0700
Provide prototypes for Mmio functions for Solaris Studio on SPARC
Actual inline implementations are provided via external *.il files
generated from *.S files in hw/xfree86/os-support/solaris
Fixes missing prototype warnings that xorg-macros has recently elevated
to build-breaking errors.
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Signed-off-by: Henry Zhao <henry.zhao@oracle.com>
Reviewed-by: Dave Airlie <airlied@redhat.com>
commit 812786f4d4306cb16f8ed57fa4a1a32bb1d13fe3
Author: Dave Airlie <airlied@redhat.com>
Date: Tue Jun 5 19:55:52 2012 +0100
xwin: fixup block/wakeup handlers
These got missed out in the api changeover.
Reported-by: Colin Harrison <colin.harrison@virgin.net>
Signed-off-by: Dave Airlie <airlied@redhat.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 3cbaf621782fb5f5679acf9104571d3ae2b48b72
Author: Dave Airlie <airlied@redhat.com>
Date: Tue Jun 5 17:54:02 2012 +0100
xfree86: fix new warnings introduced in rebase.
Spotted these in tinderbox:
xf86xv.c: In function 'xf86XVScreenInit':
xf86xv.c:282: warning: assignment from incompatible pointer type
xf86xv.c: In function 'xf86XVCloseScreen':
xf86xv.c:1275: warning: assignment from incompatible pointer type
xf86xv.c: In function 'xf86XVAdjustFrame':
xf86xv.c:1366: warning: assignment from incompatible pointer type
Missed removing one flags.
Signed-off-by: Dave Airlie <airlied@redhat.com>
Tested-by: Keith Packard <keithp@keithp.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit ec79187d9a23ba30eafc7ba225049559e6bcb78d
Author: Dave Airlie <airlied@redhat.com>
Date: Tue Jun 5 14:41:18 2012 +0100
modesetting: workaround kernel bug reporting 0x0 as valid mins
It reports these but then you can't create a 0 sized bo.
Signed-off-by: Dave Airlie <airlied@redhat.com>
commit 1f0e8bd5eb1a5539689cfc4f5a6b86b530907ec5
Author: Dave Airlie <airlied@redhat.com>
Date: Tue Jun 5 13:22:18 2012 +0100
api: rework the X server driver API to avoid global arrays.
This is a squash merge containing all the API changes, as
well as the video ABI bump.
Its been squashed to make bisection easier.
Full patch log below:
commit b202738bbf0c5a1c1172767119c2c71f1e7f8070
Author: Aaron Plattner <aplattner@nvidia.com>
Date: Mon May 14 15:16:11 2012 -0700
xfree86: Bump video ABI to 13.0
The ABI was broken by changes to convert from screen index numbers to ScreenPtr
/ ScrnInfoPtr in various structures and function signatures.
Signed-off-by: Aaron Plattner <aplattner@nvidia.com>
Reviewed-by: Dave Airlie <airlied@redhat.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
commit 3d5f7d9f8d408bcad3f83277d255f25d3b0edbf3
Author: Dave Airlie <airlied@redhat.com>
Date: Thu May 24 10:56:57 2012 +0100
xf86: xf86ClearEntityListForScreen should take a pScrn
When adding GPU screens this make life easier.
(also fix comment, as pointed out by Alan)
Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Dave Airlie <airlied@redhat.com>
commit afee8b5ab4501597ecc1ade34124d7ca227ab055
Author: Dave Airlie <airlied@redhat.com>
Date: Thu May 24 07:07:32 2012 +0100
xf86i2c: add pscrn for drivers to use
This just adds a pScrn pointer into the struct for the drivers to use
instead of scrnIndex. Mostly scrnIndex is used for logging, but some
drivers use it to lookup xf86Screens, so let them stash a pScrn instead.
Removing the scrnIndex is a bit more involved and I'm not sure its worth
the effort. Doing i2c in the X server is legacy code as far as I'm concerned.
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
commit ea5092f1f679691d187f1eee9427e6057beec56e
Author: Dave Airlie <airlied@redhat.com>
Date: Wed May 23 19:25:20 2012 +0100
dix/gc: consolidate GC object creation in one place
The standard GC create and scratch GC create were 90% the same really,
and I have a need in the future for creating GC objects without the
other bits, so wanted to avoid a third copy.
Reviewed-by: Keith Packard <keithp@keithp.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
commit 3d91482ea9b4883e64e496f2768168e0ffa21ba1
Author: Dave Airlie <airlied@redhat.com>
Date: Wed May 23 10:24:06 2012 +0100
xf86: add a define to denote the new non-index interfaces are being used
This can be used by drivers to provide compatible APIs.
Reviewed-by: Keith Packard <keithp@keithp.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
commit 37c3ae3e6cd4f3dedc72f371096d6743f8f99df3
Author: Dave Airlie <airlied@redhat.com>
Date: Wed May 23 15:09:12 2012 +0100
dix: make Create/Free scratch pixmaps take a ScreenPtr
While technically an API/ABI change I doubt anyone uses it,
but it helps in splitting screens up.
Reviewed-by: Keith Packard <keithp@keithp.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
commit 75f2062a3fe94f04764ecc7d2ff2fbbeccb9da60
Author: Dave Airlie <airlied@redhat.com>
Date: Wed May 23 14:57:55 2012 +0100
xf86/xv: remove scrnIndexfrom xf86FindXvOptions.
Move this interface to taking an ScrnInfoPtr.
Reviewed-by: Keith Packard <keithp@keithp.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
commit f80c2374f40ea7b2ee0556e2e76cc07406f3d843
Author: Dave Airlie <airlied@redhat.com>
Date: Wed May 23 14:53:59 2012 +0100
xf86: make xf86DeleteScreen take a ScrnInfoPtr (v2)
stop passing indices into this function.
v2: drop flags argument.
Reviewed-by: Keith Packard <keithp@keithp.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
commit 58824e414f35682435f15bfe6c4b656bd90b9235
Author: Dave Airlie <airlied@redhat.com>
Date: Wed May 23 14:48:09 2012 +0100
xf86: fix xf86IsScreenPrimary interface to take a pScrn (API/ABI)
Reviewed-by: Keith Packard <keithp@keithp.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
commit 6b4fc1f9d391bcdf7ca288766e49bce60f4635cd
Author: Dave Airlie <airlied@gmail.com>
Date: Tue Apr 10 14:18:59 2012 +0100
xserver: convert block/wakeup handlers to passing ScreenPtr (ABI/API) (v2)
Instead of passing an index, pass the actual ScreenPtr. This allows
more moving towards not abusing xf86Screens + screenInfo.
v2: drop the blockData/wakeupData args as per ajax's suggestion.,
fix docs.
Reviewed-by: Keith Packard <keithp@keithp.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
commit 790d003de20fb47674420a24dadd92412d78620d
Author: Dave Airlie <airlied@gmail.com>
Date: Wed Apr 11 09:53:14 2012 +0100
xf86/common: remove some more pScrn->pScreen uses
remove some more conversions that appeared after api cleanups.
Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Acked-by: Aaron Plattner <aplattner@nvidia.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
commit aac85e18d1dd093f2cad6bd29375e40bd7af0b8f
Author: Dave Airlie <airlied@gmail.com>
Date: Tue Apr 10 16:34:53 2012 +0100
ddc: change API to take ScrnInfoPtr (v2)
This removes all xf86Screens usage from ddc code,
it modifies the API for some functions to avoid taking indices.
v2: address Alan's comments about dropping DDC2Init parameter.
Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Acked-by: Aaron Plattner <aplattner@nvidia.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
commit fe3f57b6eaf6860a33876a54f9439f69578f03a5
Author: Dave Airlie <airlied@gmail.com>
Date: Tue Apr 10 16:31:26 2012 +0100
vbe: don't use index for VBEInterpretPanelID (API)
Remove use of xf86screens from vbe module.
Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Acked-by: Aaron Plattner <aplattner@nvidia.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
commit abf1965f4ed91529036d3fdb470d6a3ce6f29675
Author: Dave Airlie <airlied@gmail.com>
Date: Tue Apr 10 16:25:11 2012 +0100
int10/vbe: don't use xf86Screens. (ABI) (v3)
Pass the ScrnInfoPtr instead of the index in the int10 struct.
This saves us using it to dereference xf86Screens.
v2: address Alan's comment to fix struct alignment.
v3: squash in all the int10 fixes, test the vm86 code builds,
after comments by Keith.
Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Acked-by: Aaron Plattner <aplattner@nvidia.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
commit 23cca612b4fb5efc33683c7624b803b457387e3d
Author: Dave Airlie <airlied@gmail.com>
Date: Tue Apr 10 15:30:18 2012 +0100
xserver: drop index argument to ScreenInit (ABI/API) (v2)
This drops the index argument, its the same as pScreen->myNum,
and its the last major index abuse I can find.
v2: address Alan's review - update docs, fix xwin/xnest/darwin
Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Acked-by: Aaron Plattner <aplattner@nvidia.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
commit 40d360e2d7e832407f3ed64e3a02c27ecc89a960
Author: Dave Airlie <airlied@gmail.com>
Date: Tue Apr 10 15:23:01 2012 +0100
xf86: migrate PointerMoved from index to ScrnInfoPtr (ABI/API)
This migrates PointerMoved from an index to ScrnInfoPtr.
Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Acked-by: Aaron Plattner <aplattner@nvidia.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
commit aa60a2f38679d0eeb979a9c2648c9bc771409bf9
Author: Dave Airlie <airlied@gmail.com>
Date: Tue Apr 10 15:20:46 2012 +0100
xf86: migrate PMEvent to a ScrnInfoPtr (ABI/API)
This migrates the PMEvent from index to ScrnInfoPtr.
Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Acked-by: Aaron Plattner <aplattner@nvidia.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
commit d3f28ef44371ed4a039ffc5dd7eb6408d1269ba2
Author: Dave Airlie <airlied@gmail.com>
Date: Tue Apr 10 15:18:30 2012 +0100
xf86: migrate SetDGAMode from index to ScrnInfoPtr (ABI/API)
This migrates the SetDGAMode callback from an index to ScrnInfoPtr.
Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Acked-by: Aaron Plattner <aplattner@nvidia.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
commit baf5e4818a74f2b68c3dfdcc56f54322351039a0
Author: Dave Airlie <airlied@gmail.com>
Date: Tue Apr 10 15:14:11 2012 +0100
xf86: migrate ChangeGamma from index to ScrnInfoPtr (ABI/API) (v2)
This migrates the ChangeGamma interface to avoid passing a index.
v2: fix xf86RandR12.c + xf86cmap.c call
Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Acked-by: Aaron Plattner <aplattner@nvidia.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
commit 51e5f90ada929d6b23176090badbb42fdb3fa550
Author: Dave Airlie <airlied@gmail.com>
Date: Tue Apr 10 15:11:09 2012 +0100
xf86/exa: migrate index to screen types for EnableDisableFBAccess (ABI/API)
The EXA interface migrates to ScreenPtr,
and the xf86 interface migrated to ScrnInfoPtr.
Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Acked-by: Aaron Plattner <aplattner@nvidia.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
commit 94f1f21d17e86f96d4a54292a399160950087675
Author: Dave Airlie <airlied@gmail.com>
Date: Tue Apr 10 15:02:11 2012 +0100
xf86: migrate ValidMode callback to ScrnInfoPtr (ABI/API)
This migrates the ValidMode to passing a ScrnInfoPtr instead
of an index.
Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Acked-by: Aaron Plattner <aplattner@nvidia.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
commit 3f8f18198fed4f39ec805b508a3482e91eea26b2
Author: Dave Airlie <airlied@gmail.com>
Date: Tue Apr 10 14:59:46 2012 +0100
xf86: migrate SwitchMode to taking ScrnInfoPtr (ABI/API) (v2)
This migrate the SwitchMode interface to take a ScrnInfoPtr
instead of an index.
v2: drop flags.
Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Acked-by: Aaron Plattner <aplattner@nvidia.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
commit d06a038a5c49328ab3a8d969d24f9fcd22c63202
Author: Dave Airlie <airlied@gmail.com>
Date: Tue Apr 10 14:50:37 2012 +0100
xf86: move AdjustFrame to passing ScrnInfoPtr (ABI/API) (v2)
This converts AdjustFrame code paths to passing a ScrnInfoPtr
instead of an integer index.
v2: drop flags args.
Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Acked-by: Aaron Plattner <aplattner@nvidia.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
commit 53d2f8608ffd4090d08e7d5cf2e92fb954959b90
Author: Dave Airlie <airlied@gmail.com>
Date: Tue Apr 10 14:41:27 2012 +0100
xf86: modify FreeScreen callback to take pScrn instead of index. (ABI/API) (v2)
Another index->pScrn conversion.
v2: drop flags arg.
Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Acked-by: Aaron Plattner <aplattner@nvidia.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
commit 60db37c0b247052e0f5c54b1921fe58a3609c2e3
Author: Dave Airlie <airlied@gmail.com>
Date: Tue Apr 10 14:35:41 2012 +0100
xf86: change EnterVT/LeaveVT to take a ScrnInfoPtr (ABI/API break) (v2)
This modifies the EnterVT/LeaveVT interfaces to take a ScrnInfoPtr
instead of an index into xf86Screens. This allows dropping more
public dereferences of the xf86Screens and screenInfo.
v2: drop flags args as suggested by Keith, fix docs.
Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Acked-by: Aaron Plattner <aplattner@nvidia.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
commit 06729dbbc804a20242e6499f446acb5d94023c3c
Author: Dave Airlie <airlied@gmail.com>
Date: Tue Apr 10 14:04:59 2012 +0100
xserver: remove index from CloseScreen (API/ABI breakage)
This drops the index from the CloseScreen callback,
its always been useless really, since the pScreen contains it.
Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Acked-by: Aaron Plattner <aplattner@nvidia.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
commit 12f9aaff38ac2cf528387ce610e41fbd448698e2
Author: Chase Douglas <chase.douglas@canonical.com>
Date: Fri Apr 6 12:44:07 2012 -0700
test/touch: Initialize device name
Without this change, the test will segfault when we switch to signal-
safe logging.
Signed-off-by: Chase Douglas <chase.douglas@canonical.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 3476eb38063473a7a5fcd78e2095e284118de839
Merge: 78f0d9cdc4 42ae2e8199
Author: Keith Packard <keithp@keithp.com>
Date: Sun Jun 3 20:24:24 2012 -0700
Merge remote-tracking branch 'whot/for-keith'
commit 42ae2e8199fe875319978249963de7499607988b
Author: Siddhesh Poyarekar <siddhesh.poyarekar@gmail.com>
Date: Tue May 29 10:17:50 2012 +0530
xkb: Allocate size_syms correctly when width of a type increases
The current code seems to skip syms with width less than
type->num_levels when calculating the total size for the new
size_syms. This leads to less space being allocated than necessary
during the next phase, which is to copy over the syms to the new
location. This results in an overflow leading to a crash.
Signed-off-by: Siddhesh Poyarekar <siddhesh.poyarekar@gmail.com>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 88c767edb01ed7efb19ffe3a453e16107b27130b
Author: Michal Suchanek <hramrach@gmail.com>
Date: Wed May 23 11:22:05 2012 +0200
Fix crash for motion events from devices without valuators
A WarpPointer request may trigger a motion event on a device without
valuators. That request is ignored by GetPointerEvents but during smooth
scroll emulation we dereference dev->valuators to get the number of axes.
Break out early if the device doesn't have valuators.
Signed-off-by: Michal Suchanek <hramrach@gmail.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit e07c945ab992b1b1acdd9f5554e0688f744e4769
Author: Dave Airlie <airlied@redhat.com>
Date: Fri Jun 1 12:34:42 2012 +0100
modesetting: bump to latest X server compat api.
Signed-off-by: Dave Airlie <airlied@redhat.com>
commit 78f0d9cdc441a575e15e5f7200ce74750d2f7ad2
Author: Chad Versace <chad.versace@linux.intel.com>
Date: Wed May 2 16:18:49 2012 -0700
dri2: Add DRI2GetParam request (v2)
Bump dri2proto dependency to 2.7.
Bump DRI2INFOREC_VERSION to 7.
This new protocol request effectively allows clients to perform feature
detection on the DDX. The request was added in DRI2 protocol 1.4.
If I had DRI2GetParam in June 2011, when I was implementing support in the
Intel DDX and Mesa for new hardware that required a new DRI2 attachment
format, then I could have avoided a week of pain caused by the necessity
to write a horrid feature detection hack [1] in Mesa. In the future, when
the work begins to add MSAA support to the Intel DDX, having a clean way
to do feature detection will allow us to avoid revisiting and expanding
that hack.
[1] mesa, commit aea2236a, function intel_verify_dri2_has_hiz
v2: If driver doesn't define ds->GetParam, dont' crash. Fall back to
default behavior, per keithp.
Reviewed-by: Keith Packard <keithp@keithp.com>
Reviewed-by: Eric Anholt <eric@anholt.net> (v1)
Reviewed-by: Ian Romanick <idr@freedesktop.org> (v1)
Signed-off-by: Chad Versace <chad.versace@linux.intel.com>
commit 594b4a4f0601066d09e49a84c5af8c2eb6f07240
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu May 24 13:34:11 2012 +1000
Xext: include dix-config.h
silences
In file included from ../include/misc.h:111:0, from hashtable.c:2:
./include/os.h:559:1: warning: redundant redeclaration of 'strndup' [-Wredundant-decls]
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
commit d348ab06aae21c153ecbc3511aeafc8ab66d8303
Author: Julien Cristau <jcristau@debian.org>
Date: Fri May 11 21:31:50 2012 +0200
Xvfb: destroy the screen pixmap in CloseScreen
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
commit e4153c1d9138ed40de1c615525066a0f5bb599dc
Author: Julien Cristau <jcristau@debian.org>
Date: Fri May 11 21:31:49 2012 +0200
Xi: make stub DeleteInputDeviceRequest call RemoveDevice
DeleteInputDeviceRequest is called from CloseDownDevices on reset, so
call RemoveDevice to avoid leaking devices in Xvfb/Xnest/Xwin.
Signed-off-by: Julien Cristau <jcristau@debian.org>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
commit b840ba5f54de5b00a7700ca49e51308b8cc66f92
Author: Ian Romanick <ian.d.romanick@intel.com>
Date: Fri Dec 16 14:44:55 2011 -0800
glx: Implement protocol for glXCreateContextAttribsARB
Signed-off-by: Ian Romanick <ian.d.romanick@intel.com>
Reviewed-by: Dave Airlie <airlied@redhat.com>
Reviewed-by: Christopher James Halse Rogers <christopher.halse.rogers@canonical.com>
commit 23612a63fc12be13442a63193a19f883d7a87e5d
Author: Ian Romanick <ian.d.romanick@intel.com>
Date: Fri Dec 16 14:42:51 2011 -0800
glx: Make several functions available outside the glxcmds.c compilation unit
validGlxScreen, validGlxFBConfig, validGlxContext, and
__glXdirectContextCreate will soon be used by createcontext.c.
Signed-off-by: Ian Romanick <ian.d.romanick@intel.com>
Reviewed-by: Dave Airlie <airlied@redhat.com>
Reviewed-by: Christopher James Halse Rogers <christopher.halse.rogers@canonical.com>
commit cd5689cac5ed722e9dc1a3fab9a260b798062ee6
Author: Ian Romanick <ian.d.romanick@intel.com>
Date: Sat Dec 10 15:15:18 2011 -0800
glx: Use one function to add a context to all global tables
Instead of having separate __glXAddContextToList and AddResource
functions, just have one function that does both steps.
Signed-off-by: Ian Romanick <ian.d.romanick@intel.com>
Reviewed-by: Jesse Barnes <jbarnes@virtuousgeek.org>
Reviewed-by: Christopher James Halse Rogers <christopher.halse.rogers@canonical.com>
commit c1d91ab37025d3e0df7e8f647fb21816fe0e8420
Author: Ian Romanick <ian.d.romanick@intel.com>
Date: Sat Dec 10 15:11:57 2011 -0800
glx: Initialize remaining context fields
There is no reason to assume the screen's context allocated
initialized these fields, so don't.
Signed-off-by: Ian Romanick <ian.d.romanick@intel.com>
Reviewed-by: Jesse Barnes <jbarnes@virtuousgeek.org>
Reviewed-by: Christopher James Halse Rogers <christopher.halse.rogers@canonical.com>
commit 0db76e5f771fb964e67de716a254850a38e02f19
Author: Ian Romanick <ian.d.romanick@intel.com>
Date: Sat Dec 10 15:09:57 2011 -0800
glx: Initialize all context fields together
v2: Fix whitespace error noticed by Christopher James Halse Rogers.
Signed-off-by: Ian Romanick <ian.d.romanick@intel.com>
Reviewed-by: Jesse Barnes <jbarnes@virtuousgeek.org>
Reviewed-by: Christopher James Halse Rogers <christopher.halse.rogers@canonical.com>
commit befa76d251eb5de85edb621056eed52784722bc7
Author: Ian Romanick <ian.d.romanick@intel.com>
Date: Fri Dec 9 17:28:21 2011 -0800
glx: Implement GLX SetClientInfoARB protocol
v2: Bump glproto version to 1.4.15. This patch uses structure names
that only exist in that glproto version and later. Noticed by
Christopher James Halse Rogers.
Signed-off-by: Ian Romanick <ian.d.romanick@intel.com>
Reviewed-by: Dave Airlie <airlied@redhat.com>
Reviewed-by: Christopher James Halse Rogers <christopher.halse.rogers@canonical.com>
commit 8b8cd6f6f4dbf9d058ace638221f31801da7df9f
Author: Ian Romanick <ian.d.romanick@intel.com>
Date: Mon Dec 5 13:52:01 2011 -0800
glx: Optionally call DRI2 createContextAttribs from __glXDRIscreenCreateContext
Signed-off-by: Ian Romanick <ian.d.romanick@intel.com>
Reviewed-by: Christopher James Halse Rogers <christopher.halse.rogers@canonical.com>
commit 0a9226376c9a44c3b50baad25f2b7d2b9fecb708
Author: Ian Romanick <ian.d.romanick@intel.com>
Date: Mon Dec 5 13:48:19 2011 -0800
glx: Add tracking for GLX_ARB_create_context and GLX_ARB_create_context_profile
The formatting of the extension data table was mangled by indent.
This patch also undoes that and adds approripate control comments so
that indent won't do it again.
Signed-off-by: Ian Romanick <ian.d.romanick@intel.com>
Reviewed-by: Dave Airlie <airlied@redhat.com>
Reviewed-by: Christopher James Halse Rogers <christopher.halse.rogers@canonical.com>
commit 96d74138b1c0273e88933220d99a893858b649cd
Author: Ian Romanick <ian.d.romanick@intel.com>
Date: Mon Dec 5 10:56:07 2011 -0800
glx: Extend __GLXscreen::createContext to take attributes
The attributes will be used for glXCreateContextAttribsARB additions
in follow-on patches.
v2: Add missing 'int *error' parameters noticed by Christopher James
Halse Rogers.
v3: Remove redundant 'int err;' declaration noticed by Christopher
James Halse Rogers. This was supposed to be in v2, but I missed it.
v4: Add comma missing from additions in v2. Ugh.
Signed-off-by: Ian Romanick <ian.d.romanick@intel.com>
Reviewed-by: Jesse Barnes <jbarnes@virtuousgeek.org>
Reviewed-by: Christopher James Halse Rogers <christopher.halse.rogers@canonical.com>
commit 62f06b0dcde13cb87bc3d0c5ff86d8db7e3ff0ef
Author: Ian Romanick <ian.d.romanick@intel.com>
Date: Fri Dec 2 21:14:46 2011 -0800
glx: Don't track GLClientmajorVersion or GLClientminorVersion
Nothing uses these fields anywhere in the server.
Signed-off-by: Ian Romanick <ian.d.romanick@intel.com>
Reviewed-by: Jesse Barnes <jbarnes@virtuousgeek.org>
Reviewed-by: Christopher James Halse Rogers <christopher.halse.rogers@canonical.com>
commit 724176a87afdb9a79ce6307214bc2e869530aef3
Author: Ian Romanick <ian.d.romanick@intel.com>
Date: Mon Dec 5 10:55:20 2011 -0800
glx: Fix mishandling of shared contexts
Signed-off-by: Ian Romanick <ian.d.romanick@intel.com>
Reviewed-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Christopher James Halse Rogers <christopher.halse.rogers@canonical.com>
commit 1c01090f6485cb82c2511fb461e66ff15a097358
Author: Dave Airlie <airlied@redhat.com>
Date: Wed May 23 11:31:39 2012 +0100
modesetting: fix make distcheck
add missing compat header file.
Signed-off-by: Dave Airlie <airlied@redhat.com>
commit ef47a1b3bfec33d4031af2e01bdd46d634be2f51
Author: Dave Airlie <airlied@redhat.com>
Date: Wed May 23 11:21:55 2012 +0100
modesetting: convert to new scrn conversion APIs.
Generated with util/modular/x-driver-screen-scrn-conv.sh
Signed-off-by: Dave Airlie <airlied@redhat.com>
commit 3e46d578d8c40c95343278db0a66c931e85247c7
Author: Dave Airlie <airlied@redhat.com>
Date: Wed May 23 11:21:39 2012 +0100
modesetting: add compat header file
Signed-off-by: Dave Airlie <airlied@redhat.com>
commit 2d4fda4b09e67e47d3e6fc4743fc6e81bfe40f28
Author: Marcin Slusarz <marcin.slusarz@gmail.com>
Date: Mon May 21 21:39:43 2012 +0200
xfree86: fix mouse wheel support for DGA clients
xf86-input-evdev (since "smooth scrolling" support was added) can send mouse
motion and wheel events in one batch, so we need to handle it properly.
Otherwise mouse wheel events which come with motion events are lost
and separate mouse wheel events are handled through non-DGA path.
Signed-off-by: Marcin Slusarz <marcin.slusarz@gmail.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 9bc53d8cb04af2be3feeebb1b10774c2d599a76b
Author: Michal Srb <msrb@suse.com>
Date: Tue May 22 21:19:40 2012 -0700
dri2: SProcDRI2Connect - send the response.
The swapped implementation of DRI2Connect is always responding with empty
device and driver values. However the response was only prepared and never
sent (also had undefined .type member), causing e.g. glxinfo get stuck waiting
for response when started remotely from machine with different endianity.
Signed-off-by: Michal Srb <msrb@suse.com>
Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com>
Tested-by: Michel Dänzer <michel@daenzer.net>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 457fc77691b2df66f6dd3ba10ce7c1b61b9b42a3
Merge: 2e237c838f 5a3a98fcb7
Author: Keith Packard <keithp@keithp.com>
Date: Tue May 22 10:32:29 2012 -0700
Merge remote-tracking branch 'alanc/master'
commit 2e237c838fe1780c2fcbd2306f35fd15b6747831
Author: Dave Airlie <airlied@gmail.com>
Date: Wed Apr 11 10:02:25 2012 +0100
xf86: reimplement XF86SCRNINFO macro using new functions.
This macro did lookups via privates but we can just use the ScreenToScrn
conversion instead.
This patch drops all in-server uses, we should drop the macro later,
once drivers have been converted to not use it.
Reviewed-by: Adam Jackson <ajax@redhat.com>
Reviewed-by: Keith Packard <keithp@keithp.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
commit 8da35202f390cd8a0410814911017d99fa9dddcb
Author: Dave Airlie <airlied@gmail.com>
Date: Wed Apr 11 09:53:35 2012 +0100
xf86/modes: drop more pScrn->pScreen usages
Just simple conversion to use the lookup function.
Reviewed-by: Adam Jackson <ajax@redhat.com>
Reviewed-by: Keith Packard <keithp@keithp.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
commit e7a9e30fd20a7c2a526783726d0a76b8a04b053a
Author: Dave Airlie <airlied@gmail.com>
Date: Wed Apr 11 09:52:37 2012 +0100
xaa: convert pScrn->pScreen to use accessor.
This uses a standard conversion function to do the conversion.
Reviewed-by: Adam Jackson <ajax@redhat.com>
Reviewed-by: Keith Packard <keithp@keithp.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
commit 738367ac9b6179593a38074d0105de206cbed296
Author: Dave Airlie <airlied@gmail.com>
Date: Wed Apr 11 09:46:39 2012 +0100
xf86/modes: drop two uses of screenInfo
Just use new macros to access scrn->screen.
Reviewed-by: Adam Jackson <ajax@redhat.com>
Reviewed-by: Keith Packard <keithp@keithp.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
commit cc4fe613d0b0891ea9502340801b37e64301f573
Author: Dave Airlie <airlied@redhat.com>
Date: Sat May 5 09:47:24 2012 +0100
render/exa: use glyph picture accessors
use the glyph picture accessors in the X server, render and EXA code.
Reviewed-by: Aaron Plattner <aplattner@nvidia.com>
Reviewed-by: Keith Packard <keithp@keithp.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
commit a45e1d6cc6f2a5f31ed737294351cfa251caa030
Author: Dave Airlie <airlied@redhat.com>
Date: Sat May 5 09:38:28 2012 +0100
render: add GetGlyphPicture accessor.
This is a new API to stop the drivers directly looking up the glyph pictures
in a global array. It provides a define GLYPH_HAS_GLYPH_PICTURE_ACCESSOR for
drivers to work in a compat way.
Reviewed-by: Aaron Plattner <aplattner@nvidia.com>
Reviewed-by: Keith Packard <keithp@keithp.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
commit 41151f88a62f01b00c1912822b8b430df1eb307e
Author: Dave Airlie <airlied@gmail.com>
Date: Tue Apr 10 15:47:33 2012 +0100
xf86: migrate to using xf86ScreenToScrn wrapper (v2)
migrate to new helper API.
This just wraps all the obvious uses of xf86Screens[pScreen->myNum],
and should be fairly simple to review.
v2: remove commented out lines.
Reviewed-by: Aaron Plattner <aplattner@nvidia.com>
Reviewed-by: Keith Packard <keithp@keithp.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
commit 53932b3803fa2c02949fd7d4d0e433ea58fa89f1
Author: Dave Airlie <airlied@gmail.com>
Date: Tue Apr 10 15:47:32 2012 +0100
xf86: add helper functions to convert to from ScrnInfoPtr/ScreenPtr (v2)
These are just simple functions that we should start migrating drivers
to using.
The end goal is to remove xf86Screens and screenInfo from the ABI.
This includes a define XF86_HAS_SCRN_CONV that drivers can ifdef to provide
their own copies. I'll probably post a generic compat.h file for drivers later.
v2: add asserts.
Reviewed-by: Aaron Plattner <aplattner@nvidia.com>
Reviewed-by: Keith Packard <keithp@keithp.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
commit 39f73e813f7d404498629f6104a9003d092af28d
Author: Dave Airlie <airlied@redhat.com>
Date: Tue May 8 13:01:12 2012 +0100
xf86/pci: fix slot claiming counting.
Currently if we claim a slot for a PCI driver, we never let it go properly,
this prevents the fallback probe from reusing the slot, even though it
isn't claimed for that pci slot.
So if you set the modesetting driver to point at a specific kms device,
that isn't a PCI device (i.e. USB dongle), then the modesetting driver
loads, the pci probe tries to bind the config slot to the primary PCI
device, however we then check the kms device bus id to discover it
isn't valid. However we don't remove the claim on the slot. Next the
old probe function is called and there is no slots to claim.
This patch fixes that and converts the pciSlotClaimed boolean into
a counter, and changes the unclaim api to take a device pointer
to remove from the entity.
Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
commit 07dcc3f1a98dff2ee374a15ac5beac778d2ccc97
Author: Dave Airlie <airlied@redhat.com>
Date: Sun May 6 17:13:02 2012 +0100
config/udev: add pre_init stage to config and udev.
In order to use udev for gpu enumeration, we need to init udev earlier
than input initialisations. This splits the config init stuff so that udev
pre init sets up before output initialisation.
this is just a prepatory patch, doesn't change anything major.
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Dave Airlie <airlied@redhat.com>
commit a2a02882ab65133e6c0c69db1f38bc20b406236f
Author: Dave Airlie <airlied@redhat.com>
Date: Sun May 6 17:35:34 2012 +0100
xfree86: add modesetting driver to fallback list on Linux
Add the modesetting driver to the fallback list on Linux, after vesa
before fbdev.
Acked-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Dave Airlie <airlied@redhat.com>
commit 5a3a98fcb799c2ac8fa7494645ad9030f1cac837
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Fri Apr 27 13:35:32 2012 -0700
Undocument Font Module loading
Code was deleted in commit affec10635343668839994ea2bac16c1d4524200
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Dave Airlie <airlied@redhat.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
commit afcb7ba24ebd9968d48a192df438e7f1c0ecb770
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Fri Apr 27 13:31:56 2012 -0700
Undocument mandatory loadable modules
The code to implement was deleted when BaseModules[] was emptied by
the replacement of the "pcidata" module with libpciaccess calls
in commit 46f55f5dead5d70cdff30531d80a72f6be042315.
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Dave Airlie <airlied@redhat.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
commit c3180a74a4fc6304bcfe676e3285d707874a9fea
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Fri Apr 6 21:51:37 2012 -0700
cvt man page should use Hz, not kHz, for vertical refresh rate
https://bugs.freedesktop.org/show_bug.cgi?id=48311
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Julien Cristau <jcristau@debian.org>
commit 96e0ab54962ab59f03275a098ee02c1f0f86b94e
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Thu Jan 26 15:44:40 2012 -0800
Convert sbusPaletteKey to latest DevPrivate API
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Mark Kettenis <kettenis@openbsd.org>
Reviewed-by: Dave Airlie <airlied@redhat.com>
commit ba883a0f3435d5da82a8134e696c4905eea70f23
Merge: ae1c48ebc8 acdc4f54ee
Author: Keith Packard <keithp@keithp.com>
Date: Thu May 17 16:49:19 2012 -0700
Merge remote-tracking branch 'jeremyhu/master'
commit acdc4f54ee5784d26c251ff8c941b4360ae80e9b
Author: Jeremy Huddleston <jeremyhu@apple.com>
Date: Thu May 17 10:08:02 2012 -0700
XQuartz: Avoid a race in initialization of darwinPointer
http://xquartz.macosforge.org/trac/ticket/579
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
commit c495211373a118acee02a29c6eb25a332abc856c
Author: Jeremy Huddleston <jeremyhu@apple.com>
Date: Thu May 17 16:20:30 2012 -0700
XQuartz: Declare noPseudoramiXExtension for miinitext.c
Regression-from: 6699f54fe0b3f4952a75e46fb6c3a643988e65dd
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
commit f5fc5334116ad2b0c8930ac68c52bf0f7a2f1417
Author: Jeremy Huddleston <jeremyhu@apple.com>
Date: Mon May 7 17:07:27 2012 -0700
XQuartz: Provide fls implementation for Tiger
Regression-from: 30623d6ff7bca223f9e1a825e86bd317eef8bf16
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
commit e0097ce9719f9b0aeccf7102630c0299f8acdf93
Author: Jeremy Huddleston <jeremyhu@apple.com>
Date: Mon May 7 16:31:38 2012 -0700
XQuartz: Tiger build fix
http://trac.macports.org/ticket/34364
Regression-from: 662d41acdde1dcb9774fbe4054e251c708acaffe
Reported-by: Peter Dyballa <Peter_Dyballa@Freenet.DE>
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
commit 4acbaa3027d89728ed932616f6ef66d93537b101
Author: Jeremy Huddleston <jeremyhu@apple.com>
Date: Mon May 7 16:16:20 2012 -0700
XQuartz: Workaround an SDK bug on Leopard/x86_64
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
commit ae1c48ebc8a3c0b32b3d732e8a340bfe00bb9f79
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Wed May 16 10:54:48 2012 +1000
Xi: fix "discards ''const' qualifier" warnings
extinit.c: In function 'XInputExtensionInit':
extinit.c:1301:29: warning: assignment discards 'const' qualifier from
pointer target type [enabled by default]
extinit.c:1303:36: warning: assignment discards 'const' qualifier from
pointer target type [enabled by default]
property.c: In function 'XIChangeDeviceProperty':
xiproperty.c:757:39: warning: cast discards '__attribute__((const))'
qualifier from pointer target type [-Wcast-qual]
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Chase Douglas <chase.douglas@canonical.com>
commit e42bf98283ddc4eac2213c96e8ebcd711583e6b1
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Wed May 16 10:47:45 2012 +1000
Xi: fix "shadows previous local" warnings
exevents.c: In function 'DeepCopyFeedbackClasses':
exevents.c:272:20: warning: declaration of 'classes' shadows a previous
local [-Wshadow]
exevents.c:245:16: warning: shadowed declaration is here [-Wshadow]
(and a few more like this)
exevents.c: In function 'DeliverTouchEmulatedEvent':
exevents.c:1442:27: warning: declaration of 'win' shadows a parameter
[-Wshadow]
exevents.c:1404:55: warning: shadowed declaration is here [-Wshadow]
exevents.c:1475:28: warning: declaration of 'listener' shadows a parameter
[-Wshadow]
exevents.c:1403:62: warning: shadowed declaration is here [-Wshadow]
xiselectev.c: In function 'ProcXISelectEvents':
xiselectev.c:178:34: warning: declaration of 'dummy' shadows a previous
local [-Wshadow]
xiselectev.c:91:18: warning: shadowed declaration is here [-Wshadow]
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Chase Douglas <chase.douglas@canonical.com>
commit ca6d25ad2d1fb4efae9d40c7e74c8494f9918625
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Wed May 16 10:10:11 2012 +1000
dix: Move DeviceFocusEvent from Xi into enterleave.c
This is only called from the enterleave implementation, so move it and its
helper functions to there. No functional changes.
Fixes build error introduced in 31174565ec0090b4c03c9334c82878be2455f938 if
building with '-Werror=implicit-function-declaration'
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Dave Airlie <airlied@redhat.com>
Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com>
commit 749a593e49adccdf1225be28a521412ec85333f4
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Wed May 9 11:30:46 2012 +1000
dix: undo transformation for missing valuators (#49347)
last.valuators contains the transformed valuators of the device. If the
device submits events with x/y missing, we need to get that from
last.valuators and undo the transformation to that axis.
X.Org Bug 49347 <http://bugs.freedesktop.org/show_bug.cgi?id=49347>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Chase Douglas <chase.douglas@canonical.com>
commit 03318835a5a87a8a5cb3515130b5380d565c0d91
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Mon May 14 15:06:56 2012 +1000
include: don't redeclare device events in xkbsrv.h
../../include/xkbsrv.h:308:51: warning: redundant redeclaration of
‘DeviceKeyPress’ [-Wredundant-decls]
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Chase Douglas <chase.douglas@canonical.com>
commit 43754803c13c232fd5c37eb3d4b1ca2898d6a6cd
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Mon May 14 15:07:57 2012 +1000
test: don't shadow parameter 'len'
protocol-xiquerydevice.c:226:25: warning: declaration of ‘len’ shadows a
parameter [-Wshadow]
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Chase Douglas <chase.douglas@canonical.com>
commit 1bafc9f26bef0997c98b97efa888ed5e2a54f6f0
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Mon May 14 15:01:09 2012 +1000
test: fix redundant declaration of "BadDevice"
In file included from protocol-common.c:36:0:
protocol-common.h:36:12: warning: redundant redeclaration of ‘BadDevice’
[-Wredundant-decls]
In file included from protocol-common.c:30:0:
../../Xi/exglobals.h:41:12: note: previous declaration of ‘BadDevice’ was
here
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Chase Douglas <chase.douglas@canonical.com>
commit 47e1d0ea43eb7a6caf774f375f11849d0d515e14
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Mon May 14 14:56:02 2012 +1000
test: fix "userdata shadows global declaration" warnings
protocol-xiquerypointer.c:124:72: warning: declaration of
‘userdata’ shadows a global declaration [-Wshadow]
and similar
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Chase Douglas <chase.douglas@canonical.com>
commit e6da635826bdda7f67bd492dda8dba8a97809213
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Mon May 14 14:51:58 2012 +1000
test: fix "redundant declaration of devices" warning
In file included from protocol-xiwarppointer.c:41:0:
protocol-common.h:91:23: warning: redundant redeclaration of ‘devices’
[-Wredundant-decls]
protocol-common.h:86:3: note: previous declaration of ‘devices’ was here
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Chase Douglas <chase.douglas@canonical.com>
commit 693a31e704c0745b209e69711522417c4fa8541e
Author: Simon Thum <simon.thum@gmx.de>
Date: Mon Apr 2 18:49:53 2012 +0200
dix: indentation fixes for pointer acceleration
Signed-off-by: Simon Thum <simon.thum@gmx.de>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 31174565ec0090b4c03c9334c82878be2455f938
Author: Michal Suchanek <hramrach@gmail.com>
Date: Wed Apr 25 15:03:31 2012 +0200
dix: Remove redundant declarations.
Signed-off-by: Michal Suchanek <hramrach@gmail.com>
Reviewed-by: Dave Airlie <airlied@redhat.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
commit f1cec791d1def506b99b0e6c160e9e8be107bd13
Author: Michal Suchanek <hramrach@gmail.com>
Date: Tue Apr 24 20:08:02 2012 +0200
xfree86: Add ifdef wrapper to xvmodproc.h
Signed-off-by: Michal Suchanek <hramrach@gmail.com>
Reviewed-by: Dave Airlie <airlied@redhat.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
commit d2f71b13946a14d9698d0355cc45b114b236e73b
Author: Michal Suchanek <hramrach@gmail.com>
Date: Tue Apr 24 18:44:48 2012 +0200
Xi: Remove redundant declaration.
Signed-off-by: Michal Suchanek <hramrach@gmail.com>
Reviewed-by: Dave Airlie <airlied@redhat.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
commit a4f87f885a55373a6daf56fd540e10c5f1db5a5c
Author: Michal Suchanek <hramrach@gmail.com>
Date: Tue Apr 24 18:43:31 2012 +0200
kdrive: Remove redundant declarations.
Signed-off-by: Michal Suchanek <hramrach@gmail.com>
Reviewed-by: Dave Airlie <airlied@redhat.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
commit 369edd78769fa1a174e4091d0fa0722350df5d68
Author: Michal Suchanek <hramrach@gmail.com>
Date: Tue Apr 24 18:41:07 2012 +0200
dix: don't duplicate DoFocusEvents declaration.
Signed-off-by: Michal Suchanek <hramrach@gmail.com>
Reviewed-by: Dave Airlie <airlied@redhat.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
commit 36377fb0e88a6d237d98805e802ab3793582c976
Author: Michal Suchanek <hramrach@gmail.com>
Date: Tue Apr 24 18:37:30 2012 +0200
dix: Remove redundant declarations.
Signed-off-by: Michal Suchanek <hramrach@gmail.com>
Reviewed-by: Dave Airlie <airlied@redhat.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
commit ea9ed83f8f0da241099d0a11c3460d46c5114dea
Author: Michal Suchanek <hramrach@gmail.com>
Date: Tue Apr 24 18:32:53 2012 +0200
xfree86: don't include xvmodproc.h when not needed
The functions are already declared in xf86xv.h
Signed-off-by: Michal Suchanek <hramrach@gmail.com>
Reviewed-by: Dave Airlie <airlied@redhat.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
commit 1927e5ab25c9c9bf481e75ac50f4b140a96e634a
Author: Michal Suchanek <hramrach@gmail.com>
Date: Tue Apr 24 18:24:19 2012 +0200
xserver: Remove duplicate declaration in resource.h
Signed-off-by: Michal Suchanek <hramrach@gmail.com>
Reviewed-by: Dave Airlie <airlied@redhat.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
commit 1339681e4fbd4f5981e6246eedb23e8a9c5d10f4
Author: Michal Suchanek <hramrach@gmail.com>
Date: Tue Apr 24 18:19:43 2012 +0200
miext: Remove redundant declaration.
Signed-off-by: Michal Suchanek <hramrach@gmail.com>
Reviewed-by: Dave Airlie <airlied@redhat.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
commit 6699f54fe0b3f4952a75e46fb6c3a643988e65dd
Author: Michal Suchanek <hramrach@gmail.com>
Date: Tue Apr 24 18:18:43 2012 +0200
mi: Remove redundant declarations.
Signed-off-by: Michal Suchanek <hramrach@gmail.com>
Reviewed-by: Dave Airlie <airlied@redhat.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
commit b4bf90f9fb20e0e56d2451096d4f62ecfc24a962
Author: Michal Suchanek <hramrach@gmail.com>
Date: Tue Apr 24 18:16:30 2012 +0200
exa: Remove redundant declaration.
Signed-off-by: Michal Suchanek <hramrach@gmail.com>
Reviewed-by: Dave Airlie <airlied@redhat.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
commit 5595e7ce0735db6f82e1fe9df45434826019bf9e
Author: Michal Suchanek <hramrach@gmail.com>
Date: Tue Apr 24 18:15:17 2012 +0200
randr: Remove redundant declaration.
Signed-off-by: Michal Suchanek <hramrach@gmail.com>
Reviewed-by: Dave Airlie <airlied@redhat.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
commit c59c9dac84301f8eb2a0e4a09a8839146aa5a069
Author: Michal Suchanek <hramrach@gmail.com>
Date: Tue Apr 24 18:13:22 2012 +0200
xkb: Remove redundant declarations.
Signed-off-by: Michal Suchanek <hramrach@gmail.com>
Reviewed-by: Dave Airlie <airlied@redhat.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
commit d0a83460451df1a4c5667b2f414c35ee81b4ffa4
Author: Michal Suchanek <hramrach@gmail.com>
Date: Tue Apr 24 18:11:16 2012 +0200
xfixes: remove redundant declaration.
Signed-off-by: Michal Suchanek <hramrach@gmail.com>
Reviewed-by: Dave Airlie <airlied@redhat.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
commit 3a94b338aaa48b656aae1bb3a5a9d64300c0a093
Merge: afc153a5b4 c91d00e0f3
Author: Keith Packard <keithp@keithp.com>
Date: Wed May 9 21:17:16 2012 -0700
Merge remote-tracking branch 'whot/for-keith'
commit e8da587845978ad66c3b3e2e085fd99c16b5d3c8
Author: Dave Airlie <airlied@redhat.com>
Date: Wed May 9 09:33:54 2012 +0100
bump version to 0.3.0
commit 62543946490e7decae4f6549d83072f004e850d4
Author: Matt Turner <mattst88@gmail.com>
Date: Wed May 9 00:26:29 2012 -0400
configure.ac: remove DRI and RENDER
Driver doesn't support either of these.
Signed-off-by: Matt Turner <mattst88@gmail.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
commit 7dc22b7911ac3d5c131075903e3fbf52c58eac15
Author: Dave Airlie <airlied@redhat.com>
Date: Wed May 9 09:32:05 2012 +0100
modesetting: make sure the pci device corresponds to the drm device
If we get asked to pci open a device with a kms path override,
make sure they match, otherwise this driver can steal the primary
device binding for a usb adaptor.
The driver should fallback to the old probe entry point in this case.
Signed-off-by: Dave Airlie <airlied@redhat.com>
commit afc153a5b4fc58ae70dc214f61a71b1a8c855f06
Author: James Cloos <cloos@jhcloos.com>
Date: Tue May 8 17:55:10 2012 -0400
Fix RANDR’s gamma_to_ramp().
In order to generate a 256-entry ramp in [0,65535] which covers the full
range, one must mupliply eight-bit values not by 256 but rather by 257.
Many years back – well before the RANDR extension was written, and
before xorg@fdo – a similar bug fix was made to the DIX for converting
client-supplied eight-bit color values into sixteen-bit values.
Noticed by: Elle Stone and Graeme Gill.
Signed-off-by: James Cloos <cloos@jhcloos.com>
commit e501c34d4937d5e6f19abd29f1ec7f95faa3bb55
Author: Yaakov Selkowitz <yselkowitz@users.sourceforge.net>
Date: Tue May 1 22:03:24 2012 -0500
hw/xwin/glx: Use silent rules
Signed-off-by: Yaakov Selkowitz <yselkowitz@users.sourceforge.net>
Reviewed-by: Jon TURNEY <jon.turney@dronecode.org.uk>
commit 026d402fef623a0bda0bedd9c0938ba787bf9829
Author: Yaakov Selkowitz <yselkowitz@users.sourceforge.net>
Date: Fri Mar 30 14:33:18 2012 -0500
xfree86: use silent rules with sdksyms generation
Signed-off-by: Yaakov Selkowitz <yselkowitz@users.sourceforge.net>
Reviewed-by: Jon TURNEY <jon.turney@dronecode.org.uk>
commit 3d98dac46c17bc6e03546b8a532bfb55f00e5084
Author: Yaakov Selkowitz <yselkowitz@users.sourceforge.net>
Date: Sun Apr 29 20:45:17 2012 -0500
xfree86: respect EXEEXT in relink target
Signed-off-by: Yaakov Selkowitz <yselkowitz@users.sourceforge.net>
Reviewed-by: Jon TURNEY <jon.turney@dronecode.org.uk>
commit e6461db6dcb437cfa7d4b23008c2c12f8169ff79
Author: Yaakov Selkowitz <yselkowitz@users.sourceforge.net>
Date: Thu Apr 26 01:49:06 2012 -0500
os: Add CryptoAPI as a choice of SHA1 implementation
Both Cygwin and MinGW can use Windows' native CryptoAPI for SHA1,
saving a dependency on libgcrypt or OpenSSL. The necessary functions
are in ADVAPI32.DLL, which is among the default lib flags and is
already used in hw/xwin for accessing the registry.
Signed-off-by: Yaakov Selkowitz <yselkowitz@users.sourceforge.net>
Reviewed-by: Mikhail Gusarov <dottedmag@dottedmag.net>
Reviewed-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
Tested-by: Colin Harrison <colin.harrison@virgin.net>
commit c91d00e0f330b9de604068e1bfcb0a307096434f
Author: Daniel Kurtz <djkurtz@chromium.org>
Date: Wed Apr 18 17:51:53 2012 +0800
os/log: refactor logging
It is not safe to ever use an arbitrary (possibly user supplied) string as
part of the format for a *sprintf() call.
For example:
1. Name a Bluetooth keyboard "%n%n%n%n%n%n%n%n"
2. Pair it with a computer running X and try to use it
3. X is not happy when trying to do the following in xf86-input-evdev:
xf86IDrvMsg(pInfo, X_CONFIG, "Device: \"%s\"\n", device);
because LogVHdrMessageVerb() has put the %n from the device name
into a format string of the form:
"evdev: %n%n%n%n%n%n%n%n: Device: \"%s\"\n"
Instead, build up a log message in place by appending successive formatted
strings by sncprintf'ing to the end of the previous.
Signed-off-by: Daniel Kurtz <djkurtz@chromium.org>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 6ce0eac4f8a05f6d7401445cab95027709d3a479
Author: Daniel Kurtz <djkurtz@chromium.org>
Date: Wed Apr 18 17:51:52 2012 +0800
os/log: only write timestamp if a message is actually written to logfile
The current code will write a timestamps into the logFile whenever
the last message ended with a '\n' - even if the verb for that timestamp
is at too high a level. This timestamp will sit there with no matching
message until the next call to LogVWrite with a valid verb.
In other words, in some cases, timestamps in the X.org.log are for some
completely unrelated message that was previously ignored due to
insufficient verbosity, and not for the message that appears next to it
in the log file.
We keep the current policy which appears to be to only apply timestamps if
a message is actually written to a log file. That is, no timestamps on
stderr, or in the mem buffer. Therefore, the timestamp stringification
is moved to the conditional where it is used.
Since logging uses a fixed length buffer, this patch also forces a '\n'
whenever a buffer is terminated due to a too-long write request. This
allows the newline detection to work even on overflow, and also cleans up
the log a bit in the overflow case.
Signed-off-by: Daniel Kurtz <djkurtz@chromium.org>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 5c2e2a164d615ab06be28a663734e782614b5cc7
Author: Daniel Kurtz <djkurtz@chromium.org>
Date: Wed Apr 18 09:51:51 2012 +0000
os/xprintf: add Xvscnprintf and Xscnprintf
Normal snprintf() usually returns the number of bytes that would have been
written into a buffer had the buffer been long enough.
The scnprintf() variants return the actual number of bytes written,
excluding the trailing '\0'.
Signed-off-by: Daniel Kurtz <djkurtz@chromium.org>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit c30862879d2c766519780bb7f353f35edf0daa9b
Author: Daniel Kurtz <djkurtz@chromium.org>
Date: Wed Apr 18 17:51:50 2012 +0800
os/log: trivial cleanups
* space->tab
* remove comment that doesn't make any sense
Signed-off-by: Daniel Kurtz <djkurtz@chromium.org>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 97041364a6acb2b66b5cfd06757c90a006ad50e9
Merge: 19082726cb ee542b8559
Author: Keith Packard <keithp@keithp.com>
Date: Wed May 2 20:47:25 2012 -0700
Merge remote-tracking branch 'whot/for-keith'
No conflicts here
commit ee542b85590814ee25369babce1ad14feeb137af
Author: Chase Douglas <chase.douglas@canonical.com>
Date: Tue May 1 10:21:12 2012 -0700
Report touch emulated buttons in XIQueryPointer for XI 2.1 and earlier
XInput 2.1 and earlier clients do not know about touches. We must report
touch emulated button presses for these clients. For later clients, we
only report true pointer button presses.
Signed-off-by: Chase Douglas <chase.douglas@canonical.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 19082726cb2c69f53e9720904521e3c98f788bff
Author: Ryan Pavlik <rpavlik@iastate.edu>
Date: Fri Oct 21 12:47:38 2011 -0500
configure.ac: on MinGW, link with ws2_32 instead of winsock2
ws2_32 is the correct name for the libary (even on 64 bit Windows :-))
Signed-off-by: Ryan Pavlik <rpavlik@iastate.edu>
Reviewed-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Reviewed-by: Yaakov Selkowitz <yselkowitz@users.sourceforge.net>
commit ad9605a3e21b20fa8565dc6701610712ac6dd9e1
Author: Ryan Pavlik <rpavlik@iastate.edu>
Date: Fri Nov 4 13:26:14 2011 -0500
configure.ac: MinGW doesn't have setuid binaries either.
If the target platform isn't in a list of platforms we know don't use a
setuid binary, we try to test if we can chown something to root.
This test possibly won't give the right answer if we are cross-compiling,
which is common for the MinGW target. This patch adds MinGW to the list
of platforms we know don't use a setuid binary.
Signed-off-by: Ryan Pavlik <rpavlik@iastate.edu>
Reviewed-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Reviewed-by: Yaakov Selkowitz <yselkowitz@users.sourceforge.net>
commit 2225208c2ef9857f14813376ce85d305f19263dd
Author: Ryan Pavlik <rpavlik@iastate.edu>
Date: Fri Nov 4 13:30:43 2011 -0500
configure.ac: auto-disable MITSHM if we lack IPC
The MITSHM extension uses SYSV IPC, but even if configure's test
for IPC failed, MITSHM was still enabled by default, breaking
MinGW builds by default.
Unfortunately, fixing this exposes the fact that the HAVE_SYSV_IPC
test wasn't being used for anything before and so we hadn't noticed it
was failing on Cygwin.
Change from using SHM_W|SHM_R flags (which aren't required by POSIX) to
S_IRUSR|S_IWUSR flags (which are)
Signed-off-by: Ryan Pavlik <rpavlik@iastate.edu>
Reviewed-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Reviewed-by: Yaakov Selkowitz <yselkowitz@users.sourceforge.net>
commit 1e7b500a8e1d79b91a4e857a2da06194efe8cf69
Author: Chase Douglas <chase.douglas@canonical.com>
Date: Tue May 1 10:21:11 2012 -0700
Report logical button state in ProcXIQueryPointer
Physical button state is usually meaningless to an X client.
Signed-off-by: Chase Douglas <chase.douglas@canonical.com>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
commit d063f64b5c8c8c27fca41163c93dbca06a774d1c
Author: Dave Airlie <airlied@redhat.com>
Date: Tue May 1 17:12:29 2012 +0100
modesetting: attempt to work out if we want 24 or 32bpp
the cirrus driver presents certain challenges, and this is a
workaround, until we can possibly agree some sane interface
for exposing this information.
Signed-off-by: Dave Airlie <airlied@redhat.com>
commit 0426e6d65b6598edfbcb2fc66ee65fb08256469e
Author: Jon TURNEY <jon.turney@dronecode.org.uk>
Date: Tue Jan 3 00:14:32 2012 +0000
configure.ac: Make default configuration for MinGW disable unsupported extensions and DDXs
Same as the default configuration for Cygwin, --disable-xorg and --disable-dmx DDX by default,
and force --disable-xv and other unsupported extensions
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Reviewed-by: Yaakov Selkowitz <yselkowitz@users.sourceforge.net>
commit 610f532e6a3d934c473d2d16dff95f582285b2eb
Author: Dave Airlie <airlied@redhat.com>
Date: Tue May 1 16:52:18 2012 +0100
modesetting: move opening kernel device to before setting depth
due to interaction between option handling and set depth, we need
to what fbdev does to get the device path early.
Signed-off-by: Dave Airlie <airlied@redhat.com>
commit f3410b97cf9b48a47bee3d15d232f8a88e75f4ef
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Mon Apr 30 10:01:48 2012 +1000
dix: when disabling a device, release all buttons and keys
A suspend-induced device disable may happen before the device gets to see
the button release event. On resume, the server's internal state still has
some buttons pressed, causing inconsistent behaviour.
Force the release and the matching events to be sent to the client.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Chase Douglas <chase.douglas@canonical.com>
commit af88b43f9e604157b74270d609c08bdfa256a792
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri Apr 27 16:31:17 2012 +1000
dix: don't emulate scroll events for non-existing axes (#47281)
Test case:
- create a device with REL_HWHEEL and ABS_X and ABS_Y. evdev 2.7.0 will set
that up as device with 1 relative axis
- move pointer to VGA1
- xrandr --output VGA1 --off
Warps the pointer to the new spot and calls GPE with the x/y mask bits set.
When running through the loop to check for scroll event, this overruns the
axes and may try to emulate scroll events based on random garbage in the
memory. If that memory contained non-zero for the scroll type but near-zero
for the increment field, the server would hang in an infinite loop.
This was the trigger for this suggested, never-merged, patch here:
http://patchwork.freedesktop.org/patch/9543/
X.Org Bug 47281 <http://bugs.freedesktop.org/show_bug.cgi?id=47281>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Chase Douglas <chase.douglas@canonical.com>
commit 08962951de969b9d8c870af8b6e47303dc0decfd
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri Apr 27 10:52:39 2012 +1000
os: make timers signal-safe
If TimerSet() is called from a signal handler (synaptics tap handling code)
may result in list corruption if we're currently inside TimerSet().
See backtrace in
https://bugzilla.redhat.com/show_bug.cgi?id=814869
Block signals for all list manipulations in the timers.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Chase Douglas <chase.douglas@canonical.com>
commit d662fa2450856777b59c4b62b912395a8bfd52fd
Author: Michal Suchanek <hramrach@gmail.com>
Date: Thu Apr 26 15:11:20 2012 +0200
dmx: Annotate dmxlog.c with _X_ATTRIBUTE_PRINTF and _X_NORETURN
and fix resulting printf warning in dmxLogVisual
Signed-off-by: Michal Suchanek <hramrach@gmail.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 5c361d59c5031d9b3f7f9093a52d2b1ff4d9ae5f
Author: Chase Douglas <chase.douglas@canonical.com>
Date: Fri Apr 20 11:08:15 2012 -0700
TouchListenerAcceptReject: Warn and return early on bad listener index
Signed-off-by: Chase Douglas <chase.douglas@canonical.com>
Reviewed-by: Bryce Harrington <bryce@canonical.com>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 88bacc49f06da5927f716869f5a32672a8297ed0
Author: Chase Douglas <chase.douglas@canonical.com>
Date: Wed Apr 4 15:29:42 2012 -0700
os: Add -displayfd option
This option specifies a file descriptor in the launching process. X
will scan for an available display number and write that number back to
the launching process, at the same time as SIGUSR1 generation. This
means display managers don't need to guess at available display numbers.
As a consequence, if X fails to start when using -displayfd, it's not
because the display was in use, so there's no point in retrying the X
launch on a higher display number.
Signed-off-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Chase Douglas <chase.douglas@canonical.com>
Reviewed-by: Julien Cristau <jcristau@debian.org>
Tested-by: Julien Cristau <jcristau@debian.org>
Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 1d82ec95942b88dd01f0ac6b883368360a0b5fe6
Author: Michal Suchanek <hramrach@gmail.com>
Date: Mon Apr 23 13:52:40 2012 +0200
xserver: Fix out-of-tree build
Fixes regression caused by ccb3e78124fb05defd0c9b438746b79d84dfc3ae
Signed-off-by: Michal Suchanek <hramrach@gmail.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit ea51e9b2877df60135edaf2a8f88d0f2a2b41060
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Mon Apr 23 10:35:53 2012 +1000
Xi: return BadValue on XIQueryVersion if the version is less than first call
Clients that use plugin systems may require multiple calls to
XIQueryVersion from different plugins. The current error handling requires
client-side synchronisation of version numbers.
The first call to XIQueryVersion defines the server behaviour. Once cached,
always return that version number to any clients. Unless a client requests a
version lower than the first defined one, then a BadValue must be returned
to be protocol-compatible.
Introduced in 2c23ef83b0e03e163aeeb06133538606886f4e9c
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com>
commit 93d6ba5b711cbd3f502d83e54c9739856d2e6f2a
Author: Jeremy Huddleston <jeremyhu@apple.com>
Date: Thu Apr 26 21:17:54 2012 -0700
XQuartz: Make sure we tell startx the correct server binary to use in our fallback path
With multiple servers installed, we can't be certain if X is Xorg or Xquartz
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
commit fa6dddc6ce51c1b7a43fb379fb2a19550f6c8683
Author: Michal Suchanek <hramrach@gmail.com>
Date: Wed Mar 28 18:12:39 2012 -0700
xfree86: workaround crash on close
Fixes: https://bugs.freedesktop.org/show_bug.cgi?id=41653
Signed-off-by: Michal Suchanek <hramrach@gmail.com>
Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com>
Tested-by: Knut Petersen <Knut_Petersen@t-online.de>
commit adcb48a29dcb3f32ff570551de4b014775c1e147
Author: Jonas Maebe <jonas.maebe@elis.ugent.be>
Date: Sun Apr 22 20:52:47 2012 -0700
glapi: Correct size of allocated _glapi_table struct
The __glapi_gentable_set_remaining_noop() routine treats the _glapi_struct
as an array of _glapi_get_dispatch_table_size() pointers, so we have to
allocate _glapi_get_dispatch_table_size()*sizeof(void*) bytes rather than
sizeof(struct _glapi_struct) bytes.
Signed-off-by: Jonas Maebe <jonas.maebe@elis.ugent.be>
Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com>
commit e34519e525559b01a63d26639f13f0487468de28
Author: Jeremy Huddleston <jeremyhu@apple.com>
Date: Thu Apr 19 16:38:06 2012 -0700
XQuartz: darwinPointer now sends both absolute and relative motion
This should hopefully help out wine clients that were continuing to
have issues after the earlier changes.
http://xquartz.macosforge.org/trac/ticket/548
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
commit 662d41acdde1dcb9774fbe4054e251c708acaffe
Author: Jeremy Huddleston <jeremyhu@apple.com>
Date: Thu Apr 19 18:48:22 2012 -0700
XQuartz: Add a hack to better handle clicky wheel scroll mice
We loose information from AppKit being in our way. Before adopting
smooth scrolling, we always rounded-up the number of scroll button
clicks per NSEvent. Now, the scroll value is accumulated in the
dix, and clicky scroll wheels with legacy X11 clients are seeing
an accumulation of error due to so many translations (button press
to smooth scrolling value in AppKit, passed to the dix, and then
synthesized into a button press). This attempts to make the
situation better.
http://xquartz.macosforge.org/trac/ticket/562
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
commit eda85290ae47d8dd497ef9335d10268bbe3e02a0
Author: Jeremy Huddleston <jeremyhu@apple.com>
Date: Thu Apr 19 16:20:30 2012 -0700
XQuartz: Use screenInfo.{width,height} instead of grabbing it from the first screen
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
commit b99586c9086ac29df144ef75df92f8c0c7554651
Author: Jeremy Huddleston <jeremyhu@apple.com>
Date: Wed Apr 18 17:50:55 2012 -0700
XQuartz: Separate out tablet and mouse event delivery into separate functions
This should have no immediate impact aside from fake mouse buttons no longer
working with tablets (where they aren't needed or desired anyways). This
prepares us for future changes.
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
commit 30623d6ff7bca223f9e1a825e86bd317eef8bf16
Author: Jeremy Huddleston <jeremyhu@apple.com>
Date: Thu Apr 19 16:06:45 2012 -0700
XQuartz: Correct calculation of the size of our file descriptor array in console_redirect
Reported-by: Joe Rohde <joer@valvesoftware.com>
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
commit b4c4c65a35640e7274ccd4228f62110147878b72
Author: Jeremy Huddleston <jeremyhu@apple.com>
Date: Wed Apr 18 01:01:44 2012 -0700
XQuartz: Fix a deadlock in pre-dispatch code
The fact that this has been in place so long makes me really wonder if
anybody cares about this running in Tiger or Leopard.
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
commit d1ef0d4964e43a4ab777750ad214d1092fd1ffda
Author: Jeremy Huddleston <jeremyhu@apple.com>
Date: Sat Apr 7 15:26:53 2012 -0700
test: Fix make dist
It seems like make dist should be doing te right thing without this commit,
but it's not in some cases. Don't ask me to explain why.
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
commit d97868d934fd1a00f9e9ef23a1154a70c7bc0464
Author: Jeremy Huddleston <jeremyhu@apple.com>
Date: Thu Apr 19 16:39:23 2012 -0700
os: Annotate OsVendorFatalError as _X_ATTRIBUTE_PRINTF
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
Tested-By: Michal Suchanek <hramrach@gmail.com>
commit 0ba1794fe2896395875f62e911720c7585687444
Author: Jeremy Huddleston <jeremyhu@apple.com>
Date: Thu Apr 19 16:51:46 2012 -0700
xres: Fix build without composite
Regression from: b8d0d19a6d410776b53a41e7cae90f68d4b22bb7
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
Reviewed-by: Rami Ylimäki <rami.ylimaki@vincit.fi>
Tested-By: Michal Suchanek <hramrach@gmail.com>
commit d77eb7ee49ef19c2c4c7381d56e9d0f9c3fbc890
Merge: 31e3c0ff7f c7b1625558
Author: Keith Packard <keithp@keithp.com>
Date: Thu Apr 19 15:48:34 2012 -0500
Merge remote-tracking branch 'yselkowitz/master'
Pull in Cygwin for XFree86
commit 31e3c0ff7f5fb36421be8de06e5f6e675ec26ddc
Author: Keith Packard <keithp@keithp.com>
Date: Thu Apr 19 15:25:41 2012 -0500
Export CompositeClientWindowType
Make sure CompositeClientWindowType is visible for XResource v1.2
Signed-off-by: Keith Packard <keithp@keithp.com>
commit e6308e32fe2b5f74133d4d238ffa512257f6327c
Merge: 3720aa33ee 51a8d8dd19
Author: Keith Packard <keithp@keithp.com>
Date: Thu Apr 19 10:45:07 2012 -0500
Merge remote-tracking branch 'whot/for-keith'
Touch input changes from Chase
commit 51a8d8dd19d7496fe84b37a1f0a7a03658120539
Merge: ebf214876a 00cf1c40b2
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu Apr 19 17:03:54 2012 +1000
Merge branch 'input-fixes' of git://people.freedesktop.org/~cndougla/xserver into for-keith
commit 00cf1c40b28417d7035c2917d048553eb720023c
Author: Chase Douglas <chase.douglas@canonical.com>
Date: Wed Apr 18 18:21:54 2012 -0700
Replay original touch begin event instead of generated begin event
The generated event does not have axes other than X and Y and has a
newer timestamp. In particular, the newer timestamp may be newer than
the real touch end event, which may be stuck in the syncEvents queue. If
a client uses the timestamps for grabbing bad things may happen.
Signed-off-by: Chase Douglas <chase.douglas@canonical.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 312910b4e34215aaa50fc0c6092684d5878dc32f
Author: Chase Douglas <chase.douglas@canonical.com>
Date: Wed Apr 18 11:15:40 2012 -0700
Update currentTime in dispatch loop
A request, like input device grabs, may check a request timestamp
against currentTime. It is possible for currentTime to lag a previously
sent event timestamp. If the client makes a request based on such an
event timestamp, the request may fail the validity check against
currentTime unless we always update the time before processing the
request.
Signed-off-by: Chase Douglas <chase.douglas@canonical.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
commit a986f2f30cbe2a00e72ded7315c4951d7703e549
Author: Chase Douglas <chase.douglas@canonical.com>
Date: Tue Apr 17 11:40:15 2012 -0700
Update device state including when touch record does not exist
If a touch is physically active, the pointer core state should reflect
that the first button is pressed. Currently, this only occurs when there
are active listeners of the touch sequence. By moving the device state
updating to the beginning of touch processing we ensure it is updated
according to the processed physical state no matter what.
Signed-off-by: Chase Douglas <chase.douglas@canonical.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
commit ec9c4295830c3de610e65aca17f4da4a7af3c4c5
Author: Chase Douglas <chase.douglas@canonical.com>
Date: Wed Apr 18 12:04:58 2012 -0700
Check other clients' core masks properly when adding touch listener
The current code checks the core event mask as though it were an XI
mask. This change fixes the checks so the proper client and event masks
are used.
Signed-off-by: Chase Douglas <chase.douglas@canonical.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
commit e175971a6f44d94aa8306dc6b9228ccb2c8a0b4d
Author: Chase Douglas <chase.douglas@canonical.com>
Date: Tue Apr 17 11:39:10 2012 -0700
Ensure touch is ended when last listener is rejected
Currently, the touch is only logically ended if the touch has physically
ended. If the touch hasn't physically ended, the touch record is never
ended. If there aren't any more listeners, we don't need to keep the dix
touch record around any more.
Signed-off-by: Chase Douglas <chase.douglas@canonical.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
commit d0449851d1233543c3133d77e0ab7233319cdf5f
Author: Chase Douglas <chase.douglas@canonical.com>
Date: Tue Apr 17 10:49:14 2012 -0700
Create a new dix touch record for an emulated touch with no listeners
As a special case, if a still physically active pointer emulated touch
has no listeners and the device is explicitly grabbed for pointer
events, create a new dix touch record for the grab only.
This allows for clients to "hand off" grabs. For example, when dragging
a window under compiz the window decorator sees the button press and
then ungrabs the implicit grab. It then tells compiz to grab the device,
and compiz then moves the window with the pointer motion. This is racy,
but is allowed by the input protocol for pointer events when there are
no other clients with a grab on the device.
Signed-off-by: Chase Douglas <chase.douglas@canonical.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 3d06bfe93d33cfe6150d8fb0058ee7bc8d80622b
Author: Chase Douglas <chase.douglas@canonical.com>
Date: Tue Apr 17 13:56:08 2012 -0700
Rename TouchEnsureSprite to TouchBuildSprite and event type checks
The function will be used for building a sprite for pointer emulation
after an explicit device grab. This commit refactors the code so that
TouchBuildSprite will function with any event type and moves the checks
to the caller.
Signed-off-by: Chase Douglas <chase.douglas@canonical.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 2efbed23c29020f9994ab7c3155ce7386950dc7a
Author: Chase Douglas <chase.douglas@canonical.com>
Date: Tue Apr 17 08:39:38 2012 -0700
When activating an explicit grab, update owning listener
Pointer passive grabs may be changed by the grabbing client. This allows
for a selecting client to change an implicit grab to an active grab,
which is the mechanism used for pop-up windows like application menus.
We need to do the same thing with touches. If the grabbing client is the
owner of a touch sequence, change the listener record to reflect the new
grab. If the grabbing client is not the owner, nothing changes for the
touch.
Signed-off-by: Chase Douglas <chase.douglas@canonical.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
commit ef64b5ee97099618cf2e2cbbd3e471095695ae24
Author: Chase Douglas <chase.douglas@canonical.com>
Date: Mon Apr 16 15:53:51 2012 -0700
Don't deactivate implicit pointer grab on fake touch end event
Fake touch end events are generated by touch acceptance and rejection.
These should not cause implicit pointer grabs to be deactivated.
Signed-off-by: Chase Douglas <chase.douglas@canonical.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
commit fc518cd9f59060cc19bb90361767c0f47f0e25eb
Author: Chase Douglas <chase.douglas@canonical.com>
Date: Mon Apr 16 15:31:47 2012 -0700
End a pointer emulated touch event only on a "real" end event
Fake end events are generated by touch acceptance or rejection. These
should not end the touch point.
Signed-off-by: Chase Douglas <chase.douglas@canonical.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 80d7d1ec6a9d61aa96e7d019dc1bee29d90cea34
Author: Chase Douglas <chase.douglas@canonical.com>
Date: Mon Apr 16 14:19:59 2012 -0700
On touch accept, only process end event for owner if it has seen the end
We still need to generate the touch ownership event to process the
ending of the touch event in the case where the owner has the end
already.
Signed-off-by: Chase Douglas <chase.douglas@canonical.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 8dfd98245d2c44a1eb4c8b7c275e6cfc10fe40f1
Author: Chase Douglas <chase.douglas@canonical.com>
Date: Wed Apr 11 11:14:51 2012 -0700
Fix copy/paste error from before git history in UpdateCurrentTimeIf()
See UpdateCurrentTime() for reference. I don't know what bug this might
trigger, but it wouldn't hurt to fix this.
Signed-off-by: Chase Douglas <chase.douglas@canonical.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 6ca30cb33e829b4edd01822367e44ffe6f0951b0
Author: Chase Douglas <chase.douglas@canonical.com>
Date: Wed Apr 11 08:17:25 2012 -0700
When deactivating an explicit pointer grab, reject all grabs on touches
Explicit pointer grabs are placed at the head of the touch listener
array for pointer emulated touches. If the grab is deactivated, we must
remove it from all touches for the device.
Signed-off-by: Chase Douglas <chase.douglas@canonical.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
commit cacdb9a74065ccba7d50a82e14abdf04b36c5309
Author: Chase Douglas <chase.douglas@canonical.com>
Date: Wed Apr 11 08:13:17 2012 -0700
Accept touch sequence for pointer listener after second event delivery
This is a bit of unimplemented code for touchscreen pointer emulation. A
pointer grabbing client currently never accepts the touch sequence. The
sequence must be accepted once any touch-derived event is irrevocably
delivered to a client.
The first pointer event, derived from a touch begin event, may be caught
in a sync grab and then replayed. This is essentially a revocable
delivery of an event. Thus, we must wait till a non-begin event is
delivered.
Signed-off-by: Chase Douglas <chase.douglas@canonical.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 447fe7a1a72513aa68145962c47894242c589cc9
Author: Chase Douglas <chase.douglas@canonical.com>
Date: Wed Apr 11 08:12:08 2012 -0700
Split out helper function TouchListenerAcceptReject()
This will be used for accepting and rejecting touches in the future.
Signed-off-by: Chase Douglas <chase.douglas@canonical.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 93c33403642a3de3c9d141ad7940a7b880846aad
Author: Chase Douglas <chase.douglas@canonical.com>
Date: Wed Apr 4 12:59:55 2012 -0700
Only set XI2 mask if pointer emulation is for XI2 client
The current code returns a reference to memory that may not actually be
an XI2 mask. Instead, only return a value when an XI2 client has
selected for events.
Signed-off-by: Chase Douglas <chase.douglas@canonical.com>
Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com>
Acked-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 4c1dfd21937efc6a85fb204a73dd7d7151d54daa
Author: Chase Douglas <chase.douglas@canonical.com>
Date: Wed Apr 4 12:57:40 2012 -0700
Check core event mask properly for pointer emulated touch events
The current code checks the core event mask as though it were an XI2
mask. This change fixes the checks so the proper client and event masks
are used.
Signed-off-by: Chase Douglas <chase.douglas@canonical.com>
Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com>
Acked-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 3720aa33ee50788dd3d4acc9bbf8dfcb72c8f5ce
Author: Erkki Seppälä <erkki.seppala@vincit.fi>
Date: Thu Apr 7 12:53:51 2011 +0300
Added resourceproto version dependency, >= 1.2.0 now required
Signed-off-by: Erkki Seppälä <erkki.seppala@vincit.fi>
commit 233eab4d05cae1fdb4129a2e9905961b78693f74
Author: Erkki Seppälä <erkki.seppala@vincit.fi>
Date: Wed Dec 8 17:09:30 2010 +0200
dix: add reference count of the resource to ResourceSizeRec
The ResourceSizeRec now contains the number of references to the
resource. For example a Pixmap knows this value and it can be useful
for determining the "weight" of the resource. Typically this value
is 1.
Reviewed-by: Rami Ylimäki <rami.ylimaki@vincit.fi>
Signed-off-by: Erkki Seppälä <erkki.seppala@vincit.fi>
commit ccb3e78124fb05defd0c9b438746b79d84dfc3ae
Author: Erkki Seppälä <erkki.seppala@vincit.fi>
Date: Tue Dec 14 12:18:23 2010 +0200
Xext: add a generic hashtable implementation
The generic hashtable implementation adds a key-value container, that
keeps the key and value inside the hashtable structure and manages
their memory by itself. This data structure is best suited for
fixed-length keys and values.
One creates a new hash table with ht_create and disposes it with
ht_destroy. ht_create accepts the key and value sizes (in bytes) in
addition to the hashing and comparison functions to use. When adding
keys with ht_add, they will be copied into the hash and a pointer to
the value will be returned: data may be put into this structure (or if
the hash table is to be used as a set, one can just not put anything
in).
The hash table comes also with one generic hashing function plus a
comparison function to facilitate ease of use. It also has a custom
hashing and comparison functions for hashing resource IDs with
HashXID.
Reviewed-by: Rami Ylimäki <rami.ylimaki@vincit.fi>
Signed-off-by: Erkki Seppälä <erkki.seppala@vincit.fi>
commit a2ac01a8ea8508ed35aa844a589672c1165e05e4
Author: Erkki Seppälä <erkki.seppala@vincit.fi>
Date: Wed Apr 6 10:16:53 2011 +0300
dix: don't use a local wrapper for calling HashResourceID
Calls to Hash(client, id) were replaced with calls directly to
HashResourceID(id, clientTable[client].hashsize) and the Hash-function
was removed.
Signed-off-by: Erkki Seppälä <erkki.seppala@vincit.fi>
commit a0b0fb83f91bb82534a0d83fdd6c0222567b098d
Author: Erkki Seppälä <erkki.seppala@vincit.fi>
Date: Mon Dec 20 12:58:37 2010 +0200
dix: add hashing functions to resource.h for others to use.
The public hashing function HashResourceID uses the same hashing
hashing algorithm as resource.c uses internally, but it provides an
interface that will is usable by external modules. It provides a
parameter for the number of bits for the hash, instead of finding the
size from its internal hash table.
Signed-off-by: Erkki Seppälä <erkki.seppala@vincit.fi>
commit 3ba0decb4b55a1fd122d269e15b2b2da8ced8624
Author: Erkki Seppälä <erkki.seppala@vincit.fi>
Date: Wed Dec 8 15:30:57 2010 +0200
dix: add a mechanism for iterating through all subresources
The mechanism allows iterating even through subresources that don't
have specific XID's. When such 'resources' are iterated, the XID for
them will be zero. A resource type can assign an iteration function
for its subresources with SetResourceTypeFindSubResFunc; by default
resources are assumed not to contain subresources.
The purpose of this extension is to enable accurate accounting of
the resources a resource consumes or uses.
This patch provides the subresource iteration functions for Windows
and GCs.
Reviewed-by: Rami Ylimäki <rami.ylimaki@vincit.fi>
Signed-off-by: Erkki Seppälä <erkki.seppala@vincit.fi>
commit b8d0d19a6d410776b53a41e7cae90f68d4b22bb7
Author: Rami Ylimäki <rami.ylimaki@vincit.fi>
Date: Wed Oct 27 17:25:50 2010 +0300
composite: Report pixmap usage of client windows to resource extension.
Signed-off-by: Erkki Seppälä <erkki.seppala@vincit.fi>
Signed-off-by: Rami Ylimäki <rami.ylimaki@vincit.fi>
Reviewed-by: Mikhail Gusarov <dottedmag@dottedmag.net>
Reviewed-by: Tiago Vignatti <tiago.vignatti@nokia.com>
commit e83388cc70e21e7f377ed2e417d04469e23eb706
Author: Rami Ylimäki <rami.ylimaki@vincit.fi>
Date: Wed Oct 27 16:59:06 2010 +0300
render: Report pixmap usage of pictures to resource extension.
Signed-off-by: Erkki Seppälä <erkki.seppala@vincit.fi>
Signed-off-by: Rami Ylimäki <rami.ylimaki@vincit.fi>
Reviewed-by: Mikhail Gusarov <dottedmag@dottedmag.net>
Reviewed-by: Tiago Vignatti <tiago.vignatti@nokia.com>
commit 96864bfa951ea8bf4ab697753fc62c6a97598bc0
Author: Erkki Seppälä <erkki.seppala@vincit.fi>
Date: Mon Nov 29 12:40:56 2010 +0200
Implemented first part of XResource extension v1.2: X_XResQueryClientIds
This patch implements a part of the XResource extension v1.2 (as specified in
http://patchwork.freedesktop.org/patch/2720/ ). The request implemented is
X_XResQueryClientIds.
This patch depends on the feature introduced by
1e933665bef26c74196bb7c59910e6a78bcacf0e "dix: Add facilities for
client ID tracking." .
This latest version also adds Doxygen-formatted comments and takes a better
notice of coding conventions (as in http://www.x.org/wiki/CodingStyle ).
Signed-off-by: Erkki Seppälä <erkki.seppala@vincit.fi>
commit ebf214876a4885a98ded4f5525925b69005fae05
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Wed Apr 18 15:56:37 2012 +1000
dix: indentation fix
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 00c663a3bc76d567ad7edd6d6ef3f7f725b5df3a
Author: Dave Airlie <airlied@redhat.com>
Date: Tue Apr 17 11:50:40 2012 +0100
modesetting: add set/drop master around VT switch
commit 001dec898098e11c569abc20a307b3c2af2e2184
Author: Dave Airlie <airlied@redhat.com>
Date: Tue Apr 17 11:48:03 2012 +0100
cursor: hide cursors on LeaveVT
commit 80fefc42f5e67e6b4a4b440d8991bee7e5f38359
Merge: 9779b904c7 12188c8a8a
Author: Keith Packard <keithp@keithp.com>
Date: Sun Apr 15 21:05:30 2012 -0700
Merge remote-tracking branch 'whot/for-keith'
commit 12188c8a8a537b38b1ca4cf8c0de5447e19c886a
Author: Chase Douglas <chase.douglas@canonical.com>
Date: Tue Apr 3 17:31:01 2012 -0700
Use touch state when querying pointer through core protocol
QueryPointer is part of the core protocol. As such, it knows nothing
about touch devices. Touches are converted to button 1 press, pointer
motion, and button 1 release for core clients, so we should ensure the
pointer state mask has button 1 set when XQueryPointer is used.
Signed-off-by: Chase Douglas <chase.douglas@canonical.com>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 32ece7c09bf0ebc3d99b4078aacebbd44314776a
Author: Chase Douglas <chase.douglas@canonical.com>
Date: Tue Apr 10 17:12:42 2012 -0700
Ensure sequential touches are pointer emulated sequentially
Issue:
* Two sequential touches (i.e. down, up, down, up)
* Both are grabbed by a touch grab
* Both have a second listener in the form of a pointer grab or selection
* The second and first touches are rejected in that order
The first touch must be pointer emulated before the second touch, so the
second touch must be paused until the first touch is rejected or
accepted and all events are delivered to pointer clients.
This change ensures all pointer emulated events are emitted
sequentially. It necessarily imposes a delay on further touch events
when pointer grabs and selections are used, but there is no way around
it.
Signed-off-by: Chase Douglas <chase.douglas@canonical.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 163b0f375d73c05873fb341652de3ed347337828
Author: Chase Douglas <chase.douglas@canonical.com>
Date: Tue Apr 10 17:12:41 2012 -0700
Update event type when delivering end event to a pointer listener
Just like when we deliver to a touch listener, we must convert a touch
end event to an update event for further clients. This also ensures that
the touch record is not deleted at the end of ProcessTouchEvent().
Signed-off-by: Chase Douglas <chase.douglas@canonical.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 210cd12c47d063f97915ff23292b61d09abfd73a
Author: Chase Douglas <chase.douglas@canonical.com>
Date: Tue Apr 10 17:12:40 2012 -0700
Don't update listener after deactivating implicit pointer grab
After the pointer grab is deactivated, the touch listener record is
updated at the end of DeliverTouchEmulatedEvent. However, the touch
record is ended when the grab is deactivated, so the update to the
listener record is in an array of memory that has been freed.
Signed-off-by: Chase Douglas <chase.douglas@canonical.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 82a1ae0af3b136371638659c3e909880a99f721c
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu Apr 12 15:54:00 2012 +1000
xfree86: after VT switching back, only enable previously enabled devices
If a device was enabled before the VT switch, re-enabled it. Otherwise leave
it as is, there was probably a reason why it was disabled.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Chase Douglas <chase.douglas@canonical.com>
Reviewed-by: Daniel Stone <daniel@fooishbar.org>
commit d5d5b407436dfdbffcd56bbefecf17d11750dddf
Author: Dave Airlie <airlied@redhat.com>
Date: Sat Apr 14 19:21:47 2012 +0100
dirty: check malloc return
Suggested by keithp.
Signed-off-by: Dave Airlie <airlied@redhat.com>
commit 6c1b5cb903f2ff9cb915273835c301d6ac255f45
Author: Dave Airlie <airlied@redhat.com>
Date: Sat Apr 14 15:01:16 2012 +0100
drop use of alloca, just use malloc/free
Reported-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
commit c5a45b0f7658c77725adce2b64a0fbd62f208328
Author: Daniel Kurtz <djkurtz@chromium.org>
Date: Thu Apr 12 10:11:10 2012 +1000
dix: don't BUG_WARN for button events from button-only device
Events from button-only devices still need coordinates, and they get them
from scale_to_desktop(). Therefore, a dev without valuators is not a bug.
However, a dev with valuators, but less than two of them still is a bug.
This was noticed when unplugging a "Creative Technology SB Arena Headset",
which has some BTNs and some KEYs, but no REL or ABS valuators.
It emits [BTN_3] = 0 on unplug, which would trigger the BUG_WARN.
Signed-off-by: Daniel Kurtz <djkurtz@chromium.org>
Reviewed-by: Chase Douglas <chase.douglas@canonical.com>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 9779b904c7c0b49c74054c22c420012c40595cdc
Author: Keith Packard <keithp@keithp.com>
Date: Wed Apr 11 09:33:54 2012 -0700
hw/xfree86: Re-indent xf86vmode.c
This is the result of re-running the 'x-indent.sh' script over
xf86vmode.c to clean up the disaster caused by broken syntax in the
file.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 592bd0ae2b60cd6f6afd3efc40f5f659b12900b4
Author: Keith Packard <keithp@keithp.com>
Date: Wed Apr 11 09:28:21 2012 -0700
hw/xfree86: Spurious ');' in xf86vmode.c messed up indentation badly
Inside the unfinished XF86VIDMODE_EVENTS #ifdef block the
function definition for xf86VidModeNotifyEvent had an extra ');'
before the prototype argument declarations. This was harmless for the
compiler as the code never gets used, but completely messed up the
file re-indentation. This patch removes the spurious characters in
preparation for re-indenting the file.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 72cfc1a097dc1e09d2cd9415ef7855a2cef92351
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Wed Apr 11 09:43:23 2012 +1000
Xi: fix XITouchClass sourceid assignment
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Chase Douglas <chase.douglas@canonical.com>
commit 10cd6fdc431d2d0835c313b2f5bdda6dcea281fd
Author: Keith Packard <keithp@keithp.com>
Date: Sun Apr 8 00:16:54 2012 -0700
Revert "xfree86: workaround crash on close"
This reverts commit 55f552adb651715d2620db7248cd5b9b8187654a.
This appears to cause a crash at init time instead of close.
Reported-by: Knut Petersen <Knut_Petersen@t-online.de>
Acked-by: Jeremy Huddleston <jeremyhu@apple.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit c7b162555849ab2d4cb195d02d98a40494c5ce55
Author: Yaakov Selkowitz <yselkowitz@users.sourceforge.net>
Date: Thu Mar 29 02:26:41 2012 -0500
xfree86: link modules against Xorg symbols on Cygwin
As a PE platform, all symbols in both EXEs and DLLs must be resolved
at link time. As Xorg modules depend on symbols in the Xorg
executable, we must build Xorg before its modules, creating an implib
from the former which is used to link the latter. This implib must
then be installed in order to build the drivers.
Currently only two drivers are supported on Cygwin: xf86-video-dummy
(to replace Xvfb/Xfake) and xf86-video-nested (to replace Xnest/Xephyr).
Signed-off-by: Yaakov Selkowitz <yselkowitz@users.sourceforge.net>
Reviewed-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com>
commit 2dffdcd60f70f534ad730830fe97f0bb1a192e2a
Author: Yaakov Selkowitz <yselkowitz@users.sourceforge.net>
Date: Thu Mar 29 02:23:17 2012 -0500
xf86Config: load DIX libraries before drivers on Cygwin
Cygwin doesn't have ELF rpath capabilities, so these libraries need
to be loaded before the drivers (namely dummy and nested) which
depend on their symbols.
Signed-off-by: Yaakov Selkowitz <yselkowitz@users.sourceforge.net>
Reviewed-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com>
commit 5dd3d2dbbafee28142552640ac6ef3eef2e6d9d3
Author: Yaakov Selkowitz <yselkowitz@users.sourceforge.net>
Date: Thu Mar 29 02:21:01 2012 -0500
xf86Init: provide ddxBeforeReset ifdef DDXBEFORERESET
This is necessary when building Xorg and XWin simultaneously, otherwise
undefined symbol errors result in sdksyms.c.
Signed-off-by: Yaakov Selkowitz <yselkowitz@users.sourceforge.net>
Reviewed-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com>
commit 96186bc7219a88e549928707b3da4b8bfc16c54d
Author: Yaakov Selkowitz <yselkowitz@users.sourceforge.net>
Date: Thu Mar 29 02:18:41 2012 -0500
loader: add Cygwin support
Cygwin libraries use the .dll extension and "cyg" prefix in place of "lib".
Signed-off-by: Yaakov Selkowitz <yselkowitz@users.sourceforge.net>
Reviewed-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com>
commit 0ce48729d34ab610ff119303355883048b651500
Author: Yaakov Selkowitz <yselkowitz@users.sourceforge.net>
Date: Thu Mar 29 02:17:22 2012 -0500
os-support: add Cygwin support
Signed-off-by: Yaakov Selkowitz <yselkowitz@users.sourceforge.net>
Reviewed-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com>
commit fd115ee114e95b4e7b96f789d3ad67e2e15555de
Author: Yaakov Selkowitz <yselkowitz@users.sourceforge.net>
Date: Thu Mar 29 02:13:27 2012 -0500
xfree86: allow modules to be built without undefined symbols
This will be necessary to port Xorg to Cygwin, but other platforms may
find this useful as well.
Signed-off-by: Yaakov Selkowitz <yselkowitz@users.sourceforge.net>
Reviewed-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com>
commit 12cd7ca83c35bc61fbda7e61535692e3ec78194c
Author: Yaakov Selkowitz <yselkowitz@users.sourceforge.net>
Date: Thu Mar 29 02:06:36 2012 -0500
Cygwin/X: disable all unused or unapplicable extensions in configure
Signed-off-by: Yaakov Selkowitz <yselkowitz@users.sourceforge.net>
Reviewed-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com>
commit cb5661e86d4a428ec0ca4efc30a1a165d94d7215
Author: Yaakov Selkowitz <yselkowitz@users.sourceforge.net>
Date: Tue Mar 27 22:16:08 2012 -0500
xf86Crtc: include "xf86xv.h" only if XV
Signed-off-by: Yaakov Selkowitz <yselkowitz@users.sourceforge.net>
Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com>
commit 1110facdfeb95b1ad47d03c0ca3d73933b86dbd6
Author: Chase Douglas <chase.douglas@canonical.com>
Date: Thu Mar 29 18:06:03 2012 -0700
Implement passive touch ungrabbing
Whoops. Forgot to implement this. The code currently generates an error
due to the unhandled grab type.
X.Org Bug 48069 <https://bugs.freedesktop.org/show_bug.cgi?id=48069>
Signed-off-by: Chase Douglas <chase.douglas@canonical.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit e9d3848d7bda7f7de4c0f497aee4482d0b30ad49
Author: Jeremy Huddleston <jeremyhu@apple.com>
Date: Thu Apr 5 14:03:35 2012 -0700
XQuartz: Automatically start our virtual tablet devices
Fixes: https://bugs.launchpad.net/inkscape/+bug/972914
Regression introduced by: 7790dc86384cc451ac44663737fde84dd81ad4e1
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
commit 6cb83b78c47b80556cb4d573524d60f0cd1a64ac
Author: Jeremy Huddleston <jeremyhu@apple.com>
Date: Fri Mar 30 14:29:48 2012 -0700
XQuartz: Tiger build fix
Fixes: https://trac.macports.org/ticket/33818
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
commit eca58ee4db43d85e5940919be094c38ad166d5d0
Author: Jeremy Huddleston <jeremyhu@apple.com>
Date: Wed Mar 28 15:07:51 2012 -0700
os: Fix regression with FatalError not calling va_start
Regression From: a818b305989bbcde4e585112a7ee70cbc0b14a92
Found-by: Colin Harrison <colin.harrison@virgin.net>
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
commit 55f552adb651715d2620db7248cd5b9b8187654a
Author: Michal Suchanek <hramrach@gmail.com>
Date: Wed Mar 28 18:12:39 2012 -0700
xfree86: workaround crash on close
Fixes: https://bugs.freedesktop.org/show_bug.cgi?id=41653
Signed-off-by: Michal Suchanek <hramrach@gmail.com>
Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com>
commit 641a1b9363d59808d2586f9e84847ccc69701482
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Mon Mar 26 10:34:34 2012 +1000
test: reset the client before checking the swapped version
As of 2c23ef83b0e03e163aeeb06133538606886f4e9c, the server returns BadValue
for the same client with multiple versions. Avoid this by resetting the
client before we issue the same request as a fake swap client.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com>
Tested-by: Jeremy Huddleston <jeremyhu@apple.com>
commit 17f33ca0e5bff45a2d03e4d3b4753a714ce25baf
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Mon Mar 26 10:28:32 2012 +1000
test: init the sync extensions for tests to pass again
Introduced in d645edd11e7482f98c8b7e0d6c8693285c484907
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com>
Tested-by: Jeremy Huddleston <jeremyhu@apple.com>
commit 8053faa7b81520b0a46459ba6e3b98f2599d5bbf
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri Mar 23 08:20:22 2012 +1000
Bump input ABI to 17 for per-device idlecounters
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 7f3997b01a8813c1d7055317eb06111aed8572c9
Merge: 92d50c38b2 31646d8fa9
Author: Keith Packard <keithp@keithp.com>
Date: Mon Mar 26 16:41:52 2012 -0700
Merge remote-tracking branch 'jeremyhu/master'
commit 92d50c38b2bfeb82e7374a1966a53235e3f8275e
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Sun Feb 26 12:15:31 2012 -0500
man: s/__xservername__/Xorg/g - no longer required
Excerpt from http://lists.x.org/archives/xorg-devel/2011-March/020481.html:
The Xorg & xorg.conf substitutions are leftover from the transitional
period where some distros were building our sources with the XFree86
and XF86config names until they had time to adjust the rest of their
packages/installer/config code to the new names.
This will fix inconsistencies and prevent the creation of new unneeded
sed patterns.
Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 9e880cd2e36236e466fda0adadee34a407ae3341
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Sun Feb 26 12:15:30 2012 -0500
man: s/__xconfigfile__/xorg.conf/g - no longer required
Excerpt from http://lists.x.org/archives/xorg-devel/2011-March/020481.html:
The Xorg & xorg.conf substitutions are leftover from the transitional
period where some distros were building our sources with the XFree86
and XF86config names until they had time to adjust the rest of their
packages/installer/config code to the new names.
This will fix inconsistencies and prevent the creation of new unneeded
sed patterns.
Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 31646d8fa9524adca1d7bc2cd2db90d47c2eb96e
Author: Jeremy Huddleston <jeremyhu@apple.com>
Date: Sun Mar 25 23:33:54 2012 -0700
XQuartz: Use scrolling valuators
This lets use send more accurate data to Xi clients and uses dix
for legacy scroll buttons rather than reinventing the wheel.
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
Acked-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 7790dc86384cc451ac44663737fde84dd81ad4e1
Author: Jeremy Huddleston <jeremyhu@apple.com>
Date: Sun Mar 25 22:30:55 2012 -0700
XQuartz: Use AllocDevicePair to allocate our keyboard and mouse at the same time
Also correct isMaster to FALSE while we're here.
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
Acked-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 74fb534bf15687610367248071341fe4bfd1d8bf
Author: Jeremy Huddleston <jeremyhu@apple.com>
Date: Sun Mar 25 22:16:22 2012 -0700
XQuartz: Call update_desktop_dimensions() after updating our screen coordinates
Fixes: http://xquartz.macosforge.org/trac/ticket/555
Regression from: 8bebb4b4896d8b6ba3309b5b28fce883bb9f8a96
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
Acked-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 41a46546e92b66fed323b5845dd71a6385feb418
Author: Jeremy Huddleston <jeremyhu@apple.com>
Date: Sun Mar 25 23:05:43 2012 -0700
XQuartz: Formatting cleanup for sendX11NSEvent
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
commit 5324557c7b12dcacddac830bdb65769cb622c6cf
Author: Jeremy Huddleston <jeremyhu@apple.com>
Date: Fri Mar 23 19:58:49 2012 -0700
XQuartz: Source formatting cleanup
indent butchered Objective-C formatting. This patch was created by:
1) Reverting the indent changes in hw/xquartz
2) Editing X11Application.m and chaning some #ifdef logic to work
with uncrustify
3) Hand edited some (c) notifications
4) Opened all XQuartz sources in XCode and re-indented (^I)
5) Ran uncrustify with this configuration
(as close to the indent rules as I could get):
tok_split_gte=false
utf8_byte=true
utf8_force=true
indent_cmt_with_tabs=false
indent_align_string=false
indent_braces=false
indent_braces_no_func=false
indent_braces_no_class=false
indent_braces_no_struct=false
indent_brace_parent=false
indent_namespace=false
indent_extern=false
indent_class=false
indent_class_colon=false
indent_else_if=false
indent_var_def_cont=false
indent_func_call_param=false
indent_func_def_param=false
indent_func_proto_param=false
indent_func_class_param=false
indent_func_ctor_var_param=false
indent_template_param=false
indent_func_param_double=false
indent_relative_single_line_comments=false
indent_col1_comment=false
indent_access_spec_body=false
indent_paren_nl=false
indent_comma_paren=false
indent_bool_paren=false
indent_first_bool_expr=false
indent_square_nl=false
indent_preserve_sql=false
indent_align_assign=true
sp_balance_nested_parens=false
align_keep_tabs=false
align_with_tabs=false
align_on_tabstop=false
align_number_left=false
align_func_params=false
align_same_func_call_params=false
align_var_def_colon=true
align_var_def_attribute=true
align_var_def_inline=true
align_right_cmt_mix=false
align_on_operator=false
align_mix_var_proto=false
align_single_line_func=false
align_single_line_brace=false
align_nl_cont=false
align_left_shift=true
align_oc_decl_colon=true
nl_collapse_empty_body=true
nl_assign_leave_one_liners=true
nl_class_leave_one_liners=true
nl_enum_leave_one_liners=true
nl_getset_leave_one_liners=true
nl_func_leave_one_liners=true
nl_if_leave_one_liners=true
nl_multi_line_cond=false
nl_multi_line_define=false
nl_before_case=true
nl_after_case=true
nl_after_return=false
nl_after_semicolon=true
nl_after_brace_open=true
nl_after_brace_open_cmt=false
nl_after_vbrace_open=false
nl_after_vbrace_open_empty=false
nl_after_brace_close=false
nl_after_vbrace_close=false
nl_define_macro=false
nl_squeeze_ifdef=false
nl_ds_struct_enum_cmt=false
nl_ds_struct_enum_close_brace=false
nl_create_if_one_liner=false
nl_create_for_one_liner=false
nl_create_while_one_liner=false
ls_for_split_full=false
ls_func_split_full=false
nl_after_multiline_comment=false
eat_blanks_after_open_brace=false
eat_blanks_before_close_brace=false
mod_full_brace_if_chain=false
mod_pawn_semicolon=false
mod_full_paren_if_bool=false
mod_remove_extra_semicolon=false
mod_sort_import=false
mod_sort_using=false
mod_sort_include=false
mod_move_case_break=false
mod_remove_empty_return=false
cmt_indent_multi=true
cmt_c_group=false
cmt_c_nl_start=false
cmt_c_nl_end=false
cmt_cpp_group=false
cmt_cpp_nl_start=false
cmt_cpp_nl_end=false
cmt_cpp_to_c=false
cmt_star_cont=false
cmt_multi_check_last=true
cmt_insert_before_preproc=false
pp_indent_at_level=false
pp_region_indent_code=false
pp_if_indent_code=false
pp_define_at_level=false
indent_columns=4
indent_brace=0
indent_switch_case=0
align_struct_init_span=2
align_pp_define_gap=0
align_pp_define_span=2
align_oc_msg_colon_span=16
nl_end_of_file_min=1
nl_func_var_def_blk=0
code_width=78
nl_max=2
newlines=auto
indent_with_tabs=0
sp_arith=force
sp_assign=force
sp_assign_default=force
sp_before_assign=force
sp_after_assign=force
sp_enum_assign=force
sp_enum_before_assign=force
sp_enum_after_assign=force
sp_pp_stringify=add
sp_bool=force
sp_compare=force
sp_inside_paren=remove
sp_paren_paren=remove
sp_paren_brace=force
sp_before_ptr_star=ignore
sp_before_unnamed_ptr_star=force
sp_before_byref=force
sp_before_unnamed_byref=force
sp_after_byref=remove
sp_after_type=force
sp_before_sparen=force
sp_inside_sparen=remove
sp_inside_sparen_close=remove
sp_after_sparen=force
sp_sparen_brace=force
sp_special_semi=force
sp_before_semi=remove
sp_after_semi=force
sp_after_semi_for=force
sp_after_semi_for_empty=remove
sp_before_square=remove
sp_inside_square=remove
sp_after_comma=force
sp_before_comma=remove
sp_paren_comma=force
sp_before_ellipsis=force
sp_after_class_colon=force
sp_before_class_colon=force
sp_before_case_colon=remove
sp_after_cast=remove
sp_inside_paren_cast=remove
sp_sizeof_paren=remove
sp_inside_braces_enum=force
sp_inside_braces_struct=force
sp_inside_braces=force
sp_inside_braces_empty=remove
sp_func_proto_paren=remove
sp_func_def_paren=remove
sp_inside_fparens=remove
sp_inside_fparen=remove
sp_square_fparen=remove
sp_fparen_brace=force
sp_func_call_paren=remove
sp_func_call_paren_empty=remove
sp_return_paren=force
sp_attribute_paren=remove
sp_defined_paren=remove
sp_macro=force
sp_macro_func=force
sp_else_brace=force
sp_brace_else=force
sp_brace_typedef=force
sp_not=remove
sp_inv=remove
nl_start_of_file=remove
nl_end_of_file=force
nl_assign_square=remove
nl_after_square_assign=remove
nl_fcall_brace=remove
nl_enum_brace=remove
nl_struct_brace=remove
nl_union_brace=remove
nl_if_brace=remove
nl_brace_else=force
nl_elseif_brace=remove
nl_else_brace=remove
nl_else_if=remove
nl_for_brace=remove
nl_do_brace=remove
nl_brace_while=remove
nl_switch_brace=remove
nl_case_colon_brace=force
nl_func_type_name=force
nl_func_type_name_class=force
nl_func_proto_type_name=force
nl_func_paren=remove
nl_func_def_paren=remove
nl_func_decl_start=remove
nl_func_def_start=remove
nl_func_decl_args=remove
nl_func_decl_end=remove
nl_func_def_end=remove
nl_func_decl_end_single=remove
nl_func_def_end_single=remove
nl_func_decl_empty=remove
nl_func_def_empty=remove
nl_fdef_brace=force
nl_return_expr=remove
nl_before_if=ignore
nl_after_if=ignore
nl_before_for=ignore
nl_after_for=ignore
nl_before_while=ignore
nl_after_while=ignore
nl_before_switch=ignore
nl_after_switch=ignore
nl_before_do=ignore
nl_after_do=ignore
pp_space=remove
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
commit 3505e1faadddeeec85a0d3f823c877ea33f86e00
Author: Jeremy Huddleston <jeremyhu@apple.com>
Date: Fri Feb 17 13:15:12 2012 -0800
XQuartz: Detect FatalErrors on startup to prevent tight crash loops
If a FatalError occurs before the server finishes launching, it will
not have drained the launchd-owned DISPLAY socket, so launchd will
just relaunch it. This can cause the server to crash in a tight loop
which will spam the user with CrashReporter windows that claim focus on
appearance.
This allows users stuck in this loop to "deal" with the problem without
popping up a crash report every 10 seconds.
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
commit a818b305989bbcde4e585112a7ee70cbc0b14a92
Author: Jeremy Huddleston <jeremyhu@apple.com>
Date: Fri Feb 17 12:35:02 2012 -0800
os: Pass the FatalError message to OsVendorFatalError
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
Reviewed-by: Jon TURNEY <jon.turney@dronecode.org.uk>
commit 0bb8a2566debd6cd11164df9ddca534150ec440a
Author: Jeremy Huddleston <jeremyhu@apple.com>
Date: Tue Mar 13 00:15:55 2012 -0700
XQuartz: Add a defaults option to disable the RENDER extension
RENDER has some ugly issues on XQuartz, so add an option to disable RENDER.
Enables workaround for: https://bugs.freedesktop.org/show_bug.cgi?id=26124
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
commit 5ff46d651ac0cd396be2053b79675997ed7af765
Author: Jeremy Huddleston <jeremyhu@apple.com>
Date: Sat Mar 17 00:04:27 2012 -0700
XQuartz: Use doubles for input valuators
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
commit cd84c0949a9f397d8b803d3b87c9d02b260d4795
Author: Jeremy Huddleston <jeremyhu@apple.com>
Date: Sat Mar 17 00:08:19 2012 -0700
XQuartz: Xi: darwinPointer is now Relative
There is really no real reason why this should be necessary, but wine
developers are stuborn, so doing this to try to work around this wine
issue:
http://bugs.winehq.org/show_bug.cgi?id=29732
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
commit 87939bf8311c0e7d168741fe57bc8fac414811d8
Author: Jeremy Huddleston <jeremyhu@apple.com>
Date: Tue Mar 13 00:25:53 2012 -0700
XQuartz: Move our logs into an X11 subdirectory
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
commit df327f98f6b8e02fadcfd313a85f906722acc572
Author: Jeremy Huddleston <jeremyhu@apple.com>
Date: Mon Mar 5 00:05:48 2012 -0800
test: Fix 'make dist' for configurations that build the Xorg DDX
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
commit 0e8ee1cf4f3377a2916c43527ae0dc6cb07a67ec
Author: Dave Airlie <airlied@redhat.com>
Date: Fri Mar 23 14:54:05 2012 +0000
modesetting: fix build against older Xext
commit a7eac500e652f30deffd9dc5e623fab701077738
Merge: bf876c87a9 d645edd11e
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu Mar 22 13:13:07 2012 +1000
Merge branch 'per-device-sync-counters' into for-keith
commit d645edd11e7482f98c8b7e0d6c8693285c484907
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Mon Mar 12 16:36:31 2012 +1000
Xext: Add per-device SyncCounters
Previously, we only had one idle alarm that was triggered for all devices,
whenever the user used any device, came back from suspend, etc.
Add system SyncCounters for each device (named "DEVICEIDLETIME x", with x
being the device id) that trigger on that device only. This allows for
enabling/disabling devices based on interaction with other devices.
Popular use-case: disable the touchpad when the keyboard just above the
touchpad stops being idle.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com>
Reviewed-by: Jamey Sharp <jamey@minilop.net>
Reviewed-by: James Jones <jajones@nvidia.com>
commit 6aef209ebc2e54f5465da505a780f7b4cc273ee0
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Mon Mar 12 13:51:02 2012 +1000
Change lastDeviceIdleTime to be per-device
Preparation work for per-device idle counters.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com>
Reviewed-by: Jamey Sharp <jamey@minilop.net>
Reviewed-by: James Jones <jajones@nvidia.com>
commit 20cf0ef825e3f14b0688b691691e0aeba0a4860a
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Tue Mar 13 10:21:23 2012 +1000
Xext: strdup() the SystemSyncCounter name
Required for future dynamic names.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com>
Reviewed-by: Jamey Sharp <jamey@minilop.net>
Reviewed-by: James Jones <jajones@nvidia.com>
commit f1b28aea4156f0381ea733ad2afbdd1f34f75599
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Tue Mar 13 09:31:09 2012 +1000
Xext: store the bracket values for idle counters in the private
And drop the three global variables, we have a reference to the counter
everywhere now.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com>
Reviewed-by: Jamey Sharp <jamey@minilop.net>
Reviewed-by: James Jones <jajones@nvidia.com>
commit d9553b2bbe06fba0b209218ffed9465edd79b4d2
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Tue Mar 13 09:29:39 2012 +1000
Xext: pass the counter into block/wakeup handlers
No functional changes, currently unused. Preparation work, we don't need a
global variable if we can pass the counters around anyway.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com>
Reviewed-by: Jamey Sharp <jamey@minilop.net>
Reviewed-by: James Jones <jajones@nvidia.com>
commit 90e6dc6de1ac339212989fd8e54131b196ebb369
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Tue Mar 13 09:28:15 2012 +1000
Xext: add a private field to SyncSystemCounters
Will be used to store counter-specific data.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com>
Reviewed-by: Jamey Sharp <jamey@minilop.net>
Reviewed-by: James Jones <jajones@nvidia.com>
commit 3ddae647c307005309daa2d5dfe4bc6acb8170ab
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Mon Mar 12 15:31:39 2012 +1000
Xext: localise pIdleTimeValueLess/Greater
Cleanup for future features, no functional changes.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com>
Reviewed-by: Jamey Sharp <jamey@minilop.net>
Reviewed-by: James Jones <jajones@nvidia.com>
commit 43eb2f2758dfc6ca5a49afce97cc5baea8caf9f5
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Mon Mar 12 15:27:56 2012 +1000
Xext: localise use of IdleTimeCounter
Instead of referring to the global IdleTimeCounter everywhere, only do it
once and use a local variable for the rest.
Cleanup for future features, no functional changes.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com>
Reviewed-by: Jamey Sharp <jamey@minilop.net>
Reviewed-by: James Jones <jajones@nvidia.com>
commit 1f12f059ef994e0b9b68fbd1f1556d0285c96b8b
Author: Jamey Sharp <jamey@minilop.net>
Date: Wed Mar 14 17:22:18 2012 -0700
sync: Use a linked list instead of an array for SysCounterList.
Signed-off-by: Jamey Sharp <jamey@minilop.net>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit bf876c87a9099fdfa63ed599f8ed9a954dd023d9
Merge: 908ab3d580 c0b0a9bce9
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu Mar 22 11:34:43 2012 +1000
Merge branch 'dtrace-input-abi' into for-keith
commit c0b0a9bce9237b0abe150c1a7b54939affecc751
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Mon Mar 5 14:12:52 2012 +1000
dix: add dtrace probes to input API
For driver debugging, it is helpful to know whether the driver has actually
submitted an event to the server. dtrace hooks can help here.
Note that GetPointerEvents and friends may also be triggered by the server
for other emulated devices, some care must be taken when analysing the
results.
Additional difficulty: proximity events have a run-time assigned type, so
this may make automatic detection a tad harder. If in doubt, go for any
event > 64 since the only two that can have that value are ProximityIn and
ProximityOut.
An example systemtap script is below:
# Compile+run with
# stap -g xorg.stp /usr/bin/Xorg
#
function print_valuators:string(nvaluators:long, mask_in:long, valuators_in:long) %{
int i;
unsigned char *mask = (unsigned char*)THIS->mask_in;
double *valuators = (double*)THIS->valuators_in;
char str[128] = {0};
char *s = str;
#define BitIsSet(ptr, bit) (((unsigned char*)(ptr))[(bit)>>3] & (1 << ((bit) & 7)))
s += sprintf(s, "nval: %d ::", (int)THIS->nvaluators);
for (i = 0; i < THIS->nvaluators; i++)
{
s += sprintf(s, " %d: ", i);
if (BitIsSet(mask, i))
s += sprintf(s, "%d", (int)valuators[i]);
}
sprintf(THIS->__retvalue, "%s", str);
%}
probe process(@1).mark("input__event")
{
deviceid = $arg1
type = $arg2
detail = $arg3
flags = $arg4
nvaluators = $arg5
str = print_valuators(nvaluators, $arg6, $arg7)
printf("Event: device %d type %d detail %d flags %#x %s\n",
deviceid, type, detail, flags, str);
}
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Acked-by: Jeremy Huddleston <jeremyhu@apple.com>
commit 61cb98da1c6199964825de158d9eee7682d9c983
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Mon Mar 12 16:03:50 2012 +1000
Xext: SyncCreateSystemCounter returns a SyncCounter*
type safety++
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com>
Reviewed-by: Bryce Harrington <bryce@canonical.com>
commit 908ab3d580188533168c8cdfd2cab9dc689b4218
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Wed Mar 21 14:05:29 2012 +1000
dix: set raw event values before adding up relative values (#46976)
Regression introduced in 4e52cc0ef48145134cd58d357fb7289e6f8bb709
Raw event values are values as-is from the driver, modified only be
transformation or acceleration. 4e52cc caused the mask to be updated from
relative to absolute coordinates which then got written into the raw events.
Move the raw event update into the respective branches for absolute/relative
events.
X.Org Bug 46976 <http://bugs.freedesktop.org/show_bug.cgi?id=46976>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Chase Douglas <chase.douglas@canonical.com>
Reviewed-by: Daniel Stone <daniel@fooishbar.org>
Tested-by: Sven Arvidsson <sa@whiz.se>
Reviewed-by: Simon Thum <simon.thum@gmx.de>
commit 45fe3085f8f45e529383025414fdd263d86dfd2b
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Mon Mar 12 14:08:39 2012 +1000
Xext: remove needless /* parameter */ comments in declaration
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com>
Reviewed-by: Bryce Harrington <bryce@canonical.com>
commit 9c3bd3ae652af386b6821b197d24528f20ba867d
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Wed Mar 21 14:03:27 2012 +1000
dix: fix compiler warning "unused variable 'scr'"
getevents.c: In function 'updateSlaveDeviceCoords':
getevents.c:326:15: warning: unused variable 'scr' [-Wunused-variable]
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit e21ffff4761d2b75815391c6947adcba425ab11e
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Mon Mar 12 14:07:44 2012 +1000
Xext: typedef QueryValue and BracketValue prototypes
No functional changes, just for readability
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com>
Reviewed-by: Bryce Harrington <bryce@canonical.com>
commit 14e3ea730eed344e6ed69c873f918d6f076d13dc
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Wed Mar 14 13:48:56 2012 +1000
include: add an X_DEBUG message type
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Jamey Sharp <jamey@minilop.net>
commit 5910f2df58beaae2187438fef0b62c29a563e853
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Mon Mar 12 16:26:29 2012 +1000
Xext: drop InitServertime() declaration.
Not implemented anywhere.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com>
Reviewed-by: Bryce Harrington <bryce@canonical.com>
commit 31df08a449cf9b6e1740e1c02257997490630d93
Author: Chase Douglas <chase.douglas@canonical.com>
Date: Wed Mar 7 16:06:27 2012 -0800
Use a new sprite trace for indirect touches when all touches have physically ended
All touches of an indirect device, such as a trackpad, are sent to the
same window set. When there are no active touches, a new window set is
created; otherwise, the window set of an existing touch is copied.
The current code checks for any logically active touches. This includes
touches that have physically ended but are still logically active due to
unhandled touch grabs. Instead, we want a new window set whenever there
are no physically active touches.
This change skips over logically active but pending end touches, which
are touches that have physically ended.
Signed-off-by: Chase Douglas <chase.douglas@canonical.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 58427e08a4a36ce9e213e4b4fe5249d5db2c764d
Author: Chase Douglas <chase.douglas@canonical.com>
Date: Wed Mar 7 16:06:26 2012 -0800
Xi: Fix TouchEnd to TouchUpdate change for one accepted grab
If there is only one listener of a touch, the listener is a grab, and is
accepted before the touch has ended, the current code will not end the
touch record when the touch does end.
This change adds a listener state for when a touch is accepted but has
not yet ended. We now keep the touch record alive in this state, but end
it when the touch ends.
Signed-off-by: Chase Douglas <chase.douglas@canonical.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit e884ff8ad4df2b3272a3d8ece772906207af5142
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Wed Mar 7 19:08:33 2012 +1000
xfree86: remove out-of-date comment
No idea what this was referring to but it goes past git history.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 5497ce3da442d27c2dc7796bfef6ccd670bbadc4
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Mon Feb 20 12:09:33 2012 +1000
dix: IsFloating() on master devices is always false
There are a few subtle bugs during startup where IsFloating() returns true
if the device is a master device that is not yet paired with its keyboard
device.
Force IsFloating() to always return FALSE for master devices, that was the
intent after all and any code that relies on the other behaviour should be
fixed instead.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com>
Tested-by: Jon TURNEY <jon.turney@dronecode.org.uk>
commit 2c23ef83b0e03e163aeeb06133538606886f4e9c
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Mon Feb 27 08:01:07 2012 +1000
Xi: prohibit multiple XIQueryVersion requests with different versions
Return BadValue if major or minor differs on the second call.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Chase Douglas <chase.douglas@canonical.com>
commit eb84c154ed38194c32651727b6dfe2d1bde4c599
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Mon Feb 27 10:09:44 2012 +1000
dix: when rescaling from master, rescale from desktop dimensions (#46657)
master->last.valuators[] is in desktop dimensions, so use those as
rescale axis ranges, not the screen. Otherwise, a rescale on any screen
not the top-left will cause out-of-bounds coordinates which will always
map to the bottom-right screen, causing the device to be stuck on that
screen.
X.Org Bug 46657 <http://bugs.freedesktop.org/show_bug.cgi?id=46657>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Chase Douglas <chase.douglas@canonical.com>
commit 6b6afd3d013e3f4910fae3520d1d786df2b0e47a
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu Feb 16 15:11:40 2012 +1000
Xext: return BadAccess if PickPointer fails (#45796)
PickPointer or PickKeyboard return NULL, all MDs are currently disabled and
we cannot emulate a core event. This wasn't anticipated by the protocol, so
we don't really have an error code we may use here - BadAccess is simply the
least bad of the possible ones.
And returning BadAccess beats crashing the server.
X.Org Bug 45796 <http://bugs.freedesktop.org/show_bug.cgi?id=45796>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 9e017cf0cf1f0c9d0d9c2cfeb82ea5dc0eb5905e
Author: Andreas Wettstein <wettstein509@solnet.ch>
Date: Sat Feb 25 20:48:17 2012 +0100
XKB: Redirect actions defunct with Gtk3 (XInput?)
When redirect actions are used with Gtk3, Gtk3 complained about
events not holding a GdkDevice. This was caused by device IDs
not being set for redirect actions.
More seriously, Gtk3 did not receive state changes redirect
actions might specify. This was because event_set_state in
dix/inpututils.c accesses the prev_state field, but the changes
for the redirect action were only put into the state field.
Signed-off-by: Andreas Wettstein <wettstein509@solnet.ch>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit ab3a815a75ab5695753fa37a98b0ea5293d4cb91
Author: Daniel Stone <daniel@fooishbar.org>
Date: Thu Mar 15 15:18:29 2012 +0000
Indentation: Change '& stuff' to '&stuff'
If the typedef wasn't perfect, indent would get confused and change:
foo = (SomePointlessTypedef *) &stuff[1];
to:
foo = (SomePointlessTypedef *) & stuff[1];
Fix this up with a really naïve sed script, plus some hand-editing to
change some false positives in XKB back.
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
commit 58b1f739d73b03ff7952ca986ed8746a7307fffe
Author: Daniel Stone <daniel@fooishbar.org>
Date: Thu Mar 15 15:13:51 2012 +0000
Xinerama: Fix up obnoxiously-indented code
Comments inside of conditionals confuse indent to death. Which is fair
enough really.
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
commit 9838b7032ea9792bec21af424c53c07078636d21
Author: Keith Packard <keithp@keithp.com>
Date: Wed Mar 21 12:55:09 2012 -0700
Introduce a consistent coding style
This is strictly the application of the script 'x-indent-all.sh'
from util/modular. Compared to the patch that Daniel posted in
January, I've added a few indent flags:
-bap
-psl
-T PrivatePtr
-T pmWait
-T _XFUNCPROTOBEGIN
-T _XFUNCPROTOEND
-T _X_EXPORT
The typedefs were needed to make the output of sdksyms.sh match the
previous output, otherwise, the code is formatted badly enough that
sdksyms.sh generates incorrect output.
The generated code was compared with the previous version and found to
be essentially identical -- "assert" line numbers and BUILD_TIME were
the only differences found.
The comparison was done with this script:
dir1=$1
dir2=$2
for dir in $dir1 $dir2; do
(cd $dir && find . -name '*.o' | while read file; do
dir=`dirname $file`
base=`basename $file .o`
dump=$dir/$base.dump
objdump -d $file > $dump
done)
done
find $dir1 -name '*.dump' | while read dump; do
otherdump=`echo $dump | sed "s;$dir1;$dir2;"`
diff -u $dump $otherdump
done
Signed-off-by: Keith Packard <keithp@keithp.com>
Acked-by: Daniel Stone <daniel@fooishbar.org>
Acked-by: Alan Coopersmith <alan.coopersmith@oracle.com>
commit 75199129c603fc8567185ac31866c9518193cb78
Author: Keith Packard <keithp@keithp.com>
Date: Wed Mar 21 12:33:19 2012 -0700
Handle blank betweeen type and name in sdksyms.sh
indent sometimes adds a blank line between the type and the name in a
function declaration that includes _X_EXPORT, so handle that before
the files are re-indented.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit a615b90cab7569fae9d123e4da1d3373c871d84b
Author: Keith Packard <keithp@keithp.com>
Date: Wed Mar 14 11:32:36 2012 -0700
Bump version number to 1.12.99.0
Now that 1.12 has branched, reset the version on master to a
development number.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 53204d5c8bd83c957fbdb7d3dc2891118ed7658b
Author: Sascha Hauer <s.hauer@pengutronix.de>
Date: Sat Mar 3 14:09:25 2012 +0100
make busID non mandatory
Currently the driver only probes a device when it has a
busID. The busID is optional so don't depend on it.
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Signed-off-by: Dave Airlie <airlied@redhat.com>
commit bb7e39c1f2112f5fb7e87baddb114ab164fbc749
Author: Sascha Hauer <s.hauer@pengutronix.de>
Date: Sat Mar 3 14:09:27 2012 +0100
do not bail out on non pci devices
To make the driver work on nin PCI devices we shouldn't bail
out in this case.
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Signed-off-by: Dave Airlie <airlied@redhat.com>
commit 2b6848fcb3f85f9ce18a6de1dc6c3ac047101aa8
Author: Sascha Hauer <s.hauer@pengutronix.de>
Date: Sat Mar 3 14:09:26 2012 +0100
Fix non PCI device probing
When no devicename is found in the option then the driver probes
by PciInfo no matter if it's valid or not. Instead of doing this
use PciInfo only when it's valid and fall back to the devicename
otherwise. With devicename probing use open_hw() to fall back
on the KMSDEVICE environment variable or to the default device.
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Signed-off-by: Dave Airlie <airlied@redhat.com>
commit 456a001e3f7a24f443cf0bad8400d5d600e2ad46
Author: Sascha Hauer <s.hauer@pengutronix.de>
Date: Sat Mar 3 14:09:24 2012 +0100
introduce open_hw() function
probe_hw opens the hardware in the order we want it:
first try devname, if this is NULL then try the KMSDEVICE
environment variable and as a last fallback use "/dev/dri/card0".
Instead of implementing the same code again when really opening
the device move the code to a open_hw() function and let probe_hw
use it.
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Signed-off-by: Dave Airlie <airlied@redhat.com>
commit aa6ceaaa843525b2243569de162ed0b17faa7510
Author: Sascha Hauer <s.hauer@pengutronix.de>
Date: Sat Mar 3 14:09:23 2012 +0100
fix if() brackets in Probe function
in Probe() the indention shows what's meant but there are no
brackets. Add them.
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Signed-off-by: Dave Airlie <airlied@redhat.com>
commit b1be72c5ca6cb98ba64637990b142be0f1710a19
Author: Keith Packard <keithp@keithp.com>
Date: Sun Mar 4 20:26:18 2012 -0800
Version bumped to 1.12
Signed-off-by: Keith Packard <keithp@keithp.com>
commit e08ed0b757b9b48344a301f612fabb3e39ffec78
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Sun Feb 26 17:51:50 2012 -0500
test: add new test cases to .gitignore
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 2416ee4a015068359807a10f433e8c54192c78a9
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Wed Feb 22 15:32:56 2012 +1000
dix: avoid NULL-pointer dereference on button-only devices (#38313)
And for such devices simply take the last.valuators[] which must be valid at
all times anyway. UpdateSlaveDeviceCoords takes care of that.
X.Org Bug 38313 <http://bugs.freedesktop.org/show_bug.cgi?id=38313>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Chase Douglas <chase.douglas@canonical.com>
commit 38000e7d1f958f5944e641de3e716944a5876d41
Author: Jeremy Huddleston <jeremyhu@apple.com>
Date: Tue Jan 31 11:06:21 2012 -0800
Revert "dix: don't XWarpPointer through the last slave anymore (#38313)"
This reverts commit 2bfb802839688ecf328119c4c6979390fc60348d.
This commit caused a regression.
See: http://xquartz.macosforge.org/trac/ticket/517#comment:10
Acked-by: Peter Hutterer <peter.hutterer@who-t.net>
commit cb6a32da27f09261c4d561c19d1877c750d98cc3
Author: Jeremy Huddleston <jeremyhu@apple.com>
Date: Fri Feb 17 13:44:12 2012 -0800
XQuartz: Short-circuit activateX:
This also avoids a deadlock when calling activateX: before the server
thread has initialized
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
commit 1562c4a1ca748d2c4a8c69d57ba09ff7ca9cc453
Author: Jeremy Huddleston <jeremyhu@apple.com>
Date: Fri Feb 17 13:54:57 2012 -0800
XQuartz: Actually install the new locales
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
commit 1349a2b7ab04553c8fddb60534400dea5cbd3cca
Author: Dave Airlie <airlied@redhat.com>
Date: Wed Feb 22 10:07:06 2012 +0000
xf86-video-modesetting 0.2.0
commit e5648616d222966a95edd6c35807dcf5b91a0f96
Author: Dave Airlie <airlied@redhat.com>
Date: Wed Feb 22 09:59:12 2012 +0000
modesetting: fix warnings, remove dead code.
Signed-off-by: Dave Airlie <airlied@redhat.com>
commit f7724167746d15c0ca32a7f5f95fb594addcddd1
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Sun Feb 19 16:13:34 2012 -0500
config: layout and comment the top portion of configure.ac
Reorder statements to be consistent with other modules so things
are easier to find.
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
Signed-off-by: Dave Airlie <airlied@redhat.com>
commit a0bb835dc7db1ddd0472058a2a05a600ddea3930
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Sun Feb 19 08:36:19 2012 -0500
config: replace deprecated AC_HELP_STRING with AS_HELP_STRING
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
Signed-off-by: Dave Airlie <airlied@redhat.com>
commit d56293cae78323b8976859c4461f8809a76a0b03
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Sun Feb 19 08:36:17 2012 -0500
make: add all warnings according to the platform
The current code only adds -Wall and only for gcc.
Automake reserves the use of CPPFLAGS for the user to override
on the command line.
This also breaks the option --enable-strict-compilation
The variable CWARNFLAGS contains the complete set of warnings
and is platform sensitive.
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
Signed-off-by: Dave Airlie <airlied@redhat.com>
commit fa201fe8299099f7192a4399c9df245efcee3f8a
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Sun Feb 19 08:36:16 2012 -0500
make: remove empty variable assignment
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
Signed-off-by: Dave Airlie <airlied@redhat.com>
commit e159fbd8805005bb7a33bf2076fd2cef00e987c6
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Sun Feb 19 08:36:15 2012 -0500
Remove unneeded AM_PROG_CC_C_CO
There are no objects in subdirs or compiled multiple times
with different flags.
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
Signed-off-by: Dave Airlie <airlied@redhat.com>
commit 70558492376e66b73063e51b128b5bbad14b84f4
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Sun Feb 19 08:34:28 2012 -0500
Remove redundant AC_PROG_CC
Already covered by XORG_DEFAULT_OPTIONS
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
Signed-off-by: Dave Airlie <airlied@redhat.com>
commit d4bb99ce754073de090221d98000f609a3891380
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Sun Feb 19 08:34:27 2012 -0500
Replace obsolete AM_CONFIG_HEADER with AC_CONFIG_HEADERS
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
Signed-off-by: Dave Airlie <airlied@redhat.com>
commit 5c2d152cad66c3f8ed6a4e82c3e6a45269bbb66d
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Sun Feb 19 08:34:26 2012 -0500
Add missing targets for ChangeLog and INSTALL
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
Signed-off-by: Dave Airlie <airlied@redhat.com>
commit 8673f545cdb465b6e74f1d2fcabe29bc7fa0243d
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Sun Feb 19 08:34:25 2012 -0500
Remove redundant EXTRA_DIST for the README file.
Autotools know about it, it is always distributed.
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
Signed-off-by: Dave Airlie <airlied@redhat.com>
commit 71594746c7da32e1c7986341a0da30f241a7a2be
Merge: d53235af85 eaba06a27c
Author: Keith Packard <keithp@keithp.com>
Date: Wed Feb 22 18:07:20 2012 +1300
Merge remote-tracking branch 'whot/for-keith'
commit 88b637e59a37af8ec6c4c0783504b8f1a49e5595
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Sun Feb 19 08:34:24 2012 -0500
make: remove redundant AUTOMAKE_OPTIONS
Already covered by AM_INIT_AUTOMAKE([foreign dist-bzip2])
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
Signed-off-by: Dave Airlie <airlied@redhat.com>
commit a7ea959094e9a8d862637a0ea515f687aaf89d29
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Sun Feb 19 08:34:23 2012 -0500
Fix typo in .gitignore
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
Signed-off-by: Dave Airlie <airlied@redhat.com>
commit 861e2b444ffb24921e07fdc25ab2679c9b6d2f4d
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Sun Feb 19 08:34:22 2012 -0500
man: missing AM_V_GEN and hard-coded sed command name
Let's use the common xorg makefile for all drivers.
This ensures no new problems are introduced.
Improvements are welcome and to be applied to all drivers.
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
Signed-off-by: Dave Airlie <airlied@redhat.com>
commit 453bbe5b442a9c21d7c22437545e487e2993ceb7
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Sun Feb 19 08:34:21 2012 -0500
Add contact information to the README file
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
Signed-off-by: Dave Airlie <airlied@redhat.com>
commit dd1d7e3519ea2f148be83ef7ab0b228da95ff9c3
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Sun Feb 19 08:34:20 2012 -0500
Fill the COPYING file with license text
This reflects the copyright license text in the source code
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
Signed-off-by: Dave Airlie <airlied@redhat.com>
commit b0e12e250d4b3438fb3306155a7bbff3e2d7f9b7
Author: Dave Airlie <airlied@redhat.com>
Date: Mon Feb 20 11:08:40 2012 +0000
modesetting: disable dirty updates for ENOSYS
the kernel can also return ENOSYS for this to say its not used.
Signed-off-by: Dave Airlie <airlied@redhat.com>
commit c5529d68c5b01cf0f36d8f2ce3694a7a0f3333da
Author: Dave Airlie <airlied@redhat.com>
Date: Mon Feb 20 11:05:59 2012 +0000
modesetting: fix shadow resizing.
if we hotplugged and output, the shadow got disabled by accident.
Signed-off-by: Dave Airlie <airlied@redhat.com>
commit f3b9e52b29e8b8c4b12bc2ce290ab44e88750ad9
Author: Dave Airlie <airlied@redhat.com>
Date: Mon Feb 20 11:00:56 2012 +0000
modesetting: move shadow stuff to other structure
we need this for resize to work properly.
Signed-off-by: Dave Airlie <airlied@redhat.com>
commit eb44a004b7230321ce6837ef44610153b1d2017b
Author: Dave Airlie <airlied@redhat.com>
Date: Mon Feb 20 10:54:36 2012 +0000
modesetting: fix stride if kernel modifies it.
If the kernel aligns things use its values instead.
fixes output on nouveau here.
Signed-off-by: Dave Airlie <airlied@redhat.com>
commit 2150cbda8c75d348f39926bbc23d3e4ca9b42c88
Author: Dave Airlie <airlied@redhat.com>
Date: Mon Feb 20 10:54:21 2012 +0000
shadowfb: dump shadowfb state at startup
commit 86080a5f7a589e55a485c42bab47c6c8ff6428c1
Author: Dave Airlie <airlied@redhat.com>
Date: Thu Feb 16 19:41:40 2012 +0000
use a cap to decide if shadow is preferred or not.
commit fc5f39acd49d023a82ab05fffde1b423b697753c
Author: Dave Airlie <airlied@redhat.com>
Date: Thu Feb 16 19:41:30 2012 +0000
cleanup dumb cap fetch
commit d94b3eaba9a33d0d78ed2d9acbc33394f40fdc2e
Author: Dave Airlie <airlied@redhat.com>
Date: Mon Nov 14 11:22:44 2011 +0000
modesetting: add cursor fallback if kernel rejects cursor.
If the kernel rejects a cursor, cause a fallback, this isn't 100% as
we can lose the initial cursor, but it works fine once wm starts.
Signed-off-by: Dave Airlie <airlied@redhat.com>
commit 594b3c4d6f6f748e08baffc4bc1c3ffad9b0d9cf
Author: Dave Airlie <airlied@redhat.com>
Date: Thu Feb 16 19:31:33 2012 +0000
fix some whitespace
commit 2e297978c928c571cf0a80e8d38423089014f07e
Author: Dave Airlie <airlied@redhat.com>
Date: Wed Oct 5 15:12:43 2011 +0100
fixup device open
Signed-off-by: Dave Airlie <airlied@redhat.com>
commit eaba06a27c5520a02f08431ac1e4b0e0bdc22cd8
Author: Chase Douglas <chase.douglas@canonical.com>
Date: Mon Feb 13 16:00:48 2012 -0800
Keep virtual core pointer touch class around if new slave doesn't have one
The VCP may have active touch grabs. The touch records must be kept so
these touch grabs may be accepted/rejected in the future. This means the
touch class list will not represent the touch class of the attached
slave device if it does not have a touch class, but we already were
breaking that assumption by keeping a separate touches array for the
VCP.
Signed-off-by: Chase Douglas <chase.douglas@canonical.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 8573b3519af138a3a12a2e77098718165f9fd8ff
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Mon Feb 13 16:00:47 2012 -0800
Don't clobber virtual core pointer touches array length
The VCP has its own touches array, don't overwrite it when the class is
copied from the SD to the master.
Reported-by: Chase Douglas <chase.douglas@canonical.com>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Chase Douglas <chase.douglas@canonical.com>
commit 03d32fe7a718d9016053cdb5d57f51a74ef99b59
Author: Chase Douglas <chase.douglas@ubuntu.com>
Date: Mon Feb 13 12:09:32 2012 -0800
Don't dereference a touch after it has been ended when punting to next owner
In this case, we have ended the touch because the last owner has
rejected it. We need to return from the function right now so we don't
attempt to dereference another touch client for early acceptance
processing.
Signed-off-by: Chase Douglas <chase.douglas@ubuntu.com>
Reviewed-by: Chase Douglas <chase.douglas@canonical.com>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 1ecb7aaf2adedad1996cd26176ef5802113e3ad9
Author: Chase Douglas <chase.douglas@ubuntu.com>
Date: Sat Feb 11 07:58:38 2012 -0800
Focus event button state must show the logical buttons, not physical buttons
Similar to the fix in fcda98c48610fd507ca0b89c6006a5497d9dc1c9. This
ensures we show the correct logical state of the buttons in device focus
events too.
Signed-off-by: Chase Douglas <chase.douglas@canonical.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 6f28388187cffae9e5bc9bfc9425acff4f478b59
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Sat Feb 11 01:29:26 2012 +1000
dix: reset last.scroll when resetting the valuator (#45611)
last.scroll remained on the last-submitted scrolling value but last.valuator
was changed whenever the slave device changed. The first scrolling delta
after a switch was then calculated as (last.scroll - new abs value), causing
erroneous scrolling events.
Test case:
- synaptics with a scrolling method enabled, other device with 3+ axes (e.g.
wacom)
- scroll on touchpad
- use other device
- scroll on touchpad
The second scroll caused erroneous button press/release events.
X.Org Bug 45611 <http://bugs.freedesktop.org/show_bug.cgi?id=45611>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Chase Douglas <chase.douglas@canonical.com>
commit d53235af85d50774c68347720ce132daf9a5bc49
Author: Jeremy Huddleston <jeremyhu@apple.com>
Date: Mon Feb 13 23:06:07 2012 -0800
XQuartz: Build fix for possible conflict of BOOL type
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
commit 62edd970f6f36058fcb31de4555eb7c1329cce74
Author: Keith Packard <keithp@keithp.com>
Date: Sat Feb 11 16:13:44 2012 +1300
Bump to version 1.11.99.903 (1.12 RC3)
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 42b6756463ee0476340656707f1088dc6c2fd220
Merge: 7674d00b04 ca64912c02
Author: Keith Packard <keithp@keithp.com>
Date: Sat Feb 11 15:36:43 2012 +1300
Merge remote-tracking branch 'alanc/master'
commit 7674d00b04da5cf73cfa5c7ed1d3a9f42b59960e
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri Jan 27 12:41:09 2012 +1000
Xi: handle new XIAllowEvents request in inputproto 2.1.99.6
grab_window and touchid were removed from the struct for ABI compatibility
reasons, we need to pull in the new, XI 2.2-specific struct.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Keith Packard <keithp@keithp.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit ceb026c6a6f1eea8b34e745f06f1ebcd652c0ba1
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri Jan 27 12:41:09 2012 +1000
Xi: handle new XIAllowEvents request in inputproto 2.1.99.6
grab_window and touchid were removed from the struct for ABI compatibility
reasons, we need to pull in the new, XI 2.2-specific struct.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit b96275c4cdb164aa71f7aa9fbf88be18886d1936
Author: Benjamin Otte <otte@redhat.com>
Date: Tue Feb 7 18:01:25 2012 +1000
dix: fix an out-of-memory crash
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 6241b5e4fdbdb08d30cc8787d858ac27122d2d49
Author: Chase Douglas <chase.douglas@canonical.com>
Date: Fri Feb 3 16:19:11 2012 -0800
Implement touch early accept
This doesn't really implement early accept as it should. Ideally, the
server should send end events to all subsequent touch clients as soon as
an early accept comes in. However, this implementation is still protocol
compliant. We can always improve it later.
Signed-off-by: Chase Douglas <chase.douglas@canonical.com>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
commit b0c54856df71f9cabf9dad176fdade960ef8c5d9
Author: Chase Douglas <chase.douglas@canonical.com>
Date: Fri Feb 3 16:19:10 2012 -0800
Implement early touch reject
Signed-off-by: Chase Douglas <chase.douglas@canonical.com>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 656ab879f20892975510723ce8fe78faf64aadb4
Author: Chase Douglas <chase.douglas@canonical.com>
Date: Fri Feb 3 16:19:09 2012 -0800
Check for proper window ID when processing touch allow requests
Signed-off-by: Chase Douglas <chase.douglas@canonical.com>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 9a260e9af83feb5c53ffd3b2da2dc3adf06240a1
Author: Chase Douglas <chase.douglas@canonical.com>
Date: Fri Feb 3 16:19:08 2012 -0800
Move AllowTouch to dix/touch.c, and rename to TouchAcceptReject
Signed-off-by: Chase Douglas <chase.douglas@canonical.com>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 192b2c9a2ec04522655675ddfe71de5cf974cc7b
Author: Chase Douglas <chase.douglas@canonical.com>
Date: Fri Feb 3 16:19:07 2012 -0800
Export TouchEventRejected as TouchRejected
This function is mostly correct for early reject usage. With a small
change to pass the client resource explicitly and making the
TouchOwnership event optional, it is usable for all rejection scenarios.
This change exports it for use outside Xi/exevents.c and modifies the
name accordingly.
Signed-off-by: Chase Douglas <chase.douglas@canonical.com>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 19073425e5df1317f73f74ce0b95ab24e0e0da14
Author: Chase Douglas <chase.douglas@canonical.com>
Date: Fri Feb 3 16:19:06 2012 -0800
Factor out TouchEnd generation and delivery
The server often needs to generate and deliver TouchEnd events for
circumstances including touch grab acceptance and rejection. This change
refactors the code so it can be used more easily.
Signed-off-by: Chase Douglas <chase.douglas@canonical.com>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
commit ab60cadc2afb9d8882144e30fde11c3ef0f999cd
Author: Chase Douglas <chase.douglas@canonical.com>
Date: Fri Feb 3 16:19:05 2012 -0800
Store window pointer in touch listener record
Signed-off-by: Chase Douglas <chase.douglas@canonical.com>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
commit f92ba92adfce0e1975feb54ab0e1165b7c2a7bea
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Sat Feb 4 19:27:21 2012 +1000
Revert "dix: deduplicate callers of DeliverDeviceEvents in DeliverGrabbedEvents"
This call was supposed to have no functional changes but in some cases
DeliverDeviceEvents() was called with a uninitialised win variable.
Revert, safer than trying to sort this out otherwise.
This reverts commit 6eff14a789341d366b3013c5aa020e959c954651.
Reported-by: Mathieu Taillefumier <mathieu.taillefumier@free.fr>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Keith Packard <keithp@keithp.com>
commit ca64912c02bdff486fee420a49b11f54f8f5ba08
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Thu Jan 26 16:41:25 2012 -0800
Namespace list api to reduce conflicts with similar system headers
Rename functions/macros from list_* to xorg_list_*
Rename struct from struct list to struct xorg_list.
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Keith Packard <keithp@keithp.com>
In-sed-I-trust: Peter Hutterer <peter.hutterer@who-t.net>
commit 1541e242d1607d0db57b0cc12faca9b1c2850c67
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Fri Dec 23 15:17:28 2011 -0800
Stop including <sys/proc.h> from xf86_OSlib.h on Solaris
We don't need anything from that header (which defines /proc & kernel
structures for process information), and it causes some namespace conflicts.
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Keith Packard <keithp@keithp.com>
commit 85cecd981191f9c3dab0fb13310d91eff643d423
Author: Jeremy Huddleston <jeremyhu@apple.com>
Date: Sat Jan 28 16:06:28 2012 -0800
XQuartz: Release all buttons and keys when deactivating
http://xquartz.macosforge.org/trac/ticket/486
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 47b457541b33f00807fd495f5b0b24d5f143bf84
Author: Jeremy Huddleston <jeremyhu@apple.com>
Date: Sat Jan 28 23:11:44 2012 -0800
XQuartz: Toggle off fullscreen mode when XQuartz is hidden
http://xquartz.macosforge.org/trac/ticket/478
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
commit c2ba3f339f089c595386c4c579935c7984a2a545
Author: Jeremy Huddleston <jeremyhu@apple.com>
Date: Sun Jan 29 14:26:47 2012 -0800
XQuartz: Localization Updates
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
commit 052ca3f22eadd0aa60dd24ac7d5d76137273926f
Author: Keith Packard <keithp@keithp.com>
Date: Fri Jan 27 22:08:08 2012 -0800
Bump version to 1.11.99.902 (1.12 RC2)
Signed-off-by: Keith Packard <keithp@keithp.com>
commit bafedb7e9bcff31e2963eeb54669b2492214fae7
Author: Jeremy Huddleston <jeremyhu@apple.com>
Date: Wed Jan 18 11:52:04 2012 -0800
XQuartz: Bump bundle version to 2.7.2
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
commit 8e78bbb2d2dc5b18f127540b63b45ba293bbdd25
Author: Colin Harrison <colin.harrison@virgin.net>
Date: Thu Jan 26 13:28:24 2012 +0000
hw/xwin: Fix spelling of 'Canadian' in winkeybd.h
The Mounties always get their typo
Signed-off-by: Colin Harrison <colin.harrison@virgin.net>
Reviewed-by: Jon TURNEY <jon.turney@dronecode.org.uk>
commit 80c073352a276bad3722263629de3cd61df758ab
Author: Colin Harrison <colin.harrison@virgin.net>
Date: Wed Jan 4 17:16:36 2012 +0000
hw/xwin: Fix winEnqueueMotion() for change in miPointerSetPosition()
Commit 3b36fd1b49030ead44358945f62e5abe7f4609ce changed miPointerSetPosition()
to take co-ordinates as doubles, not ints, so this code as it stands is now wrong
(if it ever was correct in the first place :-))
It's unclear that we can safely promote x,y to doubles, apply miPointerSetPosition()
which potentially constrains the cursor, and then convert back to ints.
Fortunately, this whole dance seems to be unnecessary, and we can simply remove the
call to miPointerSetPosition() entirely, and just QueuePointerEvents() like any other
input driver.
Signed-off-by: Colin Harrison <colin.harrison@virgin.net>
Reviewed-by: Jon TURNEY <jon.turney@dronecode.org.uk>
commit ced9db65950e402d7ddc663225b888e8482b8c57
Author: Colin Harrison <colin.harrison@virgin.net>
Date: Wed Jan 25 01:37:16 2012 +0000
hw/xwin: Ignore WM_DISPLAYCHANGE messages with 0 bpp
Ignore WM_DISPLAYCHANGE messages which indicate bpp is changing to 0.
That has no defined meaning I can find, but some graphics card drivers
appear to generate it on suspend/resume or screensaver activate/deactivate.
Signed-off-by: Colin Harrison <colin.harrison@virgin.net>
Reviewed-by: Jon TURNEY <jon.turney@dronecode.org.uk>
commit bea6fb6c7af551778cfe1c0e8412ef4ccf560808
Author: Jon TURNEY <jon.turney@dronecode.org.uk>
Date: Sun Jan 22 19:31:51 2012 +0000
hw/xwin: Avoid WIN_WINDOW_PROP races during Windows window destruction
The WIN_WINDOW_PROP is removed during WM_DESTROY handling, so it is not neccessary to
remove it in winDestroyWindowsWindow(), and doing so opens a race condition, as we may
attempt to access that property in the wndproc before the WM_DESTROY has completed.
A specific example of that race is if a WM_KILLFOCUS occurs in the window between property
removal and WM_DESTROY processing, where we will attempt to apply DeleteWindowFromAnyEvents()
on an invalid (null) WindowPtr.
Also guard against null WindowPtr in the WM_KILLFOCUS handler
See http://cygwin.com/ml/cygwin-xfree/2012-01/msg00009.html
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
commit 9a709d5028094fcbeb7a49f47cb85e22cd772f36
Author: Jon TURNEY <jon.turney@dronecode.org.uk>
Date: Thu Sep 29 15:05:27 2011 +0100
hw/xwin: Handle more motif window decoration hinting
Handle the MWM_DECOR_MINIMIZE, MWM_DECOR_MAXIMIZE and MWM_DECOR_MENU
decoration hints in a _MOTIF_WM_HINTS window property
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
commit b8b0b841a0e7cfcecaf0b6a5aa67e1b4499374d9
Author: Oliver Schmidt <oschmidt-mailinglists@gmx.de>
Date: Mon Sep 5 13:32:01 2011 +0100
hw/xwin: Fix AltGr key sometimes firing an additional Ctrl-L key
I also had problems with the AltGr key. These could reliably
be reproduced by holding the AltGr for some seconds (causing
Windows generating auto repeat events)
I discovered that the mechanism in winkeybd.c function
winIsFakeCtrl_L had a problem if PeekMessage cannot obtain
the next Alt_R message because it is not there yet.
I prepared a patch that remembers the last Ctrl_L event and
reacts on a later Alt_R.
It was also necessary to alter the order in winWindowProc() in
winwndproc.c: the invocation of winIsFakeCtrl_L had to be done
before discarding auto-repeated key presses, as winIsFakeCtrl_L()
now has an internal state which must be updated by all key events.
Reviewed-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
commit 3d3114d55a2a323f8d49c3549a0dfdf9d4acf89d
Author: Jon TURNEY <jon.turney@dronecode.org.uk>
Date: Thu Jun 30 14:19:01 2011 +0100
hw/xwin: Handle the virtual key code generated by the Fn key on IBM Lenovo laptops
Apparently, IBM Leonovo laptops can generate a key-press event for the Fn
key, with virtual key code 0xFF and scan code extended 0x63
Handle this specially, rather than just passing on key code 0x63 (delete),
so you don't delete what you just typed when you adjust the screen brightness,
etc. :-)
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
commit 74af860f9a59332f6ed1ac9b3e7867fbbb3d7305
Author: Jon TURNEY <jon.turney@dronecode.org.uk>
Date: Wed Mar 24 22:41:22 2010 +0000
hw/xwin: turn on -emulate3buttons if less than 3 mouse buttons are reported
Try to be more intelligent with default options, turn on -emulate3buttons by
default if less than 3 mouse buttons are reported by Windows
Also, add -noemulate3buttons option so this default setting can be reversed
if desired
Also, correctly report the number of mouse buttons windows is reporting, rather
than always at least 3
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
commit c0f3709501a0afd3bf77e783f11d2c2e5f489d3b
Author: Jon TURNEY <jon.turney@dronecode.org.uk>
Date: Thu Mar 24 20:19:47 2011 +0000
hw/xwin: In multiwindow mode, don't grab native input focus for new windows which hint they don't want it
In multiwindow mode, avoid grabbing the input focus for newly
created windows which have InputHint FALSE
(this is used by e.g. glean to avoid every test window grabbing
the focus)
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
commit 25caa8565d7d10f4c254bca5bb9efa05a77542ad
Author: Jon TURNEY <jon.turney@dronecode.org.uk>
Date: Wed Jan 25 13:33:39 2012 +0000
hw/xwin: Remove some redundant OS version reporting
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
commit a9aca218f557c723e637287272819a7c17174e1e
Author: Roland Cassard <roland.cassard@gmail.com>
Date: Sat Oct 23 18:12:36 2010 +0100
hw/xwin: Don't assume we'll always have converted the clipboard selection after 2 attempts
Rather than knowing we have to call winProcessXEventsTimeout() for up to 2 WIN_XEVENTS_CONVERT messages, process
all messages in winProcessXEventsTimeout() until either: (i) the time out expired, (ii) an error occurred, or
(iii) received a WIN_XEVENTS_NOTIFY messaage indicating the data has been to put on the clipboard.
Reviewed-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
commit 75fe336b6c903133ae386f5cb8d308a0e9e2768e
Author: Michel Hummel <hummel.michel@gmail.com>
Date: Fri Aug 6 15:23:52 2010 +0100
hw/xwin: Mitigate a race condition in clipboard thread initialization
Remove the variables g_fClipboardLaunched and g_fClipboardStarted from
winInitializeGlobals(), as their re-initialization is handled in the
file hw/xwin/InitOutput.c.
Re-initializing g_fClipboardLaunched and g_fClipboardStarted during
the server reset procedure can lead to the clipboard thread being
launched two times and sometimes leads to a crash of the X server...
Reviewed-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
commit 95b1391fe3d3192abdfbad4140513b2112cfa02a
Author: Jon TURNEY <jon.turney@dronecode.org.uk>
Date: Mon Apr 5 13:57:24 2010 +0100
hw/xwin: Chain IOError handlers to avoid longjmp across threads
Avoid crashes on shutdown due to the undefined behaviour of calling longjmp() on the
result of setjmp() from a different thread, by chaining IOError handlers and only
jumping back up to the frame for this thread
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
commit 0659437f5ec0e3f646373394f5f9c5461e2170f3
Author: Yaakov Selkowitz <yselkowitz@users.sourceforge.net>
Date: Sat Feb 20 23:40:53 2010 -0600
hw/xwin: Improve XWinrc loading and error recovery
If $HOME/.XWinrc is present but badly formed, ignore it and try
system.XWinrc instead. If neither file is present or both are badly
formed, provide a built-in default which gives the user the chance to
load their new or fixed configuration without restarting.
Signed-off-by: Yaakov Selkowitz <yselkowitz@users.sourceforge.net>
Reviewed-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
commit 47c7b6d3e626497747ae2780f259a15b8e6c846f
Author: Michel Hummel <hummel.michel@gmail.com>
Date: Sat Oct 23 18:35:57 2010 +0100
hw/xwin: Remove no-longer needed tricks used to prevent the clipboard client from being killed
Remove no-longer needed tricks used to hide the clipboard client from XDM to prevent
it from being killed
- Delete XQuery wrapper used to hide clipboard client
- Delete XDMCP mode heuristic which waits until some magic number of connections have
been established before starting the clipboard
We still need the EstablishConnection wrapper to ensure that the clipboard client isn't
the first client (causing a server restart if it disconnects)
Reviewed-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
commit c1bf3baa44fbd8af33a2b3ce045324485b85a7a7
Author: Michel Hummel <hummel.michel@gmail.com>
Date: Sun Oct 31 14:53:02 2010 +0000
hw/xwin: Automatically restart clipboard thread
Automatically restart clipboard thread on unexpected exit
Reviewed-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
commit ae981341a98f7a1ee5d6f3bc8ebde04e42042dc5
Author: Jon TURNEY <jon.turney@dronecode.org.uk>
Date: Mon Feb 8 22:37:30 2010 +0000
hw/xwin: Give the X window for the clipboard integration client a name
This makes it a bit easier to find when staring at the output of
'xwininfo -tree -root'
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
commit b1093241f3e28223a139e7cb5c3ae85182bdf545
Author: Jon TURNEY <jon.turney@dronecode.org.uk>
Date: Tue Oct 19 20:47:21 2010 +0100
Xext: Warning fix for shm.c
shm.c: In function 'CheckForShmSyscall':
shm.c:182:5: warning: function declaration isn't a prototype [-Wstrict-prototypes]
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
commit 02775efb8930291cc62fc84086c97da75b912a55
Author: Adam Jackson <ajax@redhat.com>
Date: Tue Jan 24 17:35:04 2012 -0500
int10: Fix unmapping of the BIOS scratch area
342f3eac8460fc48cfad1f1d7be939d671e6e1cd introduced a bug, 'base' is
incremented before use. The old code corrected this when unmapping, so
the new code should too.
Signed-off-by: Adam Jackson <ajax@redhat.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit e1085a0da0b9299f48b3dc41dee5e33bf022bea5
Author: Chase Douglas <chase.douglas@canonical.com>
Date: Wed Jan 18 19:09:21 2012 -0800
Don't set X and Y valuators for indirect touch events
For expediency, it made sense to always have the X and Y axes set for
direct touch device event propagation. The last X and Y values are
stored internally. However, indirect device touch event propagation
does not depend on the touch's X and Y values. Thus, we don't need to
set the values for every indirect touch event.
On top of this, the previous X and Y values aren't stored for indirect
touches, so without this change the axes get erroneously set to 0.
Signed-off-by: Chase Douglas <chase.douglas@canonical.com>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 5201310559fe8708ba8278bdef77cdc1673fff71
Author: Daniel Stone <daniel@fooishbar.org>
Date: Thu Jan 19 22:40:32 2012 +1100
UngrabAllDevices: Don't kill clients if not told to
The kill_client argument to UngrabAllClients specifies if we want to
kill the client holding the grab or just deactivate the grab.
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
Reported-by: Julien Cristau <jcristau@debian.org>
Reviewed-by: Cyril Brulebois <kibi@debian.org>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 9b1e18f42a05a79d9ebec372a37b47442e397ca9
Author: Chase Douglas <chase.douglas@canonical.com>
Date: Wed Jan 18 18:04:14 2012 -0800
Only update pointer motion data for pointer emulated touch events
Signed-off-by: Chase Douglas <chase.douglas@canonical.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit f00e5b02f5d9928cd88961e761da91b5faff1b32
Author: Chase Douglas <chase.douglas@canonical.com>
Date: Wed Jan 18 18:04:13 2012 -0800
Only scale direct device touch coordinates
Indirect touch devices provide valuator values in pure device
coordinates. They also don't need to be fixed up for screen crossings.
Signed-off-by: Chase Douglas <chase.douglas@canonical.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 24dc0389da3970e83e4908039957567e55f9ea05
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Mon Jan 16 12:53:39 2012 +1000
include: Fix comment typo
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 954bb994842aa43a0f272858e65036c016b729a4
Author: Jeremy Huddleston <jeremyhu@apple.com>
Date: Mon Jan 9 00:40:10 2012 -0800
configure.ac: Remove MIEXT_SHADOW_LIB from XORG_LIBS
This is provided by dixmods/libshadow.so and is not part of the main binary.
This addresses a build failure on darwin due to MIEXT_SHADOW_LIB having
unsatisfied dependencies (FB_LIB) in XORG_LIBS.
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
commit ba0f5cc1961bfcfb5e7d66ac5df19d429952631d
Author: Jeremy Huddleston <jeremyhu@apple.com>
Date: Mon Jan 9 00:14:29 2012 -0800
xfree86: Don't link libxorgxkb against libdix.la
libdix.a is already provided by XSERVER_LIBS. Including it in libxorgxkb
results can result in duplicate symbols landing in the Xorg binary on some
configurations (buggy glibtool on darwin).
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
commit 2387fb23858d645f15061bc7bcbe4654386ba116
Author: Jeremy Huddleston <jeremyhu@apple.com>
Date: Fri Jan 13 12:00:14 2012 -0800
sdksyms.sh: Exit on error rather than building an empty symbol table
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
Reviewed-by: Keith Packard <keithp@keithp.com>
commit cd89482088f71ed517c2e88ed437e4752070c3f4
Author: Jeremy Huddleston <jeremyhu@apple.com>
Date: Wed Jan 11 12:17:06 2012 -0800
test: Fix linking issues when building unit tests without the Xorg DDX
This allows unit tests to build and run successfully on darwin when
only the Xvfb or XQuartz DDX is built.
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Reviewed-by: Jon TURNEY <jon.turney@dronecode.org.uk>
commit 78d39b3222a4b0b92d840137f5455d3a20dd6906
Author: Jeremy Huddleston <jeremyhu@apple.com>
Date: Sun Jan 15 02:26:43 2012 -0800
Revert "glx: don't leak fbconfigs"
This reverts commit d26fae246d7c451b4d5ffe24fdb959d4bd00b107.
This patch free()s memory in __glXScreenDestroy which was allocated in
glxdricommon (which isn't in every DDX). That breaks abstraction and
causes a crash when XQuartz quits, because it results in freeing a pointer
that was never allocated.
The correct fix is to do this cleanup in __glXDRIscreenDestroy.
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
commit f9e6858d5c10be6a8439c0f18bfb2325fa0ee070
Author: Chase Douglas <chase.douglas@canonical.com>
Date: Wed Jan 11 07:38:12 2012 -0800
Use event time instead of CurrentTime for grab times
When {XI,X,}AllowEvents is called, the timestamp is compared against the
grab time to ensure that the request pertains to the current grab in the
server. While many clients may use CurrentTime (client-side), the
timestamp of the event causing the grab is also valid.
This change ensures that the server's notion of the grab time is the
time of the event that activated the grab rather than the time that the
grab is actually activated.
This bug was exposed through nested touch then pointer grabs.
Signed-off-by: Chase Douglas <chase.douglas@canonical.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit a6273cc85c01fc020643a68e49ca4e7a2d2ae898
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu Jan 12 10:17:34 2012 +1000
xfree86: mention udev in the xorg.conf manpage AutoAddDevices section
And point out what "hotplugging" means.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Julien Cristau <jcristau@debian.org>
commit a60d87ffe6d9a15fa830c8da2947c72487863c2b
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Wed Jan 11 09:04:02 2012 +1000
os: prettify backtrace output
Changes to output:
* "Backtrace:" now appears on a separate line _with_ a timestamp
* A blank line is inserted after the last backtrace line
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Julien Cristau <jcristau@debian.org>
commit c495a839ace7fcc1f1fe414d3d3ba04f08885434
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Wed Jan 11 09:01:05 2012 +1000
include: prettify BUG_WARN output
ErrorF output is prefixed with a timestamp, so the previous output would
look like this:
[ 50.423] BUG: triggered 'if (dev->valuator->numAxes < 2)'
BUG: getevents.c:842 in scale_to_desktop()
Change this to have the prefix on both lines:
[ 50.423] BUG: triggered 'if (dev->valuator->numAxes < 2)'
[ 50.423] BUG: getevents.c:842 in scale_to_desktop()
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Julien Cristau <jcristau@debian.org>
commit bbb6b8c834e0e1491ca14403b5d0840dd14380d3
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri Jan 6 13:20:45 2012 +1000
render: don't bother with animated cursors on floating slaves (#39989)
X.Org Bug 39989 <http://bugs.freedesktop.org/show_bug.cgi?id=39989>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com>
commit 35bd77e9d0701daae87d681900d749604fc6471f
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Mon Jan 9 15:04:10 2012 +1000
dix: Update pointer limits for floating devices too (#43635)
When the screen is restructured, the pointer limits need to be reset for
floating slave devices as well, not just for master pointers. Only skip
devices that don't have a cursor (attached slaves and keyboard)
Bug reproducer: float an absolute slave device, rotate the screen - the
device is now confined to a section of the screen only.
X.Org Bug 43635 <http://bugs.freedesktop.org/show_bug.cgi?id=43635>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Chase Douglas <chase.douglas@canonical.com>
commit 5de0c2582f9c80874b4f4a5b86d250059bfaa85b
Author: Keith Packard <keithp@keithp.com>
Date: Thu Jan 12 12:10:07 2012 -0800
Revert "os: Repack ConnectionOutput for LP64"
This reverts commit d5f724544afd2949cebfcf4f0b4510ec0c701bec.
ABI change pended for 1.13
commit 11331305d4acd117b71502e45c0e86684fa9280b
Author: Keith Packard <keithp@keithp.com>
Date: Thu Jan 12 12:10:03 2012 -0800
Revert "dix: Repack ClientRec"
This reverts commit f702372822dadb1fef92cfc25086481f640147b3.
ABI change pended for 1.13
commit d9eeede52f2d5ba9dd6368d988a5d2abb3b8b4e5
Author: Keith Packard <keithp@keithp.com>
Date: Thu Jan 12 12:09:59 2012 -0800
Revert "dix: Pull client-is-local flag up to the ClientRec"
This reverts commit 49d38b75c8f3276cfce33ffe6b8c4fbeb1081b96.
ABI change pended for 1.13
commit 3be37375eed9eb9cfb9c42821deda4213af4057b
Author: Keith Packard <keithp@keithp.com>
Date: Thu Jan 12 12:09:55 2012 -0800
Revert "dix: Extend initial connection handshake for forwarding proxies"
This reverts commit 78fa121f4097d29458e5453c13473595df06e26e.
ABI change pended for 1.13
commit 5b9f5c8a53aca03c3c73bc10bd362987621a9d72
Author: Keith Packard <keithp@keithp.com>
Date: Thu Jan 12 12:09:44 2012 -0800
Revert "os: Hide the Connection{In,Out}put implementation details"
This reverts commit 48e7a2ef574c8b38c4f8f07b45f54c8bfd02552b.
ABI change pended for 1.13
commit 5867d453cebebec6b4f10409af86b603755fbf51
Author: Keith Packard <keithp@keithp.com>
Date: Thu Jan 12 12:09:34 2012 -0800
Revert "dix: Fix types in WindowOptRec"
This reverts commit a4553019a10b4e01cc06f3081db71a83338697b4.
ABI change pended for 1.13
commit e722ad6c3efa57b806ca0f2dc13114bd3619a88c
Merge: e476af417d 4e44580efd
Author: Keith Packard <keithp@keithp.com>
Date: Mon Jan 9 13:22:28 2012 -0800
Merge remote-tracking branch 'jturney/rpavlik-xwin-fixes'
commit e476af417d83730b11054f4e5b127ab5540bb332
Merge: f4956faab9 146008358e
Author: Keith Packard <keithp@keithp.com>
Date: Mon Jan 9 13:17:37 2012 -0800
Merge remote-tracking branch 'whot/multitouch'
commit f4956faab9ccf9aba6cf9603f4489f5dad19a347
Author: Zhigang Gong <zhigang.gong@linux.intel.com>
Date: Wed Jan 4 07:01:19 2012 +0000
mi/mibitblt: Fix an overflow bug of bit shift.
When depth equal to 32 and planeMask equal to 0, the overflow will
occur and cause the pixmap can't be cleared. There are some test
cases in XTS hit this bug, and this fix can eliminate the corresponding
failures.
Signed-off-by: Zhigang Gong <zhigang.gong@linux.intel.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 6d6d4cb6043905d850834946e9bfc526ed5a9ef7
Author: Matthieu Herrb <matthieu.herrb@laas.fr>
Date: Mon Jan 2 13:23:59 2012 +0000
Add OpenBSD support to DetermineClientCmd()
Uses kvm_getargv() from libkvm.
Signed-off-by: Matthieu Herrb <matthieu.herrb@laas.fr>
Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit a55214d11916b707b7c8c65c555cc0cbb59ac503
Author: Adam Jackson <ajax@redhat.com>
Date: Tue Jan 3 06:22:24 2012 +0000
Always install xaa sdk headers
Always install XAA SDK headers so drivers still build even with
--disable-xaa
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit dafc327f3c75205cf7e5360e9ccd71c7457f61a5
Author: Matthieu Herrb <matthieu.herrb@laas.fr>
Date: Mon Jan 2 13:11:41 2012 +0000
UnloadSubModule(): accept pointer value '1' and ignore it.
Some driver modules try to unload submodules that are now built-in.
Signed-off-by: Matthieu Herrb <matthieu.herrb@laas.fr>
Reviewed-by: Julien Cristau <jcristau@debian.org>
Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 8db029064bcbe378061e812bb8136608e3123226
Author: Adam Jackson <ajax@redhat.com>
Date: Wed Jan 4 16:39:33 2012 +0000
vgahw: Fix DACDelay() macro to use the driver's vtable
We don't want to unconditionally use I/O routines here, since if the
driver is using mmap'd VGA ports then the I/O handle won't be set up.
Tested-by: Jeff Chua <jeff.chua.linux@gmail.com>
Signed-off-by: Adam Jackson <ajax@redhat.com>
Reviewed-by: Mark Kettenis <kettenis@openbsd.org>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 63a8012947fc44ccb3d661dec88dbda14e7f3c04
Author: Chris Halse Rogers <christopher.halse.rogers@canonical.com>
Date: Thu Jan 5 01:22:40 2012 +0000
Revert "dix: don't return BadMatch from GetProperty (#23562)"
This reverts commit f04fe06ae244b851b38be824b1a80f2f8a030591.
dixLookupWindow no longer returns BadMatch. No other caller was checking
for it, so this problem is now fixed in the utility function.
Signed-off-by: Christopher James Halse Rogers <christopher.halse.rogers@canonical.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit ef492e9797b6d4f6bbc25e86bedc24477819fde7
Author: Chris Halse Rogers <christopher.halse.rogers@canonical.com>
Date: Thu Jan 5 01:22:39 2012 +0000
dix: Return BadWindow rather than BadMatch from dixLookupWindow
dixLookupWindow uses dixLookupDrawable internally, which returns
BadMatch when the XID matches a non-Window drawable. Users
of dixLookupWindow don't care about this, just that it's not
a valid Window.
This is a generalised version of the fix for X.Org Bug 23562,
where GetProperty was incorrectly returning BadMatch. Auditing other
window requests, all that I checked would incorrectly return BadMatch
in these circumstances. An incomplete list of calls that could
incorrectly return BadMatch is: ListProperties, SetSelectionOwner,
{Destroy,Map,Unmap}{,Sub}Window.
None of the callers of dixLookupWindow, except for GetProperty, check
for BadMatch
Signed-off-by: Christopher James Halse Rogers <christopher.halse.rogers@canonical.com>
Reviewed-by: Daniel Stone <daniel@fooishbar.org>
Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit ff891bbf68caefc22cabb541b6b56af086ac2280
Author: Arthur Taylor <art@ified.ca>
Date: Fri Jan 6 07:21:37 2012 +0000
linux: Use K_OFF VT KB mode over K_RAW if available.
Linux kernels since 2.6.38 (March 2011) have an VT KB mode K_OFF in
which special keys (like Ctrl+C) are not interpreted and input is not
buffered. Use of this mode over K_RAW removes the need for a
xf86ConsoleHandler to drain the VT input buffer, removing the grief it
causes when it goes wrong or is (de)initialized out-of-order. (This
also saves a few needless context switches per key event.)
If K_OFF is not defined or not understood by the kernel, K_RAW and the
previous method is used as a fall-back.
Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Arthur Taylor <art@ified.ca>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 0b113f7cdf5228dccd51a749a339c8669e3f20ff
Merge: 0b2c6491c5 777bf90abe
Author: Keith Packard <keithp@keithp.com>
Date: Mon Jan 9 13:07:25 2012 -0800
Merge commit '777bf90abeac37087a3d0538b847742523d5acf2'
commit 0b2c6491c5e5e1c9ba067299f3de61f5acee263b
Merge: 1f5587e144 6b19436536
Author: Keith Packard <keithp@keithp.com>
Date: Mon Jan 9 11:40:23 2012 -0800
Merge remote-tracking branch 'whot/for-keith'
commit 1f5587e14406c083687203030db6a11691ac9d9f
Merge: a97252db24 6269977c91
Author: Keith Packard <keithp@keithp.com>
Date: Mon Jan 9 11:37:59 2012 -0800
Merge remote-tracking branch 'kibi/master'
commit a97252db24669a3e26a935024ea38b8a28d30586
Author: Jeremy Huddleston <jeremyhu@apple.com>
Date: Tue Dec 20 19:49:47 2011 -0800
XQuartz: GL: Buildfix for recent GLX changes
dispatch.h was leftover from an earlier implementation and is no longer
needed, so remove it since including it causes a build failure due to
conflicts between GL/gl.h and OpenGL/gl.h
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
Reviewed-by: Jamey Sharp <jamey@minilop.net>
Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
commit 6b194365364cb7a74c2b19f4a8c5e0e0404339da
Author: Andreas Wettstein <wettstein509@solnet.ch>
Date: Wed Nov 30 20:20:21 2011 +0100
xkb: Message actions suppress other key presses #28575
When a key to which a message action is mapped is held down, presses of
other keys were not registered.
Signed-off-by: Andreas Wettstein <wettstein509@solnet.ch>
Reviewed-by: Daniel Stone <daniel@fooishbar.org>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 4e44580efd4522ced644c698336d2f6ea54f3917
Author: Ryan Pavlik <rpavlik@iastate.edu>
Date: Fri Nov 4 14:29:01 2011 -0500
hw/xwin: Include manifest file in the dist tarball
Commit c02638fd added the manifest file, but didn't add it to EXTRA_DIST.
Signed-off-by: Ryan Pavlik <rpavlik@iastate.edu>
Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
Reviewed-by: Jon TURNEY <jon.turney@dronecode.org.uk>
commit c763fe51b8ff18e204caab9cf97376a1b72324f0
Author: Ryan Pavlik <rpavlik@iastate.edu>
Date: Fri Nov 4 13:17:50 2011 -0500
hw/xwin: Fix duplicate definition of HAS_WINSOCK when building for MinGW
hw/xwin: Fix duplicate definition of HAS_WINSOCK when building for MinGW
but still provide it if building for Win32 without autotools
xserver/hw/xwin/winclipboard.h:42:0: warning: "HAS_WINSOCK" redefined
../../include/xwin-config.h:11:0: note: this is the location of the previous definition
Signed-off-by: Ryan Pavlik <rpavlik@iastate.edu>
Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
Reviewed-by: Jon TURNEY <jon.turney@dronecode.org.uk>
commit 3d80f202b06227f7fc03b674f5fbf809c2d1efb2
Author: Ryan Pavlik <rpavlik@iastate.edu>
Date: Fri Oct 28 09:56:19 2011 -0500
hw/xwin: Fix possible null ptr deref in winMWExtWMDecorateWindow()
Signed-off-by: Ryan Pavlik <rpavlik@iastate.edu>
Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
Reviewed-by: Jon TURNEY <jon.turney@dronecode.org.uk>
commit c824004b4592b3d86b3514be7cab37b36642b13a
Author: Ryan Pavlik <rpavlik@iastate.edu>
Date: Fri Oct 28 09:56:11 2011 -0500
hw/xwin: Fix possible null ptr deref in winMWExtWMRestackFrame()
Signed-off-by: Ryan Pavlik <rpavlik@iastate.edu>
Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
Reviewed-by: Jon TURNEY <jon.turney@dronecode.org.uk>
commit 3c501691a0a9fa17da4e2cc84f55010ef2a4790d
Author: Ryan Pavlik <rpavlik@iastate.edu>
Date: Fri Oct 28 09:52:34 2011 -0500
hw/xwin: Fix possible null ptr deref in winActivateAppPrimaryDD()
Signed-off-by: Ryan Pavlik <rpavlik@iastate.edu>
Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
Reviewed-by: Jon TURNEY <jon.turney@dronecode.org.uk>
commit a492c02649de4c60ac21a7fcb6b7c730b558dca6
Author: Ryan Pavlik <rpavlik@iastate.edu>
Date: Fri Oct 28 09:49:00 2011 -0500
hw/xwin: Fix possible null ptr deref in winActivateAppNativeGDI()
Signed-off-by: Ryan Pavlik <rpavlik@iastate.edu>
Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
Reviewed-by: Jon TURNEY <jon.turney@dronecode.org.uk>
commit b907079596bc8600d3420c189409053b0b5016f6
Author: Ryan Pavlik <rpavlik@iastate.edu>
Date: Fri Oct 28 09:46:56 2011 -0500
hw/xwin: Clarify an if statement mixed with ifdef in winSetEngine()
Use the same pattern as elsewhere so it's a bit clearer what we
are checking
Signed-off-by: Ryan Pavlik <rpavlik@iastate.edu>
Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
Reviewed-by: Jon TURNEY <jon.turney@dronecode.org.uk>
commit 5c35dd7be716a3464f012c92866919a3606f9beb
Author: Ryan Pavlik <rpavlik@iastate.edu>
Date: Thu Oct 27 15:49:59 2011 -0500
hw/xwin: Fix rrScreenSetSize function pointer mismatch
winrandr.c: In function ‘winRandRInit’:
winrandr.c:218:31: warning: assignment from incompatible pointer type
Fix winRandRScreenSetSize() function signature to match RRScreenSetSizeProcPtr type,
to align with commit fd9331f6 'Revert "Separate out screen size and screen pixmap
sizes in RRScreenSizeSet"'
This is fall-out from the late revert of RANDR 1.4 in the 1.10 release cycle, it will
probably need to be reverted if/when that goes back in again.
Signed-off-by: Ryan Pavlik <rpavlik@iastate.edu>
Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
Reviewed-by: Jon TURNEY <jon.turney@dronecode.org.uk>
commit aa07d82908c28f4d083c0c55846a5b34f0e1ef31
Author: Ryan Pavlik <rpavlik@iastate.edu>
Date: Fri Oct 28 09:56:26 2011 -0500
hw/xwin: Remove an empty #if 0/#endif
Um... yeah
Signed-off-by: Ryan Pavlik <rpavlik@iastate.edu>
Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
Reviewed-by: Jon TURNEY <jon.turney@dronecode.org.uk>
commit d459f42e64f2bafef5124a456d2ad6fa2cd92a7f
Author: Ryan Pavlik <rpavlik@iastate.edu>
Date: Fri Oct 28 09:52:37 2011 -0500
hw/xwin: Fix double-free in error path in winQueryRGBBitsAndMasks()
Signed-off-by: Ryan Pavlik <rpavlik@iastate.edu>
Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
Reviewed-by: Jon TURNEY <jon.turney@dronecode.org.uk>
commit cc7dedd6b51a01996ddab10fe8b84e30700d1570
Author: Ryan Pavlik <rpavlik@iastate.edu>
Date: Fri Oct 28 09:46:45 2011 -0500
hw/xwin: Fix a memory leak in error path in winInitWM()
Signed-off-by: Ryan Pavlik <rpavlik@iastate.edu>
Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
Reviewed-by: Jon TURNEY <jon.turney@dronecode.org.uk>
commit 777bf90abeac37087a3d0538b847742523d5acf2
Author: Adam Jackson <ajax@redhat.com>
Date: Mon Jul 18 15:07:07 2011 -0400
xfree86: Remove the pretense of EDID v2 support
We don't do anything with EDID v2 blocks besides publish them on the
root window. Worse, the check deleted by this patch would attempt to
take a checksum of arbitrary memory if the rawData array isn't 256+
bytes long (and, for the monitors mentioned, it probably is only 128).
Reviewed-by: Mark Kettenis <kettenis@openbsd.org>
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit 8f9bdfd293ad8e45755efe8d764b4dcc2a724f51
Author: Adam Jackson <ajax@redhat.com>
Date: Tue Dec 13 21:23:12 2011 -0500
dix: Tune dixLookupDrawable for success
The vast vast vast majority of resource lookups are successful. Move some
work to the error paths so we don't punish success.
Before:
40000000 trep @ 0.0009 msec (1109091.3/sec): PutImage 10x10 square
60000000 trep @ 0.0005 msec (2072652.2/sec): ShmPutImage 10x10 square
After:
40000000 trep @ 0.0009 msec (1148346.9/sec): PutImage 10x10 square
60000000 trep @ 0.0005 msec (2091666.1/sec): ShmPutImage 10x10 square
Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit 83a98543b58c661a22574a6f8d8f9d777c0955b8
Author: Adam Jackson <ajax@redhat.com>
Date: Tue Dec 13 20:23:40 2011 -0500
dix: Tune dtrace hooks around Dispatch
Don't call LookupMajorName if the hooks aren't active, it's quite expensive.
Before:
40000000 trep @ 0.0009 msec (1087458.5/sec): PutImage 10x10 square
60000000 trep @ 0.0005 msec (2012238.6/sec): ShmPutImage 10x10 square
After:
40000000 trep @ 0.0009 msec (1109091.3/sec): PutImage 10x10 square
60000000 trep @ 0.0005 msec (2072652.2/sec): ShmPutImage 10x10 square
Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit 11977fab546da35d579ebe285e3c26864007805e
Author: Adam Jackson <ajax@redhat.com>
Date: Tue Dec 13 21:00:05 2011 -0500
xace: ricer tuning for XaceHook
gcc doesn't want to hoist the check for XaceHooks[hook] != NULL above the
varargs code for some reason, so do it ourselves.
Before:
40000000 trep @ 0.0010 msec (1050420.2/sec): PutImage 10x10 square
60000000 trep @ 0.0005 msec (1921147.6/sec): ShmPutImage 10x10 square
After:
40000000 trep @ 0.0009 msec (1087458.5/sec): PutImage 10x10 square
60000000 trep @ 0.0005 msec (2012238.6/sec): ShmPutImage 10x10 square
Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit a4553019a10b4e01cc06f3081db71a83338697b4
Author: Adam Jackson <ajax@redhat.com>
Date: Fri Jun 17 14:30:06 2011 -0400
dix: Fix types in WindowOptRec
No reason for these to be 64 bits on LP64.
Reviewed-by: Daniel Stone <daniel@fooishbar.org>
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit c44ef2e1ff7bad168c348da63477b4636b3054fd
Author: Adam Jackson <ajax@redhat.com>
Date: Fri Jun 17 14:17:09 2011 -0400
os: Minor header cleanup
Move some constants near their only users, and remove some
getdtablesize() logic that's second-guessing configure.
Reviewed-by: Daniel Stone <daniel@fooishbar.org>
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit 48e7a2ef574c8b38c4f8f07b45f54c8bfd02552b
Author: Adam Jackson <ajax@redhat.com>
Date: Fri Jun 17 14:03:01 2011 -0400
os: Hide the Connection{In,Out}put implementation details
Reviewed-by: Daniel Stone <daniel@fooishbar.org>
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit 78fa121f4097d29458e5453c13473595df06e26e
Author: Adam Jackson <ajax@redhat.com>
Date: Fri Jun 17 13:43:38 2011 -0400
dix: Extend initial connection handshake for forwarding proxies
Forwarding proxies like sshd will appear to be local, even though they
aren't really. This leads to weird behaviour for extensions that truly
require running under the same OS services as the client, like MIT-SHM
and DRI2.
Add two new legal values for the initial connection's byteOrder field,
'r' and 'R'. These act like 'l' and 'B' respectively, but have the side
effect of forcing the client to be treated as non-local. Forwarding
proxies should attempt to munge the first packet of the connection
accordingly; older servers will reject connections thusly munged, so the
proxy should fall back to passthrough if the munged connection attempt
fails.
Reviewed-by: Daniel Stone <daniel@fooishbar.org>
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit 49d38b75c8f3276cfce33ffe6b8c4fbeb1081b96
Author: Adam Jackson <ajax@redhat.com>
Date: Fri Jun 17 13:22:41 2011 -0400
dix: Pull client-is-local flag up to the ClientRec
Reviewed-by: Daniel Stone <daniel@fooishbar.org>
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit f702372822dadb1fef92cfc25086481f640147b3
Author: Adam Jackson <ajax@redhat.com>
Date: Fri Jun 17 12:58:25 2011 -0400
dix: Repack ClientRec
sizeof(ClientRec) ILP32 LP64
before 120 184
after 104 136
Reviewed-by: Daniel Stone <daniel@fooishbar.org>
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit d5f724544afd2949cebfcf4f0b4510ec0c701bec
Author: Adam Jackson <ajax@redhat.com>
Date: Thu Jun 16 17:40:24 2011 -0400
os: Repack ConnectionOutput for LP64
Reviewed-by: Daniel Stone <daniel@fooishbar.org>
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit ed8f3c4bd17bddf1369d050ea8e63b9451d887ce
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri Jan 6 10:10:16 2012 +1000
Xi: change XIChangeDeviceProperty from const pointer to const void *
According to Daniel Kurtz, a typedef void *pointer is a atomic type. So a
'const pointer' is equivalent to 'void* const' instead of the intended
'const void*'.
This technically changes the ABI, but we don't bump it for this.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Chase Douglas <chase.douglas@canonical.com>
commit 146008358e9dd9b178bd5305bcc1680ca16c328d
Author: Chase Douglas <chase.douglas@ubuntu.com>
Date: Thu Jan 5 16:43:40 2012 -0800
Remove last listener on touch reject
The current code short-circuits around the block that removes the
rejecting listener if it is the only listener left. It also does not
delete the touchpoint record if the touch has not physically ended.
This change ensures the listener is removed under these circumstances.
Signed-off-by: Chase Douglas <chase.douglas@ubuntu.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit e30c3c5c59abba9713cf3be532a46220aa9aeeca
Author: Chase Douglas <chase.douglas@canonical.com>
Date: Wed Jan 4 15:50:40 2012 -0800
Don't end touchpoint if owning client hasn't accepted/rejected
A touchpoint is ended when no further processing will take place for it.
This includes the situation where there is only one grabbing client, and
the client receives a touch end before it has accepted/rejected the
touchpoint.
This change ensures that a delivered touch end event is converted into a
touch update event under the above scenario. If the event is left as a
touch end event, the touchpoint will be ended in ProcessTouchEvent().
Signed-off-by: Chase Douglas <chase.douglas@canonical.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 075a473e538efb771497b762101694b6c0c45c2b
Author: Carlos Garnacho <carlosg@gnome.org>
Date: Tue Jan 3 02:43:40 2012 +0100
dix: Set XITouchEmulatingPointer on events from the touch sequence emulating pointer events
The internal flag is kept around, merely translated to XITouchEmulatingPointer
when creating the XI2 events that will be delivered to the client.
Signed-off-by: Carlos Garnacho <carlosg@gnome.org>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Chase Douglas <chase.douglas@canonical.com>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit e8db10a033491059ddf2b4777c9fafed14c403e8
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri Jan 6 13:49:04 2012 +1000
Require inputproto 2.1.99.5
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 223ba8b46eacbc8e573bc5136a3d6677f3e39099
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu Jan 5 15:55:04 2012 +1000
dix: fix wrong condition checking for attached slave (#44003)
We need to update the master if the device is not a master _and_ it is not
floating.
X.Org Bug 44003 <http://bugs.freedesktop.org/show_bug.cgi?id=44003>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Chase Douglas <chase.douglas@canonical.com>
commit 3ce102c362cadcd7087bdcf48440d9498eaf77d0
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu Jan 5 07:08:01 2012 -0500
dix: on PointerRootWin send a FocusIn to the sprite window too
XTS XSetDeviceFocus-7
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Chase Douglas <chase.douglas@canonical.com>
commit a125aabda3a5cf27aa98cb61f16e49280b66f451
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu Jan 5 07:02:51 2012 -0500
dix: send focus events to the immediate parent (#44079)
For a transition from windows A to B, A->parent did not receive an event.
DeviceFocusOutEvents sends to windows ]from, to[, so start with the actual
window, not it's parent.
X.Org Bug 44079 <http://bugs.freedesktop.org/show_bug.cgi?id=44079>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Chase Douglas <chase.douglas@canonical.com>
Reviewed-by: Keith Packard <keithp@keithp.com>
commit 75953ccb9e9e5f1dbbaa44c714716a0049e22aae
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Tue Jan 3 10:45:45 2012 +1000
xfree86: split warning about missing identifier or input driver
Check for identifier first and bail if it's missing (also remove the current
identifier check after we've already bailed due to missing identifiers)
If a driver is missing, warn but also say that we may have added this device
already. I see too many bugreports with incorrectly shortened log files.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Cyril Brulebois <kibi@debian.org>
commit 6269977c91071e0ea16ca5b4b8e15fd6db0b6fcf
Author: Julien Cristau <jcristau@debian.org>
Date: Fri Dec 30 20:41:25 2011 +0100
os: don't ignore failure from dladdr
If dladdr returns 0, don't go and use the returned Dl_info, it may
contain garbage.
X.Org bug#44315 <https://bugs.freedesktop.org/show_bug.cgi?id=44315>
Reported-and-tested-by: Cyril Brulebois <kibi@debian.org>
Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com>
Reviewed-by: Cyril Brulebois <kibi@debian.org>
Signed-off-by: Julien Cristau <jcristau@debian.org>
commit 644efb43e0639af648dd46d9729c2cabd9511238
Author: Cyril Brulebois <kibi@debian.org>
Date: Fri Dec 30 02:34:36 2011 +0000
linux/ia64: Fix regression after domain I/O support code removal.
Side effect of aa0bfb0f133481c57762012e8e30c05ffa151423:
| CCLD Xorg
| sdksyms.o:(.data.rel+0x27d8): undefined reference to `outl'
| collect2: ld returned 1 exit status
Since the linux/ia64 domain I/O support code got removed in that
commit, there's no reason to keep on declaring those functions
(inb, inl, inw, outb, outl, outw).
Bugzilla: https://bugs.freedesktop.org/43985
Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com>
Signed-off-by: Cyril Brulebois <kibi@debian.org>
commit 98cde254acb9b98337ddecf64c138d38c14ec2bf
Author: Keith Packard <keithp@keithp.com>
Date: Tue Dec 27 13:42:21 2011 -0800
Bump version to 1.11.99.901 (1.12 RC1)
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 5037c9af78da6652189de7202e70e1b833395af5
Author: Keith Packard <keithp@keithp.com>
Date: Tue Dec 27 14:02:01 2011 -0800
glx/glapioffsets.h is no longer part of the build, remove it
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 8dedf9831bd80514d800f0085213296a3726dba7
Merge: cfc4c3d7fa cf96183122
Author: Keith Packard <keithp@keithp.com>
Date: Tue Dec 27 13:13:48 2011 -0800
Merge remote-tracking branch 'kibi/master'
commit cfc4c3d7fa8bd4da4c08b2ab8e6f85435f75353a
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Sat Dec 24 10:00:56 2011 -0800
Add Solaris support to DetermineClientCmd
Uses /proc/pid/psinfo to read command & partial arguments.
Moves cmdsize & argsize variables into non-Solaris #else clause
to avoid unused variable warnings.
Fixes format mismatch errors when building with DEBUG defined on
a 64-bit platform (where Mask is defined as CARD32).
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Rami Ylimäki <rami.ylimaki@vincit.fi>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit a28ff2cf92c2b35e02eacca21af929afabbf6b83
Author: Chase Douglas <chase.douglas@canonical.com>
Date: Thu Dec 22 12:00:37 2011 -0800
test/xi2: Really fix infinite loop in test_convert_XITouchOwnershipEvent
long i;
for (i = 1; ; i <<= 1)
if (i == (1 << 31))
break;
(1 << 31) is compiled as an int, and thus is equal to -2147483648. We
are trying to compare it against a long, which on 64-bit machines is
2147483648. This results in an infinite loop.
Signed-off-by: Chase Douglas <chase.douglas@canonical.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit e7df42ab68e30588a5e32ed543b0711821daf009
Author: Keith Packard <keithp@keithp.com>
Date: Thu Dec 22 09:35:51 2011 -0800
test/xi2: Fix infinite loop in test_convert_XITouchOwnershipEvent
The touchid test was using a loop like:
for(i = 1; i < 0xffffffff; i <<= 1)
When 'i' is a 32-bit variable, this infinite loops as it goes from
0x80000000 to 0. 'i' is declared as 'long', which is 32-bit in 32-bit mode.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit cf96183122a85e3376e560f0360b38b5676e57a9
Author: Cyril Brulebois <kibi@debian.org>
Date: Wed Nov 2 12:41:20 2011 +0100
xorg.conf.man: Fix bad whatis entry.
Debian's QA tool “lintian” reported a bad whatis entry for the
xorg.conf(.d) manpages.
It comes with the following pointers:
For manual pages that document multiple programs, functions, files, or
other things, the part before "\-" should list each separated by a
comma and a space. […]
Refer to the lexgrog(1) manual page, the groff_man(7) manual page, and
the groff_mdoc(7) manual page for details.
Indeed, the current situation is:
$ whatis xorg.conf; whatis xorg.conf.d
xorg.conf (5) - (unknown subject)
xorg.conf.d (5) - (unknown subject)
With this patch:
xorg.conf (5) - configuration files for Xorg X server
xorg.conf.d (5) - configuration files for Xorg X server
Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Signed-off-by: Cyril Brulebois <kibi@debian.org>
commit f75bdf7fbe757f4603e39139acc3c90538a45e15
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu Dec 22 10:00:15 2011 +1000
test: fix grab mode value tests for new XIGrabModeTouch
This test checks that last-valid-mode + 1 returns a BadValue. With the
addition of XIGrabModeTouch, that value has changed - sync it up again.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Chase Douglas <chase.douglas@canonical.com>
commit e395efc25f9fd60377f32c2bf1a9153d70908236
Merge: 2bb282cd45 fcda98c486
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu Dec 22 09:29:59 2011 +1000
Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver into multitouch
Conflicts:
configure.ac
dix/inpututils.c
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 2bb282cd45cb8149b39d72397ef5bbcfebca11d2
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Wed Dec 21 14:45:27 2011 +1000
Xi: only activate the device grab if we don't already have one
If the device is already grabbed, don't activate the passive grab, it screws
with our event masks. Just deliver to the grabbing client instead.
Reported-by: Carlos Garnacho <carlosg@gnome.org>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Chase Douglas <chase.douglas@canonical.com>
commit 475ef5cc8339fac3696fe654ef683f92f0b0cc2c
Author: Carlos Garnacho <carlosg@gnome.org>
Date: Wed Dec 21 01:08:40 2011 +0100
dix: fix xi2 mask/filter when delivering grabbed events
Signed-off-by: Carlos Garnacho <carlosg@gnome.org>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 4551510f752624592f9201f73db89ac1325a234a
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Mon Dec 19 09:08:05 2011 +1000
test: add a basic test for ownership event values
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 0c661dc478b4b436a3e61066d31bc510c7a08456
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Mon Dec 19 08:31:37 2011 +1000
test: drop printfs from protocol-eventconvert.c
The test outputs are noisy enough, no need having these here too.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 8080d785b2c1e5791312ed0975efd1b8aea58d98
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Wed Dec 21 11:11:48 2011 +1000
dix: remove requirement for client_id be the first element
Leftover code from an earlier version of GetTouchEvents.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Chase Douglas <chase.douglas@canonical.com>
commit 552de314bf0c8e4de5d002bdd1c12388c2f42283
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Mon Dec 19 14:52:41 2011 +1000
dix: don't retrieve the syncEvents tail on an empty list
An empty list points to itself but syncEvents has the list head only and is
of a different format than the elements. Thus, casting it to a QdEventPtr
gives us garbage.
Segfaults with XTS test case Xlib13/XGrabKeyboard
Introduced in 7af23259d88f4c28ed21140f82cc03b3724c06bb.
Reported-by: Aaron Plattner <aplattner@nvidia.com>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Chase Douglas <chase.douglas@canonical.com>
commit 76c11e0872dedcd360cbe02cf62bb9de3b212957
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri Dec 16 12:41:08 2011 +1000
dix: button state must show the logical buttons, not physical buttons
If the device is mapped 3 2 1, a click on physical button 1 sends a button 3
press, but the state was set for button 1. Fix this, the state must be set
for that button's logical mapping.
https://bugzilla.gnome.org/show_bug.cgi?id=655928
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Chase Douglas <chase.douglas@canonical.com>
commit 8a32c39c00789c16006de61112627722ce548be1
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu Dec 15 07:59:06 2011 +1000
mi: handle screen switching on pointer emulated touch events
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Chase Douglas <chase.douglas@canonical.com>
commit 48547068b115b1f5e5f46a70110454a2175fb9a4
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu Dec 15 07:57:47 2011 +1000
mi: split move to new screen logic to a helper function
No functional changes.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Chase Douglas <chase.douglas@canonical.com>
commit 3b1e2035cc4740711360c845cfcdff07f7b60558
Author: Daniel Stone <daniel@fooishbar.org>
Date: Thu Dec 15 07:52:28 2011 +1000
dix: Remove touch grabs if the grab disappears
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Chase Douglas <chase.douglas@canonical.com>
commit cd3de8324e8908955a2e4be3000c8ffee8684c68
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu Dec 15 07:48:49 2011 +1000
dix: hook up passive grabs and pointer emulated passive grabs
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Chase Douglas <chase.douglas@canonical.com>
commit 5b169cb695bd450d7f64e3800f00c9237ee67f96
Author: Carlos Garnacho <carlosg@gnome.org>
Date: Tue Dec 13 15:41:23 2011 +0100
Xi: assign correct grab_mode/other_device_mode in XI2 passive grabs
CreateGrab() expects the keyboard mode to be stored in grab_mode, and the
pointer mode in other_device_mode, so respect this in passive XI2 grabs,
and switch modes if needed.
Signed-off-by: Carlos Garnacho <carlosg@gnome.org>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Chase Douglas <chase.douglas@canonical.com>
commit 4469430b109fa2da7ba3d2fadf66eca78b7156a0
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu Dec 15 07:42:12 2011 +1000
Xi: add the hooks for passive touch grabs
Co-authored-by: Daniel Stone <daniel@fooishbar.org>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Chase Douglas <chase.douglas@canonical.com>
commit bb0af002dc9ad5b464dc6793aedb6d1ff65d001d
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu Dec 15 07:21:38 2011 +1000
Xi: handle grab accept/reject requests
Consists mostly of generating an ownership event and processing it.
Co-authored-by: Daniel Stone <daniel@fooishbar.org>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Chase Douglas <chase.douglas@canonical.com>
commit 209b3d613a7bed126c81daedbad6461e4391e9e6
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Tue Dec 20 16:34:43 2011 -0800
Xi: hook up touch ownership handling
Ownership changes don't get processed directly when they happen, instead the
DIX submits an ownership event which goes through ProcessTouchEvents and
ProcessTouchOwnershipEvents.
Then on the required events are generated and sent to clients.
Co-authored-by: Daniel Stone <daniel@fooishbar.org>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Chase Douglas <chase.douglas@canonical.com>
Reviewed-by: Chase Douglas <chase.douglas@canonical.com>
commit 1894468c2b9788efa70ef4fb5fc911711402f3a7
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Tue Dec 20 16:33:33 2011 -0800
Xi: hook up pointer emulation for emulating touches
Includes a hack for implicit grab activation, because integrating this
requires a larger rewrite and I'm not sleeping enough as it is.
Right now, we deliver the event and check before/after if there is an
implicit grab on. If one activated, then store the event in the grab and
switch the listener type to a grab listener.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Chase Douglas <chase.douglas@canonical.com>
Reviewed-by: Chase Douglas <chase.douglas@canonical.com>
commit 753c4dca1e42035e29fb21458a746e484ed93ca3
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Wed Dec 14 17:04:38 2011 +1000
dix: add touch to pointer event conversion helper
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Chase Douglas <chase.douglas@canonical.com>
commit c3843f5498a849920ab68cca3557411ad8ab3454
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Wed Dec 14 17:02:30 2011 +1000
dix: add real_event parameter to ActivatePassiveGrab
For touch events with pointer emulation, the event that triggers the grab
(the pointer event) is not the same as the actual event (the touch event).
For replaying, we need to store the real event then.
No effective changes at this point, for the current caller event and
real_event are identical.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Chase Douglas <chase.douglas@canonical.com>
commit e389a19a730055d4550ff708da83c78099a516fd
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Tue Dec 20 16:32:52 2011 -0800
Process and deliver touch events
Does not include pointer emulation handling.
Does include partial ownership handling but not the actual processing of
ownership events.
Note: this commit is a retroactive commit extracted from a series of ~50
commits and may thus appear a bit more complicated than what you'd write out
from scratch.
Pointer processing tree is roughly:
- ProcessOtherEvents
- ProcessTouchEvents
- DeliverTouchEvents
- DeliverTouchBeginEvent|DeliverTouchEndEvent|...
- DeliverOneTouchEvent
Also hooks up the event history playing to the right function now.
Co-authored-by: Daniel Stone <daniel@fooishbar.org>
Co-authored-by: Chase Douglas <chase.douglas@canonical.com>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Chase Douglas <chase.douglas@canonical.com>
Reviewed-by: Chase Douglas <chase.douglas@canonical.com>
commit 634b0da9a83076d0e9e0fc44dc5dc77b0c368bc1
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu Dec 15 07:53:19 2011 +1000
dix: set core and button state based on the touch state
If a pointer-emulating touch caused a button to be logically down, set that
state in the input events.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Chase Douglas <chase.douglas@canonical.com>
commit dbfd7b37a0ba21899d8ebb7e0b324301bd466c49
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Wed Dec 14 16:33:05 2011 +1000
Xi: make UpdateDeviceState aware of touch events
Update the logical button state for pointer-emulating events. Button state
must be kept separate from the ButtonClassRec to avoid clearing the button
state on a touch end if there is a physical button still down.
And obviously don't change the button state if we're currently replaying the
event history for some client.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Chase Douglas <chase.douglas@canonical.com>
commit 593c3e2eb3da5c5fb957b68c8025dfdbe1139639
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Wed Dec 14 16:30:05 2011 +1000
dix: add TouchResourceIsOwner helper function
The first listener in the sequence is the owner of the touch sequence.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Chase Douglas <chase.douglas@canonical.com>
commit 5d0260cc986e8c1f0907870b851d47fd73bb1b7d
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Wed Dec 14 16:24:17 2011 +1000
dix: add helper functions for adding/removing touch listeners
The DIX will call TouchSetupListeners once for a new touch. After that
the listener list remains static, with listeners only dropping out when they
either reject the grab or disappear.
Exception: if grabs activate they are prefixed to the listeners.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Chase Douglas <chase.douglas@canonical.com>
commit 6a68f97ce6704dd2ff2a50f91acd2da72c9995bd
Author: Chase Douglas <chase.douglas@canonical.com>
Date: Wed Dec 14 16:26:04 2011 +1000
dix: add TouchGetPointerEventType helper function
Returns the respective pointer event type for a given touch event type.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Chase Douglas <chase.douglas@canonical.com>
commit 8e58ce73c8b79cb86e890369d0216cdd850c52a5
Author: Daniel Stone <daniel@fooishbar.org>
Date: Wed Dec 14 16:53:04 2011 +1000
dix: when a window disappears, remove it from the touch sprite trace
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Chase Douglas <chase.douglas@canonical.com>
commit c18a173cf5f53778356c5e8f25ab132956f8c27d
Author: Daniel Stone <daniel@fooishbar.org>
Date: Wed Dec 14 16:03:01 2011 +1000
dix: add helper functions to build up/verify the sprite trace
Touch events' sprite trace stays the same for the duration of the touch
sequence.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Chase Douglas <chase.douglas@canonical.com>
Reviewed-by: Chase Douglas <chase.douglas@canonical.com>
commit 40475261eacabb79a824db1138407a9d0f9fe37f
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Wed Dec 14 15:56:05 2011 +1000
dix: add touch event history helper functions
If touch client has not registered for ownership events and a grab above
that client is rejected, the client needs to receive the complete event
history.
The history currently doesn't really do fancy overflow handling. We assume
that the first TOUCH_HISTORY_SIZE events are the important ones and anything
after that is dropped. If that is a problem, fix the client that takes > 100
event to decide whether to accept or reject.
Events marked with TOUCH_CLIENT_ID or TOUCH_REPLAYING must not be stored in
the history, they are events created by the DIX to comply with the protocol.
Any such event should already be in the history anyway.
A fixme in this patch: we don't have a function to actually deliver the
event yet.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Chase Douglas <chase.douglas@canonical.com>
commit b274c472a5ad700aea5fe651d677e8cb34ffc976
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Wed Oct 26 09:08:17 2011 +1000
Support XI 2.2 officially
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Chase Douglas <chase.douglas@canonical.com>
commit d2af968cb65873780a6e61342d5d3c23b9654e2a
Author: Daniel Stone <daniel@fooishbar.org>
Date: Wed Dec 14 15:45:19 2011 +1000
Xi: allow selecting for touch events
Selecting for any of XI_TouchBegin/Update/End/Ownership requires the three
bits for begin/update/end to be set.
Only one client at a time may select for XI_TouchBegin event
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Chase Douglas <chase.douglas@canonical.com>
commit f3df3ad668fcd417ffb5afa3bea79a73a348bc1a
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Wed Dec 14 16:45:04 2011 +1000
dix: handle DIX-submitted touch events
The DIX needs to submit touch events for e.g. TouchEnd after an
acceptance/rejection. These have the TOUCH_CLIENT_ID flag set.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Chase Douglas <chase.douglas@canonical.com>
commit fcda98c48610fd507ca0b89c6006a5497d9dc1c9
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri Dec 16 12:41:08 2011 +1000
dix: button state must show the logical buttons, not physical buttons
If the device is mapped 3 2 1, a click on physical button 1 sends a button 3
press, but the state was set for button 1. Fix this, the state must be set
for that button's logical mapping.
https://bugzilla.gnome.org/show_bug.cgi?id=655928
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Chase Douglas <chase.douglas@canonical.com>
commit 47da6b6b2c2e9245422655f94770146fb8cd430b
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Mon Dec 19 14:52:41 2011 +1000
dix: don't retrieve the syncEvents tail on an empty list
An empty list points to itself but syncEvents has the list head only and is
of a different format than the elements. Thus, casting it to a QdEventPtr
gives us garbage.
Segfaults with XTS test case Xlib13/XGrabKeyboard
Introduced in 7af23259d88f4c28ed21140f82cc03b3724c06bb.
Reported-by: Aaron Plattner <aplattner@nvidia.com>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Chase Douglas <chase.douglas@canonical.com>
commit 2d34b34ed7547b829979756ccfb2cff79368d0a4
Merge: e4b4d83fad 1deede3c48
Author: Keith Packard <keithp@keithp.com>
Date: Tue Dec 20 00:23:33 2011 -0800
Merge remote-tracking branch 'jeremyhu/master'
commit e4b4d83fad37bb737e25f7226dbcd15b892f9528
Merge: 4df65d247b d26cb70272
Author: Keith Packard <keithp@keithp.com>
Date: Mon Dec 19 22:36:31 2011 -0800
Merge remote-tracking branch 'idr/glx-fixes'
commit 4df65d247b56c6b1b06e17a61236d6637312cdbb
Author: Ville Syrjälä <syrjala@sci.fi>
Date: Sun Dec 18 18:29:41 2011 +0200
dri2: Invalidate window pixmaps
While a redirected window is flipped, its pixmap may still be used as
and EGL image and should also get invalidated. When sending invalidate
events for a window, also send the events for its pixmap.
Signed-off-by: Ville Syrjälä <syrjala@sci.fi>
Reviewed-by: Keith Packard <keithp@keithp.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit e8fd23fad046877ca0ee08c1e147557756debc8e
Author: Keith Packard <keithp@keithp.com>
Date: Sun Dec 18 18:29:40 2011 +0200
dri2: Invalidate DRI2 buffers for all windows with the same pixmap on swap
Without this, when a compositing manager unredirects a fullscreen window which
uses DRI2 and page flipping, the DRI2 buffer information for the compositing
manager's output window (typically the Composite Overlay Window or root window)
may become stale, resulting in all kinds of hilarity.
Fixes https://bugs.freedesktop.org/show_bug.cgi?id=35452 .
[Original patch by Michel Dänzer <michel@daenzer.net>]
[Tree walk optimized version by Keith Packard <keithp@keithp.com>]
Signed-off-by: Ville Syrjälä <syrjala@sci.fi>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 6f916ffec7767eeab62132eb6575043969104c81
Author: Michel Dänzer <daenzer@vmware.com>
Date: Sun Dec 18 18:29:39 2011 +0200
dri2: Always re-generate front buffer information when asked for it.
Otherwise we might keep stale cached information, e.g. after the driver
performed page flipping.
This is part of the fix for
https://bugs.freedesktop.org/show_bug.cgi?id=35452 .
Signed-off-by: Michel Dänzer <daenzer@vmware.com>
Reviewed-by: Ville Syrjälä <ville.syrjala@nokia.com>
Reviewed-by: Mario Kleiner <mario.kleiner@tuebingen.mpg.de>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 603fcb3abf155e91fd3250f4a7aa16f289506e8e
Author: Rami Ylimäki <rami.ylimaki@vincit.fi>
Date: Sun Dec 18 18:29:38 2011 +0200
dri2: Initialize needInvalidate member of DRI2Drawable.
If the client is not behaving correctly and swaps buffers before
getting them, Valgrind will complain about uninitialized memory being
used in DRI2InvalidateDrawable.
Signed-off-by: Rami Ylimäki <rami.ylimaki@vincit.fi>
Reviewed-by: Ville Syrjälä <syrjala@sci.fi>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 3aca8199405cff5097ee5813605ec78b5ae44a43
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri Dec 16 09:15:25 2011 -0500
dmx: force -fno-strict-aliasing for xinput example
Compiler warning:
xinput.c:272: warning: dereferencing pointer 'e' does break strict-aliasing
rules
The code itself is the usual XInput client-side code:
XEvent event;
XDeviceMotionEvent *e = (XDeviceMotionEvent *)&event;
XNextEvent(display, &event);
printf("%d\n", e->type);
Since XDeviceMotionEvent is not guaranteed the same size as XEvent, clients
must use pointer aliasing as above when using the XNextEvent API. Disable
strict aliasing for this example.
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Gaetan Nadon <memsize@videotron.ca>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 1deede3c48d5ac91f50774c79f02afc6e036614e
Author: Jeremy Huddleston <jeremyhu@apple.com>
Date: Sat Dec 17 12:56:59 2011 -0800
kdrive/linux: Fix compilation with -Werror=int-to-pointer-cast -Werror=pointer-to-int-cast
Reported-by: Arkadiusz Miśkiewicz <arekm@maven.pl>
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
Reviewed-by: Jamey Sharp <jamey@minilop.net>
commit d0170d54c71fc761b8f1ae7a0e555dc2ca23cf9c
Author: Jeremy Huddleston <jeremyhu@apple.com>
Date: Sat Dec 17 12:25:26 2011 -0800
configure.ac: Make Xephyr dependency error message more informative
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
Reviewed-by: Jamey Sharp <jamey@minilop.net>
commit 511beddffab3c4fd43c75556132159117b6ba884
Author: Jeremy Huddleston <jeremyhu@apple.com>
Date: Fri Nov 25 09:45:25 2011 -0800
XQuartz: Provide in-tree implementation of strndup(3) if needed
This function was added to Mac OS X 10.7, so we need to provide it
for earlier releases.
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
commit 9ce8463a3334f76f128bb35b541aa6e67b4e4374
Author: Daniel Stone <daniel@fooishbar.org>
Date: Wed Dec 14 15:41:07 2011 +1000
dix: generate touchpoints from driver-submitted data
The touchpoints are generated, enqueued but not processed since we don't
handle them in the event processing yet.
Co-authored-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Chase Douglas <chase.douglas@canonical.com>
commit bec51f5ec6575a1971ae5371a4b6d8563933032c
Author: Daniel Stone <daniel@fooishbar.org>
Date: Wed Dec 14 15:29:48 2011 +1000
dix: add GetTouchOwnership event API
No callers yet. This API is not to be used by drivers, it's an API for the
DIX which will create ownership events mainly on touch acceptance/rejection.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Chase Douglas <chase.douglas@canonical.com>
commit 5c63dc6dbcbebbb19d79575a9f1ec9878e6537f1
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Wed Dec 14 14:57:46 2011 +1000
dix: add DIX API to create touchpoints
The DIX touchpoints are the ones used for event processing.
Co-authored-by: Daniel Stone <daniel@fooishbar.org>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Chase Douglas <chase.douglas@canonical.com>
commit 7f8127d203394cae45c3ded0d063030d7c5fdb70
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Wed Dec 14 14:53:52 2011 +1000
dix: if we run out of space for new touch events, resize the queue
The SIGIO handler forces us to drop the current touch and schedule the
actual resize for later. Should not happen if the device sets up the
TouchClassRec with the correct number of touchpoints.
Co-authored-by: Daniel Stone <daniel@fooishbar.org>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Chase Douglas <chase.douglas@canonical.com>
commit d26cb70272a1245a7b1db639cebeddafd8ed4c40
Author: Ian Romanick <ian.d.romanick@intel.com>
Date: Thu Dec 8 12:07:38 2011 -0800
glx: use dispatch.h instead of glapioffsets.h
Signed-off-by: Ian Romanick <ian.d.romanick@intel.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
commit 66e6037c334c2bcfe6e60d24cac83a8d6087fdd5
Author: Ian Romanick <ian.d.romanick@intel.com>
Date: Mon Dec 5 15:27:08 2011 -0800
glx: Regenerate GL API files from Mesa
Adam reviewed the underlying changes in the Mesa generated scripts.
Signed-off-by: Ian Romanick <ian.d.romanick@intel.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
commit e8485768c1f1d9d9fb7ca9e52ff61175b7bb80e1
Author: Ian Romanick <ian.d.romanick@intel.com>
Date: Tue Dec 6 12:30:17 2011 -0800
glx: Add stub implementations of next GLX extension functions
Generated code from Mesa contains dispatch for GLX_ARB_create_context
and GLX_ARB_create_context_profile. Provide stub implementations of
these functions so that the GLX extension will link.
Signed-off-by: Ian Romanick <ian.d.romanick@intel.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
commit 2df539c0bc3300ea858f8bc7d52e95e67ff379b8
Author: Ian Romanick <ian.d.romanick@intel.com>
Date: Mon Dec 5 14:42:35 2011 -0800
glx: Only declare GlxExtensionInit in one header file
This silences the GCC warning:
In file included from singlepixswap.c:36:0:
glxext.h:47:13: warning: redundant redeclaration of 'GlxExtensionInit' [-Wredundant-decls]
glxserver.h:80:6: note: previous declaration of 'GlxExtensionInit' was here
Signed-off-by: Ian Romanick <ian.d.romanick@intel.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
commit 758bc57ba5a89f765d83f0b169aa09e79a89bf89
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Wed Dec 14 14:48:56 2011 +1000
dix: add helper functions to create DDX touch recs
DDX touch points are the ones that keep records of the driver-submitted
touchpoints. They're unaffected by the grab state and terminate on a
TouchEnd submitted by the driver.
The client ID assigned is server-global.
Since drivers usually submit in the SIGIO handler, we cannot allocate in the
these functions.
Co-authored-by: Daniel Stone <daniel@fooishbar.org>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Chase Douglas <chase.douglas@canonical.com>
commit 1a133eb8b1ddbe0da7c2fbf7f6a686ec4512373e
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu Dec 15 08:30:02 2011 +1000
xfree86: bump the input ABI for the touch changes
New additions to the API:
- InitTouchClassDeviceStruct
- xf86PostTouchEvent
Changes to the ABI:
- DeviceIntRec now contains a TouchClassPtr
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Chase Douglas <chase.douglas@canonical.com>
commit 3fb258ca28850c998097b55884774cb95f476f69
Author: Daniel Stone <daniel@fooishbar.org>
Date: Wed Dec 14 12:46:40 2011 +1000
input: add a TouchClassRec to the devices
These structs will be used to store touch-related data, events and
information.
Drivers must call InitTouchClassDeviceStruct to set up a multi-touch capable
device.
Touchpoints for the DDX and the DIX are handled separately - touchpoints
submitted by the driver/DDX will be stored in the DDXTouchPointInfoRec. Once
the touchpoints are processed by the DIX, new TouchPointInfoRecs are created
and stored. This process is already used for pointer events with the
last.valuators field.
Note that this patch does not actually add the generation of touch events,
only the required structs.
TouchListeners are (future) recipients of touch or emulated pointer events.
Each listener is in a state, depending which event they have already
received. The type of listener defines how the listener got to be one.
Co-authored-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Chase Douglas <chase.douglas@canonical.com>
commit 098b837440e40bbc485368ec9658e12efd6ef581
Author: Daniel Stone <daniel@fooishbar.org>
Date: Wed Dec 14 14:41:48 2011 +1000
Add the touch input API stubs
xf86PostTouchEvent is the driver API to submit touch events to the server.
This API doesn't do anything yet though but now we can at least bump the
API.
For valuators, drivers should use the existing xf86InitValuatorAxisStruct
function.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Chase Douglas <chase.douglas@canonical.com>
commit 93c2a1628a9f6e7480d834bf55c080997fd18911
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Wed Dec 14 13:51:12 2011 +1000
Hook up the ownership events
This patch applies most of the protocol conversions and the internal event
type for ownership events.
Note that ownership events are generated by the DIX only, they do not pass
through the event queue.
Co-authored-by: Daniel Stone <daniel@fooishbar.org>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Chase Douglas <chase.douglas@canonical.com>
commit c065f7b16329e30cb976359e0a807c2adaf50123
Author: Keith Packard <keithp@keithp.com>
Date: Sat Dec 17 17:22:45 2011 -0800
Version 1.11.99.2 (1.12 snapshot 2)
Signed-off-by: Keith Packard <keithp@keithp.com>
commit ead968a4300c0adeff89b9886e888b6d284c75cc
Author: Antoine Martin <antoine@nagafix.co.uk>
Date: Sat Dec 17 01:36:51 2011 +0700
xserver: check for elevated privileges not uid=0
This allows us to run the server as a normal user whilst still
being able to use the -modulepath, -logfile and -config switches
We define a xf86PrivsElevated which will do the checks and cache
the result in case it is called more than once.
Also renamed the paths #defines to match their new meaning.
Original discussion which led to this patch can be found here:
http://lists.freedesktop.org/archives/xorg-devel/2011-September/025853.html
Signed-off-by: Antoine Martin <antoine@nagafix.co.uk>
Tested-by: Michal Suchanek <hramrach at centrum.cz>
Reviewed-by: Jamey Sharp <jamey at minilop.net>
Reviewed-by: Adam Jackson <ajax@redhat.com>
commit 3390d3fc0347947796aa245d70fefecf59b7bfe4
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Wed Dec 14 13:21:59 2011 +1000
Xi: process raw touch events
No-one can generated them yet, but if they could, we'd be processing them
like there was no tomorrow.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Chase Douglas <chase.douglas@canonical.com>
commit 84db813b9db34975b5fe288a8a551bb98f0cc1c1
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Wed Dec 14 12:45:28 2011 +1000
Hook up TouchBegin/Update/End events
The are the same as device events internally but require the touch ID
separately from the detail.button field (the protocol uses the detail field
for the touch id).
For simpler integration of pointer emulation we need to set the
detail.button field while keeping the touchid around.
Add the three new touch event types to the various places in the server
where they need to be handled. The actual handling of the events is somewhat
more complicated in most places.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Chase Douglas <chase.douglas@canonical.com>
commit 92a5862d0c120b009a688237ec7142b7c21ae272
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Wed Dec 14 15:00:33 2011 +1000
include: add a bunch of flags for GetTouchEvent processing
TOUCH_CLIENT_ID is set if the touch was generated from a client ID instead
of a DDX/driver touch ID. i.e. submitted by the dix.
TOUCH_END is a special flag that's required to force the touch to end.
Since the protocol with grab replaying and pointer emulation is rather
complex, it's quite hard to know otherwise when a touch sequence should
really die.
The others do what it says on the imaginary box.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Chase Douglas <chase.douglas@canonical.com>
commit 956a97487beada8cf5f354550ff779635cc64361
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Wed Dec 14 12:19:27 2011 +1000
include: RawTouchEnd is the last event now
Plus, use the actual definition from the protocol instead of the numeric
values. Turns out not everyone knows the protocol event IDs by heart.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Chase Douglas <chase.douglas@canonical.com>
commit 92c6c0c1d2d6a8882ed97b0e7f2952978ee5ce82
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Wed Dec 14 12:15:29 2011 +1000
tests: update for touch support
Touch event mask must be set for all three event types.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Chase Douglas <chase.douglas@canonical.com>
commit 731b1db2fcc82c0a8afd28d7f28363c1db0a20ce
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Wed Dec 14 10:41:17 2011 +1000
Require inputproto 2.1.99.3
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Chase Douglas <chase.douglas@canonical.com>
commit 4c825eae89063fdc2241f92ab4101ba682b5b4b7
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Wed Nov 2 10:38:26 2011 +1000
Xi: add a FIXME
All the DeepCopy stuff really needs to be shared between the init calls the
drivers use and this code here. Too many bugs by not keeping the two in
sync.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Chase Douglas <chase.douglas@canonical.com>
commit 0b9d2e426defabbf6df7e872e158b080a6a5e0be
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Wed Dec 14 13:21:03 2011 +1000
Xi: split ProcessOtherEvent into ProcessDeviceEvent
No functional changes.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Chase Douglas <chase.douglas@canonical.com>
commit 190a6f45ee7412870b3d95c5db6c1079a285bc59
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri Dec 16 09:52:43 2011 +1000
dix: split positionSprite into scale_to_desktop and positionSprite
For future touch points, we need positionSprite to calculate the coordinates
but we don't want to actually change the cursor position for non-emulating
touches.
No functional changes at this point.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Jamey Sharp <jamey@minilop.net>
Reviewed-by: Chase Douglas <chase.douglas@canonical.com>
commit 2c1d0a539c0fb1860ac89a00d1fb609f1959e1b6
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Fri Dec 9 07:45:02 2011 -0500
dmx: fix distcheck failure, missing compsize.h in Makefile.am
which was added in commit:
dmx: Build fix for -Werror=implicit-function-declaration
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit ff6d9c79c1aa502f1aef81d8063425e5fc002534
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu Dec 15 10:19:26 2011 +1000
include: fix BUG_WARN_MSG for constant messages only
Previous declaration required the use of a message + printf varargs. We
obviously want to allow the use of just a message.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
commit f7ea7a324520844beaac8be7503ac50e20da5ab1
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Wed Dec 14 10:34:19 2011 +1000
configure: split the required modules up
We do the same thing for libraries and optional modules already, and it's
much easier to read when one of them changes
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Gaetan Nadon <memsize@videotron.ca>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 7da7aa96a0acb895e1fe57a9d3f2d093479cf2a2
Merge: b79de3f42f 7528a6b88e
Author: Keith Packard <keithp@keithp.com>
Date: Wed Dec 14 11:40:10 2011 -0800
Merge remote-tracking branch 'whot/for-keith'
commit 4c80dc1394344dc10cffe4f757c980944312dc3d
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Wed Dec 14 10:31:23 2011 +1000
configure: split the required modules up
We do the same thing for libraries and optional modules already, and it's
much easier to read when one of them changes
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 7528a6b88eb32098af4369a8bd9d70a808fa6f1c
Merge: f0de5e3990 898d976729
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Tue Dec 13 14:19:54 2011 +1000
Merge branch 'for-whot' of git://people.freedesktop.org/~alanc/xserver into for-keith
commit f0de5e3990b70df9899b7dd17d7ee6ff7c768183
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Sun Dec 11 07:31:43 2011 +1000
dix: add a MAXEVENTS define for the number of core + extension events
Not including GenericEvents
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Walter Harms <wharms@bfs.de>
Reviewed-by: Chase Douglas <chase.douglas@canonical.com>
commit adf8a0d62c0643f4c44a3b6d2e3c6c9b02532915
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri Dec 9 18:38:53 2011 +1000
dix: move event filter retrieval helpers to inpututils.c
No functional changes
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Chase Douglas <chase.douglas@canonical.com>
commit a03fe819506fbcbfcb299d4919d16061603fd4ec
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri Dec 9 18:02:49 2011 +1000
dix: switch EventIsDeliverable to take the event type only
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Chase Douglas <chase.douglas@canonical.com>
commit 10a8c428fac0d4ff8f8a3e3487c13dd349d27ed7
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri Dec 9 15:49:04 2011 +1000
dix: move storing last.valuators into a helper function
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Chase Douglas <chase.douglas@canonical.com>
commit a15abf82ddb5a209dbc30c4d12e1dc23c4adf3e4
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu Dec 8 15:38:44 2011 +1000
dix: always allocate and set the grab's sync.event
Allocate the memory at device creation time and always store the event, even
if we're not frozen. This way we know which event triggered the grab.
Since the event was never freed anyway except on device shutdown, this
doesn't really change things much.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Chase Douglas <chase.douglas@canonical.com>
commit 218752bdc5d9323d1e6202e762573a925cf8a4eb
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu Dec 8 14:27:01 2011 +1000
input: replace GRABTYPE_* with the InputLevel enums
They achieve the same thing, re-use the more generic InputLevel so we can
convert to/fro easier.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Chase Douglas <chase.douglas@canonical.com>
commit cd56bd7b3ee34a4b10eb3a57a6e94cac7512167a
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu Dec 8 14:59:06 2011 +1000
Add GrabIsPointerGrab and GrabIsKeyboardGrab helpers
No functional changes
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Chase Douglas <chase.douglas@canonical.com>
commit 47734b2ba2e1f9246fd1a3b7059ca60b0e15acb2
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu Dec 8 12:00:34 2011 +1000
dix: move delivery stop condition out of event mask
Previously, this was only called if there was a mask match, so even if we
had a no-propagate flag set or a stopAt window specified, if no mask
triggered on the window we would recurse up to the root window and
eventually deliver.
Move this, so that the stopAt and do-not-propagate mask is honoured.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Chase Douglas <chase.douglas@canonical.com>
commit 1d01e861b69d7ca8fe2335270b8286bc115fb6e9
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu Dec 8 10:22:26 2011 +1000
dix: split out core state and event state setting into helper functions
no functional changes.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Chase Douglas <chase.douglas@canonical.com>
commit fb010c543696b781a83b945f72865b7d7b75bf95
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Wed Dec 7 14:41:18 2011 +1000
dix: move grab matching code into a helper function
No functional changes.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Chase Douglas <chase.douglas@canonical.com>
commit d253a262c2c690357a4db7e235c48ab5dd0b77f8
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Wed Dec 7 13:57:25 2011 +1000
dix: split core grab interference check into helper function
No functional changes.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Chase Douglas <chase.douglas@canonical.com>
commit 97d79dd740ed1ac4eb02b0d4135850f953716278
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Wed Dec 7 13:54:28 2011 +1000
dix: compare the grab type, not the tempGrab type
No functional change. To get here, GrabMatchesSecond() needs to be TRUE and
for that the two grab types must be identical.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Chase Douglas <chase.douglas@canonical.com>
commit b9d6ae42b686287d7d23c2eefe2b12da98fe6ff8
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Wed Dec 7 15:43:31 2011 +1000
dix: remove event type check
Can't remember why this is there but we'll need to pass in XI2 events soon,
so this check is obsolete.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Chase Douglas <chase.douglas@canonical.com>
commit 80816366aa77f1730a1b6ddabfa55a946d76d494
Author: Chase Douglas <chase.douglas@canonical.com>
Date: Fri Nov 25 13:57:03 2011 -0800
dix: Split ActivatePassiveGrab() from CheckPassiveGrab()
The changed logic means we don't require the explicit grab = NULL setting
and early exit anymore. Not 100% of it, but if we see that message pop up in
a log we know it's broken.
Signed-off-by: Chase Douglas <chase.douglas@canonical.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 9ee62cd8ce3c3effc3663f3d56b322385ce12fdb
Author: Chase Douglas <chase.douglas@canonical.com>
Date: Thu Nov 17 17:40:24 2011 -0800
dix: Move grab check and activation logic to CheckPassiveGrab()
This is needed for future pointer emulation work.
Signed-off-by: Chase Douglas <chase.douglas@canonical.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit c53651dabc66aeb9882819a404a799a364f00a29
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Tue Dec 6 12:57:38 2011 +1000
dix: move EventDeliveryState into a header file, we'll need it elsewhere
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Chase Douglas <chase.douglas@canonical.com>
commit 86c3137c81e924bacd919e9d65809e07afeabbff
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Tue Dec 6 12:04:11 2011 +1000
Xi: split updating button count and state into helper functions
Functional change: for a button mapped to 0, the motionHintWindow is not
updated to the NullWindow anymore. Before it got updated unconditionally to
the button mapping. I have no idea what the practical effect of this is, but
I guess it's closer to the correct behaviour: pressing a button that's
logically disabled now does not disrupt the motion hint delivery.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Chase Douglas <chase.douglas@canonical.com>
commit e0f37250ffff5dcb3bc0e8cad63439995ce01a20
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Tue Dec 6 11:40:33 2011 +1000
Xi: deduplicate button motion mask setting
No functional changes
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Chase Douglas <chase.douglas@canonical.com>
commit 6eff14a789341d366b3013c5aa020e959c954651
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Mon Dec 5 18:54:30 2011 +1000
dix: deduplicate callers of DeliverDeviceEvents in DeliverGrabbedEvents
No functional change.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Chase Douglas <chase.douglas@canonical.com>
commit 93945b0a74aa8156a88f52b8ba77f1210042f396
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Mon Dec 5 18:42:05 2011 +1000
dix: split grab event conversion and delivery into a helper function
Effective functional change: XI2 events are checked with XACE now.
DeliverOneGrabbedEvent is exported for future use by touch events.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Chase Douglas <chase.douglas@canonical.com>
commit c81cdb0862e2184f033b3933e6bacbe0809ef2c0
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Mon Dec 5 18:29:27 2011 +1000
dix: replace conversion errors with BUG_WARN_MSG
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Chase Douglas <chase.douglas@canonical.com>
commit 6368c2aa4613a7c7eb0e8afca8d41f1a9bc4fc4d
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Mon Dec 5 16:46:18 2011 +1000
dix: deduplicate event delivery code
Move all the event delivery code into DeliverOneEvent, based on the
InputLevel we're sending to.
Functional change: we now check XI2 events with XACE too.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Chase Douglas <chase.douglas@canonical.com>
commit 7e2207548b3173afc9accb5ccd532c181a7b94ed
Author: Chase Douglas <chase.douglas@canonical.com>
Date: Wed Dec 7 20:32:28 2011 +1000
include: Add an InputLevel enum
Currently unused, but will be in the future.
Signed-off-by: Chase Douglas <chase.douglas@canonical.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 898d97672907a8074031d0d1038cd44bb5caf40d
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Mon Dec 12 16:49:33 2011 -0800
verify_internal_event: preserve constness of data pointer
All we're using it for is ErrorF calls, so make it a const char *
to stop gcc from warning:
inpututils.c: In function 'verify_internal_event':
inpututils.c:629:9: warning: cast discards qualifiers from pointer target type
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Jamey Sharp <jamey@minilop.net>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 79d09647d878e66721a778979a9eb1f4bba5f8d6
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Mon Dec 12 16:49:33 2011 -0800
Use const cast in BitIsOn macro to avoid angering gcc
Fixes gcc warnings such as:
inpututils.c: In function 'valuator_mask_isset':
inpututils.c:498:5: warning: cast discards qualifiers from pointer target type
inpututils.c: In function 'CountBits':
inpututils.c:613:9: warning: cast discards qualifiers from pointer target type
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Jamey Sharp <jamey@minilop.net>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 99dfe9b1de09cb481e95bd4c45dcf7493480798b
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Mon Dec 12 16:49:32 2011 -0800
Fix deconstifying cast warning in xi2_get_type
Since we're just comparing values in the struct, cast it to a
const xGenericEvent * to clear gcc warning of:
events.c: In function 'xi2_get_type':
events.c:193:5: warning: cast discards qualifiers from pointer target type
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Jamey Sharp <jamey@minilop.net>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
commit dd80156bf05c9eb4000d0981e00d0d9fb69a94f6
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Wed Dec 7 22:58:45 2011 -0800
Include client name if available in PrintDeviceGrabInfo
Also adds missing newline to first line of output.
Before patch:
[3581472.414] (II) Printing all currently active device grabs:
[3581472.414] Active grab 0x1800000 (core) on device 'Virtual core pointer' (2):
client pid 26174 uid 0 gid 10
[3581472.415] at 3581469139 (from active grab) (device thawed, state 1)
[3581472.415] core event mask 0x0
[3581472.415] owner-events true, kb 1 ptr 1, confine 0, cursor 0x0
[3581472.415] Active grab 0x1800000 (core) on device 'Virtual core keyboard' (3)
: client pid 26174 uid 0 gid 10
[3581472.415] at 3581469139 (from active grab) (device thawed, state 1)
[3581472.415] core event mask 0x3
[3581472.415] owner-events true, kb 1 ptr 1, confine 0, cursor 0x0
[3581472.415] (II) End list of active device grabs
After patch:
[3581736.601] (II) Printing all currently active device grabs:
[3581736.601] Active grab 0x1600000 (core) on device 'Virtual core pointer' (2):
[3581736.601] client pid 26741 /usr/bin/xscreensaver -nosplash
[3581736.601] at 3581735000 (from active grab) (device thawed, state 1)
[3581736.601] core event mask 0x0
[3581736.601] owner-events true, kb 1 ptr 1, confine 0, cursor 0x0
[3581736.601] Active grab 0x1600000 (core) on device 'Virtual core keyboard' (3)
:
[3581736.601] client pid 26741 /usr/bin/xscreensaver -nosplash
[3581736.601] at 3581735000 (from active grab) (device thawed, state 1)
[3581736.601] core event mask 0x3
[3581736.601] owner-events true, kb 1 ptr 1, confine 0, cursor 0x0
[3581736.601] (II) End list of active device grabs
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Rami Ylimäki <rami.ylimaki@vincit.fi>
commit b79de3f42ff8412dcabf2f2a805cbcbd1c6907c3
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Mon Dec 12 16:49:35 2011 -0800
xf86 parser: convert Error to a varargs macro to clear gcc format warnings
Previously it always passed a format string with exactly one argument,
using NULL when the format string needed none. Now pass the right number
of arguments to clear gcc warnings of 'too many arguments for format'.
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Jamey Sharp <jamey@minilop.net>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 7801b3dcd6501e3de93a6d2cee93b2593806e922
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Mon Dec 12 16:49:35 2011 -0800
Add some printf format attributes suggested by gcc
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Jamey Sharp <jamey@minilop.net>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
commit f68df9dfd2c7ca03c24aaa0a895b7191ecb81e85
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Mon Dec 12 16:49:34 2011 -0800
xf86Priv.h: Add some noreturn attributes suggested by gcc
Both functions call exit() at the end and have no other return path.
Also correct comment/heading to reflect commit 6450f6ca7ee0 moving
DoShowOptions into xf86Configure.c.
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Jamey Sharp <jamey@minilop.net>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 3823eedf3c124d3a20360480ba349bea72de3069
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Mon Dec 12 16:49:34 2011 -0800
Remove duplicate declarations of KdAdd*Driver in kdrive.h
Clears gcc warnings in every file that includes kdrive.h:
kdrive.h:507:1: warning: redundant redeclaration of 'KdAddPointerDriver'
kdrive.h:225:6: note: previous declaration of 'KdAddPointerDriver' was here
kdrive.h:510:1: warning: redundant redeclaration of 'KdAddKeyboardDriver'
kdrive.h:284:6: note: previous declaration of 'KdAddKeyboardDriver' was here
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Jamey Sharp <jamey@minilop.net>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 471e5373b6f87336dac3b9de9b3852f63a2b10dc
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Mon Dec 12 16:49:34 2011 -0800
Remove duplicate declaration of xf86ValidateModesFlags in xf86Modes.h
Clears gcc warning in every file that includes xf86Modes.h:
xf86Modes.h:102:1: warning: redundant redeclaration of 'xf86ValidateModesFlags'
xf86Modes.h:72:1: note: previous declaration of 'xf86ValidateModesFlags' was here
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Jamey Sharp <jamey@minilop.net>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 41dd7cf673e47ab74c5065b8dbf268b2e5facb64
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Mon Dec 12 16:49:34 2011 -0800
_XkbFilterDeviceBtn: move variable declarations to match usage scope
The main body of this function is an if { } else if { } pair of blocks.
Previously there was int button at the top level scope which is used
only in the first block, and a redeclaration of int button inside the
second block. Since there's no overlap in the code paths for the
two uses of button, move the one from the outer block into the first
block to help the programmer more quickly determine they are unrelated
usages, and to silence the gcc warning of:
xkbActions.c: In function '_XkbFilterDeviceBtn':
xkbActions.c:999:6: warning: declaration of 'button' shadows a previous local
xkbActions.c:955:6: warning: shadowed declaration is here
For consistency, move DeviceIntPtr dev declarations as well that are
used in the same way.
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Jamey Sharp <jamey@minilop.net>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
commit d8eb9b5faa2d2c9350bdaffef8749a9cac3c87b8
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Mon Dec 12 16:49:34 2011 -0800
XkbFindSrvLedInfo: remove extraneous name-clashing sli variable
Variable is already defined outside the outer if statement, and
there's no need to redefine inside the if statement.
No point in setting sli before if (dev->kbdfeed->xkb_sli==NULL)
check - if check is true, we immediately set it, if check is false,
we immediately return without further reference or use of it.
The one thing we do with it inside the inner if statement is store
an allocation in it for a brief moment before writing to the final
destination, which is immediately returned to the caller.
In short, there's no benefit to the variable at all in this block,
it just gives the optimizer more code to figure out how to omit.
Fixes gcc warning:
xkbLEDs.c: In function 'XkbFindSrvLedInfo':
xkbLEDs.c:683:19: warning: declaration of 'sli' shadows a previous local
xkbLEDs.c:679:18: warning: shadowed declaration is here
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Jamey Sharp <jamey@minilop.net>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 9edfa47bd58cd318d57d0f114714fd146be35a79
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Mon Dec 12 16:49:34 2011 -0800
KdParseFindNext: Constify delim argument
It's only used as input to strchr to find the delimiters, never
written to.
Clears a bunch of gcc warnings of the form:
kdrive.c:323:2: warning: passing argument 2 of 'KdParseFindNext' discards qualifiers from pointer target type
kdrive.c:261:1: note: expected 'char *' but argument is of type 'const char *'
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Jamey Sharp <jamey@minilop.net>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
commit ff64ad6c74a3e14ca34bacb8866bdbd2262bddff
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Mon Dec 12 16:49:34 2011 -0800
Convert KdDoSwitchCmd to use asprintf instead of malloc/strcat/etc.
Also fix the reason argument to be const char * to clear several gcc
warnings of:
kdrive.c:151:2: warning: passing argument 1 of 'KdDoSwitchCmd' discards qualifiers from pointer target type
kdrive.c:116:1: note: expected 'char *' but argument is of type 'const char *'
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Jamey Sharp <jamey@minilop.net>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 5bc590bde23ce1c57015b1d9e1cc63189c37448e
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Mon Dec 12 16:49:34 2011 -0800
DoShowOptions: preserve constness of options list as we walk it
Since all we do with the option list is walk down the list printing
the names, there's no need to cast away its constness.
Clears gcc warning:
xf86Configure.c: In function 'DoShowOptions':
xf86Configure.c:781:4: warning: cast discards qualifiers from pointer target type
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Jamey Sharp <jamey@minilop.net>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 71efd868282d47a6db405a16de18ac322926962b
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Mon Dec 12 16:49:34 2011 -0800
x86emu: constify debug strings
Strings are all pointers to literal constants, just used as input
to printf calls when debugging is enabled.
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Jamey Sharp <jamey@minilop.net>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
commit d5a5eece670dee963765eab1431c21525c16d9ee
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Mon Dec 12 16:49:34 2011 -0800
CompareISOLatin1Lowered: constify arguments
Allows callers to avoid deconstifying arguments when calling, fixing
gcc warning:
filter.c: In function 'PictureGetFilterId':
filter.c:59:2: warning: cast discards qualifiers from pointer target type
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Jamey Sharp <jamey@minilop.net>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 83ac9502ea9f1dedf3a8002745668af16bb1f2af
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Mon Dec 12 16:49:33 2011 -0800
xdmcp.c: fix three small const warnings
xdmcp.c:63:36: warning: initialization discards qualifiers from pointer target type
xdmcp.c: In function 'XdmcpRegisterConnection':
xdmcp.c:482:8: warning: cast discards qualifiers from pointer target type
xdmcp.c:482:8: warning: cast discards qualifiers from pointer target type
xdmcp.c:482:8: warning: cast discards qualifiers from pointer target type
xdmcp.c: In function 'get_mcast_options':
xdmcp.c:1596:21: warning: initialization discards qualifiers from pointer target type
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Jamey Sharp <jamey@minilop.net>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 3839d1480877818f3ccc04e25237d853bab210c3
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Mon Dec 12 16:49:33 2011 -0800
LockServer: store path to LOCKDIR literal string in a const char *
And instead of initializing to NULL, then resetting to LOCKDIR almost
immediately (before ever using the NULL value), skip directly to setting
it to LOCKDIR.
tmppath variable is only used as input for generating the path name
via calls to strlen, sprintf, etc.
Fixes gcc warning of:
utils.c: In function 'LockServer':
utils.c:259:11: warning: assignment discards qualifiers from pointer target type
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Jamey Sharp <jamey@minilop.net>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
commit af4113bfeb1d155f5f037c3492e50513336fa4a7
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Mon Dec 12 16:49:33 2011 -0800
WriteToClient: preserve constness of buf while extracting length value
Fixes gcc warning:
io.c: In function 'WriteToClient':
io.c:826:6: warning: cast discards qualifiers from pointer target type
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Jamey Sharp <jamey@minilop.net>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 2c9800f91559fbb12dd276cf0536631104092f67
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Mon Dec 12 16:49:33 2011 -0800
OsInit: store "/dev/null" in a const char *
It's only passed as the input side of a strcpy and as the filename to
fopen, so doesn't need to be non-const. Fixes gcc warning:
osinit.c: In function 'OsInit':
osinit.c:154:28: warning: initialization discards qualifiers from pointer target type
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Jamey Sharp <jamey@minilop.net>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 50b1097643934c8caec9530e5eda6ed6534aaf61
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Mon Dec 12 16:49:33 2011 -0800
Constify the reason string throughout the authorization check framework
Almost all of the places the string is assigned point to a literal
string constant, so use const char * for those, and const char **
for function calls that return it via an argument. Fortunately
the top level function, ClientAuthorized, which returns the string
as its return value is called from only one place, ProcEstablishConnection.
ProcEstablishConnection stores either that return value or a string literal
in char *reason. It only uses reason as an argument to SendConnSetup.
SendConnSetup passes the reason argument to strlen & WriteToClient,
both of which already have const qualifiers on their args.
Thus added const to the reason variable in ProcEstablishConnection
and the reason argument to SendConnSetup.
Fixes gcc warnings:
dispatch.c: In function 'ProcEstablishConnection':
dispatch.c:3711:9: warning: assignment discards qualifiers from pointer target type
auth.c: In function 'CheckAuthorization':
auth.c:218:14: warning: assignment discards qualifiers from pointer target type
auth.c:220:20: warning: assignment discards qualifiers from pointer target type
connection.c: In function 'ClientAuthorized':
connection.c:683:3: warning: return discards qualifiers from pointer target type
mitauth.c: In function 'MitCheckCookie':
mitauth.c:88:13: warning: assignment discards qualifiers from pointer target type
xdmauth.c:259:14: warning: assignment discards qualifiers from pointer target type
xdmauth.c:270:14: warning: assignment discards qualifiers from pointer target type
xdmauth.c:277:11: warning: assignment discards qualifiers from pointer target type
xdmauth.c:293:15: warning: assignment discards qualifiers from pointer target type
xdmauth.c:313:14: warning: assignment discards qualifiers from pointer target type
xdmauth.c:322:11: warning: assignment discards qualifiers from pointer target type
rpcauth.c: In function 'SecureRPCCheck':
rpcauth.c:136:10: warning: assignment discards qualifiers from pointer target type
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Jamey Sharp <jamey@minilop.net>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 99998196017ef38ec88459b50605aa20f628788b
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Mon Dec 12 16:49:33 2011 -0800
Constify string for authorization protocol names
gcc was warning from storing string constants in a char *name field:
auth.c:64:1: warning: initialization discards qualifiers from pointer target type
auth.c:72:1: warning: initialization discards qualifiers from pointer target type
auth.c:81:1: warning: initialization discards qualifiers from pointer target type
Making the field const requires changing AuthorizationFromID to take
a const char ** pointer for the name argument which it sets to point
to the matching name entry.
Changing that argument requires changing its sole caller in the security
extension to pass the address of a const char * variable to it, which it
can do, since the only thing it does with the returned name is to pass
it back to the RemoveAuthorization function that already expects a const
char *name.
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Jamey Sharp <jamey@minilop.net>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 01834e99e461e2a8354f3b4aef7f14c5e83fa255
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Mon Dec 12 16:49:33 2011 -0800
os/access.c: replace acmp & acopy macros with memcmp & memcpy calls
No need to cast to char * now that all supported platforms use C89-standard
void * argument types, so just drop the casts from acmp & acopy macros,
which clears the gcc warnings for places const pointers were cast non-const:
access.c: In function 'DefineSelf':
access.c:786:3: warning: cast discards qualifiers from pointer target type
access.c:795:6: warning: cast discards qualifiers from pointer target type
access.c: In function 'NewHost':
access.c:1293:9: warning: cast discards qualifiers from pointer target type
access.c:1298:6: warning: cast discards qualifiers from pointer target type
access.c:1309:5: warning: cast discards qualifiers from pointer target type
Without the casts, acmp & acopy are just a funny way to write memcmp
& memmove, so drop the macros and inline the calls, taking care to
swap the first two arguments to memmove since it had swapped them.
Since all the calls to memmove end up being to non-overlapping memory
(mostly copying from an existing pointer to a newly allocated one),
replace those with memcpy.
And finally, don't actually call memcpy to copy 0 bytes from one place
to another, since that's just a waste of a perfectly good function call.
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Jamey Sharp <jamey@minilop.net>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 020d83d361b0ab54ac962e97b12935be785f9a67
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Mon Dec 12 16:49:33 2011 -0800
xres.c: Preserve constness of string returned by LookupResourceName
MakeAtom now accepts a const char * so we don't need to cast down to
char * anymore. Fixes gcc warning of:
xres.c: In function 'ProcXResQueryClientResources':
xres.c:155:6: warning: cast discards qualifiers from pointer target type
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Jamey Sharp <jamey@minilop.net>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 2ddae8f0bd2a9ce0cd15bf3848393af29e615acf
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Mon Dec 12 16:49:33 2011 -0800
constify strings in resource name registry
LookupResourceName already returned a const char *, so just needed
to change the variable we're storing the list in to be a const char **
and then add const to the name argument to RegisterResourceName
(which just stores name in the array) and CreateNewResourceType
(which just passes name to RegisterResourceName).
Clears a bunch of gcc warnings of the form:
registry.c:319:5: warning: passing argument 2 of 'RegisterResourceName' discards qualifiers from pointer target type
registry.c:200:1: note: expected 'char *' but argument is of type 'const char *'
and from all the extensions:
damageext.c: In function 'DamageExtensionInit':
damageext.c:490:5: warning: passing argument 2 of 'CreateNewResourceType' discards qualifiers from pointer target type
../include/resource.h:159:26: note: expected 'char *' but argument is of type 'const char *'
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Jamey Sharp <jamey@minilop.net>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 424dbde891486ad6a6c00c61a334031ff18f5556
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Fri Dec 9 10:08:55 2011 -0800
CheckForEmptyMask does not need to declare int n twice
Just use the existing n variable again in the ARGB_CURSOR loop
instead of creating another one.
Fixes gcc -Wshadow warning:
cursor.c: In function 'CheckForEmptyMask':
cursor.c:155:6: warning: declaration of 'n' shadows a previous local
cursor.c:146:9: warning: shadowed declaration is here
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Jamey Sharp <jamey@minilop.net>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
commit b2bc38e4a553c29f49a0284333b34b4d6c8a8c12
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Sat Dec 10 10:01:18 2011 -0800
Even more correctly free config file names
If we didn't go into the if (!autoconfig) { } block, the filename,
dirname, and sysdirname pointers were never initialized, but we
freed them outside the block, leading to potential memory corruption.
Move the frees inside the block where they're initialized to avoid this.
To avoid similar problems, move the declarations of the variables that
are only used in this block inside the block.
Regression introduced by commit 3d635fe84d6de53e2f74203b10e89f7851fe3fc1
Found by gcc warning:
xf86Config.c: In function 'xf86HandleConfigFile':
xf86Config.c:2303:11: warning: 'filename' may be used uninitialized in this function
xf86Config.c:2303:22: warning: 'dirname' may be used uninitialized in this function
xf86Config.c:2303:32: warning: 'sysdirname' may be used uninitialized in this function
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Paulo Zanoni <paulo.r.zanoni@intel.com>
commit 33d6e6743d86324c2078f156991b16ac4f2593fc
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Wed Dec 7 19:06:05 2011 -0800
xf86RegisterRootWindowProperty is confused about xnfcalloc
It will never return NULL, so don't try to handle a NULL condition,
since that just confuses programmers and static analyzers.
It uses calloc, so all the allocated memory is cleared, so there's
no point looping over the memory to manually initialize it NULL.
And just because it's annoying, it doesn't need to be the only
place in this file to do if (NULL==...) instead of if (... == NULL).
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Paulo Zanoni <paulo.r.zanoni@intel.com>
commit e5aa00989cda9ebd18063c5e955235123ad37b88
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Wed Dec 7 14:14:10 2011 +1000
Change GetXI2/XI/CoreType to just take a type argument
Avoids the dummy-event dance if we have an event type and need to get the
matching XI2 type.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Chase Douglas <chase.douglas@canonical.com>
commit 6cc0e6a0afa6a87802767d484aa4e68fa935d3eb
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri Oct 28 12:55:55 2011 +1000
include: add GetXI2MaskByte and GetXI2EventFilterMask to headers
This is needed for touch event processing.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Chase Douglas <chase.douglas@canonical.com>
commit 372a6f10dc2d74d2d179e8b92449e9b8636a99ef
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Thu Dec 8 21:52:07 2011 -0800
Change disable_clientpointer return type to void
It doesn't return anything, nor does it's caller expect it to.
Fixes Solaris Studio compiler error:
"xichangehierarchy.c", line 214: Function has no return statement : disable_clientpointer
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 522f8bcc0360d6a117e929a004bc956ab92037e9
Merge: 6369b59668 2abe83df68
Author: Keith Packard <keithp@keithp.com>
Date: Thu Dec 8 20:57:26 2011 -0800
Merge remote-tracking branch 'whot/for-keith'
commit 2abe83df686ed64c4f4df711ac3c1fd12131c2e4
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Mon Dec 5 14:02:51 2011 +1000
include: add BUG_WARN_MSG for custom error message on bug condition
__BUG_WARN_MSG is a simple helper to enable call with and without varargs. I
couldn't find a way to otherwise do this without getting gcc warnings.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Chase Douglas <chase.douglas@canonical.com>
commit 4fc797f3756611a97767f407e1af0b6a7cf2f1d9
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri Nov 11 16:25:30 2011 +1000
xfree86: include xorg-config.h from xaalocal.h
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
commit 8c9589c71d47f287588314d77ddbfcc22cd04c8a
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Mon Dec 5 11:55:58 2011 +1000
Xi: rename "state" to "corestate" in ProcessDeviceEvents
'state' is shadowed by the XKB 'state' as well (which feeds into the event
too), so rename this one to clarify that this is the core event state only.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Chase Douglas <chase.douglas@canonical.com>
commit 631516a4aa9858874ee197444cd93d91b97a1089
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri Dec 2 15:47:58 2011 +1000
Xi: check button mapping value _before_ assigning it
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Chase Douglas <chase.douglas@canonical.com>
commit a1304d6cb69301899c3c8450d6bf3e68573599df
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Mon Dec 5 11:26:30 2011 +1000
Xi: skip superfluous cast
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Chase Douglas <chase.douglas@canonical.com>
commit 1ab50be938524dcd4a9e56d27e3b96a27c2db2c0
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Wed Nov 30 09:06:06 2011 +1000
xfixes: don't dereference a NULL cursor
If the new cursor is the NULL cursor, don't dereference it and use zeros
instead.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com>
commit d2ebbcdaf6b13d70eee704b1764ff349e1be22a0
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Tue Nov 29 16:15:37 2011 +1000
Xi: when removing a device, reset ClientPointers where needed
if a client had the to-be-removed device as ClientPointer, reset to NULL.
Fixes #43165
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com>
commit 27425f07b29e0ddaa782345c1899273ca742891e
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Wed Nov 9 14:45:02 2011 +1000
dix: use BUG_WARN for input mask size issues
Yes, we're likely corrupting memory here but really this is unlikely to be
triggered other than a real bug in the server. In which case a stacktrace is
going to be more useful than any silent error handling.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Chase Douglas <chase.douglas@canonical.com>
commit 9b570ecbda954227c89938ee6f94b9efd192d3c6
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri Dec 9 10:48:05 2011 +1000
xfree86: bump the input ABI
The last few patches broke the ABI, bump it for convenience.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 86bb3781b336c09e4279136ed81974de5acdba7f
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri Nov 4 11:29:01 2011 +1000
input: swap the server over to use the XI2mask struct
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Chase Douglas <chase.douglas@canonical.com>
commit b8b90cd1610331ff12fa3f70bf372670af7795ec
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu Nov 3 13:39:59 2011 +1000
Add a new XI2Mask struct and a few helper functions.
The current XI2 mask handling is handy for copying (fixed size arrays) but a
pain to deal with otherwise. Add a struct for XI2 masks and the required
accessors.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Chase Douglas <chase.douglas@canonical.com>
commit 4bc2761ad5ec2d0668aec639780ffb136605fbc8
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri Nov 4 14:16:37 2011 +1000
dix: switch the dev->deviceGrab.activeGrab from GrabRec to GrabPtr
This breaks the input ABI.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Chase Douglas <chase.douglas@canonical.com>
commit b601ea769f1b8a4d7f19e9d4a13541c78e865fe5
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri Nov 4 10:47:27 2011 +1000
dix: allocate temporary grabs on the heap
Once grabs start having nested memory locations, we can't just use the
GrabRec on the stack anymore, we need to alloc/copy/free the grabs.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Chase Douglas <chase.douglas@canonical.com>
commit b0e9e2e32616d09c30a02b9d0ae9db0b13e150d1
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri Nov 4 10:44:31 2011 +1000
dix: add CopyGrab() function
Not really needed at this point, but will be once touch support is added.
Since grabs are now expected to be allocated/freed with AllocGrab and
FreeGrab, CopyGrab must increase the refcount and duplicate the modifier
masks. Until the callers are switched to use FreeGrab, this introduces
memleaks.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Chase Douglas <chase.douglas@canonical.com>
commit 347f377f3b3f8c9d230d6309ec8ae92aa86d78b7
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu Nov 3 16:12:09 2011 +1000
dix: add AllocGrab helper function
Not needed since the GrabRec is a self-contained struct but will be needed
for the xi2 input mask rework.
FreeGrab already exists, make it available to other callers.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Chase Douglas <chase.douglas@canonical.com>
commit 7af23259d88f4c28ed21140f82cc03b3724c06bb
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Mon Nov 21 11:41:12 2011 -0800
dix: switch the syncEvent queue to a struct list
No effective functionality change, just cleanup to make this code slightly
more sane.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Chase Douglas <chase.douglas@canonical.com>
commit 6369b59668613e51131857fbaeaa393a65a73048
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Thu Dec 1 16:24:32 2011 -0500
test: update .gitignore with xfree86 and sort alphabetically
Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 3ab8ee32470f7cf1223e04238bb8c5f74ed52fc3
Merge: 22a666f995 98c4a888a4
Author: Keith Packard <keithp@keithp.com>
Date: Wed Dec 7 12:42:17 2011 -0800
Merge remote-tracking branch 'airlied/reviewed-fixes'
commit 22a666f9952feb7248e9bb2faf777edaaac8175f
Merge: 3824f558cc e89b0324da
Author: Keith Packard <keithp@keithp.com>
Date: Wed Dec 7 12:27:23 2011 -0800
Merge remote-tracking branch 'alanc/master'
commit 3824f558cc2ee051da8314c7bf08b8647b44e84a
Author: Keith Packard <keithp@keithp.com>
Date: Wed Dec 7 12:13:37 2011 -0800
hw/xfree86: fix segfault in config parser when config dir is missing
Treat a scandir error from a missing (or unusable) directory return as
if it simply returned no files at all, which is what we want.
cc: Paulo Zanoni <przanoni@gmail.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 98c4a888a4428789386c7c47cecc81933b5999ba
Author: Dave Airlie <airlied@redhat.com>
Date: Mon Nov 28 16:37:59 2011 +0000
kdrive: drop screen crossing code.
The only kdrive server we probably care about anymore is Xephyr,
and this screen enable/disable code totally breaks it in multi-screen mode.
When you are in one screen the other stops updating.
Fixes https://bugzilla.redhat.com/show_bug.cgi?id=757457
Signed-off-by: Dave Airlie <airlied@redhat.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 8d3731a811e33e263920dd7c8ec63d02968cb56e
Author: Dave Airlie <airlied@redhat.com>
Date: Thu Oct 20 10:48:26 2011 +0100
hal: free tmp_val in one missing case
Pointed out by coverity scan.
Signed-off-by: Dave Airlie <airlied@redhat.com>
Reviewed-by: Daniel Stone <daniel@fooishbar.org>
commit 41229392b790f30a0f0ef1f4ed95647c5bca4001
Author: Dave Airlie <airlied@redhat.com>
Date: Thu Oct 20 11:00:43 2011 +0100
xv: test correct number of requests. (v2)
Pointed out by coverity.
v2: fix swapped as well, as pointed out by Alan
Signed-off-by: Dave Airlie <airlied@redhat.com>
Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
commit 1049139499d9132a20cd6d4d156fe9da9cddb6c2
Author: Dave Airlie <airlied@redhat.com>
Date: Wed Oct 19 16:57:13 2011 +0100
xaa: avoid possible freed pointer reuse in epilogue
If the pGCPriv->flags == 2, then we try to assign the freed pGCPriv->XAAOps
avoid this by clearing the flags in to be destroyed pGCPriv.
Reported by coverity.
Signed-off-by: Dave Airlie <airlied@redhat.com>
Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com>
commit 682c09a2cedd234b005334cc01247d859dd7f26a
Author: Dave Airlie <airlied@redhat.com>
Date: Wed Oct 19 16:22:31 2011 +0100
Xi: avoid overrun of callback array.
This code had an off-by-one and would allow writing one past the end of
the callbacks array.
Pointed out by coverity.
Signed-off-by: Dave Airlie <airlied@redhat.com>
Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com>
commit b62dc4fcbcffd10de16650bee284702c8608bb60
Author: Dave Airlie <airlied@redhat.com>
Date: Wed Oct 19 16:21:26 2011 +0100
xext: don't free uninitialised pointer when malloc fails. (v2)
Initialise the pAttr->values to values so if the values allocation
fails it just ends up as free(NULL).
Pointed out by coverity.
v2: use Alan's suggestion.
Signed-off-by: Dave Airlie <airlied@redhat.com>
Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com>
commit 22605effd188436629a0dbc688666549473741e4
Author: Adam Jackson <ajax@redhat.com>
Date: Thu Apr 28 13:34:28 2011 +1000
fbdevhw: iterate over all modes that match a mode. (v3)
So on RHEL5 anaconda sets an xorg.conf with a fixed 800x600 mode in it,
we run radeonfb and fbdev since ati won't work in userspace due to domain
issues in the older codebase.
On certain pseries blades the built-in KVM can't accept an 800x600-43 mode,
it requires the 800x600-60 mode, so we have to have the kernel radeonfb
driver reject the 800x600-43 mode when it sees it. However then fbdev
doesn't try any of the other 800x600 modes in the modelist, and we end up
getting a default 640x480 mode we don't want.
This patch changes the mode validation loop to continue on with the other modes
that match to find one that works.
v2: move code around to avoid extra loop, after comment from Jamey.
v3: move loop setup back into loop as per Jeremy's review.
Signed-off-by: Dave Airlie <airlied@redhat.com>
Reviewed-by: Jamey Sharp <jamey@minilop.net>
Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com>
commit fac464e310b82fadcedf790798d1016c4805640b
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri Dec 2 08:52:53 2011 +1000
include: rename "foos" to "list_of_foos" in the struct list documentation
Makes things a little easier to read.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Chase Douglas <chase.douglas@canonical.com>
commit 7dfe8c32a96d3f96c8aaeb2802f5b122e381a1e4
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri Dec 2 08:51:24 2011 +1000
include: update struct list documentation to use one set of structs only
The example at the top of the file used a struct bar and a list of struct
foos. Use those two throughout instead of a different struct foo for the
examples and for the API documentation.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Chase Douglas <chase.douglas@canonical.com>
commit 18539c89eca8f6e272ead2b631365da530065ae7
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri Dec 2 08:51:04 2011 +1000
include: a new list element does not need initialization, state so
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Chase Douglas <chase.douglas@canonical.com>
commit 58dc73314b6508121ca094bbcf00612fe19ed69f
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri Dec 2 08:43:45 2011 +1000
include: point to the tests in list.c as examples
Even with the documentation, the list.c tests are the best examples.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Chase Douglas <chase.douglas@canonical.com>
commit c8e451a8e719ba432bcfa8976774c07307087809
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu Dec 1 14:12:11 2011 +1000
include: add list_last_entry to get the tail of a list
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Chase Douglas <chase.douglas@canonical.com>
commit 6acebf9e1298939593b942ec91ae9ec9e74faa19
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu Dec 1 13:35:50 2011 +1000
include: add list_append()
The existing list_add() prepends to the list, but in some cases we need the
list ordered in the way we append the elements.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Chase Douglas <chase.douglas@canonical.com>
commit e89b0324da89ba5c0ba64af1ef46a12b7f55f879
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Sat Dec 3 21:23:51 2011 -0500
autoconf: the minimum required level for autoconf is 2.60
The toolchain requirements are documented here:
http://www.x.org/wiki/ModularDevelopersGuide#Required_Tools
Note that autoconf features only found in versions later
than 2.60 must not be used.
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
commit 427cb53fddf0c517d1fd1025a87b1104735edd2a
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Sat Dec 3 21:23:21 2011 -0500
autoconf: remove redundant AC_PROG_MAKE_SET
Already included during Automake initialization.
After the patch, no change:
configure:3893: checking whether make sets $(MAKE)
configure:3915: result: yes
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
commit c19c55a93ab1bc6db56075ca34d6e1c3f522f622
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Fri Dec 2 00:09:07 2011 -0800
Fix builds of Xnest & Xephyr with Solaris Studio compilers
Required in order to build with Studio cc now that xorg-macros is
setting -errwarn=E_FUNC_HAS_NO_RETURN_STMT since a bug in the Solaris
system headers causes the noreturn attribute to not be correctly
applied to the exit() prototype in <stdlib.h> when building with
Studio instead of gcc.
Otherwise compiler exits with errors:
"Display.c", line 65: Function has no return statement : x_io_error_handler
"hostx.c", line 341: Function has no return statement : x_io_error_handler
Uses Studio-specific pragma instead of adding another exit() prototype
with a noreturn attribute to avoid causing gcc to warn about having
a redundant prototype for the exit() function.
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Mikhail Gusarov <dottedmag@dottedmag.net>
commit e4dcf580f007d6adcf5b0c639865d7aaab1a319d
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Thu Dec 1 23:45:42 2011 -0800
LoaderOpen returns either a valid pointer or NULL, so don't check for < 0
Fixes Sun cc warning that was recently elevated to error by the
stricter default CFLAGS changes to xorg-macros:
"loadmod.c", line 914: improper pointer/integer combination: op "<"
Should have been changed when commit ab7f057ce9df4e905b12 changed the
LoaderOpen return type from int to void *.
Changes log message when file is found but dlopen() fails from:
(EE) LoadModule: Module dbe does not have a dbeModuleData data object.
(EE) Failed to load module "dbe" (invalid module, 0)
to:
(EE) Failed to load module "dbe" (loader failed, 7)
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
commit 8b6a75009746db4b8e2e180210ac097e35136bcd
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Wed Nov 30 23:01:34 2011 -0800
Fix gcc warnings about redundant declarations of fallback functions
Ensure ffs, strndup, strlcat, etc. aren't defined by our headers
if they're already defined in the system headers.
This does export the HAVE_FFS, HAVE_STRNDUP, etc. definitions to drivers,
but if you built the Xserver with a libc that had those, and then build
the drivers with a less capable libc, you're going to have problems anyway,
and this should solve some reported problems with conflicts between our
strndup definition and gcc magic for it.
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
commit d829a7c5cb42c979b58f3547136df5b05d906423
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Wed Nov 30 22:20:09 2011 -0800
Move to autoconf standard function name checks & defines
Replace multiple methods of checking for functions with AC_CHECK_FUNCS
Replace multiple methods of selecting fallback funcs with AC_REPLACE_FUNCS
Replace HAS_* and NEED_* #defines with autogenerated HAVE_*
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
Reviewed-by: Mikhail Gusarov <dottedmag@dottedmag.net>
Reviewed-by: Gaetan Nadon <memsize@videotron.ca>
commit 4be68b03128e958d2a6dc1b7feb3587329b9561b
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Wed Nov 30 19:39:51 2011 -0800
Remove unused function checks from configure.ac & include/*.h.in
The code that used getisax to check for MMX support was moved to pixman
and removed from the X server by commit eb2d7fe02f9cbc.
The code that used HAVE_MKSTEMP was deleted by the Xprint removal in
commit 1c8bd318fbaf.
All alloca calls were removed by the patch series end in commit 5e363500c8,
and used custom X checks instead of the autoconf HAVE_ALLOCA anyway.
I can find no record of HAVE_GETUID, HAVE_GETEUID, HAVE_LINK, HAVE_MEMMOVE,
HAVE_MEMSET, HAVE_STRCHR, HAVE_STRRCHR, HAVE_GETOPT, HAVE_GETOPT_LONG,
HAVE_DOPRNT, or HAVE_VPRINTF ever being used, and the calls to those
functions are not wrapped in #ifdefs.
(Most of those are in our baseline requirements of C89 & Unix98 anyway.)
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
Reviewed-by: Mikhail Gusarov <dottedmag@dottedmag.net>
Reviewed-by: Gaetan Nadon <memsize@videotron.ca>
commit 84207def93e4489df8dca8e044ce544be8a3f845
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Mon Nov 28 20:38:58 2011 -0800
Disable building of tests requiring DDX functions when Xorg is not built
Some test cases require linking with some sort of DDX - ideally we'd
have a stub ddx for testing, but for now, since we link with the Xorg
ddx, disable those tests when configured with --disable-xorg
Fixes https://bugs.freedesktop.org/show_bug.cgi?id=43320
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Dan Nicholson <dbn.lists@gmail.com>
Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com>
commit fd976e4051e15ab2d01ec0bf89ff26926d4ed04e
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Thu Dec 1 16:24:12 2011 -0500
config: conftest needs an include directive to locate X11/Xfuncproto.h
The compiler option -fvisibility=hidden is erroneously missing
due to a faulty configuration test. The gcc command is unable to
locate X11/Xfuncproto.h unless the build occurs on a
system where X11 development headers are installed.
configure:21294: checking for symbol visibility support
configure:21323: gcc -std=gnu99 -c -g -O2 -fvisibility=hidden conftest.c >&5
conftest.c:144:28: fatal error: X11/Xfuncproto.h: No such file or directory
The solution is to add an include directive to obtain the location
of X11/Xfuncproto.h which may or may not be the system installed headers.
Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit feebf6746374aa04b12e9e3e51313a3a82c03530
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Wed Nov 23 00:30:02 2011 -0800
Limit the number of screens Xvfb will attempt to allocate memory for
Commit f9e3a2955d2ca7 removing the MAXSCREEN limit left the screen
number too unlimited, and allowed any positive int for a screen number:
Xvfb :1 -screen 2147483647 1024x1024x8
Fatal server error:
Not enough memory for screen 2147483647
Found by Parfait 0.3.7:
Error: Integer overflow (CWE 190)
Integer parameter of memory allocation function realloc() may overflow due to multiplication with constant value 1112
at line 293 of hw/vfb/InitOutput.c in function 'ddxProcessArgument'.
Since the X11 connection setup only has a CARD8 for number of SCREENS,
limit to 255 screens, which is also low enough to avoid overflow on the
sizeof(*vfbScreens) * (screenNum + 1) calculation for realloc.
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Jamey Sharp <jamey@minilop.net>
commit fb22a408c69a84f81905147de9e82cf66ffb6eb2
Author: Keith Packard <keithp@keithp.com>
Date: Tue Nov 8 10:13:15 2011 -0800
Save major/minor opcodes in ClientRec for RecordAReply
The record extension needs the major and minor opcodes in the reply
hook, but the request buffer may have been freed by the time the hook
is invoked. Saving the request major and minor codes as the request is
executed avoids fetching from the defunct request buffer.
This patch also eliminates the public MinorOpcodeOfRequest function,
inlining it into Dispatch. Usages of that function have been replaced
with direct access to the new ClientRec field.
Signed-off-by: Keith Packard <keithp@keithp.com>
Reviewed-by: Jamey Sharp <jamey@minilop.net>
commit 05f09354a30a4f5edd421220e1aa97be754c71bb
Merge: 3197b773c8 08ec4da6a7
Author: Keith Packard <keithp@keithp.com>
Date: Thu Dec 1 14:44:52 2011 +0000
Merge remote-tracking branch 'jcristau/for-keith'
commit 3197b773c81e58cd4aa412eccaee49526012ed6f
Merge: 2dc5ba4a1b dfcec1d3f9
Author: Keith Packard <keithp@keithp.com>
Date: Thu Dec 1 14:36:58 2011 +0000
Merge remote-tracking branch 'whot/for-keith'
commit 2dc5ba4a1b127e3ed286718ab0a6c20438361192
Author: Matt Turner <mattst88@gmail.com>
Date: Tue Nov 29 23:52:19 2011 -0500
Remove another if (E != NULL) check around free(E)
I wonder if there are any other patterns we haven't seen yet?
Reviewed-by: Jamey Sharp <jamey@minilop.net>
Signed-off-by: Matt Turner <mattst88@gmail.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit dfcec1d3f9d7bac5cde9eb034341428ee0ad3728
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri Nov 11 08:55:14 2011 +1000
test: remove unneeded printf statements from misc.c
Leftover from debugging, is not really needeed in a test.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
commit 9c38422fc4cf853c3104fada2a3851c79df2a66f
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Wed Nov 9 14:37:26 2011 +1000
include: add BUG_WARN macro for internal bug cases.
There are plenty of cases that can only be triggered by a real bug in the
server and doing the ErrorF dance manually everywhere is a tad painful and
the error message is usually used only to find the spot in the file anyway.
Plus, reading BUG_WARN somewhere is a good indicator to the casual reader
that this isn't intended behaviour.
Note that this is intentionally different to the BUG_ON behaviour on the
kernel, we do not FatalError the server. It's just a warning + stacktrace.
If the bug is really fatal, call FatalError.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Chase Douglas <chase.douglas@canonical.com>
Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
commit 61ef4daf6450da573b9de72ba7b200566821b916
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri Nov 4 15:49:23 2011 +1000
Xi: add FreeInputMask function
Does what it says on the box, complements MakeInputMask.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Chase Douglas <chase.douglas@canonical.com>
commit ee9346bb31efce4036df1b8dd8f1a5dc43ae955a
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu Nov 3 15:45:34 2011 +1000
Xi: add helper functions to alloc/free InputClientPtrs
Currently not needed since the InputClientRec is a self-contained struct. As
part of the touch rework that won't be the case in the future and a function
to allocate/free memory appropriately is required.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Chase Douglas <chase.douglas@canonical.com>
commit 4acf999c294868a44e559d212c6d88a4978256b2
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri Nov 4 15:37:32 2011 +1000
dix: use a single return statement in CheckPassiveGrabsOnWindow
No functional change.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Chase Douglas <chase.douglas@canonical.com>
commit b371795f01c1d7fc338cfe18b8a567ed9f402846
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu Nov 3 14:54:06 2011 +1000
dix: rename GetWindowXI2Mask to WindowXI2MaskIsset
And let it return a boolean value, that's all the callers need anyway.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Chase Douglas <chase.douglas@canonical.com>
commit bedb8fd90de8e2db33d5e3b1d859f24bf34efc9a
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu Nov 3 14:25:51 2011 +1000
Xi: use single return code from XIPassiveGrabDevice
Some failures returned status but the actual return code was "ret". Use
"ret" consistently and move status to the local block is used in.
[the goto isn't necessary yet, but for a future patch]
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Chase Douglas <chase.douglas@canonical.com>
commit 2aad1a2b42b7def7812abfa2462b6bcc6382e03a
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Wed Nov 2 14:07:19 2011 +1000
include: fix mask size calculation
Same bug as inputproto-2.0.1-9-gb1149ab, if the XI2LASTEVENT was a multiple
of 8, the mask was one bit too short.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Daniel Stone <daniel@fooishbar.org>
Reviewed-by: Chase Douglas <chase.douglas@canonical.com>
commit b2015a2c01711646bb7ae23d684abee0cd55d4d0
Author: Jeremy Huddleston <jeremyhu@apple.com>
Date: Thu Nov 24 13:54:08 2011 -0800
dmx: Build fix for -Werror=implicit-function-declaration on linux
Fixes regression introduced by: 6e6d732bac3c21cb85f8e998908f9b393630e5f8
Found-by: Tinderbox
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
CC: Alan Coopersmith <alan.coopersmith@oracle.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 873a1ace3646994adf95961f48719e95dcade7a2
Author: Paulo Zanoni <paulo.r.zanoni@intel.com>
Date: Tue Nov 1 10:57:56 2011 -0200
parser: free val.str after xstrtokenize
After we tokenize val.str, we discard it.
This is just one example:
6 bytes in 1 blocks are definitely lost in loss record 24 of 652
at 0x4C2779D: malloc (in vgpreload_memcheck-amd64-linux.so)
by 0x4D744D: xf86getToken (scan.c:400)
by 0x4D75F1: xf86getSubToken (scan.c:462)
by 0x4DB060: xf86parseInputClassSection (InputClass.c:145)
by 0x4D664C: xf86readConfigFile (read.c:184)
by 0x490556: xf86HandleConfigFile (xf86Config.c:2360)
by 0x49AA77: InitOutput (xf86Init.c:365)
by 0x425A7A: main (main.c:204)
Signed-off-by: Paulo Zanoni <paulo.r.zanoni@intel.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Dan Nicholson <dbn.lists@gmail.com>
commit d41987d77c903e00cca7bcf3e04ed07151e3bb4d
Author: Paulo Zanoni <paulo.r.zanoni@intel.com>
Date: Tue Nov 1 10:42:36 2011 -0200
parser: free val.str after xf86getBoolValue
After we convert the value to a boolean, we discard the string.
This is just one example:
3 bytes in 1 blocks are definitely lost in loss record 5 of 657
at 0x4C2779D: malloc (vgpreload_memcheck-amd64-linux.so)
by 0x4D744D: xf86getToken (scan.c:400)
by 0x4D75F1: xf86getSubToken (scan.c:462)
by 0x4DB3E0: xf86parseInputClassSection (InputClass.c:189)
by 0x4D664C: xf86readConfigFile (read.c:184)
by 0x490556: xf86HandleConfigFile (xf86Config.c:2360)
by 0x49AA77: InitOutput (xf86Init.c:365)
by 0x425A7A: main (main.c:204)
Signed-off-by: Paulo Zanoni <paulo.r.zanoni@intel.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Dan Nicholson <dbn.lists@gmail.com>
commit d5c7338b3eaea55177ade6fcba71a47ccd5547f5
Author: Paulo Zanoni <paulo.r.zanoni@intel.com>
Date: Mon Oct 31 17:54:03 2011 -0200
parser: free scandir's list
v2: move the free()s to the function that calls scandir
80 bytes in 1 blocks are definitely lost in loss record 411 of 631
at 0x4C2779D: malloc (vgpreload_memcheck-amd64-linux.so)
by 0x4C27927: realloc (vgpreload_memcheck-amd64-linux.so)
by 0x696A80D: scandir (scandir.c:108)
by 0x4D8828: OpenConfigDir (scan.c:854)
by 0x4D8A43: xf86openConfigDirFiles (scan.c:952)
by 0x49031F: xf86HandleConfigFile (xf86Config.c:2327)
by 0x49A9E3: InitOutput (xf86Init.c:365)
by 0x425A7A: main (main.c:204)
Signed-off-by: Paulo Zanoni <paulo.r.zanoni@intel.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 3d635fe84d6de53e2f74203b10e89f7851fe3fc1
Author: Paulo Zanoni <paulo.r.zanoni@intel.com>
Date: Sun Oct 30 18:04:59 2011 -0200
Correctly free config file names
We call xf86penConfigDirFiles twice, so we overwrite the configDirPath
variable, losing the pointer. If we move the pointer management to the
upper layer (the function callers), they will be able to call these
functions as many times as they want, but they'll have to free those
returned values.
v2: don't leak inside XWin
4,097 bytes in 1 blocks are definitely lost in loss record 625 of 632
at 0x4C2779D: malloc (in vgpreload_memcheck-amd64-linux.so)
by 0x4D7899: DoSubstitution (scan.c:615)
by 0x4D87B0: OpenConfigDir (scan.c:845)
by 0x4D8A2D: xf86openConfigDirFiles (scan.c:955)
by 0x49031F: xf86HandleConfigFile (xf86Config.c:2327)
by 0x49A9BF: InitOutput (xf86Init.c:365)
by 0x425A7A: main (main.c:204)
Signed-off-by: Paulo Zanoni <paulo.r.zanoni@intel.com>
Reviewed-by: Dan Nicholson <dbn.lists@gmail.com>
commit 0ae087e13192d9b498db782be5ba49ca91a81547
Author: Paulo Zanoni <paulo.r.zanoni@intel.com>
Date: Sat Oct 29 18:33:24 2011 -0200
glx: don't leak driConfigs
For dri, dri2 and driswrast.
12,968 (584 direct, 12,384 indirect) bytes in 1 blocks are definitely lost in loss record 569 of 570
at 0x4C2779D: malloc (in /usr/lib/valgrind/vgpreload_memcheck-amd64-linux.so)
by 0x7821E3B: driConcatConfigs (utils.c:560)
by 0x7827CF2: dri_fill_in_modes (dri_screen.c:224)
by 0x782831E: dri_init_screen_helper (dri_screen.c:405)
by 0x7826C03: drisw_init_screen (drisw.c:266)
by 0x782225F: driCreateNewScreen (drisw_util.c:69)
by 0x4826E2: __glXDRIscreenProbe (glxdriswrast.c:451)
by 0x4812FA: GlxExtensionInit (glxext.c:327)
by 0x41FB14: InitExtensions (miinitext.c:471)
by 0x568622: main (main.c:208)
Signed-off-by: Paulo Zanoni <paulo.r.zanoni@intel.com>
Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com>
commit d26fae246d7c451b4d5ffe24fdb959d4bd00b107
Author: Paulo Zanoni <paulo.r.zanoni@intel.com>
Date: Tue Oct 25 14:56:35 2011 -0200
glx: don't leak fbconfigs
29,952 (208 direct, 29,744 indirect) bytes in 1 blocks are definitely lost in loss record 573 of 573
at 0x4C2779D: malloc (in /usr/lib/valgrind/vgpreload_memcheck-amd64-linux.so)
by 0x4829BC: createModeFromConfig (glxdricommon.c:131)
by 0x482C09: glxConvertConfigs (glxdricommon.c:185)
by 0x482788: __glXDRIscreenProbe (glxdriswrast.c:468)
by 0x4812FA: GlxExtensionInit (glxext.c:327)
by 0x41FB14: InitExtensions (miinitext.c:471)
by 0x568636: main (main.c:208)
Signed-off-by: Paulo Zanoni <paulo.r.zanoni@intel.com>
Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com>
commit 305a8bcb2fc6f87f8d891fcb774198b6fd118ee1
Author: Paulo Zanoni <paulo.r.zanoni@intel.com>
Date: Thu Oct 20 17:39:29 2011 -0200
glx: fix memory leak when destroying screen
1,152 bytes in 1 blocks are definitely lost in loss record 536 of 575
at 0x4C25E84: calloc (in /usr/lib/valgrind/vgpreload_memcheck-amd64-linux.so)
by 0x483820: __glXScreenInit (glxscreens.c:357)
by 0x48271C: __glXDRIscreenProbe (glxdriswrast.c:469)
by 0x4812BE: GlxExtensionInit (glxext.c:327)
by 0x41FB14: InitExtensions (miinitext.c:471)
by 0x5685AE: main (main.c:208)
Signed-off-by: Paulo Zanoni <paulo.r.zanoni@intel.com>
Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com>
commit f405dfffe7d5db81d398615a80acbeba7e014ada
Author: Jeremy Huddleston <jeremyhu@apple.com>
Date: Mon Nov 7 22:14:30 2011 +0000
dmx: Build fix for -Werror=implicit-function-declaration
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
commit 632d205b309d0515b4ae0f9902059aa4b093a313
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Mon Nov 7 20:24:08 2011 -0800
Fix gcc -Wwrite-strings warnings in xf86Modes code
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com>
commit 09e4b78f7944234865f4648940453303af0c2663
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Mon Nov 7 19:19:47 2011 -0800
Fix gcc -Wwrite-strings warnings in xf86 ddx
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com>
commit 8e4556f560487f3d07812834d4785441d0a8323c
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Mon Nov 7 20:09:47 2011 -0800
FindModule: stop copying const char *dirname to char *dirpath
Not needed since 6cf844ab69926b split out the allocation/manipulation
into the helper function, leaving FindModule just copying the pointer
around, and causing gcc warnings and an unreachable call to free.
Also no longer need to store the combined strlen results in dirlen.
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com>
commit 05f589d464a961aea8d25632a390fb66a06cd186
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Fri Nov 4 23:21:34 2011 -0700
Fix gcc -Wwrite-strings warnings in various extensions
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com>
commit 232f1ddf3d060f3ce9d2ebd35f33b1294cac380e
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Thu Nov 3 21:21:19 2011 -0700
Fix gcc -Wwrite-strings warnings in XkbGetRulesDflts
Stop temporarily storing a pointer to a constant literal string
in a char *, just to strdup it a few lines later.
Fixes gcc -Wwrite-strings warnings:
xkbInit.c: In function 'XkbGetRulesDflts':
xkbInit.c:121:38: warning: assignment discards qualifiers from pointer target type
xkbInit.c:123:23: warning: assignment discards qualifiers from pointer target type
xkbInit.c:125:24: warning: assignment discards qualifiers from pointer target type
xkbInit.c:127:25: warning: assignment discards qualifiers from pointer target type
xkbInit.c:129:25: warning: assignment discards qualifiers from pointer target type
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com>
commit 0bc41d5f8d1a6192f57d9bf646cc46ed839b06b9
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Mon Nov 7 18:08:21 2011 -0800
Remove redundant redeclarations of functions in the same header file
Exposed by recent addition of -Wredundant-decls to default CWARNFLAGS
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com>
commit 285133a35eede03e37f41aeea6cbfd15a0800d98
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Mon Nov 7 15:44:26 2011 -0800
sun_agp: cast key to uintptr_t before casting to (int *)
Matches what linux_agp already does and prevents gcc from throwing up:
sun_agp.c: In function 'xf86DeallocateGARTMemory':
sun_agp.c:236:40: error: cast to pointer from integer of different size
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com>
commit f8dd5efb673439e7e9f7d82e6f9cfb97afacc85a
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Thu Nov 3 21:18:56 2011 -0700
Mark XKB char * as const to clean up gcc -Wwrite-strings warnings
Cleans up around 120 warnings from this set
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com>
commit cccafabd56d0f8e5784ea0ad9fdc03224f952bfe
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Thu Nov 3 21:10:51 2011 -0700
Mark arguments to fopen/popen/system wrappers as const char *
Silencing more gcc -Wwrite-strings warnings
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com>
commit 3d0ece5e8467d823afb227b7a7f8b12b906b6ba9
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Thu Nov 3 20:44:43 2011 -0700
Reduce unnecessary string copying in xkbtext routines
Instead of using sprintf to copy a static string to a local buffer,
just to pass it to TryCopyStr, pass the static string to TryCopyStr
directly, as is already done in other parts of this code.
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com>
commit 05d8a7f7a785eff3292f0f0537bb3902930f1b5c
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Sat Oct 29 11:08:17 2011 -0700
Convert a bunch of sprintf to snprintf calls
This batch is the straightforward set - others are more complex and
need more analysis to determine right size to pass.
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com>
commit b967bf2af264726042e2f6ffb9ca7d234f34b56b
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Mon Oct 31 23:01:35 2011 -0700
Remove xf86FormatPciBusNumber from API, inline the one place its used
Found no calls from current driver modules
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com>
commit 6450f6ca7ee070da3b6d70c2d3a6977f018ac421
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Thu Nov 3 22:13:05 2011 -0700
Move DoShowOptions to xf86Configure.c, delete xf86ShowOpts.c
Gets rid of duplicate static copy of optionTypeToString by putting
both callers of that helper function in the same source file.
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Daniel Stone <daniel@fooishbar.org>
Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com>
commit 43fa1274263f76faaca995f6e498bc3179a857b8
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Mon Oct 31 22:17:35 2011 -0700
Remove bad code from DoShowOptions (Xorg -showopts handler)
When we want to print a string, it's okay to just print it.
We don't need to first allocate a buffer 2 bytes bigger than the
string, copy the entire string unmodified to the buffer, print the
buffer, and then leak the buffer (though we AbortDDX 8 lines later,
and then just in case we survived that, call exit as well, so the
leak is short lived, just oh so pointless).
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Daniel Stone <daniel@fooishbar.org>
Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com>
commit 71a89d97332cc181becc5a5f73166e642f96c076
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Mon Oct 31 21:36:47 2011 -0700
Convert glx/single2.c:DoGetString() to use asprintf()
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com>
commit f3cb512dc4daaeed389bb4740e21b6e2330e01e1
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Sat Oct 29 11:19:44 2011 -0700
LogVMessageVerb: Fix const mismatch warning
"log.c", line 382: warning: assignment type mismatch:
pointer to char "=" pointer to const char
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com>
commit 3d2d88029b29d6e1c53220ad275ba8ba2dedd89e
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Sat Oct 29 11:13:32 2011 -0700
AuthAudit: clean up string handling calls
The extra "out" pointer to redirect writes to the array isn't needed since
the removal of LBX (commit a9ed5a87902a), and eliminating it allows more
logical use of sizeof(addr) in length-checked strlcpy & snprintf calls to
write to it.
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com>
commit 615f93a3d03d40924365061c6ae242240dd0ab7e
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Tue Nov 1 14:57:41 2011 -0700
Remove unnecessary variable rtrn in XkbKeysymText
Also removes even more unnecessary use of variable assignment inside
function arguments.
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Daniel Stone <daniel@fooishbar.org>
commit 5f285a30a1d6ffba82ebe5e08a0b68352bb51556
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Tue Nov 1 16:56:18 2011 -0700
Make XIGetKnownProperty take a const char * argument
Now that MakeAtom takes const char *, so can XIGetKnownProperty.
Clears 71 warnings from gcc -Wwrite-strings of the form:
devices.c:145:5: warning: passing argument 1 of 'XIGetKnownProperty' discards qualifiers from pointer target type
../include/exevents.h:128:23: note: expected 'char *' but argument is of type 'const char *'
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
commit e0f3633632de609e60950aef07c82df534db7888
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Fri Oct 28 21:31:46 2011 -0700
Convert ProcRenderQueryFilters to use memcpy instead of strncpy
We just got the string length with strlen, might as well use it
to copy the whole string quickly instead of checking each character
a second time to see if it's 0 or not.
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com>
commit 780133f9ae7fada462714b47e79d26075bbd9abe
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Fri Oct 28 21:29:50 2011 -0700
Convert DetermineClientCmd to use strdup instead of malloc+strncpy
*cmdname is initialized to NULL earlier in the function, so it's
okay to overwrite it with NULL if strdup fails, don't need that
extra check.
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com>
commit 03ddca6f71339fad089c56484bf35c63642ae1be
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Fri Oct 28 21:25:20 2011 -0700
Convert dmxSetDefaultFontPath to use strdup instead of malloc+strncpy
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com>
commit d9243777c77d9b2992fbaf7f459430283837e323
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Sat Oct 29 10:32:52 2011 -0700
matchDriverFromFiles: use one snprintf instead of strncpy/cat series
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com>
commit 6e6d732bac3c21cb85f8e998908f9b393630e5f8
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Fri Oct 28 21:18:46 2011 -0700
Convert strncpy/strncat to strlcpy/strlcat
As long as we're carrying around a compatibility copy in os/strl*.c,
might as well use them.
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com>
commit e189dbb3e57d30eb96034d4ce9544ce7a93a371e
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Fri Oct 28 20:19:44 2011 -0700
Convert AllocXTestDevice to use asprintf
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com>
commit 08093c25a91c07ab8af7cece9bba738b827cfd1b
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Mon Oct 24 23:16:30 2011 -0700
Convert some malloc + strncpy pairs into strndup calls
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com>
commit acde97a39d35bfb03af2614c68176ad9afb71f53
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Mon Oct 24 20:28:32 2011 -0700
Add fallback implementation of strndup()
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com>
Linux test code fixed by: Keith Packard <keithp@keithp.com>
commit ed38c2648cf7cc04c1d03f8d14375815f6cf536e
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Fri Oct 28 14:32:56 2011 -0700
Fix Sun compiler check that got turned around
Since the check is for !(compilers that support __builtin_constant_p)
it needs to be !(gcc or new enough Sun cc), but was written as
!(gcc or too old Sun cc).
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com>
commit 7ee7fd1f4c72b2ab6dba0413e63dd2e8b95b2112
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Mon Oct 24 20:39:24 2011 -0700
Remove a couple Error() instances left behind by 09dbfcb0ad7b6c8
Two instances found in the SIOCGIFCONF code for listing network interfaces.
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
commit e47aa9475027ed6a255daefec85561c6b15789bd
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Mon Oct 24 23:40:45 2011 -0700
Enable memory checking during unit testing
If configure is generated with xorg-macros 1.16.0 or newer, and
an appropriate memory checking library is found for the platform,
use it when running unit tests. If not, then no harm is done.
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com>
commit 36670065bd74b870d0da7c6a69a9c0d222b21706
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Tue Oct 25 00:12:48 2011 -0700
Don't require ld -wrap for tests that don't need it
If configure is generated with xorg-macros 1.16 or later, this allows
builders to --enable-unit-test and run the tests other than the xi2
tests which require ld -wrap (and are still wrapped in if HAVE_LD_WRAP
in tests/xi2/Makefile). If an older xorg-macros is used, the existing
behaviour is preserved of requiring ld -wrap for all unit tests, but
no side effects occur, so the minimum xorg-macros version is not raised.
If unit testing is enabled without ld -wrap, then we create a bogus
"xi2-tests" script just to report that we're skipping them.
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com>
commit 0e6b88db7f2e94ccc8153a0e002d176440914e01
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Mon Aug 1 14:09:33 2011 -0700
Don't fallback to wsfb or fbdev on Solaris
We don't ship either one, so don't waste time and make confusing log
entries trying to load them.
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Daniel Stone <daniel@fooishbar.org>
commit 7b0f53f0a5824fcd81ef505beb3e19ac7c77961f
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Wed Nov 23 10:50:13 2011 -0800
Fix Xdmx build on Linux to work with strlcpy changes
Include strlcpy.c in the libdmxconfig.a library with the other functions
shared among the xdmx configuration programs.
Also add a #include "os.h" to the scanner.l file that now calls strlcpy
to include the prototype from $(top_srcdir)/include/os.h.
(To be squashed into
http://cgit.freedesktop.org/~alanc/xserver/commit/?id=c19f0ff5223d428f8ad2ab3c563c974c96a521ba
before next PULL request to avoid breaking bisection.)
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 922c1d817091c7eedfb701f4d9eb4324e22ccca4
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Fri Nov 11 20:44:19 2011 -0500
docs: spell "X Server Version" consistently in titles. Add where missing.
Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 5952efa903d57ac69070f1477ce46223a2a7893c
Author: Keith Packard <keithp@keithp.com>
Date: Sun Nov 20 13:07:33 2011 -0800
Bump version to 1.11.99.1 (1.12 development release 1)
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 795fbe3e6e440f023e52c452106f4c266c13d36c
Author: Keith Packard <keithp@keithp.com>
Date: Sun Nov 20 13:33:12 2011 -0800
Add 'optionstr.h' to include/Makefile.am
This makes sure it gets distributed
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 08ec4da6a7617637914bee1636858474213cf39d
Author: Julien Cristau <jcristau@debian.org>
Date: Sat Nov 5 13:00:07 2011 +0100
Fix ShmPutImage for XYBitmap
We can't call CopyArea in that case because the image has depth 1, which
might not match the target drawable, so we might overrun the shm
segment. Commit 11817a881cb93a89788105d1e575a468f2a8d27c apparently
fixed a similar bug for XYPixmap, but missed the bitmap case.
Fixes: http://bugs.debian.org/629611
Thanks to Alan Curry for diagnosing this and providing a test case.
Reported-and-tested-by: Alan Curry <pacman@kosh.dhis.org>
Reviewed-by: Peter Harris <pharris@opentext.com>
Signed-off-by: Julien Cristau <jcristau@debian.org>
commit 328074890eeb111950e984c6f618311983600b20
Author: dtakahashi42 <dtakahashi42@gmail.com>
Date: Fri Nov 18 11:30:22 2011 -0800
rootless: Fix a server crash when choosing a color with the gimp color wheel
https://trac.macports.org/ticket/30927
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com>
commit 58864146fbdf1820d04825838691e84784ef91bc
Author: Ross Burton <ross@linux.intel.com>
Date: Wed Sep 28 11:46:02 2011 +0100
edid: Add quirk for Acer Aspire One 110
At least one revision of the AAO reports a 190x110mm maximum size but a
451x113mm mode.
X.Org Bug 41141 <https://bugs.freedesktop.org/show_bug.cgi?id=41141>
Signed-off-by: Ross Burton <ross@linux.intel.com>
Reviewed-by: Daniel Stone <daniel@fooishbar.org>
Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com>
commit 34b0e4eee911f8b09a3682a7f1b4c8598ef48b8d
Author: Chris Wilson <chris@chris-wilson.co.uk>
Date: Thu Aug 25 16:04:04 2011 +0100
dri2: Register the DRI2DrawableType after server regeneration
The Resource database is reset upon regeneration and so the dri2 module
needs to re-register its RESTYPE for the drawable or else it will
clobber the next unsuspecting user of the database. Fortunately, DRI2 is
loaded late in the initialisation sequence and was last up until
xf86-video-intel started using the Resource database to track
outstanding swaps...
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com>
Tested-by: Paulo Zanoni <paulo.r.zanoni@intel.com>
commit bfa1a0dd190ed88020d60eba3bb04681c8e83a68
Author: Chris Wilson <chris@chris-wilson.co.uk>
Date: Mon Jan 24 11:17:03 2011 +0000
DRI2: Avoid a NULL pointer dereference
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=41211
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com>
commit eeb21a133b982f71de739baf62e53c8a68f5d495
Author: Chris Wilson <chris@chris-wilson.co.uk>
Date: Mon Jan 24 11:17:03 2011 +0000
VidMode: prevent crash with no modes
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=17431
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com>
commit c1bb8f43b9290c2b18a9f0ac59773ff8f1eb974f
Author: Rami Ylimäki <rami.ylimaki@vincit.fi>
Date: Tue Oct 4 12:25:26 2011 +0300
record: Prevent out of bounds access when recording a reply.
Any pad bytes in replies are written to the client from a zeroed
array. However, record extension tries to incorrectly access the pad
bytes from the end of reply data.
Signed-off-by: Rami Ylimäki <rami.ylimaki@vincit.fi>
Reviewed-by: Erkki Seppälä <erkki.seppala@vincit.fi>
commit 1f5baa924a5907978f564372265d9830ac72a077
Author: Jeremy Huddleston <jeremyhu@apple.com>
Date: Sun Oct 30 20:26:42 2011 -0700
xfree86: Deprecate the use of xf86PciInfo.h
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
Reviewed-by: Tormod Volden <debian.tormod@gmail.com>
commit eb3377ffb8a7baa26c9831e56ed782d48b28fa71
Author: Jeremy Huddleston <jeremyhu@apple.com>
Date: Tue Nov 1 14:59:15 2011 -0700
xfree86: Fix powerpc build with -Werror=int-to-pointer-cast -Werror=pointer-to-int-cast
memType is a uint64_t on powerpc. Using memType only really makes
sense for *physical* addresses, which can be 64-bit for 32-bit
systems running on 64-bit hardware.
However, unmapVidMem() only deals with *virtual* addresses, which
are guaranteed to fit into an uintptr_t.
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
Reviewed-by: Mark Kettenis <kettenis@openbsd.org>
commit a551f126cc4af7a476d9c8fd0cb309d5aa600d54
Author: Pierre-Loup A. Griffais <pgriffais@nvidia.com>
Date: Fri Nov 4 23:26:25 2011 -0700
xfree86: Fix RandR rotation across server generations
245cb8e94fd1599 fixed xf86RotateDestroy() to actually run its teardown
code, causing the Damage object to properly be re-allocated after a
server regeneration. However the block that does that still thinks the
Rotate layer BlockHandler is wrapped from the last generation, meaning
the shadow pixmap is never re-allocated and the Damage object is never
re-registered, causing a blank screen, and potentially a driver crash
on the next teardown after the server asks it to free a 0x0 Pixmap.
Signed-off-by: Pierre-Loup A. Griffais <pgriffais@nvidia.com>
Reviewed-by: Aaron Plattner <aplattner@nvidia.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit bfa2a1857a1efda7f171f10e855d200ca0dbcc1a
Merge: f0d50cc665 e7cb8f802a
Author: Keith Packard <keithp@keithp.com>
Date: Mon Nov 14 09:07:06 2011 -0800
Merge remote-tracking branch 'whot/for-keith'
commit e7cb8f802adf6fc22e7a930c0dfc5c1076781c96
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Wed Nov 9 15:31:57 2011 +1000
Xext: remove unused variable 'n'
xselinux_ext.c: In function 'SELinuxSendItemsToClient':
xselinux_ext.c:340:16: warning: unused variable 'n' [-Wunused-variable]
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Julien Cristau <jcristau@debian.org>
commit bb4aa1f263ad38c175bfda3b7e6c325260ce3f28
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Wed Nov 9 15:31:10 2011 +1000
Xext: don't swap CARD8 in SProcSELinuxQueryVersion
xselinux_ext.c: In function 'SELinuxSendItemsToClient':
xselinux_ext.c:340:16: warning: unused variable 'n' [-Wunused-variable]
xselinux_ext.c: In function 'SProcSELinuxQueryVersion':
xselinux_ext.c:532:62: error: call to 'wrong_size' declared with attribute
error: wrong sized variable passed to swap
xselinux_ext.c:533:62: error: call to 'wrong_size' declared with attribute
error: wrong sized variable passed to swap
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Julien Cristau <jcristau@debian.org>
commit 35ec24cf245e5ef676e98a0bf7c77296a3f1ff63
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Mon Aug 1 14:14:02 2011 +1000
input: replace remaining GetPairedDevice() with GetMaster()
Wherever it's obvious which device we need (keyboard or pointer), use
GetMaster() instead of GetPairedDevice(). It is more reliable in actually
getting the device type we want.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Daniel Stone <daniel@fooishbar.org>
commit fc16917ad6f0d2722bfb5c5eeca955dd3bc4125a
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri Apr 15 13:32:10 2011 +1000
include: export GetProximityEvents and QueueProximityEvents
This is mainly needed for consistency with GetPointerEvents and friend.
No-one seems to actually need this function from outside the usual DDXs.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com>
commit 11840595a1be9f2df7390bcc708cc176e60d3ef2
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu Nov 3 08:58:58 2011 +1000
dix: Don't let a driver without a ProximityClassRec post events
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com>
commit 22715e465b415b3351b83b8279a4f44157f63199
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu Oct 27 11:03:39 2011 +1000
Xi: allow passive keygrabs on the XIAll(Master)Devices fake devices
They don't have a KeyClassRec, but we must still allow passive grabs on
them.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Tested-by: Bastien Nocera <hadess@hadess.net>
Reviewed-by: Daniel Stone <daniel@fooishbar.org>
commit f0d50cc6651dce3a8a3cd3fb84210aa92b139763
Author: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Date: Sun Nov 6 12:20:51 2011 -0500
Fix vesa's VBE PanelID interpretation
xserver's VESA driver's VBE (Vesa BIOS Extensions) code
includes a PanelID probe, which can get a monitor's native
resolution. From this, using CVT formulas, it derives
horizontal sync rate and a vertical refresh rate ranges.
It however, only derives the upper bounds of the ranges, and
the lower bounds cannot de derived. By default, they are set
to hardcoded constants which represent the lowest supported
resolution: 640x480. The constants in vbe.c however, were
not actually derived from forulas, but carried over from
other code from the bad old days, and are not relevant
to flat panel displays. This caused, for example, EEEPC701's
panel, with a native resolution of 800x480, to end up with
a upper bound of the horizontal sync rate that was lower
than the hardcoded lower bound, which of course broke things.
These numbers have been rederived using both my own CVT tool
based on xf86CVTMode(), and using the provided 'cvt' tool
that comes with xserver.
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit c643c2b7bf480f5c27ff8606bda087f8bff3b154
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Tue Nov 1 12:17:50 2011 +1000
xfree86: duplicate name and driver from pInfo for NewInputDeviceRequest
xorg.conf devices had the name and driver set in the DDX's InputInfoPtr list
but not in the option list for those devices. That information was lost when
passing the options into NewInputDeviceRequest. NIDR then refused to start
the devices.
Introduced in xorg-server-1.11.0-250-ge4cd24e
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Tested-by: James Cloos <cloos@jhcloos.com>
commit 9cc44b955b27de33348d6a20bebc9704930ee18e
Author: Rui Matos <tiagomatos@gmail.com>
Date: Tue Nov 1 21:32:36 2011 +0000
randr: Make the RRConstrainCursorHarder logic the same as miPointerSetPosition
The constraining logic in RRConstrainCursorHarder allows the cursor to reach
crtc positions of x = width and y = height while the constraining code in
miPointerSetPosition only allows it to reach x = width - 1 and y = height - 1
for the analogous screen case.
This patch makes the former's logic equivalent to the latter's which allows
applications to benefit from Fitts's law. E.g. a maximized application
adjacent to a crtc border wouldn't get pointer events if the user moved the
pointer all the way until it's contained.
Signed-off-by: Rui Matos <tiagomatos@gmail.com>
Reviewed-by: Daniel Stone <daniel@fooishbar.org>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit f47f6b6a53d414f28374391964c2930427d28f46
Author: James Simmons <jsimmons@infradead.org>
Date: Thu Nov 3 13:20:18 2011 +0000
don't map cursors in sw cursor mode
commit d4eebe5217a89de196c1933e1fe4d37e22d59c6b
Author: Dave Airlie <airlied@redhat.com>
Date: Thu Nov 3 13:18:46 2011 +0000
configure: don't require xvmc.
Not needed in here
commit 548c6fe044068ffba9b5306dc6b11f2ba22782a4
Merge: 3881b0bf1c ffe8ec86db
Author: Keith Packard <keithp@keithp.com>
Date: Wed Nov 2 21:35:31 2011 -0700
Merge remote-tracking branch 'jturney/master'
commit 3881b0bf1ce11a62473650bdf6ee01a1762f6f91
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Tue Nov 1 07:17:07 2011 -0400
mi: remove deprecated miPointerAbsoluteCursor from design doc
Function was removed from the code by commit f5409aa026
Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com>
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit d91aa0e6601bdf3e2cfa57b3412ab14ac486edc4
Merge: 8df3a9ca5a 401150d7dc
Author: Keith Packard <keithp@keithp.com>
Date: Wed Nov 2 21:20:07 2011 -0700
Merge remote-tracking branch 'whot/two-screen-coordinates'
commit 8df3a9ca5abbd56eb2013fa65250d21a8f18865b
Merge: 8329afa59d ef895484c8
Author: Keith Packard <keithp@keithp.com>
Date: Wed Nov 2 21:18:16 2011 -0700
Merge remote-tracking branch 'koba/reviewed'
commit ffe8ec86db2655b2c83e5ae61521898140c855ac
Author: Colin Harrison <colin.harrison@virgin.net>
Date: Sat Oct 8 15:05:22 2011 +0100
hw/xwin: Fix a typo in ddraw.h
Fix a (fortunately benign) typo in ddraw.h
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
commit 48fda3c52b41157313b7fd56d9f3fa3ad4166ed7
Author: Yaakov Selkowitz <yselkowitz@users.sourceforge.net>
Date: Thu Feb 18 20:37:00 2010 -0600
hw/xwin: Revert "Fix bug #5735, Serious flaw in CygwinX clipboard"
This commit wreaks havoc with other programs which manage the clipboard,
such as MS Office Clipboard or Win32 VNC viewers:
http://sourceware.org/bugzilla/show_bug.cgi?id=9910
This reverts commit 70ddd0f39d5118db72a1a4e473cbfb502f1ed9ec.
Signed-off-by: Yaakov Selkowitz <yselkowitz@users.sourceforge.net>
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Reviewed-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
commit 3ead1d810b0e157078db39712e02ea6dc85216d8
Author: Jon TURNEY <jon.turney@dronecode.org.uk>
Date: Sun Jul 3 19:10:52 2011 +0100
hw/xwin: Stop pretending we work on NT4
We already link directly to some functions not available in NT4, so stop
pretending we will work on NT4 and link directly to EnumDisplayMonitors()
and SHGetFolderPath()
Also remove mentions of NT4 & Win95 from error messages
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
commit f6529a05a2f087cb57a7fe84f226fef3780728d0
Author: Colin Harrison <colin.harrison@virgin.net>
Date: Sat Oct 8 14:39:07 2011 +0100
Xming: Always remove temporary file used when invoking xkbcomp on Win32
When built for native Win32, pipe() & fork() aren't available, so we
use a tempoary file and system() to invoke xkbcomp
Ensure the temporary file is always removed. It was only being removed
on most errors, not on success :S
Also fix a couple of warnings which occur when built with WIN32 defined
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Reviewed-by: Jon TURNEY <jon.turney@dronecode.org.uk>
commit ee1985386700288af1a8b1789dcad0d7d9c97393
Author: Jon TURNEY <jon.turney@dronecode.org.uk>
Date: Sat Apr 16 23:28:45 2011 +0100
hw/xwin: Link directly to TrackMouseEvent()
TrackMouseEvent has existed in user32 since at least NT4, so
don't bother with jumping through all the ancient compatibility hoops
of finding if _TrackMouseEvent() exists in comctl32 so it can check
if TrackMouseEvent() exists in user32 to see if it needs to emulate
it...
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
commit e2e6fab1efa6895256ac0ed4d5b054a88ad18077
Author: Jon TURNEY <jon.turney@dronecode.org.uk>
Date: Tue Mar 23 04:45:37 2010 -0500
Cygwin/X: Make default DPI match native DPI
Make the default DPI match the current Windows DPI setting. If that
setting can't be retrieved, change the fallback DPI value from 75 dpi
to 96 dpi.
Mark the application as dpiAware in the manifest, which prevents
dpi virtualization for high (>96) dpi values on Vista and later.
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Signed-off-by: Yaakov Selkowitz <yselkowitz@users.sourceforge.net>
Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
commit 8329afa59dd5ea3adf7adebdb2111a9bccbb126b
Author: Aaron Plattner <aplattner@nvidia.com>
Date: Mon Oct 31 15:01:12 2011 -0700
dix: Reinstate GetImage window size check
Commit 587c3a2d1961834558193e8e14e8e381a077a253 fixed DoGetImage to
check windows against their backing drawables, rather than against the
screen dimensions, to prevent reading outside the bounds of redirected
windows' backing pixmaps (see bug #22804). Unfortunately, while
making that change I also removed the check that the rectangle is
contained within the bounds of the source window, which is a violation
of the specification:
If the drawable is a window, the window must be viewable, and it
must be the case that, if there were no inferiors or overlapping
windows, the specified rectangle of the window would be fully
visible on the screen *and wholly contained within the outside
edges of the window* (or a Match error results). Note that the
borders of the window can be included and read with this request.
(emphasis mine)
Reinstate the window dimension check, to return BadMatch if the
GetImage request falls outside the bounds of the window.
Fixes X Test Suite test XGetImage-15:
400|0 15 1 11:05:41|IC Start
200|0 15 11:05:41|TP Start
520|0 15 00005146 1 1|VSW5TESTSUITE PURPOSE 15
520|0 15 00005146 1 2|Assertion XGetImage-15.(A)
520|0 15 00005146 1 3|When the drawable is a window and the window is viewable
520|0 15 00005146 1 4|and it is not the case that given there were no inferiors or
520|0 15 00005146 1 5|overlapping windows the specified rectangle of the window
520|0 15 00005146 1 6|would be fully visible on the screen and wholly contained
520|0 15 00005146 1 7|within the outside edges of the window, then a BadMatch
520|0 15 00005146 1 8|error occurs.
520|0 15 00005146 1 9|METH: Create window which is not fully visible on the screen.
520|0 15 00005146 1 10|METH: Call XMapWindow to make sure the window is viewable.
520|0 15 00005146 1 11|METH: Call XGetImage with rectangle extending beyond edge of screen.
520|0 15 00005146 1 12|METH: Verify XGetImage return value is null.
520|0 15 00005146 1 13|METH: Verify that BadMatch error occurred.
520|0 15 00005146 1 14|METH: Create window which is fully visible on the screen.
520|0 15 00005146 1 15|METH: Call XMapWindow to make sure the window is viewable.
520|0 15 00005146 1 16|METH: Call XGetImage with rectangle extending beyond edge of window.
520|0 15 00005146 1 17|METH: Verify XGetImage return value is null.
520|0 15 00005146 1 18|METH: Verify that BadMatch error occurred.
520|0 15 00005146 1 19|REPORT: Got Success, Expecting BadMatch
520|0 15 00005146 1 20|REPORT: Null image not returned.
220|0 15 1 11:05:41|FAIL
Signed-off-by: Aaron Plattner <aplattner@nvidia.com>
Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 132545ff576cc69ed63f5a08127151fe550de4c3
Merge: d0c6732a99 d7c44a7c97
Author: Keith Packard <keithp@keithp.com>
Date: Sun Oct 30 16:57:58 2011 -0700
Merge remote-tracking branch 'whot/for-keith'
commit d7c44a7c9760449bef263413ad3b20f19b1dc95a
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Mon Oct 24 12:00:32 2011 +1000
dix: block signals when closing all devices
When closing down all devices, we manually unset master for all attached
devices, but the device's sprite info still points to the master's sprite
info. This leaves us a window where the master is freed already but the
device isn't yet. A signal during that window causes dereference of the
already freed spriteInfo in mieqEnqueue's EnqueueScreen macro.
Simply block signals when removing all devices. It's not like we're really
worrying about high-responsive input at this stage.
https://bugzilla.redhat.com/show_bug.cgi?id=737031
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Julien Cristau <jcristau@debian.org>
commit 820d9040f50a8440741b3aefbc069a3ad81e824e
Author: Servaas Vandenberghe <vdb@picaros.org>
Date: Wed Aug 31 07:06:49 2011 +0200
xfree86: fix potential buffer overflow
The patch below fixes a potential buffer overflow in xf86addComment().
This occurs if curlen > 0 && eol_seen == 0 && iscomment == 0 , as
follows from the code:
char *xf86addComment(char *cur, char *add)
<...>
len = strlen(add);
endnewline = add[len - 1] == '\n';
len += 1 + iscomment + (!hasnewline) + (!endnewline) + eol_seen;
if ((str = realloc(cur, len + curlen)) == NULL)
return cur;
cur = str;
if (eol_seen || (curlen && !hasnewline))
cur[curlen++] = '\n';
if (!iscomment)
cur[curlen++] = '#';
strcpy(cur + curlen, add);
if (!endnewline)
strcat(cur, "\n");
Signed-off-by: Servaas Vandenberghe <vdb@picaros.org>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
[whot: added buffer overflow test case]
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 63e87b8639eb8e0b4e32e5d3a09099d31a03bbcd
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Tue Oct 25 11:49:26 2011 +1000
xfree86: reduce calls to input_option_get_key/value
No functional changes.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Dan Nicholson <dbn.lists@gmail.com>
commit d0c6732a99c9a7e40752b9ba7898a01c325103fa
Author: Anssi Hannula <anssi.hannula@iki.fi>
Date: Wed Apr 20 14:34:52 2011 +0300
xfree86: add nouveau as the first automatic driver for NVIDIA hardware
Add nouveau as the first driver on linux for NVIDIA hardware when
driver autoconfiguration is done, as it is more capable than nv.
nv is also kept in the list as it is more widely supported and because
some old cards are not supported by nouveau.
Signed-off-by: Anssi Hannula <anssi.hannula@iki.fi>
Reviewed-by: Daniel Stone <daniel@fooishbar.org>
Reviewed-by: Cyril Brulebois <kibi@debian.org>
Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit ef895484c8a43d447d9d3ea7d4226936cc5f92cc
Author: Alexandr Shadchin <Alexandr.Shadchin@gmail.com>
Date: Tue Oct 4 10:46:00 2011 +0600
bsd: alpha_video: Remove unused variables
Signed-off-by: Alexandr Shadchin <Alexandr.Shadchin@gmail.com>
Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
commit fea7c7a8c070ec17ec03e4cb193834b6ca72fb72
Author: Alexandr Shadchin <Alexandr.Shadchin@gmail.com>
Date: Mon Oct 3 23:03:31 2011 +0600
bsd: alpha_video: Simplify #include
Signed-off-by: Alexandr Shadchin <Alexandr.Shadchin@gmail.com>
Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
commit 93a3a28f2c1e95ea7fae6cf1c2fb50b30eae9c33
Author: Alexandr Shadchin <Alexandr.Shadchin@gmail.com>
Date: Tue Oct 4 00:45:09 2011 +0600
bsd: alpha_video: Function sethae() need only for FreeBSD
Return value sethae() is becoming void because no caller used it. Also old
msb_set static checked by each caller is replaced by the p.hae static checked
in sethae() when it's called.
Signed-off-by: Alexandr Shadchin <Alexandr.Shadchin@gmail.com>
Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
commit 05b41e2dc60a0aefc685a33260e5d8e09580908b
Author: Alexandr Shadchin <Alexandr.Shadchin@gmail.com>
Date: Tue Oct 4 17:20:13 2011 +0600
Move check definition MAP_FAILED in xf86_OSlib.h
Also remove odd definition MAP_FAILED.
Signed-off-by: Alexandr Shadchin <Alexandr.Shadchin@gmail.com>
Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
commit af56e502f5ddf1d2d495b633734cadcb023b7c36
Author: Alexandr Shadchin <Alexandr.Shadchin@gmail.com>
Date: Tue Oct 4 16:49:22 2011 +0600
Remove odd definition DEV_MEM
DEV_MEM defined in xf86_OSlib.h
Signed-off-by: Alexandr Shadchin <Alexandr.Shadchin@gmail.com>
Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
commit 0481e9d3d1e0dbc05099184128de5cd6f13445f7
Author: Alexandr Shadchin <Alexandr.Shadchin@gmail.com>
Date: Tue Oct 4 15:09:45 2011 +0600
Remove BSDi support
Signed-off-by: Alexandr Shadchin <Alexandr.Shadchin@gmail.com>
Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
commit 8838a86fd325cb7f262a582d22ccdaa8a8f1a534
Author: Alexandr Shadchin <Alexandr.Shadchin@gmail.com>
Date: Tue Oct 4 14:57:20 2011 +0600
Remove unused VT_SYSREQ_DEFAULT
Signed-off-by: Alexandr Shadchin <Alexandr.Shadchin@gmail.com>
Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
commit 91131037a2d2e07079de5d222d8a8c95300750cc
Author: Alexandr Shadchin <alexandr.shadchin@gmail.com>
Date: Sat Oct 29 00:14:32 2011 +0600
Fix position _X_EXPORT
Signed-off-by: Alexandr Shadchin <Alexandr.Shadchin@gmail.com>
Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 219bcec73d3554c57b87f28812ab06a66b739b19
Author: Alexandr Shadchin <alexandr.shadchin@gmail.com>
Date: Sat Oct 29 00:14:31 2011 +0600
bsd: Remove odd message about -sharevts
This is missing in commit 'xfree86: move -novtswitch & -sharevts argument
handling up to common layer'
Signed-off-by: Alexandr Shadchin <Alexandr.Shadchin@gmail.com>
Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 005ab41986b0bb6a4e626aee7a7a542247f422e7
Author: Dave Airlie <airlied@redhat.com>
Date: Thu Oct 27 08:38:45 2011 +1000
test: fix two more failing FP3232 tests
And put a comment in to explain why we're testing for a frac between .3 and
.6. We can't directly compare the frac since the floating/fixed point
conversion loses precision.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 286fa9bf9b4ffb0f9dbd3f1cae46ddcb27ee9318
Author: Jeremy Huddleston <jeremyhu@apple.com>
Date: Tue Oct 25 23:53:43 2011 -0700
XWin: windowswm: Correct byte swapping in event notifications
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
Reviewed-by: Jon TURNEY <jon.turney@dronecode.org.uk>
commit dc054fefc586c5b404fe0f949dbd456e5267c647
Author: Jeremy Huddleston <jeremyhu@apple.com>
Date: Tue Oct 25 23:49:33 2011 -0700
XQuartz: appledri: Correct byte swapping in event notifications
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
commit d5fee2b638fabeb8bec31a24e57d5c2a232d0893
Author: Jeremy Huddleston <jeremyhu@apple.com>
Date: Tue Oct 25 23:48:16 2011 -0700
XQuartz: applewm: Correct byte swapping in event notifications
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
commit 5701ab4a441eb113abd0851b0d71b82d12112854
Merge: 7d50211ab5 a41214bc9a
Author: Keith Packard <keithp@keithp.com>
Date: Mon Oct 24 22:09:00 2011 -0700
Merge remote-tracking branch 'whot/for-keith'
commit a41214bc9a0f326c6dc129e4a6382efb8b826862
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Tue Oct 25 12:57:07 2011 +1000
kdrive: check for null memory, fix OOB
If key/value allocation failed, don't bother adding another InputOption. And
make sure the memory allocated is large enough for the trailing \0
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com>
commit ffe20acedb3cdc4811eb52f8fc540ba6af7339fa
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu Oct 20 16:42:20 2011 +1000
Use new FP1616/FP3232 conversion functions
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com>
commit 7500d841f4c709ae0edc6420332096d3b9ef9fcc
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu Oct 20 16:49:28 2011 +1000
test: fix test with new double -> fp3232 conversion functions
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Tested-by: Dave Airlie <airlied@redhat.com>
Reviewed-by: Dave Airlie <airlied@redhat.com>
commit 4bb5d8fae4f9a70f12591315f0b267a2ea826a0c
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Wed Oct 19 13:17:51 2011 +1000
Xi: send DeviceChangedEvents when the scroll valuators change value
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Daniel Stone <daniel@fooishbar.org>
commit 1f4af6c12fb5d4c19f4eac3df768517c9132cc88
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Wed Oct 19 12:28:37 2011 +1000
dix: accept a NULL master for CreateClassesChangedEvent
If a floating device changes, the master is NULL but we must still create a
DCE for it.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Daniel Stone <daniel@fooishbar.org>
commit d77dec6971e4a0b306c8dbd5adf627908d7972cb
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Wed Oct 19 12:11:16 2011 +1000
Xi: ensure the deviceid for DeviceChangedEvents is always the right one
If we're sending the event for a given device, make sure the deviceid is
that of the device.
This allows callers to use the same DCE for slave and master without having
to fiddle the DCE's internal fields.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Daniel Stone <daniel@fooishbar.org>
commit e9dee21fa3213bfe87b2b728a38eb41d3ba0e664
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Tue Oct 18 17:47:59 2011 +1000
dix: pass the flags into the CreateClassesChangedEvent
No effective functional changes, prep work for future patches.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Daniel Stone <daniel@fooishbar.org>
commit fcdd2587a17437b643b4592aa7f65d11c05a4cd8
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Tue Oct 18 17:41:29 2011 +1000
dix: drop unused argument from XISendDeviceChangedEvent
Instead of device and master (and just using master), drop the master
argument and let the callers pass in the device the event is to be sent for.
No effective functional changes.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Daniel Stone <daniel@fooishbar.org>
commit 8473e441b0f832775153281bc3df5e2d4feb2b36
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Tue Oct 18 17:11:27 2011 +1000
dix: add ScrollInfo to DeviceChangedEvents
3304bbff9b4ed63f1a47410a5320a136420ba2c6 added smooth scrolling support for
pointer events and for XIQueryDevice but didn't add the matching parts to
XIDeviceChangedEvents.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Daniel Stone <daniel@fooishbar.org>
commit e3f6a76dd480717eae4b17ad8e2ff707de2ffe4c
Author: Andreas Wettstein <wettstein509@solnet.ch>
Date: Thu Aug 11 16:33:33 2011 +1000
xkb: Support noLock and noUnlock flags for LockMods
These flags are required by the XKB spec section 6.3.
Signed-off-by: Andreas Wettstein <wettstein509@solnet.ch>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 6f33593dc087d367d899d1cb6e6e30b282d922e2
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri Oct 21 09:09:55 2011 +1000
xfree86 doc: replace driver "keyboard" with "kbd"
We've deprecated keyboard a long time ago
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
commit e4cd24e717ef1059804b3f6bb483810b708cd56a
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri Aug 5 14:48:02 2011 +1000
xfree86: use NewInputDeviceRequest for xorg.conf devices too
Only use one init path for input devices - through NIDR.
This requires that inp_driver and inp_identifier from the
XF86ConfInputRec are copied over into the options for NIDR to see them.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Daniel Stone <daniel@fooishbar.org>
commit 1ecc427a39d41e723912492b846512fd0ad9af2d
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Wed Aug 10 14:37:41 2011 +1000
dix: move #if statement to stop compiler warning
ptrveloc.c: In function 'QueryTrackers':
ptrveloc.c:598:34: warning: variable 'used_offset' set but not used
[-Wunused-but-set-variable]
used_offset is used, but only in the debugging code. Move the #if statement
to ignore that warning.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Daniel Stone <daniel@fooishbar.org>
commit f9067c1dd8ce9058eb48a20dfae52bc8cf3a1e55
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri Aug 5 14:05:58 2011 +1000
xfree86: Fix a comment, the old function doesn't exist anymore
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Daniel Stone <daniel@fooishbar.org>
commit aeab26e9e1751e1e3514798fa53e9bd604b0d254
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Wed Aug 10 15:58:34 2011 +1000
xfree86: use xf86AddNewOption instead of xf86addNewOption
The former strdups for us. If the strdup fails we miss out on the
CorePointer option (default on anyway) and we're likely to fall over soon
anyway, so let's pretend this is the same behaviour.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Daniel Stone <daniel@fooishbar.org>
commit c39c8d34282b82d73c3c69a16cf0c2816256d85b
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Wed Aug 10 14:38:58 2011 +1000
input: switch InputOption to use XF86OptionRec storage.
Use the same struct for both InputOption and XF86OptionRec so we don't need
to convert to and fro the two in the config backends.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Dan Nicholson <dbn.lists@gmail.com>
Reviewed-by: Daniel Stone <daniel@fooishbar.org>
commit 16ac78a53c1edeae183db8672104587b306cfe13
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Tue Oct 25 11:40:58 2011 +1000
kdrive: switch to new InputOption API.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Keith Packard <keithp@keithp.com>
commit 7d50211ab57a35910d79fc3f67ae89aff91fa995
Author: Christopher Yeleighton <giecrilj@stegny.2a.pl>
Date: Mon Oct 24 18:47:06 2011 -0700
Bug 38420: Xvfb crashes in miInitVisuals() when started with depth=2
https://bugs.freedesktop.org/show_bug.cgi?id=38420
Exit with fatal error message, not segfault.
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit d9d3a01ffca5e2de650d098231e16205781804c5
Merge: 17416e88dc fb55f8f790
Author: Keith Packard <keithp@keithp.com>
Date: Mon Oct 24 18:12:23 2011 -0700
Merge remote-tracking branch 'jeremyhu/master'
commit 17416e88dcfcc584fe5f87580d5d2b719b3521c3
Author: Dave Airlie <airlied@redhat.com>
Date: Thu Oct 20 14:43:01 2011 +0100
xf86Crtc: handle no outputs with no modes harder.
If you started an X server with no connected outputs, we pick a default
1024x768 mode, however if you then ran an xvidmode using app against that
server it would segfault the server due to not finding any valid modes.
This was due to the no output mode set code, only adding the modes to the
scrn->modes once, when something called randr 1.2 xf86SetScrnInfoModes would
get called and remove all the modes and we'd end up with 0.
This change fixes xf86SetScrnInfoModes to always report a scrn mode of at
least 1024x768, and pushes the initial configuration to just call it instead
of setting up the mode itself.
Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=746926
I've seen other bugs like this on other distros so it might also actually fix them.
Signed-off-by: Dave Airlie <airlied@redhat.com>
Reviewed-by: Keith Packard <keithp@keithp.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit fb55f8f790f69f30b0ab18648c337bde9d41f5ff
Author: Jeremy Huddleston <jeremyhu@apple.com>
Date: Mon Oct 24 16:45:36 2011 -0700
XQuartz: Fix the filename of our log file
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
commit 1c8bda798b4480bab0f0da6f531e4770c7a1f771
Author: Jeremy Huddleston <jeremyhu@apple.com>
Date: Fri Oct 21 10:27:16 2011 -0700
XQuartz: appledri: Allow byte swapped requests
Even though it's only valid when local, it is possible for a local
client and the server to not match endianness, such as when running
a ppc application under Rosetta.
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
commit 14205ade0c750191bf43fba8bd55c65dba912cf4
Author: Jeremy Huddleston <jeremyhu@apple.com>
Date: Thu Oct 20 22:34:44 2011 -0700
XQuartz: appledri: Fix byte swapping in replies
Even though it's only valid when local, it is possible for a local
client and the server to not match endianness, such as when running
a ppc application under Rosetta.
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
Reviewed-by: Jamey Sharp <jamey@minilop.net>
commit 2ba0ac202ad64eb4a555715980ba538de19c9fd7
Author: Jeremy Huddleston <jeremyhu@apple.com>
Date: Thu Oct 20 22:23:07 2011 -0700
XQuartz: appledri: Set the correct reply length for XAppleDRICreatePixmap
http://xquartz.macosforge.org/trac/ticket/508
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
Reviewed-by: Jamey Sharp <jamey@minilop.net>
commit e4f257748b51d041275a64b8be408729ea05fbb5
Author: Jeremy Huddleston <jeremyhu@apple.com>
Date: Thu Oct 20 11:35:54 2011 -0700
XQuartz: appledri: Change whitespace in appledristr.h to match mesa
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
Reviewed-by: Jamey Sharp <jamey@minilop.net>
commit 83fef4235db86343477b4ec9858c6ba35e1aa7d9
Author: Jeremy Huddleston <jeremyhu@apple.com>
Date: Sun Oct 16 02:12:38 2011 -0700
Xnest: Match the host's keymap
This was a regression.
Introduced by: 08363c5830bdea34012dcd954b45ccfdc79a3a7e and
32db27a7f867b503c2840ca7b815e96d10be9210
Masked by: 1e69fd4a60147287b31e53bfc61543fb17bb82c8
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
Reviewed-by: Jamey Sharp <jamey@minilop.net>
commit 4597ac6fe0580323860080dae2576733acc49757
Author: Jeremy Huddleston <jeremyhu@apple.com>
Date: Mon Oct 17 23:45:32 2011 -0700
test: Add unit test for mieq
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
commit ad450d76e468cd62406c4f09e71e131f7ff4555c
Author: Jeremy Huddleston <jeremyhu@apple.com>
Date: Mon Oct 17 21:16:37 2011 -0700
mieq: Reserve some space in EQ for release and other special events
The last 64 events in the event queue will be reserved for release
events in order to help return the system to a cleaner state when
it comes back from a soft wedge.
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 7d153f25be678acf500236ae422b33d17e6cb7a6
Author: Jeremy Huddleston <jeremyhu@apple.com>
Date: Sat Oct 15 22:51:30 2011 -0700
mieq: Provide better adaptability and diagnostics during mieq overflow
This patch changes from a static length event queue (512) to one that
starts at 128 and grows to 4096 as it overflows, logging each time it
grows.
This change also allows for multiple backtraces to be printed when the
server is wedged rather than just one. This increased sampling should
help identify the true hog in cases where one backtrace might be
insufficient.
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 09eaa1f6f19f9a85a3cb74a18ac898162db451df
Author: Jeremy Huddleston <jeremyhu@apple.com>
Date: Sat Oct 30 14:55:06 2010 -0700
configure.ac: Add -fno-strict-aliasing to CFLAGS
This should force the server to have -fno-strict-aliasing even once it
is removed from the warning flags.
See: https://bugs.freedesktop.org/show_bug.cgi?id=31238
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
Reviewed-by: Gaetan Nadon <memsize@videotron.ca>
commit a046d649e4c7e4d28f350382dcdd293e92a59aad
Author: Jeremy Huddleston <jeremyhu@apple.com>
Date: Wed Oct 5 15:02:52 2011 -0700
test: Silence some debug lines from the input unit tests
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 8db554d2d830953de3c6d0cbf58e23d53d89009f
Author: Jeremy Huddleston <jeremyhu@apple.com>
Date: Thu Oct 20 14:28:56 2011 -0700
Xnest: Fix DestroyNotify handler
This partially reverts the unwanted changes that crept into
c13a48e74ec89eafa9b529a87253a631ef02f2e2
Reported-by: Julien Cristau <jcristau@debian.org>
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
Reviewed-by: Julien Cristau <jcristau@debian.org>
commit ff61592441916b83aeb778c74352bb5b26247f84
Merge: af3f64fb77 525d4172b2
Author: Keith Packard <keithp@keithp.com>
Date: Wed Oct 19 19:14:32 2011 -0700
Merge remote-tracking branch 'aplattner/for-master'
commit af3f64fb77c13180e513ee99d1fd9a1b624fd8ea
Merge: 15bbdc103b df0dd36dee
Author: Keith Packard <keithp@keithp.com>
Date: Wed Oct 19 17:33:07 2011 -0700
Merge remote-tracking branch 'hramrach/pull'
commit 15bbdc103b34b6b374815698946e6c409421a644
Merge: a5266dcb3a 323869f329
Author: Keith Packard <keithp@keithp.com>
Date: Wed Oct 19 17:26:50 2011 -0700
Merge remote-tracking branch 'whot/for-keith'
commit a5266dcb3a60587e1877f90c18552baf60b597a0
Author: Ville Syrjala <syrjala@sci.fi>
Date: Sun Oct 9 01:11:04 2011 +0300
composite: Update borderClip in compAllocPixmap()
Previously the parent constrained borderClip was copied over
when compRedirectWindow() is called. That is insufficient eg. in
case the window was already redirected, but not yet realized. So
copy the borderClip over in compAllocPixmap() instead.
Example:
Window 1 is below an automatically redirect window 2. Window 2 is
unmapped and moved outside the extents of window 1. Window 2 is
then mapped again, and MarkOverlappedWindows() uses the up to
date borderSize of window 2 to mark windows, which leaves
window 1 unmarked. Then exposures are calculated using the stale
borderClip of window 2, which causes the window below window 2,
to be exposed through an apparent hole in window 1.
Fixes: https://bugs.freedesktop.org/show_bug.cgi?id=22566
Signed-off-by: Ville Syrjala <syrjala@sci.fi>
Reviewed-by: Keith Packard <keithp@keithp.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit e4787ec20b1b9d30fe00f17b60eb0898190bf77d
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Mon Oct 17 15:08:14 2011 -0400
XWinrc.man: fix warning: tab character in unquoted macro argument #35054
Spaces or tabs do not affect the text output layout.
Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com>
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 321873f8045139edd47b526a765f8b1c66f53cd4
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Mon Oct 17 15:08:13 2011 -0400
xorg.conf.man: fix 382: warning: missing `)' (got `R') #35054
http://www.gnu.org/software/groff/manual/html_node/Man-usage.html
Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 3e145d3d67b472cb5d74cb8078b614160c4722b7
Author: Jesse Barnes <jbarnes@virtuousgeek.org>
Date: Thu Oct 13 12:01:10 2011 -0700
crtc: match full preferred modes if possible when choosing an initial config
It's fairly common to have multiple, identical monitors plugged in. In
that case, it's preferable to run the monitor's preferred mode on each
output, rather than just matching the width & height and end up with
different timings or refresh rates.
Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>
Reviewed-by: Keith Packard <keithp@keithp.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 525d4172b246e13b8122e059e3b22866e00561d9
Author: Chris Wilson <chris@chris-wilson.co.uk>
Date: Sun Sep 4 09:34:08 2011 -0700
render: export TriStrip and TriFan to the drivers
Rather than perform an intermediate copy and expand the strip and the
fan into a triangle list (thereby tripling the number of edges that the
driver needs to process), allow the backend to hook directly into the
appropriate Composite function.
In order to extend the PictureScreen, without needlessly bumping the
ABI, we move the existing copy implementations to mipict.c and assign
those by default. To notify the ddx that the new entry points are
available, we introduce PICTURE_SCREEN_VERSION.
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Reviewed-by: Aaron Plattner <aplattner@nvidia.com>
commit 9b26e6bc8d2cdf5bac3025796855ccf05972358f
Author: Luc Verhaegen <libv@skynet.be>
Date: Tue Aug 23 15:19:59 2011 -0700
randr: stop clients from deleting immutable output properties
Immutable in randr means that clients are not able to alter the
property itself, they are only allowed to alter the property value.
This logically means that the property then should not be deleted
by the client either.
Signed-off-by: Luc Verhaegen <libv@skynet.be>
Reviewed-by: Rami Ylimäki <rami.ylimaki@vincit.fi>
Reviewed-by: Aaron Plattner <aplattner@nvidia.com>
Signed-off-by: Aaron Plattner <aplattner@nvidia.com>
commit c8413362049cee8c30e0a9d67f78f9ebefe8e71f
Merge: 64d2d1bef1 b67581cf82
Author: Keith Packard <keithp@keithp.com>
Date: Tue Oct 18 07:45:24 2011 -0700
Merge remote-tracking branch 'herrb/master'
commit b67581cf825940fdf52bf2e0af4330e695d724a4
Author: Matthieu Herrb <matthieu.herrb@laas.fr>
Date: Mon Oct 17 22:27:35 2011 +0200
Fix CVE-2011-4029: File permission change vulnerability.
Use fchmod() to change permissions of the lock file instead
of chmod(), thus avoid the race that can be exploited to set
a symbolic link to any file or directory in the system.
Signed-off-by: Matthieu Herrb <matthieu.herrb@laas.fr>
Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
commit 6ba44b91e37622ef8c146d8f2ac92d708a18ed34
Author: Matthieu Herrb <matthieu.herrb@laas.fr>
Date: Mon Oct 17 22:26:12 2011 +0200
Fix CVE-2011-4028: File disclosure vulnerability.
use O_NOFOLLOW to open the existing lock file, so symbolic links
aren't followed, thus avoid revealing if it point to an existing
file.
Signed-off-by: Matthieu Herrb <matthieu.herrb@laas.fr>
Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
commit df0dd36deea0c756819825113e825059ddd19243
Author: Michal Suchanek <hramrach@centrum.cz>
Date: Sat Oct 8 14:26:24 2011 +0200
Do not uselessly reload modules in DuplicateModule
The function does not initialize the module so it has no business
loading it. If some user of DuplicateModule expects a module actually
loaded they should use LoadModule.
Signed-off-by: Michal Suchanek <hramrach@centrum.cz>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 24d435163eb5fbd9b73cd8ba13a9b3cdbbe8a1df
Author: Michal Suchanek <hramrach@centrum.cz>
Date: Sat Oct 8 14:19:34 2011 +0200
Use UnloadModuleOrDriver for UnloadSubModule.
Signed-off-by: Michal Suchanek <hramrach@centrum.cz>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 0d4bb5442ceb8e8e4a8de6cfc4203cae469eee72
Author: Michal Suchanek <hramrach@centrum.cz>
Date: Sat Oct 8 14:13:33 2011 +0200
Unload submodules.
Signed-off-by: Michal Suchanek <hramrach@centrum.cz>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
commit b04aff76ac2eb461c71b85525a00e25efb8bf267
Author: Michal Suchanek <hramrach@centrum.cz>
Date: Thu Oct 13 17:14:53 2011 +0200
Document -background none option
Document option introduced in commit 8976e97.
Signed-off-by: Michal Suchanek <hramrach@centrum.cz>
Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com>
Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
commit 323869f3298cbbfe864af9404a8aed1bf7995d79
Author: Tomáš Trnka <tomastrnka@gmx.com>
Date: Tue Oct 11 09:11:18 2011 +0200
Fix drain_console unregistration
Bug introduced by 9dca441670d261a9a9fb6108960ed48f3d58fb7f
xfree86: add a hook to replace the new console handler.
console_handler was not being set, making the server eat up CPU spinning
in WaitForSomething selecting consoleFd over and over again, every time
trying to unregister drain_console without success due to
console_handler being NULL.
Let's just fix the unregistration in xf86SetConsoleHandler() and use that.
But wait, there could be a catch: If some driver replaced the handler using
xf86SetConsoleHandler(), the unregistration in xf86CloseConsole will unregister
that one. I don't understand Xorg well enough to know whether this poses a
problem (could mess up driver deinit somehow or something like that). As it is,
xf86SetConsoleHandler() doesn't offer any way to prevent this (i.e. check which
handler is currently registered).
I had been using it for two days on my machine that previously hit 100% CPU
several times a day. That has now gone away without any new problems appearing.
Signed-off-by: Tomas Trnka <tomastrnka@gmx.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 2cb63180fa9b54f763e7e92e433943e3e73741f3
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Wed Oct 5 12:08:31 2011 +1000
dix: mark motion events as emulated if we're scrolling from button press
The protocol requires that the emulated event is marked as such. So if a
driver with smooth scrolling axis sends legacy button events, the motion
event must be marked as emulated.
Pass the real type to emulate_scroll_button_events and create the events
accordingly. For real button press or relase events, only that event must be
generated since a release event will follow or a press event has already
occured, respectively. (This fixes a bug where we'd get two release events
for each legacy button event)
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Daniel Stone <daniel@fooishbar.org>
commit 82c60232c07f50774ccc0198950f64c9338057a5
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri Sep 30 10:59:47 2011 +1000
dix: add valuator_mask_fetch_double()
Using this call simplifies callers that don't know if the mask bit is set.
Before:
if (valuator_mask_isset(mask, valnum))
value = valuator_mask_get_double(mask, valnum));
else
value = someothervalue;
Now:
if (!valuator_mask_fetch_double(mask, valnum, &value))
value = someothervalue;
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Chase Douglas <chase.douglas@canonical.com>
Reviewed-by: Daniel Stone <daniel@fooishbar.org>
commit 64d2d1bef14c7ec7156bb3aae64eff69f9f7be54
Merge: fb84be47db 679c84bce9
Author: Keith Packard <keithp@keithp.com>
Date: Mon Oct 17 14:36:34 2011 -0700
Merge remote-tracking branch 'jeremyhu/master'
commit fb84be47db7cdaff406792c08e34670e8e0cbda9
Merge: fae7ed62ad 32b289e46c
Author: Keith Packard <keithp@keithp.com>
Date: Mon Oct 17 13:50:25 2011 -0700
Merge remote-tracking branch 'whot/next'
commit 679c84bce9b03c17aa35fa69058e7e46267dbc7b
Author: Jeremy Huddleston <jeremyhu@apple.com>
Date: Sat Sep 24 00:01:11 2011 -0700
Bump ABI_VIDEODRV_VERSION to 12
The ABI changed in the previous series of changes, so bump the ABI version for
the next release.
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
Reviewed-by: Jamey Sharp <jamey@minilop.net>
commit a89cdcee4ebab6bbfa9ace94e1988a94cfb67087
Author: Jeremy Huddleston <jeremyhu@apple.com>
Date: Sun Oct 9 02:59:12 2011 -0700
xfree86: Deprecate xf86MapVidMem and friends
Drivers should transition over to using libpciaccess's instead.
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
commit 41d903918a5721e53ed694880eab44170f9717cc
Author: Jeremy Huddleston <jeremyhu@apple.com>
Date: Wed Sep 14 13:45:18 2011 -0500
xorg-server.pc.in: Remove libpciaccess and pixman-1 from Requires
Every module building against xorg-server does not *Require* pixman nor
libpciaccess. If such modules need pixman or pciaccess, they should be
depending on them directly rather than inheriting a dependency from
xorg-server. To do this, they should use PKG_CHECK_MODULES in configure.ac
to check for pixman-1 or pciaccess and include the apporpriate _LIBS variable
to the appropriate _LDFLAGS variable in Makefile.am
This also moves pixman-1 to Requires.private, so CPPFLAGS is set right to
to satisfy include dependencies but avoid linking needlessly.
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
Reviewed-by: Gaetan Nadon <memsize@videotron.ca>
commit 40d338e9f723c4b3d63516aa62fdcded4d8af75e
Author: Jeremy Huddleston <jeremyhu@apple.com>
Date: Wed Sep 14 10:37:38 2011 -0500
darwin: configure: Force some irrelevant options to off on darwin
This removes the need to pass the following to configure on darwin:
--disable-pciaccess -disable-int10-module --disable-vbe --disable-vgahw --disable-libdrm
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
Reviewed-by: Jamey Sharp <jamey@minilop.net>
commit 43d730c0e4b1a00b29843c0660dcc7c60da6725d
Author: Jeremy Huddleston <jeremyhu@apple.com>
Date: Wed Sep 14 15:42:19 2011 -0500
xfree86: Link modules with -module
This makes a difference on darwin (and apparently nowhere else)
https://www.gnu.org/s/libtool/manual/libtool.html#Modules-for-libltdl
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
Reviewed-by: Jamey Sharp <jamey@minilop.net>
Reviewed-by: Gaetan Nadon <memsize@videotron.ca>
commit f7edc00a2af83764910ff89514a046dc5ce2ff9e
Author: Jeremy Huddleston <jeremyhu@apple.com>
Date: Wed Sep 14 12:14:56 2011 -0500
xfree86: fbdevhw: Remove unused include of pciaccess.h
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
Reviewed-by: Jamey Sharp <jamey@minilop.net>
commit 6817050f3196d460ba03a62da23fb46ffd5a0f97
Author: Tiago Vignatti <tiago.vignatti@nokia.com>
Date: Tue Jun 1 13:05:47 2010 +0300
configure: wrap PCI code with macro and set it at build time
--disable-pciaccess, used together with --disable-module-int10, can be used to
disable all pci code inside the server.
Note that XSERVER_LIBPCIACCESS was previously used only in the driver side and
now it defines also whether the library is used inside the server. Also,
XORG_BUS_PCI automake variable is introduced to track PCI code needs.
Signed-off-by: Tiago Vignatti <tiago.vignatti@nokia.com>
Reviewed-by: Mikhail Gusarov <dottedmag@dottedmag.net>
Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com>
Tested-by: Jeremy Huddleston <jeremyhu@apple.com>
commit 5c12399b6c3a8def2df1bdde1d5d4d8d9e31fd84
Author: Tiago Vignatti <tiago.vignatti@nokia.com>
Date: Mon May 31 19:27:07 2010 +0300
configure: make PCI configuration more sane
No semantical changes. Just moved code around, grouping PCI related stuff in a
single chunk.
Signed-off-by: Tiago Vignatti <tiago.vignatti@nokia.com>
Reviewed-by: Mikhail Gusarov <dottedmag@dottedmag.net>
Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com>
Tested-by: Jeremy Huddleston <jeremyhu@apple.com>
commit a319e9e697faa0faa241e0e9baf0bc41efdcdf8f
Author: Tiago Vignatti <tiago.vignatti@nokia.com>
Date: Mon May 31 18:50:50 2010 +0300
configure: change PCI function checking by a meaningful version of the library
People that don't want VGA arbiter active can go to the library and enable the
stubs there.
Signed-off-by: Tiago Vignatti <tiago.vignatti@nokia.com>
Reviewed-by: Mikhail Gusarov <dottedmag@dottedmag.net>
Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com>
Tested-by: Jeremy Huddleston <jeremyhu@apple.com>
Reviewed-by: Jamey Sharp <jamey@minilop.net>
commit b3ca84430d98f5338b9b1bc817c3656efb71cff1
Author: Jeremy Huddleston <jeremyhu@apple.com>
Date: Tue Sep 13 15:32:16 2011 -0500
xfree86: Work around issue where ar may be told to make an archive with no contents
Automake:
"Be careful when selecting library components conditionally. Because building
an empty library is not portable, you should ensure that any library
always contains at least one object."
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
Reviewed-by: Gaetan Nadon <memsize@videotron.ca>
commit e8bafb9d8c7d7a7077e163ecfac6174356989bbf
Author: Jeremy Huddleston <jeremyhu@apple.com>
Date: Tue Sep 13 15:38:45 2011 -0500
xfree86: Add stubs for os-support to help adding new architecture support
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
Reviewed-by: Jamey Sharp <jamey@minilop.net>
Reviewed-by: Gaetan Nadon <memsize@videotron.ca>
commit 342f3eac8460fc48cfad1f1d7be939d671e6e1cd
Author: Adam Jackson <ajax@redhat.com>
Date: Tue May 10 19:00:02 2011 -0400
int10: Port internal users off xf86MapVidMem
This API is apparently semi-deprecated even by XFree86 standards, and
there are only four drivers left using it. Let's start chopping it off.
Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com>
Tested-by: Jeremy Huddleston <jeremyhu@apple.com>
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit 7757b8092474c4f4ec04f4ebd1272236416154c3
Author: Adam Jackson <ajax@redhat.com>
Date: Tue May 10 17:34:23 2011 -0400
pci: Remove xf86MapDomainMemory
This is slightly draconian, but that API is just awful. In all but
one case in the callers it's used to get a map of some legacy VGA
memory, and it would be cleaner for the caller to just call
pci_device_map_legacy.
The sole exception is in the vesa driver, which uses it to avoid having
to look up which device the BAR belongs to. That's similarly trivial to
fix.
Having done that, Linux's PCI layer is now very small indeed.
Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com>
Tested-by: Jeremy Huddleston <jeremyhu@apple.com>
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit 6f5041d0b8e11e761d6403f1f8f8bb2ba2a9626d
Author: Adam Jackson <ajax@redhat.com>
Date: Tue May 10 18:04:10 2011 -0400
int10: Use pciaccess rom fetch for !PC machines
... instead of rolling our own, badly.
Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com>
Tested-by: Jeremy Huddleston <jeremyhu@apple.com>
Signed-off-by: Adam Jackson <ajax@redhat.com>
Reviewed-by: Jamey Sharp <jamey@minilop.net>
commit 492ed3e53b0ee6746bd4b597978fd866d4a89ef6
Author: Adam Jackson <ajax@redhat.com>
Date: Tue May 10 16:41:08 2011 -0400
pci: Deprecate the PCITAG type
It is kept around to help drivers through the API transition and will be
removed at some point in the future.
Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com>
Tested-by: Jeremy Huddleston <jeremyhu@apple.com>
Signed-off-by: Adam Jackson <ajax@redhat.com>
Reviewed-by: Jamey Sharp <jamey@minilop.net>
commit a248fa3a33cb015942386d52b7faa8558e592a51
Author: Adam Jackson <ajax@redhat.com>
Date: Fri Jan 7 17:20:15 2011 -0500
xfree86: Remove unused bios_devmem.c
Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com>
Tested-by: Jeremy Huddleston <jeremyhu@apple.com>
Signed-off-by: Adam Jackson <ajax@redhat.com>
Reviewed-by: Jamey Sharp <jamey@minilop.net>
commit aa0bfb0f133481c57762012e8e30c05ffa151423
Author: Adam Jackson <ajax@redhat.com>
Date: Fri Jan 7 16:57:15 2011 -0500
linux: Remove ia64 domain I/O support code
pciaccess handles this now.
Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com>
Tested-by: Jeremy Huddleston <jeremyhu@apple.com>
Signed-off-by: Adam Jackson <ajax@redhat.com>
Reviewed-by: Jamey Sharp <jamey@minilop.net>
commit 95b6935637628ffa511f39004e90c75aa75141c4
Author: Adam Jackson <ajax@redhat.com>
Date: Fri Oct 16 16:09:56 2009 -0400
linux: Remove pre-2.6 PCI interface support
If you haven't ported 2.6 to your architecture in the intervening seven
years, you can keep running older servers.
Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com>
Tested-by: Jeremy Huddleston <jeremyhu@apple.com>
Signed-off-by: Adam Jackson <ajax@redhat.com>
Reviewed-by: Jamey Sharp <jamey@minilop.net>
commit 769f583783d17ffa3398bc8529f61e0f08b35530
Author: Adam Jackson <ajax@redhat.com>
Date: Fri Oct 16 14:05:54 2009 -0400
bus: remove some dead struct fields
Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com>
Tested-by: Jeremy Huddleston <jeremyhu@apple.com>
Signed-off-by: Adam Jackson <ajax@redhat.com>
Reviewed-by: Jamey Sharp <jamey@minilop.net>
commit dd72b3c1f1df57215329aa5ba9e9bb9ad0a65086
Author: Adam Jackson <ajax@redhat.com>
Date: Mon Sep 20 11:42:11 2010 -0400
linux: Use pci_device_get_parent_bridge instead of open-coding it
Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com>
Tested-by: Jeremy Huddleston <jeremyhu@apple.com>
Signed-off-by: Adam Jackson <ajax@redhat.com>
Reviewed-by: Jamey Sharp <jamey@minilop.net>
commit 858fbbb40d7c69540cd1fb5315cebf811c6e7b3f
Author: Adam Jackson <ajax@redhat.com>
Date: Fri Sep 16 13:33:04 2011 -0400
pci: Port xf86MapLegacyIO to pciaccess
Per-domain I/O is now something drivers must manually request, and must
keep track of within their own state rather than in the ScrnInfoRec.
It's not really possible to split that into two steps without an
additional intermediate ABI break, so don't even try. Drivers that want
source compatibility should ifdef on the presence of xf86UnmapLegacyIO.
As a fringe benefit, domain-aware I/O is now OS-independent, relying
only on support in pciaccess. Simplify OS PCI setup to reflect this.
The IOADDRESS type is kept around to help drivers through the API
transition and will be removed at some point in the future.
Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com>
Tested-by: Jeremy Huddleston <jeremyhu@apple.com>
Signed-off-by: Adam Jackson <ajax@redhat.com>
Reviewed-by: Jamey Sharp <jamey@minilop.net>
commit 6d9efdce0d06df6b85f0681bea306c0b1e851502
Author: Adam Jackson <ajax@redhat.com>
Date: Tue Sep 20 18:12:29 2011 -0400
vgahw: Port to pciaccess IO space routines
Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com>
Tested-by: Jeremy Huddleston <jeremyhu@apple.com>
Signed-off-by: Adam Jackson <ajax@redhat.com>
Reviewed-by: Jamey Sharp <jamey@minilop.net>
commit 4bd6579188e718654c35f95623fd4772f9e0ef06
Author: Adam Jackson <ajax@redhat.com>
Date: Thu Sep 22 13:45:57 2011 -0400
vgahw: Don't default to standard (port space) access routines
In fact, don't default to anything; drivers must explicitly say which
kind they want, and they are strongly encouraged to do MMIO if possible.
This is an ABI change in that drivers that don't will crash, but drivers
that are explicit will work with both old and new servers.
Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com>
Tested-by: Jeremy Huddleston <jeremyhu@apple.com>
Signed-off-by: Adam Jackson <ajax@redhat.com>
Reviewed-by: Jamey Sharp <jamey@minilop.net>
commit 30fb334d218f8c1d809f88054b9fe8f5f556bb62
Author: Adam Jackson <ajax@redhat.com>
Date: Thu Sep 22 13:44:53 2011 -0400
vgahw: Remove IO domain setup
Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com>
Tested-by: Jeremy Huddleston <jeremyhu@apple.com>
Signed-off-by: Adam Jackson <ajax@redhat.com>
Reviewed-by: Jamey Sharp <jamey@minilop.net>
commit 51a5558beb71bddeff9352ef4f43269a8a22317d
Author: Adam Jackson <ajax@redhat.com>
Date: Sat Sep 18 08:24:19 2010 -0400
int10: Port to pciaccess' legacy IO API
Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com>
Tested-by: Jeremy Huddleston <jeremyhu@apple.com>
Signed-off-by: Adam Jackson <ajax@redhat.com>
Reviewed-by: Jamey Sharp <jamey@minilop.net>
commit c0b63ff88a6dc20f86141aa1a1ed5a9384aa63aa
Author: Adam Jackson <ajax@redhat.com>
Date: Sat Sep 18 08:05:11 2010 -0400
xfree86: Move xf86GetClocks to vgahw
This is really a vga-specific hack anyway. The only modern driver that
uses it is trident, but it's already loaded vgahw by the time it would
call xf86GetClocks.
Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com>
Tested-by: Jeremy Huddleston <jeremyhu@apple.com>
Signed-off-by: Adam Jackson <ajax@redhat.com>
Reviewed-by: Jamey Sharp <jamey@minilop.net>
commit 1433103a49b97e356da0f20aa65046cdb2f5ece6
Author: Dave Airlie <airlied@redhat.com>
Date: Wed Oct 12 09:59:38 2011 +0100
test: fix input test
The test was memsetting the wrong thing, this fixes make check in my tinderbox.
Signed-off-by: Dave Airlie <airlied@redhat.com>
Reviewed-by: Daniel Stone <daniel@fooishbar.org>
Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com>
commit f9c6903d4a90b59c328f4fa05d2be9e0ce1c5189
Author: Jeremy Huddleston <jeremyhu@apple.com>
Date: Wed Oct 5 15:02:52 2011 -0700
dix: add utility functions for double to/fro FP1616/FP3232 conversion
Co-authored-by: Jeremy Huddleston <jeremyhu@apple.com>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com>
Reviewed-by: Mark Kettenis <kettenis@openbsd.org>
commit 401150d7dcad08be7c1f07e076f810cd61e2105c
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Tue Oct 4 11:41:17 2011 +1000
input: change pointer screen crossing behaviour for multiple ScreenRecs
miPointerSetPosition traditionally took coordinates on a per-screen basis,
triggering a screen switch when these went out-of-bounds. For absolute
devices, this prevented screen crossing in the negative x/y direction.
This patch changes the event generation patch to handle screen coordinates
in a desktop range (i.e. all screens together). Screen switches are
triggered when these coordinates are not on the current screen.
This unifies the pointer behaviour of single ScreenRec multihead and
multiple ScreenRecs multihead in that the cursor by default moves about the
whole screen rather than be confined to one single screen. The
transformation matrix may then be used to actually confine the cursor to the
screen again.
Note: fill_pointer_events has to deal with several different coordinate
systems. Make sure you read the comment before trying to understand the code.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 6bd0eff40fae1e5d8fed28751851eb5b932d131b
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Wed Oct 12 15:53:57 2011 +1000
dix: extend rescaleValuatorAxis to take a minimum default
Allow rescaling to non-zero based axis ranges as default (for when screen
offsets are non-zero). Currently unused.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 8bebb4b4896d8b6ba3309b5b28fce883bb9f8a96
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Wed Sep 7 14:04:10 2011 +1000
Store desktop dimensions in screenInfo.
For Zaphod mode screen crossing handling we need to know the size of all
screens together (i.e. the whole desktop size). Store that in the screenInfo to
have it readily available in events.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 9cbfa4739a51e4cc6b8094833928bf8678f63876
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Tue Sep 6 15:55:19 2011 +1000
xfree86: remove xf86XInputSetScreen
Keeping track of which screen the pointer within the input driver is
obsolete now. To bind to a screen, use the transformation matrix instead.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Jamey Sharp <jamey@minilop.net>
Reviewed-by: Daniel Stone <daniel@fooishbar.org>
commit 09dbfcb0ad7b6c8bac94502f2801e82f2a2ef435
Author: Jeremy Huddleston <jeremyhu@apple.com>
Date: Tue Oct 11 17:37:44 2011 -0700
os: Remove Error()
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
commit db30615bcb3b872475e7d40eeee8cdda5b723078
Author: Jeremy Huddleston <jeremyhu@apple.com>
Date: Mon Oct 10 12:16:31 2011 -0700
Xephyr: Remove socket and its lock file on exit
https://bugs.freedesktop.org/show_bug.cgi?id=11484
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
Reviewed-by: Mikhail Gusarov <dottedmag@dottedmag.net>
commit c13a48e74ec89eafa9b529a87253a631ef02f2e2
Author: Jeremy Huddleston <jeremyhu@apple.com>
Date: Mon Oct 10 12:09:39 2011 -0700
Xnest: Remove socket and its lock file on exit
https://bugs.freedesktop.org/show_bug.cgi?id=11484
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
Reviewed-by: Mikhail Gusarov <dottedmag@dottedmag.net>
commit 32b289e46cc2d5ec32ff0c4ba5bbfbf602afb388
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Mon Oct 3 13:58:01 2011 +1000
dix: move MD last.valuator update into fill_pointer_events
Don't update the MD where it's not expected, positionSprite should really
just do that - position the sprite.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Daniel Stone <daniel@fooishbar.org>
commit 3b36fd1b49030ead44358945f62e5abe7f4609ce
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Mon Oct 3 13:10:53 2011 +1000
mi: switch miPointerSetPosition to take doubles
Don't switch between doubles and ints in the caller, instead take doubles in
miPointerSetPosition and do the conversion there. For full feature we should
change everything down from here for doubles too.
Functional change: previously we'd restore the remainder regardless of
screen switching/confinement (despite what the comment said). Now,
screen changing or cursor constraints will cause the remainder be clipped
off. This should happen for cursor constraints but arguably not for screen
crossing.
This also corrects a currently wrong comment about miPointerSetPosition's
input coordinates.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Daniel Stone <daniel@fooishbar.org>
commit 81cfe44b1ed0de84ad1941fe2ca74bebef3fc58d
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Mon Oct 3 12:49:49 2011 +1000
mi: return the screen from miPointerSetPosition
miPointerSetPosition may switch screens. Always return the screen the sprite
is on instead of relying on callers to call miPointerGetScreen().
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Jamey Sharp <jamey@minilop.net>
Reviewed-by: Daniel Stone <daniel@fooishbar.org>
commit 88dfe5366d9855e0ebf8bbff74967b793ede57d1
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Mon Oct 3 12:37:28 2011 +1000
dix: drop screen argument from positionSprite
We can just get this in the function, no effective functional changes.
Also return the screen to the caller. Though we don't use it yet, we will in
a follow-up patch.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Jamey Sharp <jamey@minilop.net>
Reviewed-by: Daniel Stone <daniel@fooishbar.org>
commit 967bc25da221a69c8fc390253465145ce534fcb9
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Mon Oct 3 11:42:08 2011 +1000
dix: move screen- to device coordinate scaling to separate function
No functional changes.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Jamey Sharp <jamey@minilop.net>
Reviewed-by: Daniel Stone <daniel@fooishbar.org>
commit b059e06e19ac9417ceeb8be58c1c91b159291865
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Mon Aug 29 12:36:26 2011 +1000
dix: don't allow keyboard devices to submit motion or button events.
GPE unconditionally dereferences pDev->valuator if a mask is present. This
shouldn't really happen but if it does, don't crash, just ignore the events
with an error.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Jamey Sharp <jamey@minilop.net>
Reviewed-by: Daniel Stone <daniel@fooishbar.org>
commit bccff533184a051b614a26304ce77ad30bede5e0
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Mon Oct 3 12:19:21 2011 +1000
dix: moveRelative modifies parameter in-place, say so.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Jamey Sharp <jamey@minilop.net>
Reviewed-by: Daniel Stone <daniel@fooishbar.org>
commit b966362ccf0fe6fdd44f4d778d47e3677f55f11b
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Mon Oct 3 12:18:20 2011 +1000
dix: rename moveAbsolute to clipAbsolute
Let's be honest about what it does.
moveRelative accumulates delta _and_ clips in some cases, so that one can
keep it's name.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Jamey Sharp <jamey@minilop.net>
Reviewed-by: Daniel Stone <daniel@fooishbar.org>
commit 959d18c3765e447897a8cfd358e9ee645df595d9
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri Sep 30 10:50:51 2011 +1000
dix: fix missing verb in comment
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Jamey Sharp <jamey@minilop.net>
Reviewed-by: Daniel Stone <daniel@fooishbar.org>
commit 7074ec87bdf81699df172619aea7aae1ad4ec3c6
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri Sep 30 10:47:00 2011 +1000
dix: document transformAbsolute
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Jamey Sharp <jamey@minilop.net>
Reviewed-by: Daniel Stone <daniel@fooishbar.org>
commit f4ca19ce3ab91a9c8ad9de60f7dc95466f21f589
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri Jul 29 10:56:44 2011 +1000
dix: copy the source ID into the RawEvent (#34240)
X.Org Bug 34240 <http://bugs.freedesktop.org/show_bug.cgi?id=34240>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Daniel Stone <daniel@fooishbar.org>
commit 8b29addc30163bb7ba74c74351f312aac02f049a
Author: Jeremy Huddleston <jeremyhu@apple.com>
Date: Sun Oct 9 04:00:41 2011 -0700
loader: when creating sdksyms.c only include shmint.h if MITSHM is enabled #29109
https://bugs.freedesktop.org/show_bug.cgi?id=29109
When configured with --disable-mitshm the symbols declared in shmint.h
do not exist. By guarding the include with '#ifdef MITSHM' these
symbols are skipped when generating sdksyms.c with --disable-mitshm.
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com>
commit eabd5532fb589bd0550344ebd23c9765e591aadf
Author: Julien Cristau <jcristau@debian.org>
Date: Sun Oct 9 17:06:14 2011 -0700
xfree86: fix build with xv disabled
https://bugs.freedesktop.org/show_bug.cgi?id=29111
Signed-off-by: Julien Cristau <jcristau@debian.org>
Tested-by: Cyril Brulebois <kibi@debian.org>
Reviewed-by: Cyril Brulebois <kibi@debian.org>
commit c53380be804852045722203c993379813d97f6d7
Author: Ville Skyttä <ville.skytta@iki.fi>
Date: Sun Mar 6 10:18:30 2011 +0200
Man page syntax and spelling fixes.
Signed-off-by: Ville Skyttä <ville.skytta@iki.fi>
Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com>
commit 765ef69295ddc473640c96f1b4f54e0b8bfc670e
Author: Max Schwarz <max.schwarz@online.de>
Date: Tue Oct 4 22:06:08 2011 +0200
dix: fix inverted handling of legacy scroll button events
This bug led to inverted scrolling axes with drivers that support smooth
scrolling axes but send legacy button events.
Signed-off-by: Max Schwarz <Max@x-quadraht.de>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit fae7ed62ad476114bd37b566202cf6b6546c0a1f
Author: Jeremy Huddleston <jeremyhu@apple.com>
Date: Tue Oct 4 21:40:03 2011 -0700
XQuartz: pbproxy: Add missing AM_OBJCFLAGS
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
commit e4cddf509e1729e8ff40354275b65455111ad2bd
Author: vdb@picaros.org <vdb@picaros.org>
Date: Sat Sep 17 18:55:47 2011 +0200
Fix a rare memory leak
Signed-off-by: Servaas Vandenberghe <vdb@picaros.org>
Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com>
commit 53611213396479abfdce0f7752681572e0d26d78
Author: Kirill Elagin <kirelagin@gmail.com>
Date: Tue Oct 4 23:02:20 2011 +0400
Fix server crash due to invalid images
See https://bugs.freedesktop.org/show_bug.cgi?id=39383
Signed-off-by: Kirill Elagin <kirelagin@gmail.com>
Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com>
commit 7a33c5b934382b5554f41ab1502514e91c9bc52e
Author: Alan Hourihane <alanh@vmware.com>
Date: Tue Oct 4 19:42:46 2011 -0700
dixfonts: Don't overwrite local c variable until new_closure is safely initialized.
Signed-off-by: Alan Hourihane <alanh@vmware.com>
Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com>
commit 911e7368bf9c00d327e994a6f7a1d8d8f9b83c72
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Tue Aug 30 16:58:04 2011 -0400
Move pointOnScreen to inpututils.c
We need this from other files too.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Daniel Stone <daniel@fooishbar.org>
commit d0a7cd759d4741a1ae118d579c90704410cde244
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri Sep 2 09:53:02 2011 +1000
dix: NewCurrentScreen must work on pointers where possible
When a screen switch is triggered by PointerKeys, the device for
NewCurrentScreen is the keyboard. Submitting pointer events for this
keyboard (without valuators) has no effect as GPE ignores the event.
Force the dequeuing through the XTest device attached to this device.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Daniel Stone <daniel@fooishbar.org>
commit 535b3789be3a7b43b5d9026e2b5150521d91e32b
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Wed Aug 31 14:15:02 2011 +1000
dix: warn about keyboard events with valuator masks
We don't actually handle the mask correctly. They're clipped and dropped
into the event but that's about it. I don't think we did since 1.4, let's
warn the user if this happens.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Daniel Stone <daniel@fooishbar.org>
commit 9537afb13f2750d22350b7441570332ae60e4860
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Tue Aug 30 13:37:31 2011 +1000
dix: fill out root_x/y for keyboard events
Switching screens relies on rootx/y to be set to the correct value. Note:
though we technically take a mask for GetKeyboardEvents we don't actually
handle it properly to move the pointer as required (and generate motion
events if needed).
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Daniel Stone <daniel@fooishbar.org>
commit 6378d0233d21088b6429755627b4253859892c72
Merge: 6e965d8a18 98b230669f
Author: Keith Packard <keithp@keithp.com>
Date: Mon Oct 3 13:56:06 2011 -0700
Merge remote-tracking branch 'herrb/master'
commit 6e965d8a185087a55b2100b817e18f05b3ce5a00
Merge: 466e4b3f17 ac5881d6d0
Author: Keith Packard <keithp@keithp.com>
Date: Mon Oct 3 13:47:49 2011 -0700
Merge remote-tracking branch 'koba/reviewed'
commit 466e4b3f174bdd7a69a76eb06e6c3e3344b8adc2
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Fri Sep 30 07:21:57 2011 -0400
Xserver-spec: use appropriate copyright markup
Use docbook copyright markup for year and holder.
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 62940bf38f70e3d9fb80521de40d6361548a0ea5
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Fri Sep 30 07:21:56 2011 -0400
Xserver-spec: re-order markup to follow outpout order
No content change, no layout/ordering change.
It is easier to find <title> at the top.
Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 365bc2f5b132ac76a1f827923a99a75b33b158ac
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Fri Sep 30 07:21:55 2011 -0400
Xserver-spec: add release information
It has been added in all docs (X Version 11, Release 7.6)
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit ee3e26079e120bf9914cc27871d50501b35e75df
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Fri Sep 30 07:16:34 2011 -0400
ddxDesign: drop the url in the coporate authors list
It was such an eyesore once rendered in html.
Now it looks like other authors.
Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 0ed71b48c0c7bd65cd05eda6c06b9c29b4e3f607
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Fri Sep 30 07:16:33 2011 -0400
ddxDesign: remove server version from the document title
Such version information is already written in the appropriate location
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 83ec3bf1aa72848421660c44c4503fec655f5924
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Fri Sep 30 07:16:32 2011 -0400
ddx-Design: add X Version and Release information
Acked-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 2f09f6e3f610e585aeb5bd1023323a909d1ba20d
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Thu Sep 29 07:53:16 2011 -0400
Xinput: use appropriate copyright markup for a multi licensed doc
Removed a duplicate paragraph.
Acked-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 597348e969bf78dc2de4cf9bae7b76c110144266
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Thu Sep 29 07:53:15 2011 -0400
Xinput: replace hard coded X11 version with X server version
Which is more useful.
Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit fad04dd9701aa76249a0bab31676103debb84307
Author: Lennart Poettering <lennart@poettering.net>
Date: Tue Sep 27 18:04:06 2011 +0100
udev: make use of udev_enumerate_add_match_tag() only when it is available
udev_enumerate_add_match_tag() and udev_monitor_filter_add_match_tag()
are mostly optimizations, hence simply skip these calls if they are not
available in the installed version of libudev.
This should fix the build on older versions of udev.
[airlied: fixes tinderbox failures on RHEL6]
Signed-off-by: Lennart Poettering <lennart@poettering.net>
Reviewed-by: Dave Airlie <airlied@redhat.com>
Tested-by: Dave Airlie <airlied@redhat.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 77743f877d573cdf70fcb5cb5897250f668ebf9b
Author: Jamey Sharp <jamey@minilop.net>
Date: Mon Sep 26 22:38:44 2011 -0700
kdrive: Fix build for opaque InputOption structure.
Commit 05284a03f9002b03a66ae355b34790ec02b726f0 missed fixing up
kdrive's use of the old non-opaque structure.
Signed-off-by: Jamey Sharp <jamey@minilop.net>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 9a55b3661b4172f9a32cd6fefb254e06edb1a88a
Merge: cf11ca360c 84bb0207f6
Author: Keith Packard <keithp@keithp.com>
Date: Mon Oct 3 11:49:23 2011 -0700
Merge remote-tracking branch 'alanc/master'
commit cf11ca360c2ded5ca309faa9d039160947387bb8
Merge: 463dd87062 6eae9fa284
Author: Keith Packard <keithp@keithp.com>
Date: Mon Oct 3 11:44:59 2011 -0700
Merge remote-tracking branch 'jeremyhu/for-keith'
commit 463dd87062edaa974cb8c7163328a53197f237e1
Author: Pauli Nieminen <pauli.nieminen@linux.intel.com>
Date: Thu Sep 22 18:38:53 2011 +0300
xf86/modes: Fix shadow rotation crashing when screen pixmap changes
Driver may change screen pixmaps after page flipping that would then
make damage lose track of the root pixmap.
Using root window for shadow damages fixes the problem because
SetWindowPixmap is implemented in shadow code.
Signed-off-by: Pauli Nieminen <pauli.nieminen@linux.intel.com>
Reviewed-by: Keith Packard <keithp@keithp.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit f5d50b46ddeb039ab6564141f61261e94ee67637
Merge: 57cd32e934 524e5445c0
Author: Keith Packard <keithp@keithp.com>
Date: Mon Oct 3 11:36:28 2011 -0700
Merge remote-tracking branch 'whot/next'
commit 57cd32e93425597317b4b7722859155419836e4c
Author: Aaron Plattner <aplattner@nvidia.com>
Date: Thu Aug 25 15:41:55 2011 -0700
xfree86/modes: Make cursor position transform a helper function
When the driver can handle the crtc transform in hardware, it sets
crtc->driverIsPerformingTransform, which turns off both the shadow
layer and the cursor's position-transforming code. However, some
drivers actually do require the cursor position to still be
transformed in these cases. Move the cursor position transform into a
helper function that can be called by such drivers.
Signed-off-by: Aaron Plattner <aplattner@nvidia.com>
commit 245cb8e94fd15990e1b7d6622added460f104dba
Author: Aaron Plattner <aplattner@nvidia.com>
Date: Thu Aug 25 10:19:48 2011 -0700
xfree86/modes: Let the driver handle the transform
If a driver can use hardware to handle the crtc transform, then
there's no need for the server's shadow layer to do it. Add a crtc
flag that lets the driver indicate that it is handling the transform.
If it's set, consider the transformed size of the screen but don't
actually enable the shadow layer. Also stop adjusting the cursor
image and position.
Signed-off-by: Aaron Plattner <aplattner@nvidia.com>
commit e089737fb13868bd3a72b7ac4799d502d188f03e
Author: Keith Packard <keithp@keithp.com>
Date: Mon Oct 3 11:23:16 2011 -0700
Add AC_LANG_SOURCE wrappers around configure.ac code fragments
Current autoconf versions are very unhappy when code fragments are not
wrapped in AC_LANG_SOURCE macros, generating errors like:
configure.ac:723: warning: AC_LANG_CONFTEST: no AC_LANG_SOURCE call detected in body
../../lib/autoconf/lang.m4:194: AC_LANG_CONFTEST is expanded from...
../../lib/autoconf/general.m4:2662: _AC_LINK_IFELSE is expanded from...
../../lib/autoconf/general.m4:2679: AC_LINK_IFELSE is expanded from...
../../lib/m4sugar/m4sh.m4:606: AS_IF is expanded from...
../../lib/autoconf/general.m4:2032: AC_CACHE_VAL is expanded from...
../../lib/autoconf/general.m4:2053: AC_CACHE_CHECK is expanded from...
configure.ac:723: the top level
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 6eae9fa28445b6cfa09061b338242df5116aafe8
Author: Matt Turner <mattst88@gmail.com>
Date: Wed Sep 28 17:27:45 2011 -0400
Remove incorrect & in swap_uint32
Caused by commit 893e86a4, and hidden by the (char *) cast.
Signed-off-by: Matt Turner <mattst88@gmail.com>
Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com>
Reviewed-by: Jamey Sharp <jamey@minilop.net>
Reviewed-by: Aaron Plattner <aplattner@nvidia.com>
Tested-by: Aaron Plattner <aplattner@nvidia.com>
commit 6f581e3fde7ddc943c04f274e01735beb358b7f9
Author: Dave Airlie <airlied@redhat.com>
Date: Mon Oct 3 16:09:12 2011 +0100
fix fb_id for dirty reporting
commit 79959b734702486971447a11b2e4181463fda3bf
Author: Dave Airlie <airlied@redhat.com>
Date: Mon Oct 3 11:35:39 2011 +0100
fix make distcheck
commit 524e5445c0b6df5247d4aac5368470bb89ef4080
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Sat Oct 1 08:43:52 2011 -0700
Add #include "inpututils.h" to xkbAccessX.c for init_device_event
Fixes Sun compiler warning:
"xkbAccessX.c", line 128: warning: implicit function declaration: init_device_event
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Jamey Sharp <jamey@minilop.net>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 98b230669f591bf5b8b8764db3b287d91857ee9e
Author: Matthieu Herrb <matthieu.herrb@laas.fr>
Date: Sun Jul 31 20:43:39 2011 +0200
sdksyms.sh may not be executable.
Use $(SHELL) to run it. Someone may want to build out of a source tree
in a filesystem with the noexec mount flag set.
Signed-off-by: Matthieu Herrb <matthieu.herrb@laas.fr>
Reviewed-by: Gaetan Nadon <memsize@videotron.ca>
Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
commit f54852edc35a2831a4cd91906188101ea19904e1
Author: Matthieu Herrb <matthieu.herrb@laas.fr>
Date: Sun Sep 18 12:46:52 2011 +0200
Add a 'wscons' autoconf mechanism to configure input devices on BSD.
This does not really handle hotplug (it's handled inside the kernel,
by the 'mux' devices), but uses the wscons console driver
configuration to figure out the keyboard layout and the list of
pointing devices found by the kernel.
Signed-off-by: Matthieu Herrb <matthieu.herrb@laas.fr>
Acked-by: Peter Hutterer <peter.hutterer@who-t.net>
commit f32c827d513c44f07e1d0fbcc0c96cef18c9a4d9
Author: Max Schwarz <Max@x-quadraht.de>
Date: Sun Sep 25 20:44:26 2011 +0200
Input: Fix frac calculation on [Raw]DeviceEvent conversion
(1UL << 32) evaluates to 0 (at least here), so do the
fraction calculation in two steps as in libXi. Fractions on xXIRawEvent
were not multiplied at all, which also gave 0 as result.
Signed-off-by: Max Schwarz <Max@x-quadraht.de>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 4c6bc0e76599dbe5ede2e1f48c9936a0e996b638
Merge: 057cc92ebf 3304bbff9b
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri Sep 30 09:24:56 2011 +1000
Merge branch 'smooth-scrolling' into next
commit 3304bbff9b4ed63f1a47410a5320a136420ba2c6
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Tue Feb 15 18:49:58 2011 +0000
Input: Add smooth-scrolling support to GetPointerEvents
For scroll wheel support, we used to send buttons 4/5 and 6/7 for
horizontal/vertical positive/negative scroll events. For touchpads, we
really want more fine-grained scroll values. GetPointerEvents now
accepts both old-school scroll button presses, and new-style scroll axis
events, while emitting both types of events to support both old and new
clients.
This works with the new XIScrollClass to mark axes as scrolling axes.
Drivers mark any valuators that send scroll events with SetScrollValuator.
(Currently missing: the XIDeviceChangeEvent being sent when a driver changes
a scroll axis at run-time. This can be added later.)
Note: the SCROLL_TYPE enums are intentionally different values to the XI2
proto values to avoid copy/overlapping range bugs.
Co-authored-by: Daniel Stone <daniel@fooishbar.org>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Daniel Stone <daniel@fooishbar.org>
commit ac5881d6d0bcf4bcc66a5d6ddde4eca950db1a5b
Author: Alexandr Shadchin <Alexandr.Shadchin@gmail.com>
Date: Thu Sep 15 23:05:24 2011 +0600
Remove unused vtSysreq
Signed-off-by: Alexandr Shadchin <Alexandr.Shadchin@gmail.com>
Reviewed-by: Jamey Sharp <jamey@minilop.net>
Tested-by: Matthieu Herrb <matthieu.herrb@laas.fr>
commit 0be1640dbbdd072f26d937de2e49f5ed58d54ef9
Author: Alexandr Shadchin <Alexandr.Shadchin@gmail.com>
Date: Sat Aug 27 02:02:36 2011 +0600
bsd: ioctl KDENABIO/KDDISABIO do not matter for OpenBSD
Signed-off-by: Alexandr Shadchin <Alexandr.Shadchin@gmail.com>
Tested-by: Matthieu Herrb <matthieu.herrb@laas.fr>
commit 91042b98afdc6cecc746e101a88f79e56db1c0d0
Author: Alexandr Shadchin <Alexandr.Shadchin@gmail.com>
Date: Sat Aug 27 00:47:34 2011 +0600
bsd: OpenBSD and NetBSD not need extra headers in PCVT_SUPPORT
Signed-off-by: Alexandr Shadchin <Alexandr.Shadchin@gmail.com>
Tested-by: Matthieu Herrb <matthieu.herrb@laas.fr>
commit 86eaa9bbe4ed59f89d6509d5e13211ab7f5a8038
Author: Alexandr Shadchin <Alexandr.Shadchin@gmail.com>
Date: Sat Aug 27 01:03:28 2011 +0600
bsd: Some clean up
OpenBSD and NetBSD does not support syscons
Signed-off-by: Alexandr Shadchin <Alexandr.Shadchin@gmail.com>
Tested-by: Matthieu Herrb <matthieu.herrb@laas.fr>
commit dc864770d47fc1e4ec993e37a59e5aecb5b0a85e
Author: Alexandr Shadchin <Alexandr.Shadchin@gmail.com>
Date: Fri Aug 26 22:40:19 2011 +0600
bsd: Remove dead code
Since OsInit closes stdin before the xfree86 DDX opens the
console, fstat on stdin will always fail, so it's safe to delete
code that attempts it.
Signed-off-by: Alexandr Shadchin <Alexandr.Shadchin@gmail.com>
Reviewed-by: Jamey Sharp <jamey@minilop.net>
Tested-by: Matthieu Herrb <matthieu.herrb@laas.fr>
commit cbb842666fa7ff26bbdd1e89a7f41b835a677c5e
Author: Alexandr Shadchin <Alexandr.Shadchin@gmail.com>
Date: Fri Aug 26 21:42:41 2011 +0600
bsd: Variable devConsoleFd need only if defined PCCONS_SUPPORT
Signed-off-by: Alexandr Shadchin <Alexandr.Shadchin@gmail.com>
Reviewed-by: Jamey Sharp <jamey@minilop.net>
Tested-by: Matthieu Herrb <matthieu.herrb@laas.fr>
commit 38bd1e123d959e0a13514ec415afc8bfb5a170f2
Author: Alexandr Shadchin <Alexandr.Shadchin@gmail.com>
Date: Fri Aug 26 18:54:01 2011 +0600
bsd: Replacement screenFd on consoleFd because they are equivalent
Signed-off-by: Alexandr Shadchin <Alexandr.Shadchin@gmail.com>
Reviewed-by: Jamey Sharp <jamey@minilop.net>
Tested-by: Matthieu Herrb <matthieu.herrb@laas.fr>
commit f015351c73bb24ce4172911c3e95d67922de42ab
Author: Alexandr Shadchin <Alexandr.Shadchin@gmail.com>
Date: Fri Aug 26 18:27:02 2011 +0600
bsd: Remove unused macros KBD_FD
Signed-off-by: Alexandr Shadchin <Alexandr.Shadchin@gmail.com>
Reviewed-by: Jamey Sharp <jamey@minilop.net>
Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com>
Tested-by: Matthieu Herrb <matthieu.herrb@laas.fr>
commit cb65ec6b58daf9a1afc40c8693fa0632f8cf0585
Author: Dave Airlie <airlied@redhat.com>
Date: Thu Sep 29 16:06:52 2011 +0100
check drm support dumb buffer capability
commit 6ccd13a2d7d78db2d5bd3fafb00f78d2ceb11741
Author: Dave Airlie <airlied@redhat.com>
Date: Thu Sep 29 16:00:50 2011 +0100
add initial man page
commit 1f37991dec98073d5dfbf0c30213f838999bd9da
Author: Dave Airlie <airlied@redhat.com>
Date: Thu Sep 29 15:55:36 2011 +0100
add shadowfb support, default to on.
we should probably expose a bit from kernel to say if shadow is preferred
or wasteful.
commit 0b5e574dff230c7879eb9655bb7252553bbace50
Author: Dave Airlie <airlied@redhat.com>
Date: Thu Sep 29 15:55:24 2011 +0100
remove unused debug
commit d686130c17126d86db55aae6b65b12d8bcf6a098
Author: Dave Airlie <airlied@redhat.com>
Date: Thu Sep 29 14:13:58 2011 +0100
add -Wall, cleanup warnings
commit a4f6e661b5d6662c413c86eeefb4affddd65c562
Author: Dave Airlie <airlied@redhat.com>
Date: Thu Sep 29 14:05:43 2011 +0100
fix server recycling
commit 7847321138be62b929123b25929a69f0a57aca3f
Author: Dave Airlie <airlied@redhat.com>
Date: Thu Sep 29 12:38:26 2011 +0100
port damage tracking code from st/xorg
commit 4d3aadb22fc03f259a9d1717b55ce16d7a32e2be
Author: Dave Airlie <airlied@redhat.com>
Date: Thu Sep 29 12:34:27 2011 +0100
drop loading dri2
commit 1b1382c9e1995dcfe5dfec1de17155fa627ac6e8
Author: Dave Airlie <airlied@redhat.com>
Date: Thu Sep 29 12:34:17 2011 +0100
update authors/copyright
commit 263597dbb3a75d711b5ad2e1f51554e6b2601d9a
Author: Dave Airlie <airlied@redhat.com>
Date: Thu Sep 29 12:30:46 2011 +0100
gut some more unneeded code
commit a72bdf170c8bc55eef3d2dbb8e316839552288a5
Author: Dave Airlie <airlied@redhat.com>
Date: Thu Sep 29 12:28:59 2011 +0100
modesetting: rewrite probing based on fbdev.
This isn't perfect, it should really do more with bus id matching
and finding the write drm device using sysfs if it can. but it removes
lots of hardcoding of pci ids.
commit a77fae850511c4d73af2af2b88804586f950f28d
Author: Dave Airlie <airlied@redhat.com>
Date: Thu Sep 29 11:52:51 2011 +0100
cleanup some the drmmode_display header file
commit 2a4618905445ce13fd272a4634ef5103dc804231
Author: Dave Airlie <airlied@redhat.com>
Date: Thu Sep 29 11:49:26 2011 +0100
modesetting: restart driver effort from other codebases
This starts a randr 1.2 compatible driver with cursors.
TODO:
libkms
dirty handling
server recycling.
commit 057cc92ebfeebe81b7d01ff2c6aa2c066c8d1a64
Merge: afb1fe695d 52c9b59a9f
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu Sep 29 14:18:35 2011 +1000
Merge branch 'raw-events' into next
Conflicts:
configure.ac
dix/events.c
commit 52c9b59a9fed6abfeca775a7a04133cee18eac0b
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Mon May 30 09:47:06 2011 +1000
dix: use 'rc' for return code in DeliverRawEvent
Reported-by: Walter Harms <wharms@bfs.de>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Cyril Brulebois <kibi@debian.org>
Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com>
Reviewed-by: Daniel Stone <daniel@fooishbar.org>
commit b6b1f1b514bf14ddf6b265b8d4551f892ded0dd2
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Wed May 11 13:56:08 2011 +1000
input: deliver raw events unconditionally for XI 2.1 clients.
Deliver raw events regardless whether there is a grab on or not for clients
supporting 2.1 or later.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com>
Reviewed-by: Daniel Stone <daniel@fooishbar.org>
commit 16244fba001826190445302f56784f5de9c59c01
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu Jun 2 13:50:13 2011 +1000
Support (and require) XI 2.1
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com>
Reviewed-by: Daniel Stone <daniel@fooishbar.org>
commit 54e05d80a122bac57920fce1704c0f57492b849c
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri May 27 14:21:39 2011 +1000
dix: rename ProcessRawEvents to dix/events.c:DeliverRawEvent
No functional changes, prep work for future changes.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Cyril Brulebois <kibi@debian.org>
Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com>
Reviewed-by: Daniel Stone <daniel@fooishbar.org>
commit c48133f133c64d356a1208f185619bfdf7e9a5f2
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri May 27 14:19:45 2011 +1000
Xi: use temporary variable for filter.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com>
Reviewed-by: Daniel Stone <daniel@fooishbar.org>
commit ac0850e86f22191091a1eb07237cae9de49ee00d
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri May 27 12:14:32 2011 +1000
dix: split DeliverEventToWindowMask up a bit more.
Move out the actual event delivery, it needs to be used from elsewhere.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com>
Reviewed-by: Daniel Stone <daniel@fooishbar.org>
commit 5ea2fb389fce235366e9fce83d20abdc8874f4e2
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri May 27 11:43:50 2011 +1000
dix: rename DeliverEventsToClients to DeliverEventsToWindowMask
To avoid confusion with a future patch and it better describes what this
does anyway - delivering events to all clients that have the event mask on
the window.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com>
Reviewed-by: Daniel Stone <daniel@fooishbar.org>
commit 016413dae947fe4e8e918f728c87354fa4928275
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri May 27 11:40:56 2011 +1000
dix: split client list retrieval out of DeliverEventToClients
No functional change, but "other" was renamed to "clients".
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com>
Reviewed-by: Daniel Stone <daniel@fooishbar.org>
commit 537c5f631d1f8d526e63355b7d88cb1fb2793492
Author: Cyril Brulebois <kibi@debian.org>
Date: Sun Jun 5 03:21:18 2011 +0200
xkb: Fix case checks for Latin 4.
That one was missing _XkbKSLower:
XK_kra: U+0138 LATIN SMALL LETTER KRA
Reviewed-by: Daniel Stone <daniel@fooishbar.org>
Signed-off-by: Cyril Brulebois <kibi@debian.org>
commit 0b56a7f0ad01d3a86cdd7a14d5e567a00a3553f6
Author: Cyril Brulebois <kibi@debian.org>
Date: Sun Jun 5 03:12:44 2011 +0200
xkb: Fix case checks for Latin 2.
Those ones were getting _XkbKSLower for no reasons:
XK_ogonek: U+02DB OGONEK
XK_doubleacute: U+02DD DOUBLE ACUTE ACCENT
Reviewed-by: Daniel Stone <daniel@fooishbar.org>
Signed-off-by: Cyril Brulebois <kibi@debian.org>
commit 512a9750c197437889ff7f26a8d2bd242e030745
Author: Cyril Brulebois <kibi@debian.org>
Date: Sun Jun 5 03:03:47 2011 +0200
xkb: Fix case checks for Latin 1.
That one was missing _XkbKSLower:
XK_ssharp: U+00DF LATIN SMALL LETTER SHARP S
That one was getting _XkbKSLower for no reasons:
XK_division: U+00F7 DIVISION SIGN
For reference, XK_multiply was already excluded from the _XkbKSUpper
check, it's no big surprise XK_division has to be excluded from the
_XkbKSLower check.
Reviewed-by: Daniel Stone <daniel@fooishbar.org>
Signed-off-by: Cyril Brulebois <kibi@debian.org>
commit 635a1f50bc65512ec491fe71b9dfa8cf9118e2c2
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri Sep 23 12:04:39 2011 +1000
input: allow for max < min for relative axes on InitValuatorAxisStruct
Relative axes are initialized with 0, -1 but so far this never had any
effect as all users of this function (for relative axes) just set it to the
defaults anyway.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Daniel Stone <daniel@fooishbar.org>
commit 8d1a414cca51e7f8a93470c5aa2e998f5ca1bc9a
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri Sep 23 12:03:48 2011 +1000
input: switch InitValuatorAxisStruct to return Bool
Return errors instead of silently ignoring them.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Daniel Stone <daniel@fooishbar.org>
commit 5ac1f885f5c106b970835de36e13a9a7ea413df4
Author: Daniel Stone <daniel@fooishbar.org>
Date: Tue Feb 15 19:44:53 2011 +0000
Input: Add POINTER_EMULATED flag to GetPointerEvents
POINTER_EMULATED merely sets XIPointerEmulated in the generated
DeviceEvent.
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 78d8d6dd7f31cb903d5c8baf64181795736f33ed
Author: Daniel Stone <daniel@fooishbar.org>
Date: Tue Feb 15 14:23:25 2011 +0000
Input: Add vertical and horizontal scroll axes
To be used for smooth scrolling with future driver APIs, replacing
Rel Vert Wheel and Rel Horiz Wheel axes, which have not been used in any
open driver to date.
Combined with double-granularity ValuatorMasks, these axes allow for
fine-grained scroll data to be sent to clients. Future commits allow
drivers to post these scroll axes to
QueuePointerEvents/GetPointerEvents, which take care of emulating legacy
scroll button events.
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
commit d8e42decbad4abe13265f4c546a0c561905d018f
Author: Daniel Stone <daniel@fooishbar.org>
Date: Tue Feb 15 18:54:14 2011 +0000
Input: Split GetPointerEvents body into a helper function
For smooth-scrolling support, we want GetPointerEvents to generate
multiple events, so split the body of the function out into a helper
function in order to call it multiple times.
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
commit bc8aad2376207b5ca9c74effae67fb8183222d2e
Author: Daniel Stone <daniel@fooishbar.org>
Date: Thu Mar 3 19:48:15 2011 +0000
Input: Set last valuators in GetPointerEvents only
Previously, various pieces of code, including acceleration, used to drop
the values into DeviceIntRec::last.valuators. Remove all this and only
do it in GetPointerEvents after all transformation, acceleration and
clipping, so we're guaranteed to always have the correct values.
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 94c19a0a72403fc522e3d05eeb57f35e111a2562
Author: Daniel Stone <daniel@fooishbar.org>
Date: Thu Mar 3 15:46:45 2011 +0000
Input: Convert DeviceIntRec::last to use doubles
Change the last real user of a split integer/fractional co-ordinate
system, DeviceIntRec's last->{valuators,remainder} to just have one set
of doubles.
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 2d9beeb2174661d0a0732403ad4e49e9ff56718d
Author: Daniel Stone <daniel@fooishbar.org>
Date: Thu Mar 3 15:36:55 2011 +0000
Input: Make DeviceEvent use doubles internally
Change the DeviceEvent InternalEvent to use doubles for its valuators,
instead of data and data_frac.
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 626f487b97c99b48bf1d8c8ef4367a686639c3e6
Author: Daniel Stone <daniel@fooishbar.org>
Date: Thu Mar 3 15:06:45 2011 +0000
Input: Make RawDeviceEvent use doubles internally
Change RawDeviceEvent to use doubles for valuators internally, rather
than data(_raw) and data(_raw)_frac.
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 3b7fb0f68dc0d40c968c2cfc9bb74b1d0fb48bc8
Author: Daniel Stone <daniel@fooishbar.org>
Date: Wed Mar 2 17:18:48 2011 +0000
Input: Modify mask in-place in positionSprite
Instead of taking pointers to x and y values to modify in
positionSprite, just modify the mask (as well as dev->last) in place.
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 629a575261c08ca67324fea4c975636a1a95dc75
Author: Daniel Stone <daniel@fooishbar.org>
Date: Wed Mar 2 17:04:57 2011 +0000
Input: Convert positionSprite and GetPointerEvents to double
Use doubles internally in both of these functions, eliminating most of
the remaining int co-ordinate usage.
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 51437995a5041a8c53c33b508b1607c78a5fa463
Author: Daniel Stone <daniel@fooishbar.org>
Date: Wed Mar 2 16:50:55 2011 +0000
Input: Don't call positionSprite for non-pointer devices
If the device doesn't have any valuators, or if it has less than two of
them, don't bother calling positionSprite. Users with one-dimensional
pointing devices may be upset.
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 4c364a312daf2b743a0a60b9907f671804a1b1b6
Author: Daniel Stone <daniel@fooishbar.org>
Date: Wed Mar 2 16:49:53 2011 +0000
Input: Convert rescaleValuatorAxis to double
Instead of passing fractional pointers around everywhere, just pass
doubles instead. Much easier.
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 5680fa41ea3373651f7017898a307e97cf29b0d3
Author: Daniel Stone <daniel@fooishbar.org>
Date: Wed Mar 2 16:30:30 2011 +0000
Input: Remove x and y from moveAbsolute/moveRelative
Both these functions modify the mask and
pDev->last.{valuators,remainder} in-place now, so there's no need to
pass in pointers to local x and y values.
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 0882b788da97c75e464eb352dac1d83c938a148e
Author: Daniel Stone <daniel@fooishbar.org>
Date: Wed Mar 2 16:27:31 2011 +0000
Input: Convert acceleration code to using ValuatorMask
Instead of passing a set of int* to the acceleration code, pass it a
mask instead, which avoids an unfortunate loss of precision.
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Simon Thum <simon.thum@gmx.de>
commit 2b8f1d07bd42c9d3db3dbacfe6a1335e47236a6c
Author: Daniel Stone <daniel@fooishbar.org>
Date: Wed Mar 2 15:37:53 2011 +0000
Input: Widen pointer acceleration types to double
This widens almost all of the float-using code in ptrveloc.[ch] to
doubles, other than values coming from properties which are specified to
be floats by the property API.
Bumps input API to v14 as this changes the AccelScheme signature, as
used by xf86-input-synaptics.
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
commit 8a4a4e1b8a33899653d68a21bb7ff0557a576338
Author: Daniel Stone <daniel@fooishbar.org>
Date: Thu Jun 9 15:26:55 2011 +0100
Input: Use trunc instead of lrintf in acceleration code
For compatibility with all the rest of the input code.
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
Reviewed-by: Simon Thum <simon.thum@gmx.de>
commit e1df51421bc392d57f88c831fe0661871a8aa769
Author: Daniel Stone <daniel@fooishbar.org>
Date: Wed Mar 2 13:34:32 2011 +0000
Input: Set fractional member in set_raw_valuators
RawDeviceEvents have space for fractional valuator members, so might as
well start using them.
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
commit cdf202250ef616f3b261db70da30e421ea59a630
Author: Daniel Stone <daniel@fooishbar.org>
Date: Wed Mar 2 14:50:29 2011 +0000
Input: Convert transformAbsolute to work on doubles
Change transformAbsolute to use doubles internally.
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 3463078f9697fad0ee11837d80e88889fc6a28a4
Author: Daniel Stone <daniel@fooishbar.org>
Date: Wed Mar 2 13:29:24 2011 +0000
Input: Convert clipAxis, moveAbsolute and moveRelative to double
Change all these three to use doubles internally, though the outputs of
moveAbsolute and moveRelative are still truncated to int.
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
commit 4e52cc0ef48145134cd58d357fb7289e6f8bb709
Author: Daniel Stone <daniel@fooishbar.org>
Date: Wed Mar 2 13:20:37 2011 +0000
Input: Prepare moveRelative for conversion to double
Shuffle some code around in moveRelative to make the conversion to
double easier later.
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 80fdf9ca33a8f50f98a4b1a3279e66b040353b80
Author: Daniel Stone <daniel@fooishbar.org>
Date: Wed Mar 2 13:19:00 2011 +0000
Input: Prepare moveAbsolute for conversion to double
Shuffle some code around to make moving to double easier later.
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 6a6b4eb05c7822860e2362fa9b8441fc67055e27
Author: Daniel Stone <daniel@fooishbar.org>
Date: Wed Mar 2 17:22:59 2011 +0000
Input: Store clipped absolute axes in the mask
Change moveAbsolute to be more symmetric with moveRelative by storing a
clipped axis value back in the mask, rather than just in
dev->last.valuators.
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 7e919ef5bfa94d51a06eefb150ab947bdbfb6885
Author: Daniel Stone <daniel@fooishbar.org>
Date: Wed Feb 23 17:28:18 2011 +0000
Input: Add double-precision valuator_mask API
Add API for valuator_mask that accepts and returns doubles, rather than
ints. No double API is provided for set_range at the moment.
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 79d4deb76d5612b75ef26b4549b7ade3a656687d
Author: Daniel Stone <daniel@fooishbar.org>
Date: Wed Feb 23 14:31:01 2011 +0000
Input: Convert ValuatorMask to double-precision internally
Switch the ValuatorMask struct to using doubles instead of ints for the
actual values. Preserve the old int API, and (attempt to) round towards
zero for values we return.
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 60a766a96f9ec97adf6d0273f70ec23f313a11c6
Author: Daniel Stone <daniel@fooishbar.org>
Date: Thu Jun 9 16:02:47 2011 +0100
Input: Add flags to RawDeviceEvent
Add a flags member which will be copied wholesale into the resultant
xXIRawEvent.
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
commit 5d62c32981dbe9630bed32567b55008b536c81c5
Author: Daniel Stone <daniel@fooishbar.org>
Date: Mon Dec 27 13:24:35 2010 +0000
Input: Add flags to DeviceEvent
Add a flags member which will be copied wholesale into the resultant
xXIDeviceEvent.
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Chase Douglas <chase.douglas@canonical.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 38e9e28ba2fbffee52ad9889ef6d4e94c7af3e10
Author: Jeremy Huddleston <jeremyhu@apple.com>
Date: Tue Sep 20 20:39:06 2011 -0700
XQuartz: Use set_front_process rather than X11ApplicationSetFrontProcess since we're already in the AppKit thread
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
commit 206b30ebc608d29a91cc18665d89e887cac4dba3
Author: Jeremy Huddleston <jeremyhu@apple.com>
Date: Thu Sep 22 18:55:19 2011 -0700
Address regressions from e8ff555b95ba and d206d52f657c to work with other compilers
1) The error attribute appeared in gcc-4.3
2) The return type of __builtin_constant_p is int
3) Sun Studio 12.0 and later builtin support for __builtin_constant_p
Found by Tinderbox.
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
Reviewed-by: Matt Turner <mattst88@gmail.com>
Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Aaron Plattner <aplattner@nvidia.com>
commit afb1fe695d197187a301c19863a128a65389b15c
Merge: 7fb4bef039 c7163fdd30
Author: Keith Packard <keithp@keithp.com>
Date: Mon Sep 26 20:24:15 2011 -0700
Merge remote-tracking branch 'whot/next'
commit c7163fdd302f706a3d67f0fdf93eeb3396bb3332
Author: vdb@picaros.org <vdb@picaros.org>
Date: Wed Aug 31 07:23:01 2011 +0200
xfree86: .BI style: monitor section in xorg.conf man page
The xorg.conf manual uses the following convention in most of its
sections:
bold = text to be copied literally to the config file,
italic = a symbolic name to be substituted by a true value.
Some configuration keywords seem to have been changed into generic
options. Prepending Option to the manual entry swapped the
bold-italic logic. This patch restores the convention in the monitor
section and consists of
-.BI "Option " "\*qPreferredMode\*q " \*qstring\*q
+.BI "Option \*qPreferredMode\*q \*q" name \*q
modifications.
Plus a few minor changes (Modes → Mode) and a typo fix.
Signed-off-by: Servaas Vandenberghe
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 4b4caecb7d2c8e0b7e4fedc95fba2a728bbc25e6
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Tue Sep 6 09:33:43 2011 +1000
xfree86: expose Option "TransformationMatrix"
Recent changes to the server change the default absolute input device
behaviour on zaphods to span the whole desktop too. Since these setups
usually use an xorg.conf, allow the transformation matrix to be specified in
the config as well.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Simon Thum <simon.thum@gmx.de>
commit cf51424a34fb2b567a867338ab44f83b5c43251c
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Tue Sep 6 09:39:01 2011 +1000
xfree86: use subheader for Pointer Acceleration parts in xorg.conf(5)
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 9125952b407090b040bffb3d752288293137cf77
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Mon Sep 5 15:43:14 2011 +1000
xfree86: fix comment typo
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 2d2dce558d24eeea0eb011ec9ebaa6c5c2273c39
Author: Sam Spilsbury <sam.spilsbury@canonical.com>
Date: Wed Sep 14 09:58:34 2011 +0800
Remove the SendEvent bit (0x80) before doing range checks on event type.
Some extension libraries may set this bit before converting the event to
wire protocol and as such range checking the event will cause an invalid
BadValue error to result. As the documentation suggests the the bit
should be "forced on", remove it before doing range checks and continue
to force it on in the server.
Reviewed-by: Jamey Sharp <jamey@minilop.net>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit f52d5cd374563544dafe29587411f345e31bbdf8
Author: Carlos Garnacho <carlosg@gnome.org>
Date: Wed Aug 31 00:46:52 2011 +0200
Xi: Fix passive XI2 ungrabs on XIAll[Master]Devices
The corresponding DeviceIntPtr wasn't being gotten properly,
resulting in BadDevice from dixLookupDevice().
Signed-off-by: Carlos Garnacho <carlosg@gnome.org>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 24823f1ab0f16e0815ef44340894537dc4babf6a
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Wed Aug 3 16:01:28 2011 +1000
xfree86: switch options from pointer to XF86OptionPtr
In all cases, the pointer was simply type-cast anyway. Let's get some
compile-time type safety going, how about that.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Dan Nicholson <dbn.lists@gmail.com>
Squashed in:
xfree86: Move definition of xf86OptionPtr into separate header file
The pile of spaghettis that is the xfree86 include dependencies make it
rather hard to have a single typedef somewhere that's not interfering with
everything else or drags in a whole bunch of other includes.
Move the xf86OptionRec and GenericListRec declarations into a separate
header.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
commit 284328a6beb0bd0ab6653973ce52b5a68b4e791f
Author: Zhigang Gong <zhigang.gong@linux.intel.com>
Date: Mon Sep 26 17:04:56 2011 +0800
glamor-ddx: Rename glamor.c to glamor_ddx.c.
As glamor's dix module already has a glamor.c, rename this
glamor.c to other name to avoid file name conflict which
may confuse gdb.
Signed-off-by: Zhigang Gong <zhigang.gong@linux.intel.com>
commit 101b69dddff6cc538cb369c70377bbad825aa765
Author: Zhigang Gong <zhigang.gong@linux.intel.com>
Date: Mon Sep 26 16:33:52 2011 +0800
glamor: Check libgbm if enable glamor ddx.
Signed-off-by: Zhigang Gong <zhigang.gong@linux.intel.com>
commit 6a7ad1c92934b35eb2431c3e0f11c0c56a097dc9
Author: Zhigang Gong <zhigang.gong@linux.intel.com>
Date: Mon Sep 26 16:13:57 2011 +0800
glamor-ddx: Don't double free the cursor memory.
Signed-off-by: Zhigang Gong <zhigang.gong@linux.intel.com>
commit fe4c95ce843afffed981ac8bb89ca433bd20f1e2
Author: Zhigang Gong <zhigang.gong@linux.intel.com>
Date: Mon Sep 26 16:08:29 2011 +0800
glamor: Refine the screen pixmap initialization for Xephyr.
The previous implementation is to override the CreatePixmap
firstly and assume the first call to CreatePixmap must be
screen pixmap. This is not clean. Now Refine it to normal
way. Let the Xephyr to set texture 0 to screen pixmap
during creating screen resources.
Signed-off-by: Zhigang Gong <zhigang.gong@linux.intel.com>
commit 1fb58860cc02d28545c66a916956a45918596870
Author: Zhigang Gong <zhigang.gong@linux.intel.com>
Date: Mon Sep 26 16:05:52 2011 +0800
ephyr-glamor: Implment gl disptach function for host glx.
We should pass back the glXGetProcAddress to the underlying
gl dispatch initialization function to get those gl function
pointers.
Signed-off-by: Zhigang Gong <zhigang.gong@linux.intel.com>
commit df070205600cd736750d8a43426976a518b1fbae
Author: Zhigang Gong <zhigang.gong@linux.intel.com>
Date: Mon Sep 26 16:01:03 2011 +0800
ephyr-glamor: Set texture 0 to screen pixmap.
In Xephyr, screen pixmap is different from other pixmap.
It use fbo zero and texture zero. We initialize it during
creating screen resources.
Signed-off-by: Zhigang Gong <zhigang.gong@linux.intel.com>
commit 937d3bcecf04305c01159f5c5084833f28014061
Author: Zhigang Gong <zhigang.gong@linux.intel.com>
Date: Thu Sep 22 13:39:01 2011 +0800
glamor: Correct the version check for GLES2.
If we are using GLES2, then the version number should be no
less than 2.0 rather than no less than 1.3 which is for GL
API.
commit 483717484afb4ccf5b48483b3a21a9fe91213dd4
Author: Zhigang Gong <zhigang.gong@linux.intel.com>
Date: Tue Sep 20 17:15:12 2011 +0800
glamor-ddx: Destroy all the pixmap cursors when close current screen.
As now we use pixmap to handle cursor, and pixmaps are related to
current screen. If we close the screen, then we have to destroy all
the related cursors.
Signed-off-by: Zhigang Gong <zhigang.gong@linux.intel.com>
commit f1c36c611efaa56e49758d8e8b19d07c10a8277e
Author: Zhigang Gong <zhigang.gong@linux.intel.com>
Date: Tue Sep 20 17:10:50 2011 +0800
glamor-ddx: Don't need to call preInit in screen_init.
The previous implementation call preInit again to reopen
the device if the device is closed by eglTerminate. Now
we don't need it anymore, as glamor dix doesn't call
eglTerminate any more when close screen.
Signed-off-by: Zhigang Gong <zhigang.gong@linux.intel.com>
commit 09c63d320112fbb4995696d813c488e82915c2f5
Author: Zhigang Gong <zhigang.gong@linux.intel.com>
Date: Tue Sep 20 15:19:13 2011 +0800
glamor-ddx: Reuse glamor_dix module to handle egl platform.
We already have a glamor egl module at glamor directory which
could initialize and create egl context and also can attach a
gbm buffer to a specified pixmap or to the screen pixmap. This
commit remove all the duplicated code here and use the glamor_dix
module directly.
As we don't want to handle egl stuffs in this layer, we have to
change the way to handle hardware cursor. Previous method is to
call egl functions to create a egl image and then bind the image
to a texutre then call gl functions to load texture image to the
cursor bo. Now we can bind the cursor bo to a cursor pixmap and
then use putimage to load new image to the cursor bo. Then we can
completely avoid to call egl or gl functions directly in this
ddx driver.
Signed-off-by: Zhigang Gong <zhigang.gong@linux.intel.com>
commit 1590da001129ea61d6f7f8758d1d2842825be81b
Author: Zhigang Gong <zhigang.gong@linux.intel.com>
Date: Tue Sep 20 15:14:49 2011 +0800
glamor-egl: Add gbm device support.
Latest mesa EGL implementation move to use gbm to manage/allocate buffers.
To keep backward compatibility, we still try to use eglGetDRMDisplayMESA
firstly, and if failed, then turn to use eglGetDisplay(gbm).
Signed-off-by: Zhigang Gong <zhigang.gong@linux.intel.com>
commit 2d4d40a4b5938249f3c73ed14fe5c5b926c2fefd
Author: Zhigang Gong <zhigang.gong@linux.intel.com>
Date: Mon Sep 19 09:45:32 2011 +0800
glamor-ddx: Fix the broken switching between VTs.
Now we can allocate frame buffer during the screen initialization.
And set mode major when enter VT. This is the correct logic. The
previous implementation defer the set mode major to create screen
resource which will cause the switching between VTs broken.
Signed-off-by: Zhigang Gong <zhigang.gong@linux.intel.com>
commit 4c8ed1756aa5121a559aa604926a730180a1403f
Author: Zhigang Gong <zhigang.gong@linux.intel.com>
Date: Mon Sep 19 06:31:57 2011 +0800
glamor-ddx: Use gbm to allocate front buffer and cursor image.
Signed-off-by: Zhigang Gong <zhigang.gong@linux.intel.com>
commit 82a9b0c540dcf1064f5184c36a05d6216fb11034
Author: Zhigang Gong <zhigang.gong@linux.intel.com>
Date: Fri Sep 16 13:37:13 2011 +0800
glamor-ddx: Change naming of glamor ddx module.
Use glamor_ddx prefix for all standalone glamor ddx functions.
Signed-off-by: Zhigang Gong <zhigang.gong@linux.intel.com>
commit 67dbe0ddf87a6dd602d3d4a6049072f6386d757e
Author: Zhigang Gong <zhigang.gong@linux.intel.com>
Date: Thu Sep 8 15:16:01 2011 +0800
glamor-egl: Added new function to create image for a pixmap.
This function is used to support dri2. In the underlying
driver, it will create a buffer object for a given pixmap.
And then call this api to create a egl image from that
buffer object, and then bind that image to a texture, and
then bind that texture to the pixmap.
Normally, this pixmap's content is shared between a dri2
client and the x server.
Signed-off-by: Zhigang Gong <zhigang.gong@linux.intel.com>
commit 2a9dfc963f610abfbf12d5efdf5ba5b3f55a4305
Author: Zhigang Gong <zhigang.gong@linux.intel.com>
Date: Thu Sep 8 15:14:43 2011 +0800
glamor: Re-arrange some macros/definitions in header files.
Signed-off-by: Zhigang Gong <zhigang.gong@linux.intel.com>
commit 0dff23d65b8bcec615f4c7a49efa7a5bf220b299
Author: Zhigang Gong <zhigang.gong@linux.intel.com>
Date: Thu Sep 8 14:05:46 2011 +0800
glamor: Don't direct call to any gl functions.
Create a new structure glamor_gl_dispatch to hold all the
gl function's pointer and initialize them at run time ,
rather than use them directly. To do this is to avoid
symbol conflicts.
Signed-off-by: Zhigang Gong <zhigang.gong@linux.intel.com>
commit 7daf9af086624133d6c4857ed92d57ad2a492d86
Author: Zhigang Gong <zhigang.gong@linux.intel.com>
Date: Wed Aug 31 17:43:46 2011 +0800
glamor: Let GLAMOR_DDX implicit GLAMOR.
If user only enable GLAMOR_DDX, he must also want GLAMOR.
Signed-off-by: Zhigang Gong <zhigang.gong@linux.intel.com>
commit f08988455cd4f6339187e74df8edb5783b61f8fa
Author: Zhigang Gong <zhigang.gong@linux.intel.com>
Date: Tue Aug 30 18:24:53 2011 +0800
glamor: Route UnrealizeGlyph to glamor_glyph_unrealize.
Signed-off-by: Zhigang Gong <zhigang.gong@linux.intel.com>
commit 16659622708db82caaeb12527ba09545ad15b4c3
Author: Zhigang Gong <zhigang.gong@linux.intel.com>
Date: Tue Aug 30 17:45:07 2011 +0800
glamor: Improve glyphs cache mechanism.
This commit applying the latest uxa's glyphs cache mechanism
and give up the old hash based cache algorithm. And the cache
picture now is much larger than the previous one also.
This new algorithm can avoid the hash insert/remove and also
the expensive sha1 checking. It could obtain about 10%
performance gain when rendering glyphs.
Signed-off-by: Zhigang Gong <zhigang.gong@linux.intel.com>
commit bf4cbbd4e9c8ee104293a3c4eb202c880a139b73
Author: Zhigang Gong <zhigang.gong@linux.intel.com>
Date: Tue Aug 30 17:37:47 2011 +0800
glamor: Move glamor_glyphs_init to create screen resources stage.
As in glamor_glyphs_init, we may need to create pixmap. Thus it must
be called after the pixmap resources allocation. Just move it to
screen resource creation stage is good enough for mow.
Also introduce a macro GLAMOR_FOR_XORG to glamor.h. As glamor may
be used by Xephyr which doesn't don't have those xorg header files
and also don't need the egl extension.
Signed-off-by: Zhigang Gong <zhigang.gong@linux.intel.com>
commit ae38bd7c459982d3e05f6f672ee68d187e97421c
Author: Zhigang Gong <zhigang.gong@linux.intel.com>
Date: Thu Aug 25 10:05:11 2011 +0800
glamor: Change glamor_egl_init API.
Slightly change the API glamor_egl_init,
as this initialization is to initialize the display not
the screen, we should call it in xxx_preinit rather
than xxxScreenInit(). we change the input parameter as
below, as in preInit, the screen may not be allocated
at all. And in glamor_egl_init, it will not call
glamor_init. Driver should call glamor_init at
screen_init stage.
Signed-off-by: Zhigang Gong <zhigang.gong@linux.intel.com>
commit d4f4d1272e1745752840eb7e8ec04eb155ac38d1
Author: Zhigang Gong <zhigang.gong@linux.intel.com>
Date: Wed Aug 24 17:17:48 2011 +0800
glamor-egl: Fix direct call for glEGLImageTargetTexture2DOES.
Signed-off-by: Zhigang Gong <zhigang.gong@linux.intel.com>
commit 6cb4abca697c24bdc644502cce8a2ca9bbf131e3
Author: Zhigang Gong <zhigang.gong@linux.intel.com>
Date: Wed Aug 24 17:13:35 2011 +0800
glamor: Remove the version check for EGL/gles.
As PVR's gles2 has different version number from mesa's,
just simply remove the version check here to let both
platform could build it.
Signed-off-by: Zhigang Gong <zhigang.gong@linux.intel.com>
commit 60f14d60f6169272951d41d8ca9e0a294c2ca3d0
Author: Zhigang Gong <zhigang.gong@linux.intel.com>
Date: Wed Aug 24 16:54:32 2011 +0800
glamor-egl: Move EGL surfaceless related code to dix module.
The functions in glamor_egl.c could be shared by any egl back
end drivers.
Signed-off-by: Zhigang Gong <zhigang.gong@linux.intel.com>
commit 3854409e9ad25418c6188f491410bb05eaf92fc6
Author: Zhenyu Wang <zhenyuw@linux.intel.com>
Date: Mon Aug 22 23:27:24 2011 -0700
glamor: Fix direct call for glEGLImageTargetTexture2DOES
Follow extension call rule to call glEGLImageTargetTexture2DOES.
commit 54c91079d2bd21d3fd97b6d5fa3ba5c4a86b6337
Author: Zhigang Gong <zhigang.gong@linux.intel.com>
Date: Tue Aug 23 14:04:07 2011 +0800
glamor-gles2: Add explicit precision qualifiers for gles2.
Signed-off-by: Zhigang Gong <zhigang.gong@linux.intel.com>
commit b4f265c7f9bcb7824df19ea915ab32fe84d9ec53
Author: Zhigang Gong <zhigang.gong@linux.intel.com>
Date: Tue Aug 23 13:30:54 2011 +0800
glamor: Fallback to software fb when repeat is needed.
Need to be fixed latter. We should not need any fallback here.
But currently, the implementation for repeating tiling is
broken.
Signed-off-by: Zhigang Gong <zhigang.gong@linux.intel.com>
commit bd0ea43f3999e29ae5953ca5257b1795916dd5e7
Author: Zhigang Gong <zhigang.gong@linux.intel.com>
Date: Tue Aug 23 13:27:48 2011 +0800
glamor: Change to use the original drawable in glamor_fill.
As glamor_fill may fallback to software rasterization, we'd
better to use the original drawable as input paramter.
Signed-off-by: Zhigang Gong <zhigang.gong@linux.intel.com>
commit 65812b538f23bfccc32a7bbc0b2c4e93e1cd8fe8
Author: Zhigang Gong <zhigang.gong@linux.intel.com>
Date: Tue Aug 23 10:31:50 2011 +0800
glamor-dix: Make a glamor dix module.
And modify the header file to export three APIs to the
ddx driver.
Signed-off-by: Zhigang Gong <zhigang.gong@linux.intel.com>
commit ef3ea0f46bf1b688249cd37d54cfa67ec55041b0
Author: Zhigang Gong <zhigang.gong@linux.intel.com>
Date: Fri Aug 19 11:06:56 2011 +0800
glamor: Don't need to check status when set the target.
As we already checked the status when create the fbo.
Signed-off-by: Zhigang Gong <zhigang.gong@linux.intel.com>
commit 52cce9333fed2035da9623f338428a5d220b577d
Author: Zhigang Gong <zhigang.gong@linux.intel.com>
Date: Fri Aug 19 11:05:21 2011 +0800
glamor: egl version 7.11 should be ok for us.
Signed-off-by: Zhigang Gong <zhigang.gong@linux.intel.com>
commit 3648e35b5d0ffcb2ea5d40c842a7f8dd39b27b50
Author: Zhigang Gong <zhigang.gong@linux.intel.com>
Date: Fri Aug 19 10:53:44 2011 +0800
glamor-ddx: Add code to check required egl extensions.
Signed-off-by: Zhigang Gong <zhigang.gong@linux.intel.com>
commit eaa07998c432f68485423c4d108220ce1d72e7b6
Author: Zhigang Gong <zhigang.gong@linux.intel.com>
Date: Tue Aug 16 14:05:25 2011 +0800
glamor: Add device independent glamor to the installation package.
Other ddx driver may link libglamor_dix to utilize glamor.
Signed-off-by: Zhigang Gong <zhigang.gong@linux.intel.com>
commit 1658454dea4330144ebc0b02e1b42feed6db4f41
Author: Zhigang Gong <zhigang.gong@gmail.com>
Date: Tue Aug 16 00:33:35 2011 +0800
glamor: Fix the copy of overlaped region in one pixmap.
Originaly, we use fbo blit to handle overlaped region copy.
But GLES2 doesn't support that, just simply copy the needed
region to another texture can fix this problem.
Signed-off-by: Zhigang Gong <zhigang.gong@gmail.com>
commit 1f129c491bfc825465c3bc0e9b745b7f66dea720
Author: Zhigang Gong <zhigang.gong@gmail.com>
Date: Tue Aug 16 00:32:57 2011 +0800
glamor: Convert pixmap to supported format before getspans.
Signed-off-by: Zhigang Gong <zhigang.gong@gmail.com>
commit 67da52ec13a87846201a99d5a31db28668d9fdfd
Author: Zhigang Gong <zhigang.gong@gmail.com>
Date: Tue Aug 16 00:21:09 2011 +0800
glamor: Add color conversion support by using new shader.
There are two places we need to do color conversion.
1. When upload a image data to a texture.
2. When download a texture to a memory buffer.
As the color format may not be supported in GLES2. We may
need to do the following two operations to convert dat.
a. revert argb to bgra / abgr to rgba.
b. swap argb to abgr / bgra to rgba.
Signed-off-by: Zhigang Gong <zhigang.gong@gmail.com>
commit 0eea084db54fb88b9933fd1326a2b0b059b3f9d7
Author: Zhigang Gong <zhigang.gong@gmail.com>
Date: Tue Aug 16 00:20:01 2011 +0800
glamor: GLES2 doesn't support glEnable/Disable Texture 2D.
Signed-off-by: Zhigang Gong <zhigang.gong@gmail.com>
commit 504e03c0b59f4dc3b8058abdce79706a72cd0dde
Author: Zhigang Gong <zhigang.gong@gmail.com>
Date: Tue Aug 16 00:17:58 2011 +0800
glamor: GLES2 doesn't support GL_CLAMP_TO_BORDER.
Simply comments it out. Need revisit latter.
Signed-off-by: Zhigang Gong <zhigang.gong@gmail.com>
commit f84cc8b84b2944b60eb2a8225e3c44a1cdfb228d
Author: Zhigang Gong <zhigang.gong@gmail.com>
Date: Tue Aug 16 00:09:38 2011 +0800
glamor-ddx: Hardware cursor's format should be GL_RGBA.
Signed-off-by: Zhigang Gong <zhigang.gong@gmail.com>
commit 23c1fba5e5a5fe8dd18c4c8a9b5a958ce4671160
Author: Zhigang Gong <zhigang.gong@gmail.com>
Date: Sat Aug 13 15:41:18 2011 -0400
glamor: Remove glu3 which is unnecessary.
Signed-off-by: Zhigang Gong <zhigang.gong@gmail.com>
commit a228effbeb339ae6f0b73c633022b3ec9981148f
Author: Zhigang Gong <zhigang.gong@gmail.com>
Date: Thu Aug 11 15:56:02 2011 -0400
glamor: Remove useless glVertexPointer related code.
As glVertexPointer is not supported by GLES2, I totally
replaced it by VertexAttribArray. This commit remove those
old code.
Signed-off-by: Zhigang Gong <zhigang.gong@gmail.com>
commit 5cbb2a4ca05f696d2af9a2e50bf106b6f2acd1c6
Author: Zhigang Gong <zhigang.gong@gmail.com>
Date: Thu Aug 11 15:35:26 2011 -0400
glamor: Only fallbac glamor_setspan when we are using gles2.
Signed-off-by: Zhigang Gong <zhigang.gong@gmail.com>
commit 667d65534d64df30146cfa0d32522bced51e0697
Author: Zhigang Gong <zhigang.gong@gmail.com>
Date: Thu Aug 11 15:27:12 2011 -0400
glamor: Unify the variable name which used to indicate no alpha.
The original code use different name and the name is vague.
Now change it to no_alpha.
Signed-off-by: Zhigang Gong <zhigang.gong@gmail.com>
commit 5e7fdbb498c47b6e89280b8354f0ebaaf61d0646
Author: Zhigang Gong <zhigang.gong@gmail.com>
Date: Thu Aug 11 15:08:12 2011 -0400
glamor: Disable ALPHA8 fbo.
As some platform doesn't support to use ALPHA8 texture as
draw target, we have to disable it. It seems there is no
easy way to check that.
Signed-off-by: Zhigang Gong <zhigang.gong@gmail.com>
commit 172e8cfcd411b1abeaf8ede2e3882d6198cee5b8
Author: Zhigang Gong <zhigang.gong@gmail.com>
Date: Thu Aug 11 15:05:02 2011 -0400
glamor: Remove GLEW dependency.
Glamor doesn't need to use GLEW. We can parse the extension by
ourself. This patch also fix the fbo size checking from a hard
coded style to a dynamic checking style.
Signed-off-by: Zhigang Gong <zhigang.gong@gmail.com>
commit 2146a25bac4392c47ef06ecddbf12db184926b7e
Author: Zhigang Gong <zhigang.gong@gmail.com>
Date: Thu Aug 11 15:03:48 2011 -0400
glamor-ddx: Silence one warning.
Signed-off-by: Zhigang Gong <zhigang.gong@gmail.com>
commit d66bd9714e1e1af4267fb4eb208143a070e65ee3
Author: Zhigang Gong <zhigang.gong@gmail.com>
Date: Thu Aug 11 09:54:28 2011 -0400
glamor: Concentrate FBO's creation to one function.
And add status checking for it.
Signed-off-by: Zhigang Gong <zhigang.gong@gmail.com>
commit b2bff334ce4f36352497f1c1d4e9f0e5b3336136
Author: Zhenyu Wang <zhenyuw@linux.intel.com>
Date: Tue Aug 9 19:37:17 2011 -0700
glamor: Require libdrm CFLAGS for building
Need to depend on libdrm CFLAGS for glamor building.
commit 41b13fbd264594f88905b1cf8dcb2f14e7ee5b69
Author: Zhenyu Wang <zhenyuw@linux.intel.com>
Date: Wed Aug 10 01:42:26 2011 -0700
glamor: Use function pointer to get extenstion calls
This is the formal usage for extension functions.
commit 7aecfa245facf754ff8e09d6ef1ad0ab802156fc
Author: Zhigang Gong <zhigang.gong@gmail.com>
Date: Tue Aug 9 10:01:39 2011 -0400
glamor-es2: Add --enable-glamor-gles2 to build system.
Now, to build a gles2 version of glamor server, we could
use ./autogen.sh --enable-glamor-ddx --enable-glamor-gles2
Signed-off-by: Zhigang Gong <zhigang.gong@gmail.com>
commit 36a93f62c7830af088a54514eab6bf4d92423df6
Author: Zhigang Gong <zhigang.gong@gmail.com>
Date: Tue Aug 9 09:59:56 2011 -0400
glamor_gles2: Use gl_flavor to determine which version of GL.
Signed-off-by: Zhigang Gong <zhigang.gong@gmail.com>
commit 29e358f6b3838a56b53ec809665f2e7be1731722
Author: Zhigang Gong <zhigang.gong@gmail.com>
Date: Tue Aug 9 09:59:08 2011 -0400
glamor: Fix one typo error in README.
Signed-off-by: Zhigang Gong <zhigang.gong@gmail.com>
commit ee33c947aac10b2b1ec2c5b070fbd81cef1773c6
Author: Zhigang Gong <zhigang.gong@linux.intel.com>
Date: Wed Aug 3 16:52:19 2011 +0800
glamor-es: Use glVertexAttribPointer to replace glVertexPointer.
As GLES2 doesn't support glVertexPointer.
Signed-off-by: Zhigang Gong <zhigang.gong@linux.intel.com>
commit 94d884a198b97ed2e78a38ce5a71955bdbf893f8
Author: Zhigang Gong <zhigang.gong@linux.intel.com>
Date: Wed Aug 3 10:49:18 2011 +0800
glamor-es2: Fix some non-es2 functions.
ES2.0 doesn't support QUADS and also doesn't support
some EXT APIs. Fix some of them in this commit.
Signed-off-by: Zhigang Gong <zhigang.gong@linux.intel.com>
commit 68c3c6eb0cafd5eb2c208dd76a3a65187256700c
Author: Zhigang Gong <zhigang.gong@linux.intel.com>
Date: Tue Aug 2 15:54:15 2011 +0800
glamor-es2: Add gles2 option.
First commit to enable gles2 support. --enable-glamor-ddx
--enable-glamor-gles2 will set thwo MACROs GLAMOR_DDX and
GLAMOR_GLES2.
Currently, the gles2 support is still incomplete.
Signed-off-by: Zhigang Gong <zhigang.gong@linux.intel.com>
commit 98f8ef5f991e3c9d4b434af9003c466ad1edc23e
Author: Zhigang Gong <zhigang.gong@linux.intel.com>
Date: Tue Aug 2 15:51:46 2011 +0800
glamor: Change to use official APIs rather than ARB version function.
Signed-off-by: Zhigang Gong <zhigang.gong@linux.intel.com>
commit 0ef1698be22750fb14418bd418114fc63039db0c
Author: Zhigang Gong <zhigang.gong@linux.intel.com>
Date: Thu Jul 21 16:18:48 2011 +0800
glamor: Fix one bug for Xephyr.
Xephyr doesn't has a bounded valid texture. It seems that we can't
load texture 0 directly sometimes. Especially in the copyarea, function
if that is the case, we prefer to use fbo blit to read the screen pixmap
rather than load the bound texture.
Signed-off-by: Zhigang Gong <zhigang.gong@linux.intel.com>
commit 9b667ffd564910ff7373547ce2f8d4a7c5d71137
Author: Zhigang Gong <zhigang.gong@linux.intel.com>
Date: Wed Jul 20 14:33:00 2011 +0800
glamor: Use small internal texture format if possible.
Reduce some texture memory requirement and also save
some bandwidth.
Signed-off-by: Zhigang Gong <zhigang.gong@linux.intel.com>
commit 01489f9da9aa357c59799d4d41c7ca96b4cbd1d8
Author: Zhigang Gong <zhigang.gong@linux.intel.com>
Date: Wed Jul 20 14:02:15 2011 +0800
glamor: Add simple introduction of how to setup glamor xserver.
Signed-off-by: Zhigang Gong <zhigang.gong@linux.intel.com>
commit 1f3f3baf1469e74767474ddb383e92502384de80
Author: Zhigang Gong <zhigang.gong@linux.intel.com>
Date: Wed Jul 20 13:35:25 2011 +0800
glamor: Avoid 2D bitblit if possible.
It turns out that the use of fbo blit is one of the root cause
which lead to slow drawing, especially slow filling rects.
We guess there should be a performance bug in the mesa driver
or even in the kernel drm driver. Currently, the only thing
glamor can do is to avoid calling those functions.
We check whether the copy source and destination has overlapped
region, if it has, we have to call fbo blit function. If it has
not, we can load the source texture directly and draw it to the
target texture. We totally don't need the glCopyPixels here, so
remove it.
By apply this patch, the rendering time of firefox-planet-gnome
decrease to 10.4 seconds. At the same platform, uxa driver get 13
seconds. This is the first time we get better performance than
uxa driver.
Signed-off-by: Zhigang Gong <zhigang.gong@linux.intel.com>
commit 5c4d53c5126bb9f603d04dac6874280b527319f5
Author: Zhigang Gong <zhigang.gong@linux.intel.com>
Date: Wed Jul 20 13:06:23 2011 +0800
glamor: Implement delayed solid filling.
When we need to solid fill an entire pixmap with a specific color,
we do not need to draw it immediately. We can defer it to the
following occasions:
1. The pixmap will be used as source, then we can just use a shader
to instead of one copyarea.
2. The pixmap will be used as target, then we can do the filling
just before drawing new pixel onto it. The filling and drawing
will have the same target texture, we can save one time of
fbo context switching.
Actually, for the 2nd case, we have opportunity to further optimize
it. We can just fill the untouched region.
By applying this patch, the cairo-trace for the firefox-planet-gnome's
rendering time decrease to 14seconds from 16 seconds.
Signed-off-by: Zhigang Gong <zhigang.gong@linux.intel.com>
commit 1caf741a4a41ef46a43980ba0be897770fea13db
Author: Zhigang Gong <zhigang.gong@linux.intel.com>
Date: Wed Jul 20 13:02:28 2011 +0800
glamor: Fixed a bug when computing the bounds of boxes.
Signed-off-by: Zhigang Gong <zhigang.gong@linux.intel.com>
commit fe0a6a29300055f8288c9d1f470fd3e24f5bb3bb
Author: Zhigang Gong <zhigang.gong@linux.intel.com>
Date: Thu Jul 7 16:54:18 2011 +0800
glamor: Should return when done gl drawing.
Signed-off-by: Zhigang Gong <zhigang.gong@linux.intel.com>
commit 7fbdc60fd4eb94c02b0b89d05cfe0243c3562ec1
Author: Zhigang Gong <zhigang.gong@linux.intel.com>
Date: Thu Jul 7 15:32:39 2011 +0800
glamor: comment out the message when creating a system memory pixmap.
Signed-off-by: Zhigang Gong <zhigang.gong@linux.intel.com>
commit f961390db6fa0707895effb2e7672edda575f8ec
Author: Zhigang Gong <zhigang.gong@linux.intel.com>
Date: Thu Jul 7 15:31:35 2011 +0800
glamor: Don't need to pad the tile image if pixmap is ni texture.
Signed-off-by: Zhigang Gong <zhigang.gong@linux.intel.com>
commit 77ecd366933bbe726a4a7e57e35b1510b675df8d
Author: Zhigang Gong <zhigang.gong@linux.intel.com>
Date: Thu Jul 7 15:30:19 2011 +0800
glamor: We don't need to check format in compositing.
We already handle all format checking in pixmap uploading and
converting, don't need to do that again.
Signed-off-by: Zhigang Gong <zhigang.gong@linux.intel.com>
commit 477a54bc9ed8f252b3a42af8ac01ef1da7b5ab6b
Author: Zhigang Gong <zhigang.gong@linux.intel.com>
Date: Thu Jul 7 14:47:51 2011 +0800
glamor: Fixed two unintialized warnings.
Signed-off-by: Zhigang Gong <zhigang.gong@linux.intel.com>
commit d49d48257917a4a900c84dae111d3f5e761a8d89
Author: Zhigang Gong <zhigang.gong@gmail.com>
Date: Sat Jul 2 14:47:38 2011 +0800
glamor: Fix multiple crtc setup.
Now, support dual crtc configuration.
Signed-off-by: Zhigang Gong <zhigang.gong@gmail.com>
commit fc23334e54b0b90d2f00b017a03cf47b70dc71aa
Author: Zhigang Gong <zhigang.gong@gmail.com>
Date: Fri Jul 1 23:51:42 2011 +0800
glamor: Optimize fallback case for the polylines.
When fallback to cpu for the polylines procedure, we can just download
required region to CPU rather than to download the whole pixmap. This
significant improve the performance if we have to fallback, for example
do non-solid filling in the game Mines.
Signed-off-by: Zhigang Gong <zhigang.gong@gmail.com>
commit da66a76f276eccee90855bc0cb28092c3755ed7b
Author: Zhigang Gong <zhigang.gong@gmail.com>
Date: Fri Jul 1 23:48:21 2011 +0800
Revert "glamor: Don't need to read dest if op is SRC or CLEAR."
This reverts commit eb16fe0b7c8ea27b5cf9122d02e48bf585495228.
As currently glamor_prepare_access/finish_access will touch
the whole pixmap, not just the request region, then write only
mode will not work correctly. We may need to revisit all fallback
case, and convert the image to the right size before do the
prepare/finish processing.
Signed-off-by: Zhigang Gong <zhigang.gong@gmail.com>
commit cb3b34ec53e00c6ca212891b314f473ee2f80a40
Author: Zhigang Gong <zhigang.gong@gmail.com>
Date: Fri Jul 1 22:54:45 2011 +0800
glamor-ddx: Add missed drmmode_crtc_destroy function.
Signed-off-by: Zhigang Gong <zhigang.gong@gmail.com>
commit c68fb6ed723d7268a3c4950b40c20ddf9b4b9ca5
Author: Zhigang Gong <zhigang.gong@gmail.com>
Date: Fri Jul 1 22:36:31 2011 +0800
glamor-ddx: Reinit crtc if we need to reopen the card.
As the eglTerminate will close the card when close screen, we may
need to reopen it at next time create a screen resource. and thus
we need to re initialize the drmmode crtc also. Otherwise , the
cursor handling will be broken as it has the wrong fd.
commit ca614860fa2a56d469064b5e05070d8201597728
Author: Zhigang Gong <zhigang.gong@linux.intel.com>
Date: Fri Jul 1 17:02:10 2011 +0800
glamor: convert if too large source or mask .
Some strange web page has 20000*1 png picture, and actually only use
partial of it. We force to convert it to a actuall size rather than
its original size,if it is the case. Then to avoid latter's failure
uploading.
Signed-off-by: Zhigang Gong <zhigang.gong@linux.intel.com>
commit 1444fed4a8030ec59f4448b490f2f77db86f0b86
Author: Zhigang Gong <zhigang.gong@linux.intel.com>
Date: Thu Jun 30 16:53:24 2011 +0800
glamor: silence compilation warnings.
Signed-off-by: Zhigang Gong <zhigang.gong@linux.intel.com>
commit 734b10e9f7e729fc300ed432bd3c81e1ea7483f3
Author: Zhigang Gong <zhigang.gong@linux.intel.com>
Date: Thu Jun 30 16:50:23 2011 +0800
glamor: Fix one typo bug in glamor_tile.
It will return when the destination pixmap has a fbo but will continue
when it doesn't have a fbo.
Signed-off-by: Zhigang Gong <zhigang.gong@linux.intel.com>
commit 2eb40a37920132d53e3b48830704f92d4c695f4c
Author: Zhigang Gong <zhigang.gong@linux.intel.com>
Date: Thu Jun 30 16:49:40 2011 +0800
glamor: Remove one extra area copy in glamor_glyph.
Signed-off-by: Zhigang Gong <zhigang.gong@linux.intel.com>
commit 61e1ad39724e5baaed4f30ff3c86782e701f19fb
Author: Zhigang Gong <zhigang.gong@linux.intel.com>
Date: Thu Jun 30 16:40:32 2011 +0800
glamor: Reduce source or mask picture size if possible.
If we only need a short part of the source or mask's drawable
pixmap, we can convert it to a new small picture before
call to the low level compositing function. Then it will only
upload the smaller picture latter.
Signed-off-by: Zhigang Gong <zhigang.gong@linux.intel.com>
commit 14503fbb819d07fa2b58d9bb741b55f93aff2cf6
Author: Zhigang Gong <zhigang.gong@linux.intel.com>
Date: Thu Jun 30 16:38:43 2011 +0800
glamor: Fix the coords calculation in glamor_fill.
glamor_fill is only called from internal functions
glamor_fillspancs and glamor_polyfillrect. And both functions
already add the offset to the coords, so the coords are already
relative value, we can't add the offset once again.
Signed-off-by: Zhigang Gong <zhigang.gong@linux.intel.com>
commit 1dca5d7b91ed6fced34f389453678407bc223e9c
Author: Zhigang Gong <zhigang.gong@linux.intel.com>
Date: Thu Jun 30 16:04:59 2011 +0800
glamor: Reduce source pixmap's size.
If the dest pixmap is in texture memory, but source pixmap is not.
Then we need to upload the source pixmap to texture memory. Previous
version will upload the whole source pixmap. This commit preprocess
the source pixmap, and reduce it to a smaller tempory pixmap only
contains the required region.
Signed-off-by: Zhigang Gong <zhigang.gong@linux.intel.com>
commit 33c6c78ae9c7e72a94cc27536f3b5f50cdcc9241
Author: Zhigang Gong <zhigang.gong@linux.intel.com>
Date: Thu Jun 30 16:01:57 2011 +0800
glamor: Add one option to force create a cpu memory pixmap.
Some special case we want to get a cpu memory pixmap. For example
to gather a large cpu memory pixmap's block to a small pixmap.
Add pixmap's priviate data's deallocation when destroy a pixmap.
Signed-off-by: Zhigang Gong <zhigang.gong@linux.intel.com>
commit 8890b38857128181cf506356046bf4a5bce53ab0
Author: Zhigang Gong <zhigang.gong@linux.intel.com>
Date: Tue Jun 28 17:17:23 2011 +0800
glamor: Don't map the vbo to system memory.
Access mapped vbo address is too slow. And by use system memory
directly, rgb10text/aa10text increases from 980K/1160K to 117K/140K.
Signed-off-by: Zhigang Gong <zhigang.gong@linux.intel.com>
commit c303949aabacb6a105ca0e0c521ca293dbda7d43
Author: Zhigang Gong <zhigang.gong@linux.intel.com>
Date: Tue Jun 28 14:49:38 2011 +0800
glamor: Reduce one extra copy in glamor_trapezoids.
This reduce the time when running cairo-performance-trace with
the firefox-planet-gnome.trace from 23.5 seconds to 21.5 seconds.
Signed-off-by: Zhigang Gong <zhigang.gong@linux.intel.com>
commit 9e4567afe6019ed7a330182d660880d8ea6c3685
Author: Zhigang Gong <zhigang.gong@linux.intel.com>
Date: Tue Jun 28 14:37:29 2011 +0800
glamor: Change to use system memory for write only access.
If the pixmap is write-only, then use a pbo mapping will not
get too much benefit. And even worse, when the software
rendering is access this mapped data range, it's much slower
than just using a system memory. From the glamor_prepare_access
glamor_finish_access view, we have two options here:
option 1:
1.0 create a pbo
1.1 copy texture to the pbo
1.2 map the pbo to va
1.3 access the va directly in software rendering.
1.4 bind the pbo as unpack buffer & draw it back to texture.
option 2:
2.0 allocate a block memory in system memory space.
2.1 read the texture memory to the system memory.
2.2 access the system memory and do rendering.
2.3 draw the system memory back to texture.
In general, 1.1 plush 1.2 is much faster than 2.1.
And 1.3 is slower than 2.2. 1.4 is faster than 2.3.
If the access mode is read only or read write, option 1
may be fater, but if the access mode is write only. Then
most of the time option 1 is much faster.
Signed-off-by: Zhigang Gong <zhigang.gong@linux.intel.com>
commit 4afa9e4080eebbee0752e5f45b2ff16df75cb9b1
Author: Zhigang Gong <zhigang.gong@linux.intel.com>
Date: Tue Jun 28 14:28:19 2011 +0800
glamor: Prepare/finish access once if src equal to dst.
Signed-off-by: Zhigang Gong <zhigang.gong@linux.intel.com>
commit cbedfe75135e3253c32ac8b89380f47d1b8a37c4
Author: Zhigang Gong <zhigang.gong@gmail.com>
Date: Sun Jun 26 20:00:26 2011 +0800
glamor: Don't need to read dest if op is SRC or CLEAR.
Signed-off-by: Zhigang Gong <zhigang.gong@gmail.com>
commit b8e692d94eb7075409e0d072fdf3066ca1d5d5f3
Author: Zhigang Gong <zhigang.gong@gmail.com>
Date: Sun Jun 26 15:54:24 2011 +0800
glamor: Move the blend set up after the pixmap uploading.
This is a bug, as if we do blend set up before do the pixmap
dynamic uploading. We will have a incorrect blend env when
doing the uploading.
Signed-off-by: Zhigang Gong <zhigang.gong@gmail.com>
commit bf782283371bc13c7b969a373c2a2eaaa3c81ec6
Author: Zhigang Gong <zhigang.gong@gmail.com>
Date: Sun Jun 26 15:51:47 2011 +0800
glamor: Fixed one bug when enable dynamic pixmap uploading.
When try to upload a pixmap without yInverted set, we must
set up a fbo for it to do the y flip. Previous implementation
only consider the ax bit. After fix this problem, we can
enable the dynamic uploading feature in copyarea function when
the yInverted is not set (from Xephyr).
Signed-off-by: Zhigang Gong <zhigang.gong@gmail.com>
commit 489e6c4e6f734d961ae8bbec67d78fccbeb9781f
Author: Zhigang Gong <zhigang.gong@gmail.com>
Date: Sun Jun 26 15:49:13 2011 +0800
glamor: Initialize pixmap private's container to correct value.
When calling from ephyr, we forgot to initialize it to the correct
value. Will cause segfault when run Xephyr.
Signed-off-by: Zhigang Gong <zhigang.gong@gmail.com>
commit ca36ada041558d1823b12b1a0141e43b9f9ad939
Author: Zhigang Gong <zhigang.gong@linux.intel.com>
Date: Wed Jun 22 18:15:02 2011 +0800
glamor: Don't always fallback everything when change window attr.
Change the glamor_change_window_attributes's handling. We don't need
to fallback every thing to cpu at the beginning. Only when there
is a real need to change the pixmap's format, we need to do something.
Otherwise, we need do nothing here.
Signed-off-by: Zhigang Gong <zhigang.gong@linux.intel.com>
commit ca1908e11dcb56cb952f6bce55503e932aa9a27c
Author: Zhigang Gong <zhigang.gong@linux.intel.com>
Date: Wed Jun 22 14:33:38 2011 +0800
glamor: Concentrate and reduce some coords processing code.
Concentrate the verties and texture coords processing code to a new
file glamor_utils.h. Change most of the code to macro. Will have some
performance benefit on slow machine. And reduce most of the duplicate
code when calculate the normalized coords.
Signed-off-by: Zhigang Gong <zhigang.gong@linux.intel.com>
commit 355334fcd99e4dce62e2be1e27290c9a74ea944f
Author: Zhigang Gong <zhigang.gong@linux.intel.com>
Date: Tue Jun 21 18:31:11 2011 +0800
glamor : Add dynamic texture uploading feature.
Major refactoring.
1. Rewrite the pixmap texture uploading and downloading functions.
Add some new functions for both the prepare/finish access and
the new performance feature dynamic texture uploading, which
could download and upload the current image to/from a private
texture/fbo. In the uploading or downloading phase, we need to
handle two things:
The first is the yInverted option, If it set, then we don't need
to flip y. If not set, if it is from a dynamic texture uploading
then we don't need to flip either if the current drawing process
will flip it latter. If it is from finish_access, then we must
flip the y axis.
The second thing is the alpha channel hanlding, if the pixmap's
format is something like x8a8r8g8, x1r5g5b5 which means it doesn't
has alpha channel, but it do has those extra bits. Then we need to
wire those bits to 1.
2. Add almost all the required picture format support.
This is not as trivial as it looks like. The previous implementation
only support GL_a8,GL_a8r8g8b8,GL_x8r8g8b8. All the other format,
we have to fallback to cpu. The reason why we can't simply add those
other color format is because the exists of picture. one drawable
pixmap may has one or even more container pictures. The drawable pixmap's
depth can't map to a specified color format, for example depth 16 can
mapped to r5g6b5, x1r5g5b5, a1r5g5b5, or even b5g6r5. So we can't get
get the color format just from the depth value. But the pixmap do not
has a pict_format element. We have to make a new one in the pixmap
private data structure. Reroute the CreatePicture to glamor_create_picture
and then store the picture's format to the pixmap's private structure.
This is not an ideal solution, as there may be more than one pictures
refer to the same pixmap. Then we will have trouble. There is an example
in glamor_composite_with_shader. The source and mask often share the
same pixmap, but use different picture format. Our current solution is to
combine those two different picture formats to one which will not lose any
data. Then change the source's format to this new format and then upload
the pixmap to texture once. It works. If we fail to find a matched new
format then we fallback.
There still is a potential problem, if two pictures refer to the same
pixmap, and one of them destroy the picture, but the other still remained
to be used latter. We don't handle that situation currently. To be fixed.
3. Dynamic texture uploading.
This is a performance feature. Although we don't like the client to hold
a pixmap data to shared memory and we can't accelerate it. And even worse,
we may need to fallback all the required pixmaps to cpu memory and then
process them on CPU. This feature is to mitigate this penalty. When the
target pixmap has a valid gl fbo attached to it. But the other pixmaps are
not. Then it will be more efficient to upload the other pixmaps to GPU and
then do the blitting or rendering on GPU than fallback all the pixmaps to CPU.
To enable this feature, I experienced a significant performance improvement
in the Game "Mines" :).
4. Debug facility.
Modify the debug output mechanism. Now add a new macro:
glamor_debug_output(_level_, _format_,...) to conditional output some messages
according to the environment variable GLAMOR_DEBUG. We have the following
levels currently.
exports GLAMOR_DEBUG to 3 will enable all the above messages.
5. Changes in pixmap private data structure.
Add some for the full color format supports and relate it to the pictures which
already described. Also Add the following new elements:
gl_fbo - to indicates whether this pixmap is on gpu only.
gl_tex - to indicates whether the tex is valid and is containing the pixmap's
image originally.
As we bring the dynamic pixmap uploading feature, so a cpu memory pixmap may
also has a valid fbo or tex attached to it. So we will have to use the above
new element to check it true type.
After this commit, we can pass the rendercheck testing for all the picture formats.
And is much much fater than fallback to cpu when doing rendercheck testing.
Signed-off-by: Zhigang Gong <zhigang.gong@linux.intel.com>
commit ba6dd8aa492d9d555d8b175bcf350e5db1821597
Author: Zhigang Gong <zhigang.gong@linux.intel.com>
Date: Fri Jun 10 18:32:15 2011 +0800
glamor: Simplify fill acceleration for spans/polyfillrect by only clipping once.
This commit was borrowed from uxa driver contributed by Eric.
commit number is e0066e77e026b0dd0daa0c3765473c7d63aa6753. commit log paste as
below:
We were clipping each span against the bounds of the clip, throwing
out the span early if it was all clipped, and then walked the clip box
clipping against each of the cliprects. We would expect spans to
typically be clipped against one box, and not thrown out, so we were
not saving any work there. For multiple cliprects, we were adding
work. Only for many spans clipped entirely out of a complicated clip
region would it have saved work, and it clearly didn't save bugs as
evidenced by the many fix attempts here.
Signed-off-by: Zhigang Gong <zhigang.gong@linux.intel.com>
commit a0a52be73994c93521e94f1f10152ce851485ea3
Author: Zhigang Gong <zhigang.gong@linux.intel.com>
Date: Fri Jun 10 16:51:27 2011 +0800
glamor: Fallback to fbPolylines for diagonal poly_line.
It's better to give a correct output when we haven't
implement all the code path.
Signed-off-by: Zhigang Gong <zhigang.gong@linux.intel.com>
commit d7f8b888d0961af8d0ec6ad5c920ce758529b620
Author: Zhigang Gong <zhigang.gong@linux.intel.com>
Date: Fri Jun 10 16:01:40 2011 +0800
glamor: For non-supported fill style fallback to fbFill.
The previous implementation will just skip the rendering
which is not good.
Signed-off-by: Zhigang Gong <zhigang.gong@linux.intel.com>
commit b60e6cb66d3fba43d5403b2b5027537d09ee7c98
Author: Zhigang Gong <zhigang.gong@linux.intel.com>
Date: Fri Jun 10 15:46:23 2011 +0800
glamor: Silence compilation warnings.
Signed-off-by: Zhigang Gong <zhigang.gong@linux.intel.com>
commit 229240e565f976de8e7b82dd606c2e862152b2b5
Author: Zhigang Gong <zhigang.gong@linux.intel.com>
Date: Fri Jun 10 14:07:54 2011 +0800
glamor: Add render triangles support.
By default, fallback to frame buffer currently. This commit
makes us pass the rendercheck's triangles testing.
Signed-off-by: Zhigang Gong <zhigang.gong@linux.intel.com>
commit ac0589c91699433bc9dbc25b7edff456dff742a4
Author: Zhigang Gong <zhigang.gong@linux.intel.com>
Date: Fri Jun 10 14:02:19 2011 +0800
glamor: Use software fb for 1bpp pixmap.
For 1bpp pixmap, software fb get better performance than
GL surface. The main reason is that fbo doesn't support
1bpp texture as internal format, so we have to translate
a 1bpp bitmap to a 8bit alpha format each time which is
very inefficient. And the previous implementation is
not supported by the latest OpenGL 4.0, the GL_BITMAP
was deprecated.
Signed-off-by: Zhigang Gong <zhigang.gong@linux.intel.com>
commit 3c44e3e0ce1e286e0540298d5db547c43903629f
Author: Zhigang Gong <zhigang.gong@linux.intel.com>
Date: Wed Jun 1 19:35:15 2011 +0800
glamor: Optimize composite when soure/mask is xrgb.
Added a new shader aswizlle_prog to wired the alpha to 1 when
the image color depth is 24 (xrgb). Then we don't need to fallback
the xrgb source/mask to software composite in render phase. Also
don't wire the alpha bit to 1 in the render phase. This can get
about 2x performance gain with the cairo performance trace's
firefox-planet case.
Signed-off-by: Zhigang Gong <zhigang.gong@linux.intel.com>
commit 0e2af4d0c942405dd0869f1e6a1effee943de139
Author: Zhigang Gong <zhigang.gong@linux.intel.com>
Date: Wed Jun 1 18:14:01 2011 +0800
glamor: Don't print those fallback messages by default.
Signed-off-by: Zhigang Gong <zhigang.gong@linux.intel.com>
commit 925fc9724ff72d9e2a4940d7a1e39c23fb3ec9f0
Author: Zhigang Gong <zhigang.gong@linux.intel.com>
Date: Wed Jun 1 18:02:03 2011 +0800
glamor: Optimize glamor_finish_access.
use pbo if possible when we load texture to a temporary tex.
And for the previous direct texture load function, it's not
correct and get removed in this commit.
Signed-off-by: Zhigang Gong <zhigang.gong@linux.intel.com>
commit b8ce483f58112f200dec9853fcd7ff455479990f
Author: Zhigang Gong <zhigang.gong@linux.intel.com>
Date: Wed Jun 1 17:54:01 2011 +0800
glamor: Don't use glamor_pixmap_type currently.
Added comments to glamor_pixmap_create. To be refined in the future.
We need to identify whether a pixmap is a CPU memory pixmap or a
GPU pixmap. Current implementation is not correct. There are three
cases:
1. Too large pixmap, we direct it to CPU memory pixmap.
2. w ==0 || h == 0 pixmap, this case has two possibilities:
2.1 It will become a screen pixmap latter, then it should be
GPU type.
2.2 It's a scratch pixmap or created from a share memory, then
it should belong to CPU memory.
XXX, need to be refined latter.
commit 28835be1b8a05e510aa7fcc2f331771e3cf7dfec
Author: Zhigang Gong <zhigang.gong@gmail.com>
Date: Tue May 24 22:01:49 2011 +0800
glamor: improve glamor_finish_access.
When the platform's coordinate system is the same as X11's . We
can load the texture to the fbo directly without one extra texture
transformation.
commit 1edf0cc6ab340c98fde201328631ca61e9d871a1
Author: Zhigang Gong <zhigang.gong@gmail.com>
Date: Sun May 22 23:45:51 2011 +0800
glamor: Don't write back read only pixmap to fbo.
For those pixmap which has valid fbo and opened as GLAMOR_ACCESS_RO
mode, we don't need to upload the texture back when calling the
glamor_finish_access(). This will get about 10% performance gain.
commit 1495ba9e64633476508febb01ec2e9594a7b466b
Author: Zhigang Gong <zhigang.gong@gmail.com>
Date: Sun May 22 17:51:27 2011 +0800
glamor: Use buffer object as much as possible.
Change the row length of 1bit color depth pixmap to the actual stride.
The previous implementation use the width as its stride which is not
good. As it will waste 8 times of space and also bring some non-unify
code path. With this commit, we can merge those 1bit or other color
depth to almost one code path. And we will use pixel buffer object
as much as possible due to performance issue. By default, some mesa
hardware driver will fallback to software rasterization when use
glReadPixels on a non-buffer-object frame buffer. This change will
get about 4x times performance improvemention when we use y-inverted
glamor or the driver support hardware y-flipped blitting.
commit 529c38a4601e8f0712773bf29a48cddfa7a5edc4
Author: Zhigang Gong <zhigang.gong@linux.intel.com>
Date: Thu May 19 18:03:12 2011 +0800
glamor-ddx: Remove debug message when moving cursor.
commit cd43b1ea831eac11bc6ad0c3b1e040bb968b9861
Author: Zhigang Gong <zhigang.gong@linux.intel.com>
Date: Thu May 19 18:02:19 2011 +0800
glamor: Add fallback code path for glamor_fill.
commit 8593f22fb8fc5e0d0f406d9c94cca22347505fd6
Author: Zhigang Gong <zhigang.gong@linux.intel.com>
Date: Thu May 19 17:59:19 2011 +0800
glamor: glamor_set_alu should enable GL_COLOR_LOGIC_OP.
GL_COLOR_OP seems not supported in current MESA.
commit f871d174a861e7c3d2b8f4d9a3f10c38a5120606
Author: Zhigang Gong <zhigang.gong@linux.intel.com>
Date: Thu May 19 11:40:38 2011 +0800
glamor: Switch to software fb for too large pixmap.
If pixmap's size exceeds the limitation of the MESA library, the
rendering will fail. So we switch to software fb if it is the case.
Add one new element for pixmap private structure to indicate whehter
we are a software fb type or a opengl type.
commit 74ca45e7d0ed6654204189793261ef65f213bb2e
Author: Zhigang Gong <zhigang.gong@linux.intel.com>
Date: Wed May 18 16:48:06 2011 +0800
glamor-ddx: Fixed one bug when a client reset the connection.
This commit fixed two bugs when one client reset the connection.
The first is that we should reopen the graphic device when the previous
node was closed during the screen closing. The second one is we should
call glamor_close_screen (not the ddx version) prior to call
eglTerminate(). As eglTerminate will release the share library. And
the glamor_close_screen may still need to call openGL APIs and thus
will hit segfault. And renamed the ddx functions to avoid naming
conflications with the glamor functions.
commit c97d4533f29e77d80c076deff9ad0f218eb2e8f4
Author: Zhigang Gong <zhigang.gong@linux.intel.com>
Date: Thu May 12 14:49:08 2011 +0800
glamor: Silent compilation warnings due to some deprecated APIs.
those xcalloc/xfree/xalloc/XNFprintf/... are deprecated. Replace
then with the new one. And fix some other minor problems.
commit e3295d4106ac5b62f63e32dcb24a6094194cb1a8
Author: Zhigang Gong <zhigang.gong@linux.intel.com>
Date: Thu May 12 10:22:07 2011 +0800
glamor-ddx: Move the cursor EGL image to crtc strcture.
Cursor is a per crtc resource. And this commit also fix the cursor
initialization regard to the latest mesa EGL code. Now hardware
cursor works fine.
commit 43280372686177603111b175e92e1c88ad4ccdee
Author: Zhigang Gong <zhigang.gong@linux.intel.com>
Date: Thu May 12 01:42:05 2011 +0800
glamor-ddx: Fix a compiling error. Need revisit.
GC is redefined in the X11/Xlib.h and include/gcstruct.h which is
a xorg header file. Just use a macro to simply avoid the conflict.
Need revisit latter to find a correct way to fix this problem.
commit 18a52e23882e4664fdb2de4958c4f9c97e16068c
Author: Zhigang Gong <zhigang.gong@linux.intel.com>
Date: Thu May 12 01:37:52 2011 +0800
glamor-ddx: Migrate the code to latest mesa library.
Use eglCreateDRMImageMESA to create surfaceless image. And then
export the drm buffer back which can be used to create the frame
buffer.
commit eb3487a448ff0efa46079323821d65d7c3e4d872
Author: Zhigang Gong <zhigang.gong@linux.intel.com>
Date: Thu May 12 01:08:38 2011 +0800
glamor: Add new feature which is to flip output on y axis.
Due to the coordinate system on EGL is different from FBO
object. To support EGL surface well, we add this new feature.
When calling glamor_init from EGL ddx driver, it should use
the new flag GLAMOR_INVERTED_Y_AXIS.
commit 6dae8dc7ea6e7add3c6fda30773f264904ef8df5
Author: Zhigang Gong <zhigang.gong@linux.intel.com>
Date: Wed May 11 15:57:05 2011 +0800
glamor: Add glamor-ddx driver to the build tree.
Correct the linking parameters and add dependency to the libglamor.a.
commit 26ff612171d53baef08078a852875d5ddf1804ed
Author: Zhigang Gong <zhigang.gong@linux.intel.com>
Date: Wed May 11 15:54:50 2011 +0800
glamor: Resolved merge conflictions with Kristian's glamor-ddx patch.
commit 49bf0e301e7317a02e8b34ec2e290fcfda520e7e
Author: Kristian Høgsberg <krh@bitplanet.net>
Date: Fri Mar 5 14:53:35 2010 -0500
glamor ddx driver using EGL on KMS
commit 47b6531273e3052b653194099a49ca11d80b12df
Author: Zhigang Gong <zhigang.gong@linux.intel.com>
Date: Wed Apr 13 15:50:26 2011 +0800
glamor: Fixed one segfault bug when close screen.
move the original glamor_fini to glamor_close_screen. And wrap the CloseScreen
with glamor_close_screen, Then we can do some thing before call the underlying
CloseScreen().
The root cause is that glamor_fini will be called after the ->CloseScreen().
This may trigger a segmentation fault at
glamor_unrealize_glyph_caches() at calling into FreePicture().
commit 0d9e8db8d031d22b02df2c9b226287b1ca489f5a
Author: Zhigang Gong <zhigang.gong@linux.intel.com>
Date: Fri Apr 8 15:30:45 2011 +0800
glamor: Fixed one linking error.
As current glamor implementation depends on the glx library in the
mesa package which is conflict with the version in xorg. We have to
--disable-glx when build Xephyr. But this leads to the linking error
here. We comment out the calling to ephyrHijackGLXExtension() now.
Need revisit latter.
commit b3577a1c853d870f4d583a35d27012acb9099ef4
Author: Zhigang Gong <zhigang.gong@linux.intel.com>
Date: Fri Apr 8 15:24:55 2011 +0800
glamor: Merged with latest xserver.
Merged with latest xserver, the major change is due to the API change of
the management of devPrivates.
commit 3105fe9f6491f37a1f82a9e6f03f4efaed6c7e92
Author: Zhigang Gong <zhigang.gong@linux.intel.com>
Date: Fri Apr 8 15:22:52 2011 +0800
glamor: Call glamor_composite_rects only when enable RENDER.
commit f9843c7a35975b178eec9812d21e1f02a2120928
Author: Zhigang Gong <zhigang.gong@linux.intel.com>
Date: Fri Apr 8 14:53:15 2011 +0800
glamor: Fixed one conflict data type(XID) bug.
We should include the dix-config.h for all the glamor files. Otherwise
the XID type maybe inconsisitent in different files in 64bit machine.
The root cause is this macro "#define _XSERVER64 1" should be included
in all files refer to the data type "XID" which is originally defined
in X.h. If _XSERVER64 is defined as 1, then XID is defined as CARD32
which is a 32bit integer. If _XSERVER64 is not defined as 1 then XID
is "unsigned long". In a 32bit machine, "unsigned long" should be
identical to CARD32. But in a 64bit machine, they are different.
commit e194740c9413bbfefee6506a734e0c82c091dfa3
Author: Zhigang Gong <zhigang.gong@linux.intel.com>
Date: Fri Apr 8 14:49:57 2011 +0800
glamor: Fixed some compiling and linking errors.
Change the inline functions to static type, otherwise when linking it
complains multiple definitions of those functions.
commit 8cfcc614032320bb6a2eca2c61baeebf388d22ea
Author: Eric Anholt <eric@anholt.net>
Date: Fri Feb 19 07:14:13 2010 -0800
glamor: Add support for using EXT_framebuffer_blit to do CopyArea.
commit d2da9d1c22d25d1f86ecd83c15ca9909fab8610a
Author: Eric Anholt <eric@anholt.net>
Date: Fri Feb 19 07:36:28 2010 -0800
glamor: Reduce the noise from wide lines "fallback".
commit 955ccfbc34f370c80f7189ac5b0240e859e00b5f
Author: Eric Anholt <eric@anholt.net>
Date: Fri Feb 19 07:52:50 2010 -0800
glamor: Fix the segfault at screen fini.
commit 003dee4c82f8af9e7749876c736018410f347440
Author: Eric Anholt <eric@anholt.net>
Date: Fri Feb 19 06:10:11 2010 -0800
glamor: Replace the immediate mode in glamor_fill() with glDrawArrays().
commit 60775e21e3532452891e1b52589f7d5d7ef04b40
Author: Eric Anholt <eric@anholt.net>
Date: Thu Feb 18 18:11:54 2010 -0800
glamor: Use a VBO to accumulate multiple glyph quads at once.
This increases us from 23000 to 27000/sec on rgb24text.
commit 8ce312e61952e9f2193c28ac6124eff30f3a122c
Author: Eric Anholt <eric@anholt.net>
Date: Thu Feb 18 14:49:06 2010 -0800
glamor: Use glamor_composite_with_shader once per group of glyphs.
This shaves CPU time in GL setup. Performance of rgb24text went from
18400/sec to 23500/sec.
commit 6ce05e0b28052e5206694228218322f0dd3a6b00
Author: Eric Anholt <eric@anholt.net>
Date: Thu Feb 18 14:44:20 2010 -0800
glamor: Convert the shaders path to handling glamor_composite_rect_t.
commit 858ce0c1928c199435c9c2627f84c37c7ca7a38a
Author: Eric Anholt <eric@anholt.net>
Date: Thu Feb 18 14:02:48 2010 -0800
glamor: Add support for component alpha rendering.
Brings x11perf -rgb24text from 230/sec to 18400/sec
commit d07fc66a056dd4eab2dac82b3784c482071d1915
Author: Eric Anholt <eric@anholt.net>
Date: Thu Feb 18 09:23:22 2010 -0800
glamor: Rework shader setup to make extending the IN types easier.
commit 8cefa287ddb4ed4ad178e751b35bb93b4a44e0ab
Author: Eric Anholt <eric@anholt.net>
Date: Wed Feb 17 16:00:22 2010 -0800
glamor: Add a little mechanism for only printing fallbacks when they happen.
Sometimes we want to try a couple of different methods for
accelerating. If one of them says "no" and the other says "yes",
don't spam the log about the "no."
commit 5f5c35b56d3568f72e2305e74ed8457e0a787a3b
Author: Eric Anholt <eric@anholt.net>
Date: Wed Feb 17 15:02:17 2010 -0800
glamor: Fix up the fallback message for no texture present on compositing.
commit 2fa95725d845e5bf8a41ac776267be0d55d58004
Author: Eric Anholt <eric@anholt.net>
Date: Wed Feb 17 13:33:48 2010 -0800
glamor: Add support for a1 composite sources.
They're stored just like a8, but the values are set to either 0.0 or
1.0. Because they're a8 with only two legal values, we can't use them
as destinations, but nobody's rendering to a1 dests anyway (we hope).
commit 9bcbcbf8c28e945fa5c4f4ad1a772b787618455f
Author: Eric Anholt <eric@anholt.net>
Date: Wed Feb 17 13:30:20 2010 -0800
glamor: Fix and enable ZPixmap PutImage acceleration.
commit 2ba634fab9b03995629497efdbf5305394011e4a
Author: Eric Anholt <eric@anholt.net>
Date: Thu Feb 11 17:32:27 2010 -0800
glamor: Fix render source transforms.
Fixes (except for small bit differences) cairo source-pattern.
commit b1f67a5082420bbff141733833905f8ac95fe983
Author: Eric Anholt <eric@anholt.net>
Date: Thu Feb 11 17:15:05 2010 -0800
glamor: Fix and enable glamor_get_spans().
This makes running the cairo test suite almost tolerable.
commit f88d76cf7e05cf885d80c0b91f37f1b30675e928
Author: Eric Anholt <eric@anholt.net>
Date: Thu Feb 11 16:51:13 2010 -0800
glamor: Enable glamor_fill_spans().
x11perf -wline100 performance goes from 8.8/sec to 111/sec.
commit a63df0c504be3be0e969f5080a6593a55cb87246
Author: Eric Anholt <eric@anholt.net>
Date: Thu Feb 11 15:00:32 2010 -0800
glamor: Fix up the wide/non-solid lines fallback.
commit d61a13cf3f0a3028fbcf41310a4f5ecaa8546961
Author: Eric Anholt <eric@anholt.net>
Date: Thu Feb 11 14:52:04 2010 -0800
glamor: Fix and enable tile fill acceleration (aka the root weave).
commit 86a206525350b7e82ab0e432ad0fb8858960857d
Author: Eric Anholt <eric@anholt.net>
Date: Thu Feb 11 13:40:28 2010 -0800
glamor: Fix off-by-one in CopyPixels CopyArea path.
Fixes window dragging in uncomposited metacity.
commit be82a0624207b5f367b97c25ac7d7dbd8a518597
Author: Eric Anholt <eric@anholt.net>
Date: Thu Feb 11 13:21:47 2010 -0800
glamor: Fix screen_x/screen_y handling for compositing.
It's not an offset from pixmap coords to composited pixmap coords,
it's an offset from screen-relative window drawable coords to
composited pixmap coords.
commit 5360b1e8bbae571b120999e7eec7cd2826601497
Author: Eric Anholt <eric@anholt.net>
Date: Thu Feb 11 09:47:38 2010 -0800
glamor: Implement glCopyPixels based src == dest CopyArea acceleration
commit 0565c1d789ed82c533f860713d66b4941c299f9c
Author: Eric Anholt <eric@anholt.net>
Date: Tue Feb 9 22:35:04 2010 -0800
glamor: Add support for accel of x8r8g8b8 source pictures.
There's a limitation still for RepeatNone, but this fixes a bunch of
fallbacks for gnome-terminal.
commit e6bf50573650f03c8130b7783485b24e98e15c79
Author: Eric Anholt <eric@anholt.net>
Date: Thu Feb 11 09:23:09 2010 -0800
glamor: Set active texture on glamor_copy_n_to_n setup.
Fixes failure in rendercheck -t blend -o src
commit be64167fea3c74447ed3c5116b97473676c25b29
Author: Eric Anholt <eric@anholt.net>
Date: Thu Feb 11 09:20:50 2010 -0800
glamor: Don't try to CopyArea from a Solid source picture.
Fixes failure with rendercheck.
commit 126fc09cb5bf8c38b73f1c2cd2a0ef588c3265e8
Author: Eric Anholt <eric@anholt.net>
Date: Tue Feb 9 22:35:04 2010 -0800
glamor: Rework the Render shader setup to be easily modified, like cairo-gl.
commit f4a3194837e640997c0c3a775f48a49800e213c6
Author: Eric Anholt <eric@anholt.net>
Date: Tue Feb 9 23:17:09 2010 -0600
glamor: Add the glyph cache from UXA (de-camelCased).
This doesn't yet have an optimized glamor_composite_rects()
implementation, but it does triple the speed of x11perf -aa10text.
commit 7e6432e7b94f7f99b257da8de53573108d30ae22
Author: Eric Anholt <eric@anholt.net>
Date: Tue Feb 9 22:54:40 2010 -0600
glamor: Fix up and enable accelerated composite.
commit a0b589e90a885cf20b349b95df31bb0823a1514b
Author: Eric Anholt <eric@anholt.net>
Date: Tue Feb 9 22:49:27 2010 -0600
glamor: Restore planemask to all-on when finishing a fill.
commit d8c2662bf452a82c8fcbdd1c95a40ee34d2c32ca
Author: Eric Anholt <eric@anholt.net>
Date: Tue Feb 9 22:48:28 2010 -0600
glamor: Set active texture in finishaccess drawing.
commit 4f398b29dd42260d2c02e8e795546fd0623397b1
Author: Eric Anholt <eric@anholt.net>
Date: Tue Feb 9 21:56:39 2010 -0600
glamor: Align stride of fallback pixmap data to 32 bits.
fb/pixman demand this alignment, and all sorts of things go badly otherwise.
Fixes piglit x11-8bpp-7x8-draw.
commit 15e58b5ffb427c6c6f5172ccd72758047b98024a
Author: Eric Anholt <eric@anholt.net>
Date: Mon Feb 8 22:05:51 2010 +0100
glamor: Split the copy path out into its own function.
commit ad67299fa2afc8b42432d71d14163a36e013fef7
Author: Eric Anholt <eric@anholt.net>
Date: Mon Feb 8 21:52:35 2010 +0100
glamor: Provide more information about the operands to fallback composites.
commit 4811e428a9206ef59487fb0d3fab160a19845d46
Author: Eric Anholt <eric@anholt.net>
Date: Mon Feb 8 21:46:49 2010 +0100
glamor: Pull in UXA code for dumping some composites down to copy_n_to_n.
Window dragging with metacity+gnome-terminal+xcompmgr is almost credible.
commit 35847c578e9c35a3c90da792c34c1cb0cc536261
Author: Eric Anholt <eric@anholt.net>
Date: Mon Feb 8 21:24:15 2010 +0100
glamor: Add acceleration for copyarea not from the screen.
commit 647b9fb49a5bb636c9b0da6b708083328238543a
Author: Eric Anholt <eric@anholt.net>
Date: Mon Feb 8 20:12:44 2010 +0100
glamor: Add CopyWindow implementation so it doesn't crash.
commit 95d4a5a6ab58625d8205461157263bfb635ccd1a
Author: Eric Anholt <eric@anholt.net>
Date: Mon Feb 8 19:38:00 2010 +0100
glamor: Enable fill acceleration and flip opposite for pixmaps too.
Here's my theory for the flipping: It doesn't really matter which
orientation we store the pixmaps if we don't scan them out. We have
to flip coordinates for the window system framebuffer. Doing so for
everything else makes things consistent. I'm not sure how this will
interact with future GLX integration, though.
commit 5332547a0ac6ae6b9f1a6c6428e6fdbdf303108f
Author: Eric Anholt <eric@anholt.net>
Date: Mon Feb 8 17:14:34 2010 +0100
glamor: Fix prepare_access on 1bpp data.
Apparently I don't have anything hitting this path, so I'm not sure if
it's good or not.
commit c3c3a6349766b4fdee080ff203fb548725e42e50
Author: Eric Anholt <eric@anholt.net>
Date: Mon Feb 8 15:34:45 2010 +0100
glamor: Use the pixmap stride in fallbacks instead of trying to guess it.
Mostly fixes gnome-terminal text.
commit 45de3d24b44aa3feabdda0e377d637f498e03eb0
Author: Eric Anholt <eric@anholt.net>
Date: Mon Feb 8 14:40:06 2010 +0100
glamor: Replace the glDrawPixels in glamor_finish_access with GLSL.
Root weave displays. \o/
commit d8d3fa10346302384b8e62967c5a67893ed1c67b
Author: Eric Anholt <eric@anholt.net>
Date: Mon Feb 8 14:53:41 2010 +0100
glamor: All the fallbacks in the world.
Bringup is really not flying when I can't see anything. So dump back
to all software so I can turn on a bit at a time.
commit 745502af962a2bb475c0c667c3091c2c080771dc
Author: Eric Anholt <eric@anholt.net>
Date: Mon Feb 8 13:27:47 2010 +0100
glamor: Add check for EXT_bgra which we rely on.
commit 6ce378f11ff396f350cbaa280086f6f9600da29e
Author: Eric Anholt <eric@anholt.net>
Date: Mon Feb 8 13:15:38 2010 +0100
glamor: Add fallback support for glamor_get_spans().
commit ec526eab8f02e0bcce859a1b7ebaf6c5bccc5e87
Author: Eric Anholt <eric@anholt.net>
Date: Mon Feb 8 13:05:13 2010 +0100
ephyr: Hook the glamor into damage and draw into the backbuffer.
This should avoid a bunch of absurdity with GLX front buffer handling,
fix exposes, and improve performance. For now we're copying the whole
buffer while glamor is developed.
commit b5087ff9b1e5495c742e581f586c055de878dd4b
Author: Eric Anholt <eric@anholt.net>
Date: Mon Feb 8 12:47:59 2010 +0100
glamor: Fix the row length of 1bpp prepare_access.
commit e93070affdf64c47be02684e7902a61e7ae9fa33
Author: Eric Anholt <eric@anholt.net>
Date: Mon Feb 8 12:44:03 2010 +0100
glamor: Fix up the access flags for glamor_prepare_access().
commit 0e56c182c3b06f5b02d357e2b8e930a580bd0274
Author: Eric Anholt <eric@anholt.net>
Date: Mon Feb 8 12:16:30 2010 +0100
glamor: Add fallback support to glamor_put_image().
commit 22cad98975091ed724a37ec940946cd2899ebcbf
Author: Eric Anholt <eric@anholt.net>
Date: Mon Feb 8 12:13:15 2010 +0100
glamor: Add fallback support to glamor_set_spans().
commit 55dac9b42e18dcc1586770d31ee265178e68b744
Author: Eric Anholt <eric@anholt.net>
Date: Mon Feb 8 12:09:52 2010 +0100
glamor: Add glamor_prepare_access_gc() from UXA.
commit 72a757ba00232fe8b42b977f5210fa119495b05e
Author: Eric Anholt <eric@anholt.net>
Date: Mon Feb 8 11:58:52 2010 +0100
glamor: Use GL_MESA_pack_invert to avoid complexity in prepare_access.
commit e9d4794cd0bc6c8790204405fe09f968edfa409d
Author: Eric Anholt <eric@anholt.net>
Date: Mon Feb 8 11:23:14 2010 +0100
glamor: Add fallbacks for Render.
commit de675893b7ce2880289cce13be6190d55f4fc29c
Author: Eric Anholt <eric@anholt.net>
Date: Mon Feb 8 10:16:21 2010 +0100
glamor: Add fallbacks for glamor_copy_area().
commit ca58607a44c310ef369a097a06be83aa2a9e1c5b
Author: Eric Anholt <eric@anholt.net>
Date: Mon Feb 8 09:58:55 2010 +0100
glamor: Move glamor_poly_lines to a separate file.
commit 800fd4f8494ad6f0984073406b3dec584ba63648
Author: Eric Anholt <eric@anholt.net>
Date: Tue Sep 22 15:41:18 2009 -0700
glamor: Fix the type for copyarea.
commit c4343dfa0a2b40d46d3feb14f1df9fae0fd4a214
Author: Eric Anholt <eric@anholt.net>
Date: Tue Sep 22 12:08:19 2009 -0700
glamor: Add prepare/finishaccess code based on UXA.
commit f17473cdd5f93a2bf3a7b6a14bd5acd965e8e9f0
Author: Eric Anholt <eric@anholt.net>
Date: Tue Sep 22 10:55:04 2009 -0700
glamor: Fix pixmap private getter in copyarea.
commit 5915b4c0cfcfb25a68b77b29a4d7b39b7f6b4822
Author: Eric Anholt <eric@anholt.net>
Date: Fri Sep 4 18:43:52 2009 -0700
glamor: Add support for solid source pictures.
commit 1159ebb30b7530c2f4612109306cf85a594dd530
Author: Eric Anholt <eric@anholt.net>
Date: Fri Sep 4 18:43:02 2009 -0700
glamor: Add untested copyarea implementation
commit 936385142c12d074dcb603490517ac095840fa3f
Author: Eric Anholt <eric@anholt.net>
Date: Tue Aug 25 17:24:30 2009 -0700
glamor: Accelerate PolyFillRect using glamor_fill instead of spans.
commit 6dacc9b08c2af51c1826c20ccf12bb2c73856f25
Author: Eric Anholt <eric@anholt.net>
Date: Tue Aug 25 17:01:43 2009 -0700
glamor: Add untested PutImage 1bpp XYPixmap support.
commit 854e9bd20a2d0f8ed636d4fba0ddfa4c71d54667
Author: Eric Anholt <eric@anholt.net>
Date: Tue Aug 25 16:56:50 2009 -0700
glamor: Add untested PutImage XYBitmap support.
commit 8a53566acb5870816807425dc805df888fa42792
Author: Eric Anholt <eric@anholt.net>
Date: Tue Aug 25 13:06:11 2009 -0700
glamor: make the polylines complaint a little more useful.
commit aa133069745fc59bb2f212b0816add9bae40c376
Author: Eric Anholt <eric@anholt.net>
Date: Tue Aug 25 12:10:32 2009 -0700
glamor: Start adding render acceleration support.
This brings in idr's glu3 code. We'll probably want to move to linking to
it as a library, once an ABI-stable release is out.
commit 4a51cc0440c8d026fd8c82b40cfb188c6ea4a9f0
Author: Eric Anholt <eric@anholt.net>
Date: Mon Aug 24 09:14:20 2009 -0700
glamor: Add clipping to setspans.
commit 5fadea5d9c02670c35ddf3e0f12f9d355b412103
Author: Eric Anholt <eric@anholt.net>
Date: Mon Aug 24 09:10:14 2009 -0700
glamor: Fix some screen_xy offsets to be the right way around.
commit 44e4599b83cc330a7c9edd7e18266f222a69418a
Author: Eric Anholt <eric@anholt.net>
Date: Mon Aug 24 08:59:52 2009 -0700
glamor: Move planemask to a function in case I decide to fill it in.
commit 882411bef1091f97f61ae27a549970d87eef9cab
Author: Eric Anholt <eric@anholt.net>
Date: Mon Aug 24 08:29:30 2009 -0700
glamor: add alu support to setspans.
commit c70ce72fd74354a0b9731dc8d4451f6aaf951117
Author: Eric Anholt <eric@anholt.net>
Date: Mon Aug 24 08:24:54 2009 -0700
glamor: Give setspans the same format support as getspans.
commit d9eef95c74b7b04a3398b4cfc1a81b480838b25e
Author: Eric Anholt <eric@anholt.net>
Date: Mon Aug 24 08:17:06 2009 -0700
glamor: Fix bad fallthrough in getspans (accessing invalid memory).
commit 0360ba361a67f6cfa5c9c65590ed8440a153c16e
Author: Eric Anholt <eric@anholt.net>
Date: Mon Aug 24 08:06:57 2009 -0700
glamor: Fix memory leak in getspans.
commit cdb1fe6d9682616b1def52fa38b2dae623e2503f
Author: Eric Anholt <eric@anholt.net>
Date: Mon Aug 24 08:03:17 2009 -0700
glamor: Move setspans to a separate file.
commit cfb8dea815086b9aafd27bd314e02739e04dfc7d
Author: Eric Anholt <eric@anholt.net>
Date: Mon Aug 24 07:22:14 2009 -0700
glamor: Hook up miGetImage to fix some invalid accesses.
commit e3c02c09c125bb5def1a70a1264ef34b18182afa
Author: Eric Anholt <eric@anholt.net>
Date: Mon Aug 24 07:00:32 2009 -0700
glamor: Add ALU support to solid, tile, and putimage.
commit 2b657d91d80a0a4d9fa2e390255ff87f51426b7c
Author: Eric Anholt <eric@anholt.net>
Date: Sat Aug 22 15:54:24 2009 -0700
glamor: Add untested putimage support.
commit f66e5c4145d003247447ac1bf93f9737c6eaa27c
Author: Eric Anholt <eric@anholt.net>
Date: Fri Aug 21 10:05:32 2009 -0700
glamor: Add 8bpp to get/setspans.
commit 93ad09144213fe6b9ce8bea7ebfcc2d60887810b
Author: Eric Anholt <eric@anholt.net>
Date: Fri Aug 21 10:02:02 2009 -0700
glamor: Add trapezoids code.
This fixes segfaults on starting gnome-terminal.
commit 60ca0260f23cac6577aa85aacb0e5644d5f1b349
Author: Eric Anholt <eric@anholt.net>
Date: Thu Aug 20 17:17:43 2009 -0700
glamor: Add more solid_fail_regions for software fallbacks.
commit 7500ee2b0215932ecb6688f301fb4e6f080f8a66
Author: Eric Anholt <eric@anholt.net>
Date: Thu Aug 20 17:05:00 2009 -0700
glamor: Fill in 1 and 24-bit getspans.
commit f6cffbb2ba66948ad5cc1cbe20e12de204de175d
Author: Eric Anholt <eric@anholt.net>
Date: Thu Aug 20 16:43:22 2009 -0700
glamor: Add stub Composite support.
commit 2fa26c4958168064da95361db78ccc518c8f3ed8
Author: Eric Anholt <eric@anholt.net>
Date: Thu Aug 20 16:43:03 2009 -0700
glamor: Free resources when destroying pixmaps.
commit 16c3b929dd4cae6b40e847256db6ff32e63e9029
Author: Eric Anholt <eric@anholt.net>
Date: Thu Aug 20 16:06:42 2009 -0700
glamor: Add untested support for tile filling.
commit 8016135ec7616530e64d0019ce0401e62b25e483
Author: Eric Anholt <eric@anholt.net>
Date: Thu Aug 20 15:37:22 2009 -0700
glamor: Fill out glamor_get_color_4f_from_pixel() a bit.
commit 519103565c1b182014dea93c58917bf7e5a35fcb
Author: Eric Anholt <eric@anholt.net>
Date: Thu Aug 20 15:28:13 2009 -0700
glamor: Create FBOs for pixmaps.
commit f92d1478e984d57806731886820f47e1258b5115
Author: Eric Anholt <eric@anholt.net>
Date: Thu Aug 20 14:45:47 2009 -0700
glamor: Maybe fix up the format/type for setspans.
commit 4f139db92fb283792adae8d39a49a083e4382fb5
Author: Eric Anholt <eric@anholt.net>
Date: Thu Aug 20 14:43:43 2009 -0700
glamor: Add getspans implementation.
commit f1dbed5456e5a608425530e0dde2dc617a7c6115
Author: Eric Anholt <eric@anholt.net>
Date: Thu Aug 20 12:32:53 2009 -0700
glamor: Move to using shader objects.
commit fbbdd788cbc822fc8a2d2726435bfa39e69a0e85
Author: Eric Anholt <eric@anholt.net>
Date: Thu Aug 20 12:36:33 2009 -0700
glamor: Fix up DrawPixels arguments to bear some relation to reality.
commit 74f262bcdb3d8ae769ef8975cf4a4b2ebaeb6b39
Author: Eric Anholt <eric@anholt.net>
Date: Thu Aug 20 11:39:05 2009 -0700
glamor: remove gratuitous flush.
commit 399e00698976dd2e503b3a092bfe54ab24ea26d9
Author: Eric Anholt <eric@anholt.net>
Date: Thu Aug 20 11:37:37 2009 -0700
glamor: Fix up block/wakeup handler.
Prototypes are fixed, and we don't need to flush on wakeup.
commit 2e35ceca65bbebf07c15ea2cff932a8749955c2b
Author: Eric Anholt <eric@anholt.net>
Date: Thu Aug 20 11:19:43 2009 -0700
ephyr: Use GLEW.
This will hide all sorts of extension stuff from us.
commit 370df817ac0b346f1c7aa0b6e823c77797caaa9f
Author: Eric Anholt <eric@anholt.net>
Date: Thu Aug 20 09:35:24 2009 -0700
ephyr: Make sure a glamor-using window is created with a glx visual.
commit 08097434ecc6479dc69a408523f398284168697e
Author: Eric Anholt <eric@anholt.net>
Date: Thu Aug 20 09:10:12 2009 -0700
add fill files, merge with first real attempt at rendering.
commit e32efb02e5dff9124e8680f9a15d9d2b01db84c7
Author: Eric Anholt <eric@anholt.net>
Date: Sat Dec 20 14:48:18 2008 -0800
ephyr: merge the host glamor bits into hostx.
commit df083fab84cf57fc1a2e3cd98572039bc9fe20de
Author: Eric Anholt <eric@anholt.net>
Date: Sat Dec 20 13:43:52 2008 -0800
glamor: first real attempt at rendering.
commit 1b151f2e6aa581400b09220b87ae2d34a39aeb17
Author: Eric Anholt <eric@anholt.net>
Date: Sat Dec 20 13:48:39 2008 -0800
glamor: glFlush from the blockhandler so rendering happens.
commit b530cdea4a8e05b1f487765b8dde42cde1a6fc98
Author: Eric Anholt <eric@anholt.net>
Date: Tue Dec 16 15:20:49 2008 -0800
glamor: Use a nicer struct initializer for gcops.
commit 4d52ae7f2dca78d493e11375d764c978db5567ed
Author: Eric Anholt <eric@anholt.net>
Date: Tue Dec 16 15:14:31 2008 -0800
glamor: Start trying to hook up the rendering bits
commit 41e3e580de95fca3095d015ec8febe1a5f47cca3
Author: Eric Anholt <eric@anholt.net>
Date: Thu Aug 20 10:49:41 2009 -0700
glamor: Use -lgl for Xephyr if GLX is unset.
I'm experimenting with that because of conflicts with GL dispatch tables.
commit 8885b3b1ffb45ae16484151ce533683af526f509
Author: Eric Anholt <eric@anholt.net>
Date: Tue Dec 16 15:08:21 2008 -0800
Add exa/glamor to _DEPENDENCIES so the bin gets rebuilt with the libs.
commit da6e0ffad2173d65f27feff36291f94e6aa06f88
Author: Eric Anholt <eric@anholt.net>
Date: Tue Dec 16 14:00:05 2008 -0800
More ephyr/glamor glue.
commit 0ec823ce5b72bcf3be3923f2f23e5386feb0107b
Author: Eric Anholt <eric@anholt.net>
Date: Tue Dec 16 12:30:14 2008 -0800
Add build infrastructure for glamor.
commit 84bb0207f6db433a8d387d933393357da87ca23e
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Fri Sep 23 20:03:03 2011 -0400
dix and os: gitignore dix.O and os.O
Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
commit 3d41939d0349569dcfd2aef9b846c739d0ba0060
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Thu Sep 22 17:41:38 2011 -0700
Unconditionally #include <stdint.h>
The more recent inclusions of this file haven't been checking for
HAVE_STDINT_H, so might as well make the older ones consistent.
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com>
Reviewed-by: Jamey Sharp <jamey@minilop.net>
commit 46d5ae5b551cc926331324073f2686b47e8aea07
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Fri Sep 23 09:38:25 2011 -0400
dtrace: fix typo in title
The word provider should be capitalized.
Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
commit 6cae6224994e3252b3b7c7608f983ce73e0206fc
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Fri Sep 23 09:38:24 2011 -0400
dtrace: use docbook copyright markup for copyright holder
No content change to copyright text.
Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
commit 58d3d46d6cc0d7a81db6bad61d158f3b9af8af71
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Thu Sep 1 16:48:37 2011 -0700
Assign ids to more tags in Xserver-Dtrace.xml
Keeps xsltproc from adding random-number id tags to html output so that
it's easier to see real changes vs. different random numbers.
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Matt Dew <marcoz@osource.org>
commit 7fb4bef0394a5d09680985d34bce8252b61493cb
Merge: 98f4940093 c90903b4f7
Author: Keith Packard <keithp@keithp.com>
Date: Wed Sep 21 14:34:27 2011 -0700
Merge remote-tracking branch 'mattst88/for-keith'
commit 98f4940093dc90c3366d3e4d3ddceacbaee299dc
Merge: b018b81533 c8eacae4f8
Author: Keith Packard <keithp@keithp.com>
Date: Wed Sep 21 14:30:19 2011 -0700
Merge remote-tracking branch 'alanc/master'
commit b018b815333b256b5e06dd6251b2e539f09f89fa
Merge: 03d032991d 0f380a5005
Author: Keith Packard <keithp@keithp.com>
Date: Wed Sep 21 14:17:14 2011 -0700
Merge remote-tracking branch 'jamey/reviewed'
commit c90903b4f7a826ae6826a8dd0a901c8362500e46
Author: Peter Harris <pharris@opentext.com>
Date: Fri Sep 2 18:45:16 2011 -0400
xkb: add missing swaps for xkbGetDeviceInfoReply
Caught during review of e095369bf.
Signed-off-by: Peter Harris <pharris@opentext.com>
Reviewed-by-by: Matt Turner <mattst88@gmail.com>
Signed-off-by: Matt Turner <mattst88@gmail.com>
commit d206d52f657cb63a0f6ba8b62d788c1812b57c81
Author: Matt Turner <mattst88@gmail.com>
Date: Tue Aug 16 19:19:24 2011 -0400
Use __builtin_constant_p to determine if we can use lswapl
If the address of the swapped memory location is known at compile time,
we can check its alignment at no runtime cost and use lswapl instead.
text data bss dec hex filename
before: 1872820 52136 78040 2002996 1e9034 hw/xfree86/Xorg
after: 1864396 52136 78040 1994572 1e6f4c hw/xfree86/Xorg
bswap instructions: 131 -> 308 (used in lswapl)
rol instructions: 943 -> 1174 (used in lswaps)
Reviewed-by: Peter Harris <pharris@opentext.com>
Signed-off-by: Matt Turner <mattst88@gmail.com>
commit 889b700e7760ced38bcf5f3aff2d31d3d9a058d7
Author: Matt Turner <mattst88@gmail.com>
Date: Tue Aug 16 19:12:21 2011 -0400
Use lswap{l,s} in cpswap{l,s}
Should be safe since cpswap isn't used on pointers.
text data bss dec hex filename
before: 1875588 52136 78040 2005764 1e9b04 hw/xfree86/Xorg
after: 1872820 52136 78040 2002996 1e9034 hw/xfree86/Xorg
bswap instructions: 5 -> 131 (used in lswapl)
rol instructions: 811 -> 943 (used in lswaps)
Reviewed-by: Peter Harris <pharris@opentext.com>
Signed-off-by: Matt Turner <mattst88@gmail.com>
commit a2f0ff5f73db204a9d61e65148b28f6acc5121df
Author: Matt Turner <mattst88@gmail.com>
Date: Tue Aug 16 19:30:20 2011 -0400
Make lswap{l,s} inline functions
text data bss dec hex filename
before: 1875668 52136 78040 2005844 1e9b54 hw/xfree86/Xorg
after: 1875588 52136 78040 2005764 1e9b04 hw/xfree86/Xorg
Reviewed-by: Peter Harris <pharris@opentext.com>
Signed-off-by: Matt Turner <mattst88@gmail.com>
commit e8ff555b95baab66cc7d060c1e7f9fdd49d3802f
Author: Matt Turner <mattst88@gmail.com>
Date: Tue Aug 16 19:07:24 2011 -0400
Add type checking to swap macros
The original macros are retained (instead of replacing them with inline
functions) because of implicit type promotion. That is, an int16 passed
to an inline function taking int32 would be implicitly promoted to int32
without a warning.
Reviewed-by: Peter Harris <pharris@opentext.com>
Signed-off-by: Matt Turner <mattst88@gmail.com>
commit 893e86a49e3e381cff48a9e86dc2d9b3d5431d95
Author: Matt Turner <mattst88@gmail.com>
Date: Tue Aug 16 19:03:26 2011 -0400
Introduce swap_uint{16,32} functions, used in swap{l,s}
Reviewed-by: Peter Harris <pharris@opentext.com>
Signed-off-by: Matt Turner <mattst88@gmail.com>
commit 54770c980cd2b91a8377f975a58ed69def5cfa42
Author: Matt Turner <mattst88@gmail.com>
Date: Tue Aug 16 16:59:07 2011 -0400
Cast char* buffers to swap functions
Reviewed-by: Peter Harris <pharris@opentext.com>
Signed-off-by: Matt Turner <mattst88@gmail.com>
commit 9edcae78c46286baff42e74bfe26f6ae4d00fe01
Author: Matt Turner <mattst88@gmail.com>
Date: Wed Sep 21 17:14:16 2011 -0400
Use correct swap{l,s} (or none at all for CARD8)
Swapping the wrong size was never caught because swap{l,s} are macros.
It's clear in the case of Xext/xres.c, that the author believed
client_major/minor to be CARD16 from looking at the code in the first
hunk.
v2: dmx.c fixes from Keith.
Reviewed-by: Peter Harris <pharris@opentext.com>
Signed-off-by: Matt Turner <mattst88@gmail.com>
commit 03d032991da21bf866ca30dcbb6b7f9f99df441a
Author: Aaron Plattner <aplattner@nvidia.com>
Date: Wed Sep 14 15:25:06 2011 -0700
fb: Rename wfbTriangles and wfbTrapezoids
These symbols were not renamed when they were added to libfb:
# nm -D libwfb.so | grep ' fb'
0000000000028d00 T fbTrapezoids
0000000000028d60 T fbTriangles
This causes corruption and/or crashes on wfb-ful drivers like nvidia:
Program received signal SIGABRT, Aborted.
0x00007fd67f3a0405 in *__GI_raise (sig=<optimized out>) at ../nptl/sysdeps/unix/sysv/linux/raise.c:64
64 ../nptl/sysdeps/unix/sysv/linux/raise.c: No such file or directory.
in ../nptl/sysdeps/unix/sysv/linux/raise.c
(gdb) bt
#0 0x00007fd67f3a0405 in *__GI_raise (sig=<optimized out>) at ../nptl/sysdeps/unix/sysv/linux/raise.c:64
#1 0x00007fd67f3a3680 in *__GI_abort () at abort.c:92
#2 0x00007fd67f3995b1 in *__GI___assert_fail (assertion=0x7fd679ecb804 "key->initialized", file=<optimized out>, line=116, function=0x7fd679ecbbc0 "dixGetPrivateAddr")
at assert.c:81
#3 0x00007fd679ec55b6 in ?? () from /usr/lib/xorg/modules/libfb.so
#4 0x00007fd679eca9ef in ?? () from /usr/lib/xorg/modules/libfb.so
#5 0x00007fd679ecae20 in fbTriangles () from /usr/lib/xorg/modules/libfb.so
#6 0x00007fd67a58fc55 in ?? () from /usr/lib/xorg/modules/drivers/nvidia_drv.so
#7 0x00000000004f38d1 in ?? ()
#8 0x0000000000437ae9 in ?? ()
#9 0x0000000000426eaa in ?? ()
#10 0x00007fd67f38cead in __libc_start_main (main=<optimized out>, argc=<optimized out>, ubp_av=<optimized out>, init=<optimized out>, fini=<optimized out>,
rtld_fini=<optimized out>, stack_end=0x7fff99860d78) at libc-start.c:228
#11 0x000000000042719d in _start ()
Signed-off-by: Aaron Plattner <aplattner@nvidia.com>
Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 2c7c520cfe0df30f4bc3adba59d9c62582823bf8
Author: Matt Turner <mattst88@gmail.com>
Date: Thu Aug 4 15:35:41 2011 -0400
Use internal temp variable for swap macros
Also, fix whitespace, mainly around
swaps(&rep.sequenceNumber)
Reviewed-by: Peter Harris <pharris@opentext.com>
Signed-off-by: Matt Turner <mattst88@gmail.com>
commit c10bad3d3e8ff1b90014770fd470f9c67263e46f
Author: Matt Turner <mattst88@gmail.com>
Date: Wed Apr 27 19:29:06 2011 -0400
Silence printf format warnings in helper_exec.c
Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com>
Reviewed-by: Daniel Stone <daniel@fooishbar.org>
Signed-off-by: Matt Turner <mattst88@gmail.com>
commit 9eab5b3443a1926a29385948acc6c5e0843465ea
Author: Matt Turner <mattst88@gmail.com>
Date: Wed Apr 27 18:25:27 2011 -0400
Replace Fabs() macro with fabs() function
gcc generates better code with fabs() anyway.
Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com>
Tested-by: Jeremy Huddleston <jeremyhu@apple.com>
Reviewed-by: Daniel Stone <daniel@fooishbar.org>
Signed-off-by: Matt Turner <mattst88@gmail.com>
commit 40a47bd628f525d2d8bd3ca76554089a6e9d2a1d
Author: Matt Turner <mattst88@gmail.com>
Date: Wed Apr 27 14:19:41 2011 -0400
Remove unnecessary #undefs of [f]abs and old comments
Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com>
Tested-by: Jeremy Huddleston <jeremyhu@apple.com>
Reviewed-by: Daniel Stone <daniel@fooishbar.org>
Signed-off-by: Matt Turner <mattst88@gmail.com>
commit 079a7585e44d25a0a9fb6662c6382dfbe8f6cd3c
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Thu Sep 15 20:12:41 2011 -0400
devbook.am: maintenance update from docbook.am
The developer docs are generated from a subset of docbook.am
which is sometimes updated.
The one difference for xserver is the embedded css style in the HEAD element.
Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com>
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 82c55b5a99a1bacf2bc11bbd9d58f6f2c6c07286
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Thu Sep 15 20:12:40 2011 -0400
docbook.am: embed css styles inside the HTML HEAD element
Rather than referring to the external xorg.css stylesheet, embed the content
of the file in the html output produced. This is accomplished by using
version 1.10 of xorg-xhtml.xsl.
This makes the whole html docs tree much more relocatable.
In addition, it eliminates xorg.css as a runtime file which makes
xorg-sgml-doctools a build time only package.
Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com>
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 1602444e05cc59afe32c085c0cedb85e3268cd98
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Thu Sep 15 20:12:39 2011 -0400
docbook.am: global maintenance update - entities, images and olinking
Adding support in libX11 for html chunking caused a reorg of docbook.am
as well as the xorg-sgml-doctools masterdb for olinking.
The parameter img.src.path is added for pdf images.
A searchpath to the root builddir is added for local entities, if present.
This feature was initiated by xserver module and made available to all.
The docbook.am makefile hides all the details and is identical for
all 22 modules having DocBook documentation. It is included by a thin
Makefile.am which requires no docbook knowledge.
Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com>
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 871d65790ec2ac0fd6d5105c2d599f63a86fcaf1
Author: Pauli Nieminen <ext-pauli.nieminen@nokia.com>
Date: Mon Nov 1 16:02:11 2010 +0200
DRI2: Allow DDX to validate swap_limit changes
DDX can now implement validation for swap_limit changes to prevent
configurations that are not support in driver.
Signed-off-by: Pauli Nieminen <ext-pauli.nieminen@nokia.com>
CC: Mario Kleiner <mario.kleiner@tuebingen.mpg.de>
Reviewed-by: Mario Kleiner <mario.kleiner@tuebingen.mpg.de>
Reviewed-by: Jesse Barnes <jbarnes@virtuousgeek.org>
commit b435e2aac1b3fbb97d0275de73a1e36d16f170c0
Author: Pauli Nieminen <ext-pauli.nieminen@nokia.com>
Date: Mon Nov 1 16:22:00 2010 +0200
DRI2: Expose API to set drawable swap limit.
This allows ddx to set swap_limit if there is more than one back
buffer for drawable. Setting swap_limit has to also check if change
affects a client that is blocked.
This can be used to implement N-buffering in driver with minimal
logic in allocation and selecting next back.
Signed-off-by: Pauli Nieminen <ext-pauli.nieminen@nokia.com>
Reviewed-by: Jesse Barnes <jbarnes@virtuousgeek.org>
Reviewed-by: Francisco Jerez <currojerez@riseup.net>
Reviewed-by: Mario Kleiner <mario.kleiner@tuebingen.mpg.de>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 86f8da0aa7612558e6563f5de0d9f9793854053f
Author: Pauli Nieminen <ext-pauli.nieminen@nokia.com>
Date: Mon Nov 1 16:21:59 2010 +0200
DRI2: Add ReuseBufferNotify hook
ReuseBufferNotify hook is called whenever old buffer is reused in DRI2
code.
Driver can use this hook to rewrite the buffer name if hardware requires
shared buffers. Shared buffer might be some hardware limited resources like
framebuffer that is preallocated in boot.
Signed-off-by: Pauli Nieminen <ext-pauli.nieminen@nokia.com>
Reviewed-by: Jesse Barnes <jbarnes@virtuousgeek.org>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 2f47433fef2cf63063e069ead9003891d135e87f
Author: vdb@picaros.org <vdb@picaros.org>
Date: Wed Sep 7 17:47:56 2011 +0200
print DisplayMode type bits
Dear,
A patch I posted on xorg-devel was reviewed and is ready for
inclusion in xserver. Would you be willing to apply the patch so that
it finds its way into the master branch ?
Thank you, Servaas Vandenberghe.
http://lists.x.org/archives/xorg-devel/2011-August/024769.html
http://lists.x.org/archives/xorg-devel/2011-August/024777.html
This patch adds printing of the DisplayMode type bits to
xf86PrintModeline(). It helps to trace the modeline origin and to
understand the initial configured modeline.
Reviewed-by: Alex Deucher <alexander.deucher at amd.com>
Signed-off-by: Servaas Vandenberghe
Signed-off-by: Keith Packard <keithp@keithp.com>
commit c92c83523ede8bc361526ac93d09d089fbbdae08
Merge: 4ad271d06c 24b2b43e85
Author: Keith Packard <keithp@keithp.com>
Date: Wed Sep 21 13:32:06 2011 -0700
Merge remote-tracking branch 'kibi/master'
commit 4ad271d06c5aa42721c0e2e01e17e34a39825c65
Author: Aaron Plattner <aplattner@nvidia.com>
Date: Mon Aug 29 20:44:18 2011 -0700
xfree86: Bump extension ABI version to 6.0
The video driver ABI was bumped to 11.0 in commit
0de7cec90738a7a5020150309866bb0e23b6f479 because of a change to the
size of ATOM in commit 51f353d0a0d116af16d7d9590cadef6c56328746. This
also affects extension modules, so the extension ABI version should
have been bumped too.
Signed-off-by: Aaron Plattner <aplattner@nvidia.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit c8eacae4f833a0bd81907ba2b4cfaa80c08e037f
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Thu Aug 25 21:46:16 2011 -0700
Space & style cleanup of hw/xfree86/i2c/fi1236.c
Fortunately, the massive decrease in the cost of whitespace in the past
decade has allowed us to be much more generous with it, and much more
consistent in its application, even for code like this that clearly no
one has ever tried to read.
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Jamey Sharp <jamey@minilop.net>
commit c46215c100e964665580211a5d5893558ca9374f
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Wed Aug 10 11:17:46 2011 -0700
Cross-reference cvt(1) & gtf(1) man pages
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Julien Cristau <jcristau@debian.org>
commit 1526f1caf396fefc5f09eaff884d5b92aac44997
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Tue May 31 19:54:33 2011 -0700
Remove unused ClientStateAuthenticating
Appears to be leftover from the Kerberos code deleted in 2007
(commit dfbe32b5b828cc4e3da36a0e2e6ad641164eaa5e).
Nothing left ever set clientState to ClientStateAuthenticating
Skipped over 1 to preserve existing enum numbering.
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Julien Cristau <jcristau@debian.org>
commit 0f380a5005f800572773cd4667ce43c7459cc467
Author: Jamey Sharp <jamey@minilop.net>
Date: Tue Sep 14 18:35:21 2010 -0700
Fix pixmap double-frees on error paths.
If AddResource fails, it will automatically free the object that was
passed to it by calling the appropriate deleteFunc; and of course
FreeResource also calls the deleteFunc. In both cases it's wrong to call
the destroy hook manually.
Commit by Jamey Sharp and Josh Triplett.
Signed-off-by: Jamey Sharp <jamey@minilop.net>
Signed-off-by: Josh Triplett <josh@joshtriplett.org>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Aaron Plattner <aplattner@nvidia.com>
commit 8f69c935f6d06ad92fd0e8d9fcb3cde86cd258f5
Author: Jamey Sharp <jamey@minilop.net>
Date: Fri Sep 17 02:27:59 2010 +0200
Eliminate MAXSCREENS-sized CursorScreenKey array.
Use new per-screen privates API instead.
Commit by Jamey Sharp and Josh Triplett.
Signed-off-by: Jamey Sharp <jamey@minilop.net>
Signed-off-by: Josh Triplett <josh@joshtriplett.org>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
commit c96a43888ceae72bf89c66de911120c0b6b7a71a
Author: Jamey Sharp <jamey@minilop.net>
Date: Sat Jul 10 09:28:47 2010 -0700
Revert "Bug #6924: Restore the ABI for DrawableRec and ColormapRec to the state"
This reverts commit bc0c56c407117d1545e20d21f7d30eb3472d618b since we're
breaking ABI anyway.
Conflicts:
ChangeLog
dix/colormap.c
dix/pixmap.c
dix/window.c
include/pixmapstr.h
Signed-off-by: Jamey Sharp <jamey@minilop.net>
Reviewed-by: Aaron Plattner <aplattner@nvidia.com>
commit 13ac1ba480ee3e89163825cd2777f9a6e9dcbc9f
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Tue May 31 19:42:48 2011 -0700
Remove unused ClientStateCheckingSecurity & ClientStateCheckedSecurity
Appear to be leftovers from the XC-QUERY-SECURITY code deleted in 2007
(commit 375864cb74cced40ae688078b1f7750998972535).
Nothing left ever set clientState to ClientStateCheckingSecurity.
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Julien Cristau <jcristau@debian.org>
commit 78f946c297081d39d312e05928146c78f59fedcb
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Thu May 19 23:26:31 2011 -0700
sun_init.c: Implement novtswitch & sharevts for Solaris
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: John Martin <john.m.martin@oracle.com>
commit 87cc83474d9890d14d9bc60926a97bd0d5b059af
Author: Jamey Sharp <jamey@minilop.net>
Date: Sun Sep 18 20:47:04 2011 -0500
Replace XmuSnprintf with snprintf.
Alan Coopersmith explains:
XmuSnprintf() can be replaced by snprintf() now. (It was a
implementation X provided for it's libraries to use in the days
before all platforms we cared about had snprintf in libc.)
Reported-by: walter harms <wharms@bfs.de>
Signed-off-by: Jamey Sharp <jamey@minilop.net>
Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
commit df4eeb1256c7c5e7a3f88f10da2915c7a07a8db8
Author: Jamey Sharp <jamey@minilop.net>
Date: Tue Jun 8 13:58:04 2010 -0700
xnest: Delete unused nClipRects GC-private field.
This field was never read at any time in the git history.
Signed-off-by: Jamey Sharp <jamey@minilop.net>
Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
commit 53a4744b69ab76ecabdde5dabfb56830570c0f4e
Author: Jamey Sharp <jamey@minilop.net>
Date: Sat Sep 18 01:23:12 2010 +0200
XineramaInitData ignores its argument. Quit passing one.
Also fix up XineramaInitData's caller, XineramaReinitData.
Commit by Jamey Sharp and Josh Triplett.
Signed-off-by: Jamey Sharp <jamey@minilop.net>
Signed-off-by: Josh Triplett <josh@joshtriplett.org>
Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
commit b85c10a35d44ad695797d0d19757e5f62eab4b98
Author: Jamey Sharp <jamey@minilop.net>
Date: Tue May 25 16:23:31 2010 -0700
dmx: Fix some "no previous prototype" warnings by making functions static.
Signed-off-by: Jamey Sharp <jamey@minilop.net>
Reviewed-by: Matt Turner <mattst88@gmail.com>
commit d423012e776a81a197cde86be5c6bd471a593c39
Author: Jamey Sharp <jamey@minilop.net>
Date: Fri May 21 14:21:52 2010 -0700
dmx: Fix a non-constant printf format string warning.
Signed-off-by: Jamey Sharp <jamey@minilop.net>
Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
commit 7e127f12a24acb8f43055af0a9be1ec585bbed36
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Thu May 19 23:22:27 2011 -0700
sun_init.c: Move vt switches to a switch_to helper function like lnx_init.c
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Julien Cristau <jcristau@debian.org>
commit a00dc6af6e84d0bee3f69d8df89d7f68cb535d35
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Thu May 19 22:43:56 2011 -0700
Xorg.man: Add -novtswitch and -sharevts options
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Julien Cristau <jcristau@debian.org>
commit 93abda6bddf770dbfc3d4d0ada61ea84a7b7b9be
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Thu May 19 22:39:09 2011 -0700
xfree86: move -novtswitch & -sharevts argument handling up to common layer
Stop duplicating in each os-support variant before it gets replicated
even further.
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Julien Cristau <jcristau@debian.org>
Reviewed-by: Alexandr Shadchin <Alexandr.Shadchin@gmail.com>
commit d8d99e14b1241fd8c099d69b8d0ed0817585fe8d
Author: Jamey Sharp <jamey@minilop.net>
Date: Wed Sep 14 09:52:58 2011 -0500
configure.ac: Remove unreachable check for VM86 headers.
"configure --with-int10" is not a valid configuration, and the check for
sys/vm86.h and sys/io.h is not used. Delete it.
Signed-off-by: Jamey Sharp <jamey@minilop.net>
Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Gaetan Nadon <memsize@videotron.ca>
commit 94b2eea86319934316bdb013f6f3940685a88a2f
Author: Jamey Sharp <jamey@minilop.net>
Date: Wed Sep 14 11:23:03 2011 -0500
int10: Delete #if 0'd implementation that's older than our git history.
Throughout the xserver git history, the generic portion of the int10
module has always used other methods for reading the video BIOS. For
some time now it's been purely libpciaccess based. This commented-out
use of xf86ReadBIOS is entirely superfluous.
Signed-off-by: Jamey Sharp <jamey@minilop.net>
Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com>
commit 6ad7bb69eebd5e5b4068bd9aa0b9a7168f075006
Author: Jamey Sharp <jamey@minilop.net>
Date: Tue Sep 13 17:45:19 2011 -0500
Remove PC98 support.
Gaetan Nadon wrote:
Alan Coopersmith wrote:
"I think we recently dropped PC98 support from the X server, so I'd
be okay with dropping the documentation now".
Let's make them be right, shall we?
Signed-off-by: Jamey Sharp <jamey@minilop.net>
Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com>
Acked-by: Gaetan Nadon <memsize@videotron.ca>
Acked-by: Alan Coopersmith <alan.coopersmith@oracle.com>
commit 9eb22ebf46b77c15e53017a37c7ef605521dc164
Author: Jamey Sharp <jamey@minilop.net>
Date: Tue Sep 13 16:30:06 2011 -0500
configure.ac: XORG_OS is not used, so delete it.
Signed-off-by: Jamey Sharp <jamey@minilop.net>
Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com>
Reviewed-by: Gaetan Nadon <memsize@videotron.ca>
commit 76636f30f7cf2344f4038c59bf292db19be33d53
Author: Jamey Sharp <jamey@minilop.net>
Date: Tue Sep 13 13:10:10 2011 -0500
configure.ac: Remove unused XORG_OS_PCI variable.
This is the last mention after ccfaf82367c9d057fd8314ce36b47f0a8eb696b6
quit using the variable.
Signed-off-by: Jamey Sharp <jamey@minilop.net>
Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com>
Reviewed-by: Gaetan Nadon <memsize@videotron.ca>
Tiago Vignatti posted an identical patch in June 2010, which I only
noticed after getting the above reviews. His patch was:
Signed-off-by: Tiago Vignatti <tiago.vignatti@nokia.com>
Reviewed-by: Mikhail Gusarov <dottedmag@dottedmag.net>
commit 60b4bd181bbdc794c7f3547f67df916132aa111e
Author: Jamey Sharp <jamey@minilop.net>
Date: Tue Sep 13 14:31:24 2011 -0500
x86emu: There is no NO_INLINE implementation of unaligned access here.
Patch produced with:
unifdef -UNO_INLINE -B
This change isn't relevant to the similar code in
hw/xfree86/common/compiler.h, because x86emu is expected to someday move
out of xserver entirely and so should not depend on any xserver headers.
Also, some platforms apparently do have NO_INLINE versions of
compiler.h.
Signed-off-by: Jamey Sharp <jamey@minilop.net>
Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com>
Reviewed-by: Matt Turner <mattst88@gmail.com>
commit 24b2b43e85c1e3f3d242ccab8793bf4ef83cfac4
Author: Cyril Brulebois <kibi@debian.org>
Date: Sun Jun 5 14:53:08 2011 +0200
render: Replace __inline with inline.
Also remove traces from the past.
Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Signed-off-by: Cyril Brulebois <kibi@debian.org>
commit 9f01249d7f81514a38c44dff2a4a4612dbf97cae
Author: Cyril Brulebois <kibi@debian.org>
Date: Sun Jun 5 15:10:56 2011 +0200
configure.ac: Fix help string for mitshm.
Pasting from ./configure --help's output, one would get:
| configure: WARNING: unrecognized options: --disable-shm
Fix the help string to include the previously missing “mit” bits.
Reviewed-by: Gaetan Nadon <memsize@videotron.ca>
Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Signed-off-by: Cyril Brulebois <kibi@debian.org>
commit 0caeef6146bee5fb1827ab25db191685dde9d4b4
Author: Keith Packard <keithp@keithp.com>
Date: Fri Aug 26 16:46:13 2011 -0700
Version bumped to 1.11
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 05284a03f9002b03a66ae355b34790ec02b726f0
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu Aug 4 14:45:46 2011 +1000
input: make InputOption opaque, provide interface functions.
InputOptions is not switched to use struct list for a future patch to unify
it with the XF86OptionRec.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Dan Nicholson <dbn.lists@gmail.com>
commit fcafe825751bef99f4c0b36250ca6f15f127502f
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Mon Aug 8 15:21:46 2011 +1000
Add null-terminated list interface.
This is a set of macros to provide a struct list-alike interface for classic
linked lists such as the XF86OptionRec or the DeviceIntRec. The typical
format for these is to have a "struct foo *next" pointer in each struct foo
and walk through those. These macros provide a few basic functions to add to,
remove from and iterate through these lists.
While struct list is in some ways more flexible, switching legacy code to
use struct list is not alway viable. These macros at least reduce the amount
of open-coded lists.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
commit 79ca7c0b5786a02a80a1c40ed475e928da7c82b3
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri Aug 12 15:55:48 2011 +1000
xfree86: comment typo fix
in synch → in sync
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 2bfb802839688ecf328119c4c6979390fc60348d
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri Jul 29 16:33:54 2011 +1000
dix: don't XWarpPointer through the last slave anymore (#38313)
This line was introduced pre-1.6 to fix Bug 19297. The effect of warping
through the VCP then was that if a device had custom valuator ranges, the
warp position would be wrong. The better device for this effect is the the
XTest device.
This fixes a server crash where the lastSlave is a pointer device without
valuators (Bug 38313#0).
And while we're at it, make sure the Xinerama code-path does the same.
X.Org Bug 38313 <http://bugs.freedesktop.org/show_bug.cgi?id=38313>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Daniel Stone <daniel@fooishbar.org>
commit b29ce0726d55ec41cfbce0814e21b0217ef64efe
Author: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
Date: Tue Aug 9 11:00:34 2011 +0900
Disable check of double-aligned in test/input.c on Renesas SH
Renesas SH is not aligned at size of double.
When structure has double value, It is aligned in 4byte (long).
Signed-off-by: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 3be379f5076566edaf92c27df5a4d447bcf5d015
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu Aug 11 10:59:07 2011 +1000
dix: use helper functions in EventIsDeliverable
Proximity events don't have an XI2 type and caused error messages in the
log when trying to get the event filter. Use this opportunity to
clean up the code, instead of manually setting the fields that
GetEventFilter requires use EventTo(XI2|XI|Core) instead.
Co-Authored-by: Keith Packard <keithp@keithp.com>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Keith Packard <keithp@keithp.com>
commit 799879797505a5e891ccaec2bea73fd838c94b7a
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu Aug 11 10:57:05 2011 +1000
dix: abstract XI2 filter mask lookup
Don't access the xi2mask bytes directly or calculate the offsets manually,
use a few helper functions instead. XI2 masks are a bit weird in the event
handling code since they slot onto the legacy code. For core/XI 1.x events,
the event mask is a CARD32. That mask is used together with the event filter
(also 32 bit) to determine if event delivery should be attempted.
XI2 masks are of arbitrary size and their mask is simply the byte of the
mask that contains the event mask. Likewise, the filter is a single byte
matching that mask. Provide helper functions get these bytes and masks in
the right order instead of accessing them manually.
EventIsDeliverable should be part of this cleanup patch but it will be
gutted with the next patch.
Co-Authored-by: Keith Packard <keithp@keithp.com>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Keith Packard <keithp@keithp.com>
commit 8c5a4d6fbecf79f2dc4f2d836d741203b2d5e856
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Mon Aug 1 14:12:41 2011 +1000
dix: don't use the pointer as modifier device in UngrabKey.
Modifier device is always the keyboard.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Daniel Stone <daniel@fooishbar.org>
commit 3a077f246e9ac07a37c1b01c3d321e0f5ceb4153
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Wed Aug 3 15:07:23 2011 +1000
input: provide a single function to init DeviceEvents to 0
getevents.c already had that function, but XKB was manually initializing it,
causing bugs when the event structure was updated in one place but not the
other.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 4b376ddeb4f3c9d9d279ffd2946d88edd5af4cfc
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Mon Aug 1 14:20:53 2011 +1000
dix: fix compiler warnings ("foo" set but not used)
devices.c: In function 'AttachDevice':
devices.c:2409:18: warning: variable 'oldmaster' set but not used
[-Wunused-but-set-variable]
events.c: In function 'ConfineToShape':
events.c:683:15: warning: variable 'pSprite' set but not used
[-Wunused-but-set-variable]
events.c: In function 'ProcGrabPointer':
events.c:4759:15: warning: variable 'time' set but not used
[-Wunused-but-set-variable]
getevents.c: In function 'GetMotionHistory':
getevents.c:425:9: warning: variable 'dflt' set but not used
[-Wunused-but-set-variable]
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Daniel Stone <daniel@fooishbar.org>
commit 6fd2adc179141310e45a56ee90ef5b5f6115a1f6
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Mon Aug 1 14:27:54 2011 +1000
mi: fix compiler warnings ("foo" set but not used)
misprite.c: In function 'miSpriteSaveUnderCursor':
misprite.c:940:12: warning: variable 'y' set but not used
[-Wunused-but-set-variable]
misprite.c:940:9: warning: variable 'x' set but not used
[-Wunused-but-set-variable]
mivaltree.c: In function 'miComputeClips':
mivaltree.c:226:10: warning: variable 'resized' set but not used
[-Wunused-but-set-variable]
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Daniel Stone <daniel@fooishbar.org>
commit 484cef5b29ef82402a15e155b3b8505b1e4a6830
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Tue Aug 2 09:21:00 2011 +1000
Xi: silence compiler warnings (set but not used)
exevents.c: In function 'UpdateDeviceState':
exevents.c:719:9: warning: variable 'bit' set but not used
[-Wunused-but-set-variable]
exevents.c: In function 'ProcessOtherEvent':
exevents.c:889:22: warning: variable 'v' set but not used
[-Wunused-but-set-variable]
exevents.c:888:17: warning: variable 'k' set but not used
[-Wunused-but-set-variable]
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Daniel Stone <daniel@fooishbar.org>
commit 98fe735ea1d756711019c3d90ed6abd9c06abebf
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Mon Aug 1 13:52:13 2011 +1000
dix: add KEYBOARD_OR_FLOAT and POINTER_OR_FLOAT to GetMaster()
GetMaster() currently requires an attached slave device as parameter,
resuling in many calls being IsFloating(dev) ? dev : GetMaster(...);
Add two new parameters so GetMaster can be called unconditionally to get the
right device.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Daniel Stone <daniel@fooishbar.org>
commit dbbe5735d1451bb32f43bce90f0bcfeff46f9743
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Tue Aug 2 08:54:00 2011 +1000
test: add a test for GetMaster() behaviour
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Daniel Stone <daniel@fooishbar.org>
commit b3c76b0c53ac42b70d12849da18465e8467e474c
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Mon Aug 1 11:54:17 2011 +1000
mi: fix comment typo, whitespace in miPointerSetPosition
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Daniel Stone <daniel@fooishbar.org>
commit c9562bed0d5e26b7e3e55e26cf1ddc5086d61cc6
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Mon Aug 1 09:52:38 2011 +1000
dix: rename mieqSwitchScreen argument fromDix → set_dequeue_screen, document
fromDIX is neither exactly true nor particularly helpful in understanding
what this parameter triggers. Rename to set_dequeue_screen, because that's
exactly what happens.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Daniel Stone <daniel@fooishbar.org>
commit 09496996accfdaf7bc01097a25db400912004d97
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu Jul 28 15:56:08 2011 +1000
dix: ignore devices when adding passive core grabs to list (#39545)
Passive core grabs are mostly device-independent. In an MPX scenario, they
may change to reflect whichever master pair activated the grab last. For
adding new grabs to the list, ignore the device for core grabs to return
failures when trying to set the same grab combo twice on a window.
X.Org Bug 39545 <http://bugs.freedesktop.org/show_bug.cgi?id=39545>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Daniel Stone <daniel@fooishbar.org>
commit 80c37048539daa1d257d127d66502bde45c97c85
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu Jul 28 15:43:10 2011 +1000
dix: avoid using the VCP as modifier device
Core grabs may change device when they're activated to reflect the master
they apply to. If the device is a keyboard, modifierDevice is erroneously
set to the Virtual Core Pointer.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Daniel Stone <daniel@fooishbar.org>
commit 20a61845d3c93c337bf3331a6bac30cf66c2a293
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Tue Aug 9 11:21:06 2011 +1000
config: use add_option for '_source' too
_source was being allocated manually, with all other options added to that
list through add_option. Skip the manual part, allocate the first option
_source with add_option too.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Daniel Stone <daniel@fooishbar.org>
commit d33652dad8838ab0a9175ca4613a3161ebc5676f
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Tue Aug 9 11:20:31 2011 +1000
config: return the new InputOption from add_option.
Change add_option to return the new InputOption on success, or NULL
failure. This way we can at least check for errors in callers.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Daniel Stone <daniel@fooishbar.org>
commit e684e816acb617b4dc66a68e2b0ba8f80399170a
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Wed Jul 20 16:21:28 2011 +1000
config: fix a log message
PRODUCT was taken from the parent, hence ppath.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Daniel Stone <daniel@fooishbar.org>
commit 1357cd725143c1a35e32f15df658de111b151692
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri Jul 8 16:13:45 2011 +1000
Revert "Attempt to add the 'mouse' driver in more situations."
This reverts commit 43d9edd31e31b33b9da4a50d8ab05004881c8d5a.
This commit was introduced in the 1.2 cycle when hotplugging was less than
ideal (i.e. it didn't exist). From the commit message:
Always add a mouse driver instance configured to send core events, unless
a core pointer already exists using either the mouse or void drivers. This
handles the laptop case where the config file only specifies, say,
synaptics, which causes the touchpad to work but not the pointing stick.
We don't double-instantiate the mouse driver to avoid the mouse moving twice
as fast, and we skip this logic when the user asked for a void core pointer
since that probably means they want to run with no pointer at all.
To get this case above, a user would need to disable hotplugging _and_ have a
xorg.conf that only references one device. This is possible, but not a use-case
we should worry about too much now.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Daniel Stone <daniel@fooishbar.org>
commit 159b03e13760920274b573a2bccdbf6a79f059e7
Author: Lennart Poettering <lennart@poettering.net>
Date: Mon Jul 18 21:19:23 2011 +0200
config: add udev/systemd multi-seat support
Add support for multi-seat-aware input device hotplugging. This
implements the multi-seat scheme explained here:
http://www.freedesktop.org/wiki/Software/systemd/multiseat
This introduces a new X server switch "-seat" which allows configuration
of the seat to enumerate hotplugging devices on. If specified the value
of this parameter will also be exported as root window property
Xorg_Seat.
To properly support input hotplugging devices need to be tagged in udev
according to the seat they are on. Untagged devices are assumed to be on
the default seat "seat0". If no "-seat" parameter is passed only devices
on "seat0" are used. This means that the new scheme is perfectly
compatible with existing setups which have no tagged input devices.
Note that the -seat switch takes a completely generic identifier, and
that it has no effect on non-Linux systems. In fact, on other OSes a
completely different identifier scheme for seats could be used but still
be exposed with the Xorg_Seat and -seat.
I tried to follow the coding style of the surrounding code blocks if
there was any one could follow.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 95772598b57f6054fbf88683fa0a492c77605790
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri Jul 8 16:10:07 2011 +1000
xfree86: use xf86AllocateInput for implicit devices too
Slowly merging the vastly different code-paths.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Daniel Stone <daniel@fooishbar.org>
commit fa8f4652819b692faaf2789cf32d7fa99fbb34aa
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Mon Jul 4 15:02:20 2011 +1000
xfree86: factor out adding/removing a device from the input device array
No functional changes, just readability improvements. This also gets rid of
the count variable. Count was just used for resizing the null-terminated
list. Since we're not in a time-critical path here at all we can afford to
loop the list multiple times instead of keeping an extra variable around.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Daniel Stone <daniel@fooishbar.org>
commit 5b5477c05f691205064ca4d8034f8dd47ab975b7
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Mon Jul 4 14:14:11 2011 +1000
xfree86: update comment for InitInput
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Daniel Stone <daniel@fooishbar.org>
commit 7354f607833c69626d8692bc5176b18ea1cf6263
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Mon Jul 4 14:26:13 2011 +1000
xfree86: nest loops instead of 0x1 pointers.
If we find the core device, move all other device pointers forward right
then and there. The break will jump out of the top loop.
They had a special on braces today, so I added some for readability (and
fixed up tab vs space indentation.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Daniel Stone <daniel@fooishbar.org>
commit 5669aa2d24dff9ab276e5f74a09f97ec77b90e75
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Mon Jul 4 14:05:30 2011 +1000
xfree86: improve readability of synthesized device.
No functional changes.
The options we assign are the ones from the Pointer/Keyboard device so we
might as well use those readable names instead of dev[count-1]->options.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Daniel Stone <daniel@fooishbar.org>
commit 5aa826cdd1f2e768bedf23d399703a5d0b6302be
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Mon Jul 4 13:52:11 2011 +1000
test: add a option duplication test
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Daniel Stone <daniel@fooishbar.org>
commit 4527e2b776cfcdac2b189b5439b9a3d0b6433077
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Mon Jul 4 13:46:24 2011 +1000
xfree86: when implicitly choosing a core device, set the option to a value
Devices are core pointers/keyboards by default now anyway, but let's set the
option to some value instead of just NULL.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Daniel Stone <daniel@fooishbar.org>
commit 44d53728a6a533fc0a6e0a10269d1cc99e9dad32
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Mon Jul 4 13:44:44 2011 +1000
xfree86: don't warn about duplicate core devices
It doesn't matter. All devices are core pointer devices by default now
anyway.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Daniel Stone <daniel@fooishbar.org>
commit 033f53c223dc12a91f00e10a69f87a4f2a7adb6b
Author: Daniel Kurtz <djkurtz@chromium.org>
Date: Mon Aug 8 15:09:48 2011 +0800
xf86Helper: use LogHdrMessageVerb in xf86VDrvMsgVerb
LogHdrMessageVerb allows passing a parameterized header to insert in a log
message between MessageType and the formatted message body string.
Signed-off-by: Daniel Kurtz <djkurtz@chromium.org>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit cd8ee3e5cb29b9cd6402d2fbc71463c6b04b6077
Author: Daniel Kurtz <djkurtz@chromium.org>
Date: Mon Aug 8 15:09:47 2011 +0800
xf86Helper: use LogHdrMessageVerb in xf86VIDrvMsgVerb
LogHdrMessageVerb allows passing a parameterized header to insert in a log
message between MessageType and the formatted message body string.
Signed-off-by: Daniel Kurtz <djkurtz@chromium.org>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit b31d104fc09a7241856ff8d226be11ec562beac3
Author: Daniel Kurtz <djkurtz@chromium.org>
Date: Mon Aug 8 15:09:46 2011 +0800
os/log: Add LogVHdrMessageVerb and friends
LogVHdrMessageVerb allows a custom header to be inserted in a log message,
between the Log system's MessageType string, and a formatted variable
message body. The custom header can itself be a formatted variable string.
These functions can be used, for example, by driver abstraction layers to
format specific driver messages in a standard format, but do it in a way
that is efficient, obeys the log-layers verbosity settings, and is safe
to use in signal handlers (because they don't call malloc), even for
types besides X_NONE.
Signed-off-by: Daniel Kurtz <djkurtz@chromium.org>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit b82f934db661c59d7397ce180d08cf8f8f7118b1
Author: Daniel Kurtz <djkurtz@chromium.org>
Date: Mon Aug 8 15:09:45 2011 +0800
os/log: Pull LogMessageTypeVerbString out of LogVMessageVerb
Also, optimize how the type and format strings are combined.
Signed-off-by: Daniel Kurtz <djkurtz@chromium.org>
Reviewed-by: Guillem Jover <guillem@hadrons.org>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit e32cc0b4c85c78cd8743a6e1680dcc79054b57ce
Author: Adam Jackson <ajax@redhat.com>
Date: Thu Apr 21 16:37:11 2011 -0400
fb: Fix memcpy abuse
The memcpy fast path implicitly assumes that the copy walks
left-to-right. That's not something memcpy guarantees, and newer glibc
on some processors will indeed break that assumption. Since we walk a
line at a time, check the source and destination against the width of
the blit to determine whether we can be sloppy enough to allow memcpy.
(Having done this, we can remove the check for !reverse as well.)
On an Intel Core i7-2630QM with an NVIDIA GeForce GTX 460M running in
NoAccel, the broken code and various fixes for -copywinwin{10,100,500}
gives (edited to fit in 80 columns):
1: Disable the fastpath entirely
2: Replace memcpy with memmove
3: This fix
4: The code before this fix
1 2 3 4 Operation
------ --------------- --------------- --------------- ------------
258000 269000 ( 1.04) 544000 ( 2.11) 552000 ( 2.14) Copy 10x10
21300 23000 ( 1.08) 43700 ( 2.05) 47100 ( 2.21) Copy 100x100
960 962 ( 1.00) 1990 ( 2.09) 1990 ( 2.07) Copy 500x500
So it's a modest performance hit, but correctness demands it, and it's
probably worth keeping the 2x speedup from having the fast path in the
first place.
Signed-off-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit ac2c307f4716ebd3e955c004ceec9f4c029401a0
Author: Pelle Johansson <pelle@morth.org>
Date: Sun Aug 14 17:44:40 2011 -0700
XQuartz: Initialize darwin pointer valuators
This fixes a regression introduced by: 633b81e8ba09cc6a1ea8b43f323874fda2cf0bde
http://xquartz.macosforge.org/trac/ticket/498
Signed-off-by: Pelle Johansson <pelle@morth.org>
Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com>
commit 4020cab88f5cf3164fc83cf912f94f288aa5a45d
Author: Michel Dänzer <michel.daenzer@amd.com>
Date: Wed Aug 10 11:36:16 2011 +0200
EXA/mixed: Update sys_pitch in MPH even when there's no system memory copy.
Otherwise sys_pitch will be stale when a system memory copy is allocated.
Fixes https://bugs.freedesktop.org/show_bug.cgi?id=38322 and a crash when
unlocking the screen with xscreensaver, reported by Janne Huttunen.
Signed-off-by: Michel Dänzer <michel.daenzer@amd.com>
Tested-by: Janne Huttunen <jahuttun@gmail.com>
Tested-by: Jan Kriho <Erbureth@gmail.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit a1dec7cd6adabaf8770dc3b21b0df30ce2f0bc8d
Author: Julien Cristau <jcristau@debian.org>
Date: Thu Jul 7 19:18:03 2011 +0200
Xephyr/dri: register screen and window privates on init
Fixes assertion failure when calling dixSetPrivate
Debian bug#632549 <http://bugs.debian.org/632549>
Reported-and-tested-by: Mohammed Sameer <msameer@foolab.org>
Signed-off-by: Julien Cristau <jcristau@debian.org>
Reviewed-by: Daniel Stone <daniel@fooishbar.org>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 39bc81b60ddc9e495ff3b9bb3c3a6c39e547b43a
Author: Keith Packard <keithp@keithp.com>
Date: Wed Aug 3 20:57:03 2011 -0700
Version bumped to 1.10.99.902 (1.11 RC2)
At the close of the 1.11 non-critical fixes window.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 9504caf1c3243e3ab2eb7126bc2bb876a8f89918
Author: Ville Syrjälä <ville.syrjala@nokia.com>
Date: Fri May 6 18:19:34 2011 +0300
composite: Inhibit window background paint with manual subwindow redirection
The composite extension spec says that window background painting
should be inhibited when the subwindow redirection mode is set to
manual.
This eliminates the ugly flashing effect when compiz unredirects a
fullscreen window.
Signed-off-by: Ville Syrjälä <ville.syrjala@nokia.com>
Reviewed-by: Owen Taylor <otaylor@fishsoup.net>
Reviewed-by: Keith Packard <keithp@keithp.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit f1d75f3b742231c4c09f13d7a22ed920014cb5ef
Author: Pierre-Loup A. Griffais <pgriffais@nvidia.com>
Date: Thu Jul 28 15:17:59 2011 -0700
Revert "composite: Don't backfill non-MapWindow allocations"
This reverts commit db8840600e8e21356241eb87395031388d9b54d2.
It was an optimization for the resize case, but 193ecc8b453b22 made
it so that no backfilling takes place on resize if left in.
Signed-off-by: Pierre-Loup A. Griffais <pgriffais@nvidia.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
Conflicts:
composite/compalloc.c
Signed-off-by: Keith Packard <keithp@keithp.com>
commit e87adcc9e024982fdad974de2876b00cf974dab8
Author: Julien Cristau <jcristau@debian.org>
Date: Sun Jul 31 21:14:59 2011 +0200
Xquartz: include new localization files in the tarball
Signed-off-by: Julien Cristau <jcristau@debian.org>
Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com>
commit a1bb5062c72667b2f10b56925c61888acc89e3e4
Author: Jeremy Huddleston <jeremyhu@apple.com>
Date: Thu Jul 21 10:33:58 2011 -0700
XQuartz: xpr: Don't FatalError if xp_unlock_window fails
We added the FatalError in 5d1d9d9ae39fab2ee2ac085f9776f82768828dc8 but
it caused a regression http://xquartz.macosforge.org/trac/ticket/482
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
commit c319f7b5b3ee651636cdfd165588f0dc972a22a4
Author: Jeremy Huddleston <jeremyhu@apple.com>
Date: Wed Jul 20 00:16:42 2011 -0700
XQuartz: Use CFSTR to avoid implicit cast warning of NSString * to CFStringRef
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
commit 08dfff92e8d0c2b1726634392c147f6634d1706d
Author: Aaron Plattner <aplattner@nvidia.com>
Date: Fri Jul 29 16:12:06 2011 -0700
randr: Compare all the bytes in RRPostPendingProperties
RRPostPendingProperties tries to compare the pending and current
property values to decide whether they're actually changing. However,
it does this using a memcmp that passes in pending_value->size as the
number of bytes. This is actually the number of elements, where each
element is (pending_value->format / 8) bytes long. This causes the
pending value to not be propagated if the first pending_value->size
bytes are the same and only the end of it is changing.
Fix this by computing the total number of bytes to compare in the
memcmp.
Signed-off-by: Aaron Plattner <aplattner@nvidia.com>
Reviewed-by: Keith Packard <keithp@keithp.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit b8f61c11c94708d4f17720a55945dee4621315a4
Merge: 5596f10cce f51e42f583
Author: Keith Packard <keithp@keithp.com>
Date: Fri Jul 29 14:58:58 2011 -0700
Merge remote-tracking branch 'whot/for-keith'
commit f51e42f583073bde0bc8131887cb7220636c8855
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Wed Jul 20 13:09:05 2011 +1000
Terminate the log with one last message.
Instead of just closing the log when everything is done, put one more
message in stating that we're actually terminating. Users or scripts that
look at the Xorg.log will then know that a) the server has terminated
properly and b) why the server terminated (to some degree, given that most
real-world errors will be caused by AbortServer()).
Acked-by: Gaetan Nadon <memsize@videotron.ca>
Reviewed-by: Daniel Stone <daniel@fooishbar.org>
Tested-by: Jeremy Huddleston <jeremyhu@apple.com>
Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com>
Tested-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Reviewed-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 01de08c7d2c00eef238adba6665896ea3cd7d511
Author: Julien Cristau <jcristau@debian.org>
Date: Tue Jul 26 20:40:38 2011 +0200
configure: set default xkb rules to evdev on Linux
If config/udev was enabled, this would default to base, which means that
after regen the devices would get the wrong rules, and hilarity would
ensue.
It's probably safe to default to evdev unconditionally on Linux by now.
Reported-by: Bastian Blank <waldi@debian.org>
Signed-off-by: Julien Cristau <jcristau@debian.org>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 3798dd379c1ecf325f9907128fb66d20372f6876
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Wed Jul 20 09:00:18 2011 +1000
Initialize the fd to -1 for xorg.conf input devices.
For hotplugged devices, xf86AllocateInput does that for us but the xorg.conf
path is different. Since not all drivers reset the fd during PreInit but may
still call close(pInfo->fd) in all cases, this can terminate the logging
early.
Reproducible: add a wacom driver InputDevice section with no Option Device.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Daniel Stone <daniel@fooishbar.org>
commit f2a6735cfc07789cca81852b24a85578f200d83d
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Mon Jul 4 12:34:32 2011 +1000
xfree86: NULL option values are technically valid, don't strdup them
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Daniel Stone <daniel@fooishbar.org>
commit f0d7e9db28c374a3db359bcb63a7ce79fd84b541
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Mon Jul 4 14:14:39 2011 +1000
xfree86: duplicate xorg.conf device information before xf86NewInputDevice
xf86ConfigLayout.inputs contains the information from the xorg.conf
file. Passing this into xf86NewInputDevice means the device will get
cleaned up on exit and the pointers in xf86ConfigLayout.inputs are left
dangling. In the second server generation, this results in a server
crash.
Also, rename pDev to pInfo. pDev is pretty much reserved for DeviceIntPtr
types.
Reproducible: AutoAddDevices off and xorg.conf input sections, trigger
server regeneration.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Daniel Stone <daniel@fooishbar.org>
commit 8ffddbcf72170e246826ee0f39f18989a29fa218
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Mon Jun 27 16:30:28 2011 +1000
xfree86: Remove devices that failed to enable on startup
Devices that succeeded during PreInit and DEVICE_INIT but failed in
DEVICE_ON would be deleted through xf86DeleteInput but not removed from the
list of input devices (and not turned off). The result was a double free on
server shutdown.
Fix this by calling RemoveDevice if EnableDevice fails.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Daniel Stone <daniel@fooishbar.org>
commit 6cea28fe4b7a4a22ad270d8c71403db84a9bfb2c
Author: Lennart Poettering <lennart@poettering.net>
Date: Mon Jul 18 21:18:27 2011 +0200
config: don't fail if a device vanished by the time we managed to look at it
The nature of hotplug is that a device we enumerated might already be
gone by the time we look at it, so don't assume otherwise.
Signed-off-by: Lennart Poettering <lennart@poettering.net>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit f13de9ca1b7c4dd0dd5c08037c6bd53f88ac30f5
Author: Lennart Poettering <lennart@poettering.net>
Date: Mon Jul 18 21:17:49 2011 +0200
config: limit the kernel subsystems we look for devices in
Don't enumerate/monitor all devices of the system (since that can be
quite a few), but limit our search to devices from the "input"
subsystem, as well as the "tty" subsystem (to cover Wacom tablets).
This should make X start up a bit faster and reduce the number of
unnecessary wake-ups of the X server.
Signed-off-by: Lennart Poettering <lennart@poettering.net>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 882e3c2680c339ad7aa0d664e0b0f02b8a05b11d
Author: Lennart Poettering <lennart@poettering.net>
Date: Mon Jul 18 21:17:10 2011 +0200
config: process udev "changed" and "add" events in the same code paths
udev gives no guarantee that before each "changed" event for a device
there's an "add" event, or that before each "remove" is an "add", or
that before each "add" there was no "add" already and so on. Users can
trigger these events at any time with "udevadm trigger", and netlink is
a lossy transport, hence the events can come in unexpected ordering.
With other words: regardless which event is generated, the X server must
not choke on it and make the best of it, hence make sure that if we get
an "add" event for an existing device we don't add the device a second
time.
Signed-off-by: Lennart Poettering <lennart@poettering.net>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 5596f10cce58295d8af73646352b314ecb3ddfca
Author: Jon TURNEY <jon.turney@dronecode.org.uk>
Date: Sat Jul 9 13:21:04 2011 +0100
Remove hw/xwin/xlaunch
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
commit 73864a87aacbce85b520ccaa6e360b82c0e99716
Author: Jeremy Huddleston <jeremyhu@apple.com>
Date: Tue Jul 19 20:03:48 2011 -0700
XQuartz: Localization updates
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
commit d2463df84d3a160b2dd1e706b02985e1817784e3
Author: Jeremy Huddleston <jeremyhu@apple.com>
Date: Tue Jul 19 20:02:33 2011 -0700
XQuartz: Add english NIB changes for scroll_in_device_direction
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
commit e36e7ad6314ca5fcd3292b8022f0a618d567d72b
Author: Jeremy Huddleston <jeremyhu@apple.com>
Date: Tue Jul 19 20:01:11 2011 -0700
XQuartz: Add GUI controls to toggle scroll_in_device_direction
Also cleaned up the wording for fullscreen_menu.
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
commit ac43984215faf464fd48bd006cac1c6539603cea
Author: Jeremy Huddleston <jeremyhu@apple.com>
Date: Tue Jul 19 20:00:27 2011 -0700
XQuartz: Add a scroll_in_device_direction preference
This preference allows users to override the related option in Mac OS X's
Mouse/Trackpad preferences. This effectively lets the user determine
which "context" all of X11 fits into for context-based scrolling until
such API exists within X11 itself to pass along to X11 clients.
This is applicable to Mav OS X 10.7+
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
commit ec95a9c829b8e37529aa828c05fbaabc45cffe42
Author: George Staplin <gstaplin@apple.com>
Date: Wed Mar 4 02:03:52 2009 -0700
XQuartz: Add diagnostic error checking to xp_destroy_surface.
This occurred to me in hindsight after the last commit. If the
original developer had done this, we would have noticed the
problem sooner.
(cherry picked from commit aa0a57996f3e7d16238f69976958c2526821388b)
commit 4fe7df265324f63025686efe9d32342e3cef40d3
Author: George Staplin <gstaplin@apple.com>
Date: Wed Mar 4 01:39:58 2009 -0700
XQuartz: Fix a memory leak with surfaces that a new test found.
xp_destroy_surface was called with a surface id of 0, due to some
premature cleanup that set it to 0. This means the surfaces
weren't being destroyed until the window was.
The code that did that was: pDRIDrawablePriv->sid = 0;
In long running applications this leak may or may not have been
harmful. With the old libGL the surfaces weren't destroyed until
the context was destroyed or a new context created. In the new
libGL they are reference counted, and released much sooner, so we
ran into a resource leak more noticeably with some tests.
Make the Apple DRI code dispatch events to the client(s) for
destroyed surfaces, when a resource is destroyed. This seems to
work in my tests, however this clearly wasn't working for a while,
so bugs may result in the future if it enables some new (unexpected)
side effects.
Also add a few helpful comments to aid in understanding the code
in the future.
Tested with the test suite, Pymol, and various Mesa demos.
(cherry picked from commit bede83eb19a1629396fcd5a46441f8476a8fcd1b)
commit 0ebe45a717faa6464d3b1ab73e30570518ee4798
Author: Jeremy Huddleston <jeremyhu@apple.com>
Date: Tue Jul 19 19:42:44 2011 -0700
XQuartz: DRI: Dead code removal
Also add some comments that weren't merged in from server-1.4-apple's
99babae1326485c27eb9253db83afdd6aef9e362
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
commit 88ad050f3c2f9f11bafb56a8cf777518795295a9
Author: Jeremy Huddleston <jeremyhu@apple.com>
Date: Mon Jul 18 22:54:21 2011 -0700
XQuartz: Add some sanity checking and a fallback for the bundle id.
This way we'll print an error and still mostly work rather than crashing if
someone installs XQuartz.app incorrectly or tries running the server within
the build system rather than the installed system.
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
commit 89bfa0c633f3096cca6f983bca1507d3f4b902a8
Author: Jeremy Huddleston <jeremyhu@apple.com>
Date: Fri Jul 15 10:39:39 2011 -0700
XQuartz: DarwinEQFini doesn't return Bool
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
commit 82f5521a6d91ebcd2a4400f6c221ad625edc99a1
Author: Daniel Stone <daniel@fooishbar.org>
Date: Wed Jul 13 12:08:04 2011 +0100
XKB: Work around broken interps from old xkbcomp
Bugfix for broken xkbcomp: if we encounter an XFree86Private action with
Any+AnyOfOrNone(All), then we skip the interp as broken. Versions of
xkbcomp below 1.2.2 had a bug where they would interpret a symbol that
couldn't be found in an interpret as Any. So, an
XF86LogWindowTree+AnyOfOrNone(All) interp that triggered the PrWins
action would make every key without an action trigger PrWins if libX11
didn't yet know about the XF86LogWindowTree keysym. None too useful.
We only do this for XFree86 actions, as the current XKB dataset relies
on Any+AnyOfOrNone(All) -> SetMods for Ctrl in particular.
See xkbcomp commits 2a473b906943ffd807ad81960c47530ee7ae9a60 and
3caab5aa37decb7b5dc1642a0452efc3e1f5100e for more details.
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
Acked-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit c177a5bcaa170d24a784540460906cc04ac5c752
Author: Daniel Stone <daniel@fooishbar.org>
Date: Wed Jul 13 12:08:03 2011 +0100
Fix non-Composite builds in PrintWindowTree
The previous patch accidentally introduced a hard dependency on
Composite. Sorry, OS X.
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
Reported-by: Jeremy Huddleston <jeremyhu@apple.com>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 01dbf2514aa0cc8c40a876a24e3cb0737c41da19
Merge: 5a801af689 af0fbc37e3
Author: Keith Packard <keithp@keithp.com>
Date: Wed Jul 13 11:44:15 2011 -0700
Merge remote-tracking branch 'jturney/master'
commit 5a801af689fce9dfe84453bbc2b029cb4782de83
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Tue Jul 12 19:50:05 2011 -0400
XWinrc: replace hard coded section number with __filemansuffix__
Reviewed-by: Cyril Brulebois <kibi@debian.org>
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit af0fbc37e35ddaabf12a8d7abc79ea11958ec8ac
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Thu Jun 23 07:45:13 2011 -0400
XWinrc: replace hard coded section number with __filemansuffix__
Reviewed-by: Cyril Brulebois <kibi@debian.org>
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
commit 42bc198775a78b328612427c4c8ed4d17e005ae9
Author: Jon TURNEY <jon.turney@dronecode.org.uk>
Date: Mon Jan 24 18:29:41 2011 +0000
glx: Remove a few lingering traces of __GLXscreen.GLXVersion
The GLXversion member of the __GLXscreen struct
is just cruft since commit ad5c0d9efa47476ed5cf75c82265c73919e468b4,
when we started returning the minimum GLX version supported by all
of the screens on the display, rather than the maximum version supported
by the server.
Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com>
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
commit 005e68ba59782b60dd5c44a06c75b1fa5e8d70d8
Author: Jon TURNEY <jon.turney@dronecode.org.uk>
Date: Thu Jan 20 16:21:04 2011 +0000
hw/xwin: Add -wgl option to XWin manpage
Document the -[no]wgl options in the XWin manpage
Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
commit d62726019e4b7bfac8a23d0d733677b141047d66
Author: Jon TURNEY <jon.turney@dronecode.org.uk>
Date: Tue Nov 2 11:38:53 2010 +0000
hw/xwin: Add items to WGL AIGLX todo
Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
commit 276735ef5d12e79fe051996f100c5730c1e69334
Author: Jon TURNEY <jon.turney@dronecode.org.uk>
Date: Mon Oct 11 16:22:49 2010 +0100
hw/xwin: Report Window XIDs in Window debug messages
Report Window XIDs in Window create/destroy/reparent debug messages
It's actually quite useful if you are trying to corrolate those events
with what a client is doing...
Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
commit b0b54338e2f8aed6e6a683ebddd2a2acbefabecd
Author: Jon TURNEY <jon.turney@dronecode.org.uk>
Date: Mon Oct 11 16:25:03 2010 +0100
hw/xwin: Add a flag to track which windows have been drawn to using WGL.
Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
commit 98c6d91a48f460fdbca93700ab637eadf946fb0e
Author: Colin Harrison <colin.harrison@virgin.net>
Date: Thu Mar 24 20:39:51 2011 +0000
hw/xwin/glx: Fix some warnings in generated wrapper code
Add a suitable cast to the generated code for glWinSetupDispatchTable()
so it doesn't generate screeds of warnings
Reviewed-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
commit b67e80c84e4af54007aa1bd1e4a97a4d1b3d3765
Author: Jon TURNEY <jon.turney@dronecode.org.uk>
Date: Mon Jan 24 18:41:05 2011 +0000
hw/xwin/glx: Handle failure to get any fbconfigs more gracefully.
Handle failure to get any useful pixel formats for GLX fbconfigs
more gracefully: If we didn't get any useful pixel formats from
wglGetPixelFormatAttribivARB(), fall back to using DescribePixelFormat().
If that doesn't give us any useful pixel formats, fallback to software
rendering.
This works around a problem with Intel 845G drivers, where
wglGetPixelFormatAttribivARB() doesn't seem to work as we expect it to...
Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
commit 9915b169237e3b2d817bd3d4455f3c01dd7dd2b5
Author: Jon TURNEY <jon.turney@dronecode.org.uk>
Date: Mon Nov 1 19:53:42 2010 +0000
hw/xwin/glx: Don't spam log with wglwrap symbol resolution status at startup
... instead just log if an attempt is made to call a wrapper for
a function which didn't resolve
Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
commit 8216316867f07819b8e8b377f2633fbf8876abf7
Author: Jon TURNEY <jon.turney@dronecode.org.uk>
Date: Sat Oct 30 17:23:52 2010 +0100
hw/xwin/glx: Better handling of SetPixelFormat() failure
Propagate and report the failure if SetPixelFormat() fails
Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
commit eecc8e06eb4bdfd4354144206d990cd9ccb69721
Author: Jon TURNEY <jon.turney@dronecode.org.uk>
Date: Sat Oct 30 17:22:33 2010 +0100
hw/xwin/glx: Improvements to glxWinErrorMessage() reporting in WGL GLX provider
Request the message using languageID 0 (best effort), rather than only using language neutral messages
Always report the numeric error code.
Trim any trailing \r from FormatMessage() output
Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
commit 3873be16d050ab12fc78f1e7f0c36c2ac88d0a98
Author: Jon TURNEY <jon.turney@dronecode.org.uk>
Date: Mon Oct 11 16:21:40 2010 +0100
hw/xwin/glx: Fix fbconfig dumper formatting for 3 digit index numbers
Some graphics hardware supports hundreds of pixel formats, so adjust
formatting in fbconfig dumper for 3 digit index numbers
Also report the PFD_SUPPORT_DIRECTDRAW, PFD_DIRECT3D_ACCELERATED and
PFD_SUPPORT_COMPOSITION flags introduced with aero
Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
commit d4096abb591353405417e53816e5c46e904e7b25
Merge: 61f87a75f2 87d4f90bfc
Author: Keith Packard <keithp@keithp.com>
Date: Fri Jul 1 15:45:45 2011 -0700
Merge remote-tracking branch 'whot/for-keith'
commit 87d4f90bfcb509471ac9e7886e14a92b33223fd7
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Mon Jun 27 09:10:42 2011 +1000
input: free the EQ allocated memory on shutdown (#38634)
mieqFini() already does the right thing, but it needs to be called by the
various DDXs and the XTest Extension.
X.Org Bug 38634 <http://bugs.freedesktop.org/show_bug.cgi?id=38634>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Acked-by: Jeremy Huddleston <jeremyhu@apple.com>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit e084ac30b37c36016bb0dbb1b79e60a7799aee02
Author: Daniel Stone <daniel@fooishbar.org>
Date: Wed Mar 2 14:52:42 2011 +0000
Input: Reset SD remainder when copying co-ords from MD
In updateSlaveDeviceCoords, pDev->last.valuators was being copied from
the master, but pDev->last.remainder wasn't. Make sure we copy both, to
avoid minor inconsistencies.
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 23a783278963919778d017965542e0f983814e37
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri Jun 24 11:02:23 2011 +1000
input: add POINTER_NORAW to avoid generation of raw events (#30068)
RawEvents are supposed to be events coming from the driver. When warping the
pointer, this should not generate a raw event.
X.Org Bug 30068 <http://bugs.freedesktop.org/show_bug.cgi?id=30068>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Daniel Stone <daniel@fooishbar.org>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 9444e40d77508d545e3c0a8123f61950c22d89fa
Author: Daniel Stone <daniel@fooishbar.org>
Date: Tue Mar 1 11:11:22 2011 +0000
Test: Input: Only ever set up to MAX_VALUATORS valuators
Previously, the input tests were working up to sizeof(mask) * 8, which
could be more than the arrays; the latter only being sized as
MAX_VALUATORS.
Hypothetically, if you were switching the stored valuator values to
double instead of uint32_t, and you attempted to set the 39th member of
a MAX_VALUATORS-sized (36) array, you'd probably end up smashing
ev->key_repeat into oblivion and then tripping the check for invalid
flags because you haven't yet put XIPointerEmulated into the valid flags
for XI_Motion. Probably.
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 1e65a01cf73f1fbdfe0d63eaecea412cf8472cb4
Author: Daniel Stone <daniel@fooishbar.org>
Date: Fri Jun 17 16:28:05 2011 +0100
Test: Ensure libxservertest gets relinked when necessary
Similar to how we link Xorg, make sure that whenever any of the
component libraries changes, we relink libxservertest and the tests.
Not much use testing anything other than the actual source in your tree.
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
Reviewed-by: Dan Nicholson <dbn.lists@gmail.com>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 0f41d6c851df76d0423d9c37ad809d3440906944
Author: Daniel Stone <daniel@fooishbar.org>
Date: Fri Jun 17 13:20:19 2011 +0100
KDrive: Remove useless miPointerUpdateSprite call
miPointerUpdateSprite is already called from mieqProcessInputEvents, so
calling it by hand immediately after isn't massively helpful.
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
Reviewed-by: Cyril Brulebois <kibi@debian.org>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 57b767d2927e5c2e561a431be4e604df65423422
Author: Daniel Stone <daniel@fooishbar.org>
Date: Fri Jun 17 13:19:46 2011 +0100
DMX: Remove useless miPointerUpdateSprite call
miPointerUpdateSprite is already called from mieqProcessInputEvents, so
calling it by hand immediately after isn't massively helpful.
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
Reviewed-by: Cyril Brulebois <kibi@debian.org>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit cf398755c0ca1e031514862b670956e7b9ace5ef
Author: Daniel Stone <daniel@fooishbar.org>
Date: Fri Jun 17 15:29:44 2011 +0100
XWin: Remove executable bit from headers
Headers don't really need to be mode 0755.
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
Reviewed-by: Cyril Brulebois <kibi@debian.org>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 7d2543a3cb3089241982ce4f8984fd723d5312a1
Author: Daniel Stone <daniel@fooishbar.org>
Date: Wed Dec 29 12:03:01 2010 +0000
XKB: Add debug key actions for grabs & window tree
Add four new private XKB actions for debugging:
* PrGrbs: print active grabs to the log file
* Ungrab: ungrab all currently active grabs
* ClsGrb: kill clients with active grabs
* PrWins: dump the current window tree to the log file
To use these, you need to modify your XKB maps, e.g. the following to
have Ctrl+Alt+(F9-F12) mapped to the above:
- compat/xfree86:
interpret XF86LogGrabInfo {
action = Private(type=0x86, data="PrGrbs");
};
interpret XF86Ungrab {
action = Private(type=0x86, data="Ungrab");
}
interpret XF86ClearGrab {
action = Private(type=0x86, data="ClsGrb");
}
interpret XF86LogWindowTree {
action = Private(type=0x86, data="PrWins");
}
- symbols/pc:
key <FK09> { type="CTRL+ALT", [ Return, XF86LogGrabInfo ] };
key <FK10> { type="CTRL+ALT", [ Return, XF86Ungrab ] };
key <FK11> { type="CTRL+ALT", [ Return, XF86ClearGrab ] };
key <FK12> { type="CTRL+ALT", [ Return, XF86LogWindowTree ] };
At the moment, this only works if the grabbing client continues to call
AllowEvents, as the server does no event processing at all when a device
is frozen.
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit ddf735fd4e9658bb5610f5e911f3b4055d5acf89
Author: Daniel Stone <daniel@fooishbar.org>
Date: Tue Oct 13 19:56:57 2009 +1100
DIX: Make PrintWindowTree actually useful
Rewrite PrintWindowTree to make it actually tell you what you want to
know.
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit b27d61e4433a2a0140ed8a6128e4427451e37fec
Author: Matěj Cepl <mcepl@redhat.com>
Date: Fri Jun 17 15:26:17 2011 +0100
Fix UTF-8 encoding
Report to find out all non-UTF-8 files created by
cat extensions |xargs -I XXXX find . -name \*.XXXX |while read FILE ; do
if ( iconv -f utf8 -t ucs2 $FILE >/dev/null 2>/dev/null ) ; then
/bin/true
else
echo $FILE
fi
done >>report
Signed-off-by: Matěj Cepl <mcepl@redhat.com>
Reviewed-by: Daniel Stone <daniel@fooishbar.org>
[Daniel: git am failed for me, so I redid it. The method listed in the
commit message also failed, so I just used file/grep/iconv. The
results are the same though.]
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 2ee85d954c8f3a6affbd9b1b745594ff12e8b670
Author: Scott James Remnant <scott@netsplit.com>
Date: Tue Jun 14 16:36:07 2011 -0700
dix: avoid calling deleted block and wakeup handlers
BlockHandler and WakeupHandlers may be removed within a different
BlockHandler or WakeupHandler, especially since config/udev uses
these and removes devices.
Calling the deleted handlers and passing potentially freed data
can result in the X server segfaulting after device removal, or
events that result in device removal such as undocking or suspend/
resume.
Signed-off-by: Scott James Remnant <scott@netsplit.com>
Reviewed-by: Daniel Stone <daniel@fooishbar.org>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit b573cdd40ee49fae299fe2e7cbd02159ae8ae617
Author: Marcin Slusarz <marcin.slusarz@gmail.com>
Date: Tue Jun 7 21:22:15 2011 +0200
dri2: restore Screen->ConfigNotify on close
ConfigNotify is set by DRI2ScreenInit, but not restored to
previous state on close. Fix it.
(I'm preparing a patch for xf86-video-nouveau which detects GPU lockup
after dri2 init and it needs to reinitialize dri2)
Signed-off-by: Marcin Slusarz <marcin.slusarz@gmail.com>
Reviewed-by: Daniel Stone <daniel@fooishbar.org>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 61f87a75f2bcda939a1778d39be8cfa5c886e6d8
Merge: 0d2153a46c 72d914335c
Author: Keith Packard <keithp@keithp.com>
Date: Wed Jun 29 20:14:51 2011 -0700
Merge remote-tracking branch 'jturney/master'
commit 0d2153a46cc72d5f2e6a9081a3cf153aa3eb7787
Merge: b631c39a21 932513e23b
Author: Keith Packard <keithp@keithp.com>
Date: Wed Jun 29 20:08:32 2011 -0700
Merge remote-tracking branch 'jbarnes/master'
commit b631c39a21c8d74fd00b8932df342d6921cce8f4
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Thu Jun 23 13:37:45 2011 -0400
Remove unused check for PERL program
Unable to find any use of the PERL Automake variable.
It was used in hw/xfree86/scanpci around 2005.
Should it ever be needed, use XORG_WITH_PERL macro.
Reviewed-by: Daniel Stone <daniel@fooishbar.org>
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit d5ca33ca2dd08e8436439da926d2dedaabc268fa
Merge: 38d55f06cf 4edf49d032
Author: Keith Packard <keithp@keithp.com>
Date: Wed Jun 29 18:54:33 2011 -0700
Merge remote-tracking branch 'kibi/master'
commit 72d914335c9ad0e0f4a34b9f7e2901b830c499bf
Author: Yaakov Selkowitz <yselkowitz@users.sourceforge.net>
Date: Tue Mar 23 04:34:22 2010 -0500
Cygwin/X: Left-justify website link in About box
Left-justify website link in About box. This is a cosmetic fix to make
the About box display correctly when Windows is configured with a
non-default DPI value
Signed-off-by: Yaakov Selkowitz <yselkowitz@users.sourceforge.net>
Reviewed-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
Tested-by: Colin Harrison <colin.harrison@virgin.net>
commit e78628406f0428454983db1c51a8c828bf5684e5
Author: Jon TURNEY <jon.turney@dronecode.org.uk>
Date: Thu Aug 12 15:00:01 2010 +0100
Cygwin/X: Preserve client area size and position on Windows window style change
When the style changes, adjust the window size so the client area remains the same.
Otherwise the window size may change when sizing is reflected from Windows to X, and
some windows are drawn expecting them to be exactly the requested size (e.g. the
gmplayer control window)
Use DeferWindowPos to delay the resize to preserve client area on WM_STYLECHANGING
until after the style change has actually happened in WM_STYLECHANGED
As a consquence of this, we need to be more careful to create windows with exactly
the requested placement and client area initially, so the client area matches what
the X client requested
Also synchronize the X windows idea of the placement of a window which Windows is
allowed to place
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
Tested-by: Colin Harrison <colin.harrison@virgin.net>
commit 1d7f3a0031b4ae7d8aa984799ffa578788061ce4
Author: Jon TURNEY <jon.turney@dronecode.org.uk>
Date: Sat Nov 7 19:34:12 2009 +0000
glx: Move GLX extension string utility functions
Move GLX extension string utility functions from the DRI1 convenience library
into the GLX extension convenience library, so other DDX which don't have DRI
can use them.
This is probably also needed if anyone actually tries to build an Xorg DDX
with only DRI2 support...
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Reviewed-by: Kristian Høgsberg <krh@bitplanet.net>
commit 932513e23b5fe1793cc38eabe02df82e1cc6e4d9
Author: Jesse Barnes <jbarnes@virtuousgeek.org>
Date: Thu May 5 13:11:46 2011 -0700
DRI2/GLX: use new swap event types
Use the new event types so we can pass a valid SBC value to clients.
Fix up the completion calls to use CARD32 instead of CARD64 to match
the new field size.
Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com>
Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>
commit a3cb7d097a281252cebbc3c65c67149e106482ac
Author: Jesse Barnes <jbarnes@virtuousgeek.org>
Date: Tue May 3 10:36:44 2011 -0700
GLX/DRI2: pass drawable correctly for indirect swap events
Pass the right drawable pointer as data to the swap complete function.
Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>
commit 3e8270b869ebf788778d5d56107f6d47c7c050d0
Author: Adam Jackson <ajax@redhat.com>
Date: Tue Apr 12 15:30:25 2011 -0400
glx: Fix fbconfigs with no corresponding visual
There are, in general, more fbconfig depths than visual depths.
fbconfigs need not support Window rendering, however any that do must
have an associated visual ID (which we got right), and any that do not
must not claim GLX_WINDOW_BIT in GLX_DRAWABLE_TYPE (which we got
wrong).
Fixes piglit/glx-fbconfig-sanity, assuming you have a sufficiently
recent piglit, as that test formerly wrongly required pixmap-capable
fbconfigs to have a visual.
v2: Additional check for fbconfigs that didn't have GLX_WINDOW_BIT in
the first place, from previous patch by Jon TURNEY; also, also clear
->visualID.
Reviewed-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit 38d55f06cfbf4b05fee0aef8f97f90e835beaacb
Author: Jon TURNEY <jon.turney@dronecode.org.uk>
Date: Mon Jun 27 15:06:16 2011 +0100
Guard use of backtrace() with HAVE_BACKTRACE
Guard the use of backtrace() with HAVE_BACKTRACE, since we already
have the autoconf machinery for setting that.
For the moment, assume dladdr() is available when backtrace() is
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
commit bea57392c724f439987832b422941ae897953e4a
Author: Jeremy Huddleston <jeremyhu@apple.com>
Date: Sat Jun 25 11:29:53 2011 -0700
XQuartz: Fix Makefile dependencies
automake generates _DEPENDENCIES from _LIBADD, but it strips out variables.
This resulted in not relinking if some components were rebuilt (like
libdix, libos, etc).
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
commit c8b80a82d97d92d445c1c0af6dba42c9de7c56cd
Author: Jeremy Huddleston <jeremyhu@apple.com>
Date: Tue Jun 21 21:14:46 2011 -0700
XQuartz: Make a call to activateIgnoringOtherApps in our NSApplicationActivatedEventType handler
In addition, this change will not call into the X11 activation unless an X11
window was active when we deactivated. We can't rely on the event and current
key windows because the key window will be nil until activated, and the event
will only reference the window if the window was clicked (whereas it will be
nil if we activated via dock or cmd-tab).
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
commit 9d568450b1319e9057319ebb37e76003bcba447d
Author: Keith Packard <keithp@keithp.com>
Date: Tue Jun 28 09:33:25 2011 -0700
Create sdksyms.dep in the right place at configure time
sdksyms moved from hw/xfree86/loader to hw/xfree86, so the
configure-time create of sdksyms.dep needs to reflect that
change. Otherwise, make might be confused by a missing file and (more
importantly to me) hw/xfree86/loader/sdksyms.dep will be left around
after 'make clean' causing 'make distcheck' to fail.
commit f968f4ace9410d827fb6b68c4e38ea9516641309
Merge: 4dbed26254 163441fe53
Author: Keith Packard <keithp@keithp.com>
Date: Tue Jun 28 09:10:14 2011 -0700
Merge remote-tracking branch 'dbn/no-libxorg'
commit 4dbed2625431a92e20bede7b8cef847b5d5d99ba
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Mon Jun 27 14:45:18 2011 +1000
xfree86: Only log the serial bytes if debug is on.
Introduced in e3f296d91dfe6b827195e1d387e1a04aa73b85c3, when the ifdef DEBUG
around the whole block was removed, but only two of the three ErrorF
switched to DebugF.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 163441fe531a77f7fa54bfa59c5ab49c78f44306
Author: Dan Nicholson <dbn.lists@gmail.com>
Date: Tue Jun 14 20:03:06 2011 -0700
xfree86: Remove libxorg convenience library to speed up build
libxorg.la served to collect all the Xorg convenience libraries into one
massive archive to link into Xorg. This made things easy for symbol
resolution, but it tremendously slowed down the build since each change
caused libxorg.la to be rebuilt. This is an extremely slow process of
extracting all the objects from the sub-libraries and recombining them.
Instead, the archives are linked directly into Xorg. The order of the
libraries had to be tweaked a bit to make symbols resolve correctly with
the lower level code moving later in the link command.
As a side effect, since the dtrace objects are now being linked
directly into Xorg, we don't need the SPECIAL_DTRACE_OBJECTS hack to
add them twice.
Signed-off-by: Dan Nicholson <dbn.lists@gmail.com>
Tested-by: Jamey Sharp <jamey@minilop.net>
Reviewed-by: Daniel Stone <daniel@fooishbar.org>
Tested-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 6259b30111f568ec3d1b32dc6382bce46d8e6ccc
Author: Dan Nicholson <dbn.lists@gmail.com>
Date: Tue Jun 14 19:47:02 2011 -0700
xfree86: Move sdksyms generation to ddx toplevel
The symbols in sdksyms.c cover the entire source tree. In order to make
them resolve when libxorg.la goes away, move the objects from libloader
to Xorg. Unfortunately, this means sdksyms needs to get built again for
the test code.
Signed-off-by: Dan Nicholson <dbn.lists@gmail.com>
Tested-by: Jamey Sharp <jamey@minilop.net>
Reviewed-by: Daniel Stone <daniel@fooishbar.org>
Tested-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 7d5c8a12cbc295b3e33e1b60bd7330e2bc93a966
Author: Dan Nicholson <dbn.lists@gmail.com>
Date: Tue Jun 14 17:21:48 2011 -0700
Don't use empty source files
When an empty _SOURCES variable is declared, automake will recognize that
only linking is needed.
Signed-off-by: Dan Nicholson <dbn.lists@gmail.com>
Tested-by: Jamey Sharp <jamey@minilop.net>
Reviewed-by: Daniel Stone <daniel@fooishbar.org>
Tested-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 8ac651552bb70ba36238f430adab2f7a7f24db6e
Merge: 945b2ff814 47b6ba3204
Author: Keith Packard <keithp@keithp.com>
Date: Wed Jun 22 11:03:37 2011 -0700
Merge remote-tracking branch 'alanc/master'
commit 945b2ff8141c58344fc9558ee3853fad3e86134b
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Wed Jun 8 15:18:12 2011 -0400
docbook.am: --path is also required for xsltproc
The XSLT processor also needs to know about the entities defined
in xserver.ent. It removes error messages.
Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 6326b0f0746ded410672ad0270d1c8a0e9cb59f9
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Wed Jun 8 15:17:59 2011 -0400
Update .gitignore as new tests have been added
Refactor to follow the pattern one Makefile, one .gitignore
where needed.
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 47b6ba3204d650393a7255ce2af27b8c018bb586
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Mon Jun 20 22:17:03 2011 -0700
Add xkeyboard-config to See Also of man pages referencing xkb
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
commit cfbe471b586282aea89f7b4802c051f22301bf59
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Mon Jun 20 22:06:00 2011 -0700
Xdmx.man: convert section references to substituted forms
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Gaetan Nadon <memsize@videotron.ca>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
commit c3278f3c1786e66019a39e2612761f74782a48ee
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Sat Jun 11 10:56:08 2011 -0700
Xdmx.man: additional updates to modernize XKB information
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Matthieu Herrb <matthieu.herrb@laas.fr>
Reviewed-by: Gaetan Nadon <memsize@videotron.ca>
Reviewed-by: Daniel Stone <daniel@fooishbar.org>
commit 19e37067131175219eca7d2b11c2ee59af280575
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Sat Jun 11 10:41:48 2011 -0700
Xdmx.man: Show actual configured XKB defaults instead of old hardcoded values
Passed through from configure.ac via manpages.am
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Matthieu Herrb <matthieu.herrb@laas.fr>
Reviewed-by: Gaetan Nadon <memsize@videotron.ca>
Reviewed-by: Daniel Stone <daniel@fooishbar.org>
commit acf2173b321749c42d29d858d3521a4d506c732e
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Thu Jun 16 20:12:03 2011 -0400
Install xml versions of specs even if HAVE_XMLTO is false
DocBook/XML input source is also a useful output format that can be viewed
with an XML viewer or editor and by some O/S help system.
Acked-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 44890b3e266116ae71bfca2590e5fd9cdfbdb69b
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Thu Jun 16 20:11:52 2011 -0400
Install target dbs alongside generated documents
This matches a change in xorg-sgml-docs whereby the masterdb will look for
the target dbs into the same location as the generated documents.
The target dbs are now installed alongside the generated documents.
Previously they are installed in $prefix/sgml/X11/dbs alongside masterdb which
has the potential of installing outside the package prefix and cause
distcheck to fail when user does not have write permission in this package.
Requires XORG_CHECK_SGML_DOCTOOLS(1.8) which was released 2011-06-11
Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit a42ef6c940604172e54de110b7d989cb2208f7ef
Author: Rob Clark <robdclark@gmail.com>
Date: Tue Jun 14 11:45:38 2011 -0500
EXA: fix typo
The incorrect drawable deltas were applied if dst was a redirected
window. Resulting in a bogus region passed to prepare_access_reg().
Signed-off-by: Rob Clark <rob@ti.com>
Reviewed-by: Michel Dänzer <michel@daenzer.net>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 4edf49d032028aa4b9887d02b926b0c372c4451d
Author: Cyril Brulebois <kibi@debian.org>
Date: Tue May 24 18:33:18 2011 +0200
dmx/examples: Fix missing key_click_percent assignment.
Thanks to gcc's -Wunused-but-set-variable, stop ignoring the percent
parameter, and add it to the XKeyboardControl structure before the
XChangeKeyboardControl call.
This warning goes away accordingly:
| CC xbell-xbell.o
| xbell.c: In function ‘main’:
| xbell.c:74:22: warning: variable ‘percent’ set but not used [-Wunused-but-set-variable]
Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com>
Signed-off-by: Cyril Brulebois <kibi@debian.org>
commit 33dad2b74e3489c8a6b5fa574172d6cd2b6de037
Author: Cyril Brulebois <kibi@debian.org>
Date: Tue May 24 18:33:17 2011 +0200
hw/dmx: Stop using variables for text widgets.
They are unused in the sense they're not getting any callback set up, so
there's no point in storing them into variables. Keep the initial
alignment of the parameters to try and reduce the diff noise.
Those warnings go away accordingly:
| CC xdmxconfig-xdmxconfig.o
| xdmxconfig.c: In function ‘main’:
| xdmxconfig.c:881:29: warning: variable ‘quittext’ set but not used [-Wunused-but-set-variable]
| xdmxconfig.c:880:53: warning: variable ‘abouttext’ set but not used [-Wunused-but-set-variable]
Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com>
Signed-off-by: Cyril Brulebois <kibi@debian.org>
commit 34a9f2a90d34a2ab7ecf56d329e75e8da569f939
Author: Cyril Brulebois <kibi@debian.org>
Date: Tue May 24 18:33:17 2011 +0200
xfixes: Remove unused variable.
The last use of pScreen in ProcXFixesSetPictureClipRegion was removed in
aa7096ca6f108e399d9916639cf20c57f9776305 so remove it entirely.
Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com>
Signed-off-by: Cyril Brulebois <kibi@debian.org>
commit ad0d0833d45ea24d7af1f724b9905133fe3b065f
Author: Cyril Brulebois <kibi@debian.org>
Date: Tue May 24 18:33:17 2011 +0200
xfixes: Mark some variables as unused.
Calling Unwrap() is just a way of performing an assignment while keeping a
backup of the original value. In the CursorCloseScreen function, the backup
value doesn't seem to be useful, but Unwrap() is used anyway (probably to stay
in line with other functions). As a consequence, mark those variables as unused.
The following warnings go away accordingly:
| CC cursor.lo
| cursor.c: In function 'CursorCloseScreen':
| cursor.c:186:26: warning: variable 'display_proc' set but not used [-Wunused-but-set-variable]
| cursor.c:185:24: warning: variable 'close_proc' set but not used [-Wunused-but-set-variable]
Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com>
Signed-off-by: Cyril Brulebois <kibi@debian.org>
commit f41ac25d932ef34ab912201ab5ce65f85f2ff171
Author: Cyril Brulebois <kibi@debian.org>
Date: Tue May 24 18:33:17 2011 +0200
miext: Mark some variables as unused.
There's no use for the values set through the various macro calls
(fbGetDrawable and fbGetDrawablePixmap), so mark those variables as unused.
The following warnings go away accordingly:
| CC shpacked.lo
| shpacked.c: In function 'shadowUpdatePacked':
| shpacked.c:55:19: warning: variable 'shaYoff' set but not used [-Wunused-but-set-variable]
| shpacked.c:55:10: warning: variable 'shaXoff' set but not used [-Wunused-but-set-variable]
| CC shplanar8.lo
| shplanar8.c: In function 'shadowUpdatePlanar4x8':
| shplanar8.c:105:19: warning: variable 'shaYoff' set but not used [-Wunused-but-set-variable]
| shplanar8.c:105:10: warning: variable 'shaXoff' set but not used [-Wunused-but-set-variable]
| CC shplanar.lo
| shplanar.c: In function 'shadowUpdatePlanar4':
| shplanar.c:101:19: warning: variable 'shaYoff' set but not used [-Wunused-but-set-variable]
| shplanar.c:101:10: warning: variable 'shaXoff' set but not used [-Wunused-but-set-variable]
| CC shrot16pack_180.lo
| In file included from shrot16pack_180.c:31:0:
| shrotpack.h: In function 'shadowUpdateRotate16_180':
| shrotpack.h:109:19: warning: variable 'shaYoff' set but not used [-Wunused-but-set-variable]
| shrotpack.h:109:10: warning: variable 'shaXoff' set but not used [-Wunused-but-set-variable]
| CC shrot16pack_270.lo
| In file included from shrot16pack_270.c:31:0:
| shrotpack.h: In function 'shadowUpdateRotate16_270':
| shrotpack.h:109:19: warning: variable 'shaYoff' set but not used [-Wunused-but-set-variable]
| shrotpack.h:109:10: warning: variable 'shaXoff' set but not used [-Wunused-but-set-variable]
| CC shrot16pack_270YX.lo
| In file included from shrot16pack_270YX.c:31:0:
| shrotpackYX.h: In function 'shadowUpdateRotate16_270YX':
| shrotpackYX.h:72:19: warning: variable 'shaYoff' set but not used [-Wunused-but-set-variable]
| shrotpackYX.h:72:10: warning: variable 'shaXoff' set but not used [-Wunused-but-set-variable]
| CC shrot16pack_90.lo
| In file included from shrot16pack_90.c:31:0:
| shrotpack.h: In function 'shadowUpdateRotate16_90':
| shrotpack.h:109:19: warning: variable 'shaYoff' set but not used [-Wunused-but-set-variable]
| shrotpack.h:109:10: warning: variable 'shaXoff' set but not used [-Wunused-but-set-variable]
| CC shrot16pack_90YX.lo
| In file included from shrot16pack_90YX.c:31:0:
| shrotpackYX.h: In function 'shadowUpdateRotate16_90YX':
| shrotpackYX.h:72:19: warning: variable 'shaYoff' set but not used [-Wunused-but-set-variable]
| shrotpackYX.h:72:10: warning: variable 'shaXoff' set but not used [-Wunused-but-set-variable]
| CC shrot16pack.lo
| In file included from shrot16pack.c:30:0:
| shrotpack.h: In function 'shadowUpdateRotate16':
| shrotpack.h:109:19: warning: variable 'shaYoff' set but not used [-Wunused-but-set-variable]
| shrotpack.h:109:10: warning: variable 'shaXoff' set but not used [-Wunused-but-set-variable]
| CC shrot32pack_180.lo
| In file included from shrot32pack_180.c:31:0:
| shrotpack.h: In function 'shadowUpdateRotate32_180':
| shrotpack.h:109:19: warning: variable 'shaYoff' set but not used [-Wunused-but-set-variable]
| shrotpack.h:109:10: warning: variable 'shaXoff' set but not used [-Wunused-but-set-variable]
| CC shrot32pack_270.lo
| In file included from shrot32pack_270.c:31:0:
| shrotpack.h: In function 'shadowUpdateRotate32_270':
| shrotpack.h:109:19: warning: variable 'shaYoff' set but not used [-Wunused-but-set-variable]
| shrotpack.h:109:10: warning: variable 'shaXoff' set but not used [-Wunused-but-set-variable]
| CC shrot32pack_90.lo
| In file included from shrot32pack_90.c:31:0:
| shrotpack.h: In function 'shadowUpdateRotate32_90':
| shrotpack.h:109:19: warning: variable 'shaYoff' set but not used [-Wunused-but-set-variable]
| shrotpack.h:109:10: warning: variable 'shaXoff' set but not used [-Wunused-but-set-variable]
| CC shrot32pack.lo
| In file included from shrot32pack.c:30:0:
| shrotpack.h: In function 'shadowUpdateRotate32':
| shrotpack.h:109:19: warning: variable 'shaYoff' set but not used [-Wunused-but-set-variable]
| shrotpack.h:109:10: warning: variable 'shaXoff' set but not used [-Wunused-but-set-variable]
| CC shrot8pack_180.lo
| In file included from shrot8pack_180.c:31:0:
| shrotpack.h: In function 'shadowUpdateRotate8_180':
| shrotpack.h:109:19: warning: variable 'shaYoff' set but not used [-Wunused-but-set-variable]
| shrotpack.h:109:10: warning: variable 'shaXoff' set but not used [-Wunused-but-set-variable]
| CC shrot8pack_270.lo
| In file included from shrot8pack_270.c:31:0:
| shrotpack.h: In function 'shadowUpdateRotate8_270':
| shrotpack.h:109:19: warning: variable 'shaYoff' set but not used [-Wunused-but-set-variable]
| shrotpack.h:109:10: warning: variable 'shaXoff' set but not used [-Wunused-but-set-variable]
| CC shrot8pack_90.lo
| In file included from shrot8pack_90.c:31:0:
| shrotpack.h: In function 'shadowUpdateRotate8_90':
| shrotpack.h:109:19: warning: variable 'shaYoff' set but not used [-Wunused-but-set-variable]
| shrotpack.h:109:10: warning: variable 'shaXoff' set but not used [-Wunused-but-set-variable]
| CC shrot8pack.lo
| In file included from shrot8pack.c:30:0:
| shrotpack.h: In function 'shadowUpdateRotate8':
| shrotpack.h:109:19: warning: variable 'shaYoff' set but not used [-Wunused-but-set-variable]
| shrotpack.h:109:10: warning: variable 'shaXoff' set but not used [-Wunused-but-set-variable]
| CC shrotate.lo
| shrotate.c: In function 'shadowUpdateRotatePacked':
| shrotate.c:62:19: warning: variable 'shaYoff' set but not used [-Wunused-but-set-variable]
| shrotate.c:62:10: warning: variable 'shaXoff' set but not used [-Wunused-but-set-variable]
| CC shpacked.lo
| shpacked.c: In function 'shadowUpdatePacked':
| shpacked.c:55:19: warning: variable 'shaYoff' set but not used [-Wunused-but-set-variable]
| shpacked.c:55:10: warning: variable 'shaXoff' set but not used [-Wunused-but-set-variable]
| CC shplanar8.lo
| shplanar8.c: In function 'shadowUpdatePlanar4x8':
| shplanar8.c:105:19: warning: variable 'shaYoff' set but not used [-Wunused-but-set-variable]
| shplanar8.c:105:10: warning: variable 'shaXoff' set but not used [-Wunused-but-set-variable]
| CC shplanar.lo
| shplanar.c: In function 'shadowUpdatePlanar4':
| shplanar.c:101:19: warning: variable 'shaYoff' set but not used [-Wunused-but-set-variable]
| shplanar.c:101:10: warning: variable 'shaXoff' set but not used [-Wunused-but-set-variable]
| CC shrot16pack_180.lo
| In file included from shrot16pack_180.c:31:0:
| shrotpack.h: In function 'shadowUpdateRotate16_180':
| shrotpack.h:109:19: warning: variable 'shaYoff' set but not used [-Wunused-but-set-variable]
| shrotpack.h:109:10: warning: variable 'shaXoff' set but not used [-Wunused-but-set-variable]
| CC shrot16pack_270.lo
| In file included from shrot16pack_270.c:31:0:
| shrotpack.h: In function 'shadowUpdateRotate16_270':
| shrotpack.h:109:19: warning: variable 'shaYoff' set but not used [-Wunused-but-set-variable]
| shrotpack.h:109:10: warning: variable 'shaXoff' set but not used [-Wunused-but-set-variable]
| CC shrot16pack_270YX.lo
| In file included from shrot16pack_270YX.c:31:0:
| shrotpackYX.h: In function 'shadowUpdateRotate16_270YX':
| shrotpackYX.h:72:19: warning: variable 'shaYoff' set but not used [-Wunused-but-set-variable]
| shrotpackYX.h:72:10: warning: variable 'shaXoff' set but not used [-Wunused-but-set-variable]
| CC shrot16pack_90.lo
| In file included from shrot16pack_90.c:31:0:
| shrotpack.h: In function 'shadowUpdateRotate16_90':
| shrotpack.h:109:19: warning: variable 'shaYoff' set but not used [-Wunused-but-set-variable]
| shrotpack.h:109:10: warning: variable 'shaXoff' set but not used [-Wunused-but-set-variable]
| CC shrot16pack_90YX.lo
| In file included from shrot16pack_90YX.c:31:0:
| shrotpackYX.h: In function 'shadowUpdateRotate16_90YX':
| shrotpackYX.h:72:19: warning: variable 'shaYoff' set but not used [-Wunused-but-set-variable]
| shrotpackYX.h:72:10: warning: variable 'shaXoff' set but not used [-Wunused-but-set-variable]
| CC shrot16pack.lo
| In file included from shrot16pack.c:30:0:
| shrotpack.h: In function 'shadowUpdateRotate16':
| shrotpack.h:109:19: warning: variable 'shaYoff' set but not used [-Wunused-but-set-variable]
| shrotpack.h:109:10: warning: variable 'shaXoff' set but not used [-Wunused-but-set-variable]
| CC shrot32pack_180.lo
| In file included from shrot32pack_180.c:31:0:
| shrotpack.h: In function 'shadowUpdateRotate32_180':
| shrotpack.h:109:19: warning: variable 'shaYoff' set but not used [-Wunused-but-set-variable]
| shrotpack.h:109:10: warning: variable 'shaXoff' set but not used [-Wunused-but-set-variable]
| CC shrot32pack_270.lo
| In file included from shrot32pack_270.c:31:0:
| shrotpack.h: In function 'shadowUpdateRotate32_270':
| shrotpack.h:109:19: warning: variable 'shaYoff' set but not used [-Wunused-but-set-variable]
| shrotpack.h:109:10: warning: variable 'shaXoff' set but not used [-Wunused-but-set-variable]
| CC shrot32pack_90.lo
| In file included from shrot32pack_90.c:31:0:
| shrotpack.h: In function 'shadowUpdateRotate32_90':
| shrotpack.h:109:19: warning: variable 'shaYoff' set but not used [-Wunused-but-set-variable]
| shrotpack.h:109:10: warning: variable 'shaXoff' set but not used [-Wunused-but-set-variable]
| CC shrot32pack.lo
| In file included from shrot32pack.c:30:0:
| shrotpack.h: In function 'shadowUpdateRotate32':
| shrotpack.h:109:19: warning: variable 'shaYoff' set but not used [-Wunused-but-set-variable]
| shrotpack.h:109:10: warning: variable 'shaXoff' set but not used [-Wunused-but-set-variable]
| CC shrot8pack_180.lo
| In file included from shrot8pack_180.c:31:0:
| shrotpack.h: In function 'shadowUpdateRotate8_180':
| shrotpack.h:109:19: warning: variable 'shaYoff' set but not used [-Wunused-but-set-variable]
| shrotpack.h:109:10: warning: variable 'shaXoff' set but not used [-Wunused-but-set-variable]
| CC shrot8pack_270.lo
| In file included from shrot8pack_270.c:31:0:
| shrotpack.h: In function 'shadowUpdateRotate8_270':
| shrotpack.h:109:19: warning: variable 'shaYoff' set but not used [-Wunused-but-set-variable]
| shrotpack.h:109:10: warning: variable 'shaXoff' set but not used [-Wunused-but-set-variable]
| CC shrot8pack_90.lo
| In file included from shrot8pack_90.c:31:0:
| shrotpack.h: In function 'shadowUpdateRotate8_90':
| shrotpack.h:109:19: warning: variable 'shaYoff' set but not used [-Wunused-but-set-variable]
| shrotpack.h:109:10: warning: variable 'shaXoff' set but not used [-Wunused-but-set-variable]
| CC shrot8pack.lo
| In file included from shrot8pack.c:30:0:
| shrotpack.h: In function 'shadowUpdateRotate8':
| shrotpack.h:109:19: warning: variable 'shaYoff' set but not used [-Wunused-but-set-variable]
| shrotpack.h:109:10: warning: variable 'shaXoff' set but not used [-Wunused-but-set-variable]
| CC shrotate.lo
| shrotate.c:62:19: warning: variable 'shaYoff' set but not used [-Wunused-but-set-variable]
| shrotate.c:62:10: warning: variable 'shaXoff' set but not used [-Wunused-but-set-variable]
Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com>
Signed-off-by: Cyril Brulebois <kibi@debian.org>
commit fe6f489d21d77aacf0a073883625619018d764b3
Author: Cyril Brulebois <kibi@debian.org>
Date: Tue May 24 18:33:17 2011 +0200
fb: Mark some variables as unused.
There's no use for the values set through the various macro calls
(fbGetDrawable and fbGetDrawablePixmap), so mark those variables as unused.
The following warnings go away accordingly:
| CC libfb_la-fb24_32.lo
| fb24_32.c: In function 'fb24_32ReformatTile':
| fb24_32.c:544:19: warning: variable 'newYoff' set but not used [-Wunused-but-set-variable]
| fb24_32.c:544:10: warning: variable 'newXoff' set but not used [-Wunused-but-set-variable]
| fb24_32.c:543:19: warning: variable 'oldYoff' set but not used [-Wunused-but-set-variable]
| fb24_32.c:543:10: warning: variable 'oldXoff' set but not used [-Wunused-but-set-variable]
| CC libfb_la-fbfill.lo
| fbfill.c: In function 'fbFill':
| fbfill.c:72:21: warning: variable 'stipYoff' set but not used [-Wunused-but-set-variable]
| fbfill.c:72:11: warning: variable 'stipXoff' set but not used [-Wunused-but-set-variable]
| fbfill.c:100:21: warning: variable 'stipYoff' set but not used [-Wunused-but-set-variable]
| fbfill.c:100:11: warning: variable 'stipXoff' set but not used [-Wunused-but-set-variable]
| fbfill.c:142:20: warning: variable 'tileYoff' set but not used [-Wunused-but-set-variable]
| fbfill.c:142:10: warning: variable 'tileXoff' set but not used [-Wunused-but-set-variable]
| CC libfb_la-fbgc.lo
| fbgc.c: In function 'fbPadPixmap':
| fbgc.c:92:19: warning: variable 'yOff' set but not used [-Wunused-but-set-variable]
| fbgc.c:92:13: warning: variable 'xOff' set but not used [-Wunused-but-set-variable]
| fbgc.c: In function 'fbCanEvenStipple':
| fbgc.c:166:23: warning: variable 'stipYoff' set but not used [-Wunused-but-set-variable]
| fbgc.c:166:13: warning: variable 'stipXoff' set but not used [-Wunused-but-set-variable]
| CC libfb_la-fbpush.lo
| fbpush.c: In function 'fbPushPixels':
| fbpush.c:238:20: warning: variable 'stipYoff' set but not used [-Wunused-but-set-variable]
| fbpush.c:238:10: warning: variable 'stipXoff' set but not used [-Wunused-but-set-variable]
Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com>
Signed-off-by: Cyril Brulebois <kibi@debian.org>
commit 8da16898d9de5da1f80b789f0b371070968285f8
Author: Cyril Brulebois <kibi@debian.org>
Date: Tue May 24 18:33:17 2011 +0200
fb: Simplify logic, get rid of set but unused variable.
wrapped is only useful is FB_ACCESS_WRAPPER is set; simplify the logic
accordingly, and only set it when that's defined.
The following warning goes away accordingly:
| CC libfb_la-fbarc.lo
| fbarc.c: In function 'fbPolyArc':
| fbarc.c:71:11: warning: variable 'wrapped' set but not used [-Wunused-but-set-variable]
Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com>
Signed-off-by: Cyril Brulebois <kibi@debian.org>
commit 9a8bfc2c06f0a9206b64ae01a783cf5513f021a6
Author: Cyril Brulebois <kibi@debian.org>
Date: Tue May 24 18:33:16 2011 +0200
configure: Bump dependency on xproto.
Bumping this dependency means some additional macros can be used, like
_X_UNUSED.
Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com>
Signed-off-by: Cyril Brulebois <kibi@debian.org>
commit 9da5aa09d70e26dd4d2ef878a21317dae7bf24de
Author: Cyril Brulebois <kibi@debian.org>
Date: Tue May 24 18:33:11 2011 +0200
Xext: Fix buggy checks.
XvMCScreenKey is defined as XvMCScreenKeyRec's address, so will never be
NULL. Use the check proposed by Alan Coopersmith and Jeremy Huddleston
instead.
Those warnings go away accordingly:
| CC xvmc.lo
| xvmc.c: In function 'ProcXvMCListSubpictureTypes':
| xvmc.c:490:22: warning: the comparison will always evaluate as 'false' for the address of 'XvMCScreenKeyRec' will never be NULL [-Waddress]
| xvmc.c: In function 'XvMCExtensionInit':
| xvmc.c:671:21: warning: the comparison will always evaluate as 'false' for the address of 'XvMCScreenKeyRec' will never be NULL [-Waddress]
| xvmc.c: In function 'XvMCFindXvImage':
| xvmc.c:749:22: warning: the comparison will always evaluate as 'false' for the address of 'XvMCScreenKeyRec' will never be NULL [-Waddress]
Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Signed-off-by: Cyril Brulebois <kibi@debian.org>
commit 778309fd0ef6b586468c1a3b569e3548503459ee
Author: Jeremy Huddleston <jeremyhu@apple.com>
Date: Tue Jun 14 13:23:00 2011 -0700
XQuartz: GLX: Fix a -Wformat-security compilation warning
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
commit 34e2598f0ad247071bd6a4312d9014d6e3b2305a
Author: Jeremy Huddleston <jeremyhu@apple.com>
Date: Tue Jun 14 11:18:50 2011 -0700
XQuartz: GLX: Use _glapi_create_table_from_handle to create out dispatch table
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
commit ecec578e35f91a2cbc5d07bc8d45241af7bb585f
Author: Jeremy Huddleston <jeremyhu@apple.com>
Date: Tue Jun 14 12:51:04 2011 -0700
glx: Add _glapi_create_table_from_handle
_glapi_create_table_from_handle was recently added to mesa to ease creation of
a _glapi_table. This commit brings this API over to xserver for use in
XQuartz (next commit).
The API was generated with scripts from current mesa followed by various
script-foo to remove entries that are not in the server and add those which
are still in the server but not in mesa (CullParameterdvEXT and
CullParameterfvEXT)
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
commit c3df4df40761760b281a21f63336ca955670f7bc
Author: Jeremy Huddleston <jeremyhu@apple.com>
Date: Sun Jun 5 21:59:13 2011 -0400
XQuartz: Add missing include for <pthread.h>
BuildFix for Leopard and earlier.
https://trac.macports.org/ticket/29717
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
commit 08a7246f43c9f18079219a1c982bed558722f545
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri May 27 14:21:39 2011 +1000
dix: rename ProcessRawEvents to dix/events.c:DeliverRawEvent
No functional changes, prep work for future changes.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Cyril Brulebois <kibi@debian.org>
Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com>
Reviewed-by: Daniel Stone <daniel@fooishbar.org>
commit 0aa45c5c53e2e7ba0723f5a12c1a5f5d4baab933
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri May 27 14:19:45 2011 +1000
Xi: use temporary variable for filter.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com>
Reviewed-by: Daniel Stone <daniel@fooishbar.org>
commit a1beae635caf81ec31a8998687df0ae92b505fda
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri May 27 12:14:32 2011 +1000
dix: split DeliverEventToWindowMask up a bit more.
Move out the actual event delivery, it needs to be used from elsewhere.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com>
Reviewed-by: Daniel Stone <daniel@fooishbar.org>
commit 58e4831ed68c2fbc219c7250e9837e76a73a6432
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri May 27 11:43:50 2011 +1000
dix: rename DeliverEventsToClients to DeliverEventsToWindowMask
To avoid confusion with a future patch and it better describes what this
does anyway - delivering events to all clients that have the event mask on
the window.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com>
Reviewed-by: Daniel Stone <daniel@fooishbar.org>
commit 37a53f15b0dfa1b25f7e3e826c7c945453398ac5
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri May 27 11:40:56 2011 +1000
dix: split client list retrieval out of DeliverEventToClients
No functional change, but "other" was renamed to "clients".
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com>
Reviewed-by: Daniel Stone <daniel@fooishbar.org>
commit 02d11af01211da55e9d93fe0e1851a0c6fe57472
Merge: bf9fd0a83e ab0df72cd3
Author: Keith Packard <keithp@keithp.com>
Date: Tue Jun 7 12:31:15 2011 -0700
Merge remote-tracking branch 'kibi/master'
commit bf9fd0a83eef771ee018438f05e2d9f20b43539b
Merge: 21eec367d0 0d140567ba
Author: Keith Packard <keithp@keithp.com>
Date: Tue Jun 7 07:45:22 2011 -0700
Merge remote-tracking branch 'whot/for-keith'
commit 0d140567ba2b5bf364265dba07de519f691c67a1
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Tue Jun 7 10:42:50 2011 +1000
dix: fix crashers with floating device.
dc57f89959e549403f8488eb9f23425bd7118b22 accidentally reversed the
conditions.
in dix/events.c we try to detach floating devices. This leads to a
NULL-dereference on GetMaster()->id.
in dix/getevents.c we try to get the master device for the floating slave
and dereference it.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com>
commit 21eec367d0d9c142458f973062e17add4f693033
Author: Nicolas Kaiser <nikai@nikai.net>
Date: Mon Jun 6 16:53:41 2011 +0200
randr: void function cannot return value
Providing an argument to return in a function with void return type
is not allowed by the C standard, and makes the Sun compilers unhappy.
Signed-off-by: Nicolas Kaiser <nikai@nikai.net>
Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com>
Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit ab0df72cd33f011cc48736cfbfce9bbe9c359a80
Author: Cyril Brulebois <kibi@debian.org>
Date: Sun Jun 5 03:21:18 2011 +0200
xkb: Fix case checks for Latin 4.
That one was missing _XkbKSLower:
XK_kra: U+0138 LATIN SMALL LETTER KRA
Reviewed-by: Daniel Stone <daniel@fooishbar.org>
Signed-off-by: Cyril Brulebois <kibi@debian.org>
commit 9eb6e34c2dd09af714400ce6a1063477d7a64776
Author: Cyril Brulebois <kibi@debian.org>
Date: Sun Jun 5 03:12:44 2011 +0200
xkb: Fix case checks for Latin 2.
Those ones were getting _XkbKSLower for no reasons:
XK_ogonek: U+02DB OGONEK
XK_doubleacute: U+02DD DOUBLE ACUTE ACCENT
Reviewed-by: Daniel Stone <daniel@fooishbar.org>
Signed-off-by: Cyril Brulebois <kibi@debian.org>
commit 2b88189863579eb377bca617465bb76b05fbdebd
Author: Cyril Brulebois <kibi@debian.org>
Date: Sun Jun 5 03:03:47 2011 +0200
xkb: Fix case checks for Latin 1.
That one was missing _XkbKSLower:
XK_ssharp: U+00DF LATIN SMALL LETTER SHARP S
That one was getting _XkbKSLower for no reasons:
XK_division: U+00F7 DIVISION SIGN
For reference, XK_multiply was already excluded from the _XkbKSUpper
check, it's no big surprise XK_division has to be excluded from the
_XkbKSLower check.
Reviewed-by: Daniel Stone <daniel@fooishbar.org>
Signed-off-by: Cyril Brulebois <kibi@debian.org>
commit feab04397de2684568dedaaaa8f299cac9f44f8b
Author: Jeremy Huddleston <jeremyhu@apple.com>
Date: Fri Jun 3 02:50:40 2011 -0400
XQuartz: AIGLX: Remove unnecessary includes in indirect.c
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
commit 3fa5d27e46ea8af55dcaaad7a99973c38bd11967
Author: Jeremy Huddleston <jeremyhu@apple.com>
Date: Thu Jun 2 20:04:04 2011 -0700
XQuartz: AIGLX: Setup dispatch table based on runtime capabilities rather than buildtime
This will allow XQuartz built on older systems to pickup capabilities on
newer systems and prevent runtime failures when building on newer systems and
running on older ones.
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
commit dd5d91fc954450e99d53862900ef4fa6320ff382
Author: Jeremy Huddleston <jeremyhu@apple.com>
Date: Fri Jun 3 02:34:28 2011 -0400
XQuartz: Remove explicit link against libGL
This was indented to force a link against OpenGL.framework's libGL, but it
actually resulted in linking against mesa's libGL due to the ordering of -L
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
commit 5115c2c7216fc10acb8a26deb904ad15ef18ce8a
Author: Cyril Brulebois <kibi@debian.org>
Date: Fri Jun 3 18:09:51 2011 +0200
Xephyr: Mention Xserver's options are also accepted.
Originally reported in the Debian BTS:
http://bugs.debian.org/582650
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Jari Aalto <jari.aalto@cante.net>
Signed-off-by: Cyril Brulebois <kibi@debian.org>
commit 408ed1576dbcf93f4bd27bd3b66917b1bba2226b
Author: Cyril Brulebois <kibi@debian.org>
Date: Fri Jun 3 18:09:48 2011 +0200
xkb: Fix case checks for Latin 8.
Spotted by -Wlogical-op:
| CC xkbfmisc.lo
| xkbfmisc.c: In function '_XkbKSCheckCase':
| xkbfmisc.c:104:3: warning: logical 'and' of mutually exclusive tests is always false [-Wlogical-op]
| xkbfmisc.c:118:3: warning: logical 'and' of mutually exclusive tests is always false [-Wlogical-op]
A quick look at the keysymdef.h file (from xproto) suggests the
implementor chose to use interval checks to determine the case, but
since lines weren't sorted by codepoints, checks were quite wrong.
Implement _XkbKSUpper/_XkbKSLower checks based on a grep for
CAPITAL/SMALL (respectively) on the Latin 8 part of the said file.
Reviewed-by: Daniel Stone <daniel@fooishbar.org>
Signed-off-by: Cyril Brulebois <kibi@debian.org>
commit d9bda34d0df576d155e1d682d5e2a382b8e1ffda
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Wed Jun 1 10:24:43 2011 +1000
test: fix memset size for WindowRec (#37801)
X.Org Bug 37801 <http://bugs.freedesktop.org/show_bug.cgi?id=37801>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com>
Reviewed-by: Daniel Stone <daniel@fooishbar.org>
Reviewed-by: Cyril Brulebois <kibi@debian.org>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit bfd8422e8877acf02155ca0bd7fbd2416b029720
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri May 27 12:24:21 2011 +1000
Xi: use __func__ instead of function name.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Cyril Brulebois <kibi@debian.org>
commit c042a267c40d35b4fb947f4bafdfeb541dd9d772
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri May 27 10:10:48 2011 +1000
dix: use xi2_get_type instead of manual typecast
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com>
commit b75cdb5bf76303162e947173e8ee68253a861272
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Tue May 31 10:51:19 2011 +1000
dix: drop x/y back into the right valuators after transformation.
If the matrix is used for rotation, the coordinates affected may change.
e.g. a valuator mask of (x, nil) becomes [x, lasty] and is rotated to
[lasty, x]. Since the second value was unset, we would not drop x back into
the mask, resulting in a loss of movement.
Thus, drop any value that changed after applying the matrix into the
valuators. Thus, the example above becomes
(x, nil) → [x, lasty] → [lasty, x] → (lasty, x)
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Simon Thum <simon.thum@gmx.de>
commit fe4b818700453b76d9f46749dac5d12540b91e63
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Tue May 31 10:23:57 2011 +1000
dix: don't pass x/y to transformAbsolute
We passed in the mask, but didn't do anything with it. Move the logic to
take the axes out of the valuator masks into transformAbsolute.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Simon Thum <simon.thum@gmx.de>
commit 62f1bf96e1ea27e1eff137cb9333f3dd3b014dd0
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Wed Jun 1 10:22:44 2011 +1000
test: fix memset size for WindowRec (#37801)
X.Org Bug 37801 <http://bugs.freedesktop.org/show_bug.cgi?id=37801>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com>
Reviewed-by: Daniel Stone <daniel@fooishbar.org>
Reviewed-by: Cyril Brulebois <kibi@debian.org>
commit f94898928dfaf8df648bc3eea7d304826b7ac1b8
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Tue May 31 14:48:33 2011 +1000
dix: fix an error message.
event type, not device type.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 8ef0974874f322e3ce2f3e6be4ab3c7e73a7b380
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu May 19 14:50:17 2011 +1000
test: don't test for double alignment on i386. (#36986)
i386 is one of the few architectures that doesn't need double alignment.
X.Org Bug 36986 <http://bugs.freedesktop.org/show_bug.cgi?id=36986>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 48b4b778f61daaa161483b510ab520f3fcb84925
Author: Jeremy Huddleston <jeremyhu@apple.com>
Date: Wed Jun 1 21:55:06 2011 -0700
XQuartz: xpbproxy: Correct NSUInteger format strings
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
commit 971193b2750b98b28597ba194ed388e79b3489b6
Author: Jeremy Huddleston <jeremyhu@apple.com>
Date: Wed Jun 1 21:18:03 2011 -0700
XQuartz: ASL: Use xpbproxy subsystem for logging xpbproxy messages
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
commit 7dfd65705ccd3c6e2458d6892282520fe5ed8a6b
Author: Jeremy Huddleston <jeremyhu@apple.com>
Date: Wed Jun 1 21:06:53 2011 -0700
XQuartz: ASL: Use GLXAqua subsystem for logging GLXAqua messages
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
commit 19020b23efa15d72349bd833aebddcc64780a615
Author: Jeremy Huddleston <jeremyhu@apple.com>
Date: Wed Jun 1 21:06:08 2011 -0700
XQuartz: ASL: Use xpr subsystem for logging xpr messages
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
commit a66400f8dba9b7c5b65f9d26996fff677c42d866
Author: Jeremy Huddleston <jeremyhu@apple.com>
Date: Wed Jun 1 20:45:58 2011 -0700
XQuartz: ASL: Update logging to support differnet levels and subsystems
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
commit c0077b41b4c8bb08129db97a2a01d0af55d13fa4
Author: Jeremy Huddleston <jeremyhu@apple.com>
Date: Wed Jun 1 20:54:27 2011 -0700
XQuartz: Add a semicolon after DEBUG_LOG
Don't rely on the macro to provide it
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
commit fbc8aae8e9b5c7b175073f02e79d7ff1d1363a31
Author: Jeremy Huddleston <jeremyhu@apple.com>
Date: Sun May 29 01:20:44 2011 -0700
XQuartz: Move -lXplugin to LDFLAGS from LDADD
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
commit 38df706c6b8a339c4267cae7be0881c4362f36da
Author: Jeremy Huddleston <jeremyhu@apple.com>
Date: Tue May 31 13:01:05 2011 -0700
XQuartz: GLX: Create a new dispatch table rather than modifying the existing one
Fixes regression introduced by b0c665ac0fe6840dda581e4d0d0b76c703d62a7b
0 X11.bin 0x0000000100118293 __glXAquaScreenCreateContext + 684
1 X11.bin 0x00000001001315b0 DoCreateContext + 163
2 X11.bin 0x000000010013509f __glXDispatch + 211
3 X11.bin 0x00000001000c7dad Dispatch + 785
4 X11.bin 0x00000001000b97e5 dix_main + 1022
5 X11.bin 0x00000001000122bc server_thread + 50
6 libSystem.B.dylib 0x00007fff836554f6 _pthread_start + 331
7 libSystem.B.dylib 0x00007fff836553a9 thread_start + 13
http://lists.apple.com/archives/X11-users/2011/May/msg00045.html
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
commit c5b72fd350bbdfd1facd0ddd5085f238c4cf252a
Author: Marko Macek <Marko.Macek@gmx.net>
Date: Sat May 21 13:30:59 2011 +0100
DIX: Set backgroundState correctly for root window
When we change the root window's background to None, and we've run with
-wr or -br for a forced solid background, make sure we also change the
background state to BackgroundPixel, so we don't try to lookup either
pScreen->whitePixel or pScreen->blackPixel as a pixmap.
Signed-off-by: Marko Macek <Marko.Macek@gmx.net>
Reviewed-by: Walter Harms <wharms@bfs.de>
Reviewed-by: Daniel Stone <daniel@fooishbar.org>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit db228d3d07a6d831f53e4c05c878327ad4d045eb
Author: Keith Packard <keithp@keithp.com>
Date: Wed Jun 1 11:20:10 2011 -0700
Version bumped to 1.10.99.901 (1.11 RC1)
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 0643c056512d10be8db223d18d6563292d57e916
Merge: a2e6cfc18a d45f5b2493
Author: Keith Packard <keithp@keithp.com>
Date: Tue May 31 23:45:07 2011 -0700
Merge remote-tracking branch 'ajax/xserver-next'
commit a2e6cfc18aec1c0027b51572b03ec9f2ab074b56
Merge: bc04065b5c 8d84fd2566
Author: Keith Packard <keithp@keithp.com>
Date: Tue May 31 23:42:52 2011 -0700
Merge remote-tracking branch 'sandmann/for-keithp'
commit d45f5b2493bc0a2882bf972849b5c9c50cd533ca
Author: Adam Jackson <ajax@redhat.com>
Date: Wed May 25 05:54:35 2011 -0400
fixes: Add support for pointer barriers
Implements pointer barriers as specified by version 5 of the XFIXES
protocol. Barriers are axis-aligned, zero-width lines that block pointer
movement for relative input devices. Barriers may block motion in either
the positive or negative direction, or both.
v3:
- Fix off-by-one in version_requests array
- Port to non-glib test harness
- Fix review notes from Søren Sandmann Pedersen, add tests to match
Co-authored-by: Peter Hutterer <peter.hutterer@who-t.net>
Tested-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit bc04065b5ce277f3ac3491ff221a60ef3c7605cf
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Fri May 20 19:24:34 2011 -0700
"privates.h", line 198: warning: void function cannot return value
Providing an argument to return in a function with void return type
is not allowed by the C standard, and makes the Sun compilers unhappy.
(They actually flag it as an error, unless using a new enough version
to be able to downgrade it to a warning with "-features=extensions".)
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com>
Reviewed-by: Daniel Stone <daniel@fooishbar.org>
Reviewed-by: Cyril Brulebois <kibi@debian.org>
commit eadf5021794782fde861d471ed408675f4926b89
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Mon May 2 19:48:42 2011 -0700
Use XORG_STRICT_OPTION from util-macros 1.14 to set -Werror flags
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com>
commit 9275b1fb6f82a6971c4177ddd3d5a859a8f24119
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Mon May 2 19:47:44 2011 -0700
Use XORG_COMPILER_BRAND from util-macros 1.14 to check for SUNCC
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com>
commit 4621bb270a36d35d4ab67f1d7fb47674683dfc5b
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Wed May 18 15:00:54 2011 +1000
Add a property for device/product ID.
In some cases, knowing about the device model number and the device's vendor
is important to activate product-specific settings. Since this is
nonetheless driver-specific, only provide the property but don't do anything
with it.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Daniel Stone <daniel@fooishbar.org>
commit f26a5b9a994a980ab309bc7f3b4295a4992d81c2
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Mon Jan 31 14:43:01 2011 +1000
Xi: add device node property to known properties.
Since the server has little choice (or even knowledge) of the actual device
node used by the driver, this property is merely provided for
standardisation. It is up to the driver to set it to the appropriate value,
usually a device node in the form of /dev/input/event0 or similar.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Acked-by: Dan Nicholson <dbn.lists@gmail.com>
commit 8d84fd2566f8466b6152724df7eefc73780df093
Author: Søren Sandmann Pedersen <ssp@redhat.com>
Date: Wed May 25 12:14:05 2011 -0400
Don't call pixman_disable_out_of_bounds_workaround() anymore
Pixman used to have a workaround for a bug in old X servers, and this
function was used to disable that workaround in servers known to be
fixed.
Since 0.22, which the X server depends on, the workaround doesn't
exist anymore, so there is no point disabling it.
Reviewed-by: Cyril Brulebois <kibi at debian.org>
Signed-off-by: Soren Sandmann <sandmann@cs.au.dk>
commit b6c7b9b2f39e970cedb6bc1e073f901e28cb0fa3
Author: Aaron Plattner <aplattner@nvidia.com>
Date: Tue May 24 16:02:42 2011 -0700
randr: check rotated virtual size limits correctly
Commit d1107918d4626268803b54033a07405122278e7f introduced checks to
the RandR path that cause RRSetScreenConfig requests to fail if the
size is too large. Unfortunately, when RandR 1.1 rotation is enabled
it compares the rotated screen dimensions to the unrotated limits,
which causes 90- and 270-degree rotation to fail unless your screen
happens to be square:
X Error of failed request: BadValue (integer parameter out of range for operation)
Major opcode of failed request: 153 (RANDR)
Minor opcode of failed request: 2 (RRSetScreenConfig)
Value in failed request: 0x780
Serial number of failed request: 14
Current serial number in output stream: 14
Fix this by moving the check above the code that swaps the dimensions
based on the rotation.
Signed-off-by: Aaron Plattner <aplattner@nvidia.com>
Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com>
Tested-by: Robert Hooker <robert.hooker@canonical.com>
Tested-by: Kent Baxley <kent.baxley@canonical.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 4725d6b0dbb6371af4a1b2fbef851dcfe155514a
Merge: 1b2d17748f b5d828789c
Author: Keith Packard <keithp@keithp.com>
Date: Wed May 25 09:40:51 2011 -0600
Merge remote-tracking branch 'whot/for-keith'
commit 1b2d17748f0154da142e9b421d4f6a46e4e5a18c
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Sun May 22 13:50:14 2011 -0700
fbbltone.c: Mark bitmasks as unsigned ints
Clears many Sun compiler warnings:
"fbbltone.c", line 491: warning: integer overflow detected: op "<<"
"fbbltone.c", line 491: warning: integer overflow detected: op "<<"
"fbbltone.c", line 491: warning: integer overflow detected: op "<<"
"fbbltone.c", line 491: warning: initializer will be sign-extended: -16777216
"fbbltone.c", line 491: warning: integer overflow detected: op "<<"
"fbbltone.c", line 491: warning: initializer will be sign-extended: -1
"fbbltone.c", line 495: warning: integer overflow detected: op "<<"
"fbbltone.c", line 495: warning: integer overflow detected: op "<<"
"fbbltone.c", line 495: warning: integer overflow detected: op "<<"
"fbbltone.c", line 495: warning: initializer will be sign-extended: -256
"fbbltone.c", line 495: warning: integer overflow detected: op "<<"
"fbbltone.c", line 495: warning: initializer will be sign-extended: -1
"fbbltone.c", line 499: warning: integer overflow detected: op "<<"
"fbbltone.c", line 499: warning: integer overflow detected: op "<<"
"fbbltone.c", line 499: warning: integer overflow detected: op "<<"
"fbbltone.c", line 499: warning: initializer will be sign-extended: -65536
"fbbltone.c", line 499: warning: integer overflow detected: op "<<"
"fbbltone.c", line 499: warning: initializer will be sign-extended: -1
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Jamey Sharp <jamey@minilop.net>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit b5d828789c092c994722a896c252212e2b3614ab
Author: Simon Thum <simon.thum@gmx.de>
Date: Thu Mar 10 21:03:40 2011 +0100
xserver: remove AbsoluteClass, breaking the A(P|B)I
This struct was unused and has been effectively removed in
commit 633b81e8ba09cc6a1ea8b43f323874fda2cf0bde
Refs: xorg-server-1.10.0-133-g633b81e
Remove the remainder, with an ABI bump to 13.0.
Signed-off-by: Simon Thum <simon.thum@gmx.de>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit c05c8640f13708384e77579e7714ca846fa93f5c
Author: Oleh Nykyforchyn <oleh.nyk@gmail.com>
Date: Thu May 19 09:39:52 2011 +0300
xfree86: Allow "MatchLayout" statements in config files
Usage example (tested on a dual-seat PC):
Section "InputClass"
Identifier "keyboard-all"
MatchIsKeyboard "on"
MatchDevicePath "/dev/input/event*"
MatchLayout "!GeForce|!Matrox"
Driver "evdev"
Option "XkbLayout" "us"
Option "XkbOptions" "terminate:ctrl_alt_bksp"
EndSection
It disables auto keyboard configuration for layouts "GeForce" and "Matrox".
Note that "" in patterns means "no Layout sections found", e.g.
MatchLayout "GeForce|"
is "in layout GeForce or without explicit layout at all".
Signed-off-by: Oleh Nykyforchyn <oleh.nyk@gmail.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Acked-by: Dan Nicholson <dbn.lists@gmail.com>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 83c059f03463f2d7f41e172afe510d1ca9bba8b0
Author: Tomas Frydrych <tomas@sleepfive.com>
Date: Wed May 18 20:49:52 2011 +0100
Xephyr: fix pointer coordinate translation when screen is rotated
In the Xephyr case the position of the pointer relative toward the
Xephyr window is controlled by the host server without taking into
account rotation of the Xephyr screen. Consequently the pointer coords
must always be translated when the fb is rotated.
Signed-off-by: Tomas Frydrych <tomas@sleepfive.com>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit b387069fafbe549f2091f364e2aa92af6cc21261
Author: Tomas Frydrych <tomas@sleepfive.com>
Date: Wed May 18 20:47:52 2011 +0100
Xephyr: added dummy ephyrDeviceCursorCleanup() to avoid crashing
The DeviceCursorCleanup in miPointerSpriteFuncRec can no longer be
NULL it seems.
Signed-off-by: Tomas Frydrych <tomas@sleepfive.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 53ccc54ac71c2655276678e13f0b3d879d691489
Author: Colin Harrison <colin.harrison@virgin.net>
Date: Mon May 16 19:31:57 2011 +0100
Fix XWin compilation after updates for input API changes
Fix XWin compilation after updates for input API changes in commits
e7150db5 8670c46b and 20fb07f4
Also remove a no longer needed InternalEvent* variable
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 4c4df3ac0d8162c874b85fede12ffbe42f0062c3
Author: Jeremy Huddleston <jeremyhu@apple.com>
Date: Sat May 14 16:23:59 2011 -0700
input: Don't implicitly define verify_internal_event
Fixes regression introduced by 56901998020b6f443cbaa5eb303100d979e81b22
mieq.c:159:5: error: implicit declaration of function 'verify_internal_event' is invalid in C99 [-Wimplicit-function-declaration,Semantic Issue]
verify_internal_event(e);
^
1 error generated.
Also includes some other warning cleanups in events.c we're there.
events.c:2198:24: warning: equality comparison with extraneous parentheses [-Wparentheses,Semantic Issue]
else if ((type == MotionNotify))
~~~~~^~~~~~~~~~~~~~~
events.c:2198:24: note: remove extraneous parentheses around the comparison to silence this warning [Semantic Issue]
else if ((type == MotionNotify))
~ ^ ~
events.c:2198:24: note: use '=' to turn this equality comparison into an assignment [Semantic Issue]
else if ((type == MotionNotify))
^~
=
events.c:2487:5: error: implicit declaration of function 'verify_internal_event' is invalid in C99 [-Wimplicit-function-declaration,Semantic Issue]
verify_internal_event(event);
^
events.c:5909:22: warning: declaration shadows a local variable [-Wshadow,Semantic Issue]
DeviceIntPtr it = inputInfo.devices;
^
events.c:5893:18: note: previous declaration is here
DeviceIntPtr it = inputInfo.devices;
^
3 warnings and 1 error generated.
events.c:2836:27: warning: incompatible pointer types passing 'DeviceEvent *' (aka 'struct _DeviceEvent *') to parameter of type
'const InternalEvent *' (aka 'const union _InternalEvent *')
verify_internal_event(ev);
^~
../include/inpututils.h:40:56: note: passing argument to parameter 'ev' here
extern void verify_internal_event(const InternalEvent *ev);
^
1 warning generated.
Found-by: yuffie tinderbox (-Werror=implicit)
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit ba7d1020ac0135ebc8acda4cd57ed48b331e0133
Author: Jeremy Huddleston <jeremyhu@apple.com>
Date: Sat May 14 16:31:10 2011 -0700
input: Fix format string for verify_internal_event
inpututils.c:577:25: warning: conversion specifies type 'unsigned short' but the argument has type 'unsigned char' [-Wformat,Format String Issue]
ErrorF("%02hx ", *data);
~~~~^ ~~~~~
%02hhx
1 warning generated.
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 0de7cec90738a7a5020150309866bb0e23b6f479
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu May 19 15:36:29 2011 +1000
xfree86: bump to video ABI 11
We've broken the ABI with some commit and drivers built against ABI 10
happily segfault now.
(The relevant patch is 51f353d0a0d116af16d7d9590cadef6c56328746 which
changed the ATOM typedef from unsigned long to uint32_t, thanks to
Cyril Brulebois <kibi@debian.org> for figuring this out)
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 1fb501ad1521cfedaa5cf3052d45a924ef1866cf
Author: Jeremy Huddleston <jeremyhu@apple.com>
Date: Sun May 22 10:18:36 2011 -0700
XQuartz: Don't crash if CG increases our display resolution
miPaintWindow would cause fbFill() to overwrite pScreen's pixmap which was
sized for the old resolution.
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
commit 60af79e35ee8546a99d15a1358aac3deabfa22be
Author: Jeremy Huddleston <jeremyhu@apple.com>
Date: Sun May 22 09:32:57 2011 -0700
XQuartz: RandR: Don't crash if X11 is launched while there are no attached displays
If CG reports no displays when launching, we could crash in RandR. Instead, just
provide a fake 800x600 display until we are notified about displays being attached.
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
commit f25ca898c54cb88c7886005fc75a53762c42710b
Author: Jeremy Huddleston <jeremyhu@apple.com>
Date: Thu May 19 14:39:22 2011 -0700
XQuartz: Mark functions _X_NORETURN
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
commit 7413886d650aef492ecbfdc4298c2d92d9af5f87
Author: Jeremy Huddleston <jeremyhu@apple.com>
Date: Thu May 19 14:35:56 2011 -0700
XQuartz: Silence clang warnings about shadow declarations
X11Application.m:1272:26: warning: declaration shadows a local variable [-Wshadow,Semantic Issue]
xp_error e;
^
X11Application.m:1098:36: note: previous declaration is here
- (void) sendX11NSEvent:(NSEvent *)e {
^
1 warning generated.
bundle-main.c:648:36: warning: declaration shadows a local variable [-Wshadow,Semantic Issue]
int max_files, i;
^
bundle-main.c:594:9: note: previous declaration is here
int i;
^
1 warning generated.
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
commit 96ac4e61f4618332d95d1fd0e4799dd82844f90f
Author: Jeremy Huddleston <jeremyhu@apple.com>
Date: Thu May 19 14:34:39 2011 -0700
XQuartz: Update DEBUG_LOG to report to ASL
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
commit 384eb45b944a4386eae74a5503423c13b5f2a659
Author: Jeremy Huddleston <jeremyhu@apple.com>
Date: Sat May 14 18:33:57 2011 -0700
XQuartz: RandR: Avoid over-releasing if we are unable to determine the current display mode.
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
commit 25191648b8db87735a99243697f73036255c1eb6
Author: Jeremy Huddleston <jeremyhu@apple.com>
Date: Sat May 14 16:11:32 2011 -0700
XQuartz: Don't call mieqEnqueue during server shutdown
Found-by: GuardMalloc
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
commit fd5f630bc41de73be3b1d26bf9ce3e9ef1badc3b
Author: Jeremy Huddleston <jeremyhu@apple.com>
Date: Sat May 14 14:09:45 2011 -0700
XQuartz: Fix an array-index-out-of-bounds crasher
Found-by: GuardMalloc
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
commit 0e7f61d72c4a929319e57c9b5b777e9413c23051
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Sat May 14 13:30:20 2011 -0400
doc: use devbook.am for developers documentation
Relocate the docs under the doc subdir.
Remove redundant xml subdir.
The xmlrules set of makefiles are no longer used.
Reviewed-by Jeremy Huddleston <jeremyhu@apple.com>
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 96c65be39b98cfe035be0a3988dce519549249f3
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Sat May 14 13:30:19 2011 -0400
doc: relocate xserver.ent in the package root directory
This is the appropriate location for reusable configuration and/or
makefile artifacts as opposed to picking one of the subdirs where
it is used.
It shields them from future doc reorg as every subdir
will refer to the root package which never changes location.
Reviewed-by Jeremy Huddleston <jeremyhu@apple.com>
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit dbe26634e4f12eba905540666783c9879aa3a49a
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Sat May 14 13:30:18 2011 -0400
doc: add external doc references support to Xserver-DTrace
This makefile is used to build the 60+ docbooks in xorg.
Dtrace is a user document and should be located under doc subdir.
This user document can now refer to external user/specs docs
or can be referred to by such documnets.
Reviewed-by Jeremy Huddleston <jeremyhu@apple.com>
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 221507e3bf6fcaa4a4c2e1bc264a1f806b4362c0
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Thu Apr 28 21:16:13 2011 -0400
man: relocate manual pages in the man subdir outside doc
The convention is to have the manual pages in a man subdir
which is not under a doc dir. The doc dir contains users docs.
This will move man pages out of the way for upcoming DocBook patches.
Reviewed-by Jeremy Huddleston <jeremyhu@apple.com>
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 9129beb507642e2414ef1f90d650572325d8c2dc
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Thu Apr 28 21:16:12 2011 -0400
dmx: fix warning for doxygen explicit links
Explicit links to functions in another file are not supported.
Reviewed-by Jeremy Huddleston <jeremyhu@apple.com>
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 0d8a5766a39320dedd34a215fc6655f9ac19e8bc
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Thu Apr 28 21:16:11 2011 -0400
dmx: modernize doxygen generation.
The configuration and stylesheet were very old.
The stylesheet is not checked-in, use the generated one.
The header is not checked-in, use the generated one.
Add datetime and projectname in default footer.
Developer documentation is not installed and not included in tarball.
Reviewed-by Jeremy Huddleston <jeremyhu@apple.com>
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 622ebb88157b0ed99355419767685dd70ce0f16c
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Thu Apr 28 21:16:10 2011 -0400
dmx: split DocBook/XML and Doxygen makefile targets
Maintaining either requires full knowledge of both.
It's not obvious one has to check the usage of global variables
in devbook.am when maintaining doxygen target. Or vice-versa.
Being in their respective directory, one less thing to worry about.
Reviewed-by Jeremy Huddleston <jeremyhu@apple.com>
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 595460c397a543fe512becd3c432de2a0a68d187
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Thu Apr 28 21:16:09 2011 -0400
dmx/doc: use common makefile for developers documentation
The user/specs docs now have external references support.
Developers doc are not installed so they do not participate.
However, using a similar makefile shared amongst developers
document reduces maintenance and is forward looking.
Reviewed-by Jeremy Huddleston <jeremyhu@apple.com>
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 04011b0bc3b5b59efa0d981866349c4ad0868d8f
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Thu Apr 28 21:16:08 2011 -0400
doc: use common makefile for developers documentation
The user/specs docs now have external references support.
Developers doc are not installed so they do not participate.
However, using a similar makefile shared amongst developers
document reduces maintenance and is forward looking.
Man pages being out of here, reorg developers docs under the same roof.
Drop the obsolete sgml subdir.
Reviewed-by Jeremy Huddleston <jeremyhu@apple.com>
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 531869448d07e00ae241120b59f3aaaa5709d59c
Author: Ville Syrjälä <ville.syrjala@nokia.com>
Date: Fri May 6 18:18:15 2011 +0300
dri2: Don't send so many needless invalidate events
Only send invalidate events for drawables if some client has requested
some buffers.
Signed-off-by: Ville Syrjälä <ville.syrjala@nokia.com>
Reviewed-by: Michel Dänzer <michel@daenzer.net>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit ba5540221f2a46133371b4ff0d527b1a0a1443b1
Merge: 6347a0b802 728d0bf20e
Author: Keith Packard <keithp@keithp.com>
Date: Fri May 13 13:59:36 2011 -0700
Merge remote-tracking branch 'whot/for-keith'
commit 6347a0b802812bb185ada1bf0951add306935184
Merge: 4d02c53971 f144fb771f
Author: Keith Packard <keithp@keithp.com>
Date: Fri May 13 13:54:29 2011 -0700
Merge remote-tracking branch 'jeremyhu/master'
commit 4d02c5397114ac4d15e794908f0708427e258261
Merge: 043c175865 eac37f32b8
Author: Keith Packard <keithp@keithp.com>
Date: Fri May 13 13:52:18 2011 -0700
Merge remote-tracking branch 'vsyrjala/composite_validatetree_2'
commit f144fb771f2e0665677aa88d08778899f666a1d5
Author: Jeremy Huddleston <jeremyhu@apple.com>
Date: Fri May 13 09:10:42 2011 -0700
XQuartz: Don't circumvent NDEBUG
If someone wants to turn off asserts with NDEBUG, let them.
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
commit f46835a09662f71f2cb90540609c34561d8af87f
Author: Jeremy Huddleston <jeremyhu@apple.com>
Date: Wed May 11 15:23:17 2011 -0700
XQuartz: Redirect stdout/stderr to asl
In order to improve logging in XQuartz, stdout and stderr should be redirected
to asl (syslog).
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
commit 5bc05d96f883add324bab338ffb9b9409cf45b2c
Author: Jeremy Huddleston <jeremyhu@apple.com>
Date: Thu May 12 15:45:29 2011 -0700
XQuartz: Add a LOGGING section to our man page
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
commit c18b7165f971cbf6b634ccf670eb4aa9840eb9e4
Author: Jeremy Huddleston <jeremyhu@apple.com>
Date: Thu May 12 18:29:23 2011 -0700
XQuartz: stub: Log directly to ASL rather than stdout/stderr
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
commit d694601591d2a86a437c5150015d9889e2fe16fc
Author: Jeremy Huddleston <jeremyhu@apple.com>
Date: Thu May 12 15:15:40 2011 -0700
Fix a typo: laucnd instead of launchd
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
commit 728d0bf20ed8e2612b100fca6526705fa6e1eef4
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Wed May 11 13:35:39 2011 +1000
dix: replace CORE_EVENT and XI2_EVENT macros with inline functions.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Jamey Sharp <jamey@minilop.net>
commit ffd4874798ba54f86acac75779a15b4babeaa5f3
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Wed May 11 12:20:50 2011 +1000
include: add version_compare helper function
Compare two version numbers in the major.minor form.
Switch the few users of manual version switching over to the new function.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Jamey Sharp <jamey@minilop.net>
commit c4f9c3a07dbb05b81c8e2193a083102f710ebb27
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Wed May 11 11:43:16 2011 +1000
dix: use a tmp variable instead of multiple rClient(other).
no functional changes.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Jamey Sharp <jamey@minilop.net>
commit dc45d5816dd65168645f0017394eebfc5599d698
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu Apr 14 15:59:08 2011 +1000
Xi: split DeviceStateNotify delivery into a separate function
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Jamey Sharp <jamey@minilop.net>
commit 5bcc22757e6e1f24ee2bfec65f68a5f567300532
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu Apr 14 15:43:56 2011 +1000
dix: return deliveries from DeliverGrabbedEvent
This isn't currently used by any of the callers but it will likely be in the
future.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Jamey Sharp <jamey@minilop.net>
commit 2054ca73060a20b5a3025e8d5ef68182149484d3
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu Apr 14 15:09:39 2011 +1000
dix: move the grab activation condition into a if block.
Rather than 3 conditions with if (deliveries && ...), have one block with
the three in them.
No functional changes.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Jamey Sharp <jamey@minilop.net>
commit 236ed6f50675dc0303a505ac6f0418c515438fe1
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Tue Apr 12 14:04:37 2011 +1000
dix: split out client delivery from DeliverEventsToWindow
No real functional changes, this is just for improved readability.
DeliverEventsToWindow used to return an int to specify the number of
deliveries (or rejected deliveries if negative). The number wasn't used by
any caller other than for > 0 comparison.
This patch also changes the return value to be -1 or 1 even in case of
multiple deliveries/rejections. The comment was updated accordingly.
A future patch should probably use the enum EventDeliveryState for
DeliverEventsToWindow.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Jamey Sharp <jamey@minilop.net>
commit 536ca28f1b0b4d8715a41b8acc5f30364c833f9b
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Tue Apr 12 13:44:30 2011 +1000
dix: split out window owner event delivery from DeliverEventsToWindow
No functional changes, just for readability.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Jamey Sharp <jamey@minilop.net>
commit a311a03135f9734aa4f7dc0f2fa0e4c91768343b
Author: Jamey Sharp <jamey@minilop.net>
Date: Wed May 11 14:08:28 2011 -0700
dix: split implicit grab activation into a separate function.
I'm not sure I like splitting the check for button-press event from the
code which makes assumptions about that check. How about replacing
patches 3 and 4 with this patch instead?
Signed-off-by: Jamey Sharp <jamey@minilop.net>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit a558a66d249cd51d3d675b20cc3a76651fd87930
Author: Jeremy Huddleston <jeremyhu@apple.com>
Date: Wed May 11 17:27:52 2011 -0700
configure.ac: XQuartz: Fix support for the deprecated --with-launchd-id-prefix
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
commit c89a6f824eaf647d2b182f79fbd78f5bd1c3a27f
Author: Jeremy Huddleston <jeremyhu@apple.com>
Date: Tue May 10 23:42:46 2011 -0700
XQuartz: Don't call into CoreFoundation after fork() and before exec()
After fork()ing, we should just limit ourselves to setting up
the environment, file descriptors, and exec()ing.
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
commit c8674a328c68f03de6e4fad7790a595cdfc18736
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu Apr 14 16:45:56 2011 +1000
dix: replace unneded goto with break.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Daniel Stone <daniel@fooishbar.org>
commit 20fb07f436f7d4a0f330b2067a93a5a4829fccf5
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri Apr 15 10:07:10 2011 +1000
input: remove DDX event list handling
The current approach to event posting required the DDX to request the event
list (allocated by the DIX) and then pass that list into QueuePointerEvent
and friends.
Remove this step and use the DIX event list directly. This means that
QueuePointerEvent is not reentrant but it wasn't before anyway.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com>
commit 8670c46bdfdade64e63119d2ebbd5ef63b6fa2c3
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu Apr 14 22:05:41 2011 +1000
input: replace EventListPtr with InternalEvent array
EventListPtr is a relic from pre-1.6, when we had protocol events in the
event queue and thus events of varying size.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com>
commit e7150db5350bc2113ff4126019b489847a4dc217
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Mon Apr 11 15:48:15 2011 +1000
input: Provide Queue{Button|Keyboard|Proximity}Event helpers
Don't require every caller to use GPE + mieqEnqueue, provide matching
Queue...Event functions instead.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com>
commit 1b8593a6c12315b1071a4fa586151e12f46458f5
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Mon May 9 15:13:17 2011 +1000
xfree86: print the device ID to the log when adding a device.
Sometimes the name isn't enough, it's handy to see the device ID's from the
log file.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 3231962db826f5efd431596a309c96e907a191d1
Author: Daniel Stone <daniel@fooishbar.org>
Date: Tue May 3 03:20:23 2011 +0100
XKB: Fix sense inversion for core MapNotify events
Due to an unfortunate sense inversion incident while switching from a
if (foo) { ... } to if (!foo) continue; style in f06a9d, we punished any
client who attempted to use XKB to restrict the MapNotify events they
wanted by sending them exactly the events they _didn't_ want, and
nothing else.
NewKeyboardNotifies (coming from a client setting the map with an XKB
request, when switching between master devices, etc) weren't affected,
but this would impact anyone using xmodmap-style core requests. Could
explain a fair bit.
Clarified the comments while I was at it.
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 460a377ef2d645d9ae38a8356fb248ccc47bed4a
Author: Daniel Stone <daniel@fooishbar.org>
Date: Tue May 3 03:07:50 2011 +0100
XKB: Send XKB events for all devices to all clients
We were using XIShouldNotify(client, device) as a test for whether or
not to send XKB map/state/etc changed events, which limits it to only
sending events for the current ClientPointer/ClientKeyboard for that
client. While this makes perfect sense for core events (e.g.
MappingNotify), XKB events carry a device ID, so are safe to send to all
clients for all devices.
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
commit a79d4544fee806a25447d0147535ebc5a1cae6b9
Author: Daniel Stone <daniel@fooishbar.org>
Date: Tue May 3 03:03:06 2011 +0100
XKB: Send NewKeyboardNotify for dev before its master/slaves
When we change the keymap on a device, send the NewKeyboardNotify for
that device before we copy the keymap to and notify for its attached
master/slave devices.
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
commit c7634498d4cd42c8571805122224dc2d0e44a585
Author: Daniel Stone <daniel@fooishbar.org>
Date: Tue May 3 02:59:53 2011 +0100
XKB: Remove duplicate keymap-copying loop
Previously we had:
foreach (device + slaves of device) {
XkbCopyDeviceKeymap(i, device);
[...]
}
if (device was last slave of its MD) {
XkbCopyDeviceKeymap(master, device);
}
and now:
foreach (device + slaves of device + MD if device was last slave) {
XkbCopyDeviceKeymap(i, device);
[...]
}
As an extra bonus, when changing the keymap on a slave device, we now
ensure the LED info on the master is kept in sync.
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
commit b8540d18c7d3a0f93f9e2565a410986eddedcecb
Author: Daniel Stone <daniel@fooishbar.org>
Date: Tue May 3 02:50:48 2011 +0100
XKB: Simplify a loop in ProcXkbGetKbdByName
Replace:
for (stuff; things; etc) {
if (misc || other) {
[...]
}
}
with:
for (stuff; things; etc) {
if (!misc && !other)
continue;
[...]
}
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 72b6639c83df74767094a5e0c2861fdc5ea03ecd
Author: Daniel Stone <daniel@fooishbar.org>
Date: Tue May 3 02:39:55 2011 +0100
XKB: Don't send unnecessary NewKeyboardNotifies
In the XKB GetKeyboardByName handler, we had the following pseudocode:
if (device was last slave of its MD) {
XkbCopyDeviceKeymap(master, slave);
XkbSendNewKeyboardNotify(slave, ¬ify);
}
Even if the SendNewKeyboardNotify line nominated the correct device,
which it didn't, it's unnecessary as XkbCopyDeviceKeymap already sends a
NewKeyboardNotify on the destination device.
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 70cef8d8baf058bacaff87ef49e3851628269597
Author: Daniel Stone <daniel@fooishbar.org>
Date: Wed Jan 19 20:42:10 2011 +0000
Input: Simplify CheckPassiveGrabsOnWindow loop
Instead of a mega never-ending if branch with no else, just continue
to the next iteration of the loop if the conditions aren't met - pretty
much entirely reindentation.
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 00ba884556c675b2b25e116f5ab4eb4590b6dd56
Author: Daniel Stone <daniel@fooishbar.org>
Date: Wed Jan 19 20:38:44 2011 +0000
Input: Make CheckPassiveGrabsOnWindow take InternalEvent
Previously, it only took DeviceEvents, but it would be much more useful
if it took InternalEvents. Any event that activates a grab must still
be a DeviceEvent, so put in a check to enforce this.
Change all callers to make the appropriate casts.
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 56901998020b6f443cbaa5eb303100d979e81b22
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu May 5 08:48:19 2011 +1000
input: change CHECKEVENT macro to verify_internal_event function
The macro is sufficient if called during a development cycle, but not
sufficient information when triggered by a user (e.g.
https://bugzilla.redhat.com/show_bug.cgi?id=688693).
Expand what this does to print the event content and a backtrace, so at
least we know where we're coming from. Only the first 32 bytes are printed
since if something goes wrong, the event we have is almost certainly an
xEvent or xError, both restricted to 32 bytes.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Daniel Stone <daniel@fooishbar.org>
commit b47d2e43eb2cb3817c995d1f7e58500fb40efa2b
Author: Jeremy Huddleston <jeremyhu@apple.com>
Date: Thu May 5 09:04:41 2011 -0700
XQuartz: Make a copy of args for our crash reporter vsnprintf
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
commit bf2059b07a97e5e579c13c2c9d49707093427dc2
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri Apr 15 14:06:20 2011 +1000
input: Only release SD buttons for explicit floating/reattachment (#36146)
Grabbing an SD device temporary floats the device but we must not release
the buttons. Introduced in
commit 9d23459415b84606ee4f38bb2d19054c432c8552
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri Feb 25 11:08:19 2011 +1000
dix: release all buttons and keys before reattaching a device (#34182)
X.Org Bug 36146 <http://bugs.freedesktop.org/show_bug.cgi?id=36146>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com>
commit eac37f32b85b631d94ee3ba11fa65b9d2cb72c38
Author: Ville Syrjälä <ville.syrjala@nokia.com>
Date: Wed Apr 13 21:46:20 2011 +0300
composite: Recompute clipping when changing between manual and automatic redirection
Call compMarkWindows() when changing between manual and automatic
redirection modes. Otherwise the window clipping won't be recomputed
correctly.
Signed-off-by: Ville Syrjälä <ville.syrjala@nokia.com>
commit f2001b0f6dffa0a8f05def4a86ea37c4c91db724
Author: Ville Syrjälä <ville.syrjala@nokia.com>
Date: Wed Apr 13 21:45:43 2011 +0300
composite: Fix pWin->redirectDraw when changing between manual and automatic redirection
compAllowPixmap() is not called when changing between manual and
automatic redirection modes. That means pWin->redirectDraw is left
with an incorrect value, and miComputeClips() gets confused whether
the window is supposed to be treated as transparent or not. Fix
the issue by updating pWin->redirectDraw in compCheckRedirect()
even when not calling compAllocPixmap().
Signed-off-by: Ville Syrjälä <ville.syrjala@nokia.com>
commit 74663e61528346aeea9c11908b6980b51dcaeb68
Author: Ville Syrjälä <ville.syrjala@nokia.com>
Date: Mon Dec 20 16:37:24 2010 +0200
composite: Copy the window contents back from the pixmap
Since extra expose events are no longer generated during window
unredirection, the window contents must be preserved by the server.
So copy the window contents back from the pixmap. The copy can only
be done after the clips have been recomputed, so delay the copy and
the pixmap destruction until ValidateTree is done. Window borders are
restored by HandleExposures and thus don't need to be copied back.
Signed-off-by: Ville Syrjälä <ville.syrjala@nokia.com>
Reviewed-by: Daniel Stone <daniel@fooishbar.org>
commit 193ecc8b453b22b3e60248b9354c768dbd405598
Author: Ville Syrjälä <ville.syrjala@nokia.com>
Date: Fri Dec 17 23:46:34 2010 +0200
composite: Get rid of the internal UnmapWindow+MapWindow cycle
Eliminate the internal MapWindow+UnmapWindow cycle around window
redirection changes. Instead do the work in a single pass by marking
the afected windows and calling ValidateTree and HandleExposures
directly. This gets rid of unnecessary expose events, and invalid
ClipNotify calls during rediredction changes. Now ClipNotify will only
get called with the final clip values, and expose events are only sent
to areas that actually got exposed.
Signed-off-by: Ville Syrjälä <ville.syrjala@nokia.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
Reviewed-by: Daniel Stone <daniel@fooishbar.org>
commit a6ae91746212203a19450ac955fbb7abffff1ed3
Author: Ville Syrjälä <ville.syrjala@nokia.com>
Date: Mon Dec 20 16:30:52 2010 +0200
composite: Initialize borderClip with current values
ValidateTree needs a valid borderClip so initialize the parent
constrained border clip with the window's current borderClip
in compRedirectWindow.
Signed-off-by: Ville Syrjälä <ville.syrjala@nokia.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
Reviewed-by: Daniel Stone <daniel@fooishbar.org>
commit ce9eff9e4c30deb16f059ed84b436d37da45d5d5
Author: Ville Syrjälä <ville.syrjala@nokia.com>
Date: Mon Dec 20 16:33:36 2010 +0200
composite: Call ValidateGC after ChangeGC
ChangeGC changes the GC, so ValidateGC should be called after it, not
before.
Also pass NullClient instead of serverClient to ChangeGC() since we
know the changed values to be valid, and setting
serverClient->errorValue seems pointless anyway.
Signed-off-by: Ville Syrjälä <ville.syrjala@nokia.com>
Reviewed-by: Keith Packard <keithp@keithp.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
Reviewed-by: Daniel Stone <daniel@fooishbar.org>
commit 3ac220d6cc386c9ab9995e5b83463c40330e18c2
Author: Jeremy Huddleston <jeremyhu@apple.com>
Date: Tue May 3 10:54:09 2011 -0700
XQuartz: prefs_copy_url and prefs_get_copy return retained objects
No functional change. This just annotates the return policy.
Found-by: clang static analyzer
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
commit bac8d12555dd44b2139be0696629910cd4d8c782
Author: Jeremy Huddleston <jeremyhu@apple.com>
Date: Tue May 3 10:36:19 2011 -0700
XQuartz: Ensure that {CF,NS}_RETURNS{,_NOT}_RETAINED are defined
These will be used in subsequent patches to denote proper retain counts in XQuartz
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
commit 043c1758652259fd12b88ae37720fe6e93eda76b
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Tue Apr 19 19:02:54 2011 -0700
Clean up memory better when GetVisualInfo fails in ProcDbeGetVisualInfo
Use calloc to initialize pScrVisInfo array so we don't have to check
which ones were already initialized when freeing them all.
On failure, set rc if necessary, and jump to code at end that already
frees all the necessary allocations and return rc.
Fixes parfait reported error:
Error: Memory leak (CWE 401)
Memory leak of pointer 'pScrVisInfo' allocated with malloc((count * 16))
at line 724 of dbe/dbe.c in function 'ProcDbeGetVisualInfo'.
'pScrVisInfo' allocated at line 693 with malloc((count * 16)).
pScrVisInfo leaks when rc != 0 at line 710
and j >= i at line 716.
[ This bug was found by the Parfait 0.3.7 bug checking tool.
For more information see http://labs.oracle.com/projects/parfait/ ]
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com>
commit dadb0791ebfd05cd3bb82d4addf0fbc21aad6fbb
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Tue Apr 19 18:53:22 2011 -0700
Only free pContext once when AddResource fails in ProcRecordCreateContext
Since RecordDeleteContext frees its argument, don't fall through to free
it again.
Error: Double free (CWE 415)
Double free of pointer 'malloc(1072)' defined by malloc
at line 1964 of record/record.c in function 'ProcRecordCreateContext'.
Previously freed at line 1960 with RecordDeleteContext.
'malloc(1072)' was allocated at line 1926 with malloc.
[ This bug was found by the Parfait 0.3.7 bug checking tool.
For more information see http://labs.oracle.com/projects/parfait/ ]
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com>
commit 73de54210446e9eca81b96ea6775ee5ea1a31d75
Author: Daniel Stone <daniel@fooishbar.org>
Date: Mon Jan 24 08:40:10 2011 +1000
Input: Fix event size confusion in CheckPassiveGrabsOnWindow
We were just storing a DeviceEvent, but allocating enough space for an
InternalEvent.
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
Reviewed-by: Julien Cristau <jcristau@debian.org>
Reviewed-by: Adam Jackson <ajax@redhat.com>
Reviewed-by: Cyril Brulebois <kibi@debian.org>
commit 706326491011be8cecb9b56c06f7241b7cbd425f
Author: Daniel Stone <daniel@fooishbar.org>
Date: Tue Jan 18 20:16:36 2011 +0000
Input: Add DeepestSpriteWin function
Does what it says on the box: returns the deepest child window in a
given sprite's trace.
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
Reviewed-by: Chase Douglas <chase.douglas@canonical.com>
Reviewed-by: Keith Packard <keithp@keithp.com>
commit 65b54548dce80c8e8ff5ff91fc4f0659e9b2d921
Author: Chase Douglas <chase.douglas@canonical.com>
Date: Tue Jan 18 20:08:09 2011 +0000
Input: Pass co-ordinates by reference to transformAbsolute
With the upcoming XI 2.1 touch work, the co-ordinate values will need to
be passed by reference, rather than modified in-place.
Signed-off-by: Chase Douglas <chase.douglas@canonical.com>
Reviewed-by: Daniel Stone <daniel@fooishbar.org>
commit a14a0c711397ff7ca0220946010300fc1b2a6e67
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Fri Apr 22 22:19:39 2011 -0700
Move event filter initializer out of the structure itself
When kept in the structure, it causes the entire MAXDEVICES * 128 masks
to be stored in the data segment and loaded from the file, and also leads
to worries about later generations inheriting changes across server reset.
text data bss dec hex filename
Before: 91837 20528 32 112397 1b70d .libs/events.o
After: 92277 48 20512 112837 1b8c5 .libs/events.o
Before: 3013384 122696 163156 3299236 3257a4 Xorg
After: 3013832 102216 183636 3299684 325964 Xorg
File size before: 4337008 Xorg
File size after: 4316568 Xorg
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Jamey Sharp <jamey@minilop.net>
Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com>
Reviewed-by: Daniel Stone <daniel@fooishbar.org>
commit 8d229c4cf9e5bde78373ef3dd32708817ac97152
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Fri Mar 11 15:43:14 2011 -0800
Make xorg.conf.example rule compatible with Solaris make
Solaris make won't substitute $< in explicit rules, only implicit ones
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Gaetan Nadon <memsize@videotron.ca>
commit c6029246ddcf5ead3884dbf2ab4f57e0c3586e93
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Wed Feb 2 17:00:25 2011 -0800
Move Xinput server API documentation from libXi to doc/xml
Documentation is quite out of date but still fits better here than
in the client library.
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 0fc7ec6dd504aa03e1a1b18c60942c0c8c8b701b
Author: Jeremy Huddleston <jeremyhu@apple.com>
Date: Fri Apr 29 11:06:18 2011 -0700
XQuartz: Fix incorrect typedefs with XPLUGIN_VERSION < 4
Ok, this time for sure... how many brown bags can I fit over my face?
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
commit 29d471663e4414a3cdf154fd032d74381a921ae0
Author: Jeremy Huddleston <jeremyhu@apple.com>
Date: Sat Apr 23 18:09:11 2011 -0700
XQuartz: Use a rwlock instead of a mutex to protect window_hash in the pthread case
Concurrent reads are acceptable, so using an rwlock should be better.
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
commit 5cb31cd0cbf83fff5f17a475e7b0e45246b19bf3
Merge: 0f284f0f42 4d8735d388
Author: Keith Packard <keithp@keithp.com>
Date: Fri Apr 29 09:59:49 2011 -0700
Merge remote-tracking branch 'jturney/remove-opengl-spec-download'
commit 4d8735d388c3c6af27ef3d6a645e38e556f392f4
Author: Jon TURNEY <jon.turney@dronecode.org.uk>
Date: Wed Apr 6 16:26:45 2011 +0100
hw/xwin: wglext.h should be provided by w32api, rather than downloaded
wglext.h should be provided by the w32api package, rather than downloaded.
if it's not, do 'wget -P /usr/include/w32api/GL http://www.opengl.org/registry/api/wglext.h'
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
commit a50878682cda541766c830e49ab406c78b38d903
Author: Jon TURNEY <jon.turney@dronecode.org.uk>
Date: Wed Apr 6 16:23:45 2011 +0100
configure: Look for Khronos OpenGL spec files using pkg-config
Look for Khronos OpenGL spec files using pkg-config, rather than downloading them
Also add a --with-khronos-spec-dir=PATH configure option so XWin can be directed
where to find these files without using the khronos-spec-files package
XWin with AIGLX requires OpenGL spec files in order to generate wrapper code which:
(1) thunks from the glapi dispatch table which uses the default cdecl calling convention
to native GL functions using the stdcall calling convention.
(2) performs function address lookup for OpenGL 1.2+ functions, which are treated
as extensions and so not directly linkable.
v2: KHRONOS_SPEC_DIR is only valid when XWIN_GLX_WINDOWS is defined. Avoid 'make dist'
seeing invalid dependencies by only including rules using KHRONOS_SPEC_DIR if
XWIN_GLX_WINDOWS is defined
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
commit 0f284f0f42f26a242eb3153787f2e98b6b88dff8
Author: Jeremy Huddleston <jeremyhu@apple.com>
Date: Wed Apr 27 22:12:59 2011 -0700
XQuartz: BuildFix to build correctly with XPLUGIN_VERSION < 4
This fixes a regression introduced by d79cc14a51f3e8d4d2f66aad055092672cab1526
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
commit f6d4e75ec55ac6812f9dead42ecdffb9614578c7
Merge: ec9ea40178 4318e6a147
Author: Keith Packard <keithp@keithp.com>
Date: Wed Apr 27 12:08:51 2011 -0700
Merge remote-tracking branch 'jturney/master'
commit ec9ea4017885cefe5519a4e890b0ff1a5518235a
Merge: c6cb70be1e 6f29dbf5e3
Author: Keith Packard <keithp@keithp.com>
Date: Wed Apr 27 12:01:56 2011 -0700
Merge remote-tracking branch 'jeremyhu/master'
commit 4318e6a147e78b2663c5e0ea6ba0d351a1e87f98
Author: Jon TURNEY <jon.turney@dronecode.org.uk>
Date: Sat Mar 5 17:34:42 2011 +0000
Cygwin/X: Handle failure during winScreenInit()
Handle failure during winScreenInit() a bit more cleanly, rather than crashing
This avoids a crash with 'XWin -fullscreen -screen 0 @2 -screen 1 @1'
Also document that fullscreen may only be applied to one screen.
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
Tested-by: Colin Harrison <colin.harrison@virgin.net>
commit ce6136f8c553bbc6d3e3affa0faa2afbf8054f44
Author: Jon TURNEY <jon.turney@dronecode.org.uk>
Date: Tue Mar 23 20:06:33 2010 +0000
Cygwin/X: Make winOverrrideStyle() thread-safe
Make winOverrrideStyle() thread-safe
winOverrideStyle() is called from the internal WM client thread.
Accessing server-internal data structures to get window name and
class is not safe, as there is no lock to ensure we do not collide
with these data structures being updated in the server thread.
Rewrite so the internal client thread uses X client calls to
obtain this data safely
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
Tested-by: Colin Harrison <colin.harrison@virgin.net>
commit 0c603509eb7f9c83baf4e00b4558dce78f897ebf
Author: Jon TURNEY <jon.turney@dronecode.org.uk>
Date: Fri Feb 11 13:15:40 2011 +0000
Cygwin/X: Cosmetic fixes to logging of result from X*TextPropertyToTextList()
Report XLocaleNotSupported result from X*TextPropertyToTextList()
Fix formatting for unknown results reported for X*TextPropertyToTextList()
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
Tested-by: Colin Harrison <colin.harrison@virgin.net>
commit 71550a8665d861384332d81239ca0c1586a17137
Author: Jon TURNEY <jon.turney@dronecode.org.uk>
Date: Fri Jan 28 20:17:22 2011 +0000
Cygwin/X: Decorate function pointers retrieved via GetProcAddress with WINAPI
Decorate function pointers retrieved via GetProcAddress which are currently
missing it with WINAPI, to ensure stdcall convention is used when calling them.
This fixes a crash currently seen when compiled -O2 and the -screen option uses
a size and monitor number e.g. -screen 0 1280x1000@2
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
Tested-by: Colin Harrison <colin.harrison@virgin.net>
commit 38a1f5c613a48ef9fd6ba043bc3028f487750d3a
Author: Jon TURNEY <jon.turney@dronecode.org.uk>
Date: Tue Oct 12 17:12:02 2010 +0100
Cygwin/X: Don't make InputOnly windows visible
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
Tested-by: Colin Harrison <colin.harrison@virgin.net>
commit bd288c3458bc1ba2cbb4c8416e5b2dfd849581e6
Author: Jon TURNEY <jon.turney@dronecode.org.uk>
Date: Thu Jul 22 18:36:51 2010 +0100
Cygwin/X: Fix a GDI bitmap resource leak of window icons
Ensure any icon created specially for a window is destroyed when
the window is destroyed
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
Tested-by: Colin Harrison <colin.harrison@virgin.net>
commit 19e764eee0c8b74d877fb2b1d6aedc933976660e
Author: Jon TURNEY <jon.turney@dronecode.org.uk>
Date: Wed Jul 21 18:11:13 2010 +0100
Cygwin/X: Internal WM workaround for Java AWT bug
Java applications using AWT on JRE 1.6.0 break with non-reparenting WMs AWT
doesn't explicitly know about (See sun bug #6434227)
XDecoratedPeer.handleConfigureNotifyEvent() only processes non-synthetic
ConfigureNotify events to update window location if it's identified the
WM as a non-reparenting WM it knows about (compiz or lookingglass)
Rather than tell all sorts of lies to get XWM to recognize us as one of
those, simply send a synthetic ConfigureNotify for every non-synthetic one
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
Tested-by: Colin Harrison <colin.harrison@virgin.net>
commit c5a612fc18a7f5c542fca580494e2c66ecfc2159
Author: Jon TURNEY <jon.turney@dronecode.org.uk>
Date: Fri Apr 16 21:55:01 2010 +0100
configure: Let configure --enable/disable-aiglx control building of AIGLX for all DDXs
Let configure --enable/disable-aiglx control building of AIGLX for all DDXs. Currently
we can't use --enable/disable-aiglx to control if Xwin DDX is built with AIGLX enabled,
as at the moment it's forced off if we aren't building the X.Org DDX DRI or DRI2 loader
Rearrange things a bit, introducing a new automake conditional, AIGLX_DRI_LOADER to
specifically indicate if the X.Org DDX DRI/DRI2 loader convenience library should be
built, and replace the previous X.Org DDX-specific uses of the AIGLX conditional with that
As before, AIGLX_DRI_LOADER is only enabled if --enable-glx, --enable-aiglx and at least one
of --enable-dri or --enable-dri2 are enabled
This allows the general conditional AIGLX to control if AIGLX is built for the XWin DDX as
well
The C #define AIGLX set by AC_DEFINE(AIGLX) seems to be obsolete, I can't find anything
which checks it
Updated for ajax's "glx: Make --disable-dri not disable AIGLX" patch, which allows DRI2
to be enabled independently of DRI1
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
commit 6f29dbf5e36bef5ecb08f02d367988dee0f9f1cd
Author: Jeremy Huddleston <jeremyhu@apple.com>
Date: Mon Apr 25 22:00:41 2011 -0700
XQuartz: Use ErrorF rather than fprintf to log errors
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
commit cb083b05c469352ef80e1005a29ac320f2e4e096
Author: Jeremy Huddleston <jeremyhu@apple.com>
Date: Mon Apr 25 21:25:10 2011 -0700
XQuartz: stub: Dead code removal
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
commit 72ed7551f494c61283a7ac3d7b570eac39cc9786
Author: Emanuele Giaquinta <emanuele.giaquinta@gmail.com>
Date: Mon Apr 25 10:38:17 2011 -0700
XQuartz: pbproxy: LP64: Fix itteration through XGetWindowProperty where sizeof(long) != 4
http://xquartz.macosforge.org/trac/ticket/476
Signed-off-by: Emanuele Giaquinta <emanuele.giaquinta@gmail.com>
Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com>
commit 0a60192a85ba9f64b522da181c2fe8a5b93b79df
Author: Jeremy Huddleston <jeremyhu@apple.com>
Date: Sun Apr 24 22:01:48 2011 -0700
XQuartz: Enable logging to a file for better debugging
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
commit de4023f194c561b74f8fa904bea3dd5298230cd1
Author: Jeremy Huddleston <jeremyhu@apple.com>
Date: Sun Apr 24 21:35:04 2011 -0700
XQuartz: Rename launchd-id-prefix to bundle-id-prefix
It's used many other places than just for launchd.
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
commit e466745109416a2fcdf5d7389c80b814a0363676
Author: Jeremy Huddleston <jeremyhu@apple.com>
Date: Sun Apr 24 20:35:06 2011 -0700
XQuartz: Dead code removal
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
commit f1d867c0a1577e2c46d5dd4e262444e0cf6f8e25
Author: Jeremy Huddleston <jeremyhu@apple.com>
Date: Sat Apr 23 23:22:27 2011 -0700
XQuartz: Silence clang static analyzer
Call to 'malloc' has an allocation size of 0 bytes.
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
commit 913223e9ddf2cb927ecad99aeadfa730df8561ac
Author: Jeremy Huddleston <jeremyhu@apple.com>
Date: Sat Apr 23 23:15:49 2011 -0700
XQuartz: xpr: Dead code removal
Assigned value is always the same as the existing value.
Found by clang static analyzer
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
commit d0caa0e4cd255bea315757be2ff387cf57e8bdf7
Author: Jeremy Huddleston <jeremyhu@apple.com>
Date: Sat Apr 23 20:12:38 2011 -0700
XQuartz: Silence warnings about deprecated functionality where it is an intended fallback
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
commit 9244a3a24f63239ec12675f3df091583e06c8314
Author: Jeremy Huddleston <jeremyhu@apple.com>
Date: Sat Apr 23 12:55:39 2011 -0700
XQuartz: xpr: Use a serial queue rather than pthread mutexes for window_hash
Additionally removes some dead code and fixes double-locking in
xprIsX11Window. xprIsX11Window doesn't need to do any locking because
those resources are protected by the called functions themselves.
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
Reviewed-by: Daniel A. Steffen <dsteffen@apple.com>
commit bac34a54f7cb84f346b1b833df9917bd1ac70223
Author: Jeremy Huddleston <jeremyhu@apple.com>
Date: Sat Apr 23 12:11:39 2011 -0700
XQuartz: xpr: Initialize window_hash in xprInit
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
commit 1596ea72d66a03d9accb534679172ca6f63f78e1
Author: Jeremy Huddleston <jeremyhu@apple.com>
Date: Sat Apr 23 11:55:49 2011 -0700
XQuartz: Use a lighter spinlock instead of a pthread_mutex_t in QuartzScreenSaver
Currently, we only end up here through a call to QuartzShowFullscreen, and
this is always on the same thread. Future changes (such as further
incorporating libdispatch) may allow this to change, but contention will
remain minimal since the call is infrequent and it is short held.
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
Reviewed-by: Daniel A. Steffen <dsteffen@apple.com>
commit 3e253c603bc18f06fa48b611797eb5a7c8a96fe4
Author: Jeremy Huddleston <jeremyhu@apple.com>
Date: Sat Apr 23 01:48:25 2011 -0700
XQuartz: Remove the threadSafety dead-ish code
It's been a few years now since we've needed this to debug thread
boundaries, so punt it out to clean up the namespace polution.
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
commit a52c8078c9cc83c84a8c6eb58810f49bdb90bcc1
Author: Jeremy Huddleston <jeremyhu@apple.com>
Date: Sat Apr 23 01:39:16 2011 -0700
XQuartz: Use xorg_backtrace() instead of spewCallStack()
xorg_backtrace() has been in os for two years now, we might as well
start using it.
Ref: 94ed0ba1b5043ad9fc33b42756af447d5ab15bbd
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
commit d79cc14a51f3e8d4d2f66aad055092672cab1526
Author: Jeremy Huddleston <jeremyhu@apple.com>
Date: Fri Apr 22 12:05:32 2011 -0700
XQuartz: Fix compilation warnings with XPLUGIN_VERSION >= 4
xprAppleWM.c:143: warning: initialization from incompatible pointer type
xprAppleWM.c:144: warning: initialization from incompatible pointer type
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
commit 6128544fd58ced0ed738b7150865294d214fb4eb
Author: Jeremy Huddleston <jeremyhu@apple.com>
Date: Mon Apr 25 12:38:07 2011 -0700
XQuartz: Bump bundle version to 2.7.0
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
commit 4944de24849a109c65f1b353bc12e44e90a1211d
Author: Jeremy Huddleston <jeremyhu@apple.com>
Date: Sat Apr 23 23:25:39 2011 -0700
rootless: Fix a typo in RootlessGlyphs which resulted in a garbage value
Found by clang static analyzer
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
commit 2098cb03c6b64bfca7694fc2b5213edb77bc12e4
Author: Jeremy Huddleston <jeremyhu@apple.com>
Date: Sat Apr 23 23:27:16 2011 -0700
rootless: Dead code removal
Found by clang static analyzer
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
commit bb4d145bd25e2aee988b100ecf1105ea3b6a40b8
Author: Jeremy Huddleston <jeremyhu@apple.com>
Date: Sat Apr 23 21:24:27 2011 -0700
glx: Silence warnings when building with clang
This replaces AX_TLS (GPL3) with XORG_TLS (MIT)
In file included from glapi.c:46:
In file included from ./glapi.h:51:
./glthread.h:237:20: error: unknown attribute 'tls_model' ignored [-Werror,-Wunknown-attributes]
__attribute__((tls_model("initial-exec")));
^
In file included from glapi.c:46:
./glapi.h:92:20: error: unknown attribute 'tls_model' ignored [-Werror,-Wunknown-attributes]
__attribute__((tls_model("initial-exec")));
^
glapi.c:82:20: error: unknown attribute 'tls_model' ignored [-Werror,-Wunknown-attributes]
__attribute__((tls_model("initial-exec"))) = NULL;
^
glapi.c:85:20: error: unknown attribute 'tls_model' ignored [-Werror,-Wunknown-attributes]
__attribute__((tls_model("initial-exec")));
^
4 errors generated.
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
Tested-by: Jamey Sharp <jamey@minilop.net>
Acked-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
commit 5c9eafc8e5f8575c06591d244c2cb5ea07691cb4
Author: Jeremy Huddleston <jeremyhu@apple.com>
Date: Sat Apr 23 20:55:53 2011 -0700
render: Silence warnings when building with clang
picture.c:351:37: error: implicit conversion from 'unsigned int' to 'CARD16' (aka 'unsigned short') changes value from 4294967295 to 65535
[-Werror,-Wconstant-conversion]
pFormats[f].direct.alphaMask = Mask(PICT_FORMAT_A(format));
^~~~~~~~~~~~~~~~~~~~~~~~~~~
...
fatal error: too many errors emitted, stopping now [-ferror-limit=]
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
Suggested-by: Jamey Sharp <jamey@minilop.net>
Reviewed-by: Jamey Sharp <jamey@minilop.net>
commit c524f8bb768f886d413839bc22184098394c2559
Author: Jeremy Huddleston <jeremyhu@apple.com>
Date: Sat Apr 23 20:49:27 2011 -0700
os: Silence warnings when building with clang
access.c:1492:20: error: equality comparison with extraneous parentheses [-Werror,-Wparentheses]
if ((host->family == FamilyServerInterpreted)) {
~~~~~~~~~~~~~^~~~~~~~~~~~~~~~~~~~~~~~~~
access.c:1492:20: note: use '=' to turn this equality comparison into an assignment
if ((host->family == FamilyServerInterpreted)) {
^~
=
access.c:1492:20: note: remove extraneous parentheses around the comparison to silence this warning
if ((host->family == FamilyServerInterpreted)) {
~ ^ ~
In file included from xstrans.c:8:
In file included from /usr/X11/include/X11/Xtrans/transport.c:62:
/usr/X11/include/X11/Xtrans/Xtranssock.c:262:5: error: implicit declaration of function 'ErrorF' is invalid in C99
[-Werror,-Wimplicit-function-declaration]
PRMSG (3,"SocketSelectFamily(%s)\n", family, 0, 0);
^
log.c:180:29: error: format string is not a string literal [-Werror,-Wformat-nonliteral]
if (asprintf(&logFileName, fname, display) == -1)
^~~~~
log.c:190:26: error: format string is not a string literal [-Werror,-Wformat-nonliteral]
if ((asprintf(&suffix, backup, display) == -1) ||
^~~~~~
log.c:382:25: error: format string is not a string literal [-Werror,-Wformat-nonliteral]
LogVWrite(verb, tmpBuf, args);
^~~~~~
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
Reviewed-by: Jamey Sharp <jamey@minilop.net>
commit ab81aa91404ca0fa6843ce8021cbd9de42255a8f
Author: Jeremy Huddleston <jeremyhu@apple.com>
Date: Sat Apr 23 20:39:25 2011 -0700
Xext: Silence warnings when building with clang
xvmain.c:1113:22: warning: equality comparison with extraneous parentheses [-Wparentheses]
if ((pf->depth == pDraw->depth)
~~~~~~~~~~^~~~~~~~~~~~~~~
xvmain.c:1113:22: note: use '=' to turn this equality comparison into an assignment
if ((pf->depth == pDraw->depth)
^~
=
xvmain.c:1113:22: note: remove extraneous parentheses around the comparison to silence this warning
if ((pf->depth == pDraw->depth)
~ ^ ~
1 warning generated.
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
Reviewed-by: Jamey Sharp <jamey@minilop.net>
commit fd086f87cd1bab53c9e918cb687009e7ac8718d8
Author: Jeremy Huddleston <jeremyhu@apple.com>
Date: Sat Apr 23 20:36:53 2011 -0700
fb: Silence warnings when building with clang
fbpict.c:163:8: warning: implicit conversion from enumeration type 'PictFormatShort' (aka 'enum _PictFormatShort') to different enumeration
type 'pixman_format_code_t' [-Wconversion]
pict->format,
~~~~~~^~~~~~
fbbltone.c:486:2: warning: shift result (281474959933440) requires 49 bits to represent, but 'int' only has 32 bits [-Wshift-overflow]
C2_24( 0, 0), C2_24 ( 1, 0), C2_24 ( 2, 0), C2_24 ( 3, 0),
^~~~~~~~~~~~
fbbltone.c:474:6: note: instantiated from:
SelMask24(b,1,r))
^
fbbltone.c:429:46: note: instantiated from:
^
fbbltone.c:427:18: note: instantiated from:
0xffffff << Mask24Check(x,r)) : 0)
~~~~~~~~ ^
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
Reviewed-by: Jamey Sharp <jamey@minilop.net>
commit aad7b324aefc906f28ac9d10c64650b3445c2ae0
Author: Jeremy Huddleston <jeremyhu@apple.com>
Date: Sun Apr 24 19:57:22 2011 -0700
os: Add missing _X_ATTRIBUTE_PRINTF to va_list variants
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
commit 5423da9fb2ec0dfeff866f12cf26fbba04ea673d
Author: Nicolas Kaiser <nikai@nikai.net>
Date: Sun Apr 24 12:44:15 2011 +0200
xkb: remove duplicated include
Remove duplicated include.
Signed-off-by: Nicolas Kaiser <nikai@nikai.net>
Reviewed-by: Matthieu Herrb <matthieu.herrb@laas.fr>
commit 79b3a7f83d7cbee397eecebef1af31c048d295e8
Author: Nicolas Kaiser <nikai@nikai.net>
Date: Sun Apr 24 12:43:05 2011 +0200
test/xi2: remove duplicated include
Remove duplicated include.
Signed-off-by: Nicolas Kaiser <nikai@nikai.net>
Reviewed-by: Matthieu Herrb <matthieu.herrb@laas.fr>
commit a17c30d43e0db6c65cc73cd2be5193c02f138bf5
Author: Nicolas Kaiser <nikai@nikai.net>
Date: Sun Apr 24 12:42:07 2011 +0200
hw/xwin: remove duplicated includes
Remove duplicated includes.
Signed-off-by: Nicolas Kaiser <nikai@nikai.net>
Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com>
Reviewed-by: Jon TURNEY <jon.turney@dronecode.org.uk>
commit c270cfc30c547e28017533f490904013f73cf6f0
Author: Nicolas Kaiser <nikai@nikai.net>
Date: Sun Apr 24 12:41:11 2011 +0200
hw/xquartz: remove duplicated includes
Remove duplicated includes.
Signed-off-by: Nicolas Kaiser <nikai@nikai.net>
Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com>
commit 50ced6cfa0aef472e713ffccfdba003829df68df
Author: Nicolas Kaiser <nikai@nikai.net>
Date: Sun Apr 24 12:40:11 2011 +0200
hw/xnest: remove duplicated include
Remove duplicated include.
Signed-off-by: Nicolas Kaiser <nikai@nikai.net>
Reviewed-by: Matthieu Herrb <matthieu.herrb@laas.fr>
commit 387f45a7077faadf232edc3f608c4a081a7fd290
Author: Nicolas Kaiser <nikai@nikai.net>
Date: Sun Apr 24 12:39:11 2011 +0200
hw/xfree86/modes: remove duplicated include
Remove duplicated include.
Signed-off-by: Nicolas Kaiser <nikai@nikai.net>
Reviewed-by: Matthieu Herrb <matthieu.herrb@laas.fr>
commit 78a9ec125dcb1546ca7e7e18aedf2b323eebb1fc
Author: Nicolas Kaiser <nikai@nikai.net>
Date: Sun Apr 24 12:38:08 2011 +0200
hw/xfree86/fbdevhw: remove duplicated include
Remove duplicated include.
Signed-off-by: Nicolas Kaiser <nikai@nikai.net>
Reviewed-by: Matthieu Herrb <matthieu.herrb@laas.fr>
commit 0320db25f917980621107b790c4fc5171cb0b6ac
Author: Nicolas Kaiser <nikai@nikai.net>
Date: Sun Apr 24 12:36:48 2011 +0200
hw/xfree86/dri: remove duplicated includes
Remove duplicated includes.
Signed-off-by: Nicolas Kaiser <nikai@nikai.net>
Reviewed-by: Matthieu Herrb <matthieu.herrb@laas.fr>
commit b56271b954d6ab8eeb320f314925b77403458b9c
Author: Nicolas Kaiser <nikai@nikai.net>
Date: Sun Apr 24 12:35:45 2011 +0200
hw/xfree86/ddc: remove duplicated include
Remove duplicated include.
Signed-off-by: Nicolas Kaiser <nikai@nikai.net>
Reviewed-by: Matthieu Herrb <matthieu.herrb@laas.fr>
commit 86c0c8b9c567f57fe7477d5302fa22dc7557ce90
Author: Nicolas Kaiser <nikai@nikai.net>
Date: Sun Apr 24 12:34:46 2011 +0200
dix: remove duplicated includes
Remove duplicated includes.
Signed-off-by: Nicolas Kaiser <nikai@nikai.net>
Reviewed-by: Matthieu Herrb <matthieu.herrb@laas.fr>
commit 9b5046d2130aead79956019faf7103b5c676fd02
Author: Nicolas Kaiser <nikai@nikai.net>
Date: Sun Apr 24 12:33:32 2011 +0200
Xi: remove duplicated includes
Remove duplicated includes.
Signed-off-by: Nicolas Kaiser <nikai@nikai.net>
Reviewed-by: Matthieu Herrb <matthieu.herrb@laas.fr>
commit c6cb70be1ed7cf73bd3411b8d66ec05a9efcfeb9
Author: Søren Sandmann Pedersen <ssp@redhat.com>
Date: Mon Mar 28 13:30:52 2011 -0400
Fix trapezoid and triangle rendering to windows
For fbAdd{Traps,Triangles}() and fbRasterizeTrapezoid() this is just a
matter of adding the image offsets to the trap offsets.
For fbShapes, the story is more complicated:
The recently added pixman API did not allow offsetting
trapezoids. Instead, it would use x_dst and y_dst in such a way that
the effect was to only offset the source image.
In pixman 0.21.8, this API has changed such that all the traps are
conceptually rendered to an infinitely big image, and the source and
destination coordinates are then aligned with (0, 0) of that
image. This means offsetting dst_x and dst_y will now offset the
entire drawing, which is similar to how other composite functions
work.
This patch then changes fbComposite{Triangles,Traps} such that the
source image is aligned with the shapes, and the destination
coordinates offset according to drawable->{x, y}.
Reviewed-by: Keith Packard <keithp@keithp.com>
Signed-off-by: Soren Sandmann <ssp@redhat.com>
commit 1b96a99d8edd9016bc4a35348f9d5ddb45832f14
Author: Søren Sandmann Pedersen <ssp@redhat.com>
Date: Thu Mar 10 08:52:41 2011 -0500
fb: Call miCompositeSourceValidate() on the source in fbShapes()
Reviewed-by: Keith Packard <keithp@keithp.com>
Signed-off-by: Soren Sandmann <ssp@redhat.com>
commit 04635069554859ec67003b89f56965421cba7f52
Author: Søren Sandmann Pedersen <ssp@redhat.com>
Date: Tue Mar 29 00:11:00 2011 -0400
render: Remove unused TriStrip and TriFan typedefs
Reviewed-by: Keith Packard <keithp@keithp.com>
Signed-off-by: Soren Sandmann <ssp@redhat.com>
commit 2b0cabec620f3a2a5e431052441b092ef979bf94
Author: Søren Sandmann Pedersen <ssp@redhat.com>
Date: Tue Mar 29 00:07:44 2011 -0400
render: Remove unused fields in the source picture structs
The fields class, stopRange, colorTable and colorTableSize are not
used by any current code.
Reviewed-by: Keith Packard <keithp@keithp.com>
Signed-off-by: Soren Sandmann <ssp@redhat.com>
commit b0d84f94393edab395d65d2b2cb983fc9fec3d36
Author: Søren Sandmann Pedersen <ssp@redhat.com>
Date: Mon Mar 28 20:59:34 2011 -0400
render: Delete PictureGradientColor()
PictureGradientColor(), INTERPOLATE_PIXEL_256() and premultiply() are
not used by anything.
Reviewed-by: Keith Packard <keithp@keithp.com>
Signed-off-by: Soren Sandmann <ssp@redhat.com>
commit 61a92a78cd49969f74a046fa26c3199e06365814
Author: Søren Sandmann Pedersen <ssp@redhat.com>
Date: Tue Mar 29 13:06:36 2011 -0400
Add RegionInitBoxes(), and fix some buggy callers of RegionInit().
The interface to RegionInit():
RegionInit (RegionPtr pReg, BoxPtr rect, int size);
is very confusing because it doesn't take a list of boxes, it takes
*one* box, but if that box is NULL, it initializes an empty region
with 'size' rectangles preallocated.
Most callers of this function were correctly passing either NULL or
just one box, but there were three confused cases, where the code
seems to expect a region to be created from a list of boxes.
This patch adds a new function RegionInitBoxes() and fixes those
instances to call that instead.
And yes, the pixman function to initialize a region from a list of
boxes is called init_rects() because pixman is also awesome.
V2: Make RegionInitBoxes() return a Bool indicating whether the call
succeeded, and fix the callers to check this return value.
Reviewed-by: Keith Packard <keithp@keithp.com>
Signed-off-by: Søren Sandmann <ssp@redhat.com>
commit c7bce22b58530239e583d91ae56312bad1630da4
Author: Søren Sandmann Pedersen <ssp@redhat.com>
Date: Mon Mar 28 11:38:11 2011 -0400
Track damage for fbTrapezoids() and fbTriangles().
These calls no longer go through the CompositePicture() hook, so
damage was no longer generated for them. This patch simply damages the
entire destination clip region.
It would be possible to generate tighter damage for certain operators
such as Over and Add, where blank source pixels have no effect on the
destination, but given that virtually all trapezoid rendering takes
place on pixmaps, it's unlikely that anybody would actually benefit
from this optimization, and the miTrapezoidBounds function did
sometimes show up on profiles, probably because it does several
divisions per trapezoid.
V2: Call DamageRegionProcessPending() - pointed out by Michel Dänzer.
V3: Call DamageRegionProcessPending() *after* rendering -
pointed out by Maarten Maathuis
Reviewed-by: Michel Dänzer <daenzer@vmware.com>
Signed-off-by: Søren Sandmann <ssp@redhat.com>
commit 918a9c99cf2ebc73acb34b95f597904b93c690d9
Merge: 88c4622b59 5f496bc919
Author: Keith Packard <keithp@keithp.com>
Date: Fri Apr 22 11:20:16 2011 -0700
Merge remote-tracking branch 'jeremyhu/master'
commit 88c4622b594a1725d0cee86bc82ad640d241c520
Author: Aaron Plattner <aplattner@nvidia.com>
Date: Mon Apr 18 08:23:48 2011 -0700
linux: Retry VT ioctls while errno == EINTR
When the smart scheduler is enabled, the VT ioctls (particularly
VT_WAITACTIVE) can be interrupted by the smart scheduler's SIGALRMs.
Previously, this caused the server to immediately continue on to
ScreenInit, almost certainly causing a crash or failure because the X
server that owned the VT hadn't finished cleaning up. As of commit
7ee965a300c9eddcc1acacf9414cfe3e589222a8, it causes a FatalError
instead.
Retrying the ioctl as long as it fails with errno == EINTR fixes the
problem and allows server regenerations to trigger VT switches that
actually succeed.
Signed-off-by: Aaron Plattner <aplattner@nvidia.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Cyril Brulebois <kibi@debian.org>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 302bdc3c9678c028bed71dbe9c5ba04997626b6b
Merge: 001b6b8b70 6f97fe5df1
Author: Keith Packard <keithp@keithp.com>
Date: Fri Apr 22 10:48:37 2011 -0700
Merge remote-tracking branch 'whot/for-keith'
commit 5f496bc91941140ceaa3061472fda95bd812f2d2
Author: Jeremy Huddleston <jeremyhu@apple.com>
Date: Fri Apr 22 01:23:09 2011 -0700
XQuartz: Do translation and handoff of NSEvent to X11 in a separate serial queue
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
commit 72bd232b117b2867282e0ae1855d779e126f912b
Author: Jeremy Huddleston <jeremyhu@apple.com>
Date: Fri Apr 22 00:39:12 2011 -0700
XQuartz: Send tablet proximity events with tilt and pressure
<rdar://problem/6257569>
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
commit 034538ea9b4770025e3573bc708039cabbe1e10d
Author: Jeremy Huddleston <jeremyhu@apple.com>
Date: Thu Apr 21 16:31:58 2011 -0700
XQuartz: Use dispatch_async to handoff the FD
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
commit ca7b9e6c817681b9cec738e43cf020ac19b5e732
Author: Jeremy Huddleston <jeremyhu@apple.com>
Date: Thu Apr 21 15:51:32 2011 -0700
configure.ac: Add check for libdispatch when building for darwin
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
commit 3960115dbc83ec1eb8d9c8e90466af3fa0b32abd
Author: Jeremy Huddleston <jeremyhu@apple.com>
Date: Thu Apr 21 15:19:12 2011 -0700
XQuartz: Fix prototypes for thread functions
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
commit 7524dbd06113ec081eaa882aa54e03553ccf96aa
Author: Jeremy Huddleston <jeremyhu@apple.com>
Date: Thu Apr 21 15:11:52 2011 -0700
XQuartz: Make the DarwinProcessFDAdditionQueue_thread wait 3 seconds to allow xinitrc to catch up
Previously, we weren't always waiting the full three seconds. This should
be better, but is still sub-optimal. We really want to start processing
these once a WM has been started.
http://xquartz.macosforge.org/trac/ticket/416
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
commit 6f97fe5df16f947e52875187ff4f9e25fab33ad7
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu Apr 21 14:55:22 2011 +1000
dix: improve control flow in QueryTrackers
If the velocity is 0, skip the remainder.
If we're not in range, skip the remainder.
No functional change.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Jamey Sharp <jamey@minilop.net>
commit a0eda8cd36ffba2ecc79e0d7a1908c89b45e76c4
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu Apr 21 14:45:09 2011 +1000
dix: rename a bunch of variables to be more self-explanatory
i → used_offset
iveloc → initial_velocity
res → result
vdiff → velocity_diff
vfac → velocity_factor
tmp → tracker_velocity
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Daniel Stone <daniel@fooishbar.org>
Reviewed-by: Jamey Sharp <jamey@minilop.net>
Reviewed-by: Simon Thum <simon.thum@gmx.de>
commit e4901905903c5630a1092c69e42f313abd05187b
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Wed Apr 20 15:41:45 2011 +1000
dix: reduce scope of tmp and mult.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Daniel Stone <daniel@fooishbar.org>
Reviewed-by: Jamey Sharp <jamey@minilop.net>
Reviewed-by: Simon Thum <simon.thum@gmx.de>
commit 81c6e79f42cc263349e04c0d82b3a85d6b557885
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Wed Apr 20 15:39:27 2011 +1000
dix: reduce the work done by ApplySoftening
We can modify fdx/fdy in-place rather than requiring dx/dy as well. And the
decision to soften can be made in the caller (unless decided by the velocity
state).
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Daniel Stone <daniel@fooishbar.org>
Reviewed-by: Jamey Sharp <jamey@minilop.net>
Reviewed-by: Simon Thum <simon.thum@gmx.de>
commit 5870d507cee8547c0993791195fe04d96b271289
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Wed Apr 20 15:32:33 2011 +1000
dix: split softening and constant deceleration into two functions
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Daniel Stone <daniel@fooishbar.org>
Reviewed-by: Jamey Sharp <jamey@minilop.net>
Reviewed-by: Simon Thum <simon.thum@gmx.de>
commit 8ae90552f95f025ad09a17258d56603a424ca076
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Wed Apr 20 15:30:19 2011 +1000
dix: use single return statement in ApplySimpleSoftening
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Daniel Stone <daniel@fooishbar.org>
Reviewed-by: Jamey Sharp <jamey@minilop.net>
Reviewed-by: Simon Thum <simon.thum@gmx.de>
commit c45f4cc6bd885855ecb54d9113010906d9ee58e2
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Wed Apr 20 15:28:32 2011 +1000
dix: rename od, d to prev_delta, delta
And res to result.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Daniel Stone <daniel@fooishbar.org>
Reviewed-by: Jamey Sharp <jamey@minilop.net>
Reviewed-by: Simon Thum <simon.thum@gmx.de>
commit 5ffe06bada85e98d46a071dad578d72f5b96cb51
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Wed Apr 20 15:26:11 2011 +1000
dix: Don't use short as bool
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Daniel Stone <daniel@fooishbar.org>
Reviewed-by: Jamey Sharp <jamey@minilop.net>
Reviewed-by: Simon Thum <simon.thum@gmx.de>
commit 97c1967689d7990be86ee490690ac5a91935c875
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Wed Apr 20 15:02:46 2011 +1000
dix: rename "res" to "result" for improved readability
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Daniel Stone <daniel@fooishbar.org>
Reviewed-by: Jamey Sharp <jamey@minilop.net>
Reviewed-by: Simon Thum <simon.thum@gmx.de>
commit 1c162ebcaba78930f34639145a8ac01b87f8e6fd
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Wed Apr 20 14:56:44 2011 +1000
dix: change ProcessVelocityData2D to BOOL.
Don't confuse users with a return type of short, that's even less indicative
that it returns 0/non-0 than "int".
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Daniel Stone <daniel@fooishbar.org>
Reviewed-by: Jamey Sharp <jamey@minilop.net>
commit 70b76286dbef99daabbafccd23f3ba436fe07b09
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Wed Apr 20 16:28:21 2011 +1000
dix: add some more documentation to ptraccel code
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Daniel Stone <daniel@fooishbar.org>
Reviewed-by: Jamey Sharp <jamey@minilop.net>
Reviewed-by: Simon Thum <simon.thum@gmx.de>
commit 6b3a4cc6af240c12d05e27250b61e954eafe9f29
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Wed Apr 20 14:44:51 2011 +1000
dix: don't pass the index for a tracker around, pass the tracker
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Daniel Stone <daniel@fooishbar.org>
Reviewed-by: Jamey Sharp <jamey@minilop.net>
Reviewed-by: Simon Thum <simon.thum@gmx.de>
commit 9e8645cacf5f1c398d7a6e837a36c66cf6cf0c9c
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Wed Apr 20 14:23:29 2011 +1000
dix: CalcTracker only uses the tracker, thus only pass the tracker.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Daniel Stone <daniel@fooishbar.org>
Reviewed-by: Jamey Sharp <jamey@minilop.net>
Reviewed-by: Simon Thum <simon.thum@gmx.de>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 62f4bef82d1252515689420f8aac198e2f29c4f1
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu Apr 21 13:58:55 2011 +1000
dix: use single return statement in DoGetDirection
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Daniel Stone <daniel@fooishbar.org>
Reviewed-by: Jamey Sharp <jamey@minilop.net>
Reviewed-by: Simon Thum <simon.thum@gmx.de>
commit 5f8edbe47e3915f71a20f063a9e8b49591239600
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Wed Apr 20 13:12:53 2011 +1000
dix: use single return value in GetDirection
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Daniel Stone <daniel@fooishbar.org>
Reviewed-by: Jamey Sharp <jamey@minilop.net>
Reviewed-by: Simon Thum <simon.thum@gmx.de>
commit afaa17812513232785c8c629294190629197dfd8
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Wed Apr 20 13:12:35 2011 +1000
dix: document GetDirection
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Daniel Stone <daniel@fooishbar.org>
Reviewed-by: Jamey Sharp <jamey@minilop.net>
Reviewed-by: Simon Thum <simon.thum@gmx.de>
commit df90db892d16143742eb3c09e048f5b76457a62e
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Wed Apr 20 11:49:57 2011 +1000
dix: document DoGetDirection's maths
This is the best explanation I can come up with, but it seems to hold true
for my example values.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Daniel Stone <daniel@fooishbar.org>
Reviewed-by: Jamey Sharp <jamey@minilop.net>
Reviewed-by: Simon Thum <simon.thum@gmx.de>
commit 7513190ec7bc08db1629b04d3f88f86ea2b1588e
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Wed Apr 20 11:47:21 2011 +1000
dix: improve comment, directions flagged are 45° each
The two directions returned by this calculation are always the two boundary
conditions. Since we don't do quadrants but octants, the flagged ones are
45° each. e.g. an angle of 35° flags E and NE.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Jamey Sharp <jamey@minilop.net>
Reviewed-by: Daniel Stone <daniel@fooishbar.org>
commit e804ae85fec290894af69c2e65df55e73b417287
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Wed Apr 20 11:12:35 2011 +1000
dix: improve readbility of DoGetDirection.
Use enums for the direction bits, not hardcoded bitfield values that are
added up.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Daniel Stone <daniel@fooishbar.org>
Reviewed-by: Jamey Sharp <jamey@minilop.net>
Reviewed-by: Simon Thum <simon.thum@gmx.de>
commit 709b291972f8c65f4427f36b45ee78c3895d1e6e
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Wed Apr 20 10:40:28 2011 +1000
dix: only use a single return where only one is needed.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Daniel Stone <daniel@fooishbar.org>
Reviewed-by: Jamey Sharp <jamey@minilop.net>
Reviewed-by: Simon Thum <simon.thum@gmx.de>
commit 8c528c667da7c7fba0ba07973a06b2d4613fbf70
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Wed Apr 20 13:14:11 2011 +1000
dix: fix typo in direction calculation
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Daniel Stone <daniel@fooishbar.org>
Reviewed-by: Jamey Sharp <jamey@minilop.net>
Reviewed-by: Simon Thum <simon.thum@gmx.de>
commit 47f8cba6f3ae24e5dcdc4e348bdaaaf00d25a91c
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Mon Apr 11 14:50:16 2011 +1000
xfree86: removed unused "event" variable in xf86PostMotionEventM
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit c6212a3e5dc43bd3b5263b392cb75ec96cdf4e4f
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri Apr 15 14:13:51 2011 +1000
dix: silence compiler warning
resource.c: In function 'AddResource':
resource.c:493:3: warning: format '%lx' expects type 'long unsigned int',
but argument 3 has type 'RESTYPE'
RESTYPE is uint32_t, not long.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Daniel Stone <daniel@fooishbar.org>
commit 196d679bed2e9959d2fca89d4ee4bbc551681d0b
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri Apr 15 14:51:06 2011 +1000
test: remove glib dependency
The few features from the glib test suite we used can be replaced with
assert and printf. This patch is a simple replacement for these two
g_assert → assert
g_test_message → printf
g_test_init is removed and so is g_test_bug_base. g_test_run replaced with a
simple return 0.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Acked-by: Tiago Vignatti <tiago.vignatti@nokia.com>
Acked-by: Gaetan Nadon <memsize@videotron.ca>
commit 071a6ac4d0c347aa7fc6efe37f4f6992524d7ef1
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Mon Apr 11 15:22:52 2011 +1000
input: remove GetKeyboardValuatorEvents, this is now unnecessary.
GetKeyboardValuatorEvents handles NULL valuator masks already, so the
GetKeyboardEvents wrapper is not needed. Rename GKVE to GKE.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com>
Reviewed-by: Daniel Stone <daniel@fooishbar.org>
commit 91a735328c59db006f0ed52b49e9c59895796c0c
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Wed Mar 9 10:45:55 2011 +1000
test: add some XIPassiveGrab protocol testing.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Acked-by: Daniel Stone <daniel@fooishbar.org>
commit 60b08e013dd1e971f82e5bc8708d3f120c217497
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Wed Mar 9 10:44:48 2011 +1000
Xi: don't swap the status byte in the XIPassiveGrab replies
Reported-by: Julien Cristau <jcristau@debian.org>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Daniel Stone <daniel@fooishbar.org>
commit a3f37f3698880aec508b5ecfb88daf39360610aa
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Wed Mar 9 10:07:19 2011 +1000
Xi: exit with error value if CheckGrabValues failed.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com>
Reviewed-by: Daniel Stone <daniel@fooishbar.org>
commit f4d9ff73b161d84d3fcacc5834fa714c113c7a10
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Wed Mar 9 09:54:12 2011 +1000
Xi: fix reply swapping function check for XIPassiveGrabDevice
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com>
Reviewed-by: Daniel Stone <daniel@fooishbar.org>
commit 2a49ffa3c94819e9f28dd939f23ee8a675258172
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Wed Mar 9 09:53:47 2011 +1000
Xi: return the bad device ID if a passive grab fails with BadDevice.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com>
Reviewed-by: Daniel Stone <daniel@fooishbar.org>
commit 315aa8444b13f827237674535eb2ad55a2066808
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Wed Mar 23 10:32:35 2011 +1000
configure: actually require macros 1.13
Introduced in 6a5bf15fa99cf5b2358b3b3e2f29e5044aa8724a
Reported-by: Dave Airlie <airlied@redhat.com>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Dave Airlie <airlied@redhat.com>
Reviewed-by: Julien Cristau <jcristau@debian.org>
Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
commit f0f0eec869d932a2d9228ff3e41e9e7cda155e68
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Mon Apr 11 11:24:29 2011 +1000
Xi: silence valgrind warning. (#36120)
Conditional jump or move depends on uninitialised value(s)
at 0x4357A1: GetEventMask (events.c:454)
by 0x43B9E8: DeliverEventsToWindow (events.c:2029)
by 0x4E0C59: SendEventToAllWindows (exevents.c:2125)
by 0x4E8301: XISendDeviceHierarchyEvent (xichangehierarchy.c:118)
by 0x426F99: DisableDevice (devices.c:507)
by 0x46BF72: xf86Wakeup (xf86Events.c:457)
by 0x432ABA: WakeupHandler (dixutils.c:419)
by 0x45B708: WaitForSomething (WaitFor.c:235)
by 0x42E8D9: Dispatch (dispatch.c:367)
by 0x422DC9: main (main.c:287)
Uninitialised value was created by a stack allocation
at 0x4E8190: XISendDeviceHierarchyEvent (xichangehierarchy.c:61)
Conditional jump or move depends on uninitialised value(s)
at 0x43BB78: DeliverEventsToWindow (events.c:2010)
by 0x4DDEEA: FindInterestedChildren (exevents.c:2103)
by 0x4DDEFF: FindInterestedChildren (exevents.c:2104)
by 0x4DDEFF: FindInterestedChildren (exevents.c:2104)
by 0x4DDEFF: FindInterestedChildren (exevents.c:2104)
by 0x4DDEFF: FindInterestedChildren (exevents.c:2104)
by 0x4E0C6F: SendEventToAllWindows (exevents.c:2127)
by 0x4E8301: XISendDeviceHierarchyEvent (xichangehierarchy.c:118)
by 0x426F99: DisableDevice (devices.c:507)
by 0x46BF72: xf86Wakeup (xf86Events.c:457)
by 0x432ABA: WakeupHandler (dixutils.c:419)
by 0x45B708: WaitForSomething (WaitFor.c:235)
Uninitialised value was created by a stack allocation
at 0x4E8190: XISendDeviceHierarchyEvent (xichangehierarchy.c:61)
Set the type of dummyDev to SLAVE. The jump listed above comes from a check
to IsMaster() in GetEventMask() that would then set the
XIAllMasterDevices mask.
Hierarchy events can only be set for XIAllDevices so the above IsMaster()
check had no effect and the device type doesn't really matter anyway beyond
shuting up valgrind.
Also initialize dummyDev to 0 to ease future debugging.
X.Org Bug 36120 <http://bugs.freedesktop.org/show_bug.cgi?id=36120>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 419a27b5219a739f2fbd50cc96a1b54c469e4a88
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Tue Apr 12 10:17:07 2011 +1000
Xi: fix valuator alignment in DeepCopyDeviceClasses (#36119)
commit 678f5396c91b3d0c7572ed579b0a4fb62b2b4655 only fixed the
initialization, not the copy. After a slave device change, the valuator
were out of alignment again.
X.Org Bug 36119 <http://bugs.freedesktop.org/show_bug.cgi?id=36119>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com>
commit 7762de65e153790ee9f63903964d168a6680d815
Author: Alexandr Shadchin <alexandr.shadchin@gmail.com>
Date: Sat Apr 9 17:45:10 2011 +0600
Simplify auto-detect mouse for WSCONS_SUPPORT
Signed-off-by: Alexandr Shadchin <Alexandr.Shadchin@gmail.com>
Reviewed-by: Matthieu Herrbb <matthieu.herrb@laas.fr>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 001b6b8b70734db1fa2f68e45c1db8337ba9f662
Author: Adam Jackson <ajax@redhat.com>
Date: Fri Apr 15 13:01:37 2011 -0400
glx: Make --disable-dri not disable AIGLX
Either the DRI1 or DRI2 loaders are sufficient.
Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit f8540b9dcc1fba886be5c4ce7ea0d74952cb48c4
Author: Adam Jackson <ajax@redhat.com>
Date: Fri Apr 15 12:57:05 2011 -0400
glx: Use 0 rather than garbage for unknown INTEL_swap_event types
Otherwise the garbage you return could well be numerically identical to
one of the swap type tokens, and apps which rely on us to tell the truth
would be in trouble.
Reviewed-by: Jesse Barnes <jbarnes@virtuousgeek.org>
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit dc0cf7596782087bdda0e7f9cd2f60907c45b2c4
Author: Adam Jackson <ajax@redhat.com>
Date: Tue Mar 29 10:09:46 2011 -0400
Revert "composite: Don't backfill non-bg-None windows"
This reverts commit 6dd775f57d2f94f0ddaee324aeec33b9b66ed5bc.
Bugzilla: https://bugs.freedesktop.org/34427
Acked-by: Alex Deucher <alexdeucher@gmail.com>
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit 6a433b67ca15fd1ea58334e607f867554f227451
Author: Adam Jackson <ajax@redhat.com>
Date: Mon Mar 28 12:30:09 2011 -0400
glx: Fix lifetime tracking for pixmaps
GLX pixmaps take a reference on the underlying pixmap; X and GLX pixmap
IDs can be destroyed in either order with no error. Only windows need
to be tracked under both XIDs.
Fixes piglit/glx-pixmap-life.
Reviewed-by: Michel Dänzer <michel@daenzer.net>
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit b3d2164a0361f636bfe77b51456bee9213af4f13
Author: Ville Syrjälä <ville.syrjala@nokia.com>
Date: Tue Apr 12 17:16:50 2011 +0300
dri2: Pass out_count by value to update_dri2_drawable_buffers()
update_dri2_drawable_buffers() doesn't modify out_count, so pass it
by value.
Signed-off-by: Ville Syrjälä <ville.syrjala@nokia.com>
Reviewed-by: Tiago Vignatti <tiago.vignatti@nokia.com>
Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
commit 93c833ee84a3465ec5d251e622ba26434cb532f8
Author: Ville Syrjälä <ville.syrjala@nokia.com>
Date: Tue Apr 12 17:13:28 2011 +0300
dri2: Handle calloc() failure
Don't access invalid memory if calloc() fails to allocate the buffers
array.
Signed-off-by: Ville Syrjälä <ville.syrjala@nokia.com>
Reviewed-by: Tiago Vignatti <tiago.vignatti@nokia.com>
Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
commit b2997431fd426ab318bc5dfd2cd43956d733ebec
Author: Jeremy Huddleston <jeremyhu@apple.com>
Date: Wed Apr 13 11:51:30 2011 -0700
Send events that were missing from RRSelectInput
The RANDR spec (randrproto.txt) specifies that RRSelectInput will send out
events corresponding to the event mask, if there have been changes to
CRTCs or outputs. Only screen events were being generated, however.
Fixes http://bugs.freedesktop.org/21760
Signed-off-by: Federico Mena Quintero <federico@novell.com>
Reviewd-by: Keith Packard <keithp@keithp.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit e409fb32b97033718f270a273f29f24c0b562b84
Author: Erkki Seppälä <erkki.seppala@vincit.fi>
Date: Tue Apr 12 12:55:56 2011 +0300
damage: use DamageReportDamage for the initial borderClip damage report
Instead of using DamageDamageRegion for reporting the first (virtual)
damage in ProcDamageCreate that covers the borderClip of the drawable
window, use a function DamageReportDamage directly (previously called
damageReportDamage). This avoids sending all other damage listeners a
full window update when a new damage object is created.
As this patch makes DamageReportDamage a public interface, the
function has been moved into the part of the file that contains all
the other public functions. The function has not been otherwise
modified.
Signed-off-by: Erkki Seppälä <erkki.seppala@vincit.fi>
Reviewed-by: Keith Packard <keithp@keithp.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 274dca8f2c6707121d45df8015fe7eddb129dec9
Author: Tiago Vignatti <tiago.vignatti@nokia.com>
Date: Mon Apr 4 22:31:42 2011 +0300
dix: don't free stranger pointers inside AllocARGBCursor
This seems a good convention to follow: if pointers are allocate outside a
given function, then free there as well when a failure occurs.
AllocARGBCursor and its callers were mixing up the freeing of resources and
causing a particular double free inside TileScreenSaver (srcbits and mskbits).
Signed-off-by: Tiago Vignatti <tiago.vignatti@nokia.com>
Reviewed-by: Ander Conselvan de Oliveira <ander.conselvan-de-oliveira@nokia.com>
commit f603061e9482ad5caf1975ba5395b3294852d072
Author: Tiago Vignatti <tiago.vignatti@nokia.com>
Date: Mon Apr 4 21:40:06 2011 +0300
os: fix use after free in EstablishNewConnections
In the case of failure on AllocNewConnection, new_trans_conn cannot be
dereferenced because it's already freed. Swapping the order of this logic fix
the changes introduced in 04956b80431169e0ae713a3e6ba4cdc157ce3a66.
Signed-off-by: Tiago Vignatti <tiago.vignatti@nokia.com>
CC: Jeremy Huddleston <jeremyhu@freedesktop.org>
Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com>
commit 82498e3c2cce6f515063ecb4b6ae9303e828da00
Author: Tiago Vignatti <tiago.vignatti@nokia.com>
Date: Mon Apr 4 20:25:32 2011 +0300
xfree86: xv: set pointers to NULL in xf86XVFreeAdaptor
As a good practice and for eventual double frees.
The reason of this patch is due the resilience of xf86XVInitAdaptors, where
for any adaptor failure it's able to keep trying registering the following
ones.
I discussed briefly with Pauli and Ville about a bigger refactoring of such
function, doing it in a way to return instantly when a failure happens; after
all that's how mostly of the other driver functions work. Instead, we just
thought that xf86XVInitAdaptors is wise and cool, and eventually other driver
functions should be even following the main idea of resilience.
Signed-off-by: Tiago Vignatti <tiago.vignatti@nokia.com>
Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com>
commit 81414c1c836ae30628606545edbf7392d9b3d009
Author: Tiago Vignatti <tiago.vignatti@nokia.com>
Date: Thu Mar 31 23:44:03 2011 +0300
xfree86: xv: fix double free in xf86XVFreeAdaptor
When xf86XVFreeAdaptor is called more than once in xf86XVInitAdaptors (it may,
but not often), the conditional being changed in this patch will always take
true path and will keep freeing pAdaptor->pAttributes, thus letting the system
error-prone.
This patch fix such problem checking for a pointer instead the number of
attributes. Such pointer will be deallocated when xf86XVFreeAdaptor is called
first and will not let the code re-run in the following calls. This is a bit
similar how the surroundings code is already doing.
Signed-off-by: Tiago Vignatti <tiago.vignatti@nokia.com>
Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com>
commit 74476b700f1e499a731ba2ddbba87b12b9b5139b
Author: Tiago Vignatti <tiago.vignatti@nokia.com>
Date: Thu Mar 31 17:46:42 2011 +0300
xfree86: loader: use one exit code only for readability
No functional changes. Spaghetti code for the win! \o/
Signed-off-by: Tiago Vignatti <tiago.vignatti@nokia.com>
Reviewed-by: Nicolas Peninguy <nico@lostgeeks.org>
commit 7aad7dbf409eaa16a2c80d76ba2a42dc84501919
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu Apr 7 08:43:13 2011 +1000
Xext: use EXT_MASK macro instead of manual & 0x7f
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
commit b28a1af55cf1ad2a882cc8cd73b77341dec7ff5a
Author: Chase Douglas <chase.douglas@canonical.com>
Date: Wed Apr 6 14:51:45 2011 -0400
Fix unset valuator handling for XI 1.x valuator events again
Set the valuator values for unset masked absolute valuators in the
internal device event. This ensures the values will always be correct in
getValuatorEvents even if the device has been removed.
Signed-off-by: Chase Douglas <chase.douglas@canonical.com>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 3085b178626c957854385c7a88a05ec3c7eb74f3
Merge: c9d89cec14 3c45b59e67
Author: Keith Packard <keithp@keithp.com>
Date: Wed Apr 6 08:34:10 2011 -0700
Merge remote-tracking branch 'jturney/master'
commit c9d89cec1407550cb2568f4cef146c93607bbae6
Merge: a52049de2f bc61787a20
Author: Keith Packard <keithp@keithp.com>
Date: Mon Apr 4 11:57:39 2011 -0700
Merge remote-tracking branch 'vignatti/for-keith'
commit bc61787a20e7683cbc4dfa45fe855da98a8c0cd0
Author: Tiago Vignatti <tiago.vignatti@nokia.com>
Date: Tue Mar 29 18:22:50 2011 +0300
render: fix memory leaks in ProcRenderCompositeGlyphs
Signed-off-by: Tiago Vignatti <tiago.vignatti@nokia.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Nicolas Peninguy <nico@lostgeeks.org>
Reviewed-by: Soren Sandmann <ssp@redhat.com>
commit 45b6667b651a0a26b17f64c9e99d70784045e4bf
Author: Tiago Vignatti <tiago.vignatti@nokia.com>
Date: Tue Mar 29 17:17:40 2011 +0300
xkb: fix fd leak in XkbDDXListComponent
Signed-off-by: Tiago Vignatti <tiago.vignatti@nokia.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Nicolas Peninguy <nico@lostgeeks.org>
commit 0b288c8738a97cf6aa3f36aa5c05e7ac2a5cbca8
Author: Tiago Vignatti <tiago.vignatti@nokia.com>
Date: Tue Mar 29 16:54:14 2011 +0300
dix: fix memory leak in ProcListExtensions
Signed-off-by: Tiago Vignatti <tiago.vignatti@nokia.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Nicolas Peninguy <nico@lostgeeks.org>
commit 90e03ab026cd8ffdc6202e6b8bae119717ee8528
Author: Tiago Vignatti <tiago.vignatti@nokia.com>
Date: Tue Mar 29 16:48:21 2011 +0300
mi: fix memory leak in miZeroLine
Signed-off-by: Tiago Vignatti <tiago.vignatti@nokia.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Nicolas Peninguy <nico@lostgeeks.org>
commit daae5e5de194757f7084f9b2b24353c34b961f19
Author: Tiago Vignatti <tiago.vignatti@nokia.com>
Date: Mon Mar 28 20:13:11 2011 +0300
xi: fix memory leak in AddExtensionClient
Signed-off-by: Tiago Vignatti <tiago.vignatti@nokia.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Nicolas Peninguy <nico@lostgeeks.org>
commit c1875ac25b7b730d464c98c4c151c35efd64a562
Author: Tiago Vignatti <tiago.vignatti@nokia.com>
Date: Mon Mar 28 20:09:04 2011 +0300
dix: fix memory leak in AllocShared
Signed-off-by: Tiago Vignatti <tiago.vignatti@nokia.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Nicolas Peninguy <nico@lostgeeks.org>
commit 6e5020f46165862ff09211d5425c8b6a13966303
Author: Tiago Vignatti <tiago.vignatti@nokia.com>
Date: Mon Mar 28 20:07:06 2011 +0300
dix: fix memory leak in AllocPseudo
Signed-off-by: Tiago Vignatti <tiago.vignatti@nokia.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Nicolas Peninguy <nico@lostgeeks.org>
commit a6c71ce5d2d2fe89e07a2ef5041c915acc3dc686
Author: Tiago Vignatti <tiago.vignatti@nokia.com>
Date: Mon Mar 28 19:21:28 2011 +0300
os: fix memory and fd leaks in Popen
Signed-off-by: Tiago Vignatti <tiago.vignatti@nokia.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Nicolas Peninguy <nico@lostgeeks.org>
commit bafec9a25efa902bef2a3730dc44dc50f0e45877
Author: Tiago Vignatti <tiago.vignatti@nokia.com>
Date: Mon Mar 28 19:19:57 2011 +0300
os: use DebugF for debugging
Signed-off-by: Tiago Vignatti <tiago.vignatti@nokia.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Nicolas Peninguy <nico@lostgeeks.org>
commit 719b37c33a89d6ad86c79097e5c67b9b3cea5aac
Author: Tiago Vignatti <tiago.vignatti@nokia.com>
Date: Tue Mar 29 20:04:24 2011 +0300
xfree86: fix memory leak in xf86LoadModules
Signed-off-by: Tiago Vignatti <tiago.vignatti@nokia.com>
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Nicolas Peninguy <nico@lostgeeks.org>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
commit af054db005b48160b117dfd5bec5f821ee614ea9
Author: Tiago Vignatti <tiago.vignatti@nokia.com>
Date: Tue Mar 29 19:51:23 2011 +0300
xfree86: fix bad free configInputDevices
introduced in 93ca526892c0d22afa05cce6496198c652043a19.
Signed-off-by: Tiago Vignatti <tiago.vignatti@nokia.com>
Reviewed-by: Dan Nicholson <dbn.lists@gmail.com>
Reviewed-by: Nicolas Peninguy <nico@lostgeeks.org>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
commit ac2fac24d8baa56f369f4e54908bc00c2b73a60a
Author: Tiago Vignatti <tiago.vignatti@nokia.com>
Date: Tue Mar 29 19:49:32 2011 +0300
xfree86: fix memory leaks in configLayout
Signed-off-by: Tiago Vignatti <tiago.vignatti@nokia.com>
Reviewed-by: Nicolas Peninguy <nico@lostgeeks.org>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
commit bc123319206930638ef1217922824d586d4ada6d
Author: Tiago Vignatti <tiago.vignatti@nokia.com>
Date: Fri Mar 25 22:21:21 2011 +0200
xfree86: fix memory leak in xf86ConfigFbEntity
Signed-off-by: Tiago Vignatti <tiago.vignatti@nokia.com>
Reviewed-by: Nicolas Peninguy <nico@lostgeeks.org>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 2aa935bc5cc1e2d5365a97b8c5bb3d33eb5fc758
Author: Tiago Vignatti <tiago.vignatti@nokia.com>
Date: Fri Mar 25 22:10:55 2011 +0200
fb: fix memory leak in fbOverlayFinishScreenInit
Signed-off-by: Tiago Vignatti <tiago.vignatti@nokia.com>
Reviewed-by: Nicolas Peninguy <nico@lostgeeks.org>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 4d87606a0d0eb63458098028c300c39c6f1bd2bf
Author: Tiago Vignatti <tiago.vignatti@nokia.com>
Date: Fri Mar 25 22:07:44 2011 +0200
Xi: fix memory leak in ProcXGetSelectedExtensionEvents
Signed-off-by: Tiago Vignatti <tiago.vignatti@nokia.com>
Reviewed-by: Nicolas Peninguy <nico@lostgeeks.org>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 12e46e83733b47d2704e1509960192365102af46
Author: Tiago Vignatti <tiago.vignatti@nokia.com>
Date: Fri Mar 25 22:07:31 2011 +0200
dix: fix memory leak in SetDefaultFontPath
Signed-off-by: Tiago Vignatti <tiago.vignatti@nokia.com>
Reviewed-by: Nicolas Peninguy <nico@lostgeeks.org>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 7ae46b69ba3f05f46529131e6a864904967cde3a
Author: Tiago Vignatti <tiago.vignatti@nokia.com>
Date: Fri Mar 25 21:33:15 2011 +0200
mi: fix memory leak in miFillUniqueSpanGroup
Signed-off-by: Tiago Vignatti <tiago.vignatti@nokia.com>
Reviewed-by: Nicolas Peninguy <nico@lostgeeks.org>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 623bb34342641811e2151232f1ab4e2ee3d6b871
Author: Tiago Vignatti <tiago.vignatti@nokia.com>
Date: Fri Mar 25 19:27:17 2011 +0200
xi: fix memory leak in ProcXIQueryDevice
Signed-off-by: Tiago Vignatti <tiago.vignatti@nokia.com>
Reviewed-by: Nicolas Peninguy <nico@lostgeeks.org>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
commit dce2f10cf7bef9929cefadb5088d5b66df43a865
Author: Tiago Vignatti <tiago.vignatti@nokia.com>
Date: Fri Mar 25 19:21:03 2011 +0200
mi: fix memory leak in miInitVisuals
Free the pointers inside miInitVisuals, so the callers of this function
(fboverlay.c and fbscreen.c) don't need to worry with deallocation in the case
of failure.
Signed-off-by: Tiago Vignatti <tiago.vignatti@nokia.com>
Reviewed-by: Nicolas Peninguy <nico@lostgeeks.org>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 8ab92cd9822510f426d179a636ef34bb0ace3bb3
Author: Tiago Vignatti <tiago.vignatti@nokia.com>
Date: Fri Mar 25 18:56:02 2011 +0200
xfree86: dri2: fix memory leak and free resources properly
Signed-off-by: Tiago Vignatti <tiago.vignatti@nokia.com>
Reviewed-by: Nicolas Peninguy <nico@lostgeeks.org>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
commit aa7096ca6f108e399d9916639cf20c57f9776305
Author: Tiago Vignatti <tiago.vignatti@nokia.com>
Date: Fri Mar 25 18:24:34 2011 +0200
xorg: remove unused pointer values all over the server
Signed-off-by: Tiago Vignatti <tiago.vignatti@nokia.com>
Reviewed-by: Nicolas Peninguy <nico@lostgeeks.org>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 49051355d47849b3dd73631e3e2287e319a7f4e5
Author: Tiago Vignatti <tiago.vignatti@nokia.com>
Date: Wed Mar 23 18:08:29 2011 +0200
dix: remove unused macro
Signed-off-by: Tiago Vignatti <tiago.vignatti@nokia.com>
Reviewed-by: Nicolas Peninguy <nico@lostgeeks.org>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
commit f1a80e1268fa4d235a411a8cdf20b4f13eafcde0
Author: Tiago Vignatti <tiago.vignatti@nokia.com>
Date: Wed Mar 23 18:06:51 2011 +0200
dix: remove unused debug code
Signed-off-by: Tiago Vignatti <tiago.vignatti@nokia.com>
Reviewed-by: Mikhail Gusarov <dottedmag@dottedmag.net>
Reviewed-by: Nicolas Peninguy <nico@lostgeeks.org>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
commit a52049de2f846fe984d4db5ac8d2c1826c7b2d0b
Merge: d044d36756 266ea63bc3
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Mon Apr 4 09:58:53 2011 +1000
Merge branch 'master' of git://people.freedesktop.org/~herrb/xserver into for-keith
commit d044d3675635f037bf0eb30e47f82460f78227d1
Author: Tiago Vignatti <tiago.vignatti@nokia.com>
Date: Thu Mar 31 16:26:06 2011 +0300
xfree86: loader: fix memory leaks in LoaderListDirs
Signed-off-by: Tiago Vignatti <tiago.vignatti@nokia.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Nicolas Peninguy <nico@lostgeeks.org>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 9c4aae2141161e4bf69313a771db91c0acc4cc83
Author: Rami Ylimäki <rami.ylimaki@vincit.fi>
Date: Wed Mar 30 16:47:31 2011 +0300
xkb: Prevent leaking of XKB geometry information on copy.
Currently shapes, sections and doodads may leak on copy.
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Erkki Seppälä <erkki.seppala@vincit.fi>
Signed-off-by: Rami Ylimäki <rami.ylimaki@vincit.fi>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 29d63ba175ff1ef1587c390b18ce61c8f1c150f3
Author: Rami Ylimäki <rami.ylimaki@vincit.fi>
Date: Wed Mar 30 16:47:30 2011 +0300
xkb: Introduce helper function to handle similar reallocations.
This is preparation for a memory leak fix and doesn't contain any
functional changes.
Note that two variables are generally used for reallocation and
clearing of arrays: geom->sz_elems (reallocation) and geom->num_elems
(clearing). The interface of XkbGeomRealloc is deliberately kept
simple and it only accepts geom->sz_elems as argument, because that is
needed to determine whether the array needs to be resized. When the
array is cleared, we just assume that either geom->sz_elems and
geom->num_elems are synchronized to be equal or that unused elements
are cleared whenever geom->num_elems is set to be less than
geom->sz_elems without reallocation.
Reviewed-by: Erkki Seppälä <erkki.seppala@vincit.fi>
Signed-off-by: Rami Ylimäki <rami.ylimaki@vincit.fi>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit f40103cee1d591387359f401a5a7c21f4105aeb4
Author: Chase Douglas <chase.douglas@canonical.com>
Date: Thu Mar 31 11:29:01 2011 -0400
Don't report old relative values in getValuatorEvents
Relative valuator values should not be reported in any future events. If
a relative valuator value is not set in an internal event, set the value
to 0 for XI 1.x valuator events sent over the wire.
Signed-off-by: Chase Douglas <chase.douglas@canonical.com>
Reviewed-by: Simon Thum <simon.thum@gmx.de>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 8199eac443d2c22d313cb23e39d5e607a8cc7f99
Author: Chase Douglas <chase.douglas@canonical.com>
Date: Mon Mar 28 16:04:48 2011 -0400
Handle non continuous valuator data in getValuatorEvents
This allows for masked valuators to be handled properly in XI 1.x
events. Any unset valuators in the device event are set to the last
known value when transmitted on the wire through XI 1.x valuator events.
Fixes https://bugs.launchpad.net/ubuntu/+source/xorg-server/+bug/736500
Signed-off-by: Chase Douglas <chase.douglas@canonical.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 266ea63bc3e052b753c5484fa08dcc4fb67c8952
Author: Matthieu Herrb <matthieu.herrb@laas.fr>
Date: Fri Apr 1 22:55:57 2011 +0200
Xi: fix querydevice request swapping
WriteReplyToClient() swaps rep.length, so it can't be used
on return of WriteReplyToClient(). So save it's value for later
use.
Signed-off-by: Matthieu Herrb <matthieu.herrb@laas.fr>
Reviewed-by: Julien Cristau <jcristau@debian.org>
commit 552c78592c5e5f52fe16e2429f77c63adf398247
Author: Matthieu Herrb <matthieu.herrb@laas.fr>
Date: Fri Apr 1 22:54:54 2011 +0200
Xext: fix test on extension number for the swapped case.
Signed-off-by: Matthieu Herrb <matthieu.herrb@laas.fr>
Reviewed-by: Julien Cristau <jcristau@debian.org>
commit a074e6b6754d6c2706b2b5de54e22cbffc5b1a17
Author: Matthieu Herrb <matthieu.herrb@laas.fr>
Date: Fri Apr 1 22:53:40 2011 +0200
Xi: add XI_Focus{In,Out} to swapped events.
Signed-off-by: Matthieu Herrb <matthieu.herrb@laas.fr>
Reviewed-by: Julien Cristau <jcristau@debian.org>
commit 81257377a2d011ce47fba5822df0f7918dea1d72
Author: Matthieu Herrb <matthieu.herrb@laas.fr>
Date: Fri Apr 1 22:51:48 2011 +0200
Xi: take XI2 requests into account also for the swapping case.
Signed-off-by: Matthieu Herrb <matthieu.herrb@laas.fr>
Reviewed-by: Julien Cristau <jcristau@debian.org>
commit f9834d312e3059073e8ad77d9f9d57cb9d96e1e5
Author: Dave Airlie <airlied@redhat.com>
Date: Thu Mar 31 15:33:46 2011 +1000
fb: cleanup fbChangeWindowAttributes
This cleans up the duplication in fbChangeWindowAttributes,
and fixes a bug if the fb24_32ReformatTile ever failed,
since the old code would happily dereference it in the fbEvenTile
call a few lines later.
Signed-off-by: Dave Airlie <airlied@redhat.com>
Reviewed-by: Mark Kettenis <kettenis@openbsd.org>
commit 36c7158133660520034d645b124c2c973d2971bb
Author: Dave Airlie <airlied@redhat.com>
Date: Thu Mar 31 13:21:44 2011 +1000
fb: drop comments around 24-bit support.
Signed-off-by: Dave Airlie <airlied@redhat.com>
Reviewed-by: Keith Packard <keithp@keithp.com>
commit ac2ae2ed378cc877444bec17b353dda83b620186
Author: Dave Airlie <airlied@redhat.com>
Date: Tue Mar 29 14:24:52 2011 +1000
fb: add back fb defines for driver compat.
we could drop these really and just fixup the drivers, but
since they'll build fine but fail to work this seems safer.
Signed-off-by: Dave Airlie <airlied@redhat.com>
Reviewed-by: Keith Packard <keithp@keithp.com>
commit be9cfb249da18d134c1d65bbb75161aff65f2942
Author: Dave Airlie <airlied@redhat.com>
Date: Tue Mar 29 14:27:41 2011 +1000
fb: drop defines that aren't used/necessary anymore.
This was generated by:
cd fb
coan source --replace -DFB_SCREEN_PRIVATE -DFB_24BIT -DFB_24_32BIT -DFB_SCREEN_PRIVATE -UFBNOPIXADDR -UFBNO24BIT -UFBNO24_32 *.[ch]
A follow up patch readds the FB_24_32BIT define for Intel UXA.
Signed-off-by: Dave Airlie <airlied@redhat.com>
Reviewed-by: Keith Packard <keithp@keithp.com>
commit e0a2ad51dfb7373aa602335490d9666d6101b5ea
Merge: 327e1d8801 3d688316af
Author: Keith Packard <keithp@keithp.com>
Date: Wed Mar 30 10:51:27 2011 -0700
Merge remote-tracking branch 'ajax/xserver-next'
commit ac00ab77d5a00cfd198958aa1afaa4c3ccc6d7bc
Author: Chase Douglas <chase.douglas@canonical.com>
Date: Mon Mar 28 16:04:47 2011 -0400
Clean up getValuatorEvents using array loop logic
Signed-off-by: Chase Douglas <chase.douglas@canonical.com>
Reviewed-by: Jamey Sharp <jamey@minilop.net>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 3d688316af0e4ff3c44acfc168bd9c76c892b629
Author: Adam Jackson <ajax@redhat.com>
Date: Tue Mar 15 11:03:26 2011 -0400
xfree86: warning fix
xf86RandR12.c: In function 'xf86RandR12EnterVT':
xf86RandR12.c:1769:5: warning: ISO C90 forbids mixed declarations and code
Reviewed-by: Keith Packard <keithp@keithp.com>
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit 2762eef8c34b48be803226f48fc71f790286f968
Author: Adam Jackson <ajax@redhat.com>
Date: Tue Mar 15 11:01:50 2011 -0400
xfree86: warning fix
Pointer.c: In function 'xf86parsePointerSection':
Pointer.c:192:5: warning: format '%u' expects type 'unsigned int', but argument 3 has type 'long unsigned int'
Reviewed-by: Keith Packard <keithp@keithp.com>
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit 5275fbe2e226e1c2a46d26288390c8ef6e1a6a52
Author: Adam Jackson <ajax@redhat.com>
Date: Tue Mar 15 10:58:36 2011 -0400
render: warning fixes
picture.c: In function 'CompositeTriStrip':
picture.c:1777:25: warning: unused variable 'ps'
picture.c: In function 'CompositeTriFan':
picture.c:1807:16: warning: unused variable 'pScreen'
Reviewed-by: Keith Packard <keithp@keithp.com>
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit f1c2c01ac9ea7381cb4cd21ac1b2185ff28da3ec
Author: Adam Jackson <ajax@redhat.com>
Date: Thu Mar 24 16:51:54 2011 -0400
dix: Small refactor to resource deletion
Reviewed-by: Matt Turner <mattst88@gmail.com>
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit 3e0b311aba54895d806174526511ef11b31432b1
Author: Adam Jackson <ajax@redhat.com>
Date: Mon Mar 21 12:12:53 2011 -0400
glx: minor cast cleanup
Reviewed-by: Eric Anholt <eric@anholt.net>
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit 501506cf9df3d81556d44d074d8321fe6c171576
Author: Adam Jackson <ajax@redhat.com>
Date: Fri Mar 18 17:48:51 2011 -0400
glx: dead variable removal
Reviewed-by: Eric Anholt <eric@anholt.net>
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit 10317682e2fbb95f1d4caa1bdbbb8116272c0f86
Author: Adam Jackson <ajax@redhat.com>
Date: Fri Mar 18 17:44:11 2011 -0400
glx: Remove some obfuscatory macros
Reviewed-by: Eric Anholt <eric@anholt.net>
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit c327d07cc68802256c679a65d78f98f17327abda
Author: Adam Jackson <ajax@redhat.com>
Date: Fri Mar 18 17:03:09 2011 -0400
glx: Remove ->forceCurrent from the context vtable
All the implementations of makeCurrent and forceCurrent are identical,
so just use makeCurrent everywhere.
Reviewed-by: Eric Anholt <eric@anholt.net>
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit a48dadc98a28c969741979b70b7a639f24f4cbbd
Author: Adam Jackson <ajax@redhat.com>
Date: Mon Mar 21 11:59:29 2011 -0400
glx: Reimplement context tags
This would let you do a constant-time context lookup, but if that's your
performance problem you have two problems. Just use the context's XID
as the tag value instead.
In order to do this, we have to defer destroying a context until it
actually goes unreferenced, as you're allowed to mention a context tag
after you've (ostensibly) destroyed the context, as long as it's still
your current context. Thus, change DestroyContext to merely mark the
context as dead if it's a current context, and call down to actual
resource destruction (and XID reclamation) in StopUsingContext.
Also, stop trying to delete context state from DrawableGone. This was
always broken, as GLX does not say that contexts are destroyed when
their drawables are destroyed. But with the above change to defer
context destruction, this would trigger a server crash on client exit as
we'd free the context state twice.
Reviewed-by: Eric Anholt <eric@anholt.net>
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit 30d6947cee714385cf62a40ea6fa6d2e68388c78
Author: Adam Jackson <ajax@redhat.com>
Date: Mon Mar 7 14:53:28 2011 -0500
glx: Fix _glapi_add_dispatch
We never need to generate stubs, because those conditions can't happen
in the server. Yank that code out, but keep the bookkeeping for which
extension functions are registered so the DRI driver doesn't get
confused.
As a pleasant bonus, we're now friendlier for environments like selinux
that make runtime code generation difficult, and we're portable to more
arches since we don't have to port the assembly stubs.
Fixes the following clutter conformance tests (indirect rendering,
llvmpipe driver):
test-cogl-backface-culling
test-cogl-materials
test-cogl-readpixels
test-cogl-texture-mipmaps
test-cogl-texture-get-set-data
test-cogl-viewport
test-cogl-offscreen
Reviewed-by: Dave Airlie <airlied@redhat.com>
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit 0cb44cec7b9fbd75285f7380f162cf6140a5bf3f
Author: Adam Jackson <ajax@redhat.com>
Date: Thu Mar 3 10:42:41 2011 -0500
glx: Flatten -DXFree86Server
Always defined by the makefile, so, just get rid of it.
Reviewed-by: Dave Airlie <airlied@redhat.com>
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit ed6c13c01e017f9f40c89247ab6652895fb1ea14
Author: Adam Jackson <ajax@redhat.com>
Date: Wed Mar 2 13:37:43 2011 -0500
glx: Update some glapi comments
Reviewed-by: Dave Airlie <airlied@redhat.com>
Reviewed-by: Julien Cristau <jcristau@debian.org>
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit 17d9e374721d6c8ee3f7f9cdc882f80127bdb57f
Author: Adam Jackson <ajax@redhat.com>
Date: Wed Mar 2 13:21:39 2011 -0500
glx: Lobotomize _glapi_get_proc_address
This isn't a meaningful thing in the indirect glx loader, so just warn
if it ever happens and move on.
But also, mark it PUBLIC, so if the driver does ever call it we merely
warn instead of aborting because ld.so can't find the symbol.
Reviewed-by: Dave Airlie <airlied@redhat.com>
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit b0c665ac0fe6840dda581e4d0d0b76c703d62a7b
Author: Adam Jackson <ajax@redhat.com>
Date: Wed Mar 2 12:30:22 2011 -0500
glx: Remove noop dispatch table
We can never hit this, because the indirect GLX dispatch code always
forces a current context and checks that it's non-NULL before calling
into the dispatch table. If it's _not_ null, then _glapi_set_context
will call into the driver, which is responsible for calling
_glapi_set_dispatch to make sure the dispatch table is non-NULL.
Also remove _glapi_set_warning_func and friends, since we can no longer
call them even from dead code.
Reviewed-by: Dave Airlie <airlied@redhat.com>
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit 327e1d88012102af6aca6c6840aa0ed3c7041a77
Author: Michel Dänzer <daenzer@vmware.com>
Date: Mon Mar 28 17:18:39 2011 +0200
EXA: Use dixGetPrivate(Addr) instead of dixLookupPrivate.
The latter calls the former, let's cut the middle man and eliminate a branch
in a hot path.
According to Git history, ExaSetPixmapPriv was never used anywhere, just drop
it.
Signed-off-by: Michel Dänzer <daenzer@vmware.com>
Reviewed-by: Cyril Brulebois <kibi@debian.org>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit a095a6d4e8f5090907e8d3d66018636216300846
Merge: a22486f848 ef9d04f8ad
Author: Keith Packard <keithp@keithp.com>
Date: Sun Mar 27 20:06:29 2011 -0700
Merge remote-tracking branch 'airlied/pwin-cleanup'
commit a22486f848014000dc13dda470f77d4d8ea9e9f6
Merge: 2ef4ff45ef 633b81e8ba
Author: Keith Packard <keithp@keithp.com>
Date: Sun Mar 27 18:27:10 2011 -0700
Merge remote-tracking branch 'whot/for-keith'
commit 2ef4ff45ef1fcfc4967ebe3d550408769e5f6500
Author: Erkki Seppälä <erkki.seppala@vincit.fi>
Date: Fri Mar 25 10:38:23 2011 +0200
os/client: Prevent rare fd leak in DetermineClientPid
DetermineClientPid didn't close file descriptor if read on
/proc/pid/cmdline failed. Adjusted the code to disregard the close
return value and perform the return after that, if the read failed or
returned EOF.
Signed-off-by: Mark Kettenis <mark.kettenis@xs4all.nl>
Signed-off-by: Erkki Seppälä <erkki.seppala@vincit.fi>
Reviewed-by: Rami Ylimäki <rami.ylimaki@vincit.fi>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit ef9d04f8ad4239ac30984769c9c8c101bb8e78bf
Author: Dave Airlie <airlied@redhat.com>
Date: Thu Mar 24 14:07:34 2011 +1000
dri: kill if 0 out code.
This refers to pWin->winSize in some #if 0 code remove it.
Signed-off-by: Dave Airlie <airlied@redhat.com>
Reviewed-by: Cyril Brulebois <kibi@debian.org>
commit eb9266c7176eb240a85e72beda9b6033338294f1
Author: Dave Airlie <airlied@redhat.com>
Date: Thu Mar 24 14:04:25 2011 +1000
consolidate SetRootClip (v2)
each DDX has its own copy, I've taken the darwin one,
though I'm not sure why it needs the pOldClip piece that nobody
else has and the commit msg is like an "Updates from magic land"
type message.
This removes the main uses of pWin->winSize from the DDXen.
v2: drop old clip like ajax suggests.
Signed-off-by: Dave Airlie <airlied@redhat.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
commit 3c45b59e675ba926ec95842ac3d49e2091e41eb8
Author: Jon TURNEY <jon.turney@dronecode.org.uk>
Date: Fri Mar 18 15:00:14 2011 +0000
Fix XWin compilation after commit 769531b9
commit 769531b9 "Add mode field to pointer movement hooks" changes the
function signature of miPointerSetPosition() to include the movement mode
which resulted in the pointer position
Update use of miPointerSetPosition() in winEnqueueMotion() appropriately
(See http://tinderbox.freedesktop.org/builds/2011-03-16-0008/logs/xserver/#build)
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 633b81e8ba09cc6a1ea8b43f323874fda2cf0bde
Author: Simon Thum <simon.thum@gmx.de>
Date: Wed Mar 9 20:48:22 2011 +0100
xserver: remove AbsoluteClassRec keeping the ABI
This removes the struct, but keeps InitAbsoluteClassDeviceStruct as
a no-op and preserves related struct layout.
Signed-off-by: Simon Thum <simon.thum@gmx.de>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 2103d61909c7e6bd345622962df7784a19df72c5
Author: Simon Thum <simon.thum@gmx.de>
Date: Sat Mar 5 05:02:54 2011 +0100
simplify ChangeDeviceControl in stubs
Signed-off-by: Simon Thum <simon.thum@gmx.de>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 118ef6f806f629a8e2ad61e4f2a43820b0fa621c
Author: Simon Thum <simon.thum@gmx.de>
Date: Sat Mar 5 05:01:22 2011 +0100
xf86: don't pretend to support DEVICE_ABS_* in ChangeDeviceControl
Signed-off-by: Simon Thum <simon.thum@gmx.de>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit dee83dff4b8fbf1351263beaf2d531d033b6d0c4
Author: Simon Thum <simon.thum@gmx.de>
Date: Sat Mar 5 04:59:33 2011 +0100
kdrive: don't pretent to support DEVICE_ABS_* in ChangeDeviceControl
Signed-off-by: Simon Thum <simon.thum@gmx.de>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 9eaecb1bfe358a0c5f24645a29d6c377c0c4b37c
Author: Simon Thum <simon.thum@gmx.de>
Date: Sun Mar 20 16:28:22 2011 +0100
xquartz: simplify ChangeDeviceControl
Signed-off-by: Simon Thum <simon.thum@gmx.de>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 33e257ab43ebf35e838b80c416762e9b743e9385
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Tue Mar 22 11:53:00 2011 +1000
test: when unit tests are enabled, build them during "make"
Catch compiler errors that were otherwise only spotted on make check.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Dan Nicholson <dbn.lists@gmail.com>
commit 6243332782f2d286d49f1dec8a628b0a403665fd
Author: Erkki Seppälä <erkki.seppala@vincit.fi>
Date: Fri Mar 18 16:35:36 2011 +0200
config: handle device change event properly
wakeup_handler in udev.c wasn't dealing with udev change events.
There are situations when a device can gain its input capabilities
after it has been added to the system and therefore the change events
must be handled as well.
The change is handled as a consecutive device removal and addition.
Signed-off-by: Erkki Seppälä <erkki.seppala@vincit.fi>
Signed-off-by: Stefan Kost <Stefan.Kost@nokia.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit fad10cb38ef2433c82f8a43d3b7d64e323728060
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri Mar 18 11:06:57 2011 +1000
xfree86: print out which driver is about to be used.
Makes reading the log file a lot easier for those that don't magically
recognise the log spew by the individual drivers.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Dan Nicholson <dbn.lists@gmail.com>
commit cb5d4b416a0fc850a1c119755a9cc3c4f0d7a545
Author: Jeremy Huddleston <jeremyhu@apple.com>
Date: Wed Mar 23 12:10:15 2011 -0700
XQuartz: applewm: Don't check if requested window level is < 0 because it is unsigned (-Wtautological-compare)
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
commit c116e32dc2799c4abcf38d22bc773b755387c89a
Author: Jeremy Huddleston <jeremyhu@apple.com>
Date: Wed Mar 23 12:07:36 2011 -0700
XQuartz: Put ifdef guards around have_depth label (-Wunused-label)
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
commit 1a583f7940e18a8ef28ca14e74e85e0785d39067
Author: Jeremy Huddleston <jeremyhu@apple.com>
Date: Wed Mar 23 12:05:05 2011 -0700
XQuartz: Properly comment extra tokens (-Wextra-tokens) after endif
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
commit c55baebf4ebf1887262cc16899eb297b9f284f6e
Author: Jeremy Huddleston <jeremyhu@apple.com>
Date: Tue Mar 22 19:01:48 2011 -0700
GLX: Support TLS with better portability
AX_TLS detects when toolchains support __thread or __declspec(thread),
but existing code assumed __thread.
This also adds a check to configure.ac to error out if TLS is requested
but unsupported.
Found-by: Tinderbox
http://tinderbox.x.org/builds/2011-03-22-0007
Regression-from: 82b1eaa6cad20f39dbf15573bdb3d62acbcd91f9
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
Reviewed-by: Tom Fogal <tfogal@alumni.unh.edu>
Reviewed-by: Dan Nicholson <dbn.lists@gmail.com>
commit 03f45df93469f6aef391e97007b9614e0770cc4c
Merge: efcb7275ce 5fb329a04a
Author: Keith Packard <keithp@keithp.com>
Date: Wed Mar 23 13:38:37 2011 +0900
Merge remote-tracking branch 'airlied/xinerama-cleanup'
commit efcb7275ce5de651f91ba4ff8bb227dfb68bb154
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Thu Mar 17 19:26:37 2011 -0400
test: git ignore the list test executable
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 6a5bf15fa99cf5b2358b3b3e2f29e5044aa8724a
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Thu Mar 17 19:26:36 2011 -0400
Add generalized unit test support using util-macros.
A handful of modules have begun adding unit test programs.
These macros will help providing a consistent interface which will
help package builders and developers to manage the functionality.
XORG_ENABLE_UNIT_TESTS will turn on/off unit testing, regardless
of how it is implemented. The default (yes/no) can be specified by each
module. It can be used by itself if glib or -wrap support is not needed.
XORG_WITH_GLIB will probe the system for glib-2.0. A different version
can be specified in each module. It will consult XORG_ENABLE_UNIT_TESTS
but can be used by itself in contexts other then unit testing.
The default (yes/no) can be specified by each module.
XORG_LD_WRAP will probe the linker for -wrap support. It will consult
XORG_ENABLE_UNIT_TESTS but can be used by itself in contexts
other then unit testing.
configure options:
--enable-unit-tests Enable building unit test cases (default: auto)
--with-glib Use GLib library for unit testing (default: auto)
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit ee583cb33423fa79beb22db20b30e10a677f9b5a
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Thu Mar 17 19:26:35 2011 -0400
config: group document related XORG_ macros together
No functional changes.
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit d5b16b037b8fe12ba85c68c8289b6a8cc5e3a09d
Author: Keith Packard <keithp@keithp.com>
Date: Thu Mar 17 23:48:52 2011 -0700
Revert "dix: Remove usage_hint from pixmaps, store it in ->drawable.class"
This reverts commit 1564c82417d201de5b9a5ec5e7aa4ef14c45fbad.
The drivers used the top bits of the usage_hint to store driver
private flags (intel, radeon, nouveau).
With EXA we need to get at this data so if we migrate the pixmap we
can create the correct type of pixmap in the driver, however this
commit truncates the usage_hint into 8-bit class and loses all the
good stuff.
Signed-off-by: Dave Airlie <airlied@gmail.com>
Reviewed-by: Keith Packard <keithp@keithp.com>
commit dc9ce695a69ca0787f58f8d160212a7a41acb703
Author: Rami Ylimäki <rami.ylimaki@vincit.fi>
Date: Wed Mar 9 15:45:40 2011 +0200
xkb: Initialize pad bytes sent in replies of geometry requests.
Valgrind complains about uninitialized data being written to clients.
Reviewed-by: Erkki Seppälä <erkki.seppala@vincit.fi>
Signed-off-by: Rami Ylimäki <rami.ylimaki@vincit.fi>
Reviewed-by: Daniel Stone <daniel@fooishbar.org>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit ee3a4951a49312a2b68025db00c71472eb84293f
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu Mar 10 09:30:02 2011 +1000
xkb: Document XkbWriteCountedString.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Daniel Stone <daniel@fooishbar.org>
commit 5c47f8beac7f87680c6f7331483b9cf94a1dbc86
Author: Rami Ylimäki <rami.ylimaki@vincit.fi>
Date: Fri Mar 11 14:30:49 2011 +0200
xkb: Release XKB component names when compiling keymap.
Reviewed-by: Erkki Seppälä <erkki.seppala@vincit.fi>
Signed-off-by: Rami Ylimäki <rami.ylimaki@vincit.fi>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 6f46ae3c69c48f389560af1491ed1729ba45866f
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Tue Mar 15 13:20:03 2011 +1000
man: list the drivers that are ignored when hotplugging (#35209)
X.Org Bug 35209 <http://bugs.freedesktop.org/show_bug.cgi?id=35209>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Cyril Brulebois <kibi@debian.org>
Reviewed-by: Julien Cristau <jcristau@debian.org>
commit 642569591a73806d038f00f2f9a5c8738f764c0b
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Sat Mar 12 07:29:35 2011 -0500
dmx/doc: remove dead code in the makefile
This was leftover from some older ways of building dmx/scale docbook.
Reviewed-by: Dan Nicholson <dbn.lists@gmail.com>
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 21f70cad19474a6f3ba419e03c0df12881ed1092
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Sat Mar 12 07:29:34 2011 -0500
man: relocate manual pages in the man subdir outside doc
The convention is to have the manual pages in a man subdir
which is not under a doc dir. The doc dir contains users docs.
This will move man pages out of the way for upcoming DocBook patches.
Reviewed-by: Dan Nicholson <dbn.lists@gmail.com>
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit d3adf2d9350bee4125107e2ea1ed0c51bb736562
Author: Erkki Seppälä <erkki.seppala@vincit.fi>
Date: Thu Mar 10 11:40:40 2011 +0200
xfree86/modes: Fixed memory leak in xf86InitialConfiguration
There were two memory leaks in the function: one was the lack of free
for "enabled", the other was the full lack of releasing anything when
configuration was too small. The first issue was fixed by adding the
missing free, the other was addressed by replacing the duplicate
memory releasing sequences with one that is gotoed into.
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Rami Ylimäki <rami.ylimaki@vincit.fi>
Signed-off-by: Erkki Seppälä <erkki.seppala@vincit.fi>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit a713832cbe494ff468a627e88b11164074bbd14e
Author: Jon TURNEY <jon.turney@dronecode.org.uk>
Date: Sun Mar 13 20:01:30 2011 +0000
When XDMCP -from is specified, only register the requested address
When XDMCP -from is specified, only register the requested address,
rather than the requested address, and any others we have of different
address families to the requested address.
e.g. if we have 4 interfaces with both IPv4 and IPv6 addresses (which
are not IPv6 mapped IPV4 addresses), using -from with one of those IPv4
addresses currently means only that IPv4 address, and all IPv6 addresses
are used in the connection data in XDMCP REQUEST packet.
(See http://cygwin.com/ml/cygwin-xfree/2011-02/msg00000.html)
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 0ac4931753a5d5925fc844c8cbec08585aea57a7
Merge: a8146f6bec d7f8011418
Author: Keith Packard <keithp@keithp.com>
Date: Mon Mar 14 13:06:41 2011 -0700
Merge remote-tracking branch 'ajax/xserver-next'
commit d7f8011418f9da06631f27c66c29bcb226d0dffe
Author: Søren Sandmann Pedersen <ssp@redhat.com>
Date: Tue Mar 8 10:14:28 2011 -0500
Remove TriStrip and TriFan from the picture screen
These functions no longer go through the screen vtable, so remove
them and fix up the various wrappers.
Reviewed-by: Adam Jackson <ajax@redhat.com>
Acked-by: Keith Packard <keithp@keithp.com>
Signed-off-by: Soren Sandmann <ssp@redhat.com>
commit 0eb5b0fbcf1233a93f285ff1e1609fcbd01e7c79
Author: Søren Sandmann Pedersen <ssp@redhat.com>
Date: Tue Mar 8 10:14:27 2011 -0500
Absorb miTriStrip() into CompositeTriStrip()
There is no need to virtualize this function that nobody cares about.
Reviewed-by: Adam Jackson <ajax@redhat.com>
Acked-by: Keith Packard <keithp@keithp.com>
Signed-off-by: Soren Sandmann <ssp@redhat.com>
commit c2af0cea02bd85f4d5954c16e34b4a8fb0fe2243
Author: Søren Sandmann Pedersen <ssp@redhat.com>
Date: Tue Mar 8 10:14:26 2011 -0500
Absorb miTriFan() into CompositeTriFan()
There is no need to virtualize this function that nobody cares about.
Reviewed-by: Adam Jackson <ajax@redhat.com>
Acked-by: Keith Packard <keithp@keithp.com>
Signed-off-by: Soren Sandmann <ssp@redhat.com>
commit a8146f6becc44bf9ad611d33bded17df07e6af21
Author: Erkki Seppälä <erkki.seppala@vincit.fi>
Date: Wed Mar 9 17:29:14 2011 +0200
mi/misprite: use memory management provided by dixRegisterPrivateKey
The record allocated by miSpriteDeviceCursorInitialize was not being
released.
This patch makes misprite use dixRegisterPrivateKey with the record
size argument, which handles the memory management
issues. miSpriteDeviceCursorInitialize is restructured to initialize
pCursorInfo only if miDCDeviceInitialize succeeds. The record itself
is zeroed on cleanup to ensure that the assumptions in the code still
hold.
Reviewed-by: Rami Ylimäki <rami.ylimaki@vincit.fi>
Signed-off-by: Erkki Seppälä <erkki.seppala@vincit.fi>
Reviewed-by: Daniel Stone <daniel@fooishbar.org>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit f985a7319ef80b9b613eeaf24581000827cb220f
Author: Erkki Seppälä <erkki.seppala@vincit.fi>
Date: Wed Mar 9 17:29:14 2011 +0200
mi/misprite: use memory management provided by dixRegisterPrivateKey
The record allocated by miSpriteDeviceCursorInitialize was not being
released.
This patch makes misprite use dixRegisterPrivateKey with the record
size argument, which handles the memory management issues.
miSpriteDeviceCursorInitialize is restructured to initialize pCursorInfo
only if miDCDeviceInitialize succeeds. The record itself is zeroed on
cleanup to ensure that the assumptions in the code still hold.
Reviewed-by: Daniel Stone <daniel@fooishbar.org>
Reviewed-by: Rami Ylimäki <rami.ylimaki@vincit.fi>
Signed-off-by: Erkki Seppälä <erkki.seppala@vincit.fi>
commit 57b35adaed112520c3b3b2fbad13cf5a91cd6652
Author: Søren Sandmann Pedersen <ssp@redhat.com>
Date: Wed Mar 9 13:57:25 2011 -0500
Remove geometry arguments from miSourceValidate()
The only user of the geometry coordinates is the software sprite code,
which uses them to remove the pointer whenever the window beneath is
being used as a source. However, using Window pictures as a source is
extremely rare (let alone *partial* windows), so there is no harm done
in just validating all of the drawable.
Additionally, the miSourceValidate() function was buggy in at least
three respects:
(a) It added drawable->{x,y} before calling down, which is wrong since
the misprite code already adds them in its check. (Alternatively,
the misprite code is wrong, but there are actual users who would
notice if that code was broken).
(b) It didn't account for the width of the interpolation filter, so if
the Picture had a bilinear or convolution filter, the edges
surrounding the source area would not be validated.
(c) It didn't validate alpha maps.
Finally, computing the bounding box of the transform on every
composite request was a real performance issue in pixman, so
presumably it could be one here as well.
This patch changes miSourceValidate() to simply validate all of the
underlying drawable.
Reviewed-by: Adam Jackson <ajax@redhat.com>
Reviewed-by: Keith Packard <keithp@keithp.com>
Signed-off-by: Soren Sandmann <ssp@redhat.com>
commit 016edc17512ba966d60edede8cf947996bae0b3c
Author: Adam Jackson <ajax@redhat.com>
Date: Mon Feb 28 17:12:26 2011 -0500
dix: Define RESTYPE as uint32_t
long is needlessly long on LP64.
Reviewed-by: Dave Airlie <airlied@redhat.com>
Reviewed-by: Daniel Stone <daniel@fooishbar.org>
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit 1f2bc777f96fd41feb55a4799ece939652130ef4
Author: Adam Jackson <ajax@redhat.com>
Date: Mon Feb 28 13:11:12 2011 -0500
dix: Shrink PropertyRec on LP64
size needn't be a long. No change on ILP32 but, combined with the
previous change, 56 -> 40 bytes on LP64.
Reviewed-by: Daniel Stone <daniel@fooishbar.org>
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit 51f353d0a0d116af16d7d9590cadef6c56328746
Author: Adam Jackson <ajax@redhat.com>
Date: Mon Feb 28 13:10:20 2011 -0500
dix: Fix ATOM typedef
unsigned long is needlessly large on LP64. Use uint32_t instead.
Reviewed-by: Daniel Stone <daniel@fooishbar.org>
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit 7ca75abbbdd2a1211e52a4f43ac4ed24d3c8ab34
Author: Christopher James Halse Rogers <christopher.halse.rogers@canonical.com>
Date: Wed Mar 9 11:17:28 2011 +1100
glx: Use PATH_MAX as size of filename buffer
Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Christopher James Halse Rogers <christopher.halse.rogers@canonical.com>
commit d17a9fb8414becf6a8998041df68f209f9222b2b
Author: Christopher James Halse Rogers <christopher.halse.rogers@canonical.com>
Date: Wed Mar 9 11:17:27 2011 +1100
Consolidate all the PATH_MAX handling into misc.h
Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Christopher James Halse Rogers <christopher.halse.rogers@canonical.com>
commit 021393d1b8bcc9ff2ff5deb2306360e6b0afa1c6
Author: Christopher James Halse Rogers <christopher.halse.rogers@canonical.com>
Date: Wed Mar 9 11:15:07 2011 +1100
glx: Factor out glxProbeDriver function.
DRI, DRI2 and swrast all had near-identical driver probing logic.
Pull it into glxdricommon.
[ajax: warning fix]
Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Christopher James Halse Rogers <christopher.halse.rogers@canonical.com>
commit 56c90e29f04727c903bd0f084d23bf44eb1a0a11
Author: Adam Jackson <ajax@redhat.com>
Date: Mon Nov 15 14:29:14 2010 -0500
randr: Add RRConstrainCursorHarder
Confine cursor motion to within the bounds of a single CRTC, iff all the
CRTCs within a ScreenRec are reachable from each other. If not you get
the same "cursor floats within the bounding rect" behaviour you get now.
v3:
- Incorporate review feedback from Christopher James Halse Rogers
v4:
- Add mode field.
Signed-off-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 810fbfa44626bff9f443ab17c0ad27ff7ae121d7
Author: Adam Jackson <ajax@redhat.com>
Date: Wed Feb 9 17:32:16 2011 -0500
mi: Call pScreen->ConstrainCursorHarder from the position update path
v2: Cover more paths, spotted by Daniel Stone.
v3: pass down the mode field for movement mode.
Reviewed-by: Daniel Stone <daniel@fooishbar.org>
Signed-off-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 769531b9ccade723a56498b0888af58d085fec9e
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri Feb 18 14:19:18 2011 +1000
Add mode field to pointer movement hooks.
Preparation work for pointer barriers.
Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 92788e677be79bd04e5ef140f4ced50ad8b1bf8e
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Tue Feb 22 12:32:01 2011 +1000
test: add some tests for basic list manipulation.
This has less purpose as a test but more as documentation on how to actually
use the differnent list calls.
Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 1ad9f01c31742157934a791e6141d10520d13e8a
Author: Adam Jackson <ajax@redhat.com>
Date: Thu Mar 10 10:47:40 2011 -0500
glx: Add texbuffer2 support to swrast
Reviewed-by: Julien Cristau <jcristau@debian.org>
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit 5fb329a04a18835ce864d0563f6dfeb3d3c78d69
Author: Dave Airlie <airlied@redhat.com>
Date: Wed Mar 9 15:05:26 2011 +1000
panoramiX: convert 1->panoramiXNumScreens loops to use macro (v2)
This converts all the remaining 1->num loops to the macro,
this removes nearly all the panoramiXNumScreens usage in
loops, and is a step to replacing it.
v2: move some from the other patch.
Signed-off-by: Dave Airlie <airlied@redhat.com>
Reviewed-by: Daniel Stone <daniel@fooishbar.org>
Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
commit 0bccfcc97b2300b83aa4693454c27ac87f23f221
Author: Dave Airlie <airlied@redhat.com>
Date: Wed Mar 9 15:01:20 2011 +1000
panoramiX: convert 0->panoramiXNumScreens loops to macro (v3)
This just uses the FOR_NSCREENS macro instead.
v2: remove some of the 1->x loops.
v3: drop the 1->0 loop, will rework later.
Signed-off-by: Dave Airlie <airlied@redhat.com>
Reviewed-by: Daniel Stone <daniel@fooishbar.org>
Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
commit 5a94934487ea477947e24dcd4720b7cde77d3d2f
Author: Dave Airlie <airlied@redhat.com>
Date: Wed Mar 9 14:53:26 2011 +1000
panoramiX: consolidate common id assignment code.
This adds a new FOR_NSCREENS_FORWARD_SKIP, which skips the first
element and is a common idiom throughout panoramiX code.
It then adds a new inline function to hide id assignment to a
panoramiX resource and cleans up lots of common repeated code.
Signed-off-by: Dave Airlie <airlied@redhat.com>
Reviewed-by: Daniel Stone <daniel@fooishbar.org>
Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
commit e2f8315daefc6e56ac8395a9f58f87bbf0809039
Author: Dave Airlie <airlied@redhat.com>
Date: Thu Mar 10 09:13:50 2011 +1000
drop exa
don't provide accel in this framework
commit c48c530e541e201ea1afe2512d85967659ceef84
Author: Dave Airlie <airlied@redhat.com>
Date: Wed Mar 9 15:11:42 2011 +1000
panoramiX: macro checking if drawable is root (v2)
this code appears in quite a few places, consolidate it into
a macro in a header.
v2: align braces with macro just above it, and with
lines removed
Signed-off-by: Dave Airlie <airlied@redhat.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
commit c3c0e2fdd326214e271ce144e8fc2725cbd738ef
Merge: a19771e433 73555555a4
Author: Keith Packard <keithp@keithp.com>
Date: Wed Mar 9 14:25:54 2011 -0800
Merge remote branch 'whot/for-keith'
commit 73555555a440855f9ae64c3367c5c7dca98c8741
Author: Adam Jackson <ajax@redhat.com>
Date: Tue Mar 8 15:33:13 2011 -0500
record: warning fix
record.c:810:9: warning: unused variable 'count'
Scope-shadowed by a later variable of the same name, safe to just
delete.
Signed-off-by: Adam Jackson <ajax@redhat.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 4d114cc5467a514faa437ce7f4c5e772e2f6a21d
Author: Adam Jackson <ajax@redhat.com>
Date: Tue Mar 8 15:33:12 2011 -0500
input: warning fixes
eventconvert.c:287:9: warning: enumeration value 'ET_Enter' not handled in switch
eventconvert.c:287:9: warning: enumeration value 'ET_Leave' not handled in switch
eventconvert.c:287:9: warning: enumeration value 'ET_FocusIn' not handled in switch
eventconvert.c:287:9: warning: enumeration value 'ET_FocusOut' not handled in switch
eventconvert.c:287:9: warning: enumeration value 'ET_DeviceChanged' not handled in switch
eventconvert.c:287:9: warning: enumeration value 'ET_Hierarchy' not handled in switch
eventconvert.c:287:9: warning: enumeration value 'ET_DGAEvent' not handled in switch
eventconvert.c:287:9: warning: enumeration value 'ET_RawKeyPress' not handled in switch
eventconvert.c:287:9: warning: enumeration value 'ET_RawKeyRelease' not handled in switch
eventconvert.c:287:9: warning: enumeration value 'ET_RawButtonPress' not handled in switch
eventconvert.c:287:9: warning: enumeration value 'ET_RawButtonRelease' not handled in switch
eventconvert.c:287:9: warning: enumeration value 'ET_RawMotion' not handled in switch
eventconvert.c:287:9: warning: enumeration value 'ET_XQuartz' not handled in switch
eventconvert.c:287:9: warning: enumeration value 'ET_Internal' not handled in switch
From the code it appears these are can't happens, so if they ever do,
BadImplementation seems entirely appropriate.
Signed-off-by: Adam Jackson <ajax@redhat.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 7b5e562ea74039832116ee13db910f290f074782
Author: Adam Jackson <ajax@redhat.com>
Date: Tue Mar 8 15:33:11 2011 -0500
input: warning fix
getevents.c:770:5: warning: suggest parentheses around '&&' within '||'
Introduced with dc57f89959e549403f8488eb9f23425bd7118b22:
- if(dev->u.master && dev->valuator) {
+ if(dev->valuator && IsMaster(dev) || !IsFloating(dev)) {
So I'm assuming the two terms around the || are meant to be a unit.
Signed-off-by: Adam Jackson <ajax@redhat.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 33fee13361e745e1db29e250b08622c83046d488
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Tue Mar 8 14:41:21 2011 +1000
Xi: fix XI2 passive grab reply length calculation
If modifiers failed, the reply length was 4 bytes too short.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Julien Cristau <jcristau@debian.org>
Reviewed-by: Daniel Stone <daniel@fooishbar.org>
commit eb8141b6edd8b477c0ba796be71e985c35520a9b
Author: Julien Cristau <jcristau@debian.org>
Date: Mon Mar 7 18:55:19 2011 +0100
Xi: fix length checks for swapped clients
ChangeDeviceProperty and XIChangeProperty are followed by some data, so
use REQUEST_AT_LEAST_SIZE instead of REQUEST_SIZE_MATCH.
X.Org bug#35082 <https://bugs.freedesktop.org/show_bug.cgi?id=35082>
Reported-by: Markus Fleschutz <markus.fleschutz@x-software.com>
Signed-off-by: Julien Cristau <jcristau@debian.org>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 4114533db6704324fc26f28a444415e325ace8e0
Author: Rami Ylimäki <rami.ylimaki@vincit.fi>
Date: Fri Mar 4 17:55:33 2011 +0200
config: Ensure that stolen option list elements are released.
NewInputDeviceRequest steals the contents of option list elements but
doesn't use the elements themselves for anything. Therefore the list
elements need to be released always.
Signed-off-by: Rami Ylimäki <rami.ylimaki@vincit.fi>
Reviewed-by: Erkki Seppälä <erkki.seppala@vincit.fi>
Reviewed-by: Adam Jackson <ajax@redhat.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 8d30aff4aa708b9b885d492602ced7493a96a4df
Author: Rami Ylimäki <rami.ylimaki@vincit.fi>
Date: Fri Mar 4 17:55:32 2011 +0200
dix: Release input device config info when the device disconnects.
Signed-off-by: Rami Ylimäki <rami.ylimaki@vincit.fi>
Reviewed-by: Erkki Seppälä <erkki.seppala@vincit.fi>
Reviewed-by: Adam Jackson <ajax@redhat.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 40e56d34538f4663426db50893c231a2b5d760dc
Author: Rami Ylimäki <rami.ylimaki@vincit.fi>
Date: Fri Mar 4 17:55:31 2011 +0200
xkb: Ensure that XKB device private won't leak on device disconnect.
Signed-off-by: Rami Ylimäki <rami.ylimaki@vincit.fi>
Reviewed-by: Erkki Seppälä <erkki.seppala@vincit.fi>
Reviewed-by: Adam Jackson <ajax@redhat.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 18413f55089623123537c1499b02aa95ca2014d2
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu Mar 3 14:15:55 2011 +1000
xfree86: block signals between EnableDevice and first CheckMotion()
Devices usually enable SIGIO processing in EnableDevice. CheckMotion
initialises the pointer sprite, sends Enter/Leave events, etc. This leaves
us with a small window where events may be processed without the sprite or
pointer position (as seen from the protocol) is valid.
Block signals during this window.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Daniel Stone <daniel@fooishbar.org>
commit a19771e4337d1c4600550314bbc42a1495a023ff
Author: Erkki Seppälä <erkki.seppala@vincit.fi>
Date: Tue Mar 8 13:29:41 2011 -0500
xfree86/common: Remove a configScreen leak when conf_screen is NULL
configScreen used a dynamically allocated buffer for XF86ConfScreenRec
when conf_screen argument was NULL. This pointer was never stored
anywhere, nor was it released, so this patch makes the function use
automatically allocated storage in that situation.
[ajax: minor grammar fix]
Reviewed-by: Adam Jackson <ajax@redhat.com>
Reviewed-by: Rami Ylimäki <rami.ylimaki@vincit.fi>
Signed-off-by: Erkki Seppälä <erkki.seppala@vincit.fi>
commit b73ebe65cd071a063417ac9c38513a6742e32428
Author: Adam Jackson <ajax@redhat.com>
Date: Wed Mar 2 12:12:35 2011 -0500
glx: Remove unused _glapi_get_proc_name
Reviewed-by: Julien Cristau <jcristau@debian.org>
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit 4377288abdbaac8506d8643b440c300ba03182fe
Author: Adam Jackson <ajax@redhat.com>
Date: Wed Mar 2 11:52:27 2011 -0500
glx: Simplify _glapi_check_multithread
We can guarantee that the X server does not call DRI driver services
from multiple threads, so _glapi_check_multithread need never do
anything special. As a result, ThreadSafe is always false, so remove it
and simplify expressions where it appeared to match.
Reviewed-by: Julien Cristau <jcristau@debian.org>
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit d5e8bb2150ce9d8a4132d61f76621a2c7a7f0acf
Author: Adam Jackson <ajax@redhat.com>
Date: Wed Mar 2 11:26:05 2011 -0500
glx: unifdef BEOS_THREADS
We don't support BeOS, so, no.
Reviewed-by: Daniel Stone <daniel@fooishbar.org>
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit 3692ff0b35e774a6f6cbedf634d53c4df2e53a24
Author: Adam Jackson <ajax@redhat.com>
Date: Wed Mar 2 11:22:45 2011 -0500
glx: unifdef USE_XTHREADS
xthreads is an ancient wrapper around a half dozen or so common thread
APIs, including pthreads. Just use pthreads directly if you have it; if
you don't, get with the times.
Reviewed-by: Julien Cristau <jcristau@debian.org>
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit 2371b44f9eb9181ec2c081ce66befee51d18bf6e
Author: Adam Jackson <ajax@redhat.com>
Date: Wed Mar 2 11:17:07 2011 -0500
glx: unifdef SOLARIS_THREADS
Solaris 7 and older are not supported; Solaris 8 and later have (and
use) pthreads.
Acked-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit a5fdd1aa06c7c8ecefeafafc4a778fc816ad41a4
Author: Adam Jackson <ajax@redhat.com>
Date: Wed Mar 2 10:20:02 2011 -0500
glx: Remove unused _glapi_get_proc_offset and friends
Reviewed-by: Julien Cristau <jcristau@debian.org>
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit 2cb3dc020cbec1ba64848dac532b3bb2d84d0635
Author: Adam Jackson <ajax@redhat.com>
Date: Mon Feb 28 17:11:35 2011 -0500
xi: Use RESTYPE consistently
No functional change
Reviewed-by: Soren Sandmann <ssp@redhat.com>
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit 2413702aa0b488f1a4f828a017d5b508c4f219f1
Author: Adam Jackson <ajax@redhat.com>
Date: Mon Feb 28 16:54:17 2011 -0500
xvmc: Use RESTYPE consistently
Also mark these static since they're not used externally.
Reviewed-by: Soren Sandmann <ssp@redhat.com>
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit cd58924d294de2abddbd2f03c2db021894fe9759
Author: Adam Jackson <ajax@redhat.com>
Date: Mon Feb 28 16:28:26 2011 -0500
xinerama: Use RESTYPE consistently
No functional change
Reviewed-by: Soren Sandmann <ssp@redhat.com>
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit 9a6a9971b03381b7c44257284edecdfa0135957f
Author: Adam Jackson <ajax@redhat.com>
Date: Mon Feb 28 16:25:23 2011 -0500
xv: Use RESTYPE where appropriate
No functional change.
Reviewed-by: Soren Sandmann <ssp@redhat.com>
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit fddfd026a0e4a8190dc01fb0f38af4b2c29b63a3
Author: Adam Jackson <ajax@redhat.com>
Date: Mon Feb 28 13:01:15 2011 -0500
dix: Remove PIXEL typedef
Doesn't appear to be used anywhere.
Reviewed-by: Soren Sandmann <ssp@redhat.com>
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit 82a8677d9175732a61df4116a396b76a7704efb4
Author: Adam Jackson <ajax@redhat.com>
Date: Thu Jan 20 22:49:32 2011 -0500
dix: Remove deprecated.c
No more internal users, this can be dropped now.
Reviewed-by: Soren Sandmann <ssp@redhat.com>
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit 1564c82417d201de5b9a5ec5e7aa4ef14c45fbad
Author: Adam Jackson <ajax@redhat.com>
Date: Thu Jan 20 18:37:45 2011 -0500
dix: Remove usage_hint from pixmaps, store it in ->drawable.class
The class field was unused for pixmaps, and we don't have enough classes
to justify a whole uint32 anyway.
Reviewed-by: Soren Sandmann <ssp@redhat.com>
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit d8caa782009abf4dc17b945e325e83fda299a534
Author: Adam Jackson <ajax@redhat.com>
Date: Thu Feb 24 16:06:34 2011 -0500
vbe: Fix malloc size bug
v2: Slightly more obvious sizing math.
==14882== Invalid write of size 2
==14882== at 0x6750267: VBEGetVBEInfo (vbe.c:400)
==14882== by 0x6142064: ??? (in /usr/lib64/xorg/modules/drivers/vesa_drv.so)
==14882== by 0x471895: InitOutput (xf86Init.c:519)
==14882== by 0x422778: main (main.c:205)
==14882== Address 0x4f32fa8 is 72 bytes inside a block of size 73 alloc'd
==14882== at 0x4A0640D: malloc (vg_replace_malloc.c:236)
==14882== by 0x675024B: VBEGetVBEInfo (vbe.c:398)
==14882== by 0x6142064: ??? (in /usr/lib64/xorg/modules/drivers/vesa_drv.so)
==14882== by 0x471895: InitOutput (xf86Init.c:519)
==14882== by 0x422778: main (main.c:205)
Reviewed-by: Mark Kettenis <kettenis@openbsd.org>
Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit 628d16a92a7fa556fbb70bf4a4adf57ec05c190b
Author: Keith Packard <keithp@keithp.com>
Date: Sat Feb 26 10:31:50 2011 -0800
loader: Don't distribute sdksyms.c and make it depend on the config
sdksyms.c is constructed by processing header files with the C
preprocessor. Its contents will vary depending on the precise
configuration options, and so must depend on the config header
files.
We have one header file which is always changed when any config option
is modified called do-not-use-config.h (which may want a different
name at some point), so make sdksyms.c depend on that file.
Also, we don't want to ship this file; it always needs to be
built. So, include it in the nodist_libloader_la_SOURCES list to
prevent it from being added to the tarball.
Signed-off-by: Keith Packard <keithp@keithp.com>
Reviewed-by: Dan Nicholson <dbn.lists@gmail.com>
commit 705f047876f78bbdfb368c3643925af1d1d17f71
Author: Julien Cristau <jcristau@debian.org>
Date: Fri Mar 4 01:12:01 2011 +0100
configure.ac: bump version for 1.11 development
Signed-off-by: Julien Cristau <jcristau@debian.org>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 6c90e839d9872a37d371578c9c423e8213922044
Merge: 0bc95d5b06 edcceedbd3
Author: Keith Packard <keithp@keithp.com>
Date: Thu Mar 3 14:41:44 2011 -0800
Merge remote branch 'whot/for-keith'
commit 0bc95d5b06dcea65a1aa193ea907b50f7dd168b5
Merge: 3f41f4adea 69a9171dbb
Author: Keith Packard <keithp@keithp.com>
Date: Thu Mar 3 14:33:08 2011 -0800
Merge remote branch 'jeremyhu/master'
commit 3f41f4adea4bbb90d4bda4dab600595b655e3ed8
Merge: 8e4c3ce55b dae24abcd4
Author: Keith Packard <keithp@keithp.com>
Date: Thu Mar 3 14:12:36 2011 -0800
Merge remote branch 'sandmann/for-keithp'
commit 8e4c3ce55b0f186bc6ba4039e30629669b6087b7
Merge: f3d19c0cf3 296561506a
Author: Keith Packard <keithp@keithp.com>
Date: Thu Mar 3 13:42:07 2011 -0800
Merge remote branch 'rjy/clientids'
commit 1c008e7e7865b405b8033f625333cd64ece4499e
Author: Simon Thum <simon.thum@gmx.de>
Date: Wed Feb 23 02:29:35 2011 +0100
dix: change all timestamps in pointer acceleration to CARD32
CARD32 is being returned by GetTimeInMilis(), so use it consistently.
Signed-off-by: Simon Thum <simon.thum@gmx.de>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit a4b85261859b17dba9ad8f7f1ce650133f0235d4
Author: Simon Thum <simon.thum@gmx.de>
Date: Wed Feb 23 02:29:34 2011 +0100
dix: update pointer acceleration code to use ValuatorMask
Signed-off-by: Simon Thum <simon.thum@gmx.de>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 8128846e16b406c7d459ae7556f7cd09bdc24c91
Author: Simon Thum <simon.thum@gmx.de>
Date: Wed Feb 23 02:29:33 2011 +0100
dix: refactor predictable scheme initialization
This intends to clean up the predictable accel struct
from purely scheme-related things like input properties,
as they would be useless in other use cases such
as wheel acceleration.
Signed-off-by: Simon Thum <simon.thum@gmx.de>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 69a9171dbbafd6a7db702d48770d28fb54717545
Author: Jeremy Huddleston <jeremyhu@apple.com>
Date: Tue Mar 1 20:02:46 2011 -0800
XQuartz: pbproxy: Protect against possible collision between Cocoa and X11 Cursor types
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
commit dae24abcd44f3bb1966faa88222f851c784b37dc
Author: Søren Sandmann Pedersen <ssp@redhat.com>
Date: Mon Feb 28 11:10:38 2011 -0500
Delete RegionClipSpans()
Nothing uses it.
Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Søren Sandmann Pedersen <ssp@redhat.com>
commit edcceedbd35df576929685767d0b619659e5b020
Author: Adam Jackson <ajax@redhat.com>
Date: Mon Feb 28 12:32:53 2011 -0500
xext: Remove XCALIBRATE extension
Nobody can have been using this, it's never called from extension init.
XI2 device properties should now be a functional replacement.
Signed-off-by: Adam Jackson <ajax@redhat.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit c2207d11f243900bc2f641e08d80da63d84e97a8
Merge: 00779932de 579ee8f5d8
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Mon Feb 28 11:26:09 2011 +1000
Merge branch 'next' into for-keith
Conflicts:
dix/devices.c
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 0343aed1f082baf4bfbd730c1c3582f1410b8741
Author: Jeremy Huddleston <jeremyhu@apple.com>
Date: Sun Feb 27 16:18:27 2011 -0800
XQuartz: Don't use deprecated CoreGraphics API on SL and Lion
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
commit de32d4dcf57c10fc100c1b33630127947a8c8460
Author: Jeremy Huddleston <jeremyhu@apple.com>
Date: Sun Feb 27 15:49:10 2011 -0800
Revert "rootless: Remove ROOTLESS_WORKAROUND"
Christof Wolf has reported a regression that seems to be caused by
this change, so reverting the change in the 1.9 branch. We'll
investigate a proper fix in master for 1.10.
This reverts commit c89f0521044083a11d538ebfeaabee6fc7fb9a03.
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
commit 00779932de861bf7ac8c625802f1afed75d01b6f
Author: Matthieu Herrb <matthieu.herrb@laas.fr>
Date: Sun Feb 27 20:16:03 2011 +0100
Don't clobber input device options from xorg.conf
Since commit b8d9c5ff removed commonOptions, we now
need to append the "Core{Keyboard,Pointer}" options to
the existing list.
Fixes passing options to devices confirured in xorg.conf
on systems where autoaddevices is false.
Signed-off-by: Matthieu Herrb <matthieu.herrb@laas.fr>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 8cf3348e90846f5b04236479042228fb98ac8f70
Author: Jeremy Huddleston <jeremyhu@apple.com>
Date: Tue Feb 8 11:38:35 2011 -0800
XQuartz: RandR: Add RandR modes for the primary display in multi-monitor configs
We now support using RandR to set the resolution of the primary display (and
place a shielding window on other displays) in multi-monitor configurations.
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
commit 968652983f8e6ae6889b48e15f4098ff6ad4a15a
Author: Jeremy Huddleston <jeremyhu@apple.com>
Date: Tue Feb 8 12:26:35 2011 -0800
XQuartz: RandR: Provide an alert box when entering a RandR mode for the first time.
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
commit 13578b852b7631f99cf1fd5e2e5469edc5aae369
Author: Jeremy Huddleston <jeremyhu@apple.com>
Date: Tue Feb 8 11:37:52 2011 -0800
XQuartz: RandR: Capture the display when switching modes with RandR
This will prevent native windows from resizing as we change resolutions.
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
commit 7dff79e39564b403c3afbc5e7bacffa0df190a23
Author: Søren Sandmann Pedersen <ssp@redhat.com>
Date: Fri Feb 11 09:00:10 2011 -0500
Implement fbAddTriangles() in terms of pixman_add_triangles()
This allows the remaining triangle-to-trap conversion code to be
deleted.
Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Søren Sandmann <ssp@redhat.com>
commit 566f1931ee2916269e164e114bffaf2da1d039d1
Author: Søren Sandmann Pedersen <ssp@redhat.com>
Date: Tue Jan 11 10:33:57 2011 -0500
Move miTriangles to fb as fbTriangles()
The fb version simply calls the new pixman_composite_triangles(). This
allows us to get rid of miCreateAlphaPicture().
Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Søren Sandmann <ssp@redhat.com>
commit 788ccb9a8bcf6a4fb4054c507111eec3338fb969
Author: Søren Sandmann Pedersen <ssp@redhat.com>
Date: Tue Jan 11 09:46:46 2011 -0500
Move miTrapezoids() into fb as fbTrapezoids()
The main consumer of trapezoids, cairo, is using the Trapezoids
request, which is currently implemented in the miTrapezoids()
function. That function splits the request into smaller bits and calls
lower level functions such as AddTrap.
By moving the implementation of the whole request into fb, we can
instead call pixman_composite_trapezoids() to do the whole request in
one step.
There are no callers of miTrapezoids in any of the open source
drivers, although exa and uxa have their own copies of the function.
Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Søren Sandmann <ssp@redhat.com>
commit 197df069a4037d6faa2723c31ffba09c95d71166
Author: Søren Sandmann Pedersen <ssp@redhat.com>
Date: Wed Feb 23 10:36:57 2011 -0500
Require pixman 0.21.6
The following patches need pixman_composite_trapezoids() and
pixman_add_triangles().
Signed-off-by: Soren Sandmann <ssp@redhat.com>
commit f3d19c0cf3327cceb90f7378f5d8fc0c3e327400
Author: Keith Packard <keithp@keithp.com>
Date: Fri Feb 25 21:22:23 2011 -0800
Version bumped to 1.10
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 678f5396c91b3d0c7572ed579b0a4fb62b2b4655
Author: Keith Packard <keithp@keithp.com>
Date: Fri Feb 25 21:10:21 2011 -0800
input: Ensure Valuator axes are aligned as needed
Let the compiler figure out the correct alignment for the axes data
for a valuator by using a union to force double alignment of the
initial ValuatorClassRec structure in the allocation.
Signed-off-by: Keith Packard <keithp@keithp.com>
Tested-by: Julien Cristau <jcristau@debian.org>
Reviewed-by: Julien Cristau <jcristau@debian.org>
commit dc8f52e77f51b6fa8908d9611c3f7e3cfbbaf2d1
Author: Keith Packard <keithp@keithp.com>
Date: Fri Feb 25 16:38:27 2011 -0800
hw/dmx/doc: Add explicit dependency for all doxygen output files
Instead of listing one of the doxygen output files and depending on
sequential execution to ensure that the other files were present
before make checked for them, create explicit dependencies so that
make will not check for the additional files until after doxygen has
been run.
This allows parallel make to work correctly in this directory.
Signed-off-by: Keith Packard <keithp@keithp.com>
Tested-by: Kristian Høgsberg <krh@bitplanet.net>
commit fd4d9c75c265add8d6cc74afb341c9c4f2ec1073
Author: Keith Packard <keithp@keithp.com>
Date: Fri Feb 25 10:54:50 2011 -0800
hw/xwin: Look for gl spec files in $(srcdir) or .
Tarballs include the downloaded gl spec files, which will end up in
$(srcdir). But, git-based builds will not have them at all and will
need to download them from opengl.org. They'll land in in the build
directory instead of $(srcdir), and so we need to allow them to be in
either place.
This change checks for the files in $(srcdir), linking them to . if
present. Otherwise, it downloads them from opengl.org.
A suggested better solution is to have Mesa install these files somewhere.
Signed-off-by: Keith Packard <keithp@keithp.com>
Tested-by: Kristian Høgsberg <krh@bitplanet.net>
commit 6b951dec69103ca76d6d4a61b1a2f67a52d013b9
Author: Dan Nicholson <dbn.lists@gmail.com>
Date: Sun Feb 20 09:51:15 2011 -0800
dmx: Construct paths in doxygen.conf to fix VPATH builds
The paths in doxygen.conf assumed that srcdir=builddir and broke
otherwise. Use autoconf to fill in the paths to the srcdir so that the
files can be found when users have a separate build directory (as with
distcheck).
Signed-off-by: Dan Nicholson <dbn.lists@gmail.com>
Tested-by: Cyril Brulebois <kibi@debian.org>
Reviewed-by: Gaetan Nadon <memsize@videotron.ca>
Tested-by: Sedat Dilek <sedat.dilek@gmail.com>
commit 61ce915bf78570b7c8d53c118700ef7274bbdfb7
Author: Dan Nicholson <dbn.lists@gmail.com>
Date: Tue Feb 15 06:03:28 2011 -0800
xfree86: Allow sdksyms.dep to be included portably
Non-GNU makes don't deal with the sinclude or -include variants that
allow Makefile stubs to be created and then included during the build.
Instead, create an empty file at the end of configure so that the
regular include statement can be included. This is how automake handles
automatic source dependencies.
In order to trick automake into not processing the include statement, a
variable is used.
Signed-off-by: Dan Nicholson <dbn.lists@gmail.com>
Tested-by: Alan Coopersmith <alan.coopersmith@oracle.com>
commit 780a77acce1dd369549ece802b3e2c4006058dfe
Author: Keith Packard <keithp@keithp.com>
Date: Thu Feb 24 20:45:46 2011 -0800
Version bumped to 1.9.99.903 (1.10 RC3)
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 9d23459415b84606ee4f38bb2d19054c432c8552
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri Feb 25 11:08:19 2011 +1000
dix: release all buttons and keys before reattaching a device (#34182)
Testcase:
xinput float <keyboard name>
results in the keyboard's enter key being repeated as the device is detached
while the key is still physically down. To avoid this, release all keys and
buttons before reattaching the device.
X.Org Bug 34182 <http://bugs.freedesktop.org/show_bug.cgi?id=34182>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Fernando Carrijo <fcarrijo@freedesktop.org>
commit 229b055bdbc53370944401649234e8a38183f4fb
Merge: 6178959e3d b17fc99cb9
Author: Keith Packard <keithp@keithp.com>
Date: Thu Feb 24 19:44:35 2011 -0800
Merge remote branch 'jeremyhu/master'
commit 6178959e3dd6482a4317de6eb14eb19ca7329b9c
Author: Keith Packard <keithp@keithp.com>
Date: Thu Feb 24 19:42:02 2011 -0800
xfree86: Bump video ABI to 10.0
RandR 1.4 revert changed things
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 31704510f448706524b7b7085cc4ff0ada7bfe7e
Author: Michel Dänzer <daenzer@vmware.com>
Date: Thu Feb 24 12:17:57 2011 +0100
EXA/mixed: ModifyPixmapHeader pitch fixes. (bug #33929)
If there's a GPU copy and a non-zero devKind was passed in, set the GPU copy
pitch to that instead of to a possibly bogus value derived from the new width.
This is e.g. used by the radeon driver's drmmode_xf86crtc_resize hook, fixes
https://bugs.freedesktop.org/show_bug.cgi?id=33929 .
On the other hand, the system memory copy doesn't need the pitch to be aligned
beyond the PixmapBytePad of the width.
Signed-off-by: Michel Dänzer <daenzer@vmware.com>
Acked-by: Cyril Brulebois <kibi@debian.org>
Tested-by: Cyril Brulebois <kibi@debian.org>
Reported-by: Thierry Vignaud <thierry.vignaud@gmail.com>
Tested-by: Thierry Vignaud <thierry.vignaud@gmail.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit b17fc99cb9ca9ff0a3592f783a906cdcc35da748
Author: Jeremy Huddleston <jeremyhu@apple.com>
Date: Thu Feb 24 19:24:35 2011 -0800
XQuartz: Localization Updates
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
commit 59850630fefe5e4f0430d7e2e106937fdf1e7ffb
Author: Jeremy Huddleston <jeremyhu@apple.com>
Date: Thu Feb 24 19:18:35 2011 -0800
XQuartz: Add LSApplicationCategoryType key to Info.plist
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
commit 83861595782aaa05907f9cf7b236d50261d404d9
Merge: a1cc0e52b0 4102a00962
Author: Keith Packard <keithp@keithp.com>
Date: Thu Feb 24 18:59:07 2011 -0800
Merge remote branch 'kibi/master'
commit a1cc0e52b0e8ca40bc1218de553424b2bcb760ef
Author: Alexandr Shadchin <alexandr.shadchin@gmail.com>
Date: Tue Nov 30 21:17:19 2010 +0500
Removing unused code
In OpenBSD removed support PCCONS in 2002 year
http://marc.info/?l=openbsd-cvs&m=102435816424294&w=2
Signed-off-by: Alexandr Shadchin <Alexandr.Shadchin@gmail.com>
Reviewed-by: Matthieu Herrb <matthieu.herrb@laas.fr>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 365ad68fb9f7029550505b7c276a808050cada9c
Merge: 0801afbd7c 720c895db9
Author: Keith Packard <keithp@keithp.com>
Date: Thu Feb 24 18:49:40 2011 -0800
Merge remote branch 'ajax/for-keithp'
commit 0801afbd7c2c644c672b37f8463f1a0cbadebd2e
Author: Erkki Seppälä <erkki.seppala@vincit.fi>
Date: Thu Feb 10 15:35:14 2011 +0200
record: avoid crash when calling RecordFlushReplyBuffer recursively
RecordFlushReplyBuffer can call itself recursively through
WriteClient->CallCallbacks->_CallCallbacks->RecordFlushAllContexts
when the recording client's buffer cannot be completely emptied in one
WriteClient. When a such a recursion occurs, it will not be broken out
of which results in segmentation fault when the stack is exhausted.
This patch adds a counter (a flag, really) that guards against this
situation, to break out of the recursion.
One alternative to this change would be to change _CallCallbacks to
check the corresponding counter before the callback loop, but that
might affect existing behavior, which may be relied upon.
Reviewed-by: Rami Ylimäki <rami.ylimaki@vincit.fi>
Signed-off-by: Erkki Seppälä <erkki.seppala@vincit.fi>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 816f1f8ffafbfbf0dd31ea86f295987f84151feb
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Tue Feb 22 12:48:04 2011 +1000
include: document list interface.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
commit b833f9b924ddc043244c0a026547c438f1c4d4df
Author: Keith Packard <keithp@keithp.com>
Date: Wed Feb 23 11:18:35 2011 -0800
Revert "Replace huge argument list in xf86CrtcSetModeTransform with struct"
This reverts commit 8b35118c03590a7ad3786d3284bafb3f40fcb8cc.
commit 7030c82648930cea7ef8a2ea49d8138078920d4d
Author: Keith Packard <keithp@keithp.com>
Date: Wed Feb 23 11:18:16 2011 -0800
Revert "Require RandR protocol version 1.4 or newer"
This reverts commit c8bc25fd7629df10f2825b7cc713b031ae78f223.
commit a91d33917befd6719bb7f01007bc253a2aefb0bb
Author: Keith Packard <keithp@keithp.com>
Date: Wed Feb 23 11:18:12 2011 -0800
Revert "randr: Add sprite position transforms"
This reverts commit 66294afcab7b7a82f7dd897767e46c48a94b8ee8.
commit 3d4ee25a1e2e0ed2463ceaabea8f5a284a6ddd60
Author: Keith Packard <keithp@keithp.com>
Date: Wed Feb 23 11:18:08 2011 -0800
Revert "randr: Implement RRSetCrtcConfigs"
This reverts commit d94a035ea9eb3167fc4f35b2d9f0d53f8807014c.
commit 8b0e651f7d09a7f35c87a4d0a6e2053cae93b516
Author: Keith Packard <keithp@keithp.com>
Date: Wed Feb 23 11:18:05 2011 -0800
Revert "hw/xfree86/modes: Add optional driver API for RRSetCrtcConfigs"
This reverts commit 86c489c319c705f710bee3897fe27600ce15008e.
commit 9e8c20b0d49783d6b9334d4c11c4e6e3ba273524
Author: Keith Packard <keithp@keithp.com>
Date: Wed Feb 23 11:17:42 2011 -0800
Revert "randr: Add per-crtc pixmaps"
This reverts commit 82612045e11f2b882ae132e184a9629f43f1c424.
commit 9f47780ecdc7693f756587a758ec0141e75cb1eb
Author: Keith Packard <keithp@keithp.com>
Date: Wed Feb 23 11:17:36 2011 -0800
Revert "randr: Hook up the new RandR 1.4 functionality"
This reverts commit afb6ebf1d5829346c40fe1053c9f50afe926e6c6.
commit 793a242c89fccdbf1a2557ba33da1da2cb4ff8c4
Author: Keith Packard <keithp@keithp.com>
Date: Wed Feb 23 11:17:33 2011 -0800
Revert "DIX is responsible for ref counting scanout pixmaps."
This reverts commit 96b4d4787bf82edd9d06eb9a6e94bc45412c7df2.
commit 7b7cd3f121b3904ad851155f853ce87a0e00d002
Author: Keith Packard <keithp@keithp.com>
Date: Wed Feb 23 11:17:29 2011 -0800
Revert "Set sprite transforms from RRSetCrtcConfigs"
This reverts commit a88d70fb20a2bc3152b84adff4380857e6cfadf5.
commit fd9331f6eb39a28da7de4867b2e3a460f667d514
Author: Keith Packard <keithp@keithp.com>
Date: Wed Feb 23 11:17:24 2011 -0800
Revert "Separate out screen size and screen pixmap sizes in RRScreenSizeSet"
This reverts commit 752c368421c1c824752cf467fba9318d75d2ca2c.
commit 4d91e7a63161cdde9af53aedb3fe3e53dbe3049e
Author: Keith Packard <keithp@keithp.com>
Date: Wed Feb 23 11:17:20 2011 -0800
Revert "ProcRRSetCrtcConfigs uses 'configs' without being initialized"
This reverts commit b0f4bd61f0caf80f3be9a176f1f7a707bc6628d8.
commit 00d0b235cfbfb162ddd58c088d2ed03e55a9c5cb
Author: Keith Packard <keithp@keithp.com>
Date: Wed Feb 23 11:16:48 2011 -0800
Revert "randr: handle RRSetCrtcConfigs request with zero configs"
This reverts commit 0d01b66df9081ef48843b3bad81c56bb2cd1ae69.
commit 720c895db9327bbdc32215a67236303d2ceafad4
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Wed Feb 23 13:36:20 2011 -0500
Add mode field to ConstrainCursorHarder
For Pointer Barriers, the movement mode is important and must be passed
through.
Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit a16e282200f84233041e5a565c6363a5a78be525
Author: Adam Jackson <ajax@redhat.com>
Date: Mon Feb 8 15:40:22 2010 -0500
xfree86: Fix the sdk headers to be multilib-safe
Use _LP64 (verified on gcc and sun compilers) instead of _XSERVER64 in
internal header usage, and always define _XSERVER64 for modules if _LP64
is defined. Prevents differing xorg-server.h between 32 and 64 bit
packages.
Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit dc498b433f36af5d2de3065e7c64cdb575385d81
Author: Adam Jackson <ajax@redhat.com>
Date: Mon Feb 8 15:23:04 2010 -0500
xfree86: If the driver found modes on an output, don't add more
Inferring modes from sync ranges is only valid if the monitor says it's
valid. If the monitor says it's valid, then we'll have already added
those modes during EDID block parse. If it doesn't, then we should
believe it.
If there's no EDID for an output, but sync ranges from the config, we'll
still add default modes as normal.
Reviewed-by: Alex Deucher <alexdeucher@gmail.com>
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit 303977fbcf9c641b7e19dfde192cef585f5b455c
Author: Adam Jackson <ajax@redhat.com>
Date: Tue Feb 8 14:52:49 2011 -0500
glxproxy: warning fix
glxvendor.c: In function ‘__glXVForwardPipe0WithReply’:
glxvendor.c:205:10: warning: ‘be_buf’ may be used uninitialized in this function
Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit 405ad0610d6e2f4606768294b655ac52aee9ae58
Author: Adam Jackson <ajax@redhat.com>
Date: Tue Feb 8 14:51:47 2011 -0500
glxproxy: warning fix
glxvendor.c: In function ‘__glXVForwardAllWithReply’:
glxvendor.c:284:10: warning: ‘be_buf’ may be used uninitialized in this function
glxvendor.c:285:10: warning: ‘be_buf_size’ may be used uninitialized in this function
Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit a4cd2e0da6415ec1b3b182579bebbe2a41f29d30
Author: Adam Jackson <ajax@redhat.com>
Date: Tue Feb 8 14:47:05 2011 -0500
glxproxy: warning fix
glxsingle.c: In function ‘__glXForwardPipe0WithReply’:
glxsingle.c:218:10: warning: ‘be_buf’ may be used uninitialized in this function
Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit f928caca6e60215bc9ab423acae5542dfabc9bec
Author: Adam Jackson <ajax@redhat.com>
Date: Tue Feb 8 14:45:31 2011 -0500
glxproxy: warning fix
glxsingle.c: In function ‘__glXForwardAllWithReply’:
glxsingle.c:300:10: warning: ‘be_buf’ may be used uninitialized in this function
glxsingle.c:301:10: warning: ‘be_buf_size’ may be used uninitialized in this function
Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit dad2712c9328e113db4de768a12a8dafa6c177e9
Author: Adam Jackson <ajax@redhat.com>
Date: Tue Feb 8 14:44:03 2011 -0500
glxproxy: warning fix
glxsingle.c: In function ‘__glXDisp_ReadPixels’:
glxsingle.c:760:11: warning: ‘buf’ may be used uninitialized in this function
Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit 4270157bac645550e2c0afe89479c0bfe9d53447
Author: Adam Jackson <ajax@redhat.com>
Date: Tue Feb 8 14:38:23 2011 -0500
glxproxy: warning fix
render2swap.c:264:13: warning: ‘swapArray’ defined but not used
Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit 5d0910b4fdf99e3239635a01eb2709c32d0e5bb9
Author: Adam Jackson <ajax@redhat.com>
Date: Tue Feb 8 14:32:54 2011 -0500
glxproxy: warning fix
glxcmds.c: In function ‘CreateGLXPixmap’:
glxcmds.c:1663:20: warning: comparison between pointer and integer
glxcmds.c:1663:38: warning: comparison between pointer and integer
Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit e1b5d3e5e7f157ab769c40ad2efdc1281c25a03a
Author: Adam Jackson <ajax@redhat.com>
Date: Tue Feb 8 14:18:53 2011 -0500
glxproxy: warning fix
glxcmds.c: In function ‘CreateGLXPixmap’:
glxcmds.c:1641:22: warning: ‘pGlxScreen’ may be used uninitialized in this function
Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit 3b9de273a94fb68de51238c20c3182396aa41b84
Author: Adam Jackson <ajax@redhat.com>
Date: Tue Feb 8 14:07:20 2011 -0500
glxproxy: warning fix
glxcmds.c: In function ‘CreateContext.clone.6’:
glxcmds.c:105:19: warning: ‘be_fbconfigId’ may be used uninitialized in this function
glxcmds.c:104:14: warning: ‘be_vid’ may be used uninitialized in this function
Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit 767b93e783a981b4fc926299a85a1a18387e693a
Author: Adam Jackson <ajax@redhat.com>
Date: Tue Feb 8 14:02:37 2011 -0500
glxproxy: warning fix
glxcmds.c: In function ‘__glXGetDrawableAttributes’:
glxcmds.c:3295:8: warning: ‘screen’ may be used uninitialized in this function
glxcmds.c:3298:8: warning: ‘attribs_size’ may be used uninitialized in this function
Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit a391089186cd1063d807bf14a9651e6861b248de
Author: Adam Jackson <ajax@redhat.com>
Date: Tue Feb 8 13:55:23 2011 -0500
glxproxy: warning fix
glxcmds.c: In function ‘__glXChangeDrawableAttributes’:
glxcmds.c:3464:8: warning: ‘screen’ may be used uninitialized in this function
Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit 4102a00962f568b1d34cf72ad524e1cc705b0b1c
Author: Cyril Brulebois <kibi@debian.org>
Date: Wed Feb 23 14:44:23 2011 +0100
xfree86: Fix undefined reference to `XNFsprintf' on sparc.
Build failure on sparc:
| copying selected object files to avoid basename conflicts...
| CCLD Xorg
| ./.libs/libxorg.a(xf86sbusBus.o): In function `xf86SbusConfigureNewDev':
| […]/hw/xfree86/common/xf86sbusBus.c:712: undefined reference to `XNFsprintf'
| collect2: ld returned 1 exit status
Fix typo introduced in:
3a9bb93dd178084f4ff1abcea331ca5a62f88ce6
Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Apologized-for-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Signed-off-by: Cyril Brulebois <kibi@debian.org>
commit 579ee8f5d84c3a523b7b3e3941eabb226d1d19e2
Merge: b636893137 17265ccb02
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Wed Feb 23 08:44:42 2011 +1000
Merge branch 'mi-cleanup' into next
commit b636893137da1695e235e3a9354bfd9243fdddc2
Author: Daniel Stone <daniel@fooishbar.org>
Date: Tue Feb 22 13:43:28 2011 +0000
Input: Don't freeze unrelated devices in DeliverGrabbedEvent
When delivering an event to a device grabbed with SyncBoth,
DeliverGrabbedEvent walks the device tree looking for associated devices
to freeze them. Unfortunately, it froze all devices instead of just the
paired device, and the previous fix in 4fbadc8b17237f3c would still break
if the same client had a non-SyncBoth grab on another unrelated master
device.
Fix this by completely ignoring devices that aren't our paired device.
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 17265ccb027e3f956bf7409106174f44621d1cb8
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri Feb 18 12:28:43 2011 +1000
Move master/lastSlave out of the union into separate fields.
The removal of the double-use will cause some suble bugs as some conditions
to check for the dev->u.master case were broken and also evaluated as true
if lastSlave was set (instead of master).
Also breaks the input ABI.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Benjamin Tissoires <tissoire@cena.fr>
commit 77113dd3eef03dd65b556b672d976817b3f4542e
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri Feb 18 11:45:29 2011 +1000
input: Change a bunch of direct dev->u.master accesses to use GetMaster()
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Benjamin Tissoires <tissoire@cena.fr>
commit 2936635698619271a790004480a14285149277cb
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri Feb 18 12:06:56 2011 +1000
xkb: Fix a check for MASTER_KEYBOARD
And copy into the master keyboard, not just the directly attached device.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Daniel Stone <daniel@fooishbar.org>
Reviewed-by: Benjamin Tissoires <tissoire@cena.fr>
commit 0ba526deeb4d54ee1a75400291ee7a3673ed4d96
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri Feb 18 12:04:46 2011 +1000
mi: check for MASTER_POINTER instead of manual checks.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Benjamin Tissoires <tissoire@cena.fr>
commit 52c13896ce9a1e178d4eeed15f68020947cc20ed
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri Feb 18 11:57:06 2011 +1000
mi: update macro to search for MASTER_POINTER
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Benjamin Tissoires <tissoire@cena.fr>
commit d270f12a3e44f4ea01f176a86783e8cd4c59ddf7
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri Feb 18 11:55:51 2011 +1000
xfree86: update GetMaster check for the VCP.
Same result, but now also triggers on slave keyboards that send pointer
events.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Benjamin Tissoires <tissoire@cena.fr>
commit ce7f79efd588899f01c74f95c2f58d6dd6d816cd
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri Feb 18 11:53:06 2011 +1000
dix: fix a master device access in change_modmap.
We need to check if our master keyboard is the given device since we may be
a pointer with keys and thus need to change the modmap too.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Benjamin Tissoires <tissoire@cena.fr>
commit e1ac704185dee31b427a46cd41a00ef7a28b4129
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri Feb 18 11:42:09 2011 +1000
dix: fix up a master check in ChangeKeyboardMapping handling.
We don't just care about the directly attached master, we care about the
master keyboard.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Benjamin Tissoires <tissoire@cena.fr>
commit febce8cb814df46018f6ae1e6a9daea019b8ad0a
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri Feb 18 11:32:28 2011 +1000
Xi: replace a direct master access with GetMaster()
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Benjamin Tissoires <tissoire@cena.fr>
commit df6559237a2d641b2fc38d14975beab9bae0d971
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri Feb 18 11:30:10 2011 +1000
dix: add MASTER_ATTACHED as allowed type for GetMaster().
In some cases, we don't know/care whether we want the master pointer or keyboard
for a device. Add a new type MASTER_ATTACHED to return the master this
device is attached to.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Benjamin Tissoires <tissoire@cena.fr>
commit dc57f89959e549403f8488eb9f23425bd7118b22
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri Feb 11 12:47:37 2011 +1000
Switch to use IsFloating()
This is not a straightforward search/replacement due to a long-standing
issue.
dev->u.master is the same field as dev->u.lastSlave. Thus, if dev is a master
device, a check for dev->u.master may give us false positives and false
negatives.
The switch to IsFloating() spells out these cases and modifies the
conditions accordingly to cover both cases.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Benjamin Tissoires <tissoire@cena.fr>
commit e48bf3b6403dde33586ca0e421db61e402525453
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri Feb 11 11:11:57 2011 +1000
xfree86: replace two inputInfo.pointer uses with device loops.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Benjamin Tissoires <tissoire@cena.fr>
commit 703baece7ebd128a6742d0523d5b3ebe65126fa5
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri Feb 11 12:19:26 2011 +1000
dix: Add IsFloating(device) wrapper.
Simplifies check for floating devices.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Benjamin Tissoires <tissoire@cena.fr>
commit 77af45ebc3eda32dc534968cab8d5adfb01bd9e3
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri Feb 11 12:48:30 2011 +1000
dix: Simplify retrieving the master device.
GetMaster() returns NULL for floating slaves.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Benjamin Tissoires <tissoire@cena.fr>
commit dc32a23890776edf575bf18b3f3c079da6214340
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri Feb 11 15:21:51 2011 +1000
Fix two incorrect checks for master devices.
These two were sideeffects of lastSlave being in the same field as the
master. For devices generated by the master device directly, lastSlave was 0
and the device would (with the old checks) be interpreted as floating.
Add the required checks to safeguard against master devices.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Benjamin Tissoires <tissoire@cena.fr>
commit d63c979c7fe0f2b114b27e73ebe0a706be8840ae
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri Feb 11 15:21:31 2011 +1000
dix: replace direct master access with GetMaster and temp. device.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Benjamin Tissoires <tissoire@cena.fr>
commit c2a9e0a96983f22f721196513e75a53ea0b86d7e
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri Feb 11 11:41:47 2011 +1000
mi: simplify a "check for keyboard" condition
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Benjamin Tissoires <tissoire@cena.fr>
commit 3a6160b408447ce620140849f962683a5d139cb9
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri Feb 11 11:40:01 2011 +1000
mi: remove if 0 code.
Note sure why this is in if 0 but it's been that way since 2007.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Benjamin Tissoires <tissoire@cena.fr>
commit d9987c8c45236bc9cfcaf716f4bfcac2a9d0e7e6
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri Feb 11 11:22:45 2011 +1000
mi: Add a few comments explaining various cursor move functions.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Benjamin Tissoires <tissoire@cena.fr>
commit 15fe86e69fc256342881112cd07565527e32435b
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri Feb 11 11:01:19 2011 +1000
mi: remove static GenerateEvent variable.
Push into the respective devices. This should have no functional changes
since we never warp more than one device at a time. In the glorious future
with true multithreading, still the better thing to do.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Benjamin Tissoires <tissoire@cena.fr>
commit 93a73993708b1345c86ec3ec06b02ed236595673
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Mon Feb 21 15:40:40 2011 +1000
test: write some event → XI1 conversion tests.
Don't test everything, but hey, life is short and I'm trying to have one.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Keith Packard <keithp@keithp.com>
Reviewed-by: Daniel Stone <daniel@fooishbar.org>
commit 4cdf1013771bc86fe2f6d9223bc4a46753bc918f
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Mon Feb 21 15:32:57 2011 +1000
dix: a valuator number of 0 is valid (#34510)
For all but motion and proximity events, having no valuators is ok.
Regression from 1.9, keyboard events are not converted to protocol events.
X.Org Bug 34510 <http://bugs.freedesktop.org/show_bug.cgi?id=34510>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Keith Packard <keithp@keithp.com>
Reviewed-by: Daniel Stone <daniel@fooishbar.org>
Tested-by: Timo Aaltonen <timo.aaltonen@canonical.com>
commit b4ef34d4664e0eaac7211f7a22a2025958aa1527
Author: Maarten Maathuis <madman2003@gmail.com>
Date: Sun Feb 20 11:59:41 2011 +0100
Revert "exa/mixed: Exclude frontbuffer from deferred pixmap handling."
This reverts commit 541b25038a5de74411a094570b407c5ae018c2ba.
- It turns out that the high latency was a driver problem.
- catting a large amount of text turns out to look prettier when the
throughput is lower, but it's not worth the loss for a minor
improvement that may not even exist on someone else's computer.
Reviewed-by: Michel Dänzer <michel@daenzer.net>
Signed-off-by: Maarten Maathuis <madman2003@gmail.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 443d75446bcbe7d97a23860a1e2d46c0b7e7cb26
Author: Keith Packard <keithp@keithp.com>
Date: Fri Feb 18 14:46:33 2011 -0800
Version bumped to 1.9.99.902 (1.10 RC2)
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 2c77aeb39f59f1a94cc603a2e6256a62ce785c36
Merge: 816d67de2b 402b329c3a
Author: Keith Packard <keithp@keithp.com>
Date: Fri Feb 18 14:29:32 2011 -0800
Merge remote branch 'jcristau/for-keith'
commit 816d67de2ba9bdfe652da32cb6447a3056342b98
Merge: a73c28f0bd 3bbb70a1a7
Author: Keith Packard <keithp@keithp.com>
Date: Fri Feb 18 12:20:26 2011 -0800
Merge remote branch 'whot/for-keith'
commit a73c28f0bdafb1c5cb8129179188a99c0ca052e2
Author: Justin Dou <Justin.Dou@intel.com>
Date: Thu Feb 10 16:27:29 2011 -0500
Replace malloc with calloc to initialize the buffers[] as NULL in do_get_buffers function
The calling for allocate_or_reuse_buffer may fail due to some reason, e.g. out of memory.
If the buffers[] were not initialized to be NULL, the following err_out may try to access an illegal memory, which will cause X crash afterward.
Reviewed-by: Kristian Høgsberg <krh@bitplanet.net>
Signed-off-by: Justin Dou <Justin.Dou@intel.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 0bc9b15a622377c57e617411ccd26c4b5bf8cba4
Merge: d1123b66eb 93cd4b1034
Author: Keith Packard <keithp@keithp.com>
Date: Fri Feb 18 12:04:41 2011 -0800
Merge remote branch 'ajax/for-keithp'
commit d1123b66ebbcf96dd816236f54befc568a5f7c68
Merge: 5d020c3135 f6e4ace9ea
Author: Keith Packard <keithp@keithp.com>
Date: Fri Feb 18 11:59:25 2011 -0800
Merge remote branch 'jturney/master'
commit 649269d40667cfb387cb5286dd3519dd68f7dd80
Author: Bryce Harrington <bryce@canonical.com>
Date: Wed Feb 16 16:55:57 2011 -0800
Check for OOM condition in XISendDeviceHierarchyEvent
When system is out of memory, calloc can fail returning a NULL pointer.
Check for this before dereferencing it, and bail out if it fails.
Ref.: https://bugs.launchpad.net/ubuntu/+source/xorg-server/+bug/720445
Signed-off-by: Bryce Harrington <bryce@canonical.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 31ddb7ef4f5bac2c13c199e74a0716e43b8dc38e
Author: Simon Thum <simon.thum@gmx.de>
Date: Wed Feb 2 00:03:44 2011 +0100
dix: avoid FP promotion during pointer acceleration
Signed-off-by: Simon Thum <simon.thum@gmx.de>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 006157f203f8493bb3d18e333a3fd3d6cb10f8ea
Author: Simon Thum <simon.thum@gmx.de>
Date: Sat Sep 4 16:31:24 2010 +0200
dix: refactor scheme init
This makes it possible to init a scheme in one init call, so we
get rid of the tightly coupled two-phase init used before.
Signed-off-by: Simon Thum <simon.thum@gmx.de>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 38ffeec0c89e83afc62579dec221c325d667cc1e
Author: Simon Thum <simon.thum@gmx.de>
Date: Sun Feb 6 19:13:00 2011 +0100
xfree86: allow to check for options without warnings in the log
This allows set_percent_option in synaptics to work as described,
and should generally enable to check option syntax without log spam.
Signed-off-by: Simon Thum <simon.thum@gmx.de>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 2fbccc881bfab4bdc5b97f74a7e5bcec7fdeae20
Author: Simon Thum <simon.thum@gmx.de>
Date: Sun Feb 6 19:07:19 2011 +0100
fix percent options parsing
Signed-off-by: Simon Thum <simon.thum@gmx.de>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 46b49796015762fd131bec96eff6caaa890bfd5f
Author: Daniel Stone <daniel@fooishbar.org>
Date: Tue Feb 15 11:28:02 2011 +0000
Input: Allow EventToCore to return multiple events
Some event types (notably Expose and GraphicsExpose) require multiple
events, a la XI 1.x. Bring the EventToCore API in line with EventToXI's
and allow it to generate multiple events.
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit ea71495adabca52df44241c0eba39e6bceb58202
Author: Daniel Stone <daniel@fooishbar.org>
Date: Tue Feb 15 11:28:01 2011 +0000
Input: Reduce use of filter in DeliverEvents
Instead of switching on the event filter to determine delivery, use the
event type instead.
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 8a0241656cecb6ab2fb377f02b14238d18e65fc1
Author: Daniel Stone <daniel@fooishbar.org>
Date: Tue Feb 15 11:28:00 2011 +0000
Input: Rename EventIsDeliverable return masks
Rename the return mask values for EventIsDeliverable:
* CORE_MASK -> EVENT_CORE_MASK
* XI_MASK -> EVENT_XI1_MASK
* XI2_MASK -> EVENT_XI2_MASK
* DONT_PROPAGATE_MASK -> EVENT_DONT_PROPAGATE_MASK
And don't undef them in dix/events.c, since they're supposed to be
global.
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 737562257e8ee30b1c438e5160a61fbb26ca609e
Author: Daniel Stone <daniel@fooishbar.org>
Date: Tue Feb 15 11:27:59 2011 +0000
Input: Actually send Xi 1.x DeviceStateNotify events
When a client has selected for Xi 1.x DeviceStateNotify events, they
should receive them when a DeviceFocusIn event is generated. The code
to do this was there, but an incorrect test meant they were never being
sent.
The "type" passed in is the XI2 type, the XI1 type is in event.type.
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit da39d57a20d4281fc4099e356645fef980290030
Author: Daniel Stone <daniel@fooishbar.org>
Date: Tue Feb 15 11:27:57 2011 +0000
Input: Store passive-activating key in CheckDeviceGrabs
CheckDeviceGrabs will activate a passive grab for KeyPress and
ButtonPress events. GrabInfoRec::activatingKey contains the keycode
which activated the passive grab, so we can deactivate it later in
ProcessOtherEvents.
Previously, CheckDeviceGrabs relied on its callers to set
activatingKey, which not all callers were doing (I'm looking at you,
ComputeFreezes). Just set it in CheckDeviceGrabs instead.
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 3bbb70a1a7b24d3d1375b20a13db7011cf961c86
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Wed Feb 16 07:56:58 2011 +1000
xfree86: fix up an out-of-date comment.
InitInput simply initialises all input devices now.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Keith Packard <keithp@keithp.com>
commit 402b329c3aa8ddbebaa1f593306a02d4cd6fed26
Author: Julien Cristau <jcristau@debian.org>
Date: Sun Jan 23 13:35:54 2011 +0100
glx: Work around wrong request lengths sent by mesa
mesa used to send too long requests for GLXDestroyPixmap,
GLXDestroyWindow, GLXChangeDrawableAttributes, GLXGetDrawableAttributes
and GLXGetFBConfigsSGIX.
Fixes a regression introduced in ec9c97c6bf70b523bc500bd3adf62176f1bb33a4
X.Org bug#33324 <https://bugs.freedesktop.org/show_bug.cgi?id=33324>
Reported-by: xunx.fang@intel.com
Signed-off-by: Julien Cristau <jcristau@debian.org>
Reviewed-by: Adam Jackson <ajax@redhat.com>
commit 1137c11be0f82049d28024eaf963c6f76e0d4334
Author: Julien Cristau <jcristau@debian.org>
Date: Wed Jan 26 13:06:53 2011 +0100
glx: fix BindTexImageEXT length check
The request is followed by a list of attributes.
X.Org bug#33449
Reported-and-tested-by: meng <mengmeng.meng@intel.com>
Signed-off-by: Julien Cristau <jcristau@debian.org>
Reviewed-by: Adam Jackson <ajax@redhat.com>
commit a883cf1545abd89bb2cadfa659718884b56fd234
Author: Julien Cristau <jcristau@debian.org>
Date: Sun Jan 23 17:05:26 2011 +0100
glx: fix request length check for CreateGLXPbufferSGIX
The request is followed by an attribute list.
Signed-off-by: Julien Cristau <jcristau@debian.org>
Reviewed-by: Adam Jackson <ajax@redhat.com>
commit 0f9c6f2f822ff53b9d12ff4fa0b26cbeb7394ba5
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Sun Feb 13 21:36:05 2011 -0800
xkb: Replace malloc(strlen) + strcpy with strdup
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Daniel Stone <daniel@fooishbar.org>
commit 682865c460945e1299f943561140f46439e2b4cb
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Sun Feb 13 21:36:04 2011 -0800
XkbAddGeomProperty: Fix checks for malloc failure
Check the variable we just tried to malloc, not the string we're copying
and already checked for NULL at the beginning of the function.
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Daniel Stone <daniel@fooishbar.org>
commit aac1b435664819008989ed19f73e9c89920602c5
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Sun Feb 13 21:36:03 2011 -0800
Replace _XkbDupString with Xstrdup
The two functions have identical semantics, including safely returning
NULL when NULL is passed in (which POSIX strdup does not guarantee).
Some callers could probably be adjusted to call libc strdup directly,
when we know the input is non-NULL.
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Daniel Stone <daniel@fooishbar.org>
commit a4a2e814d5d0e6152307a301eda1d6fc1c555aaa
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Sun Feb 13 21:36:02 2011 -0800
xkb: Use snprintf to measure string lengths instead of manual strlen math
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Daniel Stone <daniel@fooishbar.org>
commit c9f7b303a36ca501c6ecf1196c266ee8e8f49d2d
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri Feb 11 13:50:10 2011 +1000
xfixes: calloc, not malloc the cursorScreenRec
Debugging NULL pointers is significantly easier than random memory.
Plus, if new fields (such as pointer barriers) are added they may just be
properly initialised.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Keith Packard <keithp@keithp.com>
commit d3499556d8d83396fa2585bd00371a81e086be36
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu Feb 10 15:12:14 2011 +1000
xkb: if the keymap failed to compile, load the default keymap instead.
We really need symbols, compat, keynames, vmods and types for a sensible keymap.
Try this in your xorg.conf.d snippets for all keyboards:
Option "XkbLayout" "us"
Option "XkbVariant" "nodeadkeys"
us(nodeadkeys) doesn't exist so xkbcomp provides everything but the symbols
map. We say we want everything but don't _need_ anything, the server happily
gives us a keymap with every key mapped to NoSymbol. This in turn isn't what
we want after all.
So instead, require symbols, compat, keynames, vmods and types from the
keymap and if that fails, load the default keymap instead. If that fails
too, all bets are off.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Dan Nicholson <dbn.lists@gmail.com>
commit 47d1d2fed656c3a3b2600491078da90962c46934
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu Feb 10 15:11:34 2011 +1000
xkb: split out keymap compilation.
Refactoring for simpler double-use in the next patch. No functional changes.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Dan Nicholson <dbn.lists@gmail.com>
commit 787ba25a8a3af52b38448a1a6f8c9704ea8b7905
Author: Carlos Garnacho <carlosg@gnome.org>
Date: Mon Feb 7 18:21:31 2011 +0100
Xi: make XIQueryPointer return the current modifiers/group as documented.
The previous XKB info was being returned instead of the current
one, producing inconsistent results between the latest events
and the modifiers/group returned by this call.
Signed-off-by: Carlos Garnacho <carlosg@gnome.org>
Reviewed-by: Daniel Stone <daniel@fooishbar.org>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>`
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 85f9017393c9bb19553e9afcf554673a44a09993
Author: Ander Conselvan de Oliveira <ander.conselvan-de-oliveira@nokia.com>
Date: Tue Feb 8 11:10:10 2011 +0200
ProcXkbGetXkbByName: fix use of uninitialised bytes valgrind error.
==9999== Syscall param writev(vector[...]) points to uninitialised byte(s)
==9999== at 0x4AB5154: writev (writev.c:51)
==9999== by 0x7C7C3: _XSERVTransWritev (Xtrans.c:912)
==9999== by 0x61C8B: FlushClient (io.c:924)
==9999== by 0x62423: WriteToClient (io.c:846)
==9999== by 0xCE39B: XkbSendMap (xkb.c:1408)
==9999== by 0xD247B: ProcXkbGetKbdByName (xkb.c:5814)
==9999== by 0x4AB53: Dispatch (dispatch.c:432)
==9999== by 0x205BF: main (main.c:291)
==9999== Address 0x557eb68 is 40 bytes inside a block of size 4,096 alloc'd
==9999== at 0x48334A4: calloc (vg_replace_malloc.c:467)
==9999== by 0x62567: WriteToClient (io.c:1065)
==9999== by 0x452EB: ProcEstablishConnection (dispatch.c:3685)
==9999== by 0x4AB53: Dispatch (dispatch.c:432)
==9999== by 0x205BF: main (main.c:291)
==9999== Uninitialised value was created by a stack allocation
==9999== at 0xD1910: ProcXkbGetKbdByName (xkb.c:5559)
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Oliver McFadden <oliver.mcfadden@nokia.com>
Signed-off-by: Ander Conselvan de Oliveira <ander.conselvan-de-oliveira@nokia.com>
commit 8a34d7a8532c7ca013e67307f3baf200167abb92
Author: Ander Conselvan de Oliveira <ander.conselvan-de-oliveira@nokia.com>
Date: Tue Feb 8 11:10:11 2011 +0200
XkbSendNames: fix use of uninitialised bytes valgrind error.
==537== Syscall param writev(vector[...]) points to uninitialised byte(s)
==537== at 0x4AB7154: writev (writev.c:51)
==537== by 0x8935B: _XSERVTransWritev (Xtrans.c:912)
==537== by 0x6C55F: FlushClient (io.c:924)
==537== by 0x6CCF3: WriteToClient (io.c:846)
==537== by 0xD51D3: XkbSendNames (xkb.c:3765)
==537== by 0xD8183: ProcXkbGetKbdByName (xkb.c:5825)
==537== by 0x27B7B: Dispatch (dispatch.c:432)
==537== by 0x205B7: main (main.c:291)
==537== Address 0x55899f2 is 154 bytes inside a block of size 1,896 alloc'd
==537== at 0x4834C48: malloc (vg_replace_malloc.c:236)
==537== by 0xD47AF: XkbSendNames (xkb.c:3642)
==537== by 0xD8183: ProcXkbGetKbdByName (xkb.c:5825)
==537== by 0x27B7B: Dispatch (dispatch.c:432)
==537== by 0x205B7: main (main.c:291)
==537== Uninitialised value was created by a heap allocation
==537== at 0x4834C48: malloc (vg_replace_malloc.c:236)
==537== by 0xD47AF: XkbSendNames (xkb.c:3642)
==537== by 0xD8183: ProcXkbGetKbdByName (xkb.c:5825)
==537== by 0x27B7B: Dispatch (dispatch.c:432)
==537== by 0x205B7: main (main.c:291)
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Oliver McFadden <oliver.mcfadden@nokia.com>
Signed-off-by: Ander Conselvan de Oliveira <ander.conselvan-de-oliveira@nokia.com>
commit 87fbef9157a6f1e1318382e368d27942d7ad72ab
Author: Ander Conselvan de Oliveira <ander.conselvan-de-oliveira@nokia.com>
Date: Tue Feb 8 11:10:09 2011 +0200
ProcRRCreateMode: fix use of uninitialised bytes valgrind error.
==543== Syscall param writev(vector[...]) points to uninitialised byte(s)
==543== at 0x4AB7154: writev (writev.c:51)
==543== by 0x8935B: _XSERVTransWritev (Xtrans.c:912)
==543== by 0x6C55F: FlushClient (io.c:924)
==543== by 0x6D013: FlushAllOutput (io.c:668)
==543== by 0x27A83: Dispatch (dispatch.c:453)
==543== by 0x205B7: main (main.c:291)
==543== Address 0x556dc8c is 12 bytes inside a block of size 4,096 alloc'd
==543== at 0x48334A4: calloc (vg_replace_malloc.c:467)
==543== by 0x6CE37: WriteToClient (io.c:1065)
==543== by 0x223A7: ProcEstablishConnection (dispatch.c:3685)
==543== by 0x27B7B: Dispatch (dispatch.c:432)
==543== by 0x205B7: main (main.c:291)
==543== Uninitialised value was created by a stack allocation
==543== at 0xA3350: ProcRRCreateMode (rrmode.c:289)
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Oliver McFadden <oliver.mcfadden@nokia.com>
Signed-off-by: Ander Conselvan de Oliveira <ander.conselvan-de-oliveira@nokia.com>
commit 0ef5973860e17c5edc996c923610f7ad88b4dfbe
Author: Ander Conselvan de Oliveira <ander.conselvan-de-oliveira@nokia.com>
Date: Tue Feb 8 11:10:08 2011 +0200
ProcRRQueryVersion: fix use of uninitialised bytes valgrind error.
==9999== Syscall param writev(vector[...]) points to uninitialised byte(s)
==9999== at 0x4AB5154: writev (writev.c:51)
==9999== by 0x7C7C3: _XSERVTransWritev (Xtrans.c:912)
==9999== by 0x61C8B: FlushClient (io.c:924)
==9999== by 0x62743: FlushAllOutput (io.c:668)
==9999== by 0x4AA5B: Dispatch (dispatch.c:453)
==9999== by 0x205BF: main (main.c:291)
==9999== Address 0x55711b9 is 1 bytes inside a block of size 4,096 alloc'd
==9999== at 0x48334A4: calloc (vg_replace_malloc.c:467)
==9999== by 0x62567: WriteToClient (io.c:1065)
==9999== by 0x452EB: ProcEstablishConnection (dispatch.c:3685)
==9999== by 0x4AB53: Dispatch (dispatch.c:432)
==9999== by 0x205BF: main (main.c:291)
==9999== Uninitialised value was created by a stack allocation
==9999== at 0x160E78: ProcRRQueryVersion (rrdispatch.c:37)
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Oliver McFadden <oliver.mcfadden@nokia.com>
Signed-off-by: Ander Conselvan de Oliveira <ander.conselvan-de-oliveira@nokia.com>
commit 81daba8ce906bfbbe44cd71d0ff269ad34e2f6b5
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Mon Jan 31 13:53:08 2011 +1000
Xi: constify XIChangeDeviceProperty()
We don't modify "value", make it official.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Chase Douglas <chase.douglas@canonical.com>
Signed-off-by: Ander Conselvan de Oliveira <ander.conselvan-de-oliveira@nokia.com>
commit 93cd4b1034e3c8bed32c5acd391eadd7605e10f0
Author: Adam Jackson <ajax@redhat.com>
Date: Thu Jan 20 00:27:00 2011 -0500
shadow: Remove hw/xfree86/ from includes
Reviewed-by: Matt Turner <mattst88@gmail.com>
Reviewed-by: Julien Cristau <jcristau@debian.org>
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit 0c230728f3af2c4250e93a070c0851a597069447
Author: Adam Jackson <ajax@redhat.com>
Date: Thu Jan 20 00:25:57 2011 -0500
rootless: Remove hw/xfree86/ from includes
Reviewed-by: Matt Turner <mattst88@gmail.com>
Reviewed-by: Julien Cristau <jcristau@debian.org>
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit 505defd270e49cfbcbe6a04d1de817d305edb3c2
Author: Adam Jackson <ajax@redhat.com>
Date: Thu Jan 20 00:24:20 2011 -0500
damage: Remove hw/xfree86/ from includes
Reviewed-by: Matt Turner <mattst88@gmail.com>
Reviewed-by: Julien Cristau <jcristau@debian.org>
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit 59d8e3cbdba032c7354c28c86cbd155e9da6447a
Author: Adam Jackson <ajax@redhat.com>
Date: Thu Jan 20 00:23:07 2011 -0500
fb: Remove hw/xfree86/ from includes
Reviewed-by: Matt Turner <mattst88@gmail.com>
Reviewed-by: Julien Cristau <jcristau@debian.org>
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit 994b7b3dc97f9afa713fe636af45a78002a4366f
Author: Adam Jackson <ajax@redhat.com>
Date: Thu Jan 20 00:17:52 2011 -0500
xfree86: warning fix
Did you know that anonymous enums with function scope will not only
override the enum values from global scope, but will be treated as
entirely different types? C's type system just rules.
xf86Crtc.c: In function 'handle_detailed_monrec':
xf86Crtc.c:1555:33: warning: comparison between 'enum det_monrec_source' and 'enum <anonymous>'
xf86Crtc.c:1562:33: warning: comparison between 'enum det_monrec_source' and 'enum <anonymous>'
Reviewed-by: Matt Turner <mattst88@gmail.com>
Reviewed-by: Julien Cristau <jcristau@debian.org>
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit ae16c5796fdb22fb6b2f680fe5123bfd2c89a825
Author: Adam Jackson <ajax@redhat.com>
Date: Thu Jan 20 00:14:11 2011 -0500
fbdevhw: Remove the non-sysfs hack for mapping from PCI to fbdev
It's broken for devices with BARs above 4G, and the sysfs method should
work everywhere anyway. As a pleasant side effect, this fixes some
warnings:
fbdevhw.c: In function 'fbdev_open_pci':
fbdevhw.c:333:4: warning: cast from pointer to integer of different size
fbdevhw.c:334:4: warning: cast from pointer to integer of different size
fbdevhw.c:336:4: warning: cast from pointer to integer of different size
fbdevhw.c:337:4: warning: cast from pointer to integer of different size
Reviewed-by: Matt Turner <mattst88@gmail.com>
Reviewed-by: Julien Cristau <jcristau@debian.org>
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit f1b7c9cead94b520e6b96774d605d63d3f341b50
Author: Adam Jackson <ajax@redhat.com>
Date: Thu Jan 20 00:09:19 2011 -0500
int10: warning fix
helper_exec.c: In function 'pciCfg1in':
helper_exec.c:507:4: warning: passing argument 2 of 'pci_device_cfg_read_u32' from incompatible pointer type
/usr/include/pciaccess.h:153:5: note: expected 'uint32_t *' but argument is of type 'CARD32 *'
Reviewed-by: Matt Turner <mattst88@gmail.com>
Reviewed-by: Julien Cristau <jcristau@debian.org>
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit be186586e504197623c69637b8122fb814f59429
Author: Adam Jackson <ajax@redhat.com>
Date: Thu Jan 20 00:06:48 2011 -0500
xf86vidmode: warning fix
xf86VidMode.c: In function 'VidModeGetMonitorValue':
xf86VidMode.c:637:19: warning: 'ret.i' may be used uninitialized in this function
Reviewed-by: Matt Turner <mattst88@gmail.com>
Reviewed-by: Julien Cristau <jcristau@debian.org>
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit f6e4ace9eabea1bb2a06dd86b6ffb954917a74ce
Author: Jon TURNEY <jon.turney@dronecode.org.uk>
Date: Sun Jul 18 13:24:48 2010 +0100
Cygwin/X: Fix for Canadian Multilingual Standard keyboard layout handling
Add a keycode mapping for VK_OEM_8 as RCtrl, which is issued by Canadian
Multilingual Standard layout
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
commit b421f5e5122dbe125a5629969cc657bd966b4261
Author: Jon TURNEY <jon.turney@dronecode.org.uk>
Date: Thu Apr 1 23:10:58 2010 +0100
Cygwin/X: Ignore MappingNotify events sent to clipboard integration client
Ignore MappingNotify events sent to clipboard integration client,
xmodmap changes aren't of interest to it, but there is no mechanism
to express that disinterest.
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
commit e930aa7bbc7f04a128df8e6fd441aed5123a2eb6
Author: Jon TURNEY <jon.turney@dronecode.org.uk>
Date: Tue Sep 14 16:02:53 2010 +0100
Cygwin/X: Add Turkish keyboard layouts to keyboard layout mapping table
0x0000041f "Turkish Q" => layout tr
0x0001041f "Turkish F" => layout tr variant f
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
commit ae99a6f895a3a5b6f71e2dd4874cd4bb0235aff0
Author: Jon TURNEY <jon.turney@dronecode.org.uk>
Date: Sun Jul 18 13:42:29 2010 +0100
Cygwin/X: Make the keyboard layout detection logging a bit clearer
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
commit 57ca09441ee5ff2a8deb95eaa17a2625a756d912
Author: Jon TURNEY <jon.turney@dronecode.org.uk>
Date: Thu Jul 1 14:54:48 2010 +0100
Cygwin/X: Update mapping for Canadian keyboard layouts
0x00000c0c "Canadian French (legacy)" => layout ca variant fr-legacy
0x00001009 "Canadian French" => layout ca variant fr
0x00011009 "Canadian Multilingual Standard" => layout ca variant multix
Signed-off-by: Yaakov Selkowitz <yselkowitz@users.sourceforge.net>
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
commit be3e5bb50178406e46368be00860331e1b6c4093
Author: Jon TURNEY <jon.turney@dronecode.org.uk>
Date: Wed Apr 14 21:45:29 2010 +0100
Cygwin/X: Better keycode debugging output
Replace useless #if 0/ErrorF/#endif with winDebug
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
commit 81892bf6b7e3730ebd19318183734f55dbaa5d4b
Author: Jon TURNEY <jon.turney@dronecode.org.uk>
Date: Wed Apr 14 21:34:39 2010 +0100
Cygwin/X: Generate X keycodes for multimedia keys
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
commit 5d020c31351594c104fb46615ce41f256cd8e8b9
Author: Pauli Nieminen <ext-pauli.nieminen@nokia.com>
Date: Fri Jan 14 15:03:28 2011 +0200
xf86/xv: Only register PostValidateTree hook when there is work to do
If none of Xv ports were affected by window tree modifications we don't
want scan the port list. To avoid useless scanning of port list
PostValidateTree hook is only registered when ClipNotify was called for
any port.
Signed-off-by: Pauli Nieminen <ext-pauli.nieminen@nokia.com>
Reviewed-by: Ville Syrjälä <ville.syrjala@nokia.com>
commit ddf32df5cc2e73b833f6e414276d938fdc38869e
Author: Pauli Nieminen <ext-pauli.nieminen@nokia.com>
Date: Thu Jan 13 20:50:16 2011 +0200
xf86/xv: Use PostValidateTree to do reput
ValidateTree calls first ClipNotify and later might call
WindowExposures. To avoid useless double reput ClipNotify delays reput
to WindowExposures or PostValidateTree.
PostValidatTree checks all ports if there is clip changes. On clip
changes reput is done to move or scale the overlay.
Signed-off-by: Pauli Nieminen <ext-pauli.nieminen@nokia.com>
Reviewed-by: Ville Syrjälä <ville.syrjala@nokia.com>
commit 5678a41f6bc0ef8965bd50a88c5ef01ba7eb8b24
Author: Pauli Nieminen <ext-pauli.nieminen@nokia.com>
Date: Mon Jan 17 16:58:00 2011 +0200
xf86/xv: Fill color key on expose
If window gets exposed but clipboxes doesn't change drivers would avoid
color key fill. This makes XResizeWindo&co to lose colorkey if
background is painted.
To help drivers to avoid filling colorkey for each put server can
provide helper function if there is exposed areas. Server can subtract
exposed areas from filled region.
As a side effect we can avoid useless color key fills if window only
moves in screen without background fills.
v3:
* Change tracking to filled area to account for client initiated clip
changes
* Make overlaid XvPutImage behavior like textured XvPutImage or PutImage
* Make region dynamically allocated only when required.
v4:
* Simplify new driver interface to reduce duplicate code
Signed-off-by: Pauli Nieminen <ext-pauli.nieminen@nokia.com>
Reviewed-by: Ville Syrjälä <ville.syrjala@nokia.com>
commit 9b048ca420864e19862f63f4a491a4da0ff9b54f
Author: Pauli Nieminen <ext-pauli.nieminen@nokia.com>
Date: Mon Jan 17 15:07:28 2011 +0200
xf86/xv: Remove unused variable from XvPortRecPrivate
Signed-off-by: Pauli Nieminen <ext-pauli.nieminen@nokia.com>
Reviewed-by: Ville Syrjälä <ville.syrjala@nokia.com>
commit 4f8f803280894a8c41691e350b7a34bfd719fe05
Author: Pauli Nieminen <ext-pauli.nieminen@nokia.com>
Date: Thu Jan 13 20:21:09 2011 +0200
xf86/xv: Remove unused GC pointers
Signed-off-by: Pauli Nieminen <ext-pauli.nieminen@nokia.com>
Reviewed-by: Ville Syrjälä <ville.syrjala@nokia.com>
commit e012f2312b4bcdf31bb5d622ddd34571f3c12429
Author: Pauli Nieminen <ext-pauli.nieminen@nokia.com>
Date: Thu Jan 13 20:19:18 2011 +0200
xf86/xv: Remove copy paste code.
xf86XVFillKeyHelperDrawable can be used to implement
xf86XVFillKeyHelper.
V2:
* Remove RegionTranslate that clobbered parameter region.
Signed-off-by: Pauli Nieminen <ext-pauli.nieminen@nokia.com>
Reviewed-by: Ville Syrjälä <ville.syrjala@nokia.com>
commit ea1ffd3e60bdcedbec5a6f28929f8677bf45d450
Merge: 12b0f7df2c 53602c3621
Author: Keith Packard <keithp@keithp.com>
Date: Wed Feb 2 15:19:55 2011 -0800
Merge remote branch 'whot/for-keith'
commit 12b0f7df2caa78d68b453aaa91248bb3577fd724
Author: Evan Broder <ebroder@mokafive.com>
Date: Tue Feb 1 16:09:50 2011 -0800
xfree86/modes: Be sure to only use new EDID for physical output dimensions
The EDID processing regards physical dimensions of 0mm x 0mm as
invalid. Previously the old values for height and width would be
preserved if none of the physical dimension specifications in the new
EDID were considered valid.
This will come up in particular if first a monitor is connected to an
output, and then a projector is connected. Since projectors generally
report physical dimensions of 0mm x 0mm, this would result in the
projector claiming to have the physical dimensions of the monitor.
Signed-off-by: Evan Broder <ebroder@mokafive.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 0b15033031d78836582bd1b641c3160c3803a708
Author: Samuel Thibault <samuel.thibault@ens-lyon.org>
Date: Mon Jan 31 23:25:10 2011 +0100
xserver: enable TLS even if AIGLX is not enabled
This aligns the xorg server build with the mesa build, which is needed on
systems where aiglx with dri support is not enabled. Else the following error is
obtained when trying to load the software raster:
(EE) AIGLX error: dlopen of /usr/lib/dri/swrast_dri.so failed (/usr/lib/dri/swrast_dri.so: undefined symbol: _glapi_tls_Context)
(EE) GLX: could not load software renderer
(II) GLX: no usable GL providers found for screen 0
because mesa always enables TLS use in GLX, even if dri is not available.
Signed-off-by: Samuel Thibault <samuel.thibault@ens-lyon.org>
Signed-off-by: Julien Cristau <jcristau@debian.org>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 541b25038a5de74411a094570b407c5ae018c2ba
Author: Maarten Maathuis <madman2003@gmail.com>
Date: Sun Jan 30 14:06:16 2011 +0100
exa/mixed: Exclude frontbuffer from deferred pixmap handling.
- Apps like xterm can trigger a lot of fallback rendering.
- This can lead to (annoyingly) high latencies, because you
have to wait for the block handler.
- You need a driver that doesn't directly access the front
buffer to trigger this (NV50+ nouveau for example).
- Repeatingly doing dmesg on an xterm with a bitmap font
will reveal that you never see part of the text.
- I have recieved at least one complaint in the past of slow
terminal performance, which was related to core font
rendering.
- This does sacrifice some throughput, roughly 33% slower.
Reviewed-by: Michel Dänzer <michel@daenzer.net>
Signed-off-by: Maarten Maathuis <madman2003@gmail.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit af87f6367ef733d1a4f3cfca4eeb92bfd84c2b6f
Author: Maarten Maathuis <madman2003@gmail.com>
Date: Sun Jan 30 14:06:15 2011 +0100
exa: Only call driver FinishAccess hook if PrepareAccess hook succeeded.
Reviewed-by: Michel Dänzer <michel@daenzer.net>
Signed-off-by: Maarten Maathuis <madman2003@gmail.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 648d4fe5172cad33c6f09e05dd3d8d7171ef1a7f
Author: Maarten Maathuis <madman2003@gmail.com>
Date: Sun Jan 30 14:06:14 2011 +0100
exa/driver: set pExaPixmap->use_gpu_copy to the right value
- Not sure if it was causing problems, but you never know.
Reviewed-by: Michel Dänzer <michel@daenzer.net>
Signed-off-by: Maarten Maathuis <madman2003@gmail.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 246d40b685292fa6393ba22127152137494af2af
Merge: 70f2d39fbd 8c1f75a1d4
Author: Keith Packard <keithp@keithp.com>
Date: Wed Feb 2 14:51:33 2011 -0800
Merge remote branch 'jeremyhu/master'
commit 70f2d39fbde38d0baa687f1755b6c4c686f23052
Merge: 3a91c2d21c a9d3c43a57
Author: Keith Packard <keithp@keithp.com>
Date: Wed Feb 2 14:43:19 2011 -0800
Merge remote branch 'jturney/master'
commit 3a91c2d21c3231e2a011d95c3cfc01785430c1cf
Merge: ac0a00a840 82b1eaa6ca
Author: Keith Packard <keithp@keithp.com>
Date: Wed Feb 2 14:37:00 2011 -0800
Merge remote branch 'dbn/build-fixes'
commit ac0a00a840a5d8d8374e5db2b849e5959550ca4e
Author: Adam Jackson <ajax@redhat.com>
Date: Thu Jan 20 23:01:03 2011 -0500
xselinux: Fix GetDrawableContext
M_DRAWABLE_PIXMAP is the lookup mask to dixLookupDrawable, and _not_ the
type value in the drawable itself.
Signed-off-by: Adam Jackson <ajax@redhat.com>
Reviewed-by: Eamon Walsh <ewalsh@tycho.nsa.gov>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 8c1f75a1d4cb5a34b4d10f3f5068bccc4356f31a
Author: Jeremy Huddleston <jeremyhu@apple.com>
Date: Fri Jan 28 21:13:38 2011 -0800
XQuartz: Localization Updates
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
commit 53602c36217487e0a80880e8328f89ab302d85c8
Author: Ville Syrjala <syrjala@sci.fi>
Date: Mon Jan 24 01:06:49 2011 +0200
xfree86/dga: Remove DGAIsDgaEvent()
DGAIsDgaEvent() is not used anymore.
Signed-off-by: Ville Syrjala <syrjala@sci.fi>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 2081728b7432e949c274e0dbbabc296fa4db17f9
Author: Ville Syrjala <syrjala@sci.fi>
Date: Mon Jan 24 01:06:48 2011 +0200
xfree86/dga: Only send DGA events for master devices
Signed-off-by: Ville Syrjala <syrjala@sci.fi>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 9f09b62e594321a8e45a33f4f13559827d660ed3
Author: Ville Syrjala <syrjala@sci.fi>
Date: Mon Jan 24 01:06:47 2011 +0200
xfree86/dga: Remove useless ifdefs
Move some variables to the scope where they are used.
Signed-off-by: Ville Syrjala <syrjala@sci.fi>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 5c941c04ca68cdc2b236c524970bc23f91906af4
Author: Ville Syrjala <syrjala@sci.fi>
Date: Mon Jan 24 01:06:46 2011 +0200
xfree86/dga: DGAProcessKeyboardEvent() forgot ET_Internal
Signed-off-by: Ville Syrjala <syrjala@sci.fi>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
commit ce4e0f660beb097e90110c97d039981702f0b0bd
Author: Ville Syrjala <syrjala@sci.fi>
Date: Mon Jan 24 01:06:45 2011 +0200
xfree86/dga: Remove DGAMouseX and DGAMouseY
Previously some sort of absolute coordinates were sent out in
the padding of the DGA2 Motion and Button events. DGAMouseX
and DGAMouseY were used to keep track of said coordinates.
libXxf86dga doesn't use that data for anything, and at least
git history didn't show any past usage either. So let's just
remove the last remnants of of this mess.
Signed-off-by: Ville Syrjala <syrjala@sci.fi>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
commit ee8faeadb60f51a36edce19e568600dab7c8b357
Author: Ville Syrjala <syrjala@sci.fi>
Date: Mon Jan 24 01:06:44 2011 +0200
xfree86/dga: DGA2 events are missing the dx/dy information
Copy dx/dy from the internal event to the DGA2 Motion/Button events.
Do the same for Key events for the sake of keeping the code consistent.
Signed-off-by: Ville Syrjala <syrjala@sci.fi>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
commit e3fef815cf85cf59256f3edeaa21c1267898b42c
Author: Ville Syrjala <syrjala@sci.fi>
Date: Mon Jan 24 01:06:43 2011 +0200
xfree86/dga: Make mieq_install Bool
mieq_installed is used as a boolean, so why not make it such. Also
it's a static variable, so the the explicit zero initialization can
be removed.
Signed-off-by: Ville Syrjala <syrjala@sci.fi>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
commit f4cb25c2ed832bf4cfcd4d25198fe5a895430fed
Author: Ville Syrjala <syrjala@sci.fi>
Date: Mon Jan 24 01:06:42 2011 +0200
xfree86/dga: Remove the ET_DGAEvent handler only if it was installed
Remove the handler only if it was installed. Also mark it as
uninstalled, otherwise it wouldn't get reinstalled after a
server reset.
Signed-off-by: Ville Syrjala <syrjala@sci.fi>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
commit e1547a9f1f6d7991219b7711f4cacc2852dbf88c
Author: Ville Syrjala <syrjala@sci.fi>
Date: Mon Jan 24 01:06:41 2011 +0200
xfree86/dga: Install the DGA event handler when DGA2 is used
The ET_DGAEvent handler is only installed when a client
requests relative events via DGA1. Do it also when a client
requests DGA2 events.
Signed-off-by: Ville Syrjala <syrjala@sci.fi>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 7b16e8633d5a95167aac0c19e43fcfe38bd4a6a4
Author: Ville Syrjala <syrjala@sci.fi>
Date: Mon Jan 24 01:06:40 2011 +0200
xfree86/input: Restore DGAStealKeyEvent()
DGA key event support was lost in commit
8da0ff2d51086666d10ca7330d428e8610a4a0e3. Bring it back.
Signed-off-by: Ville Syrjala <syrjala@sci.fi>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
commit a2c481821997ae14aa5816895ae36db2ca2e4dec
Author: Ville Syrjala <syrjala@sci.fi>
Date: Mon Jan 24 01:06:39 2011 +0200
include: Fix a copy/paste error in a comment
Signed-off-by: Ville Syrjala <syrjala@sci.fi>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 77af0dc5217fc9c446097d6d487c8ddaf00bdd2a
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Mon Jan 24 10:06:34 2011 +1000
xfree86: bump input minor ABI
The new valuator_mask_free() call requires a minor bump.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 5927e070b45fbe3fea4b394920ffd6f7d036f1ed
Author: Erkki Seppälä <erkki.seppala@vincit.fi>
Date: Fri Jan 21 15:56:22 2011 +0200
xkb: Cancel a key's repetition when its autorepeat is disabled.
When XkbChangeEnabledControls is called to disable key repetition of a
certain key (or keys), currently ongoing repetition of that key was
not cancelled. It was cancelled if ChangeKeyboardControl was used to
disable key repetition globally.
Reviewed-by: Rami Ylimäki <rami.ylimaki@vincit.fi>
Reviewed-by: Dirk Wallenstein <halsmit@t-online.de>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit a9d3c43a57cbaf42d9e96ad49cf12bbf1d275fe5
Author: Jon TURNEY <jon.turney@dronecode.org.uk>
Date: Wed Jan 19 15:57:59 2011 +0000
Fix compilation of xf86bigfont.c
xf86bigfont.c: In function 'XFree86BigfontExtensionInit':
xf86bigfont.c:146: error: 'ProcXF86BigfontDispatch' undeclared (first use in this function)
xf86bigfont.c:147: error: 'SProcXF86BigfontDispatch' undeclared (first use in this function)
It seems this has been broken since commit cbd4d5dbb70db62ba1cb79c7b904e6fa11f62d7e
"delete pervasively use of DISPATCH_PROC" (2010-09-28), which is a bit worrying as
that presumably indicates that no tinderbox is configuring with --enable-xf86bigfont.
In a similar fashion to that commit, fix by moving XFree86BigfontExtensionInit()
below the definitions of the static dispatch functions it references.
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Reviewed-by: Julien Cristau <jcristau@debian.org>
commit effaf9459c450f13e35bf263835d3e37d48ff29d
Author: Jeremy Huddleston <jeremyhu@apple.com>
Date: Sun Jan 23 22:35:34 2011 -0800
XQuartz: Use the default signal handler
This allows better interaction with CrashTracer
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
commit 418bb57a3923311338baa8a85c0794a72e15ceeb
Author: Jeremy Huddleston <jeremyhu@apple.com>
Date: Thu Jan 13 17:12:17 2011 -0800
XQuartz: Call RRScreenSizeNotify after handling externally-generated XP_EVENT_DISPLAY_CHANGED
We get an XP_EVENT_DISPLAY_CHANGED event when our display configuration is
changed. If this change was caused by hotplugging a monitor or Mac Display
Preferences changes by the user, we need to call RRScreenSizeNotify in order
to ensure new connections get the correct screen size.
http://xquartz.macosforge.org/trac/ticket/460
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
commit 6f52b10b9e8068e3deafb2bbb64b62175a208c49
Author: Jeremy Huddleston <jeremyhu@apple.com>
Date: Thu Jan 13 16:08:46 2011 -0800
XQuartz: Bump version string to 2.6.1
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
commit 1cfb96dd6151ebe84a9a26a428005db97e5d5577
Author: Jeremy Huddleston <jeremyhu@apple.com>
Date: Thu Jan 13 16:08:29 2011 -0800
XQuartz: Update copyright dates in bundle's plist
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
commit be3be7580b6f6fd2f7fa4d4abfe5e1ab19470223
Merge: 57a1d9b853 a1d885fdd6
Author: Keith Packard <keithp@keithp.com>
Date: Thu Jan 20 21:21:21 2011 -0800
Merge remote branch 'ajax/for-keithp'
commit 57a1d9b85331f6fe19d5111f5163139572ffbf02
Merge: 24ce650cf4 6423769799
Author: Keith Packard <keithp@keithp.com>
Date: Thu Jan 20 21:16:24 2011 -0800
Merge remote branch 'whot/for-keith'
commit 24ce650cf4f0c6fa72faecd38c53d40703e6c959
Merge: bbdf81a056 09fd010902
Author: Keith Packard <keithp@keithp.com>
Date: Thu Jan 20 21:11:53 2011 -0800
Merge remote branch 'jturney/jturney-framebuffer-resize-for-master'
commit bbdf81a056be0ea645da17a642dad5eadef3a906
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Tue Jan 18 19:26:20 2011 -0800
Add xorg.conf.d shadow man page pointing to xorg.conf man page
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Gaetan Nadon <memsize@videotron.ca>
Tested-by: Gaetan Nadon <memsize@videotron.ca>
Reviewed-by: Dan Nicholson <dbn.lists@gmail.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit a1d885fdd67503a442b348626d2eddf6d22419e8
Author: Adam Jackson <ajax@redhat.com>
Date: Wed Jun 23 13:28:55 2010 -0400
resource: Fix indentation
Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Daniel Stone <daniel@fooishbar.org>
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit cb61cf5c99004ba3c76b504220c6728b5f2d2de6
Author: Adam Jackson <ajax@redhat.com>
Date: Thu Apr 15 18:36:55 2010 -0400
resource: Remove expectID hack
This is clearly meant to short-circuit the (modestly) expensive resource
lookup in LegalNewID. The problem is that long-lived clients will
eventually run completely through their XID space and start asking
XC-MISC for IDs to reuse. Once that happens, the comparison against
expectID will always be true, and we'll no longer catch XID collisions
at all.
Reviewed-by: Daniel Stone <daniel@fooishbar.org>
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit 3282e3c627f97f079e3a9af756a6b13bd9a5f227
Author: Adam Jackson <ajax@redhat.com>
Date: Thu Apr 15 08:46:28 2010 -0400
resource: s/NullResource/NULL/g
Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Daniel Stone <daniel@fooishbar.org>
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit f953ae7d8a578d135a6faaf69d9c06eae7c85ede
Author: Adam Jackson <ajax@redhat.com>
Date: Mon Dec 14 14:38:10 2009 -0500
os: Reduce smart scheduler setup calls
We can return from WaitForSomething with no clients ready for any number
of reasons. There's no reason to set up the scheduler timer when this
happens.
Reviewed-by: Keith Packard <keithp@keithp.com>
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit d127075da06239852c1cc745abfe63d0d180d984
Author: Adam Jackson <ajax@redhat.com>
Date: Thu Jan 20 19:03:33 2011 -0500
xdmxconfig: warning fix
xdmxconfig.c: In function ‘dmxConfigCanvasDraw’:
xdmxconfig.c:299:23: warning: ‘maxHeight’ may be used uninitialized in this function
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit 7a08f9abef7219fabdab8d1d49e8d3afb042e36a
Author: Adam Jackson <ajax@redhat.com>
Date: Thu Jan 20 18:59:39 2011 -0500
dmx: warning fixes
dmxinputinit.c: In function ‘dmxBlockHandler’:
dmxinputinit.c:610:44: warning: cast from pointer to integer of different size
dmxinputinit.c: In function ‘dmxWakeupHandler’:
dmxinputinit.c:637:41: warning: cast from pointer to integer of different size
dmxinputinit.c: In function ‘dmxInputInit’:
dmxinputinit.c:1041:36: warning: cast to pointer from integer of different size
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit ffd323b7c0212ed9b348e51cd9b36363d7c4d1f2
Author: Adam Jackson <ajax@redhat.com>
Date: Thu Jan 20 18:55:20 2011 -0500
dmx: warning fix
dmxinputinit.c: At top level:
dmxinputinit.c:135:29: warning: ‘DMXCommonOth’ defined but not used
DMXCommonOth is actually mentioned in a #if 0 block, so delete it and
the block that references it. If anyone needs it, git remembers.
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit c1fe0b155d0567440228aa5d9e36036f37670e3b
Author: Adam Jackson <ajax@redhat.com>
Date: Thu Jan 20 18:52:57 2011 -0500
dmx: warning fix
dmxgc.c: In function ‘dmxChangeClip’:
dmxgc.c:386:5: warning: case label value exceeds maximum value for type
dmxgc.c:387:5: warning: case label value exceeds maximum value for type
dmxgc.c:388:5: warning: case label value exceeds maximum value for type
dmxgc.c:389:5: warning: case label value exceeds maximum value for type
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit b02e006b2733ea457df41791f6054309e4edf7f6
Author: Adam Jackson <ajax@redhat.com>
Date: Thu Jan 20 18:46:00 2011 -0500
dmx: warning fixes
Dear gcc: I do not care about machines where sizeof(void *) <
sizeof(int), and neither should you.
dmxextension.c: In function ‘dmxBECreateResources’:
dmxextension.c:858:26: warning: cast from pointer to integer of different size
dmxextension.c: In function ‘dmxBERestoreRenderPict’:
dmxextension.c:1062:29: warning: cast from pointer to integer of different size
dmxextension.c: In function ‘dmxBERestoreRenderGlyph’:
dmxextension.c:1084:35: warning: cast from pointer to integer of different size
dmxextension.c: In function ‘dmxAttachScreen’:
dmxextension.c:1277:8: warning: cast to pointer from integer of different size
dmxextension.c:1286:34: warning: cast to pointer from integer of different size
dmxextension.c:1292:35: warning: cast to pointer from integer of different size
dmxextension.c: In function ‘dmxBEDestroyResources’:
dmxextension.c:1456:26: warning: cast from pointer to integer of different size
dmxextension.c: In function ‘dmxDetachScreen’:
dmxextension.c:1599:8: warning: cast to pointer from integer of different size
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit 64237697994871adfcf4905b5784e75cd7281579
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu Jan 13 12:20:38 2011 +1000
xkb: after making changes to the xkb ctrls, copy them back into kbdfeed.
enabled_ctrls_changes nowhere near the usual event or config paths. So this
condition always evaluated to false and the memcpy would thus never been
hit. As a result, any modification to the XKB struct during
XkbUpdateDescActions was not reflected in the kbdfeed ctrls.
The flag that is set by XkbUpdateDescActions() if ctrls were changed are in
enabled_ctrls.
This mainly affected keyboard repeat control as XKB uses the kbdfeed ctrls,
not XKB's per_key_repeats, to determine if a key needs to be repeated. Thus,
adding a "repeat= False" to the XKB map of any action did not have any
effect.
Test case:
assign Mode_switch to any key that by default repeats, e.g. the menu key.
key <COMP> { [ Mode_switch ] };
Then modify the Mode_switch action to not repeat the key.
interpret Mode_switch+AnyOfOrNone(all) {
virtualModifier= AltGr;
useModMapMods=level1;
action= SetGroup(group=+1);
// Add this line
repeat= False;
};
Though the flags are correctly reflected in the description loaded in the
server, the change is not handed back to the kbdfeed struct and XKB will
trigger softrepeats of this key.
This patch also adds two explanatory comments and an extra check, as this
path may be hit before the CtrlProc for the kbdfeed struct is set.
Red Hat Bug 537708 <https://bugzilla.redhat.com/show_bug.cgi?id=537708>
Also fixes broken auto-repeat of the backspace key in the colemak layout
(mapped to CapsLock).
X.Org Bug 16318 <http://bugs.freedesktop.org/show_bug.cgi?id=16318>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Tested-by: Dirk Wallenstein <halsmit@t-online.de>
Reviewed-by: Dirk Wallenstein <halsmit@t-online.de>
Reviewed-by: Daniel Stone <daniel@fooishbar.org>
commit f1326ed2910bd985fafdb48714b1d6f38116b083
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu Jan 13 09:19:28 2011 +1000
xkb: Replace a few manual bitflips with SetBit & friends.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Dirk Wallenstein <halsmit@t-online.de>
commit 16eb4f2a7b67ee169785973f9e0a3773e13fdea6
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri Jan 7 09:53:35 2011 +1000
Xi: reset remainders when warping the device.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Daniel Stone <daniel@fooishbar.org>
Reviewed-by: Chase Douglas <chase.douglas@canonical.com>
Reviewed-by: Simon Thum <simon.thum@gmx.de>
commit 09fd010902fad56735b8069b1becb80d85bd6a35
Author: Jon TURNEY <jon.turney@dronecode.org.uk>
Date: Wed Sep 29 22:54:22 2010 +0100
Cygwin/X: DirectDraw engines shouldn't try to blit if the surface wasn't allocated
Fix winShadowUpdateDD(|NL) so we don't try to blit to primary surface if it didn't get allocated
(Intel drivers, in particular, seem to like to issue a WM_DISPLAYCHANGE during a suspend/resume
cycle, but not allow surface to be allocated right then)
Also:
Use winReleasePrimarySurfaceShadowDD(|NL) in winFreeFBShadowDD(|NL) rather than open coding it
Don't mess about recreating surface if we're going to resize it anyhow
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
Tested-by: Colin Harrison <colin.harrison@virgin.net>
commit 625ab9701fd75b879c1dafc05fa979591eea87c0
Author: Jon TURNEY <jon.turney@dronecode.org.uk>
Date: Tue Aug 31 13:45:43 2010 +0100
Cygwin/X: Simplify and consolidate reporting of the bpp value we are going to use
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
Tested-by: Colin Harrison <colin.harrison@virgin.net>
commit 3f7339a7c5d3dcd05909b041865125f4cb6fa29e
Author: Jon TURNEY <jon.turney@dronecode.org.uk>
Date: Tue Aug 31 10:13:01 2010 +0100
Cygwin/X: Deal with RANDR depth changes correctly in ShadowGDI drawing engine
Make ShadowGDI drawing engine only change the size of the screen
pixmap/shadow framebuffer on an RANDR change, not the bpp/depth
as well.
The server requires the screen pixmap's depth to be invariant.
Other drawing engines aren't quite as affected by this issue as
they won't draw to the display, if it has changed colour depth,
but probably still need some attention.
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
Tested-by: Colin Harrison <colin.harrison@virgin.net>
commit 8b22f83113fbdc09b932b5ad7e44f629fc15e3b5
Author: Jon TURNEY <jon.turney@dronecode.org.uk>
Date: Mon Aug 30 17:17:57 2010 +0100
Cygwin/X: Use winUpdateFBPointer() in winshaddd.c rather than duplicating it inline
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
Tested-by: Colin Harrison <colin.harrison@virgin.net>
commit 8385c426f86e9955e9e570a46f75bddd3c10ca01
Author: Jon TURNEY <jon.turney@dronecode.org.uk>
Date: Tue Aug 10 21:55:15 2010 +0100
Cygwin/X: Remove WIN_DIB_MAXIMUM_SIZE check
This is only relevant to pre-NT versions of Windows, which are all EOL.
Also, it's in the wrong place now as framebuffer can get resized.
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
Tested-by: Colin Harrison <colin.harrison@virgin.net>
commit 981ad1f364cf4fe8008c0f3592eb0f73dd14a118
Author: Jon TURNEY <jon.turney@dronecode.org.uk>
Date: Tue Aug 10 16:24:57 2010 +0100
Cygwin/X: Fix a typo in command line argument validation code
Fortunately, these swapped constants are benign as they have the same
value, 0
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
Tested-by: Colin Harrison <colin.harrison@virgin.net>
commit 5390b494672393506466d8afdb9b146b0e585cc0
Author: Jon TURNEY <jon.turney@dronecode.org.uk>
Date: Tue Aug 10 13:16:13 2010 +0100
Cygwin/X: Don't turn off -multiplemonitors when all monitors don't have the same pixel format when using shadow GDI engine
Don't turn off -multiplemonitors when all monitors don't have the
same pixel format and when using shadow GDI engine, just warn that
performance may be degraded
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
Tested-by: Colin Harrison <colin.harrison@virgin.net>
commit 33106e1e807a828208b306512e78c5e3e93960d3
Author: Jon TURNEY <jon.turney@dronecode.org.uk>
Date: Tue Mar 30 19:49:41 2010 +0100
Cygwin/X: Generate RANDR change on WM_DISPLAYCHANGE for rootless modes
When RANDR resizing is enabled, generate an internal RANDR change when
WM_DISPLAYCHANGE occurs in rootless modes for screens which occupy an
entire monitor or the virtual desktop.
Store the monitor number and use that to handle WM_DISPLAYCHANGE for a
screen specified with '-screen @monitor'
In rooted mode, WM_DISPLAYCHANGE isn't relevant (except where display
depth changes may cause problems). (A maximized screen window will get
WM_SIZE to adjust it to the new monitor size)
In rooted fullscreen mode, WM_DISPLAYCHANGE shouldn't be seen, as we
have the resolution we have selected for the fullscreen session)
(Could client randr requests be handled in fullscreen to cause a change
of the fullscreen resolution? )
Don't bother do a RANDR resize if the dimensions aren't actually changing
when WM_DISPLAYCHANGE is sent (should handle WM_DISPLAYCHANGE to size 0x0
that the intel driver seems to like to send)
Various debug output improvements
Also, remove the note that XWin can't handle display mode changes from
the man page
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
Tested-by: Colin Harrison <colin.harrison@virgin.net>
commit bbc511e80b2a9365f6a1528bc1595772f83be654
Author: Jon TURNEY <jon.turney@dronecode.org.uk>
Date: Mon Feb 15 13:42:04 2010 +0000
Cygwin/X: Make WM_SIZE use RandR resizing when -resize=randr
To avoid recursion, WM_SIZE requests shouldn't generate XRANDR requests
when no change is neeeded.
We do the actual resize on WM_EXITSIZEMOVE, as resizing occurs in
a modal loop, to avoid a backlog of resize events building up as
the X server doesn't get a change to process anything until the resize
is completed.
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
Tested-by: Colin Harrison <colin.harrison@virgin.net>
commit 85c497a8b6c488ef9ea2c6d7b49e6f9b992fb4a2
Author: Jon TURNEY <jon.turney@dronecode.org.uk>
Date: Tue Mar 30 20:48:10 2010 +0100
Cygwin/X: Implement framebuffer resizing in RANDR extension
Implement framebuffer resizing in RANDR extension:
Resize the frame buffer, the screen's root window and the native window
containing the root window image.
Correctly allow for decorations in new native window size when resizing native window
to fit the new framebuffer size with AdjustWindowRectEx()
Update physical size info for a screen when it is changed by RANDR
Forbid client-requested RANDR changes in fullscreen and rootless modes
Only resize window on an external RandR request, to avoid recursing on
a WM_SIZE requested resize.
Also, add prototypes for winRandRInit() and winDoRandRScreenSetSize() to header file
Also, update the author list and copyright for winrandr.c
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
Tested-by: Colin Harrison <colin.harrison@virgin.net>
commit 873abef315f5d947b864428891381bff539c5869
Author: Jon TURNEY <jon.turney@dronecode.org.uk>
Date: Tue Mar 30 20:07:19 2010 +0100
Cygwin/X: Add -resize command line option
Add -resize command line option to configure how native window sizing frame
is used.
In additions to the existing fixed and scrollbars modes, add a new mode to
allow framebuffer to be resized using native window frame
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
Tested-by: Colin Harrison <colin.harrison@virgin.net>
commit 46c57788539d8a5f0246528b4f88ad4ed6d867d1
Author: Jon TURNEY <jon.turney@dronecode.org.uk>
Date: Tue Feb 23 15:44:36 2010 +0000
Cygwin/X: Move QueryMonitor() out of windprocarg.c
Move QueryMonitor() out of windprocarg.c into a new file, winmonitors.c,
as we use to use it from other places as well
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
Tested-by: Colin Harrison <colin.harrison@virgin.net>
commit 73b02e964787ea9fb2d139dc781c9b2495ccb031
Author: Jon TURNEY <jon.turney@dronecode.org.uk>
Date: Fri Feb 12 12:29:30 2010 +0000
Cygwin/X: Remove an attempt at detecting if WM_DISPLAYCHANGE affects the X screen
Remove an attempt at the rather difficult optimization of detecting
if WM_DISPLAYCHANGE affects any of the monitors which intersect the
native window for the X screen.
We'll always act as if it does, which it probably usually the case.
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
Tested-by: Colin Harrison <colin.harrison@virgin.net>
commit a46146af5f6c2d96728c43f0df369ea00bcae017
Author: Jon TURNEY <jon.turney@dronecode.org.uk>
Date: Thu Apr 1 21:00:43 2010 +0100
Cygwin/X: Rather than storing calculated physical display sizes, calculate them when needed
(This stored calculation was wrong if -dpi came after -screen on the command
line, anyhow)
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
Tested-by: Colin Harrison <colin.harrison@virgin.net>
commit df518001271dbc0c49935350b755f0c0562cdb92
Author: Jon TURNEY <jon.turney@dronecode.org.uk>
Date: Tue Oct 13 14:47:33 2009 +0100
Cygwin/X: Refactor framebuffer allocation/release in drawing engines
Refactor the drawing engines so we can explicitly allocate and release the framebuffer for a screen
Move the setting of dwPaddedWidth into the DDNL engine, so it is updated when the framebuffer changes size
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
Tested-by: Colin Harrison <colin.harrison@virgin.net>
commit 708d0b9781c6f3f0c0ae7052f45223b1c2524809
Author: Jon TURNEY <jon.turney@dronecode.org.uk>
Date: Tue Oct 13 14:48:17 2009 +0100
Cygwin/X: Enable building of nativegdi and primaryfb engines to avoid further rusting
Some trivial build fixes required
Also fill out all function pointers for primaryfb engine
Also tidy up the man page section describing drawing engines.
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
Tested-by: Colin Harrison <colin.harrison@virgin.net>
commit c6aa4755ec355101a62bef86dbb090262fe806f6
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Sat Jan 15 12:13:39 2011 -0800
xkb/ddxLoad.c doesn't need <paths.h> any more
Was previously used for _PATH_VARTMP, but that was removed in
534fc5140b039a8c98ab715d0a6740d513b41209
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Julien Cristau <jcristau@debian.org>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit abfea17342da774aa4e3a351a73c8f2af6e6fd28
Merge: 361128389e e65c3f8bcc
Author: Keith Packard <keithp@keithp.com>
Date: Tue Jan 18 15:19:34 2011 -0800
Merge remote branch 'ajax/for-keithp'
commit 361128389e5cb0101cbd091ff8de77cf34608f6c
Merge: 65ceaadbf0 d9225b9602
Author: Keith Packard <keithp@keithp.com>
Date: Tue Jan 18 15:18:08 2011 -0800
Merge remote branch 'jcristau/for-keith'
commit 65ceaadbf0fb65f1962cb96d5b87fd1175f85a3b
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Sun Jan 9 20:28:31 2011 -0500
Xquartz: rename man page directory from doc to man
Following the convention makes it easier to locate man pages,
user's or developer's documentation and specifications.
Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Rémi Cardona <remi@gentoo.org>
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 7ed0d426f616fe9e44ac7091622a798f2043dfe4
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Sun Jan 9 20:28:30 2011 -0500
xfree86: use sed rather than cpp to perform string substitutions
Makefile.am: there are only 4 string substitutions to be done in this file.
SED is much simpler than the C pre processor which adds its own
strings which must be substituted by sed, still.
xorgconf.cpp: replaced __xconfigfile__ with xorg.conf as this file name
is hard coded in the xserver configuration and cannot change.
Replace XCOMM with # permanently.
Delete cpprules.in as it isn't used anywhere else. Should one need
cpprules for real cpp work, there is one in Xquartz from which the
the old man pages code have been stripped.
Fix trailing spaces.
Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Rémi Cardona <remi@gentoo.org>
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 885a3330092c13786baa3aaabd728e71962486c4
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Sun Jan 9 20:28:29 2011 -0500
man: refactor common code in the man pages makefiles
Create a manpages.am makefile snippet in the root dir.
Each man page makefile includes manpages.am.
Now all man pages in xserver are generated the same way
using the same method as all of other xorg modules.
All ".man.pre" files in git are ".man" now.
Links are no longer created between different file types.
Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Rémi Cardona <remi@gentoo.org>
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit c86f7c2b8eedd3126066a3aff44bc8767eb5e277
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Sun Jan 9 20:28:28 2011 -0500
Xdmx: build all man pages using XORG_MANPAGE_SECTIONS
Use standard directory and makefile.
Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Rémi Cardona <remi@gentoo.org>
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 9bd9d550a0d6fb4fe3daacb604658de92e69d99c
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Sun Jan 9 20:28:27 2011 -0500
exa: build man pages using XORG_MANPAGE_SECTIONS
Nothing requires the use of a C preprocessor
Using standard file extensions (.man) means no need for .gitignore
Use standard directory and makefile
Fix trailing whitespaces
Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Rémi Cardona <remi@gentoo.org>
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit d4b1fd3ff66d1a3e44a85aed34d9a01eee0d37fd
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Sun Jan 9 20:28:26 2011 -0500
fbdevhw: build man pages using XORG_MANPAGE_SECTIONS
Nothing requires the use of a C preprocessor
Using standard file extensions (.man) means no need for .gitignore
Use standard directory and makefile
Fix trailing whitespaces
Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Rémi Cardona <remi@gentoo.org>
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit b9276cb86b433bc740fe26c2e624d3d5399732f6
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Sun Jan 9 20:27:53 2011 -0500
XFree86 utils: build utils man pages using XORG_MANPAGE_SECTIONS
Nothing requires the use of a C preprocessor
Using standard file extensions (.man) means no need for .gitignore
Use standard directory and makefile
Fix trailing whitespaces
Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Rémi Cardona <remi@gentoo.org>
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit ac5ffef60e05eb05275913b133786709881e7e7e
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Sun Jan 9 20:27:52 2011 -0500
Xephyr: build Xephyr man pages using XORG_MANPAGE_SECTIONS
Nothing requires the use of a C preprocessor
Using standard file extensions (.man) means no need for .gitignore
Use standard directory and makefile
Fix trailing whitespaces
Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Rémi Cardona <remi@gentoo.org>
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 9240cffd659b1c13d66162200c6e384ea1cdbc44
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Sun Jan 9 20:27:51 2011 -0500
Xvfb: build Xvfb man pages using XORG_MANPAGE_SECTIONS
Nothing requires the use of a C preprocessor
Using standard file extensions (.man) means no need for .gitignore
Use standard directory and makefile
Fix trailing whitespaces
Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Rémi Cardona <remi@gentoo.org>
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 3f4c71799b3164440624d09b7b631d3d3c0a29ef
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Sun Jan 9 20:27:50 2011 -0500
XWin: build XWin man pages using XORG_MANPAGE_SECTIONS
Nothing requires the use of a C preprocessor
Using standard file extensions (.man) means no need for .gitignore
Use standard directory and makefile
Now can be built easily on any platform in the man directory
Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Rémi Cardona <remi@gentoo.org>
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit b8492e18a7e5322c4a492f6cf6cfeb5b0221d994
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Sun Jan 9 20:27:49 2011 -0500
Xnest: build Xnest man pages using XORG_MANPAGE_SECTIONS
Nothing requires the use of a C preprocessor
Using standard file extensions (.man) means no need for .gitignore
Use standard directory and makefile
Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Rémi Cardona <remi@gentoo.org>
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 57ca20d26614a0787cdd0db91a2eb8cdb301f2dc
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Sun Jan 9 20:27:48 2011 -0500
Xquartz: strip the man page code from cpprules.in
This is dead code which will not be used in the future.
Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Rémi Cardona <remi@gentoo.org>
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit c06c46acdc2ead20a6030118fad6092b3da6709f
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Sun Jan 9 20:27:47 2011 -0500
Xquartz: build Xquartz man pages using XORG_MANPAGE_SECTIONS
Nothing requires the use of a C preprocessor
Using standard file extensions (.man)
Use standard directory and makefile
Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Rémi Cardona <remi@gentoo.org>
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit a9e85013b1045c7e02891a019bfa8042a219b7f1
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Sun Jan 9 20:27:46 2011 -0500
man: build Xorg and xorg.conf man pages using XORG_MANPAGE_SECTIONS
Nothing requires the use of a C preprocessor
Using standard file extensions (.man) means no need for .gitignore
Use standard directory and makefile
Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Rémi Cardona <remi@gentoo.org>
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit dcdd8ea82c0e2f657abdc80a22aa0c01ead07e54
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Sun Jan 9 20:27:45 2011 -0500
Xorg.man: fix whitespace issues
Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Rémi Cardona <remi@gentoo.org>
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit d9225b9602c85603ae616a7381c784f5cf5e811c
Author: Julien Cristau <jcristau@debian.org>
Date: Wed Nov 10 22:39:54 2010 +0100
glx: validate numAttribs field before using it
Reviewed-by: Kristian Høgsberg <krh@bitplanet.net>
Reviewed-by: Daniel Stone <daniel@fooishbar.org>
Signed-off-by: Julien Cristau <jcristau@debian.org>
commit 62319e8381ebd645ae36b25e5fc3c0e9b098387b
Author: Julien Cristau <jcristau@debian.org>
Date: Sun Aug 22 16:20:45 2010 +0100
glx: swap the request arrays entirely, not just half of them
Various glx requests include a list of pairs of attributes. We were
only swapping the first half.
Reviewed-by: Kristian Høgsberg <krh@bitplanet.net>
Reviewed-by: Daniel Stone <daniel@fooishbar.org>
Signed-off-by: Julien Cristau <jcristau@debian.org>
commit 6c69235a9dfc52e4b4e47630ff4bab1a820eb543
Author: Julien Cristau <jcristau@debian.org>
Date: Sun Aug 22 00:50:05 2010 +0100
glx: check request length before swapping
Reviewed-by: Kristian Høgsberg <krh@bitplanet.net>
Reviewed-by: Daniel Stone <daniel@fooishbar.org>
Signed-off-by: Julien Cristau <jcristau@debian.org>
commit ec9c97c6bf70b523bc500bd3adf62176f1bb33a4
Author: Julien Cristau <jcristau@debian.org>
Date: Sat Jul 3 19:47:55 2010 +0100
glx: validate request lengths
Reviewed-by: Adam Jackson <ajax@redhat.com>
Reviewed-by: Kristian Høgsberg <krh@bitplanet.net>
Reviewed-by: Daniel Stone <daniel@fooishbar.org>
Signed-off-by: Julien Cristau <jcristau@debian.org>
commit 3f0d3f4d97bce75c1828635c322b6560a45a037f
Author: Julien Cristau <jcristau@debian.org>
Date: Sat Jul 3 19:42:26 2010 +0100
glx: make sure screen is non-negative in validGlxScreen
Reviewed-by: Adam Jackson <ajax@redhat.com>
Reviewed-by: Kristian Høgsberg <krh@bitplanet.net>
Reviewed-by: Daniel Stone <daniel@fooishbar.org>
Signed-off-by: Julien Cristau <jcristau@debian.org>
commit 82b1eaa6cad20f39dbf15573bdb3d62acbcd91f9
Author: Tom Fogal <tfogal@alumni.unh.edu>
Date: Wed Dec 22 14:39:48 2010 -0700
Autodetect TLS support instead of defaulting to disabled.
Uses the AX_TLS macro to figure out if the current platform
supports TLS. If it does, enable TLS automagically. Still
respects --enable option, regardless.
Signed-off-by: Tom Fogal <tfogal@alumni.unh.edu>
Reviewed-by: Dan Nicholson <dbn.lists@gmail.com>
commit 93393411e39fbb0f72cf6c2f79ebde177aa86932
Author: Tom Fogal <tfogal@alumni.unh.edu>
Date: Wed Dec 22 16:03:03 2010 -0700
Add macro for detecting thread local storage support.
This adds an AX_TLS macro which attempts to identify if the
underlying compiler/platform supports thread local storage (TLS).
The macro comes from the autoconf macro archive.
Signed-off-by: Tom Fogal <tfogal@alumni.unh.edu>
Reviewed-by: Dan Nicholson <dbn.lists@gmail.com>
commit 60801ff8703ec36995139a6dd7b1fc26ae8854a6
Author: Dan Nicholson <dbn.lists@gmail.com>
Date: Tue Nov 23 11:38:50 2010 -0800
xfree86: Convert libxf86config to static libtool library
In order to use libxf86config in a shared library, all the code must be
compiled with -fPIC. Add proper PIC support for libxf86config by turning
it into a libtool library. However, since we don't want to guarantee API
or ABI stability, make sure it's only built static.
Signed-off-by: Dan Nicholson <dbn.lists@gmail.com>
Acked-by: Gaetan Nadon <memsize@videotron.ca>
commit 8456625d64bb0013a496f3b56ea3aa20cf7a6142
Merge: aa30a86583 ce74e7562d
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri Jan 7 09:35:07 2011 +1000
Merge branch 'for-peter' of git://people.freedesktop.org/~daniels/xserver into for-keith
commit aa30a86583c3fc1a83c46e8c7583182d750edcde
Author: Tomas Carnecky <tom@dbservice.com>
Date: Sun Aug 1 21:28:18 2010 +0200
NO_PANORAMIX preprocessor symbol is nowhere defined
Which makes it useless, so remove it.
Signed-off-by: Tomas Carnecky <tom@dbservice.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit fc6cbee772bafabf7ddd7a75043bd55bb78ad09e
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu Jan 6 12:58:00 2011 +1000
input: add valuator_mask_free() to free a valuator mask.
Expecting the caller to free the mask requires us to keep it in a single
memory block (which may be an issue lateron), aside from leaving the API
asymetrical. Provide valuator_mask_free() to free the memory and reset the
mask pointer to NULL.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Fernando Carrijo <fcarrijo@freedesktop.org>
Reviewed-by: Chase Douglas <chase.douglas@canonical.com>
commit 4fbadc8b17237f3c7f8c0bf56003d1139c86655e
Author: Daniel Stone <daniel@fooishbar.org>
Date: Thu Jan 6 11:32:26 2011 +1000
Input: Prevent MD grabs from wandering on to other MDs
The code to set sync.other in DeliverGrabbedEvents is supposed to reset
sync.other for a paired MD to the grab under consideration, but was
rather optimistic in resetting sync.other for _all_ devices.
This would fall apart given two sets of MDs (A paired with B, Y paired
with Z), where both MDs were in FREEZE_BOTH_NEXT_EVENT due to being
called with SyncBoth, where no event had yet triggered the grab. An
event being processed on MD A would result in B, Y and Z all having
sync.other set to A's grab, rather than just B.
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit e65c3f8bcc86845f21ac575e2bfb4b21b67d5ebf
Author: Adam Jackson <ajax@redhat.com>
Date: Wed Jan 5 12:04:19 2011 -0500
dix: Add a Screen method for additional cursor confinement
This just reserves the slot in the ABI. Confining cursors to CRTCs will
come soon.
v2: Just reserve the slot.
Reviewed-by: Daniel Stone <daniel@fooishbar.org>
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit ce74e7562dcc800306ff92b6d3c5ee885cd4763d
Author: Daniel Stone <daniel@fooishbar.org>
Date: Tue Dec 7 11:48:14 2010 +0000
Input: Make CheckPassiveGrabsOnWindow return grab, export
Change CheckPassiveGrabsOnWindow to return the GrabPtr it used (or NULL
if none) rather than a boolean, and export it. Also add an additional
boolean 'activate' parameter; use TRUE for existing behaviour, or FALSE
to only find the grab and then return it.
This will be used in forthcoming touch patches to find the grabs, rather
than open-coding same.
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
commit eb5aaf5eb819f1287ce40da79edbe07bafb2b5c0
Author: Daniel Stone <daniel@fooishbar.org>
Date: Tue Dec 28 12:15:28 2010 +0000
Input: Export GetEventMask
Make it non-static, add to headers.
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Chase Douglas <chase.douglas@canonical.com>
commit 30c8c7a86310139e79c9698caee21b3bd51936bd
Author: Daniel Stone <daniel@fooishbar.org>
Date: Tue Dec 28 12:13:29 2010 +0000
Input: Handle grabs with no Xi 1.x equivalent
Don't try to search for an Xi 1.x grab in CheckPassiveGrabsOnWindow for
events with no Xi 1.x equivalent.
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Chase Douglas <chase.douglas@canonical.com>
commit 690476250f58616d5156317e01ba547497f4331a
Author: Daniel Stone <daniel@fooishbar.org>
Date: Mon Sep 20 15:03:05 2010 +1000
Input: Pass sprite instead of device to XYToWindow, make non-static
XYToWindow calculates the position of the cursor and updates the sprite
trace, but does nothing else with the device. Pass a SpritePtr instead
so we can update an alternate focus instead of hardcoding the device's
sprite. Also make this function non-static, so we can use it elsewhere.
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Chase Douglas <chase.douglas@canonical.com>
commit 07a892cd8276f8092de95f1909f2ebec6f5fdf08
Author: Daniel Stone <daniel@fooishbar.org>
Date: Mon Sep 20 15:03:04 2010 +1000
Input: Pass sprite instead of device to FixUpEventFromWindow
Since FixUpEventFromWindow only uses the sprite trace to determine the
window stack, pass in a sprite instead of hardcoding the device sprite,
so we can deliver to windows other than the one currently containing the
sprite.
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Chase Douglas <chase.douglas@canonical.com>
commit 10d6c3ca103ea155488cd2f29052334b5691e680
Author: Daniel Stone <daniel@fooishbar.org>
Date: Mon Dec 27 13:06:03 2010 +0000
Input: Make RootWindow() take a sprite instead of device
GetCurrentRootWindow already works for the device case, although not as
an lvalue.
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Chase Douglas <chase.douglas@canonical.com>
commit 23c37ce1fe42e3da0609a566478e947843b05023
Author: Daniel Stone <daniel@fooishbar.org>
Date: Mon Dec 27 12:48:42 2010 +0000
Input: Export SpriteRec for use in public API
Change its definition to be more in line with other structs, so we can
use it from input.h.
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Chase Douglas <chase.douglas@canonical.com>
commit 06a103ad1d6a0ef6146c97a8c81dc7de1c0a0083
Author: Daniel Stone <daniel@fooishbar.org>
Date: Tue Dec 28 16:37:48 2010 +0000
Test: Input: Test up to supported server, not protocol, events
When building against a newer inputproto, the server may support fewer
than XI_LASTEVENT events. We already have XI2LASTEVENT for the highest
event number supported by the server, so use that instead.
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Chase Douglas <chase.douglas@canonical.com>
commit a083efe8715e8b29c9bd7f4e7bb429a94620bfc4
Author: Daniel Stone <daniel@fooishbar.org>
Date: Tue Dec 28 16:06:29 2010 +0000
Test: Input: Check flags on DeviceEvent
Add initial validation of acceptable flags for XI2 device events, and
make sure they're swapped.
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Chase Douglas <chase.douglas@canonical.com>
commit 2592effef5f171af3f01a2b5130d9747403140f6
Author: Daniel Stone <daniel@fooishbar.org>
Date: Tue Dec 28 13:42:06 2010 +0000
Test: Input: Add helper function for failing EventToCore
We have quite a few tests which involve checking that EventToCore fails
for specific events, so refactor them into a separate function.
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Chase Douglas <chase.douglas@canonical.com>
commit e1aed88be92c27d76bff1743f35f9915dea9264f
Author: Daniel Stone <daniel@fooishbar.org>
Date: Tue Dec 28 17:00:29 2010 +0000
Input: Swap flags in DeviceEvents
Swap flags for different-endian clients when delivering XI2
DeviceEvents.
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Chase Douglas <chase.douglas@canonical.com>
commit 6358a60065eef167d4e5f4afd981ff26deeba80d
Author: Michel Dänzer <daenzer@vmware.com>
Date: Thu Jan 6 09:55:41 2011 +0100
EXA: Pad size of system memory copy for 1x1 pixmaps (bug #32803).
Fixes https://bugs.freedesktop.org/show_bug.cgi?id=32803 .
Signed-off-by: Michel Dänzer <daenzer@vmware.com>
Reviewed-by: Dave Airlie <airlied@redhat.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit f3480286aeb3009623d8d4b0202eadda0049552d
Author: Ville Syrjälä <ville.syrjala@nokia.com>
Date: Wed Jan 5 20:41:09 2011 +0200
composite: Support updating an arbitrary subtree
Rename compUpdateWindow to compPaintWindowToParent and split the child
walk to compPaintChildrenToWindow. Calling compPaintChildrenToWindow
allows an arbitrary subtree to be updated, instead of having to update
all the windows. This will be used to make sure all the descendants are
copied to the parent when the parent window contents need to be accessed
in IncludeInferios sub-window mode.
WindowRec has a new member 'damagedDescendants' that is used to keep
track of which subtrees need updating. When a window is damaged,
'damagedDescendants' will be set for all the ancestors, and when a
subtree is updated, the tree walk can be stopped early if no damaged
descendants are present.
CompScreenRec no longer needs the 'damaged' member since the root
window's 'damagedDescendants' provides the same information.
Signed-off-by: Ville Syrjälä <ville.syrjala@nokia.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit b89e6dbdfbb50e3b5bc7fcb7eccc397c467c92f8
Author: Ville Syrjälä <ville.syrjala@nokia.com>
Date: Wed Jan 5 20:41:08 2011 +0200
composite: Add SourceValidate wrapper
When SourceValidate is performed on a window with IncludeInferiors
sub-window mode, force an immediate update of all the automatically
redirected windows, so that the current window contents will be up
to date.
Signed-off-by: Ville Syrjälä <ville.syrjala@nokia.com>
Reviewed-by: Keith Packard <keithp@keithp.com>
Reviewed-by: Daniel Stone <daniel@fooishbar.org>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 84154954db54696d4661eb8d0a6014cdbff3c91f
Author: Ville Syrjälä <ville.syrjala@nokia.com>
Date: Wed Jan 5 20:41:07 2011 +0200
composite: Add GetImage wrapper
When GetImage is performed on a window, force an immediate update of
all the automatically redirected windows, so that the current window
contents will be up to date.
Signed-off-by: Ville Syrjälä <ville.syrjala@nokia.com>
Reviewed-by: Keith Packard <keithp@keithp.com>
Reviewed-by: Daniel Stone <daniel@fooishbar.org>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit a5dc3531e14589ac473cea482944d2d67517aabd
Author: Ville Syrjälä <ville.syrjala@nokia.com>
Date: Wed Jan 5 20:41:06 2011 +0200
Revert "composite: Convert compWindowUpdate to use TraverseTree"
TraverseTree visits the parent before the children. When performing
the automatic redirection updates, the children must be visited before
the parent.
If there are automatically redirected windows on multiple levels of the
tree, updating the parents before the children would cause the parent
updates to use stale data for areas covered by the children. Also
updating the damaged children would re-damage the parent, which would
cause additional walks over the tree.
In the worst case with an unbroken chain of automatically redirected
subwindows, all of which are damaged, only the leaf window would be
properly updated on the first round. Then it's parent would be properly
updated on the second round, and so on. And on every round all of the
ancestor windows would be updated as well, but with stale data.
So with N damaged windows you would end up with (N^2+N)/2 updates,
instead of the expected N.
This reverts commit 648c8871c92727d7b6b16859f27f12266a06a16e.
Signed-off-by: Ville Syrjälä <ville.syrjala@nokia.com>
Reviewed-by: Keith Packard <keithp@keithp.com>
Reviewed-by: Daniel Stone <daniel@fooishbar.org>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 0998574699502e6ab14fd8899c2e42961d4df7d0
Author: Ville Syrjälä <ville.syrjala@nokia.com>
Date: Wed Jan 5 20:41:05 2011 +0200
Call SourceValidate even if src == dst
The extra SourceValidate calls from damageCopyArea and damageCopyPlane
can be removed.
Signed-off-by: Ville Syrjälä <ville.syrjala@nokia.com>
Reviewed-by: Keith Packard <keithp@keithp.com>
Reviewed-by: Daniel Stone <daniel@fooishbar.org>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit e41e907b3c19908f5316346fa587ced3115478cd
Author: Ville Syrjälä <ville.syrjala@nokia.com>
Date: Wed Jan 5 20:41:04 2011 +0200
Add subWindowMode parameter to SourceValidate
Pass the subWindowMode from the GC/source Picture to SourceValidate.
Signed-off-by: Ville Syrjälä <ville.syrjala@nokia.com>
Reviewed-by: Daniel Stone <daniel@fooishbar.org>
Reviewed-by: Keith Packard <keithp@keithp.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 0dede200c9ac7adbe8b8c16efacc3edc1f183cd9
Merge: 7714357f50 2e781457d4
Author: Keith Packard <keithp@keithp.com>
Date: Wed Jan 5 08:51:46 2011 -0800
Merge remote branch 'vsyrjala/misc_fixes'
commit 7714357f506782973d25e270f85140b42507ed35
Merge: 02e18c9fb5 b01dd9d336
Author: Keith Packard <keithp@keithp.com>
Date: Wed Jan 5 08:43:18 2011 -0800
Merge remote branch 'whot/for-keith'
commit 02e18c9fb58c33d340af4573551fb9c7c59e0f43
Author: James Jones <jajones@nvidia.com>
Date: Mon Dec 20 11:05:57 2010 -0800
X Sync Cleanups
Various cleanups identified during review of the
X Sync Fence Object patches.
-Correctly handle failure of AddResource()
-Don't assert when data structures are corrupt. Instead,
use a new helper function to check for counter sync
objects when they're expected, and warn if the type is
wrong.
-Use the default switch label rather than reimplementing
it.
-Re-introduce cast of result of dixAllocateObjectWithPrivate()
to kill an incompatible pointer type warning.
-Remove comments claiming protocol updates are needed. One
wasn't true and the other was addressed with a xextproto
change.
-Return BadFence, not BadCounter from XSyncAwaitFence()
Signed-off-by: James Jones <jajones@nvidia.com>
Reviewed-by: Keith Packard <keithp@keithp.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 86ca434a1ab766c1519ee7146b48dbfead843524
Author: Zhao Yakui <yakui.zhao@intel.com>
Date: Tue Jan 4 14:08:16 2011 -0500
edid: Fix incorrect timings for VIC61
Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Anssi Hannula <anssi.hannula@iki.fi>
Signed-off-by: Zhao Yakui <yakui.zhao@intel.com>
commit bb18f277156c08be028a6e12d8987fb1593e9168
Author: Adam Jackson <ajax@redhat.com>
Date: Fri Dec 10 14:24:02 2010 -0500
x86emu: Fix more mis-decoding of the data prefix
cc2c73ddcb4370a7c3ad439cda4da825156c26c9's three-cent titanium tax
doesn't go too far enough. Fix the rest of the call and jmp
instructions to handle the data prefix correctly.
Reference: Intel 64 and IA-32 Architectures Software Developer's Manual
Volume 2A: Instruction Set Reference, A-M
http://www.intel.com/Assets/PDF/manual/253666.pdf
Reviewed-by: Julien Cristau <jcristau@debian.org>
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit 261d0d16af797bb52d4c778e220296d7f2b28e14
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Thu Dec 30 16:08:48 2010 -0800
Fix asprintf typo in commit d2c42b10
Reported-by: Jerome Carretero <cJ@zougloub.eu>
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Cyril Brulebois <kibi@debian.org>
Reviewed-by: Daniel Stone <daniel@fooishbar.org>
commit c6afe64bad7a27ff8828de499d56776c113df60f
Author: Daniel Stone <daniel@fooishbar.org>
Date: Fri Dec 31 03:15:27 2010 +0000
XFree86: Linux: AGP: Fix void-pointer-arithmetic warning
Cast it to a char *, mimicking the return immediately below it.
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
Reviewed-by: Mark Kettenis <kettenis@openbsd.org>
commit 2d67ada3c4079a11c52024a9c3d4138becca5171
Author: Pauli Nieminen <ext-pauli.nieminen@nokia.com>
Date: Thu Dec 30 19:19:43 2010 +0200
os: always check if client is local when connection is accepted
LocalClient is used for all DRI2 requests that makes it frequently
called function. Querying if connection is local or not takes 10-15us
(on ARM) depending on malloc speed.
Signed-off-by: Pauli Nieminen <ext-pauli.nieminen@nokia.com>
Reviewed-by: Daniel Stone <daniel@fooishbar.org>
commit 617b7d22115ccaaaa7ec69c99885054d33a3bc37
Author: Pauli Nieminen <ext-pauli.nieminen@nokia.com>
Date: Thu Dec 30 19:19:42 2010 +0200
os: Fix a memory leak
Signed-off-by: Pauli Nieminen <ext-pauli.nieminen@nokia.com>
Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Daniel Stone <daniel@fooishbar.org>
commit 3e1455505addc7e52178fa04399aef2a8522c921
Author: Pauli Nieminen <ext-pauli.nieminen@nokia.com>
Date: Thu Dec 30 19:19:41 2010 +0200
udev: Fix removing of the wake up handler
RemoveBlockAndWakeupHandlers requires caller to pass same block data
parameter as for RegisterBlockAndWakeupHandlers.
Signed-off-by: Pauli Nieminen <ext-pauli.nieminen@nokia.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Daniel Stone <daniel@fooishbar.org>
commit 13ac3deedb532b39f41dcd45d70f9eb4a85c1f58
Author: Pauli Nieminen <ext-pauli.nieminen@nokia.com>
Date: Thu Dec 30 19:19:40 2010 +0200
mi: Only register sprite block handler when needed
miSpriteBlockHandler takes about 10us in arm each time BlockHandlers are
called. To eliminate that overhead from xserver side only register the
BlockHandler when there actually is any cursor down.
Signed-off-by: Pauli Nieminen <ext-pauli.nieminen@nokia.com>
Reviewed-by: Daniel Stone <daniel@fooishbar.org>
commit 4f6e3b0f378d7306dbd8c00ef9a7df81e24e5769
Author: Pauli Nieminen <ext-pauli.nieminen@nokia.com>
Date: Thu Dec 30 19:19:39 2010 +0200
mi: Register sprite damage handler only when required
There is no need to have damage handler registered when there isn't any
pointer in the screen. This avoids some overhead from damage handling
which takes tens of microseconds on arm.
Signed-off-by: Pauli Nieminen <ext-pauli.nieminen@nokia.com>
Reviewed-by: Daniel Stone <daniel@fooishbar.org>
commit bf48082f30818b96bc623834be3022600371d4fc
Author: Pauli Nieminen <ext-pauli.nieminen@nokia.com>
Date: Thu Dec 30 19:19:38 2010 +0200
mi: Fix the debug message
Signed-off-by: Pauli Nieminen <ext-pauli.nieminen@nokia.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Daniel Stone <daniel@fooishbar.org>
commit 8fb43b8bf9fcbe015d4e98c7e09889184d136a1e
Author: Pauli Nieminen <ext-pauli.nieminen@nokia.com>
Date: Thu Dec 30 19:19:37 2010 +0200
mi: Fix wrapping for sprite screen
SCREEN_EPILOGUE should read the current function pointer from screen
after calling wrapped function in case the pointer changes.
Passing pPriv to macros instead of asking dix each time makes sense when
both macros need same pointer.
Signed-off-by: Pauli Nieminen <ext-pauli.nieminen@nokia.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Daniel Stone <daniel@fooishbar.org>
commit 4be2a6d1b33fac7ceb50ad1de249a1acd5a46ab0
Author: Pauli Nieminen <ext-pauli.nieminen@nokia.com>
Date: Thu Dec 30 19:19:36 2010 +0200
mi: Add GetSpriteScreen macro to hide dixLookupPrivate
Signed-off-by: Pauli Nieminen <ext-pauli.nieminen@nokia.com>
Reviewed-by: Daniel Stone <daniel@fooishbar.org>
commit ed8db09b4bff5c4a8d8056808368650e1876547b
Author: Pauli Nieminen <ext-pauli.nieminen@nokia.com>
Date: Thu Dec 30 19:19:35 2010 +0200
composite: Remove unnecessary variable.
We know that there is damage if the dynamic block handler is registered.
Signed-off-by: Pauli Nieminen <ext-pauli.nieminen@nokia.com>
Reviewed-by: Daniel Stone <daniel@fooishbar.org>
commit c038b8b28e5c436cd31bea7a3bef2c8c9d818b58
Author: Pauli Nieminen <ext-pauli.nieminen@nokia.com>
Date: Thu Dec 30 19:19:34 2010 +0200
composite: Only register the block handler when it is required
Even calling block handler that doesn't do much is costly in arm. It
takes a few microseconds each time which adds up to relative high CPU
time because it is done 500+ times per second.
Simple optimization is to register the block handler only when it is
required.
Signed-off-by: Pauli Nieminen <ext-pauli.nieminen@nokia.com>
Reviewed-by: Daniel Stone <daniel@fooishbar.org>
commit 6d0e9e5d6e1b847961ab52a11aae96981a1cf1c0
Author: Pauli Nieminen <ext-pauli.nieminen@nokia.com>
Date: Thu Dec 30 19:19:33 2010 +0200
render: Enable animated cursor block handler only when needed
Calling BlockHandlers takes some time for each iteration in main loop
which adds up quickly over multiple request. To reduce the round-trip
costs to xserver BlockHandlers should be registered only when required.
AnimCurScreenBlockHandler is the first victim for this optimization.
Signed-off-by: Pauli Nieminen <ext-pauli.nieminen@nokia.com>
Reviewed-by: Daniel Stone <daniel@fooishbar.org>
commit aa8cea953dc66bcf4cb4d08f2681f9e6cb1bc8c5
Author: Pauli Nieminen <ext-pauli.nieminen@nokia.com>
Date: Thu Dec 30 19:19:32 2010 +0200
render: Don't filter 0 return from GetTimeInMillis
In animate cursor block handler code assumes GetTimeInMillis returns
always nonzero value. This isn't true when time wraps around.
To prevent any problems in case GetTimeInMillis would return zero use
activeDevice variable to track if we have received time.
Signed-off-by: Pauli Nieminen <ext-pauli.nieminen@nokia.com>
Reviewed-by: Daniel Stone <daniel@fooishbar.org>
commit 91beeee05f88eed10ab0fd97dc625e96cb7763ba
Author: Daniel Stone <daniel@fooishbar.org>
Date: Tue Oct 13 16:27:30 2009 +1100
DIX: Reset window properties when freeing them
This enables us to reliably inspect properties when destroying windows.
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
Reviewed-by: Fernando Carrijo <fcarrijo@freedesktop.org>
commit 36ebdd361616eedbe4919deae2a4e6f6606ae6b4
Author: Adam Jackson <ajax@redhat.com>
Date: Tue Oct 19 11:59:24 2010 -0400
linux: warning fix
lnx_agp.c: In function ‘xf86DeallocateGARTMemory’:
lnx_agp.c:267: warning: cast to pointer from integer of different size
Signed-off-by: Adam Jackson <ajax@redhat.com>
Reviewed-by: Daniel Stone <daniel@fooishbar.org>
commit 63ccaec2c39f4b5742383472c951ee2cd35c9e14
Author: Adam Jackson <ajax@redhat.com>
Date: Tue Oct 19 11:59:23 2010 -0400
glx: warning fixes
render2.c: In function ‘__glXDisp_Map2d’:
render2.c:127: warning: ‘u1’ may be used uninitialized in this function
render2.c: In function ‘__glXDisp_Map1d’:
render2.c:90: warning: ‘u1’ may be used uninitialized in this function
Remove unnecessary test, and change memcpy to memmove as all users were
doing overlapping copies.
Signed-off-by: Adam Jackson <ajax@redhat.com>
Reviewed-by: Daniel Stone <daniel@fooishbar.org>
commit d057e265c862f90e9b6fddff89f40cb82b2a59b1
Author: Adam Jackson <ajax@redhat.com>
Date: Tue Oct 19 11:59:22 2010 -0400
xcmisc: warning fix
xcmisc.c:202: warning: no previous prototype for ‘XCMiscExtensionInit’
Signed-off-by: Adam Jackson <ajax@redhat.com>
Reviewed-by: Daniel Stone <daniel@fooishbar.org>
commit 67e0bcba4307de5a330e027f4504c9aed4987e5a
Author: Adam Jackson <ajax@redhat.com>
Date: Tue Oct 19 11:59:21 2010 -0400
dri1: warning fix
dri.c: In function ‘DRIScreenInit’:
dri.c:434: warning: cast from pointer to integer of different size
Signed-off-by: Adam Jackson <ajax@redhat.com>
Reviewed-by: Daniel Stone <daniel@fooishbar.org>
commit a298d044f965e5ba91f178c6b599c1df26a958ba
Author: Adam Jackson <ajax@redhat.com>
Date: Tue Oct 19 11:59:20 2010 -0400
loader: warning fix
loadmod.c: In function ‘FreeSubdirs’:
loadmod.c:377: warning: passing argument 1 of ‘free’ discards qualifiers
from pointer target type
/usr/include/stdlib.h:488: note: expected ‘void *’ but argument is of
type ‘const char *’
Signed-off-by: Adam Jackson <ajax@redhat.com>
Reviewed-by: Daniel Stone <daniel@fooishbar.org>
commit ee0b1b564413327c73bb8cdbabb76667ca4a744c
Author: Adam Jackson <ajax@redhat.com>
Date: Tue Oct 19 11:59:18 2010 -0400
config: warning fixes
xf86AutoConfig.c: In function ‘FreeList’:
xf86AutoConfig.c:123: warning: passing argument 1 of ‘free’ discards
qualifiers from pointer target type
/usr/include/stdlib.h:488: note: expected ‘void *’ but argument is of
type ‘const char *’
Signed-off-by: Adam Jackson <ajax@redhat.com>
Reviewed-by: Daniel Stone <daniel@fooishbar.org>
commit 32c85ad4b8fe27fed0c494f69c39e3902ce57b1b
Author: Daniel Stone <daniel@fooishbar.org>
Date: Tue Dec 28 12:40:31 2010 +0000
GLX: DRI2: Fix mismatched-types warning
All the DRI extension types have a base extension type as their first
member to avoid exactly these types of warning.
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
Reviewed-by: Mark Kettenis <kettenis@openbsd.org>
Reviewed-by: Cyril Brulebois <kibi@debian.org>
commit 22796cfa4805cc9551e1b3fa1d3e2e1bfae5bad1
Author: Daniel Stone <daniel@fooishbar.org>
Date: Tue Dec 28 12:29:53 2010 +0000
udev: Add strdups to kill const warnings
InputAttributes wants non-const members, and while it appears safe to
cast it, just leave it be for the moment.
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
Reviewed-by: Dan Nicholson <dbn.lists@gmail.com>
commit 03f2eb1e156796afb70118d7f7f60ac61beed026
Author: Daniel Stone <daniel@fooishbar.org>
Date: Fri Dec 17 17:13:34 2010 +0000
Input: Set client error value for invalid mask bits
When we send BadValue back to the client for having invalid mask bits,
at least tell them what the (first) invalid bit was.
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 47818287983b04625661b08ae362e0966cddf3e1
Author: Chase Douglas <chase.douglas@canonical.com>
Date: Fri Dec 17 17:13:30 2010 +0000
Make EventIsDeliverable non-static
Will be used outside dix/events.c in proceeding XI 2.1 MT changes.
Signed-off-by: Chase Douglas <chase.douglas@canonical.com>
Reviewed-by: Daniel Stone <daniel@fooishbar.org>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit f7d8ade3c5ac44faf7f3ea0d846e35f75b31c9ec
Author: Daniel Stone <daniel@fooishbar.org>
Date: Fri Dec 17 17:13:26 2010 +0000
Resources: Move rClient to resource.h
The definition of rClient was duplicated across three source files, so
move it to resource.h.
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 05e437c2ce230b588362f012c06ead5c6d89c006
Author: Chase Douglas <chase.douglas@canonical.com>
Date: Fri Dec 17 17:13:27 2010 +0000
Export all valuator_mask_* functions
Input drivers may use valuator masks for internal state. Having all the
valuator_mask_* functions available will help.
Signed-off-by: Chase Douglas <chase.douglas@canonical.com>
Reviewed-by: Daniel Stone <daniel@fooishbar.org>
Bump ABI_XINPUT_VERSION minor.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 2e781457d43ec4bf0d633257ac6852cde3b00541
Author: Ville Syrjälä <ville.syrjala@nokia.com>
Date: Thu Dec 16 18:22:13 2010 +0200
xfree86/modes: Take rotation into account when checking mode size
Assume that a mode can be used in either landscape or portrait
orientation. I suppose the correct thing to do would be to
collect all the supported rotations from the CRTCs that can be used
with a specific output, but that information doesn't seem to be
readily available when these checks are done. So just assume that
either orientation is fine.
Signed-off-by: Ville Syrjälä <ville.syrjala@nokia.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
commit 0ce25fd7904c792924c3e0ee6fc21a5f1bec1a68
Author: Ville Syrjälä <ville.syrjala@nokia.com>
Date: Fri Dec 3 17:42:16 2010 +0200
dri2: Don't page flip when the window size doesn't match the pixmap size
If the drawable size doesn't match the pixmap size page flipping should
not be allowed.
If the window is larger than the pixmap, page flipping might need to
reposition the CRTC somewhere in the middle of the pixmap. I didn't
spot any code that would handle that at least in the intel driver.
Also the root pixmap could then move to some negative screen
coordinates. Not sure if all bits of code could handle that. Perhaps
when composite is enabled screen_x/y would make it work, but without
composite there's no way that it would work AFAICS.
Signed-off-by: Ville Syrjälä <ville.syrjala@nokia.com>
Reviewed-by: Alex Deucher <alexdeucher@gmail.com>
commit efcb63d0ce43f96d0ac02b6f4a480dfd2374fc84
Author: Daniel Stone <daniel@fooishbar.org>
Date: Thu Dec 23 13:33:00 2010 +0000
Render: Fix 'comparing between distinct pointer types' warning
Add the appropriate casts so that gcc shuts up, even if it doesn't
matter.
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
Reviewed-by: Tiago Vignatti <tiago.vignatti@nokia.com>
commit 469d5bf8b75038631c27edbb0f9cdf7d737fa233
Author: Daniel Stone <daniel@fooishbar.org>
Date: Fri Dec 17 16:48:45 2010 +0000
mi: Sync: Don't free managed screen private
misync allocates space for its screen private with
dixRegisterPrivateKey, which means it doesn't have to free it at
CloseScreen time; doing so will, in fact, result in a crash.
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
Reviewed-by: James Jones <jajones@nvidia.com>
Acked-by: Tiago Vignatti <tiago.vignatti@nokia.com>
commit 44adb31bfece29260a9bbd9075c9212ebf00d24d
Author: Daniel Stone <daniel@fooishbar.org>
Date: Fri Aug 27 20:36:37 2010 +1000
GetTimeInMillis: Use CLOCK_MONOTONIC_COARSE where available
On some systems, using CLOCK_MONOTONIC forces a readback of HPET or some
similarly expensive timer. CLOCK_MONOTONIC_COARSE can alleviate this,
at the cost of negligibly-reduced resolution, so prefer that where we
can.
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
Reviewed-by: Julien Cristau <jcristau@debian.org>
Reviewed-by: Tiago Vignatti <tiago.vignatti@nokia.com>
commit 296561506a91742cc150a0fb6fc0df5dbe98c780
Author: Rami Ylimäki <rami.ylimaki@vincit.fi>
Date: Wed Dec 22 16:57:17 2010 +0200
Xext: Use general OS functions to determine client command string in SELinux.
Signed-off-by: Rami Ylimäki <rami.ylimaki@vincit.fi>
Reviewed-by: Tiago Vignatti <tiago.vignatti@nokia.com>
commit 1e933665bef26c74196bb7c59910e6a78bcacf0e
Author: Rami Ylimäki <rami.ylimaki@vincit.fi>
Date: Wed Dec 22 16:51:09 2010 +0200
os: Add facilities for client ID tracking.
An interface is provided for figuring out the PID and process name of
a client. Make some existing functionality from SELinux and IA
extensions available for general use.
Signed-off-by: Rami Ylimäki <rami.ylimaki@vincit.fi>
Reviewed-by: Tiago Vignatti <tiago.vignatti@nokia.com>
commit 671b2a1823a1c90d0b6254e2e2af8865151fff8c
Author: Rami Ylimäki <rami.ylimaki@vincit.fi>
Date: Wed Dec 22 16:38:54 2010 +0200
config: Fix linking order of Xnest libraries.
MAIN depends on DIX and not vice versa.
Signed-off-by: Rami Ylimäki <rami.ylimaki@vincit.fi>
commit 2b364bf970b2ce6829af656990c33afd0d365f3c
Author: Rami Ylimäki <rami.ylimaki@vincit.fi>
Date: Tue Jun 15 14:44:38 2010 +0200
Revert "os: Prevent backtrace from being stopped in noreturn functions."
This reverts commit 579715f830fbbca9e1ecb17dc18176132f5969e7.
The patch is not needed anymore. I haven't encountered backtrace
problems with GCC 4.3.3. Even if the problems still persisted, this
commit should be removed and instead the definition of _X_NORETURN
should be modified to be empty if GCC/ARM is used. However, currently
it seems that ARM backtraces are OK even if _X_NORETURN is used and
-mapcs-frame is not defined in CFLAGS.
Signed-off-by: Rami Ylimäki <rami.ylimaki@vincit.fi>
Reviewed-by: Jamey Sharp <jamey@minilop.net>
commit b01dd9d33651999b0390bf8ed412b84f6929a13e
Author: Daniel Stone <daniel@fooishbar.org>
Date: Fri Dec 17 17:13:34 2010 +0000
Input: Set client error value for invalid mask bits
When we send BadValue back to the client for having invalid mask bits,
at least tell them what the (first) invalid bit was.
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 495e0142a77152c4cde5c88cdba4103ddc94df2c
Author: Chase Douglas <chase.douglas@canonical.com>
Date: Fri Dec 17 17:13:30 2010 +0000
Make EventIsDeliverable non-static
Will be used outside dix/events.c in proceeding XI 2.1 MT changes.
Signed-off-by: Chase Douglas <chase.douglas@canonical.com>
Reviewed-by: Daniel Stone <daniel@fooishbar.org>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 4fbe67beb56e5600c1df789c08725c45b9bef0d4
Author: Daniel Stone <daniel@fooishbar.org>
Date: Fri Dec 17 17:13:26 2010 +0000
Resources: Move rClient to resource.h
The definition of rClient was duplicated across three source files, so
move it to resource.h.
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 871c1e17e527857cd86b5e517d9a18e5041f00fd
Author: Chase Douglas <chase.douglas@canonical.com>
Date: Fri Dec 17 17:13:27 2010 +0000
Export all valuator_mask_* functions
Input drivers may use valuator masks for internal state. Having all the
valuator_mask_* functions available will help.
Signed-off-by: Chase Douglas <chase.douglas@canonical.com>
Reviewed-by: Daniel Stone <daniel@fooishbar.org>
Bump ABI_XINPUT_VERSION minor.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit e06fa804009798ea95efa8babaabb0228dfdfe65
Author: Michel Dänzer <daenzer@vmware.com>
Date: Wed Dec 22 11:45:36 2010 +0100
EXA: Fix crash with fill using 1x1 tile of depth < 8 (bug #24703).
Fixes http://bugs.freedesktop.org/show_bug.cgi?id=24703 .
Signed-off-by: Michel Dänzer <daenzer@vmware.com>
Reviewed-by: Dave Airlie <airlied@redhat.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 56d9c736f0c450bffd43300107689eb6dd1ea70b
Author: Adam Jackson <ajax@redhat.com>
Date: Thu Dec 16 14:26:10 2010 -0500
xfree86: Convert some xf86BlockSIGIO to OsBlockSignals
The DDC1 and int10 code are blocking SIGIO to get some assurance that
their usleep() calls take as long as they expect. That's a good start
but you really want to be blocking more than just SIGIO, SIGALRM too at
minimum.
At this point, except for SIGIO handler setup itself, BlockSIGIO really
means "block input events".
Reviewed-by: Tiago Vignatti <tiago.vignatti@nokia.com>
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit ce13a1dbbfbeee3a3d51d0385817df50944cfdee
Author: Adam Jackson <ajax@redhat.com>
Date: Thu Dec 16 14:03:13 2010 -0500
xfree86: Remove xf86EnterServerState
Back when we had RAC this was a vaguely meaningful thing. Since then
it's been a glorified (and confusing) wrapper around xf86BlockSIGIO.
Note that the APM and VT switch code are unusual relative to other code
that cares about SIGIO state. Most callers push a SIGIO disable to
create a critical section for the duration of the caller's stack frame,
but those two effectively disable SIGIO after their return and re-enable
on their next entry.
Reviewed-by: Tiago Vignatti <tigo.vignatti@nokia.com>
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit a04e74cb480f98bc3dd4def2da6f6752640d9e38
Author: Adam Jackson <ajax@redhat.com>
Date: Wed Dec 15 15:16:33 2010 -0500
xfree86: Symmetrize xf86AccessEnter and xf86AccessLeave
Enter was changing server operating state, Leave wasn't. Which was
wholly redundant, since all callers of Enter would immediately change
the operating state to exactly what Enter had just done.
Reviewed-by: Tiago Vignatti <tiago.vignatti@nokia.com>
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit 7a9062f2f029b4f911ba56f291375fbf5a98ca73
Author: Adam Jackson <ajax@redhat.com>
Date: Tue Dec 14 15:44:16 2010 -0500
fonts: Fix typo in async ListFonts logic
This was introduced in 3ab6cd31cbdf8095b2948034fce5fb645422d8da. Mea
culpa. This logic is still incorrect [1], but at least it's less
incorrect.
[1] - https://bugzilla.redhat.com/658587
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Daniel Stone <daniel@fooishbar.org>
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit f28e48834e40c7901c2efc72f962c9724e74a531
Author: Adam Jackson <ajax@redhat.com>
Date: Thu Dec 16 13:13:54 2010 -0500
Remove SCO support
This has never been buildable in any modular server release.
Reviewed-by: Julien Cristau <jcristau@debian.org>
Reviewed-by: Mark Kettenis <kettenis@openbsd.org>
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit 040d54fb88f3970e19d0fbf911d6447f592496bd
Author: Adam Jackson <ajax@redhat.com>
Date: Wed Dec 15 14:59:13 2010 -0500
xfree86: Remove unused xf86inSuspend
What is this, I don't even.
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Daniel Stone <daniel@fooishbar.org>
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit e7dc253452a1ba64718a08fdc070405b494f53cd
Merge: d1107918d4 d5b0d58573
Author: Keith Packard <keithp@keithp.com>
Date: Mon Dec 20 00:48:45 2010 -0800
Merge remote branch 'alanc/master'
commit d1107918d4626268803b54033a07405122278e7f
Author: Tiago Vignatti <tiago.vignatti@nokia.com>
Date: Fri Dec 17 16:09:35 2010 +0200
randr: check for virtual size limits before set crtc
Return a error if the screen is configured to an invalid size.
Signed-off-by: Tiago Vignatti <tiago.vignatti@nokia.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
Reviewed-by: Daniel Stone <daniel@fooishbar.org>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 4b88c7be8de4149fe3d166bf115775f9e81a1373
Author: Jörn Horstmann <launchpad@planetxml.de>
Date: Mon Dec 6 11:24:02 2010 +1100
Add EDID quirk for HP Compaq nc8430.
Like some other LPL panels, this one reports the vertical size in cm rather
than mm.
Patch taken from Launchpad bug #380009 <https://launchpad.net/bugs/380009>
X.Org Bug 28414 <https://bugs.freedesktop.org/show_bug.cgi?id=28414>
Signed-off-by: Christopher James Halse Rogers <christopher.halse.rogers@canonical.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit a2e67a6412386782cb8b644b86a5744591397d45
Author: Christopher James Halse Rogers <christopher.halse.rogers@canonical.com>
Date: Mon Dec 6 11:24:01 2010 +1100
IDLETIME: Fix edge-case in IdleTimeBlockHandler
Ensure that if we're called exactly on the threshold of a
NegativeTransition trigger that we reshedule to pick up
an idle time over the threshold.
Signed-off-by: Christopher James Halse Rogers <christopher.halse.rogers@canonical.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit b55bf248581dc66321b24b29f199f6dc8d02db1b
Author: Christopher James Halse Rogers <christopher.halse.rogers@canonical.com>
Date: Mon Dec 6 11:24:00 2010 +1100
Xext: Fix edge case with {Positive, Negative}Transition triggers.
The {Positive,Negative}Transition triggers only fire when the counter
goes from strictly {below,above} the threshold. If
SyncComputeBracketValues gets called exactly at this threshold we may update
the bracket values so that the counter is not updated past the threshold.
Signed-off-by: Christopher James Halse Rogers <christopher.halse.rogers@canonical.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit d5b0d58573ffb90ea70273cd013102168fd2a18a
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Thu Dec 16 22:29:37 2010 -0800
Bug 32436 - hw/xfree86/parser/Makefile.am TOP_SRCDIR should be top_srcdir
https://bugs.freedesktop.org/show_bug.cgi?id=32436
Fix typo introduced in 2416255f7e3fd9190a9 that breaks builds when
configured --enable-install-libxf86config
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Julien Cristau <jcristau@debian.org>
Tested-by: Simon Thum <simon.thum@gmx.de>
commit 058b889fde47b4c32534f11ed651bf1749d1dbb2
Author: David Barksdale <david.barksdale@adcedosolutions.com>
Date: Mon Dec 13 18:35:20 2010 -0800
Bug 21827: faulty sdksyms.c generated by the awk script in sdksyms.sh
https://bugs.freedesktop.org/show_bug.cgi?id=21827
Tested-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Signed-off-by: David Barksdale <david.barksdale@adcedosolutions.com>
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
commit 1324b0ca9f8a7fdaf03b374c75eb3c9df407c2f1
Author: Colin Harrison <colin.harrison@virgin.net>
Date: Fri Dec 10 00:08:24 2010 +0000
Typo in xserver Xvasprintf()
I needed this patch in the wrapper around vsnprintf() in os/xprintf.c
(MinGW for Windows build) to correct various crashes.
Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
commit f1542f1d716723cba7c323849086585635121893
Merge: 9716d31247 8a8fdd762a
Author: Keith Packard <keithp@keithp.com>
Date: Tue Dec 14 15:04:12 2010 -0800
Merge remote branch 'whot/for-keith'
commit 9716d3124799c6db0d1c782aa72c72f972d5a158
Merge: 03ea0b7726 f641e4b34a
Author: Keith Packard <keithp@keithp.com>
Date: Tue Dec 14 15:01:36 2010 -0800
Merge remote branch 'jeremyhu/master'
commit 03ea0b7726487b96df73936518da73d023e51334
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Tue Dec 7 16:31:55 2010 -0500
docs: replace BUILLDOCS with existing ENABLE_DEVEL_DOCS
Use the util-macros AM Conditionals to control generation of developers
documents. This is used throughout xorg modules.
The doxygen generated docs are now also managed by --enable-devel-docs.
Remove --enable-builddocs as this was last use for BUILDDOCS
*** From the RELEASE NOTES ***
New configure options for documentation in modules
--------------------------------------------------
As many more modules now contain documentation to be converted from DocBook XML to text,
HTML, PostScript, and/or PDF formats, new standard options have been added to the configure
macros to control the build of these in the modules.
--with-xmlto=yes|no
Enables or disables use of the xmlto [https://fedorahosted.org/
xmlto/] command to translate DocBook XML to other formats.
All DocBook XML conversions require use of this command.
--with-fop=yes|no
Enables or disables use of the Apache fop [http://
xmlgraphics.apache.org/fop/] command to translate DocBook
XML to PostScript and PDF formats.
--enable-docs=yes|no
Enables or disables the build and installation of all
documentation except traditional man pages or those covered
by the --enable-devel-docs and --enable-specs options.
--enable-devel-docs=yes|no
Enables or disables the build and installation of documentation
for developers of the X.Org software modules.
--enable-specs=yes|no
Enables or disables the build and installation of the formal
specification documents for protocols and APIs.
Reviewed-by: Tiago Vignatti <tiago.vignatti@nokia.com>
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit c78c71c3a872665e426a0a4b82f17007bd8c12cd
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Tue Dec 7 16:31:54 2010 -0500
hw/dmx/doc: DIST_SUBDIRS not required when using AM_CONDITIONAL
The makefile can be simplyfied as Automake handle this automatically.
All directories in SUBDIRS are visited for dist purposes.
www.gnu.org/software/automake/manual/automake.html#SUBDIRS-vs-DIST_005fSUBDIRS
Reviewed-by: Tiago Vignatti <tiago.vignatti@nokia.com>
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 8a8fdd762ad89c350854943311ec4aadc50245fa
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Mon Dec 13 11:28:30 2010 +1000
xfree86: always report the input options before initialising the device.
After collecting the driver's default options, report the list of options
set for the device before calling PreInit(). This helps with debugging those
cases where options are not merged correctly.
xf86OptionListReport reports with verbosity 5, higher than the default
verbosity so this won't generate logspam in the default case.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Dan Nicholson <dbn.lists@gmail.com>
Reviewed-by: Simon Thum <simon.thum@gmx.de>
commit 9db9e964f6ca553dcbd3b7b037745d9581eaa065
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri Dec 10 13:23:13 2010 +1000
xfree86: swap the order to-be-merged lists in xf86CollectInputOptions.
Current order causes the user-configured option list to be overwritten with
the default list supplied by the driver. Swap around so we overwrite the
driver's default values instead.
This only affected options supplied by the driver such as XkbLayout in the
case of evdev.
Reported-by: Sebastian Glita <glseba@yahoo.com>
Reported-by: Simon Thum <simon.thum@gmx.de>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Simon Thum <simon.thum@gmx.de>
Reviewed-by: Dan Nicholson <dbn.lists@gmail.com>
Tested-by: Sebastian Glita <glseba@yahoo.com>
commit 0d440a1c6e219cd39dbddd2b7e813c6431aac6ea
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Wed Dec 8 14:52:19 2010 +1000
dix: allow for button-only input devices (#21457)
Add a few checks for the existence of a valuator class on the device to
avoid null-pointer dereferences for button events from devices without a
valuator class.
X.Org Bug 21457 <http://bugs.freedesktop.org/show_bug.cgi?id=21457>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Chase Douglas <chase.douglas@canonical.com>
Reviewed-by: Daniel Stone <daniel@fooishbar.org>
commit f641e4b34aa91ecda29e546b8b975e72ce037ed0
Author: Jeremy Huddleston <jeremyhu@apple.com>
Date: Wed Dec 8 22:58:12 2010 -0800
XQuartz GL: Add $(GL_CFLAGS) to CFLAGS
This fixes a build failure I found on tinderbox.
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
commit 9cf055892dd413932e54b43cc2dfea70bafd525f
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Wed Dec 8 14:43:51 2010 +1000
xfree86: don't set movement flags for non-valuator events.
If a device doesn't send valuators, don't try to move its position.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Chase Douglas <chase.douglas@canonical.com>
commit aba8133c9c5a50753c388d76407868ac69f4134b
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Wed Dec 8 14:02:17 2010 +1000
dix: clear up an overly convoluted if statement.
No functional changes, just improves readability. This statement had things
added to/removed from it for a few server releases while the input event
queue was revamped. What made sense once is now mainly confusing.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Chase Douglas <chase.douglas@canonical.com>
commit 883039e07b0c0ef23c7fc4ba3455b41173c7a7fc
Author: Jeremy Huddleston <jeremyhu@apple.com>
Date: Wed Dec 8 13:27:41 2010 -0800
XQuartz: Just NSBeep() for XBell()
The CoreAudio path uses deprecated API and has reported crashes that
aren't worth fixing (4e8bf12b13690afa6d9fee0e339d3819ef16fb3f fixed
one and introduced another). NSBeep() does the job just fine.
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
commit 2c70b650b342378898064cf27e2f95c4b2e53d24
Author: Jon TURNEY <jon.turney@dronecode.org.uk>
Date: Wed Dec 8 18:54:30 2010 +0000
Fix Xwin build after af0f9f91
Fix damage to XWIN_LIBS in commit af0f9f913398d34a885c3fb4e8d40c1a7e2b3ee9
"Move some sync code to miext", which broke the XWin build
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Reviewed-by: Colin Harrison <colin.harrison at virgin.net>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 519d243f0c8e3c80226701f71d2cfa62e42dbff7
Merge: 9f9c732311 446482efaa
Author: Keith Packard <keithp@keithp.com>
Date: Tue Dec 7 13:39:58 2010 -0800
Merge remote branch 'alanc/master'
commit 446482efaa3d266266e2a143492a3ec0523622bd
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Sun Nov 28 09:41:17 2010 -0800
Convert cvt code to use XNFasprintf()
Requires linking xprintf.c into standalone cvt utility
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Mikhail Gusarov <dottedmag@dottedmag.net>
Reviewed-by: Julien Cristau <jcristau@debian.org>
commit d2c42b102707db6c1ca9dccc4de9210a43650cb1
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Sat Nov 27 23:10:46 2010 -0800
Replace alloc+strcpy+strcat with asprintf() & XNFasprintf() calls
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Mikhail Gusarov <dottedmag@dottedmag.net>
commit 3a9bb93dd178084f4ff1abcea331ca5a62f88ce6
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Sat Nov 27 22:38:27 2010 -0800
Convert alloc+sprintf pairs into asprintf() & XNFasprintf() calls
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Mikhail Gusarov <dottedmag@dottedmag.net>
commit 2416255f7e3fd9190a9e01bda57c992932de4bd9
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Sat Nov 27 22:36:44 2010 -0800
Convert hw/xfree86/parser code to use asprintf() calls
Requires linking xprintf.c into libxf86config for those who build it.
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Mikhail Gusarov <dottedmag@dottedmag.net>
commit 03e8bfa1d122f7dea905d48c93cfd54afd991dfd
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Sat Nov 27 20:09:04 2010 -0800
Convert existing Xprintf style calls to asprintf style
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com>
Reviewed-by: Mikhail Gusarov <dottedmag@dottedmag.net>
commit c95c1d338fdb62dbe3dba934b97324fa778b7fce
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Sat Nov 27 18:43:12 2010 -0800
Add asprintf() implementation for platforms without it
Provides a portable implementation of this common allocating sprintf()
API found in many, but not yet all, of the platforms we support.
If the platform provides vasprintf() we simply wrap it, otherwise we
implement it - either way callers can use it regardless of platform.
Since not all platforms guarantee to NULL out the return pointer on
failure, we don't either, and require callers to check the return
value for -1.
The old Xprintf() API is deprecated, but left for compatibility for now.
The new API is added in a new header so that it can be used in parts of
the server such as hw/xfree86/parser that don't include all the server
headers.
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Mikhail Gusarov <dottedmag@dottedmag.net>
commit 2db6951763115a4a5dfac53d1a8f78ac33f91235
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Fri Dec 3 16:32:01 2010 -0800
Sun's copyrights now belong to Oracle
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Mikhail Gusarov <dottedmag@dottedmag.net>
commit f06e8a61d6ed8f3054878167bffee619f852aad9
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Tue Nov 30 16:34:38 2010 -0800
Move inclusion of panoramiX headers to top of render.c
Fixes compiler error from Sun compilers due to _X_EXPORT declaration
being included after the unlabeled version:
"../Xext/panoramiXsrv.h", line 29: redeclaration must have the same or more restrictive linker scoping: XRT_PICTURE
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 9f9c732311ef0cc198e5ec44d02412eb7e8c3f3a
Author: Cyril Brulebois <kibi@debian.org>
Date: Fri Nov 12 21:35:25 2010 +0100
dix: Fix logic for displaying deprecation warning only once.
As pointed out by Jamey Sharp (again), the logic is faulty: --warn is
always going to be false. Replace it with warn-- accordingly, so that
there's (at least, but also only) one warning showing up.
Reviewed-by: Jamey Sharp <jamey@minilop.net>
Signed-off-by: Cyril Brulebois <kibi@debian.org>
commit a937803c1f671ef29332e5fe8c190d8b48239912
Author: Cyril Brulebois <kibi@debian.org>
Date: Fri Nov 12 21:29:26 2010 +0100
dix: Simplify deprecated *Lookup* wrappers around dixLookup*.
As pointed out by Jamey Sharp: “the result pointer is already guaranteed
to be NULL if the return value is not Success”, so get rid of the
variable used to catch the return value, and used in a ternary operation
to decide whether to return the pointer or NULL. Always return the
result pointer instead.
Reviewed-by: Jamey Sharp <jamey@minilop.net>
Signed-off-by: Cyril Brulebois <kibi@debian.org>
commit 73fbc4a4a7997b3ee1c779d8f394114270bcb20d
Author: Cyril Brulebois <kibi@debian.org>
Date: Fri Nov 12 12:04:11 2010 +0100
Replace SecurityLookupIDByClass() with dixLookupResourceByClass().
This patch has been prepared with the following Coccinelle semantic patch:
@@
expression a, b, c, d;
identifier r;
type t;
@@
-r = (t) SecurityLookupIDByClass(a, b, c, d);
+dixLookupResourceByClass((pointer*) &r, b, c, a, d);
The only occurrence not matching directly was processed after separating
declaration of pXinDraw and call to SecurityLookupIDByClass().
Reviewed-by: Jamey Sharp <jamey@minilop.net>
Signed-off-by: Cyril Brulebois <kibi@debian.org>
commit 6e8b34b7048bc9e49ef52b81e2de1b518a05890e
Author: Cyril Brulebois <kibi@debian.org>
Date: Fri Nov 12 11:36:36 2010 +0100
Replace SecurityLookupIDByType() with dixLookupResourceByType(), take 2.
These occurrences are a bit harder to catch through a semantic patch,
so process them “manually”.
Reviewed-by: Jamey Sharp <jamey@minilop.net>
Signed-off-by: Cyril Brulebois <kibi@debian.org>
commit ac04c1377a42ab6803adf551756653fd8e1a694b
Author: Cyril Brulebois <kibi@debian.org>
Date: Fri Nov 12 11:36:31 2010 +0100
Replace SecurityLookupIDByType() with dixLookupResourceByType(), take 1.
This patch has been prepared with the following Coccinelle semantic patch:
@@
expression a, b, c, d;
identifier r;
@@
-r = SecurityLookupIDByType(a, b, c, d);
+dixLookupResourceByType((pointer*) &r, b, c, a, d);
Reviewed-by: Jamey Sharp <jamey@minilop.net>
Signed-off-by: Cyril Brulebois <kibi@debian.org>
commit 28b4c02d7463ffe5c29f803f5656c5ecfc040185
Author: Cyril Brulebois <kibi@debian.org>
Date: Thu Nov 11 18:36:45 2010 +0100
Enable silent rules for cat and echo.
One gets this:
| GEN lf3-xaaBitmap.c
| GEN lf3-xaaBitmap.c
| GEN lf3-xaaBitmap.c
| GEN lf3-xaaBitmap.c
| CC lf3-xaaBitmap.lo
instead of this:
| echo "#define LSBFIRST" > l3-xaaBitmap.c
| echo "#define TRIPLE_BITS" >> l3-xaaBitmap.c
| echo '#include "../../../../hw/xfree86/xaa/xaaBitmap.c"' >> l3-xaaBitmap.c
| CC l3-xaaBitmap.lo
Occurrences found using:
| git grep -E '(cat|echo)' -- '*Makefile.am'
Reviewed-by: Gaetan Nadon <memsize@videotron.ca>
Signed-off-by: Cyril Brulebois <kibi@debian.org>
commit 838b9582280030a159878af566126cb0a523ec29
Author: Cyril Brulebois <kibi@debian.org>
Date: Thu Nov 11 15:40:13 2010 +0100
Replace LookupIDByType() with dixLookupResourceByType(), take 2.
These occurrences are a bit harder to catch through a semantic patch,
so process them “manually”.
Reviewed-by: Jamey Sharp <jamey@minilop.net>
Signed-off-by: Cyril Brulebois <kibi@debian.org>
commit ffb93533fd8067c7383aef5e0018a197af59b46c
Author: Cyril Brulebois <kibi@debian.org>
Date: Thu Nov 11 15:30:15 2010 +0100
Replace LookupIDByType() with dixLookupResourceByType(), take 1.
This patch has been prepared with the following Coccinelle semantic patch:
@@
expression x, y;
type t;
identifier r;
@@
-r = (t) LookupIDByType(x, y);
+dixLookupResourceByType((pointer*)&r, x, y, NullClient, DixUnknownAccess);
@@
expression x, y;
type t;
identifier r;
@@
-t r = (t) LookupIDByType(x, y);
+t r;
+dixLookupResourceByType((pointer*)&r, x, y, NullClient, DixUnknownAccess);
Reviewed-by: Jamey Sharp <jamey@minilop.net>
Signed-off-by: Cyril Brulebois <kibi@debian.org>
commit d1b45b0fd54efb952f9ff435a516c1bfd85ca186
Author: Cyril Brulebois <kibi@debian.org>
Date: Thu Nov 11 11:35:47 2010 +0100
Fix missing <string.h> include.
The following happens otherwise (with -Wall -Werror):
| In file included from /usr/include/X11/Xfuncs.h:47,
| from ../../include/misc.h:112,
| from ../../include/screenint.h:52,
| from ../../include/scrnintstr.h:52,
| from ../../dix/cursor.c:58:
| /usr/include/string.h:534: error: conflicting types for ‘xstrcasecmp’
| ../../include/os.h:488: note: previous declaration of ‘xstrcasecmp’ was here
| /usr/include/string.h:538: error: conflicting types for ‘xstrncasecmp’
| ../../include/os.h:493: note: previous declaration of ‘xstrncasecmp’ was here
Reviewed-by: Julien Cristau <jcristau@debian.org>
Signed-off-by: Cyril Brulebois <kibi@debian.org>
commit 780754050bc9cb1489f92a2a890ab5665e3e6358
Author: Cyril Brulebois <kibi@debian.org>
Date: Fri Nov 12 12:18:59 2010 +0100
Fix GLX_LIBS vs. DMX_LIBS order.
If glxproxy needs symbols which aren't pulled in by dmx itself, glxproxy
fails to link because of undefined references.
Signed-off-by: Cyril Brulebois <kibi@debian.org>
Reviewed-by: Julien Cristau <jcristau@debian.org>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 14983286c489ea1ec6ba4fadbeaec5c2d2ee34e1
Author: Keith Packard <keithp@keithp.com>
Date: Mon Dec 6 20:45:35 2010 -0800
Version bumped to 1.9.99.901 (1.10 RC1)
Signed-off-by: Keith Packard <keithp@keithp.com>
commit d96d5f5443358e33e47d1a61f9bd2afd8064a8dd
Author: James Jones <jajones@nvidia.com>
Date: Sun Dec 5 19:42:41 2010 -0800
Bump extension ABI to 5
Commit 606e079cc4d9a9db3197652ca51683c36f74efb8 moved the visual
field in WindowOptRec, breaking the extension module ABI.
Signed-off-by: James Jones <jajones@nvidia.com>
Reviewed-by: Keith Packard <keithp@keithp.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 435361bd73b9fc733f093d81af6b839953e35176
Author: Keith Packard <keithp@keithp.com>
Date: Mon Dec 6 20:38:14 2010 -0800
sync: syncObject may be None in SyncInitTrigger
And often is, especially when called from ProcSyncCreateAlarm.
Crashing in this case seems unwise.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 0d01b66df9081ef48843b3bad81c56bb2cd1ae69
Author: Keith Packard <keithp@keithp.com>
Date: Sun Dec 5 23:35:28 2010 -0800
randr: handle RRSetCrtcConfigs request with zero configs
Need to actually return a reply in this case.
Signed-off-by: Keith Packard <keithp@keithp.com>
Reviewed-by: Aaron Plattner <aplattner@nvidia.com>
commit b0f4bd61f0caf80f3be9a176f1f7a707bc6628d8
Author: Keith Packard <keithp@keithp.com>
Date: Sun Dec 5 21:53:25 2010 -0800
ProcRRSetCrtcConfigs uses 'configs' without being initialized
If the client sends invalid data for this request, the server
will jump to 'sendReply' and call RRFreeCrtcConfigs, passing it the
uninitialized 'configs' and 'num_configs' values.
Signed-off-by: Keith Packard <keithp@keithp.com>
Reviewed-by: Aaron Plattner <aplattner@nvidia.com>
commit 752c368421c1c824752cf467fba9318d75d2ca2c
Author: Keith Packard <keithp@keithp.com>
Date: Sun Dec 5 20:57:47 2010 -0800
Separate out screen size and screen pixmap sizes in RRScreenSizeSet
This provides for separate sizes for the screen scanout and rendering
buffer and the application-visible screen size.
Signed-off-by: Keith Packard <keithp@keithp.com>
Reviewed-by: Aaron Plattner <aplattner@nvidia.com>
commit a88d70fb20a2bc3152b84adff4380857e6cfadf5
Author: Keith Packard <keithp@keithp.com>
Date: Sun Dec 5 20:55:46 2010 -0800
Set sprite transforms from RRSetCrtcConfigs
These were getting ignored.
Signed-off-by: Keith Packard <keithp@keithp.com>
Reviewed-by: Aaron Plattner <aplattner@nvidia.com>
commit 96b4d4787bf82edd9d06eb9a6e94bc45412c7df2
Author: Keith Packard <keithp@keithp.com>
Date: Sun Dec 5 20:49:19 2010 -0800
DIX is responsible for ref counting scanout pixmaps.
Remove some extra ref counting inside hw/xfree86/modes
Signed-off-by: Keith Packard <keithp@keithp.com>
Reviewed-by: Aaron Plattner <aplattner@nvidia.com>
commit afb6ebf1d5829346c40fe1053c9f50afe926e6c6
Author: Keith Packard <keithp@keithp.com>
Date: Fri Dec 3 13:04:37 2010 -0800
randr: Hook up the new RandR 1.4 functionality
This bumps the supported RandR protocol version and adds the dispatch
hooks needed to call the new functions
Signed-off-by: Keith Packard <keithp@keithp.com>
Reviewed-by: Aaron Plattner <aplattner@nvidia.com>
commit 82612045e11f2b882ae132e184a9629f43f1c424
Author: Keith Packard <keithp@keithp.com>
Date: Fri Dec 3 13:00:46 2010 -0800
randr: Add per-crtc pixmaps
This adds new driver hooks to allocate scanout pixmaps and
changes the mode setting APIs to pass the new scanout pixmaps
along from DIX. DIX is responsible for reference counting the pixmaps
by tracking them through RRCrtcNotify.
Signed-off-by: Keith Packard <keithp@keithp.com>
Reviewed-by: Aaron Plattner <aplattner@nvidia.com>
commit 86c489c319c705f710bee3897fe27600ce15008e
Author: Keith Packard <keithp@keithp.com>
Date: Sat Dec 4 20:12:26 2010 -0800
hw/xfree86/modes: Add optional driver API for RRSetCrtcConfigs
This provides a driver hook which can either completely replace, or
just validate the parameters for, the RRSetCrtcConfigs request.
Signed-off-by: Keith Packard <keithp@keithp.com>
Reviewed-by: Aaron Plattner <aplattner@nvidia.com>
commit d94a035ea9eb3167fc4f35b2d9f0d53f8807014c
Author: Keith Packard <keithp@keithp.com>
Date: Sat Dec 4 19:22:11 2010 -0800
randr: Implement RRSetCrtcConfigs
This provides a driver-independent implementation of the
RRSetCrtcConfigs API by simply using the existing interfaces.
Signed-off-by: Keith Packard <keithp@keithp.com>
Reviewed-by: Aaron Plattner <aplattner@nvidia.com>
commit 66294afcab7b7a82f7dd897767e46c48a94b8ee8
Author: Keith Packard <keithp@keithp.com>
Date: Fri Dec 3 22:08:06 2010 -0800
randr: Add sprite position transforms
This implements sprite position transformations. Sprite image
transforms are passed all the way to the DDX layer, but the images are
not yet manipulated before being passed to the drivers.
Signed-off-by: Keith Packard <keithp@keithp.com>
Reviewed-by: Aaron Plattner <aplattner@nvidia.com>
commit c8bc25fd7629df10f2825b7cc713b031ae78f223
Author: Keith Packard <keithp@keithp.com>
Date: Mon Dec 6 19:40:30 2010 -0800
Require RandR protocol version 1.4 or newer
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 8b35118c03590a7ad3786d3284bafb3f40fcb8cc
Author: Keith Packard <keithp@keithp.com>
Date: Sun Jun 6 15:23:37 2010 -0700
Replace huge argument list in xf86CrtcSetModeTransform with struct
xf86CrtcSetModeTransform was starting to get ridiculous with 6
arguments, this change has it take a single structure that contains
all of those values along with a set of flags that says which have
changed.
Signed-off-by: Keith Packard <keithp@keithp.com>
Reviewed-by: Aaron Plattner <aplattner@nvidia.com>
commit f5b8bd620f91214c0b87e9b04d57015655792352
Merge: 01e9fa7da3 8127c83c81
Author: Keith Packard <keithp@keithp.com>
Date: Mon Dec 6 19:51:06 2010 -0800
Merge remote branch 'jajones/for-keith'
commit 01e9fa7da389fc7ab834b4234b8484514144b7f4
Merge: 79870dbf72 68a1b0de95
Author: Keith Packard <keithp@keithp.com>
Date: Mon Dec 6 19:45:11 2010 -0800
Merge remote branch 'whot/for-keith'
commit 79870dbf72d463cf9efea1b3e61d1d5759df27b5
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Sat Dec 4 16:13:29 2010 -0500
config: build Xserver man pages using XORG_MANPAGE_SECTIONS
Nothing requires the use of a C preprocessor
Using standard file exentions (.man) means no need for .gitignore
Use standard directory and makefile
Fix man page whitespace issues
Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Matt Dew <matt@osource.org>
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit c4a7a5917ab828d4a0bd825a98e4d641bcb378f1
Merge: 5de312a60d 714b68d9e5
Author: Keith Packard <keithp@keithp.com>
Date: Mon Dec 6 19:28:07 2010 -0800
Merge remote branch 'jeremyhu/master'
commit 5de312a60d8227ed670849ecf888ea878aa81430
Merge: 311cad3315 8f42b2b693
Author: Keith Packard <keithp@keithp.com>
Date: Mon Dec 6 19:22:52 2010 -0800
Merge remote branch 'alanc/master'
commit 8127c83c81bf64369a8ba2999088226d14e0b128
Author: James Jones <jajones@nvidia.com>
Date: Mon Dec 6 12:14:01 2010 -0800
Expose Sync Fence Object protocol
Add the new protocol handlers for XSync 3.1 to the
dispatch tables and report support for Sync protocol
version 3.1.
Signed-off-by: James Jones <jajones@nvidia.com>
Reviewed-by: Keith Packard <keithp@keithp.com>
commit 9c0c7cc9a7adf230b5eee0b4166f9e17e07a088b
Author: James Jones <jajones@nvidia.com>
Date: Mon Dec 6 13:10:42 2010 -0800
Add XSyncAwaitFence() handler
-Add the actual ProcSyncAwaitFence() dispatch func
-Add support for fence sync triggers.
Signed-off-by: James Jones <jajones@nvidia.com>
Reviewed-by: Keith Packard <keithp@keithp.com>
commit 397dfd9f87e1cdf105d10a789a97230f4f0d204e
Author: James Jones <jajones@nvidia.com>
Date: Fri Jun 25 17:59:14 2010 -0700
Create/Destroy/Trigger/Reset/Query Fence Sync objs
Initial server side implementation of fence sync
objects. Allows creation, management, and state
queries of binary state objects. Currently they
are not very useful as there is no way to wait for
them efficiently.
The basic trigger operation added here triggers
relative to a given X screen's rendering operations.
To perform this operation, fence sync objects must
be tied to a screen. As Aaron Plattner pointed out,
screens are identified but a drawable in X protocol,
so a drawable argument is included in
XSyncCreateFence(). The screen also could have been
specified as part of the trigger operation. However,
it is also desireable to associate a screen with
fence sync objects at creation time so that the
associated screen's driver can allocate any HW-
specific resources needed by the fence object up
front.
Signed-off-by: James Jones <jajones@nvidia.com>
Reviewed-by: Keith Packard <keithp@keithp.com>
commit 53ea965d64bd9563e6bfcc81d04f283d2b85f09d
Author: James Jones <jajones@nvidia.com>
Date: Mon Nov 29 10:09:36 2010 -0800
Require xextproto 7.1.99
Subsequent changes rely on fence sync protocol
in the sync extension. This protocol is only
complete in xextproto version 7.1.99 and
above.
Signed-off-by: James Jones <jajones@nvidia.com>
Reviewed-by: Keith Packard <keithp@keithp.com>
commit 1c4a0db2c6bf0320cb630b84ab87bcfd3801a53d
Author: James Jones <jajones@nvidia.com>
Date: Mon Jun 28 16:10:13 2010 -0700
Add fence sync driver interface
-Add fence sync objects
-Add fence sync devPrivates
-Add a X sync module screen private
-Add wrappable functions to create and destroy
fence sync objects
-Give fence sync objects wrappable functions to
trigger, test, and reset their 'triggered' value.
-Give fence sync objects wrappable functions to
notify driver when adding/removing triggers to/
from the sync object.
Signed-off-by: James Jones <jajones@nvidia.com>
Reviewed-by: Keith Packard <keithp@keithp.com>
commit af0f9f913398d34a885c3fb4e8d40c1a7e2b3ee9
Author: James Jones <jajones@nvidia.com>
Date: Mon Jun 28 15:39:04 2010 -0700
Move some sync code to miext
As a precursor to the fence sync object video driver
and extension API, move some code from Xext to
miext/sync. Most of this is just code to set up the
build system to include the new directory. No
functional code is added in this change.
Signed-off-by: James Jones <jajones@nvidia.com>
Reviewed-by: Keith Packard <keithp@keithp.com>
commit 12b65de7db6e3e8bf831914d247da269d01c5fbe
Author: James Jones <jajones@nvidia.com>
Date: Mon Dec 6 10:11:45 2010 -0800
Factor out generic code from ProcSyncAwait()
In preparation for adding more sync object types
that will need Await requests of their own, factor
out some setup and finalization code from
ProcSyncAwait() into SyncAwaitPrologue() and
SyncAwaitEpilogue()
Signed-off-by: James Jones <jajones@nvidia.com>
Reviewed-by: Keith Packard <keithp@keithp.com>
commit c66a410d378090f350beb398649e9d9262933785
Author: James Jones <jajones@nvidia.com>
Date: Mon Jun 28 14:59:01 2010 -0700
Make Await SyncTrigger functions generic
Update all the functions dealing with Await
sync triggers handle generic sync objects
instead of just counters. This will
facilitate code sharing between the counter
sync waits and the fence sync waits.
Signed-off-by: James Jones <jajones@nvidia.com>
Reviewed-by: Keith Packard <keithp@keithp.com>
commit 99daf419a3070c347c0cd29b4a9bae07eca7bd6d
Author: James Jones <jajones@nvidia.com>
Date: Mon Jun 28 14:51:54 2010 -0700
Create SyncObject base type.
SyncObject is now the base type for SyncCounter.
Data to be used by all sync types is stored in
the base object. SyncCounter can be safely cast
to SyncObject, and a SyncObject can be cast to
the correct type based on SyncObject::type.
Signed-off-by: James Jones <jajones@nvidia.com>
Reviewed-by: Keith Packard <keithp@keithp.com>
commit 27593eea7efcbed8de0c6e8233cbd1a1b8a50459
Author: James Jones <jajones@nvidia.com>
Date: Mon Dec 6 13:36:14 2010 -0800
Add and use SERVER_SYNC_*_VERSION
Most extensions have a version defined
in the protocol headers, and also in the
server's protocol-versions.h. The latter
defines which version the server advertises
support for. Sync wasn't included in
protocol-versions.h, and was advertising
support for whatever was in the protocol
headers the server was built against.
Signed-off-by: James Jones <jajones@nvidia.com>
Reviewed-by: Keith Packard <keithp@keithp.com>
commit 68a1b0de95f71f74835c6c0f002699fcdccbb268
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Mon Dec 6 14:58:37 2010 +1000
xfree86: use xf86AllocateInput() for xorg.conf devices too.
Single allocation point for input devices, most notably a single point to
reset default values.
Without this patch, the file descriptor default was -1 for hotplugged
devices and 0 for config devices. Drivers that don't overwrite the default
themselves would thus fail if configured in the xorg.conf.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Daniel Stone <daniel@fooishbar.org>
Reviewed-by: Dan Nicholson <dbn.lists@gmail.com>
commit beea2378f142556471c62290e275935af848e137
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Mon Dec 6 14:33:43 2010 +1000
xfree86: don't overwrite option list (#32115)
Options set in the configuration file were unconditionally overwritten by
the server. Merge the already existing options and the new options together
instead of just overwriting ones.
Introduced in commit 2199842ed50b3eb40d54146827fc58cae7e873ec
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu Sep 2 10:52:54 2010 +1000
xfree86: remove extraOptions field from IDevRec.
X.Org Bug 32115 <http://bugs.freedesktop.org/show_bug.cgi?id=32115>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Dan Nicholson <dbn.lists@gmail.com>
Tested-by: David Ronis <ronis@ronispc.chem.mcgill.ca>
commit 8f3fa8fb0b0a75dac714fc213c034b20595898d3
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Mon Dec 6 15:44:50 2010 +1000
xfree86: add option "Floating", deprecate SendCoreEvents and friends.
Some devices should be initialised as floating from the start (e.g.
Joysticks and accelerometers benefit from this). Currently users use the
"SendCoreEvents" "off" flag for this, which isn't the most appropriate
naming.
Add an option "Floating", deprecate the others. Still parsed and handled by
the server.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Daniel Stone <daniel@fooishbar.org>
commit 36b614dedf4ddc428e43ad1542d4f9314f73f60a
Author: Eoghan Sherry <ejsherry@gmail.com>
Date: Sun Nov 28 16:15:51 2010 -0500
Xi: Fix master button update when slave buttons are mapped. #24887
It is currently assumed that an event button delieved to a master device
corresponds to the slave button states. However, the event button is a
logical (mapped) slave button and slave button states correspond to
physical (unmapped) slave buttons. This leads to incorrect update of the
master button state and incorrect events devlivered to clients. Fix the
situation by taking the slave button map into account when querying a
slave button state.
Fixes: https://bugs.freedesktop.org/show_bug.cgi?id=24887
Signed-off-by: Eoghan Sherry <ejsherry@gmail.com>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 31ab9f8860848504df18a8be9d19b817b191e0df
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri Sep 3 11:54:41 2010 +1000
mi: handle DGA subtypes when determining the master device.
The subtype in the DGA event is the core type and all ET_ event types (where
applicable) are identical to the core types. Thus the switch statement below
will work as required and assign the right master device.
Fixes a crasher bug on keyboard devices with valuators. If a device sends a
motion event while grabbed and a DGA client is active (but has not selected
input through DGA), the valuator event is posted through the VCK and
eventually results in a NULL-pointer dereference on dev->valuator.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 5d31c3e705dfd9f38f0fffcd07a6d8d06644735c
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri Nov 26 09:37:37 2010 +1000
dix: don't stop processing valuators when the mode changes.
XI 1.x events still contain absolute coordinates anyway. By the time we get
to the InternalEvent to XI event conversion, the valuators are already
absolute.
Stopping because of a different mode on a valuator is not necessary.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Adam Jackson <ajax@redhat.com>
Reviewed-by: Chase Douglas <chase.douglas@canonical.com>
commit 714b68d9e5bf624a6703f168e0f7dc980e88e8c0
Author: Jeremy Huddleston <jeremyhu@apple.com>
Date: Fri Dec 3 17:27:44 2010 -0800
XQuartz: RandR: Fix mode changing for multi-monitor configurations.
This just fixes the regression whereby we couldn't switch between the legacy
fullscreen mode and rootless on multi-monitor configurations. This was
happening because ref wasn't being set in these cases (since we don't ever
actually change CG modes), so we failed a CFEqual. Setting the references
fixes this regression and places us one step closer to more mode RandR
mode switching in multi-monitor configurations.
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
commit 14f00449eb81771c01fffcdaf3dd697cdf4e41de
Author: Jeremy Huddleston <jeremyhu@apple.com>
Date: Fri Dec 3 16:46:11 2010 -0800
XQuartz: Cleanup some compiler warnings
Mark __crashreporter_info__ as __attribute__((__used__))
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
commit 14aec8b82a316c6df51ac2a81985ebf1990abd2b
Author: Jeremy Huddleston <jeremyhu@apple.com>
Date: Fri Dec 3 16:45:37 2010 -0800
XQuartz: Remove one more backing store leftover
See: c4c4676e6874b42c2371eee96faa2c2dbb59a704
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
commit ca431371a23a2b9ad36c1d64e11ea41d5e4e5f04
Author: Jeremy Huddleston <jeremyhu@apple.com>
Date: Fri Nov 26 15:31:22 2010 -0500
XQuartz: Disable the Mac OS X screensaver when in full screen mode
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
commit 311cad33155c64ed996418808727fc417168592e
Author: Nicolas Peninguy <nico@lostgeeks.org>
Date: Wed Nov 24 00:11:11 2010 +0100
Fix Xdmx and Xephyr build when DTrace support is enabled
This fixes the following build errors when DTrace is enabled
(--with-dtrace):
CCLD Xdmx
/usr/bin/ld: ../../os/os.O: undefined reference to symbol 'dladdr@@GLIBC_2.2.5'
/usr/bin/ld: note: 'dladdr@@GLIBC_2.2.5' is defined in DSO /lib64/libdl.so.2 so try adding it to the linker command line
CCLD Xephyr
../../../os/os.O: In function `TimerForce':
/home/nico/work/xserver/os/WaitFor.c:481: multiple definition of `TimerForce'
../../../os/os.O:/home/nico/work/xserver/os/WaitFor.c:481: first defined here
Signed-off-by: Nicolas Peninguy <nico@lostgeeks.org>
Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 3824417335ec00a87b51f8d05e592099b8507680
Merge: dab064fa5e f4f41c812d
Author: Keith Packard <keithp@keithp.com>
Date: Thu Dec 2 08:39:33 2010 -0800
Merge remote branch 'vsyrjala/xv_reput'
commit dab064fa5e0b1f5c67222562ad5367005832cba1
Author: Andrea Canciani <ranma42@gmail.com>
Date: Tue Nov 2 20:10:32 2010 +0100
render: Fix byteswapping of gradient stops
The function swapStops repeatedly swaps the color components as
CARD16, but incorrectly steps over them as if they were CARD32.
This causes half of the stops not to be swapped at all and some
unrelated data be swapped instead.
Signed-off-by: Andrea Canciani <ranma42@gmail.com>
Reviewed-by: Soren Sandmann <sandmann@daimi.au.dk>
Reviewed-by: Julien Cristau <jcristau@debian.org>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 279ef1ffd787dba2f0d5056849b9cb15d36aa3eb
Author: Cyril Brulebois <kibi@debian.org>
Date: Wed Dec 1 14:12:55 2010 +0100
Fix screen number checks.
screenInfo.numScreens is not a valid screen number, they go from 0 to
numScreens - 1.
Signed-off-by: Cyril Brulebois <kibi@debian.org>
Reviewed-by: Alex Deucher <alexdeucher@gmail.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 8684543021b9b1aa165b1bc69bc58685cb5942c1
Author: Julien Cristau <jcristau@debian.org>
Date: Tue Nov 30 17:23:10 2010 +0100
DGA: fix screen number check
screenInfo.numScreens is not a valid screen number, they go from 0 to
numScreens - 1.
Signed-off-by: Julien Cristau <jcristau@debian.org>
Reviewed-by: Keith Packard <keithp@keithp.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 8f42b2b69387b006bfcd373c3d023ebea9035db2
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Sat Nov 27 22:34:57 2010 -0800
Simplify Error() - don't allocate temporary copy of error string
Doesn't seem to be any reason to just not pass the error string
as another argument directly to LogVWrite()
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Mikhail Gusarov <dottedmag@dottedmag.net>
Reviewed-by: Julien Cristau <jcristau@debian.org>
commit 685286b17d30335d799a9da11914943e466ea955
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Sat Nov 27 20:43:28 2010 -0800
FindModuleInSubdir: Stop allocating one more byte than needed
15ac25627e7239629be59 removed the "/" from the sprintf strings,
but failed to remove the extra byte allocated for the '/'.
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Mikhail Gusarov <dottedmag@dottedmag.net>
Reviewed-by: Julien Cristau <jcristau@debian.org>
commit 40d5a019352fa8f12230c863e11cbb1f6258a93e
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Sat Nov 27 19:50:38 2010 -0800
xf86VIDrvMsgVerb: print args, not format string
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Mikhail Gusarov <dottedmag@dottedmag.net>
Reviewed-by: Julien Cristau <jcristau@debian.org>
commit 4bbc90cd8b7e749fd8072ce7cd8dd998f4396981
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Sat Nov 27 19:06:56 2010 -0800
xf86AutoConfig: make copyScreen memory allocation & error handling more sane
No point calling the no-fail-alloc if you check for failure and your
only caller checks for failure.
No point calling calloc to zero fill memory you're about to memcpy over.
In the unlikely event of a loss of memory allocation, drop your previous
allocations before returning to others.
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Julien Cristau <jcristau@debian.org>
Reviewed-by: Mikhail Gusarov <dottedmag@dottedmag.net>
commit 2c8e534c8e9334562485aeaaef374871cf14d5fe
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Sat Nov 27 23:49:55 2010 -0800
xf86ValidateModes: xnfalloc(strlen) + strcpy => xnfstrdup
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Mikhail Gusarov <dottedmag@dottedmag.net>
Reviewed-by: Julien Cristau <jcristau@debian.org>
commit 29e467a1f1548a826ee2793244e3ff416aa1a0f2
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Fri Nov 26 16:53:40 2010 -0800
xf86OutputRename: Replace another strlen/malloc/strcpy set with strdup
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Matt Turner <mattst88@gmail.com>
commit d346bc3083c6d4bea59b77f634c7c5ec6c1d8cc9
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Sun Nov 28 13:48:16 2010 -0800
Fix compiler warnings in hw/xfree86/os-support/solaris
sun_init.c: In function `xf86OpenConsole':
sun_init.c:99: warning: cast does not match function type
sun_init.c:74: warning: unused variable `FreeVTslot'
sun_init.c: In function `xf86UseMsg':
sun_init.c:417: warning: old-style parameter declaration
sun_vid.c: In function `solUnMapVidMem':
sun_vid.c:162: warning: long unsigned int format, pointer arg (arg 6)
sun_vid.c: In function `xf86ReadBIOS':
sun_vid.c:217: warning: long unsigned int format, pointer arg (arg 5)
sun_vid.c:217: warning: long unsigned int format, int arg (arg 6)
sun_agp.c: In function `xf86EnableAGP':
sun_agp.c:321: warning: unsigned int format, CARD32 arg (arg 4)
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Julien Cristau <jcristau@debian.org>
commit d75777d54c2107163305f50e8ee4306da202b95e
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Sun Nov 28 13:45:40 2010 -0800
Move xchomp inside #ifdef __linux__
static function only called from the matchDriverFromFiles function
that's inside #ifdef __linux__ section
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Matt Turner <mattst88@gmail.com>
commit ccbba444b7b8e1ba555532a847377600bea43d03
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Sun Nov 28 10:45:17 2010 -0800
config: Remove AC_PROG_CC, SED & INSTALL that XORG_DEFAULT_OPTIONS provide
Most importantly removes AC_PROG_CC call that resets compiler flags back
to C89 mode, breaking use of C99 isfinite() on Solaris in dix/devices.c.
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Gaetan Nadon <memsize@videotron.ca>
commit 92cde0b84cdec164cd698dc74a7512d0791d7708
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Sat Nov 27 08:15:52 2010 -0800
Xserver-spec: Update discussion of font library
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Julien Cristau <jcristau@debian.org>
Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com>
commit c1e769250078cbc74d7e6e6ddc5323c4f420ab14
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Sat Nov 27 08:06:40 2010 -0800
Xserver-spec: Update location of log functions
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Julien Cristau <jcristau@debian.org>
Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com>
commit deae18f3cad94959110761ef2ecd9665690e3db5
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Sat Nov 27 00:45:48 2010 -0800
Xserver-spec: Fix assorted typos
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Julien Cristau <jcristau@debian.org>
Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com>
commit a410bf53798bdca43f99476a01ef27cabdf73e01
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Sat Nov 27 00:35:28 2010 -0800
Xserver-spec: Update lists of macros
LOOKUP_DRAWABLE & VERIFY_GC are no longer in dix.h, but
WriteReplyToClient & WriteSwappedDataToClient are.
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Julien Cristau <jcristau@debian.org>
Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com>
commit de518c8f378ea31345c946693d58a26a493af603
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Sat Nov 27 00:30:37 2010 -0800
Xserver-spec: Remove CreateCallbackList
The function is defined as a static, so can't be called by anyone
but AddCallback.
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Julien Cristau <jcristau@debian.org>
Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com>
commit f6c880b257a21a574cf1a47095cb39f32252802e
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Sat Nov 27 00:27:46 2010 -0800
Xserver-spec: Replace deprecated resource id lookup functions
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Julien Cristau <jcristau@debian.org>
Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com>
commit 922806a5aa6eafc432d6787495b475aaa3f1790d
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Sat Nov 27 00:14:51 2010 -0800
Xserver-spec: Update Memory Management functions
Xalloc, Xrealloc, & Xfree are deprecated now
ALLOCATE_LOCAL is removed due to stack overflow issues
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Julien Cristau <jcristau@debian.org>
Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com>
commit 02449ee24b484c9fea501df5274d95a9f87cab23
Merge: afd6eb66d5 b85f9063c2
Author: Keith Packard <keithp@keithp.com>
Date: Tue Nov 30 13:30:59 2010 -0800
Merge remote branch 'ajax/for-keithp'
commit afd6eb66d5ef6a59be4c03da4588aaa2ee47b9ad
Merge: b16964910d ffcbfa0063
Author: Keith Packard <keithp@keithp.com>
Date: Tue Nov 30 13:28:13 2010 -0800
Merge remote branch 'aplattner/for/keith'
commit b16964910d29c0bd039e8bb48bcf1199d709fe3e
Author: Ferry Huberts <ferry.huberts@pelagic.nl>
Date: Tue Nov 30 19:06:55 2010 +0100
dix: do not use bit-wise operators on the boolean result of BitIsOn
Performing bit-wise operations on a boolean amounts to mixing types,
is confusing and basically incorrect; one should only perform
logical operations on booleans.
Performing such operations relies on the implementation detail
that a boolean is in fact an integer and that its value FALSE
is implemented as zero.
Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
Reviewed-by: Matt Turner <mattst88@gmail.com>
Reviewed-by: Keith Packard <keithp@keithp.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 5f34853d6f936e8a1a317a59972b07e3f191d1ab
Author: Adam Jackson <ajax@redhat.com>
Date: Mon Nov 15 11:25:13 2010 +1000
xfree86: Bump classic driver default to 1024x768
Signed-off-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Keith Packard <keithp@keithp.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 903e0f6f0f0ec54151640fc459ff03dcba0522af
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Sat Nov 27 10:46:44 2010 -0800
Xserver-spec: Delete DBE Idioms section
The code has been gone for a while
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com>
Reviewed-by: Keith Packard <keithp@keithp.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit f4ba75a494cf9f4f5b0a979e9ceb519f4a6fcacc
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Sat Nov 27 10:46:43 2010 -0800
Remove unused ReqLen & CastxReq macros
According to Xserver-spec, they were part of the now-deleted DBE "Idioms"
code. The last callers of them were removed in commits fe616f9230b6 &
3d642905477f.
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com>
Reviewed-by: Keith Packard <keithp@keithp.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit b85f9063c2370d7710523bccb8bf030a0710425b
Author: Adam Jackson <ajax@redhat.com>
Date: Mon Nov 22 16:42:04 2010 -0500
xfree86: Remove the xf8_16bpp overlay module
Only one (marginal) driver was using it, and it's been fixed to just
implement it directly.
v2: Also fix sdksyms.sh (spotted by Jesse Adkins)
v3: Also fix DESIGN.xml (spotted bu Julien Cristau)
Reviewed-by: Julien Cristau <jcristau@debian.org>
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit a861fe6a1cf56df76928d21707551602289963c1
Author: Adam Jackson <ajax@redhat.com>
Date: Tue Nov 30 13:50:42 2010 -0500
vbe: Refuse to believe tiny (or negative) panel sizes from PanelID
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit 84a14fab8f930ef1855444ae4e9e3e14ee008328
Author: David Reveman <davidr@novell.com>
Date: Wed Jan 6 14:55:48 2010 -0500
composite: add panoramix support
Taken from:
50d2d8c8969c165582d215c6e85c4be9eac02b6a
dbffd0d44a33dcc84898c7a891d7ba212f65cbb8
9b5b102163b4eaa1b70647354fcab4f6e461c94c
75f9b98af31abf537ac6616c99f3797deb7ba017
07fba8b1f77a6bca44ea6568b346a18ce9d1e61d
With minor style fixes, ported to dixLookupResourceByType, and ported
away from client->noClientException and xalloc/xfree.
v2: Fix a memory leak in PanoramiXCompositeNameWindowPixmap, spotted by
James Jones.
v3: Fix a buglet in PanoramiXCompositeUnredirectSubwindows, spotted by
Dave Airlie.
v4: Fix a style issue with resource lookup noted by Jamey Sharp.
Reviewed-by: Dave Airlie <airlied@gmail.com>
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit 6dea617e0f71a6fc7937e3a1e10474fa87488284
Author: David Reveman <davidr@novell.com>
Date: Tue Jan 5 15:35:10 2010 -0500
fixes: Add panoramix support
Taken from:
583f4dde81d8d5e9101b0289946e1914ea1ee124
With minor style fixes and ported to dixLookupResourceByType.
Reviewed-by: Dave Airlie <airlied@gmail.com>
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit 1b3c57f075049250c6d059412af3d6954468a5b7
Author: Adam Jackson <ajax@redhat.com>
Date: Fri Aug 20 12:25:23 2010 -0400
xfree86: Remove unused xf86PixmapKeyRec
Reviewed-by: Matt Turner <mattst88@gmail.com>
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit 63b9d67d7f4f1fa108370c619e1d0d06baedbd4c
Author: Adam Jackson <ajax@redhat.com>
Date: Thu Aug 19 18:40:24 2010 -0400
mi: Remove unused miAllocateGCPrivateIndex
Reviewed-by: Matt Turner <mattst88@gmail.com>
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit 87f5b843a08fd92b4b31c04e3e6d947b8bc0d160
Author: Adam Jackson <ajax@redhat.com>
Date: Fri Nov 19 16:25:51 2010 -0500
render: Reshuffle and cull dead field from GlyphSetRec
Reviewed-by: Keith Packard <keithp@keithp.com>
Reviewed-by: Matt Turner <mattst88@gmail.com>
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit 606e079cc4d9a9db3197652ca51683c36f74efb8
Author: Adam Jackson <ajax@redhat.com>
Date: Fri Nov 19 16:17:48 2010 -0500
dix: reshuffle WindowOptRec to fill a hole on LP64
Reviewed-by: Keith Packard <keithp@keithp.com>
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit fba5c8154dbc8f8c33801a5a43d7361cd6b54ffe
Author: Adam Jackson <ajax@redhat.com>
Date: Fri Nov 19 15:21:31 2010 -0500
dix: Remove unused ChangeSaveUnder hooks
Reviewed-by: Keith Packard <keithp@keithp.com>
Reviewed-by: Matt Turner <mattst88@gmail.com>
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit c4c4676e6874b42c2371eee96faa2c2dbb59a704
Author: Adam Jackson <ajax@redhat.com>
Date: Fri Nov 19 15:04:09 2010 -0500
dix: Remove the backing store leftovers
Reviewed-by: Keith Packard <keithp@keithp.com>
Reviewed-by: Matt Turner <mattst88@gmail.com>
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit 48bc8d0dd99284f509bc6de01a8fd24a7bfc69d5
Author: Adam Jackson <ajax@redhat.com>
Date: Wed Oct 6 09:56:56 2010 -0400
render: repack PictureRec
Eliminate the unused dither field, move filter and stateChanges into the
bitfield, and reorder elements to pack holes on LP64.
sizeof(PictureRec) ILP32 LP64
before: 84 152
after: 72 120
Reviewed-by: Dave Airlie <airlied@redhat.com>
Reviewed-by: Matt Turner <mattst88@gmail.com>
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit ffcbfa0063bdc7c9ad5ac724285c7b6e67044c18
Author: Aaron Plattner <aplattner@nvidia.com>
Date: Mon Nov 15 20:43:18 2010 -0800
xfree86: Fix rotation of 2-color non-interleaved cursor images
When RandR 1.2's transformation code is enabled, it rotates the cursor
image so that it appears upright on a rotated screen. This code
completely mangles 2-color cursors on hardware where the the mask and
source images are not interleaved due to two problems:
1. stride is calculated as (width / 4) rather than (width / 8), so the
expression (y * stride) skips two lines instead of one for every
time y is incremented.
2. cursor_bitpos ignores the 'mask' parameter if the hardware doesn't
specify any of the HARDWARE_CURSOR_SOURCE_MASK_INTERLEAVE_* flags.
To fix this, refactor the code to pass the whole xf86CursorInfoPtr
through to cursor_bitpos and compute the correct stride there based on
the flags. If none of the SOURCE_MASK_INTERLEAVE flags are set, use
the total cursor size to move the 'image' variable into the mask part
of the image before computing the desired byte pointer.
Signed-off-by: Aaron Plattner <aplattner@nvidia.com>
Reviewed-by: Robert Morell <rmorell@nvidia.com>
Reviewed-by: Alex Deucher <alexdeucher@gmail.com>
Tested-by: Cyril Brulebois <kibi@debian.org>
commit 7ee965a300c9eddcc1acacf9414cfe3e589222a8
Author: Adam Jackson <ajax@redhat.com>
Date: Tue May 11 09:16:19 2010 -0400
linux: Refactor VT switch on {re,}generation and shutdown
This makes more things fatal than were fatal before, but that's correct;
if you need the VT, then failing to get it on regeneration means things
are about to go very very badly.
Reviewed-by: Julien Cristau <jcristau@debian.org>
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit 0def735c6a9fab19acc4b806def6921a702f617f
Author: Adam Jackson <ajax@redhat.com>
Date: Tue May 11 08:40:33 2010 -0400
xfree86: Remove dead ifdefs from VT switching
Reviewed-by: Julien Cristau <jcristau@debian.org>
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit 96a7a7d197d5f96e7aa51928155d4b8d5a115875
Author: Adam Jackson <ajax@redhat.com>
Date: Mon May 10 18:40:09 2010 -0400
linux: Don't muck about with tty permissions
This is not X's job.
Reviewed-by: Julien Cristau <jcristau@debian.org>
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit 6ce1908ba4959aaa0a48171acb62cf6a5d5cbf18
Author: Adam Jackson <ajax@redhat.com>
Date: Wed May 12 08:50:54 2010 -0400
xfree86: Remove os-support/sysv
Nothing's using it, the SysV derivatives we support have their own
custom versions.
Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit 01159ffc4718ba48ab7b16acaffd8008f9803811
Author: Adam Jackson <ajax@redhat.com>
Date: Mon May 10 18:14:49 2010 -0400
linux: Remove redundant variable
Reviewed-by: Julien Cristau <jcristau@debian.org>
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit a80780a7638f847c3be20e5e0c7fe85e83d9bdd1
Author: Adam Jackson <ajax@redhat.com>
Date: Wed Nov 17 09:03:06 2010 -0500
glx: Remove swap barrier and hyperpipe support
Never implemented in any open source driver. The implementation
assumed explicit DDX driver knowledge of how the client-side driver
worked, since at the time the server's GL renderer was not a DRI driver.
But now, it is, so any implementation of these should be done with
additional DRI driver API, like the swap control extension.
Reviewed-by: Julien Cristau <jcristau@debian.org>
Signed-off-by: Kristian Høgsberg <krh@bitplanet.net>
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit f4f41c812d2ba5edba7e0e0dbaab4bbf0af834b3
Author: Ville Syrjälä <ville.syrjala@nokia.com>
Date: Fri Oct 29 17:34:56 2010 +0300
xfree86/xv: Provide a ModeSet hook
Reput all ports when the display mode or panning has been changed by
RandR code. This makes the overlays appear in the correct position
on the screen.
Signed-off-by: Ville Syrjälä <ville.syrjala@nokia.com>
Reviewed-by: Luc Verhaegen <luc.verhaegen@basyskom.de>
commit 640c8716e0400e35afd7e91efc826fc447ea6745
Author: Ville Syrjälä <ville.syrjala@nokia.com>
Date: Thu Oct 28 18:13:02 2010 +0300
xfree86/modes: Provide a ModeSet hook in ScrnInfo
Add a new hook ModeSet that will be called after display mode is
changed, or after the display has been panned.
Signed-off-by: Ville Syrjälä <ville.syrjala@nokia.com>
Reviewed-by: Luc Verhaegen <luc.verhaegen@basyskom.de>
commit a942534ca3908418c407115c6393263c2fe05931
Author: Ville Syrjälä <ville.syrjala@nokia.com>
Date: Tue Nov 2 16:05:13 2010 +0200
xfree86/xv: Pass all coordinate arguments to ReputImage
Pass all of the src/dst coordinates to ReputImage so that drivers
don't necessarily have to do double bookkeeping.
Signed-off-by: Ville Syrjälä <ville.syrjala@nokia.com>
Reviewed-by: Luc Verhaegen <luc.verhaegen@basyskom.de>
commit 0fef4e94480f2bf1157ce5f92fcb0c7dd1585371
Author: Ville Syrjälä <ville.syrjala@nokia.com>
Date: Tue Nov 2 16:23:02 2010 +0200
xfree86/xv: Document VIDEO_CLIP_TO_VIEWPORT incompatibility with reput
Signed-off-by: Ville Syrjälä <ville.syrjala@nokia.com>
Reviewed-by: Luc Verhaegen <luc.verhaegen@basyskom.de>
commit 5f8ec1ade8b485f48de8c72011409219afad9dd7
Author: Ville Syrjälä <ville.syrjala@nokia.com>
Date: Tue Nov 2 16:04:36 2010 +0200
xfree86/xv: Add some helpful comments about ReputImage
Document the fact that ReputImage is used for stills as well as images.
Signed-off-by: Ville Syrjälä <ville.syrjala@nokia.com>
Reviewed-by: Luc Verhaegen <luc.verhaegen@basyskom.de>
commit b4ebde23d25bef1b891902d75b2db3aad92685b7
Author: Ville Syrjälä <ville.syrjala@nokia.com>
Date: Mon Nov 1 20:27:25 2010 +0200
xfree86/xv: Fix ReputImage clipping
PutImage/PutStill respect the GC clip, however ReputImage does not.
PutImage/PutStill are supposed to be oneshot operations so ReputImage
should never expand the area covered by the clip, instead it should
only shrink if the window clip shrinks. So commandeer clientClip
into use by ReputImage and initially make it a copy of the original
GC composite clip. Whenever ReputImage needs reclipping update
clientClip with the newly calculated composite clip.
Signed-off-by: Ville Syrjälä <ville.syrjala@nokia.com>
Reviewed-by: Luc Verhaegen <luc.verhaegen@basyskom.de>
commit 7294236bdb29b4fa7a7bc27aff9c786c5a33c544
Author: Ville Syrjälä <ville.syrjala@nokia.com>
Date: Mon Nov 1 20:02:40 2010 +0200
xfree86/xv: Remove clipOrg from XvPortRecPrivate
clipOrg never changes except when clientClip changes, so instead of
keeping copies of both originals translate clientClip by clipOrg
immediately and just keep the translated clientClip.
Signed-off-by: Ville Syrjälä <ville.syrjala@nokia.com>
Reviewed-by: Luc Verhaegen <luc.verhaegen@basyskom.de>
commit 47d8bd0a999693f47fd244dc876ef7f8fcd52854
Author: Ville Syrjälä <ville.syrjala@nokia.com>
Date: Fri Oct 29 17:31:14 2010 +0300
xfree86/xv: Factor out the meat of xf86XVAdjustFrame for later reuse
No functional change.
Signed-off-by: Ville Syrjälä <ville.syrjala@nokia.com>
Reviewed-by: Luc Verhaegen <luc.verhaegen@basyskom.de>
commit 3d4d0237a3981820a9b7290f69c7172a48659a10
Author: Ville Syrjälä <ville.syrjala@nokia.com>
Date: Fri Oct 29 17:14:34 2010 +0300
xfree86/xv: Change the behaviour of AdjustFrame to reput everything
Also reput PutVideo/GetVideo ports in AdjustFrame. This makes the
overlay track the screen panning instead of staying stationary in the
wrong place.
Signed-off-by: Ville Syrjälä <ville.syrjala@nokia.com>
Reviewed-by: Luc Verhaegen <luc.verhaegen@basyskom.de>
commit d794be81218934ad4580211c7a0a27cb71eb5d60
Author: Ville Syrjälä <ville.syrjala@nokia.com>
Date: Fri Oct 29 18:07:32 2010 +0300
xfree86/xv: No need to free composite clip in AdjustFrame
Nothing should change in AdjustFrame that would need the composite clip
to be recomputed.
Signed-off-by: Ville Syrjälä <ville.syrjala@nokia.com>
Reviewed-by: Luc Verhaegen <luc.verhaegen@basyskom.de>
commit 6051c7e940767b7120ad9c7e9188aee6a6f62b94
Author: Ville Syrjälä <ville.syrjala@nokia.com>
Date: Fri Oct 29 17:05:02 2010 +0300
xfree86/xv: Change the behaviour of ClipNotify to reput instead of stop
When ClipNotify gets called for a visible window, reput instead of
stopping the port. This eliminates nasty overlay flickering that
happens during clip changes.
If the window is invisible or if ReputImage isn't supported stop
and remove the port from the window as was done before.
Signed-off-by: Ville Syrjälä <ville.syrjala@nokia.com>
Reviewed-by: Luc Verhaegen <luc.verhaegen@basyskom.de>
commit 27707ac5bdf6831630944f02f2128951a529faab
Author: Ville Syrjälä <ville.syrjala@nokia.com>
Date: Fri Oct 29 17:00:24 2010 +0300
xfree86/xv: Allow xf86XVReputOrStopPort() to stop PutVideo/GetVideo ports
Modify xf86XVReputOrStopPort() to allow stopping of all types of ports.
Will be useful later.
No functional change.
Signed-off-by: Ville Syrjälä <ville.syrjala@nokia.com>
Reviewed-by: Luc Verhaegen <luc.verhaegen@basyskom.de>
commit 38987aae199982f17eae664f3a28ff5941d3ee73
Author: Ville Syrjälä <ville.syrjala@nokia.com>
Date: Fri Oct 29 16:51:24 2010 +0300
xfree86/xv: Factor out the meat of xf86XVWindowExposures for later reuse
No fucntional change.
Signed-off-by: Ville Syrjälä <ville.syrjala@nokia.com>
Reviewed-by: Luc Verhaegen <luc.verhaegen@basyskom.de>
commit 0178173f0579c4b9dd0cf60b9cd3e5d264f86ae4
Author: Ville Syrjälä <ville.syrjala@nokia.com>
Date: Fri Oct 29 16:39:13 2010 +0300
xfree86/xv: Eliminate two open coded copies of xf86XVRemovePortFromWindow
No functional change.
Signed-off-by: Ville Syrjälä <ville.syrjala@nokia.com>
Reviewed-by: Luc Verhaegen <luc.verhaegen@basyskom.de>
commit b02858b5af47d524001ec571737cc92f6a6f06d3
Author: Ville Syrjälä <ville.syrjala@nokia.com>
Date: Fri Oct 29 16:54:42 2010 +0300
xfree86/xv: Remove useless NULL check from ClipNotify
WinPriv->PortRec should never be NULL as WinPriv itself would be removed
from the list when the port is removed from the window.
Signed-off-by: Ville Syrjälä <ville.syrjala@nokia.com>
Reviewed-by: Luc Verhaegen <luc.verhaegen@basyskom.de>
commit 23e3d1f23318ce69623f91908f888a09f8b74ac2
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri Nov 26 10:00:49 2010 +1000
dix: remove now unnecessary !! before BitIsOn()
The macro has been changed to do this already, no need for double
not-not-ing.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Keith Packard <keithp@keithp.com>
commit 42dc91e32a02b6b21ff5c45f465f3349e5822615
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Wed Nov 24 14:20:30 2010 +1000
include: let BitIsOn() return a boolean value.
Simply returning the mask bit breaks checks like
BitIsOn(mask, 0) != BitIsOn(mask, 1);
as used in 048e93593e3f7a99a7d2a219e1ce2bdc9d407807.
The naming of this macro suggests that it should return boolean values
anyway. This patch also adds a few simple tests for these macros to make
sure they don't accidentally break in the future.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Pat Kane <pekane52@gmail.com>
Reviewed-by: Julien Cristau <jcristau@debian.org>
Reviewed-by: Keith Packard <keithp@keithp.com>
commit 4e0f8f666e61390206c42ad2087477a912525bc7
Merge: 400ddf2f58 639600fa7e
Author: Keith Packard <keithp@keithp.com>
Date: Wed Nov 24 11:47:33 2010 -0800
Merge remote branch 'whot/for-keith'
commit 400ddf2f58ce673c74d4e8ee829729cd3c75f8c9
Merge: 7250f078c1 e074f745a8
Author: Keith Packard <keithp@keithp.com>
Date: Wed Nov 24 11:46:18 2010 -0800
Merge remote branch 'jeremyhu/master'
commit 7250f078c12fd20d5ac9150f54495926e5121461
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Sun Nov 21 14:27:58 2010 -0500
doc: refactor Makefile and xmlrules.in code for reusability
A different approach which requires less variables setting
and internal knowledge of the reused code.
Changing from "install" to "not install" is very easy now.
Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit f33512b70cf0350a62df2ee2287a870d5fc991a8
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Sun Nov 21 14:27:57 2010 -0500
xmlrules.in: use $(top_srcdir) rather than ../../../ [...]
Relative paths don't always work in distcheck when srcdir not = builddir
include $(top_srcdir)/doc/xml/xmlrules.in
Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit c25b407f22456f50eef90d9bc5e026c05415c021
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Sun Nov 21 14:27:56 2010 -0500
xmlrules.in: specify the xserver entities depedencies on the target
The generated docs will rebuild when the xserver.ent file changes.
Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 73841074eb856e6be3b9f9e3fc2d2721443166ab
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Sun Nov 21 14:27:55 2010 -0500
xmlrules.in: use pattern rules to enable dependencies
This will allow a dependency to be specified as done in libX11:
%.html: %.xml $(dist_spec_DATA)
$(AM_V_GEN)$(XMLTO) $(XMLTO_FLAGS) xhtml-nochunks $<
Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 97e307dda201d6ba28a723c21a95e484921d1b08
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Sun Nov 21 14:27:54 2010 -0500
xmlrules.in: no need to setup xmlto flags when configuring --without-xmlto
The AM conditional HAVE_XMLTO should wrap more statements.
Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 1a7b14d1183057fc69a5da446e898104b65c8347
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Sun Nov 21 14:27:53 2010 -0500
xmlrules.in: remove unrequired "@rm -f $@" from doc targets
Unable to find a purpose for this, not used anywhere else
but in the font module.
Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit d3c523bd124dc1a3f4539f7f6cd4868adbfc25e1
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Sun Nov 21 14:27:52 2010 -0500
doc: HTML file generation: use the installed copy of xorg.css
Currently the xorg.css file is copied in each location
where a DocBook/XML file resides. This produces about
70 copies in the $(docdir) install tree for all of xorg.
Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 504e3010e976ccc008ff48417850b594beaee2ec
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Fri Nov 19 22:09:05 2010 -0800
Xorg.man: Replace XDarwin reference with Xquartz
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 566d09a5cd6452ee2e05e23d2205e7c3aa31f0da
Author: Bill Nottingham <notting@redhat.com>
Date: Mon Nov 15 11:25:14 2010 +1000
xfree86: store the screen's gamma information on init.
This fixes a gamma issue on vt switch observed with KDM. VT switching away
and back would result in a black screen. Avoid this by storing the current
gamma information on init.
https://bugzilla.redhat.com/show_bug.cgi?id=533217
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Keith Packard <keithp@keithp.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit c050aa2f5fa6a7ff8ce4f91def14ca44f799f067
Author: Adam Jackson <ajax@redhat.com>
Date: Mon Nov 15 11:25:12 2010 +1000
xfree86: apply gamma settings on EnterVT.
When entering the VT, re-apply the saved gamma settings for each screen.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Keith Packard <keithp@keithp.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit e074f745a80b87d1d82fb39489d7f35163d7552a
Author: Jeremy Huddleston <jeremyhu@apple.com>
Date: Tue Nov 23 16:03:48 2010 -0800
XQuartz: Remove unused CloseInputDevice stub
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
commit 639600fa7ebad7a4953d0b632abeff2d339a49c6
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Tue Nov 23 13:30:05 2010 +1000
dix: add a fixme about a corner-case that should probably be fixed.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com>
commit 0aca9e8424d8b978053a29c4468f800fc2e7238c
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Tue Nov 23 13:04:19 2010 +1000
dix: fix typo, set the second valuator with the y-axis data.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Tested-by: Jeremy Huddleston <jeremyhu@apple.com>
Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com>
commit 45131bb67f9eacb3b55de4bcd3730fb9bb028e8a
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Tue Nov 23 12:55:50 2010 +1000
dix: GetProximityEvents needs to check up to the last valuator
valuator_mask_size() returns the highest valuator set as opposed to the
number of set bits (which obviously changes as we unset valuators).
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com>
commit 048e93593e3f7a99a7d2a219e1ce2bdc9d407807
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Tue Nov 23 11:15:52 2010 +1000
dix: when converting to XI 1.x events, use the first_valuator's device mode
Don't stop processing events when a valuator's mode doesn't match the 0th
valuator's mode. Instead, start with the first_valuator in the event and
keep stacking them on until the first valuator with a different mode is hit.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com>
commit 4f3e670fd28fceec384ff0d4ca7c1ff8d7a872ad
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Tue Nov 23 10:59:52 2010 +1000
dix: when comparing axis modes, compare the bits, not the bytes.
The DeviceEvent's mode field is a set of bits for each valuator, not bytes.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com>
commit 6f12934d4ea52f17ac7b21e92f4f929db165f83d
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Tue Nov 23 10:58:32 2010 +1000
dix: replace a manual valuator check with valuator_get_mode().
This check was missing the OutOfProximity mask and resulted in the wrong
bits being set in InternalEvents.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com>
commit ebe3ddaf284ad388835da9cbaa6ad61fa21ce6dd
Author: Simon Thum <simon.thum@gmx.de>
Date: Fri Nov 19 11:09:21 2010 +1000
dix: fix up valuators passed to acceleration code.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Simon Thum <simon.thum@gmx.de>
Reviewed-by: Chase Douglas <chase.douglas@canonical.com>
commit d435e1ecb86e2fe6292b5945262956644f979bbb
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri Feb 5 11:08:27 2010 +1000
test: reduce range of byte-padding macro tests.
Byte padding and conversion is interesting for the rage of 0-8 bytes, and
then interesting towards the end of the valid range (INT_MAX - 7 and INT_MAX
- 3).
Note: this changes the upper range for pad_to_int32() and bytes_to_int32()
from the previous (INT_MAX - 4) to (INT_MAX - 3).
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Julien Cristau <jcristau@debian.org>
commit f49ee9074a66883a3c525b0d6e71589123288465
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri Feb 5 10:59:52 2010 +1000
test: compare byte padding macros against the expected bytes.
We calculate the expected bytes for each value, let's use it.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Julien Cristau <jcristau@debian.org>
commit b31df0439fe336a43a2355e2f1fb223d86045a05
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Mon Nov 22 15:14:02 2010 +1000
xfree86: add missing linebreak in error message.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Magnus Kessler <Magnus.Kessler@gmx.net>
commit 97b9bb1e2cebbb769ef347455d9c7979d19de99f
Author: Jeremy Huddleston <jeremyhu@apple.com>
Date: Mon Nov 22 20:43:14 2010 -0800
XQuartz: Localization Updates
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
commit f9fbafa1a07f951e89f208bf4928a0bf37b67cfe
Author: Jeremy Huddleston <jeremyhu@apple.com>
Date: Mon Nov 22 20:41:39 2010 -0800
XQuartz: Remove existing localization files on install to avoid conflicts
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
commit 6eed13ad5998ba80296bba2bb3f89928ee51194a
Author: Jeremy Huddleston <jeremyhu@apple.com>
Date: Mon Nov 22 20:25:33 2010 -0800
XQuartz dri: Don't check CoreGraphics version
The version check is hackish, and I highly doubt anyone using this code is on
a version of OS X that predates this support (10.2 has support for it).
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
commit a4698754c1da1cf2ca64add5276d0c6012960504
Author: Jeremy Huddleston <jeremyhu@apple.com>
Date: Sun Nov 21 10:49:24 2010 -0800
XQuartz: Add pointer debugging
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
commit 31737fff08ec19b394837341d5e358ec401f5cd8
Author: Chase Douglas <chase.douglas@ubuntu.com>
Date: Mon Nov 15 11:42:12 2010 -0500
Fix transformAbsolute
transformAbsolute must use old values if valuator mask doesn't have new
ones, and it must only set new values if there was a change.
Signed-off-by: Chase Douglas <chase.douglas@canonical.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 463841f45aafd1227bac652965c9ea337dd527fa
Author: Chase Douglas <chase.douglas@ubuntu.com>
Date: Mon Nov 15 11:42:11 2010 -0500
Fix GPE Y axis scaling
Signed-off-by: Chase Douglas <chase.douglas@canonical.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit a6b9e8f1e5d5d0b3b0f121a6f677eeca7aab1950
Author: Adam Jackson <ajax@redhat.com>
Date: Wed Aug 25 11:06:38 2010 -0400
linux: Fix CPU usage bug in console fd flushing
If the vt gets a vhangup from under us, then the tty will appear ready
in select(), but trying to tcflush() it will return -EIO, so we'll spin
around at 100% CPU for no reason. Notice this condition and unregister
the handler if it happens.
Signed-off-by: Adam Jackson <ajax@redhat.com>
Reviewed-by: Mikhail Gusarov <dottedmag@dottedmag.net>
Reviewed-by: Julien Cristau <jcristau@debian.org>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit ecdbe817fd7eb53fd1e7485c0492355f7f002d2a
Author: Dan Horák <dan@danny.cz>
Date: Tue Jun 22 19:45:26 2010 +0200
XF86CONFIGDIR is undefined when built with --disable-xorg (#28672)
The 10-evdev.conf file gets installed as /usr/share/X11/10-evdev.conf on
platforms that built the server with --disable-xorg like s390/s390x. The
definition/installation should be guarded with "if XORG" because it makes
sense only when built with xorg.
X.Org Bug 28672 <http://bugs.freedesktop.org/show_bug.cgi?id=28672>
Signed-off-by: Dan Horák <dan@danny.cz>
Acked-by: Julien Cristau <jcristau@debian.org>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 38c46ccf796462d068d95acb9022de2acfc3a1f7
Merge: 3051dd5135 c8998af3eb
Author: Keith Packard <keithp@keithp.com>
Date: Mon Nov 15 09:06:33 2010 +0800
Merge remote branch 'whot/for-keith'
commit 3051dd5135962283fc6c7de377a7c819d8a04e7f
Merge: ed547a9fc8 c5975722a9
Author: Keith Packard <keithp@keithp.com>
Date: Mon Nov 15 08:58:02 2010 +0800
Merge remote branch 'jeremyhu/master'
commit ed547a9fc8a4f5cd95ef882b656a376c163eda6d
Merge: 78f94f19aa 84e8de1271
Author: Keith Packard <keithp@keithp.com>
Date: Mon Nov 15 08:51:27 2010 +0800
Merge remote branch 'adkins/master'
commit 78f94f19aab66a1e5331df0ce29f36e310b4195d
Author: Linus Arver <linusarver@gmail.com>
Date: Sun Oct 17 12:26:01 2010 -0700
Xext: panoramiXprocs: fix typo
This fixes a typo introduced in commit
80b5d3a3264d2c5167e5ac85a3b04af0f89cece1. The pointer pDst was changed
unintentionally to pWin from a copy/paste error. This resulted in all
QT-based apps and some tcl/tk ones (like fontforge) to crash X 1.9 on
starting up, when Xinerama was enabled.
Bug report: https://bbs.archlinux.org/viewtopic.php?id=106125
Signed-off-by: Elie Bleton <drozofil@gmail.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
Reviewed-by: Matt Turner <mattst88@gmail.com>
Tested-by: Linus Arver <linusarver@gmail.com>
commit c8998af3eba49a542625912d512087e4eaaf5ede
Author: Cyril Brulebois <kibi@debian.org>
Date: Sat Nov 13 02:05:16 2010 +0100
xfree86: Initialize Pointer and Keyboard.
That helps us get rid of:
| CC xf86Config.lo
| xf86Config.c: In function ‘T.174’:
| xf86Config.c:1228: warning: ‘Pointer$module’ may be used uninitialized in this function
| xf86Config.c:1097: note: ‘Pointer$module’ was declared here
| xf86Config.c:1228: warning: ‘Pointer$drv’ may be used uninitialized in this function
| xf86Config.c:1097: note: ‘Pointer$drv’ was declared here
| xf86Config.c:1228: warning: ‘Pointer$type_name’ may be used uninitialized in this function
| xf86Config.c:1097: note: ‘Pointer$type_name’ was declared here
| xf86Config.c:1228: warning: ‘Pointer$private’ may be used uninitialized in this function
| xf86Config.c:1097: note: ‘Pointer$private’ was declared here
| xf86Config.c:1228: warning: ‘Pointer$dev’ may be used uninitialized in this function
| xf86Config.c:1097: note: ‘Pointer$dev’ was declared here
| xf86Config.c:1228: warning: ‘Pointer$fd’ may be used uninitialized in this function
| xf86Config.c:1097: note: ‘Pointer$fd’ was declared here
| xf86Config.c:1228: warning: ‘Pointer$set_device_valuators’ may be used uninitialized in this function
| xf86Config.c:1097: note: ‘Pointer$set_device_valuators’ was declared here
| xf86Config.c:1228: warning: ‘Pointer$switch_mode’ may be used uninitialized in this function
| xf86Config.c:1097: note: ‘Pointer$switch_mode’ was declared here
| xf86Config.c:1228: warning: ‘Pointer$control_proc’ may be used uninitialized in this function
| xf86Config.c:1097: note: ‘Pointer$control_proc’ was declared here
| xf86Config.c:1228: warning: ‘Pointer$read_input’ may be used uninitialized in this function
| xf86Config.c:1097: note: ‘Pointer$read_input’ was declared here
| xf86Config.c:1228: warning: ‘Pointer$device_control’ may be used uninitialized in this function
| xf86Config.c:1097: note: ‘Pointer$device_control’ was declared here
| xf86Config.c:1228: warning: ‘Pointer$flags’ may be used uninitialized in this function
| xf86Config.c:1097: note: ‘Pointer$flags’ was declared here
| xf86Config.c:1228: warning: ‘Pointer$next’ may be used uninitialized in this function
| xf86Config.c:1097: note: ‘Pointer$next’ was declared here
Signed-off-by: Cyril Brulebois <kibi@debian.org>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 98abac809a024ac3ed9dd0514ca96367f668c05d
Author: Jon TURNEY <jon.turney@dronecode.org.uk>
Date: Thu Nov 11 23:06:13 2010 +0000
Fix compilation after input API change
Fix compilation after commit 675f4a8525d29ebad783351e17be785b2f32b2e8
converts winmouse.c to the new ValuatorMask input API, but doesn't
include the required header inpututil.h
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit c5975722a95c41b8715a4612fc1c3275f8e9b59e
Author: Jeremy Huddleston <jeremyhu@apple.com>
Date: Sat Nov 13 16:04:10 2010 -0800
XQuartz: Fix make distcheck
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
Reviewed-by: Cyril Brulebois <kibi@debian.org>
commit 7b33ef74738d6a557cb25aeb14693b2a340c0e12
Author: Jeremy Huddleston <jeremyhu@apple.com>
Date: Sat Nov 13 15:46:16 2010 -0800
dix: Fix make distcheck
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
Reviewed-by: Dan Nicholson <dbn.lists@gmail.com>
commit 965e709f2b0b17f1e59e5aeb5e7717fede51ef97
Author: Jeremy Huddleston <jeremyhu@apple.com>
Date: Thu Nov 11 17:23:33 2010 -0800
XQuartz: Build-fixes for XQuartz for recent input API changes
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
commit fa50670c32637faff6bb91f1206a0e3c17a9bada
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri Nov 12 11:48:08 2010 +1000
xfree86: rename allowEmptyInput to forceInputDevices.
This is a more accurate name for the actual functionality than
allowEmptyInput. Historically, allowEmptyInput has allowed the server to
start with no input devices. Since 1.4 and the introduction of VCP and VCK,
there are always two input devices present.
allowEmptyInput was changed in behaviour to essentially "ignore xorg.conf
devices or not", auto-adding the built-in devices if disabled.
Rename to forceInputDevices, because that's essentially what it does. When
disabled (i.e. when hotplugging is enabled), it disables all
mouse/kbd/vmmouse devices configured in the xorg.conf file.
When enabled, it forces the traditional behaviour for input devices:
- use input devices configured in the server layout
- if none are configured, use the first pointer and the first keyboard
device in the xorg.conf
- if none are configured, create the default pointer/keyboard devices.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Julien Cristau <jcristau@debian.org>
commit c481dae0dc89d8d50cac23210023d75bfaf6012b
Author: Cyril Brulebois <kibi@debian.org>
Date: Thu Nov 11 23:55:55 2010 +0100
test: Fix missing xkbsrv.h include.
Otherwise, building fails with CFLAGS="-Wall -Werror" this way:
| protocol-common.c: In function ‘init_simple’:
| protocol-common.c:159: error: implicit declaration of function ‘XkbInitPrivates’
| protocol-common.c:159: error: nested extern declaration of ‘XkbInitPrivates’
Signed-off-by: Cyril Brulebois <kibi@debian.org>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit b8114f25b266624c8f73d03c710349f98693d877
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri Nov 12 08:32:05 2010 +1000
dix: fix typo in setting valuator modes (#21548)
X.Org Bug 31548 <http://bugs.freedesktop.org/show_bug.cgi?id=31548>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Tested-by: Cyril Brulebois <kibi@debian.org>
commit 5cd11d2356d153840f1b429bdb8284367f8dc468
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Wed Jun 9 17:10:57 2010 +1000
Xi: move property reset from extension shutdown to init.
If any part of the stack calls XIGetKnownProperty during device shutdown
the property is re-initialized before the server generation resets, leaving
the value invalid again.
Move the reset to the extension init which happens before input devices are
initialized before the first property is requested.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Julien Cristau <jcristau@debian.org>
commit da66119593b63ef82ae6fa2e034ccd0856b03a80
Author: Tiago Vignatti <tiago.vignatti@nokia.com>
Date: Wed Nov 10 21:48:04 2010 +0200
dix: fix root window background behaviour for protocol calls
Instead always paint root tiled (-retro like), protocol calls
(XSetWindowBackgroundPixmap and related) should behave accordingly when None
and ParentRelative is set as background pixmap.
It follow what the protocol states: "changing the background of a root window
to None or ParentRelative restores the default background pixmap".
Signed-off-by: Tiago Vignatti <tiago.vignatti@nokia.com>
Signed-off-by: Ville Syrjälä <ville.syrjala@nokia.com>
Reviewed-by: Rami Ylimäki <rami.ylimaki@vincit.fi>
commit 8976e9766edfb33f5cf3f6d54f09e46d29bc4ec5
Author: Tiago Vignatti <tiago.vignatti@nokia.com>
Date: Wed Nov 10 21:48:03 2010 +0200
dix: adds support for none root window background
It lets the driver notify the server whether it can draw a background when
'-background none' option is used by the system platform. Use cases for that
could be video drivers performing mode-setting in kernel time, before X is up,
so a seamless transition would happen until X clients start to show up.
If the driver can copy the framebuffer cleanly then it can set the flag
(canDoBGNoneRoot), otherwise the server will fallback to the normal behaviour.
The system must explicit indicates willingness of doing so through
'-background none'. We could do this option as default; in such case,
malicious users would be able to steal the framebuffer with a bit of tricks.
For instance, I can see the content of my nVidia Quadro FX 580 framebuffer
old X session modifying a bit nv driver:
xf86DPMSInit(pScreen, xf86DPMSSet, 0);
- /* Clear the screen */
- if(pNv->xaa) {
- /* Use the acceleration engine */
- pNv->xaa->SetupForSolidFill(pScrn, 0, GXcopy, ~0);
- pNv->xaa->SubsequentSolidFillRect(pScrn,
- 0, 0, pScrn->displayWidth, pNv->offscreenHeight);
- G80DmaKickoff(pNv);
- } else {
- /* Use a slow software clear path */
- memset(pNv->mem, 0, pitch * pNv->offscreenHeight);
- }
+ pScreen->canDoBGNoneRoot = TRUE;
The commit is originally based on discussions happened on xorg-devel:
http://lists.freedesktop.org/archives/xorg-devel/2010-June/009755.html
Signed-off-by: Tiago Vignatti <tiago.vignatti@nokia.com>
Reviewed-by: Rami Ylimäki <rami.ylimaki@vincit.fi>
Acked-by: Pauli Nieminen <ext-pauli.nieminen@nokia.com>
Reviewed-by: Daniel Stone <daniel@fooishbar.org>
commit bfe9cdd11bcb60cf33dc48136ebee028001a737e
Author: Tiago Vignatti <tiago.vignatti@nokia.com>
Date: Wed Oct 20 17:54:58 2010 -0200
dix: delete logo hack screen saver
Protocol doesn't mention about screen saver with logo being required and
people are already using more intelligent ways to draw screen saver themes. So
consider -logo as deprecated option, deleting its code.
Signed-off-by: Tiago Vignatti <tiago.vignatti@nokia.com>
Reviewed-by: Mikhail Gusarov <dottedmag@dottedmag.net>
Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Daniel Stone <daniel@fooishbar.org>
commit 84e8de1271bb11b5b4b9747ae4647f47333a8ab7
Author: Jesse Adkins <jesserayadkins@gmail.com>
Date: Wed Nov 10 21:37:24 2010 -0800
fb: Remove fbcmap.c (bug 5436)
This is obsolete since a240c039c47c0be22ea5e100692307b26d938747.
Updated fb.h to mention that the functions come from fbcmap_mi.c now.
Dropped fbcmap.c from the makefile.
Signed-off-by: Jesse Adkins <jesserayadkins@gmail.com>
Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com>
commit 23e329b5641ef044c34ac712c9193171eaf47198
Author: Jesse Adkins <jesserayadkins@gmail.com>
Date: Wed Nov 10 21:35:58 2010 -0800
xfree86: parser: Remove 'CUSTOM' flag option in Monitor section.
Not used in the initial import, and also not documented.
Signed-off-by: Jesse Adkins <jesserayadkins@gmail.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
commit 88cb61e1e55c54982b90e2a77465faaac6a0ba89
Merge: 19f43836d1 4ed4915bc0
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu Nov 11 12:54:46 2010 +1000
Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver into input-api
Conflicts:
dix/getevents.c
hw/xfree86/common/xf86Xinput.h
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 4ed4915bc0fbe9b4419ca4a0d4e43c2fee032ae9
Merge: 291c39dfef ec1bfbc669
Author: Keith Packard <keithp@keithp.com>
Date: Wed Nov 10 16:58:21 2010 -0800
Merge remote branch 'whot/for-keith'
commit ec1bfbc66926130e1153facc3b92ee175f1cb6b6
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Tue Nov 9 15:27:26 2010 +1000
xfree86: remove user-configured AllowEmptyInput
An estimated 100% (rounded down to the nearest percent) of the people who
have this in their configuration don't actually know what this option does.
Protect the users from themselves.
IIRC, AEI on was useful for some time between 1.4 and 1.5 and never since.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Dan Nicholson <dbn.lists@gmail.com>
commit cbaa6a66e0f9e3b7e305606924ecda0147b59e96
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Tue Nov 9 15:21:23 2010 +1000
config: remove mention of AllowEmptyInput
"You will probably want to add the following option to the ServerFlags of
your xorg.conf:
Option "AllowEmptyInput" "True""
I can't imagine why you would want to do that. My life is painful enough
already.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Julien Cristau <jcristau@debian.org>
Reviewed-by: Dan Nicholson <dbn.lists@gmail.com>
commit 291c39dfef84d1b204d7f5e63e925dee2dbdaca7
Author: Jeremy Huddleston <jeremyhu@apple.com>
Date: Tue Nov 9 13:33:55 2010 -0800
DOC: Only build dtrace documentation with --enable-docs
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit f0b4df99486066ad0e638b3b5debc905bc8ef1c4
Author: Adam Jackson <ajax@redhat.com>
Date: Sat Sep 11 17:55:57 2010 -0400
shadow: Optimize shadowUpdatePacked(). (#26973)
Signed-off-by: Matt Turner <mattst88@gmail.com>
Reviewed-by: Soren Sandmann <sandmann@daimi.au.dk>
Reviewed-by: Matt Turner <mattst88@gmail.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit c9c0f93f8ed42413a05193ee71c69fa6b41f6a03
Merge: 73f6de1ad8 4132b1c591
Author: Keith Packard <keithp@keithp.com>
Date: Wed Nov 10 16:11:29 2010 -0800
Merge remote branch 'whot/for-keith'
commit 73f6de1ad8b5e1641102b54ff48a36ebb99ccacb
Merge: 333b6ed26e 3dc3aefb88
Author: Keith Packard <keithp@keithp.com>
Date: Wed Nov 10 16:02:22 2010 -0800
Merge remote branch 'sandmann/fbdelete'
commit 333b6ed26e36735ef72f314a3f8c4ec565af223f
Author: Kristian Høgsberg <krh@bitplanet.net>
Date: Thu Oct 28 20:46:23 2010 -0700
Set DamageSetReportAfterOp to true for the damage extension
Change the damage extension reporter to queue up events after we chain
to the wrapped functions. Damage events are typically sent out after
the rendering happens anyway, since we submit batch buffers from the
flush callback chain and then flush client io buffers. Compositing
managers relie on this order, and there is no way we could reliably
provide damage events to clients before the rendering happens anyway.
By queueing up the damage events before the rendering happens, there's
a risk that the client io buffer may overflow and send the damage
events to the client before the driver has even seen the rendering
request. Reporting damage events after the rendering fixes this
corner case and better corresponds with how we expect this to work.
Signed-off-by: Kristian Høgsberg <krh@bitplanet.net>
Reviewed-by: Keith Packard <keithp@keithp.com>
(cherry picked from commit 8d7b7a0d71e0b89321b3341b781bc8845386def6)
[anholt: re-applied to revert the revert, now that the cause of the
revert is fixed]
Signed-off-by: Keith Packard <keithp@keithp.com>
commit f36153e3ef6b13a87d016caab09cc9be274b0dd5
Author: Eric Anholt <eric@anholt.net>
Date: Thu Oct 28 20:46:22 2010 -0700
Replace usage of DamageRegionAppend with DamageDamageRegion to fix reportAfter.
In all these cases, any rendering implied by this damage has already
occurred, and we want to get the damage out to the client. Some of
the DamageRegionAppend calls were explicitly telling damage to flush
the reportAfter damage out, but not all.
Bug #30260. Fixes the compiz wallpaper plugin with client damage
changed to reportAfter.
Signed-off-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Keith Packard <keithp@keithp.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit c80c41767eb101e9dbd8393d8cca7764b4e248a4
Author: Aaron Plattner <aplattner@nvidia.com>
Date: Mon Oct 25 22:01:32 2010 -0700
os: Fix BigReq ignoring when another request is pending
Commit cf88363db0ebb42df7cc286b85d30d7898aea840 fixed the handling of
BigReq requests that are way too large and handles the case where the
read() syscall returns a short read. However, it neglected to handle
the case where it returns a long read, which happens when the client
has another request in the queue after the bogus large one.
Handle the long read case by subtracting the smaller of 'needed' and
'gotnow' from oci->ignoreBytes. If needed < gotnow, simply subtract
the two, leaving gotnow equal to the number of extra bytes read.
Since the code immediately following the (oci->ignoreBytes > 0) block
tries to handle the next request, advance oci->bufptr immediately
instead of setting oci->lenLastReq and letting the next call to
ReadRequestFromClient do it.
Fixes the XTS pChangeKeyboardMapping-3 test.
CASES TESTS PASS UNSUP UNTST NOTIU WARN FIP FAIL UNRES UNIN ABORT
-Xproto 122 389 367 2 19 0 0 0 1 0 0 0
+Xproto 122 389 368 2 19 0 0 0 0 0 0 0
Signed-off-by: Aaron Plattner <aplattner@nvidia.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit cc2c73ddcb4370a7c3ad439cda4da825156c26c9
Author: Luc Verhaegen <libv@skynet.be>
Date: Sun Oct 24 23:57:06 2010 +0200
x86emu: fix jump_near_IMM to handle DATA: flag correctly.
Fixes: https://bugs.freedesktop.org/show_bug.cgi?id=24348
Before (data flag ignored -> broken):
66 DATA:
e944f1 JMP 1ff6
After (fixed):
66 DATA:
e944f1ffff JMP 00001ff8
This subtle difference in the length of decoded instruction meant
that the VBE call jumped to the routine setting AX=0x14F (VBE Failed)
instead of the routine that set AX=0x4F (VBE success).
The ability to run the same code in vm86 significantly aided the
debugging of this issue. Those X.org developers who would like to drop
vm86 better take special care towards _all_ vesa bugs, as those will
expose further issues.
Patch applies easily to even xserver 1.4.2.
Signed-off-by: Luc Verhaegen <libv@skynet.be>
Tested-by: Luc Verhaegen <libv@skynet.be>
Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit be7cf14c365c8ee0d69c4335e01316bcfcba69a4
Author: Siddhesh Poyarekar <siddhesh.poyarekar@gmail.com>
Date: Tue Oct 26 09:11:53 2010 +0530
mi: Integer overflow for dashed lines longer than 46340. #31093
Lines of length greater than 46340 can be drawn with one of the
coordinates being negative. However for dashed lines, miPolyBuildPoly
overflows the int type when setting up edges for a section of the
dashed line. This results in the dashed segments not being drawn at
all.
Signed-off-by: Siddhesh Poyarekar <siddhesh.poyarekar@gmail.com>
Reviewed-by: Keith Packard <keithp@keithp.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit a6c64d96456d794b2f3ce40915922a3fba636b95
Author: Samuel Thibault <samuel.thibault@ens-lyon.org>
Date: Sun Oct 24 15:18:28 2010 +0200
Do not trap access to timer and keyboard
Disable timer/keyboard trapping on GNU/Hurd for now
Trapping disabled for now, as some VBIOSes (mga-g450 notably) use these
ports, and the int10 wrapper is not emulating them.
It's effectively what happens in the Linux variant too, as iopl() is used there,
making the ioperm() meaningless.
Signed-off-by: Olaf Buddenhagen <antrik@users.sf.net>
Signed-off-by: Samuel Thibault <samuel.thibault@ens-lyon.org>
Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 69e8e1b0b95a325da3e3a2d76d092e7131baa9ad
Author: Julien Cristau <jcristau@debian.org>
Date: Mon May 17 19:39:54 2010 +0200
os: include dix-config.h, not xorg-config.h
os/strlc{at,py}.c were trying to include xorg-config.h, which is not
available in dix.
Signed-off-by: Julien Cristau <jcristau@debian.org>
Acked-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit acba00c0c1129fe4ef7655f018cd21dbb1ee9a1f
Merge: 383dfe23f1 44e8165414
Author: Keith Packard <keithp@keithp.com>
Date: Wed Nov 10 14:41:08 2010 -0800
Merge remote branch 'dottedmag/master'
commit 383dfe23f1641435c0713f8a56424814a156af8e
Author: Pauli Nieminen <ext-pauli.nieminen@nokia.com>
Date: Mon Oct 25 17:13:57 2010 +0300
DRI2: Avoid call to NULL pointer
DDX driver may implement schedule swap without GetMSC. In that case we
can't call GetMSC in DRI2SwapBuffers.
Signed-off-by: Pauli Nieminen <ext-pauli.nieminen@nokia.com>
Reviewed-by: Mario Kleiner <mario.kleiner@tuebingen.mpg.de>
CC: Keith Packard <keithp@keithp.com>
CC: Kristian Høgsberg <krh@bitplanet.net>
Reviewed-by: Jesse Barnes <jbarnes@virtuousgeek.org>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 68e4a628d65312df93cc71f3e76241584c4bbd23
Author: Cyril Brulebois <kibi@debian.org>
Date: Wed Nov 10 15:28:29 2010 +0100
Remove more superfluous if(p!=NULL) checks around free(p).
This patch has been generated by the following Coccinelle semantic patch:
@@
expression E;
@@
- if (E != NULL) {
- free(E);
- }
+ free(E);
Signed-off-by: Cyril Brulebois <kibi@debian.org>
Reviewed-by: Mark Kettenis <kettenis@openbsd.org>
Reviewed-by: Matt Turner <mattst88@gmail.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit b142b0d27442191d628762604f4eb1f65263d717
Author: Cyril Brulebois <kibi@debian.org>
Date: Mon Nov 8 23:35:33 2010 +0100
Remove more superfluous if(p!=NULL) checks around free(p).
This patch has been generated by the following Coccinelle semantic patch:
@@
expression E;
@@
- if (E != NULL)
- free(E);
+ free(E);
Signed-off-by: Cyril Brulebois <kibi@debian.org>
Reviewed-by: Matt Turner <mattst88@gmail.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 0649ac0afdb3f8ed11c2634563d6b9df161cb9ec
Author: Cyril Brulebois <kibi@debian.org>
Date: Mon Nov 8 23:35:32 2010 +0100
Remove more superfluous if(p) checks around free(p).
This patch has been generated by the following Coccinelle semantic patch:
@@
expression E;
@@
- if (E)
- free(E);
+ free(E);
Signed-off-by: Cyril Brulebois <kibi@debian.org>
Reviewed-by: Matt Turner <mattst88@gmail.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 99275ad2fa99778afaefc54b62c8638afc59e755
Author: Cyril Brulebois <kibi@debian.org>
Date: Wed Nov 10 16:06:10 2010 +0100
Remove superfluous if(p!=NULL) checks around free(p); p=NULL;
This patch has been generated by the following Coccinelle semantic patch:
@@
expression E;
@@
- if (E != NULL) {
- free(E);
(
- E = NULL;
|
- E = 0;
)
- }
+ free(E);
+ E = NULL;
Signed-off-by: Cyril Brulebois <kibi@debian.org>
Reviewed-by: Mikhail Gusarov <dottedmag@dottedmag.net>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 9e999d18b004b8ead9c6c5d79b4a3d4bbf0e3152
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri Nov 5 12:08:11 2010 +1000
Xi: if XTEST device creation fails, fail the master devices.
When getting close to the MAXDEVICES limit, the creation of XTEST devices
may fail due to device id exhaustion. In that case, fail the creation of
master devices too and return an error to the client.
Theoretically, we could alloc the MDs without the XTEST devices but that
will get interesting when a client starts sending XTEST events through those
devices.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Julien Cristau <jcristau@debian.org>
commit 5a455e0c80d433adc4109ebf313fd92afa194545
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri Nov 5 11:49:12 2010 +1000
Xi: rename two variables from ptr to dev.
They were named ptr when everything was in one function to save one more
variable. Now that the stuff is split out, "dev" makes more sense.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Julien Cristau <jcristau@debian.org>
commit 9b89b91c685426c9944f7fc8890f436c18b7583c
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri Nov 5 11:47:43 2010 +1000
Xi: split hierarchy manipulation into static functions.
No functional changes, just code cleanup to improve readability.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Julien Cristau <jcristau@debian.org>
commit 4132b1c591bd01c29df91b88afbd144647da9ed8
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu Oct 21 14:04:42 2010 +1000
xfree86: fix compiler warnings - unused variable i
../../../../hw/xfree86/common/xf86Config.c: In function 'configDRI':
../../../../hw/xfree86/common/xf86Config.c:2213:9: warning: unused variable
'i'
Introduced in 788bfbf18ac19923604b0d676933fdc0d78526a1
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Matt Turner <mattst88@gmail.com>
commit 6b982d73bb8878238ed46665b220a94a591e11a9
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu Oct 21 13:53:35 2010 +1000
xfree86: fix two compiler warnings - unused variable ati, atimisc
../../../../hw/xfree86/common/xf86Config.c: In function
'fixup_video_driver_list':
../../../../hw/xfree86/common/xf86Config.c:507:19: warning: unused variable
'atimisc'
../../../../hw/xfree86/common/xf86Config.c:507:12: warning: unused variable
'ati'
Introduced in 52577ae8eeda64601db8dd425027cf8e4271b873.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Matt Turner <mattst88@gmail.com>
commit 0799f0771cca335d6400a8494ba236a0d10e122b
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu Nov 4 12:53:18 2010 +1000
xfree86: remove two unused variables from Makefile.am
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Julien Cristau <jcristau@debian.org>
commit a52efb096e166e325deb3d6b502671f339a4fa15
Merge: fe8d122b13 f72aadd38b
Author: Keith Packard <keithp@keithp.com>
Date: Wed Nov 3 06:50:45 2010 -0700
Merge remote branch 'sthibaul/master-iopl'
commit 3dc3aefb88c167d365795dcd44017742c52e4967
Author: Søren Sandmann Pedersen <ssp@redhat.com>
Date: Mon Nov 1 22:23:05 2010 -0400
fb: Delete a bunch more left-overs
All of these definitions were unused since compositing moved to pixman.
Reviewed-by: Aaron Plattner <aplattner@nvidia.com>
Reviewed-by: Mikhail Gusarov <dottedmag@dottedmag.net>
Signed-off-by: Søren Sandmann <ssp@redhat.com>
commit 565b5e2b0261d1148cc2707ffcbb915414dd3e02
Author: Søren Sandmann Pedersen <ssp@redhat.com>
Date: Mon Nov 1 22:14:29 2010 -0400
wfb: Delete unused renamings
These functions haven't existed in a while.
Reviewed-by: Aaron Plattner <aplattner@nvidia.com>
Reviewed-by: Mikhail Gusarov <dottedmag@dottedmag.net>
Signed-off-by: Søren Sandmann <ssp@redhat.com>
commit 0dae479e16590e767df35985150c5acf696e5df2
Author: Søren Sandmann Pedersen <ssp@redhat.com>
Date: Mon Nov 1 22:17:08 2010 -0400
fb: Delete fbCompositeGeneral()
This function was an unused and trivial wrapper around fbComposite().
Reviewed-by: Aaron Plattner <aplattner@nvidia.com>
Reviewed-by: Mikhail Gusarov <dottedmag@dottedmag.net>
Signed-off-by: Søren Sandmann <ssp@redhat.com>
commit 74bc2d8c6bafc5373ff9c14eed12e26b5b965953
Author: Søren Sandmann Pedersen <ssp@redhat.com>
Date: Mon Nov 1 22:12:03 2010 -0400
render: Delete renderedge.[ch]
The functions in these files have not been used since trap
rasterization was moved to pixman. They survived until now to preserve
the server abi.
Reviewed-by: Aaron Plattner <aplattner@nvidia.com>
Reviewed-by: Mikhail Gusarov <dottedmag@dottedmag.net>
Signed-off-by: Søren Sandmann <ssp@redhat.com>
commit 6118346d64e3c2fbe1fe2f041ea773dd2a3c0438
Author: Søren Sandmann Pedersen <ssp@redhat.com>
Date: Mon Nov 1 22:04:49 2010 -0400
Delete unused fbWalkCompositeRegion()
This function has not been used since most of the compositing was
moved to pixman. The only reason it has survived until now is that it
was part of the server ABI.
Reviewed-by: Aaron Plattner <aplattner@nvidia.com>
Reviewed-by: Mikhail Gusarov <dottedmag@dottedmag.net>
Signed-off-by: Søren Sandmann <ssp@redhat.com>
commit fe8d122b133a43125cc961d2c3c811fa776f29c8
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu Oct 28 16:13:09 2010 +1000
Xi: reshuffle conditions for labeling a device as IsXExtensionKeyboard (#29046)
From the original bug reporter Ezra Reeves:
"I did some more digging on this today, and I found that an HP branded
wireless USB mouse has the same issue. With this mouse (as well as the
logitech wireless mouse), the return from:
xdev = XListInputDevices(GDK_WINDOW_XDISPLAY(rootwin), &ndevices_return);
lists the USB device twice, but both have xdev[num].use == 3
(IsXExtensionKeyboard as defined in X11/XI.h).
[...]
Swapping the order of the test in Xi/listdev.c that determines whether a
device is a pointer or a keyboard properly detects my devices (OEM USB
wireless mouse/kb combo) -- one as a keyboard and one as a pointer."
X.Org Bug 29046 <http://bugs.freedesktop.org/show_bug.cgi?id=29046>
Reported-by: Erik Kilfoil <ekilfoil@gmail.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit a210068c5222acbdb04db17cb8cef314735bf977
Author: Tiago Vignatti <tiago.vignatti@nokia.com>
Date: Tue Oct 26 20:50:13 2010 +0300
dix: advance parent window pointer when no node is found
Signed-off-by: Tiago Vignatti <tiago.vignatti@nokia.com>
Signed-off-by: Pauli Nieminen <ext-pauli.nieminen@nokia.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 19f43836d1006d253391926e880b14ed2e7a0cf8
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Mon Oct 25 15:10:19 2010 +1000
Re-export xf86CollectInputOptions.
Some drivers, most notably the mouse driver need this and reimplementing on
the driver side doesn't make sense.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 4613ce3f78a32f2a6f422e719150d55b035c758e
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri Oct 22 15:17:50 2010 +1000
test: valuator_mode tests.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Chase Douglas <chase.douglas@canonical.com>
commit 58554f1c6429535e7ab432c920aabca71a77edb8
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri Oct 22 15:10:32 2010 +1000
Convert some leftover axes->mode access to valuator_get_mode()
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Chase Douglas <chase.douglas@canonical.com>
commit 44e81654147065b7b907ce0d14fdc2e74a638f79
Author: Mikhail Gusarov <dottedmag@dottedmag.net>
Date: Mon Oct 25 01:30:33 2010 +0400
Remove now-misleading comment
Signed-off-by: Mikhail Gusarov <dottedmag@dottedmag.net>
Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
commit 433dddcf29d257310e95e4215dceef8b0b976e2d
Author: Mikhail Gusarov <dottedmag@dottedmag.net>
Date: Mon Oct 25 01:28:38 2010 +0400
Replace "if(buf) realloc(buf, size) else malloc(size)" with realloc()
Signed-off-by: Mikhail Gusarov <dottedmag@dottedmag.net>
Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
commit 04a04e162886ca9bc3977d3a7509def876487921
Author: Mikhail Gusarov <dottedmag@dottedmag.net>
Date: Mon Oct 25 01:27:46 2010 +0400
Remove now-misleading comment
Signed-off-by: Mikhail Gusarov <dottedmag@dottedmag.net>
Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
commit f72aadd38b730c46c0a027dacbbb57f03068383d
Author: Samuel Thibault <samuel.thibault@ens-lyon.org>
Date: Sat Oct 23 22:42:33 2010 +0200
hurd: Fix use of deprecated iopl device
Fix Xserver on GNU/Hurd into using the "mem" device instead of
the deprecated "iopl" device.
Reviewed-by: Olaf Buddenhagen <antrik@users.sf.net>
Signed-off-by: Samuel Thibault <samuel.thibault@ens-lyon.org>
commit dd11f734a9a73bf34357c149d2809842938d57b5
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri Oct 22 16:11:24 2010 +1000
input: remove "mode" field from ValuatorClassRec.
We have per-axis mode now. For those bits that still need it (XI 1.x),
assume that the first axis holds the device's mode.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Chase Douglas <chase.douglas@canonical.com>
commit 5cf3b654fccf09de63a3f983c85096cda78fb693
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri Oct 22 15:49:40 2010 +1000
input: move proximity state into ProximityClassRec.
Previously the OutOfProximity bit in the valuator mode.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Chase Douglas <chase.douglas@canonical.com>
commit e909af88bf17dbadcc00d50c13a5bdb6001367be
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri Oct 22 14:22:44 2010 +1000
dmx: clarify a valuator mode condition.
Relative is defined as 0, so change the condition to be more obvious.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Chase Douglas <chase.douglas@canonical.com>
commit b5ef88c911f697530ddc2c7302fce15ba2ead4b2
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri Oct 22 14:02:17 2010 +1000
dix: clip absolute axes depending on their mode.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Chase Douglas <chase.douglas@canonical.com>
commit ea567b675f814ac41e75f1ed8ded0ac3e9d552a8
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri Oct 22 14:01:11 2010 +1000
dix: populate motion history only if the mode matches the first axis.
XI1 doesn't cater for mixed mode devices, so bail out on the first valuator
that has a different mode.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Chase Douglas <chase.douglas@canonical.com>
commit 4381b70f5aa293400735e9b4e5a792408afa25a2
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri Oct 22 13:57:27 2010 +1000
input: add valuator_get_mode() helper.
Returns the mode of the specified valuator.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Chase Douglas <chase.douglas@canonical.com>
commit 6f6f460c2485d16d126a1ab5d939083c322dc3dd
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri Oct 22 13:48:06 2010 +1000
dix: send proximity events if one or more axes are Absolute.
We only skip relative events for proximity, not absolute ones. Now with
mixed mode, just unset those axes that are relative.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Chase Douglas <chase.douglas@canonical.com>
commit 65c0fc81eb920085e650b8c9e874c9dd26c7ec98
Author: Chase Douglas <chase.douglas@canonical.com>
Date: Fri Jul 16 09:21:19 2010 -0400
Add support for per-axis valuator modes (Relative/Absolute)
The XI2 protocol supports per-axis modes, but the server so far does
not. This change adds support in the server.
A complication is the fact that XI1 does not support per-axis modes.
The solution provided here is to set a per-device mode that defines the
mode of at least the first two valuators (X and Y). Note that initializing
the first two axes to a different mode than the device mode will fail.
For XI1 events, any axes following the first two that have the same mode
will be sent to clients, up to the first axis that has a different mode.
Thus, if a device has relative, then absolute, then relative mode axes,
only the first block of relative axes will be sent over XI1.
Since the XI2 protocol supports per-axis modes, all axes are sent to the
client.
Signed-off-by: Chase Douglas <chase.douglas@canonical.com>
commit 290af0418f8c94355e42ad81aa7779b90e173fc9
Author: Chase Douglas <chase.douglas@ubuntu.com>
Date: Thu Oct 21 22:41:09 2010 -0400
test: input - set valuators mask for event to core conversion
Commit de8be07cc0a8163b6ef04455706fd5ca2cebe587 adds a requirement to
event to core conversion that at least one of the X or Y valuators are
set in the valuator mask. This commit fixes the event conversion test to
be compliant.
Signed-off-by: Chase Douglas <chase.douglas@canonical.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 8990b31214bcbc08090604147287455bfde91c11
Author: Paulius Zaleckas <paulius.zaleckas@gmail.com>
Date: Mon Oct 18 00:02:01 2010 +0300
KDrive: Fix error handlig in tslib driver
If ts_open() fails and return NULL, then next call to ts_fd()
segfaults because of NULL dereference. There is no need to
check output of ts_fd() as ts_open() did this internally.
Signed-off-by: Paulius Zaleckas <paulius.zaleckas@gmail.com>
Reviewed-by: Daniel Stone <daniel@fooishbar.org>
Reviewed-by: Keith Packard <keithp@keithp.com>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 9696c782c8cb86b06d12949899582533a2e04cfe
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Tue Oct 19 12:52:57 2010 +1000
test: valuator_mask tests.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Chase Douglas <chase.douglas@canonical.com>
commit 2362adc2da9745e01c79ed4905aa81926355c4e2
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Tue Oct 19 10:59:09 2010 +1000
dix: remove valuator_mask_copy_valuators, not needed anymore.
With the switch to masks internally, this isn't needed anymore.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Chase Douglas <chase.douglas@canonical.com>
commit 2b04a3ef739a7ba5708400999e5d81418236a0a4
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Tue Oct 19 09:58:58 2010 +1000
xfree86: convert xf86Post{Motion|Key|Button|Proximity}Event to masks
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Chase Douglas <chase.douglas@canonical.com>
commit 0418a39e71e50b88e050b0d8a758265b17c4bf0e
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Mon Oct 18 15:55:53 2010 +1000
dix: get rid of the now-superfluous valuator arrays in GPE and friends.
The valuators are stored inside the mask, use it from there. are stored
inside the mask, use it from there. are stored inside the mask, use it from
there. are stored inside the mask, use it from there.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Chase Douglas <chase.douglas@canonical.com>
commit 675f4a8525d29ebad783351e17be785b2f32b2e8
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Tue Oct 19 13:37:46 2010 +1000
Abstract valuator masks through a set of APIs.
This commit introduces an abstraction API for handling masked valuators. The
intent is that drivers just allocate a mask, set the data and pass the mask
to the server. The actual storage type of the mask is hidden from the
drivers.
The new calls for drivers are:
valuator_mask_new() /* to allocate a valuator mask */
valuator_mask_zero() /* to reset a mask to zero */
valuator_mask_set() /* to set a valuator value */
The new interface to the server is
xf86PostMotionEventM()
xf86PostButtonEventM()
xf86PostKeyboardEventM()
xf86PostProximityEventM()
all taking a mask instead of the valuator array.
The ValuatorMask is currently defined for MAX_VALUATORS fixed size due to
memory allocation restrictions in SIGIO handlers.
For easier review, a lot of the code still uses separate valuator arrays.
This will be fixed in a later patch.
This patch was initially written by Chase Douglas.
Signed-off-by: Chase Douglas <chase.douglas@canonical.com>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Chase Douglas <chase.douglas@canonical.com>
commit 1a0d9324b3d9fd93e685066e0e5cea0611878c0d
Author: Aaron Plattner <aplattner@nvidia.com>
Date: Sun Oct 17 09:58:50 2010 -0700
Revert "Set DamageSetReportAfterOp to true for the damage extension" (#30260)
This commit breaks the Compiz "Wallpaper" plugin.
This reverts commit 8d7b7a0d71e0b89321b3341b781bc8845386def6.
Reviewed-by: Keith Packard <keithp@keithp.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit d738175eaf1098e29b8afb6de8e99b5098e366a7
Merge: 8806a04f7f 9872e0f011
Author: Keith Packard <keithp@keithp.com>
Date: Tue Oct 19 22:50:15 2010 -0700
Merge remote branch 'whot/for-keith'
commit fc48a8f9f5f66e591b3e39211d44ce68267303f8
Author: Chase Douglas <chase.douglas@canonical.com>
Date: Tue Oct 19 13:37:38 2010 +1000
Add CountBits() to the server.
Function to count the number of bits set in the given array.
Signed-off-by: Chase Douglas <chase.douglas@canonical.com>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Chase Douglas <chase.douglas@canonical.com>
commit 9872e0f0115cd7d0543e55a1831facddf3aff90c
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Wed Oct 13 10:31:51 2010 +1000
xfree86: set mask for valuators 0/1 when emulating core events (#30267)
EventToCore as of the commit below won't generate core motion events if the
valuator mask for x/y isn't set. For DGA, we work around this check by
forcibly setting the mask in the event we pass down.
commit de8be07cc0a8163b6ef04455706fd5ca2cebe587
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Tue Aug 17 12:08:52 2010 +1000
dix: don't create core motion events for non-x/y valuators.
X.Org Bug 30267 <http://bugs.freedesktop.org/show_bug.cgi?id=30267>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Tested-by: Andrew Randrianasulu <randrik@mail.ru>
Tested-by: Andy Furniss
Reviewed-by: Daniel Stone <daniel@fooishbar.org>
commit 649293f6b634e6305b6737a841d6e9d0f0065d6c
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Mon Oct 11 16:09:18 2010 +1000
xkb: always fill the symsPerKey array, regardless of client flags (#30527)
Even if a client does not modify the symbols, symsPerKey and mapWidths must
be filled from the current configuration. Both arrays are then passed into
other functions (pending the right flag), thus they must contain valid
values regardless of the XkbKeySymsMask flag in req->present.
X.Org Bug 30527 <http://bugs.freedesktop.org/show_bug.cgi?id=30527>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Daniel Stone <daniel@fooishbar.org>
commit ca21a266224b6eff4fd817c2082d2e144f1ea58c
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Mon Oct 11 15:38:38 2010 +1000
xkb: init mapWidth and symsPerKey arrays to 0.
Helps debugging greatly, random 8 or 16 bit values can sometimes look like
valid values, causing much excitement on the client front.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Daniel Stone <daniel@fooishbar.org>
commit 8806a04f7f028dd9f6a7ff5c36e460d3895c7deb
Author: Michał Górny <mgorny@gentoo.org>
Date: Thu Oct 14 15:49:51 2010 +0200
kdrive: Fix linking with tslib, with -Wl, --as-needed. #30600
Change the library order in TSLIB_LIBS variable, placing ${TSLIB_LIBS}
after the local static libraries. This fixes linking with
-Wl,--as-needed.
Fixes: https://bugs.freedesktop.org/show_bug.cgi?id=30600
Signed-off-by: Michał Górny <mgorny@gentoo.org>
Reviewed-by: Daniel Stone <daniel@fooishbar.org>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit c7e436e9987a6fb0876c63e96f59ff4c20b4bef0
Author: Michał Górny <mgorny@gentoo.org>
Date: Thu Oct 14 15:49:50 2010 +0200
kdrive: Fix tslib check fallback to set TSLIB_LIBS. #30599
If pkg-config is unable to find tslib but the fallback check does find
it, the compilation continues with tslib support enabled though
TSLIB_LIBS are unset. Thus, the compilation fails with a linking error
on tslib functions.
This patch sets TSLIB_LIBS to '-lts' whenever the tslib fallback check
succeeds.
Fixes: https://bugs.freedesktop.org/show_bug.cgi?id=30599
Signed-off-by: Michał Górny <mgorny@gentoo.org>
Reviewed-by: Daniel Stone <daniel@fooishbar.org>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 25801a2556ca9b42646023e5a95a3cbf7309e852
Author: Jon TURNEY <jon.turney@dronecode.org.uk>
Date: Thu Oct 14 22:38:17 2010 +0100
Cygwin/X: Move duplicate extern variable declarations from various .c files to a new header file
For the global variables defined in winglobals.c, remove duplicate extern
declarations from the beginning of various .c files, and move most of them
into a new header file, winglobals.h
Leave some clipboard related variables alone for the moment, they need treating
more carefully, to avoid mixing client and server type definitions.
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
commit 04d11abcf2ea2f36d899428e9c885b69e4f779ad
Author: Jon TURNEY <jon.turney@dronecode.org.uk>
Date: Thu Oct 14 22:45:31 2010 +0100
Cygwin/X: Remove g_hwndKeyboardFocus
It's set but it's value is never used
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
commit 5e896e425fe14022b0714301531bd54151c763f0
Author: Jon TURNEY <jon.turney@dronecode.org.uk>
Date: Thu Oct 14 22:43:51 2010 +0100
Cygwin/X: Make g_hmodCommonControls static
Make g_hmodCommonControls static, it's only used in InitOutput.c
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
commit 49b996faadf0fedcee25d4a8f96f4c4007c29f5f
Author: Jon TURNEY <jon.turney@dronecode.org.uk>
Date: Fri Oct 15 13:00:46 2010 +0100
Cygwin/X: Make g_hmodDirectDraw static
Add winReleaseDDProcAddresses() for releasing the direct draw module
handle, so g_hmodDirectDraw can be made static
Remove unneeded duplicate extern definitions of g_fpDirectDrawCreate
and g_fpDirectDrawCreateClipper, and move the definition from
winglobals.c to winengine.c
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
commit 6f12277e37d16a7de9d3f3079688c43b07921b0a
Author: Jon TURNEY <jon.turney@dronecode.org.uk>
Date: Thu Oct 14 22:44:53 2010 +0100
Cygwin/X: Make g_hhookKeyboardLL static
Make g_hhookKeyboardLL static, it's only used in winkeyhook.c
Also remove unused externs
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
commit 9952b51f6822aeaa19c27caf85698741eb4c27d8
Author: Jon TURNEY <jon.turney@dronecode.org.uk>
Date: Fri Oct 15 13:01:45 2010 +0100
Cygwin/X: Fix typos in comments
Fix a few typos in comments
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
commit 1de5db73d31411798ae93619d9e626fa32e0c4bd
Author: Jon TURNEY <jon.turney@dronecode.org.uk>
Date: Thu Oct 14 22:46:09 2010 +0100
Cygwin/X: Drop several unneeded includes of winprefs.h
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
commit 8e723108151136f115e8e6d4b97ed4e2fa685dbf
Author: Colin Harrison <colin.harrison@virgin.net>
Date: Wed Sep 29 14:18:27 2010 +0100
Xming: Remove uses of register keyword
I'm pretty sure the compiler has a better idea how to optimize this
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Reviewed-by: Jon TURNEY <jon.turney@dronecode.org.uk>
commit d11761c6a6dd2a9963dfd3bcb313f1b2525387fc
Author: Colin Harrison <colin.harrison@virgin.net>
Date: Fri Feb 26 13:31:18 2010 +0000
Xming: Casts to remove warnings on event pointers
winkeybd.c: In function ‘winSendKeyEvent’:
winkeybd.c:489: warning: passing argument 2 of ‘mieqEnqueue’ from incompatible pointer type
winmouse.c: In function ‘winMouseButtonsSendEvent’:
winmouse.c:247: warning: passing argument 2 of ‘mieqEnqueue’ from incompatible pointer type
winmouse.c: In function ‘winEnqueueMotion’:
winmouse.c:380: warning: passing argument 2 of ‘mieqEnqueue’ from incompatible pointer type
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Reviewed-by: Jon TURNEY <jon.turney@dronecode.org.uk>
commit 10bf8345cf15c6030147a9edb7f6a093c8db8099
Author: Colin Harrison <colin.harrison@virgin.net>
Date: Mon Oct 12 13:50:00 2009 +0100
Xming: Warning fix in winDeviceCursorCleanup()
return statement with an expression in a function whose return-type is void
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Reviewed-by: Jon TURNEY <jon.turney@dronecode.org.uk>
commit cab837a60a7aa653ccea77ff714335186ce38a4b
Author: Jon TURNEY <jon.turney@dronecode.org.uk>
Date: Sun Jul 18 13:22:46 2010 +0100
Cygwin/X: Reformat the keyboard layout mapping table
Also remove the out-of-date listing of keyboard layout IDs and which ones
have known mappings
XXX: layout zh_TW doesn't exist anymore
This patch brought to you by C-u M-x align-regexp
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
commit ee2867649d9485f6559f88a973eae6393971ff35
Author: Jon TURNEY <jon.turney@dronecode.org.uk>
Date: Sun Jul 18 13:20:01 2010 +0100
Cygwin/X: Clarify XKB options in XWin man page
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
commit 1ba1b12d24d8f825babd8cf38710c7fa9a94821e
Author: Colin Harrison <colin.harrison@virgin.net>
Date: Fri Oct 15 13:46:09 2010 +0100
Xming: Warning fix in winApplyHints()
winmultiwindowwm.c: In function ‘winApplyHints’:
winmultiwindowwm.c:1587: warning: ISO C90 forbids mixed declarations and code
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Reviewed-by: Jon TURNEY <jon.turney@dronecode.org.uk>
commit fb64414548c437bf52c3dcd0613aab5079faffba
Author: Colin Harrison <colin.harrison@virgin.net>
Date: Fri Oct 15 14:19:57 2010 +0100
Xming: Fix warnings in ProcWindowsWMFrameSetTitle()
winwindowswm.c: In function ‘ProcWindowsWMFrameSetTitle’:
winwindowswm.c:516: warning: pointer targets in passing argument 1 of ‘strncpy’ differ in signedness
winwindowswm.c:516: warning: pointer targets in passing argument 2 of ‘strncpy’ differ in signedness
winwindowswm.c:528: warning: pointer targets in passing argument 2 of ‘SetWindowTextA’ differ in signedness
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Reviewed-by: Jon TURNEY <jon.turney@dronecode.org.uk>
commit da5955cc023ae980fdc0397f6fd541e788040c29
Author: Colin Harrison <colin.harrison@virgin.net>
Date: Fri Oct 15 14:18:53 2010 +0100
Xming: Fix warnings in windialogs.c
windialogs.c: In function ‘winDisplayExitDialog’:
windialogs.c:327: warning: passing argument 3 of ‘PostMessageA’ makes integer from pointer without a cast
windialogs.c: In function ‘winDisplayAboutDialog’:
windialogs.c:597: warning: passing argument 3 of ‘PostMessageA’ makes integer from pointer without a cast
windialogs.c: In function ‘winAboutDlgProc’:
windialogs.c:697: warning: comparison between pointer and integer
windialogs.c:701: warning: format ‘%d’ expects type ‘int’, but argument 2 has type ‘HINSTANCE’
windialogs.c:716: warning: assignment makes integer from pointer without a cast
windialogs.c:736: warning: assignment makes integer from pointer without a cast
windialogs.c:756: warning: assignment makes integer from pointer without a cast
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Reviewed-by: Jon TURNEY <jon.turney@dronecode.org.uk>
commit 6d9fb07db210bcfdcdde632fa341c4ee08d44b35
Author: Colin Harrison <colin.harrison@virgin.net>
Date: Fri Oct 15 14:16:54 2010 +0100
Xming: Fix warnings in winNameCompare(), winNormalizeName()
winconfig.c: In function ‘winNameCompare’:
winconfig.c:715: warning: array subscript has type ‘char’
winconfig.c:715: warning: array subscript has type ‘char’
winconfig.c:716: warning: array subscript has type ‘char’
winconfig.c:716: warning: array subscript has type ‘char’
winconfig.c:730: warning: array subscript has type ‘char’
winconfig.c:730: warning: array subscript has type ‘char’
winconfig.c:731: warning: array subscript has type ‘char’
winconfig.c:731: warning: array subscript has type ‘char’
winconfig.c: In function ‘winNormalizeName’:
winconfig.c:1092: warning: array subscript has type ‘char’
winconfig.c:1093: warning: array subscript has type ‘char’
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Reviewed-by: Jon TURNEY <jon.turney@dronecode.org.uk>
commit 20510e51001d1659000c8d8607c0de16022d1c74
Author: Colin Harrison <colin.harrison@virgin.net>
Date: Fri Oct 15 14:15:51 2010 +0100
Xming: Fix warnings in winClipboardFlushXEvents()
winclipboardxevents.c: In function ‘winClipboardFlushXEvents’:
winclipboardxevents.c:225: warning: format ‘%08x’ expects type ‘unsigned int’, but argument 2 has type ‘DWORD’
winclipboardxevents.c:266: warning: format ‘%08x’ expects type ‘unsigned int’, but argument 2 has type ‘DWORD’
winclipboardxevents.c:619: warning: pointer targets in passing argument 1 of ‘strcat’ differ in signedness
winclipboardxevents.c:659: warning: pointer targets in passing argument 1 of ‘strlen’ differ in signedness
winclipboardxevents.c:669: warning: pointer targets in passing argument 3 of ‘MultiByteToWideChar’ differ in signedness
winclipboardxevents.c:690: warning: pointer targets in passing argument 3 of ‘MultiByteToWideChar’ differ in signedness
winclipboardxevents.c:698: warning: pointer targets in passing argument 1 of ‘strdup’ differ in signedness
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Reviewed-by: Jon TURNEY <jon.turney@dronecode.org.uk>
commit 44c8b449d281c4d984d65f66bac96a65806b2efa
Author: Colin Harrison <colin.harrison@virgin.net>
Date: Fri Oct 15 14:13:57 2010 +0100
Xming: Fix warning in winClipboardErrorHandler()
winclipboardthread.c: In function ‘winClipboardErrorHandler’:
winclipboardthread.c:444: warning: format ‘%d’ expects type ‘int’, but argument 3 has type ‘long unsigned int’
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Reviewed-by: Jon TURNEY <jon.turney@dronecode.org.uk>
commit 1f2a57d9e46424a2e0861f55253b91d930d79083
Author: Jon TURNEY <jon.turney@dronecode.org.uk>
Date: Fri Oct 15 14:12:22 2010 +0100
Cygwin/X: Turn off the bad-function-cast warning for XWin code
Turn off the bad-function-cast warning for the XWin code, it's near impossible
to write code which uses Win32 API calls that doesn't trigger this warning
For example, SendMessage(WM_SETICON) returns an LRESULT, but we are supposed to
know this is safe to cast this result to a HICON, which gcc considers a non-matching
type.
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
commit 55e528b6cc6451dbb1e65baec199d4df0441e86d
Author: Jon TURNEY <jon.turney@dronecode.org.uk>
Date: Thu Mar 25 23:39:37 2010 +0000
Cygwin/X: Remove execute permission from source files
Remove execute permission from source files
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
commit b2b685e2693ff5f089006f5b3882d6b0c0853862
Author: Jon TURNEY <jon.turney@dronecode.org.uk>
Date: Thu Mar 25 23:00:48 2010 +0000
Cygwin/X: unifdef XFree86Server
Remove XFree86Server define, which was always on anyhow, and the
code which was guarded by !XFree86Server
This completes the process of removal started in 2006 :-)
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
commit 9ed70f15eff6a85222b46db1fe7af25154314464
Author: Jon TURNEY <jon.turney@dronecode.org.uk>
Date: Mon Nov 2 17:37:14 2009 +0000
Cygwin/X: Use normal apostrophe in XWin DDX help text
Use U+0027 APOSTROPHE in XWin DDX help text, rather than
U+2019 RIGHT SINGLE QUOTATION MARK
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
commit 9f8f056a21b9480fd9fd43a22c9d6f45a2c1ef87
Author: Jon TURNEY <jon.turney@dronecode.org.uk>
Date: Tue Mar 23 16:34:26 2010 +0000
Cygwin/X: Cleanup some VENDOR_STRING/VENDOR_CONTACT cruft
Cleanup some VENDOR_STRING/VENDOR_CONTACT cruft
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
commit 5aff712a8d2eb9f965ecbb93216cc0bcdc327ae6
Merge: 5b98c6267f e354ccac36
Author: Keith Packard <keithp@keithp.com>
Date: Mon Oct 18 17:16:23 2010 -0700
Merge remote branch 'whot/for-keith'
commit 5b98c6267f575ec4ff498ecb651e34dbff030b83
Author: Adam Jackson <ajax@redhat.com>
Date: Mon Oct 18 16:01:40 2010 -0400
randr: Remove mirandr
This isn't used anywhere, not least because it's completely
nonfunctional.
Reviewed-by: Mikhail Gusarov <dottedmag@dottedmag.net>
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit 7bb653bedceb6180a0361ead1c612839e776ce98
Author: Olivier Fourdan <ofourdan@redhat.com>
Date: Mon Oct 18 15:59:35 2010 -0400
modes: improve aspect ratio match for classic drivers
After we infer the aspect ratio for the screen, we pick the largest
mode matching that aspect ratio from the best mode pool available.
We then clamp virtual size to that mode, and run the resulting mode
list through the driver's ValidMode hook. In doing so we might filter
away our initial guess. If this happens we shrink the default mode
to the next largest mode from _any_ mode pool. This is usually wrong,
and we should instead pick the next aspect-matched mode from the best
available mode pool (as always, user then driver then default).
Reviewed-by: Alex Deucher <alexdeucher@gmail.com>
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit d6d90a4fccef086e7c7934adea901b2cd9a595bf
Author: Adam Jackson <ajax@redhat.com>
Date: Mon Oct 18 15:53:43 2010 -0400
composite: Move the backfill comment to a more appropriate indent level
Reviewed-by: Keith Packard <keithp@keithp.com>
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit db8840600e8e21356241eb87395031388d9b54d2
Author: Adam Jackson <ajax@redhat.com>
Date: Mon Oct 18 15:52:52 2010 -0400
composite: Don't backfill non-MapWindow allocations
Reviewed-by: Keith Packard <keithp@keithp.com>
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit 6dd775f57d2f94f0ddaee324aeec33b9b66ed5bc
Author: Adam Jackson <ajax@redhat.com>
Date: Mon Oct 18 15:50:37 2010 -0400
composite: Don't backfill non-bg-None windows
If there's a defined background then backfilling is a waste of effort,
since exposure processing will paint that in for us. But note that we
have to backfill if any children are bg=None to preserve semantics with
non-composited servers.
Reviewed-by: Keith Packard <keithp@keithp.com>
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit d2064fbb687839c297a851a5d85f32dfbbe4a0d5
Author: Adam Jackson <ajax@redhat.com>
Date: Mon Oct 18 15:42:54 2010 -0400
ddc: Don't probe for DDC/CI or EEPROM
For whatever reason, some (broken) monitors will crash if you do this.
We're not actually using this information for anything, so let's just
not do it.
Originally reported as http://bugzilla.redhat.com/620333
Reviewed-by: Alex Deucher <alexdeucher@gmail.com>
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit 47c91dca8d8eecb429123e8370302831bcd57938
Author: Adam Jackson <ajax@redhat.com>
Date: Mon Oct 18 15:40:28 2010 -0400
xfree86: Drop linux libc5 support from the SIGIO code
Reviewed-by: Tiago Vignatti <tiago.vignatti@nokia.com>
Reviewed-by: Matt Turner <mattst88@gmail.com>
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit 788bfbf18ac19923604b0d676933fdc0d78526a1
Author: Adam Jackson <ajax@redhat.com>
Date: Thu Oct 14 15:10:43 2010 -0400
dri1: Remove "buffers" from the config logic
This was only ever used from the glint driver, which has since lost its
DRI support.
Reviewed-by: Matt Turner <mattst88@gmail.com>
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit a77458486a7b9d78dcd284e2bcc96c1fda0e862a
Author: Adam Jackson <ajax@redhat.com>
Date: Thu Oct 14 14:00:53 2010 -0400
xfree86: Remove %M expansion from config parser
This was to distinguish XFree86 3.x files from XFree86 4.x files. It
never really made sense to be looking for xorg.conf-4.
Reviewed-by: Matt Turner <mattst88@gmail.com>
Reviewed-by: Dan Nicholson <dbn.lists@gmail.com>
Reviewed-by: Jesse Adkins <jesserayadkins@gmail.com>
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit f8ec71603c796f3b272a0592cbb934c2a6e8d633
Author: Adam Jackson <ajax@redhat.com>
Date: Thu Oct 14 13:45:31 2010 -0400
xfree86: Remove an open-coded strtoul()
Reviewed-by: Matt Turner <mattst88@gmail.com>
Reviewed-by: Dan Nicholson <dbn.lists@gmail.com>
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit 52577ae8eeda64601db8dd425027cf8e4271b873
Author: Adam Jackson <ajax@redhat.com>
Date: Thu Oct 14 13:22:00 2010 -0400
config: Remove atimisc workaround
Reviewed-by: Matt Turner <mattst88@gmail.com>
Reviewed-by: Mark Kettenis <kettenis@openbsd.org>
Reviewed-by: Jesse Adkins <jesserayadkins@gmail.com>
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit 8bb1983a5f2dbf72366de9fb793a46e35912ab61
Author: Adam Jackson <ajax@redhat.com>
Date: Mon Aug 2 15:22:18 2010 -0400
config: Don't look for .o drivers anymore
This hasn't worked since we switched to dlloader.
Reviewed-by: Jesse Adkins <jesserayadkins@gmail.com>
Reviewed-by: Matt Turner <mattst88@gmail.com>
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit e354ccac36a8ee3a23bdc845833c16a5646cc200
Author: Joe Shaw <joeshaw@litl.com>
Date: Thu Oct 14 15:09:20 2010 -0400
fix a sign problem with valuator data.
Without this patch, any negative valuator value is wrong when returned
from XQueryDeviceState(). This is a regression from at least xserver
1.4.
Valuator data is set in dix/getevents.c:set_valuators() by copying
signed int values into an unsigned int field
DeviceEvent.valuators.data.
That data is converted into a double with an implicit cast by
assignment to axisVal[i] in Xi/exevents.c:UpdateDeviceState().
That double is converted back to a signed int in
queryst.c:ProcXQueryDeviceState(). If the original value in
set_valuators() is negative, the double value will be > 2^31 and the
conversion back to a signed int is undefined. (Although I
consistently see the value -2^31.)
Fix this by changing the definition of DeviceEvent.valuators.data from
uint32_t to int32_t.
Signed-off-by: Joe Shaw <joeshaw@litl.com>
Reviewed-by: Chase Douglas <chase.douglas@canonical.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 424b856e8e19f35c24bfc0a9fced9464d2f17c90
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri Oct 15 14:35:22 2010 +1000
dix: update comments for GetPointerEvents and friends
All these now generate InternalEvents, point this out. Remove XKB/XI
references, that's just confusing. This comment referred to the old-style
event generation code from server 1.4 to including 1.6 but is now just
confusing to newcomers.
Remove comment about SwitchCoreKeyboard() for the same reason.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Chase Douglas <chase.douglas@canonical.com>
commit e2ada55de3e7ec8724b98c4e4adfec741d415499
Author: Adam Jackson <ajax@redhat.com>
Date: Mon Sep 27 13:58:40 2010 -0400
os: Clean up various xtrans bits that we've never supported
Or at least, not supported since xserver 1.0.
Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit eaf0b6a4d83d49930d21d5191f335fcac962632e
Merge: 693e92d404 23229c7ce5
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri Oct 15 13:46:59 2010 +1000
Merge branch 'master' into input-api
Conflicts:
config/udev.c
hw/xfree86/common/xf86Helper.c
hw/xfree86/common/xf86Module.h
hw/xfree86/common/xf86Xinput.h
hw/xfree86/os-support/linux/lnx_init.c
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 3c28a29e132d6f73c36d4b64818d112b1c6e9a40
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Wed Oct 13 15:53:59 2010 +1000
xfree86: rename parameter names to xf86ScaleAxis.
Maybe it's just me but every time I look at it I get confused again and need
to work it out from scratch. Rename the parameters to something
self-explanatory, to/from and min/max.
No functional change.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Julien Cristau <jcristau@debian.org>
commit 23229c7ce5970516b97a1cc12e65257ff65ab9a7
Author: Jeremy Huddleston <jeremyhu@apple.com>
Date: Wed Oct 13 16:28:14 2010 -0700
test: Fix make distcheck when not building unit tests
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit ff82f724e4ed24d73f15fa9c35a1d0c2c7d8cef7
Author: Colin Harrison <colin.harrison@virgin.net>
Date: Wed Oct 13 10:20:06 2010 -0700
Comparison between pointer and integer in latest dix/dispatch.c
Signed-off-by: Keith Packard <keithp@keithp.com>
commit da4eebe58ec81e2297cc1773af1fb622fb392bbd
Author: Jon TURNEY <jon.turney@dronecode.org.uk>
Date: Wed Oct 13 17:34:31 2010 +0100
event_size is currently never assigned to in mieqProcessInputEvents().
event_size is never assigned to in mieqProcessInputEvents(), so realloc()
is always called. This is benign, but I'm guessing not intended.
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Reviewed-by: Keith Packard <keithp@keithp.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 6274dca9d984ad3c553b4901edc3151e770e6c40
Author: Adam Jackson <ajax@redhat.com>
Date: Mon Oct 11 16:37:16 2010 -0400
dix: optimize CallCallbacks
Move the basic sanity checking to an inline wrapper, which avoids the
function call overhead if the callback list is empty. On an XACEful
server on a 2.4GHz Core 2 Duo:
1 2 Operation
-------- ----------------- -----------------
20000000.0 25100000.0 ( 1.25) X protocol NoOperation
Signed-off-by: Adam Jackson <ajax@redhat.com>
Reviewed-by: Keith Packard <keithp@keithp.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit e418cd332c1f458d028df3fdf684011109d0c183
Author: Adam Jackson <ajax@redhat.com>
Date: Mon Oct 11 10:49:57 2010 -0400
xwin: Remove some undue paranoia about UNDRAWABLE_WINDOW
mi will throw away rendering to input-only windows.
Signed-off-by: Adam Jackson <ajax@redhat.com>
Reviewed-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit febf3e7ead8dbb355622c896ff1744b2ca52a49a
Author: Adam Jackson <ajax@redhat.com>
Date: Mon Oct 11 10:49:56 2010 -0400
dix: Remove the memory of the multibuffer extension
Drop DRAWABLE_BUFFER and related checks, mbuf was the only thing that
used them and it was killed in 0ba82562.
Signed-off-by: Adam Jackson <ajax@redhat.com>
Reviewed-by: Keith Packard <keithp@keithp.com>
Reviewed-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 1333e101b4f6ecca72568b7f462884f8b102a5c2
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Thu Oct 7 18:17:02 2010 -0700
Remove leftover fbSaveAreas & fbRestoreAreas defines from wfbrename.h
The fb functions they try to rename were deleted in 2007 by
commit ae7f71a8b3d6756161e55d998d6eec37d2695c98
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Matt Turner <mattst88@gmail.com>
Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com>
Tested-by: Jeremy Huddleston <jeremyhu@apple.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 8efa3623f32939ef525926b57fd533f4c01ec4b3
Author: Jamey Sharp <jamey@minilop.net>
Date: Wed Aug 4 13:48:33 2010 -0700
Use GetCurrentRootWindow or equivalent instead of spriteTrace[0].
Signed-off-by: Jamey Sharp <jamey@minilop.net>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 32de0c19075b886c2fc03f6ad73d9c15df1b2309
Author: Jamey Sharp <jamey@minilop.net>
Date: Wed Aug 4 11:44:05 2010 -0700
Move replay-window check from ComputeFreezes to CheckDeviceGrabs.
This just simplifies ComputeFreezes, eliminating some duplicated code
and a goto.
Signed-off-by: Jamey Sharp <jamey@minilop.net>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 1c1811ecafc144151630b3588394e2c345c53aa4
Author: Jamey Sharp <jamey@minilop.net>
Date: Tue Aug 3 19:49:59 2010 -0700
CheckDeviceGrabs: Delete redundant pWin->optional test.
CheckPassiveGrabsOnWindow returns FALSE if pWin->optional is NULL,
because wPassiveGrabs uses wUseDefault, so don't bother checking at the
caller.
Signed-off-by: Jamey Sharp <jamey@minilop.net>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit c360b3eb1deeac51913e7b1286b2767711c541fc
Author: Jamey Sharp <jamey@minilop.net>
Date: Tue Aug 3 19:40:26 2010 -0700
Let CheckPassiveGrabsOnWindow callers check if device is already grabbed.
CheckDeviceGrabs checked all the ancestors of the window containing this
device's pointer even if no new grabs could possibly apply due to the
device already being grabbed.
ActivateFocusInGrab and ActivateEnterGrab already checked whether they
should break an existing grab, and then set up an event that was
completely ignored if they didn't actually break the grab.
In both cases, just do what we would have done eventually anyway--return
FALSE from CheckPassiveGrabsOnWindow's caller--but do it sooner.
Signed-off-by: Jamey Sharp <jamey@minilop.net>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 853d7ebfa3e2d281d92890a39010ff5787a00ffd
Author: Adam Jackson <ajax@redhat.com>
Date: Tue Oct 5 11:24:28 2010 -0400
vbe: Fix copying the mode info block
Just use memcpy, seriously.
Reviewed-by: Rémi Cardona <remi@gentoo.org>
Signed-off-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit b2f9ce201cc2a14d5d6ad055b46c9317b040ec2e
Author: Adam Jackson <ajax@redhat.com>
Date: Tue Jul 27 17:34:36 2010 -0400
edid: Fix the HDTV sync pulse adjustment
Simple typo, should have been adjusting the horizontal timings
consistently since we're not trying to mangle vertical at all.
Signed-off-by: Adam Jackson <ajax@redhat.com>
Reviewed-by: Patrick E. Kane <pekane52@gmail.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 9a893fe52f1bfd415e9ffd9d2f5aff5c4da7a756
Author: Chris Wilson <chris@chris-wilson.co.uk>
Date: Sun Oct 3 16:56:03 2010 +0100
xfree86: Do not call dlclose(NULL) [regression after ab7f057]
During unwind following an error when attempting to a load a module, we
attempt to call dlclose on a potentially NULL handle. This is a
side-effect of removing the abstraction layer in ab7f057.
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Adam Jackson <ajax@redhat.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 533faf7f43cb4b5155a74d78d6144b702e227efa
Author: Keith Packard <keithp@keithp.com>
Date: Fri Oct 1 10:57:48 2010 -0700
Bump version to 1.9.99.1 (1.10 development series)
Make the 1.10 development series distinguishable from the 1.9 branch.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit a769f4c22a9cfb5ba248c924a66c31ec966bd8a0
Author: Adrian Bunk <bunk@stusta.de>
Date: Thu Sep 30 13:18:20 2010 +0300
remove dolt
With libtool 2.2.10 the difference in build time is so small
(< 5% with -j8 builds) that it isn't worth having this hack.
Signed-off-by: Adrian Bunk <bunk@stusta.de>
Reviewed-by: Daniel Stone <daniel@fooishbar.org>
Reviewed-by: Dan Nicholson <dbn.lists@gmail.com>
Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit c7e4222c9a27094ce4fc2831ac92acbb7b21fb1a
Author: Tobias Droste <tdroste@gmx.de>
Date: Wed Sep 29 22:51:48 2010 +0200
randr: set error numbers of resource types in RRExtenstionInit() (V2)
Fixes: https://bugs.freedesktop.org/show_bug.cgi?id=30367
Currently the ddx calls xf86RandR12Init()
(-> RRScreenInit()
-> RRInit()
-> RRModeInit()
-> RRCrtcInit()
-> RROutputInit())
before RRExtensionInit() is called. This causes RRErrorBase
being 0 while setting resource type error values (resource types:
RROutput, RRMode and RRCrtc). The fix moves the setting of error
values to own functions which are called in RRExtensionInit()
to get the right RRErrorBase.
V2: With header file
Signed-off-by: Tobias Droste <tdroste@gmx.de>
Reviewed-by: Keith Packard <keithp@keithp.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 72a9c686d7ecaa68d27687b316dbba92902809b4
Author: Jon TURNEY <jon.turney@dronecode.org.uk>
Date: Wed Sep 29 17:05:12 2010 +0100
Cygwin/X: Fix compilation after "delete pervasively use of DISPATCH_PROC"
commit cbd4d5dbb70db62ba1cb79c7b904e6fa11f62d7e
removes the static declarations of ProcWindowsWMDispatch and
SProcWindowsWMDispatch which precede their first use in
winWindowsWMExtensionInit()
Move winWindowsWMExtensionInit() to after the definition of those
two functions to fix compilation.
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Reviewed-by: Tiago Vignatti <tiago.vignatti@nokia.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 1a9022d3289ff74043112808cc8aa315fd9c40e8
Author: Aaron Plattner <aplattner@nvidia.com>
Date: Tue Sep 28 13:59:19 2010 -0700
Bump video driver ABI version to 9.0
Signed-off-by: Aaron Plattner <aplattner@nvidia.com>
Reviewed-by: Keith Packard <keithp@keithp.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit c45bea0c044ad37bedb42209f7e6ea8b587999f0
Author: Jeremy Huddleston <jeremyhu@apple.com>
Date: Tue Aug 3 12:51:51 2010 -0700
XQuartz: RandR: Refactor legacy mode-switching to be better integrated with RandR
Adds three new functions
void QuartzRandRSetFakeRootless (void);
void QuartzRandRSetFakeFullscreen (void);
void QuartzRandRToggleFullscreen (void);
The first two are identical to requesting the fake modes from a RandR client
The third responds to cmd-alt-a to leave fullscreen or RandR.
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
commit 229323a19b06f80d9b03f487e598b933b9b31d87
Author: Jeremy Huddleston <jeremyhu@apple.com>
Date: Mon Jul 26 23:34:49 2010 -0700
XQuartz: RandR: Don't change the rootless preference when changing RandR mode
Also renames a bunch of other variables for better consistency.
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
commit 721edc69c3597578d3e7f711769ff0195af6068a
Author: Jeremy Huddleston <jeremyhu@apple.com>
Date: Mon Jul 26 11:45:59 2010 -0700
XQuartz: RandR: Better handle switching betwen RandR modes that share CG modes
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
commit 026a47e21226b64eb9a7624ada3d74c3fe5fa763
Author: Jeremy Huddleston <jeremyhu@apple.com>
Date: Mon Jul 26 01:17:12 2010 -0700
XQuartz: RandR: Respond better to resolution changes made outside X
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
commit 59cd93f48a3a0a34781d4a94a3cd05a575e2d4ba
Author: Jeremy Huddleston <jeremyhu@apple.com>
Date: Sun Jul 25 22:25:49 2010 -0700
XQuartz: RandR: Use deprecated CG APIs only on Leopard and earlier
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
commit 629c3f473b7415069a87ef4717ec3d701978dc48
Author: Jan Hauffa <hauffa@in.tum.de>
Date: Fri Jul 16 17:56:44 2010 +0200
XQuartz: RandR: Remove FAKE_RANDR code.
Signed-off-by: Jan Hauffa <hauffa@in.tum.de>
Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com>
commit 97b5f5306437bfd13390485fc7a58a363c261ec9
Author: Jan Hauffa <hauffa@in.tum.de>
Date: Fri Jul 16 17:54:55 2010 +0200
XQuartz: RandR: Toggle rootless mode on XRandR mode switch.
Report a fake screen mode that corresponds to the screen mode at startup of the
server excluding the height of the menu bar. If a client requests this mode,
rootless mode is enabled. In all other modes, the root window is shown.
Signed-off-by: Jan Hauffa <hauffa@in.tum.de>
Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com>
commit 2d411472c2915614bdeb8fdc15d19dae4621444d
Author: Jan Hauffa <hauffa@in.tum.de>
Date: Fri Jul 16 17:18:03 2010 +0200
XQuartz: RandR: Implement basic RandR functionality.
Querying and changing of resolution and refresh rate is supported,
rotation is not implemented yet.
Signed-off-by: Jan Hauffa <hauffa@in.tum.de>
Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com>
commit f4926709485c0605f0b1171c84c803b68eebfc38
Author: Jeremy Huddleston <jeremyhu@apple.com>
Date: Tue Sep 28 09:48:41 2010 -0700
XQuartz: Move use of static dispatch procs after declaration
This fixes fallout from cbd4d5dbb70db62ba1cb79c7b904e6fa11f62d7e
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
commit c36ca7b1862ecd86df089f4e1933379a113928ea
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Sat Sep 25 10:05:10 2010 -0400
config: remove --with-dri-driver-path option, use dri.pc #29740
The trusted location of the dri driver directory can be obtained
from the mesa dri.pc pkg-config file.
Reviewed-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Acked-by: Matt Turner <mattst88@gmail.com>
Reviewed-by: Dan Nicholson <dbn.lists@gmail.com>
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 5532687a929426c4b1c4667f4591ed362f097c9b
Merge: 9df4fb0adf 682a3ee608
Author: Keith Packard <keithp@keithp.com>
Date: Tue Sep 28 08:15:07 2010 -0700
Merge remote branch 'ajax/less-loader'
commit 9df4fb0adf66fb82f0c007897d79af0f54a6dad9
Author: Adam Jackson <ajax@redhat.com>
Date: Mon Sep 27 17:06:46 2010 -0400
xfree86: Add 18bpp support
Signed-off-by: Adam Jackson <ajax@redhat.com>
Reviewed-by: Keith Packard <keithp@keithp.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 5c6a2f93ebc16a78093782b442306de23ae94e78
Author: Chris Wilson <chris@chris-wilson.co.uk>
Date: Mon Sep 27 19:39:23 2010 +0100
xfree86: Kill pixmapPrivate with a vengeance (v2)
ScrnInfo->pixmapPrivate only existed in order to catch invalid access to
the framebuffer by making the backing data NULL across the VT switch.
This was causing more confusion in the higher layers during mode setting
without any real benefit, so remove it.
v2: Kill ShadowModifyPixmapHeader() as well.
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Julien Cristau <jcristau@debian.org>
Cc: Andrew Guertin <lists@dolphinling.net>
Reviewed-by: Keith Packard <keithp@keithp.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit fdabcec57ae0fdc9910060609bb0848552c1db4d
Author: Chris Wilson <chris@chris-wilson.co.uk>
Date: Mon Sep 27 17:30:13 2010 +0100
modes: Beware the driver switching root pixmaps
Program received signal SIGSEGV, Segmentation fault.
0x080d4a2d in xf86RandR12ScreenSetSize (pScreen=0x8dca3a0, width=800,
height=600, mmWidth=210, mmHeight=157)
at ../../../../hw/xfree86/modes/xf86RandR12.c:731
731 ../../../../hw/xfree86/modes/xf86RandR12.c: No such file or directory.
in ../../../../hw/xfree86/modes/xf86RandR12.c
(gdb) bt full
height=600, mmWidth=210, mmHeight=157)
at ../../../../hw/xfree86/modes/xf86RandR12.c:731
randrp = 0x8dcae68
pScrn = 0x8dbeb28
config = <value optimized out>
pRoot = 0x8e08e30
pScrnPix = 0xb6d12008
ret = 1
c = <value optimized out>
mmWidth=210, mmHeight=157) at ../../randr/rrscreen.c:185
No locals.
at ../../randr/rrscreen.c:307
pWin = 0x8e08e30
pScreen = 0x8dca3a0
i = <value optimized out>
rc = 0
../../randr/randr.c:485
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Julien Cristau <jcristau@debian.org>
Tested-by: Julien Cristau <jcristau@debian.org>
Cc: Keith Packard <keithp@keithp.com>
Reviewed-by: Keith Packard <keithp@keithp.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 2f0abd7d690c3bcce2a80c093a0880f43e56d8cb
Author: Kristian Høgsberg <krh@bitplanet.net>
Date: Thu Sep 23 09:04:11 2010 -0400
glx: Fix use after free in DrawableGone
(note that nearly identical patches were proposed by Kristian and Chris)
Signed-off-by: Kristian Høgsberg <krh@bitplanet.net>
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Reported-by: Julien Cristau <jcristau@debian.org>
Reviewed-by: Adam Jackson <ajax@redhat.com>
Reviewed-by: Jamey Sharp <jamey@minilop.net>
Tested-by: Chris Wilson <chris@chris-wilson.co.uk>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit e416965bfd08dfae5d2b7932b5118efac20546ad
Author: Tiago Vignatti <tiago.vignatti@nokia.com>
Date: Sun Jul 18 18:56:02 2010 +0300
dix: remove proc tables initialization
Signed-off-by: Tiago Vignatti <tiago.vignatti@nokia.com>
Reviewed-by: Mikhail Gusarov <dottedmag@dottedmag.net>
commit cbd4d5dbb70db62ba1cb79c7b904e6fa11f62d7e
Author: Tiago Vignatti <tiago.vignatti@nokia.com>
Date: Fri Jul 16 20:19:50 2010 +0300
xserver: delete pervasively use of DISPATCH_PROC
Some functions had to be moved around due some missing static definitions.
Another minor clean up like inexistent function declarations and etc were made
also.
Part of this patch was cooked using:
sed -i -e '/static DISPATCH_PROC*.*;/d' `git ls-files`
Signed-off-by: Tiago Vignatti <tiago.vignatti@nokia.com>
Reviewed-by: Mikhail Gusarov <dottedmag@dottedmag.net>
commit 58bd317e29f4abf7f950891339d2a6a78ddf7903
Author: Macpaul Lin <macpaul@andestech.com>
Date: Tue Sep 21 15:13:34 2010 +0800
xfree86: nds32: add nds32 support for compiler related mmio codes
Add nds32 support for compiler related mmio codes.
It includes byte-swap or non-swap operations.
Signed-off-by: Macpaul Lin <macpaul@andestech.com>
Acked-by: Tiago Vignatti <tiago.vignatti@nokia.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 28e6de66b42062a885ba38416387f2dbc15707fd
Author: Macpaul Lin <macpaul@andestech.com>
Date: Tue Sep 21 15:13:33 2010 +0800
xfree86: nds32: add nds32 support for compiler specific codes
Add nds32 definitions and related assembly codes to compiler header files.
Signed-off-by: Macpaul Lin <macpaul@andestech.com>
Acked-by: Tiago Vignatti <tiago.vignatti@nokia.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 2b24b2bd859a4b4b8ccaf3b7d1b529dcda2d3b94
Author: Macpaul Lin <macpaul@andestech.com>
Date: Tue Sep 21 15:13:32 2010 +0800
xfree86: nds32: add nds32 definition for vgaHW support.
Add __nds32__ definitions for vgaHW support.
Signed-off-by: Macpaul Lin <macpaul@andestech.com>
Acked-by: Tiago Vignatti <tiago.vignatti@nokia.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 22376aa7aa44464636b12ee1d61b94e52ca02b0f
Author: Macpaul Lin <macpaul@andestech.com>
Date: Tue Sep 21 15:13:31 2010 +0800
xfree86: nds32: add nds32 definition for support linux video related io.
Add __nds32__ definitions for supporing correct io method for lnx_video.c
Signed-off-by: Macpaul Lin <macpaul@andestech.com>
Acked-by: Tiago Vignatti <tiago.vignatti@nokia.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit d52799f67f590b0f91b521cd2bdf5a5a8a229c96
Author: Macpaul Lin <macpaul@andestech.com>
Date: Tue Sep 21 15:13:30 2010 +0800
xfree86: nds32: add nds32 related definitions into include headers.
Add MSB/LSB related definitions into include/servermd.h
Signed-off-by: Macpaul Lin <macpaul@andestech.com>
Acked-by: Tiago Vignatti <tiago.vignatti@nokia.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 98197d931b266674557b52b4a7099c6470114e55
Merge: 01ad3725a8 402942cdbc
Author: Keith Packard <keithp@keithp.com>
Date: Thu Sep 23 15:30:37 2010 -0700
Merge remote branch 'jamey/for-keith'
commit 682a3ee60867da027fe1bcda0c8587dd3db9d58e
Author: Adam Jackson <ajax@redhat.com>
Date: Sat Sep 18 07:27:13 2010 -0400
xfree86: Remove useless module setup functions where appropriate
Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Julien Cristau <jcristau@debian.org>
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit 6130170e7e9b64c611ee942ec3455dd1a185193d
Author: Adam Jackson <ajax@redhat.com>
Date: Sat Sep 18 06:41:35 2010 -0400
xfree86: Remove unused refcounting from input drivers
Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Julien Cristau <jcristau@debian.org>
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit ab7f057ce9df4e905b12cebc1e587b9a7f200418
Author: Adam Jackson <ajax@redhat.com>
Date: Fri Sep 17 11:19:17 2010 -0400
loader: Remove a silly layer of reference counting
libdl will refcount objects for us just fine, thanks.
Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Julien Cristau <jcristau@debian.org>
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit 0438002cd238011f33dbf176c555de5e380ba77e
Author: Adam Jackson <ajax@redhat.com>
Date: Fri Sep 17 09:13:04 2010 -0400
loader: include cleanup
Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Julien Cristau <jcristau@debian.org>
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit 2f003fe49697f8343c052dff2b3752eace814ea7
Author: Adam Jackson <ajax@redhat.com>
Date: Fri Sep 17 09:02:13 2010 -0400
loader: Remove the handle field from LoaderOpen
This was always 0 from all the callers.
Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Julien Cristau <jcristau@debian.org>
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit 09929da50503b559459f5b722c11647c47857fdb
Author: Adam Jackson <ajax@redhat.com>
Date: Fri Sep 17 08:16:51 2010 -0400
loader: Remove unused canonical name field
Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Julien Cristau <jcristau@debian.org>
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit 3a26e7f459764d4aee71b2d7e25b113b729b94ac
Author: Adam Jackson <ajax@redhat.com>
Date: Fri Sep 17 07:55:48 2010 -0400
loader: Remove unused module serial number
Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Julien Cristau <jcristau@debian.org>
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit 2a24a013bf3f554bb03c0f5af155d23dbb27b599
Author: Adam Jackson <ajax@redhat.com>
Date: Fri Sep 17 07:32:17 2010 -0400
loader: Merge dlloader directly into the loader
This lets us drop some double-tracking of loaded modules too. If your
OS is too lame to have libdl, fix that first.
Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Julien Cristau <jcristau@debian.org>
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit 693e92d4049ee76d074737480f3fc1bb236f4278
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri Sep 10 09:54:33 2010 +1000
xfree86: add xf86OptionListDuplicate()
Does what it says on the box.
Some drivers need to duplicate option lists from the original device to
ensure that devices created by the driver (driver-internal hotplugging) have
the same list of options as the original device.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Fernando Carrijo <fcarrijo@freedesktop.org>
Reviewed-by: Tiago Vignatti <tiago.vignatti@nokia.com>
commit 402942cdbc518395a2943fd226b9f3071f24d39f
Author: Jamey Sharp <jamey@minilop.net>
Date: Fri Sep 17 02:11:44 2010 +0200
Introduce per-object per-screen privates.
This replaces dixCreatePrivateKey and the only uses, which were in
midispcur.
Commit by Jamey Sharp and Josh Triplett.
Signed-off-by: Jamey Sharp <jamey@minilop.net>
Signed-off-by: Josh Triplett <josh@joshtriplett.org>
Reviewed-by: Keith Packard <keithp@keithp.com>
commit e4d4d6ddd52801cf0b0b253d9ba3bdabfa9a9d8d
Author: Jamey Sharp <jamey@minilop.net>
Date: Fri Sep 17 02:18:10 2010 +0200
Xserver need not be compatible with old versions of xserver.
Delete time-traveling multiple personality disorder from the server.
Gaetan notes:
There were a couple of drivers containing an unknown version of the
modes/parser code. This was done in server 1.2 time frame because it
was released without mode code. It was barely or not maintained
afterwards. There are currently no video drivers with a copy of the
modes code.
Most of these ifdefs were introduced in commit
a8d760f567b19268329c4682495caa591f08a854, where Aaron wrote,
This change uses XORG_VERSION_CURRENT < 7.0 to mean "server newer
than 1.2" since XORG_VERSION current went backwards at some point.
Alan explains that:
In Xorg 1.3, when we first released an Xorg server release decoupled
from the katamari release schedule. (1.0 through 1.2 were released
as part of X11R7.0 through 7.2, while 1.3 came out between X11R7.2 &
7.3.)
Commit by Jamey Sharp and Josh Triplett.
Signed-off-by: Jamey Sharp <jamey@minilop.net>
Signed-off-by: Josh Triplett <josh@joshtriplett.org>
Reviewed-by: Aaron Plattner <aplattner@nvidia.com>
commit 01ad3725a8d0a8958720b81d19598a08c072ccee
Author: Tiago Vignatti <tiago.vignatti@nokia.com>
Date: Tue Jun 1 20:37:54 2010 +0300
xfree86: delete useless "Primary device is not PCI" message
The primary device being PCI or not has no effect on the server working. This
message is superfluous.
Signed-off-by: Tiago Vignatti <tiago.vignatti@nokia.com>
Reviewed-by: Mikhail Gusarov <dottedmag@dottedmag.net>
commit 7360235ecca25af29bb2d99a8e46d5b259ad1b1e
Author: Tiago Vignatti <tiago.vignatti@nokia.com>
Date: Mon May 31 18:20:57 2010 +0300
xfree86: bus: assign PCI_SOURCES with the actual source files
Signed-off-by: Tiago Vignatti <tiago.vignatti@nokia.com>
Reviewed-by: Mikhail Gusarov <dottedmag@dottedmag.net>
commit 18b2d2e8bd056266410226d779752e7933847b6b
Author: Tiago Vignatti <tiago.vignatti@nokia.com>
Date: Mon May 31 18:09:50 2010 +0300
xfree86: bus: move macros from common PCI header to private file
Only int10/helper_exec.c is using them.
Signed-off-by: Tiago Vignatti <tiago.vignatti@nokia.com>
Reviewed-by: Mikhail Gusarov <dottedmag@dottedmag.net>
commit 17a23f9ba8fa95f3e15afba7de22a12fe60bacfb
Author: Tiago Vignatti <tiago.vignatti@nokia.com>
Date: Fri Sep 10 19:18:42 2010 +0300
xfree86: dri: remove unused PCI macro
Signed-off-by: Tiago Vignatti <tiago.vignatti@nokia.com>
Reviewed-by: Mikhail Gusarov <dottedmag@dottedmag.net>
commit fc3ab84de7b5692f0db2b282ab0ed8e5a61d1fce
Author: Tiago Vignatti <tiago.vignatti@nokia.com>
Date: Fri Sep 10 19:16:30 2010 +0300
xfree86: configure: move buses references to their own location
This patch makes xf86Configure.c free of PCI and SBUS code, moving to a more
meaningful location.
Signed-off-by: Tiago Vignatti <tiago.vignatti@nokia.com>
Reviewed-by: Mikhail Gusarov <dottedmag@dottedmag.net>
Reviewed-by: Mark Kettenis <kettenis@openbsd.org>
commit 49b817501f97d55480063c0b62544b3af75b4b7c
Author: Tiago Vignatti <tiago.vignatti@nokia.com>
Date: Tue Jun 1 16:16:53 2010 +0300
xfree86: bus: remove xfree86 and few other references from OS files
Conceptually, os-support should have only a basic set of OS helpers which
wouldn't mix with any DDX common structure (e.g. windowing structures, etc)
This patch removes some xfree86-only and a few other unused references from
os-support/bus.
Signed-off-by: Tiago Vignatti <tiago.vignatti@nokia.com>
Reviewed-by: Mikhail Gusarov <dottedmag@dottedmag.net>
commit d9c682a5e250677883c4d375ca84cf184ee19d77
Author: Tiago Vignatti <tiago.vignatti@nokia.com>
Date: Sun May 30 21:35:23 2010 +0300
xfree86: bus: remove useless automake variable
Leftover that was missed in f7abe05b.
Signed-off-by: Tiago Vignatti <tiago.vignatti@nokia.com>
Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Mikhail Gusarov <dottedmag@dottedmag.net>
commit a7efeda8a56a540542e056a426e89cfc053a4162
Author: Tiago Vignatti <tiago.vignatti@nokia.com>
Date: Sun May 30 19:12:31 2010 +0300
xfree86: use xf86PciIsolateDevice to get PCI config information
Make xf86IsolateDevice private on PCI common file.
Signed-off-by: Tiago Vignatti <tiago.vignatti@nokia.com>
Reviewed-by: Mikhail Gusarov <dottedmag@dottedmag.net>
commit c768cdda92696b636c10bb2df64167d5274b4b99
Merge: 5a725385fb 2079853632
Author: Keith Packard <keithp@keithp.com>
Date: Mon Sep 13 16:48:33 2010 -0700
Merge remote branch 'jamey/reviewed'
commit 20798536326f94ac9c97b4ec7a51329f7c912991
Author: Jamey Sharp <jamey@minilop.net>
Date: Wed Jul 14 13:14:28 2010 -0700
rootless: Delete dead remnants of rootless acceleration.
Jeremy deleted rootlessAccelInit's implementation in 2008 in commit
587c010a1cd733fded4d49dc339df0634bda8be6. Delete its prototype and the
remaining commented-out call to it.
It still makes sense for the rootless GC ops to relax the planemask, but
that's independent of the size of the operation, so quit checking the
thresholds there.
FillBytes and CompositePixels are not called anywhere, so delete
everything related to both.
Signed-off-by: Jamey Sharp <jamey@minilop.net>
Cc: Jeremy Huddleston <jeremyhu@apple.com>
Cc: Jon TURNEY <jon.turney@dronecode.org.uk>
Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com>
commit 58d1ec0fe84412c66f1ea1de15e3901c0b120164
Author: Jamey Sharp <jamey@minilop.net>
Date: Wed Jul 14 11:30:17 2010 -0700
rootless: ROOTLESS_GLOBAL_COORDS is always set, so unifdef it.
Signed-off-by: Jamey Sharp <jamey@minilop.net>
Cc: Jeremy Huddleston <jeremyhu@apple.com>
Cc: Jon TURNEY <jon.turney@dronecode.org.uk>
Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com>
commit 35ce892a705f9377a36f19414e5a25dcbe44a354
Author: Jamey Sharp <jamey@minilop.net>
Date: Wed Jul 14 11:19:41 2010 -0700
rootless: ROOTLESS_TRACK_DAMAGE is never set, so unifdef it.
Signed-off-by: Jamey Sharp <jamey@minilop.net>
Cc: Jeremy Huddleston <jeremyhu@apple.com>
Cc: Jon TURNEY <jon.turney@dronecode.org.uk>
Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com>
commit ccdf15689050a0f988721c91fab75861ec4d339c
Author: Jamey Sharp <jamey@minilop.net>
Date: Mon May 31 16:01:18 2010 -0700
miPolyGlyphBlt: Delete redundant ValidateGC.
The caller is required to have validated the GC for the drawable before
calling any ops, including PolyGlyphBlt.
Signed-off-by: Jamey Sharp <jamey@minilop.net>
Reviewed-by: Keith Packard <keithp@keithp.com>
commit 3fd963de27f3c4452c320e617ad33b91b0967737
Author: Jamey Sharp <jamey@minilop.net>
Date: Wed May 19 14:16:20 2010 -0700
Un-export CreateScratchGC now that nothing external uses it.
The server and drivers sometimes use GetScratchGC, but never
CreateScratchGC.
Signed-off-by: Jamey Sharp <jamey@minilop.net>
Reviewed-by: Keith Packard <keithp@keithp.com>
commit 0f48e362c5baee2bc281a4b88cfb68de24172d15
Author: Jamey Sharp <jamey@minilop.net>
Date: Wed May 19 14:03:19 2010 -0700
glxdriswrast: Use CreateGC, not CreateScratchGC.
Since this code was using CreateScratchGC and not GetScratchGC,
FreeScratchGC would always call FreeGC, so just call it directly.
As long as the drawable provided to CreateGC has the same screen and
depth as were passed to CreateScratchGC, these functions are basically
identical. There are two differences:
- CreateGC gives you a non-null stipple. You probably don't care.
- CreateGC passes the gcid and client to XACE. There are several
internal GCs allocated in the server, and they all pass 0 and
serverClient. I expect XACE will never reject that combination.
The callers of createDrawable all verify that pDraw has the same screen
that driScreen does. In short, this should have no behavioral change.
Signed-off-by: Jamey Sharp <jamey@minilop.net>
Cc: Kristian Høgsberg <krh@bitplanet.net>
Reviewed-by: Keith Packard <keithp@keithp.com>
commit af2a94e12fe4e426dfca461a0d14526193c01cef
Author: Jamey Sharp <jamey@minilop.net>
Date: Tue Jul 13 13:33:59 2010 -0700
VGA arbiter: No need for arbitration around CreateGC.
None of XAA, EXA, or UXA do any hardware access during CreateGC, so they
don't need VGA arbitration. I haven't found any open source drivers that
hook CreateGC, so they're safe. I'd be surprised if any driver directly
hooks CreateGC and does hardware access from it and needs VGA
arbitration.
Signed-off-by: Jamey Sharp <jamey@minilop.net>
Signed-off-by: Tiago Vignatti <tiago.vignatti@nokia.com>
commit 7a63b2db636f01694cb54726bbb04287718e286a
Author: Jamey Sharp <jamey@minilop.net>
Date: Sun Jul 11 20:36:34 2010 -0700
Delete Colormap->devPriv. It isn't used any more.
Signed-off-by: Jamey Sharp <jamey@minilop.net>
Reviewed-by: Tiago Vignatti <tiago.vignatti@nokia.com>
commit 2e8069dd36c2f5caf868937405fc03328004a85d
Author: Jamey Sharp <jamey@minilop.net>
Date: Sun Jul 11 20:35:43 2010 -0700
xnest: Replace use of Colormap->devPriv with standard devPrivates.
Signed-off-by: Jamey Sharp <jamey@minilop.net>
Reviewed-by: Tiago Vignatti <tiago.vignatti@nokia.com>
commit 34d6492436c0f4a81822769b24d8c7816d0226ad
Author: Jamey Sharp <jamey@minilop.net>
Date: Sat Jul 10 06:55:58 2010 -0700
xquartz: Delete compile-time-constant DRIGCRec.driOps field.
The driOps field of this structure is never set to anything but
&driGCOps, and this structure is not visible outside this source file.
Just use the constant in the one place the field was used.
Signed-off-by: Jamey Sharp <jamey@minilop.net>
Cc: Jeremy Huddleston <jeremyhu@apple.com>
Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com>
commit 2051e0f371de892b2e598b30c18dae96b58d68de
Author: Jamey Sharp <jamey@minilop.net>
Date: Thu Jul 8 02:38:13 2010 -0700
dixfonts: Deobfuscate GC ops calls.
Signed-off-by: Jamey Sharp <jamey@minilop.net>
Reviewed-by: Alex Deucher <alexdeucher@gmail.com>
commit bbbf795e6b1ac048ea17164ba1089055cfe4306d
Author: Jamey Sharp <jamey@minilop.net>
Date: Sun May 23 17:15:43 2010 -0700
Delete redundant GC initializations.
When a GC is allocated, it is zeroed, including all storage requested
with dixRegisterPrivateKey. So CreateGC hooks don't need to initialize
anything to zero.
Signed-off-by: Jamey Sharp <jamey@minilop.net>
Reviewed-by: Alex Deucher <alexdeucher@gmail.com>
commit 3288232f3d2a0239944bd856101c2d16c713ef40
Author: Jamey Sharp <jamey@minilop.net>
Date: Sun Jun 13 18:10:38 2010 -0700
Delete xaaWrapper.
This was part of "An experimental pseudocolor emulation layer. Not fully
completed, currently only works for 16bpp." Only neomagic tried to use
it, and that was neutered by the removal of the fbpseudocolor portion of
that emulation layer; the rest is easily removed.
Signed-off-by: Jamey Sharp <jamey@minilop.net>
Reviewed-by: Alex Deucher <alexdeucher@gmail.com>
commit f856dcdc3a7b635dd94d3dac387ddec952e4880b
Author: Jamey Sharp <jamey@minilop.net>
Date: Sat Jun 12 08:42:31 2010 -0700
Delete unused lastWinOrg field from GCs.
Signed-off-by: Jamey Sharp <jamey@minilop.net>
Reviewed-by: Mikhail Gusarov <dottedmag@dottedmag.net>
commit b2184024361717358e35a56b084c4a71cbc29234
Author: Jamey Sharp <jamey@minilop.net>
Date: Sat Jun 12 16:20:00 2010 -0700
Delete unused devPrivate field from GCFuncs and GCOps.
Signed-off-by: Jamey Sharp <jamey@minilop.net>
Reviewed-by: Tiago Vignatti <tiago.vignatti@nokia.com>
commit 139aa6e74227f0fe52cd8dccf1d563664103aaba
Author: Jamey Sharp <jamey@minilop.net>
Date: Sun Jun 13 18:57:08 2010 -0700
damage: Delete NOTUSED block--it was never not NOTUSED.
Signed-off-by: Jamey Sharp <jamey@minilop.net>
Reviewed-by: Tiago Vignatti <tiago.vignatti@nokia.com>
commit 5ff9e58bef668c1279c5e253795711a1e118aaa1
Author: Jamey Sharp <jamey@minilop.net>
Date: Sat Jun 12 08:51:04 2010 -0700
fb: Delete unused oneRect private field.
Signed-off-by: Jamey Sharp <jamey@minilop.net>
Reviewed-by: Mikhail Gusarov <dottedmag@dottedmag.net>
commit e99bbfa0a24ec038b88e81881133a676bf63580e
Author: Jamey Sharp <jamey@minilop.net>
Date: Tue May 25 13:50:11 2010 -0700
dmx: Delete '#undef Xmalloc' and friends.
Nothing in dmx uses these names any more, and it builds cleanly without
trying to undef them.
Signed-off-by: Jamey Sharp <jamey@minilop.net>
Reviewed-by: Alex Deucher <alexdeucher@gmail.com>
commit b5217bfdca67ef2c5323838afcfcd89eba8899d5
Author: Jamey Sharp <jamey@minilop.net>
Date: Tue May 25 13:28:32 2010 -0700
dmx: __glXMalloc -> malloc, etc.
Kristian made equivalent edits to the reference GLX implementation in
2006, with commit 2d2d38d17cc2558f8a41166a4a1578bc4c663c37.
Signed-off-by: Jamey Sharp <jamey@minilop.net>
Reviewed-by: Alex Deucher <alexdeucher@gmail.com>
commit a715de7f11afeda7798f0882148a94d4db2291e6
Author: Jamey Sharp <jamey@minilop.net>
Date: Tue May 25 13:10:05 2010 -0700
dmx: Delete unused GLX visual matching code.
Kristian deleted this API from the rest of the server in 2007, in commit
7d74690536b64f7b8e8036507ab7790807349c50.
Signed-off-by: Jamey Sharp <jamey@minilop.net>
Reviewed-by: Kristian Høgsberg <krh@bitplanet.net>
commit 5a725385fbb93553931ca0217e79271ab2a2c613
Author: Tiago Vignatti <tiago.vignatti@nokia.com>
Date: Mon Sep 13 12:33:53 2010 +0300
xfree86: vgaarb: fix decoding stub API
This fix a problem introduced in commit 65466652. It closes also:
https://bugs.freedesktop.org/show_bug.cgi?id=30160
Reported-by: <xunx.fang@intel.com>
Signed-off-by: Tiago Vignatti <tiago.vignatti@nokia.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 0a3e6b0345a96aae278dd776c00b5a7c7ccf65af
Author: Jeremy Huddleston <jeremyhu@apple.com>
Date: Sat Sep 11 14:25:21 2010 -0700
XQuartz: Localization updates
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
commit 4e09a69c5b1f3c8d6f2f92ec24aaab3a1119940c
Author: Jeremy Huddleston <jeremyhu@apple.com>
Date: Sun Aug 15 20:07:28 2010 -0700
rootless: Remove ROOTLESS_WORKAROUND
This was already removed for XWin (20701522be803fe47e921fcf059dadf64c7f287d)
with no reported side effects. XQuartz seems to be behaving ok without it as
well. While this possibly brings back bug #1168, we don't have any reproduction
steps for that issue, and if it crops up again, we should fix it a real way
rather than this hokey workaround which doesn't even work for COMPOSITE.
This effectively reverts the following two changes:
b2135e589baeb2ea26da50b9167feaea23bcce3c
d7fef52254126aa5897a5c58faeda1f61d5b13d8
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
Reviewed-by: Jon TURNEY <jon.turney@dronecode.org.uk>
commit 63b7d9448abbded1cb91e82a13319d5e4313ca0c
Author: Tiago Vignatti <tiago.vignatti@nokia.com>
Date: Sun May 30 18:44:06 2010 +0300
xfree86: fbdevhw: remove unnecessary debug code
It very likely no one will want to print all functions of this file for
debugging purposes. If this is the case, then a mix of ctags + cpp + gdb
can do the same job.
Signed-off-by: Tiago Vignatti <tiago.vignatti@nokia.com>
Reviewed-by: Mikhail Gusarov <dottedmag@dottedmag.net>
commit 66105d8281f8a6442cf7fee5d10e8b8a34bef952
Author: Tiago Vignatti <tiago.vignatti@nokia.com>
Date: Sun May 30 18:16:32 2010 +0300
xfree86: fbdevhw: remove unused cmap fields from main structure
It was never used since first git revision and probably no one cares for it.
ABI break.
Signed-off-by: Tiago Vignatti <tiago.vignatti@nokia.com>
Reviewed-by: Mikhail Gusarov <dottedmag@dottedmag.net>
commit 317e491e067e31ea7cf8cb7301e47de0c10f119e
Author: Tiago Vignatti <tiago.vignatti@nokia.com>
Date: Mon Jul 19 15:44:39 2010 +0300
xext: remove unused header
Signed-off-by: Tiago Vignatti <tiago.vignatti@nokia.com>
Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com>
commit 5098801b3a570d0bb3386d7d210f21a1cbf3bf12
Author: Tiago Vignatti <tiago.vignatti@nokia.com>
Date: Sat Jun 12 16:57:50 2010 +0300
mi: delete unused code
pBSReg is always NULL, so the statement after the conditional will never be
reached.
Signed-off-by: Tiago Vignatti <tiago.vignatti@nokia.com>
Reviewed-by: Mikhail Gusarov <dottedmag@dottedmag.net>
commit 7d8cabd027cfc55e9921307e5b3dd7052de8496f
Author: Tiago Vignatti <tiago.vignatti@nokia.com>
Date: Wed Aug 4 16:12:59 2010 +0300
os: simplify smart scheduler init process
Signed-off-by: Tiago Vignatti <tiago.vignatti@nokia.com>
Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com>
Reviewed-by: Jon TURNEY <jon.turney@dronecode.org.uk>
commit d9c18c3b9badf38d499e3f53291bd23fda3c4340
Author: Tiago Vignatti <tiago.vignatti@nokia.com>
Date: Wed Aug 4 15:54:48 2010 +0300
os: remove useless smart scheduler macros
Signed-off-by: Tiago Vignatti <tiago.vignatti@nokia.com>
Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com>
Reviewed-by: Jon TURNEY <jon.turney@dronecode.org.uk>
commit a9e6080dc94633a4f497535f619a14fd8b566645
Author: Tiago Vignatti <tiago.vignatti@nokia.com>
Date: Fri Sep 10 15:01:29 2010 +0300
os/xfree86: remove macro checking for POSIX symbols
We assume already that our X implementation is POSIX compliant anyway. So
remove those redundant checking.
SA_SIGINFO is left there.
Signed-off-by: Tiago Vignatti <tiago.vignatti@nokia.com>
Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com>
Reviewed-by: Jon TURNEY <jon.turney@dronecode.org.uk>
commit 648c8871c92727d7b6b16859f27f12266a06a16e
Author: Adam Jackson <ajax@redhat.com>
Date: Wed Sep 8 16:08:24 2010 -0400
composite: Convert compWindowUpdate to use TraverseTree
v2: Use != RedirectDrawNone, since we aren't called for manual windows.
Signed-off-by: Adam Jackson <ajax@redhat.com>
Reviewed-by: Keith Packard <keithp@keithp.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit bbffb85461eb63bfb1e01e2cb9674607b9221604
Merge: 9a1a4ccbe0 71972c2534
Author: Keith Packard <keithp@keithp.com>
Date: Fri Sep 10 11:55:34 2010 -0700
Merge remote branch 'whot/for-keith'
commit 9a1a4ccbe026f34beca5db3b2243874906961b49
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Mon Aug 30 16:37:05 2010 -0400
Add screens to the PRIVATE_XSELINUX set.
The SELinux extension does store a security label in the screen
devPrivates. Fixes crash caused by overwriting another private.
Signed-off-by: Eamon Walsh <ewalsh@tycho.nsa.gov>
Reported-by: Justin Mattock <justinmattock@gmail.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 5b680f2c23fb3d35c721647d0334f63297589371
Author: Vignatti Tiago (Nokia-MS/Helsinki) <tiago.vignatti@nokia.com>
Date: Mon Aug 30 21:24:30 2010 +0300
os: add -sigstop option for Upstart (or equivalent) startup
This is very similar to the RunFromSmartParent (implicit) option, except
we do not send the signal to our parent process, but our own process
instead, and that signal is SIGSTOP, not SIGUSR1.
Upstart or a similar equivalent program will detect this, realize that
we are ready to accept clients now, send us SIGCONT and move our job
status from SPAWNED to RUNNING.
Signed-off-by: Oliver McFadden <oliver.mcfadden@nokia.com>
Acked-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Tiago Vignatti <tiago.vignatti@nokia.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit ca0d578d29f37b61e62556fff59732741885625b
Merge: cf88363db0 08adf41f63
Author: Keith Packard <keithp@keithp.com>
Date: Fri Sep 10 11:50:27 2010 -0700
Merge remote branch 'mattst88/master'
commit cf88363db0ebb42df7cc286b85d30d7898aea840
Author: Aaron Plattner <aplattner@nvidia.com>
Date: Fri Aug 27 10:20:29 2010 -0700
os: Return BadLength instead of disconnecting BigReq clients (#4565)
If a client sends a big request that's too big (i.e. bigger than
maxBigRequestSize << 2 bytes), the server just disconnects it. This makes the
client receive SIGPIPE the next time it tries to send something.
The X Test Suite sends requests that are too big when the test specifies the
TOO_LONG test type. When the client receives SIGPIPE, XTS marks it as
UNRESOLVED, which counts as a failure.
Instead, remember how long the request is supposed to be and then return that
size. Dispatch() checks the length and sends BadLength to the client. Then,
whenever oci->ignoreBytes is nonzero, ignore the data read instead of trying to
process it as a request.
Signed-off-by: Aaron Plattner <aplattner@nvidia.com>
Reviewed-by: Keith Packard <keithp@keithp.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit fa22f97af65efc2a147e9be0b7f288848965ff60
Merge: 6edbdb7f9e 6546665293
Author: Keith Packard <keithp@keithp.com>
Date: Fri Sep 10 11:47:41 2010 -0700
Merge remote branch 'vignatti/vgaarb-fixes'
commit 6edbdb7f9e02ecb069c6fe6c0600fc389553ec5d
Author: Aaron Plattner <aplattner@nvidia.com>
Date: Mon Aug 23 11:37:46 2010 -0700
Tag sdksyms.c entries with source file and line number
Signed-off-by: Aaron Plattner <aplattner@nvidia.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 9ef6241c2382bfc555284a4985f6d1e37d750d6f
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Mon Aug 23 16:04:03 2010 -0400
Fix property and selection devPrivate allocation.
Selection objects were not being allocated with privates, and both
objects had a stray statement that zeroed out the devPrivates field.
Signed-off-by: Eamon Walsh <ewalsh@tycho.nsa.gov>
Reported-by: Justin Mattock <justinmattock@gmail.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 9dca441670d261a9a9fb6108960ed48f3d58fb7f
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Mon Sep 6 11:32:38 2010 +1000
xfree86: add a hook to replace the new console handler.
This hook is only necessary for the keyboard driver to remove the race
condition between drain_console() and the driver's ReadInput (Bug 29969).
The idea is that a driver that needs to handle events from the console
calls xf86ReplaceConsoleHandler() with it's own ReadInput (or NULL) and thus
removes the drain_console call. It's the driver's responsibility to restore
the previous behaviour when the driver is unloaded.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
CC: Thomas Hellstrom <thellstrom@vmware.com>
Reviewed-by: Tiago Vignatti <tiago.vignatti@nokia.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
commit da31ca747f8e3993b2aca5d31b7d09b9907ad1d9
Author: Thomas Hellstrom <thellstrom@vmware.com>
Date: Thu Sep 2 10:53:28 2010 +0200
linux: Don't lose console events on non-evdev drivers (#29969)
The drain_console() function will race with new keyboard events being added
by the hardware causing the server to lose keyboard events if the console fd
is used for input.
Only use the drain_console() when AllowEmptyInput is off which is the best
indicator we have for whether the keyboard driver will be used. This patch
will only fix the bug when hotplugging is disabled.
What we really need is a way to figure out either whether we're _not_ using
the keyboard driver (not predictable) or a way for the keyboard driver to
disable drain_console().
X.Org Bug 29969 <http://bugs.freedesktop.org/show_bug.cgi?id=29969>
Signed-off-by: Thomas Hellstrom <thellstrom@vmware.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
(cherry picked from commit 71972c2534d490284d3d42b456c2f34b964b2894)
commit 52df92a563980a7af0fb61248da3654bd90e8232
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu Sep 2 15:08:01 2010 +1000
xfree86: move XI_VERIFY_VALUATORS to the source file it's used in.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Tiago Vignatti <tiago.vignatti@nokia.com>
commit 824e970c5cc94fc7d5fe5f78a24d0d3057d87a84
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu Sep 2 15:03:39 2010 +1000
xfree86: remove TS_Raw and TS_Scaled defines.
There are no references to it other than the commit that added them. But
since we're re-doing the API anyway, now is a good time to break things.
commit 9398d62f27ee1b287e4458fd8b011c10f7b59efd
Author: Daniel Stone <daniel@fooishbar.org>
Date: Wed Mar 21 00:18:24 2007 +0200
XFree86 input: Add backwards compatibility for motion history
Add the old motion history API back, as a shim around the new mi
API.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Tiago Vignatti <tiago.vignatti@nokia.com>
commit ac3f88e604212fc3668d623798d50aa218c13995
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu Sep 2 15:01:26 2010 +1000
xfree86: remove {Dont}SendCoreEvents defines
The input drivers that use it only do so with ABI 0 and we're long past this
one now. Input driver don't have a say in whether they send core events now
anyway.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Tiago Vignatti <tiago.vignatti@nokia.com>
commit 3f264149ff226d7c0bfcfcfc2c8845fa6326d0bd
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu Sep 2 14:52:30 2010 +1000
xfree86: don't export xf86InputDevs.
Use xf86FirstLocalDevice() instead (but don't get me started on the naming
of that one...)
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Tiago Vignatti <tiago.vignatti@nokia.com>
Reviewed-by: Fernando Carrijo <fcarrijo@freedesktop.org>
commit 8f0531bddac8e774aa25b51155445309219da0f6
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu Sep 2 14:46:59 2010 +1000
xfree86: remove XI_PRIVATE macro, unused.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Tiago Vignatti <tiago.vignatti@nokia.com>
Reviewed-by: Fernando Carrijo <fcarrijo@freedesktop.org>
commit c08f7afdbcf16d2ba30b67e27162c5aaa1ed3f61
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu Sep 2 14:45:03 2010 +1000
xfree86: update comment for xf86DeleteInput
We have a driver hook - it's UnInit.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Tiago Vignatti <tiago.vignatti@nokia.com>
Reviewed-by: Fernando Carrijo <fcarrijo@freedesktop.org>
commit b8d9c5ff0003f15720737949e65e3159c4f4576e
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu Sep 2 14:30:11 2010 +1000
xfree86: remove IDevRec, replace with InputInfoRec.
This struct is superfluous, maintaining the same info as the InputInfoRec
(with the exception of the driver name).
This is a rather large commit with the majority of changes being a rename
from the fields of the IDevRec (idev, commonOptions) to the InputInfoRec
(pInfo, options).
The actual changes affect the initialization process of the input device:
In NewInputDeviceRequest, the InputInfoRec is now always allocated and just
added to the internal list in xf86NewInputDevice() if the init process
succeeded.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Tiago Vignatti <tiago.vignatti@nokia.com>
commit c5da32a6105b3cf57b5996971149c39103cd64b3
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu Sep 2 14:26:20 2010 +1000
xfree86: plug minor memory leak.
When no identifier for the device was specified, the allocated IDevRec (and
its associated fields) need to be freed.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Tiago Vignatti <tiago.vignatti@nokia.com>
Reviewed-by: Fernando Carrijo <fcarrijo@freedesktop.org>
commit 34ade08174bfd652cc79bf26d2ad6a10ca73d2c4
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu Sep 2 14:04:50 2010 +1000
xfree86: Remove extraOptions parameter from xf86CollectInputOptions.
And unexport it, drivers don't need to call this in the new init process.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Tiago Vignatti <tiago.vignatti@nokia.com>
commit 2199842ed50b3eb40d54146827fc58cae7e873ec
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu Sep 2 10:52:54 2010 +1000
xfree86: remove extraOptions field from IDevRec.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Tiago Vignatti <tiago.vignatti@nokia.com>
commit 5ab8ca0807f9d2f8c8de2f9a1421e59e2a8e976c
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu Sep 2 10:41:27 2010 +1000
xfree86: remove some ifdef 0 code.
InputInfoRec hasn't had a free function pointer since the git import.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Tiago Vignatti <tiago.vignatti@nokia.com>
Reviewed-by: Fernando Carrijo <fcarrijo@freedesktop.org>
commit b0da1bc509446a714eb2b29cbd35d43b1e5187ed
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu Sep 2 10:39:24 2010 +1000
xfree86: move a declaration down to the block it is used in.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Tiago Vignatti <tiago.vignatti@nokia.com>
Reviewed-by: Fernando Carrijo <fcarrijo@freedesktop.org>
commit cd7059db4a766bc9d03d7968aebeba8542e6c6c0
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu Sep 2 10:36:47 2010 +1000
xfree86: minor comment fix. HAL → config backend
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Tiago Vignatti <tiago.vignatti@nokia.com>
Reviewed-by: Fernando Carrijo <fcarrijo@freedesktop.org>
commit f3861522fe7d148fd4b0802f2f9ea5d98ab2db93
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu Sep 2 11:47:30 2010 +1000
xfree86: skip a few NULL initialization, calloc does it for us.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Tiago Vignatti <tiago.vignatti@nokia.com>
Reviewed-by: Fernando Carrijo <fcarrijo@freedesktop.org>
commit 12170978617c6862fb6aa286b18aaacd0a4e2737
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Wed Sep 1 15:44:44 2010 +1000
xfree86: remove conversion procs and close proc from InputInfoRec.
None of them are called by the server.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Tiago Vignatti <tiago.vignatti@nokia.com>
Reviewed-by: Fernando Carrijo <fcarrijo@freedesktop.org>
commit 71972c2534d490284d3d42b456c2f34b964b2894
Author: Thomas Hellstrom <thellstrom@vmware.com>
Date: Thu Sep 2 10:53:28 2010 +0200
linux: Don't lose console events on non-evdev drivers (#29969)
The drain_console() function will race with new keyboard events being added
by the hardware causing the server to lose keyboard events if the console fd
is used for input.
Only use the drain_console() when AllowEmptyInput is off which is the best
indicator we have for whether the keyboard driver will be used. This patch
will only fix the bug when hotplugging is disabled.
What we really need is a way to figure out either whether we're _not_ using
the keyboard driver (not predictable) or a way for the keyboard driver to
disable drain_console().
X.Org Bug 29969 <http://bugs.freedesktop.org/show_bug.cgi?id=29969>
Signed-off-by: Thomas Hellstrom <thellstrom@vmware.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit e00e2e7b68fbc932269d607ac5dc2c441d07ad9d
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Mon Aug 23 08:35:01 2010 +1000
xfree86: Check for existence of button class before dereferencing it.
The Irxon Super Mini Bluetooth Wireless Keyboard for PC/PDA/Cell Phones
keyboards have axes but not buttons. The evdev driver doesn't set up a
button class for these keyboards and a motion event handled by
DGAProcessPointerEvent dereferences the dev->button NULL pointer, causing a
server crash.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Keith Packard <keithp@keithp.com>
commit 9802cca816884e7f055f054ac1ba9194e0eba10b
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Wed Sep 1 15:42:44 2010 +1000
Remove atom field from InputInfoRec.
This field was only used in one location where we can use a local variable.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Tiago Vignatti <tiago.vignatti@nokia.com>
commit 79ea9ef39971d008d199b18f34d1aef2bab6e33f
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Tue Aug 10 15:19:20 2010 +1000
input: constify valuators passed in by input drivers.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Keith Packard <keithp@keithp.com>
Reviewed-by: Tiago Vignatti <tiago.vignatti@nokia.com>
commit 86560b5d05f14bdf04d21b3457a66c0d5045db9c
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Tue Aug 24 13:46:35 2010 +1000
dix: don't set time to CurrentTime in DeviceChangedEvents.
CurrentTime is used by clients to skip setting the time, but not by the
server.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Keith Packard <keithp@keithp.com>
commit ff055506f0cbb852bed17acb9f9bbf1d715a854e
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Mon Aug 23 13:20:09 2010 +1000
dix: fix crash when removing devices on a buttonless MD pointer (#29669)
If the master does not have a button class, recalculating the number of
buttons required for this master dereferences a NULL pointer. Guard against
this, if the master pointer doesn't have a button class, it doesn't need to
update it's number of buttons.
Reproducible:
Two devices on the same master, device NB with axes but no buttons, device
A+B with axes and button .
If NB was the last one to send an event through the master when A+B is
removed from the server, master->button is NULL and leads to the above
NULL-pointer dereference.
X.Org Bug 29669 <http://bugs.freedesktop.org/show_bug.cgi?id=29669>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Keith Packard <keithp@keithp.com>
commit be978c7fc97e98ef1bc7b20c6c0740d8a81b609a
Author: Jesse Adkins <jesserayadkins@gmail.com>
Date: Tue Aug 3 18:21:28 2010 -0700
xfree86: Purge kbdCustomKeycodes from xf86Info.
This was obsolete after 3eeb62e8f587732e6b433c2b9c6879eb26a3f1b4 "bug #890: completely remove deprecated keyboard driver".
Signed-off-by: Jesse Adkins <jesserayadkins@gmail.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 6922b31a136b2b0ac185d61785969a11f84c7943
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Wed Sep 1 14:35:40 2010 +1000
xfree86: remove history_size
For a couple of ABIs now the history size was essentially static anyway.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 892e39025b45109ba38c0b5d0b5f4535e092f58c
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Wed Sep 1 14:33:52 2010 +1000
xfree86: remove always_core_feedback from InputInfoRec.
Unused
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 5e2912bd1d2bc8ff1508e5f726e77aa5f8677cbd
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Wed Sep 1 14:33:26 2010 +1000
xfree86: remove first/last from InputInfoRec.
Unused.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 974bc2322b3667db38d28063786fbc76fb303d00
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Wed Sep 1 14:32:51 2010 +1000
xfree86: remove private_flags from InputInfoRec.
Unused field.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 23b361b25b7b48a820a4ef851fb89706f7ec2cd0
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Wed Sep 1 14:14:20 2010 +1000
xfree86: Purge old_x/old_y from InputInfoRec.
Unused field.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 4ac3be29bc1af19f15e84ee0ea609de5c54ca0e0
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri Jul 30 14:26:06 2010 +1000
input: Purge AddOtherInputDevices DDX hook.
This hook wasn't used by any DDX. Device addition and removal is handled by
the config backend, so we don't need to do anything special that during the
ListInputDevices request processing.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Adam Jackson <ajax@redhat.com>
Reviewed-by: Daniel Stone <daniel@fooishbar.org>
commit cb672a461cc6cd668ab7e61994b94e9ff46b3ef1
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri Jul 30 14:21:14 2010 +1000
input: remove OpenInputDevice and CloseInputDevice DDX hooks.
In theory, these hooks were to be used for DDX-specific device enablement.
None of the DDXs however did anything here. Now we call DEVICE_INIT on all
devices when they are added, so the xfree86 DDX as the only one with real
code didn't do anything here.
kdrive checked for device validity but that's already handled in
ProcXOpenDevice.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Adam Jackson <ajax@redhat.com>
Reviewed-by: Daniel Stone <daniel@fooishbar.org>
commit a46d2bb344e822bbd9d69cb59829b85f9d8f0213
Author: Simon Thum <simon.thum@gmx.de>
Date: Sun Jul 18 12:31:26 2010 +0200
xfree86: Fix xf86 backend-specific input initialization
Instead of shoving it in rather unrelated places, move acceleration init
into xf86NewInputDevice.
Caveat: It's not clear atm how relevant other callers of ActivateDevice
(like OpenDevice) actually are.
Signed-off-by: Simon Thum <simon.thum@gmx.de>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Adam Jackson <ajax@redhat.com>
Reviewed-by: Daniel Stone <daniel@fooishbar.org>
commit e930710ae5579752785d6b96ace4b44bf0199a6e
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri Jul 30 13:59:29 2010 +1000
xfree86: purge superfluous includes from xf86Xinput.c
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Adam Jackson <ajax@redhat.com>
Reviewed-by: Daniel Stone <daniel@fooishbar.org>
commit 2b7840b63da6bc00aa40e8a427d9fd719ba5e6d0
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri Jul 30 13:44:20 2010 +1000
xfree86: remove unused DeviceAssocRec struct.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Adam Jackson <ajax@redhat.com>
Reviewed-by: Daniel Stone <daniel@fooishbar.org>
commit cdb5863c9f68548afa0c69e08c697c83f9a5e671
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri Jul 23 14:16:38 2010 +1000
xfree86: remove LocalDeviceRec/Ptr definition.
Two names pointing to the same struct for over 7 years now. Remove the
define, if drivers don't want to change they can always do the typedef
themselves.
Rename all "LocalDevicePtr local" to "InputInfoPtr pInfo".
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Adam Jackson <ajax@redhat.com>
Reviewed-by: Daniel Stone <daniel@fooishbar.org>
commit 8764782f6de56a9dc5e9d5a8e9fb616a8ddb2f7c
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Mon Jun 7 11:17:10 2010 +1000
xfree86: add xf86IDrvMsg and friends for input driver logging.
Input driver messages are only standardised by convention, with the drivers
prefixing the device name to most messages. This makes it rather hard to
grep on "evdev" for example when looking for the evdev ouput.
This patch adds three new logging functions, modeled after xf86DrvMsg(), the
logging function for output drivers. New functions are
xf86IDrvMsg() - input driver log message in default verbosity.
xf86IDrvMsgVerb() - input driver log message in specified verbosity.
xf86VIDrvMsgVerb() - same as xf86IDrvMsgVerb() but takes a varargs
argument.
Default log format is <driver name>: <device name>: <message>.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Adam Jackson <ajax@redhat.com>
Reviewed-by: Daniel Stone <daniel@fooishbar.org>
commit b55ac354afa0f16f71bb4f2d3d4277c887082520
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu Jul 22 12:00:07 2010 +1000
xfree86: move xf86AllocateInput and xf86DeleteInput to xf86Xinput.c
Make xf86AllocateInput static in the process, this function is only called
from one location.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Adam Jackson <ajax@redhat.com>
Reviewed-by: Daniel Stone <daniel@fooishbar.org>
commit d2a5f4166417b9d4a02a219b28470e41b6cfe012
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu Jul 22 10:30:56 2010 +1000
xfree86: return the device from xf86ActivateDevice.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Adam Jackson <ajax@redhat.com>
Reviewed-by: Daniel Stone <daniel@fooishbar.org>
commit fbf35e27f3005cf009f2dd1e112260bb294342c7
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu Jul 22 10:28:14 2010 +1000
input: set XKB extension for all new devices, not just xfree86 ones.
Right now, Xephyr and others don't get to use XKB on the slave devices.
Which works given that no-one cares about SDs just yet but event processing
is different if the ProcessInputProc isn't wrapped properly.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Adam Jackson <ajax@redhat.com>
Reviewed-by: Daniel Stone <daniel@fooishbar.org>
commit 11ed32b62c8793ecc1c68e1e4ba91e2eb45eef3e
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu Jul 22 10:24:02 2010 +1000
xfree86: purge SendDragEvents support.
From the documentation:
"This is mainly to allow a touch screen to be used with netscape and other
browsers which do strange things if the mouse moves between button down and
button up."
CLOSED - NOTOURBUG
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Adam Jackson <ajax@redhat.com>
Reviewed-by: Daniel Stone <daniel@fooishbar.org>
commit 7defd282beb57e8880980416ed579f62d561d1ac
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu Jul 22 10:16:15 2010 +1000
xfree86: remove XI86_CONFIGURED flag.
PreInit returns a status code. Let's use that instead of having it report
Success in some cases but not set the XI86_CONFIGURED flag and thus signal
an init failure.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Adam Jackson <ajax@redhat.com>
Reviewed-by: Daniel Stone <daniel@fooishbar.org>
commit 97a4acdac23b8ff33da43917c10b65d2fee5c07f
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu Jul 22 10:04:53 2010 +1000
xfree86: purge some unused defines.
These defines have been write-only for a while now.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Adam Jackson <ajax@redhat.com>
Reviewed-by: Daniel Stone <daniel@fooishbar.org>
commit 0fb7a5c261aa0d87d6596d72b70696bffe0c0aff
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu Jul 22 09:53:35 2010 +1000
input: Purge Register*Device() functions.
RegisterPointerDevice() and RegisterKeyboardDevice() were already mapped to
RegisterOtherDevice() and obsolete.
RegisterOtherDevice() was called for all devices and the two assignments can
simply be moved into AddInputDevice(). Purge RegisterOtherDevice() and
pretend it never happened.
*lalalalala*
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Adam Jackson <ajax@redhat.com>
Reviewed-by: Daniel Stone <daniel@fooishbar.org>
commit 67ffbcc14cbc61474520d4531599edca24965543
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu Jul 22 09:24:08 2010 +1000
xfree86: remove superflous assignments.
ActivateGrab and DeactivateGrab are set in AddInputDevice() already.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Adam Jackson <ajax@redhat.com>
Reviewed-by: Daniel Stone <daniel@fooishbar.org>
commit 4cd54d9ed9e87074734789a9a7708c2218f87f1e
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu Jul 22 09:22:05 2010 +1000
xfree86: make xf86ActivateDevice static.
No-one but the joystick driver uses it and that one should be using NIDR
instead.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Adam Jackson <ajax@redhat.com>
Reviewed-by: Daniel Stone <daniel@fooishbar.org>
commit 31c71425ac13a7f554316356691a79175ea82a67
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu Jul 22 09:09:10 2010 +1000
config: expose config_info as an input option.
config_info is the only reliable indicator we have in the server for
duplicate devices (drivers can test for maj/min on fds as well). Don't set
this after the device has been initialized but assume it's important enough
to set during NIDR.
This makes the option "config_info" available to the drivers as well.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Adam Jackson <ajax@redhat.com>
Reviewed-by: Daniel Stone <daniel@fooishbar.org>
commit de0cc5a72deb7c477e368aa4fe9a713788d7ae4c
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Wed Jul 21 16:00:26 2010 +1000
xfree86: rework driver PreInit API - XInput ABI 12
The main change introduced in this patch is the removal of the
back-and-forth between DDX and the driver.
The DDX now allocates the InputInfoRec and fills it with default values. The
DDX processes common options (and module-specific default options, if
appropriate) before passing the initialised struct to the driver.
The driver may do module-specific initializations and return Success or an
error code in the case of a failure.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Adam Jackson <ajax@redhat.com>
Reviewed-by: Daniel Stone <daniel@fooishbar.org>
commit 7925e8945649d4af237e6c3c5593b895a461bd1e
Author: Chase Douglas <chase.douglas@ubuntu.com>
Date: Wed Sep 1 14:45:34 2010 +1000
Fix udev population of Bluetooth input device product IDs
The udev device_added function takes the vendor and model IDs of added
devices and converts them into an attribute that can be matched for by
an InputClass configuration using MatchUSBID. Currently, the udev
mechanism works for USB devices, but fails to work properly for
Bluetooth devices. The product IDs of the event node are actually the
IDs of the Bluetooth receiver instead of the device.
This patch reads the product ID from the PRODUCT property of the parent
of the added device. This tag is set correctly for both USB and
Bluetooth input devices. The following devices have been tested by
specifying individual InputClass sections in xorg.conf:
* Apple Keyboard (Bluetooth)
* Apple Magic Trackpad (Bluetooth)
* Apple Magic Mouse (Bluetooth)
* Microsoft Bluetooth Notebook Mouse 5000 (Bluetooth)
* Microsoft IntelliMouse Optical (USB)
* N-Trig Touchscreen (USB)
* Wacom Bamboo Touch (USB)
Signed-off-by: Chase Douglas <chase.douglas@canonical.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 05e616767e5b7e60b92d31c4042ded5892dce6d4
Author: Adam Tkac <atkac@redhat.com>
Date: Wed Aug 25 10:38:40 2010 +0200
Return Success from generate_modkeymap() when max_keys_per_mod is zero
max_keys_per_mod equal to zero is a valid situation so generate_modkeymap
should not return BadAlloc in this case.
Signed-off-by: Adam Tkac <atkac@redhat.com>
Reviewed-by: Patrick E. Kane <pekane52 at gmail.com>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 4a12aecac670debd0dafb17c245fccb93eea2d60
Author: Jesse Adkins <jesserayadkins@gmail.com>
Date: Wed Aug 25 13:48:29 2010 -0700
xfree86: Document terminate not mapped by default (bug 25083)
Document that terminate is not mapped to Ctrl+Alt+Backspace by default, to help alleviate some confusion.
Signed-off-by: Jesse Adkins <jesserayadkins@gmail.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit a90052ba8697e217b0dc68057d7b9202ae8797db
Author: David Ge <davidqge@gmail.com>
Date: Thu Aug 19 00:33:57 2010 -0500
xkb: Fix RedirectKey didn't send any event.
Xorg.log shows error: Valuators reported for non-valuator device.
This is caused by uninitialized valuators.mask in _XkbFilterRedirectKey(),
which trigger the error in UpdateDeviceState().
Signed-off-by: David Ge <davidqge@gmail.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit ff109bf84401a451380eb7f3f94a6e0aa2776e3e
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Thu Aug 12 00:09:02 2010 -0700
Use GetMaster instead of direct u.master access in core procs
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Acked-by: Daniel Stone <daniel@fooishbar.org>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 3cc5e4422430e9ca44615f3e63feccd2e5729046
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri Jul 23 14:48:32 2010 +1000
xfree86: fix compiler warning about implicied decl of DuplicateModule.
../../../../hw/xfree86/common/xf86Xinput.c: In function ‘xf86AllocateInput’:
../../../../hw/xfree86/common/xf86Xinput.c:722: warning: implicit
declaration of function ‘DuplicateModule’
../../../../hw/xfree86/common/xf86Xinput.c:722: warning: nested extern
declaration of ‘DuplicateModule’
../../../../hw/xfree86/common/xf86Xinput.c:722: warning: assignment makes
pointer from integer without a cast
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Adam Jackson <ajax@redhat.com>
Reviewed-by: Daniel Stone <daniel@fooishbar.org>
commit b5c9953bbf4ffd11f1a70d058c6d3feb2bd1bca8
Author: Pauli Nieminen <ext-pauli.nieminen@nokia.com>
Date: Mon Jul 26 15:31:03 2010 +0300
xkb: Check if AddResource failed
Signed-off-by: Pauli Nieminen <ext-pauli.nieminen@nokia.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 2e6d7174042cc8007e947b7d9fb54acc0ebe29d2
Author: Pauli Nieminen <ext-pauli.nieminen@nokia.com>
Date: Mon Jul 26 15:13:34 2010 +0300
xkb: Fix possible NULL pointer dereference
sli is null before allocation assigment so deference t osli has to be
protected.
Signed-off-by: Pauli Nieminen <ext-pauli.nieminen@nokia.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
commit d6642de7ebdda16e0056600a86a7802bd4c393b7
Author: Pauli Nieminen <ext-pauli.nieminen@nokia.com>
Date: Mon Jul 26 14:50:30 2010 +0300
xkb: Fix possible NULL pointer dereference
If search for device failed sli is NULL. In that case we have to protect
dereference to prevent server crash.
Signed-off-by: Pauli Nieminen <ext-pauli.nieminen@nokia.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
commit adc0697cfcfba295a15d7a307125093cbccd637f
Author: Pauli Nieminen <ext-pauli.nieminen@nokia.com>
Date: Thu Jul 22 15:11:27 2010 +0300
xkb: Fix memory leak in error path
map is allocated but not freed if reply length and data don't match.
Signed-off-by: Pauli Nieminen <ext-pauli.nieminen@nokia.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 67cfb66562cd9d39f30fec6fbc38eb1eb5e5b030
Author: Pauli Nieminen <ext-pauli.nieminen@nokia.com>
Date: Thu Jul 22 15:05:57 2010 +0300
xkb: Remove redurant intialization code
calloc already initializes allocated memory to zero.
Signed-off-by: Pauli Nieminen <ext-pauli.nieminen@nokia.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 2475ef60977f6813dec74ef0837a5915b8a48bbc
Author: Pauli Nieminen <ext-pauli.nieminen@nokia.com>
Date: Thu Jul 22 12:48:55 2010 +0300
xkb: Fix NULL pointer dereference
xkb->names is dereferenced in else path too.
Signed-off-by: Pauli Nieminen <ext-pauli.nieminen@nokia.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 184ef0d35612d6ed0619283d376f04d9a904f47c
Author: Pauli Nieminen <ext-pauli.nieminen@nokia.com>
Date: Thu Jul 22 11:34:54 2010 +0300
xkb: Don't check for NULL before calling free
Signed-off-by: Pauli Nieminen <ext-pauli.nieminen@nokia.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 1223340644744c0b38aa85f5956eb5ab7c696517
Author: Pauli Nieminen <ext-pauli.nieminen@nokia.com>
Date: Thu Jul 22 11:33:33 2010 +0300
xkb: Fix memory leak if opening file fails
If fopen fails pointer in buf would be overwriten with a new pointer.
Signed-off-by: Pauli Nieminen <ext-pauli.nieminen@nokia.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 20cb9c923efa4edc348eba30f956a66413a8208f
Author: Pauli Nieminen <ext-pauli.nieminen@nokia.com>
Date: Thu Jul 22 11:13:10 2010 +0300
xkb: Use memcpy for copy that has known length
Fixes warning that strncpy is not able to append NULL to the end
of destination.
Signed-off-by: Pauli Nieminen <ext-pauli.nieminen@nokia.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
commit de8be07cc0a8163b6ef04455706fd5ca2cebe587
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Tue Aug 17 12:08:52 2010 +1000
dix: don't create core motion events for non-x/y valuators.
Devices that send motion events with valuators other than x/y get core
motion events with unchanged x/y coordinates. This confuses some
applications.
If the DeviceEvent does not have the x/y valuators set, return BadMatch on
core conversion, thus skipping the event altogether.
Reported-by: Bartosz Brachaczek <b.brachaczek@gmail.com>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Tested-by: Bartosz Brachaczek <b.brachaczek@gmail.com>
commit 08adf41f6315663cbac33d010214d98f3e1c8814
Author: Matt Turner <mattst88@gmail.com>
Date: Fri Aug 27 18:34:49 2010 -0400
Replace malloc/strlen/strcpy with strdup.
Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com>
Signed-off-by: Matt Turner <mattst88@gmail.com>
commit ea239112b030588ed3cdd113643ba5f6207a5bd9
Author: Jesse Adkins <jesserayadkins@gmail.com>
Date: Wed Aug 4 09:21:33 2010 +0000
xfree86: Purge parsePrologueVoid.
This was included in the original commit, and then never used.
Signed-off-by: Jesse Adkins <jesserayadkins@gmail.com>
Signed-off-by: Matt Turner <mattst88@gmail.com>
commit b25fb9fe998209e79b6917d12d5765c5f6719a7e
Author: Jesse Adkins <jesserayadkins@gmail.com>
Date: Wed Aug 4 09:21:32 2010 +0000
xfree86: Removed unused messages from Configint.h
AUTOREPEAT_MSG, MOVED_TO_FLAGS_MSG, and XLEDS_MSG made obsolete by
81913a12910e39d7ea6af8657c1c66cc6791cd65 Jul 21 2006 (remove undead files from master)
UNDEFINED_DEVICE_MSG made obsolete by
6033d8150be3a115b90226eaa42f237bb0cf3369 Oct 9 2007 (first pass at video driver autoloading)
Signed-off-by: Jesse Adkins <jesserayadkins@gmail.com>
Signed-off-by: Matt Turner <mattst88@gmail.com>
commit 18b62e0479f15e965611880ada6e0195367df025
Author: Jesse Adkins <jesserayadkins@gmail.com>
Date: Wed Aug 4 09:21:31 2010 +0000
xfree86: Fix leaks in OpenConfigFile and OpenConfigDir
[mattst88: fixed whitespace and a missing semicolon]
Signed-off-by: Jesse Adkins <jesserayadkins@gmail.com>
Signed-off-by: Matt Turner <mattst88@gmail.com>
commit 4f04fd595e82226f1d91226a41bb98ed3d940b37
Author: Jesse Adkins <jesserayadkins@gmail.com>
Date: Wed Aug 4 09:21:30 2010 +0000
xfree86: Simplify xf86Msg{,Verb}
Previously, the functions would call xf86VDrvMsgVerb with a screen of -1
despite their comments saying they were for "non-driver messages".
They now call LogVMessageVerb, which is what xf86VDrvMsgVerb does anyway
when it has a screen == -1.
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Mark Kettenis <kettenis@openbsd.org>
Signed-off-by: Jesse Adkins <jesserayadkins@gmail.com>
Signed-off-by: Matt Turner <mattst88@gmail.com>
commit f49473abfd6034e68576b2dddd30ba8d8dd0838f
Author: Jesse Adkins <jesserayadkins@gmail.com>
Date: Wed Aug 4 09:21:29 2010 +0000
xfree86: Remove prototypes for non-existant functions.
This was obsolete from 9a0f25de7ca3c68af867b38936103d17daa92ac6 "Static cleanups, dead code deletion." (server 1.3).
Signed-off-by: Jesse Adkins <jesserayadkins@gmail.com>
Signed-off-by: Matt Turner <mattst88@gmail.com>
commit 747bf5fe80f51554205c5a50b8ed9b89065c8a54
Author: Jesse Adkins <jesserayadkins@gmail.com>
Date: Sun Aug 1 16:01:23 2010 -0700
xfree86: Remove comments about unable to use malloc.
These are leftovers from when X still used Xmalloc and friends for allocation.
Now that those are gone, these comments are just confusing.
Signed-off-by: Jesse Adkins <jesserayadkins@gmail.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Matt Turner <mattst88@gmail.com>
commit 65466652936bbb2706be455d0a416bcf08e88f66
Author: Tiago Vignatti <tiago.vignatti@nokia.com>
Date: Wed May 12 13:03:14 2010 +0300
xfree86: vgaarb: fix device decoding interface to send resources type properly
Right now, when there is more than one vide card on the machine, we're
adopting a pessimistic approach and setting all cards to decode VGA legacy
address.
Some cards may want to skip the arbitration and the only way to do so is
through pci_device_vgaarb_decodes. Therefore, send the desired kind of
resource instead force the worst case.
Note that xf86VGAarbiterDeviceDecodes is not being used so far by any
open-source driver. Even so, API break.
Signed-off-by: Tiago Vignatti <tiago.vignatti@nokia.com>
Reviewed-by: Mark Kettenis <kettenis@openbsd.org>
commit 7fbf3e7cf4b261194faad747e0bf59d528df6d91
Author: Tiago Vignatti <tiago.vignatti@nokia.com>
Date: Mon May 10 21:05:14 2010 +0300
xfree86: vgaarb: remove useless macro
This was inherited from RAC and was never used there either.
Signed-off-by: Tiago Vignatti <tiago.vignatti@nokia.com>
Reviewed-by: Jamey Sharp <jamey@minilop.net>
commit ad698dd5bcc41fcec1e7ce1117c7ad1052710132
Author: Tiago Vignatti <tiago.vignatti@nokia.com>
Date: Mon May 10 21:03:30 2010 +0300
xfree86: vgaarb: remove superfluous and confusing VGAGet_GC and VGAPut_GC
Signed-off-by: Tiago Vignatti <tiago.vignatti@nokia.com>
Reviewed-by: Jamey Sharp <jamey@minilop.net>
commit c0aed4c99bf553bd7b8bbc79d0ed8f26d0ab3f94
Author: Tiago Vignatti <tiago.vignatti@nokia.com>
Date: Mon May 10 20:58:30 2010 +0300
xfree86: vgaarb: change macros by inline functions to ease debug
Signed-off-by: Tiago Vignatti <tiago.vignatti@nokia.com>
Reviewed-by: Jamey Sharp <jamey@minilop.net>
commit 79ee78de9de49d0cab03401662baa476a18e53b8
Author: Keith Packard <keithp@keithp.com>
Date: Fri Aug 20 17:32:27 2010 -0700
xserver 1.9.0
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 3e56efcfb63677cd8574e1e435e61d96f79ea536
Author: Keith Packard <keithp@keithp.com>
Date: Fri Aug 20 10:01:48 2010 -0700
fb: make isClipped always reject negative coordinates (bug 11503)
A window with either dimension > 32767 can be positioned such that
coordinates > 32767 are visible on the screen. Attempts to draw to
those pixels will generate coordinates wrapped around to negative
values.
The optimized clipping macro, 'isClipped', in fbbits.h, computes
clipping in window space rather than screen space using int16 values,
and so it too has coordinates wrapped around to negative values and
hence ends up accepting the wrapped drawing coordinates.
Two possible fixes for this problem
1) Detect wrapped region coordinates and clip those to 32767.
2) Detect negative incoming coordinates and reject those
This patch takes the second approach as it is much shorter, simply
detecting when either X or Y incoming coordinate is negative, which
can never be 'within' any drawable.
Signed-off-by: Keith Packard <keithp@keithp.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
commit 951605b4660290044fb238bcf1d6d9e498567e8c
Author: Chris Wilson <chris@chris-wilson.co.uk>
Date: Fri Aug 20 13:51:04 2010 +0100
edid: Adjust rounding of max_clock
A simple hack to accommodate various EDID who have detailed modes that
exceed the EDID's max pixel clock. The pixel clock is only defined in
units of 10MHz and often appears as the maximum pixel code of the
detailed modes, rounded to the nearest 10MHz. Adjusting the max_clock to
include an extra 5MHz prevents the parser from rejecting the detailed
modes.
The kernel uses the same fuzz and by including it in X we can use the
same modes in X as for the console.
Fixes:
Bug 23833 - X uses different refresh rate to that set by kernel module
https://bugs.freedesktop.org/show_bug.cgi?id=23833
In the future, we will want to try harder to keep the KMS modes but at
the same time we need to apply the restrictions as specified by the
user's configuration, and need to fill in modes for fullscreen games on
fixed-mode panels.
Reported-and-tested-by: Fabio Pedretti <fabio.ped@libero.it>
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Reviewed-by: Alex Deucher <alexdeucher@gmail.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 7e581780603d6b15291d032efdeeca77f969e0ba
Author: Chris Wilson <chris@chris-wilson.co.uk>
Date: Thu Jun 24 12:24:58 2010 +0100
glx: Prevent NULL context deref in __glXGetDrawable() (bug 29184)
During a SwapBuffers request, we may end up querying an unknown drawable
outside of an active context, and so need to report this error prior to
attempting to dereference the NULL context.
Also fixes:
[Bug 29184] glXSwapBuffers with no GLX context crashes X.
https://bugs.freedesktop.org/show_bug.cgi?id=29184
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Kristian Høgsberg <krh@bitplanet.net>
Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 5725849a1b427cd4a72b84e57f211edb35838718
Author: Adam Jackson <ajax@redhat.com>
Date: Mon Jun 28 18:08:50 2010 -0400
render: Bounds check for nglyphs in ProcRenderAddGlyphs (#28801)
Signed-off-by: Adam Jackson <ajax@redhat.com>
Reviewed-by: Julien Cristau <jcristau@debian.org>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit fc091936e2bddbbab9c9a501edc5a5f08388617e
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Mon Aug 16 14:18:45 2010 +1000
dix: copy the valuators passed into GPE/GKVE/GProxE.
GPE and friends modify the valuators array passed in. Which means any driver
using e.g. xf86PostButtonEventP(..., valuators) twice to emulate a button
click will provide garbage data on the second run.
This is currently affecting the wacom driver, xf86PostButtonEventP() with
valuators is required to have input events with device-specific axis values.
Passing the same valuators in twice, once with press, once with release,
will see the valuators modified in the first call and garbage submitted in
the next one.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Keith Packard <keithp@keithp.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 6e3e559e9fa63069a10eb834a6dab9a4cfc140ee
Author: Keith Packard <keithp@keithp.com>
Date: Sun Aug 15 20:53:20 2010 -0700
dix: reset pScreen->root to NULL when root window is deleted.
From: Dave Airlie <airlied@linux.ie>
We were seeing a crash in the FreeAllResources codepath,
running valgrind revealed this,
==12536== Invalid read of size 4
==12536== at 0x810BCAB: DeliverPropertyEvent (rrproperty.c:33)
==12536== by 0x80958A4: TraverseTree (window.c:227)
==12536== by 0x809593E: WalkTree (window.c:255)
==12536== by 0x810BC66: RRDeliverPropertyEvent (rrproperty.c:53)
==12536== by 0x810BD5D: RRDeleteProperty.clone.0 (rrproperty.c:76)
==12536== by 0x810BD98: RRDeleteAllOutputProperties (rrproperty.c:88)
==12536== by 0x810A36E: RROutputDestroyResource (rroutput.c:407)
==12536== by 0x808DF4E: FreeClientResources (resource.c:859)
==12536== by 0x808E005: FreeAllResources (resource.c:876)
==12536== by 0x8062300: main (main.c:305)
==12536== Address 0x46ba8ac is 4 bytes inside a block of size 164 free'd
==12536== at 0x40057F6: free (vg_replace_malloc.c:325)
==12536== by 0x8087F1F: _dixFreeObjectWithPrivates (privates.c:357)
==12536== by 0x809832A: DeleteWindow (window.c:926)
==12536== by 0x808DF4E: FreeClientResources (resource.c:859)
==12536== by 0x808E005: FreeAllResources (resource.c:876)
==12536== by 0x8062300: main (main.c:305)
Its a use after free on the root window, since we have already deleted it
at this point. This patch checks if the window we are destroying is the root
window and resets the pointer to NULL if it is.
Signed-off-by: Keith Packard <keithp@keithp.com>
Reviewed-by: Dave Airlie <airlied@redhat.com>
Tested-by: Dave Airlie <airlied@redhat.com>
commit 5d1d9d9ae39fab2ee2ac085f9776f82768828dc8
Author: Jeremy Huddleston <jeremyhu@apple.com>
Date: Sun Aug 1 11:41:58 2010 -0700
XQuartz: xpr: Bail on errors during unlock and destroy
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
commit ee7fd8fc58d9fadfbb92302ddea224537f068538
Author: Jeremy Huddleston <jeremyhu@apple.com>
Date: Sun Aug 1 11:39:14 2010 -0700
XQuartz: UpdateScreen at the end of SetRootless
This will ensure that pRoot is unlocked after the miPaintWindow
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
commit 4fc4cab98d454afbfd0d2f48548b5b481e8e7c82
Author: Jeremy Huddleston <jeremyhu@apple.com>
Date: Thu Jul 29 14:49:10 2010 -0700
XQuartz: Make application switching work better for the no-spaces case
We still have the issue with not raising the frontmost window for the case
when spaces is enabled, and the AppleSpacesSwitchOnActivate preference is
disabled.
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
commit e5bc62a03289f956c54c4699edf47f7ff237b5be
Author: Jeremy Huddleston <jeremyhu@apple.com>
Date: Sun Jul 25 22:29:11 2010 -0700
XQuartz: Ignore kXquartzToggleFullscreen when rootless
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
commit 71af1f71c0492c365707c6b3810f94642ff39352
Author: Keith Packard <keithp@keithp.com>
Date: Thu Aug 12 23:01:59 2010 -0700
Bump to version 1.8.99.906 (1.9 RC6)
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 0af322858e86665ee43f065741318e69c2755510
Author: Keith Packard <keithp@keithp.com>
Date: Thu Aug 12 22:56:36 2010 -0700
Silence GCC warning about uninitialized lastSlave variable
Not an actual bug, but gcc can't tell that this variable cannot be
used without being initialized
Signed-off-by: Keith Packard <keithp@keithp.com>
commit b5cf9c5090d15a50b105470900823f2d398d4bd2
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Thu Aug 12 00:09:01 2010 -0700
Stop checking or calling PtrCtrlProcs
None of them do anything useful now that pointer acceleration is
entirely handled in the server. (Does not completely nuke yet,
since that would be an API/ABI break.)
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit bce12f2956f23c0ee53f7f6485dba631293a0931
Author: Jesse Adkins <jesserayadkins@gmail.com>
Date: Wed Aug 4 23:39:14 2010 -0700
xfree86: parser: Never use constant strings for driver names (fixes #17438)
When the parser sees the "keyboard" driver, it automatically (and
silently) replaces it with the constant string "kbd".
Everybody else uses malloc'd memory for the driver name, so input
device closure assumes it can use free.
Free val.str, so this crash doesn't turn into a memory leak. Whew.
Signed-off-by: Jesse Adkins <jesserayadkins@gmail.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 619ca32202cd22f2a408586cbc906b8bbaeb9358
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Wed Jul 28 15:08:27 2010 +1000
Xi: reset the unused classes pointer after copying
After copying the unused_classes into the device, reset the original
pointer. Otherwise we have two pointers pointing to the same field and both
get freed on device removal.
Some classes already have this behaviour since 51c8fd69.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Keith Packard <keithp@keithp.com>
commit 1a172f3297369a72865232c382abfc14281102a4
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri Jul 23 13:24:34 2010 +1000
xkb: if the button isn't down, don't fake an event.
If the button we're about to fake isn't down (or up), don't fake a release
(or press) event for it. Behaviour is the same as before, this just saves
a few cycles.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Keith Packard <keithp@keithp.com>
commit 651c36e95ec0ac60d3fb98966df4218712ae78c2
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri Jul 23 11:46:30 2010 +1000
xkb: post-fix PointerKeys button events with a DeviceChangedEvent.
commit 14327858391ebe929b806efb53ad79e789361883
xkb: release XTEST pointer buttons on physical releases. (#28808)
revealed a bug with the XTEST/PointerKeys interaction.
Events resulting from PointerKeys are injected into the event processing
stream, not appended to the event queue. The events generated for the fake
button press include a DeviceChangedEvent (DCE), a raw button event and the
button event itself. The DCE causes the master to switch classes to the
attached XTEST pointer device.
Once the fake button is processed, normal event processing continues with
events in the EQ. The master still contains the XTEST classes, causing some
events to be dropped if e.g. the number of valuators of the event in the
queue exceeds the XTEST device's number of valuators.
Example: the EQ contains the following events, processed one-by-one, left to
right.
[DCE (dev)][Btn down][Btn up][Motion][Motion][...]
^ XkbFakeDeviceButton injects [DCE (XTEST)][Btn up]
Thus the event sequence processed looks like this:
[DCE (dev)][Btn down][Btn up][DCE (XTEST)][Btn up][Motion][Motion][...]
The first DCE causes the master to switch to the device. The button up event
injects a DCE to the XTEST device, causing the following Motion events to be
processed with the master still being on XTEST classes.
This patch post-fixes the injected event sequence with a DCE to restore the
classes of the original slave device, resulting in an event sequence like
this:
[DCE (dev)][Btn down][Btn up][DCE (XTEST)][Btn up][DCE (dev)][Motion][Motion]
Note that this is a simplified description. The event sequence injected by
the PointerKeys code is injected for the master device only and the matching
slave device that caused the injection has already finished processing on
the slave. Furthermore, the injection happens as part of the the XKB layer,
before the unwrapping of the processInputProc takes us into the DIX where
the DCE is actually handled.
Bug reproducible with a device that reports more than 2 valuators. Simply
cause button releases on the device and wait for a "too many valuators"
warning message.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Acked-by: Daniel Stone <daniel@fooishbar.org>
Reviewed-by: Keith Packard <keithp@keithp.com>
commit 6dae7f3792611aace1df0cca63bf50c50d93de43
Author: Chris Wilson <chris@chris-wilson.co.uk>
Date: Tue Aug 10 19:30:20 2010 +0100
xace: Invalid reference to out-of-scope data.
The callback data passed by reference to the hook was allocated on stack
within the scope of the case statement. The compiler is free to reuse
any of that stack space whilst making the function call so we may end up
passing garbage into the callback.
References:
Bug 18451 - Xorg server 1.5.2 SEGV during XFixesGetCursorImage()
https://bugs.freedesktop.org/show_bug.cgi?id=18451
v2: Drop the unrelated hunk that snuck in when ammending the commit
message.
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit fbd02046797185715e1a120d52e410ec78fc365f
Author: Jon TURNEY <jon.turney@dronecode.org.uk>
Date: Thu Aug 5 15:19:20 2010 +0100
Cygwin/X: Fix glxWinCreateDrawable() for API change
Commit 9de0e31746d5f0d9d39d11c94ec3cbc04a9935fc changed the signature
of __GLXScreen's createDrawable method.
Update the glxWinCreateDrawable() function in XWin's GLX provider
appropriately.
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Tested-by: Colin Harrison <colin.harrison@virgin.net>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit ff70848e623920779d20f35d47e9e1f34157de47
Author: Keith Packard <keithp@keithp.com>
Date: Fri May 21 09:01:43 2010 -0700
Don't let alpha maps recurse in fb. Bug 23581.
Recursive alpha maps (where one picture's alpha map is set to a
picture with an external alpha map) would be all fine and dandy,
except for the case where the client constructs a loop. Detecting this
case when setting the alpha map values would be difficult as any time
an alpha map is set, the server would have to check for the looping
case.
Instead, a far simpler fix is to simply disallow recursive alpha maps
in the rendering code, the Render spec is ambiguous in this area and
allows us to to ignore the recursive case.
Signed-off-by: Keith Packard <keithp@keithp.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
commit 70a94c5b7a42adc0995bf774c44587a0778be0d0
Author: Jon TURNEY <jon.turney@dronecode.org.uk>
Date: Tue Aug 3 19:49:10 2010 +0100
rootless: fix uninitialized private key assert in non-rootless modes in Cygwin/X
IsFramedWindow() is called from miPaintWindow() if the server has
been built with ROOTLESS defined, irrespective of if RootlessInit()
has ever been called, or not.
Add a check to IsFramedWindow() to check if rootlessWindowPrivateKey
has been registered (as a proxy for checking if the rootless extension
has been initialized) so we don't go on to try to use that key,
triggering an assert.
This bug exposes what appears to be a difference in opinion about
the rootless extension between XQuartz and XWin. XQuartz always
initializes the rootless extension, whereas XWin offers several modes
of operation, and the rootless extension is only used for one of them
That probably means that the all code under compile time guard for
ROOTLESS should be carefully checked that it doesn't also need to be
under a run-time guard
(I've reviewed the other ROOTLESS blocks in dix/events.c and
dix/window.c and they look ok -- keithp)
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Reviewed-by: Keith Packard <keithp@keithp.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 3ab6cd31cbdf8095b2948034fce5fb645422d8da
Author: Adam Jackson <ajax@redhat.com>
Date: Mon Aug 9 15:20:20 2010 -0400
fonts: Fix refcounting for asynchronous font operations (#3040)
When doing Xinerama, we'll dispatch font ops across all backend screens.
If using a font server (such that some operations can sleep), we'll put
the client to sleep once for each screen, but only wake up once, because
we're trying to keep track of the sleep count in _each_ screen's
closure.
Instead, just ask the core whether the client is already asleep.
Signed-off-by: Adam Jackson <ajax@redhat.com>
Reviewed-by: Keith Packard <keithp@keithp.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 35c0dbe4b0a6ab790f4271325b8a0b16894daa8b
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Sun Aug 8 10:03:08 2010 -0400
doc: add missing .gitignore for Xserver-DTrace
The dtrace doc was recently added in commit
9c171d4aee695ab66e6db1ab92539557bd368cfa
Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
commit 05c4fe83fdc20b838fd59658478278dc31a55eb9
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Fri Jul 30 17:43:24 2010 -0700
Check HAVE_XMLTO_TEXT before trying to use xmlto to make text files
Reported-by: Matt Turner <mattst88@gmail.com>
Tested-by: Gaetan Nadon <memsize@videotron.ca>
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
commit a6fb7829ed9bf26c4c2a02c6ed075fb1b17f7b2a
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Mon Jul 26 19:55:27 2010 -0700
Xserver-spec: Update ChangeGC prototype, add ChangeGCXIDs
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Jamey Sharp <jamey@minilop.net>
commit a817271d461e2f95dd7dc62cd1c7d123ce92f555
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Thu Jul 22 23:57:57 2010 -0700
Update Xserver-spec for new devPrivates API
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Patrick E. Kane <pekane52@gmail.com>
commit 40d598a4f84091db743ceef4d60752bb910c3e56
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Thu Jul 22 23:57:02 2010 -0700
Correct function name in dixRegisterPrivateKey comments
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Patrick E. Kane <pekane52@gmail.com>
commit 8d7b7a0d71e0b89321b3341b781bc8845386def6
Author: Kristian Høgsberg <krh@bitplanet.net>
Date: Thu Jul 29 20:36:25 2010 -0400
Set DamageSetReportAfterOp to true for the damage extension
Change the damage extension reporter to queue up events after we chain
to the wrapped functions. Damage events are typically sent out after
the rendering happens anyway, since we submit batch buffers from the
flush callback chain and then flush client io buffers. Compositing
managers relie on this order, and there is no way we could reliably
provide damage events to clients before the rendering happens anyway.
By queueing up the damage events before the rendering happens, there's
a risk that the client io buffer may overflow and send the damage
events to the client before the driver has even seen the rendering
request. Reporting damage events after the rendering fixes this
corner case and better corresponds with how we expect this to work.
Signed-off-by: Kristian Høgsberg <krh@bitplanet.net>
Reviewed-by: Keith Packard <keithp@keithp.com>
commit c65f610e12f9df168d5639534ed3c2bd40afffc8
Author: Kristian Høgsberg <krh@bitplanet.net>
Date: Thu Jul 29 18:52:35 2010 -0400
Always call the flush callback chain when we flush client buffers
We were missing the callback in a couple of places. Drivers may use
the flush callback to submit batched up rendering before events (for
example, damage events) are sent out, to ensure that the rendering
has been queued when the client receives the event.
Signed-off-by: Kristian Høgsberg <krh@bitplanet.net>
Reviewed-by: Keith Packard <keithp@keithp.com>
commit 7e0575baf14ec4a89492fd2780f9ab5b9244afbd
Author: Matt Turner <mattst88@gmail.com>
Date: Tue Jul 27 23:32:36 2010 -0400
ddc: Fix memory leak in GetEDID_DDC1
Mark argument to DDC_checksum as const too.
Signed-off-by: Matt Turner <mattst88@gmail.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 750d4e82a0c1161292d24216bcff200cd6647611
Author: Jeremy Huddleston <jeremyhu@apple.com>
Date: Thu Jul 29 11:39:40 2010 -0700
XQuartz: xpbproxy: Don't take down the whole server on an IO error
Calls pthread_exit to prevent _XIOError from calling exit()
This fixes http://xquartz.macosforge.org/trac/ticket/421
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
commit 98f90145d786695ecbc02a667c6ffe7c619dc67e
Author: Jeremy Huddleston <jeremyhu@apple.com>
Date: Wed Jul 28 18:08:02 2010 -0700
XQuartz: GLX: Don't mangle __GLXDrawable's pDraw
We were incorrectly NULLing out pDraw in __GLXDrawable instead of ours in
__GLXAquaDrawable. (we should refactor to eliminate this redundancy later)
This was causing http://xquartz.macosforge.org/trac/ticket/426
This was benign until commit f0006aa58f6cf7552a239e169ff6e7e4fda532f4
The root cause of this change was fed7ccc481ad1caaa518cafe944c2327a5d0b6c65
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
commit 9c171d4aee695ab66e6db1ab92539557bd368cfa
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Fri Jun 25 16:52:42 2010 -0700
Add documentation of the Xserver DTrace probes
Mostly pulled together from posts to my blog and the docs posted
at http://people.freedesktop.org/~alanc/dtrace/ and converted to
DocBook.
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Patrick E. Kane <pekane52@gmail.com>
commit 6b912b08ce65072b2401167fbf2150b99c0ca6b0
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Sat Jun 19 23:56:20 2010 -0700
Add name argument to CreateNewResourceType documentation
Reflects API change made in commit 895f40792a during Xorg 1.8 development
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Patrick E. Kane <pekane52@gmail.com>
commit 44c9350d72b3eda982c642feb45d6648afc626cf
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Sat Jun 19 23:40:37 2010 -0700
Use DocBook stylesheets from xorg-sgml-doctools if they're available
Bumps minimum xorg-macros requirement from 1.6 to 1.10
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Patrick E. Kane <pekane52@gmail.com>
commit 9fbbff3c0456f1969d45cc957d3260723caf62d7
Merge: 95756f410c 9ac8e206ff
Author: Keith Packard <keithp@keithp.com>
Date: Wed Jul 21 11:56:39 2010 -0700
Merge remote branch 'whot/for-keith'
commit 9ac8e206ffe1016a8bc203261ade6c763a8a4f86
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu Jul 15 15:46:15 2010 +1000
xkb: use GetMaster instead of dev->u.master.
Devices that are both pointers and keyboards are not affected by keyboard
changes as their master device is a master pointer, not a master keyboard.
Use GetMaster() instead to ensure devices that are attached to the paired
master pointer device will still be update.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Keith Packard <keithp@keithp.com>
Reviewed-by: Daniel Stone <daniel@fooishbar.org>
commit c54f81ba7a58faf37a612bd9a45276bb2922b5d8
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu Jul 15 13:24:14 2010 +1000
dix: hack around enter/leave event issues for grabbed devices (#27804)
The current core enter/leave does not cater for device grabs during
enter/leave events. If a window W contains a pointer P1 and a client grabs a
pointer P2, this pointer will not generate enter/leave events inside this
window.
Hack around this by forcing grabbed devices to always send enter/leave
events.
X.Org Bug 27804 <http://bugs.freedesktop.org/show_bug.cgi?id=27804>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Keith Packard <keithp@keithp.com>
commit 95756f410c65a6510a797e94a792b959d45cdb9e
Author: Jan Hauffa <hauffa@in.tum.de>
Date: Sat Jul 17 12:18:39 2010 -0700
rootless: Adjust the frame size of the native root window in RootlessResizeWindow
If the native root window isn't resized as well, we will likely crash the
next time we draw to the root. On OS X, this can be seen by:
1) Put the display preferences in the menu bar and set X11's preferences so you
can access the menu bar in fullscreen mode
2) Set the resolution of your screen lower than normal.
3) Start X11 in fullscreen mode. The root window will cover the screen as
expected.
4) Use the menu bar to increase the resolution of the display. The root
window will now cover the old area and not the full screen, but
'xwininfo -root' will report the full width.
5) Run 'xsetroot -solid red', and we have the crash you mention above.
Leaving/entering fullscreen after #4 will fix the problem. This is because the
WINREC is erased when we leave fullscreen mode and it is recreated upon
re-entry:
RootlessUpdateRooted(FALSE)
RootlessDisableRoot(screenInfo.screens[0])
RootlessDestroyFrame (pRoot, winRec);
RootlessUpdateRooted(TRUE)
RootlessEnableRoot(screenInfo.screens[0])
RootlessEnsureFrame(screenInfo.screens[0]->pRoot)
creates a new WINREC...
Signed-off-by: Jan Hauffa <hauffa@in.tum.de>
Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com>
Acked-By: Jon TURNEY <jon.turney@dronecode.org.uk>
Tested-by: Jeremy Huddleston <jeremyhu@apple.com>
commit a2c13f0d6548310e3cd115cf486d3e43edf23dcc
Author: Keith Packard <keithp@keithp.com>
Date: Wed Jul 14 12:57:29 2010 -0700
Bump to version 1.8.99.905 (1.9 RC5)
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 0fc02c0bf92f694889589e3648acc08d4684de37
Merge: 0540c46066 9d8ec712a6
Author: Keith Packard <keithp@keithp.com>
Date: Tue Jul 13 15:05:36 2010 -0700
Merge remote branch 'jeremyhu/master'
commit 0540c46066f938ad5611c56081cfcd8457a9b718
Author: Michel Dänzer <daenzer@vmware.com>
Date: Tue Jul 13 14:56:53 2010 +0200
EXA: Finish access to pixmap if it's prepared at destruction time.
Previously we assumed every pixmap destroyed during a software fallback was
also created during a software fallback and had access prepared, but that's
not always true.
Fixes a server abort
Reported-by: 邓逸昕 <bupt.dengyixin@gmail.com>
Signed-off-by: Michel Dänzer <daenzer@vmware.com>
Acked-by: Maarten Maathuis <madman2003@gmail.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit d75e8146c414bfd512ba5dbd4a83acb334bbe19b
Author: Keith Packard <keithp@keithp.com>
Date: Mon Jul 12 16:01:34 2010 -0700
Unwrap/rewrap EnterVT/LeaveVT completely, Fixes 28998
Because some EnterVT code needs to remove it self from the
call chain, we need to fix all of the wrappers to correctly
unwrap/rewrap during the call chain. This is a follow-on to the fix
for bug 27114 in commit 68a9ee8370e6f9b38218376ac92d5130a5b0ef1e.
Signed-off-by: Keith Packard <keithp@keithp.com>
Tested-by: Jesse Barnes <jesse.barnes@intel.com>
Reviewed-by: Daniel Stone <daniel@fooishbar.org>
Reviewed-by: Tiago Vignatti <tiago.vignatti@nokia.com>
commit 9d8ec712a67ce71ea7408f0626cda7e0fa7c3bac
Author: Jeremy Huddleston <jeremyhu@apple.com>
Date: Tue Jul 13 08:56:36 2010 -0700
XQuartz: Bump bundle version to 2.6.0 for xorg-server-1.9.0 and X11R7.6
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
commit b2b9c458a46e9a41c3c76ffe83a2b580a41d0e90
Author: Jan Hauffa <hauffa@in.tum.de>
Date: Wed Jun 16 09:25:41 2010 -0700
XQuartz: Remove some dead code.
Signed-off-by: Jan Hauffa <hauffa@in.tum.de>
Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com>
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
commit 648d189548530fa23d97d1e8737f89d297f1c443
Author: Jeremy Huddleston <jeremyhu@apple.com>
Date: Tue Jul 13 08:25:27 2010 -0700
XQuartz: Avoid a crash when mistakenly free()ing in QuartzSetCursor on some configs
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
commit 3209b094a3b1466b579e8020e12a4f3fa78a5f3f
Author: Jesse Barnes <jbarnes@virtuousgeek.org>
Date: Fri Jul 9 10:36:56 2010 -0700
DRI2: re-allocate DRI2 drawable if pixmap serial changes
If a pixmap header is modified or the drawable serial changes, some
aspects of the drawable are likely to have changed so we should
re-allocate the corresponding DRI2 drawable in that case. This is one
way of catching when the root window pixmap changes through xrandr.
Fixes bug https://bugs.freedesktop.org/show_bug.cgi?id=28365.
Reviewed-by: Keith Packard <keithp@keithp.com>
Reviewed-by: Kristian Høgsberg <krh@bitplanet.net>
Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 02b11509b25686ff7bd567ecb78a435701edc4c2
Author: Jesse Barnes <jbarnes@virtuousgeek.org>
Date: Fri Jul 9 10:36:12 2010 -0700
miModifyPixmapHeader: always update serialNumber
We should update the serial number even if we just change a single field.
Reviewed-by: Keith Packard <keithp@keithp.com>
Reviewed-by: Kristian Høgsberg <krh@bitplanet.net>
Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 2307ab5bc9365ebbe04568edb7c7620a23689b70
Merge: c65280ce8d fd4f5059f0
Author: Keith Packard <keithp@keithp.com>
Date: Tue Jul 6 23:54:54 2010 -0400
Merge remote branch 'whot/for-keith'
commit fd4f5059f08165a726071dc9f1ca877038292f6f
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Tue Jul 6 09:19:09 2010 +1000
dix: purge leftover manual key down bit setting.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Daniel Stone <daniel@fooishbar.org>
commit a1afe172559aff010e886cfc2a7a922d4a06c697
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Tue Jul 6 09:16:42 2010 +1000
dix: add aux. functions for button_is_down, set_button_down, set_button_up.
Same as the matching key functions. Buttons, like keys, can have two states
for down/up - one posted, one processed. Posted is set during event
generation (usually in the signal handler). Processed is set during event
processing when the event queue is emptied and events are being delivered to
the client.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Daniel Stone <daniel@fooishbar.org>
commit 32473d6bf38c95b2d6d5ddbf583a1e801c6605e4
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Tue Jul 6 08:56:12 2010 +1000
dix: use BitIsOn/SetBit/ClearBit macros for set_key_down helpers.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Daniel Stone <daniel@fooishbar.org>
commit c18442908080c9833dfd6bb2ff367945d1892421
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Mon Jul 5 16:47:57 2010 +1000
Xi: use set_key_up/down instead of manual bit handling.
We have the wrappers, use them.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 10442ce02b5be7f82b373bee1939e2b523e291d9
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Mon Jul 5 16:54:48 2010 +1000
dix: treat flags as flags, not as value in key_is_down.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Daniel Stone <daniel@fooishbar.org>
commit b46ffd25d3f211e91c67bc618ecbd58257939388
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri Jul 2 15:25:14 2010 +1000
mi: rename miPointerMoved to miPointerMoveNoEvent.
Having miPointerMove and miPointerMoved is confusing, especially since both
do the same thing bar the event delivery. Also, miPointerMove calls
miPointerMoved which indicates some confusion in the temporal alignment of
cause and effect.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Acked-by: Tiago Vignatti <tiago.vignatti@nokia.com>
Reviewed-by: Keith Packard <keithp@keithp.com>
commit dbd621705a5211540b353af81c4af83c297b74dc
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri Jul 2 14:22:03 2010 +1000
mi: De-duplicate some code in mipointer.c
miPointerMoved already has the same code.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Keith Packard <keithp@keithp.com>
commit c65280ce8df4836bd7424a90482e8aa00ab6f447
Author: Robert Hooker <sarvatt@ubuntu.com>
Date: Sat Jun 12 20:23:09 2010 -0400
Increase advertised RENDER protocol minor version to 11
Support for the blend mode operators was added in
0ce42adbf4cff9e7f049d9fc79d588ece5936177
and the requirement was bumped but when things were split off into
include/protocol-versions.h it defined it to 10. render uses
the lower of the client and server advertised versions so it's not
using the new blend mode operators.
Signed-off-by: Robert Hooker <sarvatt@ubuntu.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 9f0b193acdc29e491b6245390cf9f53b5222e6d3
Author: Keith Packard <keithp@keithp.com>
Date: Thu Jul 1 09:13:43 2010 -0400
miDbe window priv priv is pre-allocated, don't use dixSetPrivate (bug 28639)
miDbeInit pre-allocates space in each DBE window private private for a
MiDbeWindowPrivPrivRec. miDbeAllocBackBufferName used the
pre-allocated space correctly (simply fetching it instead of
allocating a new piece of memory). However, it then called
dixSetPrivate anyways, which isn't necessary, and (in the new
dixPrivate world) causes an assert failure.
Signed-off-by: Keith Packard <keithp@keithp.com>
Tested-by: Magnus Kessler <Magnus.Kessler@gmx.net>
Reviewed-by: Magnus Kessler <Magnus.Kessler@gmx.net>
commit a94cb400d15b8c78dc04148cbd8db8e5ec8364b5
Author: Keith Packard <keithp@keithp.com>
Date: Thu Jul 1 09:11:36 2010 -0400
Delete unused miDbe screen private private datatype
MiDbeScreenPrivPrivRec is not used in the server. Remove it, along
with the MI_DBE_SCREEN_PRIV_PRIV macro that tried to use it.
Signed-off-by: Keith Packard <keithp@keithp.com>
Reviewed-by: Magnus.Kessler <Magnus.Kessler@gmx.net>
commit f0fcffe55f280add5e4db2f5e9198a48c6f1b015
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Thu Jun 3 19:00:54 2010 -0700
Update the sprite immediately when moving it with MouseKeys
Fix for OpenSolaris bug 6949755: Mouse Keys are ununusable
and possibly https://bugs.freedesktop.org/show_bug.cgi?id=24856
Ensures waitForUpdate is False before calling SetCursorPosition.
Normally waitForUpdate is False when SilkenMouse is active, True
when it's not. When it's True, the mouse cursor position on
screen is not updated immediately.
This is more critical on Solaris, since we disabled SigIO, thus in turn
disable SilkenMouse, due to the SSE2 vs. signal handler issues described in
Sun bugs 6849925, 6859428, and 6879897.
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 3d9079b898c432a87f9b95c1f39a85f660bf0858
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Thu Jun 3 19:00:53 2010 -0700
Add API to update setting of waitForUpdate screen private in miPointer
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 69b2b5c85ec079ef49f84722daa5f148cedc2e1b
Merge: b90faa7156 1432785839
Author: Keith Packard <keithp@keithp.com>
Date: Thu Jul 1 23:46:53 2010 -0400
Merge remote branch 'whot/for-keith'
commit b90faa71567c4461b28515756ba5c1e6286dda16
Author: Keith Packard <keithp@keithp.com>
Date: Thu Jul 1 23:46:27 2010 -0400
Revert "xkb: merge lockedPtrButtons state from all attached SDs."
Preparing to merge Peter's branch.
This reverts commit 6052710670953b43b4fff5d101b727163fcb1187.
commit 9fb0785449b287ba1998e08613b3c2102ec24842
Author: Keith Packard <keithp@keithp.com>
Date: Thu Jul 1 23:45:50 2010 -0400
Revert "Revert "dix: use the event mask of the grab for TryClientEvents.""
Preparing to merge Peter's branch.
This reverts commit 018c878e9495b21146c8f38617fdd1bf6d8cc73b.
commit 48cac27870992f6bde2c48429ff03c0a7606d5c1
Author: James Jones <jajones@nvidia.com>
Date: Fri Jun 18 17:28:15 2010 -0700
Cast void* to pointer* to appease some compilers.
When this privates.h is included in C++ builds, the compiler
complains about implicitly casting void* to void**. This small
patch fixes that up.
Signed-off-by: James Jones <jajones@nvidia.com>
Reviewed-by: Keith Packard <keithp@keithp.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 14327858391ebe929b806efb53ad79e789361883
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu Jul 1 12:44:57 2010 +1000
xkb: release XTEST pointer buttons on physical releases. (#28808)
If a button release event is posted for the MD pointer, post a release event
through the matching XTEST device. This way, a client who posts a button
press through the XTEST extension cannot inadvertedly lock the button.
This behaviour is required for historical reasons, until server 1.7 the core
pointer would release a button press on physical events, regardless of the
XTEST state. Clients seem to rely on this behaviour, causing seemingly stuck
grabs.
The merged behaviour is kept for multiple keyboard PointerKey events, if two
physical keyboards hold the button down as a result of PointerKey actions,
the button is not released until the last keyboard releases the button.
X.Org Bug 28808 <http://bugs.freedesktop.org/show_bug.cgi?id=28808>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit a71dbc03e65cf7b0654a6eca93ce0bf6a1711ffa
Author: Keith Packard <keithp@keithp.com>
Date: Thu Jul 1 08:27:05 2010 -0400
Bump to version 1.8.99.904 (1.9 RC4)
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 5ea497fc32202ff19c2b7d8ef4eba08889108a87
Author: Tiago Vignatti <tiago.vignatti@nokia.com>
Date: Tue Jun 29 16:08:02 2010 +0300
xfree86: configure: remove vendor and card name matching rules
Although vendor and board naming are used to create the configure file, the
server doesn't actually use it when fetching such file and probing devices.
Reported-by: Richard Barnette <jrbarnette@chromium.org>
Signed-off-by: Tiago Vignatti <tiago.vignatti@nokia.com>
Reviewed-by: Mikhail Gusarov <dottedmag@dottedmag.net>
Reviewed-by: Alex Deucher <alexdeucher@gmail.com>
Tested-by: Richard Barnette <jrbarnette@chromium.org>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 90fd9e40b59e69333d250a795998f44dc3a5dc0c
Author: Tiago Vignatti <tiago.vignatti@nokia.com>
Date: Tue Jun 29 16:08:01 2010 +0300
xfree86: pci: remove superfluous vendor and card name logging
X server suffers in startup time when relying on the pciaccess's linear search
to fetch vendor and video device name from PCI ID file (when existent). Such
names are only used to write the log, which may be superfluous. This
information often is provided by the drivers or likewise users can get the it
using external tools like lspci or scanpci.
This patch remove the references of those functions from X start up.
Reported-by: Richard Barnette <jrbarnette@chromium.org>
Signed-off-by: Tiago Vignatti <tiago.vignatti@nokia.com>
Tested-by: Richard Barnette <jrbarnette@chromium.org>
Reviewed-by: James Cloos <cloos@jhcloos.com>
Reviewed-by: Mikhail Gusarov <dottedmag@dottedmag.net>
Reviewed-by: Alex Deucher <alexdeucher@gmail.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 339f62b1bfadb0ee77d67e351f4e30f5d5e9625f
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Tue Jun 29 15:24:51 2010 +1000
xkb: emulate PointerKeys events only on the master device.
This patch replicates the behaviour for button events. Only generate a
PointerKeys motion event on the master device, not on the slave device.
Fixes the current issue of PointerKey motion events generating key events as
well.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 69ac909878ef80bb74c4a9ca4150eda66debd754
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Tue Jun 29 12:12:53 2010 +1000
xkb: merge lockedPtrButtons state from all attached SDs.
Problem:
lockedPtrButtons keeps the state of the buttons locked by a PointerKeys button
press. Unconditionally clearing the bits may cause stuck buttons in this
sequence of events:
1. type Shift + NumLock to enable PointerKeys
2. type 0/Ins on keypad to emulate Button 1 press
→ button1 press event to client
3. press and release button 1 on physical mouse
→ button1 release event to client
Button 1 on the MD is now stuck and cannot be released.
Cause:
XKB PointerKeys button events are posted through the XTEST pointer device.
Once a press is generated, the XTEST device's button is down. The DIX merges
the button state of all attached SDs, hence the MD will have a button down
while the XTEST device has a button down.
PointerKey button events are only generated on the master device to avoid
duplicate events (see XkbFakeDeviceButton()). If the MD has the
lockedPtrButtons bit cleared by a release event on a physical device, no
such event is generated when a keyboard device triggers the PointerKey
ButtonRelease trigger. Since the event - if generated - is posted through
the XTEST pointer device, lack of a generated ButtonRelease event on the
XTEST pointer device means the button is never released, resulting in the
stuck button observed above.
Solution:
This patch merges the MD's lockedPtrButtons with the one of all attached
slave devices on release events. Thus, as long as one attached keyboard has
a lockedPtrButtons bit set, this bit is kept in the MD. Once a PointerKey
button is released on all keyboards, the matching release event is emulated
from the MD through the XTEST pointer device, thus also releasing the button
in the DIX.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 09645864f5a52882eee51c801b3e610d683e7147
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Tue Jun 29 13:49:27 2010 +1000
xkb: Mark switch case fallthrough with comment.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit c7330ecb5d28d7a92d24feb289f7f1812ce055a4
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Wed Jun 30 13:23:14 2010 +1000
dix: fix up erroneous error message.
(WW) Device 'device name' has 36 axes, only using first 36.
does seem a bit silly.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit dbf249ec6638f0a8dfa4c2286099845aafc8ac88
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Tue Jun 29 10:43:51 2010 +1000
xkb: remove now obsolete comment.
Looks like nothing broke from removing the hardcoded CoreProcessPointerEvent
call. Whoop. Di. Doo.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit f028e70ca714f6956e41754f132cb9b8a1e8db63
Author: Keith Packard <keithp@keithp.com>
Date: Wed Jun 30 08:33:55 2010 -0700
Initialize dev privates before using any
Initializing the dev privates code after allocating the server client
dev privates would cause the memory leak check to fire at server
startup or reset.
Signed-off-by: Keith Packard <keithp@keithp.com>
Acked-by: Daniel Stone <daniel@fooishbar.org>
commit 433d0851cd3e61d841ff374ee0a0f052d5907029
Author: Julien Cristau <jcristau@debian.org>
Date: Fri Jun 25 11:34:44 2010 +0100
Xephyr: fix Xv adaptor capability tests
Signed-off-by: Julien Cristau <jcristau@debian.org>
Reviewed-by: Keith Packard <keithp@keithp.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 9626eedebf620559652ffb1fefa82b5d659e57be
Author: Julien Cristau <jcristau@debian.org>
Date: Thu Jun 24 18:45:11 2010 +0100
configure: bail if Xephyr was requested but its dependencies are missing
Signed-off-by: Julien Cristau <jcristau@debian.org>
Reviewed-by: Jamey Sharp <jamey@minilop.net>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit e6531ae9d5bdd37775e921268366fb76056e22d5
Author: Julien Cristau <jcristau@debian.org>
Date: Thu Jun 24 18:45:10 2010 +0100
Xephyr: fix memory leak in XF86DRIOpenConnection
The allocated bus id string was not being freed.
Signed-off-by: Julien Cristau <jcristau@debian.org>
Reviewed-by: Jamey Sharp <jamey@minilop.net>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 390a8466dd1914f4786b811ff8454f6e0c4b6b04
Author: Ville Syrjälä <ville.syrjala@nokia.com>
Date: Mon Jun 28 23:26:48 2010 +0300
xfree86/modes: Allow the driver to specify initial rotation
When the "Rotate" option isn't specified allow the driver to specify
the initial rotation mode. This way the driver can choose to retain
the same settings that were used by software that was used prior to
starting X.
Signed-off-by: Ville Syrjälä <ville.syrjala@nokia.com>
Reviewed-by: Keith Packard <keithp@keithp.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 6052710670953b43b4fff5d101b727163fcb1187
Author: Keith Packard <keithp@keithp.com>
Date: Wed Jun 30 08:21:04 2010 -0700
xkb: merge lockedPtrButtons state from all attached SDs.
Problem:
lockedPtrButtons keeps the state of the buttons locked by a PointerKeys button
press. Unconditionally clearing the bits may cause stuck buttons in this
sequence of events:
1. type Shift + NumLock to enable PointerKeys
2. type 0/Ins on keypad to emulate Button 1 press
→ button1 press event to client
3. press and release button 1 on physical mouse
→ button1 release event to client
Button 1 on the MD is now stuck and cannot be released.
Cause:
XKB PointerKeys button events are posted through the XTEST pointer device.
Once a press is generated, the XTEST device's button is down. The DIX merges
the button state of all attached SDs, hence the MD will have a button down
while the XTEST device has a button down.
PointerKey button events are only generated on the master device to avoid
duplicate events (see XkbFakeDeviceButton()). If the MD has the
lockedPtrButtons bit cleared by a release event on a physical device, no
such event is generated when a keyboard device triggers the PointerKey
ButtonRelease trigger. Since the event - if generated - is posted through
the XTEST pointer device, lack of a generated ButtonRelease event on the
XTEST pointer device means the button is never released, resulting in the
stuck button observed above.
Solution:
This patch merges the MD's lockedPtrButtons with the one of all attached
slave devices on release events. Thus, as long as one attached keyboard has
a lockedPtrButtons bit set, this bit is kept in the MD. Once a PointerKey
button is released on all keyboards, the matching release event is emulated
from the MD through the XTEST pointer device, thus also releasing the button
in the DIX.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Keith Packard <keithp@keithp.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 28e33ae6f69f716ece5d68e63fc52557236c5f6e
Author: Jesse Barnes <jbarnes@virtuousgeek.org>
Date: Wed Jun 30 07:59:04 2010 -0700
OS support: fix writeable client vs IgnoreClient behavior
When ResetCurrentRequest is called, or IgnoreClient is called when a
client has input pending, IgnoredClientsWithInput will be set. However,
a subsequent IgnoreClient request will clear the client fd from that fd
set, potentially causing the client to hang.
So add an Ignore/Attend count, and only apply the ignore logic on the
first ignore and the attend logic on the last attend. This is
consistent with the comments for these functions; callers must pair
them.
Fixes https://bugs.freedesktop.org/show_bug.cgi?id=27035.
Reviewed-by: Keith Packard <keithp@keithp.com>
Reviewed-by: Daniel Stone <daniel@fooishbar.org>
Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 018c878e9495b21146c8f38617fdd1bf6d8cc73b
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri Jun 25 09:48:10 2010 +1000
Revert "dix: use the event mask of the grab for TryClientEvents."
Behaviour of earlier X servers was to deliver the ButtonPress event
unconditionally, regardless of the actual event mask being set. Thus, a
GrabButton event will always deliver the button press event, a GrabKey
always the key press event, etc. Same goes for XI and XI2.
Reproducible with a simple client requesting a button grab in the form of:
XGrabButton(dpy, AnyButton, AnyModifier, win, True, ButtonReleaseMask,
GrabModeAsync, GrabModeAsync, None, None);
On servers before MPX/XI2, the client will receive a button press and
release event. On current servers, the client receives only the release.
Clients that expect the press event to be delivered unconditionally may
leave the user with a stuck grab.
XTS test results for XGrabButton are identical with and without this patch.
This reverts commit 48585bd1e3e98db0f3df1ecc68022510216e00cc.
Conflicts:
dix/events.c
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Keith Packard <keithp@keithp.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 1884db430a5680e37e94726dff46686e2218d525
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu Jun 24 12:52:53 2010 +1000
Revert "dix: use the event mask of the grab for TryClientEvents."
Behaviour of earlier X servers was to deliver the ButtonPress event
unconditionally, regardless of the actual event mask being set. This is
documented in the protocol:
"This request establishes a passive grab. In the future, the pointer is
actively grabbed as described in GrabPointer, the last-pointer-grab time is
set to the time at which the button was pressed (as transmitted in the
ButtonPress event), and the ButtonPress event is reported if all of the
following conditions are true:
<list of conditions, event mask is not one of them>"
Thus, a GrabButton event will always deliver the button press event, a
GrabKey always the key press event, etc. Same goes for XI and XI2.
Reproducible with a simple client requesting a button grab in the form of:
XGrabButton(dpy, AnyButton, AnyModifier, win, True, ButtonReleaseMask,
GrabModeAsync, GrabModeAsync, None, None);
On servers before MPX/XI2, the client will receive a button press and
release event. On current servers, the client receives only the release.
Clients that expect the press event to be delivered unconditionally.
XTS Xlib13 XGrabButton 5/39 now passes.
This reverts commit 48585bd1e3e98db0f3df1ecc68022510216e00cc.
Effectively reverts commit 1c612acca8568fcdf9761d23f112adaf4d496f1b as well,
the code introduced with 1c612 is not needed anymore.
Conflicts:
dix/events.c
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Acked-by: Daniel Stone <daniel@fooishbar.org>
Reviewed-by: Keith Packard <keithp@keithp.com>
commit 3b3c77b87070ddcdbb2acb114a81628485e7a129
Author: Tiago Vignatti <tiago.vignatti@Nokia.com>
Date: Wed Jun 23 15:18:04 2010 +0300
configure: don't check xfont always for each server
It's already defined inside REQUIRED_LIBS and all DDX are getting it already.
No semantical changes.
Signed-off-by: Tiago Vignatti <tiago.vignatti@nokia.com>
Reviewed-by: Mikhail Gusarov <dottedmag@dottedmag.net>
Reviewed-by: Alex Deucher <alexdeucher@gmail.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 75536ee80595c79bba95a1fb6844126ee08486d4
Author: Tiago Vignatti <tiago.vignatti@nokia.com>
Date: Wed Jun 23 15:18:03 2010 +0300
dix: use one single function to register fpe fonts
X server doesn't need to understand fpe internals, so use
register_fpe_functions from libXfont.
It's required to get new version of libXfont, therefore adjust it to be passed
to autoconf.
Signed-off-by: Tiago Vignatti <tiago.vignatti@nokia.com>
Reviewed-by: Mikhail Gusarov <dottedmag@dottedmag.net>
Reviewed-by: Alex Deucher <alexdeucher@gmail.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit a68a101a730df7f73421555e381a50b074607c5e
Author: Keith Packard <keithp@keithp.com>
Date: Tue Jun 22 12:13:26 2010 -0700
Bump to 1.8.99.903 -- 1.9 RC3
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 2c0159d21788b16607e6ebe4571b57fe78545c2a
Author: Kristian Høgsberg <krh@bitplanet.net>
Date: Mon Jun 14 09:25:22 2010 -0400
list.h: Fix list_for_each_entry_safe()
Can't use next as a macro argument since we're accessing the .next field
of struct list.
Signed-off-by: Kristian Høgsberg <krh@bitplanet.net>
Reviewed-by: Keith Packard <keithp@keithp.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit e2918b67395a48397bf7db545584cc2d4f4e7ccf
Author: Keith Packard <keithp@keithp.com>
Date: Tue Jun 22 12:11:20 2010 -0700
Revert "mi: Remove unused overlay support"
This reverts commit 9120e58556014e514eef9dfe43cdea4b74dc66ae.
Whoops, please revert this patch -- overlay is in use in nvidia drivers,
and it's too late in release cycle to remove it.
I feel really sorry that I kept this patch in my tree. I will submit
another one, removing only XAA overlay hooks which are not used at all.
commit 7673451ade46ebacfdfc02a5190149210198fdd8
Author: Keith Packard <keithp@keithp.com>
Date: Tue Jun 22 11:49:30 2010 -0700
Bump to 1.8.99.902 -- 1.9 RC2
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 8b65f2edb407521e0ac0e207e5d5358986bd46da
Author: Rami Ylimäki <ext-rami.ylimaki@nokia.com>
Date: Tue Jun 22 14:57:20 2010 +0300
record: Prevent a crash on recording client disconnect.
Execute the following steps to reproduce the issue.
1. Run at least two recording clients simultaneously.
$ cnee --record --request-range 1-127 &
$ cnee --record --request-range 1-127 &
2. Kill the recording clients.
$ killall cnee
3. Give X server something to do so that the clients are closed.
$ xinput list
$ xinput list
As a result RecordUninstallHooks accesses NullClient, because
RecordAClientStateChange doesn't clean the recording clients up
properly.
Fix RecordUninstallHooks to fail locally on an assertion instead of
much later in privates code, if NullClient is still accessed because
of some other bug. Fix RecordAClientStateChange to iterate through all
contexts so that modifications of the iterated array during iteration
don't cause contexts to be skipped.
Signed-off-by: Rami Ylimäki <ext-rami.ylimaki@nokia.com>
Reviewed-by: Keith Packard <keithp@keithp.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 660f6ab5494a728c3ca7ba00c305e9ff06c8ecb2
Author: Simon Farnsworth <simon.farnsworth@onelan.com>
Date: Tue Jun 22 10:13:30 2010 +0100
Don't crash when asked if a client that has disconnected was local
ProcDRI2Dispatch uses LocalClient to determine if it's safe to respond
to a client that has made DRI2 requests which aren't sensible for
remote clients (anything but version). When the client has disappeared
mid-request stream (e.g. as a result of a kill -9, or a client-side
bug), LocalClient causes the X server to follow suit, as
((OsCommPtr)client->osPrivate)->trans_conn is NULL at this point.
The simple and obvious fix is to just return "not local" when
trans_conn is NULL, which fixes the crash I was seeing; however Keith
Packard pointed out that just checking trans_conn isn't enough;
quoting Keith:
"This looks almost right to me -- I reviewed the os code to see when
_XSERVTransClose is called (which is what frees the trans_conn data) and
found that every place which called that immediately set trans_conn to
NULL, except for the call in CloseDownFileDescriptor which is only
called from CloseDownConnection and which is immediately followed by
freeing the OsCommRec and setting client->osPrivate to NULL. So, I'd
suggest checking client->osPrivate in addition to the above check."
Signed-off-by: Simon Farnsworth <simon.farnsworth@onelan.com>
Reviewed-by: Keith Packard <keithp@keithp.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 82d41ada993d8cbdcdfea878d1a5b031afe4e593
Author: Dave Airlie <airlied@redhat.com>
Date: Mon Jun 21 16:33:55 2010 +1000
composite: fix freeing of old pixmap until after move/resize/cbw (bug 28345)
The fixes for the composite reallocation failure, were freeing the oldpixmap
straight after reallocating the new one, however this led to some wierd
effects in e16 compositing, and I think in a few other places. This patch
moves the freeing of the pixmap into the post wrapped stage. I'm not sure if
we are actually better off breaking ABI and adding another callback from the
ConfigureWindow to composite to make sure the old pixmap is always freed,
but this should be satisfactory as we should always hit one of the freeing
paths or else its a bug in the DIX.
bug: https://bugs.freedesktop.org/show_bug.cgi?id=28435
Reported-by: Andrew Randrianasulu <randrik@mail.ru>
Signed-off-by: Dave Airlie <airlied@redhat.com>
Reviewed-by: Keith Packard <keithp@keithp.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit c6bc52cb6663138d1273447cb7661fa6e958f539
Author: Dave Airlie <airlied@redhat.com>
Date: Mon Jun 21 14:08:50 2010 +1000
dri2: avoid crash with old dri drivers.
I built latest server and copied over a mesa 7.8 dri2 driver to use with it,
and it crashed in here starting compiz. Looks like we need to validate the
flush extension is registered before calling invalidate.
Signed-off-by: Dave Airlie <airlied@redhat.com>
Reviewed-by: Michel Dänzer <michel@daenzer.net>
Reviewed-by: Keith Packard <keithp@keithp.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 80d1a548d6ce73c2ff097536c1bc7044bf74965d
Author: Dave Airlie <airlied@redhat.com>
Date: Mon Jun 21 10:05:08 2010 +1000
rotation: fix cursor and overlap of one pixel.
Commit 77c7a64e8885696665556c9fbcb3cffb552e367a was introduced to fix
a cursor off by one on Intel hw, however it also move the whole crtc
into an off by one position and you could see gnom-eshell overlapping.
This commit reverts that and instead fixes the cursor hotspot
translation to work like pixman does. We add 0.5 to the cursor vector
before translating, and floor the value afterwards.
Thanks to Soeren (ssp) for pointing out where the real problem was
after explaning how pixman translates points.
Signed-off-by: Dave Airlie <airlied@redhat.com>
Reviewed-by: Keith Packard <keithp@keithp.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 32c706c4ffd7433dbfc79dba8785b1510d2f053f
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Sun Jun 20 20:37:26 2010 -0400
config: declare xserver private dependencies in xorg-server.pc
Any module (drivers) depending on xserver also depends on some of the
server private dependencies. Any driver including xf86.h depends on
xext, kbproto, inputproto and randr.
These dependencies are in separate packages, so anything can happen,
removal, wrong version, etc... and the driver fails during compilation.
Having the private dependencies declared will ensure all packages the
server depends on are present and at the correct version.
Currently each module attempts to check for server dependencies with
various degrees of accuracy. With this patch, the driver will only need
to check for its own explicit dependencies.
Now that xproto is included in Requires.private it is removed from Requires.
All the cflags from both Requires and Requires.private are returned
to caller to pkg-config.
Reviewed-by: Dan Nicholson <dbn.lists@gmail.com>
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 37734ba79ca3a9bad1c1e29d89710c8f9c299210
Author: Colin Harrison <colin.harrison@virgin.net>
Date: Wed Jun 16 18:07:04 2010 +0100
XWin: Fixes for devPrivates API change
Fix some typos in devPrivates API changes in XWin code.
Move allocation of private keys as it's no longer valid to do them during OsVendorInit()
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Reviewed-by: Jamey Sharp <jamey@minilop.net>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit f7dae972aac28c5792566e997c40254e787d246a
Author: Ville Syrjälä <ville.syrjala@nokia.com>
Date: Tue Jun 15 23:25:34 2010 +0300
xv: Don't send port notify when SetPortAttribute fails
Currently a port notify event is sent even if SetPortAttribute
fails. Furthermore the value field in the event will contain the
value that was specified in the failed request. So any client
interested in the actual value of the attribute will have to
double check the current value with GetPortAttribute after
receiving a port notify event.
Fix the problem by sending port notifications only when
SetPortAttribute succeeds.
Signed-off-by: Ville Syrjälä <ville.syrjala@nokia.com>
Reviewed-by: Keith Packard <keithp@keithp.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit c20166739603f86888f28ca2c65f5cf474d0d8c9
Author: Mikhail Gusarov <dottedmag@dottedmag.net>
Date: Sat Jun 12 01:05:07 2010 +0700
os: Remove unused dev_tty_from_init variable
Signed-off-by: Mikhail Gusarov <dottedmag@dottedmag.net>
Reviewed-by: Jamey Sharp <jamey@minilop.net>
commit 2e15f1903dac8473285ad2937c079a08cf7c5d31
Author: Mikhail Gusarov <dottedmag@dottedmag.net>
Date: Sat Jun 12 00:53:38 2010 +0700
os: Remove unused pread/pwrite/lockit functions
Signed-off-by: Mikhail Gusarov <dottedmag@dottedmag.net>
Reviewed-by: Jamey Sharp <jamey@minilop.net>
commit 9120e58556014e514eef9dfe43cdea4b74dc66ae
Author: Mikhail Gusarov <dottedmag@dottedmag.net>
Date: Sat Jun 12 00:30:27 2010 +0700
mi: Remove unused overlay support
The only reference to it in server and drivers is in XAA overlay code which
would segfault as no miInitOverlay is called ever. No segfaults were observed
"in wild", so XAA overlay is probably also unused.
XAA code is modified to act as if miOverlayCopyUnderlay always returned false,
because XAACopyWindow8_32 could only set doUnderlay to true if it's called from
miOverlayMoveWindow or miOverlayResizeWindow, which can only be called if
miInitOverlay has hooked those functions, and no driver (on fd.o) or server code
calls that.
Signed-off-by: Mikhail Gusarov <dottedmag@dottedmag.net>
Reviewed-by: Jamey Sharp <jamey@minilop.net>
commit 91b5aadbdfd9d05ca1ffdeb443e602ecdba1e04d
Author: Mikhail Gusarov <dottedmag@dottedmag.net>
Date: Fri Jun 11 20:20:00 2010 +0700
mi: do not use X11/extensions/shape.h header from libXext
Signed-off-by: Mikhail Gusarov <dottedmag@dottedmag.net>
Tested-by: Dan Nicholson <dbn.lists@gmail.com>
commit b8615d592700b7be319c04cc0563fdeb5a266534
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Sat Jun 12 08:19:16 2010 -0700
Don't coredump on "X -showopts" (bug 25874)
Don't try walking the xf86ConfigLayout.screens table if it's empty
https://bugs.freedesktop.org/show_bug.cgi?id=25874
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Tiago Vignatti <tiago.vignatti@nokia.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 32fd57509c3e06f63ac6b0ad607767fd2b688e5a
Author: Rami Ylimäki <ext-rami.ylimaki@nokia.com>
Date: Fri Jun 18 12:40:58 2010 +0300
record: Register client private to prevent crash.
Running the following command causes an assertion to fail:
cnee --record --request-range 1-127
3 in dixGetPrivateAddr at ../../include/privates.h:122
4 in dixGetPrivate at ../../include/privates.h:137
5 in dixLookupPrivate at ../../include/privates.h:167
6 in RecordInstallHooks at ../../record/record.c:911
7 in ProcRecordEnableContext at ../../record/record.c:2377
8 in ProcRecordDispatch at ../../record/record.c:2571
9 in Dispatch at ../../dix/dispatch.c:432
10 in main at ../../dix/main.c:289
Signed-off-by: Rami Ylimäki <ext-rami.ylimaki@nokia.com>
Reviewed-by: Oliver McFadden <oliver.mcfadden@nokia.com>
Reviewed-by: Tiago Vignatti <tiago.vignatti@nokia.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 75beadd766fed7b12a76e59e57c244e297c2d2cb
Author: Mario Kleiner <mario.kleiner@tuebingen.mpg.de>
Date: Sun Jun 13 18:05:26 2010 +0200
DRI2/xserver: Don't hang in glXSwapBuffers if drawable moves between crtc's (bug 28383)
Detect if a drawable has been moved from an original crtc to a new crtc
with a lower current vblank count than the original crtc inbetween
glXSwapBuffers() calls. Reinitialize drawable's last_swap_target
before scheduling next swap if such a move has taken place.
last_swap_target defines the baseline for scheduling the next swap.
If a movement between crtc's is not taken into account, the swap may
schedule for a vblank count on the new crtc far in the future, resulting
in a apparent "hang" of the drawable for a long time.
Fixes Bugzilla bug #28383.
Signed-off-by: Mario Kleiner <mario.kleiner@tuebingen.mpg.de>
Reviewed-by: Jesse Barnes <jbarnes@virtuousgeek.org>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 868bf3de478fac0080d525137fc728c551c78ea6
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Tue Jun 15 13:22:20 2010 +1000
dix: the default axis mode is Relative, not "0".
Yay for readability.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Fernando Carrijo <fcarrijo@yahoo.com.br>
commit db0d3d4e573c93a8af43499682ed788c7bd0d70d
Author: Xiaoyang Yu (Max) <max.a.yu@intel.com>
Date: Fri Jun 4 17:17:53 2010 +0800
Re-enabled Xnest fix for focus in + modifier bug.
* See https://bugs.freedesktop.org/show_bug.cgi?id=3030
Signed-off-by: Xiaoyang Yu (Max) <max.a.yu@intel.com>
Reviewed-by: Mikhail Gusarov <dottedmag@dottedmag.net>
This takes the xnest way of working around this (see
5904ef2ccd6056b187ca76f104c21e2d686bfc1d "xnest: restore
xnestUpdateModifierState") and copies it to Xephyr.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 505724c5f3e4fc1475fa54f20d08c0c06fb32443
Author: Keith Packard <keithp@keithp.com>
Date: Mon Jun 7 16:28:34 2010 -0700
In DRI2Connect, check to see if DRI2 has been initialized (bug 28424)
This prevents DRI2GetScreen from being invoked with an uninitialized
private key which would cause an assert failure.
Signed-off-by: Keith Packard <keithp@keithp.com>
Tested-by: David Ronis <David.Ronis@McGill.CA>
commit 68a9ee8370e6f9b38218376ac92d5130a5b0ef1e
Author: Keith Packard <keithp@keithp.com>
Date: Fri May 7 22:56:04 2010 -0700
Clean up RandR12 bits on screen close (bug 27114)
When resetting the server, pScrn->EnterVT must be unwrapped or the
next server generation will end up wrapping the wrapper and causing an
infinite recursion on EnterVT.
Signed-off-by: Keith Packard <keithp@keithp.com>
Tested-by: Michael Stapelberg <michael+freedesktop@stapelberg.de>
commit d5ab717768524c8552b81607aaeffb447ab268ee
Author: Keith Packard <keithp@keithp.com>
Date: Thu Jun 10 19:21:18 2010 -0700
Bump to 1.8.99.901 -- 1.9 RC1
Signed-off-by: Keith Packard <keithp@keithp.com>
commit a41d6e9bffbe56cfa1c3b84388a3d9f5a982f1a9
Merge: 7e8f100121 f4190feb25
Author: Keith Packard <keithp@keithp.com>
Date: Fri Jun 11 10:08:13 2010 -0700
Merge remote branch 'dottedmag/for-keithp'
commit 7e8f1001217326cc451974bacf25275420c4bb4e
Author: Éric Piel <E.A.B.Piel@tudelft.nl>
Date: Fri Jun 11 09:16:32 2010 -0700
exa: fix ExaCheckCopyNtoN for exa_classic when source = dest
In case you want to copy a region with source = dest, you have the same pixmap
as source and dest.
At the end of exaPixmapIsOffscreen_classic() the devPrivate.ptr is reset to
NULL (look at the sources).
Now this is what happens in ExaCheckCopyNtoN:
exaPrepareAccess( pDst );
Calls IsOffscreen()
sets devPrivate.ptr to NULL
sets up devPrivate.ptr to real pointer
Everything OK
exaPrepareAccess( pSrc );
Calls IsOffscreen()
sets devPrivate.ptr to NULL
BAILS OUT CAUSE OF NESTED OPERATION SINCE DST EQUALS SRC
We end up with devPrivate.ptr as NULL, and that is clearly wrong.
In particular this fixes a segfault when using the psb driver (bug 28077)
Signed-off-by: Éric Piel <eric.piel@tremplin-utc.net>
Reviewed-by: Michel Dänzer <michel@daenzer.net>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit f4190feb25ecc3d8278decc8bf28a5ef0e568942
Author: Matt Turner <mattst88@gmail.com>
Date: Thu Jun 10 04:08:54 2010 +0700
Remove more superfluous if(p) checks around free(p)
Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Signed-off-by: Matt Turner <mattst88@gmail.com>
Signed-off-by: Mikhail Gusarov <dottedmag@dottedmag.net>
commit 89bd05106e5823fc5cfca9abf082729f2444363b
Author: Matt Turner <mattst88@gmail.com>
Date: Fri Jun 4 21:09:35 2010 -0400
record: move free() to after last use of pContext
No functional change, since free doesn't change the value of the pointer
passed to it, but it makes this code less confusing.
Reviewed-by: Jamey Sharp <jamey@minilop.net>
Signed-off-by: Matt Turner <mattst88@gmail.com>
commit a54a766dfb39fb3df671045878ac706215d83cef
Author: Mikhail Gusarov <dottedmag@dottedmag.net>
Date: Mon Jun 7 03:19:03 2010 +0700
xkb: replace xstrdup with strdup in Win32System
The only caller of Win32System is XkbDDXCompileKeymapByNames. Add allocation
check there to avoid passing NULL pointers to various functions down the code.
Signed-off-by: Mikhail Gusarov <dottedmag@dottedmag.net>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 6e7417c342b0624e3f3c5686bb43026786423692
Author: Mikhail Gusarov <dottedmag@dottedmag.net>
Date: Fri Jun 4 17:05:35 2010 +0700
config: Replace xstrdup with strdup in add_option()
All callers of add_option pass string literal as "key" argument
except one, where non-NULL condition is guarded by if().
Signed-off-by: Mikhail Gusarov <dottedmag@dottedmag.net>
Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
commit e4570f5db5157f4233454c938733a2a0d6a1cb8f
Author: Mikhail Gusarov <dottedmag@dottedmag.net>
Date: Fri Jun 4 17:01:42 2010 +0700
xfree86: Get rid of xstrdup when argument is definitely non-NULL
ditto for XFree86
Signed-off-by: Mikhail Gusarov <dottedmag@dottedmag.net>
Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
commit 416d228481d71204cf9bfad3ab4773abc4757f79
Author: Mikhail Gusarov <dottedmag@dottedmag.net>
Date: Fri Jun 4 17:01:25 2010 +0700
xquartz: Get rid of xstrdup when argument is definitely non-NULL
ditto for XQuartz
Signed-off-by: Mikhail Gusarov <dottedmag@dottedmag.net>
Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
commit eea286f2b9e4b1acf2b1c9800f5a4bc7c3fa968d
Author: Mikhail Gusarov <dottedmag@dottedmag.net>
Date: Fri Jun 4 17:01:05 2010 +0700
xwin: Get rid of xstrdup when argument is definitely non-NULL
ditto for XWin
Signed-off-by: Mikhail Gusarov <dottedmag@dottedmag.net>
Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
commit dd45b7d74696cd4fe9545852640a3c2e66a808fd
Author: Mikhail Gusarov <dottedmag@dottedmag.net>
Date: Fri Jun 4 17:00:46 2010 +0700
kdrive: Get rid of xstrdup when argument is definitely non-NULL
ditto for Kdrive
Signed-off-by: Mikhail Gusarov <dottedmag@dottedmag.net>
Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
commit 16158366954d945db6263f6de505fc02ee03c6cd
Author: Mikhail Gusarov <dottedmag@dottedmag.net>
Date: Fri Jun 4 17:00:15 2010 +0700
dmx: Get rid of xstrdup when argument is definitely non-NULL
ditto for DMX
Signed-off-by: Mikhail Gusarov <dottedmag@dottedmag.net>
Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
commit 6592db6bb526f0c43b4c7b55859c629709e039b4
Author: Mikhail Gusarov <dottedmag@dottedmag.net>
Date: Fri Jun 4 16:58:58 2010 +0700
Get rid of xstrdup when argument is definitely non-NULL
Replace xstrdup with strdup when either constant string is
being duplicated or argument is guarded by conditionals and
obviously can't be NULL
Signed-off-by: Mikhail Gusarov <dottedmag@dottedmag.net>
Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
commit 620ca54aaa0b363fcf68cec1bd6c37e68c988352
Merge: fd69234db0 8ff9b502cf
Author: Keith Packard <keithp@keithp.com>
Date: Thu Jun 10 19:18:53 2010 -0700
Merge remote branch 'alanc/master'
commit fd69234db004e98c663f5c6c4360d2cecaa8a4df
Author: Keith Packard <keithp@keithp.com>
Date: Sun Jun 6 15:21:28 2010 -0700
Ignore RandR timestamps harder
Checking timestamps in post 1.1 randr requests was never a good idea,
let's ignore them and just make the configuration changes.
Signed-off-by: Keith Packard <keithp@keithp.com>
Acked-by: Chase Douglas <chase.douglas@canonical.com>
commit a8ec9eca850f2a7ad4c5cf31c1c011c120688496
Author: Keith Packard <keithp@keithp.com>
Date: Mon Jun 7 13:39:11 2010 -0700
Fix a couple more possible errors with input-only windows
Using type == DRAWABLE_WINDOW to differentiate between pixmaps and
windows isn't sufficient as input-only windows will end up in the
pixmap case. This patch changes a few more code paths to use
WindowDrawable instead.
Signed-off-by: Keith Packard <keithp@keithp.com>
Reviewed-by: Jamey Sharp <jamey@minilop.net>
commit 8ff9b502cfce3828f7855ffba7949d6ebee34031
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Fri Jun 4 08:44:02 2010 -0700
Solaris: avoid memory leak if AGPIOC_INFO ioctl fails
Move malloc after ioctl, so we don't have to worry about free'ing the
memory if the ioctl fails.
[ This bug was found by the Parfait bug checking tool.
For more information see http://research.sun.com/projects/parfait ]
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Mikhail Gusarov <dottedmag@dottedmag.net>
commit c5eb5d69e5183860185a05cfcce16af635cab9aa
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Thu Jun 3 19:28:43 2010 -0700
Record some additional library dependencies in xf86 modules
Helps with symbol resolution when building with -z defs
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Dan Nicholson <dbn.lists@gmail.com>
commit 1c08a37e0eb4746e8974eb7a70ca4b7b84712963
Author: Sam Lau <sam.lau@oracle.com>
Date: Thu Jun 3 19:17:14 2010 -0700
SecurityResource should not segfault when client owning resource has exited
Fixes OpenSolaris bug 6949754:
Xorg crashes when the magnifier is enabled at gdm login greeter window.
http://bugs.opensolaris.org/bugdatabase/view_bug.do?bug_id=6949754
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Eamon Walsh <ewalsh@tycho.nsa.gov>
commit 07a093add0b7e40c4d9b9b59273e3ff9e14a88a7
Merge: 84190d2095 dc614484f9
Author: Keith Packard <keithp@keithp.com>
Date: Thu Jun 10 18:39:10 2010 -0700
Merge remote branch 'whot/for-keith'
commit dc614484f93b67e8b62dbb1bb2fd247fe5a4c850
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu Jun 10 12:21:36 2010 +1000
Xi: don't copy the modifier key count when copying device classes (#25480)
The modifier key count is maintained by the XKB layer and
increased/decreased for all modifiers that set state.
Test case, MD/SD modifier key count in comment:
1. keyboard 1: press and hold Shift_L # SD:1 MD:1
2. keyboard 2: press and release Shift_L # SD:1,0 MD:1,0
<class copy happens> # SD:1 MD:1
3. keyboard 1: release Shift_L # SD:0 MD:1
4. keyboard 1: press and release Shift_L # SD:1,0 MD:2,1
The modifier is now logically down on the MD but not on keyboard 1 or
keyboard 2.
XKB is layered in before the DIX, it increases/decreases the modifier key
count accordingly. In the above example, during (2), the MD gets the key
release and thus clears the modifier bit. (3) doesn't forward the release to
the MD because it is already cleared. The copy of modifierKeysDown when the
lastSlave changes however increases the counter for the held key. On (4),
the press and release are both forwarded to the MD, causing a offset by 1
and thus do not clear the logical modifier state.
X.Org Bug 25480 <http://bugs.freedesktop.org/show_bug.cgi?id=25480>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Acked-by: Daniel Stone <daniel@fooishbar.org>
commit 7805e45284264b4cd286eece02e85426896e9f7b
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu Jun 10 14:31:48 2010 +1000
config: remove redundant DBUS API define, require dbus-1 >= 1.0
It's still being pulled in by the HAL CFLAGS but the requirement to define
this was dropped from DBus pre 1.0 (November 2006).
This means we require dbus 1.0 now.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Daniel Stone <daniel@fooishbar.org>
Reviewed-by: Dan Nicholson <dbn.lists@gmail.com>
commit 66b21b2f455a1dfbc92f7caa571dcff3f3765808
Author: Dan Nicholson <dbn.lists@gmail.com>
Date: Mon Jun 7 20:39:58 2010 -0700
xfree86: Match devices based on current driver setting
Often we want to apply a driver specific option to a set of devices and
don't care how the driver was selected for that device. The MatchDriver
entry can be used to match the current driver string:
MatchDriver "evdev|mouse"
Option "Emulate3Buttons" "yes"
The driver string is a case sensitive match.
Signed-off-by: Dan Nicholson <dbn.lists@gmail.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit a71bdff47d4cc80da6ceeb548db1dcc8e8b59702
Author: Dan Nicholson <dbn.lists@gmail.com>
Date: Mon Jun 7 20:39:57 2010 -0700
xfree86: Allow multiple InputClass Match* entries for && matching
Currently when there multiple InputClass entries of the same type, only
the last entry is used and the previous ones are ignored. Instead,
multiple entries are used to create multiple matching conditions.
For instance, an InputClass with
MatchProduct "foo"
MatchProduct "bar"
will require that the device's product name contain both foo and bar.
This provides a complement to the || style matching when an entry is
split using the "|" token.
The xorg.conf man page has added an example to hopefully clarify the two
types of compound matches.
Signed-off-by: Dan Nicholson <dbn.lists@gmail.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 842625928632ae767b0689fcdb5103c1779a4c91
Author: Dan Nicholson <dbn.lists@gmail.com>
Date: Mon Jun 7 20:39:56 2010 -0700
config: Script to convert HAL fdi settings to InputClass sections
In the new world of udev and InputClass, x11_* settings from HAL fdi
files will not be honored. This script converts those settings into
valid InputClass sections that can be dropped into xorg.conf.d.
Signed-off-by: Dan Nicholson <dbn.lists@gmail.com>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 87a1507da7e7788232d74285ef377b67b70e0fa4
Author: Dan Nicholson <dbn.lists@gmail.com>
Date: Thu Jun 10 06:15:41 2010 -0700
xfree86: Match devices based on USB ID
Sometimes the vendor and product names aren't specific enough to target
a USB device, so expose the numeric codes in the ID. A MatchUSBID entry
has been added that supports shell pattern matching when fnmatch(3) is
available. For example:
MatchUSBID "046d:*"
The IDs are stored in lowercase hex separated by a ':' like "lsusb" or
"lspci -n".
Signed-off-by: Dan Nicholson <dbn.lists@gmail.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 645679c1523eee7028f3244cee57936b93326a2a
Author: Dan Nicholson <dbn.lists@gmail.com>
Date: Thu Jun 10 06:11:10 2010 -0700
xfree86: Match devices based on PnP ID
Serial input devices lack properties such as product or vendor name. This
makes matching InputClass sections difficult. Add a MatchPnPID entry to
test against the PnP ID of the device. The entry supports a shell pattern
match on platforms that support fnmatch(3). For example:
MatchPnPID "WACf*"
A match type for non-path pattern matching, match_pattern, has been added.
The difference between this and match_path_pattern is the FNM_PATHNAME
flag in fnmatch(3).
Signed-off-by: Dan Nicholson <dbn.lists@gmail.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 84190d20954ef7888e4d96832c2a4b3225b4dfa2
Merge: 4172aa137c 5e1ef1f4dd
Author: Keith Packard <keithp@keithp.com>
Date: Thu Jun 10 13:36:35 2010 -0700
Merge remote branch 'jeremyhu/master'
commit 4172aa137c1b9b6f2a25c320d847af1f5ac56fba
Author: Keith Packard <keithp@keithp.com>
Date: Thu Jun 10 07:15:49 2010 -0700
dri2: Only deal with output windows and pixmaps.
This reverts commit fdb081b430ddffb495aa5b05bcc4cf10882ff4b2
"dri2: Deal with input-only windows by using WindowDrawable()"
and replaces it as follows:
Reject the creation of a DRI2 drawable for UNDRAWABLE_WINDOW (input-only
windows) and DRAWABLE_BUFFER (whatever those are) drawables and only look up
privates for the supported drawable types.
The rest of the the code can continue pretending there's only output windows
and pixmaps, which are the only kinds of drawables relevant for DRI2.
Fixes server crash with GLX compositing managers such as compiz or kwin, due
to looking up a window private for a pixmap and getting a bogus pointer.
Signed-off-by: Michel Dänzer <daenzer@vmware.com>
Reviewed-by: Keith Packard <keithp@keithp.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 353e32d3712f3a883a796ba562ec9fb5a8354837
Author: Jamey Sharp <jamey@minilop.net>
Date: Sun Jun 6 06:42:11 2010 -0700
glxdriswrast bugfix: configure swapgc, not gc.
I got this wrong in e2929db7b737413cf93fbebdf4d15abdfebff05c.
Signed-off-by: Jamey Sharp <jamey@minilop.net>
Cc: Kristian Høgsberg <krh@bitplanet.net>
Reviewed-by: Dan Nicholson <dbn.lists@gmail.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit b3548612c7943011f79a910f9a59bb975984d8a6
Author: Mario Kleiner <mario.kleiner@tuebingen.mpg.de>
Date: Sat Jun 5 13:09:28 2010 +0200
DRI2: Don't return junk reply instead of blocking in glXWaitForSbcOML()
DRI2WaitSBC() didn't block if requested targetSBC wasn't yet reached.
Instead it returned a xreply with uninitialized junk return values, then
blocked the connection until targetSBC was reached.
Therefore the client didn't block, but continued with bogus return
values from glXWaitForSbcOML.
This patch fixes the problem by implementing DRI2WaitSBC similar
to the clean and proven DRI2WaitMSC implementation.
Signed-off-by: Mario Kleiner <mario.kleiner@tuebingen.mpg.de>
Reviewed-by: Jesse Barnes <jbarnes@virtuousgeek.org>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 7287ef9e6cf953066e4a092cca9d0e4a279172bf
Author: Mikhail Gusarov <dottedmag@dottedmag.net>
Date: Sun Jun 6 21:18:40 2010 +0700
Remove unnecessary parentheses around return values in functions
This patch was generated by the following Perl code:
perl -i -pe 's/([^_])return\s*\(\s*([^(]+?)\s*\)s*;(\s+(\n))?/$1return $2;$4/g;'
Signed-off-by: Mikhail Gusarov <dottedmag@dottedmag.net>
Reviewed-by: Jamey Sharp <jamey@minilop.net>
Reviewed-by: Daniel Stone <daniel@fooishbar.org>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit d1b4beecbc16448282dcc825dd5c354e96e48eca
Author: Dan Nicholson <dbn.lists@gmail.com>
Date: Mon Jun 7 20:39:53 2010 -0700
xfree86: Add MatchOS InputClass entry for operating system matching
Allow InputClass sections to match against the running operating system
to narrow the application of rules. An example where this could be used
is to specify that the default input driver on Linux is evdev while it's
mouse/kbd everywhere else.
The operating system name is the same as `uname -s`, and matching is
case-insensitive.
Signed-off-by: Dan Nicholson <dbn.lists@gmail.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 9b30fa9f8fedb7ddb5672f93ed1a154d13578c47
Author: Dan Nicholson <dbn.lists@gmail.com>
Date: Mon Jun 7 20:39:52 2010 -0700
xfree86: Refactor InputClass matching code
InputClassMatches was starting to get a little hairy with all the loops
over the tokenized match strings. This adds code, but makes it easier to
read and add new matches.
Signed-off-by: Dan Nicholson <dbn.lists@gmail.com>
Reviewed-by: Jamey Sharp <jamey at minilop.net>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit d09bc8f8e5bb92899f7c90eab6b0907920c7d643
Author: Dan Nicholson <dbn.lists@gmail.com>
Date: Mon Jun 7 20:39:51 2010 -0700
xfree86: Constify InputClass functions
Signed-off-by: Dan Nicholson <dbn.lists@gmail.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 61c35d8ac4b6423caf2dcecb4ff25baaaaa14b1c
Author: Dan Nicholson <dbn.lists@gmail.com>
Date: Mon Jun 7 20:39:50 2010 -0700
config/hal: Missing newline in log message
Signed-off-by: Dan Nicholson <dbn.lists@gmail.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 697c5b010d7f6df0ec9cae6352b125c4cbdbaad3
Author: Dan Nicholson <dbn.lists@gmail.com>
Date: Mon Jun 7 20:39:49 2010 -0700
config/udev: Add verbose info when fetching udev properties
Give the user a chance to see why their input devices are being ignored,
even if they have to start the server with -logverbose.
Signed-off-by: Dan Nicholson <dbn.lists@gmail.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 94547b2d1448232ae316c228d65482cc0b646ac2
Author: Dan Nicholson <dbn.lists@gmail.com>
Date: Mon Jun 7 20:39:48 2010 -0700
config/hal: don't leak the input.tags property
Signed-off-by: Julien Cristau <jcristau@debian.org>
Reviewed-by: Dan Nicholson <dbn.lists@gmail.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 5e1ef1f4dde4615498c1c5e7a4e422c3b3432fe8
Author: Jeremy Huddleston <jeremyhu@apple.com>
Date: Tue Jun 8 13:01:10 2010 -0700
XQuartz: Add more sanity checking around string manipulation for xmodmap
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
commit 0be81f9a163f2838448caee41b2dda274d73391a
Author: Jeremy Huddleston <jeremyhu@apple.com>
Date: Sun Jun 6 16:31:19 2010 -0700
XQuartz: Fix build regression from faeebead7bfcc78535757ca7acc1faf7554c03b7
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
commit b3a7b229e1e1f212bdd185af5443311091824005
Author: Keith Packard <keithp@keithp.com>
Date: Mon Jun 7 21:49:43 2010 -0700
Make DRI_SCREEN_PRIV just return NULL when DRI isn't initialized
The code relied upon the previous devPrivate implementation which
offered this convenience.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit f7af00e9f0e0e1d854b0e882378c032518ab71ca
Author: Ben Skeggs <bskeggs@redhat.com>
Date: Mon Jun 7 10:21:18 2010 +1000
randr: prevent an unnecessary screen resize with multiple displays
crtc->{x,y} is always 0 when xf86DefaultScreenLimits() is called, so we
calculate too small an area for the initial framebuffer and force a resize
to happen.
This commit fixes the code to use desired{X,Y} instead, which contains the
initial output positions.
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Reviewed-by: Dave Airlie <airlied@redhat.com>
Reviewed-by: Keith Packard <keithp@keithp.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 8e97e5f9425639ad0a084150d0b232cad417595d
Author: Keith Packard <keithp@keithp.com>
Date: Mon Jun 7 14:23:47 2010 -0700
If XTest is always required, then eliminate the XTest devPrivate
The internals of XTest are used by Xi and Xkb, and both Xi and Xkb are
always required, so it makes little sense to have XTest place data in
a devPrivate, especially a devPrivate which is only available when the
XTest extension is enabled.
Signed-off-by: Keith Packard <keithp@keithp.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
commit fdb081b430ddffb495aa5b05bcc4cf10882ff4b2
Author: Keith Packard <keithp@keithp.com>
Date: Mon Jun 7 00:54:18 2010 -0700
dri2: Deal with input-only windows by using WindowDrawable()
Input only windows aren't DRAWABLE_WINDOW, but casting them to a
PixmapPtr is a bit harsh, and unlikely to get the appropriate privates
structure. use WindowDrawable instead which checks for both
input-output and input-only windows.
Signed-off-by: Keith Packard <keithp@keithp.com>
Tested-by: Eric Anholt <eric@anholt.net>
commit bc26665661565918af484ccd17caad951010df60
Author: Keith Packard <keithp@keithp.com>
Date: Sun Jun 6 20:45:53 2010 -0700
Initialize private keys in test suite
Make sure all of the private keys used by the test code are
initialized before being used.
Signed-off-by: Keith Packard <keithp@keithp.com>
Tested-by: Robert Hooker <sarvatt@ubuntu.com>
commit f03be727d647183a2176355ad0ac9a6735067be9
Author: Keith Packard <keithp@keithp.com>
Date: Sun Jun 6 16:04:42 2010 -0700
Place glyph privates at correct location within the allocate storage
A glyph allocation consists of :
GlyphRec
numScreens * PicturePtr
glyph privates
Tell the dix private bits to start past the picture pointers.
Signed-off-by: Keith Packard <keithp@keithp.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
commit 67b824a81bb8254827023de351a4a094031f0e94
Author: Mikhail Gusarov <dottedmag@dottedmag.net>
Date: Sun Jun 6 20:37:07 2010 +0700
randr: Make deletion of output properties more robust
Previously there was two branches of code with small discrepancies between them
(especially prop->valid_values field was not free(3)ed). Extract the common
routine and fix double-free prop->valid_values in RRDestroyOutputProperty by
the way.
Signed-off-by: Mikhail Gusarov <dottedmag@dottedmag.net>
Reviewed-by: Jamey Sharp <jamey@minilop.net>
commit 0a4d8cbdcd7b25313fb29ccdb498044af95f7de6
Author: Mikhail Gusarov <dottedmag@dottedmag.net>
Date: Sun Jun 6 15:28:30 2010 +0700
Remove more superfluous if(p) checks around free(p)
This patch has been generated by the following Coccinelle semantic patch:
@@
expression E;
@@
-if(E) { free(E); }
+free(E);
Signed-off-by: Mikhail Gusarov <dottedmag@dottedmag.net>
Reviewed-by: Julien Cristau <jcristau@debian.org>
Reviewed-by: Fernando Carrijo <fcarrijo@yahoo.com.br>
Reviewed-by: Matt Turner <mattst88@gmail.com>
commit 5a0fc0ad21d562612676ef88ef2d533b2391810a
Author: Mikhail Gusarov <dottedmag@dottedmag.net>
Date: Fri Jun 4 15:35:31 2010 +0700
Replace deprecated bzero with memset
Signed-off-by: Mikhail Gusarov <dottedmag@dottedmag.net>
Reviewed-by: Marcin Baczyński <marbacz@gmail.com>
Reviewed-by: Daniel Stone <daniel@fooishbar.org>
Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Matt Turner <mattst88@gmail.com>
commit f9810ba914877b379cb36f1b9755f7923ceca14c
Author: Mikhail Gusarov <dottedmag@dottedmag.net>
Date: Fri Jun 4 14:26:31 2010 +0700
xkb: Remove superfluous if(x) x = realloc(x, sz); else x = malloc(sz); logic
Signed-off-by: Mikhail Gusarov <dottedmag@dottedmag.net>
Reviewed-by: Marcin Baczyński <marbacz@gmail.com>
Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Matt Turner <mattst88@gmail.com>
Reviewed-by: Daniel Stone <daniel@fooishbar.org>
commit 77ea20895ca1d163e14c6b767d8c287c94ba3114
Author: Mikhail Gusarov <dottedmag@dottedmag.net>
Date: Fri Jun 4 14:22:06 2010 +0700
xkb: Remove superfluous if(p) checks around free(p)
Signed-off-by: Mikhail Gusarov <dottedmag@dottedmag.net>
Reviewed-by: Julien Cristau <jcristau@debian.org>
Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Daniel Stone <daniel@fooishbar.org>
commit 5d4e2c594059ffb536c8e506c2623320d3c6a787
Merge: eacc42132e 793dd39946
Author: Keith Packard <keithp@keithp.com>
Date: Sat Jun 5 22:20:28 2010 -0700
Merge remote branch 'jamey/for-keith'
commit 793dd399468ff3ba22ffa9c62fa54fc87261fbe7
Author: Jamey Sharp <jamey@minilop.net>
Date: Tue May 25 15:08:38 2010 -0700
dmx: Split glx scalar swap variables from array swap variables.
This makes hw/dmx/glxProxy/unpack.h more closely resemble glx/unpack.h,
and fixes the "unused variable 'swapEnd'" and "unused variable 'swapPC'"
warnings.
Signed-off-by: Jamey Sharp <jamey@minilop.net>
Reviewed-by: Keith Packard <keithp@keithp.com>
commit eacc42132ed0f1e8f4a4d65a4b6637ab06f7e2aa
Author: Kim Woelders <kim@woelders.dk>
Date: Fri Jun 4 20:20:47 2010 +0200
dix: Remove test for obsolete NO_XINERAMA_PORT macro.
Signed-off-by: Kim Woelders <kim@woelders.dk>
Reviewed-by: Jamey Sharp <jamey@minilop.net>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit a0fe6987b55b5326157b50e169b8d6b9ae26a1ae
Author: Jamey Sharp <jamey@minilop.net>
Date: Sat Jun 5 20:55:29 2010 -0700
Clean up after removal of screen parameters from region macros.
Signed-off-by: Jamey Sharp <jamey@minilop.net>
Reviewed-by: Keith Packard <keithp@keithp.com>
commit 424b593c7872a703d3d0c942b7e8acc0770eb023
Author: Keith Packard <keithp@keithp.com>
Date: Sat Jun 5 21:34:51 2010 -0700
Damage pixmap private key was being mis-registered as a picture key
This would cause all kinds of fun, in particular Xnest would crash at startup.
Reviewed-by: Jamey Sharp <jamey@minilop.net>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 9c121ae45ae1d2ebd892c45e1631716ef5e7d649
Author: Keith Packard <keithp@keithp.com>
Date: Sat Jun 5 21:34:27 2010 -0700
Register Xnest colormap screen private key
This key is used to store the currently installed colormap and must be
registered before we can use it.
Reviewed-by: Jamey Sharp <jamey@minilop.net>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit df534d05208436e9ca8c9b42acff3fbe240e3ec4
Author: Keith Packard <keithp@keithp.com>
Date: Sat Jun 5 21:24:54 2010 -0700
Make GetPictureScreenIfSet check if Render is running
This macro originally checked to see if the Render screen private
index had been allocated. When the privates were changed the first
time, there wasn't any need to check as dixLookupPrivate would simply
return NULL in that case. Now that we care, check to see if the key
has been initialized before asking for the value.
Reviewed-by: Jamey Sharp <jamey@minilop.net>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit e7fc8b32e41e10c057d2787fcc377296be67f2e9
Author: Keith Packard <keithp@keithp.com>
Date: Sat Jun 5 21:08:01 2010 -0700
Move the shadow screen private key initialization to shadowSetup
Some users of the shadow code don't call shadowInit, just shadowSetup
and so make sure the key is initialized there.
Reviewed-by: Jamey Sharp <jamey@minilop.net>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 6bd5f0d75bca727c4686b20eee166c8cae472ba2
Author: Keith Packard <keithp@keithp.com>
Date: Sat Jun 5 21:07:15 2010 -0700
Fix exa_priv.h declarations of privates
exa_priv.h exposes the privates to the rest of the exa code, and yet
the declarations of the privates wasn't fixed when the exa.c versions were.
Reviewed-by: Jamey Sharp <jamey@minilop.net>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 6b306f43384e5c2143197e746a5a39c4ebb2583c
Author: Keith Packard <keithp@keithp.com>
Date: Sat Jun 5 20:58:04 2010 -0700
kdrive: Xv code uses shared screen private instead of kdrive-specific private
When doing the devPrivate API conversion, I missed this as there was
also a local private key which wasn't ever used.
Reviewed-by: Jamey Sharp <jamey@minilop.net>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit ab07e2b8ededaa2193fc199a8c09623d84032280
Author: Keith Packard <keithp@keithp.com>
Date: Fri Apr 30 19:38:48 2010 -0700
Allocate per-screen device/cursor-bits private keys in midispcur
midispcur was abusing the CursorScreenKey to index the cursor_bits
privates, it also had a MAXSCREENS array of keys to index device
privates. Switch both of these to the new dixCreatePrivateKey API and
store a pointer to that in the screen private.
Signed-off-by: Keith Packard <keithp@keithp.com>
Reviewed-by: Jamey Sharp <jamey@minilop.net>
commit 34db537907c6cb2635dbefdce7dcfcae90f7c902
Author: Keith Packard <keithp@keithp.com>
Date: Fri Apr 30 19:36:33 2010 -0700
Add dixCreatePrivateKey API
Keys need to persist through server reset so that the private system
can be cleaned up in dixResetPrivates. In particular, this means that
keys cannot live in objects freed at reset time. This API provides
suitable object lifetime by having the privates code free the key in
the reset path.
Signed-off-by: Keith Packard <keithp@keithp.com>
Reviewed-by: Jamey Sharp <jamey@minilop.net>
commit 495fc3eb2d6c98bde82ae1278f89fcf131fd9bf8
Author: Keith Packard <keithp@keithp.com>
Date: Fri Apr 30 19:38:38 2010 -0700
Change devPrivates implementation.
Each key now declares which object type it belongs to, this permits
keys for different types to share the same offset within the allocated
privates. As a special case for XSELinux, a key may be allocated as
PRIVATE_XSELINUX which will allow it to continue to be used across the
relevant object types.
Signed-off-by: Keith Packard <keithp@keithp.com>
Reviewed-by: Jamey Sharp <jamey@minilop.net>
commit faeebead7bfcc78535757ca7acc1faf7554c03b7
Author: Keith Packard <keithp@keithp.com>
Date: Mon Apr 26 17:22:21 2010 -0700
Change the devPrivates API to require dixRegisterPrivateKey
This patch only changes the API, not the implementation of the
devPrivates infrastructure. This will permit a new devPrivates
implementation to be layed into the server without requiring
simultaneous changes in every devPrivates user.
Signed-off-by: Keith Packard <keithp@keithp.com>
Tested-by: Tiago Vignatti <tiago.vignatti@nokia.com>
commit c865a24401f06bcf1347d8b41f736a066ab25693
Author: Keith Packard <keithp@keithp.com>
Date: Fri Apr 30 22:05:27 2010 -0700
Create separate private key for midispcur cursor bits
The CursorScreenKey array is supposed to be used by the DDX for cursor
private data, but midispcur was abusing it to hold cursor bits private
information. Create a separate set of privates for the dispcur cursor
bits information.
This also renames the device private index and macros to better
reflect their usage:
miDCSpriteKey -> miDCDeviceKey
MIDCBUFFER -> miGetDCDevice
Signed-off-by: Keith Packard <keithp@keithp.com>
Reviewed-by: Jamey Sharp <jamey@minilop.net>
commit 431781a921251d54782f0a4f194bbef1fabd1380
Author: Keith Packard <keithp@keithp.com>
Date: Sat May 15 14:52:39 2010 -0700
Remove dixRegisterPrivateOffset; hard-code devPrivates offsets instead
For predefined resource types, the offset of the devPrivates field was
already kept in a constant table. The only non-predefined type needing
this treatment was dbeDrawableResType, which is just a magic alias for
RT_PIXMAP.
This patch special-cases looking up RC_DRAWABLE offsets and uses the
table directly for everything else.
Signed-off-by: Keith Packard <keithp@keithp.com>
Reviewed-by: Jamey Sharp <jamey@minilop.net>
commit 7ef612de784daaed09ba13f4615c10714614033f
Author: Keith Packard <keithp@keithp.com>
Date: Fri May 21 12:35:29 2010 -0700
Add REGION_ macros for source compatibility with existing drivers.
This makes the region code changes source compatible with existing
code, although none of them are used within the server source itself.
Reviewed-by: Jamey Sharp <jamey@minilop.net>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 965cade6ee7c226f850e806cb2e910793d1536f9
Author: Keith Packard <keithp@keithp.com>
Date: Fri May 21 12:18:22 2010 -0700
Change region implementation from macros to inline functions.
This makes all of the previous macros into inline functions and also
turns all of the direct calls to pixman region code into inline
functions as well.
Reviewed-by: Jamey Sharp <jamey@minilop.net>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 2dc138922b7588515d5f2447e4b9dcdc0bef15e0
Author: Keith Packard <keithp@keithp.com>
Date: Fri May 21 15:05:48 2010 -0700
Rename region macros to eliminate screen argument
This is a combination of a huge mechanical patch and a few small
fixups required to finish the job. They were reviewed separately, but
because the server does not build without both pieces, I've merged
them together at this time.
The mechanical changes were performed by running the included
'fix-region' script over the whole tree:
$ git ls-files | grep -v '^fix-' | xargs ./fix-region
And then, the white space errors in the resulting patch were fixed
using the provided fix-patch-whitespace script.
$ sh ./fix-patch-whitespace
Thanks to Jamey Sharp for the mighty fine sed-generating sed script.
The hand-done changes involve removing functions from dix/region.c
that duplicate inline functions in include/regionstr.h, along with
their declarations in regionstr.h, mi.h and mispans.h.
Reviewed-by: Jamey Sharp <jamey@minilop.net>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit d17e726e89ef644310de77b960b715c2d11088da
Author: Keith Packard <keithp@keithp.com>
Date: Sat May 22 00:09:47 2010 -0700
Move mi/miregion.c to dix/region.c
Reviewed-by: Jamey Sharp <jamey@minilop.net>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 9b6f5f549dfe4c20e3cb3c2ef7095ab47abaca3b
Author: Keith Packard <keithp@keithp.com>
Date: Fri May 21 11:14:59 2010 -0700
Change region implementation names to eliminate the 'mi' prefix
This prepares the file to be moved from mi to dix. This patch
was done mechanically with the included scripts 'fix-miregion' run over
the entire X server and 'fix-miregion-private' run over
include/regionstr.h and mi/miregion.c.
Reviewed-by: Jamey Sharp <jamey@minilop.net>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 1768e51976ae8949d999309bd2384ccad72deecd
Author: Jeremy Huddleston <jeremyhu@apple.com>
Date: Sat Jun 5 15:58:21 2010 -0700
rootless: Fix SetShape regression
This fixes a regression in miext/rootless from 643cb6e87c10ab554c03ada81930001a8ebcc909
Found-by: tinderbox
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
Reviewed-by: Pierre-Loup A. Griffais <pgriffais@nvidia.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 6b4af3b7925978cd79f717761f1b6f33bd8dfbaf
Author: Pauli Nieminen <ext-pauli.nieminen@nokia.com>
Date: Fri Jun 4 16:27:28 2010 +0300
configure: Check for libsha1.pc
xserver fails to detect libsha1. Problem is that configure checks for
sha1.pc when libsha1 provides libsha1.pc.
Signed-off-by: Pauli Nieminen <ext-pauli.nieminen@nokia.com>
Reviewed-by: Mikhail Gusarov <dottedmag@dottedmag.net>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit d163266692235261e1e0cfa6b900f54e6ec63de5
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Thu Jun 3 18:59:04 2010 -0700
Stop searching for XF86Config files
xorg.conf has been used since the X11R6.7 release in April 2004.
6 years has been a generous transition period for users to
"mv XF86Config xorg.conf" and for distros to update their
configuration tools and packages.
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: James Cloos <cloos@jhcloos.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 01c75522b6ed15e979347acd38e234e2cb9006c3
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Thu Jun 3 18:59:03 2010 -0700
Stop searching for XF86Config files
xorg.conf has been used since the X11R6.7 release in April 2004.
6 years has been a generous transition period for users to
"mv XF86Config xorg.conf" and for distros to update their
configuration tools and packages.
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: James Cloos <cloos@jhcloos.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 7f19a7a6e90a4fd7b7ec0256974f62e575218541
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri Jun 4 14:15:04 2010 +1000
xkb: fix invalid memory writes in _XkbCopyGeom.
Classic strlen/strcpy mistake of
foo = malloc(strlen(bar));
strcpy(foo, bar);
Testcase: valgrind Xephyr :1
==8591== Invalid write of size 1
==8591== at 0x4A0638F: strcpy (mc_replace_strmem.c:311)
==8591== by 0x605593: _XkbCopyGeom (xkbUtils.c:1994)
==8591== by 0x605973: XkbCopyKeymap (xkbUtils.c:2118)
==8591== by 0x6122B3: InitKeyboardDeviceStruct (xkbInit.c:560)
==8591== by 0x4472E2: CoreKeyboardProc (devices.c:577)
==8591== by 0x447162: ActivateDevice (devices.c:530)
==8591== by 0x4475D6: InitCoreDevices (devices.c:672)
==8591== by 0x4449EE: main (main.c:254)
==8591== Address 0x6f96505 is 0 bytes after a block of size 53 alloc'd
==8591== at 0x4A0515D: malloc (vg_replace_malloc.c:195)
==8591== by 0x6054B7: _XkbCopyGeom (xkbUtils.c:1980)
==8591== by 0x605973: XkbCopyKeymap (xkbUtils.c:2118)
==8591== by 0x6122B3: InitKeyboardDeviceStruct (xkbInit.c:560)
==8591== by 0x4472E2: CoreKeyboardProc (devices.c:577)
==8591== by 0x447162: ActivateDevice (devices.c:530)
==8591== by 0x4475D6: InitCoreDevices (devices.c:672)
==8591== by 0x4449EE: main (main.c:254)
Reported-by: Dave Airlie <airlied@redhat.com>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by-and-apologised-for: Daniel Stone <daniel@fooishbar.org>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 959a1eaf1c15a691141f1b0dc53757fe9b6e9b13
Author: Dave Airlie <airlied@redhat.com>
Date: Fri Jun 4 11:09:46 2010 +1000
composite: use config notify hook to do pixmap resize.
Since reallocating the backing pixmap can fail, we need to try and do
it before any other side effects of reconfiguring the window happen.
This changes the ConfigNotify hook to return status, and moves the
composite window reconfiguration wrappers to ConfigNotify. They all
basically did the same thing, so we can drop the MoveWindow,
ResizeWindow, ChangeBorderWidth wrappers, and allow ConfigNotify to do
all the work. If reallocation fails we fail before we send any
confiureNotify events, or enter the area we can't recover from.
The only place we now enforce 32k limits are in EXA/UXA/fb, so drivers
that don't use this should probably deal with it in their pixmap
allocate if they don't already.
This also breaks ABI, so we need an alternate fix for older servers,
working on the X server makes me realise why I'm a kernel hacker.
Signed-off-by: Dave Airlie <airlied@redhat.com>
Reviewed-by: Keith Packard <keithp@keithp.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 0f12e86e600522768f5f64eafc1230526e700ab7
Merge: aa7c09f7d0 f114f54986
Author: Keith Packard <keithp@keithp.com>
Date: Thu Jun 3 15:09:32 2010 -0700
Merge remote branch 'jamey/for-keith'
commit f114f54986aca1add4c8808a05d9692e289547e7
Author: Jamey Sharp <jamey@minilop.net>
Date: Fri Apr 23 19:33:49 2010 -0700
Accumulate graphics exposures incrementally in PanoramiXCopyArea/Plane.
This fuses two loops in each function, eliminating an intermediate
MAXSCREENS-sized array from each.
Aside from being more efficient, I believe this is equivalent to the
previous implementation, since
- each per-screen GC has the graphicsExposures flag set the same way,
and
- the REGION_* macros ignore their screen argument.
Signed-off-by: Jamey Sharp <jamey@minilop.net>
Reviewed-by: Keith Packard <keithp@keithp.com>
Reviewed-by: Tiago Vignatti <tiago.vignatti@nokia.com>
Tested-by: Tiago Vignatti <tiago.vignatti@nokia.com> (i686 GNU/Linux)
commit a7c7ebe4b3a0df1a4d1ffe3c690cfb21470f103d
Author: Jamey Sharp <jamey@minilop.net>
Date: Sat May 22 21:13:48 2010 -0700
Delete XineramaScreenRegions cache.
Every screen region consists of a single rectangle, so initializing a
stack-allocated region for each screen on-demand does no heap allocation
and is fast.
This eliminates a MAXSCREENS-sized array.
The REGION_UNINIT calls are no-ops since no boxes are actually allocated
for a single-rectangle region, but it seemed wiser to include them.
Signed-off-by: Jamey Sharp <jamey@minilop.net>
Reviewed-by: Tiago Vignatti <tiago.vignatti@nokia.com>
Tested-by: Tiago Vignatti <tiago.vignatti@nokia.com> (i686 GNU/Linux)
commit a0456da339fa9b3c3e6fead060338ee7348d6460
Author: Jamey Sharp <jamey@minilop.net>
Date: Sun May 23 12:57:52 2010 -0700
XineramaSetCursorPosition: use screen bounds directly, not POINT_IN_REGION.
This hides a MAXSCREENS-sized array as an implementation detail of
panoramiX.c rather than an exported global.
Signed-off-by: Jamey Sharp <jamey@minilop.net>
Reviewed-by: Tiago Vignatti <tiago.vignatti@nokia.com>
Tested-by: Tiago Vignatti <tiago.vignatti@nokia.com> (i686 GNU/Linux)
commit a83cff9f4d622b069c96a68b4e87a669bf1f6446
Author: Jamey Sharp <jamey@minilop.net>
Date: Sun May 23 10:11:47 2010 -0700
Move each screen's x/y origin into ScreenRec.
Many references to the dixScreenOrigins array already had the
corresponding screen pointer handy, which meant they usually looked like
"dixScreenOrigins[pScreen->myNum]". Adding a field to ScreenRec instead
of keeping this information in a parallel array simplifies those
expressions, and eliminates a MAXSCREENS-sized array.
Since dix declared the dixScreenOrigins array, I figure allocating a
screen private for these values is overkill.
Signed-off-by: Jamey Sharp <jamey@minilop.net>
Reviewed-by: Tiago Vignatti <tiago.vignatti@nokia.com>
Tested-by: Tiago Vignatti <tiago.vignatti@nokia.com> (i686 GNU/Linux)
commit 217ccaa5a341018457f468a774c035c0df47d918
Author: Jamey Sharp <jamey@minilop.net>
Date: Sun May 23 11:05:01 2010 -0700
Delete panoramiXdataPtr: it's redundant.
This eliminates a dynamically-allocated MAXSCREENS-sized array.
Signed-off-by: Jamey Sharp <jamey@minilop.net>
Reviewed-by: Tiago Vignatti <tiago.vignatti@nokia.com>
Tested-by: Tiago Vignatti <tiago.vignatti@nokia.com> (i686 GNU/Linux)
commit e7fae9ecc42ab5e73b89117722dbf4117d928f9a
Author: Jamey Sharp <jamey@minilop.net>
Date: Sat May 22 00:26:28 2010 -0700
Move each screen's root-window pointer into ScreenRec.
Many references to the WindowTable array already had the corresponding
screen pointer handy, which meant they usually looked like
"WindowTable[pScreen->myNum]". Adding a field to ScreenRec instead of
keeping this information in a parallel array simplifies those
expressions, and eliminates a MAXSCREENS-sized array.
Since dix uses this data, a screen private entry isn't appropriate.
xf86-video-dummy currently uses WindowTable, so it needs to be updated
to reflect this change.
Signed-off-by: Jamey Sharp <jamey@minilop.net>
Reviewed-by: Tiago Vignatti <tiago.vignatti@nokia.com>
Tested-by: Tiago Vignatti <tiago.vignatti@nokia.com> (i686 GNU/Linux)
commit 80b5d3a3264d2c5167e5ac85a3b04af0f89cece1
Author: Jamey Sharp <jamey@minilop.net>
Date: Fri May 21 23:13:51 2010 -0700
Move each screen's screensaver data into ScreenRec.
Most references to the savedScreenInfo array already had the
corresponding screen pointer handy, which meant they usually looked like
"savedScreenInfo[pScreen->myNum]". Adding a field to ScreenRec instead
of keeping this information in a parallel array simplifies those
expressions, and eliminates a MAXSCREENS-sized array.
Since dix uses this data, a screen private entry isn't appropriate.
Signed-off-by: Jamey Sharp <jamey@minilop.net>
Reviewed-by: Tiago Vignatti <tiago.vignatti@nokia.com>
Tested-by: Tiago Vignatti <tiago.vignatti@nokia.com> (i686 GNU/Linux)
commit 5030540d6cd2aa9bbd4ecb7f4487616f9ef0140a
Author: Jamey Sharp <jamey@minilop.net>
Date: Thu May 27 11:50:52 2010 -0700
midispcur: Add comment explaining why pRootPicture must not be freed.
Signed-off-by: Jamey Sharp <jamey@minilop.net>
Cc: Peter Hutterer <peter.hutterer@who-t.net>
Acked-by: Peter Hutterer <peter.hutterer@who-t.net>
commit f308cbea8c9fa5c5c6705bc301178b167de450d5
Author: Jamey Sharp <jamey@minilop.net>
Date: Mon May 24 18:41:54 2010 -0700
mi: Delete unused flicker-free MoveCursor code.
It's been commented-out for three and a half years and nobody seems to
be missing it enough to resurrect it.
Besides deleting code that is untested and therefore buggy, this saves a
little memory for each pointer device on each screen.
Signed-off-by: Jamey Sharp <jamey@minilop.net>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
commit d1bad1b59f24ab4dcf2d1ce1c5d4f42b5fa40bc1
Author: Jamey Sharp <jamey@minilop.net>
Date: Tue May 25 14:25:07 2010 -0700
dmx: Fix XSetExtensionErrorHandler calls to agree on constness.
Signed-off-by: Jamey Sharp <jamey@minilop.net>
Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
commit aa7c09f7d04d59852b850b2b6993f4cbdc7ec940
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Wed Jun 2 14:31:56 2010 -0700
Install fbdevhw module in normal module directory instead of linux/
Since we no longer support OS-independent custom elfloader modules,
we don't need to put the OS-dependent modules into os-specific subdirs
any more.
We do however still need to install the stubs version of this module
on non-Linux platforms, since a number of drivers link to functions
in it, even when built on non-Linux platforms.
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Michel Dänzer <michel@daenzer.net>
Signed-off-by: Tiago Vignatti <tiago.vignatti@nokia.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit b13d7a8e09c8e3eb5003420c3c0484431e5a052b
Merge: f0ab726d89 dcceb90b1d
Author: Keith Packard <keithp@keithp.com>
Date: Thu Jun 3 07:01:26 2010 -0700
Merge remote branch 'vignatti/for-keith'
commit dcceb90b1dccbbf5793f6ba1ed857013b71dafbc
Author: Tiago Vignatti <tiago.vignatti@nokia.com>
Date: Wed May 19 11:45:46 2010 +0200
xext: delete wrong source reference from fontcache
This should go away in 0b45ba48.
Signed-off-by: Tiago Vignatti <tiago.vignatti@nokia.com>
Reviewed-by: Mikhail Gusarov <dottedmag@dottedmag.net>
commit c043de3261b6e14f2446b2cd9d62dde5860d4720
Author: Tiago Vignatti <tiago.vignatti@nokia.com>
Date: Mon May 3 12:37:25 2010 +0200
configure: sha1: check libsha1 using pkg-config instead
Previously the code was using AC_CHECK_LIB, guaranteeing whether the library
is correct by tracking sha1_begin function. This paranoic checking is not
necessary given there's only one libsha1 in the market, which surely contains
such function.
Moreover, this patch now improves a bit the sha1 implementation checking
behavior using pkg-config to find the right flags that needs to link against.
Signed-off-by: Tiago Vignatti <tiago.vignatti@nokia.com>
Reviewed-by: Mikhail Gusarov <dottedmag@dottedmag.net>
commit f0ab726d8966cab4e50154c216d577db79328d77
Author: Pauli Nieminen <ext-pauli.nieminen@nokia.com>
Date: Wed Apr 21 11:07:47 2010 +0300
DRI2: Use single error path in initialization
Signed-off-by: Pauli Nieminen <ext-pauli.nieminen@nokia.com>
Reviewed-by: Kristian Høgsberg <krh@bitplanet.net>
commit 6eef70dc56bcc1e3047e4e488bcd6ae62c8ffac6
Author: Tiago Vignatti <tiago.vignatti@nokia.com>
Date: Fri Jan 22 18:34:36 2010 +0200
DRI2: Allow building without libdrm
Some drivers use DRI protocol but implement their own kernel rendering
manager. For these drivers, libdrm becomes useless. --disable-libdrm
configure parameter can be used to disable libdrm support in dri2.
To provide ABI/API compatibility for libdrm based drivers, libdrm call
is wrapped in ifdef.
Signed-off-by: Tiago Vignatti <tiago.vignatti@nokia.com>
Signed-off-by: Pauli Nieminen <ext-pauli.nieminen@nokia.com>
Reviewed-by: Kristian Høgsberg <krh@bitplanet.net>
commit cdcb575664d3d60b662c542e782de83a047165c9
Author: Tiago Vignatti <tiago.vignatti@nokia.com>
Date: Fri Jan 22 17:58:17 2010 +0200
DRI2: add AuthMagic hook for driver side support
With this new hook, drmAuthMagic becomes useless and should be deprecated.
You might want to implement AuthMagic on driver side instead.
Signed-off-by: Tiago Vignatti <tiago.vignatti@nokia.com>
Signed-off-by: Pauli Nieminen <ext-pauli.nieminen@nokia.com>
Reviewed-by: Kristian Høgsberg <krh@bitplanet.net>
commit 643cb6e87c10ab554c03ada81930001a8ebcc909
Author: Pierre-Loup A. Griffais <pgriffais@nvidia.com>
Date: Thu May 27 09:11:50 2010 -0700
Only deal with input code when changing the input shape.
Propagate the shape kind all the way to SetShape to avoid performing non-input
operations such as revalidating the tree and generating exposures when only
changing a window's input shape.
Signed-off-by: Pierre-Loup A. Griffais <pgriffais@nvidia.com>
Acked-by: Aaron Plattner<aplattner@nvidia.com>
Reviewed-by: Daniel Stone<daniel@fooishbar.org>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit d90f2cd98a97e6534792d3867b3fba70d850b706
Author: Chris Wilson <chris@chris-wilson.co.uk>
Date: Thu May 27 13:26:23 2010 +0100
xfree86: Unbreak autoconfig following 0abf065e38c4
The move of the PCI device id probing into a separate file neglected to
return the number of found devices, and so the PCI devices were being
overwritten by the default entries for vesa and fbdev.
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Tiago Vignatti <tiago.vignatti@nokia.com>
Cc: Alex Deucher <alexdeucher@gmail.com>
Reviewed-by: Julien Cristau <jcristau@debian.org>
Reviewed-by: Tiago Vignatti <tiago.vignatti@nokia.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 1304b8b27cb12c803c4f51f04cb6f9d508b82c69
Author: Aaron Plattner <aplattner@nvidia.com>
Date: Fri May 28 09:35:54 2010 -0700
Fix pixmap validation in miDbePositionWindow.
miDbePositionWindow allocates two pixmaps: a front buffer, and a back buffer.
If the buffers are supposed to be initialized, it validates a GC against the
front buffer, then uses it to fill and/or copy both the front buffer *and* the
back buffer, without revalidating. If the acceleration architecture needs
different GC funcs for the two pixmaps -- for example if allocation of the front
buffer exhausted video memory -- then this can cause crashes because the GC is
not validated for the back buffer pixmap.
Fix this by performing the rendering for the front buffer first, then
revalidating against the back buffer before performing the back buffer
rendering.
Signed-off-by: Aaron Plattner <aplattner@nvidia.com>
Reviewed-by: Jamey Sharp <jamey@minilop.net>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 91a6359caf24d94343ff76f43ea7b7fc3223203d
Author: Dave Airlie <airlied@redhat.com>
Date: Thu Jun 3 12:16:40 2010 +1000
composite: initialise pOldPixmap to NullPixmap at alloc time.
We just never initialised the malloced value.
Signed-off-by: Dave Airlie <airlied@redhat.com>
Reviewed-by: Keith Packard <keithp@keithp.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 968a79dcf5e17ac3963953ef56b8f94dbd75323b
Author: Nicolas George <nicolas.george@normalesup.org>
Date: Wed Jun 2 13:40:51 2010 +0200
Change keyboard controls on slave keyboards (#27926)
Makes the use of IsMaster in ProcChangeKeyboardControl consistent with other
similar loops.
Signed-off-by: Nicolas George <nicolas.george@normalesup.org>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 108b766c31b57fb1955d34d85673a235c7f743aa
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu May 20 11:04:53 2010 +1000
xfree86: initialize InputAttributes to NULL in the autoconfig code.
Reported-by: Jamey Sharp <jamey@minilop.net>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Jamey Sharp <jamey@minilop.net>
commit 151659f9636088fd70bc5586de97bf43ee706180
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Mon May 24 16:24:03 2010 +1000
test: fix up InputAttributes helper function test.
Just some extra clarification as pointed out by Dan Nicholson,
and that memcpy should have been a memcmp.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Dan Nicholson <dbn.lists@gmail.com>
commit 6cccf0131c8464d8838cae2200730873d7dd9e45
Author: Peter Korsgaard <peter.korsgaard@barco.com>
Date: Tue May 25 11:03:28 2010 +0200
dix: add 3x3 transformation matrix xinput property for multi-head handling
For absolute input devices (E.G. touchscreens) in multi-head setups,
we need a way to bind the device to an randr output. This adds the
infrastructure to the server to allow us to do so.
positionSprite() scales input coordinates to the dimensions of the shared
(total) screen frame buffer, so to restrict motion to an output we need to
scale/rotate/translate device coordinates to a subset of the frame buffer
before passing them on to positionSprite.
This is done here using a 3x3 transformation matrix, which is applied to
the device coordinates using homogeneous coordinates, E.G.:
[ c0 c1 c2 ] [ x ]
[ c3 c4 c5 ] * [ y ]
[ c6 c7 c8 ] [ 1 ]
Notice: As input devices have varying input ranges, the coordinates are
first scaled to the [0..1] range for generality, and afterwards scaled
back up.
E.G. for a dual head setup (using same resolution) next to each other, you
would want to scale the X coordinates of the touchscreen connected to the
both heads by 50%, and translate (offset) the coordinates of the rightmost
head by 50%, or in matrix form:
left: right:
[ 0.5 0 0 ] [ 0.5 0 0.5 ]
[ 0 1 0 ] [ 0 1 0 ]
[ 0 0 1 ] [ 0 0 0 ]
Which can be done using xinput:
xinput set-prop <left> --type=float "Coordinate Transformation Matrix" \
0.5 0 0 0 1 0 0 0 1
xinput set-prop <right> --type=float "Coordinate Transformation Matrix" \
0.5 0 0.5 0 1 0 0 0 1
Likewise more complication setups involving more heads, rotation or
different resolution can be handled.
Signed-off-by: Peter Korsgaard <peter.korsgaard@barco.com>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit e4582d9e5c8649347742a13eae68cf27005296fc
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu May 27 10:42:54 2010 -0400
xfree86: bump ABI_XINPUT_VERSION to 11.
commit c2d0b3b437b7ce6ce975f2ead4d8bb8295ef0ddc
"xfree86: store the InputAttributes in the input device."
introduced the new API. Bump the input version so drivers can handle this
appropriately.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit cd0ef0b6a2f9c6bfeda98684569da922792d3feb
Author: Jamey Sharp <jamey@minilop.net>
Date: Tue May 25 14:30:22 2010 -0700
dmx: Delete unused ChangeKeyboardDevice/ChangePointerDevice.
Daniel Stone deleted the API for these in 2006, in commit
96e32805d12fc36f0fa0926dbfb0dd8a5cadb739.
Signed-off-by: Jamey Sharp <jamey@minilop.net>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 70454864917f534483fa049e067b5646df61c88a
Author: Jamey Sharp <jamey@minilop.net>
Date: Fri May 14 12:31:44 2010 -0700
Ignore build products in the server's test suite.
Signed-off-by: Jamey Sharp <jamey@minilop.net>
Cc: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 8bb88379d95356384e233225bfda6abfd71389b4
Author: Jamey Sharp <jamey@minilop.net>
Date: Tue May 25 15:52:18 2010 -0700
dmx: Remove dead __glXDispSwap_DrawArraysEXT definition.
Eric Anholt made the corresponding fix in glx/render2swap.c in commit
49d38ab2328c409b2a98465b52677af057121513.
Signed-off-by: Jamey Sharp <jamey@minilop.net>
Reviewed-by: Alex Deucher <alexdeucher@gmail.com>
commit c97a3ade5a8718b063292c73a31aac2196fe2452
Author: Jamey Sharp <jamey@minilop.net>
Date: Tue May 25 15:17:30 2010 -0700
dmx: Delete unused local variables.
Signed-off-by: Jamey Sharp <jamey@minilop.net>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 3c3d099fc10c63d746f90c08043d45180d6a7226
Author: Jamey Sharp <jamey@minilop.net>
Date: Tue May 25 13:44:32 2010 -0700
dmx: Xfree -> free
Mikhail fixed the corresponding Xallocs, but missed these uses of Xfree
in commit 3f3ff971ecff9936cebafc813af9193b97bba89c.
Signed-off-by: Jamey Sharp <jamey@minilop.net>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 01ca6400d949a873c0bb5de7e0dbf138e8a7949b
Author: Jamey Sharp <jamey@minilop.net>
Date: Tue May 25 14:02:34 2010 -0700
Xephyr: Fix Xcalloc deprecation warnings.
Signed-off-by: Jamey Sharp <jamey@minilop.net>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 34df659687ad3936ab03d19ce8fdb21f385c2e8a
Author: Jamey Sharp <jamey@minilop.net>
Date: Tue May 25 11:51:32 2010 -0700
xfree86/int10/helper_mem: Fix log message.
Three years ago in commit f62beb6f3609e8b6e61325ac89017590811bbd07 ajax
deleted the code that could have set this format string to anything
else, so just use the format string literal. This makes GCC happy since
it can check the argument types, which, by the way, weren't correct
since this format string doesn't need any arguments.
Signed-off-by: Jamey Sharp <jamey@minilop.net>
Reviewed-by: Alex Deucher <alexdeucher@gmail.com>
Reviewed-by: Tiago Vignatti <tiago.vignatti@nokia.com>
commit 0a98d9e6cec7c611a3c56f97d4ddc0c546975c55
Author: Jamey Sharp <jamey@minilop.net>
Date: Tue May 25 10:30:58 2010 -0700
xf86bigfont: Silence compiler warning by initializing pDesc.
Access to pDesc was always guarded by (nCharInfos > 0), so the code
wasn't actually buggy, but this makes it clear that it's correct.
Signed-off-by: Jamey Sharp <jamey@minilop.net>
Reviewed-by: Alex Deucher <alexdeucher@gmail.com>
commit 4e9d3e413245e7c01c2ff3c0f130b8967754131b
Author: Keith Packard <keithp@keithp.com>
Date: Wed May 26 07:54:35 2010 -0700
Revert "Add a "flags" field to DeleteInputDeviceRequest."
Peter wants to get a larger patch sequence put together and I didn't
read past the commit message to see the 'don't take this patch
please'.
This reverts commit 531ff40301975519af7b20109c17d296312d3f2b.
commit 531ff40301975519af7b20109c17d296312d3f2b
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu May 20 18:07:12 2010 +1000
Add a "flags" field to DeleteInputDeviceRequest.
Some input drivers need to implement an internal hotplugging scheme for
dependent devices to provide multiple X devices off one kernel device file.
Such dependent devices can be added with NewInputDeviceRequest() but they are
not removed when the config backend calls DeleteInputDeviceRequest(),
leaving the original device to clean up.
Example of the wacom driver:
config/udev calls NewInputDeviceRequest("stylus")
wacom PreInit calls
NewInputDeviceRequest("eraser")
NewInputDeviceRequest("pad")
NewInputDeviceRequest("cursor")
PreInit finishes.
When the device is removed, the config backend only calls
DeleteInputDeviceRequest for "stylus". The driver needs to call
DeleteInputDeviceRequest for the dependent devices eraser, pad and cursor to
clean up properly.
However, when the server terminates, DeleteInputDeviceRequest is called for
all devices - the driver must not remove the dependent devices to avoid
double-frees. There is no method for the driver to detect why a device is
being removed, leading to elaborate guesswork and some amount of wishful
thinking.
Though the input driver's UnInit already supports flags, they are unused.
This patch uses the flags to supply information where the
DeleteInputDeviceRequest request originates from, allowing a driver to
selectively call DeleteInputDeviceRequest when necessary.
Also bumps XINPUT ABI.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Dan Nicholson <dbn.lists@gmail.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit c2d0b3b437b7ce6ce975f2ead4d8bb8295ef0ddc
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Tue May 25 17:15:32 2010 +1000
xfree86: store the InputAttributes in the input device.
InputAttributes largely decide which configuration values get merged from
the xorg.conf.d snippets. While they are available in the config backend,
they are not available for any other callers of NewInputDeviceRequest().
Drivers implementing driver-side hotplugging do not have access to these
attributes and cannot have xorg.conf.d snippets specific to dependent
devices. For example, the following case cannot work right now:
Section "InputClass"
MatchProduct "Wacom"
Option "PressCurve" "0 0 100 100"
...
EndSection
Section "InputClass"
MatchProduct "Wacom"
MatchProduct "eraser"
Option "PressCurve" "10 10 50 50"
...
EndSection
The second section is not triggered, as the wacom driver cannot supply the
InputAttributes to NewInputDeviceRequest().
Add the attributes to the IDevRec and merge them into the InputInfoRec to
make them accessible in the driver. This changes the ABI for input drivers.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Dan Nicholson <dbn.lists@gmail.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 86303a338ad563d0b986a3c052104301c310c4ac
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Tue May 25 17:12:34 2010 +1000
dix: add helper functions to duplicate and free InputAttributes.
No special memory handling is used to give drivers the maximum flexibility
with the data. Drivers should be able to call realloc on the product string
if needed and perform similar operations.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Dan Nicholson <dbn.lists@gmail.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit bf78e11839f8278020b604672ff7c3d194232be9
Author: Jamey Sharp <jamey@minilop.net>
Date: Mon May 24 09:15:32 2010 -0700
midispcur: Construct Picture objects lazily in case Render is disabled.
Reverts part of the effects of 518f3b189b6c8aa28b62837d14309fd06163ccbb,
"mi: don't thrash resources when displaying the software cursor across
screens". The per-screen cache is preserved, and the GCs are still
allocated eagerly, but now it doesn't construct pRootPicture until
somebody attempts to draw an ARGB cursor.
I noticed crashes in Xnest, which doesn't support the RENDER extension,
but I suspect other DDXes that support disabling that extension would
have had issues as well.
Signed-off-by: Jamey Sharp <jamey@minilop.net>
Reviewed-by: Pierre-Loup A. Griffais <pgriffais@nvidia.com>
commit bf9b64eefbadbf299d3b841c1890bfcaef5aab1b
Author: Jamey Sharp <jamey@minilop.net>
Date: Mon May 24 09:14:27 2010 -0700
xnest: Don't ignore errors from DeviceCursorInitialize.
Signed-off-by: Jamey Sharp <jamey@minilop.net>
Reviewed-by: Dan Nicholson <dbn.lists@gmail.com>
commit b11465a6ecdc2b8373e6fc8af427edc4602bcaa1
Merge: 7c085aebfe 0abf065e38
Author: Keith Packard <keithp@keithp.com>
Date: Mon May 24 22:18:31 2010 -0700
Merge remote branch 'vignatti/bus-cleanup-take2'
commit 7c085aebfedeb621a6fbeb3f09f4fcc640452044
Author: Jamey Sharp <jamey@minilop.net>
Date: Mon May 24 11:45:42 2010 -0700
xfixes: Remove the invisible cursor sprite, using NullCursor instead.
Oliver McFadden reports that the invisible cursor sprite caused damage
events and thus unnecessary redrawing, so removing it improves
performance when using software cursor sprites, especially on those
devices where you do not want a visible cursor: touchscreen tablets,
embedded devices, etc.
For the xfree86 DDX, if hardware cursors are used, the driver is
required to provide a HideCursor function, which will be called instead
of trying to set a null cursor. I think software cursors are already
safe. The other DDXes also look safe.
As far as I can tell, there's no reason to realize a null cursor. I
think everything that handles null cursors doesn't rely on any setup in
RealizeCursor, and treats them as empty cursors.
Xnest assumes that if a cursor is created, it will be realized before it
is freed, which didn't happen if the invisible cursor was never used in
a server generation. So this fixes a segfault in Xnest as well.
Signed-off-by: Jamey Sharp <jamey@minilop.net>
Cc: Oliver McFadden <oliver.mcfadden@nokia.com>
Signed-off-by: Oliver McFadden <oliver.mcfadden@nokia.com>
Tested-by: Oliver McFadden <oliver.mcfadden@nokia.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 0abf065e38c4c48917054eb3e39e12bd20e6e8ec
Author: Tiago Vignatti <tiago.vignatti@nokia.com>
Date: Thu May 20 19:24:47 2010 +0300
xfree86: move all pci code from auto configurator into a meaningful location
This patch creates the private xf86PciMatchDriver hook, which goes inside pci
code to match the drivers found in the system.
Now there's no direct references to PCI inside xf86AutoConfig.c anymore.
Signed-off-by: Tiago Vignatti <tiago.vignatti@nokia.com>
Reviewed-by: Alex Deucher <alexdeucher@gmail.com>
commit 0ceac6f64f5ad9bc2ac4b19be2dd245ffba78b05
Author: Tiago Vignatti <tiago.vignatti@nokia.com>
Date: Thu May 20 18:23:24 2010 +0300
xfree86: no need to check for the configuration case when matching devices
xf86MatchDevice will never be called in configuration time.
Signed-off-by: Tiago Vignatti <tiago.vignatti@nokia.com>
Reviewed-by: Alex Deucher <alexdeucher@gmail.com>
commit b0eef1101815b08da2d375af7bec2be3136cf713
Author: Tiago Vignatti <tiago.vignatti@nokia.com>
Date: Thu May 20 18:19:14 2010 +0300
xfree86: organize and group all pci related stuff inside xf86.h
Signed-off-by: Tiago Vignatti <tiago.vignatti@nokia.com>
Reviewed-by: Alex Deucher <alexdeucher@gmail.com>
commit 47df5a489ea69a68e753367423bfbe8830521f4e
Author: Tiago Vignatti <tiago.vignatti@nokia.com>
Date: Thu May 20 17:39:59 2010 +0300
xfree86: remove BUS_ISA type given we don't support anymore
Should go together within commit df14682a.
Signed-off-by: Tiago Vignatti <tiago.vignatti@nokia.com>
Reviewed-by: Alex Deucher <alexdeucher@gmail.com>
commit 9d000a5509e0a356ee33ad08e4dc967a2ef8cbe0
Author: Tiago Vignatti <tiago.vignatti@nokia.com>
Date: Thu May 20 16:52:37 2010 +0300
xfree86: remove all kind of bus and PCI dependency from the common helper file
Move all PCI procedures from xf86Helper.c to a more meaningful place (namely
xf86pciBus.c). xf86Helper.c is free of PCI code now.
Signed-off-by: Tiago Vignatti <tiago.vignatti@nokia.com>
Reviewed-by: Alex Deucher <alexdeucher@gmail.com>
commit 610009cf39984f2f5e818a221b626f7af10bd90e
Author: Tiago Vignatti <tiago.vignatti@nokia.com>
Date: Tue May 18 20:54:28 2010 +0300
xfree86: bus: remove useless field from EntityRec
RAC is the champion of remaining trash for sure!
Signed-off-by: Tiago Vignatti <tiago.vignatti@nokia.com>
Reviewed-by: Alex Deucher <alexdeucher@gmail.com>
Reviewed-by: Keith Packard <keithp@keithp.com>
commit 95889a569feabd3f803afb92950d067bd76e7397
Author: Tiago Vignatti <tiago.vignatti@nokia.com>
Date: Tue May 18 20:48:35 2010 +0300
xfree86: bus: delete useless xf86FindPrimaryDevice
This function had a wrong name and was just logging the primary device. No one
cares about it honestly.
Signed-off-by: Tiago Vignatti <tiago.vignatti@nokia.com>
Reviewed-by: Alex Deucher <alexdeucher@gmail.com>
commit f6865909485d7d282c8131a2ae306143ad51ba2b
Author: Tiago Vignatti <tiago.vignatti@nokia.com>
Date: Tue May 18 19:39:31 2010 +0300
xfree86: bus: remove unused headers
Signed-off-by: Tiago Vignatti <tiago.vignatti@nokia.com>
Reviewed-by: Alex Deucher <alexdeucher@gmail.com>
commit 111b1fff1ca69724a8350c4375089c312329c378
Author: Tiago Vignatti <tiago.vignatti@nokia.com>
Date: Tue May 18 19:35:10 2010 +0300
xfree86: bus: remove unused pci macros
Should be gone in commits 3c03d9f1 and a9d7d659a respectively.
Signed-off-by: Tiago Vignatti <tiago.vignatti@nokia.com>
Reviewed-by: Alex Deucher <alexdeucher@gmail.com>
commit 2ffffb4daf6161e6a22d81442ecf6209acc9e975
Merge: b5e0f6d8f4 d5306084b5
Author: Keith Packard <keithp@keithp.com>
Date: Sun May 23 23:22:08 2010 -0700
Merge remote branch 'alanc/docs'
commit b5e0f6d8f45c5b24eb50b305c66fa80c783ef488
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Mon May 24 12:25:15 2010 +1000
xfree86: fix multiple InputAttributes tag matching.
attr->tags is an array of strings (null-terminated). When matching, match
against each string instead of each [i,end] substring in the first tag.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Jamey Sharp <jamey@minilop.net>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit d5306084b57583c670c56ce9e7d3c78cca7aa07b
Author: Brice Goglin <bgoglin@debian.org>
Date: Sat May 22 20:29:02 2010 +0200
Remove obsolete reference to README.DRI in xorg.conf.man
Signed-off-by: Brice Goglin <Brice.Goglin@ens-lyon.org>
Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
commit 89dd7d2b6fe18f32c2f9336c3d8cd9f35490e5ae
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Sat May 22 10:33:04 2010 -0700
Remove ancient documentation of IBM RapidAccess keyboard hack
Keyboard setup belongs in drivers, not in a document no one sees
because we don't even install it.
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Julien Cristau <jcristau@debian.org>
Reviewed-by: Alex Deucher <alexdeucher@gmail.com>
commit 480fcdf0335abae0ee544b022c7985211eee462f
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Sat May 22 10:29:47 2010 -0700
Remove completely out-of-date README.DRI
The license only allows distribution of verbatim copies, so we can't
update it, even to correct the incorrect address to send updates to.
The Mesa & DRI web pages are much better sources of current information
anyway.
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Julien Cristau <jcristau@debian.org>
commit 1805c74d9b0ed46802481bcd6beea5feeb60212c
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Sat May 22 10:29:00 2010 -0700
Add RandR 1.2 README.modes doc to EXTRA_DIST
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Julien Cristau <jcristau@debian.org>
commit 5939e39a641773a36c22104e1184143678dca7a2
Author: Dave Airlie <airlied@redhat.com>
Date: Mon May 24 09:31:51 2010 +1000
xf86: allow for no outputs connected at startup operation.
When nothing is connected at startup and we canGrow, allow the server to start with a 1024x768 framebuffer, and when the drivers send hotplug events this will expand to the correct size dynamically.
Reviewed-by: Keith Packard <keithp@keithp.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit b9f48d60bc0c839bd323c582231e8e7e2b810af6
Author: Jamey Sharp <jamey@minilop.net>
Date: Wed May 19 10:44:33 2010 -0700
Device init: Don't crash when CreateGC fails.
ActivateDevice was ignoring errors from DeviceCursorInitialize, so
cursor-related calls failed later. Jeremy Huddleston saw that crash in
miPointerConstrainCursor, while with Xvfb I saw it in
miSpriteRealizeCursor.
miDCDeviceCleanup frees any non-NULL GCs. miDCDeviceInitialize calls
Cleanup on any failure, but if it failed early then some of the pointers
in the miDCBufferPtr were garbage. Switch from malloc to calloc to
ensure everything's initialized safely first.
With these two fixes, if CreateGC fails then the server gracefully fails
in FatalError instead of segfaulting.
Signed-off-by: Jamey Sharp <jamey@minilop.net>
Cc: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit c51534961e1bb4c68ff881758862d2f85f572ce7
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Sat May 22 11:11:48 2010 -0700
xorg-server.pc Requires: xproto >= 7.0.17
Since the headers we export in the SDK use the _X_NORETURN #define
introduced in xproto 7.0.17, drivers built with the SDK will also
need to have at least that version of xproto installed.
I considered exporting the version from configure.ac, but decided not
to since the minimum required to build the X server may not always
be the same as the minimum required to build drivers (for instance,
if the X server used a new #define in its .c files or internal headers,
but didn't export it in any of the SDK headers).
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Julien Cristau <jcristau@debian.org>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit e90f20eed394de2200aba42bd61fd31c1067ac33
Author: Jamey Sharp <jamey@minilop.net>
Date: Fri May 21 22:16:50 2010 -0700
Declare functions that unconditionally call FatalError as _X_NORETURN.
For AtomError, this should fix a clang warning; in the other cases it's
just good documentation.
Signed-off-by: Jamey Sharp <jamey@minilop.net>
Cc: Jeremy Huddleston <jeremyhu@apple.com>
Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 9d31d5b639c2a6ab8b1a80a0e2f0ee2c4f8cddd3
Author: Adam Jackson <ajax@redhat.com>
Date: Mon May 10 11:48:31 2010 -0400
vfb: Remove dead variable and header file
Signed-off-by: Adam Jackson <ajax@redhat.com>
Reviewed-by: Jamey Sharp <jamey@minilop.net>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit d8cbcbc01d1355d55c1c0af64f7f7f61629f6c61
Author: Jamey Sharp <jamey@minilop.net>
Date: Fri May 21 11:12:26 2010 -0700
doPolyText: forget about FontChange's XID after looking up pFont.
As of e2929db7b737413cf93fbebdf4d15abdfebff05c, doPolyText uses pFont
consistently rather than looking it up again from the saved XID.
clang noticed that "oldfid = fid" could run when fid hadn't been
initialized yet.
Signed-off-by: Jamey Sharp <jamey@minilop.net>
Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com>
Tested-by: Jeremy Huddleston <jeremyhu@apple.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 989db930d739483759087b13b8d9a043299feafb
Author: Aaron Zang <Aaron.Zang@Sun.COM>
Date: Thu May 20 17:56:28 2010 -0700
Solaris: Use VT_SET_CONSUSER ioctl to set Console User rights profile
When Xorg is started on display :0, this ioctl is called to grant the
user the rights traditionally associated with /dev/console (before VT
support was added), such as access to local peripheral devices.
Also adds a Solaris-specific -C flag to force starting on /dev/console
instead of /dev/vt*, allowing programs like xterm -C to access the
console device.
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 98553e52a14b97a03aef8dc4fc0300b3f4c2c4b5
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Thu May 20 17:56:27 2010 -0700
vbe.h: Use __attribute__((packed)) on Sun cc 5.9 & later as well as gcc
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 7b09335a46f9428141811230c69eef7968531359
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Thu May 20 17:56:26 2010 -0700
Xserver(1) man page updates
- Note that -br is now default.
- Move -bs after -br for alphabetical ordering.
- Remove -config option that's been hidden in "ignore" section,
since ajax removed the -config code a couple years back.
- Add -nocursor option.
- Add xinput & xrandr to list of runtime server control programs
- Replace XDarwin with Xquartz in list of Xservers
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit cf4f3d051858aadedd6e333bb317a1daa3987ad7
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri May 21 13:30:25 2010 +1000
dix: remove obsolete comment.from EnableDevice.
The code this comment was referring to was removed in
8b5086250aa5dae8de8b763408ff480d7beac819 "Eliminate bogus event resizing."
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Daniel Stone <daniel@fooishbar.org>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 5754e66044571d549c295b7c9e02ce3348dbe3c7
Author: Jamey Sharp <jamey@minilop.net>
Date: Thu May 20 10:46:43 2010 -0700
Replace screen->rgf scratch GC flags with a bit in each GC.
This eliminates a poorly-named, poorly-documented field from the
ScreenRec, using a previously-unused flag bit in each GC instead.
Signed-off-by: Jamey Sharp <jamey@minilop.net>
Cc: Keith Packard <keithp@keithp.com>
Reviewed-by: Keith Packard <keithp@keithp.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 5a7275d78a2f1c20ed5bb7b228cf370c4ada22c9
Author: Keith Packard <keithp@keithp.com>
Date: Thu May 20 13:57:02 2010 -0700
Find windows GL wrapper files in $(srcdir) instead of .
This fixes 'make distcheck' for me.
Signed-off-by: Keith Packard <keithp@keithp.com>
Reviewed-by: Julien Cristau <jcristau@debian.org>
commit 1197a87b5638037cc48084fba4eec9d3b599e900
Author: Keith Packard <keithp@keithp.com>
Date: Thu May 20 13:40:24 2010 -0700
winpriv.h was moved from hw/xwin to hw/xwin/glx in November
hw/xwin/Makefile.am was referencing this instead of hw/xwin/glx/Makefile.am
Signed-off-by: Keith Packard <keithp@keithp.com>
Reviewed-by: Julien Cristau <jcristau@debian.org>
commit 1cad520f3f1d9d520422e3e4d5d8f4ea85a212a4
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Mon May 17 20:35:10 2010 -0700
XFree86 Design doc: Convert LinuxDoc ``quotes'' to DocBook <quote> tags
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Tested-by: Gaetan Nadon <memsize@videotron.ca>
commit 8367913be3305be4f03d095615d3885107094427
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Fri May 14 22:05:50 2010 -0700
XFree86 Design doc: Explain this version covers the current Xorg release
Update the title & preface to explain that while this was originally
the XFree86 4.0 design, we've changed a lot since forking.
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Tested-by: Gaetan Nadon <memsize@videotron.ca>
commit 78fe4be4c43db1f07a30e8a6c9a17f81c1082d76
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Mon May 17 20:27:10 2010 -0700
Show Xserver release/version date in DIX & DDX docs
Uses a fake absolute path to the entity definition files so that
the xmlto --searchpath will work for finding the actual path
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Dan Nicholson <dbn.lists@gmail.com>
Tested-by: Gaetan Nadon <memsize@videotron.ca>
commit 2bdc73bcf41ff0c10e70ecc15fc8b8333af6db65
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Fri May 14 15:33:46 2010 -0700
Move Xserver-spec.xml from xorg-docs to doc/xml
Allows keeping it in sync with the sources it documents, and to be
released with them
Requires the previous patch to convert the Xserver tree from
LinuxDoc to DocBook for SGML/XML documents.
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Rémi Cardona <remi@gentoo.org>
Tested-by: Gaetan Nadon <memsize@videotron.ca>
commit fc6ebe1e1d3057378f61f992549a98e67a04dc6c
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Fri May 14 14:56:09 2010 -0700
Convert LinuxDoc documents to DocBook/XML
Only the markup/formatting is changed - the contents should still
be wildly out of date for now.
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Rémi Cardona <remi@gentoo.org>
Tested-by: Gaetan Nadon <memsize@videotron.ca>
commit ebd745ced89b2a2d9f6b4dcbd9f5f7e7f3b35451
Author: Simon Farnsworth <simon.farnsworth@onelan.com>
Date: Thu May 20 09:58:38 2010 +0100
Add documentation for the new DefaultModes option
This patch adds documentation for the DefaultModes monitor option
added in the previous patch.
Signed-off-by: Simon Farnsworth <simon.farnsworth@onelan.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit cfc629148891be317ba60f2495abcda485780191
Author: Simon Farnsworth <simon.farnsworth@onelan.com>
Date: Thu May 20 09:58:37 2010 +0100
Add configuration option to disable default modes on an output
Setting 'Option "DefaultModes" "No"' in an output will guarantee that
X will omit the default modes, just picking up modes from the
configuration file and modes provided by the output.
Signed-off-by: Simon Farnsworth <simon.farnsworth@onelan.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit a1c2bdb6ab7a4f374844f80e83620b155991e817
Author: Michel Dänzer <daenzer@vmware.com>
Date: Thu May 20 10:13:06 2010 +0200
EXA: Wrap Glyphs even without Composite acceleration.
In order to avoid migration ping-pong when accumulating glyphs in a mask
picture.
Signed-off-by: Michel Dänzer <daenzer@vmware.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 00581d4a42e2a0e7652834973645a4a9ed59cf93
Author: Tiago Vignatti <tiago.vignatti@nokia.com>
Date: Fri May 14 19:31:56 2010 +0300
configure: force new xproto version dependency
commit bca85e2e127a8a23e3a2debcfeb3ae07cd3c66ac introduced it.
Use the version that includes _X_NORETURN
Signed-off-by: Tiago Vignatti <tiago.vignatti@nokia.com>
Reviewed-by: Julien Cristau <jcristau@debian.org>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 103507af0c0ce7d7482a67163249864af36a2374
Merge: 8bd8d81dc4 99fcf655bd
Author: Keith Packard <keithp@keithp.com>
Date: Wed May 19 22:27:53 2010 -0700
Merge remote branch 'vignatti/bus-cleanup'
commit 8bd8d81dc473bf72ea108b1896a55e32defa02e2
Merge: c620a1c0a4 66d5ecc5fd
Author: Keith Packard <keithp@keithp.com>
Date: Wed May 19 22:27:20 2010 -0700
Merge remote branch 'vignatti/animcursor-state-fix'
commit c620a1c0a4ca564e778cce019dd30046c6969956
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu May 20 10:26:56 2010 +1000
xfree86: fix typo in optionTypeToSting.
Because we don't want anyone to get hurt.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Dan Nicholson <dbn.lists@gmail.com>
Reviewed-by: Matt Turner <mattst88@gmail.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 8b6c1809c09f832051327d86e1a25dc0ec5cc878
Merge: d88ba7721d c38552d115
Author: Keith Packard <keithp@keithp.com>
Date: Wed May 19 12:58:02 2010 -0700
Merge remote branch 'jamey/for-keith'
commit c38552d115e3bc71ad6179a8ad0d68778e943793
Author: Jamey Sharp <jamey@minilop.net>
Date: Sat Apr 24 23:56:36 2010 -0700
Add typed resource-lookup errors for non-core resource types.
Signed-off-by: Jamey Sharp <jamey@minilop.net>
Reviewed-by: Adam Jackson <ajax@redhat.com>
commit e291c561821ae86b7dd74269d5cd29bc31703962
Author: Jamey Sharp <jamey@minilop.net>
Date: Sat Apr 24 23:26:40 2010 -0700
Return an appropriately-typed error from dixLookupResourceByType.
Rather than always returning BadValue, associate an error status like
BadWindow with a resource type like RT_WINDOW, and return the
appropriate one for the requested type.
This patch only touches the core protocol resource types. Others still
return BadValue and need to be mapped appropriately.
dixLookupResourceByType can now return BadImplementation, if the caller
asked for a resource type that has not been allocated in the server.
Signed-off-by: Jamey Sharp <jamey@minilop.net>
Reviewed-by: Adam Jackson <ajax@redhat.com>
commit 90e612dcbe370da095d317fac62c80ac2447fa0b
Author: Jamey Sharp <jamey@minilop.net>
Date: Sat May 15 15:51:32 2010 -0700
Use WriteEventsToClient rather than TryClientEvents where possible.
If filter is NoEventMask (aka CantBeFiltered), grab is null, and the
first event is not in the set of "critical events", then TryClientEvents
simply calls WriteEventsToClient. In that case, it returns 0 for fake or
dead clients, and 1 otherwise. Inline for this special case.
Signed-off-by: Jamey Sharp <jamey@minilop.net>
Reviewed-by: Julien Cristau <jcristau@debian.org>
Reviewed-by: Adam Jackson <ajax@redhat.com>
commit 8033fb6c9792820a82fbdff6a14ff8a7a141ba74
Author: Jamey Sharp <jamey@minilop.net>
Date: Sat May 15 13:12:44 2010 -0700
Set event sequence number in WriteEventsToClient instead of at callers.
TryClientEvents already did this; this commit just moves the assignment
one level down so that no event source has to worry about sequence
numbers.
...No event source, that is, except XKB, which inexplicably calls
WriteToClient directly for several events.
Signed-off-by: Jamey Sharp <jamey@minilop.net>
Reviewed-by: Julien Cristau <jcristau@debian.org>
Reviewed-by: Adam Jackson <ajax@redhat.com>
commit 4b9600a4167427a8fe88bca9b738c9a99cac9469
Author: Jamey Sharp <jamey@minilop.net>
Date: Sat May 15 12:31:34 2010 -0700
Make WriteEventsToClient/WriteToClient no-op on fake or dead clients.
This matches the test in TryClientEvents, and is a superset of tests
done by the callers of these functions. The consequence of forgetting
these tests is a server crash, so they're always desirable. In my
opinion, it's better to not require the callers to remember to do these
checks.
For callers that don't do very much work before calling WriteToClient or
WriteEventsToClient, I've removed the redundant checks.
hw/xquartz/xpr/appledri.c has an interesting case: While its check for
"client == NULL" appears redundant with the test in WriteEventsToClient,
it dereferences client to get the sequence number.
Fixes: https://bugs.freedesktop.org/show_bug.cgi?id=27497
Signed-off-by: Jamey Sharp <jamey@minilop.net>
Cc: Chris Wilson <chris@chris-wilson.co.uk>
Reviewed-by: Julien Cristau <jcristau@debian.org>
Reviewed-by: Adam Jackson <ajax@redhat.com>
commit ee9cd2df4a5af66c6b7073563785b8aef61fcdb8
Author: Jamey Sharp <jamey@minilop.net>
Date: Sat May 15 13:37:34 2010 -0700
xv: TryClientEvents already checks client and sets sequenceNumber.
So don't bother doing those steps again.
Signed-off-by: Jamey Sharp <jamey@minilop.net>
Reviewed-by: Julien Cristau <jcristau@debian.org>
Reviewed-by: Adam Jackson <ajax@redhat.com>
commit e1e7deefb59cfdd82c9de46a7ca241d42436b2f8
Author: Jamey Sharp <jamey@minilop.net>
Date: Tue May 18 16:49:21 2010 -0700
mi/misprite.c: Delete unused private lookups.
Signed-off-by: Jamey Sharp <jamey@minilop.net>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 936b09f2a3e31afe41050c00736bbb6b812c7003
Author: Jamey Sharp <jamey@minilop.net>
Date: Tue May 18 16:48:08 2010 -0700
Replace miSpriteCursorFuncRec with direct calls to midispcur.c.
Nobody wraps the mi software-cursor sprite rendering implementations.
Signed-off-by: Jamey Sharp <jamey@minilop.net>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 66d5ecc5fd36e21715531a39ac83dc2b6b988a7e
Author: Tiago Vignatti <tiago.vignatti@nokia.com>
Date: Tue May 18 13:53:29 2010 +0300
render: set anim cursor state for pointer enabled devices only
The structure containing the state of animated cursor was amended within
SpriteInfoRec, removing all previously privates logic to keep such state.
API change: It was removed MAXDEVICES dependency \o/
Signed-off-by: Tiago Vignatti <tiago.vignatti@nokia.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Keith Packard <keithp@keithp.com>
commit 99fcf655bdc96f7e5b2249b05da51ba4fc9190c7
Author: Tiago Vignatti <tiago.vignatti@nokia.com>
Date: Sun May 2 22:34:44 2010 +0300
xfree86: remove PCI dependency from InitOutput
All functions that touch PCI and BUS were moved to their own files, organizing
the mess inside the InitOutput. Now, inside InitOutput, mostly accesses to
buses are coordinated by the new xf86BusConfig.
Two PCI probe functions just changed the name and a procedure to receive the
isolate devices parameters was created also, named xf86PciIsolateDevice.
Signed-off-by: Tiago Vignatti <tiago.vignatti@nokia.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
commit 0dd299864a133d478e4635bd1cd305b67fc3964d
Author: Tiago Vignatti <tiago.vignatti@nokia.com>
Date: Sun May 2 21:33:26 2010 +0300
xfree86: remove xf86EnableAccess
It's RAC remnant. This was substituted by xf86VGAarbiter{Lock, Unlock}
mechanism.
It's an API break, but the few drivers using it were covered already with
macros to avoid problems.
Signed-off-by: Tiago Vignatti <tiago.vignatti@nokia.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
commit f28515b5f774b83e0481acbcdda2f682738079b9
Author: Tiago Vignatti <tiago.vignatti@nokia.com>
Date: Sun May 2 21:24:46 2010 +0300
xfree86: bus: remove SetSIGIOForState and simplify the code
Also removed some dumb debug messages.
Signed-off-by: Tiago Vignatti <tiago.vignatti@nokia.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
commit 211ca67e4d8d00b20a74a78304a61d4dbea62706
Author: Tiago Vignatti <tiago.vignatti@nokia.com>
Date: Sun May 2 21:16:23 2010 +0300
xfree86: bus: fb drivers might want to use vga arbitration either
Signed-off-by: Tiago Vignatti <tiago.vignatti@nokia.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
commit 2464eb7d56407422e033ab3b94634ba802a119d5
Author: Tiago Vignatti <tiago.vignatti@nokia.com>
Date: Sun May 2 21:14:53 2010 +0300
xfree86: bus: simplify entity related hooks
Remove some out dated commentaries either.
Signed-off-by: Tiago Vignatti <tiago.vignatti@nokia.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
commit 971768e6884f20981652da09a1617c51a760fb86
Author: Tiago Vignatti <tiago.vignatti@nokia.com>
Date: Fri May 7 15:25:48 2010 +0300
xfree86: bus: enable declaration of sparc function as its code usage
The code in xf86sbusBus.c seems too OS-specific to be usable on OpenBSD.
Signed-off-by: Tiago Vignatti <tiago.vignatti@nokia.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
commit a70ec0d136bbb9efb6f4e683d7ebcea00375083b
Author: Tiago Vignatti <tiago.vignatti@nokia.com>
Date: Sun May 2 20:48:01 2010 +0300
xfree86: bus: rework xf86PostProbe logic and remove useless log info
Signed-off-by: Tiago Vignatti <tiago.vignatti@nokia.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
commit 2f7d630a1ee446711288af69711d57ea3054b594
Author: Tiago Vignatti <tiago.vignatti@nokia.com>
Date: Sun May 2 20:29:11 2010 +0300
xfree86: bus: reuse already assigned variable when fb driver claimed
Signed-off-by: Tiago Vignatti <tiago.vignatti@nokia.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
commit 964f29bb80c1bb05508a27969c3ac34cbf072ee9
Author: Tiago Vignatti <tiago.vignatti@nokia.com>
Date: Sun May 2 20:14:40 2010 +0300
xfree86: bus: fix Enter/Leave accesses behaviour
Okay, seems we're not using extensively such hooks in fact. But fix the
expected behaviour at least.
Signed-off-by: Tiago Vignatti <tiago.vignatti@nokia.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
commit b37462b4da7c389ec7bbcfd800e5f88bded79330
Author: Tiago Vignatti <tiago.vignatti@nokia.com>
Date: Sun May 2 19:53:37 2010 +0300
xfree86: remove unused xf86AccessInit()
The function was only initializing the boolean xf86ResAccessEnter, which
couldn't get any other value in the life of the server.
The only possible, though suspicious, code was in xf86AccessLeave(), which
could be triggered if AbortDDX is called before xf86AccessInit(). Even so,
such change is safety because no driver would have configured any entity leave
procedure at this point.
Signed-off-by: Tiago Vignatti <tiago.vignatti@nokia.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
commit d88ba7721d2d3b58cdc664fd4c23a3c5e2a5f909
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Tue May 18 11:12:49 2010 +1000
xfree86: Add option parsing for percent options.
In some cases, an option of "50%" would be preferable over fixed value
configuration - especially if the actual values are autoprobed.
Add a new set of functions to parse percent values from configurations.
The percent value parsing differs slightly - if the option is not to marked
as used (e.g. xf86CheckPercentOption()), no warning is emitted to the log
file if the value is not a percent value. This allows double-options (either
as % or as absolute number) without warnings.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Dan Nicholson <dbn.lists@gmail.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 673eb707ce6737284c4886265ba149c5587a74e2
Author: Jamey Sharp <jamey@minilop.net>
Date: Sat May 15 12:06:25 2010 -0700
SyncSendAlarmNotifyEvents: check the correct client's clientGone flag.
Signed-off-by: Jamey Sharp <jamey@minilop.net>
Reviewed-by: Keith Packard <keithp@keithp.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit c3ba199aa643e59abd30170c53fbb4e03077c377
Author: Tiago Vignatti <tiago.vignatti@nokia.com>
Date: Tue Apr 27 16:27:55 2010 +0300
render: remove unused animcursor fields from private rec
Signed-off-by: Tiago Vignatti <tiago.vignatti@nokia.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 9db63e4766bde07ebc375c4390bcc5c854b46ac3
Author: Tiago Vignatti <tiago.vignatti@nokia.com>
Date: Tue Apr 27 16:18:50 2010 +0300
render: removed unused macro from animcursor
Signed-off-by: Tiago Vignatti <tiago.vignatti@nokia.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
commit cba9942f7716b12c329616a9994c5bce857617fa
Author: Kristian Høgsberg <krh@bitplanet.net>
Date: Mon May 17 17:40:30 2010 -0400
dri2: Fix NULL check in allocation error handling
1461b31e40a3e44f6327199d23cf2ab70d8f5176 tests to see if the allocation
of buffer[i] failed after i has been incremented, causing it to look
at the wrong pointer.
Signed-off-by: Kristian Høgsberg <krh@bitplanet.net>
Tested-by: Eric Anholt <eric@anholt.net>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 27cec0a0501369a68031c048e691bda4c7095f72
Author: Julien Cristau <jcristau@debian.org>
Date: Mon May 17 19:23:44 2010 +0200
Fix build without XACE
dix/colormap.c and dix/gc.c now dereference a ClientPtr, so they need to
include dixstruct.h. Regression introduced by commit
11c69880c7c48ef9e755c4e09fadef7a629d7bc7.
Reported-by: Robert Hooker <sarvatt@ubuntu.com>
Signed-off-by: Julien Cristau <jcristau@debian.org>
Reviewed-by: Jamey Sharp <jamey@minilop.net>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 5a387cf6d248e3cb3337a938200ed5a09fc1d8cb
Author: Julien Cristau <jcristau@debian.org>
Date: Sun May 16 21:29:02 2010 +0200
Only link Xorg with libconfig.la
Other DDXs don't use input hotplugging since config_init was moved to
the DDX in commit d33adcdf03c69407d151e732fa0cf9947151eb19, so there's
no need to link this in.
Signed-off-by: Julien Cristau <jcristau@debian.org>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 37f0b45dbe4ea52bc127720207c7157b2b803ac0
Author: Jeremy Huddleston <jeremyhu@apple.com>
Date: Sun May 16 10:14:02 2010 -0700
XQuartz: Fix a build failure on Tiger
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
commit ecfeabec8d0dcfe286fb893047f1fe1a7ea9f8f5
Author: Jeremy Huddleston <jeremyhu@apple.com>
Date: Sun May 16 10:03:13 2010 -0700
XQuartz: Don't use deltaXY for determining pointer location on scroll events
<rdar://problem/7989690>
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
Reviewed-by: Edward Moy <emoy@apple.com>
commit a911292c85f7069d2caabcb677ed716a04227526
Author: Jeremy Huddleston <jeremyhu@apple.com>
Date: Sat May 15 10:53:09 2010 -0700
XQuartz: Don't trust deltaXY for middle mouse clicks.
The middle mouse clicks return erroneous values after returning from
Fast User Switching.
<rdar://problem/7979468>
http://xquartz.macosforge.org/trac/ticket/389
Signed-off-by: Martin Otte <otte@duke.edu>
Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com>
Reviewed-by: Edward Moy <emoy@apple.com>
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
commit 345eb171264325d73ea2c50ba8c692cf589c2a9b
Author: Keith Packard <keithp@keithp.com>
Date: Sat May 1 01:41:19 2010 -0700
Remove dbe screen private privates.
Each DBE Screen private structure could have nested privates. Oddly,
no code ever used them.
Signed-off-by: Keith Packard <keithp@keithp.com>
Reviewed-by: Jamey Sharp <jamey@minilop.net>
commit 87ea5760f86eb60840e6e2c10012915952df5377
Author: Keith Packard <keithp@keithp.com>
Date: Mon May 10 11:46:25 2010 -0700
Check pixmap allocation return value when creating glyphs
The driver may decide that the pixmap is too large or something and
fail to allocate a pixmap; not checking would lead to a segfault.
Signed-off-by: Keith Packard <keithp@keithp.com>
Reviewed-by: Jamey Sharp <jamey@minilop.net>
commit 03f7e92a6cbfe58db08ce840283f9809695c70e7
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Mon May 10 13:44:30 2010 -0700
Update list of supported platforms in configure.ac error message
Adds DragonFly BSD, OpenSolaris, & GNU Hurd.
Drops MacOS X, since this is in the section specific to the Xorg/XFree86 DDX.
(Matches the OS patterns the configure script checks for.)
Also uses m4 macros to fix the spacing/formatting of the resulting message.
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Acked-by: Gaetan Nadon <memsize@videotron.ca>
commit e42a29d269fadc11e065c63ee369e3165196f2d7
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Thu Apr 29 18:45:34 2010 -0700
Fix compiler issues with getifaddrs() call on OpenSolaris
OpenSolaris recently added support for the getifaddrs() API.
Building with that uncovered two compiler issues (one warning, one error)
in the code that was now being built for the first time in our builds:
"access.c", line 768: warning: argument #1 is incompatible with prototype:
prototype: pointer to struct sockaddr {unsigned short sa_family, array[14] of char sa_data} : "access.c", line 213
argument : pointer to struct sockaddr_storage {unsigned short ss_family, array[6] of char _ss_pad1, double _ss_align, array[240] of char _ss_pad2}
"access.c", line 838: assignment type mismatch:
struct sockaddr {unsigned short sa_family, array[14] of char sa_data} "=" struct sockaddr_storage {unsigned short ss_family, array[6] of char _ss_pad1, double _ss_align, array[240] of char _ss_pad2}
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Jamey Sharp <jamey@minilop.net>
commit c6613cfc26e76b296e620640bf33e756eb4ae178
Author: Jamey Sharp <jamey@minilop.net>
Date: Fri May 14 10:36:13 2010 -0700
test/xi2: Initialize predefined atoms before XInputExtensionInit.
XInputExtensionInit calls MakeAtom, which doesn't work without the atoms
table initialized.
Signed-off-by: Jamey Sharp <jamey@minilop.net>
Cc: Peter Hutterer <peter.hutterer@who-t.net>
Tested-by: Keith Packard <keithp@keithp.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 1461b31e40a3e44f6327199d23cf2ab70d8f5176
Author: Pauli Nieminen <ext-pauli.nieminen@nokia.com>
Date: Fri May 14 16:25:43 2010 +0300
dri2: Fix xserver crash if dri2 buffer allocation fails.
If driver fails to allocate memory for dri2 buffer server would crash
in send_buffers_reply.
Solution is to handle the allocation failure and return BadAlloc to
client.
Signed-off-by: Pauli Nieminen <ext-pauli.nieminen@nokia.com>
Reviewed-by: Michel Dänzer <michel@daenzer.net>
Reviewed-by: Kristian Høgsberg <krh@bitplanet.net>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit f87002cb7d8729b1da4cbefe7653f4cfd3a2d956
Merge: a4fbc0feda 890f536f8d
Author: Keith Packard <keithp@keithp.com>
Date: Fri May 14 11:46:29 2010 -0700
Merge remote branch 'jamey/for-keith'
commit 890f536f8d66f08e7d6a5685659eef4001a8757d
Author: Jamey Sharp <jamey@minilop.net>
Date: Fri May 14 00:18:14 2010 -0700
Bugfix for "Pre-validate ChangeGC XIDs": off-by-one in loop index.
Signed-off-by: Jamey Sharp <jamey@minilop.net>
Tested-by: Colin Harrison <colin.harrison@virgin.net>
commit a4fbc0fedafda6df98f647173a2deccb86ef0479
Author: Oliver McFadden <oliver.mcfadden@nokia.com>
Date: Fri May 14 07:49:31 2010 +0300
scrnintstr.h: removed unused PaintWindow function pointers.
Please note this patch breaks the ABI.
Signed-off-by: Oliver McFadden <oliver.mcfadden@nokia.com>
Reviewed-by: Keith Packard <keithp@keithp.com>
commit 71296885b0bb946e7ab986169f5b872952c221a0
Author: Oliver McFadden <oliver.mcfadden@nokia.com>
Date: Thu May 13 07:12:43 2010 +0300
mi: removed unused PointerNonInterestBox functions.
Please note this patch breaks the ABI.
Signed-off-by: Oliver McFadden <oliver.mcfadden@nokia.com>
Reviewed-by: Keith Packard <keithp@keithp.com>
commit 795432d4a92ed5b9fa4d9163e73c8e4fe4c74534
Merge: f2a0c324e3 92ed75ac59
Author: Keith Packard <keithp@keithp.com>
Date: Thu May 13 18:22:49 2010 -0700
Merge remote branch 'jamey/cleanups'
commit 92ed75ac59e2d3af149cddb962efd05fc8487750
Author: Jamey Sharp <jamey@minilop.net>
Date: Mon May 10 20:22:05 2010 -0700
Eliminate boilerplate around client->noClientException.
Just let Dispatch() check for a noClientException, rather than making
every single dispatch procedure take care of it.
Signed-off-by: Jamey Sharp <jamey@minilop.net>
Reviewed-by: Daniel Stone <daniel@fooishbar.org>
commit 11c69880c7c48ef9e755c4e09fadef7a629d7bc7
Author: Jamey Sharp <jamey@minilop.net>
Date: Sat May 8 22:16:32 2010 -0700
Quit using clientErrorValue in dix/colormap.c.
And that's it! No more clientErrorValue kludge.
Signed-off-by: Jamey Sharp <jamey@minilop.net>
Reviewed-by: Keith Packard <keithp@keithp.com>
commit a3d948ddbb54b9e831e67f22d5031922a3c44107
Author: Jamey Sharp <jamey@minilop.net>
Date: Thu May 6 12:35:52 2010 -0700
clientErrorValue is never used outside dix. Stop importing it.
Signed-off-by: Jamey Sharp <jamey@minilop.net>
Reviewed-by: Keith Packard <keithp@keithp.com>
commit 653e4878c4cc03613172a93ad4800e1eacc98f17
Author: Jamey Sharp <jamey@minilop.net>
Date: Sat May 8 19:18:11 2010 -0700
Quit using clientErrorValue in dix/gc.c.
Signed-off-by: Jamey Sharp <jamey@minilop.net>
Reviewed-by: Keith Packard <keithp@keithp.com>
commit 5193f25ea33eed31d6a75cdc1a86427c23d8033c
Author: Jamey Sharp <jamey@minilop.net>
Date: Sat May 8 19:08:47 2010 -0700
Define GCAllBits as the union of all valid CreateGC masks.
Signed-off-by: Jamey Sharp <jamey@minilop.net>
Reviewed-by: Keith Packard <keithp@keithp.com>
commit 6a84cd943430cfc9df55c83aef6a7f8dea6dbb94
Author: Jamey Sharp <jamey@minilop.net>
Date: Fri May 7 19:38:05 2010 -0700
Replace dixChangeGC with calls directly to the right variant.
Signed-off-by: Jamey Sharp <jamey@minilop.net>
Reviewed-by: Keith Packard <keithp@keithp.com>
commit 2d7eb4a19b773d0406c0c2e018a7da97f3565fd5
Author: Jamey Sharp <jamey@minilop.net>
Date: Fri May 7 18:11:36 2010 -0700
Pre-validate ChangeGC XIDs.
In order to execute a wire-level ChangeGC request, we need to look up
the resources named by any XIDs in the value-list. Various places in the
server already have pointers to the resources they want to set into the
GC, though, so over time the interface has evolved to accept either XIDs
or pointers, with several different function call signatures used in
different eras.
This patch makes the existing code require pointers to resources rather
than XIDs, and adds a simple wrapper that looks up any XIDs. The old
dixChangeGC API is preserved by delegating to whichever implementation
is appropriate.
This affects error-handling: If any of the XIDs are invalid, then the GC
is unchanged, and its ChangeGC callback is not invoked. This change is
allowed by the protocol spec, which says, "The order in which components
are verified and altered is server-dependent. If an error is generated,
a subset of the components may have been altered."
Signed-off-by: Jamey Sharp <jamey@minilop.net>
Reviewed-by: Keith Packard <keithp@keithp.com>
commit e2929db7b737413cf93fbebdf4d15abdfebff05c
Author: Jamey Sharp <jamey@minilop.net>
Date: Sat May 8 14:10:51 2010 -0700
dixChangeGC callers: Use ChangeGCVal instead of XID almost everywhere.
The exceptions are ProcChangeGC and CreateGC.
Signed-off-by: Jamey Sharp <jamey@minilop.net>
Reviewed-by: Keith Packard <keithp@keithp.com>
commit 95728ca09d45afc84c8d1828c09c6b6725f1a58d
Author: Jamey Sharp <jamey@minilop.net>
Date: Sat May 8 09:25:34 2010 -0700
Don't statically allocate the ChangeGC parameter array.
Because that's insane.
Signed-off-by: Jamey Sharp <jamey@minilop.net>
Reviewed-by: Keith Packard <keithp@keithp.com>
commit bff8525f8483304d5f93e83e36b47209381da721
Author: Jamey Sharp <jamey@minilop.net>
Date: Sat May 8 12:06:50 2010 -0700
Simplify miFillPolyHelper and miLineArc.
Both functions compute a set of spans and either fill them immediately
or accumulate them into a caller-provided buffer.
Computing the spans used only the miTranslate and lineWidth fields of
pGC, and neither could have been changed by the initial
ChangeGC/ValidateGC pair, so it's safe to compute the spans first.
Then both functions consume the spans the same way, so factor that into
a new fillSpans function.
Signed-off-by: Jamey Sharp <jamey@minilop.net>
Reviewed-by: Keith Packard <keithp@keithp.com>
commit 83f7ec97279405958aed86c6a57704a460c3bfba
Author: Jamey Sharp <jamey@minilop.net>
Date: Sat May 8 13:38:00 2010 -0700
miwideline: Factor out span buffer allocation.
Signed-off-by: Jamey Sharp <jamey@minilop.net>
Reviewed-by: Keith Packard <keithp@keithp.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
commit f2a0c324e37c9fa3eb9087adbf963addb7f21d88
Author: Keith Packard <keithp@keithp.com>
Date: Thu May 13 10:33:39 2010 -0700
Remove devPrivates init and delete callback lists.
XSELinux was the only consumer of these interfaces and it no longer
needs them.
Signed-off-by: Keith Packard <keithp@keithp.com>
Reviewed-by: Jamey Sharp <jamey@minilop.net>
commit c9e7ca4404803fe44d4684e0bb2ca2ee10fd4bb3
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Wed May 12 20:25:30 2010 -0400
xselinux: Remove use of devPrivates init/free callbacks.
Commit eb9210097efea81065c301e5b6b4da7a566deb4a removed the
sidget/sidput calls which were the major reason for using the
callbacks. The remaining operations can be skipped or worked
around.
Signed-off-by: Eamon Walsh <ewalsh@tycho.nsa.gov>
Reviewed-by: Keith Packard <keithp@keithp.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit bca85e2e127a8a23e3a2debcfeb3ae07cd3c66ac
Author: Jeremy Huddleston <jeremyhu@apple.com>
Date: Thu May 13 08:32:00 2010 -0700
Use _X_ATTRIBUTE_PRINTF _X_DEPRECATED _X_NORETURN
Use the values from xproto rather than duplicating the effort
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
Reviewed-by: Keith Packard <keithp@keithp.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 421606a8ef447d10c2ee0986f20e752056a47675
Author: Kristian Høgsberg <krh@bitplanet.net>
Date: Tue May 11 10:52:18 2010 -0400
dri2: Send out event when auxillary buffers are invalidated
This lets the DRI2 clients rely on the server to notify them when they
need to get new buffers. Without this, OpenGL clients poll the server
in glViewport() which can be a performance problems and also isn't
completely correct behaviour.
We bump the DRI2 protocol minor to indicate the availability of the
event, which the DRI2 clients can use to avoid polling. This speeds up
various piglit and oglc test cases as well as real applications.
Signed-off-by: Kristian Høgsberg <krh@bitplanet.net>
Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit f281db9a5e400c822e03a19937247baa20ecc213
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Wed May 12 23:57:58 2010 -0700
Remove ResNoAvoid definition, missed in the RAC removal
ResNoAvoid is #defined to ResBios, but ResBios was removed
from xf86str.h in 4b42448a2388d40f257774fbffdccaea87bd0347
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Julien Cristau <jcristau@debian.org>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 315041762313598aad90df84226e2d2def4a0fc9
Author: Jamey Sharp <jamey@minilop.net>
Date: Sat May 8 18:55:55 2010 -0700
CreateGC: Pass current client on to ChangeGC.
Otherwise we can't check that the XIDs this GC is being initialized with
are accessible to this client.
Signed-off-by: Jamey Sharp <jamey@minilop.net>
Cc: Eamon Walsh <ewalsh@tycho.nsa.gov>
Reviewed-by: Eamon Walsh <ewalsh@tycho.nsa.gov>
commit 04bad1b8a118a83064316d6e4327234aee19361e
Author: Jamey Sharp <jamey@minilop.net>
Date: Thu May 6 21:56:10 2010 -0700
Kill ChangeGC in favor of dixChangeGC.
This doesn't change any behavior, but it isn't clear whether NullClient
is correct in all cases. As ajax says,
> For most of these changes, I think it's correct to use NullClient,
> since they are server-initiated changes and should not fail for (eg)
> xace reasons. ... At any rate, you're certainly not changing any
> semantics by leaving them all as NullClient, so this patch can't be
> more wrong than before.
The call in CreateGC is particularly questionable.
Signed-off-by: Jamey Sharp <jamey@minilop.net>
Reviewed-by: Adam Jackson <ajax@redhat.com>
commit 65cedf39054cf3a1e695e84ac228cce9e8d48097
Author: Jamey Sharp <jamey@minilop.net>
Date: Thu May 6 21:39:43 2010 -0700
Kill DoChangeGC in favor of dixChangeGC.
This doesn't change any behavior, but it isn't clear whether NullClient
is correct in all cases. As ajax says,
> For most of these changes, I think it's correct to use NullClient,
> since they are server-initiated changes and should not fail for (eg)
> xace reasons. ... At any rate, you're certainly not changing any
> semantics by leaving them all as NullClient, so this patch can't be
> more wrong than before.
Signed-off-by: Jamey Sharp <jamey@minilop.net>
Reviewed-by: Keith Packard <keithp@keithp.com>
commit afcbbd6dfea51c5b0adca0d720edc02ba0c2dc16
Author: Jamey Sharp <jamey@minilop.net>
Date: Sat May 8 15:19:03 2010 -0700
doPolyText needs UseAccess to each font, not ReadAccess.
In commit 42d6112ec21949a336ee8b34469f2695273ee2d6, Eamon changed
dixChangeGC to require DixUseAccess on any GCFont XID. I think
doPolyText needs to require the same level of access. Otherwise
dixChangeGC could fail when it does the same lookup, which doPolyText
doesn't check for.
Signed-off-by: Jamey Sharp <jamey@minilop.net>
Cc: Eamon Walsh <ewalsh@tycho.nsa.gov>
Reviewed-by: Eamon Walsh <ewalsh@tycho.nsa.gov>
commit 59857ee5da5f1f3f4900292581b9586477513211
Merge: 21ceae9002 432cbbec19
Author: Keith Packard <keithp@keithp.com>
Date: Wed May 12 16:48:08 2010 -0700
Merge remote branch 'dottedmag/for-keithp'
commit 432cbbec194e47bf2a117c9302146e786c8a4ee1
Author: Mikhail Gusarov <dottedmag@dottedmag.net>
Date: Thu May 13 03:51:00 2010 +0700
Misc coding style cleanup
Use a[b] instead of *(a+b), fix whitespace.
Signed-off-by: Mikhail Gusarov <dottedmag@dottedmag.net>
Reviewed-by: Keith Packard <keithp@keithp.com>
commit 816b79dd061e9839cec94a4986a7820b70ca8a7f
Author: Mikhail Gusarov <dottedmag@dottedmag.net>
Date: Thu May 13 03:45:21 2010 +0700
Remove useless casts
Signed-off-by: Mikhail Gusarov <dottedmag@dottedmag.net>
Reviewed-by: Keith Packard <keithp@keithp.com>
commit 63a647abd51f44226cbd16aa04ebc57d07463c6d
Author: Mikhail Gusarov <dottedmag@dottedmag.net>
Date: Thu May 13 03:44:12 2010 +0700
Fix code style: extra whitespace before ()
Signed-off-by: Mikhail Gusarov <dottedmag@dottedmag.net>
Reviewed-by: Keith Packard <keithp@keithp.com>
commit 28211c443c693a1ca3db5740d0128274a3eef723
Author: Mikhail Gusarov <dottedmag@dottedmag.net>
Date: Thu May 13 03:43:04 2010 +0700
Fix warning: it's safe to pass atom strings > XA_LAST_PREDEFINED to free(3)
Signed-off-by: Mikhail Gusarov <dottedmag@dottedmag.net>
Reviewed-by: Keith Packard <keithp@keithp.com>
commit 8b5326aa98eba201dd78aea3dd7114e1a084489b
Author: Mikhail Gusarov <dottedmag@dottedmag.net>
Date: Wed May 12 20:27:02 2010 +0000
Mark OsAbort as noreturn function to make gcc happier.
Signed-off-by: Mikhail Gusarov <dottedmag@dottedmag.net>
Reviewed-by: Matt Turner <mattst88@gmail.com>
commit 868e372a73b377705217e0379bc6e00f36c4d8e5
Author: Mikhail Gusarov <dottedmag@dottedmag.net>
Date: Thu May 13 01:59:06 2010 +0700
Introduce X_NORETURN macro defined as __attribute__((noreturn)) for gcc
Signed-off-by: Mikhail Gusarov <dottedmag@dottedmag.net>
Reviewed-by: Matt Turner <mattst88@gmail.com>
commit 5a8e2f2745ae1f74501cd3f42614a1ed2cf974f2
Author: Mikhail Gusarov <dottedmag@dottedmag.net>
Date: Wed May 12 18:54:51 2010 +0000
Do not jump through the hoops to deallocate xkbbasedirflag variable
Fixes gcc warning as well.
Signed-off-by: Mikhail Gusarov <dottedmag@dottedmag.net>
Reviewed-by: Jamey Sharp <jamey@minilop.net>
Reviewed-by: Matt Turner <mattst88@gmail.com>
commit ff2b4cf8329b1678adafcda02e5d47a072550d47
Author: Mikhail Gusarov <dottedmag@dottedmag.net>
Date: Thu May 13 01:51:37 2010 +0700
Turn sprintf argument into literaral string, shutting up gcc warning
Signed-off-by: Mikhail Gusarov <dottedmag@dottedmag.net>
Reviewed-by: Matt Turner <mattst88@gmail.com>
commit f62ba192c285b1e49bf299f03fc0b763680afaaf
Author: Mikhail Gusarov <dottedmag@dottedmag.net>
Date: Thu May 13 01:47:26 2010 +0700
Do not use deprecated Xalloc function
Signed-off-by: Mikhail Gusarov <dottedmag@dottedmag.net>
Reviewed-by: Matt Turner <mattst88@gmail.com>
commit 21ceae9002c6364deb3d074cf2da7d3864cf6879
Author: Jamey Sharp <jamey@minilop.net>
Date: Tue May 11 10:24:00 2010 -0700
SetFontPath: set client->errorValue on failure.
Previously the callers were only setting errorValue on Success, when
it's ignored, and leaving it alone on failure, when it's sent to the
client.
Since SetFontPath takes the ClientPtr, let it set client->errorValue
instead of letting the callers continue to get it wrong.
Signed-off-by: Jamey Sharp <jamey@minilop.net>
Reviewed-by: Julien Cristau <jcristau@debian.org>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 801162919d1c625d950a5d105ae4b3487ebc30a7
Author: Mikhail Gusarov <dottedmag@dottedmag.net>
Date: Thu May 6 01:55:36 2010 +0700
Removed outdated comments obsoleted by documentation in headers
Signed-off-by: Mikhail Gusarov <dottedmag@dottedmag.net>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 4d55c8c4ffcb5d6c6500b462a41ace8e2359151d
Author: Mikhail Gusarov <dottedmag@dottedmag.net>
Date: Thu May 6 01:54:13 2010 +0700
Use lowercase variant of XNFalloc and Xstrdup
Using one variant of function/macro makes it easier to fix the code
later.
Signed-off-by: Mikhail Gusarov <dottedmag@dottedmag.net>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 3f3ff971ecff9936cebafc813af9193b97bba89c
Author: Mikhail Gusarov <dottedmag@dottedmag.net>
Date: Thu May 6 01:44:06 2010 +0700
Replace X-allocation functions with their C89 counterparts
The only remaining X-functions used in server are XNF*, the rest is converted to
plain alloc/calloc/realloc/free/strdup.
X* functions are still exported from server and x* macros are still defined in
header file, so both ABI and API are not affected by this change.
Signed-off-by: Mikhail Gusarov <dottedmag@dottedmag.net>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 96c7ab27c383ec767f62a7a11e5fd76f86363fbc
Author: Mikhail Gusarov <dottedmag@dottedmag.net>
Date: Thu May 6 00:28:25 2010 +0700
Deprecate allocation functions which are plain wrappers for C stdlib
Signed-off-by: Mikhail Gusarov <dottedmag@dottedmag.net>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
commit a5dba0f5caefce236ebd5f71948e5a659bea58e4
Author: Mikhail Gusarov <dottedmag@dottedmag.net>
Date: Thu May 6 00:27:47 2010 +0700
Document allocation functions, noting deviations from C library
Signed-off-by: Mikhail Gusarov <dottedmag@dottedmag.net>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
commit e983848ab44b0769f97f6207f1aa8b4f127be6a9
Author: Mikhail Gusarov <dottedmag@dottedmag.net>
Date: Thu May 6 00:16:24 2010 +0700
Clean {X,XNF}{alloc,calloc,realloc,free,strdup} from pre-C89 baggage
C89 guarantees alignment of pointers returned from malloc/calloc/realloc, so
stop fiddling with alignment manually and just pass the arguments to library
functions.
Also convert silent error when negative size is passed into function into
warning in log file.
Signed-off-by: Mikhail Gusarov <dottedmag@dottedmag.net>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 4f0006c2203abe0b7660c5068d6afe236f9bd2a4
Author: Kristian Høgsberg <krh@bitplanet.net>
Date: Mon May 10 08:36:02 2010 -0400
dri2: Copy front to fake front in swapbuffer
If we don't have a fake front, nothing will happen. The fix was extracted
from a bigger patch from Francisco Jerez.
https://bugs.freedesktop.org/show_bug.cgi?id=27305
Signed-off-by: Kristian Høgsberg <krh@bitplanet.net>
Reviewed-by: Pauli Nieminen <suokkos@gmail.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit ba1f1f9d9e48226f1ef6b3222a8d92fc969d6560
Author: Jeremy Huddleston <jeremyhu@apple.com>
Date: Tue May 11 09:49:34 2010 -0700
XQuartz GL: Fix __glXAquaScreenCreateDrawable prototype
Fixes regression introduced in 9de0e31746d5f0d9d39d11c94ec3cbc04a9935fc
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
Reviewed-by: Keith Packard <keithp@keithp.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 286935c6f4965a6b09de1fb9e579a00afa14082a
Author: Keith Packard <keithp@keithp.com>
Date: Tue May 11 09:08:40 2010 -0700
Remember drawable ID used to find damage target for use in events. Bug 5730.
Using Composite, window pixmaps are given names in the client resource
namespace and yet may not have any XID recorded in the drawable
structure. As such, we need to remember the XID used to lookup the
pixmap in the resource database so that we can report the correct XID
back to the client in damage events.
Signed-off-by: Keith Packard <keithp@keithp.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
commit 3df22b293c1f1d27e7ce16662744c578d35b5aba
Merge: fa6c701257 9de0e31746
Author: Keith Packard <keithp@keithp.com>
Date: Tue May 11 08:38:44 2010 -0700
Merge remote branch 'krh/dri2-resource-fixes'
commit fa6c7012572093a82c9389682977efff85590719
Author: Cyril Brulebois <kibi@debian.org>
Date: Mon Mar 1 02:11:36 2010 +0100
Fix null pointer dereference in xf86_reload_cursors().
Upon resume, X may try to dereference a null pointer, which has been
reported in Debian bug #507916 (http://bugs.debian.org/507916).
Jim Paris came up with a patch which solves the problem for him. Here's
a (hopefully) fixed version of his patch (without the typo).
Cc: Jim Paris <jim@jtan.com>
Signed-off-by: Cyril Brulebois <kibi@debian.org>
Reviewed-By: Matthias Hopf <mhopf@suse.de>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 9de0e31746d5f0d9d39d11c94ec3cbc04a9935fc
Author: Kristian Høgsberg <krh@bitplanet.net>
Date: Thu Apr 29 16:36:10 2010 -0400
dri2: Take an XID for tracking the DRI2 drawable
Some pixmaps (window pixmaps and scratch pixmaps) don't have the
drawable->id set and thus DRI2 gets confused when using that field
for looking up the DRI2 drawable. Go back to using privates for getting
at the DRI2 drawable from a DrawablePtr. We need to keep the resource
tracking in place so we can remove the DRI2 drawable when the X resource
it was created for goes away. Additionally, we also now track the DRI2
drawable using a client XID so we can reclaim the DRI2 drawable even if
the client goes before the drawable and doesn't destroy the DRI2 drawable.
Tested-by: Owen W. Taylor <otaylor@fishsoup.net>
Signed-off-by: Kristian Høgsberg <krh@bitplanet.net>
commit 32381363cd8f43aeb741bad70bcf96a287dac0c9
Author: Kristian Høgsberg <krh@bitplanet.net>
Date: Sat May 1 13:15:00 2010 -0400
list.h: Add list_for_each_entry_safe()
Signed-off-by: Kristian Høgsberg <krh@bitplanet.net>
Reviewed-by: Adam Jackson <ajax@redhat.com>
commit 4a8a615d01b9ed18c272414bd11dc2fc661727e5
Author: Kristian Høgsberg <krh@bitplanet.net>
Date: Sat May 1 13:13:54 2010 -0400
glxdri2: Hard-code the extension version we need
If we use the #define'd version from dri_interface.h, the server will
require at least that version of the extension. If we're compiling against
a dri_interface.h with a newer version we don't really require, glxdri2
will require a too high version of the extension.
The right approach is to just hard-code the version we need instead of
using the #defines.
Signed-off-by: Kristian Høgsberg <krh@bitplanet.net>
Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
commit 6d7ba5e0fcb5d1bce6bb213dec009f3a0f802d26
Author: Kristian Høgsberg <krh@bitplanet.net>
Date: Sat May 1 13:07:46 2010 -0400
dix: Update element count in FreeResource*()
FreeResource() keeps clientTable[cid].elements up to date with the
number of resources allocated to the client. The other free
resource functions (FreeResourceByType(),
FreeClientNeverRetainResources() and FreeClientResources()) don't
maintain this invariant.
Typically, the only consequence is that the element count is too high
and we end up allocating the hash table bigger than necessary. However,
FreeResource() also relies on the element count to restart the search if
the list of resources has been changed during a resource destruction
callback. Since FreeResourceByType() doesn't update the count, if we call
that from a resource destruction callback from FreeResource(), the
loop isn't restarted and we end up following an invalid next pointer.
Furthermore, LookupClientResourceComplex() and
FreeClientNeverRetainResources() don't use the element count to detect
if a callback deleted a resource and may end up following an invalid
next pointer if the resource system is called into recursively.
Signed-off-by: Kristian Høgsberg <krh@bitplanet.net>
Reviewed-by: Keith Packard <keithp@keithp.com>
commit 10de9e8ee37265a35ceeceb2007d711da70d4f2d
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri Apr 16 16:35:22 2010 +1000
xfree86: dga needs to use the master keyboard state (#27573)
GetPairedDevice() may not always return the keyboard, resulting in a
null-pointer dereference when accessing the XKB state.
For floating devices, the GetMaster() returns the device itself.
X.Org Bug 27573 <http://bugs.freedesktop.org/show_bug.cgi?id=27573>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Daniel Stone <daniel@fooishbar.org>
Tested-by: Ben Hutchings <ben@decadent.org.uk>
commit 758b8614477b53dc3de2b884fec5ccaf8a736432
Author: David James <davidjames@google.com>
Date: Mon May 10 14:00:49 2010 -0700
Fix wrong bracket values when startOver = FALSE.
Currently, SyncComputeBracketValues reuses old values of bracket_greater
and bracket_less when startOver = FALSE. This can result in incorrect bracket
values. To fix this issue, the startOver parameter is removed, and we do not
reuse old values of bracket_greater and bracket_less.
X.Org Bug 27023 <http://bugs.freedesktop.org/show_bug.cgi?id=27023>
Signed-off-by: David James <davidjames@google.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 95074538cce93abc1739a4d9dd78b0500fb8fec9
Merge: c0799779df 2160ff5240
Author: Keith Packard <keithp@keithp.com>
Date: Mon May 10 13:49:33 2010 -0700
Merge remote branch 'jamey/for-keith'
commit 2160ff5240d7e11bdc6cec8859fd1f10395c8edd
Author: Jamey Sharp <jamey@minilop.net>
Date: Fri May 7 20:00:40 2010 -0700
Simplify error-handling in dixChangeGC.
Signed-off-by: Jamey Sharp <jamey@minilop.net>
Reviewed-by: Keith Packard <keithp@keithp.com>
commit 4080cd42fde8b4c693eab7557581af2622479109
Author: Jamey Sharp <jamey@minilop.net>
Date: Sat May 8 09:41:46 2010 -0700
miPolyPoint bugfix: Check memory allocation before changing the GC.
miPolyPoint ought to leave the GC unchanged even if it fails. ajax says:
> We have a new winner for the oldest-bug competition! It's actually
> been like that since X11R1:
>
> -rw-r--r--. 1 ajax ajax 2817 1987-09-12 01:20 ddx/mi/mipolypnt.c
Signed-off-by: Jamey Sharp <jamey@minilop.net>
Reviewed-by: Adam Jackson <ajax@redhat.com>
commit ccdaecc5471cc2d56b1702eeed4280bb4d58c515
Author: Jamey Sharp <jamey@minilop.net>
Date: Sat May 8 12:26:47 2010 -0700
Move AppendSpanGroup from miwideline.h to miwideline.c.
Also make it stop being a macro.
Signed-off-by: Jamey Sharp <jamey@minilop.net>
Reviewed-by: Keith Packard <keithp@keithp.com>
commit 4272d6722c0f65bdfafc95e91cc2fdb8f6bd072e
Author: Jamey Sharp <jamey@minilop.net>
Date: Sat May 8 12:18:37 2010 -0700
Expand macros that are used only in miFillPolyHelper.
Signed-off-by: Jamey Sharp <jamey@minilop.net>
Reviewed-by: Keith Packard <keithp@keithp.com>
commit c0799779dffeef8cef228bdc57aa6c8b323e7485
Author: Keith Packard <keithp@keithp.com>
Date: Mon Apr 26 17:22:12 2010 -0700
dmxBERestoreRenderGlyph was passing wrong value to free
Signed-off-by: Keith Packard <keithp@keithp.com>
Reviewed-by: Jamey Sharp <jamey@minilop.net>
Reviewed-by: Matt Turner <mattst88@gmail.com>
commit 946f664b6ab421f69df3dc3213b14b085424c9e4
Author: Adam Jackson <ajax@redhat.com>
Date: Thu May 6 17:58:29 2010 -0400
mi: Delete wide ellipse arc cache
This does make wide ellipses slower, by a factor of twoish:
946000.0 521000.0 ( 0.55) 10-pixel wide ellipse
98300.0 49900.0 ( 0.51) 100-pixel wide ellipse
17700.0 9310.0 ( 0.53) 500-pixel wide ellipse
16900.0 7980.0 ( 0.47) 100-pixel wide dashed ellipse
16100.0 5370.0 ( 0.33) 100-pixel wide double-dashed ellipse
But no one cares, and it's a modest size win:
text data bss dec hex filename
1773824 69552 59288 1902664 1d0848 hw/vfb/Xvfb.before
1773112 69552 58648 1901312 1d0300 hw/vfb/Xvfb
Signed-off-by: Adam Jackson <ajax@redhat.com>
Reviewed-by: Keith Packard <keithp@keithp.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 580b99bb8af4ea093953c2b885bd4272aaf02baf
Author: Jamey Sharp <jamey@minilop.net>
Date: Thu May 6 11:00:39 2010 -0700
Return BadPicture, not BadPixmap, if alpha-map is invalid.
I believe this is what was intended.
Signed-off-by: Jamey Sharp <jamey@minilop.net>
Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit c677fc611b124c44adfcfb95718798105f26357b
Author: Jamey Sharp <jamey@minilop.net>
Date: Thu May 6 11:00:38 2010 -0700
VERIFY_PICTURE always returns BadPicture. Don't bother specifying.
Same goes for VERIFY_ALPHA, VERIFY_XIN_PICTURE, and VERIFY_XIN_ALPHA.
Signed-off-by: Jamey Sharp <jamey@minilop.net>
Reviewed-by: Julien Cristau <jcristau@debian.org>
Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 35761d5f811406bc0b6a68c1b02bdb699142745c
Author: Jamey Sharp <jamey@minilop.net>
Date: Thu May 6 11:00:37 2010 -0700
Introduce dixLookupFontable for "FONT or GC" parameters.
Signed-off-by: Jamey Sharp <jamey@minilop.net>
Reviewed-by: Julien Cristau <jcristau@debian.org>
Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 2eab697adba4b1858a530750e9a35fba79a7bf26
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Fri May 7 09:32:34 2010 -0700
Constify function prototypes in auth & xdmcp code
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Tested-by: Gaetan Nadon <memsize@videotron.ca>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit e2e2747f40c4b9e23dba38ea656d4c082e83a794
Author: Matthias Hopf <mhopf@suse.de>
Date: Fri May 7 18:46:30 2010 +0200
Fix mod() definition.
Presumably no implications, especially security-wise.
Signed-off-by: Matthias Hopf <mhopf@suse.de>
Reviewed-by: Matt Turner <mattst88@gmail.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 626f97688a89dbc5da80390d822d21b1a737de0e
Author: Adam Tkac <atkac@redhat.com>
Date: Fri May 7 17:02:03 2010 +1000
Export XkbCopyDeviceKeymap from Xorg, it is needed by VNC.
Signed-off-by: Adam Tkac <atkac@redhat.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 21ed660f30a3f96c787ab00a16499e0fb034b2ad
Author: Chris Humbert <freedesktop@mahadri.com>
Date: Fri May 7 17:02:43 2010 +1000
dix: make DeviceEvent coordinates signed for Xinerama. #24986
With Xinerama enabled, event coordinates are relative to Screen 0, so
they can be negative. The new DeviceEvent's coordinates are of type
uint16_t, making screens above and to the left of Screen 0 unusable.
X.Org Bug 24986 <https://bugs.freedesktop.org/show_bug.cgi?id=24986>
Signed-off-by: Chris Humbert <freedesktop@mahadri.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 9802839d35aaf788790f1d0e8300db4693a70096
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri May 7 16:22:12 2010 +1000
Xi: reset the known properties at the end of the server generation.
Properties allocated through XIGetKnownProperty() aren't reset on the second
server generation but keep the old value. As a result, wrong Atoms are
supplied to the driver, resulting in potential data corruption or weird
error message.
Reproducible by running "xlsatom | grep FLOAT" twice on a plain X server.
The second X server generation won't have the FLOAT atom defined anymore,
despite the users of this atom not noticing any errors.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Julien Cristau <jcristau@debian.org>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 72758287f79a4f1aa8fa388f20947042e3e14693
Author: Julien Cristau <jcristau@debian.org>
Date: Tue May 4 15:15:02 2010 +0200
XQuartz: add new localization files to EXTRA_DIST
commit 206531f75cd41c034e89fdfbc75ab0910682eef8 added localization files
for ar, add them to the Makefile.
Signed-off-by: Julien Cristau <jcristau@debian.org>
Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com>
commit a3f5d30ba61e70b3de8b48754dea32715ba93c40
Author: Keith Packard <keithp@keithp.com>
Date: Fri Apr 30 16:10:32 2010 -0700
Make sure XFixes invisible cursor gets freed on server reset
This uses the same hack that dix uses for the rootCursor -- allocate
a resource ID for the invisible cursor so that it gets freed at reset
time. This also allows us to unconditionally create it during
extension initialization; necessary as the privates layout may well be
different on subsequent generations.
Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit cdeb2c23f80ced961fe205125547e16905885534
Author: Keith Packard <keithp@keithp.com>
Date: Fri Apr 30 12:18:09 2010 -0700
Fix cursor ref counting mistakes with sprites and xf86Cursor.c
A few cursor value assignments weren't getting correctly ref counted,
causing leaks of cursor objects.
Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit a80b1f888f2f7674a715d512ab950eeadee20448
Merge: 4971099860 0efd7b8d82
Author: Keith Packard <keithp@keithp.com>
Date: Sun May 2 16:35:17 2010 -0700
Merge remote branch 'jeremyhu/master'
commit 0efd7b8d82a48793341e27d4c224986e0971687c
Author: Jeremy Huddleston <jeremyhu@apple.com>
Date: Tue Apr 27 13:14:47 2010 -0700
XQuartz GLX: Change around includes for better compatability with different OS versions
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
commit 7b506fdc840aebed6b5acb91437a2cb620b5bddc
Author: Jeremy Huddleston <jeremyhu@apple.com>
Date: Wed Apr 21 08:38:53 2010 -0700
rootless: Add some sanity checking to miPaintWindow
This avoids painting the root window when it isn't actually drawable.
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
commit 4d3789c9b3fbe6aad32fcacd964353b612640f27
Author: Jeremy Huddleston <jeremyhu@apple.com>
Date: Sun Apr 18 01:22:27 2010 -0700
rootless: Remove an unneeded comment
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
commit 048d15192af39ba5111882d18a957b6ff4e34cad
Author: Oliver McFadden <oliver.mcfadden@nokia.com>
Date: Thu Apr 22 10:29:44 2010 +0300
x-list.c: null-returning function malloc() was called without checking
Signed-off-by: Oliver McFadden <oliver.mcfadden@nokia.com>
Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com>
commit 4971099860e8e6d7817ada92e2636cb435fd002d
Author: Tiago Vignatti <tiago.vignatti@nokia.com>
Date: Sun May 2 19:14:39 2010 +0300
dix: wrap variables with #ifdef when panoramix is not used
this shut up some warnings.
Signed-off-by: Tiago Vignatti <tiago.vignatti@nokia.com>
Reviewed-by: Jamey Sharp <jamey@minilop.net>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 40858960c02a7694b0e1b72e2a986805580ff6f1
Author: Keith Packard <keithp@keithp.com>
Date: Thu Apr 29 12:24:51 2010 -0700
Delete loop with no effect from GlyphUninit
Signed-off-by: Keith Packard <keithp@keithp.com>
Reviewed-by: Jamey Sharp <jamey@minilop.net>
commit 65e961fcc1da0f1e6c1c477701b2eeb36955ed24
Author: Keith Packard <keithp@keithp.com>
Date: Thu Apr 29 12:24:49 2010 -0700
Replace some input devPrivates with regular struct fields
In the process, fixes a memory leak in CloseDevice, and an unchecked
memory allocation in InitializePredictableAccelerationProperties.
Signed-off-by: Keith Packard <keithp@keithp.com>
Reviewed-by: Jamey Sharp <jamey@minilop.net>
commit 998e982b775073da59412dce8ce609ea2ad7967c
Author: Keith Packard <keithp@keithp.com>
Date: Thu Apr 29 12:24:48 2010 -0700
Move callback definitions to their own file
Needed as the privates stuff uses the callbacks before they would have
been defined in dix.h
Signed-off-by: Keith Packard <keithp@keithp.com>
Reviewed-by: Jamey Sharp <jamey@minilop.net>
commit 7dde50c649089b03650d6497079a690feea65e22
Author: Keith Packard <keithp@keithp.com>
Date: Thu Apr 29 12:24:47 2010 -0700
Move X_DEPRECATED to misc.h so it can be used outside resource.h
Signed-off-by: Keith Packard <keithp@keithp.com>
Reviewed-by: Jamey Sharp <jamey@minilop.net>
commit 5623908aeef70e5083f3b49986c7547ed044fedd
Author: Aaron Plattner <aplattner@nvidia.com>
Date: Wed Apr 28 12:37:08 2010 -0700
dix: Improve documentation of the DIX private data functions.
The functions exported by the devPrivates code were poorly documented. I tried
to spruce it up a little.
Signed-off-by: Aaron Plattner <aplattner@nvidia.com>
Reviewed-by: Tiago Vignatti <tiago.vignatti@nokia.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 986d46144b183a36b4e98aed95eca0c55a8b4251
Merge: a974c8e7cb b5b8f91b82
Author: Keith Packard <keithp@keithp.com>
Date: Fri Apr 30 12:40:53 2010 -0700
Merge remote branch 'jamey/for-keith'
Conflicts:
hw/xfree86/common/xf86xv.c
commit a974c8e7cba40c8d7d1b91e07de8c414627b71a2
Merge: 6581bc4591 02e86221b8
Author: Keith Packard <keithp@keithp.com>
Date: Fri Apr 30 12:33:00 2010 -0700
Merge remote branch 'whot/for-keith'
commit 6581bc4591746c906d97f8b868f946c47bc6d756
Merge: 0e91e19f78 d073e51bee
Author: Keith Packard <keithp@keithp.com>
Date: Fri Apr 30 12:29:52 2010 -0700
Merge remote branch 'yselkowitz/master'
commit 0e91e19f783d21198fc2e210203e0f10040a9cd0
Merge: 81a081c1f0 edbc56c088
Author: Keith Packard <keithp@keithp.com>
Date: Fri Apr 30 12:27:51 2010 -0700
Merge remote branch 'vignatti/for-keith'
commit 02e86221b851e5423a95782aa7e297ea051022ca
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu Apr 29 09:48:37 2010 +1000
xfree86: a missing input driver is not an error.
We call NIDR on all devices that make it through the config backend.
Including some that have no driver assigned to them (/dev/input/mouse0 for
example). Those ones then simply get ignored by NIDR, but this should not be
noted as an error in the log file.
X_INFO is sufficient, and it may just prevent some bugreports.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Acked-by: Julien Cristau <jcristau@debian.org>
Reviewed-by: Dan Nicholson <dbn.lists@gmail.com>
commit 81a081c1f0cb55df94cb10495aa7ad71cd5a9afb
Author: Jon TURNEY <jon.turney@dronecode.org.uk>
Date: Sat Nov 7 19:28:18 2009 +0000
Cygwin/X: AIGLX using native WGL
A rewrite of the XWin DDX AIGLX code to actually make it do something useful again
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
commit 262c2c9031ea60cbe738ed80ddb7faa1b888d137
Author: Rami Ylimäki <ext-rami.ylimaki@nokia.com>
Date: Tue Apr 27 14:04:47 2010 +0300
test: Fix linking of wrapped functions in XI2 tests.
Running "make check" will lead to build problems in
scratchbox. Building the first test that wraps dixLookupWindow fails
because symbol __real_dixLookupWindow can't be resolved. Defining
wrapping options as linker options instead of compiler options makes
everything build nicely in scratchbox.
Signed-off-by: Rami Ylimäki <ext-rami.ylimaki@nokia.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit ffaae7c0c69a51a53a76146c79f3630ae197a443
Author: Adam Jackson <ajax@redhat.com>
Date: Mon Apr 26 20:11:31 2010 -0700
Remove mibank support
Banked framebuffers are so 1990. As of 7.4 the only drivers remaining
that used this were chips, neomagic, trident, and vesa. vesa only used
it when not using shadowfb, which is broadly undesirable anyway, and no
longer uses it at all as of 2.3.0. neomagic never used it by default,
and support for it is gone in git master. The other two effectively
only ever used it for ISA chips; since ISA support is now gone from
the server, they have been modified to only compile mibank support when
ISA support is available.
Signed-off-by: Adam Jackson <ajax@redhat.com>
Reviewed-by: Keith Packard <keithp@keithp.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit b5b8f91b82d7b150c926dd3fecee6c3aafff6e39
Author: Jamey Sharp <jamey@minilop.net>
Date: Thu Apr 22 21:35:17 2010 -0700
xfree86: use screen privates for Xv offscreen images.
This replaces a globally-allocated array that depended on MAXSCREENS.
Signed-off-by: Jamey Sharp <jamey@minilop.net>
Acked-by: Tiago Vignatti <tiago.vignatti@nokia.com>
Reviewed-by: Aaron Plattner <aplattner@nvidia.com>
commit a1c2acfe798c57e5be7e5f6c111a6ce91400487a
Author: Jamey Sharp <jamey@minilop.net>
Date: Wed Apr 21 18:05:45 2010 -0700
xfree86: use screen privates for exclusive DGA clients.
Most DGA requests allow at most one client to be using DGA on each
screen. Instead of keeping track of the current client in a
MAXSCREEN-sized array, track it in a per-screen private.
Signed-off-by: Jamey Sharp <jamey@minilop.net>
Acked-by: Tiago Vignatti <tiago.vignatti@nokia.com>
Reviewed-by: Aaron Plattner <aplattner@nvidia.com>
commit f9e3a2955d2ca73604c68fc9d51405581b832edb
Author: Jamey Sharp <jamey@minilop.net>
Date: Mon Apr 26 18:23:27 2010 -0700
Make Xvfb independent of MAXSCREENS.
If a -screen option specifies a screen number higher than any previously
specified, reallocate the vfb-private array of screen-info structs.
If built with a DIX that still has a MAXSCREENS limit, asking for too
many screens won't be detected until InitOutput calls AddScreen.
Signed-off-by: Jamey Sharp <jamey@minilop.net>
Reviewed-by: Tiago Vignatti <tiago.vignatti@nokia.com>
commit 20e84b0b44e8b3b40a3ecab5b2e64a27de247b16
Author: Jamey Sharp <jamey@minilop.net>
Date: Mon Apr 26 18:09:23 2010 -0700
Xvfb: Simplify screen option processing.
Inspired by Jon Turney's "Xwin: Simplify screen option processing"
patch, which does something similar for the Xwin server.
Besides making the code more readable, this eliminates most of Xvfb's
references to MAXSCREENS.
Signed-off-by: Jamey Sharp <jamey@minilop.net>
Reviewed-by: Tiago Vignatti <tiago.vignatti@nokia.com>
commit eeb84547556b943af2acff207e034823205c7dfe
Author: Jamey Sharp <jamey@minilop.net>
Date: Mon Apr 26 18:04:25 2010 -0700
Delete redundant scrnum field from Xvfb private screen-info struct.
The screen number can be inferred from the position in the vfbScreens
array, and it was only used in two places, so it was hardly important.
Signed-off-by: Jamey Sharp <jamey@minilop.net>
Reviewed-by: Tiago Vignatti <tiago.vignatti@nokia.com>
commit da0217891904bc48d5f0b7ea5c62c8ea0e9b95f9
Author: Jamey Sharp <jamey@minilop.net>
Date: Wed Apr 21 22:26:28 2010 -0700
Track screens' installed colormaps as screen privates.
Several DDXes allow each screen to have at most one (or in some cases,
exactly one) installed colormap. These all use the same pattern: Declare
a global-lifetime array of MAXSCREENS ColormapPtrs, and index it by
screen number. This patch converts most of those to use screen privates
instead.
Signed-off-by: Jamey Sharp <jamey@minilop.net>
Acked-by: Tiago Vignatti <tiago.vignatti@nokia.com>
commit 22c4300ee25a20e1f815e46225bf0de9cfd6748f
Author: Jamey Sharp <jamey@minilop.net>
Date: Wed Oct 7 09:00:02 2009 -0700
Simplify XineramifyXv.
The structure of the adaptor-matching algorithm was obscured by trying
to use "continue" and "break" as the only control-flow primitives. It's
a lot more clear if you add "return" to that set.
Signed-off-by: Jamey Sharp <jamey@minilop.net>
Reviewed-by: Adam Jackson <ajax@redhat.com>
commit af170a4ab76d33254dd4e54a33bb410fa1624739
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Wed Apr 21 15:51:20 2010 +1000
Xext: only update the sprite on pointer events.
A call to miPointerUpdateSprite for the XTEST keyboard may result in a
NULL pointer dereference in miDCPutUpCursor() when the save buffer is NULL.
XTS test case: Xlib 11 KeymapNotify
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit bac1c5f1be4588b2b1eb646ee98a5442e1b767d5
Author: Dirk Wallenstein <halsmit@t-online.de>
Date: Sat Apr 17 21:36:23 2010 +0200
xkb: Fix omissions in geometry initialization #27679
_XkbCopyGeom did not copy all of the data from the source geometry. This
resulted in failures when trying to obtain the keymap from a server
where the default geometry has not been replaced by a custom
configuration.
Signed-off-by: Dirk Wallenstein <halsmit@t-online.de>
Reviewed-by: Daniel Stone <daniel@fooishbar.org>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 3f63db89191701139d45332ca80b9d6eb327c773
Merge: 41bdb6c003 54e51de8cd
Author: Keith Packard <keithp@keithp.com>
Date: Mon Apr 26 20:18:13 2010 -0700
Merge remote branch 'jamey/for-keith'
commit 41bdb6c003cca3ef0ff88d9c7de318115bab1ba2
Author: Pierre-Loup A. Griffais <pgriffais@nvidia.com>
Date: Wed Apr 21 18:11:05 2010 -0700
xf86: Don't crash when switching modes through RandR without owning the VT.
While VT-switched, FB access is disabled and should remain so. Trying to switch
modes in that state would re-enable it, potentially causing crashes if trying
to access it before the driver has recovered from the mode switch.
Signed-off-by: Pierre-Loup A. Griffais <pgriffais@nvidia.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 2a763c9023b8bc978b32eaa56d2c625b6f2badee
Author: Adam Jackson <ajax@redhat.com>
Date: Mon Feb 15 16:54:35 2010 -0500
dix: Default DPMS timeout values to match screensaver values
These have the same default, but if you specify something different with
-s on the command line, only the screensaver time is changed. As DPMS
is usually what's desired, change it to match.
Signed-off-by: Adam Jackson <ajax@redhat.com>
Reviewed-by: Keith Packard <keithp@keithp.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 518f3b189b6c8aa28b62837d14309fd06163ccbb
Author: Pierre-Loup A. Griffais <pgriffais@nvidia.com>
Date: Wed Apr 21 16:46:17 2010 -0700
mi: don't thrash resources when displaying the software cursor across screens
This changes the DC layer to maintain a persistent set of GCs/pixmaps/pictures
for each pScreen instead of failing to thrash between them when changing
screens.
Signed-off-by: Pierre-Loup A. Griffais <pgriffais@nvidia.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Tested-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 54e51de8cd950b3f5b30e72cf1d604f54f619f0e
Author: Jamey Sharp <jamey@minilop.net>
Date: Sat Apr 24 23:07:47 2010 -0700
ProcGrabButton: remove redundant error check.
If dixLookupResourceByType did not return Success, it will have set the
pointer to NULL, so the second if will always be true.
Signed-off-by: Jamey Sharp <jamey@minilop.net>
Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
commit 7e573b5ccd2c759f74ebb84d3a5a23da6b88ec6d
Author: Jamey Sharp <jamey@minilop.net>
Date: Mon Apr 26 15:05:06 2010 -0700
Kill unused/useless macros in panoramiX.h: BREAK_IF, IF_RETURN, FORCE_ROOT
This header doesn't seem to be used outside the server tree, so I don't
think anything was depending on these except what I've fixed in this
patch.
FORCE_ROOT is not used anywhere, and never has been in all the history
that's in git. ajax removed its FORCE_WIN and FORCE_CMAP companions
three years ago, in 04b87d6dfae02e4ecdb5216d12c6cdafd1e8c2b4.
BREAK_IF and IF_RETURN expanded to exactly the keywords in their names,
which is silly. They were rarely used and served only to make callers
inconsistent with the idioms used elsewhere in the server.
Signed-off-by: Jamey Sharp <jamey@minilop.net>
Reviewed-by: Matt Turner <mattst88@gmail.com>
commit e372cc58e02391c3e8e82ac03f73fbe8b1f7d49c
Author: Jamey Sharp <jamey@minilop.net>
Date: Wed Oct 7 11:06:34 2009 -0700
Boolean-or short-circuits, so (a || (!a && ...)) is redundant. Simplify.
Signed-off-by: Jamey Sharp <jamey@minilop.net>
Reviewed-by: Dan Nicholson <dbn.lists@gmail.com>
Reviewed-by: Matt Turner <mattst88@gmail.com>
commit 25d1c6cd37cc4079adf7c4bad8d10678fb08b409
Author: Keith Packard <keithp@keithp.com>
Date: Mon Apr 26 11:04:38 2010 -0700
Exa screen private has SavedSourceValidate, not SourceValidate
Need to check the right field to see if there is a wrapped
SourceValidate function.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit d073e51beeed2e702fa5c7534b1345360bc302f2
Author: Yaakov Selkowitz <yselkowitz@users.sourceforge.net>
Date: Mon Apr 26 11:39:19 2010 -0500
Clarify help strings for disabled features in configure
Features which are disabled by default use the --enable-* syntax to show
how they need to be passed to override the default.
Signed-off-by: Yaakov Selkowitz <yselkowitz@users.sourceforge.net>
Reviewed-by: Mikhail Gusarov <dottedmag@dottedmag.net>
Reviewed-by: Dan Nicholson <dbn.lists@gmail.com>
Reviewed-by: Gaetan Nadon <memsize@videotron.ca>
commit 57409af1267f48457f93134922f2450518182e09
Author: Yaakov Selkowitz <yselkowitz@users.sourceforge.net>
Date: Wed Apr 14 13:18:28 2010 -0500
Catch when requested SHA1 implementation is missing
The other SHA1 implementation detections already error out if
specifically requested but were not found.
Signed-off-by: Yaakov Selkowitz <yselkowitz@users.sourceforge.net>
Reviewed-by: Julien Cristau <jcristau@debian.org>
commit 0d8fe2fe5c37659147cbecac793183c62fc6818a
Author: Yaakov Selkowitz <yselkowitz@users.sourceforge.net>
Date: Tue Apr 13 13:32:51 2010 -0500
Prefer libsha1 over libgcrypt
When no SHA1 implementation is specified, we should first prefer
system-builtin solutions (libc/libmd/CommonCrypto), then smaller
implementations over the larger ones. libsha1 is much smaller than
libgcrypt, so it should be first.
Signed-off-by: Yaakov Selkowitz <yselkowitz@users.sourceforge.net>
Reviewed-by: Mikhail Gusarov <dottedmag@dottedmag.net>
Acked-by: Julien Cristau <jcristau@debian.org>
commit 65a2c09549d2372c23b155addff428177708c910
Author: Yaakov Selkowitz <yselkowitz@users.sourceforge.net>
Date: Thu Apr 8 21:55:45 2010 -0500
Revert "Disable Record by default."
Record was broken during the pre-1.6 development cycle and was not fixed
until 1.7.6. Now that it is fixed, re-enable it by default.
This reverts commit 3eaecdd66e791e0f3d86b23ce10be057ca44c044.
Conflicts:
configure.ac
Signed-off-by: Yaakov Selkowitz <yselkowitz@users.sourceforge.net>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 6e0d847c273ab89323883a05f806f449180e3669
Author: Yaakov Selkowitz <yselkowitz@users.sourceforge.net>
Date: Thu Mar 25 03:37:09 2010 -0500
xfree86: Fix reference to SGML entities
XORG_CHECK_LINUXDOC sets the SGML search path to the parent of X11/defs.ent.
Signed-off-by: Yaakov Selkowitz <yselkowitz@users.sourceforge.net>
Acked-by: Dan Nicholson <dbn.lists@gmail.com>
Tested-by: Gaetan Nadon <memsize@videotron.ca>
commit 04b7d529c09af2c842cf020d5b26080e1ffd88d6
Author: Yaakov Selkowitz <yselkowitz@users.sourceforge.net>
Date: Thu Mar 25 03:36:25 2010 -0500
xfree86: Ignore linuxdoc generated docs
Signed-off-by: Yaakov Selkowitz <yselkowitz@users.sourceforge.net>
Acked-by: Gaetan Nadon <memsize@videotron.ca>
commit 39e5108c78e0802833a8e9ea7f29d042738625ba
Author: Yaakov Selkowitz <yselkowitz@users.sourceforge.net>
Date: Thu Mar 25 03:35:36 2010 -0500
dmx: use silent rules in doc
Signed-off-by: Yaakov Selkowitz <yselkowitz@users.sourceforge.net>
Acked-by: Gaetan Nadon <memsize@videotron.ca>
commit 3ba2ce5d1054c99354686aeb373247f1b9debf79
Author: Yaakov Selkowitz <yselkowitz@users.sourceforge.net>
Date: Thu Mar 25 03:33:55 2010 -0500
dmx: Ignore linuxdoc generated docs
dmx.txt and scaled.txt are generated from SGML, so they probably never
should have been in version control in the first place.
Signed-off-by: Yaakov Selkowitz <yselkowitz@users.sourceforge.net>
Acked-by: Peter Hutterer <peter.hutterer@who-t.net>
Acked-by: Dan Nicholson <dbn.lists@gmail.com>
commit 40972576b606237d5d42abc13d846163e264a4ac
Author: Yaakov Selkowitz <yselkowitz@users.sourceforge.net>
Date: Tue Mar 23 04:47:27 2010 -0500
Use AC_PROG_SED and respect its result
AC_PROG_SED sets SED as the path to a fully-functional 'sed' (which may
also be called 'gsed' if GNU sed is installed alongside a proprietary
version).
This is a follow up to commit 9be4157391edf0c5fc4ee36adfb1eb1c3bdb8e3b.
Signed-off-by: Yaakov Selkowitz <yselkowitz@users.sourceforge.net>
Reviewed-by: Rémi Cardona <remi@gentoo.org>
commit b557571dbff3d9a615e03cad904d46b8af9153a0
Author: Jerome Glisse <jglisse@redhat.com>
Date: Mon Apr 26 16:01:48 2010 +0200
exa: avoid calling non existent SourceValidate callback
In unaccel path we were unconditionaly calling the SourceValidate
callback but in some case it could be NULL. Check if we have a
valid callback before calling it.
Signed-off-by: Jerome Glisse <jglisse@redhat.com>
Acked-by: Michel Dänzer <michel@daenzer.net>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 0e6e75b04eaca311962390533acc03d0ac5ece83
Author: Keith Packard <keithp@keithp.com>
Date: Mon Apr 26 09:14:22 2010 -0700
Revert "exa: avoid calling non existent SourceValidate callback"
This reverts commit daa6f9308fa57e41210f78d92dbdb3f1c8eae6ad.
This one checked pScreen->SourceValidate instead of
pExaScr->SourceValidate which would cause a segfault when
pExaScr->SourceValidate was NULL.
commit daa6f9308fa57e41210f78d92dbdb3f1c8eae6ad
Author: Jerome Glisse <jglisse@redhat.com>
Date: Mon Apr 26 15:55:26 2010 +0200
exa: avoid calling non existent SourceValidate callback
In unaccel path we were unconditionaly calling the SourceValidate
callback but in some case it could be NULL. Check if we have a
valid callback before calling it.
Signed-off-by: Jerome Glisse <jglisse@redhat.com>
Acked-by: Michel Dänzer <michel@daenzer.net>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit edbc56c088462844f6445f5e6d7cbcfc58a207dc
Author: Tiago Vignatti <tiago.vignatti@nokia.com>
Date: Mon Apr 26 14:49:25 2010 +0300
include: remove couple of unused structures fields and bump ABI
Signed-off-by: Tiago Vignatti <tiago.vignatti@nokia.com>
commit 4f8dc1109dcdfa973466a038c16c07da5f6c16b4
Author: Tiago Vignatti <tiago.vignatti@nokia.com>
Date: Thu Apr 22 15:43:11 2010 +0300
dix and others: remove unused arraySize field from ScreenInfo
Bizarre. This seems to never be used before. I left the field in ScreenInfo,
with another name. So, stop looking at it.
Signed-off-by: Tiago Vignatti <tiago.vignatti@nokia.com>
Reviewed-by: Aaron Plattner <aplattner@nvidia.com>
commit 64fd39f2f0ffbbdc2d5929047d260263d0962141
Author: Tiago Vignatti <tiago.vignatti@nokia.com>
Date: Thu Apr 22 15:48:48 2010 +0300
xfree86: no need to assign numScreens again
numScreens is always being assigned to 0 in dix for any server generation.
Signed-off-by: Tiago Vignatti <tiago.vignatti@nokia.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
commit a7d398e545a4be5491248d5ccb303aa03ee1594f
Author: Jon TURNEY <jon.turney@dronecode.org.uk>
Date: Fri Apr 16 18:13:50 2010 +0100
Xwin: make screens structures run-time adjustable
Change g_ScreenInfo, an array of winScreenInfo elements, from a
static array of MAXSCREENS elements, to a dynamically allocated one
Fix up the validation that -screen option screen numbers are
contiguous from zero (which possibly didn't work correctly before
anyhow)
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Reviewed-by: Jamey Sharp<jamey@minilop.net>
Reviewed-by: Tiago Vignatti <tiago.vignatti@nokia.com>
commit d8454ae488cfc073cd6010c9a08d53855a0c2612
Author: Jon TURNEY <jon.turney@dronecode.org.uk>
Date: Mon Apr 12 20:18:13 2010 +0100
Xwin: Simplify screen option processing
Use an instance of the XWin DDX-specific screen info structure to hold
the current default values, to simplify greatly the code for applying
options to all screens and remove all those loops over MAXSCREENS screens
in the command line option processing
Use g_iNumScreens for tracking the current initialized screen count
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Reviewed-by: Jamey Sharp <jamey@minilop.net>
Reviewed-by: Tiago Vignatti <tiago.vignatti@nokia.com>
commit b61870595ba4df06006d24ed8c07cfe781bce1b7
Author: Tiago Vignatti <tiago.vignatti@nokia.com>
Date: Thu Apr 22 20:20:48 2010 +0300
xfree86: track screens' installed colormaps as screen privates
Signed-off-by: Tiago Vignatti <tiago.vignatti@nokia.com>
Reviewed-by: Jamey Sharp <jamey@minilop.net>
commit a94f5455c71363d5047668ee093901b9e1645cf1
Author: Tiago Vignatti <tiago.vignatti@nokia.com>
Date: Thu Apr 22 20:20:43 2010 +0300
mi: track screens' installed colormaps as screen privates
Signed-off-by: Tiago Vignatti <tiago.vignatti@nokia.com>
Reviewed-by: Jamey Sharp <jamey@minilop.net>
commit a2c716eaf6b3a4ce75382394636a0a890b5dcfe0
Author: Jamey Sharp <jamey@minilop.net>
Date: Thu Apr 22 07:34:04 2010 +0200
fb: track screens' installed colormaps as screen privates.
Several DDXes allow each screen to have at most one (or in some cases,
exactly one) installed colormap. These all use the same pattern: Declare
a global-lifetime array of MAXSCREENS ColormapPtrs, and index it by
screen number. This patch converts most of those to use screen privates
instead.
Signed-off-by: Jamey Sharp <jamey@minilop.net>
Acked-by: Tiago Vignatti <tiago.vignatti@nokia.com>
commit e055bef055b6c726e9f3ef91a83585d13c80651d
Author: Jamey Sharp <jamey@minilop.net>
Date: Thu Apr 22 06:08:29 2010 +0200
xfree86: use screen privates for exclusive DGA clients
Most DGA requests allow at most one client to be using DGA on each screen.
Instead of keeping track of the current client in a MAXSCREEN-sized array,
track it in a per-screen private.
Signed-off-by: Jamey Sharp <jamey@minilop.net>
Acked-by: Tiago Vignatti <tiago.vignatti@nokia.com>
commit 7c9733d063acee04735a0e75d62e508fe4ea1163
Author: Jamey Sharp <jamey@minilop.net>
Date: Fri Apr 23 06:41:00 2010 +0200
xfree86: use screen privates for Xv offscreen images.
This replaces a globally-allocated array that depended on MAXSCREENS.
Signed-off-by: Jamey Sharp <jamey@minilop.net>
Acked-by: Tiago Vignatti <tiago.vignatti@nokia.com>
commit 35d208125fa0ec78e8d694adc52886b977e789cf
Author: Tiago Vignatti <tiago.vignatti@nokia.com>
Date: Wed Apr 21 18:28:13 2010 +0300
xfree86: fix not reached code in fi1236 driver from i2c
This issue was introduced in the first dump of the code in 2004. I haven't
check what's the correct fix for it so I simply kept the behaviour of someone
calling this and removed the unreachable code.
Signed-off-by: Tiago Vignatti <tiago.vignatti@nokia.com>
Reviewed-by: Keith Packard <keithp@keithp.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 7ac6a6b7d0dfc5e021270b2898accd3425aa008a
Merge: 0782894b57 f7ef6fd9a1
Author: Keith Packard <keithp@keithp.com>
Date: Wed Apr 21 16:07:38 2010 -0700
Merge remote branch 'vignatti/for-keith'
Conflicts:
exa/exa.c
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 0782894b5702adcf6f4a90861793b717f3856fa5
Author: Keith Packard <keithp@keithp.com>
Date: Wed Apr 21 16:00:28 2010 -0700
Xvfb: Usage message typo fix.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit ee3412b8702072c3a0b006bd20dd3bc7071d721c
Author: Keith Packard <keithp@keithp.com>
Date: Wed Apr 21 15:58:23 2010 -0700
Restore some unused win32 debug code accidentally removed with unifdef
unifdef found some code covered by
which it decided to remove. This patch simply restores that in case
someone wants it back.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit e3d2a7a613366c26e5316cf582d9a8c6c6692b0a
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Wed Apr 21 11:47:24 2010 +1000
Revert "mi: don't thrash resources when displaying the software cursor across screens"
This commit leads to a segfault on the very first XTS test case.
Backtrace:
0: /opt/xorg/bin/Xorg (xorg_backtrace+0x3b) [0x80a33db]
1: /opt/xorg/bin/Xorg (0x8048000+0x62a75) [0x80aaa75]
2: (vdso) (__kernel_rt_sigreturn+0x0) [0x5d140c]
3: /lib/libc.so.6 (0x9bb000+0x73579) [0xa2e579]
4: /lib/libc.so.6 (realloc+0xe0) [0xa2e830]
5: /opt/xorg/bin/Xorg (Xrealloc+0x33) [0x80a3f33]
6: /opt/xorg/bin/Xorg (0x8048000+0x1ab79) [0x8062b79]
7: /opt/xorg/bin/Xorg (0x8048000+0x1ac4e) [0x8062c4e]
8: /opt/xorg/bin/Xorg (RegisterExtensionNames+0x2ce) [0x8062fbe]
9: /opt/xorg/bin/Xorg (AddExtension+0x19a) [0x807bd7a]
10: /opt/xorg//lib/xorg/modules/extensions/libextmod.so (0x728000+0x1169a)
[0x73969a]
11: /opt/xorg/bin/Xorg (InitExtensions+0x85) [0x80c0eb5]
12: /opt/xorg/bin/Xorg (0x8048000+0x1a51d) [0x806251d]
13: /lib/libc.so.6 (__libc_start_main+0xe6) [0x9d1bb6]
14: /opt/xorg/bin/Xorg (0x8048000+0x1a2a1) [0x80622a1]
Segmentation fault at address 0x10b2d5f8
valgrind output:
==5069== Invalid read of size 4
==5069== at 0x80F928D: FreePicture (picture.c:1531)
==5069== by 0x818DDEF: miDCDeviceCleanup (midispcur.c:867)
==5069== by 0x81B97F0: miSpriteDeviceCursorCleanup (misprite.c:968)
==5069== by 0x80995FA: miPointerDeviceCleanup (mipointer.c:292)
==5069== by 0x807973E: CloseDevice (devices.c:840)
==5069== by 0x80799B6: CloseDownDevices (devices.c:933)
==5069== by 0x8062705: main (main.c:309)
==5069== Address 0x4cce844 is 12 bytes inside a block of size 84 free'd
==5069== at 0x40057F6: free (vg_replace_malloc.c:325)
==5069== by 0x80A3DE0: Xfree (utils.c:1154)
==5069== by 0x80F9332: FreePicture (picture.c:1576)
==5069== by 0x80FBB4B: PictureDestroyWindow (picture.c:69)
==5069== by 0x810B1A3: damageDestroyWindow (damage.c:1840)
==5069== by 0x80864F1: FreeWindowResources (window.c:846)
==5069== by 0x8086812: DeleteWindow (window.c:925)
==5069== by 0x806B53E: FreeClientResources (resource.c:806)
==5069== by 0x806B60F: FreeAllResources (resource.c:823)
==5069== by 0x80626E4: main (main.c:299)
==5069==
==5069== Invalid write of size 4
==5069== at 0x80F9295: FreePicture (picture.c:1531)
==5069== by 0x818DDEF: miDCDeviceCleanup (midispcur.c:867)
==5069== by 0x81B97F0: miSpriteDeviceCursorCleanup (misprite.c:968)
==5069== by 0x80995FA: miPointerDeviceCleanup (mipointer.c:292)
==5069== by 0x807973E: CloseDevice (devices.c:840)
==5069== by 0x80799B6: CloseDownDevices (devices.c:933)
==5069== by 0x8062705: main (main.c:309)
==5069== Address 0x4cce844 is 12 bytes inside a block of size 84 free'd
==5069== at 0x40057F6: free (vg_replace_malloc.c:325)
==5069== by 0x80A3DE0: Xfree (utils.c:1154)
==5069== by 0x80F9332: FreePicture (picture.c:1576)
==5069== by 0x80FBB4B: PictureDestroyWindow (picture.c:69)
==5069== by 0x810B1A3: damageDestroyWindow (damage.c:1840)
==5069== by 0x80864F1: FreeWindowResources (window.c:846)
==5069== by 0x8086812: DeleteWindow (window.c:925)
==5069== by 0x806B53E: FreeClientResources (resource.c:806)
==5069== by 0x806B60F: FreeAllResources (resource.c:823)
==5069== by 0x80626E4: main (main.c:299)
XTS test case: Xproto pAllocColor
This reverts commit 00b8b7ad61b6f818271fb4d1e383113170309d72.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit f7ef6fd9a1a1f48603df2796fe7c904c25a81077
Author: Tiago Vignatti <tiago.vignatti@nokia.com>
Date: Tue Apr 20 15:56:58 2010 +0300
xfree86: fix not reached code in tty code
CLEARRTS_SUPPORT cannot be triggered at all. Notice that mouse driver manual
page states the support for it though.
Signed-off-by: Tiago Vignatti <tiago.vignatti@nokia.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
commit b36eeb713a349961a6be8a6dd183ded6d27f9974
Author: Tiago Vignatti <tiago.vignatti@nokia.com>
Date: Tue Apr 20 16:26:02 2010 +0300
xkb: check for NULL pointer before dereferences it in XkbWriteXKBSymbols
move srv assignment to before it's being used. Also, check for xkb being nil.
Signed-off-by: Tiago Vignatti <tiago.vignatti@nokia.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 471f350c99b2e7c5a9045eef5ebff65cd2ddb7c5
Author: Tiago Vignatti <tiago.vignatti@nokia.com>
Date: Mon Apr 19 20:34:30 2010 +0300
exa: don't need to check for NULL pointer if we already assumed it has a value
the alternative would be to check ps in the beginning of the function.
Signed-off-by: Tiago Vignatti <tiago.vignatti@nokia.com>
Acked-by: Michel Dänzer <michel@daenzer.net>
commit 96784f4fcb6c2fb82f6d1abbd28ea1e189e4e6f5
Author: Tiago Vignatti <tiago.vignatti@nokia.com>
Date: Mon Apr 19 20:46:12 2010 +0300
xkb: check for NULL pointer before dereferences it in XkbAddClientResource
Signed-off-by: Tiago Vignatti <tiago.vignatti@nokia.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Dan Nicholson <dbn.lists@gmail.com>
commit 057c147541bde6f0cbe22ca069b43a97ddc95baf
Author: Tiago Vignatti <tiago.vignatti@nokia.com>
Date: Fri Apr 16 18:01:41 2010 +0300
Xi: check for NULL pointer before dereferences it in ListButtonInfo
Both dev and dev->button are already used before their checking were being
performed. So check on the beginning.
Signed-off-by: Tiago Vignatti <tiago.vignatti@nokia.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Dan Nicholson <dbn.lists@gmail.com>
commit 7f457351d2a09013cd57fcb2f95c0d6f56bfaccb
Author: Tiago Vignatti <tiago.vignatti@nokia.com>
Date: Mon Apr 19 20:18:51 2010 +0300
xfree86: check for NULL pointer before dereferences it in parser code
Seems to be harmless. Meh.
Signed-off-by: Tiago Vignatti <tiago.vignatti@nokia.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Dan Nicholson <dbn.lists@gmail.com>
commit d948dcd9555c81ccb378054383ef8da464202bdf
Author: Tiago Vignatti <tiago.vignatti@nokia.com>
Date: Fri Apr 16 17:08:09 2010 +0300
Xi: fix not reached code in XSendExtensionEvent
Error was introduced in 31a7994a. I.e., broken since 2007. I guess nobody uses
XSendExtensionEvent.
Signed-off-by: Tiago Vignatti <tiago.vignatti@nokia.com>
Reviewed-by: Dan Nicholson <dbn.lists@gmail.com>
commit f491b0aa5b86a5242fc4e04218202bbb52d0af39
Author: Tiago Vignatti <tiago.vignatti@nokia.com>
Date: Fri Apr 16 16:47:33 2010 +0300
xfree86: fix not reached code in parser
...because Error is a macro that returns NULL.
Signed-off-by: Tiago Vignatti <tiago.vignatti@nokia.com>
Reviewed-by: Dan Nicholson <dbn.lists@gmail.com>
commit 099946a3ac94ff5e575e9edcecd26cf9f346b241
Author: Tiago Vignatti <tiago.vignatti@nokia.com>
Date: Fri Apr 16 18:35:55 2010 +0300
mi: check for NULL pointer before dereferences it in miPointerSetPosition
Signed-off-by: Tiago Vignatti <tiago.vignatti@nokia.com>
Reviewed-by: Dan Nicholson <dbn.lists@gmail.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 49835eec0c996ad95a01f0fe340336b6b60e51aa
Author: Tiago Vignatti <tiago.vignatti@nokia.com>
Date: Fri Apr 16 17:50:43 2010 +0300
exa: check for NULL pointer before dereferences it
Signed-off-by: Tiago Vignatti <tiago.vignatti@nokia.com>
Acked-by: Michel Dänzer <michel@daenzer.net>
Reviewed-by: Dan Nicholson <dbn.lists@gmail.com>
commit 996c115deb558e8e9490ea773528b8e96650df53
Author: Tiago Vignatti <tiago.vignatti@nokia.com>
Date: Thu Mar 25 18:17:54 2010 +0200
configure: remove unused builtin font macro from autoconf file
This should be removed together with 49b93df8.
Signed-off-by: Tiago Vignatti <tiago.vignatti@nokia.com>
Reviewed-by: Dan Nicholson <dbn.lists@gmail.com>
commit 0ba82562eeba8bf3bcd00b6e3ff28ce5b2c8df3c
Author: Tiago Vignatti <tiago.vignatti@nokia.com>
Date: Tue Mar 30 19:10:36 2010 +0300
Death to Multibuffer extension
The rationale behind is because no sane application will use this when we have
modern APIs such DRI2. Besides, as a fact, xfree86 server has already
deprecated this extension in 1998:
http://www.xfree86.org/3.3.6/isc7.html
Signed-off-by: Tiago Vignatti <tiago.vignatti@nokia.com>
Reviewed-by: Keith Packard <keithp@keithp.com>
commit 28b7b2b8d02d975480080865f0dddebcaa2f7968
Author: Keith Packard <keithp@keithp.com>
Date: Mon Apr 19 09:26:10 2010 -0700
unifdef -B -DRENDER to always include RENDER code
This patch was created with:
git ls-files '*.[ch]' | while read f; do unifdef -B -DRENDER -o $f $f; done
Signed-off-by: Keith Packard <keithp@keithp.com>
commit b3ab978df861c08298f57529e3db980489055c35
Merge: a92b2c2c8d 0ad022a729
Author: Keith Packard <keithp@keithp.com>
Date: Sun Apr 18 22:01:40 2010 -0700
Merge remote branch 'whot/for-keith'
commit 0ad022a729bafa56cc7b5d241f567444a34514ad
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Wed Apr 14 10:54:29 2010 +1000
xkb: rename XkbFakeDeviceButton and XkbFakeDeviceMotion, move into xkbActions.c
The name XkbDDXFakeDeviceButton and XkbDDXFakeDeviceMotion is somewhat
misleading, there's no DDX involved in the game at all anymore.
This removes XkbFakeDeviceMotion and XkbFakeDeviceButton from the API where
it arguably shouldn't have been in the first place.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Daniel Stone <daniel@fooishbar.org>
Reviewed-by: Dan Nicholson <dbn.lists@gmail.com>
commit da4e2e382828d7ba460766709368ec6214b286dd
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Wed Apr 14 09:48:53 2010 +1000
xkb: purge unneeded includes from ddxDevBtn.c
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Daniel Stone <daniel@fooishbar.org>
Reviewed-by: Dan Nicholson <dbn.lists@gmail.com>
commit a92b2c2c8dd1e86ee852168146f01bdf72bfe2d0
Author: Kristian Høgsberg <krh@bitplanet.net>
Date: Fri Apr 16 05:55:35 2010 -0400
glx: Drop DestroyWindow hook
Now that glx doesn't call DRI2DestroyDrawable anymore, we don't need to
force a specific resource destruction order in the DestroyWindow hook.
Signed-off-by: Kristian Høgsberg <krh@bitplanet.net>
Reviewed-by: Michel Dänzer <michel@daenzer.net>
https://bugs.freedesktop.org/show_bug.cgi?id=26394
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 1da1f33f2dd5b437dd56cd9f5d6782de4ad5a1bc
Author: Kristian Høgsberg <krh@bitplanet.net>
Date: Fri Apr 16 05:55:34 2010 -0400
DRI2: Track DRI2 drawables as resources, not privates
The main motivation here is to have the resource system clean up the
DRI2 drawable automatically so glx doesn't have to. Right now, the
glx drawable resource must be destroyed before the X drawable, so that
calling DRI2DestroyDrawable doesn't crash. By making the DRI2
drawable a resource, GLX doesn't have to worry about that and the
resource destruction order becomes irrelevant.
https://bugs.freedesktop.org/show_bug.cgi?id=26394
Signed-off-by: Kristian Høgsberg <krh@bitplanet.net>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 22da7aa9d743deee198aaf6df5d370a446db9763
Author: Kristian Høgsberg <krh@bitplanet.net>
Date: Fri Apr 16 05:55:33 2010 -0400
glx: Let the resource system destroy pixmaps
GLX pbuffers are implemented using a pixmap allocated by the server.
With the change to DRI2 to track DRI2 drawables as resources, we need to make
sure that every drawable we create a DRI2 drawable for has an XID. By
using the XID of the pbuffer, the resource system will automatically
reclaim the hidden pixmap and the DRI2 drawable when the pbuffer is
destroyed or the client exits.
Signed-off-by: Kristian Høgsberg <krh@bitplanet.net>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit f0006aa58f6cf7552a239e169ff6e7e4fda532f4
Author: Kristian Høgsberg <krh@bitplanet.net>
Date: Fri Apr 16 05:55:32 2010 -0400
glx: Track GLX 1.3 style GLX drawables under their X drawable ID as well
This ensures that the DrawableGone callback gets called as necessary
when the X drawable goes away. Otherwise, using a GLX drawable
(say, glXSwapBuffers) in indirect mode after the X drawable has been
destroyed will crash the server.
Signed-off-by: Kristian Høgsberg <krh@bitplanet.net>
Reviewed-by: Michel Dänzer <michel@daenzer.net>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit f4106c02318fcc4b534224df5b95a58aff555fb4
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Tue Apr 13 14:44:59 2010 +1000
xkb: use GPE for XKB fake motion events.
Section 4.6.1 of the XKB spec says that "the initial event always moves the
cursor the distance specified in the action [...]", so skip the
POINTER_ACCELERATE flag for GPE, it would cause double-acceleration.
Potential regression - GPE expects the coordinates to be either relative or
both. XKB in theory allows for x to be relative and y to be absolute (or
vice versa). Let's pretend that scenario has no users.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Simon Thum <simon.thum@gmx.de>
Reviewed-by: Daniel Stone <daniel@fooishbar.org>
commit 6c42c8c356be305dc7f3f92ad8d58675da8c2f07
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Wed Apr 14 10:51:41 2010 +1000
xkb: Guard against SIGIO updates during PointerKeys.
In theory, an event coming in during GPE could reset our lastSlave, leading
to rather interesting events lateron.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Simon Thum <simon.thum@gmx.de>
Reviewed-by: Daniel Stone <daniel@fooishbar.org>
commit 108457dff816569453a2d88cd72595fa7eb02479
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Tue Apr 13 14:41:07 2010 +1000
xkb: Post PointerKeys through the XTEST device.
Posting an event through a master device may cause pointer jumps once
lastSlave == master, caused by double scaling. To avoid this, post the fake
event generated by XKB through the XTEST device instead.
Fedora bug #560356 <https://bugzilla.redhat.com/560356>
Tested-by: Andrew McNabb
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Daniel Stone <daniel@fooishbar.org>
commit a780e5b3638a0ff81301fc68aca15b47ba0befb7
Author: Benjamin Tissoires <tissoire@cena.fr>
Date: Wed Apr 14 17:27:51 2010 +0200
xf86ScaleAxis: support for high resolution devices
High resolution devices was generating integer overflow.
For instance the wacom Cintiq 21UX has an axis value up to
87000. Thus the term (dSx * (Cx - Rxlow)) is greater than
MAX_INT32.
Using 64bits integer avoids such problem.
Signed-off-by: Philippe Ribet <ribet@cena.fr>
Signed-off-by: Benjamin Tissoires <tissoire@cena.fr>
Reviewed-by: Keith Packard <keithp@keithp.com>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit e424d5812300e82de375d83dc0b490a76d865016
Merge: 5b0faf3554 0e7703f9b1
Author: Keith Packard <keithp@keithp.com>
Date: Thu Apr 15 15:01:34 2010 -0700
Merge remote branch 'whot/for-keith'
commit 0e7703f9b1927328954a2fc87aac6be244819329
Author: Julien Cristau <jcristau@debian.org>
Date: Tue Apr 13 22:28:36 2010 +0200
vfb: add a name and type to the pointer and keyboard
Fixes a crash in XIQueryDevice which calls strlen on a NULL pointer.
#0 strlen () at ../sysdeps/x86_64/strlen.S:31
#1 0x00000000004c16ed in SizeDeviceInfo (dev=0x969bd0)
at ../../Xi/xiquerydevice.c:204
#2 0x00000000004c1a01 in ProcXIQueryDevice (client=0xa57510)
at ../../Xi/xiquerydevice.c:98
Debian bug#575905 <http://bugs.debian.org/575905>
Reported-by: "Bernhard R. Link" <brlink@debian.org>
Signed-off-by: Julien Cristau <jcristau@debian.org>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 2f29b163bbdebe384c24f781bb97b446959e8f4c
Author: Adam Tkac <atkac@redhat.com>
Date: Mon Mar 22 14:52:29 2010 +0100
dix: Export AllocDevicePair GetPointerEvents, GetKeyboardEvents and generate_modkeymap functions from Xorg.
Those functions are used by TigerVNC libvnc.so module which doesn't
use standard XInput infrastructure but uses same functions like,
for example, XTest devices.
Signed-off-by: Adam Tkac <atkac@redhat.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 241b53b77750b5eea6759e79b23be4ff270a3d1f
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Tue Mar 23 14:35:56 2010 +1000
mi: remove log-spamming bogus error message (#26843)
miSpriteRealizeCursor is called whenever a device is set floating and it's
fine to do so, no need for an error message.
Same goes for the other miSprite messages.
X.Org Bug 26843 <http://bugs.freedesktop.org/show_bug.cgi?id=26843>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 00b8b7ad61b6f818271fb4d1e383113170309d72
Author: Pierre-Loup A. Griffais <pgriffais@nvidia.com>
Date: Wed Apr 7 13:52:47 2010 -0700
mi: don't thrash resources when displaying the software cursor across screens
This changes the DC layer to maintain a persistent set of GCs/pixmaps/pictures
for each pScreen instead of failing to thrash between them when changing
screens.
Signed-off-by: Pierre-Loup A. Griffais <pgriffais@nvidia.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 5f31e2196179f8db3170d65a17d8ad40da1acb0d
Author: Tim Yamin <plasm@roo.me.uk>
Date: Mon Mar 8 12:45:15 2010 +1000
dix: fix cursor screen check for xinerama setups.
The de-duplication of CheckPhysLimits 942eae6868b8b0f343b6a added a
condition that is invalid for a Xinerama setup. pScreen is invalid for the
Xinerama case, so comparing it to anything is a bad idea.
Signed-off-by: Tim Yamin <plasm@roo.me.uk>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 5b0faf355465c9f21ad96e0ed266fbdbc29efb5b
Author: Jeremy Huddleston <jeremyhu@apple.com>
Date: Thu Apr 15 10:55:53 2010 -0700
XQuartz GLX: Don't let garbage enter our pixel request
https://bugs.freedesktop.org/show_bug.cgi?id=27654
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
commit fe7778e58e099d353689755ed2f5aa440569ebe3
Author: Jeremy Huddleston <jeremyhu@apple.com>
Date: Wed Apr 14 09:06:04 2010 -0700
XQuartz: Fix possible NULL dereference in ListenOnOpenFD
<rdar://problem/7862319>
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
Reviewed-by: Marc Majka <majka@apple.com>
commit 206531f75cd41c034e89fdfbc75ab0910682eef8
Author: Jeremy Huddleston <jeremyhu@apple.com>
Date: Tue Apr 13 14:33:49 2010 -0700
XQuartz: Localization update
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
commit 9ddbb03fa56aa73c3f417d8ee6433e45b94445b3
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Wed Apr 14 17:43:22 2010 +1000
dix: Fix crash in DeliverGrabbedEvents.
If both devices are synchronously grabbed, first with a GrabPointer, then
with a GrabKeyboard (GrabModeSync on both), sync.other of each device points
to the grab of the respective other device.
If the keyboard is then thawed through a AllowSome request, the VCK's
sync.other is reset to NULL. Subsequently, an event on the VCP would crash
the server when dereferencing sync.other on the VCP.
The check's purpose is to compare if the other device is grabbed by the same
client, which should be checked by accessing (dev->deviceGrab->grab->resource).
A check of the server-1.3 sources confirms that.
XTS test case: Xlib13 XAllowEvents 20.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Keith Packard <keithp@keithp.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 7b6517526631a65891b806bca30be8f49955d0a8
Author: Michel Dänzer <daenzer@vmware.com>
Date: Wed Apr 14 19:28:37 2010 +0200
EXA: Check sys_ptr isn't NULL before passing it to the UploadToScreen hook.
Fixes https://bugs.freedesktop.org/show_bug.cgi?id=27510 .
Signed-off-by: Michel Dänzer <daenzer@vmware.com>
Reviewed-by: Alex Deucher <alexdeucher@gmail.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit fc5d76740851725e3788c68e14474a012a205892
Author: Julien Cristau <jcristau@debian.org>
Date: Tue Apr 6 11:51:53 2010 +0200
XGE: don't register an extension event
The GenericEvent is a core event, we never send an extension event, so
don't reserve an id for one.
Signed-off-by: Julien Cristau <jcristau@debian.org>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 0b676acd47e0d6a675df374b42ddb200deab5d06
Author: Julien Cristau <jcristau@debian.org>
Date: Tue Apr 13 11:45:41 2010 +0200
Bump version in configure.ac
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 1760d2bef9f5b248cb2332f6ebf0220eb02bab42
Author: Kristian Høgsberg <krh@bitplanet.net>
Date: Fri Apr 9 10:58:48 2010 -0400
glx: Set the pbuffer bit for dri2 fbconfigs
They've been implemented for a while, but we never advertised them. All we
need to do is set the GLX_PBUFFER_BIT in the drawable type fbconfig
field when we're using DRI2.
https://bugs.freedesktop.org/show_bug.cgi?id=26581
Signed-off-by: Kristian Høgsberg <krh@bitplanet.net>
Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit ab60975fe28cb135b4183c57b7f50d3615921c1f
Merge: adbbc66108 59edde7c28
Author: Keith Packard <keithp@keithp.com>
Date: Mon Apr 12 21:40:41 2010 -0700
Merge remote branch 'jeremyhu/master'
commit 59edde7c28db2d3174a5813a0af334e4ead2082f
Author: Jeremy Huddleston <jeremyhu@apple.com>
Date: Fri Apr 9 16:19:43 2010 -0700
XQuartz: Add a GUI preference for the Alt / Mode_switch toggle
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
Reviewed-by: Kevin Van Vechten <kvv@apple.com>
commit 5600f7f001529b3afdee95546aec212a70d6a5b2
Author: Jeremy Huddleston <jeremyhu@apple.com>
Date: Fri Apr 9 13:33:06 2010 -0700
XQuartz: Customize the NSDefaults id in the man file.
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
Reviewed-by: Kevin Van Vechten <kvv@apple.com>
commit 840d12c7a6ac6a974da185045215ce944a61fab6
Author: Jeremy Huddleston <jeremyhu@apple.com>
Date: Fri Apr 9 13:29:34 2010 -0700
XQuartz: Add a defaults option to toggle Alt / Mode_switch
See option_sends_alt in Xquartz(1)
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
Reviewed-by: Kevin Van Vechten <kvv@apple.com>
commit d6f160510a50d4c4eaa48c9c69a5ddda0d50052c
Author: Jeremy Huddleston <jeremyhu@apple.com>
Date: Mon Apr 5 16:54:22 2010 -0700
XQuartz: Blacklist some oddball legacy Mac keycodes that break wine
http://xquartz.macosforge.org/trac/ticket/295
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
Reviewed-by: Kevin Van Vechten <kvv@apple.com>
commit adbbc661080ba4efdb764c154d40c4d2fe718e16
Author: Dan Nicholson <dbn.lists@gmail.com>
Date: Tue Feb 16 08:11:41 2010 -0800
xfree86: Fix priority ordering for ignoring input classes
Commit 8736d112afb0dd61dfdaadd6378eafd200b2ef5f changed the priority
ordering of the InputClass option merging to be "last match wins". This
fixes the handling of Option "Ignore" to follow that logic.
Signed-off-by: Dan Nicholson <dbn.lists@gmail.com>
Reviewed-by: Keith Packard <keithp@keithp.com>
commit d7c98c1c81ae272f66edb05fde20f4c616604add
Merge: 82cf3a4ae0 03ccbd2579
Author: Keith Packard <keithp@keithp.com>
Date: Wed Apr 7 22:25:51 2010 -0700
Merge remote branch 'whot/for-keith'
commit 03ccbd2579948d11e5f16f88cdf68a55f57c9d26
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu Apr 8 13:47:26 2010 +1000
xfree86: remove dead input drivers from xorg.conf man page.
These drivers have been deactivated for over a year now, let's not refer
potential users to them.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit d4dd3d0085f8eaca8c989aaeace1a1a24c5ebf49
Author: Dan Nicholson <dbn.lists@gmail.com>
Date: Sat Apr 3 09:33:51 2010 -0700
Move 10-evdev.conf to system config dir $datadir/X11/xorg.conf.d
Since the server searches in a vendor specific path now, we can install
the evdev catchall there without disturbing local administration files.
Signed-off-by: Dan Nicholson <dbn.lists@gmail.com>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 95f01bdfee8241371675f0089170fa6b2908d815
Author: Dan Nicholson <dbn.lists@gmail.com>
Date: Sat Apr 3 10:08:25 2010 -0700
xfree86: Search for a system xorg.conf.d
In addition to the conf files found in /etc/X11 or $sysconfdir/X11 used
for local administration, we also reserve a system directory for vendor
and package usage. The simple search path is:
/usr/share/X11/xorg.conf.d
$datadir/X11/xorg.conf.d
Files from these directories will have the lowest config priority. The
directory $datadir/X11/xorg.conf.d is exported from xorg-server.pc in
the variable "sysconfigdir". Packages should install their .conf files
to the directory specified by:
`pkg-config --variable=sysconfigdir xorg-server`
Signed-off-by: Dan Nicholson <dbn.lists@gmail.com>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit a1bae63dc634a5a79861eab128c63506081f7ed9
Author: Dan Nicholson <dbn.lists@gmail.com>
Date: Sat Apr 3 09:33:49 2010 -0700
xfree86: Set a saner search path for xorg.conf.d
There's no reason to carry all the oddities from xorg.conf like appended
hostname to the search path for xorg.conf.d. This changes it to something
very simple:
/etc/X11/<cmdline>
$sysconfdir/X11/<cmdline>
/etc/X11/xorg.conf.d
$sysconfdir/X11/xorg.conf.d
Signed-off-by: Dan Nicholson <dbn.lists@gmail.com>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 2ac33888a9a5766aaf88bc92a8bd1d489873524c
Author: Dan Nicholson <dbn.lists@gmail.com>
Date: Sat Apr 3 09:33:48 2010 -0700
xfree86: Document how -configdir affects the xorg.conf.d search path
Explain the "safe" path dance for -configdir, too.
Signed-off-by: Dan Nicholson <dbn.lists@gmail.com>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 2460e921d18fd264e6f6374be0908f4100442650
Author: Dan Nicholson <dbn.lists@gmail.com>
Date: Sat Apr 3 09:33:47 2010 -0700
xfree86: Allow adding sysconfdir and datadir to config search paths
We could just use $projectroot/etc and $projectroot/share, but the user
might have other plans for them.
Signed-off-by: Dan Nicholson <dbn.lists@gmail.com>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit c8a608cb6ce8f9c86258c1ab49084f691fa9cc51
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Wed Apr 7 10:04:38 2010 +1000
config: only match sane devices in 10-evdev.conf
Having a generic catchall also adds devices like accelerometers. These
devices make X unusable, hence restrict matching to "known sane" devices
like pointers, touchpads, keyboards, tablets and touchscreens.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Acked-by: Julien Cristau <jcristau@debian.org>
Acked-by: Dan Nicholson <dbn.lists@gmail.com>
Acked-by: James Cloos <cloos@jhcloos.com>
commit 6b09f66d8c6ebcee70382b5cca1ba82b68f20afa
Author: Pierre-Loup A. Griffais <pgriffais@nvidia.com>
Date: Fri Apr 2 12:48:21 2010 -0700
Don't keep a pointer to a possibly freed cursor when changing screens, preventing a crash in xf86CursorEnableDisableFBAccess() trying to restore it.
Signed-off-by: Pierre-Loup A. Griffais <pgriffais@nvidia.com>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 82cf3a4ae01811917f7903d6f62ba9b7132adf7e
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Tue Apr 6 15:52:18 2010 -0700
Convert x86emu fixed size int typedefs to use stdint types
Fixes x86emu builds when using non-gnu compilers now that u64 is required
Before this fix, the u64 type would not be defined, causing
x86emu/sys.c to fail to build:
"sys.c", line 102: syntax error before or at: ldq_u
"sys.c", line 102: syntax error before or at: *
Since Keith requested using <stdint.h>, converted all the x86emu
typedefs to use the stdint types.
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Acked-by: Matt Turner <mattst88@gmail.com>
Acked-by: Tiago Vignatti <tiago.vignatti@nokia.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit a9fe7cfa77ccee64d68732dc3f37d35cbfc27a65
Author: Paulo Ricardo Zanoni <pzanoni@mandriva.com>
Date: Thu Mar 11 14:28:18 2010 -0300
dix: be more verbose when we run out of opcodes
If we run out of opcodes, nothing is print on the log, making the
problem hard to debug. In the current Xserver, if you enable some
extensions like multibuffer (+2 events) and use nvidia binary driver (+5
events) you can run out of opcode numbers.
Signed-off-by: Paulo Ricardo Zanoni <pzanoni@mandriva.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Julien Cristau <jcristau@debian.org>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 6150595bdbacde13bb4f9aba81b15435089bee94
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Mon Apr 5 19:12:22 2010 -0400
doc: specify 1.6.1 as the minimum version for doxygen.
Older versions generate filenames that are different from
the ones listed in the Makefile.
Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com>
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit cbda58c963af5bb9c4643e9017dd4eec589ceff3
Merge: a7698a6776 c983f40fe4
Author: Keith Packard <keithp@keithp.com>
Date: Wed Apr 7 15:51:38 2010 -0700
Merge remote branch 'yselkowitz/master'
commit a7698a677682a32960b885c22fdba2add70f4658
Merge: 495cec794d 165a4a9c7d
Author: Keith Packard <keithp@keithp.com>
Date: Tue Apr 6 12:36:15 2010 -0700
Merge remote branch 'jbarnes/master'
commit c983f40fe4f30311f31a9df699cdc888709251d0
Author: Yaakov Selkowitz <yselkowitz@users.sourceforge.net>
Date: Wed Feb 24 15:17:42 2010 -0600
Cygwin/X: Add configure option for WindowsWM
WindowsWM support is still experimental, and uses the Rootless extension
which currently breaks the simultaneous build of the other DDXs (see
commit b3415187e92960cbff784108b5a3a8d130dc34c5). So we disable it by
default for now; once the latter issue is fixed we can make this 'auto'.
Signed-off-by: Yaakov Selkowitz <yselkowitz@users.sourceforge.net>
commit 20701522be803fe47e921fcf059dadf64c7f287d
Author: Jon TURNEY <jon.turney@dronecode.org.uk>
Date: Thu Feb 18 14:19:21 2010 -0600
Don't enable ROOTLESS_WORKAROUND, it breaks composite
This possibly brings back whatever the bug is in
http://bugs.freedesktop.org/show_bug.cgi?id=1168 for
-rootless mode, but since we don't have reproduction
steps for that, I can't test that...
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Tested-by: Yaakov Selkowitz <yselkowitz@users.sourceforge.net>
Signed-off-by: Yaakov Selkowitz <yselkowitz@users.sourceforge.net>
commit 95c9947f6244d37592958b70760bd1ac885b625a
Author: Yaakov Selkowitz <yselkowitz@users.sourceforge.net>
Date: Wed Mar 24 00:08:23 2010 -0500
Cygwin/X: Disable unsupported extensions in configure
Several extensions are not supported by XWin, some of which are enabled
by default in configure. We forcefully disable these early on so that
configure will succeed without arguments and without the corresponding
proto installed.
Signed-off-by: Yaakov Selkowitz <yselkowitz@users.sourceforge.net>
commit 24c9d48cd6999f1e90f9f0e2bbfebd8e95d314d8
Author: Yaakov Selkowitz <yselkowitz@users.sourceforge.net>
Date: Mon Mar 22 12:47:52 2010 -0500
Disable setuid configure test on Cygwin
Only Xorg is installed setuid, so there is no need to run this configure
test on Cygwin.
Signed-off-by: Yaakov Selkowitz <yselkowitz@users.sourceforge.net>
commit 495cec794dad95ed0c79048f3c410ad23e7d5ea4
Author: Keith Packard <keithp@keithp.com>
Date: Fri Apr 2 00:14:23 2010 -0700
xserver 1.8.0
Signed-off-by: Keith Packard <keithp@keithp.com>
commit b9ad452ec92a7dcbed680acb3f3b8ec29fa660df
Author: Tiago Vignatti <tiago.vignatti@nokia.com>
Date: Thu Apr 1 18:57:50 2010 +0300
xfree86: die gracefully in the vga arbiter if AddScreen fails
vga arbiter will be locked in one device while AbortDDX will call LeaveVT
routines from the other device. Fail!
Signed-off-by: Tiago Vignatti <tiago.vignatti@nokia.com>
Reviewed-by: Keith Packard <keithp@keithp.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit e75f202e7768b7cc0eb2ad0e0f3f51ea81cd7275
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Wed Mar 24 11:08:55 2010 +1000
configure: enable udev backend as "auto"
Due to the checks in configure, this means it gets priority over HAL if
libudev is found.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 24952b786625fef808cb26d539dd5109d623c053
Author: Keith Packard <keithp@keithp.com>
Date: Thu Apr 1 23:44:24 2010 -0700
Install 10-evdev.conf in $(prefix)/etc/X11/xorg.conf.d under udev
udev needs some xorg.conf file to tell it to load a suitable input
driver, 10-evdev.conf is as simple as they come, mapping all evdev
devices to the evdev driver.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 02328f190f893cb4ad0f3af7a2ecd39ed77ae5ad
Author: Jeremy Huddleston <jeremyhu@apple.com>
Date: Thu Apr 1 18:21:51 2010 -0700
Bump bundle version to 2.5.1
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
commit 0e342add7768df55a1917e27f9b85feddd444e82
Author: Jeremy Huddleston <jeremyhu@apple.com>
Date: Thu Apr 1 15:30:46 2010 -0700
darwin: Correct inline assembly for ___crashreporter_info__
It was missing an underscore.
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
commit 67b814d9b2baea6beccfb1625a1e3f0b2ba7218b
Author: Ruediger Oertel <ro@suse.de>
Date: Mon Mar 29 00:23:40 2010 +0200
Remove now obsolete function chooseVideoDriver
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 1dd5fbc5a4d860af1c102b33e04dedd8c72617a1
Author: Ruediger Oertel <ro@suse.de>
Date: Fri Mar 26 09:33:20 2010 -0700
xfree86: Handle driver autoconfiguration when .conf files exist
When doing driver autoconfiguration with some parts of the config file
present but no driver set (e.g. only input configuration) fix the case
that we may have multiple drivers to try.
Create a screen section for each driver and let them be tried in a row.
Signed-off-by: Ruediger Oertel <ro@suse.de>
Reviewed-by: Dan Nicholson <dbn.lists@gmail.com>
Tested-by: Timo Aaltonen <timo.aaltonen@aalto.fi>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 57cb1a854a1b6d91d214b3fa250a7df2ed20d433
Merge: 4b3d67a764 28a5f14b40
Author: Keith Packard <keithp@keithp.com>
Date: Mon Mar 29 11:46:00 2010 -0700
Merge remote branch 'jeremyhu/master'
commit 4b3d67a7647f696957727948f9757a261e15d14e
Merge: 579715f830 aa91508356
Author: Keith Packard <keithp@keithp.com>
Date: Mon Mar 29 11:44:07 2010 -0700
Merge remote branch 'whot/for-keith'
commit 165a4a9c7de0fcc6ef6a6421736b412ccb35965e
Author: Jesse Barnes <jbarnes@virtuousgeek.org>
Date: Tue Mar 23 09:47:08 2010 -0700
GLX/DRI2: expose swap control extensions if DDX support is present
Export DDX swap control status from the DRI2 module and check for it in
GLX when initializing extensions.
Reviewed-by: Mario Kleiner <mario.kleiner@tuebingen.mpg.de>
Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>
commit 5933b0abc6a76aaea84aa534df89900cd795c888
Author: Jesse Barnes <jbarnes@virtuousgeek.org>
Date: Mon Mar 8 15:10:47 2010 -0800
DRI2: prevent swap wakes from waking MSC waiters
If a few swaps were queued leading to a throttle related block on the
client, and then the client submitted an MSC wait, one of the previous
swap wakeups could have caused the MSC wait to complete early. Add a
flag for this to prevent a swap wake from prematurely waking an MSC
waiter.
Reported-by: Mario Kleiner <mario.kleiner@tuebingen.mpg.de>
Reviewed-by: Mario Kleiner <mario.kleiner@tuebingen.mpg.de>
Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>
commit b00d435ddf2e9817e33bfd5f7e9b905442dc23c7
Author: Jesse Barnes <jbarnes@virtuousgeek.org>
Date: Mon Mar 8 12:41:25 2010 -0800
DRI2: handle swapsPending better
Avoid a potential swapsPending underflow by incrementing it before
ScheduleSwap, which may complete it immediately. And be sure to
decrement it again in case the schedule failed.
Reported-by: Mario Kleiner <mario.kleiner@tuebingen.mpg.de>
Reviewed-by: Mario Kleiner <mario.kleiner@tuebingen.mpg.de>
Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>
commit 0294ff2a5cadddc8fcc77ba9a851f979f0b91fc3
Author: Jesse Barnes <jbarnes@virtuousgeek.org>
Date: Mon Mar 8 12:39:54 2010 -0800
DRI2: throttle swaps at submission time too
We need to throttle swaps here in addition to when the context is made
current to avoid causing problems with clients that just swap.
Throttling here also ensures our swaps get ordered as long as we block
the client occasionally.
Reported-by: Mario Kleiner <mario.kleiner@tuebingen.mpg.de>
Reviewed-by: Mario Kleiner <mario.kleiner@tuebingen.mpg.de>
Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>
commit db1c7cb604167baf49e61be4c09ccf7b592c4af3
Author: Jesse Barnes <jbarnes@virtuousgeek.org>
Date: Mon Mar 8 12:38:37 2010 -0800
DRI2: advertise lowest supported DRI2 protocol version
Update our supported DRI2 protocol version as each driver does
DRI2ScreenInit, since depending on available kernel features, each DDX
may support different callbacks and therefore protocol.
Reviewed-by: Mario Kleiner <mario.kleiner@tuebingen.mpg.de>
Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>
commit 87ca6320f26eb3129e3c19056e1d8fa5c1784723
Author: Jesse Barnes <jbarnes@virtuousgeek.org>
Date: Fri Mar 5 09:49:03 2010 -0800
DRI2: handle swap_interval of 0 correctly
A 0 swap interval means that swaps shouldn't be sync'd to vblank, so
just complete the swap immediately in that case.
Reviewed-by: Mario Kleiner <mario.kleiner@tuebingen.mpg.de>
Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>
commit 8476d99231cb725c090305d60f1c1c889d25c8dc
Author: Jesse Barnes <jbarnes@virtuousgeek.org>
Date: Fri Mar 5 09:15:24 2010 -0800
DRI2: drawable lifetime fixes
Handle drawable destruction and lifetime correctly.
Check whether the drawable priv is valid in DRI2SwapInterval(),
DRI2WaitSBC() and DRI2WaitMSC(); it may have gone away, so be sure to
check it before using it.
If more than 1 outstanding swap is queued, we may complete several after
an app has exited. If we free it after the first one completes and the
refcount reaches 0, we'll crash the server on subsequent completions.
So delay freeing until all swaps complete and remove the error message
as this is a normal occurence. To do this properly, we must also avoid
destroying drawables in DRI2DestroyDrawable() if a swap or wait event is
pending.
And finally, make sure we free drawables in DRI2WaitMSCComplete() if
necessary (i.e. if the refcount has reached 0 and this MSC was the last
pending event on the object).
Reported-by: Mario Kleiner <mario.kleiner@tuebingen.mpg.de>
Reviewed-by: Mario Kleiner <mario.kleiner@tuebingen.mpg.de>
Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>
commit b180e43977710b56ccfd6780f204ddcc952987a1
Author: Jesse Barnes <jbarnes@virtuousgeek.org>
Date: Thu Mar 4 10:31:59 2010 -0800
DRI2: fix swapbuffers handling of SBC and target MSC
Returns expected SBC after completion of swap to caller, as required by
OML_sync_control spec, instead of the last_swap_target value.
Passes target_msc, divisor, remainder, correctly for
glXSwapBuffersMscOML() call, while retaining old behaviour for simple
glXSwapBuffers() call.
An OML swap can have a 0 target_msc, which just means it needs to
satisfy the divisor/remainder equation. Pass this down to the driver as
needed so we can support it.
Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>
Signed-off-by: Mario Kleiner <mario.kleiner@tuebingen.mpg.de>
commit 751e8c09d34df4b41e8d8384a3ec1bf5cb8ca028
Author: Mario Kleiner <mario.kleiner@tuebingen.mpg.de>
Date: Sun Feb 21 05:26:00 2010 +0100
DRI2WaitSbc(): Fixes for correct semantic of glXWaitForSbcOML()
Added implementation for case target_sbc == 0. In that case, the
function shall schedule a wait until all pending swaps for the drawable
have completed.
Fix for non-blocking case. Old implementation returned random,
uninitialized values for (ust,msc,sbc) if it returned immediately
without scheduling a wait due to sbc >= target_sbc.
Now if function doesn't schedule a wait, but returns immediately,
it returns the (ust,msc,sbc) of the most recently completed swap,
i.e., the UST and MSC corresponding to the time when the returned
current SBC was reached.
Signed-off-by: Mario Kleiner <mario.kleiner@tuebingen.mpg.de>
commit 0de4974b90b10fa6a447cdf980b4a114c6c9e5a8
Author: Mario Kleiner <mario.kleiner@tuebingen.mpg.de>
Date: Sun Feb 21 05:25:59 2010 +0100
DRI2: Fix glitches in DRI2SwapComplete() and DRI2WakeupClient()
DRI2SwapComplete(): Increment pPriv->swap_count++; before calling
into callback for INTEL_swap_events extension, so the swap event
contains the current SBC after swap completion instead of the
previous one.
DRI2WakeupClient: Check for pPriv->target_sbc <= pPriv->swap_count,
had wrong comparison pPriv->target_sbc >= pPriv->swap_count for
unblocking of clients of DRI2WaitSBC().
Signed-off-by: Mario Kleiner <mario.kleiner@tuebingen.mpg.de>
commit 4c8ec49826a46eb3b36c69d2ad3f82320c179c38
Author: Jesse Barnes <jbarnes@virtuousgeek.org>
Date: Thu Mar 4 09:54:15 2010 -0800
DRI2: make target_sbc signed
We need to track invalid targets as well as 0 targets, so just make it
signed so our comparisons work like they should.
Reviewed-by: Mario Kleiner <mario.kleiner@tuebingen.mpg.de>
Reported-by: Kristian Høgsberg <krh@bitplanet.net>
Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>
commit c4d54816f2ee4883d8f9bcf4595474fb58c95146
Author: Jesse Barnes <jbarnes@virtuousgeek.org>
Date: Thu Mar 4 09:19:13 2010 -0800
DRI2: fixup handling of last_swap_target
We need to initialize the swap target, which is passed to the driver to
schedule events. Rather than using -1 to indicate that the field is
uninitialized, just make sure we initialize it at drawable creation
time.
Reviewed-by: Mario Kleiner <mario.kleiner@tuebingen.mpg.de>
Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>
commit 28a5f14b4089dccb8045cc4fdc923542a73dd22d
Author: Jeremy Huddleston <jeremyhu@apple.com>
Date: Sun Mar 28 13:46:23 2010 -0700
XQuartz: Re-query dixScreenOrigins as the value could've changed.
Fix a regression in 9c9c3a85b094a3c7b2763a572715d710325091aa
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
Acked-by: Adam Jackson <ajax@redhat.com>
commit 436d0bb9cca122bfdde32902b683d2499f61e6fc
Author: Jeremy Huddleston <jeremyhu@apple.com>
Date: Sat Mar 27 17:35:10 2010 -0700
darwin: Generate crash reports on FatalError()
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
Acked-by: Adam Jackson <ajax@redhat.com>
commit 73b3b67aac9f3938a96cb8822b9c270bd82ded5c
Author: Jeremy Huddleston <jeremyhu@apple.com>
Date: Mon Mar 22 09:30:51 2010 -0700
GLX: Remove a redundant initialization
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
Acked-by: Adam Jackson <ajax@redhat.com>
commit 339207be6f184cc783076fc7e2cc12f92f57f2ba
Author: Jeremy Huddleston <jeremyhu@apple.com>
Date: Thu Mar 25 22:15:58 2010 -0700
XQuartz: Workaround weird key data reported on some layouts
This should make 'Unicode Hex Input' work as an input layout.
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
Acked-by: Adam Jackson <ajax@redhat.com>
commit aa91508356f243edc3b11795b1481edcfe0d39c2
Author: Dan Nicholson <dbn.lists@gmail.com>
Date: Wed Mar 24 23:18:35 2010 -0700
config/udev: Prefer product name from attribute rather than uevent
The input device product name for evdev devices in the kernel uevent has
embedded quotes that aren't expected here. Use the sysfs name attribute
instead, which does not suffer this problem. The uevent name will be
used as a fallback if no name attribute is found.
Signed-off-by: Dan Nicholson <dbn.lists@gmail.com>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit d00c3298a698ddddc8967215cef7dd941fa15804
Author: Fernando Carrijo <fcarrijo@yahoo.com.br>
Date: Wed Mar 24 20:11:34 2010 -0300
Cleanup some comments in SpriteRec
Signed-off-by: Fernando Carrijo <fcarrijo@yahoo.com.br>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 70bd02f2ea3a91c0340df97ca3b8a4f9400f6f46
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Tue Mar 23 12:13:56 2010 +1000
xfree86: merge driver from the input class into the options.
A driver that is assigned by an input class is only present as idev->driver.
The driver itself has no access to this information once PreInit is called.
For devices that rely on chain-hotplugging (wacom), this means that for the
second device the driver information is lost and the second device cannot be
initialized through NewInputDeviceRequest. Although this could be worked
around by hardcoding the driver name in the wacom driver, having the
assigned driver in the options seems like the better solution.
This issue only manifests itself with the udev backend. With HAL, the driver
is assigned by HAL and the option is duplicated in config/hal.c.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Dan Nicholson <dbn.lists@gmail.com>
commit 579715f830fbbca9e1ecb17dc18176132f5969e7
Author: Rami Ylimaki <ext-rami.ylimaki@nokia.com>
Date: Wed Mar 17 12:16:57 2010 +0200
os: Prevent backtrace from being stopped in noreturn functions.
There are two noreturn functions in the X server: FatalError and
AbortServer. Having any of those two functions in the middle of a call
stack will prevent unwinding the program properly and stops the
backtrace at those functions in gdb.
The file containing FatalError and AbortServer, os/log.c, has to be
compiled with the -mapcs-frame option on ARM to get proper
backtraces. Automake imposes its own restrictions on compiling
individual source files with different options. The recommended way to
do this is to put os/log.c into a convenience library and add this
library inside os/libos.la. See the documentation of GNU Automake
manual, version 1.11.1, section 27.8 Per-Object Flags Emulation, for
details.
Signed-off-by: Rami Ylimaki <ext-rami.ylimaki@nokia.com>
Reviewed-by: Daniel Stone <daniel@fooishbar.org>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit e086b99c1f5ce351b578de7cd9f616bc79d6cf64
Author: Mikhail Gusarov <dottedmag@dottedmag.net>
Date: Tue Mar 23 01:03:53 2010 +0600
kdrive: Bump evdev maxKeycode
There are keycodes > 193 in evdev, e.g. KEY_WIMAX which is 246 .
Signed-off-by: Mikhail Gusarov <dottedmag@dottedmag.net>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Acked-by: Adam Jackson <ajax@nwnk.net>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 185185eeb44a277c324be0f58a4b4a469b56b69b
Author: Peter Harris <pharris@opentext.com>
Date: Tue Mar 23 12:08:19 2010 -0400
Fix crash when all glyphs of a given depth are freed, but not all glyphsets
This is how the crash can be triggered with only two clients on the system:
Client A: (already running)
Client B: Connect
Client B: CreateGlyphSet(depthN)
Client A: Disconnect
Server: free globalGlyphs(depthN)
Client B: AddGlyphs(depthN)
Server: SEGV
This crash was introduced with the FindGlyphsByHash function
in 516b96387b0e57b524a37a96da22dbeeeb041712. Before that revision,
ResizeGlyphSet was always called before FindGlyphRef, which would
re-create globalGlyphs(depthN) if necessary.
X.Org Bug 20718 <http://bugs.freedesktop.org/show_bug.cgi?id=20718>
Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Peter Harris <pharris@opentext.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 8311cd5f89ca6781842bb24671b8122cdf8be148
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Tue Mar 23 10:37:36 2010 -0700
XKB: Fix garbage initialization
XkbEnableDisableControls set extra garbage bits on the xkbControlsNotify
changedControls mask because it was uninitialized on the stack.
Found by clang
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 0ecfab89d1754b0b7e32b3964b40663d1810cd62
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Mon Mar 22 14:04:09 2010 +1000
xfree86: remove if 1 from the dawn of time.
7+ years for an if 1 should be enough to just admit that there's no other
option.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Fernando Carrijo <fcarrijo@yahoo.com.br>
Reviewed-by: Corbin Simpson <MostAwesomeDude@gmail.com>
commit 6389405b56d2221d8a7b80c4bb3bd3b4e1a29bab
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Mon Mar 22 09:20:49 2010 +1000
configure: Always define XINPUT.
This define was removed in e251c9e75afdc "Remove all traces of #ifdef XINPUT
and the matching bits from the configure.ac". Drivers that support multiple
server versions and still check for ifdef XINPUT now always build without
XINPUT support if they're calling XORG_DRIVER_CHECK_EXT(XINPUT, inputproto).
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Dan Nicholson <dbn.lists@gmail.com>
commit 0c2fde5c8ad6e94b4ed1588aa93256a2b64f74d9
Author: Tomas Carnecky <tom@dbservice.com>
Date: Mon Mar 22 11:20:15 2010 -0700
Fix typos in the swap functions
This should fix bug #3539.
Signed-off-by: Tomas Carnecky <tom@dbservice.com>
Signed-off-by: Ian Romanick <ian.d.romanick@intel.com>
Reviewed-by: Keith Packard <keithp@keithp.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 3083c5d0c4386cdd7083b7a83ac72fdad2f1e61e
Author: Michel Dänzer <daenzer@vmware.com>
Date: Mon Mar 22 18:01:17 2010 +0100
Xext: Fix cursor reference counting hazard.
Make sure the reference count of the new cursor is increased before the old
one is decreased, otherwise bad things will happen if they're one and the
same and the reference count is 1 initially. Not sure this can actually happen
here, but better safe than sorry.
Signed-off-by: Michel Dänzer <daenzer@vmware.com>
Reviewed-by: Roland Scheidegger <sroland@vmware.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit b29220dc765cb6f878c5466e00e4bd21f3bd803d
Merge: c3da76643a ed31d50b5f
Author: Keith Packard <keithp@keithp.com>
Date: Sun Mar 21 23:01:58 2010 -0700
Merge remote branch 'jeremyhu/master'
commit c3da76643aeebdd24047e3e14a860507eac37ec3
Author: Yaakov Selkowitz <yselkowitz@users.sourceforge.net>
Date: Thu Mar 18 23:19:20 2010 -0500
Cygwin/X: Make X -> XWin symlink during install
Signed-off-by: Yaakov Selkowitz <yselkowitz@users.sourceforge.net>
Reviewed-by: Dan Nicholson <dbn.lists@gmail.com>
commit abf4e0b7e349b0238b2b97a16b8a308b5026af31
Author: Yaakov Selkowitz <yselkowitz@users.sourceforge.net>
Date: Mon Mar 22 00:44:28 2010 -0500
New header for XF86Bigfont server functions
Xext/xf86bigfont.c contains three non-static functions which are called
elsewhere in the server. This creates a new header containing these
declarations in order to fix several warnings:
xf86bigfont.c:285: warning: no previous prototype for `XF86BigfontFreeFontShm'
dixfonts.c:502: warning: implicit declaration of function `XF86BigfontFreeFontS$
dixfonts.c:502: warning: nested extern declaration of `XF86BigfontFreeFontShm'
log.c:436: warning: implicit declaration of function `XF86BigfontCleanup'
log.c:436: warning: nested extern declaration of `XF86BigfontCleanup'
Signed-off-by: Yaakov Selkowitz <yselkowitz@users.sourceforge.net>
Reviewed-by: Julien Cristau <jcristau@debian.org>
commit 57a049ea89b008c0b60316c3b6e6ff5c8fbd4cad
Author: Yaakov Selkowitz <yselkowitz@users.sourceforge.net>
Date: Thu Mar 18 04:46:20 2010 -0500
Xext: fix old-style function definitions in xf86bigfont.c
Signed-off-by: Yaakov Selkowitz <yselkowitz@users.sourceforge.net>
Reviewed-by: Julien Cristau <jcristau@debian.org>
commit 822b9f9a3e822df8848995eda246f83864d1366f
Author: Yaakov Selkowitz <yselkowitz@users.sourceforge.net>
Date: Sun Feb 21 01:24:44 2010 -0600
mi: remove deprecated #include <X11/extensions/xf86bigfstr.h> in miinitext.c
Signed-off-by: Yaakov Selkowitz <yselkowitz@users.sourceforge.net>
Reviewed-by: Julien Cristau <jcristau@debian.org>
commit 946b49ebcbf47e030a6e00ce1a699f3b055f638a
Author: Yaakov Selkowitz <yselkowitz@users.sourceforge.net>
Date: Wed Mar 17 17:37:05 2010 -0500
Catch errors in recursive relink targets
If make relink fails in a subdirectory, we need to catch the error
otherwise make will continue iterating the 'for' loop.
Signed-off-by: Yaakov Selkowitz <yselkowitz@users.sourceforge.net>
Reviewed-by: Dan Nicholson <dbn.lists@gmail.com>
commit 0820a6e2fb005b5f856dda25e1644f34fc994129
Author: Yaakov Selkowitz <yselkowitz@users.sourceforge.net>
Date: Wed Mar 17 13:40:41 2010 -0500
Fix .man.N targets for AM_SILENT_RULES
Add $(AM_V_GEN) for sed-based rules so they appear as expected with
automake silent rules, and $(AM_V_at) to completely hide cp/ln/rm
commands which are not prone to fail.
Signed-off-by: Yaakov Selkowitz <yselkowitz@users.sourceforge.net>
Reviewed-by: Alan Coopersmith <alan.coopersmith@sun.com>
Reviewed-by: Julien Cristau <jcristau@debian.org>
commit 9be4157391edf0c5fc4ee36adfb1eb1c3bdb8e3b
Author: Yaakov Selkowitz <yselkowitz@users.sourceforge.net>
Date: Wed Mar 17 13:33:39 2010 -0500
Respect value of SED from configure
We now use libtool, which calls AC_PROG_SED and sets SED as the path to
a fully-functional 'sed' (which may also be called 'gsed' if GNU sed is
installed alongside a proprietary version). Therefore we should respect
the value of SED so we are sure to use the correct one.
Signed-off-by: Yaakov Selkowitz <yselkowitz@users.sourceforge.net>
Reviewed-by: Alan Coopersmith <alan.coopersmith@sun.com>
Reviewed-by: Julien Cristau <jcristau@debian.org>
commit 5e00f464c546debf9164f24c6d648623f7ee5946
Author: Yaakov Selkowitz <yselkowitz@users.sourceforge.net>
Date: Wed Mar 17 14:56:24 2010 -0500
Fix relink targets for silent rules
Add $(AM_V_at) to all relink make targets to silence them when automake
silent rules are in use.
Signed-off-by: Yaakov Selkowitz <yselkowitz@users.sourceforge.net>
Reviewed-by: Alan Coopersmith <alan.coopersmith@sun.com>
Reviewed-by: Julien Cristau <jcristau@debian.org>
commit fa7e062962d17862032bc600bfcffd486addb063
Author: Yaakov Selkowitz <yselkowitz@users.sourceforge.net>
Date: Wed Mar 17 13:52:38 2010 -0500
Use EXEEXT in relink rules for portable DDXs
On Cygwin and MinGW, executables use the .exe suffix. Autoconf and
automake set EXEEXT on these platforms, and leave it empty on others
where no suffix is used. $(EXEEXT) must be appended to executable names
in custom rules for portability:
http://www.gnu.org/software/automake/manual/html_node/EXEEXT.html
Signed-off-by: Yaakov Selkowitz <yselkowitz@users.sourceforge.net>
Reviewed-by: Alan Coopersmith <alan.coopersmith@sun.com>
Reviewed-by: Julien Cristau <jcristau@debian.org>
commit 037869d7b876f43158df88d63788b93a5d6187c1
Author: Yaakov Selkowitz <yselkowitz@users.sourceforge.net>
Date: Wed Mar 17 13:48:49 2010 -0500
kdrive: Use $(MAKE) in relink rules
Signed-off-by: Yaakov Selkowitz <yselkowitz@users.sourceforge.net>
Reviewed-by: Mikhail Gusarov <dottedmag@dottedmag.net>
Reviewed-by: Alan Coopersmith <alan.coopersmith@sun.com>
Reviewed-by: Julien Cristau <jcristau@debian.org>
commit 8e5de45513577c63a33833931f2afd0cc59d42a7
Author: Yaakov Selkowitz <yselkowitz@users.sourceforge.net>
Date: Wed Feb 24 02:56:59 2010 -0600
Use libtool -export-dynamic flag for portability
The linker flag required for exporting symbols in executables varies
by platform. libtool handles this with a single -export-dynamic
flag (not to be confused with the similarly-named ELF linker flag)
which tells it to use the correct platform-specific flag at link time.
Signed-off-by: Yaakov Selkowitz <yselkowitz@users.sourceforge.net>
Reviewed-by: Dan Nicholson <dbn.lists@gmail.com>
Reviewed-by: Keith Packard <keithp@keithp.com>
commit 2a11ffa977d2267d8b2f27b76490a98e9c73b8c7
Author: Yaakov Selkowitz <yselkowitz@users.sourceforge.net>
Date: Fri Feb 19 14:31:28 2010 -0600
Rename xdmx client to dmxinfo
The DMX Xdmx server and xdmx client cannot both be installed on
case-insensitive file systems. The client is undocumented and
so renaming it is the best option.
Signed-off-by: Yaakov Selkowitz <yselkowitz@users.sourceforge.net>
Reviewed-by: Keith Packard <keithp@keithp.com>
commit fbb4903eaa23174d21ab8c640d9de1fe3eb17539
Author: Yaakov Selkowitz <yselkowitz@users.sourceforge.net>
Date: Sun Feb 21 02:08:08 2010 -0600
Cygwin/X: Fix windres rule for automake silent rules
Signed-off-by: Yaakov Selkowitz <yselkowitz@users.sourceforge.net>
Reviewed-by: Rémi Cardona <rem@gentoo.org>
Reviewed-by: Keith Packard <keithp@keithp.com>
commit 8db894690988f2bac9c0acb96fd39811d2b42f47
Author: Yaakov Selkowitz <yselkowitz@users.sourceforge.net>
Date: Fri Feb 19 00:05:28 2010 -0600
Cygwin/X: Fix make dist after 11252ed82e1f361b99e86521ac9314f868bd1a3a
Signed-off-by: Yaakov Selkowitz <yselkowitz@users.sourceforge.net>
Acked-by: Adam Jackson <ajax@redhat.com>
Reviewed-by: Keith Packard <keithp@keithp.com>
commit ed31d50b5f7f25e4db986711699704e615b8afcb
Author: Jeremy Huddleston <jeremyhu@apple.com>
Date: Fri Mar 19 17:24:27 2010 -0700
XQuartz: Constrain the pointer to the updated display bounds on display reconfigure.
http://xquartz.macosforge.org/trac/ticket/346
commit 927480be12ff61deb4e8120d2f90ddef3a1a6beb
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Sat Mar 20 11:03:28 2010 -0700
XQuartz: pbproxy: Make standalone xpbproxy respect the launchd prefix
Signed-off-by: Jeremy Huddleston <jeremyhu@freedesktop.org>
commit d16bc8a3cdbe0e8b9cba836c7aa2ff7c0458049e
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Sat Mar 20 03:28:57 2010 -0700
XQuartz: xpbproxy: Cleanup xpbproxy threading
Confine xpbproxy to a single thread
Runs inside its own CFRunLoop
Signed-off-by: Jeremy Huddleston <jeremyhu@freedesktop.org>
commit 9c9c3a85b094a3c7b2763a572715d710325091aa
Author: Jeremy Huddleston <jeremyhu@apple.com>
Date: Fri Mar 19 17:23:12 2010 -0700
XQuartz: Minor cleanup
Move RandRInit to where it will need to be (not yet implemented)
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
commit bb75d0df8b5238bfe8b011bb5737fae2a3584290
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Fri Mar 19 15:26:50 2010 -0700
XQuartz: GLX: Fix Availability for Tiger ppc workaround
Signed-off-by: Jeremy Huddleston <jeremyhu@freedesktop.org>
commit eac7cdabecafb7c505795207182ab2578d672c06
Author: Jeremy Huddleston <jeremyhu@apple.com>
Date: Tue Mar 16 11:29:08 2010 -0700
Revert "XQuartz: Explicitly pass a bellProc to make XBell() work again."
I'm not quite sure why this was necessary, but DDXRingBell is being called
from CoreKeyboardBell, so we don't need a separate bellProc which would
result in multiple rings.
This reverts commit 9071b0d69748cfa7ecca17b4cb0e431bbb0ef2a4.
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
commit 13c007f9224ad871193e40466e64df1477ed26b0
Author: Keith Packard <keithp@keithp.com>
Date: Sun Mar 21 17:23:46 2010 -0700
Bump to 1.7.99.902 -- 1.8 RC2
commit 235fa5030428084368e5be57fca695647b7b79c4
Merge: 1c612acca8 fa5103a02b
Author: Keith Packard <keithp@keithp.com>
Date: Sun Mar 21 15:38:40 2010 -0700
Merge commit 'fa5103a02bd509e4a102afdad2ab26cb22210367'
commit 1c612acca8568fcdf9761d23f112adaf4d496f1b
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Wed Mar 17 14:32:38 2010 +1000
dix: if owner-events is true for passive grabs, add the window mask (#25400)
A client requesting a GrabModeSync button grab, owner-events true, with only
the ButtonRelease mask set would never receive the press event even if the
grab window had the ButtonPress mask set.
The protocol requires that if owner-events is true, then the delivery mask
is the combination of the grab mask + the window event mask.
X.Org Bug 25400 <http://bugs.freedesktop.org/show_bug.cgi?id=25400>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Tested-by: Jim Ramsay <i.am@jimramsay.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 95ca39b981624df5338a16b506289014c431ae82
Merge: e7ff956638 bf181915e1
Author: Keith Packard <keithp@keithp.com>
Date: Sun Mar 21 15:24:06 2010 -0700
Merge remote branch 'jturney/master'
commit e7ff956638780dc1c6f160a1fd041b92cebff9ac
Author: Oliver McFadden <oliver.mcfadden@nokia.com>
Date: Mon Mar 15 23:46:36 2010 +0200
common: xf86Configure: alloc_strlen: Allocated memory does not have space for the terminating NUL of the string
buffer_alloc: Called allocating function "realloc" which allocated memory dictated by parameter "len + strlen(displaySize_string)"
alloc_strlen: Allocated memory does not have space for the terminating NUL of the string
var_assign: Assigned "ptr->mon_comment" to storage allocated by "realloc(ptr->mon_comment, len + strlen(displaySize_string))"
Signed-off-by: Oliver McFadden <oliver.mcfadden@nokia.com>
Reviewed-by: Matt Turner <mattst88@gmail.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit aeae6637b52b042cf8b07c6943abcd5d31968d49
Author: Oliver McFadden <oliver.mcfadden@nokia.com>
Date: Mon Mar 15 23:46:34 2010 +0200
fb: fbFinishScreenInit: leaked_storage: Variable "(visuals|depths)" goes out of scope
Signed-off-by: Oliver McFadden <oliver.mcfadden@nokia.com>
Reviewed-by: Matt Turner <mattst88@gmail.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit d9ee31ab05efbd2d598cc93a41a8834f84d30803
Author: Oliver McFadden <oliver.mcfadden@nokia.com>
Date: Mon Mar 15 23:46:33 2010 +0200
exa: exaFinishAccess: Overrun of static array "pExaScr->access" of size 6 at position 6 with index variable "i"
Signed-off-by: Oliver McFadden <oliver.mcfadden@nokia.com>
Reviewed-by: Keith Packard <keithp@keithp.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit bf181915e103b0659c5a0bc3b2f6bccb18c9ec36
Author: Yaakov Selkowitz <yselkowitz@users.sourceforge.net>
Date: Mon Feb 1 17:11:51 2010 +0000
Cygwin/X: Allow the default log location to be configurable
Allow the default log location to be configurable (e.g. /var/log),
and use separate logs for each display instance (e.g. XWin.0.log).
Make the type of g_pszLogFile const char*, per os/log.c:LogInit().
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
commit cca4952d750779a4c58a11fe08a53336042930bb
Author: Colin Harrison <colin.harrison@virgin.net>
Date: Fri Feb 26 14:40:30 2010 +0000
Xming: Warning fixes
Fix warnings due to prototypes not specifying function arguments
Fix warning with RegQueryValueEx()
Tidy up an include
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Reviewed-by: Jon TURNEY <jon.turney@dronecode.org.uk>
commit b8cf4153f84404b2a1b62a247d5d36d24bf481da
Author: Colin Harrison <colin.harrison@virgin.net>
Date: Fri Feb 26 14:41:00 2010 +0000
Xming: Dead code removal
Remove some dead code, mostly code made obsolete by mandatory XKB
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Reviewed-by: Jon TURNEY <jon.turney@dronecode.org.uk>
commit 9b18f7ac0ba9aadb8c86bc2717cbdff75e951b69
Author: Jon TURNEY <jon.turney@dronecode.org.uk>
Date: Fri Feb 26 14:22:57 2010 +0000
Cygwin/X: Tidy up some cosmetic issues in log strings
Tidy up some cosmetic issues in log strings:
- Add missing '\n'
- Fix some strings starting with '\n'
- Remove '\f' from some log strings
These all just look daft in a log with timestamps.
Also clarify log message about screen origin coordinates
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
commit 178e830378c3514b9c53a5b1c6d2d5f930c3779b
Author: Jon TURNEY <jon.turney@dronecode.org.uk>
Date: Mon Feb 22 19:13:30 2010 +0000
Cygwin/X: Fix thinko in mount option checking
Fix a thinko in mount option checking.
Use symbolic names for values assigned to binary flag for clarity.
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
commit fa5103a02bd509e4a102afdad2ab26cb22210367
Author: Francisco Jerez <currojerez@riseup.net>
Date: Wed Feb 24 23:18:01 2010 +0100
dri2: No need to blit from front on DRI2GetBuffers if they're just being reused.
It can be quite an expensive operation, so we're better off not doing
it unless it's totally required.
Signed-off-by: Francisco Jerez <currojerez@riseup.net>
Signed-off-by: Kristian Høgsberg <krh@bitplanet.net>
Reviewed-by: Kristian Høgsberg <krh@bitplanet.net>
commit e38e01081af42825bb7b44d18aa35845318f8556
Author: Francisco Jerez <currojerez@riseup.net>
Date: Wed Feb 24 23:18:00 2010 +0100
Import linked list helpers from the intel DDX.
Borrowed from i830.h, except for list_for_each_entry().
Signed-off-by: Francisco Jerez <currojerez@riseup.net>
Signed-off-by: Kristian Høgsberg <krh@bitplanet.net>
Reviewed-by: Kristian Høgsberg <krh@bitplanet.net>
commit b8a3be5f34016b745e38cd53825a4e398c6127bc
Author: Francisco Jerez <currojerez@riseup.net>
Date: Wed Feb 24 23:17:59 2010 +0100
Add a ConfigNotify hook.
Executed from the ConfigureWindow request, right before sending
ConfigureNotify to the clients.
This commit breaks the ScreenRec ABI.
Signed-off-by: Francisco Jerez <currojerez@riseup.net>
Signed-off-by: Kristian Høgsberg <krh@bitplanet.net>
Reviewed-by: Kristian Høgsberg <krh@bitplanet.net>
commit 67a8c659f25218904bae64aac6e98e326c90330b
Author: Roland Scheidegger <sroland@vmware.com>
Date: Fri Mar 12 16:53:30 2010 +0100
hw/xfree86: move reference counting out of the UseHWCursor[ARGB] functions
The problem is that the xf86_use_hw_cursor(_argb) functions may get this
correctly now, some drivers will replace these generic versions with their
own functions. It is pretty insane to expect them to do reference counting
of the cursor (as an example, look at driver/xf86-video-vmware to see how
that looks like as a workaround). There are even places in xserver itself
which replace these two functions.
The segfaults if no reference counting is done are caused because the
reference count of the cursor reached zero, hence the cursor was freed,
however xf86CursorEnableDisableFBAccess() brought it back to life from
the dead (from the SavedCursor).
This patch hence adds reference counting in xf86CursorSetCursor. As per Michel
Daenzer's suggestion, also free the cursor upon xf86CursorCloseScreen.
In theory with this it should be possible to remove the reference
counting in the UseHwCursor functions I think, though it should also be
safe to keep them.
Signed-off-by: Roland Scheidegger <sroland@vmware.com>
Reviewed-by: Michel Dänzer <michel@daenzer.net>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 75efb46a14fe45ffe73faff637b1fa6d017e1e52
Author: Roland Scheidegger <sroland@vmware.com>
Date: Fri Mar 12 16:52:56 2010 +0100
hw/xfree86: fix refcounting in xf86_use_hw_cursor
This is the same fix as was done in
fcdc1d78cca3b8bb6b77d53eda7e21d649df6943 for xf86_use_hw_cursor_argb.
Signed-off-by: Roland Scheidegger <sroland@vmware.com>
Reviewed-by: Michel Dänzer <michel@daenzer.net>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit df9b6f16b27398545cd4cff8a56dd59a3813351d
Merge: 5f169f5493 5172253bae
Author: Keith Packard <keithp@keithp.com>
Date: Mon Mar 15 08:26:58 2010 -0700
Merge remote branch 'jeremyhu/master'
commit 5f169f54936c9868ad0f3778cb95c1f35eef41ea
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Fri Mar 5 10:35:54 2010 -0500
XQuartz: remove undefined XSERVER_CFLAGS variable
This is a variable local to configure.ac which is not AC_SUBST()
It is undefined in any generated Makefile.
Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com>
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 5172253bae3b9867118c6717434e73c173acd5e9
Author: Jeremy Huddleston <jeremyhu@apple.com>
Date: Wed Feb 10 15:52:14 2010 -0800
XQuartz: Use an empty xkb keymap by default
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
commit b117bc7a441bec8f61610fb384d747112f73d236
Author: Jeremy Huddleston <jeremyhu@apple.com>
Date: Thu Mar 11 00:06:01 2010 -0800
XQuartz: Include os.h for OsAbort()
Fixes regression from 5b9a52be7e975e59e0bbc6b43539ecaff96b2ecd
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
commit b7a16117c6d87a9d33a5f682b592b4507f2c065e
Author: Jeremy Huddleston <jeremyhu@apple.com>
Date: Thu Mar 11 00:03:08 2010 -0800
XQuartz: GLX: Fix prototype for swapBuffers
This was a regression introduced by 04a54f69a8085ab3fe11a8713bd8b6b16ed1db27
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
commit 178da6534fe7ab4b99fb87925c04e6f963c88583
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Mon Mar 8 16:33:37 2010 -0500
Xext: Link to external libraries when necessary.
Although the DDX should be linked to the necessary libraries, we may
also need to pull them in directly to the module to ensure the symbols
are resolved at runtime. Should fix this bug with XSELINUX:
/usr/bin/X: symbol lookup error:
/usr/lib64/xorg/modules/extensions/libextmod.so: undefined symbol:
is_selinux_enabled
-v2: use _LIBADD instead of _LIBS; remove SELINUX_LIBS from
XSERVER_SYS_LIBS as it should only be needed in extmod.
Signed-off-by: Dan Nicholson <dbn.lists@gmail.com>
Signed-off-by: Eamon Walsh <ewalsh@tycho.nsa.gov>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit a2ea8c2f2cc53607d57d60f41c879380ea70cd02
Author: Daniel Stone <daniel@fooishbar.org>
Date: Thu Mar 11 14:19:04 2010 +0200
Record: Avoid duplicates from replaying frozen events
Reintroduce a check which used to be there in the old
ProcessKeyboardEvent/ProcessPointerEvent codepath, which avoids us
recording events subject to a grab twice: once when it's first processed
in EnqueueEvent, and then again when it's thawed and being replayed.
This required a tiny amount of code motion to expose syncEvents.
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit f2eacb4646beb25d055de22868f93e6b24f229b6
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Wed Mar 10 09:39:05 2010 +1000
Revert "dix: Use DeliverGrabbedEvent for implicit passive grabs (#25400)"
Several users have pointed out that this commit introduces regressions, most
notably perhaps fluxbox which essentially stops working after a few clicks.
This reverts commit cf72b5437d2d620521279077a29c5df6d0fbb576.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit df9f3273041c6c3e0da2d2254e8c156cd582e296
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Wed Mar 10 09:24:32 2010 +1000
xfree86: fix xf86Config.c build error in --enable-debug mode. (#26971)
xf86Config.c: In function 'configInputDevices':
xf86Config.c:1514: error: request for member 'lay_identifier' in something
not a structure or union
make[5]: *** [xf86Config.lo] Error 1
Introduced with e1165632bdfbd720889ed1adf5f7ab338032c0ee.
X.Org Bug 26971 <http://bugs.freedesktop.org/show_bug.cgi?id=26971>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Acked-by: Dan Nicholson <dbn.lists@gmail.com>
commit 116068103282924ef1476231d13d54719a797252
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Tue Mar 9 09:35:23 2010 +1000
xfree86: don't warn about nonexisting core pointer/keyboard in config.
In the vast majority of cases there is no xorg.conf that specifies a core
pointer/keyboard. Skip this warning, since we'll get another notification
about how the server relies on the config backend for input devices anyway.
Leave the warning in for the error case (AEI off).
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Fernando Carrijo <fcarrijo@yahoo.com.br>
Reviewed-by: Dan Nicholson <dbn.lists@gmail.com>
commit c39c8ece9bd3ce025549f4bac7794f5a62266f4a
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Wed Feb 10 15:06:52 2010 +1000
os: remove INTERNAL_MALLOC define.
There doesn't seem to be anything that defines it and given that the
counterpart (the X internal malloc) was removed in
01cfba75229f4b9bf1e4fe80814931acdacde14c it's unlikely to work anyway.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 9f462ff9082634719e64d2d8d4dbd09ec7deaf2e
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri Feb 26 14:02:09 2010 +1000
dix: Clip only into axis ranges if we're in absolute mode. (#26543)
An absolute device in relative mode may provide valuators outside of the
axis range. Clipping back into the range prevents screen crossings in a
multi-screen (Xinerama) setup as the required screen edge for crossing is
never met: miPointerSetPosition crosses the screen conditional to the X
coordinate being equal to the screen width or _less than_ 0. While the
former can be met when clipping into the coordinate range and scaling, the
latter cannot, resulting in a mouse pointer that gets stuck on the rightmost
screen.
This patch only applies axis clipping for valuators in mode Absolute. If
relative, we allow the values to get above/below the axis ranges. Doesn't
matter, miPointerSetPosition will reset the values to the allowed range even
if no screen was crossed.
This leads to interesting values provided to clients, the valuator range of
the device resets once a screen is crossed and essentially reflects
the position of the cursor on the screen - scaled into the valuator range.
The values themselves are valid given the range though.
In theory, the XI1 specs require that a relative device has a min/max range
of 0/0. This doesn't really go well with devices that actually can switch
mode between relative and absolute since they would have to reset their axis
range when switching. If multiple XI clients are in use, we have no method
of notifying them about the changes, so other clients may continue to use
the wrong axis ranges (note: XI1 wasn't really designed to have multiple
clients use a device). Expecting all relative devices to have this min/max
of 0 is unrealistic at this point.
So pick what is possibly the lesser of all evils, pass the beer and despair.
X.Org Bug 26543 <http://bugs.freedesktop.org/show_bug.cgi?id=26543>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Daniel Stone <daniel@fooishbar.org>
commit 1f0e69b3a13258b79bffdec76b46f7960eb334b3
Author: Matt Turner <mattst88@gmail.com>
Date: Mon Mar 8 10:54:21 2010 -0500
Don't check for Xinerama.
It doesn't seem to be used anywhere, so don't require it.
CC: Jerome Glisse <jglisse@redhat.com>
CC: Alex Deucher <alexdeucher@gmail.com>
CC: Dave Airlie <airlied@redhat.com>
Signed-off-by: Matt Turner <mattst88@gmail.com>
commit bbae92795c7eab062e6722c42fa7915e0cee5d69
Author: Matt Turner <mattst88@gmail.com>
Date: Mon Feb 15 20:08:09 2010 -0500
Replace assembly with generic unaligned access code
Removes Alpha assembly, and probably works around unaligned accesses on
other sensitive platforms.
Signed-off-by: Matt Turner <mattst88@gmail.com>
Acked-by: Adam Jackson <ajax@redhat.com>
Compiled-by: Tiago Vignatti <tiago.vignatti@nokia.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 1c2abec479cfbac9aeadc121af0825d368317658
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri Feb 26 11:44:17 2010 +1000
configure: move SELINUX_LIBS to XSERVER_SYS_LIBS
All ddxs require linking against selinux if enabled.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Dan Nicholson <dbn.lists@gmail.com>
Reviewed-by: Eamon Walsh <ewalsh@tycho.nsa.gov>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit cab99b947c66a42dbf8a906bdb02e23aa7cab519
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri Feb 26 11:41:38 2010 +1000
configure: move libselinux requirement up to the common section.
Let's have all version-specific requirements in one block.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Dan Nicholson <dbn.lists@gmail.com>
Reviewed-by: Eamon Walsh <ewalsh@tycho.nsa.gov>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 9e7b6e565f6e69f20002bf03ed05fe8b63f86924
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri Feb 26 10:14:00 2010 +1000
dmx: fix OsAbort()-related build error in examples/xinput.c
5b9a52be7e975e59e0bbc6b43539ecaff96b2ecd changed the server to use OsAbort()
instead of abort(). xinput in dmx is a client program though and fails to
link if it tries to use OsAbort(). Switch it back to using abort().
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Fernando Carrijo <fcarrijo@yahoo.com.br>
Reviewed-by: Julien Cristau <jcristau@debian.org>
Reviewed-by: Rami Ylimaki <ext-rami.ylimaki@nokia.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit cf72b5437d2d620521279077a29c5df6d0fbb576
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu Feb 25 12:49:21 2010 +1000
dix: Use DeliverGrabbedEvent for implicit passive grabs (#25400)
A client requesting a GrabModeSync button grab, owner-events true, with only
the ButtonRelease mask set would never receive the press event even if the
grab window had the ButtonPress mask set.
The protocol requires that if owner-events is true, then the delivery mask
is the combination of the grab mask + the window event mask.
DeliverGrabbedEvents does this already for us, checking first the delivery
based on owner_events and then based on the grab mask. AFAICT, the device
cannot enter the states FREEZE_BOTH_NEXT_EVENT or FREEZE_NEXT_EVENT that
would be handled by DGE in any possible path here.
Bonus point - CheckPassiveGrabsOnWindows suddenly becomes a lot lesss
complicated.
X.Org Bug 25400 <http://bugs.freedesktop.org/show_bug.cgi?id=25400>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Keith Packard <keithp@keithp.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit de86a3a3448f0a55c1cd99aee9ea80070a589877
Author: Keith Packard <keithp@keithp.com>
Date: Thu Feb 25 11:37:05 2010 -0800
Allow for missing or disabled compat_output
When the compat output is missing (I don't think this is actually
possible), or is disabled (and hence has no crtc), we would like to
avoid dereferencing NULL pointers. This patch creates inline functions
to extract the current compat output, crtc or associated RandR crtc
structure, carefully checking for NULL pointers everywhere.
Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit fbbadca7e88391e81ab0f470290f5eec36aa9ce7
Author: Keith Packard <keithp@keithp.com>
Date: Thu Feb 25 11:35:03 2010 -0800
Share enum definition for det_monrec_parameter sync_source
There were two separate enum definitions, one inside
det_monrec_parameter struct and one for a local variable (which was then
stored inside the struct). Sharing a single definition makes the
code more obviously correct while making the compiler happier.
Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 4b55b2cf8a52c39b53bae11cd1bc7314481d4c86
Author: Robert Bragg <bob@o-hand.com>
Date: Wed Jan 27 20:38:38 2010 +0000
DRI2: initialize event->drawable in DRI2SwapEvent
We weren't initialising the drawable in the event structure so the
client side DRI2WireToEvent used for translating the event into a GLX
event wouldn't be able to lookup up the corresponding GLXDrawable before
passing the event on.
Signed-off-by: Robert Bragg <robert@linux.intel.com>
Reviewed-by: Eric Anholt <eric@anholt.net>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 780c95caf9888fa4548dfe4c1c78a7e7ce99a9ed
Merge: 018b177591 758f697175
Author: Keith Packard <keithp@keithp.com>
Date: Wed Feb 24 09:59:19 2010 -0800
Merge remote branch 'whot/for-keith'
commit 018b177591c9fade6d065e31858cc6e054d33eff
Author: Kristian Høgsberg <krh@bitplanet.net>
Date: Wed Feb 24 10:37:26 2010 -0500
glx: Compile fix to let server compile with new and old mesa
We broke the __DRI2_FLUSH API since it was never released, but since it's
taking a little longer than expected to get the X server side of the changes
ready, fix things up so it compiles.
Signed-off-by: Kristian Høgsberg <krh@bitplanet.net>
Reviewed-by: Keith Packard <keithp@keithp.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 758f6971750ed507e64eee817d720a77181439f2
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Mon Feb 15 16:32:16 2010 +1000
dix: try to ring the bell even if the current device doesn't have one. (#24503)
Evdev devices do not have the bell proc set, but XTEST devices do. By
exiting early, the bell only rings if the last keyboard used was the XTEST
keyboard and hence the bell proc is still set on the master but not if an
evdev keyboard was used last.
The better approach here is to try to ring the bell on all devices attached
to this master device in case one or more actually do produce an audible
sound. That's also XKB's behaviour if XkbUseCoreKbd is specified as device
identifier.
X.Org Bug 24503 <http://bugs.freedesktop.org/show_bug.cgi?id=24503>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Adam Jackson <ajax@redhat.com>
commit c0d941913199ed251fceab62fcf65437f6f9bd31
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu Feb 18 16:00:15 2010 +1000
dix: remove now-erroneous comment about frozen slave devices.
A direct grab on a slave device through XI2 detaches it, regardless of
whether the grab is sync or async. So this comment doesn't apply to XI2
anyway.
For XI1, aside from your life being miserable already, it doesn't matter as
XI1 does not have a concept of attachment. You can freeze a device and if
you don't freeze _all_ other devices at the same time, the master device can
still happily send events to the client.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Acked-by: Adam Jackson <ajax@redhat.com>
commit db4f676f25c6d8e58263d5151942be730592d444
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Wed Feb 3 15:40:47 2010 -0500
xselinux: Bump extension minor version.
Changes introduced in this version:
- 3 window-related requests now handle pixmaps also.
Signed-off-by: Eamon Walsh <ewalsh@tycho.nsa.gov>
Reviewed-by: Keith Packard <keithp@keithp.com>
commit a6cbcf6e782e65f3d4d14202ed0b7a8f65b33c9d
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Wed Feb 3 15:38:57 2010 -0500
xselinux: Rename window-related requests that now support pixmaps.
Renamed requests:
SetWindowCreateContext -> SetDrawableCreateContext
GetWindowCreateContext -> GetDrawableCreateContext
GetWindowContext -> GetDrawableContext
Signed-off-by: Eamon Walsh <ewalsh@tycho.nsa.gov>
Reviewed-by: Keith Packard <keithp@keithp.com>
commit ab68c707fd02613d9359120ba6402639dd8bd89e
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Wed Feb 3 15:08:40 2010 -0500
xselinux: Allow GetWindowContext to be used for pixmaps as well.
Signed-off-by: Eamon Walsh <ewalsh@tycho.nsa.gov>
Reviewed-by: Keith Packard <keithp@keithp.com>
commit eb9210097efea81065c301e5b6b4da7a566deb4a
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Wed Jan 6 12:52:51 2010 -0500
xselinux: Remove reference counting calls for SID objects.
Starting with libselinux 2.0.86, SID objects are no longer
reference counted and the sidput() and sidget() calls are no-ops.
Signed-off-by: Eamon Walsh <ewalsh@tycho.nsa.gov>
Reviewed-by: Keith Packard <keithp@keithp.com>
commit 0c4b75a08922416050bb73d2e279ce938d3823e7
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Wed Oct 21 21:59:01 2009 -0400
Don't print a failure message when XACE denies an input event delivery.
A denial is normal and the behavior should be to drop the event.
Having the log message creates excessive log spam.
Signed-off-by: Eamon Walsh <ewalsh@tycho.nsa.gov>
Reviewed-by: Keith Packard <keithp@keithp.com>
commit e687e11b1248494a45b9a4e4c321675526808703
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Wed Oct 21 21:46:50 2009 -0400
Revert "Remove some debug messages that trigger on XACE event delivery failure."
The log messages still need to be there for non-XACE failures.
This reverts commit 4be354c4c2da5168b302601b91bd80cfaca7e193.
Signed-off-by: Eamon Walsh <ewalsh@tycho.nsa.gov>
Reviewed-by: Keith Packard <keithp@keithp.com>
commit 2ecb9f7d86117f212d7845741a3e155553954a85
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Wed Oct 21 19:28:26 2009 -0400
libselinux now has a pkgconfig file. Use it.
Also remove HAVE_NETLINK_AVC_ACQUIRE_FD tests, because we now
require a version of libselinux that has it.
Signed-off-by: Eamon Walsh <ewalsh@tycho.nsa.gov>
Reviewed-by: Keith Packard <keithp@keithp.com>
commit 9fc6b59d46382e949526dc10c3f5bfddbe2acb92
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Thu Oct 15 17:32:21 2009 -0400
xselinux: Allow SetWindowCreateContext to be used for pixmaps as well.
Signed-off-by: Eamon Walsh <ewalsh@tycho.nsa.gov>
Reviewed-by: Keith Packard <keithp@keithp.com>
commit 93ff1bc5884cdfca1132af7fbc06c48e06f218c8
Author: Simon Farnsworth <simon.farnsworth@onelan.co.uk>
Date: Mon Feb 15 14:18:00 2010 +0200
Always enable outputs that have been forced on in the configuration file
If the user has gone to the effort of manually enabling an output in
the configuration file assume that they know what they're doing.
X.org Bug 14611 <http://bugs.freedesktop.org/show_bug.cgi?id=14611>
Signed-off-by: Simon Farnsworth <simon.farnsworth@onelan.co.uk>
Reviewed-by: Alex Deucher <alexdeucher@gmail.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit ca9c2472d74c7107ccc117e2c9c723c168d2eccf
Merge: e40ba5798c 02d1116e7e
Author: Keith Packard <keithp@keithp.com>
Date: Mon Feb 22 13:26:06 2010 -0800
Merge remote branch 'whot/for-keith'
commit e40ba5798c367bec584f6437b23d2c5f801fd013
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu Feb 18 15:49:09 2010 +1000
Xi: assume BadMode for non-BadMatch errors returned from SetDeviceMode.
The XI protocol spec only allows for two errors on the SetDeviceMode
requests: BadMatch or BadMode. BadMode however is a dynamically assigned
extension error and the driver doesn't have access to the actual error
number. Hence, if a SetDeviceMode driver returns an error other than
BadMatch, assume BadMode.
The two exceptions are BadAlloc and BadImplementations, pass these on to the
client (any request is allowed to return either of those).
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Dan Nicholson <dbn.lists@gmail.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 02d1116e7eb84068fa32477f1640d29b0a81b638
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Mon Jan 11 16:35:36 2010 +1000
Xi: assume BadMode for non-BadMatch errors returned from SetDeviceMode.
The XI protocol spec only allows for two errors on the SetDeviceMode
requests: BadMatch or BadMode. BadMode however is a dynamically assigned
extension error and the driver doesn't have access to the actual error
number. Hence, if a SetDeviceMode driver returns an error other than
BadMatch, assume BadMode.
The two exceptions are BadAlloc and BadImplementations, pass these on to the
client (any request is allowed to return either of those).
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Dan Nicholson <dbn.lists@gmail.com>
commit 122fc0e7a0712df4ec2bd9ca6773f90bcd2095cf
Author: Chris Dekter <cdekter@gmail.com>
Date: Thu Feb 11 16:34:09 2010 +1000
Re-enable RECORD extension.
RECORD was disabled during the switch to internal events. This patch
modifies the record callback to work with internal events instead of
xEvents. The InternalEvents are converted to core/Xi events as needed.
Since record is a loadable extension, the EventTo* calls must be externed.
Signed-off-by: Chris Dekter <cdekter@gmail.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 03ef00ae79687046dc9f9987857062a16ff2c2e0
Author: Michel Dänzer <daenzer@vmware.com>
Date: Wed Feb 17 11:40:44 2010 +0100
EXA/mixed: Clean up exaPrepareAccessReg_mixed() a little.
Signed-off-by: Michel Dänzer <daenzer@vmware.com>
Acked-by: Maarten Maathuis <madman2003@gmail.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 9623daad7c864d46b0dfcbb6e689820b96cc8115
Author: Maarten Maathuis <madman2003@gmail.com>
Date: Wed Feb 17 11:40:43 2010 +0100
exa/mixed: fix gnome-panel corruption
- A mapped pixmap can't be used for acceleration, any decent memory manager
will refuse this.
- Source pixmaps migrated with a bounding region are incomplete (from the
gpu point of view), so do the upload unconditionally, instead of just for
deferred destination pixmaps.
- Fixes fd.o bug #26076.
Signed-off-by: Maarten Maathuis <madman2003@gmail.com>
Acked-by: Michel Dänzer <michel@daenzer.net>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 5b9a52be7e975e59e0bbc6b43539ecaff96b2ecd
Author: Rami Ylimaki <ext-rami.ylimaki@nokia.com>
Date: Thu Jan 28 11:08:34 2010 +0200
os: Prevent core dump from being truncated.
The problem fixed by this patch can be reproduced on Linux with the
following steps.
- Access NULL pointer intentionally in ProcessOtherEvent on key press.
- Instead of saving core dump to a file, write it into a pipe.
echo "|/usr/sbin/my-core-dumper" > /proc/sys/kernel/core_pattern
- Dump the core by pressing a key.
While the core is being dumped into the pipe, the smart schedule timer
will cause a pending SIGALRM. Linux kernel stops writing data to the
pipe when there are pending signals. This causes the core dump to be
truncated. On my system I'm expecting a 6 MB dump but the size will be
60 kB instead. The problem is solved if we block the SIGALRM caused by
expired smart schedule timer.
I haven't been able to reproduce this problem in the following cases.
- Save core dump to a file instead of a pipe.
- kill -SEGV `pidof Xorg`
- Press a key to dump core while gdb is attached to Xorg.
- Give option -dumbSched to Xorg.
Also note that the fix works only when NoTrapSignals has the default
value FALSE. The problem can still be reproduced if error signals
aren't trapped. In addition to pending SIGALRM, there is a similar
problem with pending SIGIO from the keyboard driver during core dump.
Signed-off-by: Rami Ylimaki <ext-rami.ylimaki@nokia.com>
Reviewed-by: Keith Packard <keithp@keithp.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit ca364ca82a760d8e5347a6f9f79636c9a5e4e03f
Author: Rami Ylimaki <ext-rami.ylimaki@nokia.com>
Date: Thu Jan 28 11:08:33 2010 +0200
os: Introduce OsAbort for proper core dumps.
Signed-off-by: Rami Ylimaki <ext-rami.ylimaki@nokia.com>
Reviewed-by: Keith Packard <keithp@keithp.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 031f92bf9ab15226df410012a0d1c9c390efc36d
Author: Oliver McFadden <oliver.mcfadden@nokia.com>
Date: Wed Feb 3 10:05:20 2010 +0200
parser: corrected xf86getBoolValue to use case insensitive compare
commit c6e8637e29e0ca11dfb35c02da7ca6002ac8c597 introduced this
regression; it can cause existing config files to be parsed incorrectly.
Acked-by: Julien Cristau <jcristau@debian.org>
Reviewed-by: Dan Nicholson <dbn.lists@gmail.com>
Signed-off-by: Oliver McFadden <oliver.mcfadden@nokia.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit be96fb2f02c13a6ee8aba40f7d4c3f9141f06cea
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Mon Feb 15 17:42:11 2010 -0800
Solaris xf86OSRingBell() off-by-one error in filling iov[] array
When generating sound buffers for /dev/audio bells, insert waveform
for beep *or* silence, but not both, so we don't write one entry past
the end of the iov buffer when the final bit of soundwave ends up in
the final entry allocated in the iov array.
Fixes OpenSolaris bug 6894890:
http://bugs.opensolaris.org/bugdatabase/view_bug.do?bug_id=6894890
Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Acked-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 2d40f22d1ec970a84b23aa42b1feca4feedeb4bb
Author: Matt Turner <mattst88@gmail.com>
Date: Mon Feb 15 20:05:24 2010 -0500
Use C-style comments in x86emu
Signed-off-by: Matt Turner <mattst88@gmail.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 4e8bf12b13690afa6d9fee0e339d3819ef16fb3f
Author: Jeremy Huddleston <jeremyhu@apple.com>
Date: Mon Feb 15 16:46:21 2010 -0800
XQuartz: Fix a possible buffer overrun in quartzAudio
Also dropped deprecated API while there
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
commit 4127e8e5be5c366eb752bbb8d7f0ff5b519e641b
Author: Jeremy Huddleston <jeremyhu@apple.com>
Date: Wed Feb 10 17:56:30 2010 -0800
XQuartz: clang static analysis fixes
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
commit c686c5cbdc5f35744407af5f9aabbd18cc17714b
Author: Jeremy Huddleston <jeremyhu@apple.com>
Date: Mon Feb 15 15:03:01 2010 -0800
XQuartz: Fix linking (CloseInput())
Fixes regresison from d33adcdf03c69407d151e732fa0cf9947151eb19
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
commit 84905007702da2c05a4f7446b3fc5ff52be49655
Author: Thomas Jaeger <ThJaeger@gmail.com>
Date: Mon Jan 4 15:00:49 2010 -0500
udev: Don't filter subsystem "input"
This allows serial wacom devices to work, whose subsystem is "tty".
Signed-off-by: Thomas Jaeger <ThJaeger@gmail.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 8736d112afb0dd61dfdaadd6378eafd200b2ef5f
Author: Dan Nicholson <dbn.lists@gmail.com>
Date: Sat Feb 13 10:40:40 2010 -0800
xfree86: Reorder InputClass option priorities
Currently the config and InputClasses are merged together so that the
options from the config backend have the highest priority. This is bad
since it means options such as a default XKB layout set by the backend
cannot be changed by the user.
This patch changes order of precedence to be:
1. xorg.conf
2. xorg.conf.d (later files have higher priority)
3. config backend
In order to allow this ordering, the config parsing has been changed to
read the xorg.conf.d files before xorg.conf. This has the consequence
that the core device picking which looks for the first InputDevice may
not find it in xorg.conf.
Signed-off-by: Dan Nicholson <dbn.lists@gmail.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 48f7298657f91843db36566b8d66d6c4c18dbd4c
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Wed Jan 13 15:03:45 2010 +1000
Xi: reset the sli pointers after copying device classes. (#25640)
If the indicator flags have the XkbSLI_IsDefault bit set, the indicator map
and names aren't their own bit of memory but rather point into the
device->key->xkbInfo->desc structure. XkbCopySrvLedInfo knows about this and
leaves the pointers alone.
When copying the classes from the slave to the master, these pointers are
copied and still point to the dev->key class of the slave device. If the
slave device is removed, the memory becomes invalid and a call to modify
this data (e.g. XkbSetIndicators) may cause a deadlock.
The copying of dev->key relies on dev->kbdfeed to be already set up. Hence
the pointers need to be reset once _both_ kbdfeed and key have been copied
into the master device.
X.Org Bug 25640 <http://bugs.freedesktop.org/show_bug.cgi?id=25640>
Fedora Bug 540584 <https://bugzilla.redhat.com/show_bug.cgi?id=540584>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Keith Packard <keithp@keithp.com>
commit d33adcdf03c69407d151e732fa0cf9947151eb19
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri Jan 15 15:22:02 2010 +1000
dix: move config_init into the DDX.
The only DDX currently using hotplugging is the xfree86 one and it looks
like it'll stay that way for a bit. Move the initialization to the DDX,
since Xephyr, Xnest, and friends don't need HAL or udev notifications.
Add CloseInput (counterpart to InitInput) to be able to clean up the config
initialization from the DDX as well.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Julien Cristau <jcristau@debian.org>
Reviewed-by: Dan Nicholson <dbn.lists@gmail.com>
commit 001ce71dc11287dc94cc2fbc5d35677c046e6c04
Author: Julien Cristau <jcristau@debian.org>
Date: Fri Feb 12 23:34:57 2010 +0100
dix: restore lastDeviceEventTime update in dixSaveScreens
This was removed in 6b5978dcf1f7ac3ecc2f22df06f7000f360e2066 (Do not
reset lastDeviceEventTime when we do dixSaveScreens), but caused a
regression for XResetScreenSaver. Add the lastDeviceEventTime update
back, but restrict it to that case.
X.Org bug#25855 <http://bugs.freedesktop.org/25855>
Reported-by: Lubos Lunak <l.lunak@suse.cz>
Tested-by: Lubos Lunak <l.lunak@suse.cz>
Signed-off-by: Julien Cristau <jcristau@debian.org>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 97b03037f4d99fcebc7603011f41c3aff9871ce2
Author: Peter Harris <pharris@opentext.com>
Date: Fri Feb 12 15:36:30 2010 -0500
Don't double-swap the RandR PropertyNotify event
The event is already swapped in randr.c/SRROutputPropertyNotifyEvent, so
it should not be swapped here.
X.Org Bugzilla #26511: http://bugs.freedesktop.org/show_bug.cgi?id=26511
Tested-by: Leonardo Chiquitto <leonardo@ngdn.org>
Acked-by: Adam Jackson <ajax at redhat.com>
Reviewed-by: Julien Cristau <jcristau at debian.org>
Signed-off-by: Peter Harris <pharris@opentext.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 0b73f98cbd1803b82c2faf1a40f1a0037673d712
Author: Soeren Sandmann <sandmann@daimi.au.dk>
Date: Fri Feb 12 20:04:53 2010 +0100
xfree86: Add qxl driver to the autoconfig logic
The qxl driver is for the QXL virtualized graphics device.
Signed-off-by: Søren Sandmann Pedersen <ssp@redhat.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 9c5bb550a2234e4bee2a144417d74c6bdf160e89
Author: Keith Packard <keithp@keithp.com>
Date: Fri Feb 12 13:46:03 2010 -0800
Bump to 1.7.99.901 -- 1.8 RC1
commit 57ffeb3f2b3313dcef92a396f1f55fdbc064b2c5
Merge: c6d9bc092c c76248fda9
Author: Keith Packard <keithp@keithp.com>
Date: Fri Feb 12 13:36:32 2010 -0800
Merge remote branch 'jturney/master'
commit c6d9bc092c84ad5c68083a126aa7577baa42cef7
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Wed Feb 10 15:36:50 2010 +1000
Add tag matching to input attributes.
Tags may be a list of comma-separated strings that match against a MatchTag
InputClass section. If any of the tags specified for a device match against
the MatchTag of the section, this match is evaluated true and passed on to
the next match condition.
Tags are specified as "input.tags" (hal) or "ID_INPUT.tags" (udev), the
value of the tags is case-sensitive and require an exact match (not a
substring match).
i.e. "quirk" will not match "QUIRK", "need_quirk" or "quirk_needed".
Example configuration:
udev:
ENV{ID_INPUT.tags}="foo,bar"
hal:
<merge key="input.tags" type="string">foo,bar</merge>
xorg.conf:
Section "InputClass"
Identifier "foobar quirks"
MatchTag "foo|foobar"
Option "Foobar" "on"
EndSection
Where the xorg.conf section matches against any device with the tag "foo"
or tag "foobar" set.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Tested-by: Dan Nicholson <dbn.lists@gmail.com>
Reviewed-by: Dan Nicholson <dbn.lists@gmail.com>
commit 3ac43df5d4a25d6e0058b327fa05a1c1436b4794
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Wed Feb 10 15:36:49 2010 +1000
Add xstrtokenize to the dix.
Move tokenize out of the parser, make it a dix util function instead.
Splitting a string into multiple substrings is useful by other places, so
let's use it across the line. Future users include config/hal, config/udev
and of course the parser.
Example usage:
char **substrings = xstrtokenize(my_string, "\n");
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Dan Nicholson <dbn.lists@gmail.com>
commit 27d1b86d1b858f931b4cb1b6ddf857c76d92a6d9
Author: Dan Nicholson <dbn.lists@gmail.com>
Date: Wed Feb 10 15:36:48 2010 +1000
xfree86: Set fnmatch pathname flag for InputClass device matching
Signed-off-by: Dan Nicholson <dbn.lists@gmail.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 9b369f71273fb117c982e6ce16cd4462f206d365
Author: Dan Nicholson <dbn.lists@gmail.com>
Date: Wed Feb 10 15:36:47 2010 +1000
xfree86: Allow multiple arguments to InputClass matches
In order to keep the number of InputClass sections manageable, allow
matches to contain multiple arguments. The arguments will be separated
by the '|' character. This allows a policy to apply to multiple types of
devices. For example:
Section "InputClass"
Identifier "Inverted Mice"
MatchProduct "Crazy Mouse|Silly Mouse"
Option "InvertX" "yes"
EndSection
This applies to the MatchProduct, MatchVendor and MatchDevicePath
entries. Currently there is no way to escape characters, so names or
patterns cannot contain '|'.
Signed-off-by: Dan Nicholson <dbn.lists@gmail.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit a378e361a5de89f0be8b68ebc3e854f56cefe666
Author: Dan Nicholson <dbn.lists@gmail.com>
Date: Wed Feb 10 15:36:46 2010 +1000
xfree86: Use "Ignore" option in InputClass to skip devices
Sometimes it is desirable to skip adding specific input devices to the
server. The "Ignore" option is used similarly to Monitor sections so
that matched devices will not be added. BadIDChoice is returned to the
config backend so that it will clean up all resources.
Signed-off-by: Dan Nicholson <dbn.lists@gmail.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 8b1a685f00ae76be864cc188943a0874f48b8d64
Author: Dan Nicholson <dbn.lists@gmail.com>
Date: Wed Feb 10 15:36:45 2010 +1000
xfree86: Handle config files ending without newline
The config parser expects to find a newline at the end of each line, so
files ending without one would confuse it. A newline is inserted at the
end of the buffer in these situations. Additionally, switching to the
next config file is moved to the higher level to allow parsing of the
last line of the previous file to complete before shifting the index and
resetting the line number.
Signed-off-by: Dan Nicholson <dbn.lists@gmail.com>
Tested-by: Stephan Raue<stephan.raue@gmx.net>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 67bc278a511ca6ec42e1f8d2d5897c0109e94e2c
Author: Dan Nicholson <dbn.lists@gmail.com>
Date: Wed Feb 10 15:36:44 2010 +1000
xfree86: Make InputClass docs and comments match reality
Drivers and options specified in InputClass sections work on a "first
match wins" strategy. Let's be consistent when documenting it.
Signed-off-by: Dan Nicholson <dbn.lists@gmail.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit a34812b09000db2ff2a1dc6182602839123edd4e
Author: Benjamin Tissoires <tissoire@cena.fr>
Date: Mon Feb 8 13:50:43 2010 +0100
Add labels for multitouch valuators
Thoses definitions have been included in the kernel but the X server is not updated accordingly.
Without these definitions, the multitouch axes are not correctly labelled.
Signed-off-by: Benjamin Tissoires <tissoire@cena.fr>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit c76248fda99c38aef0ccf0ed6b58fbe95f6fe497
Author: Jon TURNEY <jon.turney@dronecode.org.uk>
Date: Tue Feb 2 20:53:44 2010 +0000
Cygwin/X: Avoid a collision between DEBUG and a token name
Rename a token to avoid a collision between DEBUG defined via AC_DEFINE
if --enable-debug is configured, and the token for the 'debug' instruction
in the XWin preferences file
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
commit b7dbbd3cd4d28cd4939706b3bf6394ba8ecafaff
Author: Jon TURNEY <jon.turney@dronecode.org.uk>
Date: Sun Nov 22 23:35:09 2009 +0000
Cygwin/X: Avoid cursor size log spam
Fedora 12 likes to use a 39x26 animated wait cursor. Avoid spamming
the log with warnings that each frame can't be completely contained
in the 32x32 native cursor
Also reformat log message so it doesn't contain a '\n\t'. I mean,
it's not like we might want to grep the log or something...
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
commit c9cbbd5d1cfa58a2d9f08e25534ea8439284322d
Author: Jon TURNEY <jon.turney@dronecode.org.uk>
Date: Sat Nov 28 17:51:33 2009 +0000
Repair '-nolock'
commit 446fe9eecddd1337f9d5164dd7c301e1ba3dfe32 removes the AC_DEFINE for
SERVER_LOCK and conditional compilation checking it, making it always on
everywhere, except in os/utils.c where code is left under SERVER_LOCK, which
now never gets built, making the '-nolock' option non-functional...
This seems to have been broken since Xserver 1.7.0, but this option is
actually of some slight use on cygwin, as if /tmp resides on a FAT filesystem
(yes, I know...), hard links aren't supported.
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
commit 7f54ccafadf99c0a1a3e788734199b306b4fa51d
Author: Jon TURNEY <jon.turney@dronecode.org.uk>
Date: Fri Jan 16 13:12:12 2009 +0000
Cygwin/X: Make transient windows resizable again
Reverts the change which makes parented windows non-resizeable
Because this was trying to do something which we should be doing, as an alternative we
try checking WM_NORMAL_HINTS for windows which shouldn't be resizable
If a window has a maximum size specified, no maximize box
If a window has a fixed size (max size == min size, per EWMH 1.3 Implementation Notes), no resizing frame
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
commit 654d2e372dc2978ce379ab9f02137333ec224f0c
Author: Jon TURNEY <jon.turney@dronecode.org.uk>
Date: Tue Nov 10 13:24:40 2009 +0000
Cygwin/X: Discourage other WMs in multiwindow mode
Tidying up of other WM detection code when ading SWT/Motif
fix in commit 71519a572fe15b85c0eb2b02636c9e871f2c858f
was rather over-agressive and now allows other WMs to think
they can start when the internal WM is running.
Revert to the behaviour of selecting ButtonPressMask events
as well on the root window, so other WMs will be dissuaded
from starting
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
commit 26857b1c2003797b02e258247f63064aa1e37c10
Author: Jon TURNEY <jon.turney@dronecode.org.uk>
Date: Sat Oct 31 17:19:17 2009 +0000
Cygwin/X: Update XWin man page
Restructure to group similar options and offer some commentary on those groups
Review option descriptions, clarify and bring up-to-date
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
commit 6f1836bfbd80e88d4c57a32757d0a5b398504c35
Author: Jon TURNEY <jon.turney@dronecode.org.uk>
Date: Mon Nov 2 17:37:14 2009 +0000
Cygwin/X: Update DDX specific -help text
Alphabetize options
Review option descriptions, clarify and bring up to date
Add missing option descriptions
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
commit 22982b9e95a2339d5ba60d66263e42a0331ee41f
Author: Jon TURNEY <jon.turney@dronecode.org.uk>
Date: Thu Oct 29 18:50:23 2009 +0000
Cygwin/X: XSupportsLocale() failure is non-critical
Treat XSupportsLocale() returning false as non-critical to internal client
theads startup, and issue a warning, not an error
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
commit f60b7712b3451649f138b158ee282be89a66b9ef
Author: Yaakov Selkowitz <yselkowitz@users.sourceforge.net>
Date: Mon Feb 1 17:13:00 2010 +0000
Cygwin/X: Report BUILDERSTRING with version information
Report BUILDERSTRING with version information
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
commit ed2c2a68e1e6b409c198a52d99d300eb6d517e89
Author: Yaakov Selkowitz <yselkowitz@users.sourceforge.net>
Date: Mon Feb 1 17:12:57 2010 +0000
Define FD_SETSIZE on Cygwin regardless of XWin DDX
All DDXs segfault on Cygwin unless -DFD_SETSIZE=256 is set, so make sure
we do so whether or not we are building XWin.
FD_SETSIZE must be at least XFD_SETSIZE for uses of select() to be correct.
The Cygwin default is only 64, so it must be increased to 256
Signed-off-by: Yaakov Selkowitz <yselkowitz@users.sourceforge.net>
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
commit 2f2f3da080629d410dd99e281c382b54f0dbbf5d
Author: Jon TURNEY <jon.turney@dronecode.org.uk>
Date: Fri Jun 19 21:14:47 2009 +0100
Cygwin/X: Copy the state of the Windows keyboard device to the Virtual Core Keyboard at startup.
Otherwise, this happens lazily after the first keypress, which can lead
to applications which are started from a shell window and inspect the
keyboard state before a character is typed getting the wrong idea about
the desired keymap (e.g. xemacs shows this behaviour)
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
commit 7a440e5b7a416e582b6c3cc4c33822854ce73aed
Author: Jon TURNEY <jon.turney@dronecode.org.uk>
Date: Sun Oct 4 15:55:40 2009 +0100
Cygwin/X: Tidy up system.Xwinrc
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
commit 11252ed82e1f361b99e86521ac9314f868bd1a3a
Author: Yaakov Selkowitz <yselkowitz@users.sourceforge.net>
Date: Mon Feb 1 17:11:54 2010 +0000
Cygwin/X: Look for system.Xwinrc in SYSCONFDIR/X11
Look for system.Xwinrc in SYSCONFDIR/X11 (usually /etc/X11)
Rename sample system.Xwinrc file not to have a X11R6 path in it's name
Add makefile install rule for system.XWinrc
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
commit 34269a90ea2087f883f5dc8805894fc4998e4b81
Author: Yaakov Selkowitz <yselkowitz@users.sourceforge.net>
Date: Tue Feb 2 16:21:44 2010 +0000
Cygwin/X: Update resources file and About dialog
Use the configured vendor web address in the About dialog
Update resources file: rework About dialog, use 'MS Shell Dlg 2'
logical font for all dialogs, add ellipsis to exit option in tray
menu as it (may) trigger another dialog.
Get short vendor name from xwin-config.h, like other configuration
data presented in the About dialog box, rather than creating the
PROJECT_NAME define
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
commit 881812438b430d2856d0494707e028e5f30d6e9a
Author: Colin Harrison <colin.harrison@virgin.net>
Date: Tue Feb 2 16:22:39 2010 +0000
Xming: Use 8 point font for URL in About dialog
Use an 8 point font for URL in About dialog, to match the rest
of the text in that dialog
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
commit c02638fd68440513b6046315547c554a910bd7e2
Author: Colin Harrison <colin.harrison@virgin.net>
Date: Tue Feb 2 16:08:45 2010 +0000
Xming: Add a manifest file
Use manifests to enable XP style controls
(only effective for XP and later and when themes are enabled).
The addition of manifests shouldn't cause compatibility problems with older Windows versions.
Manifest must have execute permissions, otherwise attempts to
execute XWin.exe in the same directory will fail...
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
commit fd8a32baba77aba8d124658a19f4f6eda79e49c6
Author: Jon TURNEY <jon.turney@dronecode.org.uk>
Date: Fri Jun 19 21:14:39 2009 +0100
Cygwin/X: Window placement refinement for multiwindow mode
Window placement refinement for multiwindow mode, ensure a window actually
ends up somewhere visible if it tries to create itself offscreen (which
can happen for e.g. if it has a stored position from a different sized
display)
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
commit 7eb840fd42bc62d88fb4fcf6600546c9ff6e56be
Author: Jon TURNEY <jon.turney@dronecode.org.uk>
Date: Tue Feb 2 15:42:12 2010 +0000
Cygwin/X: Respect the system's ownership of the clipping region
Respect the system's ownership of the clipping region used for shaped windows
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
commit bad41bdfd4a12f0c92fd221bffd9f3c5e40d0fe1
Author: Colin Harrison <colin.harrison@virgin.net>
Date: Mon Feb 1 17:11:22 2010 +0000
Xming: Always update the Windows title Unicode (wide-character) in -multiwindow mode.
Apply the Windows title wide-character in -multiwindow mode. Windows should now
display correct client X Window titles for locales with wide characters.
Copyright (C) Colin Harrison 2005-2008
http://www.straightrunning.com/XmingNotes/
http://sourceforge.net/projects/xming/
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
commit 901c4ebf620579c5bb951a8c003430d967ecf2ff
Author: Julien Cristau <jcristau@debian.org>
Date: Mon Jan 11 00:31:27 2010 +0000
main: move config_init() after InitInput()
With the udev backend, config_init() calls NewInputDeviceRequest(),
which enables devices. They can then start sending events, even though
the event queue is only initialized later in InitInput(). Oops.
Debian bug#564256 <http://bugs.debian.org/564256>
Reported-by: Sedat Dilek <sedat.dilek@googlemail.com>
Signed-off-by: Julien Cristau <jcristau@debian.org>
Tested-by: Sedat Dilek <sedat.dilek@googlemail.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 7f648777680b9dea31c4adb657e205fc6880d98b
Author: Dan Nicholson <dbn.lists@gmail.com>
Date: Thu Jan 14 16:42:16 2010 +1000
Don't use AC_CHECK_FILE for fontpath checks when cross compiling
AC_CHECK_FILE chokes when cross compiling, so instead we set the default
to the standard FONTROOTDIR directories in that case.
Signed-off-by: Dan Nicholson<dbn.lists@gmail.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit db687f718f760ba254ab51994769db101dc9ca3a
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri Jan 15 10:07:38 2010 +1000
xkb: sed True -> TRUE and False -> FALSE
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Dan Nicholson <dbn.lists@gmail.com>
Reviewed-by: Daniel Stone <daniel@fooishbar.org>
commit 0ea2b0bd02f8683998e8b9ebc2b96d606ce45f45
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri Dec 18 20:07:30 2009 +1000
xkb: Add XKM file format description.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Acked-by: Dan Nicholson <dbn.lists@gmail.com>
Reviewed-by: Daniel Stone <daniel@fooishbar.org>
commit 08b22c7faf97217ea4d497eec6624fc3dd916d9b
Author: Oldřich Jedlička <oldium.pro@seznam.cz>
Date: Sun Jan 17 17:59:03 2010 +0100
Allow driver to call DeleteInputDeviceRequest during UnInit
When the input driver (like xf86-input-wacom) removes it's devices
during a call to UnInit, the CloseDownDevices() cannot handle it. The
"next" variable can become a pointer to freed memory.
The patch introduces order-independent device freeing mechanism by
remembering the already freed device ids. The devices can reorder any
time during freeing. No device will be double-freed - if the removing
failed for any reason; some implementations of DeleteInputDeviceRequest
don't free the devices already.
Signed-off-by: Oldřich Jedlička <oldium.pro@seznam.cz>
Reviewed-by: Simon Thum <simon.thum@gmx.de>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit b91cec26de367f75388e620772747b08eee34294
Author: Horst Wente <horst.wente@acm.org>
Date: Wed Dec 30 19:35:20 2009 +0100
xkb: make ctrl+alt+keypad + / ctrl+alt+keypad - work again (#25743)
Video mode switching via keypad keys did not work
Signed-off-by: Horst Wente <horst.wente@acm.org>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 993e78d6c433f65bd8a87890a6bb6da480b2cdc4
Author: Oldřich Jedlička <oldium.pro@seznam.cz>
Date: Tue Jan 12 19:15:06 2010 +0100
Fix typo in updateSlaveDeviceCoords
The index [0] for the second valuator looks bogus; fix it.
Signed-off-by: Oldřich Jedlička <oldium.pro@seznam.cz>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 52456c602c3cdd7d5eac677889a18fad37dfb7ae
Author: Jeremy Huddleston <jeremyhu@apple.com>
Date: Sat Jan 30 14:49:02 2010 -0800
XQuartz: Attatch a stub display when CoreGraphics reports no displays.
This is half of the required changes to address the "stuck mouse pointer"
bug that occurs when X11 launches while the displays are asleep. The
remainder of the fix is part of libXplugin which needs to be updated to
send XP_EVENT_DISPLAY_CHANGED when the display wakes up. If you don't
have a recent enough libXplugin (expected in 2.5.0_beta2 or later), you
can cause this event to be sent by changing your display resolution (or
you could just start X11.app with your screens awake).
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
commit 15f4bb6dc64313ff100aa5444a94c60922a498df
Author: Jeremy Huddleston <jeremyhu@apple.com>
Date: Wed Jan 27 17:12:12 2010 -0800
XQuartz: Dead code removal
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
commit 7ba5de6e9e1e8efda9f79af601fb6269bae841ce
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Sat Jan 30 10:55:38 2010 -0800
XQuartz: Add some .gitignore magic
Signed-off-by: Jeremy Huddleston <jeremyhu@freedesktop.org>
commit 4d575b0559817258f7a0ce6c4d2d0f9e7e5bba63
Author: Robert Morell <rmorell@nvidia.com>
Date: Fri Jan 29 19:07:03 2010 -0800
RENDER: Fix gradient and solid fill pictures with Xinerama, and misc cleanup
If these aren't wrapped, then procs that are wrapped (such as
RenderChangePicture) will fail in Xinerama when they see the resource
type of a picture created through one of these interfaces is PictureType
and not XRT_PICTURE like those allocated via RenderCreatePicture.
Signed-off-by: Robert Morell <rmorell@nvidia.com>
Reviewed-by: Aaron Plattner <aplattner@nvidia.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 8d6b1838330625b758ebc55bb0df1b425c5cefaf
Author: Robert Morell <rmorell@nvidia.com>
Date: Thu Jan 21 12:38:47 2010 -0800
Render: Fix request size verification
RenderSetPictureClipRectangles and the Xinerama version of
RenderChangePicture were using the wrong structure types for request
size verification.
Signed-off-by: Robert Morell <rmorell@nvidia.com>
Reviewed-by: Aaron Plattner <aplattner@nvidia.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 5e81078cf56aabbf6551d96d312c7840ba9370ae
Author: Tiago Vignatti <tiago.vignatti@nokia.com>
Date: Mon Jan 18 14:31:12 2010 +0200
xfree86: vgaarb: remove useless debug
This is RAC's remnant. Any sane person would use a more wise method of
debugging instead.
X.Org Bug 26074 <http://bugs.freedesktop.org/show_bug.cgi?id=26074>
Signed-off-by: Tiago Vignatti <tiago.vignatti@nokia.com>
Reviewed-by: Keith Packard <keithp@keithp.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit e38df06772965cd5099646f1e7032b7c944d16ed
Author: Aaron Plattner <aplattner@nvidia.com>
Date: Thu Jan 28 14:33:25 2010 -0800
DRI2: Bump the dri2 module version to 1.2.0 to reflect recent API changes.
Signed-off-by: Aaron Plattner <aplattner@nvidia.com>
Acked-by: Jesse Barnes <jbarnes@virtuousgeek.org>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 60b6477f6dc005a1b052be8c5e5a549550a4aa88
Author: Tiago Vignatti <tiago.vignatti@nokia.com>
Date: Thu Jan 14 17:18:28 2010 +0200
dix/configure: remove null root cursor option
The default behavior of the server is to start with an invisible root cursor.
Be such cursor invisible or inexistent (null), in the end it doesn't matter -
for the user. The content on screen will be the same. Besides, there's no
difference, in terms of performance, whether such cursor is invisible or
simply null. The paths that both take inside the server are roughly the same.
Therefore create a null root cursor becomes irrelevant.
Signed-off-by: Tiago Vignatti <tiago.vignatti@nokia.com>
Acked-by: Peter Hutterer <peter.hutterer@who-t.net>
Acked-by: Daniel Stone <daniel@fooishbar.org>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit b4baab90c0d98bef98d485682d4a69a327a380d6
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri Jan 8 15:18:41 2010 +1000
dix: EventToCore needs to copy the root window too.
This value isn't actually set for normal events but it saves us some work
for the record extension support.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Keith Packard <keithp@keithp.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 27fc98ecfed99fefd5c14388b4c6242f87281895
Author: Keith Packard <keithp@keithp.com>
Date: Wed Jan 27 14:37:32 2010 -0800
Revert "dix: EventToCore needs to copy the root window too."
This reverts commit 0f2d297dedeff8bd227df4c498cc668b0e902344.
Peter provided an updated patch which fixes the tests.
commit 711e26466ae04ae93ff4c48d377d83d68a6320e9
Author: Jesse Barnes <jbarnes@virtuousgeek.org>
Date: Mon Jan 25 09:21:51 2010 -0800
DRI2: handle drawable destruction properly at DRI2SwapComplete time
Simon reported an issue with kwin that turned out to be a general problem. If
a drawable goes away before its swap completes, we'll try to free it up.
However, we free it improperly, which causes a server crash in
DRI2DestroyDrawable. Fix that up by splitting the free code out and calling
it from DRI2SwapComplete.
Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>
Reviewed-by: Michel Dänzer <michel@daenzer.net>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit b68f0204a2e4fa9d8884cbdd84b6a5df21d6b36e
Author: Jesse Barnes <jbarnes@virtuousgeek.org>
Date: Wed Jan 27 09:10:41 2010 -0800
xserver: require libdri 7.8.0 to build
We depend on new DRI interfaces now, so require them in configure.ac.
Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 003829072853546abd973266fe9b24d803f4f5cb
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Tue Jan 26 22:25:04 2010 -0800
Avoid segfaults in XF86VidMode GammaRamp functions if randr_crtc is NULL
Fixes crash when xscreensaver tries to use GammaRamp calls to fade out
http://bugs.opensolaris.org/bugdatabase/view_bug.do?bug_id=6915712
Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
Reviewed-by: Keith Packard <keithp@keithp.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 19d03d4f49e08442f58cf02240e3e6bab04633d2
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Tue Jan 26 20:15:49 2010 -0500
doc: finish the removal of SecurityPolicy file man pages
The variable was unassigned but all the code was left in.
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
Reviewed-by: Alan Coopersmith <alan.coopersmith@sun.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 7962c8f78964d460c76f76dda2795b971a8c2a94
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Tue Jan 26 20:02:13 2010 -0500
man: add missing __datadir__ for Xserver XWin man pages
The man pages display __datadir__/fonts/X11/... because __datadir__
is missing in cpprules.in. Problem was introduced in commit:
b54bc14ce0ae38c4863794bc3096ca86cdb23908
when replacing __projectroot__ in the previous font path.
Reviewed-by: Alan Coopersmith <alan.coopersmith@sun.com>
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit d2322b6309bf15a45002b42e7e6ba3d6b5bfa932
Author: Kok, Auke <auke-jan.h.kok@intel.com>
Date: Wed Jan 27 11:34:45 2010 -0800
xserver: Add timestamps to logfile output.
Add timestamps in seconds derived from clock_monotonic to the log
file.
Signed-off-by: Auke Kok <auke-jan.h.kok@intel.com>
Reviewed-by: Keith Packard <keithp@keithp.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 0b21a0416b4cb2c32da5e3fda05a0682eb97d56e
Merge: 1e6fd65d0b 837bd2bbc0
Author: Keith Packard <keithp@keithp.com>
Date: Wed Jan 27 14:14:15 2010 -0800
Merge remote branch 'alanc/master'
commit 1e6fd65d0b95260253828678131885a4ec21c594
Author: Michael Vogt <mvo@ubuntu.com>
Date: Mon Jan 25 18:41:20 2010 +0100
xfree86/modes: only call gamma_set if its non NULL
I ran accross a crash with xf86-video-nv-2.1.15 [1] and xserver
1.7.3.901. It looks like the problem is that gamma_set is called even
if that is NULL.
[1] https://launchpad.net/bugs/494627
Reviewed-By: Matthias Hopf <mhopf@suse.de>
Signed-off-by: Julien Cristau <jcristau@debian.org>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 0688dca044f966abc3da667f6d4e79e7cf47f996
Author: Eric Anholt <eric@anholt.net>
Date: Thu Jan 21 10:31:04 2010 -0800
dri2: Fix order of operations issue in __glXdriSwapEvent test.
Clients would have received swap events regardless of asking for it.
Signed-off-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Keith Packard <keithp@keithp.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit a6bd5d2e482a5aa84acb3d4932e2a166d8670ef1
Author: Pierre-Loup A. Griffais <pgriffais@nvidia.com>
Date: Wed Jan 27 14:03:03 2010 -0800
Fix source pictures getting random transforms after 2d6a8f668342a5190cdf43b5.
*xoff and *yoff were uninitialized for source-only pictures.x
Signed-off-by: Pierre-Loup A. Griffais <pgriffais@nvidia.com>
Reviewed-by: Aaron Plattner <aplattner@nvidia.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit c3395158678aaab9dca5fc6a812cbe715ddc0e1a
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Fri Jan 15 14:13:18 2010 -0500
packaging: provide a default README file #24206
All modules should have a README file.
The bottom URL section is found in all X.Org README files.
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit f311f2d047120fb816897444d2101465ff5189db
Author: Aaron Plattner <aplattner@nvidia.com>
Date: Wed Jan 13 11:35:52 2010 -0800
DRI2: Allow multiple driver names.
Each driver type (e.g. DRI2DriverDRI or DRI2DriverVDPAU) can have a name in the
driverNames array in DRI2InfoRec. DRI2Connect returns the name for the driver
specified by driverType. Also print names of supported drivers in
DRI2ScreenInit.
Signed-off-by: Aaron Plattner <aplattner@nvidia.com>
Reviewed-by: Kristian Høgsberg <krh@bitplanet.net>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit f57bc0ede8e018c7e264b917927c42a018cd1d5a
Author: Christian Zander <chzander@nvidia.com>
Date: Mon Jan 11 12:29:07 2010 -0800
x86emu: Respect the LEA 67h address size prefix.
Signed-off-by: Christian Zander <chzander@nvidia.com>
Signed-off-by: Aaron Plattner <aplattner@nvidia.com>
Tested-by: Tiago Vignatti <tiago.vignatti@nokia.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 837bd2bbc02b893f96861b48c1f02b7b8e7e3e48
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Fri Oct 16 22:32:15 2009 -0700
Remove unbalanced ( from failure to move log error
Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
Reviewed-by: Dan Nicholson <dbn.lists@gmail.com>
commit 138d4c1670ebab435bf00627c97098a3a54b81a6
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Sat Jan 16 21:03:00 2010 -0800
glx: Sun compilers now support some gcc __attribute__ values
Sun cc 5.9 and later (__SUNPRO_C >= 0x590) support __attribute__
calls for aligned, always_inline, noinline, pure, const, and malloc.
This commit consists of the related updates to files that were
regenerated by gl_XML.py in mesa after adding the __SUNPRO_C checks to it
Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
Signed-off-by: Brian Paul <brianp@vmware.com>
commit 79e7b0b875634d0f9e1a95232a4e38adf617bc14
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Sat Jan 16 10:45:32 2010 -0800
Only enable kdrive input drivers on Linux by default
Fixes build on non-Linux platforms by restoring the defaults to
where they were before commit 6c2b3a4247d10a50699ffa6abb643c5e959eefa8,
to only enable the Linux kbd, mouse & evdev drivers when building
on Linux platforms.
Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
Reviewed-by: Mikhail Gusarov <dottedmag@dottedmag.net>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 39ab474197bdad7d8e9ef496df2d61cbea39d370
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Tue Dec 15 19:07:38 2009 -0800
Move OS-specific VT key handler code from common to os-support
Adds new function xf86Activate to the OS-specific *VTsw*.c files
and calls it from xf86ProcessActionEvent
Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
Tested-by: Tiago Vignatti <tiago.vignatti@nokia.com> (GNU/Linux)
commit 15ca3312c069526b7f2207de9dfb9b9e851caf95
Author: Aaron Zang <Aaron.Zang@Sun.COM>
Date: Mon Dec 14 17:55:46 2009 -0800
Solaris: Avoid switching to inactive VT's
Fix for OpenSolaris bug 6876992: "[vconsole] Ctrl+Alt+F12 switchs to blank
console screen with hotkeys property turned-off"
http://bugs.opensolaris.org/bugdatabase/view_bug.do?bug_id=6876992
Xorg needs to do sanity test for the VT it is commanded to switch to.
If the VT is not opened by any process, discard the switching request.
The changes also contain the fix for some flaws discovered when
getting the new gdm to run.
Signed-off-by: Aaron Zang <Aaron.Zang@Sun.COM>
Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
commit 2984c18eb994696927a7f3b94d86fd47907334a0
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Thu Jan 21 14:21:07 2010 -0500
config: replace custom code with reusable macro XORG_WITH_DOXYGEN
XORG_WITH_DOXYGEN provides additional functions like a configure
option which allow platform builders to control the usage of
the doxygen program.
This is a requirement from platforms that do not have such doc tool.
A platform with a back level doxygen may use --without-doxygen
to get the rest of the documentation built.
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit d9c20ee4191de7276a08288adffc24dff48aff8f
Author: Tiago Vignatti <tiago.vignatti@nokia.com>
Date: Fri Jan 15 19:34:29 2010 +0200
dix: move cursor realize code to its own function
The semantic remains, only code was moved: reuse chunk of code to realize
cursor on both AllocARGBCursor and AllocGlyphCursor.
Signed-off-by: Tiago Vignatti <tiago.vignatti@nokia.com>
Reviewed-by: Keith Packard <keithp@keithp.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit f818f222362c93bcc859d997d96d8f3b447729f4
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri Jan 15 15:32:19 2010 +1000
xkb: unexport xkbDevicePrivateKey and xkbUnwrapProc.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Dan Nicholson <dbn.lists@gmail.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 6850ea8fb95417db9ce3a70fc17f90d6fdea1389
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri Jan 15 15:32:16 2010 +1000
xfree86: replace True/False with TRUE/FALSE.
xf86Xinput.c relied on xkbsrv.h's definition of True/False which seems odd
at first and weird on second glance.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Dan Nicholson <dbn.lists@gmail.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 64b1372c15c3ede2696346e153bca9bd89016a20
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri Jan 15 15:32:15 2010 +1000
xkb: remove unused _XkbIsPressEvent and _XkbIsReleaseEvent defines
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Dan Nicholson <dbn.lists@gmail.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit c8bba14a390fe3fa16027e6b2433a314b3ea00c3
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri Jan 15 15:32:13 2010 +1000
xkb: remove XkbAtomGetString, replace with NameForAtom.
XKB really XKBdoes not XKBneed its own XKBdefines for XKBeverything.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Fernando Carrijo <fcarrijo@yahoo.com.br>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit f37799c9712afb7769f369162b904d9ea2dbd608
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri Jan 15 15:32:12 2010 +1000
xkb: remove IsKeypadKey define, only used in two places.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Fernando Carrijo <fcarrijo@yahoo.com.br>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit c8076f317ee5044ed3cc21b097f8b1741af8e0f1
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri Jan 15 15:32:11 2010 +1000
xkb: remove XConvertCase.
Since it's typedef'd to XkbConvertCase anyway and the headers are now split
from the client headers, simply get rid of it altogether.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Keith Packard <keithp@keithp.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit d627dd9d1ef436b01f0581e40a6736ffc6b5d2c8
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri Jan 15 15:32:10 2010 +1000
xkb: remove _XkbClearElems, a memset will do.
Bonus point - it's easier to understand what's actually being done with the
memory.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Fernando Carrijo <fcarrijo@yahoo.com.br>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit ea1de3fcdc40d2060bb6d13775005eadd624e767
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri Jan 15 15:32:09 2010 +1000
xkb: remove _XkbTyped*alloc
Please no extension-specific macros for memory allocation.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Dan Nicholson <dbn.lists@gmail.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 0f2d297dedeff8bd227df4c498cc668b0e902344
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Tue Jan 5 16:31:37 2010 +1000
dix: EventToCore needs to copy the root window too.
This value isn't actually set for normal events but it saves us some work
for the record extension support.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Keith Packard <keithp@keithp.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 6f6a99abc12ddee82898fdabfb50c17e90e094b9
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Wed Jan 13 14:39:54 2010 -0800
XQuartz: Don't FatalError in x_hook_run if the list is empty
Signed-off-by: Jeremy Huddleston <jeremyhu@freedesktop.org>
commit 6bde306f7f6b9bbabeaa8bb910ea549be906cd8b
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Wed Jan 13 11:20:29 2010 -0800
XQuartz: Update copyright in bundle for 2010
Signed-off-by: Jeremy Huddleston <jeremyhu@freedesktop.org>
commit 6008cc116493cb2825ad0bda0b407b7aefabb3f4
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Mon Jan 11 18:02:55 2010 -0800
XQuartz: Setup the modifier map in the quartz thread
This avoids possible doing it twice which could result in incorrect
keycodes for alt due to our loss of information about its side.
Signed-off-by: Jeremy Huddleston <jeremyhu@freedesktop.org>
commit 44f9c3d16c9c9b3362306a9ba26ee52e7baafeca
Merge: 032f97808c 84956ca43b
Author: Keith Packard <keithp@keithp.com>
Date: Wed Jan 13 10:19:21 2010 -0800
Merge remote branch 'jbarnes/master'
commit 84956ca43b087600d9db297cffd62e960c516d9e
Author: Jesse Barnes <jbarnes@virtuousgeek.org>
Date: Mon Jan 11 14:56:24 2010 -0500
GLX/DRI2: add INTEL_swap_event support
This allows clients to easily check for swap completion status in their
main loop.
Reviewed-by: Kristian Høgsberg <krh@bitplanet.net>
Reviewed-by: Adam Jackson <ajax@nwnk.net>
Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>
commit 04a54f69a8085ab3fe11a8713bd8b6b16ed1db27
Author: Jesse Barnes <jbarnes@virtuousgeek.org>
Date: Thu Jul 16 09:01:17 2009 -0400
DRI2: add support for new DRI2 protocol requests
Support the new DRI2 2.2 protocol requests: DRI2SwapBuffers, DRI2GetMSC,
DRI2WaitMSC, DRI2WaitSBC and DRI2SwapInterval.
These requests allow the server to support the SGI_video_sync,
SGI_swap_interval, and OML_sync_control GLX extensions if DDX support is
present. The new DDX APIs are documented in dri2.h.
Reviewed-by: Kristian Høgsberg <krh@bitplanet.net>
Reviewed-by: Adam Jackson <ajax@nwnk.net>
Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>
commit 032f97808c65771a07bac748212cf6457a5d1660
Author: Simon Thum <simon.thum@gmx.de>
Date: Wed Jan 6 17:32:24 2010 +0100
xfree86: init pointer feedback controls from options
With InputClass support, it makes more sense to cover all
aspects of acceleration in options. Previously, one could only set the
default on the command line.
Signed-off-by: Simon Thum <simon.thum@gmx.de>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 0722c287a4c8a6cdedca9756192547bfcf77ade5
Author: Simon Thum <simon.thum@gmx.de>
Date: Wed Jan 6 19:43:59 2010 +0100
xfree86: document pointer acceleration in xorg.conf.man
Signed-off-by: Simon Thum <simon.thum@gmx.de>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Fernando Carrijo <fcarrijo@yahoo.com.br>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 1aca2d757534879eb55faaee421cb972a9546712
Author: Simon Thum <simon.thum@gmx.de>
Date: Wed Jan 6 19:13:36 2010 +0100
whitespace fixes
Signed-off-by: Simon Thum <simon.thum@gmx.de>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 14039b5a7982fbf8130501bb00766176a4e9bccb
Author: Simon Thum <simon.thum@gmx.de>
Date: Wed Jan 6 18:16:20 2010 +0100
doc: actually document SendDragEvents
Signed-off-by: Simon Thum <simon.thum@gmx.de>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 14e4e4a294e648e0bdcb70c34748e1b81c5bb64f
Author: Simon Thum <simon.thum@gmx.de>
Date: Wed Jan 6 18:13:27 2010 +0100
os: state effect of -a and -t options more precisely
Signed-off-by: Simon Thum <simon.thum@gmx.de>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit d727ddb91a549d23f6bf323e91db4b8916c1b7a0
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Sat Jan 9 16:28:32 2010 -0500
kdrive: klinux.h breaks make dist
This file is no longer part of the source code
and must be removed from distribution.
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
Reviewed-by: Mikhail Gusarov <dottedmag@dottedmag.net>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 6313d2da6c6910827d68cf31fe00b46a34c5bfc7
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Fri Jan 8 19:04:25 2010 -0500
configure: use backticks rather than $() for commands
This patch to xserver configure.ac is to increase code portability to
non POSIX system by using backticks rather than $() for command
substitution for BUILD_DATE and BUILD_TIME.
Reviewed-by: Rémi Cardona <remi@gentoo.org>
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 74ab27f64a747ee45810f99cdc6e29b82cf8035e
Author: Tiago Vignatti <tiago.vignatti@nokia.com>
Date: Mon Dec 28 18:00:28 2009 +0200
Revert "Make sys.c use unaligned access functions provided in compiler."
This reverts commit da923d0bc15e99a8ed1986bd6f5df37f7af7284b.
Signed-off-by: Tiago Vignatti <tiago.vignatti@nokia.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 6a2a57832709798d99d19ff4c587e22f3b3c150d
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Thu Jan 7 15:23:34 2010 -0500
macros: use PKG_CONFIG variable rather than executable name
User can defined alternate location for pkg-config.
Once option in place, all instances of pkg-config must be converted.
Acked-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Dan Nicholson <dbn.lists@gmail.com>
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 1b3132f5e981b3398e08263742332cc966bebc07
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Thu Jan 7 14:12:34 2010 -0500
xwin: ignore intermediate .man file
Only detectable on a Cygwin build
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 8ab4749aaefb3727b9fc58bb37b50a2d07eb1531
Merge: 8d53d84485 9437504b21
Author: Keith Packard <keithp@keithp.com>
Date: Thu Jan 7 10:32:21 2010 -0800
Merge remote branch 'dottedmag/for-keithp'
commit 8d53d84485fdce8ea9686e6f300a69f7ddebd467
Author: Adam Tkac <atkac@redhat.com>
Date: Thu Jan 7 15:34:52 2010 +0100
Do not define members of include/eventstr.h:EventType enum conditionally.
Main problem is that EventType enumeration members can be different in
module and in server, which obviously causes problems.
Signed-off-by: Adam Tkac <atkac@redhat.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 9437504b21dfdb509ab8b3a00f64403e1e4026dd
Author: Mikhail Gusarov <dottedmag@dottedmag.net>
Date: Mon Jan 4 05:42:02 2010 +0600
kdrive: Remove unused kdNoopOps external variable declaration
Reviewed-by: Adam Jackson <ajax@redhat.com>
Reviewed-by: Daniel Stone <daniel@fooishbar.org>
Signed-off-by: Mikhail Gusarov <dottedmag@dottedmag.net>
commit aa6e0936be15488455e6a4236806a58496da2979
Author: Mikhail Gusarov <dottedmag@dottedmag.net>
Date: Mon Jan 4 05:30:22 2010 +0600
kdrive: Remove unused kmap.c
Reviewed-by: Adam Jackson <ajax@redhat.com>
Reviewed-by: Daniel Stone <daniel@fooishbar.org>
Signed-off-by: Mikhail Gusarov <dottedmag@dottedmag.net>
commit f78ac5c6e273f575af29746e08e7c182ff7b93b3
Author: Mikhail Gusarov <dottedmag@dottedmag.net>
Date: Mon Jan 4 02:36:30 2010 +0600
kdrive: Make internal functions static
Reviewed-by: Adam Jackson <ajax@redhat.com>
Reviewed-by: Daniel Stone <daniel@fooishbar.org>
Signed-off-by: Mikhail Gusarov <dottedmag@dottedmag.net>
commit 37a8ddc0dbf3fb7f059b689038979bace206dccf
Author: Mikhail Gusarov <dottedmag@dottedmag.net>
Date: Mon Jan 4 02:28:37 2010 +0600
kdrive: Remove unused 'k' variable
Reviewed-by: Adam Jackson <ajax@redhat.com>
Reviewed-by: Daniel Stone <daniel@fooishbar.org>
Signed-off-by: Mikhail Gusarov <dottedmag@dottedmag.net>
commit af1f1a05e1aa9ec921f1288818a66766c301f8b0
Author: Mikhail Gusarov <dottedmag@dottedmag.net>
Date: Mon Jan 4 01:50:04 2010 +0600
kdrive: Remove bus mouse driver
Bus mice aren't used anymore, do not keep dead code around.
Reviewed-by: Adam Jackson <ajax@redhat.com>
Reviewed-by: Daniel Stone <daniel@fooishbar.org>
Signed-off-by: Mikhail Gusarov <dottedmag@dottedmag.net>
commit a3cc3af186b55ac80abd6859ffe491f4ae936596
Author: Mikhail Gusarov <dottedmag@dottedmag.net>
Date: Sat Jan 2 23:31:28 2010 +0600
kdrive: Adjust kdrive usage message as shadow overlay support has been dropped
Reviewed-by: Adam Jackson <ajax@redhat.com>
Reviewed-by: Daniel Stone <daniel@fooishbar.org>
Signed-off-by: Mikhail Gusarov <dottedmag@dottedmag.net>
commit c40b9f959175057fac726fcdfff9641ae0681cf6
Author: Mikhail Gusarov <dottedmag@dottedmag.net>
Date: Mon Jan 4 14:07:37 2010 +0600
kdrive: Remove unused VxWorks* variable declarations
Reviewed-by: Adam Jackson <ajax@redhat.com>
Reviewed-by: Daniel Stone <daniel@fooishbar.org>
Signed-off-by: Mikhail Gusarov <dottedmag@dottedmag.net>
commit 4e0d580d5ac00d8d87c8e0080a02868c87a31caa
Author: Mikhail Gusarov <dottedmag@dottedmag.net>
Date: Sat Jan 2 15:04:03 2010 +0600
kdrive: Remove unused KdCardInfo::lastMarker field
Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Mikhail Gusarov <dottedmag@dottedmag.net>
commit dbaab9759ba31edf63cf73eda86ba931d88e8cce
Author: Mikhail Gusarov <dottedmag@dottedmag.net>
Date: Sat Jan 2 16:18:29 2010 +0600
kdrive: Extract common part of fbdevPutColors and fbdevEnable
Put framebuffer colormap updating code in separate function
for brevity.
Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Mikhail Gusarov <dottedmag@dottedmag.net>
commit 7ee14154b230b931d294288e1291c4fc617b1354
Author: Mikhail Gusarov <dottedmag@dottedmag.net>
Date: Sat Jan 2 15:42:53 2010 +0600
kdrive: Remove unused overlay fb support
Xfbdev, Xephyr and Xfake all use only one framebuffer, so simplify
implementation by removing overlay support.
Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Mikhail Gusarov <dottedmag@dottedmag.net>
commit 730f7d1c4fae8ca582a4a9998a4dc4b325f98896
Author: Mikhail Gusarov <dottedmag@dottedmag.net>
Date: Sat Jan 2 15:06:18 2010 +0600
kdrive: Remove unused KD_MAX_CARD_ADDRESS macro
Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Mikhail Gusarov <dottedmag@dottedmag.net>
commit 5337ddcfd9dc2a5b823da39df7adaad6692214f0
Author: Mikhail Gusarov <dottedmag@dottedmag.net>
Date: Sat Jan 2 14:59:07 2010 +0600
kdrive: Move Xephyr-specific fields out of KdScreenInfo
memory_base, memory_size, off_screen_base fields in
KdScreenInfo are used only by fake EXA in Xephyr. Move
them into Xephyr, cleanup Xfake and Xfbdev.
Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Mikhail Gusarov <dottedmag@dottedmag.net>
commit 62883b499b72f678ab055de4d0370227ae441370
Author: Mikhail Gusarov <dottedmag@dottedmag.net>
Date: Sat Jan 2 13:17:21 2010 +0600
kdrive: Remove unused KdCardAttr from KdCardInfo
Card attrs are unused in all current kdrive servers, so
remove it completely to avoid allocating and passing dummy
values to KdCardInfoAdd.
Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Mikhail Gusarov <dottedmag@dottedmag.net>
commit 6c2b3a4247d10a50699ffa6abb643c5e959eefa8
Author: Mikhail Gusarov <dottedmag@dottedmag.net>
Date: Mon Jan 4 14:07:04 2010 +0600
kdrive: Add option to compile out input drivers
Add --without-kdrive-{kbd,mouse,evdev} configure options disabling
Linux keyboard driver, Linux mouse drivers (ps2, bus,ms),
and Linux evdev driver.
Build all drivers by default as before.
Acked-by: Dan Nicholson <dbn.lists@gmail.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Mikhail Gusarov <dottedmag@dottedmag.net>
commit 72ba717b1d639e94fa9ab56ca026131edc020a30
Author: Mikhail Gusarov <dottedmag@dottedmag.net>
Date: Sat Jan 2 15:03:24 2010 +0600
kdrive: Remove unused KdCardInfo::needSync field
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Mikhail Gusarov <dottedmag@dottedmag.net>
commit d21b41cdb5e89eb428f36b19e965f0ab49e051d9
Author: Mikhail Gusarov <dottedmag@dottedmag.net>
Date: Sat Jan 2 13:21:25 2010 +0600
kdrive: Remove .gitignore left from SDL server
SDL server is gone, no need to keep its .gitignore anymore.
Reviewed-by: Gaetan Nadon <memsize@videotron.ca>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Mikhail Gusarov <dottedmag@dottedmag.net>
commit 6f265d55a61f9be323583b8acacae783be72bda9
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Tue Jan 5 13:15:25 2010 +1000
dix: don't update the slave coordinates from the VCK.
A keyboard event from a device with both valuators and keys will be posted
through the VCK. In this case, do not update the slave device coordinates
from the VCK - they're always 0/0. Leave them as-is, for the next pointer
event will continue where it left.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Keith Packard <keithp@keithp.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 326429badfc76885e4652ddc72860810c0e8d102
Author: Adam Jackson <ajax@redhat.com>
Date: Tue Nov 10 14:56:36 2009 -0500
modes: Remove the ClockRanges type
ba2d39dd5428cb5922b797a1d4ea45b859412b40 introduced warnings:
xf86Mode.c: In function ‘xf86CheckModeForDriver’:
xf86Mode.c:986: warning: passing argument 1 of ‘modeInClockRange’ from incompatible pointer type
xf86Mode.c:253: note: expected ‘ClockRangePtr’ but argument is of type ‘ClockRangesPtr’
xf86Mode.c:1002: warning: passing argument 1 of ‘modeInClockRange’ from incompatible pointer type
xf86Mode.c:253: note: expected ‘ClockRangePtr’ but argument is of type ‘ClockRangesPtr’
Because I foolishly didn't notice that we had types with nearly
identical members named ClockRange and ClockRanges. The latter
contained an extra 'strategy' member at the end, which claimed to be
needed by the vidmode extension. Of course, this was a lie: the only time
we'd use it was in mode validation, for drivers using LOOKUP_CLKDIV2 with
non-programmable clocks. The only driver using LOOKUP_CLKDIV2 is
rendition, which has a programmable clock. The only driver using the
ClockRanges type was smi, which did not use it for its 'strategy' member,
so has been fixed to use ClockRange instead.
Signed-off-by: Adam Jackson <ajax@redhat.com>
Reviewed-by: Keith Packard <keithp@keithp.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 13c8bd3fde3b0831921e59f84936022a16379d63
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Mon Jan 4 18:21:54 2010 -0800
CloseDevice: call XkbRemoveResourceClient before freeing key class struct
XkbRemoveResourceClient() returns immediately if dev->key is NULL.
CloseDevice calls XkbRemoveResourceClient until it removes all resources.
If we free dev->key and NULL it before XkbRemoveResourceClient, then
infinite loop ensues, and the server appears to hang on exit or crash.
Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Daniel Stone <daniel@fooishbar.org>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit e707612e9de4e5e1d91dc1a8152810912d7e18bb
Author: Michel Dänzer <daenzer@vmware.com>
Date: Mon Jan 4 09:07:48 2010 +0100
EXA: Restore migration call in exaDoPutImage().
Turns out this is still necessary if the driver PrepareAccess hook succeeds.
Signed-off-by: Michel Dänzer <daenzer@vmware.com>
Tested-by: Maarten Maathuis <madman2003@gmail.com>
Tested-by: Andrew Chant <andrew.chant+debian@gmail.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit e10072b7c74a6f5e24f6dfa37e73688d1f3425e3
Author: Mikhail Gusarov <dottedmag@dottedmag.net>
Date: Sat Jan 2 05:43:28 2010 +0600
Add Xephyr.man to .gitignore
Signed-off-by: Mikhail Gusarov <dottedmag@dottedmag.net>
Reviewed-by: Gaetan Nadon <memsize@videotron.ca>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit fb26cb793c6eba189050662c566f7ea0559bd486
Author: Mikhail Gusarov <dottedmag@dottedmag.net>
Date: Sat Jan 2 05:43:27 2010 +0600
Remove unused pShadow field from drivers' private structures
Signed-off-by: Mikhail Gusarov <dottedmag@dottedmag.net>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 2c85d72fc7bd013af327321ad5d626dc73c3caf0
Author: Mikhail Gusarov <dottedmag@dottedmag.net>
Date: Sat Jan 2 05:43:26 2010 +0600
Do not check xfree argument for NULL
xfree itself checks for NULL, and even this is not necessary
as passing NULL to free(3) is safe.
Signed-off-by: Mikhail Gusarov <dottedmag@dottedmag.net>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 15bc35c6e44c65812de5c3e85ec8bbf78b032ded
Author: Mikhail Gusarov <dottedmag@dottedmag.net>
Date: Sat Jan 2 05:43:25 2010 +0600
Remove trailing whitespace
Signed-off-by: Mikhail Gusarov <dottedmag@dottedmag.net>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 1763550d0181ac1c775b9ddf490114eff2fbe67e
Author: Simon Thum <simon.thum@gmx.de>
Date: Fri Jan 1 19:58:05 2010 +0100
dix: add smooth limited pointer acceleration profile
This profile is inspired by the accel code removed from the wacom driver.
It ascends from zero to acceleration, maxing out at threshold. This means you
can control the slope using threshold, which wasn't possible in wacom.
For sanity's sake, threshold should grow with acceleration.
Works best with adaptive deceleration, since otherwise it only generates
acceleration above 1, causing seldom pixel skips.
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 435f27667f84269768efecde34de4af2b2d43376
Author: Julien Cristau <jcristau@debian.org>
Date: Sun Sep 27 14:45:47 2009 +0200
config: add libudev input-hotplug backend
Add a backend using libudev for input hotplug, and disable the hal and
dbus backends if this one is enabled.
XKB configuration happens using xkb{rules,model,layout,variant,options}
properties (case-insensitive) on the device. We fill in InputAttributes
to allow configuration through InputClass in Xorg.
Requires udev 148 for the input_id helper and ID_INPUT* properties.
Signed-off-by: Julien Cristau <jcristau@debian.org>
Acked-by: Dan Nicholson <dbn.lists@gmail.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
commit b8b12e41c453c3bf94b11e7a18934d3b6e1869bf
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Wed Dec 23 16:05:16 2009 +1000
xfree86: move sanity checks below option and input classes merges.
While the identifier is likely set before the input classes are merged, the
driver may not be. Hence don't check for a driver before we've completed
configuration for this device.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Dan Nicholson <dbn.lists@gmail.com>
Signed-off-by: Julien Cristau <jcristau@debian.org>
commit 9fad8f06fb89ac2ae05bea0fa24cab3df7677297
Merge: 871bbe1d87 42e8c9224e
Author: Keith Packard <keithp@keithp.com>
Date: Wed Dec 30 09:28:19 2009 -0800
Merge remote branch 'dbn/inputclass'
commit 871bbe1d87fa3c7ebd075e1d1eec33e45b08493d
Merge: db2c6f7c91 e1165632bd
Author: Keith Packard <keithp@keithp.com>
Date: Wed Dec 30 09:16:45 2009 -0800
Merge remote branch 'dbn/xorg.conf.d'
commit db2c6f7c91289b5d49978974093a1002b3b53a56
Author: Michel Dänzer <daenzer@vmware.com>
Date: Tue Dec 29 15:48:44 2009 +0100
EXA: Don't use UTS/DFS directly for Put/GetImage when there's a system copy.
We want to save the result in the system memory copy, in case we'll need it
again for subsequent software fallbacks.
Signed-off-by: Michel Dänzer <daenzer@vmware.com>
Acked-By: Maarten Maathuis <madman2003@gmail.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit f28ca728e90ccbb901e8e7215a842525d8e786d3
Author: Thomas Hellstrom <thellstrom@vmware.com>
Date: Tue Dec 29 12:51:30 2009 +0100
EXA: Restrict the regions that need to be migrated for composite fallback for src / mask pictures.
[ Michel: Minor fixups to address compiler warnings ]
Signed-off-by: Thomas Hellstrom <thellstrom@vmware.com>
Signed-off-by: Michel Dänzer <daenzer@vmware.com>
Acked-by: Maarten Maathuis <madman2003@gmail.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 0c1f43c0f3e888172f11f62a2f208af70e0183cc
Author: Michel Dänzer <daenzer@vmware.com>
Date: Tue Dec 29 12:51:29 2009 +0100
EXA/mixed: Handle results of software fallbacks in DamageReport hook.
This is more elegant and probably also slightly more correct than doing it
at FinishAccess time.
Signed-off-by: Michel Dänzer <daenzer@vmware.com>
Acked-by: Maarten Maathuis <madman2003@gmail.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 08bf26c28fc8147b64f2fe8345b9581e0101571c
Author: Michel Dänzer <daenzer@vmware.com>
Date: Tue Dec 29 12:51:28 2009 +0100
EXA: Fix migration avoidance for 1x1 pixmaps.
Signed-off-by: Michel Dänzer <daenzer@vmware.com>
Acked-by: Maarten Maathuis <madman2003@gmail.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 0bd8f0cd7f3823ee17ae8c88fd3e004bfff9982d
Author: Michel Dänzer <daenzer@vmware.com>
Date: Tue Dec 29 12:51:27 2009 +0100
EXA/classic: Fix crash with migration heuristic "smart".
Signed-off-by: Michel Dänzer <daenzer@vmware.com>
Acked-by: Maarten Maathuis <madman2003@gmail.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 40453bf7718f1c3d672b87e9d84991032cbef859
Author: Thomas Hellstrom <thellstrom@vmware.com>
Date: Tue Dec 29 09:34:44 2009 +0100
EXA: Limit src prepareAccess regions for a number of unaccelerated operations.
When we can trivially calculate the affected source regions,
do that before calling region bounded prepareAccess.
[ Michel: Minor fixups to address compiler warnings ]
Signed-off-by: Thomas Hellstrom <thellstrom@vmware.com>
Signed-off-by: Michel Dänzer <daenzer@vmware.com>
Acked-by: Maarten Maathuis <madman2003@gmail.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit aa9ce8ab343d51a67924757c5a43c9572248bb24
Author: Michel Dänzer <daenzer@vmware.com>
Date: Tue Dec 29 09:34:43 2009 +0100
EXA: Use relevant source region to minimize migration on CopyWindow fallbacks.
Signed-off-by: Michel Dänzer <daenzer@vmware.com>
Acked-by: Maarten Maathuis <madman2003@gmail.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 39cc110caa1f6481a7213ae39f82669333ec1645
Author: Thomas Hellstrom <thellstrom@vmware.com>
Date: Tue Dec 29 09:34:42 2009 +0100
EXA: Fix bugs in exaGetImage / ExaCheckGetImage migration.
Signed-off-by: Thomas Hellstrom <thellstrom@vmware.com>
Acked-by: Michel Dänzer <michel@daenzer.net>
Acked-by: Maarten Maathuis <madman2003@gmail.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit d42f3960514f1c410863ac6c09c5638b5ddeae20
Author: Michel Dänzer <daenzer@vmware.com>
Date: Mon Dec 28 16:48:18 2009 +0100
EXA: Allow optimized migration to be enabled with mixed pixmaps.
This was always the intention, I only recently realized it wasn't the case
yet...
Signed-off-by: Michel Dänzer <daenzer@vmware.com>
Acked-by: Maarten Maathuis <madman2003@gmail.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 661630f9099f254e54c8da513aaed12f6532cc35
Author: Michel Dänzer <daenzer@vmware.com>
Date: Mon Dec 28 16:48:17 2009 +0100
EXA/mixed: Don't clear deferred status of pixmaps if migration is limited.
* With optimized migration, only the pending damage region is synchronized for
destination pixmaps.
* Migration of source pixmaps can be limited to a bounding region.
Signed-off-by: Michel Dänzer <daenzer@vmware.com>
Acked-by: Maarten Maathuis <madman2003@gmail.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 42e8c9224e6c54655c45f87999d37d0d67b3f7f5
Author: Dan Nicholson <dbn.lists@gmail.com>
Date: Fri Oct 2 06:29:28 2009 -0700
xfree86: Introduce InputClass configuration
Currently Xorg uses hal's fdi files to decide what configuration options
are applied to automatically added input devices. This is sub-optimal
since it requires users to use a new and different configuration store
than xorg.conf.
The InputClass section attempts to provide a system similar to hal where
configuration can be applied to all devices with certain attributes. For
now, devices can be matched to:
* A substring of the product name via a MatchProduct entry
* A substring of the vendir name via a MatchVendor entry
* A pathname pattern of the device file via a MatchDevicePath entry
* A device type via boolean entries for MatchIsKeyboard, MatchIsPointer,
MatchIsJoystick, MatchIsTablet, MatchIsTouchpad and MatchIsTouchscreen
See the INPUTCLASS section in xorg.conf(5) for more details.
Signed-off-by: Dan Nicholson <dbn.lists@gmail.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 0711598dd3e8366217676f462f1af7d0899656d9
Author: Dan Nicholson <dbn.lists@gmail.com>
Date: Wed Sep 2 06:47:13 2009 -0700
config: Introduce InputAttributes in NewInputDeviceRequest
In order to give NewInputDeviceRequest more information, a new
InputAttributes type is introduced. Currently, this collects the product
and vendor name, device path, and sets booleans for attributes such as
having keys and/or a pointer. Only the HAL backend fills in the
attributes, though.
Signed-off-by: Dan Nicholson <dbn.lists@gmail.com>
Reviewed-by: Peter Hutterer <peter.hutterer at who-t.net>
commit c6e8637e29e0ca11dfb35c02da7ca6002ac8c597
Author: Dan Nicholson <dbn.lists@gmail.com>
Date: Fri Oct 2 06:28:03 2009 -0700
xfree86: Support non-Option boolean entries in configuration
Refactored code into the parser to allow the freeform boolean types used
in Option entries to be used in other configuration entries. This isn't
as powerful as allowing "No" to precede the option names, but it atleast
gives a common handling of "yes", "no", etc.
A type xf86TriState has been added to support an optional boolean. This
allows the boolean sense of the value to be kept while providing a means
to signal that it is unset.
Signed-off-by: Dan Nicholson <dbn.lists@gmail.com>
Reviewed-by: Peter Hutterer <peter.hutterer at who-t.net>
commit e1165632bdfbd720889ed1adf5f7ab338032c0ee
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Mon Dec 21 15:56:35 2009 +1000
xfree86: Add Option AutoServerLayout for input devices.
Any input device with this option will be automatically added to whichever
server layout is selected at startup. This removes the need to reference a
device from the ServerLayout section. The two following configuration are
identical:
CONFIG 1:
Section "ServerLayout"
InputDevice "foo"
EndSection
Section "InputDevice"
Identifier "foo"
...
EndSection
CONFIG 2:
Section "InputDevice"
Identifier "foo"
Option "AutoServerLayout" "on"
...
EndSection
The selection of the server layout affects both explicitly specified
layouts and the implicit layout.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Keith Packard <keithp at keithp.com>
commit 592b20c517461d32daf44a940386ffcc11c434f8
Author: Dan Nicholson <dbn.lists@gmail.com>
Date: Mon Dec 21 01:13:44 2009 -0800
xfree86: Allow config directory to be specified on command line
Add a new command line parameter, -configdir, to specify the config
directory to be used. Rules are the same as -config for root vs. user
privileges.
Signed-off-by: Dan Nicholson <dbn.lists@gmail.com>
Reviewed-by: Peter Hutterer <peter.hutterer at who-t.net>
commit efa5269f23c2237eb5368bf5245ffbbf35714153
Author: Dan Nicholson <dbn.lists@gmail.com>
Date: Mon Dec 21 00:04:16 2009 -0800
xfree86: Use xorg.conf.d directory for multiple config files
Currently there is a single file, xorg.conf, for configuring the server.
This works fine most of the time, but it becomes a problem when packages
or system services need to adjust the configuration. Instead, allow
multiple configuration files to live in a directory. Typically this will
be /etc/X11/xorg.conf.d.
Files with a suffix of .conf will be read and added to the server
configuration after xorg.conf. The server won't fall back to using the
auto configuration unless there is no config file and there are no files
in the config directory.
Right now this uses a simpler search template than the config file
search path by not using the command line or environment variable
parameters. The matching code was refactored a bit to make this more
coherent. Any DDX wanting to read the config files will need to call
xf86initConfigFiles before opening/reading them. This is to allow
xf86openConfigFile without xf86openConfigDirFiles and vice-versa.
Signed-off-by: Dan Nicholson <dbn.lists@gmail.com>
Reviewed-by: Peter Hutterer <peter.hutterer at who-t.net>
commit f1e869aca176e9113f9d234b0ea59b4cac295cc4
Author: Dan Nicholson <dbn.lists@gmail.com>
Date: Mon Dec 21 00:03:11 2009 -0800
xfree86: Unexport configuration file symbols
These functions should not be used outside of DDXs, so no need to put
them in the ABI.
Signed-off-by: Dan Nicholson <dbn.lists@gmail.com>
Reviewed-by: Peter Hutterer <peter.hutterer at who-t.net>
commit 90e6d93cf9bfafd63d7849dc16ce194d6f9c9d5f
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Wed Dec 23 12:54:14 2009 +1000
test/xi2: fail if xi2 class type is garbage. (#25492)
If the keycode range exceeds the allowable length, memory gets overwritten.
Catch this case by making sure that only allowed class types are
present.
X.Org Bug 25492 <http://bugs.freedesktop.org/show_bug.cgi?id=25492>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Dave Airlie <airlied@redhat.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 72286eae9f4a2f2ca6c46919ff8aa1011429e03a
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Tue Dec 22 15:42:59 2009 +1000
xfree86: remove LAYOUT_DEBUG section.
I don't think this one has been in use since 2003.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Dave Airlie <airlied@redhat.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 38b5afb0b5b46b61effa6f0e5a377b343e357e7e
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Tue Dec 22 15:40:40 2009 +1000
xfree86: remove some 'enable this later' and if 0 ifdefs
2003 called, they want their ifdefs back.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Dave Airlie <airlied@redhat.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 7dc78db79edd15b971110acaf16bbe7f69e40bdb
Merge: 81a623f036 b44c9be244
Author: Keith Packard <keithp@keithp.com>
Date: Tue Dec 22 21:25:18 2009 -0800
Merge remote branch 'whot/master'
commit b44c9be244cee286835855483a69c69e80b095c0
Author: Julien Cristau <jcristau@debian.org>
Date: Tue Dec 22 17:14:09 2009 +0100
test/xi2: fix maximum max_keycode (bug#25492)
The number of keycodes needs to be lower than 0xFFFD so that the length
field of xXIKeyInfo doesn't overflow.
Signed-off-by: Julien Cristau <jcristau@debian.org>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 190610e0c62170a27ab3e40c6c6210a583ae1ad4
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Mon Dec 21 11:08:26 2009 +1000
xfree86: remove HistorySize from the xorg.conf man page.
This option isn't parsed by anything anymore.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Keith Packard <keithp@keithp.com>
commit 094c6b9f97a9f92e5a0ef3cf5be24c09ed4d6063
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Mon Dec 21 10:42:32 2009 +1000
xfree86: reword InputDevice man sections, deprecate CorePointer/CoreKeyboard
Reshuffle and reword - InputDevice sections are only necessary if
hotplugging is disabled. Put more emphasis on hotplugging and less on HAL
since we'll switch backends eventually.
CorePointer, CoreKeyboard, and AlwaysCore should be listed as deprecated
since they don't do what they used to since 1.4. These days, only
SendCoreEvents matters and it's enabled for any driver calling
xf86ProcessCommonOptions (== every driver).
It only controls the startup behavior too, so document this.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Acked-by: Keith Packard <keithp@keithp.com>
Reviewed-by: Alan Coopersmith <alan.coopersmith@sun.com>
commit 81a623f036fe56d53c4e3bdafb3eaf945502525f
Author: Keith Packard <keithp@keithp.com>
Date: Sat Dec 19 20:11:41 2009 -0800
Bump to 1.7.99.3 (unreleased)
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 3c30c5b6d321f34736c442c9cd982308d9b8b93a
Author: Keith Packard <keithp@keithp.com>
Date: Fri Dec 18 22:58:59 2009 -0800
Set release date for 1.7.99.2
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 895f40792a14d8b88923bf3b428d31ae3bb31e46
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Wed Dec 2 17:43:01 2009 -0800
Add type name argument to CreateNewResourceType
Convert all calls of CreateNewResourceType to pass name argument
Breaks DIX ABI.
ABI versions bumped:
Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
Reviewed-by: Keith Packard <keithp@keithp.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit a11c58fa0c5809f918b36b84be53385cb2d8ea59
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Fri Dec 11 00:58:25 2009 -0800
Ensure all resource types created have names registered
Calls RegisterResourceName to record the type name for
use by X-Resource, XACE/SELinux/XTsol, and DTrace.
Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
Reviewed-by: Keith Packard <keithp@keithp.com>
commit eb750f8b5e14751d4c40b50499baec5d2ba79db9
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Fri Dec 11 00:46:22 2009 -0800
Check for failures from CreateNewResourceType
Make sure to check return value before setting bitmask flags.
For most calls, just fails to init the extension. Since Xinput
already calls FatalError() on initialization failure, so does
failure to allocate Xinput's resource type.
Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
Reviewed-by: Keith Packard <keithp@keithp.com>
commit 1df4bd6011e110dcf0649b15bfffd4ab9e6961d6
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Thu Dec 17 18:24:40 2009 -0800
Change default xkb model from pc104 to pc105
PC105 is a more useful default for non-American keyboard users,
not harmful for American PC101/PC104 keyboard users.
Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 1d2e189cdc1d65c9ca2aa0a950780dc18e6c50f1
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Thu Dec 17 18:24:39 2009 -0800
Change sysconfdir brackets to avoid some shells trying to run it as a command
Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
Reviewed-by: Dan Nicholson <dbn.lists@gmail.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 48749cc21b074ee8e68c3854bd3977ec7c408225
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Thu Dec 17 18:24:38 2009 -0800
Add platform compatibility defines for Sun Studio compilers
Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit b63912ed4c69fedd1bea92274d6cae0429a79677
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Thu Dec 17 18:24:37 2009 -0800
Convert checks for PC98 support from platform #ifdefs to configure flag
Default remains the same - on for most OS'es on i386 (except Solaris),
off for everyone else. Can be manually toggled via --enable-pc98 or
--disable-pc98.
Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 801bc8075aee664bd4c6b6ff842ab737c143a1de
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Mon Dec 14 08:43:19 2009 +1000
xfree86: update man page for special keys handling.
SpecialKeyHandling was removed from the kbd driver with version 1.4.0. Since
this is the only version that will build against server 1.7+ it's not
reasonable to mention it in the man page. Reword, point to XKB instead and
make clear that some key combinations _may_ not be available in any given
config.
Reported-by: Derek Fawcus
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Alan Coopersmith <alan.coopersmith@sun.com>
commit 753310837cd3812882d8de67f063bb61813db675
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Mon Dec 14 08:41:18 2009 +1000
xfree86: DontZap has been disabled for a while now, say so in the man page.
1.7 always shipped with DontZap disabled, it's just the default keymaps that
may not include the symbol to trigger it.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Alan Coopersmith <alan.coopersmith@sun.com>
commit 0cb638dc6822e54567a1731ea1cf588475a226e9
Merge: 6a6a041c2d fbdf493a3e
Author: Keith Packard <keithp@keithp.com>
Date: Wed Dec 16 21:58:44 2009 -0800
Merge remote branch 'alanc/master'
commit 6a6a041c2d8d32f6355db77cd59cff371038c683
Merge: 8127465f44 d503195504
Author: Keith Packard <keithp@keithp.com>
Date: Wed Dec 16 21:57:32 2009 -0800
Merge remote branch 'jeremyhu/master'
commit 8127465f44fee99181f37a5e55dafc90bfafe3d8
Author: Ville Syrjälä <ville.syrjala@nokia.com>
Date: Mon Dec 14 19:19:01 2009 +0200
xf86xv: Fix off-by-one in viewport clipping
Most of the Xv Put/Get operations have an off by one error in the
viewport clipping.
Apparently PutImage was fixed at some point but the same code was
already copy-pasted all over the place, and so the other operations
still suffer from the bug.
Signed-off-by: Ville Syrjälä <ville.syrjala@nokia.com>
Reviewed-by: Tiago Vignatti <tiago.vignatti@nokia.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit faca1bc582e374d32ee9d63d10e072fbef4940a3
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Mon Dec 14 11:05:20 2009 +1000
xfree86: belately init RandR12 if xinerama fails. (#24627)
On Fri, Dec 11, 2009 at 10:19:01AM -0800, Keith Packard wrote:
> On Wed, 9 Dec 2009 11:55:14 +1000, Peter Hutterer <peter.hutterer@who-t.net> wrote:
> > On Tue, Dec 08, 2009 at 05:24:06PM -0800, Aaron Plattner wrote:
> > > On Tue, Dec 08, 2009 at 03:52:27PM -0800, Peter Hutterer wrote:
> > > > Xorg +xinerama crashes immediately due to whacky dependency between Xinerama
> > > > and RandR12. The latter doesn't initialize if Xinerama is enabled, but if
> > > > only one screen is found, Xinerama is disabled again and RandR12 tries to
> > > > access data it never initialized.
>
> I'd sure like to have RandR get enabled when xinerama doesn't; is there
> an easy way of making that happen here? Perhaps having the RandR12 code
> disable Xinerama when only one screen is found? Or some other kludge?
you know the dependency better than I do so any hints are apreciated.
afaict, the screenInfo.numScreens (the check used by Xinerama) isn't
necessarily initialized at this point so we can't use the same check.
The following seems to work though:
From 670b3ebdb7312a6433a8f093d0820785db2aea20 Mon Sep 17 00:00:00 2001
From: Peter Hutterer <peter.hutterer@who-t.net>
Date: Mon, 14 Dec 2009 11:00:58 +1000
Subject: [PATCH] xfree86: if only one screen was found, disable Xinerama (#24627)
Xorg +xinerama crashes immediately due to whacky dependency between Xinerama
and RandR12. The latter doesn't initialize if Xinerama is enabled, but if
only one screen is found, Xinerama is disabled again and RandR12 tries to
access data it never initialized.
Dependency chain is:
- ProcessCommandLine sets noPanoramiXExtension to FALSE
- xf86RandR12Init() is a noop
- PanoramiXExtensionInit sets noPanoramiXExtension to TRUE
- xf86RandR12CreateScreenResources tries to use the devPrivates key it never
initialized.
This hack checks if there's only one screen at the time RandR12 is
initialized. If so, we expect Xinerama to fail anyhow so we disable it
ourselves and proceed as planned.
X.Org Bug 24627 <http://bugs.freedesktop.org/show_bug.cgi?id=24627>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 5f898ddbaa7df01d2479e40238d8c7954fc4b67a
Author: Tiago Vignatti <tiago.vignatti@nokia.com>
Date: Fri Dec 11 17:04:14 2009 +0200
xfree86: fix -quiet option behaviour
Previously it was trying to set the same value as the default one. Sigh.
Signed-off-by: Tiago Vignatti <tiago.vignatti@nokia.com>
Acked-by: Rami Ylimaki <ext-rami.ylimaki@nokia.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 7284e198619cdacb38d0ad715e932acff86c8367
Author: Tiago Vignatti <tiago.vignatti@nokia.com>
Date: Fri Dec 11 17:04:13 2009 +0200
os: print log markers only if log level is >= 0
FWIW default log verbosity is 0, so this will affect only if one start the
server with a different -verbose argument.
Signed-off-by: Tiago Vignatti <tiago.vignatti@nokia.com>
Acked-by: Rami Ylimaki <ext-rami.ylimaki@nokia.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit f57240a0a8c05e0a2589d0127f8888db140d6974
Author: Tiago Vignatti <tiago.vignatti@nokia.com>
Date: Fri Dec 11 17:04:12 2009 +0200
xfree86: spam output but with verbose level checked instead
Signed-off-by: Tiago Vignatti <tiago.vignatti@nokia.com>
Acked-by: Rami Ylimaki <ext-rami.ylimaki@nokia.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit fbdf493a3e7e48039a0826531e11aa33b04bf391
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Mon Dec 14 18:46:00 2009 -0800
Add freetype & type1 to the LoadModules ignore list
Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
Acked-by: Adam Jackson <ajax@redhat.com>
commit c9726bbe3148c7a8adb4dfde483741545d59c3dc
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Tue Dec 15 15:54:22 2009 -0800
Update Sun license notices to current X.Org standard form
Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
Acked-by: Peter Hutterer <peter.hutterer@who-t.net>
commit d50319550458f8127298cf8672b47f914b74ab1f
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Fri Dec 11 16:42:43 2009 -0800
Xfake: Nuke -Wl,-undefined=InitExtensions from LDFLAGS
This is not portable, and accodring to Paulo should not be required any more.
Signed-off-by: Jeremy Huddleston <jeremyhu@freedesktop.org>
commit ed7d2527190ec56aed38db19d9e958abe88441b9
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Fri Dec 11 11:53:28 2009 -0800
dtrace: Add Xserver-dtrace.h to CLEANFILES
Signed-off-by: Jeremy Huddleston <jeremyhu@freedesktop.org>
Reviewed-by: Alan Coopersmith <alan.coopersmith@sun.com>
commit 44f102ed64e2552a0e04714c7574f74ca5ee66e2
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Mon Nov 23 22:24:44 2009 -0800
COPYING: Update license preamble
Update the comment about "a modification is currently under discussion"
since there hasn't been any such discussion for some time and this is
the consensus agreed upon preferred format.
Also throw in a pointer to the OSI discussion page about the MIT license.
Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 00a7252fe3e519e3e4d62cdd8746833ca59bce77
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Fri Nov 20 13:38:30 2009 -0800
Fix dtrace object builds of libos to link with SHA1_LIBS
Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
Acked-by: Adam Jackson <ajax@redhat.com>
commit dd2c83d03ecedce8b546d583e436c12f92510754
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Wed Nov 11 14:42:20 2009 -0800
Fix builds with --with-int10=stub
Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
Acked-by: Adam Jackson <ajax@redhat.com>
commit 77221c9155a3c96cb63b210a048db1ea71a5e359
Author: Adam Jackson <ajax@redhat.com>
Date: Thu Oct 29 14:01:29 2009 -0400
glx: swrast can do GLX 1.4 too
Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
Signed-off-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit a72c65e9176c51de95db2fdbf4c5d946a4911695
Author: Keith Packard <keithp@keithp.com>
Date: Wed Dec 2 08:37:20 2009 -0800
fb: Adjust transform or composite coordinates for pixman operations
Windows (or even pixmaps, in some cases) may not sit at the origin of
the containing pixmap, so any coordinates relative to the drawable
must be adjusted. For destinations and untransformed sources, the
operation coordinates are adjusted. For transformed sources, the
transform matrix is adjusted.
Signed-off-by: Keith Packard <keithp@keithp.com>
Acked-by: Soeren Sandmann <sandmann@daimi.au.dk>
commit bd567061c8b84b268d9bbb01bc4d8981feefb862
Author: Keith Packard <keithp@keithp.com>
Date: Wed Dec 2 15:51:22 2009 -0800
Split fbGetDrawable into fbGetDrawablePixmap and fbGetPixmapBitsData
These two sub-macros each perform half of the original macro work and
the old macro is now implemented in terms of the new ones. This makes
way for new code which wants to know the underlying pixmap for a
window instead of just getting a pointer to the bits.
Signed-off-by: Keith Packard <keithp@keithp.com>
Acked-by: Soeren Sandmann <sandmann@daimi.au.dk>
commit 61335052972a78d67c0ba74f902273b34c63a198
Author: Keith Packard <keithp@keithp.com>
Date: Tue Dec 1 11:09:32 2009 -0800
Revert "Fix clipping when windows are used as sources"
This reverts commit e9aa61e9f0d663d5b34a397b943b4d1df44e873d.
Conflicts:
fb/fbpict.c
Signed-off-by: Keith Packard <keithp@keithp.com>
Acked-by: Soeren Sandmann <sandmann@daimi.au.dk>
commit 071b3c1810d9f2602173acc8578caac20e0b771e
Author: Keith Packard <keithp@keithp.com>
Date: Tue Dec 1 11:05:04 2009 -0800
Revert "Use IncludeInferiors when copying windows before compositing."
This reverts commit 7c7f0c2c6a04f7044d5ce69e97a615735e5831f1.
Signed-off-by: Keith Packard <keithp@keithp.com>
Acked-by: Soeren Sandmann <sandmann@daimi.au.dk>
commit 8e640d6b131d2865a9725d8997023865b0ef3d69
Author: Keith Packard <keithp@keithp.com>
Date: Tue Dec 1 11:04:49 2009 -0800
Revert "Reserve space for two GC values in copy_drawable()."
This reverts commit 08df24555cb432eb0d90a3f63275e9485e777c4c.
Signed-off-by: Keith Packard <keithp@keithp.com>
Acked-by: Soeren Sandmann <sandmann@daimi.au.dk>
commit 0816c5482c25251da8af5978cc348e1c547bf731
Author: Keith Packard <keithp@keithp.com>
Date: Tue Dec 1 11:04:06 2009 -0800
Revert "fb: Don't crash if copy_drawable() returns NULL."
This reverts commit 66a9616d645f5a23225251d197e00b94c79274f6.
Signed-off-by: Keith Packard <keithp@keithp.com>
Acked-by: Soeren Sandmann <sandmann@daimi.au.dk>
commit d3e054ac07dae12a82ad764b0622fddbef4b9ec5
Merge: 12fb31815d 97a6454ea5
Author: Keith Packard <keithp@keithp.com>
Date: Fri Dec 11 09:22:22 2009 -0800
Merge remote branch 'jeremyhu/master'
commit 12fb31815db9de9c01f2d4155a2b74531777c0bf
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Mon Dec 7 12:58:57 2009 +1000
xkb: don't assign garbage value to led_return.
As the comment for the function states, led_return is undefined if map is
NULL. We might as well skip writing to it then.
Found by clang.
Reported-by: Tomas Carnecky <tom@dbservice.com>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Jamey Sharp <jamey@minilop.net>
commit ea14a418214ba4c58910f5650d8b25b3fc3a7099
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu Dec 3 11:21:31 2009 +1000
Xi: reset device properties to NULL after deleting them. (#25374)
Commit 0e6cee853d8e5bef3274e632ef034d37f14674a9 introduced cleanup code to
remove the accel properties when switching schemes. The same code is
triggered by the default closedown code but only after unconditionally
removing all device properties (as part of the cleanup). The properties,
although deleted never got reset to NULL.
X.Org Bug 25374 <http://bugs.freedesktop.org/show_bug.cgi?id=25374>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Tested-by: Andy Furniss <lists@andyfurniss.entadsl.com>
Reviewed-by: Dave Airlie <airlied@redhat.com>
commit 9ac6a048efaec51f158bbc1a4a3f448cbe5658ad
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Wed Dec 9 11:43:34 2009 +1000
xfree86: remove unused variable in configureDDMonitorSection.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Dave Airlie <airlied@redhat.com>
commit 3fad969a90ccab604359ec4de05e745bb4b909e1
Author: Julien Cristau <jcristau@debian.org>
Date: Sun Dec 6 20:27:06 2009 +0100
Move config_init() after CreateWellKnownSockets() and InitCoreDevices()
config_init() can now add devices directly instead of scheduling a
timer.
Signed-off-by: Julien Cristau <jcristau@debian.org>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 886140787852c660978a9bb3abc7cc2702cbaed1
Author: Tomas Carnecky <tom@dbservice.com>
Date: Mon Dec 7 05:54:57 2009 +0100
Fix possible NULL dereference in XkbFlushLedEvents()
Through some code paths it is possible that NULL is being passed in the
'ed' parameter to XkbFlushLedEvents(). Make sure we don't pass it along
to bzero().
Signed-off-by: Tomas Carnecky <tom@dbservice.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 92d9cb7e1340b259294ba317ea3a7d18487498b5
Author: Tomas Carnecky <tom@dbservice.com>
Date: Sun Dec 6 23:52:54 2009 +0100
XkbWriteCountedString(): return early if str is NULL
This avoids NULL from being passed to memcpy() later in the code. While
that wasn't an issue before - that value being NULL implied 'size == 0'
so memcpy() wouldn't try to dereference it - it made the code harder
to read and also confused clang.
Signed-off-by: Tomas Carnecky <tom@dbservice.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit df2635d4644d1fa2772ff58d8d34cdf788ece412
Author: Michel Dänzer <daenzer@vmware.com>
Date: Thu Dec 10 00:04:53 2009 +0100
EXA/mixed: Don't consider devKind for detecting dimension change.
Fixes http://bugs.freedesktop.org/show_bug.cgi?id=25536 .
There should be no reason for the pitch to actually change when none of the
other dimensions do, and this could lead to incorrectly freeing the system
memory copy when allocating a GPU copy, resulting in loss of valid pixmap
contents.
Signed-off-by: Michel Dänzer <daenzer@vmware.com>
Acked-by: Maarten Maathuis <madman2003@gmail.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 97a6454ea57587db490873fee8ff0f899882972d
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Wed Dec 9 18:27:31 2009 -0800
XQuartz: pbproxy: Fix building of standalone xpbproxy executable
Signed-off-by: Jeremy Huddleston <jeremyhu@freedesktop.org>
commit 1b8f90aa8b1017c74b254db2f398131b857323d4
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Tue Dec 8 15:50:28 2009 -0800
Miscellaneous compilation warning fixes
main.c:134: warning: no previous prototype for 'dix_main'
rootlessScreen.c: In function 'RootlessMarkOverlappedWindows':
rootlessScreen.c:434: warning: function declaration isn't a prototype
backtrace.c:51: warning: format '%lx' expects type 'long unsigned int', but argument 5 has type 'int'
backtrace.c:54: warning: format '%lx' expects type 'long unsigned int', but argument 5 has type 'int'
set.c: In function 'RecordSetMemoryRequirements':
set.c:413: warning: old-style function definition
set.c: In function 'RecordCreateSet':
set.c:425: warning: old-style function definition
stub.c: In function ‘main’:
stub.c:236: warning: ISO C90 forbids mixed declarations and code
Signed-off-by: Jeremy Huddleston <jeremyhu@freedesktop.org>
commit 955b9f23a34cc79a5cd9676b45b3df4ffcc7302b
Author: Michel Dänzer <daenzer@vmware.com>
Date: Tue Dec 8 20:25:02 2009 +0100
EXA: ModifyPixmapHeader_mixed fixes.
* Better detection of dimension changes.
* Make sure to re-create the system memory copy when the pixmap dimensions
change (e.g. the screen pixmap on screen resize).
* Clear the valid regions.
Signed-off-by: Michel Dänzer <daenzer@vmware.com>
Acked-by: Maarten Maathuis <madman2003@gmail.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit c1503861cf75654d4f7b22e6f7f6487c47a0a395
Author: Michel Dänzer <daenzer@vmware.com>
Date: Tue Dec 8 20:25:01 2009 +0100
EXA: ExaDoPrepareAccess return value fixes.
Only return TRUE if the GPU copy is being accessed, and preserve the return
value on repeated / nested calls for the same pixmap.
exaPrepareAccessReg_mixed could get inconsistent return values e.g. when the
same pixmap is both the destination and source of an operation, potentially
resulting in a crash.
Signed-off-by: Michel Dänzer <daenzer@vmware.com>
Acked-by: Maarten Maathuis <madman2003@gmail.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit fd867387335b6175d76bbe93118bbe5e1e45ce88
Author: Maarten Maathuis <madman2003@gmail.com>
Date: Sat Dec 5 03:18:31 2009 +0100
exa/mixed: pixmaps that succeed prepare access have no need for a cpu copy
- When they have a gpu copy ofcource.
- Use the presence of a cpu copy as a hint to fall back instead of UTS'ing in
exaHWCopyNtoN.
Signed-off-by: Maarten Maathuis <madman2003@gmail.com>
Acked-by: Michel Dänzer <michel@daenzer.net>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit bb7acfbcfbc37869c2215c26791c6175a5a6c526
Author: Michel Dänzer <daenzer@vmware.com>
Date: Fri Dec 4 08:37:14 2009 +0100
EXA: Use correct coordinate system for calculating Composite fallback region.
Fixes incorrectly skipped rendering of some Composite operations to windows.
Signed-off-by: Michel Dänzer <daenzer@vmware.com>
Reviewed-by: Keith Packard <keithp@keithp.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 0f4ef7123d3e6e09e04dc55e8edb47aecf017648
Author: Maarten Maathuis <madman2003@gmail.com>
Date: Thu Dec 3 19:28:13 2009 +0100
exa/mixed: setting devKind before exaCopyDirty* is not needed
Signed-off-by: Maarten Maathuis <madman2003@gmail.com>
Acked-by: Michel Dänzer <michel@daenzer.net>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 8ea415d417b3ef6b8a288d10da76ff4bc334e08b
Author: Maarten Maathuis <madman2003@gmail.com>
Date: Wed Dec 2 20:24:02 2009 +0100
Revert "exa: a few small pitch related changes"
This reverts commit 99d88ef69d5f7dbf99ca605eceb92f42230a89f4.
- Some pixmaps under classic have a sys_pitch which is 0, no idea why. This is
causing rendering corruption.
Signed-off-by: Maarten Maathuis <madman2003@gmail.com>
Acked-by: Michel Dänzer <michel@daenzer.net>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 98c8b752254a27ab1aaf881b36bfda0f74929d0a
Merge: 0e084d8c71 91c1bd78f7
Author: Keith Packard <keithp@keithp.com>
Date: Wed Dec 2 15:28:07 2009 -0800
Merge remote branch 'whot/master'
commit 91c1bd78f7240c92702828f8e5a6b6ce944b9e36
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Sat Nov 28 21:32:47 2009 -0500
configure.ac: error while checking for XDMXCONFIG_DEP
Introduced in commit 9998105a387e0294054502331a56e1e020cd93e4
The replacement third parameters to PKG_CHECK_MODULES([DMXMODULES]
was not quoted.
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
Reviewed-by: Dan Nicholson <dbn.lists@gmail.com>
Tested-by: Julien Cristau <jcristau@debian.org>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 761ae22f880bd79550ccf93d321b8a28b3755956
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Tue Dec 1 14:38:19 2009 +1000
xfree86: tell users to disable AutoAddDevices, not AllowEmptyInput.
Technically, disabling AEI is the right suggestion. AEI off forces the
server to init the built-in defaults for input devices (or pick the first
one from the config file). At the same time, hotplugging is still available
with AEI off.
Unfortunatly, in the vast majority of cases users want to simply disable
hotplugging or have a working server while the local HAL configuration is
broken or missing. Disabling AEI will lead to duplicate events, triple
keystrokes, etc. once the configuration works again.
It's not actually required to remove AEI once hotplugging works again,
though it will in many cases lead to a setup that appears broken.
Asking users to disable AutoAddDevices instead means those users disable
hotplugging, can then fix the HAL setup and they _must_ remove the config
line again to test if hotplugging works again. Which doesn't leave them with
a broken config once everything is working nice and dandy. Less bugreports,
everybody wins.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Acked-by: Dan Nicholson <dbn.lists@gmail.com>
Acked-by: Daniel Stone <daniel@fooishbar.org>
Acked-by: Rémi Cardona <remi@gentoo.org>
Acked-by: James Cloos <cloos@jhcloos.com>
commit b584c224a888c9e7f92d7e49021f74232a727c7f
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri Oct 30 12:11:41 2009 +1000
Set the source and deviceid for key repeat events (#24785)
X.Org Bug 24785 <http://bugs.freedesktop.org/show_bug.cgi?id=24785>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Acked-by: Adam Jackson <ajax@redhat.com>
commit 66bb8c6fbdfc0fc0d971aac4ec6f949bb9288c1b
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri Nov 27 16:20:13 2009 +1000
dix: remove core devices when shutting down. (#25028)
NewInputDeviceRequest (and RemoveDevice) have checks in place to not allow
removal of the VCP/VCK. When shutting down, they need to be cleaned up
nonetheless to free the memory associated.
X.Org Bug 25028 <http://bugs.freedesktop.org/show_bug.cgi?id=25028>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Keith Packard <keithp@keithp.com>
commit 83d90b90bcb71c89750f92a177361e53dd261414
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri Nov 27 16:08:44 2009 +1000
dix: remove some obsolete comment.
The "counterpart to biggest hack" included checking for the motion history
function - which is unified in 1.7. Hence the check (which is already
removed) would evaluate to true anyway, and this comment isn't needed.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Keith Packard <keithp@keithp.com>
commit c20c8897272427cb3f755a3e28e80a9ad46f08a1
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri Nov 27 16:01:53 2009 +1000
dix: fix memory leak, free event list on shutdown. (#25028)
X.Org Bug 25028 <http://bugs.freedesktop.org/show_bug.cgi?id=25028>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Keith Packard <keithp@keithp.com>
commit 0e084d8c71e697a5cf5d5d7c749455ae14bd6eb7
Author: Luc Verhaegen <libv@skynet.be>
Date: Wed Nov 11 15:59:27 2009 +0100
Xv: Fix AdjustFrame when driver implements ReputImage.
Should probably also be applied to stabler xserver branches too.
Luc Verhaegen.
From a22bc20721bad506d8fa9772b1258568cbffe7d2 Mon Sep 17 00:00:00 2001
From: Luc Verhaegen <libv@skynet.be>
Date: Wed, 11 Nov 2009 15:52:39 +0100
Subject: [PATCH] Xv: Fix AdjustFrame when driver implements ReputImage.
Finally fixes fd.o #4653, filed more than 4 years ago.
Patch can be happily applied to all modular Xorg versions.
Signed-off-by: Luc Verhaegen <libv@skynet.be>
Reviewed-by: Keith Packard <keithp@keithp.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit f4fc3406720410e37a2bce1b782cba0f0b734e42
Author: Jeremy Huddleston <jeremyhu@apple.com>
Date: Mon Nov 30 11:03:59 2009 -0800
XQuartz: Drop calls to alloca
This makes us more consistent with the rest of the codebase, using xalloc/xfree
Signed-off-by: Jeremy Huddleston <jeremyhu@freedesktop.org>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 66a9616d645f5a23225251d197e00b94c79274f6
Author: Michel Dänzer <daenzer@vmware.com>
Date: Mon Nov 30 13:17:53 2009 +0100
fb: Don't crash if copy_drawable() returns NULL.
Fixes http://bugs.freedesktop.org/show_bug.cgi?id=24634 .
Signed-off-by: Michel Dänzer <daenzer@vmware.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 8754db77d8169e5ea506a963cebee1a651bcf094
Author: Michel Dänzer <daenzer@vmware.com>
Date: Mon Nov 30 13:17:52 2009 +0100
EXA: Don't defragment offscreen memory at allocation time.
Fixes http://bugs.freedesktop.org/show_bug.cgi?id=24300 .
Offscreen memory allocation can occur from various places, and apparently
doing defragmentation from at least some of them can confuse some driver
acceleration code.
There's still the regular background defragmentation in the WakeupHandler,
which should manage to keep fragmentation at a reasonable level.
Signed-off-by: Michel Dänzer <daenzer@vmware.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 0e555a1033e5deed1db8582ca075455a6a2d4228
Author: Michel Dänzer <daenzer@vmware.com>
Date: Mon Nov 30 13:17:51 2009 +0100
Revert "EXA: Accumulate arbitrary number of glyphs without flushing."
This reverts commit c11678cc189551f2a01eaa7a63969c16950739b4.
Not sure what I was thinking, turns out alloca() of a size derived from client
input is a bad idea.
Signed-off-by: Michel Dänzer <daenzer@vmware.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 99d88ef69d5f7dbf99ca605eceb92f42230a89f4
Author: Maarten Maathuis <madman2003@gmail.com>
Date: Sat Nov 28 10:34:45 2009 +0100
exa: a few small pitch related changes
- Setting pitch before exaCopyDirty* is not needed.
Signed-off-by: Maarten Maathuis <madman2003@gmail.com>
Acked-by: Michel Dänzer <michel@daenzer.net>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit a54c23fe647cb4d610d871094193ae5959606008
Author: Maarten Maathuis <madman2003@gmail.com>
Date: Sat Nov 28 10:34:44 2009 +0100
exa: s/PixmapIsOffscreen/PixmapHasGpuCopy and s/pExaPixmap->offscreen/pExaPixmap->use_gpu_copy
- Fixup some variable names as well.
Signed-off-by: Maarten Maathuis <madman2003@gmail.com>
Acked-by: Michel Dänzer <michel@daenzer.net>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 342f3689d17256c92cbfee079d24501d27aa1153
Author: Maarten Maathuis <madman2003@gmail.com>
Date: Sat Nov 28 10:34:43 2009 +0100
exa: handle pixmap create/destroy in lower layers
- Pixmaps that are created during a fallback are automatically prepared access.
- During the fallback accelerated ops are blocked to prevent new/scratch gc's
from triggering accelerated ops on mapped pixmaps.
- A few cases of incorrect wrapping (on the top level pointer instead of
between damage and (w)fb) have been removed.
Signed-off-by: Maarten Maathuis <madman2003@gmail.com>
Acked-by: Michel Dänzer <michel@daenzer.net>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit b54bc14ce0ae38c4863794bc3096ca86cdb23908
Author: Ingmar Vanhassel <ingmar@exherbo.org>
Date: Wed Nov 25 20:31:48 2009 +0100
Update man-pages for new default font paths
Signed-off-by: Ingmar Vanhassel <ingmar@exherbo.org>
Reviewed-by: Alan Coopersmith <alan.coopersmith@sun.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit c0367028ac02b3ccfbc245863dc6b7295a4014d6
Author: Ingmar Vanhassel <ingmar@exherbo.org>
Date: Wed Nov 25 20:31:47 2009 +0100
Update COMPILEDDEFAULTFONTPATH to match the new default font path
Signed-off-by: Ingmar Vanhassel <ingmar@exherbo.org>
Reviewed-by: Alan Coopersmith <alan.coopersmith@sun.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 0e6cee853d8e5bef3274e632ef034d37f14674a9
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Wed Nov 18 14:39:25 2009 +1000
dix: clean up accel old scheme data when switching schemes.
InitValuatorClassDeviceStruct always initializes with the default profile.
The default profile allocs data and adds a few properties which become
obsolete if the profile is changed lateron by the driver.
The property handlers are stored in the device's devPrivates and cleaned up.
Ideally, the property handler ID's could be stored somewhere more obvious,
but that seems to require breaking the ABI.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Acked-by: Simon Thum <simon.thum@gmx.de>
commit 1b127ab8429616adf9ec31ba4d8bdd9af6e104a9
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Tue Nov 24 15:31:48 2009 +1000
Xi: when deleting all properties, reset property handler to NULL.
Trying to unregister property handlers during the device closure process
leads to invalid memory accesses.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Keith Packard <keithp@keithp.com>
commit 8806375ed72a3cd465fe0a49ead079a334accd6b
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Tue Nov 17 09:25:47 2009 +1000
Move xdmxconfig modules into DMX conditionals (#25102)
xdmxconfig requires additional modules not checked for if Xdmx build is set
to auto (the default). This may lead to build errors if the Xdmx modules are
installed, but not the extra ones required for xdmxconfig.
X.Org Bug 25102 <http://bugs.freedesktop.org/show_bug.cgi?id=25102>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Remi Cardona <remi@gentoo.org>
Acked-by: Julien Cristau <jcristau@debian.org>
commit a2adda7ab3defd953cf0f48f5372efb037786a9e
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu Nov 19 16:35:55 2009 +1000
Revert "Move xdmxconfig modules into DMX conditionals (#25102)"
New package dependency unnecessarily links in a few libraries that Xdmx
doesn't need. This can be fixed more elegantly.
This reverts commit 0ef15ca9d2d9c78c79a2771c550563bc6931b365.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit eb967ca36cfe0409972ac987a74d498cd6f6bafb
Author: Rami Ylimaki <ext-rami.ylimaki@nokia.com>
Date: Tue Nov 17 17:13:43 2009 +0200
Xext: Fix a memory leak on GE client disconnect.
Add a call to dixRequestPrivate to inform dixFreePrivates that memory
allocated in GEClientCallback should be released when client
disconnects. Otherwise there is a leak of sizeof(GEClientInfoRec) for
every client connect/disconnect.
Also remove the explicit allocation and let GEGetClient /
dixLookupPrivate do it. This makes GEClientCallback similar to the
other extension callbacks.
Signed-off-by: Rami Ylimaki <ext-rami.ylimaki@nokia.com>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 55f60e192318132157d3dfdd6732f141bd9dc352
Author: Maarten Maathuis <madman2003@gmail.com>
Date: Mon Nov 23 22:17:43 2009 +0100
Revert "exa/mixed: be more thorough about setting fb_pitch when needed"
This reverts commit d4fc245115eb2cb323e06a82f9dd52518d9b6a16.
- This is causing crashes/problems for some.
Acked-by: Michel Dänzer <michel@daenzer.net>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 4677b5a80025b50ba2a3e953fd487a549586ae9f
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Mon Nov 23 16:33:00 2009 -0800
XQuartz: Allow better compatability with older versions of xinit
If we are id="org.x" and the launchd socket is ":0", we will claim
the socket to match the old behavior before we prefixed the
socket name with our id.
Signed-off-by: Jeremy Huddleston <jeremyhu@freedesktop.org>
commit ec16357edaba23694b12fd234ffa12fd58a73dfa
Author: Tiago Vignatti <tiago.vignatti@nokia.com>
Date: Mon Nov 23 17:00:06 2009 +0200
configure: remove unused kdrive Xvesa config variable
Xvesa was gone in commit 6d21fbf0 and this should be there as well.
Signed-off-by: Tiago Vignatti <tiago.vignatti@nokia.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit a30e739a144912a68adcaa9f426d600c6ecbd529
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Mon Nov 23 13:07:56 2009 +1000
Xi: don't crash when deleting invalid device properties.
Deleting a property that was not set on a device leads to a null-pointer
reference. The protocol allows deleting those properties - it has to be a
noop.
Reproducible:
xinput --set-prop "My device" --type=int --format=8 "my property" 1
xinput --delete-prop "My other device" "my property"
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 19f7c15e2008dab3c46ba3e14dfa353d01c74f72
Author: Zhao Yakui <yakui.zhao@intel.com>
Date: Fri Nov 20 14:43:35 2009 +0800
xfree86: Edid quirk for Philips LCD LP154W01
v1->v2: Make one condition case for one quirk instead of merging them
together. This is based on the Keithp's suggestion.
Move the EDID quirk for Philips LCD LP154W01 as the panel reports the vertical
size in cm.
https://bugs.freedesktop.org/show_bug.cgi?id=24482
Signed-off-by: Zhao Yakui <yakui.zhao@intel.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit b8b8db98353760738eead612fe846c2ce1c174fa
Author: Michel Dänzer <daenzer@vmware.com>
Date: Thu Nov 19 10:46:30 2009 +0100
EXA: Don't use UploadToScreen for CopyNtoN with mixed pixmaps.
Signed-off-by: Michel Dänzer <daenzer@vmware.com>
commit d4fc245115eb2cb323e06a82f9dd52518d9b6a16
Author: Maarten Maathuis <madman2003@gmail.com>
Date: Wed Nov 18 21:23:09 2009 +0100
exa/mixed: be more thorough about setting fb_pitch when needed
Signed-off-by: Maarten Maathuis <madman2003@gmail.com>
Acked-by: Michel Dänzer <michel@daenzer.net>
commit 647b79f87a9891225678dc6fc2fbda3bdef8fa9d
Author: Maarten Maathuis <madman2003@gmail.com>
Date: Wed Nov 18 21:23:08 2009 +0100
exa/mixed: avoid copying back pixmap data when no migration took place
- When the driver handles the prepare access no copying is needed.
- Delayed pixmap creation should be fine, because it's handled by the
first prepare access, but the exaPixmapIsOffscreen check in finish access
will return FALSE without a driver pixmap.
Signed-off-by: Maarten Maathuis <madman2003@gmail.com>
Acked-by: Michel Dänzer <michel@daenzer.net>
commit 30be7ceaf228497ac1ff0a1123c1b35e3aa1fc73
Author: Julien Cristau <jcristau@debian.org>
Date: Sat Nov 14 18:39:00 2009 +0100
xfree86: set a sane umask before opening the log
Xorg creates its log file following the umask of the user running
startx, which may result in a world-writable log. Set umask to 022 to
prevent this.
Debian bug#555308 <http://bugs.debian.org/555308>
See also http://thread.gmane.org/gmane.comp.security.oss.general/2299
Signed-off-by: Julien Cristau <jcristau@debian.org>
Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit fb95090730360b6b7f5429c40937e8fc9dfe5c14
Author: Matt Turner <mattst88@gmail.com>
Date: Mon Nov 9 03:33:45 2009 +0000
Use glibc's in/out routines
Let's let glibc do the right thing for dense/sparse selection.
The _alpha_iobase code has been unused since the switch to libpciaccess. It
really should have been killed by fba700f1f6a8976.
Signed-off-by: Matt Turner <mattst88@gmail.com>
Tested-by: Michael Cree <mcree@orcon.net.nz>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 0ef15ca9d2d9c78c79a2771c550563bc6931b365
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Tue Nov 17 11:48:35 2009 +1000
Move xdmxconfig modules into DMX conditionals (#25102)
xdmxconfig requires additional modules not checked for if Xdmx build is set
to auto (the default). This may lead to build errors if the Xdmx modules are
installed, but not the extra ones required for xdmxconfig.
X.Org Bug 25102 <http://bugs.freedesktop.org/show_bug.cgi?id=25102>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Tested-by: Adrian Bunk <bunk@stusta.de>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit df95be4d3d9a744720e37a16fd89d9569bf6e188
Author: Paulo Ricardo Zanoni <pzanoni@mandriva.com>
Date: Thu Nov 12 11:27:34 2009 -0200
configure: change 'sigio-default' to 'use-sigio-by-default'
This was discussed in this thread:
http://lists.x.org/archives/xorg-devel/2009-September/002025.html
The patch sent fixed the help string but not the configure option.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 801f0e59800ea4a3f6c85b22dea6f2c400bda703
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Wed Oct 28 14:09:11 2009 -0400
INSTALL, NEWS, README or AUTHORS files are missing/incorrect #24206
Add missing INSTALL file. Use standard GNU file on building tarball
README may have been updated
Remove AUTHORS file as it is empty and no content available yet.
Remove NEWS file as it is empty and no content available yet.
Reviewed-By: Jeremy Huddleston <jeremyhu@apple.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit c93f516e850c2ef2b47cc2e282f9081ae7165ac7
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Tue Oct 27 15:07:26 2009 -0400
Deploy the new XORG_DEFAULT_OPTIONS #24242
This macro aggregate a number of existing macros that sets commmon
X.Org components configuration options. It shields the configuration file from
future changes.
Reviewed-By: Jeremy Huddleston <jeremyhu@apple.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 0f38159cdd154a29caab0342aee41378e9921929
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Tue Nov 10 09:12:27 2009 -0500
Makefile.am: ChangeLog not required: EXTRA_DIST or *CLEANFILES #24432
ChangeLog filename is known to Automake and requires no further
coding in the makefile.
Reviewed-By: Jeremy Huddleston <jeremyhu@apple.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit c739beb439bb813e4c82b3216daee7e89aa96f2f
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Tue Nov 10 08:56:21 2009 -0500
.gitignore: use common defaults with custom section #24239
Using common defaults will reduce errors and maintenance.
Only the very small or inexistent custom section need periodic maintenance
when the structure of the component changes. Do not edit defaults.
Reviewed-By: Jeremy Huddleston <jeremyhu@apple.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 9071b0d69748cfa7ecca17b4cb0e431bbb0ef2a4
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Mon Nov 9 13:09:55 2009 -0800
XQuartz: Explicitly pass a bellProc to make XBell() work again.
Signed-off-by: Jeremy Huddleston <jeremyhu@freedesktop.org>
commit e87a03fd531ce7974877688680d3bf9b85c2d835
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Tue Oct 27 17:16:57 2009 -0700
XQuartz: pbproxy: Wait for the server to finish starting up, so display is valid.
Signed-off-by: Jeremy Huddleston <jeremyhu@freedesktop.org>
commit 15fc56addcc906592af7c0f4c0a5ac906fa5c389
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Sun Nov 8 20:25:42 2009 -0800
XQuartz: Buildfix for Leopard and older
Signed-off-by: Jeremy Huddleston <jeremyhu@freedesktop.org>
commit b5aa2e0a5fe233dc883084a5026013472e85bca4
Author: Chase Douglas <chasedouglas@gmail.com>
Date: Mon Nov 9 22:54:39 2009 -0500
Move FD_CLR above pInfo->read_input
The event fd may be invalidated by the pInfo->read_input call. If it is
invalidated, the subsequent FD_CLR call will segfault. Thus, the FD_CLR
call must precede the pInfo->read_input call.
Signed-off-by: Chase Douglas <chasedouglas@gmail.com>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 982f6648fd29d085265bf6035c1bf4d1b2499316
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Tue Nov 10 09:50:50 2009 +1000
dix: increase default number of buttons to 10.
Currently the XTEST device is limited to the same number of buttons the core
device has. This breaks if a user has a mouse with more than 3 buttons
connected and is using a core client to fake button 8+ presses.
Rather than expecting all clients to fix themselves, just increase the
default number of buttons to 10, which is somewhat a compromise. Ideally,
the XTEST devices should adjust themselves to the highest number of buttons
available on the slave devices (like the master pointers already do), but
that's a taks for another day.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit ec5417b965616e60b51466fe9fd2b44cb5abb349
Author: Jon TURNEY <jon.turney@dronecode.org.uk>
Date: Sun Jul 12 23:58:32 2009 +0100
Cygwin/X: Ensure WM_STATE atom exists in multiwindow mode
Workaround a bug in iiimxcf (assuming the WM_STATE atom exists),
which can cause many Solaris clients to simply fail with a BadAtom
error
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
commit aa860552fd7e2888258a7b48b8c3bd4af527dc6c
Author: Yaakov Selkowitz <yselkowitz@users.sourceforge.net>
Date: Sun Nov 1 18:19:08 2009 +0000
Cygwin/X: Enable clipboard integration by default
Enable clipboard integration by default, can be turned off with -noclipboard.
We still accept -clipboard for backwards compatibility. If both are passed,
the last one is accepted (just as other arguments are handled).
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
commit 87b00ced3d308a9168828c0e38ecffa0640621a0
Author: Jon TURNEY <jon.turney@dronecode.org.uk>
Date: Sun Nov 1 18:18:48 2009 +0000
Cygwin/X: Setup screen layout in Xinerama mode
Setup screen layout according to the screen window native window
positions in Xinerama mode
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
commit 0fe2e8c64e7a5a9140c77b88b266d7ae58b0bca2
Author: Yaakov Selkowitz <yselkowitz@users.sourceforge.net>
Date: Sun Nov 1 18:18:31 2009 +0000
Cygwin/X: Allow composite to be enabled for Xwin
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
commit 26a69bbd9b6f415c443d6d6f8f450329f348edc3
Author: Yaakov Selkowitz <yselkowitz@users.sourceforge.net>
Date: Sun Nov 1 18:19:04 2009 +0000
Cygwin/X: Mount options have changed in cygwin-1.7
Mount options have changed in cygwin-1.7
Also fix a typo in the warning issued if /tmp is a textmode mount
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
commit 35901ece6a49e5f8e245364c27723da2f9009a1d
Author: Paul Loewenstein <paul.loewenstein@gmail.com>
Date: Sun Nov 1 18:18:45 2009 +0000
Cygwin/X: Handle fake keypresses generated by speech recognizers
Apparently, fake keypresses generated by speech recognizers may not bother
with a scan code, so look up what scan code corresponds to the virtual key
code if this occurs.
Patch by Paul Loewenstein <paul.loewenstein@gmail.com>
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
commit 0866322b574b1f3695467535ed5fa8f9e629ad1d
Author: Jon TURNEY <jon.turney@dronecode.org.uk>
Date: Mon Jul 13 13:46:45 2009 +0100
Cygwin/X: Always use an authorization cookie for internal clients
Don't conditionalize use of an authorization cookie for internal client
threads on XCSECURITY, always use one (this avoids certain problems
with XDMCP setups where the XDMCP host removes localhost from the access
list etc.)
Conditionalize the use of a XCSECURITY authorization descriptor on XCSECURITY
Consolidate the various places where the authorization cookie is set
for internal threads into a new function, winSetAuthorization()
Use authorization cookie for multiwindow WM X message thread as well
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
commit 72f81f4e449defb0654e9bdb2c9ec014475a3977
Author: Colin Harrison <colin.harrison@virgin.net>
Date: Fri Nov 6 17:46:58 2009 +0000
Xming: Make -auth option work in with -multiwindow
Use an internally generated cookie for authentication of the internal
window manager client when using the -auth option in -multiwindow mode.
Copyright (C) Colin Harrison 2005-2008
http://www.straightrunning.com/XmingNotes/
http://sourceforge.net/projects/xming/
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
commit 6dbf8f27c885ea3a761548183fb00ba3df2df553
Author: Colin Harrison <colin.harrison@virgin.net>
Date: Tue Jul 21 01:15:25 2009 +0100
Xming: Tidy up code for initial native window positioning
Tidy up code for initial native window positioning and avoid a
duplicate call to winMultiWindowGetTransientFor()
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
commit 28eb61fc04811bb9bbb523e0a252933313bb16ce
Author: Jon TURNEY <jon.turney@dronecode.org.uk>
Date: Sun Nov 1 18:19:14 2009 +0000
Avoid a null dereference if IFF_BROADCAST is set but there is no broadcast address
It seems that the getifaddrs() function can return interfaces with
IFF_BROADCAST & IFF_UP set, but no broadcast address (at least
under Cygwin 1.7, this seems to happen for v6 mapped v4 addresses)
Avoid a null dereference if this ever happens
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
commit 091cbbaed7aafab6f9839a40fe977ab067d1ace1
Author: Colin Harrison <colin.harrison@virgin.net>
Date: Mon Oct 12 13:40:11 2009 +0100
Xming: Fix UT8String and CompoundText clipboard text sharing with windows clipboard
XConvertSelection() in libX11 always returns 1, so there is no point in
testing it incorrectly against Success. This is possibly a bug in
XConvertSelection()
This should fix UTF8String and CompoundText selection via the clipboard.
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
commit 9657eae5d65eff289089afc46dfb629758ebbdf7
Author: Jon TURNEY <jon.turney@dronecode.org.uk>
Date: Sun Nov 1 18:18:51 2009 +0000
Cygwin/X: Clearly diagnose a timeout while waiting for SelectionNotify event
Clearly diagnose a timeout while waiting for SelectionNotify event
in the clipboard integration internal client.
(which seems to be behind some of the reported failures)
Turn useless #if 0/ErrorF()/#endif into useful winDebug()
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
commit 062f49a8e0d1afb4dd32e9451a47ab2792639e7f
Author: Jon TURNEY <jon.turney@dronecode.org.uk>
Date: Wed Nov 4 17:36:54 2009 +0000
Cygwin/X: Add a workaround for a SWT/Motif bug to internal window manager
SWT/Motif expects all top-level windows to get reparented, and waits until they
do. So workaround that in our internal WM by forcing a reparent event to
occur, even though we don't actually need to reparent the window to
frame it (as the frame is a native window, not an X window)
http://sourceware.org/bugzilla/show_bug.cgi?id=9848
https://bugs.eclipse.org/bugs/show_bug.cgi?id=36806
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
commit 71519a572fe15b85c0eb2b02636c9e871f2c858f
Author: Jon TURNEY <jon.turney@dronecode.org.uk>
Date: Wed Nov 4 17:34:40 2009 +0000
Cygwin/X: Fix typo in g_fAnotherWMRunning and tidy up WM detection code
Tidy up code for detecting another WM is already running
Fix typo g_fAnotherWMRunnig -> g_fAnotherWMRunning
Remove some unused event mask macros
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
commit f3fad371cce0f3836514ad5b29e59fa1ca0627a7
Author: Colin Harrison <colin.harrison@virgin.net>
Date: Wed Nov 4 15:33:53 2009 +0000
Xming: Add FORCEEXIT option to configuration file
Add a new option to configuration file: FORCEEXIT, like SILENTEXIT
but ignores the client count. Unsaved client work may be lost with
this option but it is useful if you want no dialogs.
Add description of this new keyword to XWinrc man page
Also fix grammar of the exit confirmation dialog warning to be correct
when there is only one(1) client connected.
Also rearrange yacc tokens to one per line to make future merges
easier
Also amend default system.XWinrc so that SILENTEXIT is on by default
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
commit 019a601de6a8ae083852c2d384c814dcc7aeeb72
Author: Colin Harrison <colin.harrison@virgin.net>
Date: Wed Nov 4 15:16:03 2009 +0000
Xming: Add mouse motion events with flag POINTER_SCREEN in winEnqueueMotion()
Add mouse motion events with flag POINTER_SCREEN in winEnqueueMotion(), as
they are in screen coordindates and may need to be scaled to the axis range
appropriately
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
commit 7af1240b57daa4ec55512276a9fda499d923eaa0
Author: Colin Harrison <colin.harrison@virgin.net>
Date: Wed Nov 4 14:20:17 2009 +0000
Xming: Replace all the uses of deprecated functions in hw/xwin with current ones
Replace uses of LookupIDByType() and SecurityLookupIDByType()
with dixLookupResourceByType()
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
commit 2a38f7c0dbc890e6408eee143d77719f265d583d
Author: Jon TURNEY <jon.turney@dronecode.org.uk>
Date: Fri Jun 19 21:12:55 2009 +0100
Cygwin/X: Remove a couple of extraneous '\n' in logged version info
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
commit 56658fc06cb773ed20ef1b23a3fe918c0d3b36bb
Author: Yaakov Selkowitz <yselkowitz@users.sourceforge.net>
Date: Thu Oct 15 22:40:02 2009 -0500
Set default font path with fontutil 1.1 and fontpath.d
Look for $sysconfdir/X11/fontpath.d and, if it exists, set it to the
default font path as a catalogue: entry. Based on app/xfs commit
c66a46e35ae40a23ad9acee838ab42300eddbd67.
Otherwise, use the font-util 1.1 macros to determine the system
fontrootdir and standard subdirectories, or let the user configure it
and the subdirectories themselves.
This adds a build-time (or at least an autoconf/autogen time) dependency
on font-util, and changes the --with-fontdir argument to --with-fontrootdir.
Signed-off-by: Yaakov Selkowitz <yselkowitz@users.sourceforge.net>
Reviewed-by: Alan Coopersmith <alan.coopersmith-xsfywfwIY+M@public.gmane.org>
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
commit c7d1319872e0ae0b7d945e9af8c4027ee5aa2055
Author: Adam Jackson <ajax@redhat.com>
Date: Mon Nov 9 11:12:22 2009 -0500
randr: Fill in errorValue when verifying outputs/crtcs/modes
Signed-off-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit d85ab6b6483d6ca7d9d22298d05ed1fa3076b042
Author: Dave Airlie <airlied@redhat.com>
Date: Tue Oct 13 10:15:00 2009 +1000
loader: actually stat something that has some chance of existing. (v2)
FindModuleInSubdir seems to expect a / at the end of the subdir its
finding for, so we add the / early, the stat will fail if its
not a subdir, I'm leaving the S_ISDIR in just in case there is another
reason it could return 0. This does look a bit silly in strace
but it seems to work fine.
I have a very intermittent issue where drivers loses its / that
I've been seeing on/off for a while, this may or may not fix it.
Signed-off-by: Dave Airlie <airlied@redhat.com>
Reviewed-by: Julien Cristau <jcristau@debian.org>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit a5e59230de3abafda9cd9d571cea192897155a14
Author: Adam Jackson <ajax@redhat.com>
Date: Thu Nov 5 13:44:30 2009 -0800
randr: Turn on ModeDebug during server setup
Signed-off-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit c61e77c77ca309f3676370992f41867807ed0c67
Author: Matt Turner <mattst88@gmail.com>
Date: Thu Nov 5 22:40:03 2009 -0800
Remove lnx_font.c and lnx.h
I couldn't find any version of the X xserver that ever used lnx_font.c
so let's delete it. I tried contacting its author, Egbert, multiple
times on IRC and email [*] but never got any response. It also hasn't
been seriously touched since January 2005.
[*] http://lists.x.org/archives/xorg-devel/2009-October/002855.html
Signed-off-by: Matt Turner <mattst88@gmail.com>
Reviewed-by: Tiago Vignatti <tiago.vignatti@nokia.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 15ffe9f51b122494a2b292b3ab1f199d3e81600c
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Thu Nov 5 18:28:28 2009 -0800
configure.ac: Notify user about which SHA1 implementation is being used
Signed-off-by: Jeremy Huddleston <jeremyhu@freedesktop.org>
commit 6b109919f6e1593b27b0760bb56a65b43fb86ea4
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Thu Nov 5 18:13:07 2009 -0800
SHA1: Add support for Common Crypto
libSystem on darwin can handle SHA1 computation without needing to pull in
OpenSSL. See CC_crypto(3)
Signed-off-by: Jeremy Huddleston <jeremyhu@freedesktop.org>
commit 840a68dc5e3b4d285894f86df2a8c41fca5a4bec
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Wed Nov 4 18:39:16 2009 -0800
XQuartz: Cleanup X11Controller.m compilation warnings.
Declare X11Controller as implementing NSTableViewDataSource.
Use selectRowIndexes:byExtendingSelection instead of selectRow:byExtendingSelection
Signed-off-by: Jeremy Huddleston <jeremyhu@freedesktop.org>
commit 0e3ad44c3b05cbe7b1d8f5ce7949fec3c7ae2e7c
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Wed Nov 4 18:15:08 2009 -0800
XQuartz: Use dixLookupResourceByType instead of LookupIDByType
Signed-off-by: Jeremy Huddleston <jeremyhu@freedesktop.org>
commit 069fc6ce0a0e7f2c418e11941568ffcc52b6b331
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Wed Nov 4 16:18:06 2009 -0800
XQuartz: Don't weed out duplicates in generated keymap
There seems to be an issue in the 1.5+ server where shift-space does not
produce a space when 'keycode 57 = space' but it does when 'keycode 57 = space
space'
Signed-off-by: Jeremy Huddleston <jeremyhu@freedesktop.org>
commit 6d6e8fb27f00f0c3128cef624b39a60aa754fdc8
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Wed Nov 4 13:34:20 2009 -0800
XQuartz: Controller thread launches clients
This avoids a memory leak due to no active auto-release pool on the server thread.
Signed-off-by: Jeremy Huddleston <jeremyhu@freedesktop.org>
commit f7b375bd141d0cf1e3add5443a5838dd8f554ef6
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Thu Nov 5 11:42:34 2009 -0800
Enable XF86PM on all Solaris platforms, not just x86/x64
Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit f77262513ea17401092479e17ad20fc0eb91ffb5
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Thu Nov 5 11:42:33 2009 -0800
Use $(MAKE) instead of "make" to build Solaris inline assembly
Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 964040764387d89ef64324cfbee31872ee6ce41c
Author: Tiago Vignatti <tiago.vignatti@nokia.com>
Date: Wed Nov 4 15:35:37 2009 +0200
EXA: Preserve pPixmap->devPrivate.ptr in exaPixmapIsOffscreen_driver
It crash the server when the drawable is 32 bit and the framebuffer is 16.
This is pretty much a copy-past from commit 8e873185.
Signed-off-by: Tiago Vignatti <tiago.vignatti@nokia.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 7442f3355ab8f0bb2b1a270da18c65d8d315d4dd
Merge: 0573042cdd 7897b6c2d4
Author: Keith Packard <keithp@keithp.com>
Date: Wed Nov 4 08:55:20 2009 -0800
Merge remote branch 'jeremyhu/master'
commit 0573042cddb6f9942e408687a16c6842e62a8bfa
Author: Rami Ylimaki <ext-rami.ylimaki@nokia.com>
Date: Wed Nov 4 15:59:30 2009 +0200
dix: Fixes a memory leak when a cursor resource is released.
Just open and close a client that creates cursors in order to
reproduce. In the problem case bits->refcnt is -1 and therefore
bits->devPrivates is never released.
Signed-off-by: Rami Ylimaki <ext-rami.ylimaki@nokia.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 7897b6c2d41bccb72c19418674c3526ecce29515
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Tue Oct 27 18:00:48 2009 -0700
dix: Properly detect if the other device is frozen
Signed-off-by: Jeremy Huddleston <jeremyhu@freedesktop.org>
commit 5e79976c13c5b94b12392b493846ca26be11750b
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Tue Nov 3 16:35:27 2009 -0800
XQuartz: Run xmodmap after programatically updating the keymap.
Signed-off-by: Jeremy Huddleston <jeremyhu@freedesktop.org>
Signed-off-by: Martin Otte <otte@duke.edu>
commit 412c56ef3332d09efbd861e41c3e985f44729729
Author: Maarten Maathuis <madman2003@gmail.com>
Date: Sun Nov 1 22:08:40 2009 +0100
exa: remove some outdated comment
- This comment is still in exa_driver.c and there it makes sense.
Signed-off-by: Maarten Maathuis <madman2003@gmail.com>
Acked-by: Michel Dänzer <michel@daenzer.net>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 48b8c076a7b7dbbddfc472e8c6e5251a0b174cbc
Author: Matthieu Herrb <matthieu@laas.fr>
Date: Mon Nov 2 11:11:24 2009 +0100
add libc as a choice for SHA1 implementation
On Sun, Nov 01, 2009 at 02:54:13PM -0800, Keith Packard wrote:
> Excerpts from Matthieu Herrb's message of Sun Nov 01 09:34:35 -0800 2009:
>
> > +AC_CHECK_FUNCS([SHA1Init], [HAVE_LIBC_SHA1=yes])
>
> I'd suggest AC_CHECK_FUNC instead; as far as I can tell, AC_CHECK_FUNCS
> will also define HAVE_SHA1INIT. Also, can you use HAVE_LIBC_SHA1
> consistently rather than having two separate names (HAVE_LIBC_SHA1 and
> HAVE_SHA1_IN_LIBC)? Yes, I know one is a preprocessor symbol and the
> other is a cpp shell variable, but I think that will work anyway.
>
New version taking you comments into account.
From: Matthieu Herrb <matthieu.herrb@laas.fr>
Date: Sun, 1 Nov 2009 18:19:27 +0100
Subject: [PATCH] Add a probe for SHA1 functions in libc in *BSD.
The interface is the same as the one in libmd.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit da923d0bc15e99a8ed1986bd6f5df37f7af7284b
Author: Matt Turner <mattst88@gmail.com>
Date: Sun Nov 1 14:30:48 2009 -0500
Make sys.c use unaligned access functions provided in compiler.
Favorite deleted line was definitely
/* to cope with broken egcs-1.1.2 :-(((( */
Signed-off-by: Matt Turner <mattst88@gmail.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit d30637339963950910e5f5fb755b8465ac7dddb4
Author: Mikhail Gusarov <dottedmag@dottedmag.net>
Date: Thu Oct 29 11:46:22 2009 -0700
Supply all code using dl*() with DLOPEN_LIBS
Previously DLOPEN_LIBS was managed in top-level configure.ac.
Instead bundle it with the code using dl*() functions to
avoid breakages in uncommon configurations.
Signed-off-by: Mikhail Gusarov <dottedmag@dottedmag.net>
Reviewed-by: Dan Nicholson <dbn.lists@gmail.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit ec98d7fc78efefcf9fc61492529157c0d289c3f2
Author: Adam Jackson <ajax@redhat.com>
Date: Mon Sep 21 10:23:16 2009 -0400
EDID: Extend the HDTV hack to handle "1368x769"
Hate televisions so much.
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit 7c0803f555782dbf451b7c79112d7deae02e5c9f
Author: Adam Jackson <ajax@redhat.com>
Date: Wed Oct 28 15:44:37 2009 -0400
modes: Fix duplicate detection, and do it more consistently
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit ba2d39dd5428cb5922b797a1d4ea45b859412b40
Author: Adam Jackson <ajax@redhat.com>
Date: Mon Oct 26 15:10:30 2009 -0400
modes: De-duplicate a clock range check.
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit 25236d19e6ef07fcb2c71569f1b7b0c12810834a
Author: Adam Jackson <ajax@redhat.com>
Date: Mon Oct 26 14:49:57 2009 -0400
EDID: Fix interlaced detailed timings to be frame size, not field size
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit fb86433d897c116315cc7994390d11ac2f577511
Author: Adam Jackson <ajax@redhat.com>
Date: Mon Oct 26 14:04:23 2009 -0400
modes: Decorate interlaced mode names with a trailing 'i'
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit fc2ec95664d55f45f77f1ebb039a7c17a1fcdaa3
Author: Ma Ling <ling.ma@intel.com>
Date: Wed Feb 18 17:41:26 2009 +0800
EDID: CEA extension support
Reviewed-by: Adam Jackson <ajax@redhat.com>
commit fab74d1081270fb8f1d231e6e10d10aa33e164da
Author: Jamey Sharp <jamey@minilop.net>
Date: Wed Oct 28 17:48:19 2009 -0700
Suppress certain GCC warnings in auto-generated code.
- Don't warn for references to deprecated functions in xorg_symbols.
- Ignore functions generated by gl_apitemp.py that are never used.
Signed-off-by: Jamey Sharp <jamey@minilop.net>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 239435875d6a92ed31731b500a992a3af0943594
Author: Jamey Sharp <jamey@minilop.net>
Date: Wed Oct 28 17:48:18 2009 -0700
Don't cast double to int: use default conversions or explicitly round.
GCC warns about casting a double return value to int.
Signed-off-by: Jamey Sharp <jamey@minilop.net>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit e8c48fd8f7aab54327b0091cd17c60235ae27168
Author: Jamey Sharp <jamey@minilop.net>
Date: Wed Oct 28 17:48:17 2009 -0700
Suppress GCC warnings like "the address of `u1' will always evaluate as `true'".
Signed-off-by: Jamey Sharp <jamey@minilop.net>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 662594aeff9d1767316f08600949c73ac5060d18
Author: Mikhail Gusarov <dottedmag@dottedmag.net>
Date: Thu Oct 29 00:40:48 2009 +0600
kdrive: Grab evdev mouse/keyboard devices when X server is active
Input events are directed to both vt and input devices by default.
Unless input devices are grabbed, keyboard events fill it vt buffers
and cause spontaneous wakeups in kernel tty layer when buffers are full.
Signed-off-by: Mikhail Gusarov <dottedmag@dottedmag.net>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 83d520d86c888f2c8a4abb18b7a8858d568aa18f
Author: Jamey Sharp <jamey@minilop.net>
Date: Wed Oct 28 16:45:44 2009 -0700
Add video driver flag to indicate that console access is not needed.
Existing video drivers will get the console enabled by default.
Signed-off-by: Jamey Sharp <jamey@minilop.net>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 25979c46b467847ccb54f5c86a1be6b9c303c99a
Author: Jamey Sharp <jamey@minilop.net>
Date: Wed Oct 28 16:35:28 2009 -0700
Alloc/free drawables array for each ProcPanoramiXShmGetImage call.
Updates my previous patch, b422b532f3dcab54c53f61a66f2ad76059d1874a.
keithp recommended against allocating the drawables array globally, but my
updated patch with that fixed isn't the patch that landed.
Signed-off-by: Jamey Sharp <jamey@minilop.net>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 757c11630d5999ad13dcac79191429badc92a3a6
Author: Tormod Volden <lists.tormod@gmail.com>
Date: Wed Oct 28 23:10:43 2009 +0100
xfree86: Fix description of DDC_QUIRK_DETAILED_USE_MAXIMUM_SIZE
The message ending up in the log is misleading as to what the quirk
actually does: It ignores the sizes in the detailed timings and
replaces them with the display "Max Image Size".
Signed-off-by: Tormod Volden <debian.tormod@gmail.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit ccf4a69db747b000aee09072aac0a2891bde139a
Author: Mikhail Gusarov <dottedmag@dottedmag.net>
Date: Thu Oct 29 01:54:00 2009 +0600
os: Add libsha1 as a choice of SHA1 implementation
There are small systems which don't need OpenSSL or gcrypt.
Add libsha1 (http://github.com/dottedmag/libsha1) as an alternative
small SHA1 implementation.
Signed-off-by: Mikhail Gusarov <dottedmag@dottedmag.net>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 8613e4b0eb04150b1e377871f02b164be5d001e9
Author: Mikhail Gusarov <dottedmag@dottedmag.net>
Date: Wed Oct 28 11:44:27 2009 -0700
Add missing DLOPEN_LIBS to kdrive compilation flags
Xfbdev failed to build due to dladdr being used by xorg_backtrace.
Explicitly add DLOPEN_LIBS to KDRIVE_LIBS as there does not
seem to be a better place for it.
Signed-off-by: Mikhail Gusarov <dottedmag@dottedmag.net>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit deb72fc61464250af8185dab2da8ee09f13c55d8
Merge: 55f4c80a4c a60e676f1f
Author: Keith Packard <keithp@keithp.com>
Date: Wed Oct 28 10:54:13 2009 -0700
Merge remote branch 'jcristau/sha1'
commit 55f4c80a4c891b355a99e6a05978ca945397c5cc
Author: Hans Nieser <hnsr@xs4all.nl>
Date: Wed Oct 28 06:59:40 2009 +0100
Xinput: allow non-integer values again for Constant- and AdaptiveDeceleration
This was initially fixed by commit 3932a848572f4eaf8b7f1d91d9b74aeafab069a2
but then (presumably not intentionally) undone by commit
1d54479cb3c8b4f75b7564f8b5e1c5da940b20f4 .
Signed-off-by: Hans Nieser <hnsr@xs4all.nl>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 50a5c32430a5267f2a05656d2417f9a8a44d8b97
Author: Jon TURNEY <jon.turney@dronecode.org.uk>
Date: Fri Oct 23 19:32:42 2009 +0100
dmx: Correctly compute DMXGetScreenAttributes reply length
Correctly allow for excess length of DMXGetScreenAttributes reply
over standard 32 byte reply in addition to the displayName string
when computing the length of reply
http://bugs.freedesktop.org/show_bug.cgi?id=24685
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Reviewed-by: Julien Cristau <jcristau@debian.org>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 9a2f6135bfb0f12ec28f304c97917d2f7c64db05
Author: Keith Packard <keithp@keithp.com>
Date: Fri Oct 23 10:04:57 2009 +0900
DRI2: Report the correct extension minor version
Signed-off-by: Aaron Plattner <aplattner@nvidia.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit d886008c96cd16f735f54dace070cb00b23c6f44
Author: Marcin Baczyński <marbacz@gmail.com>
Date: Thu Oct 22 14:43:25 2009 +0200
Kill compilation warnings.
Signed-off-by: Marcin Baczyński <marbacz@gmail.com>
Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 15b30fde179cba3877182cd51b0f870ef29ffaee
Author: Adam Jackson <ajax@redhat.com>
Date: Thu Oct 22 17:29:01 2009 -0400
dix: Fix up colormap fixup.
FindClientResourcesByType() will walk all colormaps on all screens; we
only want to fix up the current screen. Otherwise, screens > 0 will
have the visual pointers for their colormaps pointing off into space.
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit 3785475a78636eb6547ef9e46be9e009c7cf7800
Author: Keith Packard <keithp@keithp.com>
Date: Fri Oct 23 09:03:39 2009 +0900
Bump to 1.7.99.2 (unreleased)
commit 909df9beb3ddd02632f36ae682537280a6a8e5b4
Author: Jon TURNEY <jon.turney@dronecode.org.uk>
Date: Tue Oct 20 12:57:05 2009 +0100
Resolve an inconsistency between libX11 and Xserver over GetModifierMapping
libX11 ModMap.c believes that GetModifierMapping can never return an error
Xserver devices.c believes that GetModifierMapping can return an error if
the ModMap couldn't be generated
According to the protocol document I have, libX11 is right, so adjust the
server to send back an empty modmap if one couldn't be made...
http://bugs.freedesktop.org/show_bug.cgi?id=24621
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 9c48862ac1ac119b6cfb7e376533f53af6a857f4
Author: Keith Packard <keithp@keithp.com>
Date: Thu Oct 22 01:12:03 2009 +0900
Bump version to 1.7.99.1
This is a development snapshot for 1.8.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 26f4d8a2c12ff06c4beb06842cd8d9c0d9ddd4aa
Author: Keith Packard <keithp@keithp.com>
Date: Thu Oct 22 01:04:42 2009 +0900
Make sure dmx docs are built for distribution.
Ok, dmx docs are driving me slightly nuts. We probably shouldn't
include the built versions in the tarball, but we do, so this is an
attempt to make that work by having both the 'all' and 'dist' targets
depends on the doxygen output.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 4114854893ff57a1be525ec099a4b33e5f9963b1
Author: Keith Packard <keithp@keithp.com>
Date: Thu Oct 22 00:17:37 2009 +0900
Don't attempt to build hw/kdrive/sdl/Makefile anymore
With sdl removed, there's no way to build the sdl Makefile.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 4d333c5121818754356853724333eadec2dcd18c
Author: Keith Packard <keithp@keithp.com>
Date: Thu Oct 22 00:16:12 2009 +0900
Always check for doxygen so that distcheck gets dmx docs
make distcheck wants the built dmx documentation so that users don't
have to install doxygen. This means that even if dmx isn't built, the
docs need to be so that the tarball can include them.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 7e92bac5f769aca99bd20e21fe2811f0480b647b
Author: Keith Packard <keithp@keithp.com>
Date: Thu Oct 22 00:00:35 2009 +0900
Make sure HAVE_DOXYGEN is defined when not building dmx
The DMX docs are build using doxygen if present, so configure.ac
checks to see if that is available. However, when not building dmx
(the default), this conditional must still be defined to make automake
happy.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 1228e2d052f0bb98175c55c194340773b5fedb40
Merge: 08e7f62faf 52bc6d9449
Author: Keith Packard <keithp@keithp.com>
Date: Wed Oct 21 22:46:53 2009 +0900
Merge remote branch 'whot/master'
commit 08e7f62faf72540cb3a6f1023024c145f7fa1a23
Author: Keith Packard <keithp@keithp.com>
Date: Wed Oct 21 16:46:55 2009 +0900
Fix 'distcheck' to use host xkb files but install to build dir
'make distcheck' needs to read xkb files and write out compiled
versions as a part of the 'make check' phase. This patch passes
suitable options to the configure stage of the distcheck process to
read xkb files from the system location and write them to the
distcheck _inst directory.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 52bc6d944946e66ea2cc685feaeea40bb496ea83
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri Oct 16 11:03:09 2009 +1000
kdrive: Purge Xsdl
From the original Xsdl commit:
"sdl x server so that we can x-on-x the fb stuff for ease of debugging. if
anyone uses this in production, a big scary monster will eat them.
hrm, perhaps i should make it have a --i-know-what-i'm-doing
param that it doens't start without, heh"
That should be reason enough to not spend time maintaing it. Also, no more
elephants.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit f713f447a2110718dfc091380699362d76f0cd6c
Author: Lee Leahu <freedesktop-bugs@dyweni.com>
Date: Mon Oct 19 15:43:59 2009 -0500
dmxDestroyWindow() - must call the X's native DetroyWindow()
Don't really know why this section was disabled, but without it,
certain pPicture resources do not get free'd until later in the
FreeClientResources() process after the screen has been free'd -
resulting in seg fault.
With this patch, all resources normally free'd using vanilla X are
now also being freed correctly by Xdmx.
https://bugs.freedesktop.org/show_bug.cgi?id=24576
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 664a8e37fd83141974b772980f680b94e48b4f87
Author: Lee Leahu <freedesktop-bugs@dyweni.com>
Date: Sat Oct 17 00:45:44 2009 -0500
dmx: when setting up device axis, use the correct counter number
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 010d5e28655d619693632938e9e4325eef938295
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri Oct 16 10:01:13 2009 +1000
dmx: remove doxygen-generated files.
These can be recreated by simply running 'doxygen doxygen.conf' in
hw/dmx/doc. Some of the files do not exist anymore, these have been removed.
Some other files have a different naming scheme.
Doxygen warnings about missing links fixed, two warnings remain:
/home/whot/xorg/xserver/hw/dmx/dmxwindow.c:142: Warning: explicit link
request to 'dmxConfigureRootWindow' could not be resolved
/home/whot/xorg/xserver/hw/dmx/dmxwindow.c:119: Warning: explicit link
request to 'dmxConfigureScreenWindow()' could not be resolved
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit ff3e171568c8b604fc5eacd5f7e9b7ee9417f172
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri Oct 16 10:26:21 2009 +1000
xkb: don't conditionally include xkb-config.h.
If HAVE_XKB_CONFIG_H is ever undefined, we fail to build anyway.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 0b9dbd4bf2d1061514bebd28648538a5fc0b60e6
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri Oct 16 08:24:37 2009 +1000
Use the default XKB settings for dmx and kdrive.
Drop the dmx-specific defines, there's no reason to have separate ones
considering they're about as hardcoded as the default rules anyway.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit e08d8a2b043e5be821c5e8b2dbf37b09102b5d01
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu Sep 24 11:25:28 2009 +1000
kdrive: silence tslib compiler warnings
tslib.c: In function 'TslibInit':
tslib.c:157: warning: unused variable 'tsDev'
tslib.c:156: warning: unused variable 'inputent'
tslib.c:155: warning: unused variable 'inputdir'
tslib.c:154: warning: unused variable 'i'
tslib.c:154: warning: unused variable 'fd'
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 522ca8179ad2b2b935993f08c9382cd5ad1d8b2f
Author: Mikhail Gusarov <dottedmag@dottedmag.net>
Date: Tue Oct 20 04:18:01 2009 +0700
Remove unused LinuxFindPci and LinuxGetPciCfg
These two functions are not referenced from inside xserver.
Remove now-empty klinux.h too.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 63f4bf39170eb2262617ef2dc95fd6d337b9dad5
Author: Yaakov Selkowitz <yselkowitz@users.sourceforge.net>
Date: Mon Oct 19 13:07:26 2009 +1000
Fix make dist after 78c87bdad1feab91c2a39e01513b4b0826665f06
Signed-off-by: Yaakov Selkowitz <yselkowitz@users.sourceforge.net>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 2bd71a6db241924bd17ac9dd4aa38e7e563ee5c1
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Fri Oct 16 22:29:26 2009 -0700
Fix segfault when -extension XKEYBOARD is passed on the command line
Users should be told they can't disable XKB or XInput via error messages,
not core dumps.
Reported by T`2 on #xorg irc
Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit a32b2420d85f076282721afe005e85fff7d9837e
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu Oct 15 13:50:36 2009 +1000
kdrive: fix Xfake build by removing the old keysym stuff
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Acked-by: Yaakov Selkowitz <yselkowitz@users.sourceforge.net>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 7c31dd5db8b43c7796bf97a07e08213af5afd2ae
Author: Yaakov Selkowitz <yselkowitz@users.sourceforge.net>
Date: Thu Oct 15 04:24:25 2009 -0500
Remove CopyISOLatin1Lowered
This function was moved verbatim into libXfont-1.4, and it is not used
by the server or any drivers. Exporting it in both places leads to
multiple definition linking errors on Cygwin, where we need to use a
static libXfont due to poor weak-symbol handling.
Signed-off-by: Yaakov Selkowitz <yselkowitz@users.sourceforge.net>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 9bc4e88d84daf0f4faf0599b575675e74c75f4b8
Author: Yaakov Selkowitz <yselkowitz@users.sourceforge.net>
Date: Thu Oct 15 01:53:43 2009 -0500
Define ddxBeforeReset stubs in platform-neutral DDXs
XWin uses ddxBeforeReset, which is called in DIX. Other DDXs need to
define these in order to avoid an undefined symbol error at link time
when building alongside XWin. Xnest and Xvfb already provide empty stubs;
this does the same for Xdmx and the platform-neutral KDrive servers.
Also add a prototype to avoid a warning in all DDXs.
Signed-off-by: Yaakov Selkowitz <yselkowitz@users.sourceforge.net>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit a2f27b97900f335cd5f6a3e5bf8fa1d0ec9eb9ac
Author: Yaakov Selkowitz <yselkowitz@users.sourceforge.net>
Date: Thu Oct 15 01:53:42 2009 -0500
Remove duplicates from Xfake_LDADD
KDRIVE_LIBS already contains the libs in XSERVER_LIBS, so linking against
both leads to multiple-definition errors when linking on Cygwin.
Signed-off-by: Yaakov Selkowitz <yselkowitz@users.sourceforge.net>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit ed4c6bc79a797830895ad6c3601318b2d1c4bdcb
Author: Yaakov Selkowitz <yselkowitz@users.sourceforge.net>
Date: Thu Oct 15 01:53:41 2009 -0500
Fix XWIN_LIBS definition
Move XWIN_LIBS from XWIN=auto conditional to XWIN=yes conditional,
otherwise the build breaks if an explicit --enable-xwin is passed to
configure.
Also remove obsolete library values from the definition.
Signed-off-by: Yaakov Selkowitz <yselkowitz@users.sourceforge.net>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit bcd0c02cfd0707b5f8b1ca91dfbe4412df2c643e
Author: Yaakov Selkowitz <yselkowitz@users.sourceforge.net>
Date: Thu Oct 15 01:53:40 2009 -0500
Install SDK pkg-config and aclocal files only if XORG
Signed-off-by: Yaakov Selkowitz <yselkowitz@users.sourceforge.net>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 264ce9e8360374b3a43442c8bdea08abde705446
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Wed Oct 14 20:33:53 2009 -0400
xselinux: Use the now-exported IsPointerDevice() instead of a copy.
Signed-off-by: Eamon Walsh <ewalsh@tycho.nsa.gov>
commit 0ae1632be045bfbb288bb57190c830f94247460f
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Wed Oct 14 20:32:28 2009 -0400
dix: Export IsPointerDevice() and IsKeyboardDevice().
Makes the functions available to extmod for extensions to call.
Signed-off-by: Eamon Walsh <ewalsh@tycho.nsa.gov>
commit 6c2ae5fec552366e11ad64a27626eb5dec4becf0
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Tue Sep 22 13:31:49 2009 -0700
xselinux: switch from x_device to separate x_pointer and x_keyboard classes.
This will allow separate controls over pointer and keyboard without having
to relabel the devices to separate types.
Signed-off-by: Eamon Walsh <ewalsh@tycho.nsa.gov>
commit 4be354c4c2da5168b302601b91bd80cfaca7e193
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Tue Sep 22 13:18:44 2009 -0700
Remove some debug messages that trigger on XACE event delivery failure.
It is normal for XACE to deny an event delivery, so these log messages
shouldn't trigger when that happens. Just drop them for now.
Signed-off-by: Eamon Walsh <ewalsh@tycho.nsa.gov>
commit c4ffce4dc84a0a9d134a59b7e7765c99ed767e53
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Tue Sep 22 13:13:03 2009 -0700
xace: Relax permissions on XkbGetState from Read to Getattr.
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>
commit 0ff28319906eeb3f236acd72201c416ce01f2c6e
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Tue Sep 15 19:41:04 2009 -0400
xselinux: Stop special-casing QueryPointer access checks.
XACE has been changed to not return BadAccess on device read failures.
Thus, no need for this workaround code.
Signed-off-by: Eamon Walsh <ewalsh@tycho.nsa.gov>
commit 8502c06e19a4c00bf1311f54f9a365ee9e026e97
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Tue Sep 15 19:29:34 2009 -0400
xace: Fake return values on denials in input polling requests.
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.
Signed-off-by: Eamon Walsh <ewalsh@tycho.nsa.gov>
commit 0493935691e925ae137af7636fa15befa76c8b45
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Mon Aug 31 21:20:53 2009 -0400
xselinux: Factor out some dynamic array code into common helpers.
Signed-off-by: Eamon Walsh <ewalsh@tycho.nsa.gov>
commit ae8891ba0b63bfe6941a324e201d9ab7c645c0f3
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Mon Aug 31 18:46:23 2009 -0400
xselinux: refactor extension code into smaller files.
New files:
xselinux_ext.c: Extension init and request handlers.
xselinux_hooks.c: XACE hook functions and other callbacks.
xselinux_label.c: Object security-labeling code.
xselinuxint.h: Shared internal functions.
Signed-off-by: Eamon Walsh <ewalsh@tycho.nsa.gov>
commit a60e676f1fd243c78859440b87652f523d3f2ec1
Author: Julien Cristau <jcristau@debian.org>
Date: Wed Oct 14 23:51:22 2009 +0200
Add libgcrypt as an option for SHA1
Signed-off-by: Julien Cristau <jcristau@debian.org>
Reviewed-by: Rémi Cardona <remi@gentoo.org>
commit d2a6a395435919aff8943285f9cbfe6569a9728f
Author: Julien Cristau <jcristau@debian.org>
Date: Wed Oct 14 23:30:55 2009 +0200
configure: add --with-sha1={libmd,libcrypto} option
Signed-off-by: Julien Cristau <jcristau@debian.org>
Reviewed-by: Rémi Cardona <remi@gentoo.org>
commit 55516094947dd78ad2734bb784a2fb109b64c990
Author: Julien Cristau <jcristau@debian.org>
Date: Wed Oct 14 23:20:44 2009 +0200
Move SHA1 computation from render/glyph.c to os/
Signed-off-by: Julien Cristau <jcristau@debian.org>
Reviewed-by: Rémi Cardona <remi@gentoo.org>
commit 22b38f513c93c2f2aea5909878c3c9acae7d35c1
Author: Jon TURNEY <jon.turney@dronecode.org.uk>
Date: Sat Oct 3 12:44:50 2009 +0100
Cygwin/X: Avoid a potential null pointer dereference before input initialization
Avoid a null pointer dereference if WM_MOUSEMOVE occurred before
the input device had been initialized (a timing sensitive bug
occassionally seen during initialization)
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
commit 1b0dfd8dee639870725d3bd9b70c3bd589d09e5a
Author: Jon TURNEY <jon.turney@dronecode.org.uk>
Date: Tue Jul 21 02:23:21 2009 +0100
Cygwin/X: Make -logverbose affect the verbosity of logging to the log file
Make -logverbose affect the verbosity of logging to the log file, not just the
verbosity of logging to the console
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
commit 83d120b90482d356be730f63aead0f8e44a4e846
Author: Colin Harrison <colin.harrison@virgin.net>
Date: Thu Oct 1 14:47:22 2009 +0100
Xming: Fix various 'ISO C90 forbids mixed declarations and code' warnings
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
commit 78c87bdad1feab91c2a39e01513b4b0826665f06
Author: Colin Harrison <colin.harrison@virgin.net>
Date: Fri Sep 25 17:49:59 2009 +0100
Xming: Remove unused X-boxed icon resource
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
commit fdf7f7e95c852734c620f58df408a324902172cf
Author: Colin Harrison <colin.harrison@virgin.net>
Date: Fri Sep 25 17:46:40 2009 +0100
Xming: update .rc file
Remove the obsolete DISCARDABLE flag in the .rc file
Replace the obsolete DIALOG resource with DIALOGEX in the .rc file
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
commit 5ddfd9d0898629627e8ab10e65ea2e082be3af37
Author: Jon TURNEY <jon.turney@dronecode.org.uk>
Date: Sat Oct 3 13:07:23 2009 +0100
Cygwin/X: Don't build rootless extension code unless we need it
Only try to build rootless extension code if we really need it (i.e. mwextwm mode is enabled)
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
commit 25344ba7f7845654364d62bf15322b3b79465bd9
Author: Yaakov Selkowitz <yselkowitz@users.sourceforge.net>
Date: Tue Oct 13 20:14:58 2009 -0500
dolt: add Cygwin to supported platforms
Signed-off-by: Yaakov Selkowitz <yselkowitz@users.sourceforge.net>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 6e158003e80534ce007290f75c89d698aec1d00b
Merge: 2b14e14203 5e762f0e2f
Author: Keith Packard <keithp@keithp.com>
Date: Tue Oct 13 18:40:42 2009 -0700
Merge remote branch 'mattst88/master'
* mattst88/master:
[alpha] assume we have __NR_pciconfig_iobase
[alpha] don't return from void functions
Fix undefined symbols on alpha
Fix breakage on alpha caused by c7680befe5ae
Revert "alpha: kill xf86SlowBCopyToBus and xf86SlowBCopyFromBus"
commit 5e762f0e2f203b5121a3de3b9af3c8981b31a77f
Author: Matt Turner <mattst88@gmail.com>
Date: Tue Oct 13 20:42:14 2009 -0400
[alpha] assume we have __NR_pciconfig_iobase
The code path if we didn't have support has been broken since before we
switched to git.
The pciconfig_iobase syscall has been supported since 2000.
Signed-off-by: Matt Turner <mattst88@gmail.com>
commit 46785c04bca16f495af3ed8d685aee939a1a8f39
Author: Matt Turner <mattst88@gmail.com>
Date: Tue Oct 13 20:40:59 2009 -0400
[alpha] don't return from void functions
Signed-off-by: Matt Turner <mattst88@gmail.com>
commit 2b14e142039193ea854a02706662204f4f5f6db8
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Tue Oct 13 12:54:56 2009 -0700
Rootless: src drawable window can now be NULL
Fix a possible crash when pSrc->pDrawable is NULL.
Signed-off-by: Colin Harrison <colin.harrison@virgin.net>
Signed-off-by: Jeremy Huddleston <jeremyhu@freedesktop.org>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 5b91dfac6fbdf35288a4558638d4923e230ab8d3
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Tue Oct 13 12:54:11 2009 -0700
Rootless: Abstract some of the Xplugin specific stuff which has crept into rootlessWindow.c
The rootless extension now directly calls some Xplugin functions, and relies
on types defined in Xplugin.h, which isn't very abstracted :-)
This patch is a start at abstracting some of the Xplugin specific stuff which
has crept into rootlessWindow.c. This has been done in a pretty mindless fashion,
without much thought as to if the additions to the generic rootless interface are
the correct ones
There is some confusion as to if RootlesscolormapCallback() returns a Bool or
xp_error_enum value (not so abstact), but I have no way of checking, of finding
out if Xplugin actually checks the result :-)
Based on patches from Colin Harrison, Jon Turney and Yaakov Selkowitz
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Signed-off-by: Jeremy Huddleston <jeremyhu@freedesktop.org>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 72f5874434c0c015b671c492c1318f35f1793668
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Tue Oct 13 13:15:05 2009 +1000
dix: extend IsPointerDevice check to valuator-only devices.
A device with valuators but no keys is definitely a pointer device and needs
to be attached to the VCP. Otherwise, the class copying happens on the VCK
and the VCP isn't updated with the events that are to be sent through it.
This addresses the trigger for #24441, not the actual issue.
Jury is still out on valuator+key devices.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 1088073b11ed488c0df45af3867b900ef93c6fe1
Author: Michel Dänzer <daenzer@vmware.com>
Date: Fri Oct 9 11:31:44 2009 +0200
EXA: Fix exaTryDriverSolidFill() for solid source pictures.
Solid pictures have a NULL pFormat field, but their format is always
PICT_a8r8g8b8.
Signed-off-by: Michel Dänzer <daenzer@vmware.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 55305cf8db7787883bc80b7348eb626e609626f8
Author: Ben Skeggs <bskeggs@redhat.com>
Date: Fri Oct 9 16:08:15 2009 -0700
EXA: fix exaGetRGBAFromPixel to not loop forever on PICT_a8 picture
Easily reproducible by running "rendercheck -t fill".
It should be safe to just test against rbits for all colour components
as we should always have values for r/g/bbits for PICT_FORMAT_COLOR
formats.
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Signed-off-by: Michel Dänzer <daenzer@vmware
Signed-off-by: Keith Packard <keithp@keithp.com>
commit b375be9285c40467578fac2f1360c29a75306ab4
Author: Michel Dänzer <daenzer@vmware.com>
Date: Fri Oct 9 11:31:46 2009 +0200
composite: Revert changes from adding support for BGRA picture formats.
They were aimed towards a since abandoned approach for making radeon KMS work
on big endian machines, and Aaron Plattner pointed out that they break the
Composite extension when the X server runs in 16bpp.
Signed-off-by: Michel Dänzer <daenzer@vmware.com>
Tested-by: Aaron Plattner <aplattner@nvidia.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit c0a1bb511a4629bf5683d8a710dc4a1c577a5d44
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Wed Oct 7 22:10:55 2009 -0700
Fix make warning: overriding commands for target `dix.O'
Not only does automake generate unnecessary rules for dix.O on platforms
for which SPECIAL_DTRACE_OBJECTS is false, it generates duplicate sets
when "if SPECIAL_DTRACE_OBJECTS" is nested inside "if XSERVER_DTRACE"
Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
Acked-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit b0dd6be2c8703f7062d45ac9fd646550c7d54e3b
Author: Jamey Sharp <jamey@minilop.net>
Date: Thu Oct 8 13:38:44 2009 +1100
Cast small-int values through intptr_t when passed as pointers
On 64-bit systems, int and pointers don't have the same size, so GCC gives
warnings about casts between int and pointer types. However, in the cases
covered by this patch, it's always a value that fits in int being stored
temporarily as a pointer and then converted back later, which is safe.
Casting through the pointer-sized integer type intptr_t convinces the
compiler that this is OK.
Signed-off-by: Jamey Sharp <jamey@minilop.net>
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
commit b680a89262efcfef4644adb4a61ae42ea0db0c93
Author: Jamey Sharp <jamey@minilop.net>
Date: Thu Oct 8 13:38:01 2009 +1100
Fix GCC warnings in xorg_backtrace
Signed-off-by: Jamey Sharp <jamey@minilop.net>
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
commit 9bf2ff4faf730913de3073f346646a8727be41d4
Author: Jamey Sharp <jamey@minilop.net>
Date: Thu Oct 8 13:36:44 2009 +1100
Fix "possibly uninitialized" warnings in glx
In both functions, "answer" was uninitialized if "compsize" was 0, but in
that case __GLX_SEND_VOID_ARRAY(compsize) results in a call to
WriteToClient for 0 bytes, which returns immediately without examining the
"answer" argument. So initializing to a null pointer is as good as
anything else.
Signed-off-by: Jamey Sharp <jamey@minilop.net>
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
commit b422b532f3dcab54c53f61a66f2ad76059d1874a
Author: Jamey Sharp <jamey@minilop.net>
Date: Thu Oct 8 13:29:27 2009 +1100
Remove static MAXSCREENS limit from Xext/shm.c
Dynamically allocate per-screen data in the SHM extension, instead of
having a single static-sized array.
Signed-off-by: Jamey Sharp <jamey@minilop.net>
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
commit 4df3e8c8053d9d4b3043f339a73d0de97020d884
Author: Martin Ettl <ettl.martin@gmx.de>
Date: Thu Oct 8 13:27:30 2009 +1100
Resource leakage: 0 is a valid file descriptor
When testing if an fd is valid, the required construct is >= 0, not > 0.
[Daniel: Fixed up the Linux MTRR case as well.]
Signed-off-by: Martin Ettl <ettl.martin@gmx.de>
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
commit 4151a13c80f3afa43f88afcf19a7aeb16dace93a
Author: Francisco Jerez <currojerez@riseup.net>
Date: Mon Oct 5 02:39:03 2009 +0200
dix: Fix a double free in dixFreePrivates.
It can be reproduced when the server is regenerated and for some
reason the private keys are reassigned in a different order: a
manually allocated private may get an index formerly used by a
preallocated private. In that case it will first be manually freed and
then again by dixFreePrivates, as items[i].size was never zeroed
out. Do it in dixResetPrivates.
Signed-off-by: Francisco Jerez <currojerez@riseup.net>
Acked-by: Eamon Walsh <ewalsh@tycho.nsa.gov>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 34eddbbb73bb16395dba0818247909c1b4bee4c2
Author: Michael Cree <mcree@orcon.net.nz>
Date: Wed Oct 7 18:33:29 2009 -0400
Fix undefined symbols on alpha
Signed-off-by: Matt Turner <mattst88@gmail.com>
commit 44efcdde501d54ca9c3e33ab5b1f699956fc3f9f
Author: Jamey Sharp <jamey@minilop.net>
Date: Wed Oct 7 09:07:03 2009 -0700
Fix overlay detection when matching Xv adaptors across screens.
Signed-off-by: Jamey Sharp <jamey@minilop.net>
Acked-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 68304215e25876ee639015969b4f07e1c9c515e0
Merge: 6676f49e34 315aaef557
Author: Keith Packard <keithp@keithp.com>
Date: Tue Oct 6 22:41:42 2009 -0700
Merge remote branch 'alanc/master'
Conflicts:
configure.ac
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 315aaef55750a863c08a16ad9120ffb76f9b48e0
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Fri Oct 2 21:54:53 2009 -0700
Use $(AM_V_GEN) to silence more commands when AM_SILENT_RULES is active
Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
Reviewed-by: Eric Anholt <eric@anholt.net>
Acked-by: Dan Nicholson <dbn.lists@gmail.com>
Acked-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 2e294380b64b6362173d0590c4292f290e50af50
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Fri Oct 2 16:51:24 2009 -0700
Migrate to xorg macros 1.3 & XORG_DEFAULT_OPTIONS
Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
Reviewed-by: Eric Anholt <eric@anholt.net>
Acked-by: Dan Nicholson <dbn.lists@gmail.com>
Acked-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 4b0911565d18b1aefca564315d0f1b9b4a17aa65
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Mon Oct 5 16:52:19 2009 -0700
Add platform tests for Dtrace linker magic
Replaces special handling for Xquartz DDX and scales better to handling
the multiple platforms that now have some level of Dtrace support available.
Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com>
commit 8c51b886400c5962b31ff565771be1b01a3ca8fb
Author: Julien Cristau <jcristau@debian.org>
Date: Tue Oct 6 16:08:42 2009 +0200
configure: quote argument to m4_pattern_forbid
Without this, configure spits out
../configure: line 15460: ac_fn_c_check_member: command not found
Also anchor the pattern to make it stricter.
Signed-off-by: Julien Cristau <jcristau@debian.org>
Signed-off-by: Dan Nicholson <dbn.lists@gmail.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 6ee61578ddb9f880ef12bbe9c3671d7dd53f2809
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Mon Oct 5 17:27:27 2009 -0700
Remove shave now that automake-1.11 has AM_SILENT_RULES
Revert "Add shave so that we can see the steaming piles of warnings generated."
This reverts commit 181cc08c8908a119fc403f970dea8cc98d3e0b9b.
shave was left in the xserver 1.7 release/branch to allow developers &
distros time to transition to automake-1.11. xserver 1.8 series will
require automake-1.11 for silencing build noise.
Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit d5d960f57834f16164457dab2e80290717dbf2cd
Author: Kim Woelders <kim@woelders.dk>
Date: Fri Oct 2 19:31:15 2009 +0200
render: Fix clip region translation in miClipPictureSrc().
Signed-off-by: Kim Woelders <kim@woelders.dk>
Reviewed-by: Soren Sandmann Pedersen <sandmann@redhat.com>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit d2118c8ca94fc7bcb8e0de547e63cf022f53a8a9
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Mon Oct 5 15:31:54 2009 +1000
xfree86: remove log-spamming DebugF
All input drivers use xf86PostKeyEventP indirectly now and have been since
it exists. I guess that qualifies it as tested - no need to spam the logs.
Reported-by: Felix Wenk
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
commit bf116057c7efd43c247c93f2f5d733a5db857cc9
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Mon Oct 5 10:44:43 2009 +1000
Require libXtst >= 1.0.99.2 and libdmx >= 1.0.99.1
libXtst requirement is already implicit since we require xextproto 7.1 and
that doesn't go well with pre 1.0.99.2 versions of libXtst. Nonetheless,
list it explicitly.
Since d0440275108920f5cb5d630f55fc9a3320c496d3 we require dmxproto 2.2.99.1.
Complementing that is libdmx 1.0.99.1 with the dmxext.h header file.
Reported-by: Mark Rosenstand
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 9625f6d328d6f516520930227b218979309938bc
Author: Matt Turner <mattst88@gmail.com>
Date: Tue Oct 6 20:58:30 2009 -0400
Fix breakage on alpha caused by c7680befe5ae
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>
commit aa07957373fd7cbe67458a001e4afd6a7f1ea37f
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Mon Sep 28 12:20:03 2009 +1000
Revert "alpha: kill xf86SlowBCopyToBus and xf86SlowBCopyFromBus"
The vesa driver still uses slowbcopy_frombus and slowbcopy_tobus.
This reverts commit 5ef53a94ce4e48e11de26290cd677266308640c8.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 6676f49e34f8db7ef5767a6dbf6c2a4d2087f79c
Author: Julien Cristau <jcristau@debian.org>
Date: Tue Oct 6 16:08:42 2009 +0200
configure: quote argument to m4_pattern_forbid
Without this, configure spits out
../configure: line 15460: ac_fn_c_check_member: command not found
Also anchor the pattern to make it stricter.
Signed-off-by: Julien Cristau <jcristau@debian.org>
Signed-off-by: Dan Nicholson <dbn.lists@gmail.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit a0363bf7b135d816e73849c91fa53d98fd6072d1
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Mon Oct 5 17:27:27 2009 -0700
Remove shave now that automake-1.11 has AM_SILENT_RULES
Revert "Add shave so that we can see the steaming piles of warnings generated."
This reverts commit 181cc08c8908a119fc403f970dea8cc98d3e0b9b.
shave was left in the xserver 1.7 release/branch to allow developers &
distros time to transition to automake-1.11. xserver 1.8 series will
require automake-1.11 for silencing build noise.
Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
commit cbc886a3513079c084fb7ce47b87c3e5bba19f3f
Author: Kim Woelders <kim@woelders.dk>
Date: Fri Oct 2 19:31:15 2009 +0200
render: Fix clip region translation in miClipPictureSrc().
Signed-off-by: Kim Woelders <kim@woelders.dk>
Reviewed-by: Soren Sandmann Pedersen <sandmann@redhat.com>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit bd7430a32e63df8cd60352764744076448ee623f
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Mon Oct 5 15:31:54 2009 +1000
xfree86: remove log-spamming DebugF
All input drivers use xf86PostKeyEventP indirectly now and have been since
it exists. I guess that qualifies it as tested - no need to spam the logs.
Reported-by: Felix Wenk
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
commit 1a2dde3335864abfbbc133dbc709f564272dd540
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Fri Oct 2 20:44:19 2009 -0700
Set XQUARTZ to no on non-Darwin OS'es
Fixes build with dtrace probes on Solaris after efacd7bfd08ffc0725de6f639c6afbf3b2f6c9fe
Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com>
commit c629e0fc50dfaffaa40a56709da7f035c289fed2
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Mon Oct 5 10:44:43 2009 +1000
Require libXtst >= 1.0.99.2 and libdmx >= 1.0.99.1
libXtst requirement is already implicit since we require xextproto 7.1 and
that doesn't go well with pre 1.0.99.2 versions of libXtst. Nonetheless,
list it explicitly.
Since d0440275108920f5cb5d630f55fc9a3320c496d3 we require dmxproto 2.2.99.1.
Complementing that is libdmx 1.0.99.1 with the dmxext.h header file.
Reported-by: Mark Rosenstand
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 24e640e1fa6cfb3917ba90dcdabf1fadddff20aa
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Fri Oct 2 19:20:24 2009 -0700
XQuartz: Fix a possible minor memory leak
commit c4886fbabc1d8b4054654b227fcad83f58e8e798
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Fri Oct 2 18:58:35 2009 -0700
XQuartz: Send mouse location with scroll events.
This fixes the problem where (0, 0) was sent as the mouse location with scroll
button events causing the event to not reach the client.
commit 4c6bfa2c09ae2b0cffdf9211a6dfbcaefe0366b5
Author: Ian Romanick <ian.d.romanick@intel.com>
Date: Thu Oct 1 10:39:19 2009 -0700
GLX: More clearly document the GLX protocol version handling
Signed-off-by: Ian Romanick <ian.d.romanick@intel.com>
Acked-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 45f447dafded5adfe11b7df3325c2d8f6ae0639b
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu Oct 1 21:19:11 2009 +1000
dix: force a minimum of 0 for screen coordinates.
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>
commit 64fe5784b49347e1fd27b0c463be5c16557594c9
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri Oct 2 09:34:24 2009 +1000
configure: if xnest was requested but modules weren't found, fail.
Tested-by: Xavier Chantry <shiningxc@gmail.com>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Acked-by: Julien Cristau <jcristau@debian.org>
commit 3ebb82d61c2b56e8f7145443a552a4e913bbfc80
Author: Dave Airlie <airlied@redhat.com>
Date: Thu Oct 1 15:25:55 2009 +1000
rotate: drop unwrapping inside block handler.
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>
commit cb54cf1b3e8c4109541cfb698542c00f2473e731
Author: Dave Airlie <airlied@linux.ie>
Date: Wed Sep 30 11:33:16 2009 +1000
glx: fixup deref of null pointer when glx screen init fails.
I think this is what the original author wanted.
Signed-off-by: Dave Airlie <airlied@redhat.com>
Acked-by: Ian Romanick <ian.d.romanick@intel.com>
commit 3d7cf468df96c0130a862f0d93fec990b9110c2f
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Thu Oct 1 11:58:18 2009 -0700
XQuartz: Update version strings to be X11R7.5 and the bundle 2.5.0
Is fink really _still_ relying on this X11R7.x version string?
commit 85b831f701d085e514afcf8a5ce9b11f8a57984e
Author: Julien Cristau <jcristau@debian.org>
Date: Thu Oct 1 17:27:11 2009 +0200
xfree86: fix xorg.conf manpage formatting error
commit 9bc7cbf9c02656982c2525836b5498993f708e02
Author: Nirbheek Chauhan <nirbheek@gentoo.org>
Date: Tue Sep 29 22:35:06 2009 +0530
xkb: check permissions on XKM_OUTPUT_DIR
Checking just for root is insufficient since that does not guarantee write/read
permissions in XKM_OUTPUT_DIR (for example with sandbox).
Check if we can write a file, as well as read it later. Otherwise, invoke the
fallback to /tmp
Signed-off-by: Nirbheek Chauhan <nirbheek@gentoo.org>
Signed-off-by: Rémi Cardona <remi@gentoo.org>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 622fc98fd08aba98369e6933c3ab8c9ff85385d5
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu Oct 1 10:03:42 2009 +1000
render: Fix crash in RenderAddGlyphs (#23645)
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>
commit 758ab55d2defc78d0169fd61a7036eb9f889e9e7
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu Oct 1 15:22:19 2009 +1000
render: set the glyph picture to NULL by default.
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>
commit b5fcc5553eb784c9f4826936e839079c0cdee55a
Author: Michel Dänzer <daenzer@vmware.com>
Date: Thu Oct 1 15:17:11 2009 +1000
exa: avoid infinite loops if UTS sw fallbacks.
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>
commit db98b26ee145f70e732e2cf4a6ac3de77fdf4adc
Author: Keith Packard <keithp@keithp.com>
Date: Wed Sep 30 11:40:19 2009 -0700
Re-fix DGA removal.
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>
commit 873467adad479be02cd9cc6b43685919f5612d91
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Wed Sep 30 00:22:02 2009 -0700
XQuartz: Set the proper bitmap for key repeats...
XkbSetRepeatKeys lies and doesn't do what it says it will...
commit 7bef78e199a4e4f7916be506807513efcd8fd4cb
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Tue Sep 29 23:40:47 2009 -0700
xkb: Use XkbPerKeyBitArraySize instead of hardcoded value of 32
commit 4970666827e65424ee17ccf6341ff84aac974383
Author: Kim Woelders <kim@woelders.dk>
Date: Tue Sep 29 20:31:45 2009 +0200
dix: Fix potential memory corruption in doListFontsWithInfo.
Signed-off-by: Kim Woelders <kim@woelders.dk>
Reviewed-by: Keith Packard <keithp@keithp.com>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 6ffda5aae75272fabdc27d6f693ae827be119e95
Author: Dave Airlie <airlied@redhat.com>
Date: Tue Sep 29 11:49:09 2009 +1000
dix/glx/composite: consolidate visual resize in one place.
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>
commit ad5c0d9efa47476ed5cf75c82265c73919e468b4
Author: Ian Romanick <ian.d.romanick@intel.com>
Date: Tue Sep 29 16:43:43 2009 -0700
GLX: Enable GLX 1.4 on DRI2
Return the minimum GLX version supported by all screens. Assume that
DRI2 screens have all the required features for GLX 1.4. Assume that
everyone else can only support GLX 1.2.
Reviewed-by: Kristian Høgsberg <krh@redhat.com>
Reviewed-by: Jesse Barnes <jbarnes@virtuousgeek.org>
commit f11a356bcef1bc0a6440325019d5967b745a42dd
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Mon Sep 28 17:05:29 2009 -0700
XQuartz: Cleaned up keymap setting for easier maintenance
(cherry picked from commit b9dfed9e88389cbd29406a20d38ee4297638649b)
commit f3223c71cfc638e695981e527517d48ea00d124d
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Mon Sep 28 23:01:59 2009 -0700
XQuartz: Remove the redundant xquartz_resetenv_display
unsetenv(DISPLAY) takes care of this for us anyway
(cherry picked from commit d2263645d839c9edeedea0835d26f1f41b37f70e)
commit 9b98b883227ed23d5470e8de689afeec4a0fd742
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Mon Sep 28 17:47:31 2009 -0700
XQuartz: Query the BundleIdentifier from the bundle in X11.bin rather than using the configure option.
This lets X11.bin drop into any .app ... the Info.plist and Xquartz binary need to have it hardcoded still.
(cherry picked from commit 9ad16b8e50b13eb6d0cd20386d07aa8d7320f671)
commit 11817a881cb93a89788105d1e575a468f2a8d27c
Author: Michel Dänzer <daenzer@vmware.com>
Date: Tue Sep 29 08:56:59 2009 +0200
Fix ShmPutImage non-ZPixmap case.
Fixes http://bugs.freedesktop.org/show_bug.cgi?id=23298 .
commit 19be992d9dc542b61fa3f4fd32a09071c9e64880
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Mon Sep 28 14:18:45 2009 +1000
ephyr: if -parent is given, check for a trailing -screen. (#24144)
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>
commit efacd7bfd08ffc0725de6f639c6afbf3b2f6c9fe
Author: Ben Byer <bbyer@freedesktop.org>
Date: Sun Sep 27 10:35:53 2009 -0700
Add (ok, fix) support for DTrace under OS X
(cherry picked from commit 8428a57184f542941d2c8c90e97d18e111a69dd2)
commit b3415187e92960cbff784108b5a3a8d130dc34c5
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Sun Sep 27 23:09:51 2009 -0700
Rootless: Correct border rendering on parent-relative windows
Resurected code from the punted RootlessPaintBackground/Border and added it conditionally to miPaintWindow
(cherry picked from commit cf2e3312cff3f341e9edba8c321a4ca7ffd8748e)
commit 6df00917cab5c1096070625385fd76ee6c52e0f1
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Sun Sep 27 23:00:59 2009 -0700
XQuartz: Fix QuartzSetCursor to match the expected prototype.
(cherry picked from commit dadab5a2279a19dcf709402d7f22f0cd48670db0)
commit 67a51cd9ef60b4c9f25fdde84f9eb352936c8c67
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Sun Sep 27 22:57:25 2009 -0700
XQuartz: Fix a bunch of compilation warnings about style
(cherry picked from commit 54000bdcbca52a2de31f7c1a1147de6d8e9dbbb8)
commit 96780eaf32636c94a9cf33f22eb9f01d984ff754
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Sun Sep 27 22:29:49 2009 -0700
XQuartz: Nuke TSM
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.
(cherry picked from commit 29cb904e4de2411a9b6dbe68694954788f0525f7)
commit 15e15816a2f011d0aeeaff9e394d30a147c973ce
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Sun Sep 27 22:26:22 2009 -0700
XQuartz: Fix inverse map from mode_switch to alt
(cherry picked from commit de6cee11e1c335a0e5f708e7641e81d3cfe52529)
commit 558d803b2966c2e44345a80e635e091dc3e49f02
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Sun Sep 27 18:25:57 2009 -0700
XQuartz: Force a keymap resync on the first keypress to workaround XKB mucking with our keymap.
We need to find a better way to work with XKB on this.
(cherry picked from commit ceaa5c779ceed3de5ea53727649613be3133b24e)
commit 226b1033b48807fd6871ba626e20ef1411904939
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Sun Sep 27 17:08:12 2009 -0700
XQuartz: Transition from xEvent based mieq to InternalEvent
(cherry picked from commit a3dbde2de87ee4f577748a8c447501a3ea462559)
commit 0c2731596f27f2cdf5000ba41de37e7eb86ad6f9
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Mon Sep 28 15:07:48 2009 +1000
Put tests for zero-sized strings in quotes (#24060)
X.Org Bug 24060 <http://bugs.freedesktop.org/show_bug.cgi?id=24060>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 83023ffd09a84ff48e6b99f57ebad101a00478db
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Mon Sep 28 13:59:25 2009 +1000
xfree86: use the DDC size if either width or height of DisplaySize is bogus.
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>
commit f772014c435f56db56520ca13ffa39431684f122
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Wed Sep 23 10:53:51 2009 +1000
render: Plug a memory leak in AddGlyph. (#23286)
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>
commit 3db28f92b0c810b452506abbed299a204c90ba0b
Author: Tilman Sauerbeck <tilman@code-monkey.de>
Date: Thu Sep 24 12:57:02 2009 +0200
configure: make XNEST default to auto.
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>
commit 78ad6ca9a97440b74019c00a28144ea7d1e03431
Author: Samuel Thibault <samuel.thibault@ens-lyon.org>
Date: Sun Sep 27 17:30:23 2009 +0200
xfree86: Hurd fix
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>
commit fb7938315bed9d4cb5641ee9acebf78a13bc109e
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Sun Sep 27 09:48:43 2009 -0700
Xi: Make CopyKeyClass X_HIDDEN to avoid ugly ifdef-fu
(cherry picked from commit 6d436e17a9ae7f4ce8537f3fabc052d4f07ca75f)
commit a2cd21177859eb45320a94c96dde7d9058ab7650
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Sat Sep 26 23:41:45 2009 -0700
XQuartz: Stop checking version numbers of the bundle because CFBundleGetVersionNumber is gimpish
(cherry picked from commit 9f5bdd89608ec12012592ff395b82e954fbb4da8)
commit fbfbf93405222322571e15e78dea57c8f2755eae
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Sat Sep 26 22:52:39 2009 -0700
XQuartz: Add pressure/tilt property labels
(cherry picked from commit 84ea67130ef6b4086042aad6036ce66f93ea3e56)
commit 65f14840898dd7e9d61d8c966f3ff11ae3e82d4f
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Sat Sep 26 22:48:49 2009 -0700
XQuartz: Fix a brain-o array indexing problem
/bop Peter
(cherry picked from commit 494a6b046a258ad83dc98eb92b7c3d8f1d2626bb)
commit 7159381881e5da33a49e8735811b93cbfe4f681e
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Sat Sep 26 22:17:09 2009 -0700
XQuartz: Nuke duplicate locks that make painful headaches
(cherry picked from commit 1dd56322bd1722f2427fb2d833c5608248b60cf0)
commit fba8c702ba6aa8fac27682e0838fd744e197d54f
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Sat Sep 26 22:13:49 2009 -0700
Xi: CopyKeyClass is not static for XQuartz
(cherry picked from commit 85d6402354cdf143c6490f2725744c2f08b5605b)
commit dc1e1bebff8b9d1eb6196dfd4b2f52f1e4200efa
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Fri Aug 7 00:02:21 2009 -0700
XQuartz: Use internal xshm header for new xextproto
(cherry picked from commit 1755239330c0bdac820d88a3e06ff391d65f29be)
(cherry picked from commit 697be460d0e555e2c75eed6889293650e02d423c)
commit 73ae547d5e687ef10dea45801fc627e10ac4b659
Author: Michel Dänzer <daenzer@vmware.com>
Date: Sun Sep 27 02:08:10 2009 +0200
EXA: Fix mixed pixmaps crash with missing / failing UploadToScreen hook.
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 .
commit c9ec2bab2f258798fd6e6676698c732f09571a60
Author: Kevin E Martin <kem@redhat.com>
Date: Sat Sep 26 13:10:54 2009 +1000
dmx: undefine MITSHM, move undefs to miinitext.c.
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>
commit fc9d733bab3ff0e4e51b19c73b66196dca563a70
Author: Kevin E Martin <kem@redhat.com>
Date: Sat Sep 26 13:09:52 2009 +1000
dmx: reshuffle linker order to avoid errors when MITSHM is undefined.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit e7c2598f565e8252dd66ee3e6212b310856476cb
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri Sep 25 14:53:33 2009 +1000
dmx: core events are always in screen coordinates when passed to GPE.
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>
commit 43a2eb794f19a2ba56d653f465fc5f6b2ff0d3d3
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Wed Sep 23 21:49:11 2009 +1000
configure: Unify all library defines that require a specific version.
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>
commit 9bd08c690fc687c4d69bb70536f3079a9184476d
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu Sep 24 14:07:26 2009 +1000
Xi: update axisVals with the right subpixel data.
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>
commit abb8108fb44cc9b08fe4ae7d805a0a22564ca6bb
Author: Michel Dänzer <daenzer@vmware.com>
Date: Sat Sep 26 02:05:24 2009 +0200
EXA: Only calculate cache position once for each glyph.
commit c11678cc189551f2a01eaa7a63969c16950739b4
Author: Michel Dänzer <daenzer@vmware.com>
Date: Sat Sep 26 02:05:06 2009 +0200
EXA: Accumulate arbitrary number of glyphs without flushing.
commit 0369eeeb6bf8a808fa2df503fc8b8df81e6e07b8
Author: Michel Dänzer <daenzer@vmware.com>
Date: Sat Sep 26 02:04:48 2009 +0200
EXA: Try to minimize UploadToScreen calls for mixed pixmaps.
If there are several software fallbacks affecting the system memory copy of the
same pixmap, only copy the results back to the driver pixmap when it's used for
acceleration again, or in the BlockHandler, whichever happens first.
commit 1818cbd70fc1f2e1487b4c678e67e28f1265c0ef
Author: Michel Dänzer <daenzer@vmware.com>
Date: Sat Sep 26 01:59:39 2009 +0200
EXA: Extend mixed pixmaps scheme to allow driver PrepareAccess hook to fail.
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.
commit e23bffc41b007f1bc2b8f5cd4ac54213062c95cc
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Tue Sep 15 19:17:48 2009 -0700
Fix build of unit tests when dtrace probes are enabled
ar loses the dtrace probe magic when building static libraries, so we
have to link with the .O files in order to resolve the dtrace probe symbols.
Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
commit 9fa73be9fa543a686ea35c861084f5af37d44caa
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Tue Sep 22 20:34:54 2009 +1000
Require libXext >= 1.0.99.4
Reported-by: Tilman Sauerbeck
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit a9c274df5c37cb4ece6449e934342d8ff8e61705
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Wed Sep 23 11:43:27 2009 +1000
kdrive: plug two memory leaks when freeing the KdKeyboard/Pointer.
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>
commit fd913136732ff14a0484ca28f60ac1fbf49be81d
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Wed Sep 23 11:44:12 2009 +1000
dix: plug memory leak in DeviceEnterLeaveEvents.
'event' must be freed before exiting.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 6ee796e9bb4e46782b50a69c7b4fa5b49576f139
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu Sep 24 14:05:52 2009 +1000
Xi: fix length calculation for ValuatorState in QueryDeviceState reply.
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>
commit 3b5bbb149d4c932d9624336f5cbe9fe71c87bea3
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Wed Sep 23 12:32:44 2009 +1000
configure: fix up tslib check once again.
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>
commit 5402f18d9c3f7ba19cc05b3a814e3a9e94c8d551
Author: Thomas Jaeger <thjaeger@gmail.com>
Date: Tue Sep 22 20:16:21 2009 -0400
dix: report XI1 axis values correctly if first_valuator != 0
Signed-off-by: Thomas Jaeger <ThJaeger@gmail.com>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 33bf9cb69dccbb6889b2f83e6db61f40dc644e17
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Wed Sep 23 17:41:28 2009 -0700
XQuartz: GLX capabilities: Allow 16bit accumulation buffers
http://xquartz.macosforge.org/trac/ticket/308
(cherry picked from commit e9e63a2118b76b6c31c4081fec08a99e4d796e22)
commit ce1fe8ddb4a4dbe6cfd909e5b1b73b459d742bec
Author: Michel Dänzer <daenzer@vmware.com>
Date: Wed Sep 23 13:10:05 2009 +0200
render: Don't add b8g8r8x8 format for depth 24.
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.
commit 096f21bb7a1217443d8a03529b1a2938518eb24f
Author: Michel Dänzer <daenzer@vmware.com>
Date: Wed Sep 23 08:24:06 2009 +0200
EXA: Fix some issues pointed out by clang.
Remove dead variables, fix use of uninitialized values, that kind of thing.
commit 824a09d856a5f750694e11d2fd2faaa3de705eaa
Author: Simon Thum <simon.thum@gmx.de>
Date: Mon Sep 21 15:23:27 2009 +0200
dix: move bounds check before access
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 9edb9e9b4dde6f73dc5241d078425a7a70699ec9
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Tue Sep 22 12:56:17 2009 +1000
Bump to 1.7.99.1
X Server 1.7 has branched off.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 66ece3bfb19642bf0f1ef73c3caa8a99c3dfb5a9
Author: Kevin E Martin <kem@redhat.com>
Date: Tue Sep 22 11:42:24 2009 +1000
dmx: only free the default pixmaps that we actually allocated.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 20fb8c2e2fccb28c1b89e6e2a5c685e1287baedb
Author: Kevin E Martin <kem@redhat.com>
Date: Tue Sep 22 11:41:33 2009 +1000
dmx: disable Get/SetWindowPixmap, we don't support composite/redirected windows
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit fcdc1d78cca3b8bb6b77d53eda7e21d649df6943
Author: Keith Packard <keithp@keithp.com>
Date: Mon Sep 21 19:16:59 2009 +0200
Fix sporadic segfault on resume due to accidentally freeing cursor.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 91e1fe5863a180b2d70a6943e83b98bbd4c9ebce
Author: Matthias Hopf <mhopf@suse.de>
Date: Mon Sep 21 19:13:31 2009 +0200
Revert fe31f9c + 977953b to fix issue for good.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 90aa0e4a49cdd637178a771365e1e8dab8bceb87
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri Sep 18 10:03:02 2009 +1000
input: don't use typecasts to access members of InternalEvent.
To avoid confusion, the member names are now postfixed with _event.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 693d4fdb1c7b7c789a812790122454e718602449
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Tue Sep 22 11:13:58 2009 +1000
Xext: switch mbuf.c to dixLookupResourceByType
Resolves a linker error caused by LookupIDByType.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 493d2f9c2fc56dd3b4c03451c07cd25e3012142e
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Tue Sep 22 11:05:07 2009 +1000
Xext: remove DisplayImageBuffers from mbuf.c
Not referenced by anything.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit fff40b3353c7025c1d1e3dd14b5c78f7c9f5de7c
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Tue Sep 22 10:53:47 2009 +1000
Xext: fix up multibuffer compiler errors.
Triggered by the xextproto 7.1 change, fixed by moving the matching
declarations from the header file to here.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 4c8f834da6c8c84849313453fe223a8165c6afc0
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Mon Sep 21 14:52:31 2009 +1000
configure: fix up check for tslib.
Reduce the tslib-check to the pkg-config check only instead of the previous
library symbol check followd by a pkg-config check.
This patch also reduces the required version of tslib back down to
tslib-0.0. Unfortunately, the 1.0 tarball available through
http://tslib.berlios.de/ still announces itself as 0.0.2.
Reported-by: Werner Landgraf
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 977953bf14858d17c22208c848854ddbe7e86527
Author: Matthias Hopf <mhopf@suse.de>
Date: Mon Sep 21 15:44:00 2009 +0200
Less intrusive workaround for sporadic segfault on resume.
Hopefully fixes fdo #24010 (memleak).
commit 55747d256d759850141e4a9c4dec965616a31dc8
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri Sep 18 16:27:54 2009 +1000
input: define server-supported protocol versions in one single file.
include/protocol-versions.h specifies each extension version as supported by
the server and sent back on the wire to the client.
This fixes up several issues with the server potentially reporting a higher
version of the protocol if recompiled against a newer version of the
protocol.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Acked-by: Rémi Cardona <remi@gentoo.org>
Acked-by: Julien Cristau <jcristau@debian.org>
commit 0b7c6c728c2e2d8433a188315cc591308a89cd85
Author: Keith Packard <keithp@keithp.com>
Date: Fri Sep 18 21:12:17 2009 -0700
xfree86/modes: Remove all framebuffer support from DGA
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.
Signed-off-by: Keith Packard <keithp@keithp.com>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit d3a3c904e5e3b5e8bb3c51ca6a563880ff589bf3
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Mon Sep 21 09:41:46 2009 +1000
configure: resourceproto is optional.
Although a --disable-xres flag is provided, resourceproto was listed in
REQUIRED_MODULES since 2005 (5b218617fa8ba52bf65aef35da39e06c662495e6).
Remove, make conditional on the xres flag only.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit b9ae1b91f316a98eb3bbefe1fc61f3e0faa861e0
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Mon Sep 21 09:22:53 2009 +1000
dmx: silence 'implicit declaration of function ‘XFixesSetPictureClipRegion’
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit aa71e268f55ac39351814ab6840196c4f58bad39
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri Sep 18 11:35:47 2009 +1000
Xext: silence 'warning: no previous prototype' for sync, bigreq and xcmisc.
xcmisc and bigreq don't have their own header so just declare it here to
shut up the compiler.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 00dfe69aab786ea650b41dfefc031f0e0fc72b0c
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu Sep 17 14:48:51 2009 +1000
randr: reply with the server or client version, whichever is lower.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 8b75d0f9d347d7c3aad1e53809e0a2bed03b92fc
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu Sep 17 14:17:54 2009 +1000
render: reply with the server or client version, whichever is lower.
Protocol requires that the lower of [server version, client version] is
returned to the client.
The other part of the issue discussed in reply to [1] remains.
[1] http://lists.freedesktop.org/archives/xorg-devel/2009-September/001990.html
Reported-by: Julien Cristau
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 20ccc66708bcd55372bff03fa0d78a7846e8c82d
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Sun Sep 20 21:12:31 2009 +1000
xfree86: silence warning: ‘ramplen’ may be used uninitialized
'ramplen' is only set and used if stuff->size > 0 but the compiler doesn't
pick that up.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 2df10a49867635c341b1d1a9faadf4dbae043a0f
Author: Keith Packard <keithp@keithp.com>
Date: Thu Sep 17 18:14:38 2009 -0700
RRDestroyOutputProperty: Free randr property valid values
These were leaked when the property was destroyed.
Signed-off-by: Keith Packard <keithp@keithp.com>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit d3a84906c00b8fe4a4e33fa89bff3ed66ceafdec
Author: Keith Packard <keithp@keithp.com>
Date: Thu Sep 17 18:14:37 2009 -0700
Free randr crtc and output pointer arrays
All of the crts and outputs were freed, but not the arrays full of
pointers to them.
Signed-off-by: Keith Packard <keithp@keithp.com>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 6086a6065666fb9ded5d99919ddfa51c66b76246
Author: Keith Packard <keithp@keithp.com>
Date: Thu Sep 17 18:14:36 2009 -0700
xf8CrtcSetModeTransform: free adjusted_mode name too
The adjusted mode was freed, but any name allocated for that was leaked.
Signed-off-by: Keith Packard <keithp@keithp.com>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 088107827347cee05a6e5317bcebdbc282b9a3bc
Author: Keith Packard <keithp@keithp.com>
Date: Thu Sep 17 18:14:35 2009 -0700
LoaderSortExtensions: free graph nodes
Signed-off-by: Keith Packard <keithp@keithp.com>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit d5959d37cd36895898786e4ea5bf72c480b79832
Author: Keith Packard <keithp@keithp.com>
Date: Thu Sep 17 18:14:34 2009 -0700
Free libpciaccess iterator in xf86PciProbe
Signed-off-by: Keith Packard <keithp@keithp.com>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit ded35b7bf7a5ad27de152476c657a56a4f232800
Author: Keith Packard <keithp@keithp.com>
Date: Thu Sep 17 18:14:33 2009 -0700
xf86Xinput.c: get DIX event queue pointer once at InitInput time
The DIX event queue is allocated before InitInput is called, so fetch
the pointer there and not randomly at other times. This avoids failing
to fetch the pointer sometimes during server regen and then smashing
memory through the stale pointer from the previous server generation.
Signed-off-by: Keith Packard <keithp@keithp.com>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 54f15a414130f89832b5c2604b0b44e7e4c6709f
Author: Keith Packard <keithp@keithp.com>
Date: Thu Sep 17 18:14:32 2009 -0700
probe_devices_from_device_sections: don't leak list of devices
xf86MatchDevice returned malloc'd storage containing the list of
devices to look at; make sure that gets freed.
Signed-off-by: Keith Packard <keithp@keithp.com>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 8b5086250aa5dae8de8b763408ff480d7beac819
Author: Keith Packard <keithp@keithp.com>
Date: Thu Sep 17 18:14:31 2009 -0700
Eliminate bogus event resizing.
Now that all event queues hold internal events only, they never need
to be resized. Resizing them led to memory corruption as they would
get sized for an appropriate xEvent, not an internal event.
Signed-off-by: Keith Packard <keithp@keithp.com>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit c7987660fd665f32406b14db7078a3f5f7b76e9c
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu Sep 17 15:33:19 2009 +1000
xfree86: fix up wrong use of OptionRec for AutoAddDevices andAutoEnableDevices
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 971d4eac1274db78efa546ea50ca5e01a80bbd81
Author: Thomas Jaeger <ThJaeger@gmail.com>
Date: Sat Sep 19 15:48:30 2009 -0400
Xext: include security protocol header instead of client header
Signed-off-by: Thomas Jaeger <ThJaeger@gmail.com>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit a62664bc07b35aedb6b11b984c94341deb4486ca
Author: Thomas Jaeger <ThJaeger@gmail.com>
Date: Sat Sep 19 16:01:52 2009 -0400
Bump fixesproto requirement to 4.1
Signed-off-by: Thomas Jaeger <ThJaeger@gmail.com>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 2a890d85e923e1da0331b02e58e95f98b11f5de0
Author: Thomas Jaeger <ThJaeger@gmail.com>
Date: Sun Sep 20 01:31:59 2009 -0400
fixes: Make sure invisible cursor is inialized with zero src/mask
This fixes a regression introduced in 9040dab76182d1a019ca7fef7b29733d2c199e61.
Signed-off-by: Thomas Jaeger <ThJaeger@gmail.com>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 2bb3f0c87119e73157141431d7c00ab104d4b34b
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri Sep 18 10:27:14 2009 +1000
xfree86: remove now unused variable
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 1888d7d3e3ae81b5cb23e3a0852317362c8e215a
Author: Carl Worth <cworth@cworth.org>
Date: Fri Sep 18 10:39:19 2009 -0700
configure: Fix broken quoting for initialization of REQUIRED_MODULES
A recent change switched to C-style automatic string concatenation,
(presumably for better readability and maintainability), but this
doesn't actually work for the shell. So we revert to the previously
working initialization.
This commit reverts one hunk of c947605eda082fbca0821efc0cc14fec8f958fd0
commit 4982bbc3b49b1b61e63a8461ea803e41318c8187
Author: Tiago Vignatti <tiago.vignatti@nokia.com>
Date: Fri Sep 18 12:36:11 2009 +0300
xfree86: vgaarb: missing wrapping macro
Signed-off-by: Tiago Vignatti <tiago.vignatti@nokia.com>
commit af1af50de621bc451e6413fa5602ae5db2dc9809
Author: Martin-Éric Racine <q-funk@iki.fi>
Date: Fri Sep 18 09:33:37 2009 +0300
xserver: added more Geode oddities to xf86AutoConfig.c
commit ec0ad408ef8d5a2cf7a2bd65d13de3ef3147308c
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu Sep 17 16:01:29 2009 +1000
xfree86: use SendDevicePresenceEvents instead of manual event handling.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit d0440275108920f5cb5d630f55fc9a3320c496d3
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Wed Sep 16 10:58:52 2009 +1000
Require dmxproto 2.2.99.1
This requirement was introduced in code with commit
e85775aa64d1e9322c82090a26256af5e1fede0a.
Reported-by: Marvin Schmidt
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit c947605eda082fbca0821efc0cc14fec8f958fd0
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Tue Sep 15 15:05:27 2009 +1000
configure.ac: move all protocol requirements to a single location.
Protocol requirements were spread throughout configure.ac, leaving us with a
few locations where one DDX asked for a different version of the package
than another.
For each protocol, define <NAME>PROTO="[<name>proto >= version]" and
assemble REQUIRED_MODULES based on these.
Future changes to protocol versions need to only be done in a single place.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 4d6b20c25af5f590f19530b6c007e3648a8037c3
Author: Shunichi Fuji <palglowr@gmail.com>
Date: Wed Sep 16 12:02:00 2009 +1000
dri: use noPanoramiXExtension directly.
xf86LoaderCheckSymbol() is never useful if using externed variable directly.
noPanoramiXExtension will be just used through dlopen() like other extension modules.
Signed-off-by: Shunichi Fuji <palglowr@gmail.com>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 3853314d13b503684c9922715323f8033febe5de
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Thu Sep 17 08:11:27 2009 -0700
Fix typo in Xephyr man page
Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
commit 2edf967b00963559552d061bb98b15243d978279
Author: Dave Airlie <airlied@redhat.com>
Date: Thu Sep 17 15:24:01 2009 +1000
xserver: SIGIO option handling was incorrect.
reported by a user on #radeon when DRI1 broke.
Signed-off-by: Dave Airlie <airlied@redhat.com>
commit 715953bf5c00b4605dd6ab45c92140c0e81174ee
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Tue Sep 15 21:13:00 2009 -0700
Check for -wrap support in the linker
Allows unit tests to be built with non-gnu-linkers that
also have -wrap support
Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit e2c64551808988657069006f74c6780973ec0557
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Tue Sep 15 21:13:48 2009 -0700
Add configuration option for use of SIGIO handlers for input events
Boolean option to enable/disable SIGIO handlers is set by the first
of these found:
- UseSIGIO option is set in xorg.conf ServerFlags
- Default set at build time by ./configure --enable-use-sigio-by-default
- Platform default value: Solaris = no, all others = yes
This matches the current settings on all platforms except Solaris.
This reverts Solaris (for now) to the settings used in Xorg 1.6, before
SIGIO support for Solaris was added, due to some system level bugs that
won't be resolved in time for Xorg 1.7 release, but allows us to enable
when those are resolved (or when we need to test if they're resolved).
See http://bugs.opensolaris.org/bugdatabase/view_bug.do?bug_id=6879897
Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 3bdf36476179257561b9409c3f49a77640fbb9f9
Author: Matthias Hopf <mhopf@suse.de>
Date: Wed Sep 16 16:03:46 2009 +0200
Work around sporadic segfault on resume with intel/KMS due to cursor->bits == NULL.
Apparently SavedCursor is sometime tried to be set while already being set.
commit fe31f9c646bc26163497f29c3b833c090df0b3f9
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Mon Sep 14 19:51:23 2009 -0700
Change xf86dristr.h includes to use xf86driproto.h instead
Clears warnings about obsolete headers, but raises minimum
required version of xf86driproto to 2.1.0
Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 159e03204093991ccd4133133c50c0cae88c828f
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Tue Sep 15 11:39:09 2009 +1000
dmx: don't include panoramiXsrv.h if building w/o Xinerama
Reported-by: Marvin Schmidt
Tested-by: Marvin Schmidt
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit f56cbe1ef24415d0142b9a7d0ab0a031069ccb52
Author: Rémi Cardona <remi@gentoo.org>
Date: Mon Sep 14 17:09:59 2009 +0200
dix: append "built-ins" to the font path in SetDefaultFontPath
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.
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>
commit 139368f7ae192b592e24d013e8ca5ce4175effe1
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Tue Sep 15 17:53:50 2009 -0700
Fix num_masks/length overflow test for XiSelectEvents
Have to set windowid to a valid value first, since that check
appears earlier in the code than the masks/length check.
Also have to have data[] set large enough so that reading mask
data for 0xFFFF masks doesn't overflow past the end of the array
into uninitialized data.
Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 13decf5efe76e735a003227c951e58a41e36a8b5
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Tue Sep 15 13:54:51 2009 -0700
test_convert_XIRawEvent: Don't write more data than the struct holds
sizeof(in.valuators.mask) * 8 == 40, but the valuators arrays only
holds 36 entries, so the test was smashing the stack when 36 < i < 40
(leading to core dumps on Solaris x86, since the return address was
overwritten with an invalid pointer).
Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 38a61e9a7cf616e26a79dba815bf67737317d1eb
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Tue Sep 15 13:54:50 2009 -0700
Remove stray semi-colon in protocol-common.c
Caused Sun compilers to issue warning:
"protocol-common.c", line 141: warning: syntax error: empty declaration
Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit e320736c457ea7b2f19a4c7c2dfc0c461d0dd405
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Mon Sep 14 19:51:22 2009 -0700
Fix module path in xorg.conf man page
Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 49b98d092ec3d032e657eeff62c22fce243b1e8b
Author: Tiago Vignatti <tiago.vignatti@nokia.com>
Date: Thu Sep 10 17:52:33 2009 +0300
xfree86: vgaarb: rework wrapping function
No semantical changes.
Signed-off-by: Tiago Vignatti <tiago.vignatti@nokia.com>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 422cd7a674e6831f40be14ee853bd946cb62eadc
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Mon Sep 14 13:52:53 2009 -0700
XQuartz: pbproxy: Remove debugging XBell()
(cherry picked from commit 1fd7c1fd4740393a32e261af33e64c19be48ca9a)
commit 663807ce0e65b51537540bb95fbf3c18988c04c7
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Mon Sep 14 16:44:52 2009 +1000
xserver 1.6.99.901 (xserver 1.7 RC1)
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit f450be999268d118b384c04ea070c87ad48c4c59
Author: Soeren Sandmann <sandmann@daimi.au.dk>
Date: Fri Sep 11 04:03:06 2009 +0200
Add xoff and yoff to drawable->x and drawable->y in create_bits_picture().
These are 0, except when the drawable is a redirected window.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 2b00afec4b5b51851aee4cb0fba7baff3e10ef3f
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Mon Sep 14 15:59:41 2009 +1000
Update xorg.conf man page & sample for changes in Xorg 1.7
AllowMouseOpenFail description changed to reflect actual behaviour
and point to AllowEmptyInput for previously described behaviour.
Update default DPMS mode timeouts to match new defaults set
in April 2009 by commit d52fddefaeb43f15b677eefbea4a288a9948373b
Update autoloaded module list to match ModuleDefaults in xf86Config.c
Update module subdir list to match stdSubdirs in loadmod.c
Add xorg.conf options that were added to the code:
- XkbDir option added in February 2009
by commit 76f18b94bd2719a8199334742d021c4d0806187d
- DRI2 option added in April 2008
by 35982bc109d424c464551ab22ec90af69908c884
Remove xorg.conf options that were removed from the code:
- XkbDisable option was removed in January 2009
by commit 40877c6680863bd6a8475f2bb0c54df55bcf0b0e
- PciProbe/Config options were removed in August 2008
by commit fdf7c747a8e1bc59dfb31b7f90dd5eab2687315b
- EstimateSizesAggressively was removed in August 2008
by commit cd1e8f26147919227e7624ac4c6b313d972a4d35
- loadable font modules were removed in July 2008
by commit affec10635343668839994ea2bac16c1d4524200
- ModInDev options were removed in December 2008
by commit 6de6ffff35ac03d49fa61de195d4a0605e0ef8bf
(Also strips some trailing whitespaces to make git happier.)
Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit b6f5c54fc61588c638b987bde914b0e5ff9b655e
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Mon Sep 14 15:49:01 2009 +1000
xfree86: Change default font path to match configure.ac's --default-font-path.
Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 23dc4678e9333ba0ee1a5374521905fa3f4f309c
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Mon Sep 14 14:14:27 2009 +1000
dmx: use top_builddir, not top_srcdir to get libxfixes.la
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Tested-by: Byeong-ryeol Kim <brofkims@gmail.com>
commit 4650e6ebe6e3ea48a026ace60b25daa165580467
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Mon Sep 14 12:00:18 2009 +1000
xkb: drop key presses for already repeating keys. (#23889)
The event sequence for continuously pressed keys with the keyboard driver is
PRESS - PRESS - PRESS - ... - RELEASE.
The first press sets the repeatKey to the keycode and the matching timer.
The second press (on the same keycode) can be silently dropped instead of
overwriting the timer again.
X.Org Bug 23889 <http://bugs.freedesktop.org/show_bug.cgi?id=23889>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Acked-by: Daniel Stone <daniel@fooishbar.org>
commit c626a5578aa16c17ef68c1b15ed53828080d9d90
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Sun Sep 13 17:35:51 2009 +1000
xfree86: fix VT_WAITACTIVE control flow (#11477)
Move misplaced } to get the flow of
if (!ShareVTs) {
VT_ACTIVATE
VT_WAITACTIVE
}
X.Org Bug 11477 <http://bugs.freedesktop.org/show_bug.cgi?id=11477>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Acked-by: Daniel Stone <daniel@fooishbar.org>
commit d3c66d6b69c04466b8388586090dc48a0aad7684
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Mon Sep 14 08:03:17 2009 +1000
dix: FindChildForEvent needs init child to None.
silences compiler warning:
events.c: In function 'FixUpEventFromWindow':
events.c:2262: warning: 'child' may be used uninitialized in this function
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit e85775aa64d1e9322c82090a26256af5e1fede0a
Author: Kevin E Martin <kem@redhat.com>
Date: Mon Sep 14 08:01:56 2009 +1000
Include <X11/extensions/dmx.h> and remove _DMX_SERVER_ define.
Fixes build with newer dmx header files that have been split between dmx.h
and dmxext.h. _DMX_SERVER_ is no longer needed with the split headers.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 232d43510e0f9f780a9f8eb857366e03acf2fcdc
Author: Kevin E Martin <kem@redhat.com>
Date: Mon Sep 14 08:00:42 2009 +1000
dmx: Make description match default option.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 6389a190faa7c06bdedfd1cc3acb280ebb5cc04a
Author: Tiago Vignatti <tiago.vignatti@nokia.com>
Date: Sat Sep 12 21:47:51 2009 +0300
shave: use CC tag variable on libtool
This fix scratchbox compilation.
Signed-off-by: Tiago Vignatti <tiago.vignatti@nokia.com>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit dfb106c846c880a06fa5caada92f45576eab7b00
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Tue Sep 8 18:09:12 2009 +1000
configure: re-enable dmx build (default=auto)
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 72607960c136894c4533a54cef7a9be64246f1a3
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Wed Sep 9 11:02:22 2009 +1000
dmx: Remove some dead code.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 88187ad889ab707fcae3f64890cdb291b567ec23
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Wed Sep 9 11:02:18 2009 +1000
dmx: purge DMX EQ leftovers
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit f3aaa46f27f802233e54b3c70ba827e0fcca2605
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Wed Sep 9 09:51:45 2009 +1000
dmx: formatting fix to improve readability
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 7a588c833e87dd07f167b9885d5ec43dde271ebe
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Tue Sep 8 18:14:43 2009 +1000
dmx: Default rules are now base, not xfree86
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 33243ae971db90477a29dfb0e51cc00c95e561bc
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Tue Aug 4 17:04:08 2009 +1000
dmx: include xfixes lib, reshuffle include order to resolve linker errors.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 2d46678762b12c9746fc8f89821c15705680ba35
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Tue Sep 8 17:46:06 2009 +1000
dmx: remove dmx-internal event queue.
The EQ is in the DIX now.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 545f11139d600febf1c5fd46b11bea4352b82c32
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Tue Sep 8 17:14:53 2009 +1000
dmx: compiler warning fix (mixed declarations + code)
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 7d703af74ced36968f4480507a7eb54d249b5edc
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Tue Sep 8 17:13:38 2009 +1000
dmx: get the state from XKB for dmxCheckSpecialKeys
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 6e52f9233176986508356f6eee4fce86ba740e71
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Tue Sep 8 17:10:22 2009 +1000
dmx: fix dmxKeySymToKeyCode to work with mandatory XKB.
Approach taken is inefficient, it converts the xkb symbol table to a core
symbol table first and then extracts the keycode from there.
Consider this a todo for a rainy afternoon when the beer fridge demands
emptying.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 61ae0a5ca5de24590f444c405445124404ba9753
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Tue Sep 8 17:05:12 2009 +1000
dmx: fix up dmxKeyCodeToKeySym for XKB-only.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 9caba3e2abceda0a1ff4ad4bf05708f0166c2218
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Tue Aug 4 15:12:25 2009 +1000
dmx: fix two calls to InitKeyboardDeviceStruct.
Takes RMLVO now instead of the keysyms directly.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 29b9a10dad1ca780dc90f4f1f63fd11fd7d1221b
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Tue Aug 4 15:04:45 2009 +1000
dmx: XkbComponentNamesRec doesn't have a keymap field anymore.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit a6f3f6a63ae76afbe01eb9049a63609476d2ed4d
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Tue Sep 8 16:43:04 2009 +1000
dmx: switch lnx-input and usb-input over to xkb-only.
kbd*Convert are nearly identical, it just asks for merging. Not today
though.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 5d81aee5f75e80ae9d3ac7cb32d293ade62d6c5c
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Tue Aug 4 15:24:02 2009 +1000
dmx: include xkbsrv.h to silence compiler.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 4da59f478686fa7e80a3837bf9fa61672c13c50b
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Tue Sep 8 16:30:36 2009 +1000
xkb: split effectiveGroup calculation into separate utility function.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 8fb3fa28a5a1b36cdaad38055a607400828b9e1c
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Fri Sep 11 11:21:26 2009 -0700
compiler.h: include <string.h> before using memmove()
Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
commit d908ee6e549fd8ff653e2c58e9637df347540ef9
Author: Tiago Vignatti <tiago.vignatti@nokia.com>
Date: Thu Sep 10 20:56:18 2009 +0300
Revert "Make sys.c use compiler.h unaligned access functions"
This reverts commit 1b30545c04a51bfa3ff95a26d64962907a62ff15.
Signed-off-by: Tiago Vignatti <tiago.vignatti@nokia.com>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 281ebb453d2f5254e057a24e580dafa9abf82305
Author: Tiago Vignatti <tiago.vignatti@nokia.com>
Date: Thu Sep 10 17:52:32 2009 +0300
xfree86: vgaarb: close and cleanup vga arbiter
So far there are no apparently issues on not closing the fd. But let's do the
right job here.
Signed-off-by: Tiago Vignatti <tiago.vignatti@nokia.com>
Acked-by: Dave Airlie <airlied@redhat.com>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit e62549b8d61cd739adbbd04487d96fe706da1370
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Wed Sep 9 16:03:38 2009 +1000
Xext: don't try to initialize XTEST device properties if they failed.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 744cdc897746dca86f5ab9e57be982621c2f0986
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Wed Sep 9 15:05:15 2009 +1000
dix: Remove two _X_EXPORT defines from the function definition.
These two are defined _X_EXPORT in their declaration anyway.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 9871f9be4e5b184b151ce93458b2578cc8c7b962
Author: Martin-Éric Racine <q-funk@iki.fi>
Date: Wed Sep 9 13:43:45 2009 +0300
Use lowercase PCI vendor ID for NSC.
commit f4350c66b493d63fa06be87caa958d7033232ea4
Author: Daniel Stone <daniel@fooishbar.org>
Date: Wed Sep 9 15:48:33 2009 +1000
fbdevhw: Test for graphics:fb%d as well as graphics/fb%d
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>
commit 72f6be540840b46aa4b158b98fac11a6f90dc9d1
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri Sep 4 11:13:55 2009 +1000
xfree86: remove now unused xf86CrtcShadowClear
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 1f24638985ce053b696ca3359cc50b5bc26ccb03
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Wed Sep 9 09:28:46 2009 +1000
kdrive: output meaningful error message for HAL devices.
kdrive ignores all devices from hal as they don't have the 'type' option
set. Instead of "Unrecognised device identifier!" print out "Ignoring
device from HAL." to indicate that the errors surrounding the device don't
really matter.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
commit ae812bb79668e59cda1f851fb1fabe9db9ea705f
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Tue Sep 8 13:53:26 2009 +1000
Xnest: set the default pointer accel to the host's values (#10013)
The defaultPointerControl holds compile-time defaults for pointer
acceleration. If an Xnest instance is started, it resets the hosts pointer
accel values to these built-in defaults instead of using the host values.
This patch queries the host for the values before initializing the device,
thus leaving the host values untouched.
X.Org Bug 10013 <http://bugs.freedesktop.org/show_bug.cgi?id=10013>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 97e3f4316b1c917f93d324f05d3a4551c1d051a3
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Tue Sep 8 09:55:22 2009 +1000
dix: auto-float SD's with SendCoreEvents "false"
AlwaysCore and SendCoreEvents specify whether a device is to send core
events. A device that has either disabled is not supposed to send core
events.
With MPX/XI2, a device that is attached automatically sends core events when
the event is routed through the master device. Floating a slave device
disables core events by breaking the route.
This patch automatically floats devices that have coreEvents disabled in the
xorg.conf/HAL. This replicates the behaviour of a SendCoreEvents "false"
device in server 1.6 and earlier.
The devices may still be reattached to a master at runtime.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 447bd4ce90113037a489ce55d9878523fe5294c7
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Mon Sep 7 16:02:50 2009 +1000
kdrive: fix sdl build by removing old keySymsRec references.
These are set in kinput now through InitKeyboardDeviceStruct.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit d8aadfa5af85ce6613289efe119e592aa687ab03
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Mon Sep 7 15:04:33 2009 +1000
dix: remove unused and half-broken code to restore original classes.
In theory, the MD should change back to its old, original classes when the
last SD is detached. Thanks to the XTEST devices, we'll always have an SD
attached until the MD is removed. So let's not worry about that and do
nothing instead of having some code that's essentially untested.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit e9a507acca01234de189f0f64da63bac32dc13fd
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Mon Sep 7 15:59:37 2009 +1000
kdrive: remove xkb member from KdKeyboardInfo
Wasn't being used by anyone.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit cafa7c5f9017efdc33c348b6a55d80d44df0fe17
Author: Martin-Éric Racine <q-funk@iki.fi>
Date: Tue Sep 8 23:52:52 2009 +0300
Added comment with the PCI device ID of Geode SCx200 series.
commit d3ad1804a5216487b5837a80f3e53b81212dcf84
Author: Michel Dänzer <daenzer@vmware.com>
Date: Tue Sep 8 15:25:19 2009 +0200
EXA: Only take special code path for 1x1 fill for pixmaps.
It doesn't make sense for windows.
Also double-check that the data pointer is valid.
Fixes http://bugs.freedesktop.org/show_bug.cgi?id=23461 (not sure that could
happen on master even without this, but just in case)
commit a9d30f6a038166052a4684308db205bd4e60799e
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Tue Sep 8 17:43:24 2009 +1000
dix: GetKeyboardValuatorEvents doesn't recurse anymore - fix comment.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 1bdc9ec617d357b076c9e69296018bc212d91c7d
Author: Eamon Walsh <efw@eamonwalsh.com>
Date: Fri Sep 4 21:49:29 2009 -0400
Fix "warning: left-hand operand of comma expression has no effect"
Signed-off-by: Eamon Walsh <efw@eamonwalsh.com>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 9005ec4ce19d704d5055232d2a36acee3247be67
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri Sep 4 11:38:03 2009 +1000
dix: remove dixLookupResource - we don't have any users left.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Acked-by: Eamon Walsh <ewalsh@tycho.nsa.gov>
Acked-by: Aaron Plattner <aplattner@nvidia.com>
commit 1e0caf9a2ca983f171976822d9c04bacc14e9af7
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Sun Sep 6 14:02:53 2009 -0700
XQuartz: launchd: Fallback on :0 if prefix:0 gives an error for the socket name
(cherry picked from commit 647c871dc9f2d0adc172b401cde89ffbdfcc4d7a)
commit 081f72390a25e2244561e238f772f98289a6a581
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Sat Sep 5 14:04:53 2009 -0700
XQuartz: Fix "warning: function declaration isn’t a prototype" noise
(cherry picked from commit 9a77905a975e562daa4230739937bbb0b4caf087)
commit 7ece2cb220e4fe2c9a8c4c62361522a45adf22c1
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Sat Sep 5 14:03:19 2009 -0700
XQuartz: pbproxy: 64bit fixes: Properly process an array of Atoms
(cherry picked from commit 1b659cda1af02762a31cc7875e457b08c8dc68b5)
commit 1747120043cc5b5d201b7efd06b75ef08b032922
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Sat Sep 5 02:51:09 2009 -0700
XQuartz: Fix a strcpy/strcmp typo
(cherry picked from commit 701c24da3ef76a05ccb2d7e84ccfa1b7c5d38e15)
commit be37f339a9ed90b9b5e44aeb396ca73347078027
Author: Michel Dänzer <daenzer@vmware.com>
Date: Fri Sep 4 23:11:13 2009 +0200
EXA: Stop hiding solid or gradient pictures from the driver.
Add support for solid pictures in exaTryDriverSolidFill(), but otherwise just
pass solid and gradient pictures to the driver Composite hook.
While we're at it, clean up the logic to detect Composite operations which are
effectively solid fills or copies. This should also fix some false negatives
and positives.
commit 1f61bbeffdf2ad5a2c54121c75f3b049baf01708
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Fri Sep 4 00:38:58 2009 -0700
XQuartz: Check the DISPLAY environment variable to see if the socket at startup is ours. If not, ignore it and fork/exec startx.
(cherry picked from commit 3d5e10cce360a04bf917227615fb9b825675124f)
commit 0a361d0e5f896351b98dc9765b4a33c79efa6f02
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Thu Sep 3 19:40:11 2009 -0700
XQuartz: Use --with-launchd-id-prefix for consistency with xinit
Also actually honor LAUNCHD_ID_PREFIX and APPLE_APPLICATION_NAME
(cherry picked from commit 990038ab006b2f5e03dcef385514ba4e4584bd25)
commit e6e83d81ee7366779d600cbb128034e248815339
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri Sep 4 14:51:08 2009 +1000
xserver 1.6.99.900
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit bc0841b6e87cdd752b44b17ccb021c831a3e02a5
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri Sep 4 15:58:36 2009 +1000
shave: hack around the configure ld check for make distcheck.
configure calls $(CC) -print-prog-name=ld to get the binary for the linker.
The shave script prints " CC \nld" which can't be parsed by configure,
resulting in a fatal error.
This patch special-cases -print-prog-name and passes it though directly
without any additional output.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 58d9a4c6356c98c32be2826410df027ece70d44d
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri Sep 4 15:06:45 2009 +1000
xfree86: fix make distcheck after removal of Domain.note and RAC.Notes.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 8af2793a90e8e644a6a598adce3f752c15b3e37a
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu Sep 3 11:30:48 2009 +1000
xkb: xkbGetKbdByName on the lastSlave needs to change the master (#21859)
If the layout is changed on a master's lastSlave, the master needs to change
layout immediately. Otherwise, the master stays on the same layout until the
lastSlave changes - which may not happen if only a single keyboard is
available.
X.Org Bug 21859 <http://bugs.freedesktop.org/show_bug.cgi?id=21859>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 219ae5b628f9ffe2be0876d5911cc04e52bef5f8
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri Aug 21 16:38:53 2009 +1000
dix: hide the sequenceNumber key repeat hack behind two functions.
Just in case we figure out a better way to do it in the future.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit bfb219f532f3c78ba905424365ee7c5f7b5f21a2
Author: Daniel Stone <daniel@fooishbar.org>
Date: Fri Aug 21 16:03:36 2009 +1000
input: allow for detectable autorepeat.
For core and XI1 events, store the key_repeat flag in the sequence number
until TryClientEvents. The sequenceNumber is unset until TryClientEvents.
[Also thrown in, some random indentation changes. Thanks]
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 3d988e01e41e98fc5160f825a250522ba274d09f
Author: Daniel Stone <daniel@fooishbar.org>
Date: Fri Aug 21 15:15:41 2009 +1000
dix: improve code flow in TryClientEvents, better debugging messages.
Instead of a massive if (blah && blah), return early where possible.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 6fb01c8286c16968fd07e4a5b78da89cd8768d79
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri Sep 4 10:57:33 2009 +1000
require xf86vidmodeproto 2.2.99.1 or newer.
commit 2122fedb2c058dc27f9df0e856d2193fabe725e2
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri Sep 4 11:37:58 2009 +1000
os: silence bigreqsproto compiler warning
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 59e731ef66095723e74a16b2e5548aed627089ff
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri Sep 4 11:06:37 2009 +1000
xfree86: silence some xf86dgaproto compiler warnings
We already require xf86dgaproto > 2.0.99 since 6fffcd582
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit ead57a13531aa14033839112fa66e33e142f67da
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri Sep 4 11:03:55 2009 +1000
xfree86: silence 'unused variable' compiler warning
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 21f04f008e6b1ab66a63de3de668b1f261a6928a
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri Sep 4 11:01:09 2009 +1000
os: don't redefine GNU_SOURCE
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 09f0ee1324b046f2830bdd260f6e2a67ee8f2973
Author: Martin-Éric Racine <q-funk@iki.fi>
Date: Fri Sep 4 04:17:09 2009 +0300
Formatted recent Geode PCI ID changes to fit a 80-column coding style.
commit a17b50b130fe01c058a74f2696a8b97c756acb49
Author: Martin-Éric Racine <q-funk@iki.fi>
Date: Fri Sep 4 03:51:01 2009 +0300
Further explained what the Geode PCI ID is all about as comments.
commit afd800dae4f7491baee08509094a30160bb9c849
Author: Martin-Éric Racine <q-funk@iki.fi>
Date: Fri Sep 4 03:41:08 2009 +0300
Removed unnecessary curly braces for Geode LX PCI ID.
commit 842b7a47d583a7729099de3031ae20977dddf774
Author: Martin-Éric Racine <q-funk@iki.fi>
Date: Fri Sep 4 03:25:32 2009 +0300
Updated the PCI Vendor and Device IDs for all Geode variants.
In practice, some of the native drivers for older Geode products
have become deprecated due to lack of e.g. libpciaccess upgrade,
but that's OK, since most distributions don't ship them anymore.
In that case, we'll let X server fall back to good old VESA.
commit 8e873185f4cbfb2a36e1f43fe7da47fd9fd5aeea
Author: Michel Dänzer <daenzer@vmware.com>
Date: Thu Sep 3 19:11:02 2009 +0200
EXA: Preserve pPixmap->devPrivate.ptr in exaPixmapIsOffscreen_mixed.
Otherwise we may incorrectly clobber it to NULL on repeated PrepareAccess
calls.
commit 120286aef59dabdb7c9fa762e08457e5cc8ec3a6
Author: Michel Dänzer <daenzer@vmware.com>
Date: Thu Sep 3 08:05:59 2009 +0200
glx: Add screen DestroyWindow wrapper to destroy the GLX drawable.
Fixes crashes exitting MacSlow's rgba-glx demo.
commit f04fe06ae244b851b38be824b1a80f2f8a030591
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu Sep 3 14:17:14 2009 +1000
dix: don't return BadMatch from GetProperty (#23562)
dixLookupWindow may return BadMatch if the window in question isn't actually
a window. In this case, GetProperty needs to return BadWindow - not
BadMatch.
X.Org Bug 23562 <http://bugs.freedesktop.org/show_bug.cgi?id=23562>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 84eb4c66a4a09c360cef260fb2f35dfb6d8a93c6
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu Sep 3 10:00:42 2009 +1000
test: add protocol testing for XIWarpPointer.
TODO: some way to check src_x/y coordinates would be good.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 1b7858e8469aea6d2031039ba41d7191a4b80f28
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu Sep 3 10:58:00 2009 +1000
test: expose the default screen to tests, some cleanup work.
Provide common #define for invalid window IDs.
Init the sprite's hotPhys, provide a common #define for the initial sprite
position.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 61a6e1f074d9ff75d61446b946aab6c04019c287
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu Sep 3 10:00:00 2009 +1000
Xi: return BadDevice for master kbds and attached slaves in XIWarpPointer
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 8939ad2b2aa0385f072d3e1169eaf99289ed737a
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu Sep 3 09:44:11 2009 +1000
Xi: return error values to client from XIWarpPointer.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit d481720c57f558c47273bf89854fc69254319772
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Wed Sep 2 15:28:28 2009 +1000
Xi: standardise XI2 headers.
Adding missing dix-config.h include, adding one missing header guard.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 377a5f655ca88cd836da24ab42361df9f3ff51a2
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Wed Sep 2 11:16:15 2009 +1000
Xi: if XISetEventMask fails, return this to the client.
The only failure point can be a BadAlloc.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 993ca5acbdccef9e43cd6580e7cc22cfda1a2578
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Wed Sep 2 10:53:40 2009 +1000
dix: when unsetting a cursor, update the sprite immediately (#23608)
Removing the device cursor while the cursor was within the window did not
update the visible sprite until the next enter/leave event.
X.Org Bug 23608 <http://bugs.freedesktop.org/show_bug.cgi?id=23608>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit b41db8fe460fc0956922b79261752d1bb104684f
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Wed Sep 2 08:57:40 2009 +1000
Xi: fix broken swap code in XISelectEvents request processing.
The pointer advanced 12 bytes too short. Rather unfortunate if both the code
and the test have the same bug.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 727de7c90de4198222e0dc58d7503b4a1672f642
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Tue Sep 1 16:33:56 2009 +1000
Xi: Unify checking for invalid bits in grab masks.
Bits above XI2LASTEVENT are invalid and cause in BadValues. These checks
must be performed anywhere where a mask_len parameter is given.
This patch also adds the missing checks to grab masks.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 59a6d7d478903a8bc9c5d4cc8b2e62e2ad102dba
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Tue Sep 1 16:30:52 2009 +1000
Xi: don't overrun memory for grab masks.
A grab mask provided in the request may be larger than the one used in the
server. Cut down to size before memcopying.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 83db2b126e8623824e1303e74070375994984599
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Tue Sep 1 15:58:02 2009 +1000
Xi: don't try to set oversized or non-existing masks.
Fixes crash if the first XISelectEvents has a zero sized event mask.
Fixes crash if the mask provided is larger than others->xi2mask[].
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 6fe235d3635aaf995dfa198c60ded1a43fe9dd45
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Tue Sep 1 15:46:34 2009 +1000
test: fix request length calculation, add length tests for XISelectEvents
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 7ab1b50c545ae1a62384bedee60168e227bb2a94
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Tue Sep 1 15:27:29 2009 +1000
test: fix build after changing libxf86config.la
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 58c298acc1045927e0d90be73b8dbc8837252589
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Tue Sep 1 15:16:17 2009 +1000
Xi: extra length checking for requests providing masks.
masks can be of arbitrary length. If the client did not initialize mask_len,
some sort of boundary check is needed to avoid running over memory.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 0e4dd3b2d28d3dbbfc152d6f5030901ec063a7ae
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Mon Aug 31 09:50:36 2009 +1000
Un-export ApplyPointerMapping. This is an in-server function.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit a470e8426ee290046a927a17fc969235c4b1e2e7
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Wed Sep 2 17:56:52 2009 -0400
Correct outdated e-mail address in "Author" statements.
Signed-off-by: Eamon Walsh <ewalsh@tycho.nsa.gov>
commit 17545ed80ee3bb6a058a2748fc7bfb0fc5139fc1
Author: Adam Jackson <ajax@redhat.com>
Date: Wed Sep 2 14:40:07 2009 -0400
randr: Fix crtcs using set_mode_major()
We'd never mark the crtc as active, meaning (among other things) gamma
upload wouldn't work.
commit 291408980f33b1e541c89d958535e6fad55fdac9
Author: Dave Airlie <airlied@linux.ie>
Date: Wed Sep 2 20:14:30 2009 +1000
vgaarb: protect fini as well just in case
commit 8aeadbff0840efc0c9a073e60d6fec0dba313060
Author: Dave Airlie <airlied@linux.ie>
Date: Wed Sep 2 19:07:40 2009 +1000
vgaarb: if arb init fails, make sure locking doesn't occur.
pointed out by Martin Jansa on irc.
Signed-off-by: Dave Airlie <airlied@redhat.com>
commit 0e46066efea4e385b2874d4a62a786957e572fe5
Author: Jerome Glisse <jglisse@redhat.com>
Date: Tue Sep 1 13:59:47 2009 +0200
Xext: fix a typo for bigreqsproto.h header file
Signed-off-by: Jerome Glisse <jglisse@redhat.com>
commit c61d8ce1507318476b75b81bf871da19cb1bf747
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Mon Aug 31 17:57:50 2009 -0700
Xext: Require newer versions of xcmiscproto, bigreqsproto, and xf86bigfontproto for new *proto.h header file names
bigreqsproto >= 1.1.0
xcmiscproto >= 1.2.0
xf86bigfontproto >= 1.2.0
commit 1c37be80982151a5acd74fe4b960695f604f22ca
Author: Michael Witrant <mike@lepton.fr>
Date: Tue Sep 1 10:46:50 2009 +1000
XFree86: Linux: Fix 100% CPU usage with ShareVTs and kbd
Leave consoleFd open over the course of the server, even though any use
of it in this context is likely to be disastrous.
Signed-off-by: Michael Witrant <mike@lepton.fr>
Reviewed-by: Daniel Stone <daniel@fooishbar.org>
commit 65183dc3153232943dff3cfbaacab141e7ed0e9c
Author: Daniel Stone <daniel@fooishbar.org>
Date: Sun Jul 5 19:53:55 2009 +0300
Input: Mark Xi input events as critical
Note that the Xi events are critical and should thus cause a flush to
the client when an input event is pending.
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
commit a4e614d301cfa2577de1ee6a15abf023590586d1
Author: Daniel Stone <daniel@fooishbar.org>
Date: Sat Apr 25 16:46:10 2009 +1000
Xi: Fix harmless ButtonPress/ButtonRelease confusion
A missing break meant that ButtonPress would fall through into
ButtonRelease, but luckily it appears to have been completely harmless.
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
commit 5ef53a94ce4e48e11de26290cd677266308640c8
Author: Matt Turner <mattst88@gmail.com>
Date: Mon Aug 31 20:23:26 2009 -0400
alpha: kill xf86SlowBCopyToBus and xf86SlowBCopyFromBus
xf86SlowBCopyToBus and xf86SlowBCopyFromBus cause segfaults on my
system.
Also remove associated slowbcopy_tobus/slowbcopy_frombus macros.
Signed-off-by: Matt Turner <mattst88@gmail.com>
commit a8e634b86d47353ef354717904fa66ebe35e1303
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Mon Aug 31 15:53:58 2009 -0700
XQuartz: GLX: Drawable does not contain resize anymore.
(cherry picked from commit 1e642f22fbf029bb3917091cb5fa2f78b4a92f62)
commit 1b30545c04a51bfa3ff95a26d64962907a62ff15
Author: Matt Turner <mattst88@gmail.com>
Date: Mon Aug 31 16:16:02 2009 -0400
Make sys.c use compiler.h unaligned access functions
Signed-off-by: Matt Turner <mattst88@gmail.com>
commit 9522ab9a98e98bc394703038e34b1c12aa39a179
Author: Matt Turner <mattst88@gmail.com>
Date: Mon Aug 31 16:12:29 2009 -0400
Remove unused Delay.c
Signed-off-by: Matt Turner <mattst88@gmail.com>
commit 4fac13ff8848bc38654b5567170fbc0d7b2c96d6
Author: Matt Turner <mattst88@gmail.com>
Date: Mon Aug 31 16:11:59 2009 -0400
Remove unused BUSmemcpy.c
BUSmemcpy.c provides xf86BusToMem and xf86MemToBus, which are are memcpy
wrappers written to avoid glibc's memcpy on Alpha. glibc'c memcpy on
Alpha has improved much since this was written, so it's no longer
needed. Neither function is used inside the xserver, and no module on
my machine uses either as well.
Signed-off-by: Matt Turner <mattst88@gmail.com>
commit b65146fc8418b53b7e43dd34cc20000369475671
Author: Matt Turner <mattst88@gmail.com>
Date: Mon Aug 31 16:11:10 2009 -0400
Remove unused ia64_flush_cache function
Signed-off-by: Matt Turner <mattst88@gmail.com>
commit f201705e29bdc3309dd611b461ec67740cb706ef
Author: Matt Turner <mattst88@gmail.com>
Date: Mon Aug 31 16:09:33 2009 -0400
Simplify unaligned access code
All architectures should be able to use the same unaligned access code,
regardless of whether they need special unaligned access instructions.
Let's let gcc do the heavy lifting.
In the case that we're not using a gcc-compatible compiler, use memmove.
The xserver already requires pixman, so include pixman.h for its uint*_t
types.
Signed-off-by: Matt Turner <mattst88@gmail.com>
commit 3718beb69cc5b4cdb79dd97242fce9231a26a39a
Author: Matt Turner <mattst88@gmail.com>
Date: Mon Aug 31 16:08:52 2009 -0400
Clean up unaligned access functions on alpha
Checks for __GNUC__ are superfluous since the only other compiler for
the platform is Compaq C, and it doesn't support GCC style inline
assembly.
Signed-off-by: Matt Turner <mattst88@gmail.com>
commit e1fdd7671346ce374a2b77fe94b8c1a25c0520da
Author: Matt Turner <mattst88@gmail.com>
Date: Mon Aug 31 16:08:20 2009 -0400
Move unaligned access functions to common section
Signed-off-by: Matt Turner <mattst88@gmail.com>
commit 628b863bcc6a2a14fd3c0e6c2be4394833cc314c
Author: Matt Turner <mattst88@gmail.com>
Date: Mon Aug 31 15:53:41 2009 -0400
Remove unused arm_flush_cache function
Signed-off-by: Matt Turner <mattst88@gmail.com>
commit a544139196ac7f5bc89bc642c6c5c0ea1b0bb60e
Author: Matt Turner <mattst88@gmail.com>
Date: Mon Aug 31 15:53:19 2009 -0400
Remove unused ppc_flush_icache function
Signed-off-by: Matt Turner <mattst88@gmail.com>
commit 52aa0495218dc7821a23b045b2c74b2a66e34616
Author: Matt Turner <mattst88@gmail.com>
Date: Mon Aug 31 15:52:39 2009 -0400
Replace 8 nops with proper sync instruction on mips
Cc: Ralf Baechle <ralf@linux-mips.org>
Acked-by: David Daney <ddaney@caviumnetworks.com>
Signed-off-by: Matt Turner <mattst88@gmail.com>
commit 563fa1c5d762173cd6fb78f9e33cb960ef3153bb
Author: Matt Turner <mattst88@gmail.com>
Date: Mon Aug 31 15:52:10 2009 -0400
Use sfence and mfence instructions on amd64
Signed-off-by: Matt Turner <mattst88@gmail.com>
commit 430c4af0d6e2cad03ca5f49ec6e87f3717d0d9e2
Author: Matt Turner <mattst88@gmail.com>
Date: Mon Aug 31 15:51:41 2009 -0400
Add x86 barrier macros
Signed-off-by: Matt Turner <mattst88@gmail.com>
commit 0d87f77a3ff4b22729220b7edcb98c6f06d0787c
Author: Matt Turner <mattst88@gmail.com>
Date: Mon Aug 31 15:51:05 2009 -0400
define barrier macros as nops if not otherwise defined
Signed-off-by: Matt Turner <mattst88@gmail.com>
commit 1b43ee13b30d9e3f828e94cdf686d103ce1cac07
Author: Matt Turner <mattst88@gmail.com>
Date: Mon Aug 31 15:53:58 2009 -0400
Move memory barrier macros into common section
alphabetize by architecture also.
Signed-off-by: Matt Turner <mattst88@gmail.com>
commit 295e598d9a83ff7162a093810ca9f546d00c0968
Author: Tiago Vignatti <tiago.vignatti@nokia.com>
Date: Mon Aug 31 20:04:51 2009 +0300
xfree86: remove _more_ RAC junk
Signed-off-by: Tiago Vignatti <tiago.vignatti@nokia.com>
commit 38627b2eaf64aa8fe694fc3e1f5e4fee0c9c11c3
Author: Tiago Vignatti <tiago.vignatti@nokia.com>
Date: Mon Aug 31 19:36:02 2009 +0300
xfree86: shut up vgaarb warnings when server doesn't support it
Signed-off-by: Tiago Vignatti <tiago.vignatti@nokia.com>
commit 79182538b43ecd35bf2b47eccfb2dd3bbcdc12eb
Author: Tiago Vignatti <tiago.vignatti@nokia.com>
Date: Mon Aug 31 19:25:13 2009 +0300
xfree86: removal of some dead code due VGA arbiter's inclusion
Signed-off-by: Tiago Vignatti <tiago.vignatti@nokia.com>
commit 6f3cc08ec01609c7efe424ac3e30fe4ff9391007
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Thu Aug 27 16:21:11 2009 -0700
XQuartz: GL: Unset GL_EXT_gpu_program_parameters for Tiger/ppc
See http://trac.macports.org/ticket/20638
(cherry picked from commit 0f3a89d306838b3c75a73cd1e9e2928737222b70)
commit fdb29ebeed143fa05630966b847b05399a446ddc
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Thu Aug 27 11:04:00 2009 -0700
XQuartz: GL: Explicitly set GL_EXT symbols to 0 if they are not in OpenGL.framework to prevent X11's glext.h from setting them to 1.
(cherry picked from commit 7fe37137d826d1b698e87a5b35050dd02f0a4d4b)
commit 3be80bd98357cf362aa9a004d1292e5167d83a17
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri Aug 28 16:20:59 2009 +1000
Xi: silence compiler warning "type may be used uninitialized"
GrabKey and GrabButton are only called from XI/XI2 code. Set type to -1,
just in case.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 24716b9254fa7d609792596723a192bb044a7d3f
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Fri Aug 28 22:52:48 2009 -0400
xace: fix up access modes in dixLookupDrawable calls from dri2.
Referencing a screen through a drawable only requires GetAttr access.
Treat dri2 drawables as child windows (Add/Remove access).
Treat getting buffers as intent to read/write the drawable.
Signed-off-by: Eamon Walsh <ewalsh@tycho.nsa.gov>
commit 0f3a64c3a5bce6cf3f00fe42cc7d1d3e69822945
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Thu Aug 27 15:11:12 2009 -0400
Add DRI2 requests to protocol.txt
Signed-off-by: Eamon Walsh <ewalsh@tycho.nsa.gov>
commit 3d17c4f6e1538986fe7b1f17614d76e28f2d1e11
Author: Adam Jackson <ajax@redhat.com>
Date: Fri Aug 28 12:12:52 2009 -0400
EDID: Vendor detailed blocks aren't worth X_WARNING about
commit 2c1a845521a31f08938b0f8d6e38835ce127c94a
Author: Adam Jackson <ajax@redhat.com>
Date: Fri Aug 28 12:09:57 2009 -0400
EDID: Print 1152x864 in established timings, not x870
The spec says x870, but we actually use x864 because that's a real DMT
mode and x870 isn't. This might or might not be wrong, but we should at
least tell the truth.
commit 2a806d7fa372e28d039761c9b4087cf812e8e46b
Author: Tiago Vignatti <tiago.vignatti@nokia.com>
Date: Fri Aug 28 16:05:04 2009 +0300
os: remove unused -cursor option
Signed-off-by: Tiago Vignatti <tiago.vignatti@nokia.com>
commit 9040dab76182d1a019ca7fef7b29733d2c199e61
Author: Tiago Vignatti <tiago.vignatti@nokia.com>
Date: Fri Aug 28 15:50:50 2009 +0300
xfixes: minor clean ups on createInvisibleCursor()
- unused return value
- no reason to declare static variable given the function is just called
once
- no reason to declare different type and cast it after.
Signed-off-by: Tiago Vignatti <tiago.vignatti@nokia.com>
commit 80ed8096f9b8e974b556a6c9f3b600fb71b994c3
Author: Tiago Vignatti <tiago.vignatti@nokia.com>
Date: Fri Aug 28 15:33:19 2009 +0300
render: delete unused headers declaration
Signed-off-by: Tiago Vignatti <tiago.vignatti@nokia.com>
commit f959b1e5485b93700c7da449a98182f5ce067ca2
Author: Tiago Vignatti <tiago.vignatti@nokia.com>
Date: Fri Aug 28 15:30:21 2009 +0300
render: AnimCurInit and AnimCursorCreate shouldn't be _X_EXPORT
Pointed by Peter Hutterer on xorg-devel ml.
Signed-off-by: Tiago Vignatti <tiago.vignatti@nokia.com>
commit e454f106dc65ecfacc154a1fa0810935022a8fee
Author: Dave Airlie <airlied@redhat.com>
Date: Fri Aug 28 11:39:42 2009 +1000
xf86 ddx: add vga arbiter support.
This adds support for using the libpciaccess interface for
vga arbitration support on top of a kernel which supports it.
Currently patches are queued for kernel 2.6.32 in jbarnes
pci tree, and shipping in Fedora kernel.
Co-authors:
Tiago Vignatti <tiago.vignatti@nokia.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
commit 6fffcd5825454a7fe58ffbcfb219f007cf38e731
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu Aug 27 13:43:15 2009 +1000
xfree86: require xf86dgaproto 2.0.99.1.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 2fba2eac0b4c8d07bdf7bea20ef75ff579621728
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Mon Aug 24 11:23:23 2009 +1000
test: add a few tests for xtest device initialization.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 903c3db1d1685bd855dceed9e7b92890743663e1
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Mon Aug 24 09:48:00 2009 +1000
Xext: rename Xtst* to XTest*
This patch corrects a misnaming of XTest-related functions.
The extension itself announces itself as XTEST. Xtst is the library name
itself, but all library functions are prefixed by XTest. Same with the
naming in the server.
- Rename all *Xtst* functions to *XTest* for consistency with the library
and in-server API.
- Rename the "Xtst device" property to "XTEST device" for consistency with
the extension naming.
- Rename the device naming to "<master device name> XTEST device". The
default xtest devices become "Virtual core XTEST pointer" and "Virtual
core XTEST keyboard".
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 8bfd23e144e51401e3756de9260a4811fcc59e91
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Mon Aug 24 09:38:15 2009 +1000
input: move XTest device initialization into Xext/xtest.c
XTest devices are non-optional but nonetheless specific to the XTEST
extension.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit a95f80fa914678d360f6dfd2b58926193df6ea4a
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Mon Aug 24 09:26:56 2009 +1000
dix: use IsXtstDevice instead of the direct key lookup.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 16b7ebd7d876034edfe8f74562bd06e747879d79
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Mon Aug 24 14:34:23 2009 +1000
xfree86: Remove xf86GetMotionEvents from public API.
This function was used as the default motion event queue API until
including XINPUT_ABI 2 (server 1.5).
This API was broken with 1883485 in May 2008 (wrong casting of parameters)
and isn't in use by input drivers past ABI 3.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Tiago Vignatti <tiago.vignatti@nokia.com>
commit af76bddd7a47092e2f0f85b2547c1cc74eb5cebc
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Sun Aug 9 16:13:32 2009 -0700
XQuartz: Check NSINTEGER_DEFINED to make sure the NSInteger and NSUInteger types are defined.
(cherry picked from commit 36e02a8649c0a545084cce5fb2c5717277b9273c)
commit 07c935b72fb14cb12f1cb5afbf8cc81f97086bac
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Tue Aug 25 20:11:38 2009 -0700
XQuartz: Use applewmproto 1.4 updated headers.
(cherry picked from commit 203df06c0eb2dcd5adfa788a1ba9569650c15f9c)
commit 0f613007cd43545eda40825bd74ada3e6e5f36f6
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Wed Aug 5 17:43:29 2009 -0700
CheckWindowOptionalNeed: Ensure w->optional is set to avoid SEGFAULT
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)
commit e7dd1efef408effe52d0bd3d3aa0b5d4ee10ed90
Author: Keith Packard <keithp@keithp.com>
Date: Tue Aug 25 18:07:00 2009 -0700
Ensure that rotation updates happen frequently
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.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 1740cda7a37abc7d0a169ab4555b446adaa62211
Author: Keith Packard <keithp@keithp.com>
Date: Tue Aug 25 16:58:07 2009 -0700
Perform rotation redisplay before calling driver block handler (which may 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>
commit 4aab05e3b3231f1ec9795a66a075d17a722634a7
Author: Keith Packard <keithp@keithp.com>
Date: Tue Aug 25 16:54:16 2009 -0700
xf86_reload_cursors: fix cursor position to eliminate jumping after mode set
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>
commit 0f9ffc887ca1471e98df746253d9300e03e46a15
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Mon Aug 24 15:10:52 2009 +1000
Xi: fix XIWarpPointer up for FP3232 as input coordinates.
requires inputproto 1.9.99.902
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 5e96945cf54136afdb80cc17f67611251d59205d
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri Aug 21 12:15:54 2009 +1000
Xi: fix swapping for XIWarpPointer and XIChangeCursor requests.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 990d204ef8074665763ad129d0b015b7ab3ae9ef
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Mon Aug 24 09:22:16 2009 +1000
Xext: remove un-used extern of DeviceMotionNotify.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 80f18a73267bd3090e459de609a7006a21e6c649
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Mon Aug 24 09:21:03 2009 +1000
input: move CorePointer/KeyboardProc declarations into header.
The extern declaration in xichangehierarchy.c was broken anyway.
This fixes a crash on creating a new master device.
Reported-by: Maxim Levitsky
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit b96823713129f641ee99306e3cadba8dfe21afa2
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Mon Aug 24 09:06:29 2009 +1000
mi: include shmint.h if needed, silence compiler warning.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 1b3859a49a3861517c9b34f6e8750f7ae0ff2b5d
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri Aug 21 12:29:39 2009 +1000
Xi: add swapping hook for XIGetFocus reply.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit fe430d7d3b0a85fbea9e93171423688f76dc9e1e
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri Aug 21 12:09:32 2009 +1000
test: add XIQueryPointer protocol tests.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 285c88018ba4b3819500027c9b6a05b8c27ff2ee
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri Aug 21 11:38:42 2009 +1000
Xi: correct length field for XIQueryPointer reply.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit e4ea91a02d6fac9dad844150c5d2fbe7dc9629b1
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri Aug 21 12:12:05 2009 +1000
Xi: allow XIQueryPointer requests for master pointers and floating slaves.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 8e396f2b806496cdcac233cc731b0322735020c3
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri Aug 21 12:11:19 2009 +1000
Xi: fix swapping for XIQueryPointer request/reply handling.
buttons_size is necessary as WriteToClient swaps the buttons_len field,
resulting in the wrong number of bytes being written later.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit f1c856ef9073d9d02bc84ce1472883c8441a9758
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri Aug 21 10:42:15 2009 +1000
test: fake initialization of a sprite trace and window locations
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 58fd28f6b6bebab7f31c54e696f96d64ebb50f5a
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri Aug 21 09:44:37 2009 +1000
Xi: return deviceid as error value in XIQueryPointer.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit b41dd4328bfb8a0981d299bb60f986a2bc55fd24
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri Aug 21 09:43:46 2009 +1000
record: include recordproto.h, require recordproto 1.13.99.1
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 65354e5a698a5b527db09afc431110afba0e14b2
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu Aug 20 10:52:52 2009 +1000
Xi: return BadDevice for changing device cursors on non-master pointers.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit ef75301854d41c6b11dd2742fa9d17a5de8a4cfa
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu Aug 20 10:52:24 2009 +1000
dix: FixUpEventFromWindow mustn't scramble non-device events.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit c73cd3b265c301b8a54ffe484d6c696f2abefb46
Author: Dan Nicholson <dbn.lists@gmail.com>
Date: Sun Aug 16 18:07:49 2009 -0700
xfree86: Link libselinux with Xorg system libraries
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>
commit 9d8fc33cae2fee7777edd20658dbf6a3ffb3d557
Author: Adam Jackson <ajax@redhat.com>
Date: Thu Aug 20 16:56:04 2009 -0400
composite: Move screen init before extension registration.
Otherwise, you'd still advertise the extension even if no screens
actually supported it, and the first Composite protocol request would
probably crash.
commit ae68708ebe24c4cdf8c5265e206f6913d9298f37
Author: Adam Jackson <ajax@redhat.com>
Date: Thu Aug 20 15:45:57 2009 -0400
xfree86: dump /proc/cmdline in the log on Linux
commit 0b131a5cd91cea54240777c66a9cd385029e8cb2
Author: Adam Jackson <ajax@redhat.com>
Date: Thu Aug 20 15:28:57 2009 -0400
linux: Yet more malloc() avoidance for backtrace()
Turns out, there's an initializer at the top of backtrace() that (on
some arches) calls dlopen(). dlopen(), unsurprisingly, calls malloc().
So, call backtrace() early in signal handler setup so we can later
safely call it from the signal handler itself.
commit 792dee3854cbede64e17fdc4736831edad295706
Author: Tiago Vignatti <tiago.vignatti@nokia.com>
Date: Wed Aug 19 18:20:54 2009 +0300
xfree86: remove bus state change notification callback
No one is using bus notifications now. We hope that the kernel take care of
this properly.
For other not-so-urgent-notifications (ACPI wakeups, etc) we can just register
a handler on server's scheduler (using xf86AddGeneralHandler). And for
external applications, the "trend" is to use HAL to kick notifications. So
we're already provided of enough notification schemes.
Signed-off-by: Tiago Vignatti <tiago.vignatti@nokia.com>
Signed-off-by: Aaron Plattner <aplattner@nvidia.com>
commit eb031d4013d36f6aef4aba45840762ae8635cc13
Author: Adam Jackson <ajax@redhat.com>
Date: Wed Aug 19 15:42:34 2009 -0400
linux: hand-roll a backtrace printer instead of using backtrace_symbols
Why? Because backtrace_symbols calls malloc, which you can't do from a
signal handler. Face? Palm.
commit 75b9383d8a4c113ab3c6cfc1d5efcb5d9982a1bf
Author: Jesse Adkins <jesse_adkins7@yahoo.com>
Date: Tue Aug 18 21:13:40 2009 -0700
xserver doesn't stop all connections to localhost
X.Org Bugzilla #23329: http://bugs.freedesktop.org/show_bug.cgi?id=23329
Patch #28648: http://bugs.freedesktop.org/attachment.cgi?id=28648
I noticed in xserver at os/access.c that xorg tries to stop connections
to localhost by checking against the address 127.0.0.1. However, RFC
3330 defines the localhost network as 127.0.0.0/8. This means that any
IPv4 address that starts with 127 is just another name for localhost.
commit 2d34eace13c2016048c627c4e96c3b2399901078
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Tue Aug 18 20:11:23 2009 -0700
Sun bug 6872917: Xorg not querying /dev/fb when no xorg.conf exists
commit 48ee5558333bd324463b6994735cabb23de262ec (OpenSolaris VT support)
broke the autoconfiguration code in xf86AutoConfig.c that uses the
Solaris-specific VIS_GETIDENTIFIER ioctl on a frame buffer device like
/dev/fb by changing xf86Info.consoleFd from /dev/fb to a /dev/vt/*
device.
This fixes it by reworking the code to split the console device
(/dev/vt/*, the vtXX CLI option) from the frame buffer device
(/dev/fb, -dev option) to allow both VT and autoconfig to work.
It also fixes the console device to use /dev/fb when VT's are not
supported instead of throwing a Fatal Error because it can't open
/dev/vt/0.
Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
commit d225230148b3cdab3b32fce3abee26b818d4bab0
Author: Jesse Barnes <jbarnes@virtuousgeek.org>
Date: Tue Aug 18 12:15:32 2009 -0700
xfree86/linux: don't change VT perms unless we're running as root
In non-setuid root installations, we shouldn't try to adjust VT/tty
ownership. It will fail, and shouldn't be necessary anyway (since
startup scripts or PAM should be handling perms for us in that case).
Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>
commit 41884b8f4dfe4d931c64a6046adfefcc2b7646c2
Author: Tiago Vignatti <tiago.vignatti@nokia.com>
Date: Tue Aug 18 15:47:56 2009 +0300
xfree86: remove unused code (xf86Configure.c)
The xorg.conf generator was not assigning correctly the primary device
("bootable") as screen zero. So just skip this kind of routines for now.
Signed-off-by: Tiago Vignatti <tiago.vignatti@nokia.com>
commit 097376266f256e3ae37a16b343ed1e3441a8f003
Author: Tiago Vignatti <tiago.vignatti@nokia.com>
Date: Tue Aug 18 13:13:57 2009 +0300
xfree86: remove unaffected code (xf86Configure.c)
Signed-off-by: Tiago Vignatti <tiago.vignatti@nokia.com>
commit dd8960a9f37fbef65cb99e058c3772edfda7b6db
Author: Tiago Vignatti <tiago.vignatti@nokia.com>
Date: Tue Aug 18 12:53:47 2009 +0300
xfree86: remove stupid macro (xf86Configure.c)
It was confusing more instead helping.
Signed-off-by: Tiago Vignatti <tiago.vignatti@nokia.com>
commit 4ec7667bb17839bd4ec11091c75ecfff317fc96c
Author: Tiago Vignatti <tiago.vignatti@nokia.com>
Date: Tue Aug 18 12:33:35 2009 +0300
xfree86: remove wrong commentary
Signed-off-by: Tiago Vignatti <tiago.vignatti@nokia.com>
commit 2e8c2b8ae6a092871838b7cceaaf4a7590bce1d3
Author: Tiago Vignatti <tiago.vignatti@nokia.com>
Date: Tue Aug 18 12:28:15 2009 +0300
xfree86: header clean up (xf86Configure.c)
Signed-off-by: Tiago Vignatti <tiago.vignatti@nokia.com>
commit 2df414a33321ae772af1e7e52c36aec222bb3c8f
Author: Tiago Vignatti <tiago.vignatti@nokia.com>
Date: Tue Aug 18 12:14:27 2009 +0300
xfree86: reorganize xf86Configure.c
No semantical changes. Only code moved around.
Signed-off-by: Tiago Vignatti <tiago.vignatti@nokia.com>
commit 113e66a1ffe2a43c4d1c92a7d78ca43b4db58822
Author: Tiago Vignatti <tiago.vignatti@nokia.com>
Date: Sun Aug 16 21:02:11 2009 +0300
xfree86: remove unused PCI header
Signed-off-by: Tiago Vignatti <tiago.vignatti@nokia.com>
commit 6b5978dcf1f7ac3ecc2f22df06f7000f360e2066
Author: Richard Hughes <richard@hughsie.com>
Date: Mon Aug 17 09:15:32 2009 +0100
Do not reset lastDeviceEventTime when we do dixSaveScreens
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>
commit 4098ad72d00e65d142fb9fe8a1194be35338508b
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Sun Aug 16 00:06:10 2009 -0400
xace: fix access mode in dixLookupWindow within several RandR calls.
Referencing a screen using a window only requires GetAttr access.
Signed-off-by: Eamon Walsh <ewalsh@tycho.nsa.gov>
commit d4b8f7602b5e266a0ebd3b1ba23724362cc7de3a
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Mon Aug 10 18:39:04 2009 -0400
xace: fix access mode in dixLookupWindow call within ProcUngrabKey.
Referencing a window (as grab-window) only requires GetAttr access.
Signed-off-by: Eamon Walsh <ewalsh@tycho.nsa.gov>
commit 6d2f4e487869f10de4a62365b4d6de036c752ab8
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Mon Aug 10 18:36:53 2009 -0400
Add XI2 requests to protocol.txt
Signed-off-by: Eamon Walsh <ewalsh@tycho.nsa.gov>
commit 73975ef3a39ce522c6206ca800ed175fbf851dcf
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Mon Aug 10 18:34:07 2009 -0400
xselinux: Allow per-client device create contexts.
The previous behavior was to set the serverClient's value which was used globally.
This is in support of XI2, where clients can create device pairs directly.
Signed-off-by: Eamon Walsh <ewalsh@tycho.nsa.gov>
commit 66e32d252cffcd4fe7d505f1c211253f23c5002c
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Mon Aug 10 18:33:05 2009 -0400
xselinux: Add more new device permissions for XI2.
Reflects the ability of clients to create/destroy device objects.
Signed-off-by: Eamon Walsh <ewalsh@tycho.nsa.gov>
commit 1f4ea22a20fdd30412a259a87eee133155e1163d
Author: Rémi Cardona <remi@gentoo.org>
Date: Mon Aug 17 11:33:24 2009 +0200
configure: fix help string after Xnest default build was changed
Signed-off-by: Rémi Cardona <remi@gentoo.org>
commit 7e37e7c50e4fdcb53296a99d90af3d90081ce9bb
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Tue Aug 11 14:39:50 2009 +1000
test: add protocol tests for DeviceChangedEvents
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 2851f04cb2f6e5c30267f733d867c86d4e69a485
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Tue Aug 11 16:27:40 2009 +1000
dix: rework DeviceChangedEvents a bit.
DCEs are now processed when sent throught the master device, not when sent
through the slave device. This includes a removal of some un-used (or partly
used) fields in the DCE itself to something more self-explanatory.
TODO: if a device has events queued and its attachment is changed, the DCE
is silently dropped now. Instead, it should be generated as soon as the
first event after the attachment is sent.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit c1d901d723c3bee523736eacc15b44a7dff484fe
Author: Richard Hughes <richard@hughsie.com>
Date: Fri Aug 14 11:44:35 2009 +0100
Don't reset the lastDeviceEventTime when doing DPMS actions
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>
commit dca4de72d375c4b9bcdd25b151e291a77a5b06cc
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Sat Aug 15 20:17:20 2009 +1000
dix: fix potential use of unused variable 'mask'.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 978b65bce14598f2d42ca0177ea58fef71fc12c5
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri Aug 14 15:05:42 2009 +1000
include: XInputExtensionInit doesn't need to be exported.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 3989dc1d34f116f30915632cc5286937392e180a
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Tue Aug 11 16:20:20 2009 +1000
dix: use the XI2 defines for class types.
Doesn't matter really, they have the same values anyway.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit fe045820f1fb33991e8bff5c6e192097caa85727
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Mon Aug 10 15:34:00 2009 +1000
input: move DeviceChangedEvent conversion into eventconvert.c
The version in eventconvert.c was half broken and for some reason we ended
up with a second version in exevents.c (which works). Move it over to where
it belongs and call EventToXI2 instad of having a custom function for it.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 33eb6f70816921abc5da62e434f40e78d672274e
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri Aug 14 13:49:58 2009 +1000
include: Unexport most symbols from exevents.h.
And shuffle them around so that the part used by drivers is up the top and
commented.
Also, woo, the sdksyms script doesn't like declarations with return type and
function name on the same line...
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 1373c2ea877b562076a4a3c97e8e4f999c977217
Author: Dave Airlie <airlied@redhat.com>
Date: Sat Aug 15 12:14:26 2009 +1000
exa: clarify createpixmap2 new pitch return
commit 48ee5558333bd324463b6994735cabb23de262ec
Author: Aaron Zang <Aaron.Zang@Sun.COM>
Date: Mon Aug 3 23:21:39 2009 -0700
Add new VT support for OpenSolaris & future Solaris releases
Signed-off-by: Aaron Zang <Aaron.Zang@Sun.COM>
Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
commit 613e76ff9055d8ac2b1af1130668180646a9e14c
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Mon Aug 3 21:38:51 2009 -0700
Remove support for Solaris x86 releases older than Solaris 8
If you want to run a pre-1999 kernel, you'll need a pre-2009 X server
[Some pre-Solaris 8 VT support is left by this patch to allow reuse by
the new Solaris VT support that follows in the next patch.]
Signed-off-by: Aaron Zang <Aaron.Zang@Sun.COM>
Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
commit 6c292d17053eb2a7e7054e51210f423dbc0cb7e8
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri Aug 14 11:48:54 2009 +1000
dix: update the sprite trace for all masters && floating slaves (#23257)
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>
Tested-by: Thomas Jaeger
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 49046088f10cceaea7da97401d742d3fb59371f5
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri Aug 14 09:48:45 2009 +1000
config: don't shutdown the libhal ctx if it failed to initialize (#23213)
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>
commit 1545a120df6dffb5b84fe96c5a992357520b7c8d
Author: Dave Airlie <airlied@redhat.com>
Date: Tue Aug 11 15:00:36 2009 +1000
exa: fix CreatePixmap2 to be useful for tiling.
This adds a pitch return so that the driver can align the pitch to any
value it wishes and not just the one it gave to EXA at startup.
commit db568f9eabf3450d8a023597ff007df355b13ea8
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu Aug 13 16:37:00 2009 +1000
Xext: fix up wrong conditions for negative sync transitions.
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>
commit a3e50b05747cab92090ae7d7f4475cd61d3fcadf
Author: Pierre-Loup A. Griffais <pgriffais@nvidia.com>
Date: Mon Jul 27 20:58:44 2009 +0200
Add 4 missing 10bpc picture formats to the server format list.
Signed-off-by: Aaron Plattner <aplattner@nvidia.com>
commit 36e24a6d93bd5aced4e566b80bf2d03555fab9ca
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu Aug 13 10:50:26 2009 +1000
Xext: add missing return code check to ProcSyncDestroyAlarm
Introduced with 57aff88c7d0761e590806d07bee1c9410680c89f.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit ce69a06aff934b2dcded8606cab079ac6465007c
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Tue Aug 11 16:16:54 2009 +1000
Xi: fix up broken DeviceChangedEvent swapping code
commit b44d34d5fd0d8aaacb89121e8b4afba04f1dcc80
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Mon Aug 10 15:32:59 2009 +1000
include: correct a copy/paste error in a comment.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit c477ac8a151a28ba23f5c87e8f7affd6e82cfaa9
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Mon Aug 10 15:15:02 2009 +1000
dix: re-name internal eventToClassesChanged to eventToDeviceChanged
DeviceClassesChangedEvents (where this name comes from) have been replaced
with DeviceChangedEvents.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit af38f6790c4c8ba1e70f5c5ba3530ded85d6e372
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Mon Aug 10 14:08:59 2009 +1000
test: add event conversion tests for XIDeviceEvents
commit 3f2e4b9867b6877ee7be32b151fcaf221ef0812f
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Mon Aug 10 14:07:54 2009 +1000
Xi: add event swapping for XIRawEvents.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit f3b2f9fb734ecfff6db9ae85b0d247856ede8112
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Mon Aug 10 13:12:40 2009 +1000
Xi: fix event swapping for XIDeviceEvents.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit e46f02fa2de79261221b42ab73f9daa2ce8ac650
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Mon Aug 10 09:50:16 2009 +1000
Xext: allocate a separate event list for XTest events (#23100)
XTest event processing may be interrupted by a SIGIO. If Xtest uses the same
event list as the rest of the server, this list may be overwritten
in-flight.
X.Org Bug 23100 <http://bugs.freedesktop.org/show_bug.cgi?id=23100>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 8483b08152104dc619d9e44f877d2687d866355e
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri Aug 7 16:11:37 2009 +1000
test: add focus and enter conversion testing.
Doesn't actually convert anything, but verify the expected behaviour.
commit 59dc59a72ffd4cbc4df207bc688c92bb4863e8a9
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri Aug 7 11:23:33 2009 +1000
test: add XI2 eventconversion test for raw events.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 10d7948e0360860e1e9633dca39f646d492e73bf
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri Aug 7 10:17:14 2009 +1000
test: fix build error introduced by new AllocDevicePair API
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 3f161a0aac39fbdeef393a17269486b8dace4672
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Mon Aug 10 14:14:35 2009 +1000
Xi: un-statify XI2EventSwap, it is needed for tests.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 55e1ea08d03d89ecc0f2db7652a4d15567204696
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Mon Aug 3 16:46:11 2009 +1000
Xi: get device changed data from DeviceChangedEvents, not the device (#23100)
If a new device posts an event while the DCE is in the queue, getting the
data from the device may result in invalid memory access.
X.Org Bug 23100 <http://bugs.freedesktop.org/show_bug.cgi?id=23100>
commit 8ce4fde76fdf747fd3e00836c9c9c542e516ae9a
Author: Matt Turner <mattst88@gmail.com>
Date: Wed Aug 12 14:45:13 2009 -0400
Fix build on Alpha
commit a400dbb38f93030d51afe806b4b20d5ef501c855
Author: Colin Harrison <colin.harrison@virgin.net>
Date: Wed Aug 12 17:48:36 2009 +0100
Xming: Add NET_WM_ICON to native icon conversion
fd.o bugzilla #4491
originally from a patch by Joe Krahn <jkrahn@nc.rr.com>
Convert a NET_WM_ICON to a native icon by converting to a native
bitmap and then using CreateIconIndirect()
Don't use icon alpha on Windows 2000 or if display isn't 32-bit, convert
alpha channel to a 1-bit transparency mask using a threshold value
Fix warning in winScaleXBitmapToWindows() about signedness of *iconData
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
commit 211511f150ce189681aff176c311fa8f312517e9
Author: Soren Sandmann Pedersen <ssp@redhat.com>
Date: Tue Aug 11 14:40:42 2009 -0400
Disable the out-of-bounds workaround in pixman.
This workaround was necessary for older X servers, but now fb should
be using correct coordinates.
Also bump pixman requirement to 0.15.20.
commit 93d9646c713336e03c135204c061f561d3654e23
Author: Tiago Vignatti <tiago.vignatti@nokia.com>
Date: Sat Aug 8 20:18:10 2009 +0300
mi: fix indentation
mieq.c looks indented-wise now. Let's see how long it will take to someone
mess it again.
Signed-off-by: Tiago Vignatti <tiago.vignatti@nokia.com>
commit f9a2fff2248d7254958857677cabfea914ed4853
Author: Tiago Vignatti <tiago.vignatti@nokia.com>
Date: Wed Aug 5 21:02:29 2009 +0300
mi: fix cursor warping screens
The server was processing ET_RawMotion type when the cursor was wrapping to
another screen and getting wrong valuator values. This fix such issue
considering only ET_Motion, ET_KeyPress, ET_KeyRelease, ET_ButtonPress and
ET_ButtonRelease types when the cursor detects a new screen, keeping the
"normal" processing of device events.
Signed-off-by: Tiago Vignatti <tiago.vignatti@nokia.com>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit d573cc46d3106824902ab4f926617bd9959af57c
Author: Maarten Maathuis <madman2003@gmail.com>
Date: Sat Aug 8 11:32:05 2009 +0200
exa: more safety
commit 8b652435cd42929e2d187b353b3b20e798569356
Author: Maarten Maathuis <madman2003@gmail.com>
Date: Sat Aug 8 10:35:01 2009 +0200
exa: minor cleanup
commit a73f95aa93634cf7ba2c7c9274a046b2df2adca7
Author: Maarten Maathuis <madman2003@gmail.com>
Date: Sat Aug 8 02:31:23 2009 +0200
exa: Fix the broken upload fallback for "mixed"
- Replace it with something wfb friendly while i'm at it.
commit c029678bf7883b91f3c8095e764abbee246c9bb6
Author: Julien Cristau <jcristau@debian.org>
Date: Fri Aug 7 20:42:30 2009 +0200
configure.ac: drop dependency on fontenc
Nothing in the server uses this anymore.
commit 3943df7f76c1b4930fb7370d9d145cee96dd562b
Author: Maarten Maathuis <madman2003@gmail.com>
Date: Fri Aug 7 20:36:03 2009 +0200
exa: one can never be too careful
commit 1548e8ae5d28ed0eb6057a1a19cfc84a78ef34dc
Author: Maarten Maathuis <madman2003@gmail.com>
Date: Fri Aug 7 20:04:53 2009 +0200
exa: fix a potential loophole in "mixed"
- Always free sys_ptr before setting the pixmap to pinned.
commit e94c7c42ce9d6a194b76ba7e8b3904b180f93a1b
Author: Dave Airlie <airlied@redhat.com>
Date: Fri Aug 7 13:36:52 2009 +1000
parser: make libxf86config_internal.la not installed.
commit 5fb188b547e0ef4e2f2c59b66a3183b004e4a1e9
Author: Dave Airlie <airlied@redhat.com>
Date: Fri Aug 7 12:05:51 2009 +1000
ddx: fix xf86Config.a generation
We were generating a shared library, but this lib is foobar, the parser
requires some symbols from the X server or from the program its being linked
into. If the program its being linked into (say a python .so) has symbol
visibility enabled then it will fail to dynamic link, also if this .so has
symbol visiblity enabled it will fail to dynamic link.
Screw it go back to a .a file really unless someone cleans it up properly.
Signed-off-by: Dave Airlie <airlied@redhat.com>
commit 3047bd067464efb9857960d3fa6324b947faa970
Author: Maarten Maathuis <madman2003@gmail.com>
Date: Wed Aug 5 18:39:47 2009 +0200
exa: delay malloc for "mixed"
commit e8ac2ed5dc4c2ac0a5e1e1f371f94c15b1c729dd
Author: Maarten Maathuis <madman2003@gmail.com>
Date: Wed Aug 5 16:12:16 2009 +0200
exa: implement exaMoveInPixmap for "mixed"
- This can be used to force creation of driver pixmap.
- Not for 1 or 4 bpp.
- Driver can still fail (driver) pixmap creation.
commit 9d2a7128d3e66b8c076a714d69f84bcad49391b9
Author: Maarten Maathuis <madman2003@gmail.com>
Date: Sun Aug 2 02:35:46 2009 +0200
exa: Use damage to optimise away useless copies.
commit 03ecb164f2592c954aa408bf121e0c67b604d854
Author: Maarten Maathuis <madman2003@gmail.com>
Date: Sat Aug 1 19:19:19 2009 +0200
exa: A simple 3rd backend implementation.
- Based on driver pixmaps with some changes (completely transparent to driver).
- It helps with the problem of known software fallbacks, such as trapezoids.
- exaDoMigration is now called for all cases that provide a do_migration hook.
- exa_migration.c is renamed to exa_migration_classic.c
commit ac7ac913fd98ea359c05c89968ab53a3223615b4
Author: Maarten Maathuis <madman2003@gmail.com>
Date: Wed Jul 22 21:35:41 2009 +0200
exa: Split out some classic and driver allocated pixmap code into seperate files
- Create a few seperate functions and a few private function pointers.
- Replace a few if conditions with a check for pExaPix->pDamage instead.
- This is in preperation of a third scheme that lies somewhere in between.
- Code clarity would have suffered (i started working on it and didn't like the mess).
commit 3abbd327f4a732408119de1f8e9ecba4812772a5
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Wed Aug 5 15:47:46 2009 +1000
dix: detach SD during XI2 grabs only.
XI1 grabs on slave devices leave the device attached - just like in earlier
versions of XI.
Tested-by: Thomas Jaeger
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit c29aa7da220661532b05972cacd3dbaff29408b5
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Wed Aug 5 15:33:07 2009 +1000
Revert "dix: Remove temporary detachment of slave devices."
This reverts commit 0c0ef42292f4c910c73b308cd75d77637312da53.
Tested-by: Thomas Jaeger
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 931160fcf378120e58849d801dbc62bed6e65a4b
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Tue Aug 4 02:53:17 2009 -0700
XQuartz: AIGLX: Provide empty __glXAquaDrawableResize to avoid crashing in DoMakeCurrent
(cherry picked from commit 60a1d2c2764f2f02c0751940a264588717afce79)
commit 0fe639a314de397516cf00d8100da8086abdd97a
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Sat Aug 1 22:53:45 2009 -0700
XQuartz: Only save lastpt on mouse/tablet events
(cherry picked from commit 552be074e5be6492df3e290e8b7d9daff1a2cb34)
commit 491c2d74c12d7f9bc9f31b427ece04e049ebff5a
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Sat Aug 1 12:43:14 2009 -0700
XQuartz: Use mouseLocation rather than locationInWindow when setting lastpt
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)
commit df6c01352471c766e9f71ceac03cab8c3911faa1
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Sat Aug 1 02:32:52 2009 -0700
XQuartz: Don't use location delta for tablets since NSEvent does not give a precise delta.
(cherry picked from commit 6c5bf756a7f5389cdfe2e43a339d7c31a3e522e9)
commit e360104880e6e2e666aa05dfd56e2ef3880f38ef
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Wed Aug 5 16:17:01 2009 -0700
XQuartz: Purge redundant QuartzBell
(cherry picked from commit de14a63d20095e1537fd74352850c734d900031d)
commit 8c0085c715effdc450d78eec14bc32e6214c78af
Author: Tiago Vignatti <tiago.vignatti@nokia.com>
Date: Wed Aug 5 22:50:44 2009 +0300
xfree86: remove more RAC junky
Signed-off-by: Tiago Vignatti <tiago.vignatti@nokia.com>
commit 444723273ae82fc3f6707ed1a461aaaa8fdae39c
Author: Tiago Vignatti <tiago.vignatti@nokia.com>
Date: Wed Aug 5 22:48:02 2009 +0300
xfree86: reorganize pci code
- xf86PciVideoInfo doesn't need to be global
- remove unused macros
Signed-off-by: Tiago Vignatti <tiago.vignatti@nokia.com>
commit 20169414e1afd5d1d02cb1b57866b1c158b2fc6c
Author: Tiago Vignatti <tiago.vignatti@nokia.com>
Date: Wed Aug 5 22:44:19 2009 +0300
xfree86: remove unused functions
RAC trash.
Signed-off-by: Tiago Vignatti <tiago.vignatti@nokia.com>
commit 95b678e6dc41f2524ada4eb11289687fafce7588
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Mon Aug 3 23:49:56 2009 -0700
Correct modifier map built when ProcSetModifierMapping is called
Fixes xmodmap changes to modifiers to stop corrupting modifier maps
Previous code had two bugs:
- the code to increment mod was after the code to continue if no
modifier was set, so mod wouldn't be incremented for modifiers
with no keys mapped to them (such as if you called
xmodmap -e 'clear Lock')
- the value it set in the modifier map was the raw modifier number,
not the bitmask value for that modifier
Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 4ca305956e5ea6f606b22ef62aa462186a7b95f0
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Wed Aug 5 09:40:56 2009 +1000
Re-enable Xnest by default.
Xnest was disabled in 82fc102568b3d6b0daeb6c5f5b3a1310a7f14fcd due do build
errors. These errors have since been fixed.
Re-enable Xnest by default to increase coverage by default builds.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 5904ef2ccd6056b187ca76f104c21e2d686bfc1d
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Wed Aug 5 10:40:20 2009 +1000
xnest: restore xnestUpdateModifierState
The meat of xnestUpdateModifierState was ifdef'd out in
6ef46c40e62def4841a4cff4e0b443516a2ed782. This resulted in stuck modifiers
when a modifier key release event wasn't sent to Xnest (e.g. Alt-Tab away).
See X.Org Bug 3664 <https://bugs.freedesktop.org/show_bug.cgi?id=3664> for
the original bug report.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 44afc7577ad3339f4555438388f6a4d8e220c991
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Wed Aug 5 09:51:05 2009 +1000
xnest: include exevents.h for XIGetKnownProperty.
Silences compiler warning.
Pointer.c: In function ‘xnestPointerProc’:
Pointer.c:64: warning: implicit declaration of function ‘XIGetKnownProperty’
Pointer.c:64: warning: nested extern declaration of ‘XIGetKnownProperty’
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 32ce5c83a504d2cafd2b19ed628b40032ef347b3
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Wed Aug 5 09:39:47 2009 +1000
xnest: use AllocDevicePair for Xnest device initalization
All Xnest needs is a single pointer+keyboard pair. AllocDevicePair sets them
up nicely with the name assigned etc.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 26b83ad4a29dc180b336a19d9e97589814e93e37
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Wed Aug 5 09:32:50 2009 +1000
dix: require PointerProc and KeyboardProc to be passed into AllocDevicePair.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 6a500fdd4d717947b86f6d6844ebf9a8603eb8e2
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Tue Aug 4 15:29:55 2009 +1000
dmx: include exglobals.h for DeviceKeyPress and friends.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 591c2f8758ef36a9bbf1625f9c207a1804f58ef4
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Tue Aug 4 15:30:52 2009 +1000
dmx: typecast to InternalEvent* before mieqEnqueue.
Silences a few compiler warnings.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 15b425b5a6630d2ac95b490f4f4dbb9240ac9c5d
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Tue Aug 4 15:31:42 2009 +1000
dmx: move 'state' around to silence compiler warning.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit e10f802c8260e034fd6c835d3f2622d9cd5085f8
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Tue Aug 4 15:40:17 2009 +1000
dmx: include inputstr.h for inputInfo.pointer
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 9ffc3f280b3907a672f99101548a5eb52027b37f
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Tue Aug 4 15:40:31 2009 +1000
dmx: don't call InitKbdFeedbackClassDeviceStruct - doesn't exist anymore.
InitKeyboardDeviceStruct does the same task now.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 63155cf985ee15bf6aad95066b076ab680cf5a31
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Tue Aug 4 15:28:30 2009 +1000
dmx: pass button/axis labels into the init functions (currently unset)
Currently only None labels are passed in, in the future these labels should
be whatever the respective buttions/axes are.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit af85973a0a80fb0ba82330ae3ec897f65d618003
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Tue Aug 4 15:25:06 2009 +1000
dmx: remove now-useless defines.
XI is mandatory so we can expect both to be defined.
commit 654d7a02600bbafd890f555a081aa0a2fcb5e253
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Tue Aug 4 15:23:01 2009 +1000
Revert "dmx: claim we support XI 2."
XQueryInputVersion doesn't exist anymore and for now XI 1 support is good
enough.
This reverts commit 8da8a0fec4b1b9d9208635dedb2f449dc99e0004.
commit e7c950c6273ff93f25c091c93d86da6e332a2277
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Tue Aug 4 15:15:24 2009 +1000
dmx: fix a call to XkbSetRulesDflts, takes XkbRMLVOSet now.
commit 2cde9208ff756e33d162e2324f4b99540230d743
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Tue Aug 4 14:58:25 2009 +1000
dmx: Enable/DisableDevice take a boolean variable now.
We want to send events here, so pass in TRUE.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 1e210d6d10ec63d22247e5801890e024826fc861
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Tue Aug 4 14:41:46 2009 +1000
xkb: remove now-unused XkbGetKeysym.
XkbGetKeysyms was only used by the now-removed Keysym grabs.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit a6ce6c70cff5108f0751b662b8e52c83daab0722
Author: Michel Dänzer <daenzer@vmware.com>
Date: Tue Aug 4 23:23:21 2009 +0200
EXA: Simplify exaGetPixmapFirstPixel using GetImage.
commit 842373104d08d47efc863cecbe30431d3faebef1
Author: Michel Dänzer <daenzer@vmware.com>
Date: Tue Aug 4 23:23:21 2009 +0200
Add support for RENDER BGRA formats.
commit 0bf7eaf3052ce24066b0a7c14860b4762fb81364
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Mon Aug 3 23:14:50 2009 -0700
Ansify function arguments in VTsw_noop.c
Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
commit 736f2d64725c6df8413e627bd40ce7ecb011acc7
Author: Paul Bender <pebender@gmail.com>
Date: Tue Jun 30 15:50:46 2009 -0800
Bug 16832: XDMCP related build error when --disable-xdmcp is used
X.Org Bugzilla #16832: http://bugs.freedesktop.org/show_bug.cgi?id=16832
Patch #27279: http://bugs.freedesktop.org/attachment.cgi?id=27279
commit b159a98f7fbdb3f8b337cd1bfd2ff27312856619
Author: Lee Leahu <freedesktop-bugs@dyweni.com>
Date: Thu Oct 23 21:03:57 2008 -0500
seg fault when initializing DMX screens
X.Org Bugzilla #18086: http://bugs.freedesktop.org/show_bug.cgi?id=18086
Patch #19837: http://bugs.freedesktop.org/attachment.cgi?id=19837
commit 5da9b255a64bec7dbf5ddb392d54dac9be5b43c0
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Mon Aug 3 19:53:27 2009 -0700
Fix blddir != srcdir builds of solaris-*.il files
Fixes http://bugs.freedesktop.org/show_bug.cgi?id=17509
Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
commit 1e69fd4a60147287b31e53bfc61543fb17bb82c8
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Mon Aug 3 12:03:26 2009 +1000
xnest: fix up parameters to InitKeyboardDeviceStruct.
IKDS takes a DeviceIntPtr as first argument, and an RMVLO struct as second.
The keysyms stuff is long gone now.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 008658049cbeea35a9f76f98037aa2f4173f3573
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Mon Aug 3 12:00:45 2009 +1000
xnest: silence compiler warnings by typecasing properly.
Events.c: In function ‘xnestQueueKeyEvent’:
Events.c:112: warning: passing argument 2 of ‘mieqEnqueue’ from incompatible
pointer type
../../mi/mi.h:203: note: expected ‘union InternalEvent *’ but argument is of
type ‘struct xEvent *’
Events.c: In function ‘xnestCollectEvents’:
Events.c:141: warning: passing argument 2 of ‘mieqEnqueue’ from incompatible
pointer type
../../mi/mi.h:203: note: expected ‘union InternalEvent *’ but argument is of
type ‘struct xEvent *’
Events.c:150: warning: passing argument 2 of ‘mieqEnqueue’ from incompatible
pointer type
../../mi/mi.h:203: note: expected ‘union InternalEvent *’ but argument is of
type ‘struct xEvent *’
Events.c:160: warning: passing argument 2 of ‘mieqEnqueue’ from incompatible
pointer type
../../mi/mi.h:203: note: expected ‘union InternalEvent *’ but argument is of
type ‘struct xEvent *’
Events.c:193: warning: passing argument 2 of ‘mieqEnqueue’ from incompatible
pointer type
../../mi/mi.h:203: note: expected ‘union InternalEvent *’ but argument is of
type ‘struct xEvent *’
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 664ac92d8bbe956dd6fd80fac5dc3161028803b2
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri Jul 31 14:38:35 2009 +1000
xfixes: backup the DisplayCursor/CloseScreen proc before restoring it (#23034)
The screen's DisplayCursor func is wrapped as
AnimCurDisplayCursor -> CursorDisplayCursor -> miPointerDisplayCursor.
Calling CursorDisplayCursor while an animated cursor was currently displayed
would remove AnimCurDisplayCursor from the wrap stack. Thus, the next call
to ChangeToCursor wouldn't update the animated cursor state. The block
handler for animated cursors would then continuously overwrite the actual
cursor, leaving an animated cursor everywhere on the screen.
X.Org Bug 23034 <http://bugs.freedesktop.org/show_bug.cgi?id=23034>
commit f48dfcc1b772a09428e328c72124ea0d46a73416
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri Jul 31 10:44:28 2009 +1000
xfixes: allocate CurrentCursor for all devices.
XFixes requires cursor notifies to clients when the cursor changes. This
should work on the ClientPointer and then on all master pointers. Hence
change CurrentCursor to a MAXDEVICES array.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit d3e5629fac224d53a972df5e2a87db02534f9b17
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu Jul 30 16:36:56 2009 +1000
dix: call SetFocusOut and LeaveWindow when disabling a device.
PointerWindows[x] would be set after removing a master pointer. Destroying
this window then crashed the server.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 97ed946cfccec5979c47b5fabf1ad56cc7d33ef4
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu Jul 30 16:36:30 2009 +1000
dix: SetFocusOut and LeaveWindow don't need parameters other than dev.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit d040940efe041b57e6323921c380ceb2bb43f41e
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu Jul 30 16:16:51 2009 +1000
xfixes: FixesHideCursor should work on all master pointers.
Presumably, a client calling HideCursor doesn't want any cursor displayed.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit b83c682e7ea4e10757eca6363de28281108591a8
Author: Oliver McFadden <oliver.mcfadden@nokia.com>
Date: Mon Aug 3 02:46:57 2009 +0300
xf86Xinput: xf86PostButtonEventP must set POINTER_ACCELERATE for relative events.
Thanks to Peter Hutterer for spotting this bug.
commit ae65daab080c6269f0eadc6be1a48bf27866c542
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Fri Jul 31 15:32:07 2009 -0700
XQuartz: Unify how we set our bitmasks for visuals
(cherry picked from commit c230b52c27ce50ac6c27011ec8e88f1b263b25f9)
commit 4a53fed41d711f270c7d8a7fbeaafb4fb619e879
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Fri Jul 31 14:19:50 2009 -0700
XQuartz: Dead code removal for StaticColor visual
(cherry picked from commit e457a44e87950207f6c16bf82bf5af11c777ecf1)
commit da0a2747803dbecb1308181176a784e14cf02809
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Fri Jul 31 14:14:21 2009 -0700
XQuartz: Cleanup the bitmask setting for GLX visuals.
(cherry picked from commit d32c3df258e748958ef997c675dc4fae118c0d7b)
commit 70ac671af2f092471022590cb7a19ef9155c51b4
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Thu Jul 30 01:30:52 2009 -0700
XQuartz: no DirectColor
(cherry picked from commit df2fbc410f2c484612f65a6539a6cb069ef4a468)
commit c0c72a866a237d3c2d9e69e1c69181ef5446e3f8
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Thu Jul 30 00:51:55 2009 -0700
XQuartz: Define DDXRingBell
(cherry picked from commit 113347381289497cb2a79994d0ef5f427ae63ac5)
commit 949811313989809f5b58424af04b9fd8e1d0bec4
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu Jul 30 21:59:40 2009 +1000
test: fix build by including eventstr.h
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 0565f4ed4519962bed40a0bbcf0b409471f4de40
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Wed Jul 29 16:46:45 2009 +1000
Xi: set the sourceid for focus devices to the device id.
Unlike Enter/Leave events generated by a device pushing the pointer around,
a device doesn't change focus all by itself. It's a result of a
SetInputFocus call, a window becoming unviewable or a grab activating. As
such, the sourceid for focus events is always the deviceid itself.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit de4dd5848cab90b0f8b8243ca0b49985ef047124
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Wed Jul 29 16:45:34 2009 +1000
include: DeviceFocusEvent is not to be exported.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 46ac9f92416f3cb99b5d84a9d200237dc33a3bb7
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Wed Jul 29 16:34:28 2009 +1000
dix: pass the sourceid around for enter/leave events.
The sourceid for enter/leave events as a result of pointer motion is the ID
of the slave device. The sourceid for those as a result of a grab activating
is the device itself.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit c299b2228fb63c192b72851c90e14ceaceb67bbc
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Wed Jul 29 16:00:19 2009 +1000
dix: remove obsolete comment, parameter described doesn't exist.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 5085ac09a50721d87196bd9f2607dc76200ca399
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Wed Jul 29 13:45:32 2009 +1000
input: switch internal event types to enums.
Use enum EventType instead of ints. This requires a load of default
cases in various switch statements to silence compiler warnings.
Reported-by: Aaron Plattner
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 1ae8332d643299a3ee9a9f45a8e25b8c87c751e1
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Wed Jul 29 13:39:38 2009 +1000
include: fix enum EventType declaration.
Having EventType after the enum declares a variable. silly me.
Reported-by: Aaron Plattner
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 994f7a1c814a89e90f710dac5bf6b2445fb64712
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Wed Jul 29 12:11:13 2009 +1000
record: silence some compiler warnings.
warning: passing argument 4 of ‘RecordAProtocolElement’ discards qualifiers
from pointer target type
note: expected ‘pointer’ but argument is of type ‘const void *’
record.c:2745: warning: passing argument 1 of ‘SwapConnSetupInfo’ from
incompatible pointer type
../include/swaprep.h:243: note: expected ‘char *’ but argument is of type
‘struct xConnSetup *’
record.c:2745: warning: passing argument 1 of ‘SwapConnSetupInfo’ from
incompatible pointer type
../include/swaprep.h:243: note: expected ‘char *’ but argument is of type
‘struct xConnSetup *’
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit a863d636293cd7361639c1a8cf9c4f7f15da1e1d
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Wed Jul 29 12:09:34 2009 +1000
Xi: remove FIXME and obsolete include.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit fac49df08f173f091cbb77feaf373d7d465358af
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Wed Jul 29 12:07:22 2009 +1000
Xi: remove obsolete comment.
XI1 only uses 7 bits for deviceids, bit 8 is used for the MORE_EVENTS flag
on the wire (when DeviceValuator events are required).
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 845e65f08059e8f4bfd37356e99b48bba9416c0c
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Wed Jul 29 11:54:14 2009 +1000
xkb: move XkbFilterEvents to xkbsrv.h
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 8da0ff2d51086666d10ca7330d428e8610a4a0e3
Author: Oliver McFadden <oliver.mcfadden@nokia.com>
Date: Tue Jul 28 08:20:37 2009 +0300
xf86Xinput: Add the xf86Post(Proximity|Button|Key)EventP helper functions.
xf86PostKeyboardEvent also makes use of xf86PostKeyEventP to avoid code
duplication, and the valuator verification has been split into the
XI_VERIFY_VALUATORS macro.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit a148d407429c7d13136b3fcafd2d279c5438df73
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Tue Jul 28 16:53:51 2009 +1000
xkb: restore XKB PtrBtn actions.
Ifdef'd out since the switch to internal events. PtrBtn actions now work
again. Instead of generating the event directly, GPE generates the event and
it is then posted through the usual event processing routines
(mieqProcessDeviceEvent).
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 3d3b8babd1a5407082f1a40875ed69f62ba2153f
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Tue Jul 28 16:51:14 2009 +1000
mi: update master event copying to InternalEvents.
This is long overdue. The device events are InternalEvents now (and only one
at a time), diminishing the need for an EventList for the master event.
Furthermore, don't make masterEvent a static since this will interfere if
mieqProcessDeviceEvent is called from somewhere else (e.g. XKB actions).
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit f85619b14d130ec54d42cabfaee15e55ced0c665
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Tue Jul 28 16:48:56 2009 +1000
dix: update GetMaximumEventsNum() to real value (3).
GPE and friends now use internal events so they may generate up to 3 events.
One (optional) DeviceChanged event and one raw event plus a device event.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 0217d0370c0b0bce66a9c09092eda8e820274e2e
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Tue Jul 28 14:54:30 2009 +1000
record: ifdef out RecordExtensionInit and print a warning to the log.
The RECORD extension is currently broken. By ifdef'ing out the content of
RecordExtensionInit the extension isn't added to the server's internal list
and it does not get advertised to the client. Clients can thus fail
gracefully with a "extension not supported" instead of waiting forever for
events that never arrive.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 4e9b2938cd8637a5d3b0a4c9f69d6ee75faab3a0
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Mon Jul 27 16:54:33 2009 +1000
include: untangle events.h from the SDK headers.
InternalEvents shouldn't be used anywhere outside the X server itself. Split
up into events.h for opaque typedefs for the events needed by various
headers and eventstr.h for the actual struct definitions.
eventstr.h must only be included by code that requires internal events and
is not part of the SDK.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit fad5f96c01811af7490a071719e4017c019a8d9b
Author: Jon TURNEY <jon.turney@dronecode.org.uk>
Date: Wed Jul 29 13:50:48 2009 +0100
Cygwin/X: Only try to build rootless extension if multiwindow extwm mode is being built
Rootless extension still needs a bit more work to build successfully for Cygwin/X
commit de2ae521abde445daaf025a07aa01563ca5ddd41
Author: Colin Harrison <colin.harrison@virgin.net>
Date: Sun Jul 26 20:48:19 2009 +0100
Xming: Use RegisterClassEx() instead of superseded RegisterClass()
RegisterClass is supserseded by RegisterClassEx, so change to using that everywhere
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
commit 764ce6ee683db342264bbca4df6379eb6093fb85
Author: Colin Harrison <colin.harrison@virgin.net>
Date: Tue Jul 28 16:16:57 2009 +0100
Xming: Use GetClassLongPtr() instead of superseded GetClassLong()
GetClassLong() is superseded by GetClassLongPtr(), so change to using that
commit a85523dc50f392a33a1c00302a0946828bc9249d
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Tue Jul 28 22:52:33 2009 -0700
XQuartz: Avoid a possible spinlock in applicationWillTerminate
(cherry picked from commit f430cda0fdcc1a8fc5f4795743b40f09ff0bd869)
commit 1e49c8d340ee8d8b6f90abcc2e2e9c390cbcd622
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Tue Jul 28 13:40:15 2009 -0700
XQuartz: Avoid namespace collission for BOOL in Sparkle
(cherry picked from commit 227c6e01a641b72158201553273299283cdb5599)
commit 442967c90dd9d8483a56bdc9237c49e33d619126
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Tue Jul 28 15:02:37 2009 -0700
Remove hardcoded gcc -Wall option from configure.ac
Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
commit 52e9ef5664a697a31102e8761eaa03cff01d14d8
Author: Tiago Vignatti <tiago.vignatti@nokia.com>
Date: Tue Jul 28 19:04:59 2009 +0300
xfree86: remove some RAC junk
Signed-off-by: Tiago Vignatti <tiago.vignatti@nokia.com>
commit d57361bb9ac08bec470f76ca8ca602d60c339502
Author: Tiago Vignatti <tiago.vignatti@nokia.com>
Date: Tue Jul 28 18:55:32 2009 +0300
doc: remove outdated PCI/RAC/Domain notes
Signed-off-by: Tiago Vignatti <tiago.vignatti@nokia.com>
commit 7b3d05ebd5a55f88098f4a763d1fa7ca110bb780
Author: Tiago Vignatti <tiago.vignatti@nokia.com>
Date: Tue Jul 28 18:45:16 2009 +0300
xfree86: remove pci debug macros
there's no effect when their are enabled.
Signed-off-by: Tiago Vignatti <tiago.vignatti@nokia.com>
commit 6089d9cfde533c6a7aec7dfc08aec9c8f2f18e27
Author: Tiago Vignatti <tiago.vignatti@nokia.com>
Date: Tue Jul 28 18:29:35 2009 +0300
xfree86: remove RAC/resource doc
Signed-off-by: Tiago Vignatti <tiago.vignatti@nokia.com>
commit c553161e17ebc577ecb91ec6c81f0bdd0ae85e13
Author: Tiago Vignatti <tiago.vignatti@nokia.com>
Date: Fri Jul 24 13:47:31 2009 +0300
xfree86: delete devices probe code (-probe and -probeonly options)
Inside a windowing system, it's not the place to probe for devices. Goodbye
-probe and -probeonly.
Signed-off-by: Tiago Vignatti <tiago.vignatti@nokia.com>
commit c09779f95a9772c0556760222dfc570dbaf8a28e
Author: Tiago Vignatti <tiago.vignatti@nokia.com>
Date: Fri Jul 24 13:37:31 2009 +0300
xfree86: delete stupid video driver dump (-modalias option)
Such stupid and ugly way to dump PCI information! Oh boy... Anyway, this
doesn't belong to the X server at all. Go away!
Signed-off-by: Tiago Vignatti <tiago.vignatti@nokia.com>
commit 0524420622df6cbdb3872917906f7b2a6ec02958
Author: Colin Harrison <colin.harrison@virgin.net>
Date: Mon Jul 27 15:49:41 2009 +0100
Cygwin/X: use GWLP_WNDPROC, GWLP_USERDATA with Get/SetWindowLongPtr
Missed from commit b3751454cbe02ee952bab213e8c3684d429c41b3
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
commit b1c3dc6ae226db178420e3b5f297b94afc87c94c
Author: Rémi Cardona <remi@gentoo.org>
Date: Mon Jul 27 12:07:51 2009 +0200
config: add HAL error checks
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>
commit 8898203b0d0e9fa03453b2bcd9b88843cccc3230
Author: Dave Airlie <airlied@redhat.com>
Date: Tue Jul 28 19:35:37 2009 +1000
sbus: fixup for rac removal
commit 4b42448a2388d40f257774fbffdccaea87bd0347
Author: Dave Airlie <airlied@redhat.com>
Date: Tue Jul 28 14:47:42 2009 +1000
xserver: remove RAC/resource handling code.
This changes the ABI, but since the video ABI is at 6 already
it should be fine.
driver changes are in the pipeline after this.
Signed-off-by: Dave Airlie <airlied@redhat.com>
commit 0a168401c401727e49a12cae43a6a387b1f2928d
Author: Dave Airlie <airlied@redhat.com>
Date: Tue Jul 28 14:19:24 2009 +1000
pci: add support for pci is boot vga call.
This allows us to ask the kernel for the boot VGA device
instead of nasty guessing.
commit b3751454cbe02ee952bab213e8c3684d429c41b3
Author: Colin Harrison <colin.harrison@virgin.net>
Date: Tue Jul 21 16:07:56 2009 +0100
Cygwin/X: Update Get/SetWindowLong() to Get/SetWindowLongPtr() everywhere
Get/SetWindowLong() is superseded by Get/SetWindowLongPtr(), so change to
using that everywhere it remains
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
commit c81595e23b48368dafc054f023c1dd16bbad9494
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Sun Jul 26 02:32:17 2009 -0700
XQuartz: Overhaul setting up visuals
The main change is cleanup of the visualConfigs and setting up alpha correctly there to match the visuals being added earlier (so the default visual has a corresponding GLX visual)
(cherry picked from commit 7351db5c8746be30a4047469ee9b50bc19e62a89)
commit 7f28c555b80dda2ed4f518efdb79733647dfea80
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Sat Jul 25 20:19:05 2009 -0700
XQuartz: Use CopyKeyClass to copy the keymap to the virtual core keyboard.
(cherry picked from commit 9a801d1716f005c30be076fcc9ac8dbb3e74d989)
commit 1031ac3a7306e7a82169c79c64607696c826c47f
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Sat Jul 25 20:18:38 2009 -0700
Revert "XQuartz: Copy the keyboard map to the core keyboard"
This reverts commit 795de791cf18c658421d701af645718493eac51e.
commit 48703083a1cf308306f254691d7c2ecda09b3812
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Sat Jul 25 19:34:17 2009 -0700
XQuartz: Use pDev=NULL for DarwinSendDDXEvent
These events aren't really related to physical input devices anyways, so it doesn't make sense to use the pointer.
(cherry picked from commit bfe0b9cfa7af4a48dba849cab1eb152c409b4e08)
commit b8e0f740829d0c81324aeb59222fc8e3d22493cc
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Sat Jul 25 20:17:25 2009 -0700
mieq: Protect from pDev=NULL in mieqEnqueue and mieqProcessInputEvents
(cherry picked from commit bf60ffb49700da367f7f88983b042a88fef7219b)
commit dab8de036808e363a8ec9be826cff7fbcd92b953
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Sat Jul 25 15:21:12 2009 -0700
XQuartz: Bump the reported version to X11R7.4
(cherry picked from commit c83f701aa75c75433b8745f5d79bca3a7516df91)
commit 9e74bb97ab6cb83dd99ec36bd3842197263b8a8c
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Sat Jul 25 10:39:26 2009 -0700
XQuartz: xpr: Added missing include for RootlessHideAllWindows
(cherry picked from commit 75e104730810acbb11bf8503bac24ea25243b2ac)
commit 09b024db636f5a306c9cec3806fffde9acd3c408
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Sat Jul 25 15:22:01 2009 -0700
XQuartz: Use the master device in DarwinSendDDXEvent to avoid duplicate events.
(cherry picked from commit 6fa62192af937aa9656f64b516050bc099231c7a)
commit 795de791cf18c658421d701af645718493eac51e
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Sat Jul 25 15:25:06 2009 -0700
XQuartz: Copy the keyboard map to the core keyboard
This still doesn't handle the modifier map... gotta figure out what to do now that SwitchCoreKeyboard is gone
(cherry picked from commit 427e1aab41dabb54354bfd30f2baae98ac8202c0)
commit af8047f7816b39be7015e8cbbe085c57bb354592
Author: Aaron Plattner <aplattner@nvidia.com>
Date: Fri Jul 17 15:10:46 2009 -0700
Damage: Add devPrivates to DamageRec
Signed-off-by: Aaron Plattner <aplattner@nvidia.com>
commit c80ed4945ef6dd50473fab871211b71b3d20dc3c
Author: Aaron Plattner <aplattner@nvidia.com>
Date: Fri Jul 17 15:10:32 2009 -0700
Damage: Add wrappable hooks for damage create, destroy, register, & unregister.
Signed-off-by: Aaron Plattner <aplattner@nvidia.com>
commit fb46474feb69d52d3dfdd61452ced5cfc38f6651
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Fri Jul 24 09:16:37 2009 -0700
XQuartz: Rever the "Set can_quit to true during a Sparkle-initiated relaunch." change
This was in place to work around the issue that was correctly solved with the
previous commit (changing the Windows menu behavior). Reverting this change
no longer causes crashing, so it's safe to show the dialog now.
(cherry picked from commit 023cef31bbb2ab80a241098d82fcfd35ada75fc0)
commit 0d73893a5795d5c1d28fd0287f2f1965f2ff1bda
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Thu Jul 23 20:03:29 2009 -0700
XQuartz: Change handling of Windows menu to workaround a bug triggered by mixing Sparkle and X11 windows
<rdar://problem/7088335> NSApplication releases the separator in the Windows menu even though it's an IBOutlet
(cherry picked from commit 27ac5135267be9cb221329ae68461117dd43a4bf)
commit 171409cecbd848e5fec6334fc61a20e882e80fa9
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Tue Jul 21 00:22:12 2009 -0700
XQuartz: Set can_quit to true during a Sparkle-initiated relaunch.
(cherry picked from commit b2e9a77111d4572402d8ca95e3368db97ba7d598)
commit 7ff84d350b44fa40669c1d0d48a715a0bf056ece
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Mon Jul 20 22:38:25 2009 -0700
XQuartz: Added a "Check for X11 Updates..." menu item.
(cherry picked from commit 305144bfa4b59791123c44e869fab93a084792d6)
commit 1e1dbd1e462f571dad2f9684fcf4cd8ae17eedd5
Author: Tiago Vignatti <tiago.vignatti@nokia.com>
Date: Mon Jun 29 11:46:17 2009 +0300
xfree86: "Staticize" functions in xf86AutoConfig.c
Signed-off-by: Tiago Vignatti <tiago.vignatti@nokia.com>
commit 7c6b5458de9bc7f6cd972a36b56888aaa3d201ee
Author: Aaron Plattner <aplattner@nvidia.com>
Date: Thu Jul 23 15:16:44 2009 -0700
Fix dist.
* Makefile.am: Include the test/ subdirectory in the dist tarball.
* include/Makefile.am: Move events.h to sdk_HEADERS and eventconvert.h to
EXTRA_DIST so they're included in the tarball. events.h shouldn't be
included in the SDK either, but for now it's needed by input.h.
commit 20daa145c437c3ba67970146f6182849f87a1b43
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu Jul 23 08:33:00 2009 +1000
mi: fix build error caused by missing xtest.h
xtest.h was renamed to xtestconst.h in xextproto.
Requires xextproto 7.0.99.3
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 587c3a2d1961834558193e8e14e8e381a077a253
Author: Aaron Plattner <aplattner@nvidia.com>
Date: Wed Jul 22 10:55:46 2009 -0700
Bug #22804: Reject out of bounds XGetImage requests
The XGetImage man page states:
If the drawable is a window, the window must be viewable, and it must be the
case that if there were no inferiors or overlapping windows, the specified
rectangle of the window would be fully visible on the screen and wholly
contained within the outside edges of the window, or a BadMatch error
results. Note that the borders of the window can be included and read with
this request.
However, the server was only checking the requested region against the screen
bounds, allowing XGetImage requests to read pixels outside the bounds of a
window's ancestors. Normally, this would just read other pixels from the
screen, but if one of the ancestor windows is redirected, the window's backing
pixmap may be smaller than the window itself.
This change checks the region against the window's bounding drawable, which is
either the screen pixmap, a redirected window's backing pixmap, or the root
window for servers that don't support GetWindowPixmap.
Signed-off-by: Aaron Plattner <aplattner@nvidia.com>
Reviewed-by: Keith Packard <keithp@keithp.com>
commit ecd618957ebf01cb4137f98efec3faed35f8a9f5
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Wed Jul 22 15:19:34 2009 +1000
dix: fix null-pointer dereference on activating enter/focus grabs.
EventToXI2 returns a NULL event for enter/focus events since these events
aren't yet wrapped into internal events. This is a quickfix only, it works
thanks to the alignment of internal and XI2 event types.
Eventually, enter/leave events should be wrapped into internal events.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 48585bd1e3e98db0f3df1ecc68022510216e00cc
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Wed Jul 22 12:09:24 2009 +1000
dix: use the event mask of the grab for TryClientEvents.
A client that grabs for button/key events may not have the
ButtonPress/KeyPress mask set and should not receive an event in that case.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 4dc91b3e54503a1be555bae5b18f3e52f58be307
Author: Pierre Willenbrock <pierre@pirsoft.de>
Date: Tue Jul 21 17:21:28 2009 +0200
Check if new space was actually allocated before freeing.
There will be no new space allocated, if mode != PropModeReplace and
len == 0, or if mode is not one of the handled modes.
This fixes freeing data that is still in use, leading to double frees and
other memory corruption.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 9a1bfa5664a80f03cedeb89b9f8a86115a08e7af
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Mon Jul 20 16:39:16 2009 +1000
input: remove XI2 keysym grabs, use keycode grabs instead.
Keysym grabs are tricky in the details, keycode grabs are known to work. So
for now, provide keycode grabs only.
Requires inputproto 1.9.99.15.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit afc3e3b5955ea4a49308399820cc4c499f4312da
Author: Jon TURNEY <jon.turney@dronecode.org.uk>
Date: Tue Jul 21 16:14:21 2009 +0100
Cygwin/X: winInitMultiWindowClass() should be static
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
commit 9dc8106ba095474fea1474622b0f0162c8fd5aa4
Author: Michel Dänzer <daenzer@vmware.com>
Date: Tue Jul 21 14:34:47 2009 +0200
randr12: Add compatibility for XF86VidMode gamma ramps.
Fixes screensaver fadeout effects.
Also make all RandR 1.2 compatibility code for XF86VidMode operate only on the
CRTC associated with the compatibility output, not all CRTCs at once.
commit 268e227ba06c027f5c56b1aaee5dcc6a2034403f
Author: Michel Dänzer <daenzer@vmware.com>
Date: Tue Jul 21 14:34:13 2009 +0200
EXA: Make Prepare/FinishAccess tracking resilient to repeated / nested calls.
Use reference counting and do nothing unless the reference count transitions
to/from 0.
Fixes https://bugs.freedesktop.org/show_bug.cgi?id=22822 .
As a bonus, this avoids calling the driver Prepare/FinishAccess hooks more than
once per pixmap and operation.
Also update the Doxygen documentation for the PrepareAccess driver hook to
better match current reality.
commit de7a14ca92f99ff03c8ad204aab5be8203c86a72
Author: Michel Dänzer <daenzer@vmware.com>
Date: Tue Jul 21 12:55:27 2009 +0200
EXA: Fix up some issues introduced by 00fe4a297744c81b40f0243fb56ad848a9be6a2b.
* Check all pixmaps involved for damage records, fixes visual corruption due to
the screen pixmap never having one.
* Fix an array size and remove a now superfluous assignment.
commit be4dd35ffecbf49aff13aa9f604a44c9b665ae92
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Sat Jul 18 15:51:29 2009 -0700
XQuartz: Initial support for automatic updates through Sparkle
(cherry picked from commit c45f1be36426bceeef9af67c26351114f14f5277)
commit 2415e2dce918efd49d5e6d71f705255a234a866b
Author: Michel Dänzer <daenzer@vmware.com>
Date: Mon Jul 20 02:08:31 2009 +0200
EXA: Bail earlier from exaDoPutImage if the driver has no UploadToScreen hook.
Also remove dead code associated with access_prepared local variable.
commit 00fe4a297744c81b40f0243fb56ad848a9be6a2b
Author: Michel Dänzer <daenzer@vmware.com>
Date: Mon Jul 20 02:04:40 2009 +0200
EXA: Completely eliminate exaDoMigration calls for drivers that manage pixmaps.
commit 7b9915b11ed9eedd0698b4563328504d686ac4ec
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Sat Jul 18 20:52:20 2009 -0400
dix: xserver "make dist" fails due to eventconvert.h (#27825)
This header file is not in the /dix dir, but in the /include dir.
The makefile aborted and the xserver distribution files were not created.
The fix is to remove this header file from the libdix_la_SOURCES
in the dix/Makefile.am.
X.Org Bug 27825 <http://bugs.freedesktop.org/show_bug.cgi?id=27825>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit a98acb290737ac6b0776f2ea8128a4613c0f778b
Author: Adam Jackson <ajax@redhat.com>
Date: Wed Jul 15 13:56:19 2009 -0400
s/xf86EnableOutputs/xf86CollectEnabledOutputs/ for clarity
commit 8fab7f72f2cc4ac5ca415c95ccbd05d3084f10c4
Author: Adam Jackson <ajax@redhat.com>
Date: Wed Jul 15 14:09:08 2009 -0400
randr: Add Option "Primary" to Monitor sections
commit 053bb92145045e06f8d72c3bddb75806432faa1c
Author: Adam Jackson <ajax@redhat.com>
Date: Thu Jul 16 14:29:05 2009 -0400
xfree86: Remove xf86SetPriority
GetClocks is pretty doomed to begin with, this really isn't going to
make it worse.
commit 3637945a45d55385335833197b18703379892884
Author: Adam Jackson <ajax@redhat.com>
Date: Thu Jul 16 14:10:45 2009 -0400
loader: Remove a useless check.
commit ef2bb08c76f0d1eed0c8b3e4937648f0b6ae01e5
Author: Adam Jackson <ajax@redhat.com>
Date: Thu Jul 16 13:53:00 2009 -0400
loader: remove dead LoaderCheckUnresolved
commit 06a2784232b5d0e2440ed365d272abdfa1f5d35f
Author: Adam Jackson <ajax@redhat.com>
Date: Thu Jul 16 13:40:48 2009 -0400
loader: Remove useless TestFree() macro
commit 087745b809b9a834751e5c719b9d87967194369b
Author: Adam Jackson <ajax@redhat.com>
Date: Thu Jul 16 10:51:53 2009 -0400
fbdevhw: Remove pointless OS check, this never gets built on non-Linux
commit 892c93553aa0b03aeb3f4c27d952cc4bb7120aff
Author: Adam Jackson <ajax@redhat.com>
Date: Thu Jul 16 10:51:27 2009 -0400
fbdevhw: Remove a #if 0
commit e5712f2926abf33b146a4ccfcf6e89c914dad37b
Author: Adam Jackson <ajax@redhat.com>
Date: Thu Jul 16 10:49:22 2009 -0400
fbdevhw: simplify some #if 1
commit 8868bb4131be25340bf65ec61b998d353965bab6
Author: Adam Jackson <ajax@redhat.com>
Date: Thu Jul 16 10:44:24 2009 -0400
randr: Un-duplicate the reduced blanking check.
commit 453ee39bc6a6b46e6cda11512cfcd431ba32a4b7
Author: Adam Jackson <ajax@redhat.com>
Date: Thu Jul 16 10:39:37 2009 -0400
xfree86: Fix some misleading comments
commit 2c57a7aa07fdf52be315ecb498341776268c1a10
Author: Adam Jackson <ajax@redhat.com>
Date: Thu Jul 16 10:32:53 2009 -0400
xfree86: Remove some #if 0
This code all lives in xf86Modes.c now anyway
commit 1a8c89683ff40cdd1d33da89ab47e7bd240b9bb7
Author: Adam Jackson <ajax@redhat.com>
Date: Thu Jul 16 10:15:41 2009 -0400
xfree86: Remove TargetRefresh option
This was a vestige from the days before we'd make the mode list from the
EDID data, and from CRT technology when you could reasonably assume that
higher refresh rates were better. Also it did not function as advertised,
acting as a high-pass filter instead of a band-pass.
commit b4ee3bf700e04ae1b3c4ec021373424ed6e5338f
Author: Adam Jackson <ajax@redhat.com>
Date: Fri Jul 17 14:57:50 2009 -0400
dbe: Fix indentation
commit 0bb9a7e1650180a24246d14493a8168487cf8914
Author: Adam Jackson <ajax@redhat.com>
Date: Tue Jun 9 11:49:41 2009 -0400
displayid: Implement mode decoding.
commit 2f1a9c5baa367818bf017bdb72f20a2f6fa7ac21
Author: Adam Jackson <ajax@redhat.com>
Date: Tue Jun 9 10:13:47 2009 -0400
ddc: s/xf86DDCMonitorSet/xf86EdidMonitorSet/
Since we need a second path for DisplayID.
commit d0cb4f5a91932e901d10cac5f2a4ba12bb8a0e6f
Author: Adam Jackson <ajax@redhat.com>
Date: Tue Jun 9 10:10:18 2009 -0400
ddc: Refactor root window property code
commit 14103b781201bc36896cbe9112a2e0d991fb785d
Author: Adam Jackson <ajax@redhat.com>
Date: Tue Jun 9 10:05:01 2009 -0400
ddc: Don't try to publish a root window property for DisplayID
commit c302a5ff49146bff24df196fc36ed38745d42911
Author: Adam Jackson <ajax@redhat.com>
Date: Mon Jun 8 17:42:10 2009 -0400
ddc: Skeleton for xf86DoDisplayID()
commit 0b36f68efb1171fcdbe53e93064394f5609b7fb5
Author: Adam Jackson <ajax@redhat.com>
Date: Mon Jun 8 15:36:15 2009 -0400
ddc: mv xf86DDC.c ddc.c
commit 8eb82168fc5c7ea958a4f63676738510647dd203
Author: Adam Jackson <ajax@redhat.com>
Date: Mon Jun 8 15:34:42 2009 -0400
ddc: Give DisplayID a place to hang its hat
commit ace0fe09aee48d57cd0079260cd8d20d041e8eb6
Author: Adam Jackson <ajax@redhat.com>
Date: Mon Jun 8 14:45:47 2009 -0400
ddc: Yet more code motion
commit 3a350688bbe1257feaf1502b4009f5f701d2640e
Author: Adam Jackson <ajax@redhat.com>
Date: Mon Jun 8 14:37:38 2009 -0400
ddc: Code motion to eliminate forward decls
commit 8797831f82637b0e65a08e1262d1ec57c075cc12
Author: Adam Jackson <ajax@redhat.com>
Date: Mon Jun 8 14:30:53 2009 -0400
ddc: Update a comment.
commit bb6fa39eb3aa044ffc18632288fd59909ff06344
Author: Adam Jackson <ajax@redhat.com>
Date: Thu Jul 16 17:43:31 2009 -0400
dbe: Adapt to new headers
commit 9965174f4f09a7de00a9569607e96226208bc2ce
Author: Pierre Willenbrock <pierre@pirsoft.de>
Date: Thu Jul 16 12:12:48 2009 +0200
Check dev->u.master if there is a custom event handler, too
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit c806162c133603a99d9cd844bb04485bb663707d
Author: Pierre Willenbrock <pierre@pirsoft.de>
Date: Tue Jul 14 13:42:19 2009 +0200
Always update u.lastSlave
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 4db8950b1dfc3150ee2e9f1f975e9ecb4eabb1f2
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri Jul 17 10:40:59 2009 +1000
Xext: include securproto.h instead of securstr.h
Reported-by: Byeong-ryeol Kim
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit b5f6da1e9b37f52484948185dcf17950657cd65b
Author: Oliver McFadden <oliver.mcfadden@nokia.com>
Date: Fri Jul 17 06:34:00 2009 +0300
Revert "Coverity Prevent: RESOURCE_LEAK in AccelSetProfileProperty:"
This reverts commit 7333dc2969f60af0abcfb28e7182a5fff9918223.
False positive.
commit f517fca31d8c341ad36f3de4863adb0bc5206176
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Thu Jul 16 17:28:56 2009 -0700
XQuartz: Localization updates
(cherry picked from commit 4b797fc1edf2bd963410a3133e3d2182ccfda4c3)
commit c8a35165147a9b2f747b25da80d0fdb4279a8331
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Thu Jul 16 17:20:16 2009 -0700
XQuartz: Cleanup getGlCapabilities to avoid hardcoding the number of displays
(cherry picked from commit 12f7365f1f58d648217b16f09c2152fa47dcd7a1)
commit e7bc9ff816c1848c700a376908a1411f1e20d29f
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Thu Jul 16 16:59:47 2009 -0700
XQuartz: Allow more than 3 OSX displays
(cherry picked from commit 45045eb3968069a8d74ce9188890a5537dc60fec)
commit 7333dc2969f60af0abcfb28e7182a5fff9918223
Author: Oliver McFadden <oliver.mcfadden@nokia.com>
Date: Thu Jul 16 18:57:49 2009 +0300
Coverity Prevent: RESOURCE_LEAK in AccelSetProfileProperty:
Event alloc_arg: Called allocation function "XIPropToInt" on "ptr" [details]
167 rc = XIPropToInt(val, &nelem, &ptr);
Event leaked_storage: Variable "ptr" goes out of scope
commit 66eabbebaf1b40fed7670b7c05337ed6226dd81e
Author: Oliver McFadden <oliver.mcfadden@nokia.com>
Date: Thu Jul 16 18:50:22 2009 +0300
Coverity Prevent: RESOURCE_LEAK in xf86CrtcSetInitialGamma
commit 464e8ad733fa6afee028607d6e7d4663b4c273cc
Author: Oliver McFadden <oliver.mcfadden@nokia.com>
Date: Thu Jul 16 17:51:08 2009 +0300
Coverity Prevent: NEGATIVE_RETURNS in fbdev_open_pci:
Event var_tested_neg: Variable "fd" tested NEGATIVE
At conditional (1): "fd != -1" taking false path
335 if (fd != -1) {
Event negative_returns: Tracked variable "fd" was passed to a negative sink.
347 close(fd);
commit 53ae6b63387e04324b23b6f8311cc22a154c1fb8
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Wed Jul 15 23:18:35 2009 -0700
XQuartz: Cleanup keymap locking, fix a possible synchro bug
(cherry picked from commit 33e7437a4984ee7c1b04b87d23dee7d4739d5f12)
commit 6a90c7b93724a2d26eae70b5806ca06c91e7df4c
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu Jul 16 09:28:42 2009 +1000
xkb: cosmetic fix, use TRUE instead of True.
Rest of InitKeyboardDeviceStruct uses TRUE and FALSE.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 52088d3c2d53a91b2690f9cc402f839d77769e37
Author: Éric Piel <eric.piel@trempin-utc.net>
Date: Sun Jun 21 18:11:28 2009 +0200
xserver: remove unused code in clipValuators
The axes variables was never used, remove it.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit d3f6b43a240eb763025b3cbf546cb7ae502c94fa
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Wed Jul 15 16:51:05 2009 +1000
Update to xextproto 7.0.99.1.
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.
commit 693babbf12cc7969c3e211c4037c7af0d41c13e9
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Wed Jul 15 12:30:02 2009 +1000
xkb: Remove XKMformat.h include from xkbsrv.h into the files that need it.
xkbsrv.h is used by drivers, they don't need the XKM format and shouldn't
require it.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 35ff5cd26eb7564fefebf238e30b8d43cbb4dc25
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Wed Jul 15 10:29:46 2009 +1000
dix: fix wrong raw valuator copy
internal events keep valuator data at the index for the valuator, not like
the wire events that start with first_valuator.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 975bf60a82f863e3bdc36fc3f8201b48a4d1e6f7
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Wed Jul 15 10:29:19 2009 +1000
dix: use sizeof(FP3232) instead of 2 * sizeof(int32_t).
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit d040af7fa3c7314917414a28d723bdda3c4289c3
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Mon Jul 13 15:09:38 2009 +1000
Update to type-specific raw events - require inputproto 1.9.99.14.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 81b64f668541217c1c9518ac4a7e3fdf0a6e4002
Author: Fredrik Höglund <fredrik@kde.org>
Date: Wed Jul 15 00:38:01 2009 +0200
Require renderproto >= 0.11 and pixman-1 >= 0.15.14 for the new blend modes.
commit 0ce42adbf4cff9e7f049d9fc79d588ece5936177
Author: Fredrik Höglund <fredrik@kde.org>
Date: Wed Jul 15 00:37:05 2009 +0200
Render: Add support for the PDF blend mode operators.
commit 686e4867302a741f3029c4105b997d0f0ac7c13c
Author: Tiago Vignatti <tiago.vignatti@nokia.com>
Date: Tue Jul 14 17:11:13 2009 +0300
xfree86: remove a bunch of unused pci headers
Signed-off-by: Tiago Vignatti <tiago.vignatti@nokia.com>
commit cc575a3ba4a52265e410b325c2291fe900a54f33
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri Jun 12 11:38:46 2009 +1000
test: add tests for ProcXIGetClientPointer.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 92b0065a19dcde50494d2528e19a4ee76723b3da
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri Jun 12 11:38:00 2009 +1000
test: add ProcXISetClientPointer tests.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 019bc9d70c5b3beb69ca20b6bca3551e00415992
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri Jun 12 11:37:17 2009 +1000
test: add ProcXIGetSelectedEvents tests.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 8579d39c12b065d8e82fe75af4b254c8ad4f4ab8
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri Jun 12 11:36:22 2009 +1000
test: add ProcXISelectEvents tests.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 60b7a7990003a22be5cc26ebe4d8d2d0803b97de
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri Jun 12 11:33:22 2009 +1000
test: add ProcXIQueryDevice tests.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 441c91be05912e2665cc1d3ee72fb70dcd32e7a2
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri Jun 12 11:32:15 2009 +1000
test: Add ProcXIQueryVersion tests.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 1d635ae65b217e124b3bd5a8844e73f447eb1b79
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri Jun 12 11:30:53 2009 +1000
test: add xi2 directory, prepare for protocol testing.
These two files provide a couple of common defines, functions and variables
that will be used in a number of protocol tests.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 4b93413b2a490a74de2e27b37268332b609ac872
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Tue Jul 14 11:20:01 2009 +1000
Add test subdir to base Makefile.am
If unittests are enabled, make will build those as well - spotting potential
build errors in the tests faster. Furthermore, this allows for the tests to
be run from the top-level directory.
This patch removes the "run make check to build the test suite" message
since that'd pop up after every build now.
If unittests are disabled, this change has no effect.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit e2226f3cd7d1bef598f9657b756a171b02f1a299
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Mon Jul 6 14:57:04 2009 +1000
dbe: switch to byte counting functions
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 3e1a054423c22f0e35f25127dde1ea8263892480
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Mon Jul 6 14:24:45 2009 +1000
record: switch to byte counting functions
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 089c460058c4e6814d98d40179eb4c731f37fa80
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Mon Jul 6 14:22:40 2009 +1000
xkb: switch to byte counting functions
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 0dc11da57562a7bbb6830ab657a2b818c596a537
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Mon Jul 6 12:41:29 2009 +1000
ephyr: switch to byte counting functions
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 34bfaa9d9ecd90cfe8413bc275179fdcc193eab3
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Mon Jul 6 12:29:26 2009 +1000
xfixes: switch to byte counting functions
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit e216527107fda470b92b7e526f3db22465962a43
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Mon Jul 6 12:27:23 2009 +1000
render: switch to byte counting functions
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 1d6b71b8d0dc24355e84391ba413170a03ccdbf4
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Mon Jul 6 12:25:39 2009 +1000
os: switch to byte counting functions
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 86b239ff9c4d01685c357ca2b1ef761d167e3224
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Mon Jul 6 12:24:27 2009 +1000
randr: switch to byte counting functions
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 7b9e84e320a6f6449fe7bc58a8d6a094ae37b86c
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Mon Jul 6 12:20:21 2009 +1000
Xext: switch to byte counting functions
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit aa19d355125a10b1a385c8f134d68e79d3d609c7
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri Jul 10 14:25:22 2009 +1000
xwin: switch to byte counting functions
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 0b4e6af857bcc5513e4c19912a54656d4696e56d
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Mon Jul 6 12:12:57 2009 +1000
xquartz: switch to byte counting functions
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
commit ad508c93c239a5ba8381000c031e96caf2769265
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Mon Jul 6 12:12:20 2009 +1000
xfree86: switch to byte counting functions
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit c20304226b3ca2f8d0a4f4866480b0d71913941c
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Mon Jul 6 12:07:00 2009 +1000
glx: switch to byte counting functions
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 87ce93c9973067255b4197d82772f83cd4ea5d27
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Mon Jul 6 12:06:47 2009 +1000
dmx: switch to byte counting functions
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit dc82e11e509ecf586d77c3e7c1325d515509ce51
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Mon Jul 6 12:03:34 2009 +1000
exa: switch to byte counting functions.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Acked-by: Michel Dänzer <michel@daenzer.net>
commit 2d35ea8d957a955e1200ba2b14424bddfe1f4148
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri Jul 3 16:50:03 2009 +1000
dix: switch to byte-counting functions.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 7dd415aa6a3959f15276741db168ba264948ecfe
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri Jul 3 13:57:14 2009 +1000
Xi: use byte-counting macros instead of manual calculation.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 912402fd71144bcee255141efe12a78abad39240
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Mon Jun 29 13:09:57 2009 +1000
include: introduce byte counting functions.
This patch adds the following three functions:
bits_to_bytes(bits) - the number of bytes needed to hold 'bits'
bytes_to_int32(bytes) - the number of 4-byte units to hold 'bytes'
pad_to_int32(bytes) - the closest multiple of 4 equal to or larger than
'bytes'.
All three operations are common in protocol processing and currently the
server has ((foo + 7)/8 + 3)/4 operations all over the place. A common set
of functions reduce the error rate of these (albeit simple) calculations and
improve readability of the code.
The functions do not check for overflow.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 2c535b6f13ffbf2c4ac59834dae39bb8e172c003
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Tue Jul 14 08:58:23 2009 +1000
dix: don't send presence events for attaching/detaching slave devices.
The code that didn't list attached slave devices for XI1 clients doesn't
exist anymore, so there's no need for these presence events.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 0c0ef42292f4c910c73b308cd75d77637312da53
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Sun Jul 12 21:43:06 2009 +1000
dix: Remove temporary detachment of slave devices.
Previously, an active grab on an attached slave device would send the device
floating for the duration of the grab. This breaks existing XI applications
(e.g. the GIMP) since they grab all devices automatically - resulting in the
loss of control over the VCP.
The behaviour of extended input devices during a grab in relation to the
core pointer is not specified in the XI protocol specification.
The removal of the temporary detachment restores the behaviour of extended
input devices as present in currently released servers - even if a device is
grabbed, an event from this device will result in an event from the core
pointer.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 9f1570c8f4f549cdd2fbae1234011290fcc73e18
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri Jun 26 09:12:47 2009 +1000
input: include effective modifiers in device events.
Require inputproto 1.9.99.13
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 78aedbe609e309446e71835ed15e4557d3ccf723
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Fri Jul 10 17:35:57 2009 -0700
Fix int10 module build after typo in commit 2638e9899
Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
commit 35758544813f156eaac28844e693b2a28f6de316
Author: Michel Dänzer <daenzer@vmware.com>
Date: Fri Jul 10 20:06:02 2009 +0200
EXA: Only pass CT_YXBANDED to RECTS_TO_REGION() if that is really true.
Fixes http://bugs.freedesktop.org/show_bug.cgi?id=22642 .
commit 2638e9899e57d9b25a2cade3247083a6e101dee2
Author: Tiago Vignatti <tiago.vignatti@nokia.com>
Date: Fri Jul 10 16:09:08 2009 +0300
configure: introduce --{enable,disable}-int10-module
Not all chipsets need to rely on the int10 scheme to do its daily work.
Well, the ideal would be to remove all int10 module from the server. I'll try
to provide some patches "soon" for this. Something like:
http://cgit.freedesktop.org/~vignatti/libx86/
Signed-off-by: Tiago Vignatti <tiago.vignatti@nokia.com>
Acked-by: Oliver McFadden <oliver.mcfadden@nokia.com>
commit 42d95a38535f382bfb2ddfaef93839ab9bbf584f
Author: Tiago Vignatti <tiago.vignatti@nokia.com>
Date: Fri Jul 10 15:54:07 2009 +0300
configure: introduce --{enable,disable}-vbe
Not all drivers need this kind of access as well.
Signed-off-by: Tiago Vignatti <tiago.vignatti@nokia.com>
Acked-by: Oliver McFadden <oliver.mcfadden@nokia.com>
commit 53d64930513fecaa417bb5a922966b45c9ff8679
Author: Tiago Vignatti <tiago.vignatti@nokia.com>
Date: Fri Jul 10 15:38:51 2009 +0300
configure: introduce --{enable,disable}-vgahw
Not all drivers need this kind of access.
Signed-off-by: Tiago Vignatti <tiago.vignatti@nokia.com>
Acked-by: Oliver McFadden <oliver.mcfadden@nokia.com>
commit aafcae79d17c1f802bc880d2142af7171fed75d8
Author: Tiago Vignatti <tiago.vignatti@nokia.com>
Date: Fri Jul 10 14:56:31 2009 +0300
xfree86: remove unused vbe header file
Signed-off-by: Tiago Vignatti <tiago.vignatti@nokia.com>
Acked-by: Oliver McFadden <oliver.mcfadden@nokia.com>
commit 3711d68f657c77b947cc4670cc4eac4f62de3af8
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri Jul 10 11:10:30 2009 +1000
Revert "XKB: Sanitise * actions" commits (#19602)
Reverts the following four patches:
feb757f384382c7782ceac55 "XKB: Sanitise vmods for redirected keys"
b5f49382fe48f0a762d9a15f "XKB: Sanitise ctrls action"
1bd7fd195d85681e722161f8 "XKB: Sanitise pointer actions"
61c508fa78aa08ea2666fde9 "XKB: Sanitise vmods in actions"
Strictly speaking, the structs used in the server are not part of the client
ABI. Practically, they are as we copy from the wire straight into the
structs. Changing the struct sizes breaks various wire/server conversions.
Even when the structs have the same size, some internal magic causes
conversions to fail. Visible by diffing the output files of:
setxkbmap -layout de; xkbcomp -xkb :0 busted.xkb
setxkbmap -layout de -print | xkbcomp -xkb - correct.xkb
Interestingly enough, busted.xkb is the working one although the output is
incorrect. Revert the four offending patches until the exact cause of this
breakage can be determined.
This patch restores functionality to Level3 modifiers.
X.Org Bug 19602 <http://bugs.freedesktop.org/show_bug.cgi?id=19602>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 08df24555cb432eb0d90a3f63275e9485e777c4c
Author: Soren Sandmann Pedersen <ssp@redhat.com>
Date: Thu Jul 9 17:23:04 2009 -0400
Reserve space for two GC values in copy_drawable().
Pointed out by Pierre Willenbrock.
commit 3c53f3241319d96affad2f4539f7661e02e80521
Author: Adam Jackson <ajax@redhat.com>
Date: Thu Jul 9 17:21:07 2009 -0400
Since font modules are dead, don't mention them in xorg-server.pc
commit e812103382a7bc3f7ba8b2f44ab97960dec265a9
Author: Adam Jackson <ajax@redhat.com>
Date: Thu Jul 9 10:58:17 2009 -0400
config: drop i810.
The driver assuredly no longer builds against 1.7. Please don't feel
compelled to fix it.
commit 55ac155d42268009eaecbc183329a8744d6ae48c
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Tue Jul 7 16:59:39 2009 -0700
Xephyr & Xserver man page fixes
Xephyr(1): Fix quote formatting, add missing ' to contraction
Xserver(1): Add Xephyr(1) & startx(1) to SEE ALSO section
Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
commit 36dc66ae79b6e1cbe0a23587e32aebb68365b0d0
Author: Michael Lorenz <macallan@netbsd.org>
Date: Tue Jul 7 20:21:39 2009 -0400
The way XaceHook() mixes struct initializers and va_arg() is not portable and
gives bogus data on sparc and probably others leading to a crash.
Fix:
Don't use initializers, instead set each member directly to enforce order.
Signed-off-by: Eamon Walsh <ewalsh@tycho.nsa.gov>
commit 48a9d65b88f56d1f8ab3bf824a4fe48c2f68725f
Author: Jon TURNEY <jon.turney@dronecode.org.uk>
Date: Sun Jul 5 16:06:32 2009 +0100
Cygwin/X: Window positioning improvements for multiwindow mode
A few tweaks to winUpdateWindowPosition():
* Don't allow window decoration to disappear off to top or left edge of the
display as a result of adjustments to add decoration for the window style
* Honour the position requested by window geometry for the client area (so
windows which save their position don't get moved by the decoration width
every time they are created) (unless we need to bump it away from top or left edges)
* Fix an issue with initial window placement being offscreen on multimonitor
systems when some monitors have negative coordinates (are to the left of or
above the primary monitor)
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
commit 5aec72745232dd61e60cfbf3acc4628d4fcd0315
Author: Keith Packard <keithp@keithp.com>
Date: Mon Jul 6 11:53:02 2009 -0700
Remove old DRI2 buffer alloc/free interfaces
These old interfaces are no longer supported by the server, removing them
requires bumping the video driver ABI. Note that this is not guaranteed to
be the last change in ABI version 6.
Signed-off-by: Keith Packard <keithp@keithp.com>
Reviewed-by: Eric Anholt <eric@anholt.net>
commit 2e2c5b216cc1c7a9bc26bd2c68226aaed5fc52ca
Author: Keith Packard <keithp@keithp.com>
Date: Wed Jul 1 14:01:57 2009 -0700
dri2: Preserve compatibility with 1.6 DRI2 API/ABI
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.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 7c7f0c2c6a04f7044d5ce69e97a615735e5831f1
Author: Søren Sandmann Pedersen <sandmann@redhat.com>
Date: Fri Jul 3 14:36:54 2009 -0400
Use IncludeInferiors when copying windows before compositing.
Part of bug 22484.
commit 43ee8d2ead862f84a4526a472519663ef27a8d6a
Author: Matthias Hopf <mhopf@suse.de>
Date: Wed Jun 24 18:26:23 2009 +0200
Unclaim PCI slot if driver probing fails.
Otherwise no subsequent driver will be able to claim this pci slot.
Example for this: fbdev tries to claim, but framebuffer device is not
available. Later on VESA cannot claim the device.
commit 73abdc94c3cceadeda26a9b6bd3cdfecf0df8db2
Author: RALOVICH, Kristóf <tade60@freemail.hu>
Date: Sun Jul 5 16:42:54 2009 +0200
glx: damage is only used with DRI
Signed-off-by: Tiago Vignatti <tiago.vignatti@nokia.com>
commit 7208a0f032d487bd3bc9809800f4557f1da1e2db
Author: RALOVICH, Kristóf <tade60@freemail.hu>
Date: Mon Jun 29 15:18:56 2009 +0200
glx: remove Xgl leftover
GlxSetRenderTables was only used by the long gone Xgl.
Signed-off-by: Tiago Vignatti <tiago.vignatti@nokia.com>
commit 89cf81cd85919e3dbb5adff5e6c6056c7990b60f
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri Jul 3 10:29:40 2009 +1000
Xext: return BadValue for XTestFakeInput on unsupported capabilities.
Calling XTestFakeDevice*Event on a device that doesn't allow the matching
event returns BadValue.
Reported-by: Florian Echtler
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit b773b4e8e0087993406d1d8c2df895db4d6301ff
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Mon Jul 6 11:04:47 2009 +1000
s/MAX_DEVICES/MAXDEVICES/ updates.
The number of input devices is MAXDEVICES, not MAX_DEVICES (f781a752e6)
Two comments updated to refer to MAXDEVICES.
MAX_FUNCS in sigio.c was set to 16 if MAX_DEVICES was undefined. If more
than 15 physical input devices were present, this could result in a
failure to install the SIGIO handler for any device above 15.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 183c075d2f9d5f6effa1ce7ab135fb0c2e46085a
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri Jul 3 13:26:48 2009 +1000
dix: always init the full button map to default values (#22594)
Master devices must have the standard button map applied for all buttons to
ensure buttons larger than 7 (the default for MDs) are mapped appropriately.
We can't copy the button map from SDs to MDs since that breaks the chained
button mapping. However, by ensuring all buttons (even non-existing ones)
are mapped, devices that send such buttons continue to work.
X.Org Bug 22594 <http://bugs.freedesktop.org/show_bug.cgi?id=22594>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 744bb559826ede37a77e9000b6c620eaa6a3c837
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri Jul 3 13:58:38 2009 +1000
Xext: remove unused variable 'it'.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit fd4eed69e40cf090aa16e79a8596eb1442461829
Author: Eric Anholt <eric@anholt.net>
Date: Thu Jul 2 15:24:54 2009 -0700
dri2: Enable GLX_SGI_make_current_read when the DRI driver supports it.
This matches idr's 82f150d73cc9a7d8eaf7241a51b03af05bcec159 for DRI1.
commit d6b8205e699c0c62af76c4a9cbff1402337927b3
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Fri Jul 3 19:25:33 2009 -0700
XQuartz: ProcAppleWMAttachTransient to play nice with the new Dock in SL
(cherry picked from commit ddc0242d8f291d0f961ba9aa8c883e39861ce2ad)
commit a49ae50370ec94e08e7dec3c742d33e20e79ef36
Author: Colin Harrison <colin.harrison@virgin.net>
Date: Mon Jun 29 22:55:52 2009 +0100
Xming: Apply window style hints in -multiwindow mode
Remove frames from 'dock' windows and make them topmost in -multiwindow mode.
Remove frames from windows with MOTIF_WM_HINTS of no decorations in -multiwindow mode.
Apply some _NET_WM_STATE hints in -multiwindow mode.
Apply window styles overrides from .rc file
Correctly update region of shaped windows when applying styles
Copyright (C) Colin Harrison 2005-2009
http://www.straightrunning.com/XmingNotes/
http://sourceforge.net/projects/xming/
commit 17e67c407d130c325d3899c18d68b8eef6a88bea
Author: Joe Krahn <jkrahn@nc.rr.com>
Date: Wed Jun 24 23:32:09 2009 +0100
Cygwin/X: Change to a single native window class for all X windows
from fd.o Bugzilla #4491:
There is no point in having one class for every window, aside from trying to
set custom icons via the class, which we no longer do, so converted to using
a single class for all client windows.
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
commit 2c69deb92e11542f615df0f24fdc03e3b4415475
Author: Rémi Cardona <remi@gentoo.org>
Date: Fri Jul 3 10:51:50 2009 +0200
configure: libXinerama isn't needed anymore
since libXinerama commit 90d4d23bf2e94721149ddc0a80093b10a82e8845 and
xineramaproto commit 21477147613c28c968b5e1eb9d8aea7017dd399d, the
server no longer needs libXinerama.
Signed-off-by: Rémi Cardona <remi@gentoo.org>
commit 97e29ffb5bf04a9d8280f1fa32ceced148503492
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri Jul 3 09:52:04 2009 +1000
xfree86: fix wrong IsMaster() check causing crashes.
Crashes caused by dereferencing NULL if the path was executed for a floating
slave device.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 50a2a8dc76645d8736f7d712f0ef05f23089407e
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri Jul 3 09:18:57 2009 +1000
Fix IsXtstDevice - returns false positives since 0814f511d5.
Missing check for the value of 'mid' returned false positives if master was
NULL.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 3525d140567e0ad5f0184e4b37893c47239e1628
Author: Felix Kuehling <felix.kuehling@amd.com>
Date: Tue Jun 30 20:07:30 2009 -0400
Export symbols needed by the RandR implementation in fglrx
GIT change
http://cgit.freedesktop.org/xorg/xserver/commit/?id=45c8bd0fe54273039fdaa1eeeafb81b5774f2c75
changed the default symbol visibility of the Xserver. As a result 2 symbols
that are needed by the RandR 1.2/1.3 implementation in the fglrx driver are no
longer visible:
xf86configptr
xf86CursorScreenKey
We would like to get these two symbols _X_EXPORT'ed before Xserver 1.7 is
released. Otherwise it will be problematic for fglrx to support RandR 1.3 on
Xserver 1.7.
In the future, we may want to sync our RandR implementation to later versions
of the RandR implementation in hw/xfree86/modes. Therefore it would be nice if
all symbols used by the Xserver RandR implementation were _X_EXPORT'ed in the
future.
commit e13605ea40cfc671314a0086c75b917564298b55
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Tue Jun 23 14:09:22 2009 +1000
dix: introduce "Xtst Device" label property.
Xtst devices get this property assigned automatically so they can be
detected easily by a client.
The property is read-only.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 0814f511d56a89c7b1868b17eba7a89f990b9ab1
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Tue Jun 23 10:50:52 2009 +1000
input: store the master device's ID in the devPrivate for XTest devices.
Rather than storing a simple boolean in the devPrivate for XTest devices,
store the actual master device's id (since it is constant for the life of
the device anyway).
Callers should use GetXtstDevice now instead of digging around in the
devPrivates themselves.
This patch allows for a cleanup in the creation of new master devices since
GetMaster and GetXtstDevice spare the need for loops, IsPointer checks and
similar.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Acked-by: Benjamin Close <Benjamin.Close@clearchain.com>
commit 1bcc0d3c244ce7d9f5cbab626aa5fd5784b41a1c
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Mon Jun 22 16:55:12 2009 +1000
input: abstract Xtst device lookup
The callers should need to use the dev privates key to look up xtest
devices.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Acked-by: Benjamin Close <Benjamin.Close@clearchain.com>
commit 34424fab9abd7a4ca11036be25414129980db0e0
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Tue Jun 23 11:50:29 2009 +1000
dix: set the client's error value to the bad deviceid in check_butmap_change.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit da04e8f1354fa9d253443489dc002b16f94d6fab
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Tue Jun 30 17:52:42 2009 -0400
dix/property.c: use memcpy where appropriate.
Signed-off-by: Eamon Walsh <ewalsh@tycho.nsa.gov>
commit 65d74d93145d22b68bad5728a7ebe38dc662cb21
Author: Jon TURNEY <jon.turney@dronecode.org.uk>
Date: Wed May 20 21:32:54 2009 +0100
Cygwin/X: Fix multiwindow extwm mode to build again
Build and link with rootless extension
Update Xwin code for removal of RootlessAccelInit()
Fix Xwin code which now has a collision with the type name EventType
Based on patches from Colin Harrison, Jon Turney and Yaakov Selkowitz
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
commit 638ca9a7a2363757dc5b5d456e10d34f6f158885
Author: Jon TURNEY <jon.turney@dronecode.org.uk>
Date: Mon May 18 18:14:41 2009 +0100
Cygwin/X: Avoid a visual glitch on window move in rootless modes
Handle and ignore WM_ERASEBKGND since we repaint the entire invalidated region anyhow
(this avoids a white flickering on window resize)
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
commit b718b2e0880cf2b969675da98d5ef8a4a01ca5d6
Author: Jon TURNEY <jon.turney@dronecode.org.uk>
Date: Mon May 18 18:14:09 2009 +0100
Cygwin/X: Allow pointer warping to work in rootless modes
Mouse pointer warping in multiwindow/rootless mode was never implemented,
due to concerns that moving the mouse pointer without asking might be rude
This patch allows X applications to move the mouse pointer in rootless modes,
Let's hope they don't abuse this privilege ;-)
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
commit 85614946ba3d5a233eece612afc7f09572a347c2
Author: Jon TURNEY <jon.turney@dronecode.org.uk>
Date: Mon May 18 18:13:08 2009 +0100
Cygwin/X: Improve mouse tracking for moving/resizing undecorated windows
In -multiwindow mode, tell Windows we wish to capture the mouse when a button
is down. This causes Windows to continue to send movement events for the mouse
even if the mouse pointer moves outside the window frame.
This helps greatly with undecorated windows which have regions you can grab
to move (e.g. gmplayer, xine control panels) or resize (e.g. Songbird) the
window, as it means the window continues to receive the mouse motion even if the
mouse pointer moves out of the window (which presumably happens if we don't
manage to update the window fast enough to track the mouse pointer)
Consolidate the multiple instances of the code to start the mouse position
polling timer into a new function winStartMousePolling(), and use that to
restart the polling timer when we release the mouse.
Also, start the timer on WM_SHOW, so that xeyes will track the mouse position
when it is first shown, even if the mouse doesn't enter it's window
(You probably need focus-stealing turned off to see this problem)
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
commit f351c10a9774cc0ea2cbb58f00f07ece7f7c6e73
Author: Yaakov Selkowitz <yselkowitz@users.sourceforge.net>
Date: Mon Jan 5 16:17:30 2009 +0000
Cygwin/X: Man page fixes
Correct path names in man pages, using cpprules.in
Install XWinrc man page into section 5
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
commit 5c1afac5eea1d8327c74342d12d082b75f0cebde
Author: Adam Jackson <ajax@redhat.com>
Date: Mon Jun 29 11:16:16 2009 -0400
EDID: Fix timing class names to match the spec
commit bf0f3b8f2bc830c8bd6f8f9410b89394b8d96257
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Mon Jun 29 13:31:02 2009 +1000
test: fix build error introduced by XINPUT_ABI 7
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit cbeb6a73c44143674a700d36a7e9804d41003a4f
Author: Thomas Jaeger <ThJaeger@gmail.com>
Date: Sat Jun 20 20:17:41 2009 -0400
dix: report subpixel coordinates for high-resolution devices
Acked-by: Simon Thum <simon.thum@gmx.de>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 069b4c5f0a38649de73d1e0f70ee81bf862399dd
Author: Simon Thum <simon.thum@gmx.de>
Date: Sat Jun 20 18:57:22 2009 +0200
dix: make part of ptrveloc.h internal
Though this is a SDK header, some functions are intended solely
for the server.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 2830e8493757e0da1253fe5ab280562b84730e77
Author: Simon Thum <simon.thum@gmx.de>
Date: Wed Jun 24 11:33:19 2009 +0200
dix: rename pDev->dev, pVel->vel for consistency
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 373e8c960d00e2b8c2250dd3f66859b081e14854
Author: Simon Thum <simon.thum@gmx.de>
Date: Wed Jun 24 11:16:24 2009 +0200
dix: improve pointer acceleration API
This makes the ptr accel api actually sensible from a driver
perspective, since it avoids superfluous device lookups.
Also, makes independent accel contexts possible.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit b8050bb6deebdb1ee60731f63884ffca575c09ce
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Sat Jun 27 15:28:34 2009 -0700
XQuartz: Don't leave zombied processes at startup
(cherry picked from commit 40c1406830588fa85d880e9f4e9ca570db1db306)
commit aaff92c8c22a47804a21010d023ef76d82e7ec7e
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Sat Jun 27 14:40:03 2009 -0700
XQuartz: 64bit fix for screen origin in AppleWM
(cherry picked from commit 60a757d2802a5c34acd91ca9a052937b5a169ede)
commit cabcc1a7ad697dde915794ddcea6a300f66b0a28
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Sat Jun 27 10:40:59 2009 -0700
XQuartz: More localization updates
(cherry picked from commit 5925c1f48ad05bf94195b986c1fdefc52a20ae42)
commit 31166c2ae0ce898c96995a8b16b58b127dc85a2f
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Fri Jun 26 16:51:22 2009 -0400
xace: add a new hook for checking property content after it has been set.
Allows security modules to enforce what property contents can be set by
clients. Uses the new DixPostAccess bit to distinguish between the
existing call made during the lookup (with the old property data) and
this new call. Note that this only applies to writes, prepends, or
appends to existing properties; for new properties the existing
DixCreateAccess hook call may be used since it includes the new data.
Refer to the XACE-Spec document in xorg-docs, section "Property Access."
Signed-off-by: Eamon Walsh <ewalsh@tycho.nsa.gov>
commit 51105de9b0d865c4b5e5a7d9ab23c89d808d1cfa
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Fri Jun 26 16:50:12 2009 -0400
xselinux: ignore property hook calls with the new Post access mode bit set.
Signed-off-by: Eamon Walsh <ewalsh@tycho.nsa.gov>
commit 10812204b3415c969bcebd3215e84d758a0b4dd8
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Fri Jun 26 16:48:24 2009 -0400
dix: add a new DixAccess bit, "DixPostAccess".
This will be used for follow-up checks after a client has written something,
for security modules that enforce a set of valid values a client can set.
Signed-off-by: Eamon Walsh <ewalsh@tycho.nsa.gov>
commit 9480725af0275b72b24b9e1cb3b68d5b97288d01
Author: Rémi Cardona <remi@gentoo.org>
Date: Wed Jun 24 10:12:50 2009 +0200
xfree86: DIST_SUBDIRS should not contain variables
This patch reverts a change done in commit
800d4ceb946c93724661ebfd28afb658ca63b6b1 to add conditional XAA support
Signed-off-by: Rémi Cardona <remi@gentoo.org>
commit 84662e40c3d4141ebb298a1ad714f75056a4ab74
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Thu Jun 18 23:19:21 2009 -0400
Xi: check for GetAttr permission when listing or querying devices.
If the check fails, leave the device off the returned list of info
structures. Under XI2, this may cause inconsistent views of the device
topology after a change (for example, devices disappearing from view,
or showing as attached to a master that cannot be seen). More work is
needed to deal with topology changes and device relabeling.
Signed-off-by: Eamon Walsh <ewalsh@tycho.nsa.gov>
commit 00bc8d34c68dab6c818cd1c7e03e9992d1d0cbfc
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Thu Jun 18 21:41:17 2009 -0400
Xi: check for Use permission on the device in SetClientPointer().
Presumably, some intelligent, XI2-aware management app will be calling
XISetClientPointer on behalf of other clients; this check makes sure
the target client has permission on the device.
Requires changing the prototype to return status code instead of Bool.
Signed-off-by: Eamon Walsh <ewalsh@tycho.nsa.gov>
Acked-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 119b96667778391436998c76a68bf64e746c9e08
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Thu Jun 18 21:02:28 2009 -0400
Xi: fix up access modes for calls to dixLookupDevice().
New access modes are being passed to the device access hook for XI2:
DixCreateAccess for creating a new master device;
DixAdd/RemoveAccess for attaching/removing slave devices to a master; and
DixListProp/GetProp/SetPropAccess for device properties.
Refer to the XACE-Spec document in xorg-docs, section "Device Access."
Signed-off-by: Eamon Walsh <ewalsh@tycho.nsa.gov>
commit 07c36e4fdcd93df3d33bdab6cca4780ebc9c1f54
Author: Dave Airlie <airlied@redhat.com>
Date: Wed Jun 10 13:33:47 2009 +1000
dix/resource: fix use after free in resource code with DRI
LookupClientResourceComplex is used by DRI1 code to find and free a DRI
drawable in a callback, however when the DRI code returns this->value
is now pointing at freed memory. It seemed easiest to store the value
to a temporary and return it afterwards.
Another option might be a new FreeClientResourceComplex or one that
also returns the id, so we can free it using an alternative means.
found using valgrind.
amended along ajax's suggestions
commit 184deb9bc325eb7aa7eb7b7d4f98aa917f0269cb
Author: Dave Airlie <airlied@redhat.com>
Date: Wed Jun 24 10:40:05 2009 +1000
GLX: make function static.
This function isn't called from anywhere else and I don't think it shuold be.
commit 9d85b56078ec05da1369ca22930d8eb214c389db
Author: Dave Airlie <airlied@redhat.com>
Date: Wed Jun 24 10:38:49 2009 +1000
GLX: note the implicit flushes with ReadPixels in indirect contexts.
This just notes the flush has occured when readpixels returns, and
fixes the glean test.
commit e341512bfa40dd98853a20596dc65dcac4dcaa37
Author: Thomas Jaeger <ThJaeger@gmail.com>
Date: Sat Jun 20 21:37:59 2009 -0400
dix: update a comment
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 5cbd4d3d6e54d202ecdbb527b57aaefeb8435600
Author: Thomas Jaeger <ThJaeger@gmail.com>
Date: Sat Jun 20 20:17:04 2009 -0400
dix: do away with an instance of temporary in-place modification
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 94cdc1ef0a72802573a11ba292e2f5cc8474aa8e
Author: Thomas Jaeger <ThJaeger@gmail.com>
Date: Mon Jun 22 13:00:37 2009 -0400
dix: deal with first_valuator > 0 correctly if POINTER_SCREEN is set
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 21cbb4c9de44e2629dc0fa6f647ce2d139f2cef0
Author: Oliver McFadden <oliver.mcfadden@nokia.com>
Date: Wed Jun 24 00:24:44 2009 +0300
xorg-server.h.in: Export the X Access Control Extension (XACE), too.
Acked-by: Daniel Stone <daniel@fooishbar.org>
commit 800d4ceb946c93724661ebfd28afb658ca63b6b1
Author: Tiago Vignatti <tiago.vignatti@nokia.com>
Date: Wed Jun 24 00:13:32 2009 +0300
configure: Provide the --enable/disable-xaa option.
Acked-by: Daniel Stone <daniel@fooishbar.org>
commit ce3d539ac6ecab3e343cef7c4dc112bc82ea3b02
Author: Oliver McFadden <oliver.mcfadden@nokia.com>
Date: Wed Jun 24 00:08:51 2009 +0300
xf86Config: Avoid attempting to load non-compiled modules.
Acked-by: Daniel Stone <daniel@fooishbar.org>
commit 33e25143361d63ea776dfafeeb6d4ffb2f6fd8d4
Author: Yaakov Selkowitz <yselkowitz@users.sourceforge.net>
Date: Fri May 15 22:42:30 2009 +0100
Cygwin/X: add hebrew to autodetected keyboard layouts
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
commit b079945c39e2a72220b46953352e24c3a74ef39a
Author: Jon TURNEY <jon.turney@dronecode.org.uk>
Date: Fri Feb 20 15:21:35 2009 +0000
Cygwin/X: more warnings fixes
More warning fixes, mainly removing casts on function return values
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
commit e79db6a97d02c8a256a4a7e145ea0b48b5a084ab
Author: Jon TURNEY <jon.turney@dronecode.org.uk>
Date: Wed Feb 11 23:00:58 2009 +0000
Cygwin/X: Remove an obsolete mention of xf86Config
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
commit 3020b1d43e34fca08cd51f7c7c8ed51497d49ef3
Author: Michel Dänzer <daenzer@vmware.com>
Date: Tue Jun 23 16:45:40 2009 +0200
glx: Clean up more thoroughly if the drawable of a current context goes away.
Fixes crash when restarting compiz, due to cl->currentContexts[x] being stale.
commit df597709d71f47b8516e27c6fb1bfffd59de5e48
Author: Michel Dänzer <daenzer@vmware.com>
Date: Tue Jun 23 16:45:39 2009 +0200
dri2: Don't crash if pPriv is NULL.
commit 048697ccfa31cf7f7a29afa90a2f702d43efb7d4
Author: Ben Skeggs <bskeggs@redhat.com>
Date: Wed May 27 15:24:34 2009 +1000
quirk: use first detailed timing as preferred for PEA prod 9003 (rh#492359)
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 07154db4a8b96467785fd6be93d20379acacffa8
Author: Ben Gamari <bgamari.foss@gmail.com>
Date: Mon Jun 22 08:59:45 2009 -0400
Xi: Remove redundant and incorrect butmap range check
Maps are CARD8s, therefore checking for values above 255 is completely
unnecessary. Moreover, 0 is a valid value for maps, so the check wasn't
even correct to begin with. This fixes bug #22392, which was uncovered
by commit 280b7f92d729ec910ffa3d18dce7bbc215be7a3c.
Signed-off-by: Ben Gamari <bgamari.foss@gmail.com>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 96706c24bd57fbd9b11e5bd5e38d05d81b90aebe
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu Jun 18 15:40:08 2009 +1000
dix: fix wrong indices in set_valuator.
Reported-by: Thomas Jaeger
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit ae20e748cd3a656173e1f50109bfd4af0712bb87
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Fri Jun 19 21:16:10 2009 -0700
XQuartz: More localization updates
(cherry picked from commit 7fbe974246f54535c545861a57c043d80e127ee7)
commit 30df49f54945e75f033a0eb6445c26d37eb33c5e
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Thu Jun 18 23:15:47 2009 -0400
Xi: fix 2 memory leaks.
In ProcXIQueryDevice() and XISendDeviceHierarchyEvent().
Signed-off-by: Eamon Walsh <ewalsh@tycho.nsa.gov>
commit eb35402d0a5290e8a73d7d1e92f173294c364cc2
Author: Adam Jackson <ajax@redhat.com>
Date: Fri Jun 19 12:42:07 2009 -0400
pci: Dump vendor/devices ids in the printed device list
commit c733660428c0a7c1d11f7bd21e23e1bb934d352e
Author: Søren Sandmann Pedersen <sandmann@redhat.com>
Date: Fri Jun 19 08:37:18 2009 -0400
Use pixman_version_string() instead of PIXMAN_VERSION_STRING
Pointed out by Julien Cristau.
commit aef6b904ebf0d7de6259058606c7c04ea177bda3
Author: Dave Airlie <airlied@panoply-rh.(none)>
Date: Thu Mar 13 16:16:46 2008 +1000
fbdev: make entity fail if PCI claimed already.
bad kitty fbdev, been shipping this in Fedora for a while now
commit 3efb23a6c40dc3583d083d25ada3853ecc56000d
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Thu Jun 18 19:35:22 2009 -0400
xselinux: Add new device permissions for XI2.
Refects the ability of clients to add/remove devices and device properties.
Signed-off-by: Eamon Walsh <ewalsh@tycho.nsa.gov>
commit 1e060c3d8b13d352a58fc65980cb9a3c6cb5718f
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Thu Jun 18 18:48:24 2009 -0400
xselinux: Move the security class mapping to the header file.
Take the mapping of DixAccess bits to Flask permissions, move it
into the header file, break up the extremely long lines, and
annotate the permission names with the bit being referenced.
Signed-off-by: Eamon Walsh <ewalsh@tycho.nsa.gov>
commit 75c51c67b340548286efd41a53882e2acaf74ab5
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Thu Jun 18 09:49:12 2009 -0700
Clarify use of and need for mffs vs. ffs
Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
commit 128cd03eecacc6d5c5903d59a11966dcf3697bf1
Author: Søren Sandmann Pedersen <sandmann@redhat.com>
Date: Sat Jun 13 10:55:04 2009 -0400
Fix miComputeCompositeRegion() to follow new clip rules.
Ignore the hierarchy clip, and always apply any client clip after
transformation and repeating.
commit e9aa61e9f0d663d5b34a397b943b4d1df44e873d
Author: Søren Sandmann Pedersen <sandmann@redhat.com>
Date: Sat Jun 13 10:28:21 2009 -0400
Fix clipping when windows are used as sources
The new clipping rules:
- client clips happen after transformation
- pixels unavailable due to the hierarchy are undefined
The first one is implemented in pixman; the second one is realized by
making a copy of window sources (to prevent out-of-bounds access).
commit d9b5e77a0e48a16c53653b56bc61a0b8dc4122a1
Author: Søren Sandmann Pedersen <sandmann@redhat.com>
Date: Tue Jun 9 14:36:21 2009 -0400
Print the current version of pixman.
commit 1e9907499c27321a2aa5dc8a75a375b7a82c999a
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu Jun 18 15:14:00 2009 +1000
record: use dixLookupResourceByClass instead of LookupIDByClass.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 66089e9129a821cfb1983d3d35f41b975a52de5e
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Wed Mar 25 12:55:42 2009 +1000
xfree86: fix SWCursor check in xf86CursorSetCursor.
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.
Reported-by: Gordon Yuan <GordonYuan@viatech.com.cn>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit afa680e495622f521cae80563511c0d284f57551
Author: David Miller <davem@davemloft.net>
Date: Thu Jun 11 05:15:05 2009 -0700
mi: ignore DGA events in ChangeDeviceID
DGA events don't have a deviceid, so they don't need changing.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit cd8abd17abcc8ae9da6704d03b97a9f134f36aab
Author: Jon TURNEY <jon.turney@dronecode.org.uk>
Date: Wed Jun 17 14:17:07 2009 +0100
Cygwin/X: Fix permuted args to InitPointerDeviceStruct()
Fix a minor error in commit a30fef9956b296f59ea18a9ee38d0abafeb15a4e,
new btn_labels argument to InitPointerDeviceStruct() wasn't added in
the right place
commit 14581afb474552716c02ca15220ca7050123c375
Author: Benjamin Close <Benjamin.Close@clearchain.com>
Date: Thu Feb 26 17:32:10 2009 +1030
xfree86: correctly define barriers for FreeBSD amd64
Previously when compiling on freebsd amd64 we'd end up at xi86
block (line 1315) which would define mem_barrier and write_mem_barrier
to be NOP's. Instead they should be valid, as per the linux amd64 setup.
This stops the hangs experienced by many when using the nv driver
which would hang due to out of order dma requests as noticed in
http://bugs.freedesktop.org/show_bug.cgi?id=3168
Signed-off-by: Benjamin Close <Benjamin.Close@clearchain.com>
commit e92dcb6ce07aa3cfb53e8bad5701481c106c4094
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu Jun 18 14:40:20 2009 +1000
input: unify button numbers on master devices.
Master devices provide the union of all attached slave devices' buttons,
i.e. the number of buttons on the master device is always the number of
buttons of the slave device with the highest number of buttons. When slaves
are attached or detached, the master device adjusts the button number to
reflect the new buttons.
On a slave switch, this slave's button labels are copied into the master (up
to slave->num_buttons). The remaining button labels (if any) stay as they
are. Thus, if any of the higher buttons is still pressed, it reflects the
label of the last pressed device that provided this button.
If two devices press the same button and it is differently labelled the last
pressed one will be reflected in the master device.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 280b7f92d729ec910ffa3d18dce7bbc215be7a3c
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Wed Jun 17 22:38:24 2009 +1000
dix: reduce MDs and xtest pointers to 7 buttons by default.
MD's will soon be the union of all devices anyway. XTest pointers are only
for the core protocol XTest stuff, so 7 buttons (lmr + 4 wheel buttons)
should do.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 6c7d992735eebbd7a20247926e7725896348b865
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Wed Jun 17 09:11:52 2009 +1000
Require inputproto 1.9.99.12
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 09cef7573938e5c08007e578e1b638bc5e1796a8
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Wed Jun 17 09:04:08 2009 +1000
Xi: valuator/button labels are called labels now, not 'names'
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit bc2ff5365030ad8bc11efde430b1064080dd7098
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Tue Jun 16 19:36:57 2009 +1000
Xi: copy the valuator mode from SD to MD.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 87d1f44bad608507e3995e17eb84fa0a0119796c
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Tue Jun 16 14:18:45 2009 +1000
Xi: copy the button and axes labels into the XIQueryDevice reply.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit a30fef9956b296f59ea18a9ee38d0abafeb15a4e
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Tue Jun 16 16:38:11 2009 +1000
input: Add labels to buttons and valuators - ABI_XINPUT_VERSION 7
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 17f9723f488d0470e3879c6b0dfdba61544cdd7b
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Wed Jun 17 08:37:44 2009 +1000
input: bump to ints for deviceids - XI2 requires 16-bit deviceids.
Note: ABI break, but ABI_XINPUT_VERSION has NOT been bumped. Recompile input
drivers.
Revert "Xi: return BadImplementation for deviceids 256 and above"
This reverts commit 2b459f44f3edaea137df9a28bc7adfeb1b9f1df7.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit cbeb73e2055f6c013c8fe6325851f2631170137d
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Tue Jun 16 10:51:52 2009 +1000
Xi: return current valuator values in XIQueryDevice.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 80837dbefd9d5e96ab5c1f4b4c2d5c66ce17ce67
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Tue Jun 16 10:51:17 2009 +1000
input: change axisVal from uint to double.
With subpixel support, uint just doesn't cut it.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 25b6fc4a42f7698e6ae0b16becb316bfd7835d05
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Tue Jun 16 10:48:48 2009 +1000
Xi: last_valuator is used like an index, so range it accordingly.
The previous code would always skip the last valuator due to a wrong
upper boundary in the loop. last_valuator is the index of the last set
valuator - which also means it must be initialized to -1, not 0.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 3fc762ea9474cf92f6b7ef60dd0bb68f59385272
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Tue Jun 16 10:48:03 2009 +1000
Xi: Motion events update the device state too.
Without this line the device's axis values don't get updated properly for
pure motion events.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit ad6347afead500fefb34131841f4beb5b03ad4ec
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Tue Jun 16 16:35:40 2009 +1000
Xi: don't use a constant number for class sizes - use sizeof instead
The protocol is still changing, and having to debug crap like this is
annoying.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit d5a15e65b7d2fdda14fb719e3ebf076cce896386
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Sun Jun 14 09:15:42 2009 +1000
Xi: include button state in XIButtonInfo.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 01241b4247a7ad0974d48412cc0d88e1a09a3c49
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Sun Jun 7 19:43:11 2009 +1000
Xi: Add support for sourceid in the device classes.
commit d230742ea820a21a3f1ed0c58b5e6d8680b2f2aa
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Tue Jun 16 12:13:16 2009 +1000
Xi: namespace XI2 files.
Some files (notably those merged with MPX before XI2 came along) didn't use
a 'xi' prefix. This patch changes all of them to meaningful names.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 4ddb002b6847e8a88e6f13ae0453a35ee79946ae
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Mon Jun 15 15:14:47 2009 +1000
xfree86: fix two compiler warnings in xf86vmode.c
xf86vmode.c:1578: warning: pointer targets in passing argument 1 of
‘SwapShorts’ differ in signedness
../../../../include/misc.h:231: note: expected ‘short int *’ but argument is
of type ‘CARD16 *’
xf86vmode.c:1543: warning: unused variable ‘i’
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 9d039ef5047af2dedff0c583dda11032f71bed01
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Mon Jun 15 15:11:55 2009 +1000
xfree86: silence a few int10 compiler warnings.
'format ‘%#x’ expects type ‘unsigned int’, but argument 2 has type ‘CARD32’'
and similar.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit fb882b3da189847bc98b646faddac9e8b42aa435
Author: Adam Jackson <ajax@redhat.com>
Date: Tue Jun 16 14:58:10 2009 -0400
EDID: Carp about 1.4 monitors with no preferred refresh rate
You would think, having finally tightened down the spec, that
monitor vendors would bother to implement what the spec actually
mandates. You would be wrong.
commit b2d2af76b43d62c9be07fd736652f904632fd663
Author: Adam Jackson <ajax@redhat.com>
Date: Mon Jun 15 10:10:26 2009 -0400
randr: fix typo in swapped dispatch
commit 1d20b9021e8aecb942619f64017cc2fc31f02d29
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Sun Jun 14 18:21:43 2009 +1000
Xi: fix wrong bit->byte conversion in ProcXIQueryPointer
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 9afc3241c157e5c19454f913c7105b3fdfa97ec4
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Sun Jun 14 18:24:22 2009 +1000
Xi: remove un-used IsOn macro.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit b67ff1d6e0d01170c6261593ca36d0f51d917393
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri Jun 12 16:45:36 2009 +1000
Xi: XISelectEvents/XIGetSelectedEvents use 'win' instead of 'window' now.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit b2bf67b61c564a4b92a429ca9ad455403161f33a
Author: Benjamin Defnet <benjamin.r.defnet@intel.com>
Date: Wed Jun 10 21:35:48 2009 -0700
randr: fix operation order so that rotation+transform works
The matrix multiply to combine rotation and projective transforms was being
done in the wrong order.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 3627215e97734cc367fff273a3358c2a95a53481
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri Jun 5 16:38:46 2009 +1000
Add check for GNU ld in the test suite.
The GNU linker supports a -wrap option to wrap function calls at link-time.
This allows for easy overriding of functions in the X server with stubs in
the test suite. This functionality is only supported on the GNU linker and
will be used extensively in the tests. Disable the tests if GNU ld is not
available.
commit 5e0ca6fabd12401de6bd6039484be2079e28851e
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu Jun 11 16:26:23 2009 +1000
input: remove un-used "setter" argument from SetClientPointer.
It's obsolete, not likely to come back, let's drop it.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit e6a18762ef113296c6a09833be70cb4b45aa3940
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu Jun 11 15:40:56 2009 +1000
Xi: fix XISetClientPointer return values.
If SetClientPointer fails, the only reason may be that the device is not a
pointer or that the device is an SD. Return BadDevice instead of BadAccess.
(BadAccess is a leftover from the early times of the ClientPointer
implementation when only one client was allowed to set it).
If the window parameter doesn't name a valid window or client, return
BadWindow.
Finally, allow both master keyboards and master pointers as deviceid.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit ae7dab2a136d15b976b956f68feec53886951dd6
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu Jun 11 15:40:38 2009 +1000
Xi: Fix XISetClientPointer swapping.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 98e8ec8deb09db1c56e06afed267e6f517042fa3
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri Jun 12 10:54:55 2009 +1000
Xi: sanitize ProcXIGetClientPointer.
This was quite old code and can be streamlined a bit. The new code is
essentially the same as in ProcXISetClientPointer.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 96ea82fdac7c28feb2748cd4ff7faa7c00dbbdcd
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri Jun 12 10:54:25 2009 +1000
Xi: fix reply swapping in XIGetClientPointer.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 76f25086a9ab6f0c27d9e2cd745f8463c6b3df5f
Author: Adam Jackson <ajax@redhat.com>
Date: Thu Jun 11 16:34:06 2009 -0400
vfb: Re-enable 30bpp support
commit 0de58c88aba7ddd69b04f24ab5b2967c359aa69e
Author: Dave Airlie <airlied@redhat.com>
Date: Thu Jun 11 14:21:53 2009 +1000
xfree86: move didLock assignment down to where the function pointer is valid.
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>
commit a85d210b34506cb39e7f08d81d4586fe4448b47f
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu Jun 11 12:32:39 2009 +1000
Xi: store mask_len before swapping in ProcXIGetSelectedEvents.
Swapping the mask_len and then advancing the pointer by the swapped length
is just a bad idea.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 5043f42f36b49e7702d0c496dd4fe157788d44ee
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu Jun 11 12:31:40 2009 +1000
Xi: correct return buffer size for XIGetSelectedEvents.
The maximum number of bytes is calculated by the mask len, and the mask len
is always in 4-byte units. XI2MASKSIZE however is in bytes.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit fcf0c0b8f332cbde03c1a479376b7913197962eb
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu Jun 11 13:23:40 2009 +1000
Xi: XISetEventMask needs to clear the mask if len is 0
zero-length masks are supposed to clear the device's mask.
ProcXISelectEvents passes these masks through directly, so we need to clear
the bits here if such a mask is supplied.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 22b4ac44e4fdbe8f36f2b570cdbdaf237062e33e
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu Jun 11 11:08:07 2009 +1000
Xi: XIGetSelectedEvents mustn't returned masks from non-existing devices.
Or devices the client doesn't have XACE permissions for.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 7868956b0fb50a9d77506f01413612e429f540a3
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Wed Jun 10 17:09:39 2009 +1000
Xi: ProcXIGetSelectedEvents must use WriteToClient for swapped data.
The data is already swapped before, so we just post it to the client as-is,
without attempting to swap it again.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit aa2babf11c30be4d289b58212dc330b84efb4053
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Wed Jun 10 14:41:11 2009 +1000
input: remove dependency on XI2 protocol for XI_LASTEVENT.
inputstr includes XI2proto.h for the sole purpose of XI_LASTEVENT.
However, using XI_LASTEVENT in the server is prone to errors, if the server
is recompiled against a newer version of the protocol it would bump this
variable and associates bits, including potential ABI.
This patch defines an XI2LASTEVENT for use in the server and removes the
XI2proto.h require. XI2LASTEVENT is the current value of XI_LASTEVENT.
This patch is required by components that require access to inputInfo
(currently xf86-video-geode and xf86-video-cirrus) but should not have a
require for the XI2 protocol.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 77cc816da4a2777110182ed01c22c0f5e6ac3b65
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Wed Jun 10 13:54:42 2009 +1000
Xi: rename ProcXISelectEvent to ProcXISelectEvents.
The request name has the plural, so let's do it here too. Purely cosmetic
change.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 9563feeeb5309de1971c4e04419fed6fd31c9cea
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Tue Jun 9 16:57:09 2009 +1000
Xi: start checking for invalid mask bits _after_ LASTEVENT.
Two issues that combined to false positives and false negatives.
- The checking for invalid bits must be performed when there are enough bits
that an event outside of LASTEVENT may be selected.
- The first invalid bit is LASTEVENT + 1, not LASTEVENT.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit e2fbaebb87e18198143a4b8e6be7e650563cd819
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Tue Jun 9 14:38:25 2009 +1000
Xi: XISelectEvents returns BadValue for num_masks == 0.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit cfeb65ac45b194dead5e8b9b26192df2619d6f9c
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Tue Jun 9 14:37:42 2009 +1000
Xi: XISelectEvents needs to be at least size 3, not exactly.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit f3c26034eca98924d93a004aaa1f61ffe5d344ca
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Tue Jun 9 13:04:56 2009 +1000
Xi: XIQueryDevice should use XIFooClass instead of the old FooClass defines.
This is merely a cosmetic change, the actual values are the same anyway.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 482cc72aa790bd2f23c7ebe12c5549b47c737115
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Tue Jun 9 13:03:38 2009 +1000
Xi: get the class length before swapping.
Advancing by the already-swapped length lets our pointers point into
nirvana.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 9974249980894f74f3ead466655da87958a43670
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Tue Jun 9 13:02:52 2009 +1000
Xi: Swapping 32 bit keycodes requires swapl, not swaps.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 918923e285f4e269a257bb5be4d3c8a50174aad0
Author: Dave Airlie <airlied@redhat.com>
Date: Wed Jun 10 15:13:45 2009 +1000
glx: fix open-coded linked list removal function
OMG stab stab stab, YALL.
removal function was made of crack, actually truncated the list from
the one after the find point.
However fixing this makes glean makecurrent fail with a GLX error.
commit 3ea747c0dbbec0db6761d66d4f6c680d2e9ddeaf
Author: Daniel Stone <daniel@fooishbar.org>
Date: Sat Apr 25 16:53:18 2009 +1000
KDrive: Warning fixes
xEvent vs. InternalEvent confusion still reigns though.
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
commit 754be1e2ec9be2486bf45000d7244d217556de07
Author: Daniel Stone <daniel@fooishbar.org>
Date: Sat Apr 25 16:51:48 2009 +1000
KDrive: Xephyr: DRI: Warning fixes
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
commit f534e6bea17746db952feb563ffea7320846b49d
Author: Daniel Stone <daniel@fooishbar.org>
Date: Sat Apr 25 15:38:54 2009 +1000
OS: Fix compile warnings
It's a marvel the sigaction() ever actually worked.
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
commit 305ab237f666936cd812c464bf43f86f6079838e
Author: Daniel Stone <daniel@fooishbar.org>
Date: Sat Apr 25 22:11:19 2009 +1000
KDrive: Warning fixes and cleanups
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
commit 4c8812b544ce5f319a7ac59a131c626c8509ef99
Author: Adam Jackson <ajax@redhat.com>
Date: Wed Jun 10 12:46:19 2009 -0400
kdrive: undef PSEUDO8
Whatever that was, it no longer is.
commit 973ef5a7086aedb88a4888e73630c96ae68078e4
Author: Adam Jackson <ajax@redhat.com>
Date: Wed Jun 10 12:44:45 2009 -0400
kdrive: Remove a lie about PCMCIA support.
commit e3c65cf1df9bbfb126f07b4b8e1254a855fb70c7
Author: Adam Jackson <ajax@redhat.com>
Date: Wed Jun 10 12:05:09 2009 -0400
xephyr: Add -title option.
commit 803522300344265f11ea9f869ee6747730413bae
Author: Colin Harrison <colin.harrison@virgin.net>
Date: Wed Jun 10 13:32:54 2009 +0100
Xming: Simplify logic for ownership release of native clipboard
Make the logic simpler for the ownership release of the Windows
clipboard in winclipboardwrappers.c - We've already marked a selection
as unowned if it is owned by our clipboard window
Copyright (C) Colin Harrison 2005-2008
http://www.straightrunning.com/XmingNotes/
http://sourceforge.net/projects/xming/
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
commit c7d3965bee0edb72468a0135aaa8a081348c2b23
Author: Jon TURNEY <jon.turney@dronecode.org.uk>
Date: Wed Jun 10 13:09:44 2009 +0100
Cygwin/X: Add a needed inputstr.h
Add a needed inputstr.h to fix build after commit 6d4ffcc9e066bc7c49dcff1a2ff0111801c7286d
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
commit 6d4ffcc9e066bc7c49dcff1a2ff0111801c7286d
Author: Dave Airlie <airlied@redhat.com>
Date: Wed Jun 10 11:15:24 2009 +1000
input: move inputstr.h to where its needed.
This stops inputstr.h being needed to be included by output drivers.
Signed-off-by: Dave Airlie <airlied@redhat.com>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 6f59a8160042ea145514fdcb410f17f33fd437c2
Author: Benjamin Defnet <benjamin.r.defnet@intel.com>
Date: Mon Jun 8 21:45:42 2009 -0700
hw/xf86/modes: Set crtc mode/rotation/transform before calling set_mode_major
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>
commit e244a5991e2cc55f5aa2f6e5255f1dabf56f0235
Author: Federico Mena Quintero <federico@novell.com>
Date: Tue Jun 9 13:28:28 2009 -0700
dix/randr: Add missing fields to SRR*NotifyEvent()
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>
commit 746e7b22e1bdfbf2363040367209b4c46b1c2fec
Author: Adam Jackson <ajax@redhat.com>
Date: Tue Jun 9 16:20:11 2009 -0400
cvt: Allow multiple-of-60Hz refresh rates for reduced blanking.
Doing so generates the same timings as given in the DMT spec for
120Hz RB, so we should be set there. Other rates might be legal
too but why push our luck.
commit 2a035600e603117a4dbe668cad50bae2a5609094
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Tue Jun 9 10:14:18 2009 +1000
require inputproto 1.9.99.11
commit c5bebca46f63bcd7279f3c73ed1d50e0c1b6051f
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Mon Jun 8 17:54:05 2009 +1000
Xi: hierarchy events have a num_info now instead of num_devices.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 810b74dbbcc1db3e68e0f95ff5223ddb2032e46d
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Mon Jun 8 13:41:22 2009 +1000
Xi: change from XICreateMaster to XIAddMaster for consistency.
add/remove is used for slave devices and hierarchy flags.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 0e66a443a09176b8a875195d5473b953c07aa1d7
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Mon Jun 8 12:24:24 2009 +1000
Xi: return BadValue for XI_HierarchyChangd mask on devices.
This mask may only be selected for XIAllDevices.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 69a9545d1f8110841538410818df19fd960412c5
Author: Keith Packard <keithp@keithp.com>
Date: Thu May 28 14:43:27 2009 -0700
Make RANDR 'set' timestamps follow client specified time. Bug 21987.
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>
commit fa18c569ed26d2fdd442af6b39723cb7e30d18df
Author: Ben Skeggs <bskeggs@redhat.com>
Date: Tue Jun 9 09:14:50 2009 +1000
exa: driver pixmaps enabled if either CreatePixmap or CreatePixmap2 present
commit 9390b7a133b0e17bc4d303effb7a99ff7017b086
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Sun Jun 7 19:26:45 2009 +1000
dix: protect against missing ButtonClasses in GetPointerMapping.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 21ee53060b4dcb5c12074cf6682ff0067021ff60
Author: Simon Thum <simon.thum@gmx.de>
Date: Fri Jun 5 19:14:48 2009 +0200
config: fix build after XI2 API changes to RemoveDevice.
This patch fixes the build with --enable-config-dbus is enabled
(default disabled).
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 07c59411817c10fbcbf1bc9efa6a0818b6e0493a
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Sat Jun 6 22:17:44 2009 -0700
GLX: Make sure the types match for ALIAS in indirect_reqsize.c
(cherry picked from commit 31a20a573b867fb7f02da15425e3b92eccb82dec)
commit 077556ec39ca7e0d14486005cf71fcdc70a350cf
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Sat Jun 6 21:55:51 2009 -0700
XQuartz: AIGLX dispatch table cleanup
This should fix some issues when building on different versions of OSX. We only use extensions that OpenGL.framework's glext.h header tells us are supported.
(cherry picked from commit e10c53421f1e780573c8adcd8ea89d6ffa28a819)
commit fc24a97a8d022e986082b65b5133701e7273805c
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Tue Jun 2 19:12:41 2009 -0700
Rootless: Use serverClient instead of NullClient
This seems to stop the crash when moving windows.
(cherry picked from commit fcd857c8e295ac7a2b0e58d49dc71251ed9d1266)
commit 2429daa7e6b35a4a8032e1c3736e417a5a9baa07
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Tue Jun 2 10:19:10 2009 -0700
XQuartz: Default to forcing the dialog box before quitting.
This will show the quit dialog for users of other WMs.
(cherry picked from commit 639ee0c913f892776fee40bcfb856e0d7c2c7db5)
(cherry picked from commit 09432fa5b1cc8e9a30fb8aa4f8dfcd08c4a91e30)
commit 6d75606a9e7f6ebc4d79a5261a48f5915c71cbcd
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Mon Jun 1 22:58:40 2009 -0700
Rootless: Despite its name, we still want to allow rootless to mess with the root window
This fixes the bug whereby we weren't drawing the contents of the root window since RootlessPaintWindowBackground got nuked.
(cherry picked from commit bb0e208787739fbed2a0c8d1af6b6504319fdf88)
commit 7348bf4935c8887bca33fe340ac2548f551bee3d
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Sun Jun 7 09:25:51 2009 +1000
dix: set the generic event type for implicit XI2 grabs.
event->type is always GenericEvent for XI2 events. Instead, XI_ButtonPress
(the generic event's evtype must be stored.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit bb1c131b785ca30cf40041db3513b7669beebd34
Author: Simon Thum <simon.thum@gmx.de>
Date: Thu May 28 16:43:42 2009 +0200
dix: suppress pointer acceleration on xtest devices
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 707b1241681c33401d5e0eb6edeace33f5970928
Author: Simon Thum <simon.thum@gmx.de>
Date: Sat Mar 21 18:19:19 2009 +0100
dix: prefer lroundf() over roundf() in axis scaling
it's unclear whether there actually is a problem, but in a very similar
case there is (bug#21456). Also, integer addition is generally faster.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit ef0e435052b2fda598cd8670c8e892aea685a102
Author: Jon TURNEY <jon.turney@dronecode.org.uk>
Date: Fri Jun 5 19:29:02 2009 +0100
Cygwin/X: Remove obsolete ChangeLog files
Remove obsolete ChangeLog files, this information is preserved in
the automatically generated top-level ChangeLog
commit 752508577aa7f0a1d80c8b7f4d3fe2b098e5e5fa
Author: Jon TURNEY <jon.turney@dronecode.org.uk>
Date: Tue Jun 2 21:19:46 2009 +0100
Cygwin/X: Tidy up a bodge to avoid collision between X header and native Win32 API definitions of ATOM
Remove a bodge to avoid collision between X header and the native
Win32 API definitions of ATOM, use X11/Xwindows.h which exists to
address these issues
Consequently, include misc.h in winclipboardthread.c, to provide the
max() macro, as previously we were using the the one from windows.h
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
commit 7f3456a4080d1bf21010170e126128cb653bd2ac
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri Jun 5 16:44:46 2009 +1000
Revert "test: check from INT_MIN to INT_MAX for core type conversion"
This patch requires extra special casing to check if the linker supports the
-wrap option. Patches to do so will follow, in the meantime, revert this
commit. It shouldn't have been pushed in the first place anyway.
This reverts commit d979f443946011158b6a183582728a6899c33b85.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit d770d57f1701c7c8272b4ca3714f64c46c47adf1
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri Jun 5 11:38:22 2009 +1000
Xi: fix XIQueryVersion major/minor swapping.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 17d62306b602ec61e8c5b44a79c9e1edc6b63a21
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri Jun 5 11:31:39 2009 +1000
Xi: add XIQueryVersion reply swapping hook.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 2b459f44f3edaea137df9a28bc7adfeb1b9f1df7
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri Jun 5 10:15:04 2009 +1000
Xi: return BadImplementation for deviceids 256 and above
The protocol allows for 16 bit device ids, but the implementation doesn't
yet. We need to break the input ABI once more to shift the DeviceIntRec's
CARD8 to a CARD16, along with some changes in the privates.
Once that is done, revert this patch.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit c77f42049f77417c68bbce3dd2e995d916fc5af5
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri Jun 5 09:29:04 2009 +1000
Xi: fix flawed logic in XIQueryVersion return value.
The server returned the minimum of major/minor each instead of the lower of
the combined major.minor version. As a result, a client reporting
3.0 and a server supporting 2.7, the return value would be 2.0 (the minimum
of both).
Reported-by: Rémi Cardona
Reported-by: Simon Thum
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit b6c16fc7dad5a4ffcaaab647c0e3fabed372efd5
Author: Dave Airlie <airlied@redhat.com>
Date: Fri Jun 5 11:57:39 2009 +1000
crtc/gamma: check xf86_config is valid before using it.
If you have multiple cards, some that support randr 1.2 and some that don't
you can get a null dereference in here.
Signed-off-by: Dave Airlie <airlied@redhat.com>
commit da682abc78c9a5b2fde09679061fe08a3a1c665b
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Thu Jun 4 17:33:25 2009 -0400
xace: fix a bad send access hook call.
commit 993daf06497c85bb6a1e70592df380503d721dfb
Merge: 2bda50ee14 e1e8c7ddd7
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu Jun 4 15:11:36 2009 +1000
Merge branch 'master' into xi2
commit 2bda50ee14b7873f28081bf0f1bfb7b79a40de43
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu Jun 4 14:51:32 2009 +1000
Xi: memset the device name padding to 0.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 09266d6cd1bb6e09fe8bcb875c63fb4011c05b55
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu Jun 4 13:36:29 2009 +1000
Xi: XIQueryVersion requires major_version of 2 or higher.
Otherwise, a BadValue error is sent.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 6ea76c550486bd17eb31f43757030fb44bdf1eab
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu Jun 4 12:55:59 2009 +1000
Xi: reply with the XI2 version that is supported by both client and server.
XIQueryVersion must return the client's version if the client's version is
lower than or equal to the server's version, or the server's version
otherwise.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit d979f443946011158b6a183582728a6899c33b85
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu Jun 4 11:40:14 2009 +1000
test: check from INT_MIN to INT_MAX for core type conversion
ErrorF is link-wrapped to reduce the run-time of the test.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit d8471bc7a19cd248fa3e0845496c86cd9251c013
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu Jun 4 11:32:15 2009 +1000
test: adjust event_to_core_conversion test for new ProximityIn/Out behaviour
Both types now return BadMatch.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit e1e8c7ddd7fdbfd674361364295fb1cbd5f28b45
Author: Adam Jackson <ajax@redhat.com>
Date: Wed Jun 3 13:37:32 2009 -0400
s/MIN/min/, s/MAX/max/ (#2968)
commit 6de67d3206f0a4e307070714564c19efc84da2ec
Merge: af4e658401 7f027d9dc0
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Wed Jun 3 16:11:33 2009 +1000
Merge branch 'master' into xi2
commit 7f027d9dc0146e229802aeac342ea2dbab63264a
Author: Olivier Blin <blino@mandriva.com>
Date: Thu May 28 20:57:36 2009 +0200
kdrive: add protocol mouse option
kdrive probes a lot of PS/2 protocols for the mouse device, which
makes the mouse unusable for some seconds after X startup.
This new "protocol" option allows forcing the mouse protocol.
It can be used this way:
Xfbdev -mouse mouse,,protocol=ps/2 -keybd keyboard
Signed-off-by: Olivier Blin <blino@mandriva.com>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit af4e658401ecbd2f2cc515b4c5abe5aee361cd64
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Wed Jun 3 12:30:49 2009 +1000
mi: only process master if the SD is still attached.
SDs may be detached during event processing (e.g. if a passive grab
activates). In this case, the event must not be processed through the master
device.
Reported-by: Thomas Jaeger
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit eb3fe72cbcd10c3953d713e07c321e695194a328
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Wed Jun 3 12:19:14 2009 +1000
dix: set the device state for XI valuator events.
Valuator events need to include the device's state, while other device
events need to include the state of the core devices.
Reported-by: Thomas Jaeger
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 08fd2ae652883393ecff6f3d5177e63408d58472
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Wed Jun 3 12:18:17 2009 +1000
dix: use GetMaster in PickPointer and PickKeyboard.
GetMaster is more reliable than GetPairedDevice, it always returns the
keyboard/pointer if desired, even if the wrong device was passed in.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit a1d1dd06f8f91c1d1802f7581a4ba7568b85e69c
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Wed Jun 3 12:15:32 2009 +1000
Xi: fix wrong grabtype from ProcXGrabDevice.
86077f0058ce88ee9b3df5d1ab854eeca43 switched from a boolean to a grabtype
enum. ProcXGrabDevice didn't switch with it. PickPointer during an XI grab
on a slave device would thus return a wrong (or NULL) device and crash the
server.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit a371a47205fc58a587e1aecaa4a031184481c228
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Wed Jun 3 11:47:16 2009 +1000
dix: EventToCore must return BadMatch for proximity events.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 2bd5ea80652358565346071bed829070ddf5de85
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Wed Jun 3 10:45:28 2009 +1000
dix: rework event conversion before delivery.
Let EventToXI, EventToCore and EventToXI2 return BadMatch if there's no
matching event for this protocol spec.
Adjust the delivery paths to cope with BadMatch errors (and clean them up on
the way).
As a side-effect, this fixes server crashes on proximity events for a
grabbed device.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 20d9f11abfd6ce3630d9640ff7383c7e27196956
Author: Adam Jackson <ajax@redhat.com>
Date: Tue Jun 2 13:49:09 2009 -0400
Typo fix
commit ab5d1ae82ebd467d0a5b39821b286097865ba0c7
Author: Adam Jackson <ajax@redhat.com>
Date: Tue Jun 2 13:39:55 2009 -0400
Remove some libXfont leftovers
commit 75795637c7160f1579dbe81c2d7600e85b1d141f
Author: Matthias Hopf <mhopf@suse.de>
Date: Tue Jun 2 18:41:36 2009 +0200
Revert "randr: Setting gamma: inverse logic looks more sane"
This reverts commit 79138eec1b49cbaca6a16f2bdd8579b5828aeb28.
commit fc8cfc3a055d8af4ac809799c71f3db0d5246433
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Tue Jun 2 16:53:41 2009 +1000
dix: ensure EventIsDeliverable has inputMasks set at all times.
For proximity events, the XI2 type is 0 and inputMasks never got set in the
preceding condition. As a result, proximity events got never delivered.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit ef9f851057a0ae214be02cb919f1e6634cead20b
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Tue Jun 2 16:38:32 2009 +1000
dix: protect against floating slaves in DeviceFocusEvent.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit b40289c8766c5e7543b7288009b4d965f57c04ce
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Tue Jun 2 16:22:58 2009 +1000
xkb: allow pointer events to pass through for floating SDs without a key class.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 38df8351b36195070232b42a6d3369a9a08df8df
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Mon Jun 1 17:09:03 2009 +1000
test: add grab matching tests.
commit a66686a83edd6093ed540414dda2b8700e4696fe
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Mon Jun 1 15:37:53 2009 +1000
input: add support for XIAllDevices and XIAllMasterDevices passive grabs.
These grabs are suported through two fake devices inputInfo.all_devices and
inputInfo.all_master_devices. These devices are not part of the device list
and are only initialised for their device id, nothing else.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit f00cf7675164bb984ef310412f9e09582813adb1
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Tue Jun 2 10:23:21 2009 +1000
dix: get the current MD keyboard for the grab modifier state.
A passive XI2 grab always uses the paired master device as a modifier
device. After issuing a passive grab, the slave may be reattached to a
different master and hence the modifier device may change.
commit 1cd7ed75d903b5b0ea4e1070d2c26f4f931bdec7
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Mon Jun 1 17:14:06 2009 +1000
dix: float slave devices during passive grabs.
Exception - implicit passive grabs.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit f56ad22e8fabdca6d9fd1e408a539696e30599fc
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Tue Jun 2 15:07:53 2009 +1000
dix: rework temporary slave detachment.
Rework addresses two issues:
- storing the master device's pointer is a bad idea, we need to store the ID
of the device in case it disappears during the grab.
- restoring the old master did not actually reattach the device. Fixed now.
commit b3e4810a283d369e1a2c6c3288177fe79fd1e9d6
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Mon Jun 1 16:22:51 2009 +1000
dix: move grab device assignment into GRABTYPE_CORE block.
grab->type is the device type and XI2 types overlap with core events (being
less than GenericEvent). Thus, for passive grabs the grab device would be
overwritten with whatever device was activating it.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 18ae48670859d05788776e164c65985e3b35a723
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Mon Jun 1 16:06:52 2009 +1000
dix: don't try to activate a passive grab on top of an active one.
If we already have an active grab on the device, don't attempt to activate
another one.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit ff1d6244eba8367a8d50601ca393e951c60c94b6
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Mon Jun 1 12:14:52 2009 +1000
input: add support for XIAnyModifier in passive XI2 grabs.
commit eb97d125fb6adeff0b23c2460108e0587ba253e2
Author: Adam Jackson <ajax@redhat.com>
Date: Mon Jun 1 15:50:50 2009 -0400
doc: Remove mention of Kerberos replay cache from Xserver.1
The krb5 auth code is gone, so this is no longer relevant.
commit 80ea32ad4f1440d068e18db65830f45498703b09
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Mon Jun 1 12:06:55 2009 +1000
dix: switch grab checking from unsigned shorts to unsigned ints
XIAnyModifier is outside of the unsigned short range.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 080b0331b3d1de1bab5ecdc9df175b287616e358
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Mon Jun 1 13:33:29 2009 +1000
input: Add grabtype to GrabParameters.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit bee02a154145c0e4ed97980f7857dc27a96b1be8
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Mon Jun 1 10:49:22 2009 +1000
dix: ensure implicit passive grabs have the xi2mask zeroed.
This fixes XI2 enter/leave events being sent to non-xi2 clients.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit cc71dfb4f5cf6113053951070dec9556e941aa24
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Mon Jun 1 13:19:30 2009 +1000
test: Add GetSelectedEvents request to struct size tests.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit de5c5b1db083a9c1d23e1461b54ca646c5a5c445
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Mon Jun 1 13:21:36 2009 +1000
test: fix compile error introduced with the removal of isMaster.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 45530d16097459a756696e255ab4e72d6e51fbc4
Author: Adam Jackson <ajax@redhat.com>
Date: Fri May 29 18:07:48 2009 -0400
vfb: Fix depth setup.
Initialize the depth corresponding to the root window before the
pixmap-only depths. Otherwise you end up with the root window depth in
the depth list twice, which is mildly confusing for clients and
catastrophically confusing for PanoramiXConsolidate().
commit 5c8540d8cf9ebaafa7572cb2879d057cd3d15190
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Fri May 29 14:49:05 2009 -0700
GLX: Purge glxint.h usage
Change (__GLXvisualConfig *) to (void *) in ABI compat stubs.
(cherry picked from commit b4adec886c65e49cfbd30d1e3a41b613f75ed3f5)
commit da2aaee24a77e1a9e5c623af4a78ca6acc94b787
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Fri May 29 14:27:46 2009 -0700
GLX: Purge some glxint.h usage in glxcmds.c
This is related to d0b249f1c5df81f3941d638f9625fe1e16c31807 in the 1.4 branch and was ok'd by krh
(cherry picked from commit e587436cf2e1237813c924699ff0662aea3034e1)
commit f2151f1b0dcbfec23488a29a7ea887fbfd53b760
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Fri May 29 14:09:41 2009 -0700
XQuartz: Fix alpha to be 1 (screenshots bug, etc)
This is related to: bc964ff1e3f3d8ab590eab40d767c6241e9480d4
XQuartz: Stab at fixing the alpha 0/1 bug (screenshots, etc) by pulling in some old code that got gutted from rootless.
which was on the 1.4 branch and implemented in fbPaintWindow. Now that fbPaintWindow is gone, this is now in miPaintWindow().
(cherry picked from commit 032173f693f75385a40e144ffe2b7b5378bb6f2e)
commit 7c158ffa766d32f5e8ec459693da5ef6ba0892e9
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Fri May 29 14:02:18 2009 -0700
Rootless: Use miPaintWindow since PaintWindowBackground is dead
(cherry picked from commit 4975c087257b52189a5c21d93d121f183e60e4c8)
commit ec9e9c8bcabda3d8b4ea07037fb247f7408dde8b
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Thu May 28 15:30:20 2009 -0700
XQuartz: English localization update for HIG compliance
(cherry picked from commit 86b319d7cbef39d75b54c9d321e5dbf097b552be)
commit 0f47203a9a690498c18b1c04e2ef5deed23a0e3e
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri May 29 14:18:37 2009 +1000
dix: Set the implicit passive grab flag for keyboards too.
Extension devices have ActivateKeyboardGrab as their grab activation
function, hence we need to ensure the implicit passive grab flag is set
accordingly in the grab for further event delivery.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 75c73ddbfc9236bb80a3709d467674c4a1018fa3
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri May 29 14:01:21 2009 +1000
dix: fix broken XI event delivery during grabs.
If an implicit passive grab is active, the XI event mask is in
grab->deviceMask. Otherwise, for explicit grabs, the XI event mask is in
grab->eventMask.
Reported-by: Thomas Jaeger
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 29ec14625111a8ae600d245ccbf905f059074d7c
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri May 29 13:26:22 2009 +1000
Xi: passively grabbing slave devices must be possible.
There's use-cases where this is useful, so take the check out preventing
that.
Reported-by: Thomas Jaeger
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 235cf5713a8fe535c439628cce9ea5b42432acb1
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri May 29 12:09:06 2009 +1000
dix: init inputMasks to NULL to avoid random value dereference.
If the XI2 type is 0 (e.g. proximity events), inputMasks is never set and
may not be NULL.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 68d86adbe8d84099812c37a04098f2ab5ccc45a4
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri May 29 12:03:07 2009 +1000
dix: GetProximityEvents doesn't need extra events for valuators.
With internal events, we only have one event for all the data, no need to
calculate for extra events.
Reported-by: Thomas Jaeger
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 71a83d68ab07536c0778d13cd7da974c40e77457
Author: Adam Jackson <ajax@redhat.com>
Date: Thu May 28 15:32:03 2009 -0400
xfree86: Remove loader symbol list ABI stubs
These have been nops since 2006 and functionally void since 7.0.
commit d7aef3f663f4b5d861799f8615dcd301d5ce2906
Merge: a25f248fc3 e08c6a0752
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu May 28 17:20:58 2009 +1000
Merge branch 'master' into xi2
Conflicts:
Xext/geext.c
Xi/chdevcur.c
Xi/extgrbdev.c
Xi/xiproperty.c
configure.ac
dix/ptrveloc.c
hw/xfree86/common/xf86Config.c
mi/mipointer.h
test/input.c
xkb/xkb.c
commit a25f248fc3bd0375d91ca8a44320200d445ecfbb
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Wed May 27 15:47:12 2009 +1000
Xi: Send Enter or Leave events with XIPassive(Un)grabNotify
If a passive enter or focus in grab activates, send additional enter or
focus events with mode XIPassiveGrabNotify to the grabbing client.
Likewise, if the grab deactivates, send additional leave or focus out
events.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 2107becb0ce2ffda001be65728c53563496d8d50
Author: Adam Jackson <ajax@redhat.com>
Date: Wed May 27 17:13:19 2009 -0400
xfree86: Remove unused (and useless) xf86{Add,Delete}ModuleInfo
commit e08c6a0752772745f35f7afcf6c2b1c927b91cc0
Author: Federico Mena Quintero <federico@novell.com>
Date: Mon May 4 19:24:47 2009 -0500
randr: bug #21554 - re-probe outputs when coming back from laptop unsuspend
Make xf86 RANDR wrap the EnterVT call chain, so it can re-probe the
outputs when a laptop comes back from suspend/unsuspend (actually, any
time that we enter our VT again). The X server should then send RR*
events to clients, so they can cope with a monitor that was unplugged
while the laptop was suspended.
Signed-off-by: Federico Mena Quintero <federico@novell.com>
commit b12010e10f38951358b48ff1076c026f943b7cc3
Merge: 6e69272473 f1441b8353
Author: Søren Sandmann Pedersen <sandmann@redhat.com>
Date: Wed May 27 15:56:30 2009 -0400
Merge branch 'master' of git+ssh://sandmann@git.freedesktop.org/git/xorg/xserver
commit 6e6927247359cc0db47501fb9d2dbb7856aa5985
Author: Søren Sandmann Pedersen <sandmann@redhat.com>
Date: Wed May 27 15:51:19 2009 -0400
Fix alpha map computation in miComputeCompositeRegion()
According to the RENDER spec, the origin of the alpha map is
interpreted relative to the origin of the drawable of the image, not
the origin of the drawable of the alpha map.
This commit fixes that and adds an alpha-test.c test program.
The only use of alpha maps I have been able to find is in Qt and they
don't use a non-zero alpha origin.
commit f1441b83538e6ba8a1557c4f5ea50c53a1837087
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Wed May 27 10:06:10 2009 -0700
XQuartz: More localization updates
(cherry picked from commit b107390c9f30571902556b4d053e62d345a06254)
commit 996357e905c1082479bb238110b93bc170b8cb84
Author: Joe Krahn <jkrahn@nc.rr.com>
Date: Tue Jan 20 17:22:37 2009 +0000
Cygwin/X: Update icons directly, rather than modifying the window's class
Update icons directly to windows rather than modifying
the window's class. Respect custom icons overriden via
the configuration file.
fd.o bugzilla #4491
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
commit 9955252564922e7e8702dfb6eab52c75605a4a22
Author: Jon TURNEY <jon.turney@dronecode.org.uk>
Date: Mon Jan 5 17:55:58 2009 +0000
Cygwin/X: Remove unused TimeSinceLastInputEvent()
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
commit 966c8fccf16e77c8f459b4b175718323f2ec5d58
Author: Colin Harrison <colin.harrison@virgin.net>
Date: Mon Jan 5 18:04:42 2009 +0000
Xming: Fix some log spam
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
commit d190a27a33ab8c198568baf184fad14df57e24ad
Author: Colin Harrison <colin.harrison@virgin.net>
Date: Thu Jan 29 11:00:49 2009 +0000
Xming: Various tidy ups in winClipboardFlushXEvents()
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
commit fbe9ed27b1c2f932a74aa6ced134ecec021a3fc1
Author: Colin Harrison <colin.harrison@virgin.net>
Date: Thu Jan 29 10:55:38 2009 +0000
Xming: Avoid log spam if a windows application won't provide CF_UNICODETEXT clipboard format
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
commit 71ba9856a4f01aa7a42f1178c8da98a2e5ac23ae
Author: Colin Harrison <colin.harrison@virgin.net>
Date: Tue Feb 3 15:52:11 2009 +0000
Xming: Cache atom lookups in clipboard integration code
Cache the CLIPBOARD atom lookups in winClipboardWindowProc()
Cache atom lookups in winClipboardFlushXEvents()
Recache on server regeneration
Copyright (C) Colin Harrison 2005-2008
http://www.straightrunning.com/XmingNotes/
http://sourceforge.net/projects/xming/
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
commit 4ec110327bdc4f2617cd6116539812d7ef96b24e
Author: Colin Harrison <colin.harrison@virgin.net>
Date: Sun Jan 4 18:29:49 2009 +0000
Xming: Prevent the mouse wheel from stalling when another window is minimized.
Fix internal WM to prevent the mouse wheel from stalling when another window is minimized.
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
commit 888e6961a4ee76d05d212cfb946f089caafb3f69
Author: Jon TURNEY <jon.turney@dronecode.org.uk>
Date: Wed Jan 7 18:29:16 2009 +0000
Cygwin/X: Correctly allow for the native window frame width in ValidateSizing()
Fix internal WM to correctly calculate the native window border when validating window sizing
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
commit a72865868f03b675f86990476fcee601822894b3
Author: Joe Krahn <jkrahn@nc.rr.com>
Date: Tue Jan 20 17:09:43 2009 +0000
Cygwin/X: Consolidate dialog initialization in winInitDialog()
Changed windialogs.c to set icons via window properties rather than class
properties, and use LoadImage() for small icons, because LoadIcon() can only open
large icons. Since this code is redundant across the dialogs, I put it in the
winCenterDialog function, along with a few other redundant instructions, and
renamed in winInitDialog().
Also, don't bogusly put our dialogs at the center of the virtual desktop if we
are on a multimonitor system (this causes the dialog to end up split across two
monitors in a dual-monitor side-by-side setup)
Corrections to use HWND_TOPMOST instead of HWND_TOP and not to use SWP_NOZORDER
from Colin Harrison
fd.o bugzilla #4491
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
commit d053c3b35f730fdaddd22f841dbd8ed6c9a07ba0
Author: Colin Harrison <colin.harrison@virgin.net>
Date: Sun Nov 2 20:46:40 2008 +0000
Xming: Slightly adjust the formatting of the logged command line
Copyright (C) Colin Harrison 2005-2008
http://www.straightrunning.com/XmingNotes/
http://sourceforge.net/projects/xming/
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
commit a7e23a79c1fc429aedbf9b6c0e78b1c8d7e02238
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Tue May 26 14:42:25 2009 +1000
Xi: Add support for Enter and FocusIn grabs.
Enter grabs are checked for in CheckMotion(), each time the sprite window
changes the current grab is deactivated (if applicable) and the new grab is
activated (if applicable). Exception - if the grab is on a parent window of
the current window since we keep the grab across descendants.
Since CheckMotion() may change the grab status of a device, we mustn't get
"dev->deviceGrab.grab" in ProcessOtherEvents until after CheckMotion().
FocusIn grabs are checked in much the same manner.
The event delivery for grabs replaces the NotifyNormal on window change with
a NotifyGrab on window change. Note that this happens before the grab
activates, so the EnterNotify(NotifyGrab) is still delivered to the window,
not to the grabbing client. This is in line with the core protocol semantics
for NotifyGrab events.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit ec2fe9660dbc0c16cdaca33b3b878011857e0fe2
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Wed May 27 14:18:51 2009 +1000
Require inputproto 1.9.99.10
commit 0ef6ba9f3b9e68307bfe623e12dc36d44440e97f
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Wed May 27 11:15:54 2009 +1000
Xi: set the passive grab's resource mask on ungrabbing.
Not having the resource mask set means we never match an existing grab,
hence we never actually ungrab.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 1f61d6647f25add487c5cae9739643a6e33ef9f7
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Wed May 27 11:15:23 2009 +1000
Xi: use GetMaster(MASTER_KEYBOARD) to get the modifier device for XI2 pgrabs
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit bedfd561fa534b65baea45c4a05b1752ef172c45
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Tue May 26 15:28:33 2009 +1000
dix: fix wrong cast of eventMask into CreateGrab.
commit 023f959e6812e63f9d38b078158275bc13d238ae
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Tue May 26 14:56:40 2009 +1000
Xi: fix an inputInfo.keyboard usage.
In the case of a RevertToFollowKeyboard, the master device should be used
(since this is the closest equivalent to the VCK as before). Only if the
master keyboard is the same as the device, revert to the VCK itself.
commit b3463fd6a89d50a7562c357aeb5314ce0fd6493d
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Tue May 26 13:58:04 2009 +1000
dix: convert window coordinates to FP1616 before calculating event_x/y
root_x/y are already in FP1616 at this point.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 10b5e981016132b4c07ad9ce68646d0a385e9c24
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Tue May 26 11:12:08 2009 +1000
dix: take grabs into account for XI_Enter/Leave events.
commit 1815defdb2f19e79f4ec0354d188ea763ff1f15e
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Tue May 26 10:08:46 2009 +1000
Xi: only deactivate passive grabs if the event type matches.
This didn't use to be a problem when devices could only be pointers or
keyboards, not both. Nowadays, slave devices may have both buttons and
keyboards, and in this case we don't want to deactivate a passive keyboard
grab when a button release is detected.
commit 9dc3810a034f067096d71b33b0b47f1f52092fe6
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Wed May 27 13:53:46 2009 +1000
dix: set the right grab event type for implicit passive grabs.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 6583477035234e23ead2fad9db7a07e5862447a4
Author: Nicolai Hähnle <nhaehnle@gmail.com>
Date: Sat May 23 13:35:24 2009 +0200
Remove reference to non-existing requestLog and requestLogIndex
These fields were removed in 252ec504817e05b185e4896a2d899e9c00b8aeef.
Signed-off-by: Nicolai Haehnle <nhaehnle@gmail.com>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 53e821ab4a41cbc85932b9ef150311bc2e57c108
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Mon May 25 12:20:37 2009 +1000
Xi: add request processing for XIGetSelectedEvents.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit b377994336c978875dd786f4a4a9ef2e7b20e32c
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Mon May 25 13:55:17 2009 +1000
Xi: advance by the right number of bytes when trawling XI2 event masks.
The wire layout is [struct xXIEventMask][mask bytes]. So the pointer needs
to not only be advanced by the mask bytes, but also by the size of the
struct.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 12e725d08b4cf7dbb7f09b9ec09fa1b621156ea9
Author: Julien Cristau <jcristau@debian.org>
Date: Fri May 22 09:54:38 2009 +0200
randr: fix server crash in RRGetScreenInfo
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>
commit c70511931ca1441878daed50e710fa514f6ab077
Author: Matthieu Herrb <matthieu.herrb@laas.fr>
Date: Sun May 24 10:32:38 2009 +0200
fix typo in cabff9007 which led to an unintialized memory read and a crash.
commit 99e22b86c5f1a3653f3caaf01368a777d2b208d0
Author: Adam Jackson <ajax@redhat.com>
Date: Fri May 22 12:01:55 2009 -0400
EDID: Add modes from Established Timings III descriptor to mode pool
EDID 1.4, section 3.10.3.9
commit b395da91c531d633ec47bb5a51e361d321663a3a
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri May 22 15:24:46 2009 +1000
Xi: silence two compiler warnings
chdevcur.c:97: warning: ‘SecurityLookupIDByType’ is deprecated (declared at
../include/resource.h:269)
xiproperty.c:200: warning: passing argument 2 of ‘GetEventFilter’ from
incompatible pointer type
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 4a36db60774640ea92a2133a3b08fbf1a48d2cb6
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri May 22 15:16:43 2009 +1000
os: fix compiler warning "too few arguments to format"
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit da0d3baf71b34657cc235d6c6b37d548541f9449
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu May 21 14:11:27 2009 +1000
dix: protect event generation against single-valuator devices.
If we have a single-axis device and it sends events it should not access
non-existant memory.
commit b25e29e8014927815d4fdc9c416bfeb2af0ecba6
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu May 21 12:07:03 2009 +1000
mi: use GetMaster() from MIPOINTER and MISPRITE.
Both may in some cases be called for a SD attached to a master keyboard. In
this case, we need to get the right master device (i.e. the pointer).
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit c9df51b070377ca33e48644dbc842b6e3dfb2975
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu May 21 11:16:37 2009 +1000
input: allow for master pointers to not have a button class.
There's devices (e.g. some barcode readers) that have axes but no buttons.
When such a device sends a motion event, the valuator and button class is
copied into the master pointer (i.e. removing the button class).
So we need a couple of extra sanity checks for the button class to exist.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit ebe45e1a72a81ad22413e5d0514869b3e45a69b7
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Wed May 20 10:55:03 2009 +1000
input: introduce partial class copying depending on the event.
Copying all classes into the master device has drawbacks for hybrid devices
(devices that are both mice and keyboards). If such a device posts an event,
it's key classes are moved into the VCP. The key event itself is unaffected
by keyboard grabs and the like.
Partial class copying copies depending on the event and copies the classes
into the right master device (i.e. the VCK for key events, the VCP for
pointer events).
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit bc63c8a4570c989f19a036965854bceb9800ce19
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Wed May 20 12:33:49 2009 +1000
dix: introduce GetMaster()
For hybrid devices (keys + buttons/axes) the attached master device is
generally the wrong one. One shouldn't post a button event through a
keyboard and vice versa.
GetMaster(dev) returns the right master device for the given type needed.
This may be the MD paired with this device's MD.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit d79318f269d959d566ec66239b4c985afd61b259
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu May 21 08:29:14 2009 +1000
dix: Add a deviceid to the DeviceChangedEvent.
ChangeDeviceId would actually overwrite the flags field if deviceid wasn't
present. Aside from the event of course not telling which device generated
it in the first place.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit eeffb83fea2d87070beafd0c692fb0ad54d8335b
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Mon May 18 20:03:07 2009 +1000
ABI_XINPUT_VERSION 6
commit 438a4eafa5d14ab676827f7a5d58782c02db4cdf
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Wed May 20 17:02:50 2009 +1000
input: remove nested union from InternalEvent.
There's no need for internal events to be a struct with a single nested
union, we might as well make the union itself the InternalEvent.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit b12d302df8283186ce87882c29b2b0294adb2770
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Wed May 20 15:28:16 2009 +1000
Input: rename DeviceIntRec->isMaster to ->type.
isMaster is not enough as long as we differ between master pointers and
keyboard. With flexible device classes, the usual checks for whether a
master device is a pointer (currently check for ->button, ->valuators or
->key) do not work as an SD may post an event through a master and mess this
check up.
Example, a device with valuators but no buttons would remove the button
class from the VCP and thus result in the
IsPointerDevice(inputInfo.pointer) == FALSE.
This will become worse in the future when new device classes are introduced
that aren't provided in the current system (e.g. a switch class).
This patch replaces isMaster with "type", one of SLAVE, MASTER_POINTER and
MASTER_KEYBOARD. All checks for dev->isMaster are replaced with an
IsMaster(dev).
commit add2defac7e59dcb355e5ba12b6de60861741d57
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Wed May 20 16:23:38 2009 +1000
Split the signal-handler's lastSlave out into a separate variable.
dev->u.lastSlave was not signal safe since it was accessed by the DIX and
during signal handling.
Replaced with:
'dev->last.slave' for the signal handler's lastSlave (used to generate
DeviceChangedEvents), .
'dev->u.lastSlave' for the DIX lastSlave (currently only used in
change_modmap)
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 525aa17f804d37d1cfcbbf6b8e6cddb45e999b20
Author: Tomas Janousek <tomi@nomi.cz>
Date: Wed May 20 15:03:01 2009 +0200
Bug #6428, #16458, #21464: Fix crash due to uninitialized VModMap fields.
In ProcXkbGetKbdByName, mrep.firstVModMapKey, .nVModMapKeys and
.totalVModMapKeys were not initialized, contained random values and caused
accesses to unallocated and later modified memory, causing
XkbSizeVirtualModMap and XkbWriteVirtualModMap to see different number of
nonzero values, resulting in writes past the end of an array in XkbSendMap.
This patch initializes those values sensibly and reverts commits 5c0a2088 and
6dd4fc46, which have been plain non-sense.
Signed-off-by: Tomas Janousek <tomi@nomi.cz>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 7db55a0806c82bd4143c8bf1b8eb2b62e456ad9a
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Wed May 20 14:38:25 2009 +1000
dix: remove superfluous loop in change_modmap.
A device can only be attached to a single master device. So instead of
looping and searching for the master device, we can just use dev->u.master
directly.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit cabff9007a4abad026b450a4aab155c7bcd94326
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri May 15 08:33:07 2009 +1000
xfree86: treat other drivers as mouse drivers in the config.
Historically, if no input device was referenced in the ServerLayout,
the server would pick the first "mouse" device found in the xorg.conf.
This patch gives evdev, synaptics, vmmouse and void the same status. If
there is a section in the config file using this driver - use it as the core
pointer.
Device selection is in driver-order, not in config-order. If a "mouse"
device is listed after a "synaptics" device, the "mouse" device gets
preference. This replicates the original behaviour.
This code only takes effect if AllowEmptyInput is off and there is no core
pointer in the server layout.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit a8bd1e1f96d8e5380972a7dce8d9940cd912aa09
Author: Søren Sandmann Pedersen <ssp@l3000.localdomain>
Date: Thu May 21 18:21:28 2009 -0400
Fix alpha map computation in miComputeCompositeRegion()
According to the RENDER spec, the origin of the alpha map is
interpreted relative to the origin of the drawable of the image, not
the origin of drawable of the alpha map.
The only use of alpha maps I have been able to find is in Qt and they
don't use a non-zero alpha origin.
commit a2c5ee36b21c2ee5c0468f1b251e74c1412dbecb
Author: Adam Jackson <ajax@redhat.com>
Date: Thu May 21 10:20:48 2009 -0400
EDID: Be more cautious about finding vendor blocks.
Many old monitors zero-fill the detailed descriptors, so check for that
to avoid a useless warning like:
(WW) RADEON(0): Unknown vendor-specific block 0
commit 73c7398aafa050950ad614483fb0d5bdd2da97ca
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Wed May 20 10:40:50 2009 +1000
dix: 'namespace' HAS_OLD_SLAVE and HAS_NEW_SLAVE.
We need more flags for this in the near future, so let's namespace them now.
commit 5b5e3fa2771383a85afff679be34df19d3a4e290
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri May 15 08:33:07 2009 +1000
xfree86: treat other drivers as mouse drivers in the config.
Historically, if no input device was referenced in the ServerLayout,
the server would pick the first "mouse" device found in the xorg.conf.
This patch gives evdev, synaptics, vmmouse and void the same status. If
there is a section in the config file using this driver - use it as the core
pointer.
Device selection is in driver-order, not in config-order. If a "mouse"
device is listed after a "synaptics" device, the "mouse" device gets
preference. This replicates the original behaviour.
This code only takes effect if AllowEmptyInput is off and there is no core
pointer in the server layout.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 1cce55cc0333a026474100cf2f784e220fd96473
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Wed May 20 14:07:03 2009 +1000
input: rename device->type to device->xinput_type.
This type is only used in XI to give a hint of what type this device may be.
Call it xinput_type for clarity.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 81b3b0cce088866dc3cda099d7c8d6655849fd43
Author: Tomas Janousek <tomi@nomi.cz>
Date: Wed May 20 15:03:01 2009 +0200
Bug #6428, #16458, #21464: Fix crash due to uninitialized VModMap fields.
In ProcXkbGetKbdByName, mrep.firstVModMapKey, .nVModMapKeys and
.totalVModMapKeys were not initialized, contained random values and caused
accesses to unallocated and later modified memory, causing
XkbSizeVirtualModMap and XkbWriteVirtualModMap to see different number of
nonzero values, resulting in writes past the end of an array in XkbSendMap.
This patch initializes those values sensibly and reverts commits 5c0a2088 and
6dd4fc46, which have been plain non-sense.
Signed-off-by: Tomas Janousek <tomi@nomi.cz>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 79138eec1b49cbaca6a16f2bdd8579b5828aeb28
Author: Matthias Hopf <mhopf@suse.de>
Date: Tue Mar 10 16:03:26 2009 +0100
randr: Setting gamma: inverse logic looks more sane
commit c2785ae7eb6197bbfc75e92e99fffbb8ad8064da
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Wed May 20 14:29:13 2009 +1000
dix: refuse events from disabled devices.
If the device is disabled ("off"), it must not send events to a client.
The driver shouldn't send events in that case anyway, but just to make sure
we simply drop events coming while the device is disabled.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 47a89b1cba67a43ddc225f7e1b5d2b3b217c8d93
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Wed May 20 13:59:22 2009 +1000
Xi: remove DeviceIsPointerType
This approach is broken anyway. DIPT only checked for the XInput type
"MOUSE" and the only user of this is xf86ActivateDevice when it sets the
Activate/DeactivateGrab functions.
Since synaptics and wacom set their own types, evdev only sets MOUSE for,
well, mice half the devices didn't have this set correctly anyway.
Instead, ActivatePointerGrab should be merged together with
ActivateKeyboardGrab.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 7b891e450f005688e41e61016e6d3e394c67f6be
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Wed May 20 14:23:16 2009 +1000
dix: Remove obsolete comment
CorePointerProc doesn't back up the device classes anymore.
commit 42719ce5c715ac3a0c74c3c7df872d35e0449de9
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Wed May 20 14:38:25 2009 +1000
dix: remove superfluous loop in change_modmap.
A device can only be attached to a single master device. So instead of
looping and searching for the master device, we can just use dev->u.master
directly.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 22a33a7250f879b8f3eb84176a1dc57027d8cfe4
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Tue May 19 22:45:26 2009 -0400
glx: Register names for the GLX resource types.
Signed-off-by: Eamon Walsh <ewalsh@tycho.nsa.gov>
commit 77e90261d5f91e1170c6e02deb0e3739c24fcfd6
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Tue May 19 19:36:03 2009 -0400
dix/events.c: Use wClient where appropriate.
Signed-off-by: Eamon Walsh <ewalsh@tycho.nsa.gov>
commit 3cea176d5abcb0f14eefbdcbe17fed0847524dd4
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Tue May 19 19:30:33 2009 -0400
xace: Fix a bad device access hook call.
Add a proper access mode, and reverse the logic of the return value.
Zero ("Success") is returned on success from the hook calls.
Signed-off-by: Eamon Walsh <ewalsh@tycho.nsa.gov>
commit 4addfcd633484b7f53b5df1b92bfca8bfc1dc48d
Author: Michel Dänzer <daenzer@vmware.com>
Date: Mon May 18 17:53:35 2009 +0200
EXA: Allocate from the end of free offscreen memory rather than from the start.
This way we don't always need to scan over previously allocated areas when
looking for an available one, and there might be less fragmentation.
Signed-off-by: Michel Dänzer <daenzer@vmware.com>
commit 510cbd43cd4e34bd459e8f74ab2855714b4ca95d
Author: Michel Dänzer <daenzer@vmware.com>
Date: Mon May 18 17:48:57 2009 +0200
EXA: Defragment offscreen memory.
At most once per second, under the following circumstances:
* We can't satisfy an offscreen memory allocation, but there seems to be enough
offscreen memory available in total.
or
* The server has been idle for at least 100ms, and there is more than one
available offscreen area.
Signed-off-by: Michel Dänzer <daenzer@vmware.com>
commit 8331bde0adeccefb275c4d707e7b2cb1d95b1581
Author: Jon TURNEY <jon.turney@dronecode.org.uk>
Date: Fri May 15 21:36:28 2009 +0100
Cygwin/X: link with libmain.a to provide main()
Commit 987579c930bda803427a28cb82773c389f5110d6 moves main.c into
into libmain.a to be linked with separately, and updates the various
DDXs to link with libmain.a, except Xwin, which also needs this change.
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
commit b89dcfbfbd38f8d19f1d4f24f81820b1048572c8
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Mon May 18 16:07:08 2009 +1000
Xi: fix length field in XIQueryPointer.
Buttons append 4-byte units to the end of the reply, they need to be
included too.
Reported-by: Mark Dokter
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 33fcaaaea5ea30be39156ecfdbcca891b47ab465
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Mon May 18 16:05:35 2009 +1000
Fix missing parentheses in FP1616 macro.
Missing parens led to interesting results if an expression instead of a
constant was passed in (ProcXIQueryPointer for example).
commit 6258bb1d6bb78ea4ba1d33470bc74e9b711b25f2
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri May 15 20:24:45 2009 +1000
require inputproto 1.9.99.9
commit e7e94ff5fd3205a9ee01fe9342d9f3a426b0a068
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu May 14 21:45:35 2009 +1000
Xi: set the right length for the XIQueryPointer reply.
commit 00ab04d73c612ac85e024105015bdb7c79e8874b
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu May 14 16:24:35 2009 +1000
Include full modifier + button state in XIQueryPointer.
commit de78aab0ea3a2d8c61222493f25911258dea65a2
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu May 14 15:53:00 2009 +1000
Xi: take the paired device as modifier device only for MD pointers.
commit 0e089f9ceb0edec532078c6e1df7f642f7220fb5
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu May 14 15:29:20 2009 +1000
Xi: check cursor and grab_window before attempting the passive grab.
Both values need to fail the request, so we need to check them before
looping through the modifier masks. Otherwise, a wrong grab_window will
show up in each failed modifier return but not actually cause an error.
commit 5c3e7289801c958e2c70e2629d3ebee122449be8
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Wed May 13 16:54:01 2009 +1000
dix: count must be 1 if we have an XI2 match.
This fixes events that activated a grab not getting delivered to the client.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit e083a0d0692baa5ad29002a38293b36dd3b4c06f
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Wed May 13 15:23:42 2009 +1000
Xi: set the correct length for XIPassiveGrab replies.
commit 8ff1bff8f462b15e05fc298704e1e40cb244587f
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Tue May 12 21:33:54 2009 +1000
Update to new XI2 names
commit bbf266cca3de726e3eb932d66dd5b8981ef40fa8
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Tue May 12 21:24:07 2009 +1000
mi: un-deprecate miPointerWarpCursor
This function was deprecated in ef68273f5bdb27a492ec0b69548ec4fbede46c08
because it didn't take a device argument. The device argument was added in
1c7568b8a1417257fa67c7fca69aa253099b9461 though, so the deprecation is
obsolete.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 273890924b8ed6f8b7949c0322c8258b9e6f8630
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Tue May 12 16:09:35 2009 +1000
input: reduce the number of superfluous hierarchy events
There's only two reasons for hierarchy events:
- device is added, removed, etc. In this case we want to send the event as
it happens.
- devices are added in a XIChangeDeviceHierarchy request. In this case we
only want one event cumulating all changes.
commit 033a2b12fcd02fa9a2c2f20a352bec0a43074512
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Tue May 12 14:50:57 2009 +1000
Xi: set per-device hierarchy changed flags.
Rather than have one field per hierarchy change, XI2 has two fields - one
generic one and one per-device that include the device-specific flags.
This requires some funky handling for removed devices, but oh well.
commit 8fb51feae222ff4f4aa1c440b6973ce7383bbc09
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Mon May 11 15:45:46 2009 +1000
xkb: if kbd init failed, NULL out the pointers after freeing them (#21278)
Reproducible:
Configure a server that uses the keyboard driver with an invalid ruleset,
e.g. (Option "XkbRules" "foobar"). Ensure that Option "AllowEmptyInput" is
"off" in the ServerFlags or ServerLayout section. Start the server.
After failing to init the keymap, the server will try to clean up after the
device, double-freeing some xkb structs that have not been reset properly.
X.Org Bug 21278 <http://bugs.freedesktop.org/show_bug.cgi?id=21278>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 0cea199eda772a5ddd5ce72e4823a00ec14405d4
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Mon May 11 12:53:56 2009 +1000
kdrive: set Activate/Deactivate grab for input devices (#21591)
X.Org Bug 21591 <http://bugs.freedesktop.org/show_bug.cgi?id=21591>
commit fdce58ca822f4e43e03e84076190f52d7104e01f
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Mon May 11 12:51:40 2009 +1000
dix: ensure Activate/DeactivateGrab has a valid value.
Xephyr doesn't manually set Activate/DeactivateGrab for new devices,
resulting in a NULL-pointer dereference later when a grab is activated.
Avoid the segfault by ensuring that the pointer is always valid.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit e3f296d91dfe6b827195e1d387e1a04aa73b85c3
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Sat May 9 10:33:20 2009 +1000
xfree86: Remove superfluous ifdef DEBUG checks.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 2f6253376df45e508284ff7766b186cfc7fb56d6
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Sat May 9 10:33:20 2009 +1000
xfree86: Remove superfluous ifdef DEBUG checks.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit b1b5ec45c1cb650ccb8c659218f9481379c777d9
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Mon May 11 12:53:56 2009 +1000
kdrive: set Activate/Deactivate grab for input devices (#21591)
X.Org Bug 21591 <http://bugs.freedesktop.org/show_bug.cgi?id=21591>
commit 6f9e22049862ee9ac7f604411d005d8bb1b2dd1c
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Mon May 11 12:51:40 2009 +1000
dix: ensure Activate/DeactivateGrab has a valid value.
Xephyr doesn't manually set Activate/DeactivateGrab for new devices,
resulting in a NULL-pointer dereference later when a grab is activated.
Avoid the segfault by ensuring that the pointer is always valid.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit c1d7deca9281ba1df0df1abcea1fe7f841b10ff9
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Tue May 12 21:24:07 2009 +1000
mi: un-deprecate miPointerWarpCursor
This function was deprecated in ef68273f5bdb27a492ec0b69548ec4fbede46c08
because it didn't take a device argument. The device argument was added in
1c7568b8a1417257fa67c7fca69aa253099b9461 though, so the deprecation is
obsolete.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 8609a4e883e917d1652fbe810108de99bc89713f
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Fri May 15 11:22:32 2009 -0700
Correct some Sun license notices to Sun's standard X11 license format
Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
commit 94c5093c8bc803d0b14429b5a4d07ae46da865cc
Author: David Marx <David.Marx@Sun.COM>
Date: Wed May 13 17:53:30 2009 -0700
Solaris: Make sure non-inline versions of asm routines end with ret statements
Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
commit 2be5eecb4b0f30b9c55d12521415edbb88c1f8fd
Author: Julien Cristau <jcristau@debian.org>
Date: Fri May 15 17:29:32 2009 +0200
xfree86: add edid quirk for Samsung Syncmaster 2333HD
It reports vertical size in cm in the detailed mode.
X.Org bug#21750 <http://bugs.freedesktop.org/show_bug.cgi?id=21750>
Reported-by: Peter Poklop <Peter.Poklop@gmx.at>
Signed-off-by: Julien Cristau <jcristau@debian.org>
commit 7c8327f0a75087a85864256a9cea80dd4b86def5
Author: Michel Dänzer <daenzer@vmware.com>
Date: Fri May 15 15:48:37 2009 +0200
EXA: Always damage glyph cache pixmap manually after uploading a glyph.
Signed-off-by: Michel Dänzer <daenzer@vmware.com>
commit 850675d4de4373e5df95507dbf2cd9affaaf54bc
Author: Michel Dänzer <daenzer@vmware.com>
Date: Fri May 15 15:48:37 2009 +0200
EXA: Take GC client clip type into account for migration.
Fixes http://bugs.freedesktop.org/show_bug.cgi?id=18950 .
Signed-off-by: Michel Dänzer <daenzer@vmware.com>
commit c1bbac2708bbccbec01cecba39cdf2b8160c1dc3
Author: Matt Turner <mattst88@gmail.com>
Date: Thu May 14 16:00:41 2009 -0400
Fix mem_barrier() on Alpha
Some clean up (da086901c6579e41b28b1418fa12ebb82744fc87) went a bit
too far and removed the needed mem_barrier macro on Alpha.
This re-adds it.
commit 4cc33190ef1a4207c0f8fc74201cdf2568a239c2
Author: Julien Cristau <jcristau@debian.org>
Date: Thu May 14 17:01:57 2009 +0200
xfree86: Add two __FreeBSD_kernel__ checks
Debian bug#525475 <http://bugs.debian.org/525475>
Reported-by: Petr Salinger <Petr.Salinger@seznam.cz>
Signed-off-by: Julien Cristau <jcristau@debian.org>
commit ed9aecf8517bf74e943e3e5dd3ee407524e8f122
Author: Adam Jackson <ajax@redhat.com>
Date: Thu May 14 06:55:21 2009 -0400
COPYING: SGI FreeB 1.1 -> SGI FreeB 2.0
commit c66cf7b64c7bcb31c81b9fde27cc40c1440753b1
Author: Adam Jackson <ajax@redhat.com>
Date: Thu May 14 06:53:08 2009 -0400
Update several of my and/or Red Hat's licenses to standard form.
commit 2075d4bf9e53b8baef0b919da6c44771220cd4a5
Author: Michel Dänzer <daenzer@vmware.com>
Date: Thu May 14 11:46:41 2009 +0200
glx: If a destroyed window is bound to the current context, make it not current.
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>
commit 2c1190f888515292de01e60fe74657c34b99fd9e
Author: Michel Dänzer <daenzer@vmware.com>
Date: Thu May 14 11:39:16 2009 +0200
randr12: Initialize and keep track of updates to VidMode extension gamma value.
This way clients querying the gamma value via the VidMode extension at least
get the last value set via the same, rather than always something bogus.
Signed-off-by: Michel Dänzer <daenzer@vmware.com>
commit fc3ce861cdab8606610726ce7c53f57d950c2407
Author: Michel Dänzer <daenzer@vmware.com>
Date: Thu May 14 11:35:25 2009 +0200
randr12: Fix calculation of gamma ramp values.
The reciprocal gamma value was missed in the first copy and this mistake was
propagated to the second one.
Signed-off-by: Michel Dänzer <daenzer@vmware.com>
commit f3c61377d0fb1f09a18833995556fc9ffd11e097
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Tue May 12 18:27:09 2009 -0700
COPYING file updates for git master changes since 1.6 branch
Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
commit b746a00cffca5c553b607a8e9c1074294a23b443
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Tue May 12 16:11:01 2009 -0700
Resync COPYING file with notices in code base as of xorg-server-1.6.1
Remove notices for code no longer in tree (Xprint, Xgl, kdrive, cfb, etc.)
Add/update notices for new/changed code in tree
Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
commit f250eea2e90fc50bec5214c2f41132b95edc2c46
Author: Jerome Glisse <glisse@freedesktop.org>
Date: Mon May 11 22:52:46 2009 +0200
DRI2: update DRI2 private drawable width & height according to X drawable
commit 0952d12717031e9dda9e48123bb922d0f4e81834
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Mon May 11 15:27:46 2009 -0400
xselinux: Relax ownership restriction on SetSelectionUseContext.
Instead, clients should keep track of the selection instances they use.
commit ac13145dbcb284293582435409d8a90f276785c5
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Mon May 11 15:45:46 2009 +1000
xkb: if kbd init failed, NULL out the pointers after freeing them (#21278)
Reproducible:
Configure a server that uses the keyboard driver with an invalid ruleset,
e.g. (Option "XkbRules" "foobar"). Ensure that Option "AllowEmptyInput" is
"off" in the ServerFlags or ServerLayout section. Start the server.
After failing to init the keymap, the server will try to clean up after the
device, double-freeing some xkb structs that have not been reset properly.
X.Org Bug 21278 <http://bugs.freedesktop.org/show_bug.cgi?id=21278>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit ebfd6688d1927288155221e7a78fbca9f9293952
Author: Søren Sandmann Pedersen <sandmann@redhat.com>
Date: Sun May 10 23:27:56 2009 -0400
Make compositing with transformed windows work again.
The coordinate translation was broken in pretty much every way
imaginable.
commit c2b668e6fff11c52f2a3f0dc3f4d1fc2c5bcf3e6
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Tue May 5 20:27:53 2009 -0700
XQuartz: pbproxy standalone: added missing variable declarations.
(cherry picked from commit 2d947d17a3ef5fb8cef959bff0eb08b8bb5b6548)
commit 9c5b761c8c86cca56f4b4af272f42ba89c9c3ba5
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Sat May 9 16:19:13 2009 +1000
Revert "xkb: write the _XKB_RF_RULES_PROP to each device."
This commit shouldn't have been pushed, we're still sorting out the API we
want to use.
This reverts commit 876910a951053f0bd31e30098de3da15a1c1f5d6.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 1e816065e5ec3b9394dc1fa5815457a664e15fd9
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Fri May 8 21:31:01 2009 -0700
Don't printf NULL pointers on HAL connection error
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>
commit b680bda34da130ce408783f04214771471e41e8d
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Thu Apr 30 18:49:06 2009 -0700
Fix a couple off-by-one array boundary checks.
Error: Write outside array bounds at Xext/geext.c:406
in function 'GEWindowSetMask' [Symbolic analysis]
In array dereference of cli->nextSib[extension] with index 'extension'
Array size is 128 elements (of 4 bytes each), index <= 128
Error: Buffer overflow at dix/events.c:592
in function 'SetMaskForEvent' [Symbolic analysis]
In array dereference of filters[deviceid] with index 'deviceid'
Array size is 20 elements (of 512 bytes each), index >= 0 and index <= 20
Error: Read buffer overflow at hw/xfree86/loader/loader.c:226
in function 'LoaderOpen' [Symbolic analysis]
In array dereference of refCount[new_handle] with index 'new_handle'
Array size is 256 elements (of 4 bytes each), index >= 1 and index <= 256
These bugs were found using the Parfait source code analysis tool.
For more information see http://research.sun.com/projects/parfait
Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
Signed-off-by: Adam Jackson <ajax@redhat.com>
Acked-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 00bc043fa0398a1d14d46b87da2ff3031a9535dc
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri May 8 10:10:25 2009 +1000
dix: export subpixel precision in XI2 events for root/event coordinates.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit bae070914fc27db122e6131ae4838559c4a72f65
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu May 7 16:52:31 2009 +1000
input: update to inputproto 1.9.99.8 XI2 defines.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 83f32d3972b8bfb0a87069dfb3fcd64b6b7c6424
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu May 7 10:05:29 2009 +1000
Xi: Add XI2 property requests.
commit 9935bec6e860cba9a3cc5baadd372ddb89d72ef0
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu May 7 09:43:56 2009 +1000
Xi: split some code out of the XI 1.5 property request processing.
This is in preparation for the XI2 property requests that can re-use much of
this code.
commit f6f1e417063d2d61d65731a7e3ebca3ec2bdaacc
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Wed May 6 22:25:28 2009 +1000
Xi: fix copy/paste error causing sizeof against wrong struct.
This wrong check may cause BadLength to be returned to the client even if the
length is correct.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit fc0013d744a345199f013ba5b6ef0e44201d0e68
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Wed May 6 16:55:32 2009 +1000
Xi: don't double-swap the XListDeviceProperties reply.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 409012061b7d361a172b20455d4aaa5e47527c42
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Wed May 6 16:42:46 2009 +1000
Xi: add missing break in XI event swapping function
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit c3c64978c4a231a3a8c18211d0716df875c75efa
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Wed May 6 15:05:06 2009 +1000
Xi: fix a couple of wrong dixLookupDevice permission tags.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 0d947aa8e87c5d92b702c60190c8bc5d32c9ba9c
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Wed May 6 12:07:07 2009 +1000
xfree86: fix xf86PostMotionEventP type checking
We only put internal events into the queue now, so let's check for ET_Motion
rather than the MotionNotify.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 9457ce448988dacea9a3a1c14b6955767118ff31
Author: Simon Thum <simon.thum@gmx.de>
Date: Thu Apr 30 13:01:17 2009 +0200
dix: remove superfluous includes from ptrveloc.c
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit ee30e1b102d779403eeda97e007b81e85f006a37
Author: Simon Thum <simon.thum@gmx.de>
Date: Thu Apr 30 12:58:48 2009 +0200
dix: fix warning in pointer acceleration
newer gcc's warn against how this cast is done (though it eludes me why),
and lrintf() is also faster especially on insane processors like the P4
(http://www.mega-nerd.com/FPcast).
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 5cf70183812541b33a6e83c7e1e3bc6198730cbe
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Tue May 5 21:00:31 2009 +1000
xkb: remove _XkbAlloc, _XkbCalloc, _XkbRealloc and _XkbFree
We all agree that wrapping is fun, but seriously. One of these days someone
will get hurt.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 0e31d3906deaee5d9ada66e538b9e93574a4d610
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Tue May 5 21:07:07 2009 +1000
xkb: remove some now-useless XFUNCPROTOBEGIN
We bring them back if we start rewriting the server in C++, promise.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 8b583ca2b21155359c6255f406c96599b277c762
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Wed May 6 22:25:28 2009 +1000
Xi: fix copy/paste error causing sizeof against wrong struct.
This wrong check may cause BadLength to be returned to the client even if the
length is correct.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 7ab5e9b97c300bba793a23fa13506b0c77c50ddf
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Wed May 6 12:07:07 2009 +1000
xfree86: fix xf86PostMotionEventP type checking
We only put internal events into the queue now, so let's check for ET_Motion
rather than the MotionNotify.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 50cc8adafca4ba3838d468278d6eb8a4692d2488
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Wed May 6 16:55:32 2009 +1000
Xi: don't double-swap the XListDeviceProperties reply.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 3fc6fcfb267888d65a22ed7c3eda175a2530a3d5
Author: Simon Thum <simon.thum@gmx.de>
Date: Wed May 6 10:39:16 2009 +0200
dix: add 'none' pointer acceleration profile with number -1
This is a shorthand for disabling acceleration, while retaining the
possiblity to use constant deceleration. If constant deceleration is
also unused, it will optimize motion processing.
Other possiblities to deactivate acceleration were quite hidden,
and didn't always work as expected. E.g. xset m 1 1 would retain
adaptive deceleration, while xset m 1 0 would not (in the default
profile).
Also removes the 'reserved' profile; it was unused and it's trivial
to add new ones anyway.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 9d1597cbefea6a5e7959f2099c46f1a284def7ad
Author: Simon Thum <simon.thum@gmx.de>
Date: Thu Apr 30 13:01:17 2009 +0200
dix: remove superfluous includes from ptrveloc.c
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 35fce4e5c7fa34f98b3e4010c6cb09ce38a9205c
Author: Simon Thum <simon.thum@gmx.de>
Date: Thu Apr 30 12:58:48 2009 +0200
dix: fix warning in pointer acceleration
newer gcc's warn against how this cast is done (though it eludes me why),
and lrintf() is also faster especially on insane processors like the P4
(http://www.mega-nerd.com/FPcast).
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit d220d6907d1d5138d1528c48b739e77f65616225
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Mon May 4 17:38:02 2009 +1000
Xi: add GrabButton and GrabKeysym code.
We don't do keycode grabs in XI2, they're pointless.
commit 1b593ced171d02f1d00034f0f733060706bb6d41
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Tue May 5 16:57:46 2009 +1000
Xi: access the prev_state to get group/modifier state for key events.
Key events may change the modifier state, so we need to get the prev_state for
those (i.e. without the changes by the event already applied).
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 35a4b8e7f4526a92d44cb16a783f21030cd1f6df
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Tue May 5 16:51:59 2009 +1000
xkb: remove oldState from XkbHandleActions.
I really don't know what the purpose of this variable is or was, aside from
potentially clobbering up our key state since there's a path where it may be
used uninitialised.
Also, this means that xkbi->prev_state is now accessible from the DIX with
meaningful data.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit d523fbe428e4513d85402caa83e9349256b680cc
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Mon May 4 17:00:57 2009 +1000
test: add test for xi2 struct sizes.
commit 1b1b20d6e3e696e4437a9ef56128cde70a485f66
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Tue May 5 13:47:55 2009 +1000
Change glib require for tests to auto.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 749cae82204f347248c815b1068ffcae9825fe70
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu Apr 30 14:58:00 2009 +1000
mi: don't crash if we're trying to update the pointer for a keyboard.
If a device doesn't have a pointer, just return.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 7ecedb0f2ee5b53513205d1f0aa381451893b9c5
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri May 1 14:35:12 2009 +1000
include: up the number of max. input devices to 40.
With the Xtest virtual slave devices we have 4 devices for each MD
pointer/keyboard pair, plus the AllDevices and AllMasterDevices reserved
deviceids. It's quite easy to hit the current limit.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit a38d33f6ac765bc5a3296b325e2c9b4a6a10ebf1
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri May 1 15:24:02 2009 +1000
Xext: shut up compiler warnings in xtest.c
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 14d5471981151b27678de826daa078977217477a
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri May 1 15:22:37 2009 +1000
Xext: return BadDevice from XTest if we don't have keys/buttons/valuators.
BadDevice is an XI error, but this cannot happen for core XTest fake input
anyway since the device will be the matching virtual XTest slave device.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit f1bed0959e803784af142a0f45177ee3b675d78a
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri May 1 15:15:04 2009 +1000
Xext: fix core Xtest button presses, don't call PickPointer.
We already did the device selection before, so dev should be the XTest virtual
pointer.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 94648bb797d94b025746c60679c584e5be2fae28
Author: Jesse Barnes <jbarnes@virtuousgeek.org>
Date: Mon May 4 15:38:22 2009 -0700
Don't prepare outputs & crtcs if set_mode_major is present
A driver with this hook will take care of preparing the outputs & crtcs,
so calling the prepare functions will just cause unnecessary flicker.
Fixes bug #21077
commit 7d85169c7ab1d05c21fdbb2877ffd79f344dbb6b
Author: Michel Dänzer <daenzer@vmware.com>
Date: Mon May 4 10:14:43 2009 +0200
Fix typo in ProcRenderCreateAnimCursor.
commit 59358de4b68a01452bf68593beb83605087ebc8f
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Mon May 4 17:30:19 2009 +1000
input: ensure various ProcUngrabKey/Buttons have the right grabtype set.
commit 834ea071b619506e0bef5bdbf0e3c59831cf6e99
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Mon May 4 15:58:15 2009 +1000
dix: if grab types differ, two grabs cannot be the same.
commit 63a3c727b35d1ffd8a850a5177bd6623cd78b179
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri May 1 15:24:02 2009 +1000
Xext: shut up compiler warnings in xtest.c
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 226dd90597ef29998ac5db15c5457aad3fe9729e
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri May 1 15:22:37 2009 +1000
Xext: return BadDevice from XTest if we don't have keys/buttons/valuators.
BadDevice is an XI error, but this cannot happen for core XTest fake input
anyway since the device will be the matching virtual XTest slave device.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 0fdff0a47a57a0096974ee83e07fefbad03075dd
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri May 1 15:15:04 2009 +1000
Xext: fix core Xtest button presses, don't call PickPointer.
We already did the device selection before, so dev should be the XTest virtual
pointer.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit f0124ed93cdcee8d22a6690e639a3f60b9a63c54
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri May 1 14:35:12 2009 +1000
include: up the number of max. input devices to 40.
With the Xtest virtual slave devices we have 4 devices for each MD
pointer/keyboard pair, plus the AllDevices and AllMasterDevices reserved
deviceids. It's quite easy to hit the current limit.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 08cd846000286eb5e07cc8d8cb313aff2d6e7faf
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri May 1 11:06:06 2009 +1000
dix: only free the old cursor if the grab was successful.
Testcase: start thunderbird and move a message around, crashes after two or
three moves.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 557dbadf3be273255e8fdb12d9321f4e88bf2b65
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Sat May 2 00:26:18 2009 -0700
XkbSetNamedIndicator should ignore SD's without LED's
When ProcXkbSetNamedIndicator is called on a core device, and we
walk the slaves to set the LED's on each of them, ignore any slaves
that do not have either a KbdFeedbackCtrl or LedCtrl structure.
(This is much more critical in xserver-1.5-branch, where we walk
*all* devices, not just the slaves of the specified master, and
thus return failure when setting an LED on the Core Keyboard and
hit a xf86-input-mouse device with no LED's to set.)
Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
Acked-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 0d9d3f3e361f769822caedccf4c2a58cc9930ecc
Author: Ian Romanick <ian.d.romanick@intel.com>
Date: Mon Apr 27 15:11:10 2009 -0700
DRI2: Force allocation of real-front buffer for non-windows as well
For redirected rendering we end up with pixmaps (which the app thinks are
windows) that are double buffered.
Signed-off-by: Ian Romanick <ian.d.romanick@intel.com>
Tested-by: Pierre Willenbrock <pierre@pirsoft.de>
commit 3d30789a05a730a03faa6058c73a5eda36ef3779
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu Apr 30 14:58:00 2009 +1000
mi: don't crash if we're trying to update the pointer for a keyboard.
If a device doesn't have a pointer, just return.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 876910a951053f0bd31e30098de3da15a1c1f5d6
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu Apr 30 14:46:45 2009 +1000
xkb: write the _XKB_RF_RULES_PROP to each device.
We only have one root window and writing the rules used to the same property
for each device is quite pointless if you don't have the same RMLVO on all
devices. So let's be sensible and write the same property to the device too,
so at least we know which device got loaded with which RMLVO.
commit 44044adc92e6bb6537f48c84727523d5cb23528c
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu Apr 30 11:39:50 2009 +1000
xfree86: print a message if NIDR fails due to AutoAddDevices off.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 43dbbc30327f826068bc7cd2cdaf870ed61b4522
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Tue Apr 28 21:01:36 2009 +1000
Xi: fix typo in ProcXIGrabDevice
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 6a618929a0c06ba0d6dac13d7e644cd9658d98ed
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Tue Apr 28 16:49:45 2009 +1000
input: reshuffle CreateGrab and friends to take a GrabParameters param.
This is cleaning up work in preparation for XI2 passive grabs.
commit e8e26f700c9c70d3f1bb53bdb71d1100f5c43a69
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Sun Apr 26 21:43:25 2009 +1000
Xi: split some grab parameter checking out of GrabButton and GrabKey.
commit 57aff88c7d0761e590806d07bee1c9410680c89f
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Wed Apr 29 01:04:37 2009 -0400
Fix most remaining deprecated resource lookups.
Callsites updated to use dixLookupResourceBy{Type,Class}.
TODO: Audit access modes to make sure they reflect the usage.
commit 1abe0ee3da5e1268c7315f841d31337ea6524cf0
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Tue Apr 28 23:51:40 2009 -0400
kdrive: fix Xvfb build with separate libmain.
commit 737b49199a05299486064e6e762cf2a2f6f95be6
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu Apr 9 15:40:24 2009 +1000
xfree86: restore default off for DontZap
Zapping is triggered by xkb these days, so note in the man page that it's the
Terminate_Server action. Since it's XKB, personal preferences towards or
against zapping should be achieved through xkb rulesets.
If Terminate_Server is not in the xkb actions, then we can't zap anyway and we
don't need a default of DontZap "on".
This patch restores the old meaning of DontZap - disallow zapping altogether,
regardless of XKB's current keymap.
Ideally, this patch should be accompanied by b0f64bdab00db652e in
xkeyboard-config.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 98a1fa994158feca8bc80a10296a7675465c0e56
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Tue Apr 21 22:18:23 2009 +1000
test: add InternalEvent to core event conversion tests.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 990e8362a76fadc173e890d9052a2e5274b6eac5
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu Apr 16 11:41:58 2009 +1000
test: add a simple test to verify device axis intialization.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 4eac0df060b897470fb01cfd3b70f500da757c74
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Wed Apr 15 17:21:08 2009 +1000
Add a test-suite for in-server unit-testing.
This patch adds a test/ directory that contains the setup for a unit-testing
suite designed for in-server unit-testing. All functions available to the X
server are available to the test binaries through static linking.
This test suite uses the glib testing framework.
Do not use glib calls outside of the test/ directory.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit c2c515ead38d9a6c9eae0b83aa7a82208f177b7e
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Wed Apr 22 13:26:40 2009 +1000
dix: remove all but main() from main.c
All other functions are pushed into where they seemed to fit.
main.c is now linked separately into libmain.a and linked in by the various
DDXs.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit dc2767d1c5db60385867c76ba2de507fe0cb8a90
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Tue Apr 21 22:18:23 2009 +1000
test: add InternalEvent to core event conversion tests.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 1127ca097cb75450bcccfc5f5d82e435de2fb5b7
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu Apr 16 11:41:58 2009 +1000
test: add a simple test to verify device axis intialization.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 4124c465a85713fe44843a16c5e2b13ece17e9d2
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Wed Apr 15 17:21:08 2009 +1000
Add a test-suite for in-server unit-testing.
This patch adds a test/ directory that contains the setup for a unit-testing
suite designed for in-server unit-testing. All functions available to the X
server are available to the test binaries through static linking.
This test suite uses the glib testing framework.
Do not use glib calls outside of the test/ directory.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 987579c930bda803427a28cb82773c389f5110d6
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Wed Apr 22 13:26:40 2009 +1000
dix: remove all but main() from main.c
All other functions are pushed into where they seemed to fit.
main.c is now linked separately into libmain.a and linked in by the various
DDXs.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 2a2a7fa6856b2e1954e904577535118f20cd9133
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Mon Apr 27 20:23:53 2009 -0700
Solaris: use <sys/agpgart.h> instead of stale copy in Xorg sources
Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
commit 707af5f8c5fae3b6c4c5125a91917667bb0ab908
Author: Simon Farnsworth <simon.farnsworth@onelan.co.uk>
Date: Thu Apr 23 16:15:01 2009 +0100
Make the cursor completely optional
For embedded use, it's convenient to be able to disable the cursor
completely, without having to audit and fix up all your third-party
code (e.g. Mozilla Firefox).
Add -nocursor and -cursor server options to enable and disable the
cursor. The default is still -cursor, but embedded users can run the
server with -nocursor to hide the cursor regardless of what
application developers do.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 40a8f2f4088aa353de733a11327b628ef13a52e6
Author: Pierre Willenbrock <pierre@pirsoft.de>
Date: Sun Apr 19 21:15:22 2009 +0200
Fix obvious copypasta
Reviewed-by: Ian Romanick <idr@freedesktop.org>
commit a8cf63fd18b0ddadbadf7b47d620159854920050
Author: Aaron Plattner <aplattner@nvidia.com>
Date: Thu Apr 23 14:57:04 2009 -0700
Export CompositeRegisterAlternateVisuals.
Drivers need this if they add visuals that require implicit redirection. Add a
new SDK header, compositeext.h, to contain the prototype for this function.
commit 48573e7ea13e279593249036e6d30f1d7507882f
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Sun Apr 26 21:32:37 2009 +1000
Xi: swap stuff->cursor in SProcXIGrabDevice
commit ff6c7764c2909e4126403b7211faa6c58556b341
Author: Ian Romanick <ian.d.romanick@intel.com>
Date: Fri Apr 24 12:49:19 2009 -0700
DRI2: Implement protocol for DRI2GetBuffersWithFormat
This change implements the protocol for DRI2GetBuffersWithFormat, but
the bulk of the differences are the changes to the extension / driver
interface to make this function work. The old CreateBuffers and
DeleteBuffers routines are replaced with CreateBuffer and DeleteBuffer
(both singular).
This allows drivers to allocate buffers for a drawable one at a time.
As a result, 3D drivers can now allocate the (fake) front-buffer for a
window only when it is needed. Since 3D drivers only ask for the
front-buffer on demand, the real front-buffer is always created. This
allows CopyRegion impelemenations of SwapBuffers to continue working.
As with previous version of this code, if the client asks for the
front-buffer for a window, we instead give it the fake front-buffer.
Signed-off-by: Ian Romanick <ian.d.romanick@intel.com>
Reviewed-by: Kristian Høgsberg <krh@redhat.com>
commit 28ddfc88d8d547941c7f4713db527a3c2f9ec35a
Author: Ian Romanick <ian.d.romanick@intel.com>
Date: Fri Apr 24 12:09:21 2009 -0700
DRI2: Add interface for drivers to query DRI2 extension version
Signed-off-by: Ian Romanick <ian.d.romanick@intel.com>
commit a1c98f7fa9aa0cd5075ef2054c5d2be4d1e740f0
Author: Joel Bosveld <Joel.Bosveld@gmail.com>
Date: Fri Apr 24 10:12:26 2009 -0700
Correct fcntl(F_SETOWN) error check in non-Solaris sigio code
commit 64b7f96dca accidentally inverted the comparison, could
result in crashes on some systems later on.
Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
commit 64b7f96dca23d2b33e0b8a8785d628d9a2f50e7b
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Fri Apr 24 00:14:12 2009 -0700
Add SIGIO/SIGPOLL support for Solaris
Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
commit 0c467b1f990f156a34d5ef117bd825df6b633114
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Fri Apr 24 00:05:28 2009 -0700
Add casts to generated entries in sdksyms.c to silence type mismatch warnings
Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
commit 7d0f7518c2235a9dc783029971259ddaada2db20
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Thu Apr 23 08:42:38 2009 -0700
Fix byte swapping of XF86VidMode{Get,Set}GammaRamp
Fixes OpenSolaris Bug 8315:
Xorg segfaults when screensaver fades in cross-endian xdmcp session
<http://defect.opensolaris.org/bz/show_bug.cgi?id=8315>
Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
commit 057fc9a4f89282e440b5e11458f1dd8655879dd8
Merge: 95628b797e 932d6bcbb6
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri Apr 24 16:15:47 2009 +1000
Merge branch 'master' into xi2
Conflicts:
Xi/chdevhier.c
include/input.h
commit 932d6bcbb68194c5bdfeb336f700dc8b31529223
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri Apr 24 15:28:45 2009 +1000
mi: remove superfluous check.
mieqProcessInputEvents doesn't process events from MDs anymore, so we don't
need to check for pDev->isMaster.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit fab563bf8f6b63906ce9d5a568c467425843265b
Author: Benjamin Close <Benjamin.Close@clearchain.com>
Date: Fri Mar 27 16:44:15 2009 +1030
input: propagate XTst events through virtual slave devices.
A XTest virtual slave device pair (kbd/ptr) exists for every master
device pair. This is so XTest events are correctly propogated via slave
devices up to Master devices and the classes are correctly changed along
the way. We add the XTest slave device pair to the Virtual Core pointer
and provide a simple way of creating the devices.
A XTest Slave Device is identified by the XTstDevicePrivateKey property
being set in the devices devProperties
XI events are still propagated through the matching device, in the hope the
client knows what it is doing.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit ccd28ca2ad40aecf951ab058d89062828e3e5d8a
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Wed Apr 22 19:23:17 2009 -0700
XQuartz: Localization update
(cherry picked from commit 9435fc5e20e25ce66ec85bde033daff51f39f69c)
commit a362d0f4fb79150f7b8e0eb3d1dc1cdee2f98d95
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Sat Apr 11 19:06:45 2009 -0700
XQuartz: Make sure the bgMouseLocationUpdated state is consistent
(cherry picked from commit 8fa8a8e1db60c8ac60d10f1f15517471d2291f77)
commit 8dc8812c226222fc64f8e489f9f123687a95d3d1
Author: Dave Airlie <airlied@redhat.com>
Date: Thu Apr 23 12:13:35 2009 +1000
exa: add missing exa.h header include
commit 3ec6a121e110ba3cae964ee201d4d5bf818b6dff
Author: Dave Airlie <airlied@redhat.com>
Date: Thu Apr 23 12:13:05 2009 +1000
exa: missed exa.h change
commit 02ae85c4c93bbd0013c063ce0014b365a8ba061f
Author: Dave Airlie <airlied@redhat.com>
Date: Thu Apr 23 12:04:17 2009 +1000
exa: add CreatePixmap2 hook for driver pixmaps.
This adds a revised pixmap hook for driver pixmaps, which is
required to support tiling on various chips.
Signed-off-by: Dave Airlie <airlied@redhat.com>
commit 9d684ba0bcab53841a17ebd521507b6df8bc4b45
Author: Dave Airlie <airlied@redhat.com>
Date: Thu Apr 16 10:28:36 2009 +1000
exa: avoid offscreen pixmap swapped out flag for driver pixmaps
commit 0dfb97f15f591f85e079f5829c77d0c328d00464
Author: Julien Cristau <jcristau@debian.org>
Date: Wed Apr 22 20:01:49 2009 +0200
Bug#21324: Add quirk for Iiyama Vision Master 450
Reported-by: Jeremy Henty <onepoint@starurchin.org>
Signed-off-by: Julien Cristau <jcristau@debian.org>
commit 44227ef1b77467c76147b9bf79bdd0e6305a522a
Author: Ian Romanick <ian.d.romanick@intel.com>
Date: Mon Apr 20 18:20:52 2009 -0700
DRI2: Send the version the code actually supports
This prevents building an older server with a new dri2proto.h from
resulting in a DRI2 extension module that lies about the version it
supports.
Signed-off-by: Ian Romanick <ian.d.romanick@intel.com>
commit d1e916d29be8b470cbc8cadcf6e83991fdbc5a9f
Author: Ian Romanick <ian.d.romanick@intel.com>
Date: Thu Apr 16 12:10:34 2009 -0700
DRI2: Add missing front-buffer flush callback.
Signed-off-by: Ian Romanick <ian.d.romanick@intel.com>
commit 826a5bff0136b2b4d55a9e6e6bc3a7a64da9031e
Author: Benjamin Close <benjamin.close@clearchain.com>
Date: Thu Apr 16 15:33:30 2009 +1000
dix: Change AllocMaster into AllocDevicePair, allow creation of SDs too.
Allocating a slave device is essentially the same as allocating a master device.
Hence we rename AllocMaster to AllocDevicePair and provided the ability to
indicate if a master or slave device pair is required.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit e2e5932bda3f473629d4be6f3ca4dcab18993eb6
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu Apr 16 11:06:52 2009 +1000
dix: don't allow more than MAX_VALUATORS on one device.
Some keyboards (?) advertise more than MAX_VALUATORS axes. Parts of the
internal event delivery relies on not having more than MAX_VALUATOR axes, so
let's cap it down.
If there's real devices that require more than the current 36, I'm sure we can
bump this up.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 063833f3a6d9f8f657e3de309c8d6d5c3d606513
Author: Julien Cristau <jcristau@debian.org>
Date: Wed Dec 24 14:23:37 2008 +0100
Add XI 1.5 event and requests to protocol.txt
commit 4f86ee61a4abf7a29e565d095aa08abd0ca9dc66
Author: Julien Cristau <jcristau@debian.org>
Date: Wed Dec 24 14:17:27 2008 +0100
Add RandR 1.3 requests to protocol.txt
commit 6559f02ef89cb0ee365110d6a928ebd29632ad53
Author: Colin Harrison <colin.harrison@virgin.net>
Date: Fri Apr 17 15:14:45 2009 +0100
xkb: set bell_func in InitKeyboardDeviceStruct.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 95628b797e2b326ae15406df4f736e25f5d2f12f
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Mon Apr 20 14:04:54 2009 +1000
Xi: use the XI2 defines for AsyncPair, SyncDevice, etc, not the XI ones.
And don't allow some values on SDs either.
commit 335c63fcd6a53c1d3dffd6e00c0acd400c61e3d3
Author: Werner LEMBERG <wl@gnu.org>
Date: Fri Apr 17 15:22:57 2009 +0200
Add newline to some LogMessage strings.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit d5ad14c8ed4d8360e1df8cd0bacf6a7c9c31df91
Merge: 54716fd3db 0e0642ee94
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Sun Apr 19 22:28:22 2009 +1000
Merge branch 'master' into xi2
commit 54716fd3dbc251db9d251d1d0435942efaa63259
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Sun Apr 19 22:12:11 2009 +1000
Convert to using int32_t fixed point values on the wire.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 129ac9a9145323e3f126590b491e718f976f80ce
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Sun Apr 19 21:31:56 2009 +1000
dix: set root_x/y for device events.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit eeb1e4cd254c047539933c3b886037e67ef30762
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Wed Apr 15 22:17:15 2009 +1000
Xi: add support for XIAllowEvents.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 74d0fc3aee05bc4f505274d81dd44c0d2b4368ff
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu Apr 16 11:06:52 2009 +1000
dix: don't allow more than MAX_VALUATORS on one device.
Some keyboards (?) advertise more than MAX_VALUATORS axes. Parts of the
internal event delivery relies on not having more than MAX_VALUATOR axes, so
let's cap it down.
If there's real devices that require more than the current 36, I'm sure we can
bump this up.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit edb70caf21fa5da3c336c47c62218a3f05c635b8
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Wed Apr 15 22:16:49 2009 +1000
dix: remove un-used parameter "core" from AllowSome
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit bb5418d4901017c657031181d3839f58b387a2a3
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Sun Apr 12 22:22:21 2009 +1000
Xi: Add support for XI2 active grabs and ungrabs.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit c11ef87931f920ba782ba4e9b47d9c31ad7c1cf7
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Sun Apr 12 22:16:14 2009 +1000
Xi: take XI2 requests into account when checking opcodes.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit c94ea5bc055e4efc323e84b7a8266e8b8a4af48e
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Sun Apr 12 17:38:28 2009 +1000
input: use a GrabMask union in GrabDevice to allow for XI2 masks.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 6bb4b5b93701535402f65ea828348ed7747c7dbf
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Sun Apr 12 16:20:10 2009 +1000
Xi: add XI2 grab protocol request handling.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 09f9a86077f0058ce88ee9b3df5d1ab854eeca43
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Sun Apr 12 16:19:45 2009 +1000
input: replace GrabRec's coreGrab field with grabtype.
Don't allow grabs of different types to override each other.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 7fbe1b7d63c94b344e8ff9d09c0bb162ca104909
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Sat Apr 11 13:10:31 2009 +1000
Xi: remove the GetExtensionVersion hack.
Squashing data into a request that's defined to be padding is probably not the
best idea.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 0e0642ee9466d3268476d0084a83a9d93a4aa555
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu Apr 16 16:17:07 2009 +1000
os: don't malloc memory in LogVMessageVerb.
LogVWrite is limited to a buffer size of 1024, so we don't loose anything here
by truncating. This way we can use LogVMessageVerb (and xf86Msg and friends)
during signal handlers with the normal message types.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Acked-by: Alan Coopersmith <alan.coopersmith@sun.com>
commit 62d2fb68638e9f2aa3c1d72027619c4d38f5b812
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu Apr 16 17:06:33 2009 +1000
xkb: Add XkbFreeRMLVOSet helper function.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Acked-by: Dan Nicholson <dbn.lists@gmail.com>
commit 73e1055b1275470dcc2d53b15898c866d9721d3e
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Sat Apr 11 11:19:29 2009 +1000
Xi: fix a typo in a #ifdef
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit cbbc7fed994448852961a987a8b0eadf718b24bf
Author: Simon Thum <simon.thum@gmx.de>
Date: Wed Apr 1 10:53:10 2009 +0200
dix: correctly utilize tracker buffer and protect from timer overruns
two small related fixes hard to split up
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit ca4918ac2ff003142aefbd8ac7ec2bc398ccc6eb
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu Apr 9 19:31:04 2009 +1000
Xi: remove fail from SProcXISelectEvent.
Leftover from rebasing once too often, I guess.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 463676f016a105a790cbb386d20eb5b188c04652
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu Apr 9 19:11:59 2009 +1000
Xi: remove un-used variable pXIClient
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 32b13ec4cd42842a133aa6428f49638b0448efc9
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu Apr 9 19:11:27 2009 +1000
Xi: silence compiler warnings about "wrong" event types.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit f2e957c5342aefc8329e9fe282b7072f767fcd28
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu Apr 9 19:07:36 2009 +1000
mi: add prototype for CopyGetMasterEvent.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit d80798ba2ae018086aaf230fcd8bc71d3bf06b11
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu Apr 9 20:27:00 2009 +1000
mi: fix wrong (*EnqueueEvent) declaration in miPointerScreenFuncRec.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 4dedb900f4fbd3bdc9538b1e82cab2044438a770
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu Apr 9 08:42:06 2009 +1000
xfree86: shut up compiler warnings - typecast to InternalEvent
Reported-by: Eric Anholt <eric@anholt.net>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 4fa7fcf610d2ab91c1158f8034bbc0531060a86f
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu Apr 9 08:40:20 2009 +1000
mi: fix compiler warning - explicitly typecast to InternalEvent.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 8bf2f562678107c346e8664f18c10f315c2768f5
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu Apr 9 08:14:39 2009 +1000
dix: fix dev/keybd variable mixup.
Reported-by: Eric Anhold <eric@anholt.net>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 012cb1956a69f6cf2a878c5331e792fb12c73e9d
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu Apr 9 08:06:32 2009 +1000
xfree86: fix use of uninitialized variable in DGAProcessPointerEvent.
Reported-by: Eric Anholt <eric@anholt.net>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 73b01a9aac5fde46ccd90c08a070e9d2496092b9
Author: Simon Thum <simon.thum@gmx.de>
Date: Wed Apr 8 14:35:01 2009 +0200
dix: fix pointer accelerations remainder handling
This didn't really work as intended, but did amazingly well thanks
to roundf() hiding the defect. Cheers!
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 4318075140cc287871d3c3b9f777289ea4ffa23a
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Tue Apr 7 21:51:02 2009 +1000
dix: store subpixel precision and send it down the wire to the client.
For the valuator data, not yet for root x/y and event x/y.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 9212948461c5e053abb61fff73ced4a00f138544
Author: Simon Thum <simon.thum@gmx.de>
Date: Sat Mar 21 18:19:19 2009 +0100
dix: allow relative motion buffer to accumulate in a natural way
Since with XI2 we pass sub-pixel motion, anything else is broken.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit ad76656f8869e2065f0c4e66cfbeef0b42c61769
Author: Adam Jackson <ajax@redhat.com>
Date: Fri Apr 17 17:46:58 2009 -0400
randr: Accept gamma set requests from XF86VidMode clients too
commit d9bf52b4abd29a3c206cd1e765b680659ddac1c6
Author: David Jander <david.jander@protonic.nl>
Date: Fri Apr 17 01:34:18 2009 -0400
[kdrive] Fix rotation of pointer
Rotation matrix for pointer coordinates was incomplete and pointers with
absolute coordinates did not work correctly in xserver (kdrive) when the
sceen was rotated other than by 0 degrees.
Signed-off-by: David Jander <david.jander@protonic.nl>
Signed-off-by: James Cloos <cloos@jhcloos.com>
commit 4559d2ace6ac55fe361f572ded0769cdd1f3b545
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Thu Apr 16 22:48:11 2009 -0400
security: Grant untrusted windows remove access on all windows.
This allows untrusted clients to destroy their own windows when they
have been reparented by a trusted window manager.
commit 3481b32ab971c41cb972f6819ae049f3e9f7033b
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Thu Apr 16 22:39:54 2009 -0400
security: Fix a crash caused by wrong ordering of format arguments.
commit 6045506be0cebca4ebbe943ae77f020aafa703d4
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Thu Apr 16 22:33:12 2009 -0400
security: Revert behavior of extension access for compatibility.
Previously, three extensions were defined as "trusted" by the extension:
BIG-REQUESTS, XC-MISC, and XPrint. No other extensions were permitted
to be used by untrusted clients.
In commit 8b5d21cc1d1f4e9d20e5d5eca44cb1e60a419763 this was changed for
some reason. Return to the old, compatible behavior.
commit 56a5955c8cd87137248edb2cbc65d384376d72ad
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Tue Apr 14 17:05:04 2009 +1000
xkb: strdup the values returned by XkbGetRulesDflts
XkbGetRulesDftls may get a copy of what will later be freed when passed into
XkbSetRulesDftls.
On the second run of XkbGet/SetRulesDflts:
XkbGetRulesDflts(rmlvo)
rmlvo->rules = current-rules
XkbSetRulesDflts(rmlvo)
free(current-rules)
current-rules = strdup(rmlvo->rules)
Leaving us with garbage in current-rules.
This patch requires callers of XkbGetRulesDflts to free the associated memory.
See also
http://lists.freedesktop.org/archives/xorg-devel/2009-February/000305.html
Reported-by: Benjamin Close <Benjamin.Close@clearchain.com>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Acked-by: Benjamin Close <Benjamin.Close@clearchain.com>
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
commit b406886bbffadaa52864a99f2a0520999eadc15d
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Tue Apr 14 16:57:29 2009 +1000
input: allow NULL as XkbRMVLOSet in InitKeyboardDeviceStruct.
Virtually all callers use
XkbGetRulesDefault(&rmlvo);
InitKeyboardDeviceStruct(..., rmlvo);
Let's save them the trouble and accept NULL as a hint to take the
default RMLVO.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Acked-by: Benjamin Close <Benjamin.Close@clearchain.com>
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
commit 4e4e263bc073bf452f19c932b937c4881ae71f64
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Wed Apr 15 22:16:49 2009 +1000
dix: remove un-used parameter "core" from AllowSome
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit dd6e8a14ec1c8f4ed9c51ca2764261e6e48d13b3
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Sat Apr 11 11:19:29 2009 +1000
Xi: fix a typo in a #ifdef
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit de1e43181bd670877b994db221ad8a04b5d63324
Author: Ian Romanick <ian.d.romanick@intel.com>
Date: Wed Apr 15 11:13:48 2009 -0700
DRI2: Don't leave empty entries in private->buffers
This should fix bug #21130.
Signed-off-by: Ian Romanick <ian.d.romanick@intel.com>
commit b3e3154cce47add97f5561088036ce3b9e7dc937
Author: Robert Noland <rnoland@2hip.net>
Date: Wed Apr 15 12:06:19 2009 -0500
One = is more than adequate here. Make is sh safe.
commit 74d27c8b5bac7c8d2ed02ba86e09bf09924ce05c
Author: Samuel Thibault <samuel.thibault@ens-lyon.org>
Date: Wed Apr 15 15:44:17 2009 +0200
Fix build on hurd-i386
http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=523970
commit faf7dfa099f5b42a703313fbd1bf8afdad07a179
Author: Dave Airlie <airlied@linux.ie>
Date: Wed Apr 15 18:26:06 2009 +1000
randr12: looking up these bits if randr isn't initialised is bad.
When xinerama is enabled we don't get randr protocol, but the
driver might still want randr internals
commit efa31092d6703397121a0ada4f7205a8ecad3d3d
Author: Ander Conselvan de Oliveira <ander@mandriva.com.br>
Date: Mon Apr 6 16:01:20 2009 -0300
xfree86: Remove device from inputInfo.devices if ActivateDevice failed.
After the call to xf86ActivateDevice, the new device will be added to
inputInfo.devices. However, if the subsequent call to ActivateDevice
fails, the correponding InputInfoRec for the device is deleted but an
entry still remains in inputInfo.devices. This might lead to a server
crash later on (on InitAndStartDevices for instance) when the device
control proc would be called for an invalid device.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit d79bad0aa70403ead8ec87bac8463a6e2005802c
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Mon Apr 13 17:49:00 2009 +1000
xfree86: don't synthesise a mouse section if synaptics devices are found.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 4a27618565f3151ab17f0ca9ecbde12fa7ba13c0
Author: Kristian Høgsberg <krh@redhat.com>
Date: Tue Apr 14 16:21:04 2009 -0400
composite: Fix resource lookups
commit e7785e8af3e34f9d1089d8499d16802984ab9823
Author: Kristian Høgsberg <krh@redhat.com>
Date: Tue Apr 14 14:24:31 2009 -0400
xfixes: Fix a couple of resource lookups
commit 0eb19f9437b7d8c19592e49eedb028771d300d80
Author: Adam Jackson <ajax@redhat.com>
Date: Tue Apr 14 10:54:25 2009 -0400
xdmcp: Don't crash on X -query with more than 255 IP addresses. (#20675)
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.
commit f0543ae4ec0fcb5d696e7b2983653bd779f1eddc
Author: Eric Anholt <eric@anholt.net>
Date: Wed Apr 8 14:17:41 2009 -0700
Fix unused var warning from pci cleanups.
commit 181cc08c8908a119fc403f970dea8cc98d3e0b9b
Author: Eric Anholt <eric@anholt.net>
Date: Wed Apr 8 14:17:40 2009 -0700
Add shave so that we can see the steaming piles of warnings generated.
The old style output can be reenabled for build system debugging using
"make V=1", or --disable-shave at configure time.
commit 4474c200a102feda72f9572a96cb588009aa0147
Author: Eric Anholt <eric@anholt.net>
Date: Wed Apr 8 14:17:39 2009 -0700
Move VENDOR_* defines from AC_SUBST to a header to avoid angering shave.
This is more sane anyway, as it ensures a rebuild when changing them.
commit e72c85547b405fbd0117dc1236e5ca5a2126063c
Author: Eric Anholt <eric@anholt.net>
Date: Wed Apr 8 14:17:38 2009 -0700
Move contributed m4 to a subdir so we can more easily update contributions.
commit bef1cfb2395df47458159a0b7ae27b9db15025ef
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Tue Apr 14 16:54:42 2009 +1000
xnest: remove unused variable 'names'.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 7b6400a1b8d2f228fcbedf17c30a7e3924e4dd2a
Author: Kristian Høgsberg <krh@redhat.com>
Date: Thu Apr 9 13:16:37 2009 -0400
glx: Fix drawable private leak on destroy
When a drawable goes away, we don't destroy the GLX drawable in full,
since it may be current for a context. This means that when the drawable
is destroyed in full later, the backend doesn't get a chance to
destroy resources associated with the drawable (the DRI2Drawable).
With this patch, we destroy the GLX drawable in full when it goes away
and then track down all contexts that reference it and NULL their
pointers.
commit 140463a197fb93d0a4bfad924efc35b860e8cc54
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Sat Apr 11 16:53:59 2009 -0700
XQuartz: Use correct values for ProximityIn and ProximityOut
This was the other underlying cause of teh 100% CPU tablet issue.
(cherry picked from commit a9cecf34c23fbcd59b56b380c51d31a9fabc3eb7)
commit 80a7bb2605f9b439d6221c0495a629a39177a018
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Sat Apr 11 17:26:07 2009 -0700
XQuartz: Solve the tablet 100% CPU bug
This happened because we put a byte in the fd to wake up dispatch, but we never actually enqueued anything in mieq because the num_events was 0.
(cherry picked from commit c21ca7558d2faf93c61f5feaafd7c878e9e21942)
commit 6f8f7c78f1b722bc70a0ea8f6340116a1e09e858
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Sat Apr 11 16:13:42 2009 -0700
XQuartz: Re-enable background window checking
since that code was not the culprit for the wacom tablet, background 100% CPU bug
(cherry picked from commit fc1dc5d71b2a488a8a94d953dd8e67353161a590)
commit 8522a759c9e78478bb399b91d3a0af2d23ea6766
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Sat Apr 11 16:12:23 2009 -0700
XQuartz: Only set MotionNotify on activation if it is updated.
(cherry picked from commit ae8077a251ef27381a755d57ff974767bda16148)
commit 5e55becddccc376ab7338789562ad6d6cd750de9
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Sat Apr 11 14:23:41 2009 -0700
XQuartz: Make sure the Fn doesn't trigger unneccessary calls to DarwinUpdateModKeys()
(cherry picked from commit 70a18558c6b0a02b633fd8974f002cdf3cdc713e)
commit bd1d9179094657865b0606ed0ac835a8b8df3be1
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Sat Apr 11 13:53:38 2009 -0700
XQuartz: Re-enable Fn as an option for 3button mouse simulation.
Patch from Martin Otte <otte@duke.edu>
(cherry picked from commit b5ec3be6b5449b5d575bc1472fdd1c9cb15cb8be)
commit 1b5758bef0840c6614244e321790231b3c9477c9
Author: Maarten Maathuis <madman2003@gmail.com>
Date: Thu Apr 9 15:45:57 2009 +0200
exa: implement UTS based upload through CopyArea
- Some image viewers (eog, gqview) trigger the CopyArea path of Xext/shm.c
- I'm not aware of any code path that wouldn't like UTS and trigger this code.
- miDoCopy should handle src coordinate clipping.
- Overlapping blits are obviously not an issue (both would have to be offscreen or not).
commit 567cf67959b30432ae30f4851ec17b3a375ab838
Author: Ian Romanick <ian.d.romanick@intel.com>
Date: Thu Apr 9 14:38:24 2009 -0700
DRI2: Synchronize the contents of the real and fake front-buffers
Signed-off-by: Ian Romanick <ian.d.romanick@intel.com>
commit f1a995d1496d73741731e32f475097c44a8da972
Author: Ian Romanick <ian.d.romanick@intel.com>
Date: Thu Apr 9 14:31:01 2009 -0700
DRI2: Do not send the real front buffer of a window to the client
Signed-off-by: Ian Romanick <ian.d.romanick@intel.com>
commit aa2928325fe51d94a636dde9c090e8f54a311a12
Author: Ian Romanick <ian.d.romanick@intel.com>
Date: Wed Apr 8 15:44:34 2009 -0700
DRI2: Add fake front-buffer to request list for windows
If a front-buffer is requested for a window, add the fake front-buffer
to the list of requested buffers.
Signed-off-by: Ian Romanick <ian.d.romanick@intel.com>
commit 808fd2c67f303cb721769375b11ce8b90ffc1909
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Thu Apr 9 20:00:37 2009 -0700
XQuartz: xprSetWindowLevel updated to store the level requested by the WM
(cherry picked from commit c28c2ddc3a8f3c5b9beec396953bb3ac9ee4714b)
commit dfb0d7aefbbdfc0db966e3a84d52f638135d9138
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Thu Apr 9 18:51:22 2009 -0700
XQuartz: Update window levels when changing rootless state
(cherry picked from commit 1359ded5bfc14a80fb998b01a54ecacb96c4ff88)
commit d5ef88d7543ed787093099ab18db766c446b47d1
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Thu Apr 9 18:27:22 2009 -0700
XQuartz: Fix window levels for rooted mode to allow showing the menu bar.
(cherry picked from commit 80759a4186bf0335edc85aecea2faf11fe09f491)
commit 15146b863759640e7a73fab2301fb28ef4dead84
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Thu Apr 9 17:47:41 2009 -0700
XQuartz: Properly set the window level for the root window
(cherry picked from commit bdf9286d1cbfeaaf8eaf03d28091e91ee587ee25)
commit 8d5dcfe2154f217bd8fde5509d78f3383add8725
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Thu Apr 9 04:36:26 2009 -0700
XQuartz: Properly set the menu bar and hotkey state when changing rootless mode.
Currently no code path exhibits the broken behavior since we only toggle into rootless if we don't have the root.
(cherry picked from commit 970f100ca3c5fc0662ae7658d49d118fbd9de943)
commit 82d7cf5cdcbc5e451a87f8c2f64cd5d2e3627d54
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Thu Apr 9 03:55:13 2009 -0700
XQuartz: In rooted mode, make sure we start in the hidden state.
(cherry picked from commit 5ecc497f71c2133f773f6c56ad76cb778862ddd6)
commit e86f4e93020d56385418850a9eebae8076dcb9ac
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Mon Apr 6 21:34:14 2009 -0700
XQuartz: Send MotionNotify before button presses when X11 is in the background
(cherry picked from commit c80d0ec18ef5b842447d31360406d0b5b9424222)
commit 5ccfad8df099e8ebc4bf2dd53c3db1460903b135
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Mon Apr 6 19:21:46 2009 -0700
XQuartz: Revert most of the previous override redirect patch
The changes actually caused all windows to move to the current space. Instead, we're going with a fix entirely within Xplugin that depends on quartz-wm being the window-manager for now.
(cherry picked from commit 997b6f3142c622541bb5bac98652abae75d1101d)
commit ff7f019bbcbc52618cc478db7baed57aa5b7c3d3
Author: Simon Thum <simon.thum@gmx.de>
Date: Wed Apr 1 10:53:10 2009 +0200
dix: correctly utilize tracker buffer and protect from timer overruns
two small related fixes hard to split up
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 06aebecb19dd9d90d73b742a09b6068b862f1d05
Author: Simon Thum <simon.thum@gmx.de>
Date: Wed Apr 8 14:35:01 2009 +0200
dix: fix pointer accelerations remainder handling
This didn't really work as intended, but did amazingly well thanks
to roundf() hiding the defect. Cheers!
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 98f4179156391752e6688339487458ad7828abf4
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Thu Mar 26 23:04:24 2009 -0700
Use RTLD_DI_SETSIGNAL to catch runtime dynamic loader errors and clean up
Based on fix for Sun bug 6813925: Xorg needs to catch ld.so.1 failure
so it can close down devices cleanly
<http://bugs.opensolaris.org/bugdatabase/view_bug.do?bug_id=6813925>
Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
commit a0b6a363dca8ce0dc6f4eb79333e48496153cd67
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Mon Mar 9 13:22:57 2009 -0700
Lift fatal signal handlers from DDX'es up to a common DIX implementation
Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
commit fcc19e673e3ef33d64916dd933853f8aa667c4d7
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu Apr 9 20:27:00 2009 +1000
mi: fix wrong (*EnqueueEvent) declaration in miPointerScreenFuncRec.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 4fee979d0632751d3d54d2115e84e9654edf0622
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu Apr 9 19:11:27 2009 +1000
Xi: silence compiler warnings about "wrong" event types.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 6b467bf879eeb77d167ef321e6dda97ca9d7010a
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu Apr 9 08:42:06 2009 +1000
xfree86: shut up compiler warnings - typecast to InternalEvent
Reported-by: Eric Anholt <eric@anholt.net>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 8a2a184da78a3e9cbeae8290431f40d5ec7f3636
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu Apr 9 08:06:32 2009 +1000
xfree86: fix use of uninitialized variable in DGAProcessPointerEvent.
Reported-by: Eric Anholt <eric@anholt.net>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 011cee3103c146c8096b7098a27993f99e07a824
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu Apr 9 08:14:39 2009 +1000
dix: fix dev/keybd variable mixup.
Reported-by: Eric Anhold <eric@anholt.net>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 630a6e9d14ffbf036fa72f580c72c0172d7c20bd
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu Apr 9 08:40:20 2009 +1000
mi: fix compiler warning - explicitly typecast to InternalEvent.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit e3bb7dea06b9ab0e30d801bf6c3a59f94290aaed
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu Apr 9 19:07:36 2009 +1000
mi: add prototype for CopyGetMasterEvent.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 346e71525fc545c6ca4ad79425722282d1544459
Author: Michel Dänzer <daenzer@vmware.com>
Date: Thu Apr 9 09:36:41 2009 +0200
EXA: If the driver can't composite to an a8 mask, try an argb mask for glyphs.
Signed-off-by: Michel Dänzer <daenzer@vmware.com>
commit 682d7b55699cacbb2dbcd84a5e816bf6e2d2f02a
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Thu Apr 9 02:48:04 2009 -0400
xselinux: Don't BadAlloc in List* requests if there are no items to list.
commit 3a0ee199dcec39596756a995996eac388acf6315
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Thu Apr 9 02:26:24 2009 -0400
config: fix crash caused by strdup(NULL)
commit 7b3982eb6518da33ab01c2fbf7ceb45b89f841df
Author: Michel Dänzer <daenzer@vmware.com>
Date: Thu Apr 9 08:21:09 2009 +0200
glx: Test the error value, not its address...
commit 03aebed519986c4dd03e02b3b3d4af1f64595ca7
Author: Ian Romanick <ian.d.romanick@intel.com>
Date: Wed Apr 8 14:54:30 2009 -0700
Use a #define instead of a magic number
The number of buffers is likely to change in the future, so having
this as a define is the right way to go.
Signed-off-by: Ian Romanick <ian.d.romanick@intel.com>
commit 0d9f3ca7eabd4c514808114d30627f682c8bd030
Author: Ian Romanick <ian.d.romanick@intel.com>
Date: Wed Apr 8 14:53:46 2009 -0700
Allow GLX sources to build against Mesa 7.4 sources
Signed-off-by: Ian Romanick <ian.d.romanick@intel.com>
commit e8b324102f6e21ae2b8292a6f50d016dd6254dd6
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Wed Apr 8 15:10:16 2009 -0400
xselinux: Don't require incoming context strings to be null-terminated.
commit df27b870a8db7a5153b18a556fe77efa590f9eee
Author: Kristian Høgsberg <krh@redhat.com>
Date: Tue Apr 7 16:28:08 2009 -0400
Convert remaining GLX LookupIDByType() calls
commit 92562747a0fdbef1dbedf734cb55dd6a9e1d2994
Author: Kristian Høgsberg <krh@redhat.com>
Date: Tue Apr 7 13:58:53 2009 -0400
Add validGlxDrawable() and use dixLookupResourceByType().
Fixes deprecation warnings, and fixes a couple of GLX error codes
for failing drawable lookups.
commit f70cfc8f90091ef0f5ed0a5b2e023e7fd6369b36
Author: Kristian Høgsberg <krh@redhat.com>
Date: Thu Apr 2 17:30:19 2009 -0400
Don't stomp on dixLookupDrawable() return value in DoCreateGLXPixmap().
commit 30d81ad72e870cc37754bd8c8aadf605450ec16e
Author: Kristian Høgsberg <krh@redhat.com>
Date: Thu Apr 2 17:24:12 2009 -0400
Make GLX context lookup use dixLookupResourceByType()
commit 66539cc05d0b017b9feb4a038499907810140623
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Thu Mar 26 22:22:32 2009 -0700
Don't leak default font path when appending built-ins
Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
commit 6c3b633299f12051fcf37fb8439f358de876cf03
Merge: adf21dba76 0cfd481308
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Tue Apr 7 19:36:27 2009 +1000
Merge branch 'master' into xi2
commit 0cfd48130842685828e0662a27272a3a65facd23
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Mon Mar 23 11:41:16 2009 +1000
dix: Dont change the keyboard mapping on non-keyboard devices.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 69e73e5ce0e3971eceed71216d2d7e7d9cd57cc2
Author: Adam Jackson <ajax@redhat.com>
Date: Mon Apr 6 17:56:49 2009 -0400
config: Remove useless xf86conf{{m,c,re}alloc},free} macros
commit 485946120a6522db9298111752de9be3d675e0b3
Author: Adam Jackson <ajax@redhat.com>
Date: Mon Apr 6 17:51:35 2009 -0400
config: s/xf86configStrdup/strdup/
commit 5f769b73441cf29c05a05c728ab81bdde1fc00b6
Author: David Jander <david.jander@protonic.nl>
Date: Mon Apr 6 13:01:08 2009 -0400
kdrive: Fix segfault in tslib support
commit 843166b033dc0544b9f3cf3c91fc3ae3650bda14
Author: Adam Jackson <ajax@redhat.com>
Date: Mon Apr 6 11:05:17 2009 -0400
os: signal handlers return void.
commit aa6fbc2a3679896181610aee7ce2844d4322a5ce
Author: Adam Jackson <ajax@redhat.com>
Date: Mon Apr 6 10:58:47 2009 -0400
Remove some OS/2 leftovers.
commit 2c03a63ff6855272d587b4972a67f64115a1ce4c
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Sun Apr 5 03:20:40 2009 -0700
XQuartz: Use updated Xplugin API to send overide-redirect windows to the current space when they're ordered in
This fixes the annoying "using a menu moves me to another space" bug
(cherry picked from commit 9e6dab89e08a26d764ba1aeaeb804c3d25c667da)
commit 67621f3b39c387b3f7bfc65781051aea51c0b83f
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Sun Apr 5 00:06:57 2009 -0700
XQuartz: Send a MotionNotify event for the mouse cursor when activating X11.app
Otherwise if X11.app was activated with a mouse click, the location of the even is the last location of the cursor before X11 was deactivated
(cherry picked from commit c7457d7b31ddd2ddfd04dd6294bed4532664e1ab)
commit e1338d27141125af61634597c5dea880692c4017
Author: Julien Cristau <jcristau@debian.org>
Date: Sat Apr 4 23:43:28 2009 +0200
xfree86: Remove unused DEFAULT_UNRESOLVED and DEFAULT_BEST_REFRESH macros
commit e25d55ad546905c4921f0a26385bdb9f22038429
Author: Adam Jackson <ajax@redhat.com>
Date: Fri Apr 3 22:38:00 2009 -0400
Revert accidental Makefile change from previous commit
commit 472811dc4ba741ab09db184216878700f4adf745
Author: Adam Jackson <ajax@redhat.com>
Date: Fri Apr 3 22:27:51 2009 -0400
DPMS: Re-export the various DPMS variables.
The drivers might not need them but extmod does. Should move it to
builtin though.
commit cbb165ab88cb0810268001e84d87671440baf837
Author: Adam Jackson <ajax@redhat.com>
Date: Fri Apr 3 18:34:45 2009 -0400
os: Remove the useless -x option
commit 6574ab092fb80b7731e06ede653b6af92fa7684e
Author: Adam Jackson <ajax@redhat.com>
Date: Fri Apr 3 18:03:43 2009 -0400
DPMS: Remove the defaultDPMS* variables
commit c1cf36ee29e41901ecd382f0258110ebb4a0124e
Author: Adam Jackson <ajax@redhat.com>
Date: Fri Apr 3 17:51:55 2009 -0400
DPMS: Simplify command line parsing
commit 2d0a4fff7985f58c21023cc4757090ee67067593
Author: Adam Jackson <ajax@redhat.com>
Date: Fri Apr 3 13:44:37 2009 -0400
DPMS: Remove unused DPMSGet()
commit d52fddefaeb43f15b677eefbea4a288a9948373b
Author: Adam Jackson <ajax@redhat.com>
Date: Fri Apr 3 13:33:03 2009 -0400
DPMS: Align the default timeouts with the default screensaver timeout.
On a typical LCD, a black screensaver is actually worse for power
consumption than a normal screen, because it takes more energy to turn
the crystals opaque. Also, the intermediate DPMS states are essentially
useless and most monitors alias them to the 'off' state, so we may as
well do the same.
As a pleasant side effect, this brings the default DPMS timeouts in line
with the EnergyStar Program Requirements for Computers:
http://www.energystar.gov/index.cfm?c=revisions.computer_spec
which state that products must be "shipped with the display's Sleep mode
set to activate within 15 minutes of user inactivity".
commit 38576dc3ae8ddec2baedd2f7e64abdfc56bedf93
Author: Adam Jackson <ajax@redhat.com>
Date: Fri Apr 3 11:55:41 2009 -0400
DPMS: Simplify some macro silliness.
commit 1c01127a214731a21c4784249a429c74f17bd424
Author: Adam Jackson <ajax@redhat.com>
Date: Fri Apr 3 11:39:18 2009 -0400
DPMS: Unexport all the various setup variables.
The drivers don't need to know any of this.
commit a99b0ab918998c9a1b9f8692591b8cb59a12eb9e
Author: Adam Jackson <ajax@redhat.com>
Date: Fri Apr 3 11:32:00 2009 -0400
DPMS: Fix cast abuse
commit 4da347adb1fcc39e8f4fb2cadd98e887d7ac877a
Author: Adam Jackson <ajax@redhat.com>
Date: Fri Apr 3 11:18:21 2009 -0400
DPMS: Code motion.
commit 1731882341c191b4ffd78e0c1fd9297c636e0401
Author: Havoc Pennington <hp@pobox.com>
Date: Fri Mar 27 12:30:37 2009 -0400
Set bg pixmap of composite overlay window to None (#20912)
Otherwise it's impossible to get the COW without a white
flash on the screen, because it's on top, mapped immediately,
and unaffected by composite redirection. This makes
initial login ugly when it doesn't need to be.
commit d2690375dfd994817f004cda133ca2a492c0b956
Author: Adam Jackson <ajax@redhat.com>
Date: Fri Apr 3 11:06:50 2009 -0400
kdrive: s/KdSaveString/strdup/g
This isn't even funny anymore.
commit 91b697efdefba125348dbcaf584ee51a7f8c9bf6
Author: Kristian Høgsberg <krh@redhat.com>
Date: Wed Apr 1 17:42:33 2009 -0400
Support setTexBuffer2 in AIGLX.
Fixes broken GLX_tfp, specifically, lets compositors ignore un-defined
alpha channel for pixmaps.
commit 1c101d75d4855b2698e3fc8d2dd662f20585812f
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Thu Mar 26 22:25:08 2009 -0700
Don't leak canonical module name and patterns if module is built-in
Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
Acked-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 9180081ec32b6c655d193de4c89b59d222a72579
Author: Jeremy Huddleston <jeremy@yuffie.local>
Date: Wed Apr 1 13:45:02 2009 -0700
XQuartz: Still send mouse events while X11 is in the background if we have test extensions enabled
(cherry picked from commit f393fb686cfbedb11a1539d4eaf5c491af8b3a64)
commit 029307e79a14cad5bde8f1f4a5d0a2f740271f06
Author: Jeremy Huddleston <jeremy@yuffie.local>
Date: Wed Apr 1 13:07:15 2009 -0700
XQuartz: Return BadRequest when SendPSN isn't implemented rather than success
(cherry picked from commit 49871e99179d5176a1ec516c8f449e2dc219faea)
commit 0603fbc1d3b2db5c25faabbfb5e04914110b4d0e
Author: Jeremy Huddleston <jeremy@yuffie.local>
Date: Wed Apr 1 12:46:51 2009 -0700
XQuartz: Pad xAppleDRINotifyEvent to 32bytes to match sizeof(xEvent)
(cherry picked from commit 276ee3bb087c772f57a987519aa4d94afeceadaa)
commit b1dab580bdfb4acfe3feddeda6e760098ec4922a
Author: Tormod Volden <debian.tormod@gmail.com>
Date: Wed Apr 1 19:32:21 2009 +0200
xfree86: edid quirk for Philips LCD LP154W01-TLAJ
This panel reports its vertical size in cm.
X.Org bug#21000 <http://bugs.freedesktop.org/show_bug.cgi?id=21000>
Signed-off-by: Tormod Volden <debian.tormod@gmail.com>
Signed-off-by: Julien Cristau <jcristau@debian.org>
commit 7d94414cf4b16501ce4c4291846498f393f150a4
Author: Adam Jackson <ajax@redhat.com>
Date: Wed Apr 1 09:42:06 2009 -0400
input: Remove xf86ReloadInputDevs hack
We have input hotplug now, no need to fake it.
commit 3311ef6ec93df4325d198715e0fce73af19f0781
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Tue Mar 31 18:11:19 2009 -0700
XQuartz: Don't report mouse events while X11 is not the foreground application
(cherry picked from commit 5d1dd35096334b59564d77caef7a97bd58845c5d)
commit 89887fadc97f6fd5059886396a6d7cf61de1982f
Author: Adam Jackson <ajax@redhat.com>
Date: Tue Mar 31 15:09:57 2009 -0400
APM: Don't carp if not available.
commit 2e145989d10ef454581f8aa60358ed3782fd6442
Author: Adam Jackson <ajax@redhat.com>
Date: Mon Mar 30 17:22:28 2009 -0400
dix: Simplify InitClient()
commit 252ec504817e05b185e4896a2d899e9c00b8aeef
Author: Adam Jackson <ajax@redhat.com>
Date: Mon Mar 30 15:18:30 2009 -0400
Document which bits of ClientRec are currently unused
commit 0b6e14d46feaf8c46fd3768ee5353b844391b79b
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Mon Mar 30 20:37:25 2009 -0700
XQuartz: Fix mouse tracking for quake, et. al. in wine
Patch courtesy of Codeweavers
Fix mouse movement tracking. For a non-window-related mouse-move event,
calculate the new position by adding the event's delta-x and delta-y values
to the previous mouse position. Do not rely on the current mouse position
because it may have been changed by a XWarpPointer call.
(cherry picked from commit 7a67935b05a475215b9bdbb959e4f7e15f32416f)
commit c74220b853cd99d03e33cc62d32431ca3a879483
Author: Adam Jackson <ajax@redhat.com>
Date: Mon Mar 30 14:56:15 2009 -0400
APM: Use general handlers, not input handlers.
Otherwise APM events get treated as input events, which messes up idle
time accounting and screensavers and such. Not, we hope, that anyone
is using APM anymore.
commit 283a081572d8db787c77d09e5ba6bcadebf4f7fe
Author: Adam Jackson <ajax@redhat.com>
Date: Fri Mar 27 15:56:15 2009 -0400
selinux: Only activate if policy says to be an object manager
commit 8e7facfe3013abda12a0c39ad8b4d025618077a7
Author: Adam Jackson <ajax@redhat.com>
Date: Fri Mar 27 15:48:17 2009 -0400
config: Fall back to vesa for Intel Poulsbo.
commit 17239c8e3163fef0159835d43c0dde20e78192a1
Author: Adam Jackson <ajax@redhat.com>
Date: Fri Mar 27 12:44:20 2009 -0400
misprite: Remove private header, fold into misprite.c
commit bb89fc2771d2e54d7e0cd0371db68ddb754a64e5
Author: Adam Jackson <ajax@redhat.com>
Date: Fri Mar 27 12:36:42 2009 -0400
misprite: Fix software cursor on multiple ScreenRecs
commit 2c000f4980d30015e6da95de3c77c0fdda0090e4
Author: Adam Jackson <ajax@redhat.com>
Date: Fri Mar 27 11:54:52 2009 -0400
misprite: Do window check first for Get{Image,Spans} too
commit 8beced6c02610444105f3d0b8ee3a49e1072096d
Author: Adam Jackson <ajax@redhat.com>
Date: Fri Mar 27 11:43:33 2009 -0400
misprite: RECT_IN_REGION -> miRectIn
commit a232116b9ecd41ce55f8eeee9dfe2b67d76479d6
Author: Adam Jackson <ajax@redhat.com>
Date: Fri Mar 27 11:41:40 2009 -0400
misprite: Fix a typo
commit 1f0eaf886d88f3935e43985d2c889b374f412e43
Author: Adam Jackson <ajax@redhat.com>
Date: Fri Mar 27 11:29:40 2009 -0400
misprite: Fix cast abuse
commit e3c1096273446bb7eb993b179ceb989617d149cc
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Mon Mar 23 13:20:22 2009 +1000
dix: build_modmap_from_modkeymap needs to bounds-check its argument.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
commit 45baef0b77f6f0e5e6230eca045dfcbb1e48c647
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Mon Mar 23 13:32:32 2009 +1000
dix: return BadValue as error in SetModifierMapping.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
commit 603db34337a61754e0c5f71525011d10eab78411
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Wed Mar 25 15:51:43 2009 +1000
Xext: set POINTER_SCREEN flag in XTestFakeInput if necessary. (RH #490984)
The POINTER_SCREEN flag must be set explicitly for XTest core events to avoid
out-of-range events when the lastSlave was an SD with an explicit axis range.
Device events sent through XTest don't need this flag, they are expected to be
in the valuator range of the device anyway.
Red Hat Bug 490984 <https://bugzilla.redhat.com/show_bug.cgi?id=490984>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 4ab93f05664890ff6738ef1089bcd956ce3f06e9
Author: Adam Jackson <ajax@redhat.com>
Date: Mon Mar 23 15:19:47 2009 -0400
misprite: In SourceValidate, check that it's a Window first
It almost never is. However, you have _lots_ of input devices now, and
walking them all on every Composite operation is not the cheapest thing
in the world.
commit d698e62690e0a52fa537f1cd792cab7a5b1bafdf
Author: Maarten Maathuis <madman2003@gmail.com>
Date: Thu Mar 19 21:35:25 2009 +0100
xkb: plug a memory leak in XkbCopySrvLedInfo (#20756)
X.Org Bug 20756 <http://bugs.freedesktop.org/show_bug.cgi?id=20756>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit e26f79335bb7a9ad34fe9b23c283a214202f89ed
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Tue Mar 17 16:22:00 2009 +1000
xkb: put a few extra checks in against non-keyboards
commit 844bb629fe786ecf536039df3f5f4b3b214c9d40
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu Mar 19 15:44:34 2009 +1000
dix: remove a truly useless a = (foo) ? bar : bar; statement.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 62183a06e5f72a18abc3d58c4bf5658a20ece217
Author: Tomas Carnecky <tom@dbservice.com>
Date: Fri Mar 20 16:19:33 2009 +0100
Remove two unused defines in C files
These two defines were defined in C files but not used anywhere:
dix/window.c #define DeviceEventMasks (KeyPressMask | [...]
os/connection.c #define MAXFD 500
Signed-off-by: Tomas Carnecky <tom@dbservice.com>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 4e0d7cc506b661b5e5cedf8be6e17aa4c8075aa8
Author: Tomas Carnecky <tom@dbservice.com>
Date: Fri Mar 20 16:19:34 2009 +0100
FID, whatever that was, isn't anymore
No traces of FID in the xserver nor in the modules listed in
util/modular/xorg.modules
Signed-off-by: Tomas Carnecky <tom@dbservice.com>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit adf21dba7617542f08309415e315d4b2699c10e0
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu Mar 19 20:40:43 2009 +1000
include: un-export a bunch of server-only functions.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 111ef10375204a6981a5be5c045860854c4da4e6
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu Mar 19 09:33:02 2009 +1000
dix: move ProcGrabPointer guts into GrabDevice.
Yes, this means we have even more arguments to GrabDevice. But it beats having
a copy of most but not all of GrabDevice in ProcGrabPointer.
Also, reshuffle the order of parameters, the CARD* status is a return value
and should be last.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit dc153271b6458cacd63a4bc0208594011c6460b0
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Wed Mar 18 15:13:00 2009 +1000
Xi: purge old device enter/leave masks.
commit 15a969c0fcd4f19f3c560a7037c1a6a58bce51f0
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Wed Mar 18 10:21:59 2009 +1000
dix: remove now obsolete mskidx parameter from DeliverEventsToWindow.
mskidx would always be dev->id anyway, so if we're already passing in the
device, mskidx is superfluous.
commit f5409aa026b2cb501170867d04c6e220f3fe0a44
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri Mar 13 15:51:50 2009 +1000
mi: remove deprecated miPointerAbsoluteCursor
Functions that don't specify the device are so last year.
commit 46145a9312eaf5dcd0e8b6788ed8219e086f790e
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri Mar 13 15:12:55 2009 +1000
dix: remove coreMods field from GrabRec.
Nobody uses it anyway, and it's taking up a whole bit!
commit 40e2a61e37109cd9c2ab57954ee40dcf4a062e31
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu Mar 12 16:53:56 2009 +1000
Add Get/SetDeviceFocus handling.
commit d9b7343eac1157490442cc0fb3b5b6d7d6e9a705
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu Mar 12 12:56:18 2009 +1000
dix: even if we don't get a XI1 event, continue processing.
commit e11dc10f01603b181e224c90d1dd4abe940f2ce7
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu Mar 12 10:21:00 2009 +1000
dix: Send HierarchyEvents when devices are added/removed/enabled/disabled.
commit 8634e1bcbae9317fc22132f7c9bde1a4a881b9a7
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu Mar 12 10:42:05 2009 +1000
dix: send presence events when floating and unfloating SDs
commit c9483a53bea1f721d2902ac11467f67317e7de14
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Wed Mar 11 16:20:22 2009 +1000
include: add a few prototypes to silence compiler warnings.
commit a4b61cfc78d81de02a71fa6ad8a44a06616f6794
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Wed Mar 11 16:08:24 2009 +1000
dix: un-static FixUpEventFromWindow and deal with focus events too.
commit 4cc6a96d7171e567a9bd5a10f552bb953077aafb
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Tue Mar 10 16:08:14 2009 +1000
input: add support for RawDeviceEvents.
commit a668d91e28d5a3042a8ce0d087474883b046869a
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Mon Mar 9 16:36:07 2009 +1000
dix: store the xi2mask on grabs and pass it around as needed.
This enables passive and implicit passive grabs for XI2 events, except that we
don't have the protocol spec yet to request them.
commit 32f338263ff7de1a2e76d570c98f5be979c18d4e
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Sun Mar 8 21:32:31 2009 +1000
Xi: Deliver XI2 HierarchyEvents when the hierarchy changes.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 97e89a59572a4be6757510a317c142ec1d82e8f8
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri Mar 6 23:22:00 2009 +1000
Allow XI2 event selection for AllDevices and AllMasterDevices.
commit 808a158182b0a3b985385899252c190947b4dbbd
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri Mar 6 14:45:26 2009 +1000
dix: Enable XI2 delivery for events and focused events.
No support for grabbed events yet.
commit 87ff1159b497c66554a4036ae619f92d5631f00f
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Wed Mar 11 09:01:23 2009 +1000
dix: deliver device enter/leave events.
commit 04ed0bcb2530866f7248b412974ecd15f0fbf6ac
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Mon Feb 23 17:07:55 2009 +1000
xkb: remove Device/Enter leave handling - XI2 enter/leave don't have compat state.
commit 3f37923a727d5fc4b1880a53dac1145884ba7140
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Mon Feb 23 16:12:25 2009 +1000
Xi: send XI2 focus events.
commit daf7dd3bfecc9029bdd10c7a4ea5d2c875a89c41
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Wed Mar 11 09:01:12 2009 +1000
dix: Add GetWindowXI2Mask helper
commit 8b6a370058ad5a20e0a0e49ec9443daf03775de8
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Mon Feb 23 15:58:07 2009 +1000
Add XI2 masks and XISelectEvent() request handling.
XI2 event masks are simply stored in the OtherEventMasks as a separate field.
This replaces the XiSelectEvent code.
commit 38bba0c1b75b84e8bbdfa7975cf701a9414a3afd
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri Feb 20 16:07:33 2009 +1000
Xi: Change ChangeMasterDeviceClasses to new XI2 events.
Split ChangeMasterDeviceClasses into an extra XISendDeviceChangedEvent that
assembles the XI2 wire event for the DeviceChanged event. Re-use this when
detaching the last SD.
Not quite perfect yet, we still copy the device classes from the slave now
rather than from the data we had when the event occured. But it's a start.
(We can now unexport SizeDeviceInfo and CopySwapDevices, not needed anymore)
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 181e41511d5772962b8bc998a1940d2a9ba62d5e
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Mon Feb 23 16:14:51 2009 +1000
dix: fix up device enter/leave for XI_Enter/XI_Leave.
commit 0befeb36c175b14eac8d5416851f1556af90dd86
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Tue Feb 24 15:27:07 2009 +1000
dix: Add device info to DeviceChangedEvent, and fill in CCCE.
We need to fill the info here, as the device may change until we get a chance
to process it.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit b2ba77bac4fc3edab39372dfdc529e745ae74f77
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu Mar 5 14:23:47 2009 +1000
dix: add EventToXI2 and GetXI2Type.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit dfa2e8e966b699f9d292628119d5a9cbd2dbdf5a
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Mon Feb 23 15:12:32 2009 +1000
Xi: add XIQueryDevice request handling.
commit 560c58b53e4e60ebd26e0c66dd00399c438bd619
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri Feb 20 15:17:52 2009 +1000
Xi: name-space and fix XI2 requests
All XI2 requests have XI prefixes.
Requests affected:
ChangeDeviceCursor
QueryDevicePointer
WarpDevicePointer
SetClientPointer
GetClientPointer
XIChangeDeviceHierarchy.
commit 903449615b1a1188955c0287a552aec8ac5b3fbb
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri Feb 20 15:03:35 2009 +1000
Xi: add XIQueryVersion request handling.
commit 77d51b94bd264be5a8625a2bdd98f2bfb2aa33d3
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Sun Mar 8 11:47:26 2009 +1000
dix: FixUpEventForWindow needs to handle XI2 events.
commit 95ed2ab715fa881d36d508adf4ae5dadd92ae7b2
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu Mar 12 11:46:07 2009 +1000
Add XI2_EVENT check.
commit 92e0a324b5c738166ed4046cb00fe85ab8aea5a0
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu Mar 12 14:15:02 2009 +1000
require inputproto 1.9.99.7
commit 906fe9547957917ac463d646935473ceca10a72b
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri Mar 20 09:36:09 2009 +1000
Xi: don't allow OpenDevice on any MD.
This restores the original behaviour of XI 1. Any slave device may be opened,
but none of the MDs.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit c7eb27f3927ba9a36f9904938996f346cca33021
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Wed Mar 4 18:45:09 2009 +1000
Xi: always only list VCP/VCK and the SD's in XListInputDevices.
If a client wants other MDs, it should use XI2's XQueryDevice() instead.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 801f14d4b742e506201b619d472087a7e82bd018
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Tue Mar 3 17:04:08 2009 +1000
Xi: don't send attachment info down with ListInputDevices.
commit 66dd8879b3527f30309fb747cad4a161d0709d91
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri Feb 20 15:01:05 2009 +1000
Xi: purge ExtendedGrabDevice request handling.
commit 43e48900fccd245e98d6d697e4cdbb6fa866a0dd
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri Mar 6 22:27:54 2009 +1000
dix: Force deviced ids of 2 and higher for actual devices.
0 is now reserved for the "AllDevices" virtual device.
1 is now reserved for the "AllMasterDevices" virtual device.
This also means that wherever we passed in (mskidx = 0), we now need to pass
in the deviceid.
commit 70896f6127e2c12c13479a027fdd6e67853d1f8b
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri Feb 13 16:42:02 2009 +1000
dix: abstract event filters through GetEventFilters.
Don't let everyone acces the filters[] array directly. This is necessary once
we start dealing with GenericEvents, where the filters are a bit more
complicated.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 8a8763f1502c9ddd1961f96f2cc7c73fbc0b49b5
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu Feb 12 16:07:15 2009 +1000
dix: restructure DeliverEventsToWindow, a little bit anyway.
Desperate attempt of making the code easy to read and understand. A failed
desparate attempt, possibly.
commit 891cfc802028c3e008ee6c2d3e2438a31f57f39f
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu Feb 12 10:12:45 2009 +1000
dix: clean up DeliverDeviceEvents.
Move mask checking into external function and streamline the code.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 6b6b660c3633af75a94302725137549df0dbe446
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Tue Mar 10 10:15:45 2009 +1000
Xext: remove ev_fill from GEExtensions.
commit 445daa62e720fe58fa2d6c3cdc26663671b2bc48
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu Jan 15 17:16:22 2009 +1000
Xext: purge XGE event masks.
The masks were originally designed to generically handle event masks for
extensions. Since all that is in-server anyway, it's much better writing
custom event masks for those extensions that need it and not providing a
unified mechanism.
XI2 needs more than the current implementation, which is already too complex
for most other extensions. good riddance.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 6fe4c28bf4f3a9f7c341b9403213470e9ded5cb3
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Mon Feb 16 16:34:05 2009 +1000
Add agressive event type checking.
Best to FatalError if a wrong event comes in. At least that forces me to fix
it really quickly.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 836864b65794dc0954a01245e418e714cead8125
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri Mar 13 12:43:17 2009 +1000
xkb: don't overrun the map index when accessing symbols.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 497a12533905b98f388775b6ba49adf21017cc75
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri Mar 13 11:52:33 2009 +1000
dix: remove duplicate PickKeyboard() command.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 7d4df0ee4414779ad5e519e7bd297c5dfec409a3
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu Mar 19 20:24:06 2009 +1000
dix: fix device sync state when calling SyncBoth during AllowEvents.
This did access the wrong device's sync state, potentially freezing or not
thawing the actual device that was supposed to be thawed.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit f1c7b95d83948160a0d5796ef6c16fc0d1bf5c5d
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri Mar 20 13:55:00 2009 +1000
dix: do percentage check before device check in ProcBell
This is just for correctness. The server should return BadValue for anything
not in [-100, 100].
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit d60391d8ca9918d2089c23c0baef5c91177325f0
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri Mar 20 14:01:30 2009 +1000
dix: fix uncredible fail in PostSyntheticMotion.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 1a71862d333282e2d251ff0036866cec22bcce85
Author: Simon Thum <simon.thum@gmx.de>
Date: Sat Feb 28 22:17:47 2009 +0100
dix/xfree86: simplified velocity approximation algorithm
Replace multi-stage filtering with simple linear velocity,
tracked several instances backwards. A heuristic ensures
only approximately linear motion is considered, so velocity
remains valid in any case. Numerical stability is much
better, and nothing changes to people who didn't tune the
advanced features of the previous algorithm.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 5ae129baef85b47590c02e4cf61b23904d8f7aa9
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Tue Mar 17 15:47:57 2009 +1000
Xi: check for existence of the button class before accessing it
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit e8094d8f3f69f45850af031efd79a3928e584638
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu Mar 19 10:09:04 2009 +1000
dix: ProcSendEvent shouldn't use inputInfo.keyboard directly.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 12aeddf5ad41902a180f8108623f356642b3e911
Author: Maarten Maathuis <madman2003@gmail.com>
Date: Thu Mar 19 19:07:59 2009 +0100
exa: Accept scratch pixmaps with offscreen memory as such.
commit a635bb5357648779815ec6729d55f6b478493213
Author: Maarten Maathuis <madman2003@gmail.com>
Date: Tue Mar 17 19:34:45 2009 +0100
exa: round of fb_pitch to the next byte
commit ec328783593339e33772301a8c5fea35fd63c0a2
Author: Maarten Maathuis <madman2003@gmail.com>
Date: Tue Mar 17 10:45:21 2009 +0100
exa: check if the pixmap is pinned for unsupported AUX indices.
commit 3992dd38caf33b343affd8d732c94880d1099dcf
Author: Adam Jackson <ajax@redhat.com>
Date: Mon Mar 16 13:24:48 2009 -0400
selinux: Add support for avc_acquire_netlink_fd()
Requires libselinux 2.0.79 or newer. Without this, libselinux will
check for policy updates on the netlink socket on basically every policy
lookup. Statistically speaking, they never happen, and the check
translates to at least one more syscall on basically every operation.
Instead, take control of the fd from the library, and check it in
WakeupHandler if it polls readable.
commit be6dc9023b5fb3995a9ce56d607627e247918aef
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri Mar 13 16:29:36 2009 +1000
xfree86: remove a superfluous assignment.
If dev is NULL, we don't have a VCP and that means we have other issues
anyway.
commit bfab422dcdbb9c009b2a91fe0dba288fac9bc859
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri Mar 13 16:27:49 2009 +1000
xfixes: useless (void) typecast removal
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 4eeaee1e5a05ea973cbeb653abf99f2a352edc70
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri Mar 13 16:25:12 2009 +1000
xkb: xkbi has a pointer to the device - use this instead of inputInfo.pointer.
commit 3f801ba62ac493d4aeb664a5ae638e3fb0c9a262
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri Mar 13 16:23:50 2009 +1000
xkb: the VCP can post device events, don't stop xkb filtering on it.
commit 23686e5680d565c36e0b6320ce62c38c7830d06b
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri Mar 13 16:20:56 2009 +1000
xkb: Fix a mis-use of inputInfo.keyboard.
commit c97c6c3de337f247406eaffd5845a847630ee6c1
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri Mar 13 16:17:20 2009 +1000
xkb: fix a couple of device checks when looping through all devices.
Generally, we want to apply stuff to the device and to all attached slave
devices.
commit d21a546e9604ce2d3c914900f6e6ff2df9f5ca8b
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri Mar 13 16:02:22 2009 +1000
Xi: VCP and VCK may register for ext. events, so delete them if necessary.
commit 6ec49098f7ef259b43870139511006627b308bb6
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri Mar 13 15:57:27 2009 +1000
render: replace a wrong inputInfo.pointer with pDev
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 0b2b330f6fbf8633ae682a17fbd95f6b5db2c112
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri Mar 13 15:54:27 2009 +1000
mi: remove a bunch of useless inputInfo.pointer assignments.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 31301861c1dd87a2f55c5c4300ac7c8f54154bf8
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri Mar 13 15:49:22 2009 +1000
dix: remove wrong InputInfo.pointer usage - should be pDev instead.
commit 639658b2eab480a5bfb943dff51e4bdfc1e16e3b
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri Mar 13 15:34:29 2009 +1000
dix: use GetPairedDevice in ProcQueryPointer rather than inputInfo.keyboard.
commit f01ee198ff0cbd7ca418217a84248d1c6131a0c6
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri Mar 13 15:22:23 2009 +1000
dix: don't use inputInfo.keyboard to get the focus window in ActivateKbdGrab
I'm not sure if that's the right solution, but the other one is wronger.
commit de415743f4c1878df2de79f84f5fe087a88d5241
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri Mar 13 15:19:23 2009 +1000
dix: fix XACE checks in ProcWarpPointer
commit 18430616cfd5d0bc5a3efe61fcc2982b1726b0de
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri Mar 13 14:59:18 2009 +1000
dix: use PickPointer() and PickKeyboard instead of inputInfo.pointer/keyboard.
Affected calls:
ProcChangeKeyboardControl
ProcBell
ProcUngrabKey
ProcUngrabButton
commit e31727158cda7729283233cfdc9bc5bcb59a52c1
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri Mar 13 14:51:55 2009 +1000
dix: fix ProcChangePointerControl's wrong inputInfo.pointer usage.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit fc5e8dc4a24c2b5bed4e6b5d00670c4401ec92d9
Author: Adam Jackson <ajax@redhat.com>
Date: Fri Mar 13 14:00:37 2009 -0400
Unexport xf86SetPriority
commit 89d7b88f32f9227fa72a043675367b94c4c9283c
Author: Maarten Maathuis <madman2003@gmail.com>
Date: Fri Mar 13 00:40:43 2009 +0100
exa: allow exaModifyPixmapHeader to set sys_ptr for EXA_HANDLES_PIXMAPS
- exaModifyPixmapHeader would save sys_ptr if needed, but it would be NULL'ed afterwards.
- This is needed to support pixmaps that are not offscreen.
commit 544cd9e7b50cd9905afc52404de1a5a2bcff91b5
Author: Ander Conselvan de Oliveira <ander@mandriva.com.br>
Date: Thu Mar 5 12:57:28 2009 -0500
Honour Option "DPMS" "off" on xorg.conf
Signed-off-by: James Cloos <cloos@jhcloos.com>
commit 7abb72c5c711a26a27a82604bd2398bcb6df0a99
Author: Simon Thum <simon.thum@gmx.de>
Date: Wed Feb 25 10:55:36 2009 +0100
xfree86: remove obsolete code
remove a few lines which redo part of the pointer acceleration
init. Properties is the way to go for them.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 97cb3cc28e4a5694d17f156276efd84555a96d18
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu Mar 12 10:17:16 2009 +1000
dix: Merge DevicePresence notify events generation into a single function.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 7f1ba804a1c1aef725e20a04e5f6ef74478ecf44
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Tue Mar 10 11:55:04 2009 +1000
dix: s/numEvents/num_events/ in GetKeyboardValuatorEvents
GPE and GProxE use the same.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 067f26f7ba4c8cf37af7ddf0eb204b7e1d06096d
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri Mar 6 19:42:27 2009 +1000
Xi: set the modifier + group state during POE.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit da724e8f1d1867c36c9550a153c58829939800fc
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri Mar 6 15:50:05 2009 +1000
Xi: Set the button state on the event during POE.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit b368dd1720c708aaec492b4a67fb7e4f87569c11
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu Mar 5 15:22:41 2009 +1000
dix: remove a few pointless (void) casts of return values.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit cadf65a6e190a8952ad3cc216dc9ea55241de91a
Author: Matthias Hopf <mhopf@suse.de>
Date: Tue Mar 10 15:49:49 2009 +0100
randr: Nuke broken set_origin shortcut
Shortcut is impossible to implement this way, because we don't know for sure
whether the crtc of an output has changed or not.
commit 6544490700051b3b5e88ac1890d71b35634c9100
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Mon Mar 9 17:28:40 2009 -0400
Correct access mode in call to dixLookupWindow() within RRSelectInput.
Reported by Alan Coopersmith.
commit f8dd80d13bb5313a11b38b280f8ad3e22f0a6300
Author: Keith Packard <keithp@keithp.com>
Date: Wed Aug 6 15:26:24 2008 -0700
Replace dixLookupResource by dixLookupResourceBy{Type,Class}
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.
commit 0d9a42dc0380d1583889b6b6521bd5a2451735d4
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Mon Mar 9 08:59:01 2009 +1000
Xi: don't crash on a NULL property name, just return None.
strcmp doesn't like NULL-pointers.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 432a95032eb10f82fb59caa29e52d3f56dfb363c
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Sun Mar 8 21:34:02 2009 +1000
Remove useless (void) typecasts.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit f508446a2bcd887df9cf5db786b15fc3cbc435a0
Author: Peter Åstrand <astrand@cendio.se>
Date: Fri Mar 6 19:41:35 2009 -0800
Composite: Uninitialized borderClipX/borderClipY
Valgrind warned me about two other uninitialized variables, which are not
padding. Valgrind output at the end. I'm a bit unsure of what these should
be initialized to, is zero fine?
commit d1338a94805cc774fe0a5d00c2225a3ee9673a9f
Author: Winfried Grünewald <winfried.gruenewald.ext@eizo-dt.de>
Date: Fri Mar 6 12:59:35 2009 -0500
[hw/xfree86] Fix StaticGray cmap.
Fix this bug report:
,----< from http://bugzilla.freedesktop.org/show_bug.cgi?id=20504 >
| Using the Visual StaticGray (8 bit depth) is missing one gray level.
| The gray level of index zero and index one are the same and all
| other levels are shifted by one. The max level (255) cannot be used.
`----
Signed-off-by: James Cloos <cloos@jhcloos.com>
commit eba3bab71ff26d58bb0e49e4a9726fc21ff07258
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Thu Mar 5 15:09:28 2009 -0800
Remove #ifdef macII code left over from ancient A/UX 3.0 support
Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
commit daa9727a02701cfac7b92f3e61d752be6fcc005e
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Wed Mar 4 11:33:00 2009 -0800
XQuartz: Implement SendPSN for AppleWM
(cherry picked from commit 779e9fdc2de9bfebc5f0a4c9d5f42e389fdd8593)
commit ce6e1771be5f2c21af6f72a9705795df26210413
Author: Maarten Maathuis <madman2003@gmail.com>
Date: Mon Mar 2 17:05:28 2009 +0100
exa: fix a serious issue in exaChangeWindowAttributes (and some more related things)
- fbChangeWindowAttributes can create pixmaps (and access them) without use preparing access.
- Also handle the destroyed pixmaps by finishing them first.
- Switch to DEST indices again in exaCreatePixmapWithPrepare, because they are obviously being rendered to.
- Also avoid calling FinishAccess on pixmaps that are destroyed (and their memory potentially invalid).
commit 7fb68e8b31d259325ce311ad67befc43a933f009
Author: Maarten Maathuis <madman2003@gmail.com>
Date: Sat Feb 28 22:29:42 2009 +0100
exa: remove a few pExaPixmap checks.
- And make some fatal for a debug build.
commit bd2f35ef0d4b8c56eb205b8694b4fe5d2fa2c049
Author: Maarten Maathuis <madman2003@gmail.com>
Date: Sat Feb 28 22:15:04 2009 +0100
exa: fix unwrapping of ModifyPixmapHeader upon CloseScreen.
- Cleanup wrapping too.
commit da8ea41a542787691ea1120e5c8c7dc3182cbea5
Author: Maarten Maathuis <madman2003@gmail.com>
Date: Sat Feb 28 21:59:09 2009 +0100
exa: increase/rework safety checks in Prepare/FinishAccess.
commit 3ea3d505e8128ab3e878edcef697fd5656b0c917
Author: Maarten Maathuis <madman2003@gmail.com>
Date: Sun Mar 1 01:15:28 2009 +0100
exa: avoid a potential Prepare/FinishAccess inbalance.
commit 10334cf7e64e2e633cd507f2aa216027e840c8e5
Author: Maarten Maathuis <madman2003@gmail.com>
Date: Sat Feb 28 21:46:00 2009 +0100
exa: simplify exaPixmapIsOffscreen
- This includes properly handling the framebuffer.
commit 57bed76e218471b60d340b18c346d492f37798c2
Author: Tomas Carnecky <tom@dbservice.com>
Date: Wed Mar 4 10:29:34 2009 -0500
Remove dead EXTENSION_PROC_ARGS define
Signed-off-by: Tomas Carnecky <tom@dbservice.com>
commit a6fb9f4ccfc69dc090b152e29142e3159f812166
Author: Tomas Carnecky <tom@dbservice.com>
Date: Wed Mar 4 10:27:30 2009 -0500
Remove dead XTest code from extmod
Signed-off-by: Tomas Carnecky <tom@dbservice.com>
commit c4081fee0995dae691665a00ea9bfdb8b8043b8c
Author: Topi Kanerva <topi.kanerva@nokia.com>
Date: Wed Mar 4 10:23:10 2009 -0500
Make DGA optional.
commit c7ebb4bef152b47880abb6ea4819416e89e6522c
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Tue Mar 3 14:02:36 2009 -0500
Fix 2 const warnings.
commit c7cf926d25523d5d0d8e5c83671c901660070d71
Author: Eric Paris <eparis@redhat.com>
Date: Tue Mar 3 13:15:39 2009 -0500
This patch changes all places in the X code to use _raw functions. The
X server should never see, translate, or deal with a munged context.
Display managers which show contexts to the user should take care of
translating these to human readable form.
commit d84a2f855da9fd293e984084168c1e27f5a5115c
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Sun Mar 1 16:59:14 2009 +1000
xfree86: Add linebreak to two debug statements.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit e0ed9f16d0ab871f3209837f54055446503c4108
Author: Jason Vas Dias <jason.vas.dias@gmail.com>
Date: Tue Mar 3 13:24:54 2009 +1000
Fix build with --enable-debug.
[amended by Peter Hutterer]
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 6093d3eb1d7d1e9cbacc2c2f4d376352f787dd53
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu Feb 26 15:38:45 2009 +1000
dix: fix two compiler warnings (old-style function definition).
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit b874a5c0aafc766891c9e567af48b891ea14be4f
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu Feb 26 14:40:22 2009 +1000
mi: only print the "EQ overflowing" error once.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit a706dd8771f87cf0a73578755552124d162baa5d
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu Feb 26 10:04:14 2009 +1000
include: add a range of button labels.
Mostly the same buttons as defined by linux/input.h, with five exceptions:
"Button Unknown" for a button that cannot be labelled.
"Button Wheel Up", "Button Wheel Down" for buttons 4/5, traditionally the
wheel buttons.
"Button Horiz Wheel Up", "Button Horiz Wheel Down" for buttons 6/7,
traditionally the horiz. wheel buttons.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Acked-by: Daniel Stone <daniel@fooishbar.org>
commit 8a6ed44a8b2fc5f14729dc54fec17607ced03859
Author: Adam Jackson <ajax@redhat.com>
Date: Mon Mar 2 14:26:23 2009 -0500
randr: Fix thinko in xf86TargetPreferred
The only-one-output case would only work right if that also happened to
be the zeroth output. Oops.
commit 7bfad37f7706da5a76174c0da78dce4d6c6a585b
Author: Maarten Maathuis <madman2003@gmail.com>
Date: Fri Feb 27 22:26:52 2009 +0100
exa: fixup aux indices and ensure that the indices are used as they should be.
- In a previous patch i forgot to add a FALSE somewhere it seems.
- Rename AUX indices so the driver (think of driver managed pixmaps) can do optimisations based upon them.
- Fix one abuse of DEST index now that we have the AUX indices (same reason as above).
commit 8c6b4a827624aa70aea94b449fee6d5df8504105
Author: Adam Jackson <ajax@redhat.com>
Date: Fri Feb 27 12:42:43 2009 -0500
DDC: Redo extended device probe slightly.
We'll now only mention the E-EDID segment register if the device is
actually E-EDID-capable. While we're here, check for DDC/CI and
standard EEPROM support too.
commit b030f858f2f1ce1fd27a73ebf7f9ec5db541a668
Author: Adam Jackson <ajax@redhat.com>
Date: Sat Feb 21 19:56:20 2009 -0500
selinux: Don't bother relabeling resources that are being destroyed
Makes window destroy about 40x faster in Xvfb.
commit f028b14876dc536b575d4b6e1df7f37ee525acec
Author: Maarten Maathuis <madman2003@gmail.com>
Date: Fri Feb 27 13:06:28 2009 +0100
exa: whitespace
commit ed00515ec54b294f304b8ae2857e3073f97860d2
Author: Maarten Maathuis <madman2003@gmail.com>
Date: Thu Feb 26 22:18:03 2009 +0100
exa: fixup exaAssertNotDirty.
- Do the right thing based on prepare access.
commit 2e88b6004f09dbcb888abf05d4d5554231b2bd1a
Author: Maarten Maathuis <madman2003@gmail.com>
Date: Thu Feb 26 21:14:23 2009 +0100
exa: minor glyphs cleanup.
- This should fix subtle coordinate bugs and make the code a bit cleaner to read.
commit 265d20068af5434489752b6dba0bf0065b3cc3ec
Author: Michel Dänzer <daenzer@vmware.com>
Date: Fri Feb 27 16:41:39 2009 +0100
EXA: Fix check for whether the glyph we're evicting from the cache is in use.
Since commit f07f18231a921d3ae9dd9b75881c9e58e9e2e235 ('EXA: Allow using
exaCompositeRects also when we can't use a mask in exaGlyphs.') we were
checking the wrong set of coordinates in the buffer where glyphs to be rendered
are accumulated when no mask is used in exaGlyphs.
This fixes occasional glyph corruption which can be corrected with redraws, in
particular with Qt4.
Thanks to Maarten Maathuis for asking the right question: 'where do we protect
against evicting glyphs that are still needed?'
Signed-off-by: Michel Dänzer <daenzer@vmware.com>
commit 9d5141f7bcfed36417873b47f850332506af83ac
Author: Michel Dänzer <daenzer@vmware.com>
Date: Fri Feb 27 16:37:28 2009 +0100
EXA: No longer use the driver UploadToScratch hook.
See http://bugs.freedesktop.org/show_bug.cgi?id=20213 .
Signed-off-by: Michel Dänzer <daenzer@vmware.com>
commit 4cfb36f6ad2df01215028fec48d99239a0e4496b
Author: Michel Dänzer <daenzer@vmware.com>
Date: Fri Feb 27 16:37:28 2009 +0100
EXA: Handle separate alpha maps properly in Composite fallback, take two.
Preserve the EXA ABI by introducing a new driver flag EXA_SUPPORTS_PREPARE_AUX.
If the driver doesn't set this flag, we have to assume any Prepare/FinishAccess
driver hooks can't handle the EXA_PREPARE_AUX* indices, so we move out such
pixmaps at PrepareAccess time.
Fixes https://bugs.freedesktop.org/show_bug.cgi?id=18710 .
Signed-off-by: Michel Dänzer <daenzer@vmware.com>
commit 4bf707f01822abe99286909fd561da7e7a4211d6
Author: Michel Dänzer <daenzer@vmware.com>
Date: Fri Feb 27 16:37:27 2009 +0100
Revert "Fix up Xephyr build for recent EXA changes."
This reverts commit 4e8d98b61e1f763c187e7994c683b543cca1a33c.
commit de022f8e634baf5a7acd186934b370647df58355
Author: Michel Dänzer <daenzer@vmware.com>
Date: Fri Feb 27 16:37:27 2009 +0100
Revert "EXA: Handle separate alpha maps properly in Composite fallback."
This reverts commit 170cf1270dff38d3cce7f5ba5b940d1c0d70eff5.
Conflicts:
exa/exa_render.c
commit d0dd649035fc3698c5b436f9d9d248116aa106a3
Author: Jon TURNEY <jon.turney@dronecode.org.uk>
Date: Thu Feb 12 16:03:16 2009 +0000
Remove references to rgb.txt from files section of Xserver and Xorg man pages
The references to this file in the server code were removed in commit dda10c9066a660b647384179f82e1da8e063264f
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
commit b0ad9e1ced9619f37acf77764c395c57b86cf463
Author: Jon TURNEY <jon.turney@dronecode.org.uk>
Date: Thu Feb 12 16:02:17 2009 +0000
Remove long-gone '-co' option from Xserver man page
The '-co' option was removed in commit dda10c9066a660b647384179f82e1da8e063264f
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
commit 7907b37d96dc81f333351a6fedd6a9f4e31ae66a
Author: Jeremy Huddleston <jeremy@yuffie.local>
Date: Thu Feb 26 21:22:48 2009 -0800
XQuartz: Don't erase the mode_switch+keysym if it's the same as shift+keysym
(cherry picked from commit 3e2427e6e9675dd655c8ad328b82e12191b064f2)
commit f07f18231a921d3ae9dd9b75881c9e58e9e2e235
Author: Michel Dänzer <daenzer@vmware.com>
Date: Thu Feb 26 10:35:44 2009 +0100
EXA: Allow using exaCompositeRects also when we can't use a mask in exaGlyphs.
This should give the full benefits of the glyph cache even when we can't use a
mask.
This also means we no longer need to scan the glyphs to see if they overlap,
we can just use a mask or not as the client asks.
Signed-off-by: Michel Dänzer <daenzer@vmware.com>
commit b26c136ee9bf7015c583136af53d0c9e9da67ace
Author: Michel Dänzer <daenzer@vmware.com>
Date: Thu Feb 26 10:35:44 2009 +0100
EXA: Stop tracking damage for pixmaps subject to ModifyPixmapHeader.
Signed-off-by: Michel Dänzer <daenzer@vmware.com>
commit 812e8d681a49b33d8748983843799ef692b8b148
Author: Keith Packard <keithp@keithp.com>
Date: Wed Feb 25 11:08:01 2009 -0800
Oops. 62fc98c had crtc offsets applied backwards (fix from server-1.6-branch)
Crtc offsets are in screen space, not crtc space, and hence should be
applied relative to the screen->crtc transform, not the crtc->transform.
This fix was found in the 'cherry pick' of 62fc98c on server-1.6-branch,
clearly some new definition of 'cherry pick' that I am unaware of.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit c090f5514d28e1602a6ebbe7c909e98a0e3374d7
Author: Keith Packard <keithp@keithp.com>
Date: Wed Feb 25 10:14:36 2009 -0800
Pre-clip panning coordinates to keep crtc within panning region
There is a separate panning region check, but that doesn't work under
transformation, so just pre-clip the mouse coordinates when computing the
panning offsets. This leaves the case where panning constants are changing
unresolved.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 77c7a64e8885696665556c9fbcb3cffb552e367a
Author: Keith Packard <keithp@keithp.com>
Date: Wed Feb 25 10:12:23 2009 -0800
RandR rotations and reflections offset by one pixel
The matrix computation for rotation and reflection resulted in dropping a
row or column of pixels as the offsets used in the matrix computations used
width and height rather than width-1 and height-1.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 4e8d98b61e1f763c187e7994c683b543cca1a33c
Author: Michel Dänzer <daenzer@vmware.com>
Date: Wed Feb 25 10:26:04 2009 +0100
Fix up Xephyr build for recent EXA changes.
Signed-off-by: Michel Dänzer <daenzer@vmware.com>
commit d6976e1436c035b8e4a6d1e10971b083b1b4184b
Author: Jeremy Huddleston <jeremy@yuffie.local>
Date: Tue Feb 24 23:12:57 2009 -0800
XQuartz: Re-enable support for capslock
(cherry picked from commit 4901b8147e593d26d7a31a9b73a201254b948916)
commit 4b63f88b0ad5f6614fee5b7af4f97ce4581ab935
Author: Jeremy Huddleston <jeremy@yuffie.local>
Date: Tue Feb 24 18:54:16 2009 -0800
XQuartz: Comment out the background pointer interaction that seems to be causing CPU spinning on some configurations
(cherry picked from commit 1d479fa4f3bca9cbd81808a6c87582422fd2a257)
commit 5672e2d66444be74125c71b81373b82f8e1b7dd2
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri Feb 20 14:55:51 2009 +1000
Xi: remove AllExtensionVersions.
Keeping an AllExtensionVersions array to save all versions of
all extension is rather pointless if only one extension uses it.
Rename to XIVersion, reduce to a single struct.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 59bc615ed2e60c595887dcc11fe04935b49bcaff
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Tue Feb 24 15:26:20 2009 +1000
dix: set the valuator mode in set_valuators
We only have per-device mode for now anyway.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit cffa3c499a0495e132557bd6b08a8c0b858cdf3b
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Tue Feb 24 15:25:49 2009 +1000
dix: remove unused variable 'tmp'
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 8d6dd83a38020080808705a156d32ec2a135633c
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri Feb 20 13:13:58 2009 +1000
include: fix indentation for lastSlave/master.
Yeah!
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit b3412adca8b2ba3fff348bceb4f01b9e968c0afc
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Sun Feb 22 20:53:46 2009 +1000
Xi: don't need to set the XKB settings for new core devices.
This is done by the XKB code these days anyway, so we might as well ignore it
and keep using the stanard stuff.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit a180c2367974abe2ccdc88bb5c6f138c7df4d2e9
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Mon Feb 23 16:38:41 2009 +1000
dix: remove ConvertBackToXI.
This was a temporary solution for the internal-events rework and is not needed
anymore.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 26cf709e712573548990d165e71137f28271a8bb
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Mon Feb 23 22:39:08 2009 +1000
Doxygenify events.h and eventconvert.c
Should have done that before pushing, but oh well.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 170cf1270dff38d3cce7f5ba5b940d1c0d70eff5
Author: Michel Dänzer <daenzer@vmware.com>
Date: Tue Feb 24 09:22:09 2009 +0100
EXA: Handle separate alpha maps properly in Composite fallback.
Fixes https://bugs.freedesktop.org/show_bug.cgi?id=18710 .
As this can't work without new EXA_PREPARE_AUX* indices, this requires a major
version bump, so we can also drop the UploadToScratch driver hook and
ExaOffscreenSwap*(). So this also fixes
http://bugs.freedesktop.org/show_bug.cgi?id=20213 .
Moreover, introduce EXA_DRIVER_KNOWN_MAJOR to break compilation of drivers
which may not be able to handle EXA_PREPARE_AUX*, giving instructions how to
make them build again in the #error message.
Signed-off-by: Michel Dänzer <daenzer@vmware.com>
commit d3b355875ac46104a174966e1974e6af99e40fd6
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Tue Feb 24 11:14:14 2009 +1000
dix: fix wrong condition for setting valuators on the event.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit ef320bdd5ec3419abba77041d3a4d96a3ff87563
Author: Michel Dänzer <daenzer@vmware.com>
Date: Mon Feb 23 16:49:51 2009 +0100
DRI1: Make DRICreateDrawable return TRUE for pixmaps.
GLX_EXT_texture_from_pixmap was broken since commit
a26c77ff432d2e85a2665fc36fca25143460c476 ('glx: fix retval checks when failures
occur for drawable creation.')
Signed-off-by: Michel Dänzer <daenzer@vmware.com>
commit 1df6716281579e2937743d840ab1079343c503ac
Author: Adam Tkac <vonsch@gmail.com>
Date: Mon Feb 23 09:28:26 2009 +1000
xfree86: don't try to UnInit virtual devices in DIDR. (#20087)
DeleteInputDeviceRequest function doesn't handle "virtual" devices well.
TightVNC libvnc.so module to X (which makes bare Xorg VNC capable) uses such
kind of devices.
Bare Xvnc (it is something like Xvfb) simply uses AddInputDevice &
RegisterDevice functions. Xvnc uses DeleteInputDeviceRequest from Xi/stubs.c
so everything works fine (now I see that DeleteInputDeviceRequest in
Xi/stubs.c should call RemoveDevice function, shouldn't it? :) )
Situation is quite different when you use libvnc.so module. It uses same
schema as Xvnc, so it simply calls AddInputDevice & RegisterDevice. Thus
device is created correctly. When server is terminated it calls
DeleteInputDeviceRequest (now from hw/xfree86/common/xf86Xinput.c) for each
device. Here is the difference - Xvnc calls DeleteInputDeviceRequest from
Xi/stubs.c as I wrote above. Thus Xorg gets sigsegv because "VNC" devices
don't have real input driver.
X.Org Bug 20087 <http://bugs.freedesktop.org/show_bug.cgi?id=20087>
[This isn't really a fix (libVNC should behave correctly) but not crashing the
server sounds like an improvement.]
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit a50c40be1f28467bcef7dc71fab54ebdddacffdf
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Sat Feb 21 08:09:40 2009 +1000
dix: don't apply button mappings to SDs, or the device's MD. (#20122)
Only ever change the button map on the device we actually care about, not the
attached SDs, not the current MD of the device.
X.Org Bug 20122 <http://bugs.freedesktop.org/show_bug.cgi?id=20122>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Acked-by: Daniel Stone <daniel@fooishbar.org>
commit 36583a49965c0bb40a84284939b1539b3cb9fc9c
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Tue Feb 10 12:45:49 2009 +1000
mi: split EQ popping and event processing into two functions.
mieqProcessInputEvents() - pop an event off the EQ and pass it to
mieqProcessDeviceEvent() - process the event according to the MD/SD hierarchy.
This way, we can use mieqPDE() from Xtest, xkb, and others to post an event.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 47f136ed6fd80310f715a2555501d1b271dd084c
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri Feb 6 12:08:43 2009 +1000
mi: change custom handlers to internal events
This should re-enable DGA, but XQuartz needs to be changed to internal events
too now.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit bdc262701a37a0c12ead810d63fa99a26cbb82ec
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Mon Feb 2 22:39:37 2009 +1000
dix: remove un-used getValuatorEvents and countValuatorEvents from getevents.c
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 763848d3ab84b4e33a0254120c44b5a1877c819d
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Mon Feb 2 17:20:17 2009 +1000
Input: change processing API to InternalEvents.
Don't pass xEvent* and count through to processing, pass a single
InternalEvent.
Custom handlers are disabled for the time being. And for extra fun,
XKB's pointer motion emulation is disabled. But stick an error in there so
that we get reminded should we forget about it.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 0b4066c116e07918a13dc6b4159df7ac9eb92b4b
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Mon Feb 2 17:18:16 2009 +1000
xkb: _XkbFilterRedirectKey needs to pass InternalEvents down.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 085d50360863ccc8280cd3eccea2bcb4f3dd9a14
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Mon Feb 2 16:56:52 2009 +1000
dix: Fix PostSyntheticMotion to use a DeviceEvent for posting.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 155986a93dc78d6aa060ca3038d5fafa3d8753c2
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Mon Feb 2 16:06:15 2009 +1000
dix: CheckPassiveGrabsOnWindow moved to internal events.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 1c38abd4b136301008ba77d4e68aea34508f4c22
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Mon Feb 2 14:54:34 2009 +1000
dix: switch DeliverGrabbedEvent to internal events.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit fb858774b80eb75c2f8e81fe893bbbdd37065fbd
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Mon Feb 2 14:44:13 2009 +1000
dix: switch DeliverDeviceEvents to internal events.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 3aa9404fcd161e94a80b057a77ef47afe428a56d
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Mon Feb 2 14:00:41 2009 +1000
dix: switch DeliverFocusedEvent to internal events.
And because of xfree() macro hilarity, rename "pointer" to "ptr". Oh, how we
laughed.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 8c873e7f514844d1056f2b20e653f1dd75f4c327
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Sun Feb 1 20:41:16 2009 +1000
dix: Switch DeliverGrabbedEvents to use internal events.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit a3718536989fa7d3358e0b2d859c25fde0a2d93e
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Sun Feb 1 20:18:33 2009 +1000
dix: Deliver{Grabbed|Focused|Device}Events API changed to InternalEvents.
With the API change, we can now purge the XI conversion from POE.
Note: this commit breaks DGA even more.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 8f94ec6f788565474931cc7d5e3d4672f0f31670
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Sun Feb 1 09:58:15 2009 +1000
dix: convert passive grabs to use internal events.
deviceGrab.sync.event is now an internal event, and CheckDeviceGrabs and
friends is changed over.
Note that this currently breaks some frozen grabs. See towards the end of
ComputeFreezes().
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit daa3245c479b19d445a070b5b76ee005915b5335
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Sat Jan 31 08:46:43 2009 +1000
dix: fix EnqueueEvent to work with internal events.
Note that we're only partially switched to internal events. The event in the
devices' event queue (dev->deviceGrab.sync.event) is still an XI event. The
events in syncEvents are InternalEvents only now.
This also implies fixing CheckVirtualMotion to work with internal events.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 75595ba4aa9c3823ffe3b3388ce088929824816f
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri Jan 30 15:14:46 2009 +1000
Xi: make ProcessOtherEvents more InternalEvent aware.
Get rid of the deviceValuator processing and a few other things, but still
drop back into XI before checking device grabs or doing anything else.
NoticeEventTime now needs to take InternalEvents, and while we're at it,
change NoticeTime from a macro to a function.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 3a02e538dbdb3cd482e01baeaf2aba2ddb7731df
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri Jan 30 14:59:22 2009 +1000
dix: update CheckMotion to deal with DeviceEvents.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 8829d966a6bacb05d322b60531c59366b58f4514
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri Jan 30 13:33:55 2009 +1000
Xi: support InternalEvents in UpdateDeviceState, parts of POE and EnqueueEvent
Note that this breaks DGA. Life is tough.
EnqueueEvent is a somewhat half-baked solution, we immediately drop back into
XI and store them. But it should in theory work.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Don't let the dcce be random data.
commit 007e93c869325cafcc29d975b356dbb8e7cd2ac1
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri Jan 30 14:35:22 2009 +1000
xkb: Switch the xkb event processing path over to InternalEvents.
Before dropping down into the DIX, convert back into XI events. This is a
temporary solution only, until the DIX is capable of handling InternalEvents
anyway.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 64ea6078105f73d1b727619fc123920bc7e4a06c
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Mon Feb 2 14:15:52 2009 +1000
dix: change eventconvert to always return an array of xEvents
Just alloc the memory on demand rather than doing things with EventListPtrs
etc.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 4026c63e4eb16481bafc1a41ad67cd2556728d40
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri Jan 30 14:34:02 2009 +1000
mi: switch the EQ to contain InternalEvents only.
This gets rid of the nevents parameter, InternalEvents are always a single
item per event. Also remove the special DeviceValuator handling in both
enqueueing and dequeueing.
Custom callback handlers are now broken until fixed.
For bisectability, we copy the InternalEvent back into the XI required during
POE and friends. Consider this a temporary solution.
Note: Because of misc linker bonghits, Xvfb won't link in this revision.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 5a827593f9517fd5593751dd8bd90c611de06c5d
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu Jan 29 15:26:57 2009 +1000
dix: switch event generation to InternalEvents.
GPE, GKVE, GProxE generate InternalEvents now.
DeviceClassesChangedEvents generates an InternalEvent now, but incomplete! We
need to tack on the information about the new SD in the ClassesChanged events.
Note: To make the progress bisectable, we drop back into XI events at the end of the
Get*Events functions. So the rest of the server still uses XI events.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 00b03683d0e5cda40fa23b9fe6a83d7227f86f5d
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri Jan 30 14:31:08 2009 +1000
dix: Add temporary conversion function ConvertBackToXI.
Until the InternalEvents are used throughout the server, we can use this one
to drop us back into XI la-la land where every event is the wire format.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 269d4d9f2e86fde8c6a28ef0293fb0e44b577886
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Sun Feb 1 09:57:27 2009 +1000
dix: add GetCoreType and GetXIType.
Convert from an InternalEvent type to the matching core/XI type. Currently
only for a few events, those we actually need in the server.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 656491921e17b2371057041f4551ad6165067551
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Wed Jan 28 15:27:38 2009 +1000
dix: add InternalEvent -> core/xi event conversion routines.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit e7867d12541ef9683d5d7fc766e918c13a742981
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri Jan 23 15:37:23 2009 +1100
include: add XInternalEvent.
This is the event we want to feed into the EQ and process on the way through.
Only applies for input events for now.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 10dcf3ed9c543a6811340567e586ec0e476fcf61
Author: Jon TURNEY <jon.turney@dronecode.org.uk>
Date: Fri Feb 20 15:22:35 2009 +0000
Cygwin/X: Fix keyboard layout mapping for Latin American keyboards
Fix keyboard layout mapping table entry for Windows keyboard layout 0x80a
(Latin American), layout should (now) be 'latam', not 'la' which is Laos
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
commit 9531b96470a2fd812eb3fa0d1e10419331842496
Author: Jeremy Huddleston <jeremy@yuffie.local>
Date: Sun Feb 22 00:41:52 2009 -0800
XQuartz: DefineInitialRootWindow is gone
commit c7c50157b5137a147e69abb70b43a28fac4a9ffa
Author: Jeremy Huddleston <jeremy@yuffie.local>
Date: Sun Feb 22 00:29:48 2009 -0800
XQuartz: quartzKeyboard compile fixes for recent XKB Changes
Seems we're less divorced from XKB than we'd like for now... hopefully not having any rules installed will still let us override things the way we want to...
commit 61abf3189f3f97ec5228d45c035dbfd0c249f844
Author: George Staplin <gstaplin@apple.com>
Date: Sat Feb 21 22:33:10 2009 -0700
XQuartz: GL: Change from xalloc to xcalloc to potentially avoid
uninitialized data in the __GLXAquaContext.
(cherry picked from commit d3120241f9f48d21f9a6ecfb848434a4a0270855)
commit 5587f9b771f5b5427a81d4d657f403667d20f310
Author: George Staplin <gstaplin@apple.com>
Date: Sat Feb 21 22:22:52 2009 -0700
XQuartz: GL: Fix a bug with an uninitialized GLX data structure.
This was causing a crash randomly, due to random memory contents.
Use xcalloc to prevent this in the future, due to future changes or mistakes.
Set the drawableType to include GLX_PIXMAP_BIT and GLX_PBUFFER_BIT.
The new libGL supports these.
Set the max Pbuffer width/height, based on the results of a test program.
We may someday want to revisit this depending on what users need, so that
we create a CGLContextObj, make it current, and call glGetIntegerv to
gather the information at runtime.
(cherry picked from commit c7e338330943e0d03a99328c740540d03f018d20)
commit ab61033700b5383a7a15370dd054eaa80e72e811
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Thu Feb 19 13:57:28 2009 -0800
Add Extensions section to xorg.conf man page
Extensions section was added in X11R6.8.0 and documented in the release notes:
http://www.x.org/archive/X11R6.8.0/doc/RELNOTES2.html#3
but never made it into the man page.
Also fix a bonus typo.
Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
commit 372977354c3a09ca77ca13ba0aec00a61046f60d
Author: George Staplin <gstaplin@apple.com>
Date: Wed Feb 18 21:43:19 2009 -0700
XQuartz: Fix the new ProcAppleDRIDestroyPixmap code REQUEST_SIZE_MATCH.
It had a copy and paste mistake that I didn't notice. :/
It was using the CreatePixmapReq.
Also add a missing B16 to the end of the length for the DestroyPixmapReq struct.
Now the AppleDRIDestroyPixmap request seem to work.
(cherry picked from commit 295fe25bd8fa2d141291a9d9b6ef7b75fcccb4dd)
commit 225853d51d1fb610261ab0c295b1b5a96ce177d5
Author: Dan Nicholson <dbn.lists@gmail.com>
Date: Thu Feb 19 06:45:05 2009 -0800
xkb: Use cached XKB keymap when rules haven't changed
Rather than compiling a new keymap every time InitKeyboardDeviceStruct
is called, cache the previous keymap and reuse it if the rules have not
changed.
Signed-off-by: Dan Nicholson <dbn.lists@gmail.com>
Acked-by: Daniel Stone <daniel@fooishbar.org>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 64e595d12e05c4df56b0230cc57924b9beb274d3
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu Feb 19 09:18:53 2009 +1000
dix: check if keybd->key is valid before getting the keyboard state.
For floating SDs, GetPairedDevice() returns the SD itself, hence keybd->key
may be NULL.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit e0a451eb7cc812f11db3614b730ba0f07d6ae18c
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Tue Feb 17 19:37:22 2009 -0800
Obsolete InputDevices keyword in xorg.conf Files section
Was only used to provide a list of input devices that XF86-Misc could use,
now that XF86-Misc is gone, was parsed and logged, then completely ignored.
(Depends on previous patch that introduces OBSOLETE_TOKEN in parser to
make obsolete keywords like InputDevices & RgbPath be non-fatal errors.)
Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
Acked-by: Adam Jackson <ajax@redhat.com>
commit d2cf562bbad553d7f09b70202134f5b6ada0114e
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Tue Feb 17 18:48:52 2009 -0800
Make RgbPath keyword in xorg.conf a non-fatal error
Xorg shouldn't refuse to run just because the user has an xorg.conf that
had the previously-used RgbPath keyword in it.
Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
Acked-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 344b1f2b25d627bdf7d802c5831b6a72d22ffe34
Author: Jeremy Huddleston <jeremy@yuffie.local>
Date: Tue Feb 17 23:25:14 2009 -0800
configure.ac: Support version strings like W.X.Y.Z-XXXXXX
(cherry picked from commit 43967514cd57ad836d7fb85c8c9e58ada07e0232)
commit 67faf41b3f3e0cd66e35e3c176a9adb37ff1a759
Author: Jeremy Huddleston <jeremy@yuffie.local>
Date: Tue Feb 17 23:24:25 2009 -0800
XQuartz: Don't need GlxSetVisualConfig any more
Fixes build failure resulting from 516f8e2cad1311a09764e2633644188d1e3c31bb
(cherry picked from commit 066b17028a35956a089815716e38571f305469c5)
commit b349a764e98f0d8f221190157ffa0904b91beca5
Author: Eric Anholt <eric@anholt.net>
Date: Tue Feb 17 09:59:17 2009 -0800
xinerama: Put the proto version in the code instead using proto headers.
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.
commit 5394b7e66224d20888dd4020f5cb8ca930720fb4
Author: Keith Packard <keithp@keithp.com>
Date: Fri Feb 6 06:34:35 2009 +0100
Eliminate the shadow clear on transform change
When the crtc transformation changes, the entire crtc must be repainted.
This was being done by clearing the shadow and then painting the rectangle
containing the screen image; the clear being required as the screen image
may not fill the crtc. When changing the transform rapidly, this leads to
flashing. Eliminate the clear by painting the entire crtc instead of just
the screen rectangle.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 76f18b94bd2719a8199334742d021c4d0806187d
Author: Keith Packard <keithp@keithp.com>
Date: Mon Feb 9 13:09:11 2009 +0100
Add XkbDir to Files config file section
The XKB base directory was not configuable through the config file.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 123093996507c4d3b6dc457240ce00f8ac42f410
Author: Adam Jackson <ajax@redhat.com>
Date: Tue Feb 17 12:59:16 2009 -0500
RANDR: Fail softly on GetPanning if the screen can't do it.
Just return a zeroed-out reply in that case. This is unambiguous, and
distinguishes "you didn't name a CRTC" from "you named a CRTC that can't
do panning".
commit b2ceea3635ec05dca9d4aa2f823b96ae9fce7fe8
Author: Maarten Maathuis <madman2003@gmail.com>
Date: Tue Feb 17 19:40:59 2009 +0100
Revert "exa: the extent of the valid region is probably much larger than that of the pending damage."
This reverts commit 97c1cbc70216366e92b9371de608ce94e60aa874.
- Sorry for the thinko, pending damage is often not fragmentated.
- Should the dst region become fragmentated, you actually want to copy more to unfragmentate it.
commit 3175646b10c602d17d5dd37bdace7c1c7ee92b3d
Author: Maarten Maathuis <madman2003@gmail.com>
Date: Tue Feb 17 19:06:35 2009 +0100
exa: exaPixmapDirty should use official damage functions.
- Otherwise other users will not be notified of damage.
commit 97c1cbc70216366e92b9371de608ce94e60aa874
Author: Maarten Maathuis <madman2003@gmail.com>
Date: Tue Feb 17 19:01:44 2009 +0100
exa: the extent of the valid region is probably much larger than that of the pending damage.
- Since the default has been changed from nothing to everything.
commit 4039603413f9f46d7f725463a70b4a51838e0049
Author: Ian Romanick <ian.d.romanick@intel.com>
Date: Tue Feb 17 08:27:32 2009 -0800
glx: Inialize best_score before calculating visual scores
This bug was pointed out by Peter Åstrand.
Signed-off-by: Ian Romanick <ian.d.romanick@intel.com>
commit bac13e54b164ceff7b921a2d17c4a198b42aeccf
Author: George Staplin <gstaplin@apple.com>
Date: Mon Feb 16 17:33:19 2009 -0700
XQuartz: Add driWrap.h that I missed in the last commit.
This should complete the GLXPixmap commits for now.
(cherry picked from commit 7e99b55651bf7f6275bb227d02f203fb885a67a2)
commit 95052caa2c8a79981cdc7936888a8a47e09415e0
Author: George Staplin <gstaplin@apple.com>
Date: Mon Feb 16 17:22:18 2009 -0700
XQuartz: Add support for GLXPixmaps to the AppleDRI.
This involved wrapping some GCOps to get the proper behavior
when using X11 raster ops mixed with OpenGL (see driWrap.c).
This extends the AppleDRI protocol with create and destroy pixmap
functions.
The dri.c code has been extended quite a bit to enable this, and
to initialize the wrapping of CreateGC for GCOps.
This has been tested with tests/glxpixmap and proven to work with
the new libGL. Existing applications seem to work fine too. Redraws
all appear to be correct.
There may be some bugs lurking that I haven't found yet. I plan
to drive them out by extending the libGL test suite.
(cherry picked from commit 630518766b01022c49fe3a9e7d501808f71b06e2)
commit 970725d23e83285d41e3f7cab678a825d9cc25cf
Author: Adam Jackson <ajax@redhat.com>
Date: Mon Feb 16 18:44:00 2009 -0500
kdrive: Nuke dead AGP and VGA code. (#19921)
commit a932744d983845f81791045cf0dfb6a359790158
Author: Chris Ball <cjb@laptop.org>
Date: Mon Feb 16 18:27:26 2009 -0500
Build fix, remove export of pciBusAddrToHostAddr
a9d7d659.. (PCI: Remove pciBusAddrToHostAddr and associated nonsense)
removes pciBusAddrToHostAddr(), but not its prototype, resulting in:
./.libs/libxorg.a(sdksyms.o):(.data.rel+0xe64): undefined reference to
`pciBusAddrToHostAddr'
Signed-off-by: Chris Ball <cjb@laptop.org>
commit ab331aa76f0bc6a85a519b2deaafa4ce8a070c53
Author: Julien Cristau <jcristau@debian.org>
Date: Mon Feb 16 21:56:03 2009 +0100
xfree86: ModeDebug is a boolean, not a string
Signed-off-by: Julien Cristau <jcristau@debian.org>
commit f5bf1fdaf36163d5c2f1b9b51df96326ebbb0e9c
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri Feb 13 09:56:22 2009 +1000
xkb: Fix wrong colour reference in XKB geometry copying. #20081
base_color and label_color need to reference the color in the destination, not
in the source.
X.Org Bug 20081 <http://bugs.freedesktop.org/show_bug.cgi?id=20081>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
commit a9d7d659a05e4b6b25e6acd2ce59926911aac0f7
Author: Adam Jackson <ajax@redhat.com>
Date: Fri Feb 13 18:36:27 2009 -0500
PCI: Remove pciBusAddrToHostAddr and associated nonsense
This was all a glorified no-op. We rely on pciaccess to create device
maps anyway, so we should have no reason to care about what the host
address is.
Acked-by: Ian Romanick <ian.d.romanick at intel.com>
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit be8c3d4022faa7d169778ea10d1f11e8f90e1c0c
Author: Adam Jackson <ajax@redhat.com>
Date: Fri Feb 13 17:54:33 2009 -0500
Linux: Remove dead USE_DEV_FB #ifdefs
commit 51ae4d6bbfd95cac8a9cdefcd6f22fbe21a6cb9d
Author: Ian Romanick <ian.d.romanick@intel.com>
Date: Mon Feb 16 12:08:28 2009 -0800
glx: Add comments around some extension string weirdness
commit caa5310e163b040689383f6d25ccab5ef1b2e215
Author: Maarten Maathuis <madman2003@gmail.com>
Date: Mon Feb 16 20:41:14 2009 +0100
exa: reintroduce src rect optimisation, with a slightly higher threshold.
- I got some feedback on gtkperf line test regression.
- The increased threshold should ensure the destination optimisation is dominant.
commit 46eeaf82e228df1c5971a24dc815566516e19be9
Author: Maarten Maathuis <madman2003@gmail.com>
Date: Mon Feb 16 17:17:14 2009 +0100
exa: fix performance regression from 736b6fbd2c941b6276066cd1503523edebe7bf3d
- The src optimisation is more aggressive and possibly harmful in light of the new initial state of pixmaps.
- There is now actually a performance improvement by almost always keeping the number of rects low.
commit 6198373ff2a8e36113bb1dcaebe975530ff01b86
Author: David Nusinow <dnusinow@debian.org>
Date: Sun Feb 15 18:36:01 2009 -0500
xorg.conf (5) refer to mousedrv (4). Debian #394058
Signed-off-by: Julien Cristau <jcristau@debian.org>
commit 2a8b8077d8f6001eb57deba60e1009fc99c28668
Author: Alan Hourihane <alanh@vmware.com>
Date: Mon Feb 16 11:39:34 2009 +0000
dri2: support glXWaitGL & glXWaitX by copying fake front to front and
vice-versa.
commit ddb8d8945d1f44d16adc366b6612eef20ae813f7
Author: Peter Åstrand <astrand@cendio.se>
Date: Fri Feb 13 10:23:28 2009 +0100
xserver: Avoid sending uninitialized padding data over the network
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit b735a4b4951b607e614682836f24d5fd86c1f7fb
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu Feb 12 14:29:23 2009 +1000
dix: Remove lastEventMask variable, substitute with a #define.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 772e0f9159ca3ab8fb4e03ed6feee3cc93697724
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu Feb 12 13:38:34 2009 +1000
dix: Don't set core events in SetMaskForEvent.
Rather, modify the two callers to call separately for the two different.
events. Unexport SetMaskForEvent too.
And while we're at it, get rid of the MotionFilter macro, because it's one
half confusing and one half pointless.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 58f3127919ba5fcb3bb467b6913c28ee1127c82b
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu Feb 12 08:37:49 2009 +1000
Xi: remove dynamic mask assignment for XI events.
They end up being the same anyway on startup, so let's not have a dynamic mask
assignment mechanism and instead just hardcode them already.
Also unexport SelectForWindow and remove the valid_masks parameter. We can
check that before calling, since there's only one caller anyway.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 7057a9a97b9316b1de954d05451e04223fdd9fd8
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu Feb 12 22:14:48 2009 +1000
Remove two more define XKB leftovers.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 736b6fbd2c941b6276066cd1503523edebe7bf3d
Author: Michel Dänzer <daenzer@vmware.com>
Date: Sun Feb 15 17:44:51 2009 +0100
EXA: Try to prevent the valid regions from growing too many rects.
This helps contain region management overhead in some pathological cases, see
e.g. http://bugs.freedesktop.org/show_bug.cgi?id=16647 .
Signed-off-by: Michel Dänzer <daenzer@vmware.com>
commit 45e14f515337159e600a47ebf349692751552af8
Author: Chris Ball <cjb@laptop.org>
Date: Fri Feb 13 20:32:02 2009 -0500
Build fix for xf86EdidModes.c
Commit 20ac314.. forgets to declare hsize/vsize/refresh.
commit ae68be312619ad3bcb2d550a6267d38cce3284f5
Author: Adam Jackson <ajax@redhat.com>
Date: Fri Feb 13 17:25:32 2009 -0500
Input: Don't re-block SIGIO in xf86SigioReadInput()
It's already blocked on the way in, because we asked for it to be
blocked at sigaction() time.
commit c18f454e4a9cab03e5d55b6d761a4a735c943b6b
Author: Aaron Plattner <aplattner@nvidia.com>
Date: Thu Feb 12 18:27:48 2009 -0800
Query the DDX in ProcRRGetScreenInfo.
This is the RandR 1.1 version of GetScreenResources and needs to re-query the
DDX to see if the mode pool changed.
Fixes Launchpad bug #325115.
Signed-off-by: Adam Jackson <ajax@redhat.com>
(cherry picked from commit 660c2a7d4c6cb52fd0992e9d2008a24805dc8c02)
commit 20ac3140ce16af460992b83aa8aeff4afe28c2ee
Author: Adam Jackson <ajax@redhat.com>
Date: Mon Feb 9 13:36:05 2009 -0500
EDID: Hack for 1366x768 in standard timing descriptors
All you get for standard timing descriptors is horizontal size in
multiples of 8 pixels (which means you can't say 1366) and height in
terms of aspect ratio (which means you can't say 768). You'd like to
just fuzzy-match this by walking the DMT list for sufficiently close
modes, but you can't because DMT is useless and only defines a 1360x768
mode, because it's _also_ specified in terms of character cells despite
providing pixel exact timings. Neither can you use CVT or GTF to
generate the timings, because they _also_ believe that modes have to be
a multiple of 8 pixels.
You'd also hope you could find a timing definition for this in CEA, but
you can't because CEA only defines transmission formats that actually
exist. So there's 480p, 720p, and 1080p, but no 768p. And why would
there be, after all, the encoded signal is never 768p so obviously no
one would ever make a display in that format.
So instead, make a CVT mode since that's likely to be handled well by
just about everything, smash the horizontal active down by 2, and shift
the sync pulse by 1. Underscanning the hard way.
Pass the suicide.
commit bcafdfbed6f1e1f901c2459f60f94a0da506bd90
Author: Adam Jackson <ajax@redhat.com>
Date: Fri Feb 13 14:06:07 2009 -0500
RANDR: Validate entire mode list for interlace and doublescan
Otherwise drivers have to refuse interlace twice: once in the output
config, and once in ->valid_mode() to catch output and config modes.
If you can't do interlaced modes, asking nicely for it in the config
isn't going to suddenly make it work.
commit a26c77ff432d2e85a2665fc36fca25143460c476
Author: Alan Hourihane <alanh@vmware.com>
Date: Fri Feb 13 13:45:08 2009 +0000
glx: fix retval checks when failures occur for drawable creation.
commit a38ca0063c91ef221f20bf0c4ac0dc84ce07d557
Author: Benjamin Close <Benjamin.Close@clearchain.com>
Date: Fri Feb 13 14:44:53 2009 +1030
xext: Use proto header rather than the Xext include file, this prevents 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>
commit d62c085f36892c327785e85571bd2c7c70513ac6
Author: Benjamin Close <Benjamin.Close@clearchain.com>
Date: Fri Feb 13 14:44:09 2009 +1030
dix: Remove includes which are not actually used directly
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>
commit 340f1576afcdaf883d185da356e5d6282aa65e19
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu Feb 12 10:44:27 2009 +1000
dix: remove DefineInitialRootWindow()
Obsolete.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit c178c3f814f7666f43cbf47d24c7543b289f9b1a
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu Feb 12 15:29:38 2009 +1000
dix: doxygen-ify enterleave.c
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit cc696a2b7928ec497b6a0df3602fc70dec83a629
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu Feb 12 15:05:57 2009 +1000
Doxygen-ify bits of events.c
commit 8364bf7374aa5f6d991700f0c02921dc6c638c9f
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Wed Feb 11 16:06:36 2009 +1000
Document the event masks.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit ed9d58c3c25ee1b3dedbc4c116823c263ccf164d
Author: Simon Thum <simon.thum@gmx.de>
Date: Sun Feb 8 17:21:09 2009 +0100
dix: refactor pointer acceleration
The algorithm is split in a 2D-specific and a general part.
This potentially allows to accelerate more than just screen motion.
A state machine is intoduced to make code more explicit and readable.
It also improves handling of 'phase 1' mickeys when axial correction
kicks in (corner case).
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit ac470dfb4fadaa0b28b6f8b57f4f13a20842b897
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Thu Feb 12 18:34:22 2009 -0800
Check for and report errors writing xorg.conf.new from Xorg -configure
Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
commit bd713794ceaa1b2890522554562103c0a2d50f04
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Thu Feb 12 18:23:59 2009 -0800
Correct error message if specified config file is not found
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>
commit d229ba7068f0adf1bc8b30b7ccf2fce2c7e8b97b
Author: George Staplin <gstaplin@apple.com>
Date: Fri Feb 6 12:55:09 2009 -0700
XQuartz: xpr: The dri.c code for pixmaps was wrong in several ways. They weren't
being exported correctly by Xplugin.
This should fix a bug with the surface for a window, when an export fails.
Before the export could fail and leave behind an invalid (freed) pointer in the dix privates.
I have an idea of how to fix the GLXPixmaps now without using CGLSetOffScreen.
This work is a step towards that. The Xplugin will need a small patch to fix an
issue that this change brought forth.
(cherry picked from commit 58c4116c47543b5e30c2232e7bee8efc0b9be176)
commit b17d6bed97eddd0773d0845f93f842444b7de0ae
Author: Jeremy Huddleston <jeremy@yuffie.local>
Date: Thu Feb 12 15:33:47 2009 -0800
XQuartz: Fix copyright info in Info.plist to be prettier when viewed in Finder
(cherry picked from commit 8b607c9c507a68a6abda63831d227d0f8947028c)
commit d1ad43a8bc3a93a9cddcb4b0be1d722993bf5dd6
Author: Ian Romanick <ian.d.romanick@intel.com>
Date: Thu Feb 12 14:05:10 2009 -0800
Enable pbuffers
If a driver does not actually support pbuffer rendering, it can just
not enable any pbuffer fbconfigs.
commit 0065896e1ae6d419a42b318b66d6e4d5f17a40ca
Author: Colin Harrison <colin.harrison@virgin.net>
Date: Sun Nov 2 20:46:37 2008 +0000
Xming: Update keyboard layouts mapping table
An update to the keyboard layout mapping table which updates some no longer valid keyboard layout names
(e.g. de_CH -> ch -variant de) and adds a few more reported layouts
Copyright (C) Colin Harrison 2005-2008
http://www.straightrunning.com/XmingNotes/
http://sourceforge.net/projects/xming/
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
commit d7c27bfe553235e55eb48799129ff9f8e7e0d4f6
Author: Colin Harrison <colin.harrison@virgin.net>
Date: Tue Feb 3 15:57:29 2009 +0000
Xming: Check clipboard selection ownership after taking it
When you take ownership of a selection you should always check you got
it (X11 ICCCM gospel).
Copyright (C) Colin Harrison 2005-2008
http://www.straightrunning.com/XmingNotes/
http://sourceforge.net/projects/xming/
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
commit cb6315072ff23740bdc5fc2f95dd960601df5664
Author: Colin Harrison <colin.harrison@virgin.net>
Date: Tue Feb 3 15:54:31 2009 +0000
Xming: Fix a memory leak in clipboard integration code
Free the memory allocated for ReturnData in FlushXEvents().
Copyright (C) Colin Harrison 2005-2008
http://www.straightrunning.com/XmingNotes/
http://sourceforge.net/projects/xming/
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
commit d54d24dd5f25188b951b82b1c95eb9d36b5be970
Author: Colin Harrison <colin.harrison@virgin.net>
Date: Tue Feb 3 15:53:43 2009 +0000
Xming: Fix prototype for winProcessXEventsTimeout() in clipboard integration code
Function 'winProcessXEventsTimeout()' is declared 'static Bool' and
defined 'static int' (correct) in 'winclipboardwndproc.c'. This has been
wrong since dot, but luckily was of no significance
Copyright (C) Colin Harrison 2005-2008
http://www.straightrunning.com/XmingNotes/
http://sourceforge.net/projects/xming/
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
commit d8bae80305057acfb8e82341f68090eac0dccb90
Author: Colin Harrison <colin.harrison@virgin.net>
Date: Tue Feb 3 15:52:57 2009 +0000
Xming: Improve clipboard integration startup in XDMCP mode
Improve clipboard integration startup in XDMCP mode
Stop the "Clipboard not yet started, aborting" message from spamming the log.
Copyright (C) Colin Harrison 2005-2008
http://www.straightrunning.com/XmingNotes/
http://sourceforge.net/projects/xming/
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
commit 7cb1622ce44754d9dcd6f405fb8403bd79c3e7e4
Author: Colin Harrison <colin.harrison@virgin.net>
Date: Tue Feb 3 15:51:02 2009 +0000
Xming: Select events correctly in clipboard integration code
The clipboard should only select PropertyChange events and do this on
the correct window, the messaging window for the clipboard not the root
window!
Copyright (C) Colin Harrison 2005-2008
http://www.straightrunning.com/XmingNotes/
http://sourceforge.net/projects/xming/
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
commit b997b3849d902894dd5b38673b73a23a47edf502
Author: Colin Harrison <colin.harrison@virgin.net>
Date: Tue Feb 3 15:48:04 2009 +0000
Xming: Add Colin Harrison to copyright and authors list for clipboard integration files
Add Colin Harrison to copyright and authors list
Adjust license text for multiple authors
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
commit 5ff289834d7445cc6f60dbb1cf18423e7236311a
Author: Jon TURNEY <jon.turney@dronecode.org.uk>
Date: Mon Jan 19 17:42:54 2009 +0000
Cygwin/X: Place prototype for winSelectIcons() in a header file
Fixes warning as prototype is now in scope for the definition
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
commit ab2c98b86f1c3968581dfdad8b67432082feec78
Author: Jon TURNEY <jon.turney@dronecode.org.uk>
Date: Mon Jan 19 17:36:58 2009 +0000
Cygwin/X: Place prototypes for winCheckKeyPressed() and winFixShiftKeys() in a header file
Fixes warnings as they are now in scope at the definition
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
commit cc7a4c7c6e051fceacb32997740d83fc0655414e
Author: Jon TURNEY <jon.turney@dronecode.org.uk>
Date: Mon Jan 19 17:29:28 2009 +0000
cygwin/X: Remove an unused variable to fix a warning
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
commit 7c2fb098b206c0fb97c18cce8f88387cd0c0e82a
Author: Jon TURNEY <jon.turney@dronecode.org.uk>
Date: Mon Jan 19 17:22:59 2009 +0000
Cygwin/X: Fix several prototypes to return HICON
Fix prototypes of winOverrideIcon(), winTaskbarIcon() and winOverrideDefaultIcon() to return HICON
Also use HICON type in WINPREFS stucture
Remove various casts these changes make unnecessary
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
commit 19b3e44ce51cc2f74ba388cb2cd3a26467848e9a
Author: Jon TURNEY <jon.turney@dronecode.org.uk>
Date: Mon Jan 19 17:03:23 2009 +0000
Cygwin/X: Fix -Wold-style-definition warnings
Fix old-style definition warnings caused by definitions with empty
parameter lists "()", which should be "(void)" to indicate the function
takes no parameters, rather than unspecified parameters
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
commit 734b23e5982e171031077a2d5d6b5dc2a12e1a70
Author: Maarten Maathuis <madman2003@gmail.com>
Date: Wed Feb 11 14:31:17 2009 +0100
fb: add fbDoCopy and fbCopyRegion compatibility wrappers.
commit 619c4d60eb3a8a51a8300ccf8ab5b98a688e6e12
Author: Eric Anholt <eric@anholt.net>
Date: Sun Feb 8 12:37:50 2009 +0100
glx: Replace broken GLX visual setup with a fixed "all" mode.
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.
commit 7bbf05d9aa75b536a5321abf51f37852b8f109ed
Author: Shunichi Fuji <palglowr@gmail.com>
Date: Tue Feb 10 14:44:18 2009 +0900
dix: build fix if PANORAMIX is not defined.
Signed-off-by: Shunichi Fuji <palglowr@gmail.com>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 4844bff58f296b2851be4e6b955c3a68d02437a9
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Wed Feb 4 11:50:18 2009 +1000
config: if we can't connect to HAL, listen for a startup notification.
If HAL isn't available when we try to connect, the registered NameOwnerChanged
signal handler waits until HAL is available. Once we connected to HAL, we
unregister the signal handler again.
This allows HAL to be started in parallel or after the server has started.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 5b2bbffc12cd7d29e4200943f8736bd6336ae4aa
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri Jan 30 16:46:27 2009 +1000
dix: deduplicate SyntheticMotion.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 34820f9c1304891bebb4bff6a492288aec4fc0d1
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri Jan 30 16:37:19 2009 +1000
dix: remove XineramaChangeToCursor.
It's nearly identical to ChangeToCursor now anyway.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 942eae6868b8b0f343b6aa921ddf77e8bb70798a
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri Jan 30 16:25:22 2009 +1000
dix: Remove XineramaCheckPhysLimits.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit bf044f6d10ad9f2baca91a2f04e82dc1af2657cd
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri Jan 30 16:14:54 2009 +1000
dix: reduce redunancy in XineramaConfineCursorToWindow.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit cdce5699f085e717ee1a2ed8390746dfcb9ddadf
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri Jan 30 16:09:23 2009 +1000
dix: Get rid of XineramaCheckVirtualMotion.
Yes, this is an ugly piece mess of #ifdefs, but it beats having two nearly
identical functions.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 1cb5afdf1ef53e72e0eef28ff6197bf5e86ef758
Author: Maarten Maathuis <madman2003@gmail.com>
Date: Sun Feb 8 18:59:17 2009 +0100
dix: always NULL pGC->tile.pixmap in Create{Scratch}GC.
commit 6fd8fe9cb993f9b733cf7d878bc324acd09aa48d
Author: Maarten Maathuis <madman2003@gmail.com>
Date: Sun Feb 8 18:43:15 2009 +0100
exa: fix exaValidateGC.
- use DEST in the createPixmap wrapper, because stipple already takes MASK (in case someone uses swappers).
- Anticipate some of the less common situations when fbValidateDrawable will access tile related pixmaps.
commit 30daba6903378dd47f386c0012a0667fd2368f3e
Author: Maarten Maathuis <madman2003@gmail.com>
Date: Sun Feb 8 02:08:13 2009 +0100
exa: All fallbacks should have a GC, remove some code.
- I did some testing with full fallbacks forced by the driver.
- I ran rendercheck, expedite and the (full) x11perf test suite.
- Thanks to ajax for pointing out this should be unneeded.
commit d591c7d1b87c61ee8add2fce689e35cf097eed4f
Author: Maarten Maathuis <madman2003@gmail.com>
Date: Sat Feb 7 20:47:54 2009 +0100
mi: kill a few warnings
commit 00226d0b589595cdd45c75e7e28237334a8883b1
Author: Maarten Maathuis <madman2003@gmail.com>
Date: Fri Feb 6 20:56:49 2009 +0100
mi: clip exposures to pGC->clientClip.
commit ffa72793e25f19a388a1369708f472921f721284
Author: Maarten Maathuis <madman2003@gmail.com>
Date: Fri Feb 6 20:47:01 2009 +0100
exa: Calling exaMarkSync after UTS is the drivers responsibility.
commit da086901c6579e41b28b1418fa12ebb82744fc87
Author: Matt Turner <mattst88@gmail.com>
Date: Fri Feb 6 18:31:12 2009 -0500
Remove unused barrier macros on alpha.
commit 68665d78e72c4c564073d66a0f59ac8d3f5fd756
Author: Maarten Maathuis <madman2003@gmail.com>
Date: Thu Feb 5 17:07:31 2009 +0100
exa: don't use fbCopyNtoN
commit 2e76958d304a3c4080d62f32449724eeb9b95d93
Author: Maarten Maathuis <madman2003@gmail.com>
Date: Wed Feb 4 19:48:03 2009 +0100
fb: move some code to mi
commit f06bde3d4bf9a0f245dfa6c65cd98f8e0c7dfdfc
Author: Maarten Maathuis <madman2003@gmail.com>
Date: Sat Jan 31 19:57:07 2009 +0100
exa: create ExaCheckGetImage
commit 258fc4b106dfd7b583999f97caf4d4a7a11569b6
Author: Maarten Maathuis <madman2003@gmail.com>
Date: Sat Jan 31 19:40:48 2009 +0100
exa: wrap the remainder of exa_unaccel.c
commit 6fabf249494bf38b69e3c9c6c9718ee8b12fc6e1
Author: Maarten Maathuis <madman2003@gmail.com>
Date: Sat Jan 31 19:25:20 2009 +0100
exa: use proper wrapping in exa.c
commit 015c99a4ad572f5a1b68054efb070e1ffee1fed0
Author: Maarten Maathuis <madman2003@gmail.com>
Date: Sat Jan 31 18:53:52 2009 +0100
exa: properly wrap GC functions
commit 5e6a06fe691db63ccf2dc7161a1f6c71c09741b7
Author: Maarten Maathuis <madman2003@gmail.com>
Date: Sat Jan 31 16:30:31 2009 +0100
exa: add GC private
commit 5cc67ae94c066dcac78072ad8a819c3b602d8bab
Author: Maarten Maathuis <madman2003@gmail.com>
Date: Fri Jan 30 19:32:33 2009 +0100
exa: kill of exaImageGlyphBlt
- It serves no obvious purpose, yet it directly accesses many fb
symbols.
commit 6483834200fab90164c27c72d4710014edeb4479
Author: Maarten Maathuis <madman2003@gmail.com>
Date: Fri Jan 30 18:40:46 2009 +0100
exa: Remove one of the many calls directly into the fb layer.
commit f112d6bf59964f317ab236221f7bce7fe2603ab8
Author: Michel Dänzer <daenzer@vmware.com>
Date: Fri Feb 6 18:30:43 2009 +0100
EXA: Try harder to keep current pixmap copy up to date in exaMigrateToward*.
This is probably required, but apparently not sufficient, for making migration
heuristics other than "always" work correctly again. Not that I really care
about them...
commit 3948b523893d3d44b6a088340c4252e969613769
Author: Michel Dänzer <daenzer@vmware.com>
Date: Fri Feb 6 11:37:53 2009 +0100
EXA: Guard empty pending region warning by DEBUG_MIGRATE.
It isn't very useful yet while the damage layer calls us for empty operations,
mostly confuses users.
commit 9a1d07ecb74b7c3267a6910af66ada917a525110
Author: Tomas Carnecky <tom@dbservice.com>
Date: Wed Feb 4 20:20:24 2009 +0100
Fix "warning: cast from pointer to integer of different size"
Signed-off-by: Tomas Carnecky <tom@dbservice.com>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 0e15697b53c9448ce9911aa6499b2ea0bda92af6
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Wed Feb 4 10:11:13 2009 +1000
dix: die if we can't activate or init the VCP/VCK.
If we have a busted xkb setup, the XKB initialization on the core devices
fails and leaves us with dev->key->xkbInfo == NULL. This in turn causes
segfaults lateron.
Return BadValue when the XKB configuration for a master device failed, and if
that happens for the VCP/VCK, die semi-gracefully.
The VCP init can only fail on OOM.
Reported by Aaron Plattner.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Acked-by: Daniel Stone <daniel@fooishbar.org>
Acked-by: Dan Nicholson <dbn.lists@gmail.com>
Signed-off-by: Aaron Plattner <aplattner@nvidia.com>
commit db836715198a445dc3b32c3df0610f700930483f
Author: Adam Jackson <ajax@redhat.com>
Date: Wed Feb 4 23:27:32 2009 -0500
Revert "Bus: Remove xf86SetAccessFuncs() and related machinery"
This reverts commit 2fe79990e31ac684637ca3c47198ee0cead10abe.
Reminder: nvidia uses this, because other parts of RAC are broken in
worse ways, and it needs to disable that.
commit 2fe79990e31ac684637ca3c47198ee0cead10abe
Author: Adam Jackson <ajax@redhat.com>
Date: Mon Jan 26 07:11:49 2009 -0500
Bus: Remove xf86SetAccessFuncs() and related machinery
Only mga was using this, and even then only behind an ifdef that no one
ever built. Not a great idea in the first place.
commit 9ff6180161267e71ae750498da0ec4889cd5c260
Author: Adam Jackson <ajax@redhat.com>
Date: Mon Jan 26 06:23:09 2009 -0500
Bus: Delete some obfuscatory macros
commit 8eca37cb8934e79f02291460eb7b49a5d528f391
Author: Adam Jackson <ajax@redhat.com>
Date: Wed Feb 4 22:48:52 2009 -0500
Bus: Remove unused xf86ExtractTypeFromList
commit b013111e98d50f5962e9b275eb28d969d5c9576e
Author: Adam Jackson <ajax@redhat.com>
Date: Mon Jan 26 03:14:18 2009 -0500
Bus: make the resource list static.
commit bde028dd8d856f8d47c39e3c6d3731c34c398c74
Author: Adam Jackson <ajax@redhat.com>
Date: Mon Jan 26 22:58:58 2009 -0500
loader: Remove icache flushes on alpha.
If libdl doesn't already get this right for you, you have two problems.
commit 910a1e88d23e0b7e4ca4679ab50a883a918f2590
Author: Adam Jackson <ajax@redhat.com>
Date: Mon Jan 26 07:54:07 2009 -0500
loader: Remove a vestige of archive support
commit 366f23c6eb504fc23112f121769bcb719948474f
Author: Adam Jackson <ajax@redhat.com>
Date: Mon Jan 26 07:53:05 2009 -0500
loader: Remove useless call to LoaderGetOS
We know what OS you're running on anyway, it's printed in the uname
string at the top of the log.
commit 05e415a5a3f376e28955be3bf976390e8631e25f
Author: Adam Jackson <ajax@redhat.com>
Date: Mon Jan 26 07:52:07 2009 -0500
loader: Simplify loader magic
commit bf1ca06a1693cbe5415a152936939ce3b088a022
Author: Adam Jackson <ajax@redhat.com>
Date: Mon Jan 26 07:51:35 2009 -0500
loader: Make a comment slightly less stupid
commit 499908aeca9a31692c787070e23bfaa92d1b32a4
Author: Adam Jackson <ajax@redhat.com>
Date: Mon Jan 26 07:50:00 2009 -0500
loader: code motion.
commit 28b6b1519c4c526662302fac4ed9b7f540bafd4a
Author: Adam Jackson <ajax@redhat.com>
Date: Mon Jan 26 07:47:46 2009 -0500
loader: Simplify handle allocation and refcounting.
commit 0bad0552bfd4d10529ab51d618af8d08c5aeea71
Author: Adam Jackson <ajax@redhat.com>
Date: Wed Feb 4 17:20:24 2009 -0500
XKB: Remove -kb and +kb from -help text and man page.
commit 7968823cbc02615e1080c0d3f34dcebe14ea1771
Author: Keith Packard <keithp@keithp.com>
Date: Tue Feb 3 20:18:37 2009 -0800
Handle the combination of panning and crtc transforms
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>
commit 763df9eec79a867978efc5138d8635a46c1a0d17
Author: Keith Packard <keithp@keithp.com>
Date: Tue Feb 3 20:15:41 2009 -0800
Damage re-used shadow scanout buffer using new transforms.
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>
commit 62fc98cb88e4e8b636f343453fc1168a87c58972
Author: Keith Packard <keithp@keithp.com>
Date: Tue Feb 3 20:12:42 2009 -0800
Handle matrix computation overflow in RRTransformCompute
If the computation of the composite fixed-point transform for RandR
overflows at any point, take the resulting floating point transform and
scale that back to fit in a fixed point matrix. This ensures that a matrix
will always be available, although perhaps at reduced precision. Someday we
should add floating point matrices to Render.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 7a3ddef3bc27982f3558183c74fc8e365cf2e7fd
Author: Tomas Carnecky <tom@dbservice.com>
Date: Wed Feb 4 00:07:02 2009 +0100
fbdevHWGetRec() doesn't return the private data
Signed-off-by: Tomas Carnecky <tom@dbservice.com>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit e04d9ab999978995b06f4b702293b96f69b0e8c3
Author: Tomas Carnecky <tom@dbservice.com>
Date: Wed Feb 4 00:08:21 2009 +0100
DBUS_API_SUBJECT_TO_CHANGE is already defined on the command line
dbus-core.c:30:1: warning: "DBUS_API_SUBJECT_TO_CHANGE" redefined
<command-line>: warning: this is the location of the previous definition
Signed-off-by: Tomas Carnecky <tom@dbservice.com>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 9f60d127b5371f2853dcc53903c6ff8c7670ad1b
Author: Tomas Carnecky <tom@dbservice.com>
Date: Wed Feb 4 00:07:40 2009 +0100
Fix "warning: braces around scalar initializer"
Signed-off-by: Tomas Carnecky <tom@dbservice.com>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit a88995dfb88719ae4a03483dc571dbbe83565285
Author: Tomas Carnecky <tom@dbservice.com>
Date: Wed Feb 4 00:03:58 2009 +0100
Make gcc happy: correct third argument of CopyGetMasterEvent()
Signed-off-by: Tomas Carnecky <tom@dbservice.com>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit dd3f4e829286e62f4c5c07ee93f9f576876acbf9
Author: Tomas Carnecky <tom@dbservice.com>
Date: Wed Feb 4 00:02:24 2009 +0100
Fix "warning: cast to pointer from integer of different size"
Add parenthesis around the whole expression.
Signed-off-by: Tomas Carnecky <tom@dbservice.com>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 731a907ac21a753f306b53706f689469cefeb953
Author: Tomas Carnecky <tom@dbservice.com>
Date: Tue Feb 3 23:58:25 2009 +0100
Fix "warning: XXX defined but not used"
generic.c:80: warning: ‘read_legacy_video_BIOS’ defined but not used
Signed-off-by: Tomas Carnecky <tom@dbservice.com>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit bc57efffe654c493ceb62555cccb7926f4a646f1
Author: Tomas Carnecky <tom@dbservice.com>
Date: Tue Feb 3 23:54:53 2009 +0100
Fix "warning: unused variable XXX"
events.c:4614: warning: unused variable ‘kbd’
xkbUtils.c:361: warning: unused variable ‘maxKeysPerMod’
xf86Events.c:409: warning: unused variable ‘ke’
generic.c:131: warning: unused variable ‘cs’
generic.c:130: warning: unused variable ‘size’
xf86RandR12.c:591: warning: unused variable ‘crtc’
Signed-off-by: Tomas Carnecky <tom@dbservice.com>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 111fdef74dfc7e288cef675b171b673bf64fe056
Author: Tomas Carnecky <tom@dbservice.com>
Date: Tue Feb 3 21:18:53 2009 +0100
ISO C90: Move declaration to the beginning of the function
devices.c: In function ‘DoChangeKeyboardControl’:
devices.c:1768: warning: ISO C90 forbids mixed declarations and code
Signed-off-by: Tomas Carnecky <tom@dbservice.com>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 9fe9b6e4ef669b192ee349e3290db5d2aeea273c
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Mon Feb 2 10:20:13 2009 +1000
mi: don't call UpdateSpriteForScreen if we have Xinerama enabled. #18668
In Xinerama all windows hang off the first root window. Crossing the screens
must not reset the spriteTrace, otherwise picking fails and events are sent to
the root window.
X.Org Bug 18668 <http://bugs.freedesktop.org/show_bug.cgi?id=18668>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit f80332a04d0714a74f16b2552cccf3457e6494af
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Mon Feb 2 14:28:16 2009 +1000
dix: for core events, pass the core filter into DeliverEventsToWindow
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 01879e583b0ce0d8fddc37e36d9b69fe4f1d1e72
Author: Aaron Plattner <aplattner@nvidia.com>
Date: Tue Feb 3 13:49:19 2009 -0800
Don't enable XAA offscreen pixmaps with Option "XaaOffscreenPixmaps" "no".
xf86IsOptionSet is rarely the right function to use for boolean options because
it returns TRUE whenever the option is present, even if its value is "no",
"off", "0", etc.
commit 5623c27700b7b23a8dbbd8c8f45e5d4fa0c667e3
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Mon Feb 2 19:25:14 2009 -0800
Constify atom name strings
Changes MakeAtom to take a const char * and NameForAtom to return them,
since many callers pass pointers to constant strings stored in read-only
ELF sections. Updates in-tree callers as necessary to clear const
mismatch warnings introduced by this change.
Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
Acked-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 6869efae74381e5305b2d6517bf286e3ef7fdcb7
Author: Jeremy Huddleston <jeremy@yuffie.local>
Date: Tue Feb 3 09:58:51 2009 -0800
XQuartz: Accept bundle version 2.1.6 to work with our startup method
(cherry picked from commit 7f2966557374cb5ea22bc7b73d5ca04891eb5e78)
commit 43a1c91a3dac4f0c8cea5de1b9785e349e09978a
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Sun Feb 1 20:44:27 2009 +1000
Xext: fix typo in GEEventFill macro
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 412e09e1e37b74421abd4dd9606536d2785da440
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu Jan 15 11:03:03 2009 +1000
dix: Use GenericEvent instead of LASTEvent to check for core events.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 9f3c5d46f81887b2b413b3e6cc9df8282f06522c
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Mon Feb 2 12:55:39 2009 +1000
Xi: initialize the device before applying button map changes.
This part got lost in bc909f71367a0.
Reported by Tomas Carnecky.
Acked-by: Daniel Stone <daniel@fooishbar.org>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 6bf6a4c47e94780bf0eef47702f21a505c336556
Author: Simon Thum <simon.thum@gmx.de>
Date: Fri Jan 23 12:06:16 2009 +0100
Xi: create well-known atoms on demand, rather than preinit them
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 32adf8d34fb7db9b78859241f2670349b75c3f7e
Author: Peter Hutterer <peter.hutterer@redhat.com>
Date: Wed Jan 28 20:52:45 2009 +1000
Xi: If the MD doesn't have a key/kbdfeed class, init the keyboard.
This fixes crashes on mouse/keyboard combos where the mouse is both a keyboard
and a mouse. Upon copying the SD's key info into the VCP, the NULL xkbInfo of
the VCP would crash the server.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit caade11b8465a743b2ecc890a4d180277e9ca716
Author: Peter Hutterer <peter.hutterer@redhat.com>
Date: Wed Jan 28 20:44:47 2009 +1000
Xi: remove now obsolete oldXkbInfo.
Signed-off-by: Peter Hutterer <peter.hutterer@redhat.com>
commit 5e0967f5fc2e0fcf2a55128eb03931cf6f5709e9
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri Dec 12 10:49:53 2008 +1000
dix: add SetBit(arr, bit) and ClearBit(arr, bit) to include/inputstr.h
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit faeb18eb7eb20f15528f9c8004d843146ebc2a50
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Tue Jan 27 15:40:31 2009 +1000
Xext: rename shape's EventType to ShapeEventType to avoid name clashing.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit cfd3443fe81685e91a53063dee58e24a5684dc29
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Wed Jan 28 13:34:10 2009 +1000
Xext: rename saver's EventType to SaverEventType.
Avoid namespace clashing with the internal events.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 8460425740c72e58bcb897557f033e2836251160
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Wed Dec 10 12:31:59 2008 +0000
render: rename SetBit to RenderSetBit.
Avoiding namespace collision with the SetBit macro soon to be used in the
input code.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 940a7aeebc9b042b0208ee475ef162c485ac2274
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Tue Jan 27 15:52:49 2009 +1000
include: remove now-unused sempahore macros.
Obsolete with the new enter/leave model.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit f5c7f8a3ab5723b6c1c3cd21b90a87fd7f37cb7f
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Mon Feb 2 12:30:57 2009 -0800
XQuartz: GLX: Fix accidental exclusion of glBlitFramebufferEXT on Leopard
(cherry picked from commit 8620579483789ae9ac1b68dbefe32b70011386de)
commit 5100d829a4d71ce4a9fbc2b81694a1fb90066ccf
Author: Eric Anholt <eric@anholt.net>
Date: Mon Feb 2 10:13:46 2009 -0800
glx: Don't match fbconfigs to visuals with mismatched channel masks.
This fixes at least one known bug, where the depth 32 visual would end up
with a depth 24 fbconfig attached, angering compiz.
commit 4475ae036c3d5a06a6ce88a359ce2a9a8ae9b4f1
Author: Jon TURNEY <jon.turney@dronecode.org.uk>
Date: Mon Jan 26 13:15:07 2009 +0000
Cygwin/X: Fix compilation for mandatory XKB
Fix a stray '}'
Update to use RMLVO interface
Remove g_winInfo.xkb.disable, can never be set since noXkbExtension has been removed
Change to retrieve modifier key state using XkbStateFieldFromRec() from Colin Harrison
Update to use XKB defaults from xkb-config.h
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
commit e2b4d3d4a1994347979508fbb483cd55c2232502
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Sun Feb 1 15:08:02 2009 -0800
XQuartz: GLX: OpenGL.framework on Tiger doesn't have glBlitFramebufferEXT
(cherry picked from commit e01662cadcaa4052e3a5aa82cbaed00a2d0220e0)
commit 66a6fbbfa3a1fd0d91fe61cf2ab299d0e3df46b9
Author: Jim Huang <jserv@kaffe.org>
Date: Sun Feb 1 09:19:20 2009 -0800
kdrive: Move a close() to the right place so we don't close(-1) normally.
Bug #18343
commit 0055fe66d5f73742cafab868ccdb7a6f36ea1dd5
Author: Manuel Bouyer <bouyer@netbsd.org>
Date: Sun Feb 1 09:14:19 2009 -0800
netbsd: Force the use of ev56 instructions for register access on ev56.
This avoids 32-bit access which might affect other registers. The linux code
uses gcc flags to get this to happen, but this seems like more of a sure thing.
commit 1375c1b07df114d864a0a06786bc75a3a4f65177
Author: Manuel Bouyer <bouyer@netbsd.org>
Date: Sun Feb 1 09:12:21 2009 -0800
netbsd: Fix alpha ev6 support.
Bug #19721
commit ad8ffbe7cb50387e6a9cc4a24fea0d9c13b7bfc8
Author: John Hein <jhein@timing.com>
Date: Fri Jan 30 21:30:35 2009 -0800
Actually require bigfontproto when it's enabled. Bug #13710.
commit 29b3b88dc744f4919c6709747ddb7baac47486c5
Author: Pierre Willenbrock <pierre@pirsoft.de>
Date: Fri Jan 30 21:16:48 2009 -0800
Prevent double unref of glxdrawables
Found by valgrind. Bug #18917.
commit 60bcdd687040db76490851d4b459284ce37020e0
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Fri Jan 30 21:44:08 2009 -0800
x11-input.fdi: Add options needed to handle adding USB devices on Solaris
commit 4de5705545792d77c9990bbec3e263a517757a2a
Author: Keith Packard <keithp@keithp.com>
Date: Fri Jan 30 20:17:10 2009 -0800
RandR crtcs not fetched correctly when primary output is set.
Primary outputs may not have a CRTC.
Loops fetching CRTCs respecting primary output were broken.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit f716e3f3445d443cbc6507d27f806e9ad387120a
Author: Eric Anholt <eric@anholt.net>
Date: Fri Jan 30 20:10:21 2009 -0800
modes: Protect xf86_crtc_supports_gamma() from non-RandR 1.2 drivers.
commit 317f2b4a9fe4b606975711bc332166a82db5087d
Author: Eric Anholt <eric@anholt.net>
Date: Fri Jan 30 19:06:17 2009 -0800
randr: Avoid re-querying the configuration on everything but GetScreenResources.
The new path should only re-query on the other requests when we haven't
gathered the information from the DDX yet (such as with a non-RandR 1.2 DDX).
Bug #19037.
commit c1f2be1f3fd0c80cb4c85b98140b98aa9311242b
Author: Keith Packard <keithp@keithp.com>
Date: Fri Jan 30 19:14:36 2009 -0800
RandR SetOutputPrimary should work with or without a crtc connected
The test was inverted from the protocol spec, and besides, the test is bogus
anyways.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit dd098501d800571e71d06ffc936635a6c9d44e05
Author: Eric Anholt <eric@anholt.net>
Date: Fri Jan 30 16:17:58 2009 -0800
Move the apple fat binary hacks back to a header file, and make it apple-only.
commit 6e49fdd2c839b6244c23ce95c3ae76a1a265b986
Author: Keith Packard <keithp@keithp.com>
Date: Fri Jan 30 15:43:04 2009 -0800
Make RandR CRTC info report panning area instead of just crtc area
This makes the RandR info consistent with the Xinerama info.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit ea309e47457156b60aadbf113f04e5b6851029c8
Author: Keith Packard <keithp@keithp.com>
Date: Fri Jan 30 14:19:41 2009 -0800
Make crtc_notify wrap/unwrap code do nothing unless mode code is inuse
Drivers not using the new hw/xfree86/modes code would crash in DRI due to
that code trying to monitor CRTC changes.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit fff00df94d7ebd18a8e24537ec96073717375a3f
Author: Keith Packard <keithp@keithp.com>
Date: Fri Jan 30 14:16:12 2009 -0800
Ignore EDID-supplied monitor physical sizes for core screen size
We report the EDID values in RandR, and we let people configure whatever
they like for the screen in xorg.conf. Reporting the EDID values in the core
means applications get inconsistent font sizes in the default configuration.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 4e7bc2d7a9879297aff0924febeca9bd3b6c336d
Author: Paulo Cesar Pereira de Andrade <pcpa@mandriva.com.br>
Date: Fri Jan 30 03:56:39 2009 -0200
Work around inclusion of <X11/extensions/panoramiXext.h>
The X Server build only needs the macros PANORAMIX_MAJOR_VERSION
and PANORAMIX_MINOR_VERSION from that header.
Addition of extra prototypes to <X11/extensions/panoramiXext.h>
caused a X Server build failure.
commit 15ac25627e7239629be59adedda5d8a9deb330ef
Author: Matt Turner <mattst88@gmail.com>
Date: Thu Jan 29 14:40:27 2009 -0500
Remove extra / from Loading module line
In the X log, upon module load, it prints a line similar to the following.
> (II) Loading /usr/lib64/xorg/modules/extensions//libdbe.so
The attached patch removes the extra / before the module name.
Code already exists in hw/xfree86/loader/loadmod.c:InitPathList to add a
trailing slash if needed, removing the one added by sprintf is harmless.
Signed-off-by: James Cloos <cloos@jhcloos.com>
commit 3903e23153a0d47704050944fa83a7b31bc2eebc
Author: Maarten Maathuis <madman2003@gmail.com>
Date: Thu Jan 29 12:42:57 2009 +0100
XKB: ifdef XKB is dead, yet it was still present in a few places.
commit 756a2c848305aa06bfe636314e28ad7f97c1168a
Author: Pierre Willenbrock <pierre@pirsoft.de>
Date: Wed Jan 28 22:18:50 2009 +0100
Fix duplicate code, off-by one in space calculation, not initialized members
commit b55db937fee5ddf34518a54f352c0ee9b8cc2c2c
Author: Søren Sandmann Pedersen <sandmann@redhat.com>
Date: Wed Jan 28 17:33:25 2009 -0500
[shadow] Store the closure in the buffer
commit 82fc102568b3d6b0daeb6c5f5b3a1310a7f14fcd
Author: Peter Hutterer <peter.hutterer@redhat.com>
Date: Wed Jan 28 07:51:32 2009 +1000
Disable Xnest by default.
Xneest doesn't build right now and is in the process of being removed. So
let's not build it by default.
commit f7585d020593345e7a61b1fe1a517c38da8f6d79
Author: Paulo Cesar Pereira de Andrade <pcpa@mandriva.com.br>
Date: Tue Jan 27 03:13:28 2009 -0200
Convert kdrive libraries to libtool convenience libraries.
Also correct a link failure due to unresolved symbols. This
is arguably a libtool/ranlib/ld bug, that "may" be corrected
by linking all convenience libraries in a single one. But in
this case, it was preferred to just add a linker option to
Xfake_LDFLAGS, to force linkage of all libraries.
This corrects #19725.
commit b43a4e2d38adb9ff16204218f24df93cfd820d1b
Author: Magnus Kessler <Magnus.Kessler@gmx.net>
Date: Tue Jan 27 09:30:37 2009 +1000
Xvfb: add missing include for new xkbsrv.h
Commit 08363c5830bdea34012dcd954b45ccfdc79a3a7e added call to
XkbGetRulesDflts defined in xkbsrv.h
Signed-off-by: Magnus Kessler <Magnus.Kessler@gmx.net>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit a7e6424d992151c504a75bb807fa34c57ad52cad
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri Jan 23 17:11:57 2009 +1100
dix: remove obsolete comment. Event lists should not be allocated by the DDX
commit b137a0cdb1d517a807d081fbde8e8dc0539fb3ca
Author: George Staplin <gstaplin@apple.com>
Date: Mon Jan 26 03:02:38 2009 -0700
XQuartz: GL: indirect.c changes to fix the build with newer OpenGL frameworks.
(cherry picked from commit 143224405ba74929c702a95de52b56df140b0d1b)
commit 34b896e50fa154ad890a458c60932964421e739f
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Fri Jan 16 19:26:07 2009 -0800
XQuartz: SnowLeopard: Help system book name changed in 10.6
(cherry picked from commit b57cb05c69acbedb00a97234099ea104309aa2cb)
commit c7d62d74bbd6e0067f511fd910b9e633576befb7
Author: Paulo Cesar Pereira de Andrade <pcpa@mandriva.com.br>
Date: Sun Jan 25 19:19:01 2009 -0200
Explicitly add libxorg_la_LIBADD to libxorg_la_DEPENDENCIES
Otherwise, for example, when hacking config/*.c, it is required to
run make clean on that directory, to ensure the proper libconfig.a
will be linked in the generated Xorg binary.
commit 0eec7348875035792097f606487a558422774e2c
Author: Magnus Kessler <Magnus.Kessler@gmx.net>
Date: Fri Jan 23 12:11:00 2009 -0200
.gitignore: ignore sdksyms.dep
Signed-off-by: Magnus Kessler <Magnus.Kessler@gmx.net>
commit 88efe9c76f85423d952ff38e0cfd8b690439902a
Author: Magnus Kessler <Magnus.Kessler@gmx.net>
Date: Fri Jan 23 11:25:00 2009 -0200
Xvfb: Remove unused function GetLK201Mappings in InitInput.c
Silence a gcc warning. After commit 08363c5830bdea34012dcd954b45ccfdc79a3a7e
GetLK201Mappings is no longer needed.
Signed-off-by: Magnus Kessler <Magnus.Kessler@gmx.net>
commit 6ef46c40e62def4841a4cff4e0b443516a2ed782
Author: Paulo Cesar Pereira de Andrade <pcpa@mandriva.com.br>
Date: Sun Jan 25 19:01:10 2009 -0200
Update xnest keyboard code to match xephyr/kdrive.
Xnest was not updated in the last batch of xkb changes. This
patch is basically cut&paste from hw/kdrive/src/kinput.c and
hw/kdrive/ephyr/ephyr.c, and appears to generate a Xnest as
functional as before the xkb changes.
commit 759348f13ffa02fb1804238189ffce1c92d33e2a
Author: Adam Jackson <ajax@redhat.com>
Date: Thu Jan 22 22:09:11 2009 -0500
Xephyr: Add some rudimentary Xnest command line compat
commit 01ffaf6834fd6a3b1ddbd33d0f0b8d086be0737e
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Mon Jan 19 21:11:05 2009 +1100
Xi: define a range of axis labels.
This is copied from linux/input.h, presumably that's the ones at least the
Linux kernel can give us for any device.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 132b464d734b077038e19b21e46d3a6258f4b998
Author: Adam Jackson <ajax@redhat.com>
Date: Thu Jan 22 02:11:16 2009 -0500
Remove a bunch of useless casts.
We've had void * for twenty years now people let's try to act like we
know how it works.
commit 0fb4390526bb829ab17ff4635d41a3012f63c1b2
Author: Adam Jackson <ajax@redhat.com>
Date: Thu Jan 22 01:13:17 2009 -0500
Remove xorgcfg 'Options' list.
commit b5ece46b76c9182a077141505cc0e788c0fca3ea
Author: Daniel Stone <daniel@fooishbar.org>
Date: Sat Jan 17 20:07:40 2009 +0200
Input: Clarify valuator FatalError messages
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit ddb46c1421a98190313b79621c0f5ae43b97d3f6
Author: Daniel Stone <daniel@fooishbar.org>
Date: Sat Jan 17 20:03:10 2009 +0200
Input: Use previous state in valuator events
Make valuator event state match other events by using the device state
from before processing the event, not after. Also, we already check the
number of valuators in UpdateDeviceState, so no need to do it again.
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 18e51911f5748f9a27a18cd6bb421c899f5b048f
Author: Daniel Stone <daniel@fooishbar.org>
Date: Sat Jan 17 13:44:47 2009 +0200
Input: Add postdown to ButtonClassRec
This mirrors that in KeyClassRec: the state of the buttons as posted to
GetPointerEvents, rather than the state of the buttons as processed by
ProcessOtherEvent and friends.
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit c05f3bc935bef4d98216d38c0e98bd57ced382df
Author: Daniel Stone <daniel@fooishbar.org>
Date: Sat Jan 17 19:35:15 2009 +0200
Input: Don't allow DDX to generate repeat events
We always use soft-repeat at the moment; XKB posts a release/press sequence,
which admittedly needs cleaning up, but that's for another day.
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 6aef4e96affcc26b9415c6bc9c9bebb5af05a1a7
Author: Daniel Stone <daniel@fooishbar.org>
Date: Sat Jan 17 13:42:46 2009 +0200
XKB: Fix logic error
Use logical or instead of bitwise or.
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 0ec9b1069aeeaf66fd104c09f08202f7ebccd170
Author: Daniel Stone <daniel@fooishbar.org>
Date: Sat Jan 10 14:44:28 2009 +0200
XKB: Remove unused XkbProcessOtherEvent
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 7af53799ccefe27b996bdc6073075b7f12353d3a
Author: Daniel Stone <daniel@fooishbar.org>
Date: Sun Jan 4 16:39:18 2009 +1100
Input: Remove unused CoreProcess{Keyboard,Pointer}Event
Everything goes through XKB's Process{Keyboard,Pointer}Event on its way
through to ProcessOtherEvent now, so get rid of the old, useless functions.
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 7c4c00649cae855e141ec9a3667bfe399e3156d0
Author: Daniel Stone <daniel@fooishbar.org>
Date: Thu Jan 1 05:25:52 2009 +1100
XKB: Remove unused DDX functions
They were complete no-ops anyway.
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 4fa3872dc2bcfd6d1fc88d0a94c7071683eea899
Author: Daniel Stone <daniel@fooishbar.org>
Date: Sat Oct 18 20:26:00 2008 +0100
Input: Remove core keysyms from KeyClassRec
Instead of always keeping two copies of the keymap, only generate the
core keymap from the XKB keymap when we really need to, and use the XKB
keymap as the canonical keymap.
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit bc909f71367a02297e725bb5769c2bcadab22395
Author: Daniel Stone <daniel@fooishbar.org>
Date: Tue Aug 12 00:35:56 2008 +0300
Input: Centralise pointer map changing
Replace both core and Xi functions with one function that validates the
proposed map, and sends out both kinds of notification.
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit f06a9d2e05e13466c115fc706966a90b1fb0518e
Author: Daniel Stone <daniel@fooishbar.org>
Date: Sat Oct 18 20:59:30 2008 +0100
Input: Clean up keymap change notifications
Keyboard map notifications are always generated from within XKB code,
which also takes care of copying the keysyms, etc. If you need to
mangle the keymap yourself, generate a new core keymap/modmap, and pass
it to XkbApplyMappingChange.
SendMappingNotify is renamed to SendPointerMappingNotify (and ditto its
Device variants), which still only _sends_ the notifications, as opposed
to also doing the copying a la XkbApplyMappingChange.
Also have the modmap change code traverse the device hierachy, rather
than just going off the core keyboard.
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
commit 1d1a0f67eee330a286fbdef17e967ce8ea201548
Author: Daniel Stone <daniel@fooishbar.org>
Date: Tue Oct 28 16:27:37 2008 +1100
Xi: Introduce XIShouldNotify
XIShouldNotify just lets you know if you should send an event for a
keymap change (or similar) concerning a given device to a given client;
at the moment, this is only for devices which are sending events to that
client.
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit b5242789edb726bb539e4d42fa35bfdaca0025c9
Author: Daniel Stone <daniel@fooishbar.org>
Date: Sat Aug 9 17:02:02 2008 +0300
XKB: Simplify keymap writing a bit
We don't need no temporary variable.
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
commit feb757f384382c7782ceac55f99d54c7caadbd9d
Author: Daniel Stone <daniel@fooishbar.org>
Date: Fri Apr 25 19:54:29 2008 +0300
XKB: Sanitise vmods for redirected keys
Turn two unsigned chars into one unsigned int for both vmods and the
vmod mask. As a bonus, remove broken unused accessor macro for setting
the vmods.
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit b5f49382fe48f0a762d9a15fb10a7d7e1183fc8d
Author: Daniel Stone <daniel@fooishbar.org>
Date: Fri Apr 25 19:52:11 2008 +0300
XKB: Sanitise ctrls action
Turn four unsigned chars into one unsigned long.
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 1bd7fd195d85681e722161f8c636a28f11b40abb
Author: Daniel Stone <daniel@fooishbar.org>
Date: Fri Apr 25 19:50:12 2008 +0300
XKB: Sanitise pointer actions
Turn two unsigned chars into one int.
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 61c508fa78aa08ea2666fde950fbafad95d65056
Author: Daniel Stone <daniel@fooishbar.org>
Date: Fri Apr 25 19:47:16 2008 +0300
XKB: Sanitise vmods in actions
Turn vmods from two unsigned chars into one int.
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 4f3078df2acf07364a17f738bc5c32f9a5962723
Author: Daniel Stone <daniel@fooishbar.org>
Date: Sat Aug 9 16:50:22 2008 +0300
XKB: Add a hell of a lot more FIXMEs
For some reason, we insist on having daft internal representations that
make no sense, that always have to be converted to be used. We should
really sort this one out.
Also, comment the hojillion members of XkbStateRec.
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
commit edeb033f29ae2d52e86c543ccbf22fb7ae1fdb7f
Author: Daniel Stone <daniel@fooishbar.org>
Date: Wed Oct 15 18:07:52 2008 +0100
XKB: Explicitly decode action data
Rather than requiring a one-to-one correspondence between XKM and struct
formats in action data, explicitly fill the action data, so we can break
API.
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 699824a35791735b4b4378adf8648e3aaa599ace
Author: Daniel Stone <daniel@fooishbar.org>
Date: Fri Jul 18 16:41:29 2008 +0300
XKB: Remove descriptions from maprules
We don't use them, as they're not up to the task. We'll get a better
solution someday, promise.
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 1ad80678d88525159e55bb814205fd4eaca060a3
Author: Daniel Stone <daniel@fooishbar.org>
Date: Fri Jul 18 16:29:35 2008 +0300
XKB: Remove support for setting combined keymaps
We don't do full keymaps anymore. Deal.
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 133e0bd6f1cc147a2ddbbe1519d10300e7dbe669
Author: Daniel Stone <daniel@fooishbar.org>
Date: Fri Jul 18 16:27:57 2008 +0300
XKB: Remove 'extra' functionality from rules parsing
When we find something weird in the rules, don't stash it as an extra
freeform component, just state that the rules file is likely broken and
move on with our lives.
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit cc5c6d628aa0dc87c2cc9d063972e09ad747a596
Author: Daniel Stone <daniel@fooishbar.org>
Date: Fri Apr 25 18:45:37 2008 +0300
XKB: Remove unsupported Xi operation flags
We support every XKB operation on Xi devices, so always report that we
support everything, and that nothing is ever unsupported.
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 32db27a7f867b503c2840ca7b815e96d10be9210
Author: Daniel Stone <daniel@fooishbar.org>
Date: Thu Apr 17 12:42:01 2008 -0700
Input: Remove modifierMap from core
We already have modmap (in the exact same format!) in XKB, so just use
that all the time, instead of duplicating the information.
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit f062e90a95f9b7ae5458ef2100615e8ace9b66a7
Author: Daniel Stone <daniel@fooishbar.org>
Date: Wed Apr 16 19:15:30 2008 +0300
Input: Remove modifierKeyMap
Since modifierKeyMap is generated from modifierMap, just remove it, and
only generate it when we need to send the modifier map to the client.
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit cf6a2fc2bd94b392cfea120444d5e032d26f1d37
Author: Daniel Stone <daniel@fooishbar.org>
Date: Sun Mar 30 17:25:39 2008 +0300
Input: Ignore modifiers in core input processing
Modifiers get cleared by the XKB code when we drop down into core input
processing, so just delete the dead code path to simplify things a bit.
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 6727ee94086d238f9f99379280d4e4827f388cce
Author: Daniel Stone <daniel@fooishbar.org>
Date: Sat Aug 9 16:45:45 2008 +0300
Input: Remove state from KeyClassRec
We already have state fully stored within XKB, so instead of duplicating it,
just generate the values to send to clients when required.
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 08363c5830bdea34012dcd954b45ccfdc79a3a7e
Author: Daniel Stone <daniel@fooishbar.org>
Date: Fri Dec 26 18:38:25 2008 +1100
Input: Overhaul keyboard initialisation process
XkbInitKeyboardDeviceStruct is now the only valid keyboard
initialisation: all the details are hidden behind here. This now makes
it impossible to supply a core keymap at startup.
If dev->key is valid, dev->key->xkbInfo->desc is also valid.
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 40877c6680863bd6a8475f2bb0c54df55bcf0b0e
Author: Daniel Stone <daniel@fooishbar.org>
Date: Tue Mar 18 10:05:57 2008 +0200
XKB: Make XKB mandatory
No more #ifdef XKB, because you can't disable the build, and no more
noXkbExtension either.
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit f9da417163b6b2d6234d2542c1f375e33db7159a
Author: Daniel Stone <daniel@fooishbar.org>
Date: Fri Mar 28 19:26:42 2008 +0200
Xephyr: Disable state inheritance hack
Prepare for the impending removal of the state field by disabling this hack
for a while: it's hell of nasty and I'm amazed it ever really worked.
Basically, on focus out, it should do as current DDXes do and fake releases
for all keys (not just mangle the core state) that are currently down;
buttons too. When focus comes back in, we already have a KeymapNotify that
lets us know what's currently down, so we can use this to fake the
appropriate keypresses, and send it through the event routing layer.
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
commit 5c281446d2a8c38511d45baee6f0d25a640f12e1
Author: Daniel Stone <daniel@fooishbar.org>
Date: Fri Mar 28 11:56:34 2008 +0200
XKB: Remove lock actions disabling
For some reason, XKB allows clients to set a global (!) flag that simply
turns lock keys into state no-ops. Ignore this flag.
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
commit 2f7cb7306709d5266688e05a066701d309323035
Author: Daniel Stone <daniel@fooishbar.org>
Date: Fri Dec 26 18:36:30 2008 +1100
XKB: Add XkbRMLVOSet
XkbRMLVOSet is just a set of strings for rules, model, layout, variant
and options; use that in preference to XkbRF_VarDefsRec, which is a
hideously complicated monster that somehow managed to not include the
actual rules.
While we're at it, clean up xkbrules.h so it doesn't require xkbstr.h.
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
commit 3208eff2d7b856a4ac0d650498ccb36e7e62e034
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Wed Jan 21 14:45:06 2009 -0800
Update xorg-server.h.in & Xnest to use new XKB default #defines
commit cdf216aa17b776130a91fa6792c321620e810a18
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Tue Jan 20 16:50:43 2009 -0800
Fix XKB default configure options to use the right variables
commit 0d3c3dad21857ef502fe0d0235620a1228248e13
Author: Adam Jackson <ajax@redhat.com>
Date: Tue Jan 20 23:46:48 2009 -0500
Don't include fontmod.h
commit 4f004ab9a83e209943760e1faa39f06c8eeb27af
Author: Benjamin Close <Benjamin.Close@clearchain.com>
Date: Thu Jan 22 01:36:31 2009 +1030
XNest: Fix the build caused by __XKBDEFRULES__ -> XKB_DFLT_RULES in 23862ede59a9ce11a06ec5151bde460fb836c603
commit e45a8a498d1ee8e40fc334805c38c05cb04b49d0
Author: Adam Jackson <ajax@redhat.com>
Date: Tue Jan 20 22:07:07 2009 -0500
Remove CreateUnclippedWinSize from window.h
This is utterly wrong, but then, so is sdksyms.sh
commit 20d2117eb82fb7ce91afd4f01fe1b9d4b1bf0459
Author: Adam Jackson <ajax@redhat.com>
Date: Tue Jan 20 00:17:42 2009 -0500
Move CreateUnclippedWinSize to mbuf
It's the only user, so.
commit e1611d8d55ade35bf8c2e1da7bc2dbf05b011301
Author: Daniel Stone <daniel@fooishbar.org>
Date: Thu Nov 27 13:34:05 2008 +1100
XKB: Be more verbose about XkbCopyKeymap failure in debug mode
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 5ee504cae5f17d16ee7599beaa4b1944a9a8aee6
Author: Daniel Stone <daniel@fooishbar.org>
Date: Thu Nov 27 13:31:18 2008 +1100
XKB: Trying to copy to the same keymap is not fatal
Humour the user if they run XkbCopyKeymap(foo, foo).
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit d929ba6886c6f121b101c0bf0f7c63ef9d851a3e
Author: Daniel Stone <daniel@fooishbar.org>
Date: Fri Dec 26 18:32:41 2008 +1100
XFree86: Input: Fail NIDR if we can't enable devices
If we can't enable a device, bail out of NewInputDeviceRequest rather than
blithely continuing. Also, be more verbose when initialization failed. Also,
be more verbose when initialization failed. Also, be more verbose when
initialization failed. Also, be more verbose when initialization failed.
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 534669b376a6a703fbc97269d279a5418cf60c98
Author: Daniel Stone <daniel@fooishbar.org>
Date: Sun Jan 4 16:24:44 2009 +1100
XKB: Remove unnecessary prototype
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 27ea1a7e4e7eca394e052791c64bc6be515e075e
Author: Daniel Stone <daniel@fooishbar.org>
Date: Sun Jan 4 16:40:46 2009 +1100
XKB: Only Xi events are processed
Core events aren't run through these functions, so don't bother testing
for them.
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 2762cafc321166ac48f80146720709b1011e6894
Author: Daniel Stone <daniel@fooishbar.org>
Date: Thu Nov 27 13:35:42 2008 +1100
XkbCopyKeymap: inputInfo.keyboard is not a special case
The device-walking code is still depressing, though.
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 07c3bb922b8c1ae8fe28198f6c451430b836f21e
Author: Daniel Stone <daniel@fooishbar.org>
Date: Sun Jan 4 14:12:19 2009 +1100
XKB: Move XkbCopyKeymap definition to xkbsrv.h
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 4f35a34f3cd3df3c8af129936d1808dcc063d8a7
Author: Peter Hutterer <peter.hutterer@redhat.com>
Date: Thu Aug 14 17:26:02 2008 +0930
dix: Remove traces of CoreDevicePrivateKey
Obsolete with MPX.
Signed-off-by: Peter Hutterer <peter.hutterer@redhat.com>
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
commit 58a6b5b9eff25b1b9c6de239d6f5a952a31dfd15
Author: Peter Hutterer <peter.hutterer@redhat.com>
Date: Thu Aug 14 17:21:28 2008 +0930
Xi: don't care about CoreDevicePrivateKey when copying keys
If we get here, we must copy.
Signed-off-by: Peter Hutterer <peter.hutterer@redhat.com>
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
commit 23862ede59a9ce11a06ec5151bde460fb836c603
Author: Daniel Stone <daniel@fooishbar.org>
Date: Sat Jan 10 14:36:16 2009 +0200
XKB: Allow build-time configuration of XKB defaults
Instead of hardcoding base/pc105/us, allow users to change the defaults at
./configure time. Change the default model to be evdev on Linux.
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
commit 57a5eb2583bdf1069861fe2184de9739c0d0c7c1
Author: Colin Harrison <colin.harrison@virgin.net>
Date: Sun Jan 4 17:40:54 2009 +0000
Xming: Update .rc file to tidy About and Exit dialogs
Tidy up About and Exit dialogs, add keyboard accelerators
Copyright (C) Colin Harrison 2005-2008
http://www.straightrunning.com/XmingNotes/
http://sourceforge.net/projects/xming/
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
commit df3f701ef2d41ff4be4839f473ae71d33777bea3
Author: Colin Harrison <colin.harrison@virgin.net>
Date: Sun Nov 2 20:17:23 2008 +0000
Xming: Ensure we dont try to print a null value when displaying xkb configuration
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
commit c612f0df45d388c98108e1e0c80afdfae05e338e
Author: Colin Harrison <colin.harrison@virgin.net>
Date: Sun Nov 2 20:46:41 2008 +0000
Xming: Add styles keyword and attributes.
Add handling for style keyword and atttributes in .XWinrc
Update man page to document these additions
Copyright (C) Colin Harrison 2005-2008
http://www.straightrunning.com/XmingNotes/
http://sourceforge.net/projects/xming/
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
commit 847a91ad2e8c9b0992c09f0ec38466885d6d25d4
Author: Colin Harrison <colin.harrison@virgin.net>
Date: Sun Jan 4 19:57:56 2009 +0000
Xming: Notify X when the keyboard focus is lost to a pure Windows window in -multiwindow mode.
Fix internal WM to notify X when the keyboard focus is lost to a pure Windows window in -multiwindow mode.
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
commit 6c3e7e4d0568ecb7d10b814593bbbd817b7d2aab
Author: Colin Harrison <colin.harrison@virgin.net>
Date: Sun Jan 4 18:28:34 2009 +0000
Xming: Only allow WM_MOUSEWHEEL messages to act on the client area of a focused window.
Fix internal WM so it only allows WM_MOUSEWHEEL messages to act on the client area of a focused window.
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
commit d84e0e387764236c7e97509baf4606d96cfc19d4
Author: Colin Harrison <colin.harrison@virgin.net>
Date: Sun Jan 4 18:20:44 2009 +0000
Xming: Correctly parent XA_WM_TRANSIENT_FOR windows in -multiwindow mode when a windows window is created.
Fix internal WM to correctly parent XA_WM_TRANSIENT_FOR windows in -multiwindow mode when a windows window is created,
and to de-iconize parent windows when a child window acquires focus.
XXX: Perhaps we should also shuffle parent(s) forward through Z-order when a child acquires focus?
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
commit 8d82d806ee38d45ec7cdbf8b1f671ec1e4437567
Author: Colin Harrison <colin.harrison@virgin.net>
Date: Sun Nov 2 20:46:38 2008 +0000
Xming: Correct the way display and screen number is reported in window titles and tooltips
Correct the tooltip text for the toolbar X icon to be strictly correct, 'display-number:screen' should be ':display-number.screen'.
Also for the default window title.
Adjust the style of the Windows title in XDMCP mode from 'Xming - hostname' to 'hostname:display-number.screen'.
Copyright (C) Colin Harrison 2005-2008
http://www.straightrunning.com/XmingNotes/
http://sourceforge.net/projects/xming/
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
commit 656f92e247f2f257105daf1e0e6998e1b3d10eba
Author: Jon TURNEY <jon.turney@dronecode.org.uk>
Date: Sun Nov 2 20:17:02 2008 +0000
Cygwin/X: should also use GetTickCount(), just like Xming
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
commit 7f781e780ee2b261c5cb688a8e6c5dc1a53bdb6f
Author: Yaakov Selkowitz <yselkowitz@users.sourceforge.net>
Date: Wed Dec 17 19:13:30 2008 +0000
Cygwin/X: Cygwin doesn't have RTLD_LOCAL
RTLD_LOCAL is not defined on Cygwin
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
commit 5630ff809676ab6b4833757060e48e201e8768a5
Author: Dan Nicholson <dbn.lists@gmail.com>
Date: Mon Dec 22 13:53:43 2008 -0800
Ignore generated dmx manpages
Signed-off-by: Dan Nicholson <dbn.lists@gmail.com>
commit 64f924fbf513b5f91b3f2bcf5767f6fe927d3f7a
Author: Dan Nicholson <dbn.lists@gmail.com>
Date: Mon Dec 22 13:43:30 2008 -0800
Kill off --with-mesa-source completely
There were a few spots left in the source that were using the
--with-mesa-source defined headers or the now removed $(top_srcdir)/GL
directory. These aren't needed anymore as all the necessary source for
GLX is in $(top_srcdir)/glx.
Signed-off-by: Dan Nicholson <dbn.lists@gmail.com>
commit e1c8ee215797fa8c6a3a5421bb6f99b58064248b
Author: Dan Nicholson <dbn.lists@gmail.com>
Date: Sun Dec 14 14:18:58 2008 -0800
Don't reuse PKG_CHECK_MODULES identifiers
Using GL for the PKG_CHECK_MODULES identifier multiple times means only
the first call will actually be used. Later calls will be skipped due to
GL_CFLAGS and GL_LIBS already being set. This changes DRI to using a
different identifier and DMX to just reusing GL_CFLAGS.
Signed-off-by: Dan Nicholson <dbn.lists@gmail.com>
commit ca46c01869768a8661a9d8a71493ed5f0760a8ab
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Fri Jan 16 13:58:20 2009 -0800
XQuartz: mieq: Wait for the server to finish initializing before letting other threads mieqEnqueue
Avoid possible race condition whereby one thread might call mieqEnqueue before InitAndStartDevices finishes
(cherry picked from commit 94e417ac87a98cd5c6bf2d7c495d702748398931)
commit b33905234025f005819c7e2acd653a3a0ecfeb82
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri Jan 9 14:32:14 2009 +1000
xfree86: always force RAW mode under linux.
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>
commit 646add4eb47c01c045ef64405510a08ecfb5bfd6
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri Jan 16 16:04:07 2009 +1000
dix: remove XineramaCheckMotion, merge into CheckMotion.
For 5 lines difference, we don't need to duplicate the whole function. really.
commit e76f904abe530df9ddaa09510088c545298b0b91
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri Jan 16 15:53:50 2009 +1000
dix: remove "notyet" conditional compilation.
If it's "notyet" for 3 years, then "yet" won't arive anytime soon.
commit 5c41b3f9c8b72f0115019237f812d74610b82c24
Author: George Staplin <gstaplin@apple.com>
Date: Mon Jan 12 19:30:43 2009 -0700
XQuartz: xpr: Cleanup some of the code and possibly fix part of the GLX 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)
commit c5d52d4c37ebec92cb668b0653bf3de2bdfc5782
Author: George Staplin <gstaplin@apple.com>
Date: Mon Jan 12 14:14:44 2009 -0700
XQuartz: GL: Make indirect.c build and work in the 1.6 branch.
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)
commit 1c504dff8a84804888f18ee9b184f0c4584185d7
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Thu Jan 15 21:03:27 2009 -0800
XQuartz: Fix builddir != srcdir issues and undef _XSERVER64 where appropriate on fat binary compilation
commit 717a961528ec69a6e630d536e15568670e0b398a
Author: Thomas Jaeger <ThJaeger@gmail.com>
Date: Sat Dec 20 16:17:02 2008 +0100
Don't release grabs unless all buttons are up
Previously, only buttons <= 5 would count here, but the core protocol
allows for 255 buttons.
http://lists.freedesktop.org/archives/xorg/2009-January/042092.html
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit f7f85f696570541e2dd43462675de9e6ee46f545
Author: Thomas Jaeger <ThJaeger@gmail.com>
Date: Mon Dec 22 00:55:09 2008 +0100
Count the number of logically down buttons in buttonsDown
This fixes the following bug. Assuming your window manager grabs
Alt+Button1 to move windows, map Button3 to 0 via XSetPointerMapping,
then press the physical button 3 (this shouldn't have any effect), press
Alt and then button 1. The press event is delivered to the application
instead of firing the grab.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 6f065a26db62aaf1d7aab9f9a3d0e6cd09d1c1dd
Author: Colin Harrison <colin.harrison@virgin.net>
Date: Thu Jan 15 21:42:26 2009 +0000
Xming: Reduce MOUSE_POLLING_INTERVAL
Reduce MOUSE_POLLING_INTERVAL from 500ms to 50ms
In -multiwindow mode, this determines how quickly X windows can track the mouse
when it is outside any X window... Move the cursor around an xeyes, and you will
see what this timing effects.
commit c745db1674c3cb55249c9eb6e74939b74c42409c
Author: Jon TURNEY <jon.turney@dronecode.org.uk>
Date: Mon Jan 5 13:52:45 2009 +0000
GLX: Avoid a crash when we have an uninitialized GL context
If the GL dispatch table pointer points to glapi_noop_table,
(due to some kind of GL initialization failure), DoGetString(GL_VERSION)
(for example as invoked by glxinfo) will crash as it tries to
do atof() on the null pointer returned by the noop dispatch function
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
commit e30032d0bbbf0bf71e1b53a4ac388f3bd6f68e53
Author: Peter Hutterer <peter.hutterer@redhat.com>
Date: Mon Dec 1 21:14:01 2008 +1000
Xext: clean up XGE macros.
Signed-off-by: Peter Hutterer <peter.hutterer@redhat.com>
commit 1ae529bef50a8ccc4a8a264ed120aeae544b21e7
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Wed Jan 14 14:56:10 2009 +1000
dix: replace manual check for event types with IsPointerEvent()
commit 1d54479cb3c8b4f75b7564f8b5e1c5da940b20f4
Author: Simon Thum <simon.thum@gmx.de>
Date: Tue Nov 25 14:12:02 2008 +1000
xfree86: init properties when ptraccel configuration is found.
Signed-off-by: Peter Hutterer <peter.hutterer@redhat.com>
Signed-off-by: Simon Thum <simon.thum@gmx.de>
commit 19275ea8e9dd93d5e61906943706dfe49003dd9c
Author: Simon Thum <simon.thum@gmx.de>
Date: Wed Nov 19 16:01:21 2008 +1000
dix: add property support for pointer acceleration.
Note: properties don't need to be cleaned up, the DIX does it for us anyway.
Data that is stored in properties is cleaned up by the property system.
Handlers, etc. don't need to be unregistered while cleaning up, as they get
deleted when the device is removed anyway.
Signed-off-by: Peter Hutterer <peter.hutterer@redhat.com>
Signed-off-by: Simon Thum <simon.thum@gmx.de>
commit d645721170b1196e5064b397cfbffd1da8c79bb1
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu Jan 8 11:53:30 2009 +1000
mi: ensure chained button mappings from SD -> MD (#19282)
After copying the master event, flip the detail field to the mapped button of
the SD, not the physical button. This way if the SD has a mapping 1:3 and the
MD has a mapping of 3:4, a press on button 1 on the SD results in a core event
on button 4.
X.Org Bug 19282 <http://bugs.freedesktop.org/show_bug.cgi?id=19282>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 639f289dcdbe00a516820f573c01a8339e120ed4
Author: Michel Dänzer <daenzer@vmware.com>
Date: Tue Jan 13 13:05:32 2009 +0100
EXA: Declare glyph cache picture as component-alpha when necessary.
Without this, rendering component-alpha glyphs may break without a mask.
Fixes http://bugs.freedesktop.org/show_bug.cgi?id=19233 .
commit f4e00b783d3f824058a5f140e6462142688f5116
Author: Michel Dänzer <daenzer@vmware.com>
Date: Tue Jan 13 11:03:27 2009 +0100
Fix build with --enable-visibility --disable-xdmcp.
commit d36adf52a2b2711d22b11105f7bd907d4493fb9b
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Mon Jan 12 15:29:36 2009 +1000
dix: fix WarpPointer calls for devices with custom valuator ranges (#19297)
If the MD's lastSlave was a devices with custom axes ranges, then a
WarpPointer would position the cursor at the wrong location. A WarpPointer
request provides screen coordinates and these coordinates were scaled to the
device range before warping.
This patch consists of two parts:
1) in the WarpPointer handling, get the lastSlave and post the event through
this device.
2) assume that WarpPointer coordinates are always in screen coordinates and
scale them to device coordinates in GPE before continuing. Note that this
breaks device-coordinate based XWarpDevicePointer calls (for which the spec
isn't nailed down yet anyway) until a better solution is found.
X.Org Bug 19297 <http://bugs.freedesktop.org/show_bug.cgi?id=19297>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 488d45295105daf10ccd17ca93ae6a6f4d0104f1
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Mon Jan 12 16:16:24 2009 +1000
dix: EnqueueEvent and PlayReleasedEvent need to handle DeviceMotionNotifies
No MotionNotify events in the processing anymore, so let's have them treat DMN
instead.
Reported by Thomas Jaeger.
commit 1e470645983ad18fa38c0885d674bc9d1dc1e560
Author: Julien Cristau <jcristau@debian.org>
Date: Tue Jan 13 00:12:56 2009 +0100
require randrproto 1.2.99.3
commit a48c81dcdf569a3f634ac23e08d2491354de6a36
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri Dec 5 16:24:57 2008 +1000
Xi: add XATOM_FLOAT to server-defined properties.
This property is used to denote type float for input properties. Such
properties can be accessed easily through the XIPropToFloat() function.
Code originally written by Simon Thum.
Signed-off-by: Peter Hutterer <peter.hutterer@redhat.com>
commit 669f6810af9a89187d6149841925fe765f3988ff
Author: Peter Hutterer <peter.hutterer@redhat.com>
Date: Wed Nov 19 15:50:57 2008 +1000
Xi: add XIPropToInt() auxiliary function.
Converts an XIPropertyValuePtr to an integer, provided that type and format is
right.
Code originally written by Simon Thum.
Signed-off-by: Peter Hutterer <peter.hutterer@redhat.com>
commit 56efbc0986e782da45addb05ece9f456d41d7a90
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri Jan 9 13:46:20 2009 +1000
dix: drop x/y back into last.valuators before updating the history (#19285)
positionSprite needs to scale to screen coordinates and in the process of
doing so alters dev->last.valuators[0:1]. Drop the real coordinates back after
finishing and before updating the motion history. This way, we don't push the
screen coordinates into the motion history.
X.Org Bug 19285 <http://bugs.freedesktop.org/show_bug.cgi?id=19285>
commit 67710ad1d172cc4d53e28e5cc7dab2efb57a9a85
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Sun Jan 11 16:34:36 2009 -0800
XQuartz: Don't need explicit Activate/EnableDevice in InitInput
(cherry picked from commit b1d29784410b3b93037e5636f336ba608d8ad6e3)
commit dde5c591be74139ec6f2a90a3fdc7904d7342554
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Sun Jan 11 16:10:45 2009 -0800
mieq: Avoid possible race condition whereby one thread might call mieqEnqueue before InitAndStartDevices finishes
This is more of a hack around the problem. This is something that will need to be addressed in a
more structured manner with the multi threaded input efforts.
(cherry picked from commit 3c596c061e75848cfa76dd9259c23a3f3a67444c)
commit 0720816aea20971ee94b5df3faa9cb9f16e93f82
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Sun Jan 11 14:49:39 2009 -0800
XQuartz: Only call DarwinUpdateModKeys when needed
Previously, we were calling it on almost every itteration through sendX11Event
(cherry picked from commit 6461729647ff4441d80811e73f0c0d2f108f2700)
commit c8bf582db8111f71b9250a602a9d5aa7bd828136
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Thu Oct 23 11:41:22 2008 -0700
XQuartz: Comment explaining the 0x10 flag for [e data2]
(cherry picked from commit 3c695280641c1205b97d3bb9f1d5e15a19cfa45f)
commit 5339c22a8ca8bce6cd2b51e97c904292e7c40e74
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Sun Jan 11 01:56:45 2009 -0800
XQuartz: Add locking to make mieq thread safe on OSX
(cherry picked from commit 7a8d2266861e74176b5310b83652a9c10a170494)
commit 1beff89810cd193e45d437846929b3938cee6d96
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Sun Jan 11 01:55:26 2009 -0800
XQuartz: misc 1.6 updates (still --disable-glx)
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)
commit 2d917cfe56af1e74205f80ddbaddfb5c6ce82f0a
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Sat Jan 10 01:39:08 2009 -0800
Apple: Don't use DRI2
(cherry picked from commit a1d35cee5907a76977ee43c49cb55c8f411c9794)
commit 7a8abb9c8554d7967d912dcd427804f65906dc5c
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Tue Jan 6 15:32:44 2009 -0800
XQuartz: Bundle version 2.4.0
(cherry picked from commit 3a3ccf5354e4275abe9d01f41a92602df5d690dc)
commit 63ff7d236f67e159943312e1a551fcf5bb3f463a
Author: Julien Cristau <jcristau@debian.org>
Date: Sun Jan 11 08:45:24 2009 +0100
os: don't mix declarations and code
commit f43a3c61ab1eab8aecdc0e4bdee9f3bae2cab234
Author: Julien Cristau <jcristau@debian.org>
Date: Sun Jan 11 08:44:53 2009 +0100
os: backtrace() returns int, not size_t
commit 5321ae76cffc5fcfe4bebcfb10e08eecaf640503
Author: Julien Cristau <jcristau@debian.org>
Date: Sun Jan 11 08:44:29 2009 +0100
os: ANSI cleanups
commit 47438a2161a92fec08081d2de28966cf8d31654a
Author: Julien Cristau <jcristau@debian.org>
Date: Sun Jan 11 08:43:48 2009 +0100
randr: RRSetPrimaryOutput can be static
commit 7f82114b1dc738f98b9f22f6e61d6d5191383b67
Author: Julien Cristau <jcristau@debian.org>
Date: Sun Jan 11 08:43:35 2009 +0100
xkb: ANSI cleanup
commit 46f3c1b937002f9a860878b359dcf5756a82dcf2
Author: Julien Cristau <jcristau@debian.org>
Date: Sun Jan 11 08:42:57 2009 +0100
mi: don't mix declarations and code
commit 5aa9483d3ee306a79a9235610ce6b2754d697585
Author: Julien Cristau <jcristau@debian.org>
Date: Sun Jan 11 08:42:28 2009 +0100
mi: ANSI cleanups
commit 359ed32c9b013ed88e14c99aa7fd7a617a85e2c5
Author: Julien Cristau <jcristau@debian.org>
Date: Sun Jan 11 08:40:58 2009 +0100
xnest: only define ddxBeforeReset if needed
commit 9651cd8d7ac26635b6fb1826806ac9f4e2bddb63
Author: Julien Cristau <jcristau@debian.org>
Date: Sun Jan 11 08:40:47 2009 +0100
xnest: ANSI cleanups
commit 31439195c51f183f5a8989a8d4f95b3e6326eda0
Author: Julien Cristau <jcristau@debian.org>
Date: Sun Jan 11 08:37:06 2009 +0100
xfree86: linuxPci.c needs a prototype for xf86AccResFromOS
commit a00dbd0015845e08ef2af9480cc3833819cf86f5
Author: Julien Cristau <jcristau@debian.org>
Date: Sun Jan 11 08:36:16 2009 +0100
xfree86: use %zu to format size_t arguments
commit 17c8cb50990a9ad20bbd3f8ce14c149dac9d72ad
Author: Julien Cristau <jcristau@debian.org>
Date: Sun Jan 11 08:34:56 2009 +0100
xfree86: don't mix declarations and code
commit aec4c0caca41a06832536ba82ba5bcdccf4a0aea
Author: Julien Cristau <jcristau@debian.org>
Date: Sun Jan 11 08:33:18 2009 +0100
xfree86: ANSI cleanups
commit dba3b1944d04232f88bb310277639f2c1adcbe08
Author: Julien Cristau <jcristau@debian.org>
Date: Sun Jan 11 08:28:23 2009 +0100
Xvfb: ANSI cleanups
commit a2a760e33c17e211650b1f53c05a89c013916cf3
Author: Julien Cristau <jcristau@debian.org>
Date: Sun Jan 11 08:25:39 2009 +0100
dix: don't mix declarations and code
commit 466dddbb83aa37ae93fb32976d51ecaa947c3616
Author: Julien Cristau <jcristau@debian.org>
Date: Sun Jan 11 08:25:17 2009 +0100
dix: fix cast from pointer to integer
commit 54332e4732577dc49e440d9c9f8dd7d791f03f8e
Author: Julien Cristau <jcristau@debian.org>
Date: Sun Jan 11 08:20:06 2009 +0100
dix: ANSI cleanups
commit ef9902652b8a1c716ea3851565d6e2a98bd30eb0
Author: Julien Cristau <jcristau@debian.org>
Date: Sun Jan 11 08:18:56 2009 +0100
config: ANSI cleanups
commit e64473b14e091e4b75e6ac2bf9a35e9aaa907258
Author: Julien Cristau <jcristau@debian.org>
Date: Sun Jan 11 08:17:41 2009 +0100
Xi: fix missing declaration of XkbSetRulesDflts
commit 6e20a4ae731b7bc72266e5809faa0ecfde2bdfe4
Author: Julien Cristau <jcristau@debian.org>
Date: Sun Jan 11 08:16:55 2009 +0100
xsync: make SyncAlarmCounterDestroyed static
commit 292311b421e53ead53c7df67d735a3d6d3e5b515
Author: Julien Cristau <jcristau@debian.org>
Date: Sun Jan 11 08:16:12 2009 +0100
Xext: ANSI cleanups
commit 7a05c8b1e70680ddd3b3e09ad448788f8d70a428
Author: Julien Cristau <jcristau@debian.org>
Date: Tue Dec 23 13:08:49 2008 +0100
xfree86/linux: fix log flood on acpid open error
When we can't open the acpid socket, warn once, not once every second
commit 0d8184de591c75794083c8a8ca3fb8459e9394bc
Author: George Staplin <gstaplin@apple.com>
Date: Fri Jan 9 16:08:26 2009 -0700
XQuartz: GL: Set the __GLXconfig renderType to GLX_RGBA_BIT.
(cherry picked from commit 3c14546f58f8a138fe67c9cacc3bd0b7fa90c29a)
commit 9c3975d63e129ad7230cae585f08a962d45fb861
Author: George Staplin <gstaplin@apple.com>
Date: Fri Jan 9 15:53:39 2009 -0700
XQuartz: GL: Make many more fbconfigs and visuals available for the 1.5 branch.
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)
commit a68373994f4957a73f4eab52c90ebcfb96f285f8
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Wed Jan 7 18:27:21 2009 -0800
XQuartz: Update padding in appledristr. This shouldn't change how the struct ends up in memory, but should make it more obvious for human eyes
(cherry picked from commit f7b6c1907c326a1befd8b5c8a1d311d551e8670f)
commit 5f3188228eb988bd8f08b62c84f98a8ff66ee283
Author: Xiang, Haihao <haihao.xiang@intel.com>
Date: Tue Jan 6 10:03:19 2009 +0800
avoid a potential endless loop.
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.
commit b2756a71a432f7cf7c870a48676c98625512558d
Author: Thomas Jaeger <ThJaeger@gmail.com>
Date: Fri Jan 9 02:02:38 2009 -0500
Xext: Send out correct events in ProcXTestFakeInput
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 9bf77569cc8f9b0cc25c99487672d375d7c32f99
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu Jan 8 16:32:24 2009 +1000
Xi: call CheckMotion for floating SDs too.
CheckMotion updates the sprite position so we need to call it for all devices
that have a sprite - including floating SDs (which have an invisible sprite).
commit 83eb863e3cfcd62549b836f3195107d8908b36d0
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri Jan 9 11:39:02 2009 +1000
Xext: don't accept DeviceValuator if the dev doesn't have valuators (in xtest)
Reported by Chris Ball.
commit a3f9e887d9ff5fdee6c35ccc0f7b324723a83a46
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri Jan 9 11:40:18 2009 +1000
dix: don't accept Button 0 presses in GPE.
commit 0c6987df3b9b3a37d201d740d8248c326449835e
Author: Adam Jackson <ajax@redhat.com>
Date: Tue Jun 17 16:10:51 2008 -0400
XAA: Disable offscreen pixmaps by default.
Say Option "XaaOffscreenPixmaps" to turn them back on.
Apropos of bugs #13795 and #15098. But this still isn't correct.
commit eb2d7b3d700952ba88c77deacf687b251300e660
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri Dec 19 21:05:47 2008 +1000
dix: move focus handling into enterleave.c.
This commit moves the focus handling from events.c into enterleave.c and
implements a model similar to the core enter/leave model.
For a full description of the model, see:
http://lists.freedesktop.org/archives/xorg/2008-December/041740.html
This commit also gets rid of the focusinout array in the WindowRec, ditching
it in favour of a local array that keeps the current focus window for each
device.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 673eb23aac578dcdc04e2a99d1fa5c2987eb58b8
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri Dec 19 21:05:09 2008 +1000
dix: add a few auxiliary functions for the updated focus model.
SetFocusIn and SetFocusOut, including the static array to keep all focus
windows.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 38b28dcadd0990cb43f50db4300eebb8f044db96
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu Dec 18 15:55:11 2008 +1000
dix: reduce FirstPointerChild complexity
Instead of keeping a flag on each window for the devices that are in this
window, keep a local array that holds the current pointer window for each
device. Benefit: searching for the first descendant of a pointer is a simple
run through the array.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 72ad4a85cc0ffe60a90011d65ef718d5852beae4
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu Dec 18 15:43:18 2008 +1000
dix: remove now unused "exclude" parameter from FirstPointerChild
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 0aa4460c3b4f9bb17d5412d76fa8c4c501132429
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Wed Dec 17 16:14:41 2008 +1000
dix: re-implement enter/leave model.
The old model was implemented based on a misunderstanding of NotifyVirtual and
NotifyNonlinearVirtual events. It became complicated and was broken in some
places [1]. This patch wipes this model completely.
A much simplified implementation is provided instead. Rather than a top-down
approach ("we have a tree of windows, which ones need to get which event")
this one uses a step-by-step approach. For each window W between A and B
determine the pointer window P as perceived by this window and determine the
event type based on this information. This is in-line with the model described
by Owen Taylor [2].
[1] http://lists.freedesktop.org/archives/xorg/2008-December/041559.html
[2] http://lists.freedesktop.org/archives/xorg/2008-August/037606.html
commit f8ecc2f08fc375b14d60a74e2fdd7830bfdcd74f
Author: Christian Beier <beier@informatik.hu-berlin.de>
Date: Tue Jan 6 11:31:03 2009 +1000
Xi: fix typo in WarpDevicePointer handling.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 3d549438c29004d78032ecc50ab45ca0e3f49623
Author: Thomas Jaeger <thjaeger@gmail.com>
Date: Mon Jan 5 01:26:42 2009 -0500
Don't alter device button maps in DoSetPointerMapping
Currently, if a device map differs from the core pointer map, then the
request may return MappingBusy, even though all the affected core
buttons are in the up state.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit b72c6b083baeadfd7b18b6025df054be502d6e28
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Tue Jan 6 09:01:48 2009 +1000
dix: remove inputInfo.keyboard reference in QueryPointer handling.
PickKeyboard() is to be used instead.
commit 30d2cfcd3851870178d62e5067211aa36f87fbd2
Author: Kim Woelders <kim@woelders.dk>
Date: Mon Jan 5 19:35:18 2009 +0100
dix: Fix handling of do_not_propagate_mask window attribute.
This was broken in 32aa252e988be8cbfd4f7e373fb7b7736ef1f5f2.
Signed-off-by: Kim Woelders <kim@woelders.dk>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 515ce3e4ba42605a1ee9979e8bb5acd3cf6470a3
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Mon Jan 5 15:48:45 2009 +1000
xkb: fix typo - missing negation when checking button state.
Introduced with a85f0d6b98237d8a196de624207acf1983a1859a.
Reported by Thomas Jaeger.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 9a313fb03153eb764aab3e9cb9988b6603541637
Author: Paulo Cesar Pereira de Andrade <pcpa@mandriva.com.br>
Date: Wed Jan 7 23:07:01 2009 -0200
Don't call free, use xfree macro.
There are several other direct calls to free, check
% egrep '\<free\(' `find . -name \*.c`
but they are free'ing memory from explicit malloc calls.
This one was not intended, and corrected, so that it would
both, follow the conventions everywhere (and work on some
libc that doesn't like free(0)), and make it easier to use
malloc wrappers.
commit 49b93df8a3002db7196aa3fc1fd8dca1c12a55d6
Author: Paulo Cesar Pereira de Andrade <pcpa@mandriva.com.br>
Date: Wed Jan 7 19:37:03 2009 -0200
Default to use standard bitmap fonts, with builtins as fallback
The builtin-fonts configure option was removed, as it at best should
have been a runtime option. Instead, now it always register all "font
path element" backends, and adds built-ins fonts at the end of the
default font path.
This should be a more reasonable solution, to "correct" the most
common Xorg FAQ (could not open default font 'fixed'), and also don't
break by default applications that use only the standard/historical
X Font rendering.
commit 4f004231871c830e16c4525cfaab183fad0aee86
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Wed Jan 7 10:55:08 2009 -0800
XQuartz: Fat binary buildfixes
Let Xarch.h set X_BYTE_ORDER for us.
Determine _XSERVER64 at build time.
(cherry picked from commit f54736c2b0b537c8322ecb2db8e9cee5eea68165)
commit fbf44d85bd59bfa629193d6494b16812a7343cab
Author: Jon TURNEY <jon.turney@dronecode.org.uk>
Date: Mon Jan 5 23:18:11 2009 +0000
Cygwin/X: Tidy up an unused #define
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
commit 1badeb78b0b974a381e563e3d4f4cf37debd4266
Author: Rémi Cardona <remi@gentoo.org>
Date: Wed Jan 7 09:31:17 2009 -0500
Include Xmd.h from edid.h
commit fc14d52297f8f408693ed867ab649ea5b210b0b3
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Sun Nov 16 15:35:17 2008 -0800
XQuartz: Use AvailabilityMacros.h instead of availability.h for Tiger
(cherry picked from commit 91f3c3435716195e6d606c8e2f6b0de52eb5972d)
commit 4c326c4d342bede0de57e71c1431f56188f812ce
Author: Keith Packard <keithp@keithp.com>
Date: Tue Jan 6 08:36:39 2009 -0800
Make cvt complain about invalid arguments more often.
cvt doesn't correctly parse 'cvt -vr 1920 1080'. This patch doesn't fix
that, but it does at least generate an error message now.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 1da4a41b0881b605c7cfa4c4bf637efa132c58fc
Author: Paulo Cesar Pereira de Andrade <pcpa@mandriva.com.br>
Date: Tue Jan 6 05:01:32 2009 -0200
Add sdksyms.sh to EXTRA_DIST to correct make distcheck
Thanks to <vehemens at verizon.net> for noticing the problem.
commit 200230535fa80c04faaa562bbbd8272713e2763b
Author: Paulo Cesar Pereira de Andrade <pcpa@mandriva.com.br>
Date: Mon Jan 5 16:49:57 2009 -0200
Update sdk headers to export new symbols.
All symbols in installed sdk headers should be explicitly tagged
as exported symbols. Otherwise, to ensure it is not a mistake, one
could write it as something like:
extern /* NOEXPORT */ type name ...;
but the proper procedure really should be to use a non sdk header
(or a "noinst_" one).
This patch also removes prototypes to some functions that existed
only temporarily.
commit af6152499654a7146250d4ad0df89f611345434e
Author: Jon TURNEY <jon.turney@dronecode.org.uk>
Date: Wed Dec 17 14:15:34 2008 +0000
Cygwin/X: Add *.exe pattern to .gitignore
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
commit 8428b92fcb478b041f778c0e8c66fdeb96c807f3
Author: Colin Harrison <colin.harrison@virgin.net>
Date: Sun Jan 4 20:12:16 2009 +0000
Xming: Fix a couple of warnings
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
commit f6f97419bd2db651384ecaec0b296840810463a4
Author: Jon TURNEY <jon.turney@dronecode.org.uk>
Date: Mon Jan 5 18:35:52 2009 +0000
Cygwin/X: Add -static back to linker flags
Add -static back to linker flags to avoid screwing things up for
people who don't know that they need to avoid dynamically linking
with libXfont, as weak symbol handling requires static linking to
work correctly on Cygwin...
commit 2ec0ac08addb938a3d5aa5b9888ce7c79a0daada
Author: Jon TURNEY <jon.turney@dronecode.org.uk>
Date: Wed Dec 17 19:18:38 2008 +0000
Cygwin/X: Fix some remaining build issues
Fixes for a few remaining build issues, omitted from commmit 6e85a8304b50c0bfd16a400a05d257f0168fb99b in error
Provide VENDOR_RELEASE in XORG_VERSION_CURRENT for XWin
Remove -static from linker flags for XWin
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
commit e351d10773742d1570e1111976b7c8b6adda5ae6
Author: Daniel Stone <daniel@fooishbar.org>
Date: Mon Jan 5 17:41:38 2009 +0200
RandR: Only export Xinerama symbols when building Xinerama support
Otherwise compilation fails due to sdksyms.
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
commit 3387cbb7c13636eb62b22640d28df7011c2268f0
Author: Daniel Stone <daniel@fooishbar.org>
Date: Mon Jan 5 11:25:57 2009 +0200
XFree86: Xv: Add ClipNotify helper
Add a ClipNotify helper that lets the driver know about changes in the
clipping of an Xv backing drawable.
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
commit 55c4ec0a1ef78481b4d82153c19c20fbf88f1624
Author: Daniel Stone <daniel@fooishbar.org>
Date: Mon Jan 5 11:24:24 2009 +0200
XFree86: fbdevhw: Add helper function to get fd
Most devices need to do custom weird ioctls, so let them know what the
fd is.
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
commit 7da4e901e078e5597b8dbcb7ee39b949edf7ef03
Author: Daniel Stone <daniel@fooishbar.org>
Date: Mon Jan 5 11:23:39 2009 +0200
XFree86: Fix build with DGA disabled
It's optional, so we might as well work when it's disabled.
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
commit 13ce7b98d48261b061da5768a6405bdbe9caa1fb
Author: Dan Nicholson <dbn.lists@gmail.com>
Date: Mon Dec 22 14:31:03 2008 -0800
dmx: Require newer libXi for XQueryInputVersion
Signed-off-by: Dan Nicholson <dbn.lists@gmail.com>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 27011254c4de4e573a0851bf46892fb488db6522
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Tue Dec 23 09:59:28 2008 +1000
xfree86: If an input device failed to activate, return immediately.
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>
commit e1a3a1a0d85c9971aea65c2228b5fd4dbf3bf57a
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Tue Dec 23 10:00:34 2008 +1000
xfree86: don't call CheckMotion if a device hasn't been enabled. #19176
X.Org Bug <http://bugs.freedesktop.org/show_bug.cgi?id=19176>
commit af820259a06a6e8dbd299fe22347aa83b0c985b0
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Fri Jan 2 11:06:12 2009 -0800
XQuartz: Copyright Update... happy new year
(cherry picked from commit 9f1c26ae8d9ccf81cba0ab946326968a701f8c36)
commit d8c9ba37abd0d63ea2c5394af434b46ec3b647fd
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Fri Jan 2 10:58:40 2009 -0800
XQuartz: pbproxy: Push dpy init and CFRunLoop hook setup into the pbproxy thread to avoid possible deadlock
(cherry picked from commit 49e59d32b88e4fad070f230b5efaa261b47f78db)
commit 2f361186f93a791e446c4a9471bb0c3b9b818d98
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Wed Dec 31 12:40:02 2008 -0800
XQuartz: Don't use NX_SECONDARYFNMASK, NX_NUMERICPADMASK, NX_HELPMASK
We don't have keycodes for them, so don't try to use them
(cherry picked from commit cb912aca3a2834c4ad8e386c8a0d05c1bb31b0e7)
commit a2abaa9fd3a5ad713c1f946e9d7f598825ad3a84
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Wed Dec 31 11:57:49 2008 -0800
XQuartz: Make sure to reset the saved key state when deactivating X11.app
(cherry picked from commit 3eef78eb321f4f7dbca5a10c80666c621e28a1e0)
commit 3986b683adc4f6f967cc5f643e973d89764234c7
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Wed Dec 31 12:44:43 2008 -0800
XQuartz: Honor system key repeat rate
(cherry picked from commit 4303c9be39a86f5a21de108f72b90a989435905e)
commit 1a69d56afda082298edc76271d2cb71af00526ce
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Mon Dec 29 19:54:12 2008 -0800
XQuartz: Better avoid stuck keys on context switches
(cherry picked from commit e9963f1a4f4f12f253eae9d4f01694b6cabe35ad)
commit f464b5a9164b24f74adea198bcabe9affaf5552c
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Mon Dec 29 19:38:31 2008 -0800
XQuartz: Workaround OSX VNC server bug for modifier key state
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)
commit 3ead9aa2602cab9c883aa7bcbd2a8d82c5c88f5a
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Mon Dec 29 00:30:31 2008 -0800
XQuartz: Updated man page fullscreen_hotkeys fullscreen_menu
(cherry picked from commit 00f3a2e33c8e91da5f855821313a04ea97445656)
commit 48dbaf173a82693fd72953983da9fc556cd1c6ed
Author: Daniel Stone <daniel@fooishbar.org>
Date: Tue Dec 30 12:17:14 2008 +1100
XKB: Also copy keyboard feedback when copying the keymap
When updating the XKB keymap, make sure the keyboard feedback is also
copied, to preserve autorepeat settings etc.
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
commit cf85a32b5f80694f3c2f434e91cf77edb33a7c17
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Sun Dec 28 15:57:59 2008 -0800
XQuartz: pbproxy: We explicitly need libX11 for pbproxy
(cherry picked from commit 32824120da0749b8369c2592f851bb1030dea9f1)
commit 997e8c321bb11067591785ba38103a3a5029301d
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Sun Dec 28 01:53:38 2008 -0800
XQuartz: Try harder to get the user's login environment
(cherry picked from commit 6bedaddd78aa04bd303df434a4c49bb87bd7deaa)
commit ae8dc47fd910ec4b9edd64bf3b7ba33e212c5942
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Wed Dec 24 00:39:06 2008 -0800
XQuartz: Reposition windows when we enter fullscreen to ensure our root window
(cherry picked from commit 7617d3659b5481ef85aecc1f936e7dd2662bdfbd)
commit 895186e026881196ac9383aa165e123055d9cf09
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Tue Dec 23 20:33:27 2008 -0800
XQuartz: Re-enable rlAccel
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)
commit dc4498ec5cb7f25f710bdec8793746da2d2324ed
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Sun Dec 28 22:16:52 2008 -0800
Updated .gitignore
(cherry picked from commit 06964c322e4da81f3146022049a2de13f6b2892d)
commit 3534a5e5d9c5af85149c799f324257f89507fa23
Author: Maarten Maathuis <madman2003@gmail.com>
Date: Fri Dec 26 16:38:27 2008 +0100
exa: Allow drivers to set non-NULL devPrivate.ptr for !offscreen pixmaps.
commit 027b440d4f9f0cdd46addff46fd2d5c44cd5c847
Author: Maarten Maathuis <madman2003@gmail.com>
Date: Fri Dec 26 15:51:55 2008 +0100
exa: preparing as source and finishing access as mask is a bad idea
commit 89bbd07e9ddd688df81405151f9c6284fa3367a8
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Tue Dec 23 21:40:21 2008 -0800
Remove obsolete XF86_DATE & xf86Date.h
commit 8dc3a7d6817b7371bbfece1108ef856788256853
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Tue Dec 23 14:59:46 2008 -0800
Remove unused CLOG_DATE (leftover from pre-git ChangeLog)
commit fe05a46f191ebd36251dda7a9703d90c25efec11
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Tue Dec 23 14:55:26 2008 -0800
Remove powerpc load/store functions from export list on other platforms
commit a1b201bcb01e702f8f0a5889a3d49317503b9475
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Tue Dec 23 12:39:38 2008 -0800
XQuartz: Use depth=24 instead of FatalError if we can't figure out our depth
(cherry picked from commit 80b65c5b78d125c4ad3620b87b121c9e666299c3)
commit 86dc660588a615baefb1799d78a501c95a931d77
Author: Paulo Cesar Pereira de Andrade <pcpa@mandriva.com.br>
Date: Tue Dec 23 18:07:54 2008 -0200
Improve sdksyms.c automatic generation (Fix #19245).
Since it is already parsing cpp output, create a dependency file
in the same process. This will cause sdksyms.c to be regenerated
whenever a sdk header is modified.
This also uses the gmake 'sinclude' directive (don't fail if
included file doesn't exist). This should not cause any problems
given that gmake only constructs are used in several other Makefiles.
commit 477c32708718f4470ac2e786b2446d7a44e45b9c
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri Dec 19 08:56:35 2008 +1000
dix: don't disable uninitialized devices.
If a device hasn't been initialized, it doesn't have a cursor yet. So don't
set the cursor to the NullCursor, and don't try to DisableDevice either.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 25aac8b5793caa92116b766d5a9e12dbecdb0290
Author: Peter Hutterer <peter.hutterer@redhat.com>
Date: Tue Dec 2 16:16:58 2008 +1000
xkb: don't treat groups with different no of symbols as identical.
Signed-off-by: Peter Hutterer <peter.hutterer@redhat.com>
commit f141c1b4bb9482f188783dd6f161d3c7960a3329
Author: Peter Hutterer <peter.hutterer@redhat.com>
Date: Tue Dec 2 14:54:50 2008 +1000
xkb: explicitly check for group replication in the core representation.
Single-group keys may get replicated amongst all groups. Check explicitly for
this case and squash it down to one group.
Signed-off-by: Peter Hutterer <peter.hutterer@redhat.com>
commit 70a977c021e107c4fabe46ec2f619be9fb55abeb
Author: Peter Hutterer <peter.hutterer@redhat.com>
Date: Tue Dec 2 15:36:51 2008 +1000
xkb: don't replicate past the number of groups we have.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit a157575eeeb523cd43197c5caeb00cb3d56f9988
Author: Peter Hutterer <peter.hutterer@redhat.com>
Date: Tue Dec 2 13:31:58 2008 +1000
xkb: ensure enough symbols for core Group1 replication.
A single-group key on a multi-group keyboard has to be replicated across all
three groups (see Section 12.4 of the XKB protocol spec). Ensure that there's
enough symbols available to actually do that.
e.g. a key ABCD on a 3 group keyboard needs to be replicated as ABABCDCDABCD,
hence requiring space for 12 symbols, even if maxSymsPerKey is less than that.
Signed-off-by: Peter Hutterer <peter.hutterer@redhat.com>
commit b5736d237a21d5e65d839c4d213dd3bda5a11e9d
Author: Maarten Maathuis <madman2003@gmail.com>
Date: Mon Dec 22 19:53:14 2008 +0100
randr/xfree86: Fix initial gamma computation.
- The previous version overflowed sometimes.
commit ba9dc353a60e9a6bba64e854b23271011bff7015
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Sun Dec 21 21:03:59 2008 -0800
XQuartz: Don't use keycode 0 to determine !swallow since our most common key to swallow is actual keycode 0 (a)
(cherry picked from commit 33f43a7f03023bfbab25a957cb81fc25b4afa4ca)
commit f0cdccd1e22198f4f5e1aa0d0617441b79ffbc44
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Sun Dec 21 20:40:36 2008 -0800
XQuartz: Update our "screens" when we toggle rootless rather than when we 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)
commit 8f04a5237384fa97ff960b4607a79b688ea03fc1
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Sun Dec 21 14:54:11 2008 -0800
XQuartz: Run applications via '/bin/sh -c ...' to support users who expect shell parsing
(cherry picked from commit 67455e716e3ecffd528930479192785958d37988)
commit 029d255a654eca6401c374d145f63bbb923554b5
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Sun Dec 21 14:43:12 2008 -0800
XQuartz: pbproxy: Release display notification lock when not needed to avoid deadlock
(cherry picked from commit 22f664ab95a0cae981e9cefad6f075d051583ca5)
commit b1f166f2981595aea6f8e2a336d6d25436f8a07d
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Sun Dec 21 14:42:26 2008 -0800
XQuartz: update quoting in case X11.app is moved to a directory with a space.
(cherry picked from commit cc805dc799efa37c8dcefa3db04d87e9b835ffbd)
commit 2f47bda645eb43c60b71315e8d265190acce481d
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Thu Dec 18 09:14:16 2008 -0800
XQuartz: Changed X11.sh to allow use of a ~/.x11run as requested by users of alternate shells
(cherry picked from commit b62ed1f8eaf041a946bb591165bb18ee481dedbf)
commit 83edcc08de4c815c5cbe815f521b3b728441cad6
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Wed Dec 17 15:09:35 2008 -0800
XQuartz: Get rid of white rectangle bug
(cherry picked from commit 3269959033ed0c675a3a906666454df34086896a)
commit 1335a300b9cd03208a583acfdb7f7153eaef4ea6
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Wed Dec 17 14:43:02 2008 -0800
rootless: Make expose_1 static
(cherry picked from commit 60c8d2697036a125ca5381df8e2eaedabad4d242)
commit 22b2811e6aa0bdbfa6a0682ac862063e52ec0c62
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Wed Dec 17 13:54:53 2008 -0800
XQuartz: Name the startup shell script X11 for better compatability
(cherry picked from commit f84613d6fcbbb5f769ee34cff0900353a13693cf)
commit 82fba7697fbbb6f66cc22424ba99755b99ff482e
Author: Maarten Maathuis <madman2003@gmail.com>
Date: Mon Dec 22 00:33:55 2008 +0100
xfree86/randr: Avoid a crash when xf86CrtcConfigPrivateIndex is -1.
commit 1567b7243f4799808ab93fbd962df14ce3af2d49
Author: Maarten Maathuis <madman2003@gmail.com>
Date: Sun Dec 21 00:08:56 2008 +0100
exa: A more correct fix.
commit 2db7b66863ae6055c3ce13c88b36d620de8a4d75
Author: Maarten Maathuis <madman2003@gmail.com>
Date: Fri Dec 19 23:12:37 2008 +0100
exa: a few cleanups
- Some warnings silenced.
- Some whitespace cleanup.
commit aedd2f566df585db7a1614f302cc8d3feda54275
Author: Maarten Maathuis <madman2003@gmail.com>
Date: Fri Dec 19 19:10:23 2008 +0100
randr/xfree86: Fix a one off error in the panning calculations.
- 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.
commit 332d65ec7a6e94d75efe95d53742f137835274de
Author: Maarten Maathuis <madman2003@gmail.com>
Date: Fri Dec 19 18:59:27 2008 +0100
randr: Consider panned crtc's when calculating xinerama screen sizes.
- This will allow window managers and applications to actually use the panned area.
commit f2d1de6c2a3e6e50db6d9714c293eb26324fbd3d
Author: Adam Jackson <ajax@redhat.com>
Date: Fri Dec 19 10:27:37 2008 -0500
xv: remove useless XVCALL macro
commit 5a072c55350f4b73d911ea6a2aeddad844924834
Author: Adam Jackson <ajax@redhat.com>
Date: Fri Dec 19 09:51:52 2008 -0500
dmx: Fix calloc macro confusion.
commit 8c488ac3b3990cd203baed7f2127b9bed8aab534
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Thu Dec 18 19:47:49 2008 -0800
Fix linking of Xorg with dtrace probes on Solaris
commit 396433d0da721951e6e7abc02dc3b2f682495154
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Thu Dec 18 18:49:47 2008 -0800
Fix sdksyms.sh to work with Solaris/Sun compiler builds
- Pass $(CPP) & $(AWK) settings from configure to sdksyms.sh
- Only reset sdk variable (tracks if header is part of sdk) if
a filename is included on the cpp # <line-no> <filename> line,
since Sun compilers omit filename when it is unchanged from
previous line.
commit aea6f19f25e13768b1d09fac4991d6a5e6c2cdac
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Tue Dec 16 17:10:03 2008 +1000
xfree86: don't restore the TTY mode if we didn't initialize it ourselves
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>
commit 5d065a889074558634216eebd4bba35a60db9a09
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Thu Dec 18 13:59:36 2008 -0500
xselinux: Use xace Xtrans wrappers instead of the now-inaccessible wrapees.
commit f87e66486c3610c56888915b66ae5ab0af03da8b
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Thu Dec 18 13:58:35 2008 -0500
xace: Export wrappers around two Xtrans functions used by modules.
Don't know a better way to do this, since Xtrans isn't a library that
can be linked into modules.
commit 777408914dbf395e9969e3f34720286e6f740369
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Thu Dec 18 12:35:57 2008 -0500
Add xace headers to the SDK when enabled and export the XaceHooks symbol
to modules.
commit 9e4ef3cfe5ee178c266edd64a8edd767827aa0d7
Author: Paulo Cesar Pereira de Andrade <pcpa@mandriva.com.br>
Date: Thu Dec 18 15:00:25 2008 -0200
Use regex pattern understood by all known awk variants.
Ubuntu uses mawk by default, but it doesn't understand posix character
classes (which are locale dependent, and this patch uses only valid C
identifiers).
Also make sure awk runs with LC_ALL=C to match the regex patterns.
commit 3d3c234b434a3443a00c3be9f32c698bcced111c
Author: Maarten Maathuis <madman2003@gmail.com>
Date: Thu Dec 18 16:26:38 2008 +0100
randr: add some notes about the stuff that changed in driver ABI 2
commit 1b244feb4cf11d1cdba79fbead50035965535552
Author: Maarten Maathuis <madman2003@gmail.com>
Date: Thu Dec 18 16:11:21 2008 +0100
randr: check for malloc failure
commit 21a2df9f359584e634dc12d8602401d54defd7db
Author: Colin Harrison <colin.harrison@virgin.net>
Date: Sun Nov 2 20:46:44 2008 +0000
Xming,Cygwin/X: Fix crashes when using the DirectDraw '-refresh rate-in-Hz' option in -fullscreen (#11128)
fd.o bugzilla #11128
Fix crashes when using the '-refresh rate-in-Hz' option in -fullscreen mode and using a DirectDraw engine.
On failure (typically 0x80004001 DDERR_UNSUPPORTED), use the default refresh rate for the driver, instead of the
entered value.
Also fix some nearby error reporting
Copyright (C) Colin Harrison 2005-2008
http://www.straightrunning.com/XmingNotes/
http://sourceforge.net/projects/xming/
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
commit b0ed1567c1782041cf3d14ec6dd4d622915c7d0c
Author: Colin Harrison <colin.harrison@virgin.net>
Date: Wed Dec 17 17:16:02 2008 +0000
Xming, Cygwin/X: Tidy up warnings, headers and unused variables (#11132)
Tidy up various warnings, include headers and unused variables, etc.
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
commit 15c4a6e088039e14b4f2387ff204cb5448916b39
Author: Colin Harrison <colin.harrison@virgin.net>
Date: Wed Dec 17 16:44:07 2008 +0000
Xming, Cygwin/X: Fix crash in function winMultiWindowGetTransientFor() (#11147)
The function winMultiWindowGetTransientFor() crashes, due to a bogus pointer
dereference, but this fact was previously hidden by the function not being called!
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
commit 08a3d6928c87032998b6113d67f69b79b09eecee
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Tue Dec 16 14:19:12 2008 +1000
dix: Allocate the space for the DCCE when the last SD is removed.
This still doesn't fix reset the MD's classes (a TODO that's been here for
ages), but at least we don't segfault anymore when detaching the last SD.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 689be0cb4b259840208c17f974066a942196793a
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Tue Dec 16 14:19:38 2008 +1000
dix: set the correct length in CreateClassesChangedEvent.
Fallout from aeff14d5f208d02f211b8b2a1a98999624e8c2cf. Yes, we don't malloc
anymore because we are inside a SIGIO and the memory is already there anyway.
But we still need to set the event length correctly, otherwise
mieqEnqueue/mieqProcessInputEvent don't know how much memory to copy.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 1001403301001fcc84ce6833938590956df40d2a
Author: Maarten Maathuis <madman2003@gmail.com>
Date: Thu Dec 18 00:19:06 2008 +0100
Forgot to fix a comment.
commit 9fa15bef59881bdcf087889f16ab3c8d953da8f1
Author: Maarten Maathuis <madman2003@gmail.com>
Date: Wed Dec 17 23:42:30 2008 +0100
randr: some improvements, fixes and crtc abi bump
- Add active field to crtc.
- Set gamma (only) whenever a crtc becomes active.
- Check for xf86_config being NULL.
- Increase crtc abi to 3.
- A few other fixes.
commit bf65523ab0b39774f07a7ae478ff3f5653fad469
Author: Joe Krahn <jkrahn@nc.rr.com>
Date: Sun Nov 2 20:17:03 2008 +0000
Cygwin/X: Fix for mis-aligned icon data creates bad background masks (#4491)
fd.o bugzilla #4491
Transparent icon backgrounds appear with black stripes as mask data is incorrectly aligned.
Modified the icon DDB bitmap data alignment to 16 bits
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
commit 91f73b79b7ae64e5b846d1efeb470bb61a913720
Author: Maarten Maathuis <madman2003@gmail.com>
Date: Wed Dec 17 16:56:26 2008 +0100
randr: Improve per-crtc gamma support.
- The Gamma values from the monitor section are now used during initial config.
- The old colormap system is disabled when gamma set hook is available.
- Gamma values are now persistent for the lifetime of the xserver.
- This requires no driver changes and should be driver ABI compatible.
commit 1556815d34cecb4b4b62d2a4ce813b1435a937ec
Author: Jon TURNEY <jon.turney@dronecode.org.uk>
Date: Sun Nov 2 18:27:18 2008 +0000
Cygwin/X: Initialize native HWND atom when built !XWIN_MULTIWINDOWEXTWM
Fix the native HWND atom identifier to be initialized correctly, when built without external WM support
This is neccessary for native window naming to work correctly in multiwindow internal WM mode.
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
commit 92082a0a00f05ecdc90814a8104828853c9c8f29
Author: Jon TURNEY <jon.turney@dronecode.org.uk>
Date: Sun Nov 2 18:27:15 2008 +0000
Cygwin/X: update to use standard DPMS stubs
Bring Cygwin/X up to date with DPMS API changes by using the standard stubs
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
commit 2850f26bb2999ef3fb2a10adb80fe358463aecb5
Author: Jon TURNEY <jon.turney@dronecode.org.uk>
Date: Sun Nov 2 18:27:14 2008 +0000
Cygwin/X: update for changes to shadow framebuffer
Bring Cygwin/X up to date with the change to damage-based shadow framebuffer.
Register the screen bitmap as the shadow framebuffer after screen resources
are created.
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
commit 35d76028304f910edeaf642376df71b8134ec02c
Author: Jon TURNEY <jon.turney@dronecode.org.uk>
Date: Sun Nov 2 18:27:13 2008 +0000
Cygwin/X: enqueue a pointer motion event on mouse movement
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
commit 816e0d243df068bc06d328874b5655d4530fe16a
Author: Jon TURNEY <jon.turney@dronecode.org.uk>
Date: Sun Nov 2 18:27:12 2008 +0000
Cygwin/X: update for changes in mieq API
Bring Cygwin/X up to date with mieq event API changes
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
commit bca7483c4e95ad450fb09048a3b85bb3056a0518
Author: Jon TURNEY <jon.turney@dronecode.org.uk>
Date: Sun Nov 2 18:27:11 2008 +0000
Cygwin/X: update for MPX device changes
Bring Cygwin/X up to date with MPX device API changes
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
commit 829a8a970dd17623ef3cb5022d34190744f74741
Author: Jon TURNEY <jon.turney@dronecode.org.uk>
Date: Sun Nov 2 18:27:10 2008 +0000
Cygwin/X: update for MPX cursor API changes
Bring Cygwin/X up to date with cursor API changes
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
commit d61e902aab92c262e6c8ee9cd70aec4493cf6cae
Author: Francis Giraldeau <francis.giraldeau@revolutionlinux.com>
Date: Wed Dec 17 09:49:39 2008 +0200
Don't log audit messages when -audit 0 specified
make the auditTrailLevel check more general and don't log when not
using DTRACE and -audit 0 is set.
commit 295a3fa721ee2f2226891de308c0c4b0ee26fe72
Author: Paulo Cesar Pereira de Andrade <pcpa@mandriva.com.br>
Date: Wed Dec 17 02:04:12 2008 -0200
Ensure symbols required by swrast_dri.so are visible.
commit 6d8ea5104cf97dbf64612f58fc06f94f869ed5ec
Author: Colin Guthrie <cguthrie@mandriva.org>
Date: Tue Dec 16 17:44:27 2008 -0500
Fix compilation with -Werror=format-security
commit 1bb5a919f4bf38ac96c73077021b0cdc82965f31
Author: Adam Jackson <ajax@redhat.com>
Date: Tue Dec 16 13:46:59 2008 -0500
config: Add vboxvideo and tga to the magic driver list
Also sort the list while I'm here.
commit 8511a964f81b3b06a526f0fca4232afb2152f405
Author: Matthias Hopf <mhopf@suse.de>
Date: Tue Dec 16 18:21:20 2008 +0100
randr: Update EDID_ATOM_NAME to reflect RandR 1.3 name change
commit a058192d970f7417b06334aa666c17e9891795c6
Author: Owen W. Taylor <otaylor@redhat.com>
Date: Wed Oct 22 16:12:53 2008 -0400
Xephyr: Fix crash with control-shift and GLX (#18185)
When we are looking up the screen for an event, we need to take
into account the fact that the event may have been delivered to the
"peer window" that we create when implementing GLX. Since we only
ever create one such window per screen, just add a single peer_win
field to EphyrHostScreen.
commit 6e85a8304b50c0bfd16a400a05d257f0168fb99b
Author: Jon TURNEY <jon.turney@dronecode.org.uk>
Date: Sun Nov 2 18:27:09 2008 +0000
Cygwin/X: build machinery fixes
The Cygwin/X build has been broken for a long time, probably since modular X
This patch fixes up configure/makefile and some general build issues (#18568)
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
commit 7aa29b9d66c3cd0f8af4fafbe92efd0c0556d225
Author: Robert Noland <rnoland@2hip.net>
Date: Tue Dec 16 00:07:42 2008 -0500
Support -sharevts on FreeBSD
Bugzilla #11179
Submitted-by: Nathan Whitehorn
Signed-off-by: Robert Noland <rnoland@2hip.net>
commit 063eb6743cd0d98dd52d1a9559b804381ee5144d
Author: Keith Packard <keithp@keithp.com>
Date: Mon Dec 15 19:53:45 2008 -0800
Patch brown-bag fix for bug 19017 (scrn->virtualX/virtualY 0 before PreInit)
When a driver uses a crtc during device detection, the scrn has not yet been
configured and virtualX/virtualY are still zero. This caused the X server
to try and allocate a shadow frame buffer, which couldn't work.
Detect this by checking for zero virtualX/virtualY values.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit fde2f961035609cfff8761ef1e0f23e6a9761be2
Author: Keith Packard <keithp@keithp.com>
Date: Mon Dec 15 11:39:24 2008 -0800
Use scrn->virtualX/virtualY in xf86CrtcFitsScreen. Fix bug 19017.
pScreen->width/height are not initialized when doing initial mode setting,
which makes this function incorrectly fail. Using scrn->virtualX should work
in all cases though.
Bug 19017 reports a crash in xf86CrtcSetModeTransform when doing a modeset
for output probing, long before the screen array is initialized; that was
caused by a work-around to set pScreen->width/height so that xf86CrtcFitsScreen
could find the right values.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 29a5b0596b396d3e4a8a014cacd3e3ef77467ab7
Author: Keith Packard <keithp@keithp.com>
Date: Mon Dec 15 11:38:00 2008 -0800
When disabling SIGIO tracking, use SIG_IGN instead of SIG_DFL.
This avoids a race condition for drivers which mis-order the fd close and
signal disable.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 1ba4cbb15919759aadd71960c5c057af9ba94fe3
Author: Keith Packard <keithp@keithp.com>
Date: Mon Dec 15 11:36:43 2008 -0800
Clean up rotation data when crtc is turned off
The shadow frame buffer and other data used for rotation need to be freed
when the crtc is disabled, not just when rotation is disabled.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 2a61397d17339113b9e37995b06ca543589814ce
Author: Cooper Yuan <Cooper.Yuan@amd.com>
Date: Mon Dec 15 10:29:34 2008 -0500
Fix typo in xf86PickCrtcs()
commit 3db60add6671f766f9360e7d03492dfd51eba225
Author: Jon TURNEY <jon.turney@dronecode.org.uk>
Date: Mon Dec 15 12:42:10 2008 +0000
Cygwin/X: Update the native icon to one based on the X.Org logo
Update the native icon for the X server to one created from the X.Org logo by Colin Harrison.
commit 450739efa904a0fce5024372da7236bb7b84b67a
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Sat Dec 13 00:45:27 2008 -0800
XQuartz: Updated menu item ordering for better HIG compliance
(cherry picked from commit 4c9bb241ce5fb856fab20ae96fa89bd2b71ef242)
commit aee27be2785d8b09ac10f5be040b4d573190de0e
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Wed Dec 10 23:04:30 2008 -0800
XQuartz: Tiger fix, don't call Xplugin code in the Appkit thread if Xplugin isn't threadsafe.
(cherry picked from commit 748d9e5bd756513d42c4046f3b31e1fdc55bccb6)
commit a939368ab8140d48c1da4ba0bb229d13b221189c
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Mon Dec 15 03:18:13 2008 -0800
mi: Reuse memory in mieqProcessInputEvents rather than making excessive calls to calloc()
Signed-off-by: Peter Hutterer <peter.hutterer@redhat.com>
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
commit f1c9b5ab230cbb4124d8d476ae4886d05022adcb
Author: Ian Romanick <ian.d.romanick@intel.com>
Date: Sun Dec 14 18:58:33 2008 -0800
GLX: Changes resulting from changes to Mesa generator scripts / data
Several recent Mesa commits (listed below) make modifications to the
protocol generator data and scripts. This commit represents the
changes to the generated files resulting from the previous changes.
- 0f73302d24f4201813da2939742c5bcb6964b3b1
GLX: Fix protocol for glTexSubImage#D
- 1709ab01ef24279c782e420568e9257b4b92b224
Return 0 as the request size when the pixels parameter is NULL
- 63cca2ba10ce7dcc8481cfa4be3872dfc269dded
GLX: Include glapi.h before glapitable.h
This is the server-side part of the fix for bugzilla #11003.
commit 6383bc93b2ae76361a58653bc7e291df0d6ddfec
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Sat Dec 13 15:44:52 2008 +1000
dix: Init DeviceEnterLeave event's type before FixUpEventFromWindow (#19064)
X.Org Bug 19064 <http://bugs.freedesktop.org/show_bug.cgi?id=19064>
commit 49d38ab2328c409b2a98465b52677af057121513
Author: Eric Anholt <eric@anholt.net>
Date: Tue Dec 2 15:09:57 2008 -0800
Warning fix: Remove dead glXDisp{,Swap}_DrawArraysEXT definitions.
Signed-off-by: Eric Anholt <eric@anholt.net>
Acked-by: Ian Romanick <ian.d.romanick@intel.com>
commit 2c5bfffc832e3818bbf0c0a96522865ce1ef2653
Author: Eric Anholt <eric@anholt.net>
Date: Tue Dec 2 14:59:04 2008 -0800
Warning fix (GL likes to call strings GLubyte * instead of char *).
Signed-off-by: Eric Anholt <eric@anholt.net>
Acked-by: Ian Romanick <ian.d.romanick@intel.com>
commit 7be6520d94df874c6bbd46d06a1830a12d0967f2
Author: Stuart Bennett <sb476@cam.ac.uk>
Date: Fri Dec 12 00:08:44 2008 +0000
dolt: allow older versions of bash to compile the xserver (#19031)
Signed-off-by: James Cloos <cloos@jhcloos.com>
commit aeff14d5f208d02f211b8b2a1a98999624e8c2cf
Author: Peter Hutterer <peter.hutterer@redhat.com>
Date: Tue Nov 25 20:23:50 2008 +1000
dix: don't alloc in ChangeMasterDeviceClasses.
We mustn't realloc as we are inside a signal handler. With
SetMinimumEventSize, this code should never be hit anyway, as the event list
should have the required memory before this code is hit.
Signed-off-by: Peter Hutterer <peter.hutterer@redhat.com>
commit fb2a8d0e59a3d187255538f6add22ec67551507a
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Mon Dec 8 15:58:15 2008 +1000
Xi: silence compiler warning
Don't mix declarations and statements.
commit d961abb59f0a8bee4bd11b1540aa43ff83cddbb8
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu Dec 11 15:54:15 2008 +1000
dix: fix compiler warning (mixing declarations + statements)
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit cb95642dc8edebb2935dd471f8b339cb98aa8481
Author: Peter Hutterer <peter.hutterer@redhat.com>
Date: Fri Nov 28 22:28:32 2008 +1000
Remove #define NEED_EVENTS and NEED_REPLIES
A grep on xorg/* revealed there's no consumer of this define.
Quote Alan Coopersmith:
"The consumer was in past versions of the headers now located
in proto/x11proto - for instance, in X11R6.0's xc/include/Xproto.h,
all the event definitions were only available if NEED_EVENTS were
defined, and all the reply definitions required NEED_REPLIES.
Looks like Xproto.h dropped them by X11R6.3, which didn't have
the #ifdef's anymore, so these are truly ancient now."
Signed-off-by: Peter Hutterer <peter.hutterer@redhat.com>
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit 920b7622be4a68ebb5d8432f55c5362fbe964fce
Author: Simon Thum <simon.thum@gmx.de>
Date: Tue Nov 25 14:28:26 2008 +1000
xfree86: dump the ptraccel filter setup to the log on init.
Signed-off-by: Peter Hutterer <peter.hutterer@redhat.com>
commit fbb57a2c54b141ccbb50833143b0b7cb2c4cb903
Author: Simon Thum <simon.thum@gmx.de>
Date: Tue Nov 25 13:43:28 2008 +1000
dix: ptraccel - Add GetAccelerationProfile()
Signed-off-by: Peter Hutterer <peter.hutterer@redhat.com>
commit beb749c87f383a62172a9ffa36373438e7a12d8e
Author: Adam Jackson <ajax@redhat.com>
Date: Thu Dec 11 17:04:37 2008 -0500
Fix syncsrv.h guard define
commit 9fba808b4f43f5dc69d85a48fa40cb83dd4d9f9d
Author: Colin Harrison <colin.harrison@virgin.net>
Date: Thu Dec 11 13:22:53 2008 -0500
xsync: Prototype fix.
commit dce887ff53222652c397bc96a1dd3566f5847745
Author: Adam Jackson <ajax@redhat.com>
Date: Thu Dec 11 13:16:02 2008 -0500
xsync: build fix
argh protocol header disaster
commit d41b8960be8ad316504ef5657c0abfe6d76d3b5e
Author: Matthias Hopf <mhopf@suse.de>
Date: Thu Dec 11 18:48:02 2008 +0100
randr: Fix initial panning border copy
Thanks to Julien Cristau for finding this.
commit fd77ce9f884f5ac4d36736f3a99ba86101f133ea
Author: Matthias Hopf <mhopf@suse.de>
Date: Thu Dec 11 17:51:20 2008 +0100
randr: Oops, miscalculated panning rectangle's coordinates
commit f8e52f1b6d7c59d007de99a1c9c69c053d4f3cbe
Author: Matthias Hopf <mhopf@suse.de>
Date: Thu Dec 11 16:48:40 2008 +0100
randr: Update initial screen size if panning information is present
commit 24d6b7d1c5fc5d07c2eb06a9fc4406e393d59b17
Author: Matthias Hopf <mhopf@suse.de>
Date: Thu Dec 11 16:48:11 2008 +0100
randr: Fix error message for bad panning config
commit fdbbe65a7e777b7777bfae5a161efb89d4fb9a8d
Author: Matthias Hopf <mhopf@suse.de>
Date: Thu Dec 11 14:56:51 2008 +0100
randr: Add monitor option "Panning" for initial panning configuration
commit 27261a950d91c352eac25a3036656c3e4f81fb12
Author: Paulo Cesar Pereira de Andrade <pcpa@mandriva.com.br>
Date: Thu Dec 11 14:43:04 2008 -0200
Modify sdksyms.sh to receive $top_srcdir as first argument.
If the basename of header file processed by cpp matches $top_srcdir,
check for extern symbols in the output, and add to the xorg_symbols
vector.
Possibly a better solution then using this script would be to somehow
tell the linker to not drop any symbols from the binary being generated.
commit 1f4fb0225b278d1cf4145aebeb0bdd23dc8f62d5
Author: Adam Jackson <ajax@redhat.com>
Date: Wed Dec 10 16:13:20 2008 -0500
xsync: Fix wakeup storm in idletime counter.
Wakeup scheduling only considered the threshold values, and not whether
the trigger was edge or level.
See also:
https://bugzilla.redhat.com/show_bug.cgi?id=474586
http://svn.gnome.org/viewvc/gnome-screensaver/trunk/src/test-idle-ext.c?view=markup
commit 1a99110f0c221b79045ea26d61c4a1ec1e0d7341
Author: Adam Jackson <ajax@redhat.com>
Date: Wed Dec 10 14:18:59 2008 -0500
xsync: ANSI cleanups
commit e0d8f6a8084a3fe6c549c1dee11e4502e316c382
Author: Adam Jackson <ajax@redhat.com>
Date: Wed Dec 10 13:32:04 2008 -0500
xsync: Use a local header for server API definitions
commit 1208a1dbcaecbc218a77bf51068f9c0c768e16c5
Author: Adam Jackson <ajax@redhat.com>
Date: Wed Dec 10 11:47:35 2008 -0500
xsync: remove cast abuse.
commit 119d9c46e841f5fa35610f557e6fa1ec58587c24
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Wed Dec 10 01:56:01 2008 -0800
XQuartz: Fix path to executable
(cherry picked from commit 7e9d3698e070a0c63dd2556651373c3aca58e2fe)
commit c46b564c47fde3474e948aa1b188a975836cba47
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Wed Dec 10 00:00:29 2008 -0800
XQuartz: fixed make dist
(cherry picked from commit 2d52367ab92429e58596d1a1ed3ef52a0a38a7aa)
commit 23156a21d8e2f1be7d19d69cb91dae1b885ef671
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Tue Dec 9 23:48:18 2008 -0800
XQuartz: Make debugging output for invalid depths a bit more detailed
(cherry picked from commit 609fb166b7062c76f0561df12ffe893811f6ac8f)
commit 76351d2faf9ceb79aaa00b374c203b8b279c58f3
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Tue Dec 9 23:47:32 2008 -0800
XQuartz: Avoid using login /bin/sh blech. Just use a bash script to start the app, so it will inherit the right environment
(cherry picked from commit f4b7ad9cc6b0c99fc7ee8516c4bf858ece938148)
commit e5ce6e198f4c245f4dc840c5e9e90a7ef80fb6e9
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Mon Dec 8 21:59:49 2008 -0800
XQuartz: unset DISPLAY if we didn't get a launchd socket handoff
(cherry picked from commit b959727f38733009c6381cc8ca06b5984257bdac)
commit ecaaf0462d6c70cabfcaf6868a526e5415505e2c
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Mon Dec 8 21:00:11 2008 -0800
XQuartz: unsetenv(DISPLAY) if we're not org.x.X11
Also some prefix related fixes.
(cherry picked from commit fd459e96581a883e30323c840b71004aa0747169)
commit ea94995982d1cc585768d52fec75cae018457fa5
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Sat Dec 6 12:01:28 2008 -0800
XQuartz: Removed some debug spew
(cherry picked from commit 370dcf11b360b87aa24cace35eb615419057fda0)
commit 86c64ddf21763972aa7fc8c5770259123c9907b3
Author: Adam Jackson <ajax@redhat.com>
Date: Mon Dec 8 17:42:47 2008 -0500
randr: clear primaryOutput when the output is deleted
commit fe65f400ed16cb39db8c9518b9446f590c34db1a
Author: Adam Jackson <ajax@redhat.com>
Date: Mon Dec 8 17:40:07 2008 -0500
randr: use primary output for RRFirstOutput()
commit cdcb516e561e2f65eb2fa523ca001c57674d5caf
Author: Adam Jackson <ajax@redhat.com>
Date: Mon Dec 8 17:37:17 2008 -0500
randr: Mangle GetScreenResources sort order based on primary output
commit d7b316e82bc7051f8829b4f4a640f50ae91c2db9
Author: Adam Jackson <ajax@redhat.com>
Date: Mon Dec 8 17:28:55 2008 -0500
randr: Mangle compat Xinerama reply based on primary output
commit 9d58d2a319059989ccdfa758f586149ccdc16df6
Author: Adam Jackson <ajax@redhat.com>
Date: Tue Dec 9 10:51:37 2008 -0500
randr: Add [GS]etOutputPrimary
commit d281866b74f7067f2704c278fe9720eafc0ee5ef
Author: Peter Hutterer <peter.hutterer@redhat.com>
Date: Mon Dec 1 21:20:48 2008 +1000
mi: Clean up CopyGetMasterEvent, re-use the memory.
Alloc an EventList once and then re-use instead of allocing a new event each
time we need a master event.
There's a trick included: because all the event processing handlers only take
an xEvent, init a size 1 EventList and squash the events into this one.
Events that have count > 1 must be squished into an xEvent array anyway before
passing into the event handlers, so we don't lose anything here.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Acked-by: Daniel Stone <daniel@fooishbar.org>
commit 0b4fef6337d88ae8ef05b8b73941350a9007565c
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Wed Dec 10 11:35:09 2008 +1000
dix: move MAX_VALUATOR_EVENTS into include/input.h
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit b36c398b11321a908cfe217108b26a32ffc1d850
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Mon Dec 8 16:41:20 2008 +1000
dix: purge dead device-based window access code.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit aa71ac1dd4697738752c73fe4c106b665ea3ec25
Author: Paulo Cesar Pereira de Andrade <pcpa@mandriva.com.br>
Date: Wed Dec 10 00:32:34 2008 -0200
Add dependency tracking to sdksyms.c and export composite wrapper.
Thanks to David Miller for noticing a make problem with sdksyms.c
not being regenerated when sdksyms.sh is updated. This is not yet the
best solution; automake generates dependency for sdksyms.o, but the
build really should also regenerate sdksyms.c when sdksyms.o needs to
be regenerated.
Export the symbols in miext/cw/cw.h. These symbols are in libxaa, and
at least the nvidia driver uses them. Maybe cw.h should be installed
in the sdk.
commit 090f63123975220819d531f569df6e5787607ec6
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Mon Dec 8 11:53:20 2008 +1000
mi: always update the sprite for master devices.
Follow-up to 9ce995373e4a. This re-enables cursor rendering if the MD is
controlled through software (e.g. synergy).
Reported by John Tapsell: "I use Xorg with no mouse attached, but use synergy
to control the mouse. The commit means that I no longer have a visible mouse
cursor. The mouse cursor is still 'there' in terms that I can click buttons
etc with it, but it's just not visible."
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 7c8720c1433d2c3b85bbf4b811cc54c2df4c0080
Author: Paulo Cesar Pereira de Andrade <pcpa@mandriva.com.br>
Date: Mon Dec 8 22:11:50 2008 -0200
Correct wrong symbol reference on sparc.
The awk script was incorrectly referencing the struct name, and
not the struct variable.
Also added some comments to sdksyms.sh, for the reason it generates
the "symbol table" and add a message to the generated file, telling
is was automatically generated.
commit 58a27d2932164e43c0db42b1286ec2f95250b420
Author: Adam Jackson <ajax@redhat.com>
Date: Mon Dec 8 16:28:00 2008 -0500
Default to x86emu even on i386 linux
vm86 mode is a bad idea anyway, and using the emulator everywhere
means we get a consistent set of bugs.
commit bbf811514d3cdf84790bad5b852942a4e636902b
Author: Sascha Hlusiak <saschahlusiak@arcor.de>
Date: Mon Dec 8 12:24:39 2008 +0100
ddxCtrls.c: XkbDDXUsesSoftRepeat always returns 1 now
We'd like to do soft repeat in the server for all keys. Remove obscure check, that'd
prevent the server from autorepeating when delay is set to exactly 660ms and rate is
set to exactly 25 (interval=40).
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
commit 8c1dd40a04693f09f4fcea6e7f905af34c7589de
Author: Benjamin Close <Benjamin.Close@clearchain.com>
Date: Mon Dec 8 14:49:38 2008 +1030
Don't use gnu specific extensions to awk when builing symbols
Traditional posix awk doesn't know about \W and whilst we check that
awk exists in configure.ac we don't check which awk we are using.
This corrects symbol generation for posix only awk.
commit 39db182b637041255ed6dac739ff77c8e4e07c30
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Mon Dec 8 12:12:39 2008 +1000
xfree86: init EQ before trying to initialise the devices (#18890)
The kbd driver may send events during device initialisation, and these events
need the EQ set up already.
X.Org Bug 18890 <http://bugs.freedesktop.org/show_bug.cgi?id=18890>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 78a62d7713c708d067d8824ec41b0a0225c1997f
Author: Tom Jaeger <ThJaeger@gmail.com>
Date: Mon Dec 8 11:38:12 2008 +1000
Xi: XIGetDevice needs to ignore the MORE_EVENTS flag.
Reported in X.Org Bug 18882, Comment 5.
<http://bugs.freedesktop.org/show_bug.cgi?id=18882>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit ee1a6c28418a6dad6c89f79a994f27bfbaa77368
Author: Peter Hutterer <peter.hutterer@redhat.com>
Date: Fri Dec 5 10:12:57 2008 +1000
dix: fix calculation of valuator events.
Follow-up to 4971315296cb. countValuatorEvents was copied from GKVE where it
was obviously broken but nobody noticed. GPE had the correct version, but that
one got lost during de-duplication. Restoring the correct calculation - if we
have 6 valuators, we want 1 valuator event, not 2.
Signed-off-by: Peter Hutterer <peter.hutterer@redhat.com>
commit 13de7511b17b57a28668e1a60b196ccfe61dbcbe
Author: Peter Hutterer <peter.hutterer@redhat.com>
Date: Thu Dec 4 10:30:02 2008 +1000
xfree86: Only use the evdev ruleset on linux.
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>
commit 8e3279134987a45f2a89c963ef2d33bc3d3c8179
Author: Peter Hutterer <peter.hutterer@redhat.com>
Date: Thu Dec 4 09:47:25 2008 +1000
xfree86: fix compiler warning (use of uninitialized variable)
drv and idev are only set for SDs, but are only dereferenced for SDs too, so
initializing them to NULL is safe.
Signed-off-by: Peter Hutterer <peter.hutterer@redhat.com>
commit 22d4ddcc3d63b7fbf2a23f5162075e4ee06db781
Merge: d2dad384f5 c3bf15ba85
Author: Matthieu Herrb <matthieu@crux.(none)>
Date: Sun Dec 7 23:56:15 2008 +0100
Merge branch 'master' of git://anongit.freedesktop.org/git/xorg/xserver
commit d2dad384f5725a36e593fd75f03d712f53b20620
Author: Matthieu Herrb <matthieu@crux.(none)>
Date: Sun Dec 7 23:52:26 2008 +0100
Fix build in separate build directory.
commit c3bf15ba85fd3ab2e1fe809428b75bf34db25cc8
Author: Paulo Cesar Pereira de Andrade <pcpa@mandriva.com.br>
Date: Sun Dec 7 18:52:23 2008 -0200
Require macros 1.2.0 or newer for XORG_CHANGELOG and XORG_CWARNFLAGS.
commit 5a8068b390b7d30eb526e954443d8e43a199b971
Author: Paulo Cesar Pereira de Andrade <pcpa@mandriva.com.br>
Date: Sun Dec 7 18:31:32 2008 -0200
Convert libx86emu.a to a "libtool convenience library".
commit ed4a17274015ecd8040ae85bd5cd9d1dbcc9460a
Author: Paulo Cesar Pereira de Andrade <pcpa@mandriva.com.br>
Date: Sun Dec 7 14:59:25 2008 -0200
Export some symbols from libxf86config when installing it.
These are private symbols, but used by the X Server.
The newly exported symbols were not added to the sdk headers.
Optionally, libxf86config could be compiled without hidden symbols
when being installed.
Thanks to Maarten Maathuis for noticing the problem.
commit bf4c29ab48a166eb158cf4be7c597982d65ef214
Author: Paulo Cesar Pereira de Andrade <pcpa@mandriva.com.br>
Date: Sun Dec 7 05:12:41 2008 -0200
Correct xf86acpiDisableFlag symbol.
It is declared as
<hash>ifdef HAVE_ACPI
Bool xf86acpiDisableFlag = FALSE;
<hash>endif
in hw/xfree86/common/xf86Globals.c
but not protected by the ifdef in the sdk header xf86Priv.h, what
caused a build failure in the tinderbox, due to the address of the
symbol being taken (to ensure it is available) in sdksyms.c.
commit b1dac41fb3853ca8182048ea57b88b6e84ecceb3
Author: Paulo Cesar Pereira de Andrade <pcpa@mandriva.com.br>
Date: Sun Dec 7 02:22:19 2008 -0200
Use libtool convenience libraries and better "symbol" table.
All .a libraries were converted to .la, and instead of linking the
Xorg binary with a mix of .a and .la, and adding some libraries more
then once in the command line, etc, now it generates a single libxorg.la
from all the required convenience libraries, and links with a dummy
xorg.c (that should usually be the file with the main function...).
This removes the requirement of some things like libosandcommon and
libinit, that existed to circumvent problems when linking multiple
.a and .la in the final Xorg binary.
The "symbol table" is now generated dynamically, by a shell script,
with an embedded gawk parser that parses cpp output. The new file
sdksyms.sh is generated by hand by analyzing all Makefile.am's and
making it create a sdksyms.c file, that includes all sdk headers that
will add symbols for the Xorg binary. Module headers aren't read, and
a in 2 files it was required to add a "<hash>ifndef XorgLoader" around
declarations shared between the Xorg binary and libextmod. A few
other changes were added to other sdk headers, like preventing
multiple inclusion, or including other headers to satisfy dependencies.
This should be a lot more portable, and better (hopefully properly)
using libtool to generate convenience libraries.
commit ccd2c668c13863ed704f86b29fc6b3ee628e56a2
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Sat Dec 6 14:11:52 2008 -0800
XQuartz: darwinPointer reports the actual pixel position now rather than a relative position
(cherry picked from commit a41e7f75decd340d064fdc0d2c4fe6c88d7dbc82)
commit 7ebd0c7e8d42a13079957d9bacf5cb30d7855a59
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Fri Dec 5 12:42:31 2008 -0800
XQuartz: Corrected name/command labels in the customization widget
(cherry picked from commit a689c23f17eb445c36b97eb617ef4b8bd157985f)
commit 027ff97a1354ab4c83fecb615f6bc2a6b739b871
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Fri Dec 5 12:00:08 2008 -0800
Make sure _X_EXPORT is defined in edid.h
Fixes build error in xf86-video-intel utilities
commit 466b0fca9ba5d5e7fb36e47a6d1bd60218f51c75
Author: Paulo Cesar Pereira de Andrade <pcpa@mandriva.com.br>
Date: Fri Dec 5 17:01:09 2008 -0200
Add back a simplified version of the loader static address tables.
If not taking the symbol addresses, linkage will break badly, as not
all symbols will be present, and it also requires changing library order,
and/or making some changes like the "libosandcommon".
This table should be modified to be generated automatically, as
it is required to "fool" the compiler/loader into adding all required
symbols to the X Server.
commit 44bef8b850c5a78a3d3eca5f0d92b71bdd0a87e2
Author: Matthias Hopf <mhopf@suse.de>
Date: Fri Dec 5 15:37:15 2008 +0100
randr: Update SProcRandrVector for panning
commit 44c8c3cf7de589fb8e987f4ab931294eaf0b405f
Author: Paulo Cesar Pereira de Andrade <pcpa@mandriva.com.br>
Date: Fri Dec 5 04:26:57 2008 -0200
Remove static symbol address tables in hw/xfree86/loader/*sym.{c,h}
Those tables were once used to decide what symbols are visible to
modules, but they were outdated. The only real usage was that, since
it was taking the address of symbols, linkage should fail if the
symbols were not available.
Now the proper way to make symbols available to modules should
be to use the _X_EXPORT macro, or not compile with hidden symbols,
so that all symbols would be available.
All symbols in the tables were revised to ensure they are exported,
and only symbols that were not exported are ClientSleepUntil() and
DuplicateModule(), that were not in the sdk for quite some time
already, and should not have any users outside of the X Server
(and/or builtin modules).
commit 091a50d1260c70055aba1fa6a2d1b1a36de1114e
Author: Paulo Cesar Pereira de Andrade <pcpa@mandriva.com.br>
Date: Thu Dec 4 18:23:25 2008 -0200
Move _X_EXPORT attribute to header file.
The attribute should be set on header files to make it easier to
manage what symbols are available to modules.
_X_EXPORT should be used in sources only for special cases, like
symbols that must be visible by non video/input driver/modules but
should not be "advertised" in the sdk.
commit e5ab9e66628cde081757cf2a1013a78e927a622e
Author: Matthias Hopf <mhopf@suse.de>
Date: Thu Dec 4 18:13:40 2008 +0100
randr: Allow panning to be disabled per axis
commit bad118ace6c5bae5a5ed8a35129c90c38f1c1932
Author: Matthias Hopf <mhopf@suse.de>
Date: Thu Dec 4 16:55:14 2008 +0100
randr: Rework panning area verification
commit 219c26ce0c65625d55cfd943ec66fe94a1a0ddfd
Author: Matthias Hopf <mhopf@suse.de>
Date: Thu Dec 4 16:28:40 2008 +0100
randr: Don't change panning parameters if verification fails.
commit 18a8bac1a1567b6215928f96870554ea63f39aab
Author: Matthias Hopf <mhopf@suse.de>
Date: Thu Dec 4 16:30:38 2008 +0100
randr: Rename pan() to set_origin(), and xf86CrtcPan() to xf86CrtcSetOrigin()
commit 825b2c2f4a59ac4852f90bbbddf18ab832297fdd
Author: Matthias Hopf <mhopf@suse.de>
Date: Thu Dec 4 16:11:21 2008 +0100
randr: Nuke config-timestamp for panning
commit eeeb98d1df59baaaec954b6318d788a37e388d11
Author: Matthias Hopf <mhopf@suse.de>
Date: Fri Nov 28 17:51:20 2008 +0100
randr: Protocol bits for panning support
commit b929d721efdb17bcc94b9984c4f34d0df3d267d5
Author: Matthias Hopf <mhopf@suse.de>
Date: Fri Nov 28 17:49:31 2008 +0100
randr: Panning support
commit 834cbc16f3eb539704faade7bff347b161ce69d9
Author: Matthias Hopf <mhopf@suse.de>
Date: Fri Nov 28 17:39:23 2008 +0100
randr: Crtc interface update for panning support.
commit a475eb9feec75e9ce1e316da0f1679acd7dd3aa8
Author: Matthias Hopf <mhopf@suse.de>
Date: Fri Nov 28 17:38:52 2008 +0100
randr: Weird enough, crtc->version was never set upon creation. Fix that.
commit 9db84fac0cc767e23986223d22bc085cde0cc86f
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Tue Dec 2 14:54:10 2008 -0800
Removed unised option from configure.ac for launchd
(cherry picked from commit 87e4de0a9a8af6e5e0cbba74e585761f1160a6ab)
commit fa4f2527a5002711fe47c02b14097032fd845dc4
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Tue Dec 2 14:53:21 2008 -0800
XQuartz: pbproxy: Simplify linking
(cherry picked from commit 909cc5c4dca0f63e90505575bbd454b46a4670cc)
commit 126d8a4c8a72b039903023dce0da64b251080e1d
Author: Paulo Cesar Pereira de Andrade <pcpa@mandriva.com.br>
Date: Thu Dec 4 02:43:29 2008 -0200
Update .gitignore.
Add files left by make distcheck and remove files that no longer
are generated.
commit 9826b95c198e74f89680cc247b9bd9dd884d72be
Author: Paulo Cesar Pereira de Andrade <pcpa@mandriva.com.br>
Date: Thu Dec 4 02:05:05 2008 -0200
Correct make distcheck by removing dolt files.
commit 5dbe70dd52fd8daf8d0797951cc5a758d2c3b44c
Author: Paulo Cesar Pereira de Andrade <pcpa@mandriva.com.br>
Date: Thu Dec 4 01:57:46 2008 -0200
Remove dummylib.
Only cvt required it, and only used XNF{,c}alloc
via xnf{,c}alloc macros.
Based on patch by Eric Anholt.
commit f841d4e3cccbde02e91c948f5ffb9e32c8c3b3cc
Author: Julien Cristau <jcristau@debian.org>
Date: Wed Dec 3 23:02:03 2008 +0100
Move RELEASE_DATE closer to AC_INIT so it's more likely to be updated
commit 75b02dd0be2ef64c0f8e3138c90b5c5e48b17913
Author: Paulo Cesar Pereira de Andrade <pcpa@mandriva.com.br>
Date: Wed Dec 3 14:46:30 2008 -0200
Include <X11/Xfuncproto.h> if _X_EXPORT is not defined.
commit dd128ddcdcbe254a9cdd973590f6a979a7f0427e
Author: Timo Aaltonen <tjaalton@cc.hut.fi>
Date: Wed Dec 3 18:40:29 2008 +0200
If AEI is on, disable 'vmmouse' in addition to 'kbd' and 'mouse'.
Signed-off-by: Timo Aaltonen <tjaalton@cc.hut.fi>
Signed-off-by: Peter Hutterer <peter.hutterer@redhat.com>
commit 0b5ecabfb803cd820338fb0364521fe39b05578b
Author: Julien Cristau <jcristau@debian.org>
Date: Wed Nov 26 21:19:55 2008 +0100
randr: add swapped dispatch for RR[GS]etCrtcTransform
Fix a memory leak in ProcRRGetCrtcTransform() while I'm at it.
Signed-off-by: Julien Cristau <jcristau@debian.org>
Cc: Keith Packard <keithp@keithp.com>
commit 110a71d11ab7a1a55a6a24d792457fdef0b0746d
Author: Kristian Høgsberg <krh@redhat.com>
Date: Wed Dec 3 11:22:38 2008 -0500
Test for DRI2 extension in dri_internal.h and only enable AIGLX DRI2 if found.
commit fd2d40b7ec5d685dac55453eb1f2da672dc83126
Author: Peter Hutterer <peter.hutterer@redhat.com>
Date: Wed Dec 3 11:31:48 2008 +1000
Xi: change XIUnRegisterPropertyHandler to XIUnregisterPropertyHandler
CamelCase can be taken too far, and AFAICT there's no consumers of that
function yet anyway.
Signed-off-by: Peter Hutterer <peter.hutterer@redhat.com>
commit 49f77fff1495c0a2050fb18f9b1fc627839bbfc2
Author: Paulo Cesar Pereira de Andrade <pcpa@mandriva.com.br>
Date: Wed Dec 3 05:43:34 2008 -0200
Rework symbol visibility for easier maintenance
Save in a few special cases, _X_EXPORT should not be used in C source
files. Instead, it should be used in headers, and the proper C source
include that header. Some special cases are symbols that need to be
shared between modules, but not expected to be used by external drivers,
and symbols that are accessible via LoaderSymbol/dlopen.
This patch also adds conditionally some new sdk header files, depending
on extensions enabled. These files were added to match pattern for
other extensions/modules, that is, have the headers "deciding" symbol
visibility in the sdk. These headers are:
o Xext/panoramiXsrv.h, Xext/panoramiX.h
o fbpict.h (unconditionally)
o vidmodeproc.h
o mioverlay.h (unconditionally, used only by xaa)
o xfixes.h (unconditionally, symbols required by dri2)
LoaderSymbol and similar functions now don't have different prototypes,
in loaderProcs.h and xf86Module.h, so that both headers can be included,
without the need of defining IN_LOADER.
xf86NewInputDevice() device prototype readded to xf86Xinput.h, but
not exported (and with a comment about it).
commit 0b8f8b24f718820a72ebdc52423c2e6a44e848c5
Author: Stuart Bennett <sb476@cam.ac.uk>
Date: Tue Dec 2 22:52:53 2008 -0800
xf86Cursors: xf86_reload_cursors shouldn't unconditionally show hwcursor (#14820)
Also, no need to call ShowCursor when SetCursorPosition already does it
Based on a previous patch by Maarten Maathuis
Signed-off-by: Keith Packard <keithp@keithp.com>
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.
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>
commit 463e02e7de5da3e582a3a049110a476713c7210e
Author: Peter Hutterer <peter.hutterer@redhat.com>
Date: Wed Dec 3 15:06:37 2008 +1000
xkb: Allow NULL as rulesFile in XkbSetRulesDflts.
If no rules file is given, simply re-use the previous one. If no RF is given
the first time this function is called, use the built-in default.
This includes fixing the built-in default to something that actually exists.
Signed-off-by: Peter Hutterer <peter.hutterer@redhat.com>
commit e670fd889607fa712876218882cd4a9b46937661
Author: Peter Hutterer <peter.hutterer@redhat.com>
Date: Wed Dec 3 11:55:13 2008 +1000
dix: fix GetMaximumEventsNum(), may return a DCCE event too.
Signed-off-by: Peter Hutterer <peter.hutterer@redhat.com>
commit 85d84c7cf2d368d1803dc2cdd03d6c9df8cc0430
Author: Eric Anholt <eric@anholt.net>
Date: Tue Dec 2 17:33:43 2008 -0800
Fix GLX after 180bad84774493d48f2793a6281d825560944863.
Sigh.
commit 4a61ad427c634bcc38a31ce0f14ff5c2d3f706c7
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Tue Dec 2 14:35:45 2008 -0800
Update sample xorg.conf file
commit c1db925d10fd37077bed90612ed95c3fd20cd2e2
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Tue Dec 2 14:32:48 2008 -0800
Add atKeynames.h to libdmxinput_a_SOURCES so it's included in tarballs
Reported by geearu in #xorg-devel
commit 8561514574b3540c729bcc3acca9c943adcdc778
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Tue Dec 2 13:32:34 2008 -0800
Don't need to check uid/euid for every commandline argument
Check uid/euid only when handling the arguments that are restricted
to root/non-setuid users
commit 6de6ffff35ac03d49fa61de195d4a0605e0ef8bf
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Tue Dec 2 13:19:08 2008 -0800
Remove unused config flags from FlagValues & FlagOptions
FLAG_DISABLEMODINDEV, FLAG_MODINDEVALLOWNONLOCAL, & FLAG_HANDLE_SPECIAL_KEYS
commit bb072019fa8dd292a50ef433d05caeefd1304a73
Author: Peter Hutterer <peter.hutterer@redhat.com>
Date: Mon Dec 1 16:57:06 2008 +1000
xfree86: don't render SW cursors for devices attached to VCP (#16805)
When leaving 3D games such as quake3 or sauerbraten, a cursor may stay on the
screen. This is caused by one run of SW rendering for the SD, even though the
SD was attached to the VCP and thus has HW rendering capabilities.
Check for the SD's attachment (like in all other functions) before deciding on
SW or HW rendering.
X.Org Bug 16805 <http://bugs.freedesktop.org/show_bug.cgi?id=16805>
Signed-off-by: Peter Hutterer <peter.hutterer@redhat.com>
commit 3a690598cf18c4cdc6aadd10a1ecf0772cacd34b
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Tue Dec 2 12:59:57 2008 -0800
Remove unused HandleSpecialKeys config option
Was only used by "keyboard" driver - the last place the value was checked
was in xf86PostKbdEvent, which was removed in commit
60ea7b51fe2b8a19a08b63db48504971a7a50ee6
commit 1dfed222e93f4684c2a450944a9a0ea9e085c43f
Author: Bernhard Rosenkraenzer <bero@arklinux.org>
Date: Tue Dec 2 09:01:56 2008 +1000
Xext: fix MultiBuffer compilation error with TryClientEvents. (#18835)
X.Org Bug 18835 <http://bugs.freedesktop.org/show_bug.cgi?id=18835>
Signed-off-by: Peter Hutterer <peter.hutterer@redhat.com>
commit 9ce995373e4aa4b1bf51b4adafa2324f781ec1cd
Author: Peter Hutterer <peter.hutterer@redhat.com>
Date: Mon Dec 1 21:32:39 2008 +1000
mi: UpdateSprite only if the device is attached.
commit d507f60689f4e14383b0d24e63afc8cf836360d5
Author: Peter Hutterer <peter.hutterer@redhat.com>
Date: Wed Nov 26 14:15:04 2008 +1000
xfree86: don't FatalError on "too many input devices".
Just ignore devices after MAXDEVICES has been reached, but warn the user that
the devices are ignored.
Signed-off-by: Peter Hutterer <peter.hutterer@redhat.com>
commit 9bf761468fa3baf4c5fa40efa717b4b581d920f9
Author: Peter Hutterer <peter.hutterer@redhat.com>
Date: Fri Nov 28 11:44:58 2008 +1000
Xi: fix xi_filters size.
commit 260e48c252c95fd1b1ba9ad7478791f6b9a67e2d
Author: Peter Hutterer <peter.hutterer@redhat.com>
Date: Fri Nov 28 11:29:06 2008 +1000
dix: remove confusing (and wrong) comment. VCP is not the only pointer.
Signed-off-by: Peter Hutterer <peter.hutterer@redhat.com>
commit 5d02e580d7c4144ea6f0984240fc913e05fec877
Author: Peter Hutterer <peter.hutterer@redhat.com>
Date: Fri Nov 28 11:46:15 2008 +1000
dix: use UpdateFromMaster in GetProximityEvents.
Signed-off-by: Peter Hutterer <peter.hutterer@redhat.com>
commit 95fc59a199f99bf167fbb09297a9bb0e33e31869
Author: Peter Hutterer <peter.hutterer@redhat.com>
Date: Fri Nov 28 14:55:15 2008 +1000
xkb: Extra sanity checks to prevent dev->key == NULL dereferencing.
commit a425abf0eaa61ee5ccb2f32a1af24edd190f7889
Author: Peter Hutterer <peter.hutterer@redhat.com>
Date: Wed Nov 26 12:20:00 2008 +1000
xkb: don't attempt to filter events for devices without key classes.
Reported by Magnus Kessler.
Signed-off-by: Peter Hutterer <peter.hutterer@redhat.com>
commit a85f0d6b98237d8a196de624207acf1983a1859a
Author: Peter Hutterer <peter.hutterer@redhat.com>
Date: Wed Nov 26 11:15:05 2008 +1000
Xi: fix use of button->down - bitflags instead of int arrays.
The device's button down state array was changed to use DOWN_LENGTH and thus
bitflags for each button in cfcb3da7.
Update the DBSN events to copy this bit-wise state.
Update xkb and Xi to check for the bit flag instead of the array value.
Reported by ajax.
Signed-off-by: Peter Hutterer <peter.hutterer@redhat.com>
commit 180bad84774493d48f2793a6281d825560944863
Author: Paulo Cesar Pereira de Andrade <pcpa@mandriva.com.br>
Date: Tue Dec 2 02:50:45 2008 -0200
Add visibility flags to XSERVER_CFLAGS.
This is done to actually change DIX_CFLAGS, as not all "modules" use
XORG_CFLAGS.
Also export the symbols that are required by other modules after
the change.
commit 8c560422b44e012053612754430d2b87dc44ed59
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Mon Dec 1 20:02:34 2008 -0800
More man page updates for 1.6 release for Xorg, xorg.conf & exa man pages.
- Remove remaining references to XFree86-Misc options AllowNonLocalModInDev
and DisableModInDev.
- Remove remaining references to grab-breaking keys & associated options.
- Update description of Ctrl-Alt-Backspace to new -retro/DontZap defaults.
- Add description of new options -modalias and -showopts.
- Update list of modules loaded by default.
- Update input driver references from keyboard to evdev & kbd.
- Update list of driver man pages to match xf86-*-* drivers with man pages.
- Add See Also section to exa man page.
and various formatting/typo/etc. fixes.
The Xorg/xorg.conf sections on input device selection could use further
updates to better match the current state of HAL-enabled configuration.
commit 6a1850b8c677e2a2993f6f6b731ee3d35aa55d09
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Mon Dec 1 19:19:04 2008 -0800
Correct warning for unknown GlxVisuals option in conf file
commit afeacb8e74b2a1e366e5ca9f0e58805d8d96c457
Author: Kristian Høgsberg <krh@redhat.com>
Date: Mon Dec 1 20:53:17 2008 -0500
Bump dri2proto requirement to 1.99.3.
commit ad01e86b5c7c528adec8a1f95ecaa294f58a8922
Author: Kristian Høgsberg <krh@redhat.com>
Date: Mon Dec 1 20:52:41 2008 -0500
Drop unused DRI2 vblank infrastructure.
For this first iteration of DRI2 we don't have any vsync functionality
in place yet, so back out the support in DRI2 and the protocol for now.
commit 24c562f04b41d219c34f5fa3f963564accf329f2
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Mon Dec 1 16:28:45 2008 -0800
Update See Also lists in Xorg & xorg.conf man pages
Remove xorgconfig & xorgcfg
Update driver lists:
- Remove vga
- i810->intel
- via->openchrome
commit bd147e6f4b03f344c967c88fd433877b14fe1912
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Mon Dec 1 16:08:55 2008 -0800
Remove hack to only load font modules if magic strings appear in font path
commit 5f3f14179edf48aad518f6f707bfdc37c27267c6
Author: Jay Cotton <jay.cotton@sun.com>
Date: Mon Dec 1 16:06:09 2008 -0800
Sun bug 6618220: Xorg server core dump in xf86RandRModeRefresh(NULL)
<http://bugs.opensolaris.org/bugdatabase/view_bug.do?bug_id=6618220>
commit 09df7cc5ad7b72d8a23c3e22fc718aad8c16f4d3
Author: Kristian Høgsberg <krh@redhat.com>
Date: Mon Dec 1 12:41:10 2008 -0500
Avoid dereferencing NULL pScreen in xf86CrtcSetModeTransform().
We can get there during PreInit as we set a mode for load detection.
At that time there's no pScreen anywhere, so just skip the optimization
then.
commit b0d371ab0a6efd4956c3677faa20b2ac15c33765
Author: Adam Jackson <ajax@redhat.com>
Date: Mon Dec 1 11:36:06 2008 -0500
randr: Don't send output property events on server exit
If the Window resource type is already gone, there's no point in trying
to send events, all it can do is access already-freed memory.
Relevant thread:
http://lists.freedesktop.org/archives/xorg/2008-November/040443.html
commit 16b11cd03d8c5def07f0e598f237f71a37883a46
Author: Paulo Cesar Pereira de Andrade <pcpa@mandriva.com.br>
Date: Sun Nov 30 02:59:34 2008 -0200
Correct static symbol XkmReadTOC and first pass on compile warning fixes.
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
commit fb22d4d928bc5d1a893494a059359da2ed2ac639
Author: Paulo Cesar Pereira de Andrade <pcpa@mandriva.com.br>
Date: Sun Nov 30 01:33:20 2008 -0200
Remove declarations of symbols that are never defined.
These symbols were removed from the X Server, or never declared.
One symbol that may need special attention is XkbBuildCoreState(),
that doesn't have a prototype anywhere, but is called from
xkb/xkbEvents.c:XkbFilterEvents(), and also used by the macros
XkbStateFieldFromRec() and XkbGrabStateFromRec() defined in
include/xkbstr.h.
fb/wfbrename.h also may need some cleanup, as it makes several
"renames" of non existing symbols.
commit d6cbd4511e35a89a0353f11834c6fdb8d4d2189f
Author: Paulo Cesar Pereira de Andrade <pcpa@mandriva.com.br>
Date: Sat Nov 29 23:56:06 2008 -0200
Export symbols defined in the sdk.
This is the biggest "visibility" patch. Instead of doing a "export"
symbol on demand, export everything in the sdk, so that if some module
fails due to an unresolved symbol, it is because it is using a symbol
not in the sdk.
Most exported symbols shouldn't really be made visible, neither
advertised in the sdk, as they are only used by a single shared object.
Symbols in the sdk (or referenced in sdk macros), but not defined
anywhere include:
XkbBuildCoreState()
XkbInitialMap
XkbXIUnsupported
XkbCheckActionVMods()
XkbSendCompatNotify()
XkbDDXFakePointerButton()
XkbDDXApplyConfig()
_XkbStrCaseCmp()
_XkbErrMessages[]
_XkbErrCode
_XkbErrLocation
_XkbErrData
XkbAccessXDetailText()
XkbNKNDetailMaskText()
XkbLookupGroupAndLevel()
XkbInitAtoms()
XkbGetOrderedDrawables()
XkbFreeOrderedDrawables()
XkbConvertXkbComponents()
XkbWriteXKBSemantics()
XkbWriteXKBLayout()
XkbWriteXKBKeymap()
XkbWriteXKBFile()
XkbWriteCFile()
XkbWriteXKMFile()
XkbWriteToServer()
XkbMergeFile()
XkmFindTOCEntry()
XkmReadFileSection()
XkmReadFileSectionName()
InitExtInput()
xf86CheckButton()
xf86SwitchCoreDevice()
RamDacSetGamma()
RamDacRestoreDACValues()
xf86Bpp
xf86ConfigPix24
xf86MouseCflags[]
xf86SupportedMouseTypes[]
xf86NumMouseTypes
xf86ChangeBusIndex()
xf86EntityEnter()
xf86EntityLeave()
xf86WrapperInit()
xf86RingBell()
xf86findOptionBoolean()
xf86debugListOptions()
LoadSubModuleLocal()
LoaderSymbolLocal()
getInt10Rec()
xf86CurrentScreen
xf86ReallocatePciResources()
xf86NewSerialNumber()
xf86RandRSetInitialMode()
fbCompositeSolidMask_nx1xn
fbCompositeSolidMask_nx8888x0565C
fbCompositeSolidMask_nx8888x8888C
fbCompositeSolidMask_nx8x0565
fbCompositeSolidMask_nx8x0888
fbCompositeSolidMask_nx8x8888
fbCompositeSrc_0565x0565
fbCompositeSrc_8888x0565
fbCompositeSrc_8888x0888
fbCompositeSrc_8888x8888
fbCompositeSrcAdd_1000x1000
fbCompositeSrcAdd_8000x8000
fbCompositeSrcAdd_8888x8888
fbGeneration
fbIn
fbOver
fbOver24
fbOverlayGeneration
fbRasterizeEdges
fbRestoreAreas
fbSaveAreas
composeFunctions
VBEBuildVbeModeList()
VBECalcVbeModeIndex()
TIramdac3030CalculateMNPForClock()
shadowBufPtr
shadowFindBuf()
miRRGetScreenInfo()
RRSetScreenConfig()
RRModePruneUnused()
PixmanImageFromPicture()
extern int miPointerGetMotionEvents()
miClipPicture()
miRasterizeTriangle()
fbPush1toN()
fbInitializeBackingStore()
ddxBeforeReset()
SetupSprite()
InitSprite()
DGADeliverEvent()
SPECIAL CASES
o defined as _X_INTERNAL
xf86NewInputDevice()
o defined as static
fbGCPrivateKey
fbOverlayScreenPrivateKey
fbScreenPrivateKey
fbWinPrivateKey
o defined in libXfont.so, but declared in xorg/dixfont.h
GetGlyphs()
QueryGlyphExtents()
QueryTextExtents()
ParseGlyphCachingMode()
InitGlyphCaching()
SetGlyphCachingMode()
commit ffb484f7ef84099019b196ef97bfb2355eb6d52a
Author: Maarten Maathuis <madman2003@gmail.com>
Date: Sat Nov 29 14:30:55 2008 +0100
randr: Avoid needlessly creating a shadow framebuffer.
- pScreen->width and height were zero, so it didn't "fit" the screen.
commit 01eaebdc98f30fdf543af6337cdf012d3ff16f09
Author: George Staplin <gstaplin@apple.com>
Date: Fri Nov 28 13:57:45 2008 -0700
XQuartz: GL: Make various changes to makeFormat, so that it works better. Now glxgears looks normal with the old libGL.
Add various GLX extensions to the list of supported extensions.
Reformat the oddly formatted code in some areas.
Use xalloc and xfree instead of malloc and free.
(cherry picked from commit 755f53eb40c4329d8c82a31cb910c31fdd4ea12e)
commit 3d527b91b4bfa31e78d5fc7a1447a4026876f14e
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Fri Nov 28 12:59:09 2008 -0800
XQuartz: Added option to enable/disable test extensions
defaults write org.x.X11 enable_test_extensions -boolean true
(cherry picked from commit fd4710aff3723d5f3422cf6a6530172eafc556d9)
(cherry picked from commit 635019ad18db921fec99256294debd8571074abf)
commit 71d3df7cc37403b5842227a035d9b995fd920e0b
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Fri Nov 28 11:18:14 2008 -0800
XQuartz: Avoid some warning messages being spewed to system.log by AppKit
(cherry picked from commit 780eff230ce41ad785e54d61a82c731269ae0446)
commit a9796c7bc43223df44f12a7be08e361aea963ec1
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Fri Nov 28 01:45:37 2008 -0800
XQuarz: Setup our PATH and PWD earlier, so our initial client benefits from it as well...
(cherry picked from commit cbae2b447357b3fed6ff19414c60dd3792045600)
commit ef4179f43a84d90f867b95ee5974ad26884253b5
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Wed Nov 26 12:15:58 2008 -0800
XQuartz: Fix dead-acute on Greek keyboards
(cherry picked from commit 807f2ec35c5f95b56b3e2b5eac51aec300fe5cb6)
commit 800f5c681bed300d8caf99935e8f80ea6c1993ba
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Wed Nov 26 12:07:52 2008 -0800
XQuartz: Fix Czech keyboard dead-acute
(cherry picked from commit 771df2786bc60389489f0967e705c7c95bdda085)
commit ac57bb36d56a7a4d41add8d5a206ff37544a1819
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Tue Nov 25 20:14:37 2008 -0800
XQuartz: Fix an uninitialized keyboard_type on Tiger
(cherry picked from commit 27b1a5eb3482052253ebdce1a09aedf05ac1b099)
commit 45c8bd0fe54273039fdaa1eeeafb81b5774f2c75
Author: Paulo Cesar Pereira de Andrade <pcpa@mandriva.com.br>
Date: Fri Nov 28 02:01:57 2008 -0200
Enable compiling the X Server and modules with hidden symbols by default.
Note that it checks if support for symbol visibility is available by
the compiler, not if it is functional. It may have problems on non x86
architectures.
To disable the feature, just pass the option "--disable-visibility"
to the X Server configure script.
Unless using an alternate build schema, drivers built from a git
checkout will use the same "visibility" related CFLAGS used to compile
the X Server.
commit 31285d063ec4623cb0764437d6d57e244f20460d
Author: Paulo Cesar Pereira de Andrade <pcpa@mandriva.com.br>
Date: Fri Nov 28 01:55:11 2008 -0200
Make visible symbols required by xorg modules.
This patch exports all symbols required by the compilable
(in a x86 linux computer) xorg/driver/* modules.
Still missing symbols worth mentioning are:
sunleo
miFindMaxBand no longer available
intel (uxa/uxa-accel.c)
fbShmPutImage no longer available (and should have been static)
mga
MGAGetClientPointer (should come from matrox's libhal)
This is not a definitive "visibility" patch, as all it does is to
export missing symbols, but the modules that current don't compile,
may require more symbols once fixed, and third party drivers should
also require more symbols exported.
A "definitive" patch should export symbols defined in the sdk.
commit 6f18ea7e656b79e58f66f51067334414767b413f
Author: Julien Cristau <jcristau@debian.org>
Date: Wed Nov 26 19:07:04 2008 +0100
Typo fix
commit efefc03f9b26738b69abb570c1af2167cc99c4d8
Author: Julien Cristau <jcristau@debian.org>
Date: Sun Oct 26 13:19:48 2008 +0100
Add missing include
../../../../hw/xfree86/xaa/xaaTables.c:9:14: warning: symbol 'byte_expand3' was not declared. Should it be static?
../../../../hw/xfree86/xaa/xaaTables.c:53:14: warning: symbol 'byte_reversed_expand3' was not declared. Should it be static?
commit 74bc792e1814849b8eee9e448e36c3568b821e6c
Author: Paulo Cesar Pereira de Andrade <pcpa@mandriva.com.br>
Date: Thu Nov 27 05:34:14 2008 -0200
Export symbols required by the vesa and fbdev drivers.
This is a minimal set of patches, to have an usable X Server when
compiling it with symbols hidden by default.
commit 74e2669103b59d51b24ddc48f378b1d04a3effd4
Author: Paulo Cesar Pereira de Andrade <pcpa@mandriva.com.br>
Date: Thu Nov 27 04:33:44 2008 -0200
Export symbols also defined in libXfont.
libXfont has stubs for these symbols, so, when compiling with hidden
symbols by default, these symbols must be visible in the X Server, or
the stubs in libXfont will be used.
commit 87a7fb7438b70d07ebf240c530b8548a01021d48
Author: Paulo Cesar Pereira de Andrade <pcpa@mandriva.com.br>
Date: Thu Nov 27 00:12:59 2008 -0200
Rework code using return value of LoaderSymbol as a function pointer.
The patch removes all macros in the format
define xf86_sym ((type (*)(argument-list))LoaderSymbol("sym"))
creates a new macro in the format
define xf86_sym sym
and ensures "sym" is a "visible" symbol.
The patch doesn't add or remove features, and is source and binary
compatible with previous shared objects (with the difference that it
requires the dlloader).
These symbols are a special case, as, due to the fact that LoaderSymbol
was being used to reference them, they are not easily found by "automated"
tools that check for missing symbols. And now it also have the benefit
that the compiler/loader "knows what is going on".
commit fc708394318ed92c612e2938b335c08c1ffebb28
Author: Keith Packard <keithp@keithp.com>
Date: Wed Nov 26 15:49:02 2008 -0800
Add server support for RRGetScreenResourcesCurrent
This depends on randrproto 1.2.99.1
Signed-off-by: Keith Packard <keithp@keithp.com>
commit f710ce269c020a39f58b2bfbd0fe5192a3279c72
Author: Alan Hourihane <alanh@tungstengraphics.com>
Date: Wed Nov 26 20:02:44 2008 +0000
bump master to 1.6.99.1 (now the 1.6 branch is created)
commit f3edc1fb0210149f35eab4e413700b5c4ac48214
Author: Keith Packard <keithp@keithp.com>
Date: Tue Nov 25 23:15:35 2008 -0800
New version of dolt
commit 4715f079b9c61362755c95c1ebf89c97cc6fff2b
Merge: 9ffc671939 ed597f19fd
Author: Keith Packard <keithp@keithp.com>
Date: Tue Nov 25 22:19:08 2008 -0800
Merge commit 'origin/master'
commit 9ffc6719390df8fdd0a5295a7a7a0eaea792be45
Author: Keith Packard <keithp@keithp.com>
Date: Mon Nov 24 13:08:48 2008 -0800
Move matrix operations from X server to pixman 0.13.2
pixman 0.13.2 now holds all of the matrix operations. This leaves
the protocol conversion routines and some ABI stubs in place
Signed-off-by: Keith Packard <keithp@keithp.com>
commit ed597f19fdc3017dde6d1452b5cdf8ddcd69a5b1
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Tue Nov 25 19:36:31 2008 -0500
xselinux: use "raw context" variants of getpeercon() and getcon().
commit ec1d08442f69353cb0e73ac4eaf0346ebb975594
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri Nov 21 15:13:00 2008 +1000
dix: Enable core devices in InitCoreDevices already.
Updated patch, see
http://lists.freedesktop.org/archives/xorg/2008-November/040540.html
Signed-off-by: Peter Hutterer <peter.hutterer@redhat.com>
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit 2b45602e828a07a0817691b2838cd34ffee531bd
Author: Peter Hutterer <peter.hutterer@redhat.com>
Date: Wed Nov 26 10:42:52 2008 +1000
Revert "dix: Enable core devices in InitCoreDevices already."
I merged the wrong patch. See correct patch at:
http://lists.freedesktop.org/archives/xorg/2008-November/040540.html
Not activating the device before attempting to enable it would leave the
sprite unset, crashing the server when enabling the real devices.
This reverts commit e078901a4eca02bd3e7a80d9462dafbca939a187.
Signed-off-by: Peter Hutterer <peter.hutterer@redhat.com>
commit 416685c295353b5816689994c7c58ae7db3e878d
Author: Jeremy Uejio <jeremy.uejio@sun.com>
Date: Tue Nov 25 16:26:44 2008 -0800
Refix Sun bug #6685465: Xephyr uses wrong or bad colortable in 8-bit mode
<http://bugs.opensolaris.org/view_bug.do?bug_id=6685465>
This is a refix of the previous fix for CR 6685465. In the first fix
I was shifting the colors to match the mask by the bits_per_rgb amount
in the visual structure. That field has nothing to do with the # of
bits to shift by. I should just instead shift the bits to match the mask.
commit d5f9a131a2d5bd33f82fdd4e809880b0ff792b45
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Tue Nov 25 15:46:39 2008 -0800
Fix const-mismatch warnings for DisplayModePtr's
Includes fixes for:
"xf86Config.c", line 2434: warning: argument #1 is incompatible with prototype:
prototype: pointer to struct _DisplayModeRec: "xf86.h", line 351
argument : pointer to const struct _DisplayModeRec
"xf86EdidModes.c", line 312: warning: argument #1 is incompatible with prototype:
prototype: pointer to struct _DisplayModeRec: "../../../hw/xfree86/common/xf86.h", line 351
argument : pointer to const struct _DisplayModeRec
"xf86EdidModes.c", line 438: warning: assignment type mismatch:
pointer to struct _DisplayModeRec "=" pointer to const struct _DisplayModeRec
"xf86Modes.c", line 701: warning: assignment type mismatch:
pointer to struct _DisplayModeRec "=" pointer to const struct _DisplayModeRec
commit d5ad296869c38ab30136b5a293a0125b76aad994
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Tue Nov 25 14:12:26 2008 -0800
Remove duplication from code paths in XkbDDXCompileKeymapByNames
commit 2538fc0d893a150e978355d281750f0a989728a7
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Tue Nov 25 18:18:46 2008 -0500
xselinux: don't pass a NULL key string to selabel_lookup().
commit c8472a74441838e16d0d3414db1fa7fe996868a9
Author: Michael Vogt <michael.vogt@ubuntu.com>
Date: Tue Nov 25 19:35:17 2008 +0200
Do not send VisibilityNotify events when MapUnmapEvents are disabled
This prevents a protocol visible side-effect (XVisibilityEvent) on
XCompositeRedirectWindow() followed by a XCompositeUnredirectWindow().
The problem shows up in gnome-screensaver with compiz and "unredirect
fullscreen windows" enable. A VisibilityNotify event is generated (first
with obscured and than with unobscured) when the window swithces from
redirected to unredirected.
https://bugs.freedesktop.org/show_bug.cgi?id=18133
http://launchpad.net/bugs/278112
commit 88297558aada44bc714ad57adbeed3740aaadee5
Author: Adam Jackson <ajax@redhat.com>
Date: Tue Nov 25 14:20:58 2008 -0500
Dead code cleanup over DBE.
No DDXes have explicit DBE support anymore, so the init registration
table never got used. Just nuke it all.
commit e5eaea599ab16428c69912b6b3427ebe46707d7c
Author: Adam Jackson <ajax@redhat.com>
Date: Tue Nov 25 14:05:51 2008 -0500
Warning fix
xf86info.c:11: warning: initialization makes integer from pointer
without a cast
commit 37072500f7bcf39e0d6aa2ceb5d1f2aeeab0b26b
Author: Adam Jackson <ajax@redhat.com>
Date: Tue Nov 25 14:04:44 2008 -0500
Warning fix
helper_exec.c: In function ‘port_rep_inb’:
helper_exec.c:219: warning: implicit declaration of function
‘DEBUG_IO_TRACE’
helper_exec.c:219: warning: nested extern declaration of
‘DEBUG_IO_TRACE’
commit d96bffce2dcf209e76be9b36ca1ede7e0c976d77
Author: Adam Jackson <ajax@redhat.com>
Date: Tue Nov 25 13:59:00 2008 -0500
Warning fix
Init.c:139: warning: no previous prototype for ‘ddxBeforeReset’
Just declare the prototype always, seriously.
commit 09ea671cbff605fd2b2af71619e7db5002108bf8
Author: Adam Jackson <ajax@redhat.com>
Date: Tue Nov 25 13:40:47 2008 -0500
Warning fix
lnx_bell.c:37: warning: no previous prototype for ‘xf86OSRingBell’
commit a9853c7d337b3b1ad49793e9b4b90e313b6fa536
Author: Adam Jackson <ajax@redhat.com>
Date: Tue Nov 25 00:53:55 2008 -0500
Warning fix
Pixmap.c: In function ‘xnestPixmapToRegion’:
Pixmap.c:93: warning: ‘Box.x1’ may be used uninitialized in this
function
commit 81eafe9f93a272b06aa9f9235ec5676b9aa3ee3e
Author: Adam Jackson <ajax@redhat.com>
Date: Tue Nov 25 00:45:07 2008 -0500
Warning fix.
vbe.c: In function ‘VBEReadPanelID’:
vbe.c:1145: warning: return from incompatible pointer type
commit 09bfb25e031772611a2f0902d4ba77b587e4bdb2
Author: Adam Jackson <ajax@redhat.com>
Date: Tue Nov 25 00:43:36 2008 -0500
Remove unused XAAAvailableOptions
commit 8b9253f6383df3fefe38bde43a5f892b158a77c4
Author: Adam Jackson <ajax@redhat.com>
Date: Tue Nov 25 00:38:47 2008 -0500
Code motion: subsume xf86DoProbe.c into xf86Init.c
commit fbabb1c5c243cfd8c954dec4c060dff1a0b81015
Author: Adam Jackson <ajax@redhat.com>
Date: Tue Nov 25 00:34:28 2008 -0500
Warning fix.
In file included from l3-xaaStipple.c:4:
./xaaStipple.c:35: warning: no previous prototype for
‘XAAGetStippleScanlineFunc3LSBFirst’
etc
commit cbaca6ec666d7349c4680b8affc13b5c9cae1fa5
Author: Adam Jackson <ajax@redhat.com>
Date: Tue Nov 25 00:14:24 2008 -0500
Remove dead FreeModuleDesc.
commit eb474adf98229a43bbe17ab98ff084371cb9fa09
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Tue Nov 25 11:25:58 2008 -0800
XQuartz: Simplify the xquartz_resetenv_display path
(cherry picked from commit d2e0624dd30eb234bb25595ceedfa51d48ca1724)
commit 94df1ab7f09a64f57c1e1453e3640462e984619c
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Tue Nov 25 01:30:03 2008 -0800
XQuartz: Force X11Controller to reset a broken DISPLAY envvar.
(cherry picked from commit f1a52b5b5ac31702497937efe3ac578be9a6c54f)
commit 0b314c50a2a0ca1afbdc06663c3b719b05ebb851
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Tue Nov 25 01:13:35 2008 -0800
XQuartz: Removed hardcoded org.x.X11 from MachIPC as well
(cherry picked from commit b4add7826d485600a13eba6a9c7be533f2c02d51)
commit 065d2afb0ca34f89806e0936c51cd27805bc5123
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Tue Nov 25 00:51:01 2008 -0800
XQuartz: Add fallback for xpbproxy's display for Tiger or no-launchd-Leopard
(cherry picked from commit 7a8c6665949d7804a97ef2539a74ec4aa682e1cc)
commit 13df49dca28cf680a4d104630cd675de25d3e944
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Tue Nov 25 00:39:52 2008 -0800
XQuartz: Use the environment to pass the bundle's prefs domain on to xinit/quartz-wm for Tiger or no-launchd-LEOPARD
(cherry picked from commit fbf4b0d33fa5dc618c3191a4e823232dfa33cd95)
commit 40187f782beae4ae751824ef511c9f56a80357c7
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Tue Nov 25 00:20:57 2008 -0800
XQuartz: Dead code removal
(cherry picked from commit eeb323612e0adbea37befed31bbaa1d295728385)
commit b55cad4569e34e3c10e9a327e20b91ea87d9dd98
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Tue Nov 25 00:15:53 2008 -0800
XQuartz: Don't hardcode values of org.x.X11 for the preferences domain
(cherry picked from commit 3a500d9247cf34686ec17b4a88c34d51ecd38ecd)
commit d508a3dcca2f160021aced872715e1ded23cef97
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Mon Nov 24 23:33:54 2008 -0800
XQuartz: More dead code removal
(cherry picked from commit dcb0f6a2e62823a671051874d14a33ce59505892)
commit 41fbdf72f2154a3fca8cf484a611501e3c174fbe
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Mon Nov 24 12:33:20 2008 -0800
XQuartz: Disable some error spew on Tiger (where it wouldn't be an error)
(cherry picked from commit 73ec6d3dfe0086d352f4eca25f1df5ae1884bb18)
commit 09c3f6e04c273ffafcb547c252137fb17c8ce016
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Sat Nov 22 20:23:46 2008 -0800
XQuartz: Dead code removal
(cherry picked from commit 46c077d9b4a883fc809c32077ce40f33a70d268b)
commit ab12c7516207908f3e063a78904d68e2db14208e
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Sat Nov 22 15:47:14 2008 -0800
XQuartz: More Tiger cleanup: bootstrap_strerror
(cherry picked from commit 37f535aff3e9a7a02711daa98152cdff97745622)
commit 208f091bfc657e9ee57b988f035d3aac7e9e173a
Author: Adam Jackson <ajax@redhat.com>
Date: Sun Oct 12 00:07:56 2008 -0400
Remove xf86IODelay
commit 47478aa10adb20b6e48335ac8c4ef31f3fdfe68c
Author: Adam Jackson <ajax@redhat.com>
Date: Sat Oct 11 23:59:24 2008 -0400
Remove xf86{En,Dis}ableInterrupts entirely
commit c7680befe5aebd0f4277d11ff3984d8a7deb9d5b
Author: Adam Jackson <ajax@redhat.com>
Date: Sat Oct 11 23:35:24 2008 -0400
Remove the remnants of Jensen support
As being an EISA-only machine, and as ISA support is gone now...
commit df14682a31b92751091571ed82f6095f55f19cca
Author: Adam Jackson <ajax@redhat.com>
Date: Sat Oct 11 22:48:51 2008 -0400
Bus: Remove ISA support.
No, really. PCI is old enough to drive now. If you want this, get the kernel
to expose a framebuffer device.
commit a8bcab2d3b224e4d4d5b6a097ea530beee920213
Author: Adam Jackson <ajax@redhat.com>
Date: Sat Oct 11 22:14:23 2008 -0400
Bus: Remove yet more unused overlap processing.
commit 994b7c034fc20d76651cf7f6a285526d9aff8770
Author: Adam Jackson <ajax@redhat.com>
Date: Sat Oct 11 22:11:12 2008 -0400
Bus: Don't pretend to care about IRQs, DMA, or PCI config space
commit eb5ae45127fa9f08f0badec7e21f8c26c9c7c969
Author: Adam Jackson <ajax@redhat.com>
Date: Sat Oct 11 21:44:16 2008 -0400
Bus: Simplify a failure case (that pretty much never happens)
commit ee8b5cf94c2a9f8526a3bb5011ebb10f3246a4d9
Author: Adam Jackson <ajax@redhat.com>
Date: Sat Oct 11 21:41:47 2008 -0400
Bus: Trust the kernel when registering driver resources
... everywhere, not just (linux && (ia64 || alpha)).
commit 8397df89456558e3c85b05e0acfccb9f6af6b695
Author: Adam Jackson <ajax@redhat.com>
Date: Sat Oct 11 21:36:14 2008 -0400
Remove unused MIN macro
commit c251c0baae59714a6ac83b69cd106c08baa3613e
Author: Adam Jackson <ajax@redhat.com>
Date: Sat Oct 11 21:34:27 2008 -0400
Bus: remove special handling for init-only resources
This isn't used by any driver, nor has it ever been as far as I can
tell.
commit 3e5281af17841cf50d0e52a728b12c6ab56e61df
Author: Adam Jackson <ajax@redhat.com>
Date: Sat Oct 11 21:16:45 2008 -0400
PCI: Unexport xf86scanpci
commit 6b198daa46f2f609aff7900761cf82cc2fb4e0b4
Author: Adam Jackson <ajax@redhat.com>
Date: Sat Oct 11 20:51:39 2008 -0400
Bus: remove useless isaConvertRange2Host
commit a96db74c2a95bb1dce132cf47ea720ae939dfad7
Author: Adam Jackson <ajax@redhat.com>
Date: Thu Oct 9 00:43:26 2008 -0400
Bus: Don't try to find an ISA bus just for fun.
commit b21311a99d58997cd1fc68726d0848242e9c34fc
Author: Adam Jackson <ajax@redhat.com>
Date: Thu Oct 9 00:34:42 2008 -0400
Bus: Remove unused RemoveOverlaps
commit 41be6b3f0dc0baa1c6ae8d2b41a6be73ca0e7268
Author: Adam Jackson <ajax@redhat.com>
Date: Thu Oct 9 00:33:28 2008 -0400
Bus: Remove the notion of estimated resources.
commit 095ba1435501776c8c8a34e767b89f89e5dc949a
Author: Adam Jackson <ajax@redhat.com>
Date: Thu Oct 9 00:27:33 2008 -0400
Bus: remove the "reducer"
This code effectively didn't do anything anymore.
commit 4457e31710af90f9ac295bb686c841e9473fb767
Author: Adam Jackson <ajax@redhat.com>
Date: Thu Oct 9 00:14:54 2008 -0400
PCI: Remove unused ia64 platform code.
commit 86cfe0ee236bfd3613e5f9ba589211db42d009eb
Author: Adam Jackson <ajax@redhat.com>
Date: Wed Oct 8 23:45:40 2008 -0400
PCI: Simplify OS PCI function registration a bit.
commit 2d427b9cb1594f8f2f66b463033fff5b459962fd
Author: Adam Jackson <ajax@redhat.com>
Date: Wed Oct 8 23:38:23 2008 -0400
PCI: Remove config mechanism details.
pciaccess handles this for us now, no need to remember PC arcana.
commit 5bb86bafd6fda296011cbcd5d15a85a6d770ae29
Author: Adam Jackson <ajax@redhat.com>
Date: Wed Oct 8 23:34:41 2008 -0400
PCI: Remove non-pciaccess path for x86.
commit a67360e79fa7e17c3d907771694009c57c1cd195
Author: Adam Jackson <ajax@redhat.com>
Date: Wed Oct 8 23:31:38 2008 -0400
PCI: Always build domain support.
commit 51e105ccc3d0ac8c0fe74efd029ffbddb80b140e
Author: Adam Jackson <ajax@redhat.com>
Date: Wed Oct 8 23:12:31 2008 -0400
Remove xf86GetResourcesImplicitly
commit 599a0f3f1e3ae92676e3648471576c0001cfd9ae
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Mon Nov 24 20:37:58 2008 -0800
Fix typo in 5bf2c88d2317230b95b2904cb975167d03ee13a2
Amazing how these things hide until you see the diff come back from
the commit list.
commit 5bf2c88d2317230b95b2904cb975167d03ee13a2
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Mon Nov 24 20:34:46 2008 -0800
Simplify filename generation code for Xorg -configure
commit 75784e1e53ad78e21518696dd9d297bc08c17d54
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Mon Nov 24 20:32:20 2008 -0800
Solaris: Make KDSETMODE failure non fatal, and retry it on interrupts
commit 3e6da1636093d7dc98baac40544c0b0fb7fd8aec
Author: Peter Hutterer <peter.hutterer@redhat.com>
Date: Fri Nov 14 15:55:57 2008 +1000
include: remove ENTER_LEAVE_SEMAPHORE macros.
commit b292a7a2d7e259177e1cc37346c2bee27a018630
Author: Peter Hutterer <peter.hutterer@redhat.com>
Date: Fri Nov 14 15:44:29 2008 +1000
dix: updated enter/leave core event model.
As proposed by Owen Taylor [1], the enter-leave event model needs to adjust
the events sent to each window depending on the presence of pointers in a
window, or in a subwindow.
The new model can be summarised as:
- if the pointer moves into or out of a window that has a pointer in a child
window, the events are modified to appear as if the pointer was moved out of
or into this child window.
- if the pointer moves into or out of a window that has a pointer in a parent
window, the events are modified to appear as if the pointer was moved out of
or into this parent window.
Note that this model requires CoreEnterLeaveEvent and DeviceEnterLeaveEvent to
be split and treated separately.
[1] http://lists.freedesktop.org/archives/xorg/2008-August/037606.html
Signed-off-by: Peter Hutterer <peter.hutterer@redhat.com>
commit 724f83b87bb16472d4c328e35d2a477384b29f84
Author: Peter Hutterer <peter.hutterer@redhat.com>
Date: Fri Nov 14 15:29:01 2008 +1000
dix: add FirstPointerChild, FirstPointerAncestor auxiliary functions.
FirstPointerChild: Return the first child that has a pointer within its
boundaries.
FirstPointerAncestor: return the first ancestor with a child within its
boundaries.
These are required for the updated enter/leave model.
Signed-off-by: Peter Hutterer <peter.hutterer@redhat.com>
commit 7d3e595f93dcd3d334e766a9dea602c05affdbaf
Author: Peter Hutterer <peter.hutterer@redhat.com>
Date: Fri Nov 14 15:27:19 2008 +1000
dix: Add EnterWindow, LeaveWindow, HasPointer auxiliary functions.
These replace the ENTER_LEAVE_SEMAPHORE_* macros. Unused currently.
Signed-off-by: Peter Hutterer <peter.hutterer@redhat.com>
commit 6bdc963cdabb4a2e77de7f00a1d062aa2b873f9b
Author: Peter Hutterer <peter.hutterer@redhat.com>
Date: Fri Nov 14 15:37:35 2008 +1000
dix: split enter/leave event handling into core and device handling.
Device events always need to be delivered, core events only in some cases.
Let's keep them completely separate so we can adjust core event delivery.
Signed-off-by: Peter Hutterer <peter.hutterer@redhat.com>
commit 5e48f5e2dd2dec7cfd1fa40b61e25123dfca515e
Author: Peter Hutterer <peter.hutterer@redhat.com>
Date: Fri Nov 14 15:41:59 2008 +1000
dix: remove unused EnterLeaveSemaphoresIsset.
Signed-off-by: Peter Hutterer <peter.hutterer@redhat.com>
commit 868fd503b7aeab31dba72046b59061008d8b7501
Author: Peter Hutterer <peter.hutterer@redhat.com>
Date: Fri Nov 14 15:18:56 2008 +1000
dix: move Enter-Leave related functions into new enterleave.c
Preparation for the new core enter/leave model.
Signed-off-by: Peter Hutterer <peter.hutterer@redhat.com>
commit c4b9ab6bf56139fdd8c7c584a6f523c6766cddd6
Author: Keith Packard <keithp@keithp.com>
Date: Tue Apr 29 08:29:42 2008 -0700
Handle transform failure when computing shadow damage area.
PictureTransformBounds can fail, when this happens, damage the entire screen
so that the shadow gets repainted correctly.
commit 9c7679240ad90367693a462e288308b3fdc08f26
Author: Keith Packard <keithp@keithp.com>
Date: Sun Mar 30 19:05:07 2008 -0700
[randr] don't try to compute crtc transform when no mode is set.
Dereferencing the NULL mode pointer would cause a crash. As these transform
matrices won't be used while the CRTC is disabled, just leave their values
alone.
commit 315b6d0a425d0257f226ee7032aca3ca31665e59
Author: Keith Packard <keithp@keithp.com>
Date: Thu Mar 27 11:46:39 2008 -0700
Update RandR global transform when driver notifies of transform change.
Need to compute and save the global transform when the driver changes it.
commit 5d9282fde919c936816a85c2a9c5734dc9d57cc2
Author: Keith Packard <keithp@keithp.com>
Date: Thu Mar 27 11:45:53 2008 -0700
Export rrtransform.h as needed by randrstr.h
When the transform management was moved from randrstr.h, the associated
header file became necessary to build drivers. Include it as a part of the
sdk headers.
commit 7236fd9dd4e9f5c4cb5bafa5c2a18cff12a0444c
Author: Keith Packard <keithp@keithp.com>
Date: Fri Mar 21 03:16:09 2008 -0700
Be careful about copying transforms around; they have allocated memory.
commit 7e69e364d2ef146d8ec3651d04bdd6d641017449
Author: Keith Packard <keithp@keithp.com>
Date: Fri Mar 21 03:15:00 2008 -0700
Fix rotated/reflected cursor positions.
Doing projective transforms required repositioning the cursor using the
hotspot, but that requires relocating the upper left corner in terms of said
hotspot.
commit 93179c214fc6ed88f72955a11c69ae0a47316d8c
Author: Keith Packard <keithp@keithp.com>
Date: Fri Mar 21 03:14:47 2008 -0700
rrtransform needs randrstr to get RANDR_INTERFACE defines
commit 7c61db66a470a8306e346ed8bf8934f014dada42
Author: Keith Packard <keithp@keithp.com>
Date: Fri Mar 21 02:39:49 2008 -0700
Create rrtransform.[ch]. Add RRTransform argument to RRCrtcNotify.
Instead of using a separate function to notify DIX about transform changes,
add the transform to RRCrtcNotify so that the whole Crtc state changes
atomically.
commit fa6a1df209bd74da1d545982cca437afc2198cc1
Author: Keith Packard <keithp@keithp.com>
Date: Fri Mar 21 02:35:28 2008 -0700
Avoid overflow in PictureTransformPoint. Fix PictureTransformIsIdentity.
PictureTransformPoint computes homogeneous coordinates internally, but fails
to handle intermediate values larger than 16.16. Use 64 bit intermediate
values while computing the final result at 16.16 and only complain if that
result is too large.
PictureTransformIsIdentity was completely wrong -- it was not checking for
identity transforms at all.
commit 6fe9c15731be5f5afabacb3aa3ed71b840f4238b
Author: Keith Packard <keithp@keithp.com>
Date: Wed Mar 19 12:15:39 2008 -0700
Allow drivers to set crtc transforms.
Track curent transform down in the mode setting code so that it may be set
separately from RandR.
commit 49db14e4ac26070ed86088419483888dda18b603
Author: Keith Packard <keithp@keithp.com>
Date: Wed Mar 19 00:46:35 2008 -0700
Handle RandR transform matrices in floating point.
RandR matrix computations lose too much precision in fixed point;
computations using the inverted matrix can be as much as 10 pixels off.
Convert them to double precision values and pass those around. These API
changes are fairly heavyweight; the official Render interface remains fixed
point, so the fixed point matrix comes along for the ride everywhere.
commit 6f734aecaec4f5c6152c3ebca197ef65bb4523da
Author: Keith Packard <keithp@keithp.com>
Date: Tue Mar 18 16:06:06 2008 -0700
Eliminate inverse matrix from randr transform protocol
It is easier, and potentially more precise, to compute the inverse in the
server where everything can eventually be kept in floating point form.
commit 197aa784694992f6bcfd194932309e440334c237
Author: Keith Packard <keithp@keithp.com>
Date: Tue Mar 18 15:35:44 2008 -0700
Report whether transforms are support from driver through extension to client
Add APIs to xf86RandR12 support and randr extension to record whether the
driver supports transforms, report that value in the RRGetCrtcTransform
reply.
commit e86c34663ef97e946a1129450105efa89a123af6
Author: Keith Packard <keithp@keithp.com>
Date: Tue Mar 18 15:25:31 2008 -0700
Clear shadow pixmaps before using them.
This eliminates some ugly flashing, as well as clearing the borders when the
shadow will not be completely painted.
commit 97ab0c6eff870b52c0383b63a78cec49059b2545
Author: Keith Packard <keithp@keithp.com>
Date: Tue Mar 18 15:15:40 2008 -0700
When converting from double to fixed, round carefully.
This reduces the matrix representation error after inverting a
transformation matrix (although it doesn't eliminate it entirely).
Perhaps we should extend Render to include 64-bit floating point transforms...
commit 6d3a9e40a4b9ec455af11cce31e4aa616c93db32
Author: Keith Packard <keithp@keithp.com>
Date: Mon Mar 17 23:04:49 2008 -0700
Compute matrix inversion instead of using wire version in RRCrtcTransformSet
It doesn't make sense to have the client invert this matrix when the server
can do so reasonably efficiently. This avoids weird fixed point rounding
errors when testing the transform against its inverse. Now to fix the
protocol.
commit 160252d94f04acc95f0a4e0f884ff565a5aa0744
Author: Keith Packard <keithp@keithp.com>
Date: Mon Mar 17 23:03:56 2008 -0700
Add matrix inversion function (uses doubles)
The obvious matrix inversion function, coded using doubles to avoid fiddling
with fixed point precision adventures.
commit 8fd82c88e3f2060fda4ba30376900ece77668c63
Author: Keith Packard <keithp@keithp.com>
Date: Mon Mar 17 16:14:43 2008 -0700
Adjust transformed cursor position to account for hotspot
commit eb222e64128034df8361d5a82d4f4aa1318923ce
Author: Keith Packard <keithp@keithp.com>
Date: Mon Mar 17 16:14:15 2008 -0700
Actually use filter kernel size to expand transform redisplay box
commit 3fdb963f6e8287edeb4c5bc7bbadbc02eb8bb910
Author: Keith Packard <keithp@keithp.com>
Date: Mon Mar 17 16:13:25 2008 -0700
Correct bilinear filter kernel size (should be 2x2)
commit ee6326a6b89b2d223f6e1eaf02aac1fe8aebfaf6
Author: Keith Packard <keithp@keithp.com>
Date: Mon Mar 17 15:22:06 2008 -0700
Handle filter widths in xf86Rotate
commit ddc8466137d229fdc100cc403f492c7d61a1ba89
Author: Keith Packard <keithp@keithp.com>
Date: Mon Mar 17 15:21:26 2008 -0700
Initialize and cleanup new filter fields in xf86Crtc.
commit 16c093afd4f6b30d889cacdc994b0024f9bd83d5
Author: Keith Packard <keithp@keithp.com>
Date: Mon Mar 17 15:20:52 2008 -0700
Pass filter kernel size through transforms
commit 1df02d7ddd44f84bcaefd6583af1a9141cb3c78b
Author: Keith Packard <keithp@keithp.com>
Date: Mon Mar 17 15:19:17 2008 -0700
Add kernel size to Render filters.
This width/height value lets filter users know how far the filter spreads
into the source image.
commit 40f3dff6b350fe0be55ebf7dbca88a0ef8f6380f
Author: Keith Packard <keithp@keithp.com>
Date: Mon Mar 17 13:57:47 2008 -0700
Use transform when computing scanout size of modes
Report transformed crtc sizes through RandR and Xinerama. Test screen size
against transformed mode sizes when configuring the Crtc.
commit f50349e1930e620cacdf27a6f8585fcb9cb5199a
Author: Keith Packard <keithp@keithp.com>
Date: Sat Mar 15 00:36:45 2008 -0700
[RANDR] Support filters in CRTC transforms.
Create new RRTransform datatype to hold all of the transform related
information, use that in lots of places to pass filters around.
commit acda790e430b2a18c7c35379f6e538f3d01ff221
Author: Keith Packard <keithp@keithp.com>
Date: Fri Mar 14 13:46:30 2008 -0700
[render] Split out filter finding from filter setting.
To prepare for RandR using filters in transforms, split out
code paths so that the RandR code can validate the filter name and
parameters during the transform set operation so that use of the filter
later will not have unreportable errors.
commit e3d6f279d5c305dfb81ca109fbfb665870712d2f
Author: Keith Packard <keithp@keithp.com>
Date: Thu Mar 13 21:31:12 2008 -0700
Wire up RandR CRTC transform protocol, bump server to RandR 1.3
This involved removing a pile of matrix code from the DDX,
as well as moving a bit of transform logic from DDX to DIX.
commit ff9d1cd843a9b0aba69a3d788b21d5f6af702590
Author: Keith Packard <keithp@keithp.com>
Date: Thu Mar 13 21:30:18 2008 -0700
Add funcs to convert between protocol and pixman matrices
commit c2f254da694731ea573aa8bbc2707c083743f2d4
Author: Keith Packard <keithp@keithp.com>
Date: Thu Mar 13 21:29:19 2008 -0700
Randr now depends on Render for matrices
commit f547650328287545a7a4d96df8d6a6c606dd95a9
Author: Keith Packard <keithp@keithp.com>
Date: Thu Mar 13 14:50:13 2008 -0700
Export a bunch of matrix operations from render.
The render extension uses many matrix operations internally, this change
exposes those functions to other parts of the server, drivers and
extensions. The change is motivated by the 'transform' additions to the
RandR extension but will likely be useful elsewhere.
commit e063162e80e51ed4368874b3af7ba690ea280d9e
Author: Keith Packard <keithp@keithp.com>
Date: Thu Mar 13 14:26:01 2008 -0700
Add projective transforms to RandR DIX/DDX API.
New RRCrtcGetTransform function in DIX that DDX can use to get the pending
transform. The DDX code should be complete; the DIX code is just a stub at
this point.
commit 9c7ac47b871a71e42d2f6933749ca462f1a65b40
Author: Keith Packard <keithp@keithp.com>
Date: Tue Nov 4 00:10:08 2008 -0800
Notify DRI when crtc regions change
Drivers that care about crtc positions on the screen to ensure that vblank
works correctly need to be notified when crtcs are changed.
Provide a hook in the mode setting code that is invoked whenever any
configuration is done to the screen.
Use this new hook in the DRI code so that DRI clients are notified and
receive updated information.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 554592cd70543f87cd8bee5ff47cc8281511e041
Author: Peter Hutterer <peter.hutterer@redhat.com>
Date: Mon Nov 24 11:50:38 2008 +1000
DGA: silence compiler warning.
Signed-off-by: Peter Hutterer <peter.hutterer@redhat.com>
commit 0dbcbd35f63db14734199a0beb2a91b6937f3838
Author: Peter Hutterer <peter.hutterer@redhat.com>
Date: Fri Nov 21 12:02:02 2008 +1000
xfree86: Split the working code of NIDR into new xf86NewInputDevice.
The xfree86 server previously hat NewInputDeviceRequest and InitInput, and
both basically did the same thing. Reduce NIDR to parameter checking and use
xf86NewInputDevice from both InitInput and NIDR to actually create the device.
Signed-off-by: Peter Hutterer <peter.hutterer@redhat.com>
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit e078901a4eca02bd3e7a80d9462dafbca939a187
Author: Peter Hutterer <peter.hutterer@redhat.com>
Date: Fri Nov 21 12:39:55 2008 +1000
dix: Enable core devices in InitCoreDevices already.
Signed-off-by: Peter Hutterer <peter.hutterer@redhat.com>
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit d939f2482e71ad20bac28b7aa4b2e8c8196e9d65
Author: Peter Hutterer <peter.hutterer@redhat.com>
Date: Fri Nov 21 12:21:45 2008 +1000
dix: fix false comment.
VCP and VCK are always present, this comment is a leftover from earlier MPX
days.
Signed-off-by: Peter Hutterer <peter.hutterer@redhat.com>
commit 387563b77743d92be83420d982eaf57f5459a883
Merge: 85f650c9b7 f6e01fa1b8
Author: Matthieu Herrb <matthieu.herrb@laas.fr>
Date: Sun Nov 23 13:15:46 2008 +0100
Merge branch 'master' of git+ssh://herrb@git.freedesktop.org/git/xorg/xserver
commit 85f650c9b76ab2e244f01908a7941c320635becd
Author: Matthieu Herrb <matthieu.herrb@laas.fr>
Date: Sun Nov 23 13:14:27 2008 +0100
missing action in if statement.
commit f6e01fa1b87ea190ea5ad723ce46893784ea1de4
Author: Stefan Dirsch <sndirsch@suse.de>
Date: Sun Nov 23 11:16:03 2008 +0100
Added '-showopts' option to print available driver options (#5564).
commit 8964b8d0ec2b7b3b6bf540cd647b14a20e8f64a5
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Sat Nov 22 14:23:23 2008 -0800
XQuartz: More 1.6 server API updates
commit ad0f232165fe1a25ca4fb6da817da02b6ce31779
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Sat Nov 22 14:04:28 2008 -0800
XQuartz: Fixed --disable-glx
commit 8e2287c220694953e972cd5119c2b0cd256b7a30
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Sat Nov 22 13:57:45 2008 -0800
XQuartz: Updated some code to use newer server API
commit 6eb33bc0cb2e62339d323e1f1894015d7e3142f3
Author: George Staplin <gstaplin@apple.com>
Date: Sat Nov 22 11:37:08 2008 -0700
XQuartz: GL: Remove the inclusion of glcontextmodes.h.
Add some commentary about future directions needed for the GLX drawable
creation and destruction code.
Match xalloc with xfree.
I made some minor formatting improvements.
(cherry picked from commit b772d64fce31d16b498c621096e39d5203994d6e)
commit 429b4b20d5708d608fd55f91dd5bcd4ac0b51a12
Author: George Staplin <gstaplin@apple.com>
Date: Sat Nov 22 10:57:58 2008 -0700
XQuartz: GL: Add a branch to prevent a NULL DrawablePtr structure access.
In attach() check for pDraw being NULL, and also print an ErrorF message,
because we eventually want to track down why this is occuring.
It's unclear how this occurs, but as I noted in the 1.4 branch, I believe that
the DrawablePtr/struct _Drawable -> id is the member being accessed that causes
KERN_PROTECTION_FAILURE at 0x0000000000000004
This passes my tests using: env LIBGL_ALWAYS_INDIRECT=1 ./sometest.
I fixed a warning: caused by initializing the screen->base.visuals with the
configs. It is a ** not a *. It seems that some other part of GLX will
initialize this for us.
(cherry picked from commit 17f6a261fca6d5856069dce28bb4838261afc6bc)
commit bc0c7075e29b1719409cf7de8a4ab9ae1315aa67
Author: Matthieu Herrb <matthieu.herrb@laas.fr>
Date: Sat Nov 22 19:10:09 2008 +0100
Remove the old libusbhid copy from os-support/bsd.
This has been replaced by in-kernel support for USB mices several
years ago and hasn't been enabled in build since X.Org 6.8.
commit 76fcfc480133726112049e5bd9c3082d46825918
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Fri Nov 21 20:25:55 2008 -0800
XQuartz: GLX: sync up indirect.c to match George's updates in the xorg-server-1.5-apple branch
commit 1a717779b67b9c1cdf734eef64135ac38829f726
Author: George Staplin <gstaplin@apple.com>
Date: Fri Nov 21 17:28:11 2008 -0700
XQuartz: GL: remove glcontextmodes.* from the Makefile.am. It has been replaced.
The new replacement is __GLXconfig.
(cherry picked from commit 3bed9b65c807a1aeb662b8042826cbb54280181d)
commit dacad9ae0bdaedff9403fbe84a5c5a4b4eef3542
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Fri Nov 21 17:16:22 2008 -0800
Xephyr man page typo fixes.
Also trailing white space removal to clear git warnings.
commit ca64b5949d229a60a3c62b6d29d51873b7694bd6
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Fri Nov 21 11:20:31 2008 -0800
XQuartz: Don't use LS to find X11.app on Tiger.
(cherry picked from commit e62107e55261ef252a2a24dd26a60e5dd295d560)
commit 701f8e3a94d2b659ebcfffd09acd1d66f9e797b8
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Fri Nov 21 11:08:00 2008 -0800
XQuartz: Update applewm deps
(cherry picked from commit 0ad91c59be8759a9c9e9d4f639056d8c689a3bc5)
commit 393325f908f8bd6648e466183f3683a2d80b264e
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Fri Nov 21 10:57:31 2008 -0800
XQuartz: spewCallStack is noop on Tiger now...
(cherry picked from commit 56c469a68b92c6cf003802f418ea00bd596a41c3)
commit 5d47a5d6526b7e52387647a15a580dfcafd1733f
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Fri Nov 21 10:54:55 2008 -0800
XQuartz: pbproxy: Added some typedefs for types not available on Tiger
(cherry picked from commit 0947aa7911f1de44bfe16e505a757b659c5ab2a8)
commit b262788401715787c68cea4ca79f4b270307afee
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Fri Nov 21 10:53:39 2008 -0800
XQuartz: More Tiger ifdefs
(cherry picked from commit 803509072f2c039e5cd555c4ac14d672f0e698c5)
commit 510744444329170f702d31d43997a6bbc1591b44
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Fri Nov 21 10:44:11 2008 -0800
XQuartz: Resurrect the old audio path for Tiger
(cherry picked from commit a61a8d9047e8765faf3892f4f2148c8553fd192c)
commit d7ee76f9dd84da05b59591a971b96bf990136767
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Wed Nov 19 11:42:59 2008 -0800
XQuartz: pbproxy: Push the pbproxy Xevent processing into its own thread
and just have the AppKit thread wake it up.
(cherry picked from commit 799715b8f3327c8da59ab45706e85af2d2c438e4)
commit a9e20306fbe3262602f21b876a52a1ef38cdf20a
Author: Egbert Eich <eich@ovid.suse.de>
Date: Fri Nov 21 18:50:01 2008 +0100
int10: Do an mprotect(..,PROT_EXEC) on shmat()ed memory ranges.
When the linux kernel sets the NX bit vm86 segfaults when it tries to execute
code in memory that is not marked EXEC. Such code gets called whenever
we return from a VBIOS call to signal the calling program that the call
is actually finished and that we are not trapping for other reasons (like
IO accesses).
Use mprotect(2) to set these memory ranges PROT_EXEC.
commit a54153e669fd293a47f0077bf25505dd545ddce2
Author: Rémi Cardona <remi@gentoo.org>
Date: Fri Nov 21 16:39:00 2008 +0100
xfree86: don't reset Auto(Add|Enable)Devices, use defaults from xf86Globals
Without this, commit ace38fafb062372dcd3d56378b5b8f86525c6241 is useless
when HAL support is disabled.
Signed-off-by: Julien Cristau <jcristau@debian.org>
commit 6a1b2fed7e465a9c652e8ee250b8eab440945862
Author: Matthieu Herrb <matthieu.herrb@laas.fr>
Date: Sun Sep 28 12:18:16 2008 +0200
Add a man page for Xephyr, with information from the README file.
commit 10d472bf9d61bef32d0a383b2e3783e7a1d7621f
Author: Matthieu Herrb <matthieu.herrb@laas.fr>
Date: Mon May 19 05:15:30 2008 +0200
Support for BSD apm
XXX check amd64 pci init
commit f4e725f248870a2de10449cc8f53de32e7840d45
Author: Peter Hutterer <peter.hutterer@redhat.com>
Date: Thu Nov 20 13:51:15 2008 +1000
dix: memset DeviceVelocityPtr to zero.
Signed-off-by: Peter Hutterer <peter.hutterer@redhat.com>
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit 7f818776b7a19bd6100596d327ecaa69be317bc6
Author: Simon Thum <simon.thum@gmx.de>
Date: Wed Nov 19 15:05:50 2008 +1000
dix: fix typos in comments, one formatting fix.
Signed-off-by: Peter Hutterer <peter.hutterer@redhat.com>
commit 037ec5a3c496b07f885a128828ef804b3aa8eee2
Author: Peter Hutterer <peter.hutterer@redhat.com>
Date: Wed Nov 19 15:12:04 2008 +1000
gitignore: ignore .patch files
commit ace38fafb062372dcd3d56378b5b8f86525c6241
Author: Peter Hutterer <peter.hutterer@redhat.com>
Date: Tue Nov 18 08:19:45 2008 +1000
xfree86: without CONFIG_HAL, Auto{Add|Enable}Devices and AEI is false.
There's little chance that we'll get the input devices at runtime without HAL,
we might as well force the server to add mouse/kbd devices automatically -
just like in the olden days.
Signed-off-by: Peter Hutterer <peter.hutterer@redhat.com>
commit 1cd894173ee7fa3d1a78d330c12453ea53e7b908
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Wed Nov 19 13:44:26 2008 -0800
Always use server-<display>.xkm to avoid races when multiple servers start
Previously each server starting ran xkbcomp with the output set to
<keymapname>.xkm, read it, then deleted it - which led to races if
two servers were starting at the same time with the same keymap.
Sun bug #6773816 Xorg uses the same xkm output file for compiled keymap file
<http://bugs.opensolaris.org/bugdatabase/view_bug.do?bug_id=6773816>
commit 1e4412abc499b9938bbac8a3ecd82f7f12d448d9
Author: Rémi Cardona <remi.cardona@lri.fr>
Date: Mon Nov 17 09:56:49 2008 +0100
drop unused HAVE_LIBDRM_2_2
Signed-off-by: Julien Cristau <jcristau@debian.org>
commit c4ec71b405fcb5132d5089e3f8dd7b00c235265a
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Sun Nov 16 17:57:46 2008 -0800
XQuartz: pbproxy: nuke RCS Id, update header license/copyright
(cherry picked from commit 477c6968a88429bb9c10222a5836bdc936d10ab1)
commit 42f330cf9ef44aea7428a67d282dfb1a60196e55
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Sun Nov 16 10:42:03 2008 -0800
XQuartz: pbproxy: Remove thread-main.m
it got accidently added and isn't used.
(cherry picked from commit cb6ffce68a2d10022fa92725d2d1837da4b3b89f)
commit 19aac4274bbac55ce944acfaf3274a4403fe392e
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Wed Nov 19 10:55:29 2008 -0800
mi: Push screen-saver/DPMS handling to after the EQ pop operation.
This way we on't need to hold the mutex during the dixSaveScreens() call.
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
Signed-off-by: Tiago Vignatti <vignatti@c3sl.ufpr.br>
Signed-off-by: Peter Hutterer <peter.hutterer@redhat.com>
commit 56d1793c435abbaababab031860f1160f09fff06
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Wed Nov 19 10:54:57 2008 -0800
mi: Only increment tail (push) when the event data is actually in the queue
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
Signed-off-by: Tiago Vignatti <vignatti@c3sl.ufpr.br>
Signed-off-by: Peter Hutterer <peter.hutterer@redhat.com>
commit 570835b9a89187a36e08defbccc56051bb349b52
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Wed Nov 19 10:19:20 2008 -0800
Use bsd_pci stub routines on Solaris too, since we use pciaccess for real work
Depends on commit 70e18a3b6b9d52169bca650f6cd4ef5d8ab40d95 to get
definition of xf86InitVidMem on Solaris.
commit 3932a848572f4eaf8b7f1d91d9b74aeafab069a2
Author: Keith Packard <keithp@keithp.com>
Date: Tue Nov 18 14:21:01 2008 -0500
Xinput: use floats for ConstantDeceleration and AdaptiveDeceleration
These values need not be constrained to integer values.
Signed-off-by: Peter Hutterer <peter.hutterer@redhat.com>
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit 08cd361234ed0410f67342f46ae01120c4fe3331
Author: Dave Airlie <airlied@redhat.com>
Date: Mon Nov 17 10:28:48 2008 +1000
exa: avoid doing prepare/done without intervening copies in exaFillRegionTiled
This does a precursor check to make sure the copies are required before
entering the prepare/done code.
commit 8f8a9c19ad58768b07461a3f4bccea98f7c4f958
Author: Dave Airlie <airlied@redhat.com>
Date: Mon Nov 17 10:24:39 2008 +1000
EXA: avoid copy operations if no boxes in use
Simple fix for now, I'm sure damage shouldn't be calling us with nbox = 0.
commit 03f7a66a1ae3f522a49bcc783066d53d69c97262
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Sat Nov 15 19:45:49 2008 -0800
XQuartz: Don't use TIS on Tiger...
(cherry picked from commit be8ac84c15e7e76c581b9e75cda74139394aa4c7)
commit e8112784e8ef80a96ed54eca7e148b424001a38f
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Sat Nov 15 19:52:34 2008 -0800
XQuartz: Integrated xpbproxy into the server.
Added a configure option called --enable-standalone-xpbproxy which is useful for deveoping xpbproxy.
The 'active' switch in preferences just disables the in-server xpbproxy (not this standalone).
(cherry picked from commit 42944936326ef8732f622db9f75b79a92980550d)
commit 24928b85dc996c8d0a052ddf383df25718ee5305
Author: Michel Dänzer <michel@tungstengraphics.com>
Date: Sat Nov 15 13:28:53 2008 +0100
DRI2: Don't crash in DRI2ClipNotify when DRI2DrawablePtr is NULL.
commit e5271c374715dd4e9a724ab3e5f77108d4ce8c23
Author: Michel Dänzer <michel@tungstengraphics.com>
Date: Sat Nov 15 13:27:42 2008 +0100
Set libdrm flags correctly even when only DRI2 is enabled.
commit bc4f804cd86497655f6765b0954e64dc959939e3
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Fri Nov 14 15:13:22 2008 -0800
XQuartz: Actually add glcontextmodes.[hc]
(cherry picked from commit 763195d338345e3637d112279bdbe002b6e7791a)
commit aedafbea0e1c7bc780ebe7ae878f62525769aca8
Author: Ben Byer <bbyer@apple.com>
Date: Mon Mar 31 20:21:24 2008 -0700
fix compilation on systems that don't have
XP_EVENT_SPACE_CHANGED defined
(cherry picked from commit 6e833e41e2f3a84f7e5164b918737b3975517c12)
commit b0789365719f48c0b477b4703f2072f932246b76
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Fri Nov 14 14:57:09 2008 -0800
XQuartz: Initial work on readding GLX to the 1.5 server
(cherry picked from commit a186cab6ae82340770c13b37ff5df731ce2a0ceb)
commit 1d7049f8fd3c0798250b9213149d3ce0b37ab77f
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Thu Nov 13 12:45:35 2008 -0800
Xquartz: Force sending mouse clicks to AppKit if we're over the menu bar
(cherry picked from commit 7dff93ec1ac92aeaf3b70d5cfe787fa4a28c0dba)
commit 3c124832642f1ec3228a57bea3d1eda68a188ff3
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Wed Aug 20 10:37:17 2008 -0700
XQuartz: Made X11Application.m a little more tidy.
(cherry picked from commit 3520386261b838196a8918e8bee16bdccbc9781d)
commit e917806fc556c2054b2835c8f85770b554c78092
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Fri Nov 14 10:56:21 2008 -0800
os/connection: TRANS_NOXAUTH bit comparison brainfart fix.
https://bugs.freedesktop.org/show_bug.cgi?id=18524
commit 17bccff4ce905f46c074fd8ee7c6567b1371a0a1
Author: Fernando Carrijo <fcarrijo@yahoo.com.br>
Date: Fri Nov 14 12:36:20 2008 -0500
[dix] Remove a duplicate statement.
Signed-off-by: James Cloos <cloos@jhcloos.com>
commit ba4e08244ed3923eecf26842dfc1df17c696e053
Merge: 81fd17f5f4 5bad5d2abe
Author: Alex Deucher <alexdeucher@gmail.com>
Date: Thu Nov 13 15:04:18 2008 -0500
Merge branch 'master' of git+ssh://agd5f@git.freedesktop.org/git/xorg/./xserver
commit 81fd17f5f49cdd2c10d0bf3b7ddeb8b5953886a5
Author: Alex Deucher <alexdeucher@gmail.com>
Date: Thu Nov 13 15:00:30 2008 -0500
Only add default modes if EDID supports continuous-frequency
When an EDID is present, only add the default mode pool if the
continuous-frequency bit is set in the EDID. Should fix bugs
like 18512.
commit c232f3d673fb00d7fceb8e82741349d64e5ac0ad
Author: Adam Jackson <ajax@nwnk.net>
Date: Thu Nov 13 14:58:21 2008 -0500
xf86TargetExact should try harder if there's only one monitor attached.
If there's no preferred mode, but only one monitor, pick the
biggest mode for its aspect ratio, assuming one exists.
commit 5bad5d2abea2f51cbf53dc8dd016e90ccb086220
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Thu Nov 13 11:32:40 2008 -0800
XQuartz: Fixed XBell() when not using system alert.
(cherry picked from commit aa0e9ab1c7a226cdcb3c5e62be159355a290faf8)
commit 0fca8588a238c91580b305c3671567e910150a02
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Thu Nov 13 11:10:15 2008 -0800
XQuartz: Added more debugging to handoff spew
(cherry picked from commit acefa7e3c8706ffedc052effd50b36ce10e72c22)
commit 47d38218706564d1437dc3ff9d1bba3511db063c
Author: George Staplin <gstaplin@apple.com>
Date: Wed Nov 12 17:17:25 2008 -0700
XQuartz: GL: Handle the alpha differently when the alpha is equal to GLCAPS_COLOR_BUF_INVALID_VALUE.
This prevents visuals with odd sizes. The machine I use didn't have
this problem, but it shows up on some others.
(cherry picked from commit ed181382ddeb77019577d39b9c06b1cd839e18e4)
commit 6b501d7cc55f1d06966cdf3caf36bcfc6cf18939
Author: Alex Deucher <alexdeucher@gmail.com>
Date: Thu Nov 13 13:57:30 2008 -0500
Add missing newline when printing edid info
commit 33edd32702d963802e64d382124eabb9d0352fa8
Author: George Staplin <gstaplin@apple.com>
Date: Sun Nov 9 18:35:10 2008 -0700
XQuartz: Disable 2 calls to miSetVisualTypesAndMasks that seem to be unnecessary, and possibly wrong (with regard to masks and bits per RGB).
Use the settings queried from the system in xprScreen.c, rather than those 2 calls.
The 2 calls increased the total number of visuals a great deal (when using GLXEXT),
and not all of the visuals were usable with GLX. Some of the visuals aren't usable
with GLX still, such as DirectColor, but that seems to be acceptable based on my
understanding of the manual that states "a subset of visuals are made available
for OpenGL rendering."
(cherry picked from commit 373b8a5f32509722e06d8776109e6c3f06645ee0)
commit 1523476afa6657c20eba112e3ee051d45e721164
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Sat Nov 8 23:32:40 2008 -0800
XQuartz: CFBundleShortVersionString needs to conform to X.Y.Z as well... sigh
(cherry picked from commit 54d20f6d33c347bcb37a0a8287c2d92fed2b9092)
commit 1f301a0051d65296189248b2529616d9b33276b3
Author: George Staplin <gstaplin@apple.com>
Date: Thu Nov 13 01:27:33 2008 -0700
XQuartz: Restore the logic of AppleWMDoReorderWindow to the same as the 1.4 branch.
It was returning inverted values in comparison to the 1.4 branch. This resulted in
the windows not drawing due to a deep path of: RootlessReorderWindow ->
SCREENREC(pScreen)->imp->DoReorderWindow(winRec) - > xprDoReorderWindow ->
AppleWMDoReorderWindow.
(cherry picked from commit d1d398db762fe7d5720f9b5fafa2bbe8372fceac)
commit f5841e96487234df5ead5f5c0fb3c587c418cb46
Author: Peter Hutterer <peter.hutterer@redhat.com>
Date: Tue Nov 11 22:50:35 2008 +1000
dix: don't store enter/leave and focus semaphores in a devPrivate.
We need them for each window, every time a window is allocated. Storing them
in a devPrivate is the wrong thing to do.
This also removes the unused ENTER_LEAVE_SEMAPHORE_ISSET macro.
Signed-off-by: Peter Hutterer <peter.hutterer@redhat.com>
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
commit 26f701704b4e536cd91bd8a9f7d2194793471998
Author: Peter Hutterer <peter.hutterer@redhat.com>
Date: Wed Nov 12 16:53:29 2008 +1000
dix: remove duplicate line in EnterLeaveEvent.
Signed-off-by: Peter Hutterer <peter.hutterer@redhat.com>
commit 8ff62ea5ba1bc331c886840b2b1e101cb4f2ebed
Author: Kristian Høgsberg <krh@redhat.com>
Date: Wed Nov 12 15:19:09 2008 -0500
CopySubBuffer expects GL style coordinates.
commit d91243beb63008fff2ce6affa7db091786e8c49a
Author: Peter Hutterer <peter.hutterer@redhat.com>
Date: Fri Nov 7 08:39:38 2008 +1030
dix: formatting fix.
commit dde09076c5c0c36a4a9321cd23a2c7922c4c755b
Author: Peter Hutterer <peter.hutterer@redhat.com>
Date: Wed Nov 5 12:52:03 2008 +1030
dix: remove superfluous variable devgrab
grab == devgrab anyway, this is a leftover from the time when we had two
different grabs per device (core and XI grab).
Signed-off-by: Peter Hutterer <peter.hutterer@redhat.com>
commit fc3e8bfb82323477b54181c6d546c90f53f1ebd8
Author: Peter Hutterer <peter.hutterer@redhat.com>
Date: Tue Nov 4 15:27:30 2008 +1030
mi: clean up mieqProcessInputEvents, copy all events before processing.
Copy the EventRec's information into local variables before processing them,
this should make it safer for upcoming threading and also makes it easier to
read.
Simplify the event allocation code from the abyss it was before.
This also fixes a potential bug where a custom handler could scramble the
event before the same -now scrambled- event was then passed through the
master's custom event handler.
Signed-off-by: Peter Hutterer <peter.hutterer@redhat.com>
commit 31005efb1bb6be5a892ff905f754109dc3fa8fe6
Author: Fernando Carrijo <fcarrijo@yahoo.com.br>
Date: Mon Nov 10 13:23:45 2008 -0500
input: Remove useless conditional.
commit 24383056d0513cc588cee5cee78f1cba2c0fbe89
Author: James Cloos <cloos@jhcloos.com>
Date: Sat Nov 8 13:04:20 2008 -0500
Don’t recommend fixing HAL if HAL support is disabled.
As reported in http://bugs.freedesktop.org/show_bug.cgi?id=18438
the server suggests reconfiguring HAL if AllowEmptyInput is enabled
and no input devices are known.
Instead of that notice, if HAL is disabled at configure time,
AllowEmptyInput is enabled in the config and no input devices are
found report those facts and recommend disabling AllowEmptyInput.
commit b3c7e62664457a3802ebc23785446051624a8c2f
Author: James Cloos <cloos@jhcloos.com>
Date: Sat Nov 8 12:18:13 2008 -0500
Remove some null statements.
Remove several doubled statement-terminal semicolons.
Reported by Fernando Carrijo.
commit 21c116219cd5c6845a0955f2d88fdb5fab5c17cf
Author: Michel Dänzer <michel@tungstengraphics.com>
Date: Sat Nov 8 01:25:14 2008 +0100
Fix typos which caused exaCompositeRects() to use an incorrect damage region.
Fixes http://bugs.freedesktop.org/show_bug.cgi?id=18065 .
Also, it can bail if either width or height of the bounding box is <= 0, not
only if both of them are.
commit 59f9fb4b8c031df69b3592a26b77e744ff4a556e
Author: Luc Verhaegen <libv@skynet.be>
Date: Fri Nov 7 19:11:11 2008 +0100
XAA PixmapOps: Sync before accessing unwrapped callbacks.
When using any XAAPixmapOps, we call into unknown but freshly
unwrapped callbacks (like fb ones). Unlike the XAA*Fallback calls,
we did so without syncing first, exposing us to all kinds of
synchronisation issues.
I believe that the rendering errors appeared now because *PaintWindow
vanished (e4d11e58), and we just use miPaintWindow instead. This
takes a less direct route to the hw and ends up at
PolyFillRectPixmap, which very often left drawing artifacts.
We now sync accordingly, and no longer get the rendering artifacts i
was methodically reproducing on radeonhd, radeon, unichrome...
Also, in order to allow driver authors to remove extensive syncing
or flushing to hide this issue, create XAA_VERSION_ defines, put
them in xaa.h and bump the patchlevel.
(novell bug #435791)
commit 991c88b7542164194be73573e7644164416ea90c
Author: Julien Cristau <jcristau@debian.org>
Date: Fri Nov 7 17:36:38 2008 +0100
xfree86: xf86SetDepthBpp needs to respect the driver's depth24flags
When setting the depth to 24, leave bpp unset so the logic to pick
a supported value is used instead of ignoring the driver's preference
and forcing 32 bpp.
commit d3d6be4948fa19947fd3b03e6694247109cc0ffb
Author: Julien Cristau <jcristau@debian.org>
Date: Fri Nov 7 18:36:00 2008 +0100
mi: Fix infinite loop on regen when swrast_dri.so is missing
The swrast DRI provider gets pushed on the glx provider stack at every
server generation, so the stack turns into a circular list on regen.
X.Org bug#18388 <https://bugs.freedesktop.org/show_bug.cgi?id=18388>
commit f59352881f315a634f60c9aac885b2764b28b167
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Thu Nov 6 14:41:55 2008 -0800
XQuartz: Make LS parse our version properly... it didn't like our CFBundleVersion
(cherry picked from commit 980df1b4ff7d4dab9dc1462dc086542265b1fb1b)
commit b4ca9dc2393ace2415163094b916f0d17ecba9ee
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Wed Nov 5 21:58:04 2008 -0800
When HAL returns a NULL property, print "(null)" instead of a NULL pointer
They've promised to fix Solaris printf soon to check for NULL pointers
instead of segfaulting, but that won't help people on existing releases.
commit 13d06f5aaf6120c902a323649615c1ce3d1b5359
Author: George Peter Staplin <gps@Georges-Workstation.local>
Date: Tue Nov 4 12:53:12 2008 -0700
XQuartz: GL: Add capability detection for depth buffers, and multisampling.
GL/capabilities.c: Add handleDepthModes(), and extend
handleRendererDescription() for the various depth and multisampling flags.
Add initialization of the new config options to initConfig().
GL/capabilities.h: Add depth and multisample config members.
GL/visualConfigs.c: Add depth and multisampling support to the visual config
setup.
(cherry picked from commit f527381eea6a8ae6cd791475b2060d21fcf8efb2)
commit 34bb06b292dc8b07d8602941aab3e69a73811314
Author: George Peter Staplin <gps@Georges-Workstation.local>
Date: Mon Nov 3 19:52:48 2008 -0700
XQuartz: GL: Work around problems with really deep visuals.
GL/capabilities.c: #if 0 (for now) any capabilities above 8 bits per channel,
because they introduce drawing problems.
GL/indirect.c: Comment out some visual setup code that shouldn't be running, and
actually seemed to cause some problems. The current visualConfigs.c code seems
to do a reasonable job of setting up visuals for XQuartz.
GL/visualConfigs.c: Make use of the proper visual .class. Eliminate depth 0.
It seems we really just want 24 for now, and 0 I think was a flaw in the original
code.
(cherry picked from commit 1e5f63f15e13a40a6e69a1505934d10d6990b6a2)
commit 39e82a9b1250b23768136f3c397377a97f8b908c
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Sun Nov 2 15:52:22 2008 -0800
XQuartz: Replace deprecated API usage thanks to Robery Murphy
(cherry picked from commit 71dd052412400362793f2f0c7c02bf4f4309738c)
commit b4db46320a437ba8894cb8cfd4ee3abdcc894b01
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Fri Oct 31 20:18:27 2008 -0700
XQuartz: version string updated for 2.3.2_beta3
(cherry picked from commit 81bb4128570b44d779126a8dffcd3c5620747383)
commit c9051b684b524549eab6d5b88ee3e195a6f6fbe8
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Wed Nov 5 18:25:57 2008 -0800
Use OsSignal in Popen/Pclose to avoid SysV signal() stupidity
commit d63ea510138c8b6de66184c78cda39ed9981fc1f
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Wed Nov 5 14:52:29 2008 -0800
Non-Linux OS'es should default to kbd driver, not now-dead keyboard driver
commit 446d9443cea31e493d05c939d0128a8116788468
Author: Adam Jackson <ajax@redhat.com>
Date: Wed Nov 5 11:51:06 2008 -0500
linux: Drain the console fd of data when using evdev for keyboards
Works around a silly bug in the kernel that causes wakeup storms after
too many keypresses. Should fix the kernel bug too, but this at least
keeps the idle wakeup count below 1000/sec.
commit 6d21fbf00648307208146aca0837ec63ea490659
Author: Adam Jackson <ajax@redhat.com>
Date: Wed Nov 5 11:39:46 2008 -0500
kdrive: Bye bye Xvesa
commit 9a874a71a791c6110fd57b8a5c083f777a446d0f
Author: Egbert Eich <eich@freedesktop.org>
Date: Tue Nov 4 21:31:27 2008 +0100
DDX/RandR: When positioning outputs assume width/height = 0 if no modes exist.
When a user specifies the position of an output for which no modes exist
(for whatever reason) assume that the width and height of this output
is 0. The result will be the same as if this output isn't taken into
consideration at all and thus should be sane. It will prevent a segfault
when trying to determine the width and height of a non-existent mode.
commit a4d62bbf215894bad8e19d99f7330c637d3d49e3
Author: Michel Dänzer <michel@tungstengraphics.com>
Date: Tue Nov 4 11:27:53 2008 +0100
AIGLX: Reinstate call to driver texOffsetFinish hook.
It was accidentally lost when factoring out __glXDRIdoReleaseTexImage, so this
is a regression fix and should probably be backported to server-1.5-branch.
commit 27f1ad466cd9662d638f4a8e59beafc32a8b2a8f
Author: Michel Dänzer <michel@tungstengraphics.com>
Date: Tue Nov 4 11:26:03 2008 +0100
AIGLX: Don't truncate offset returned by driver texOffsetStart hook on 32 bit.
commit de1a8b68eb10c39a0d4a197107d68d7cc009edb2
Author: Peter Hutterer <peter.hutterer@redhat.com>
Date: Mon Nov 3 11:30:48 2008 +1030
xkb: extract the correct device in XkbFilterEvents.
If the event is an XI event, we need to work on the correct device, not on
the VCK.
Adds XIGetDevice(event) function to extract the device from an event.
commit d97239956667f8181f30271759573b75bf455fbb
Author: Peter Hutterer <peter.hutterer@redhat.com>
Date: Fri Oct 31 16:40:41 2008 +1030
Purge device-based WindowAccess code.
Really, this was a bad idea. It's not security, the UI features that would
have been cool (e.g. clicking through windows) aren't implemented anyway, and
there's nothing you can't achieve just by using plain XI anyway.
Requires inputproto 1.9.99.6.
commit cbc6f983959595aa21c9dd72fac6a7070a650ef7
Author: Peter Hutterer <peter.hutterer@redhat.com>
Date: Fri Oct 31 14:36:48 2008 +1030
xkb: when faking mouse button events, fake them on the correct devices.
When MouseKeys are activated, keyboard devices may generate fake mouse button
events through XKB. Let's get then running through the appropriate paths, i.e.
as XI events on the correct device.
To make matters more fun, ProcessOtherEvents drops events if the DIX device
state cannot be updated accordingly, i.e. all button events from keyboard
devices.
Hence we need to get the paired MD for the device in XkbDDXFakeDeviceButton,
and post the event through the paired MD (usually the VCP).
Removes now-unused ddxFakeBtn.c.
Note: this patch only half-arsedly fixed button events, motion events are a
more complicated matter.
commit 4971315296cbf868dd738c1c0c1c504fcfe1b619
Author: Peter Hutterer <peter.hutterer@redhat.com>
Date: Mon Nov 3 17:47:36 2008 +1030
dix: clean up GetPointerEvents and GetKeyboardValuatorEvents.
Split into several functions, remove some stale comments.
Signed-off-by: Peter Hutterer <peter.hutterer@redhat.com>
commit 6bb0e0a53656db6168a053fb51b242a8640c1461
Author: Peter Hutterer <peter.hutterer@redhat.com>
Date: Fri Oct 24 16:22:09 2008 +1030
xnest: I'm sure xfree works fine, even if we're 64 bit.
Signed-off-by: Peter Hutterer <peter.hutterer@redhat.com>
commit 67b7e06c4fa4e8dafb64d9f3eb976836d0cc5889
Author: Daniel Stone <daniel@fooishbar.org>
Date: Fri Apr 25 19:39:48 2008 +0300
XKB: Remove pointless macros
These weren't even being used, which isn't overly surprising, given that
they were already in the struct.
Signed-off-by: Peter Hutterer <peter.hutterer@redhat.com>
commit d9ff20e323ba9fb309629ac21946e85709625589
Author: Daniel Stone <daniel@fooishbar.org>
Date: Thu Oct 23 16:48:15 2008 +1030
DIX: Remove unnecessary prototype
We don't call XkbCopyKeymap from getevents.c anymore, so axe it.
Signed-off-by: Peter Hutterer <peter.hutterer@redhat.com>
commit 064ee458c7183eb91ef2e0f262b312ba1e3ad6e5
Author: Daniel Stone <daniel@fooishbar.org>
Date: Sat Aug 9 15:54:56 2008 +0300
XKB: Tiny cleanups to _XkbLookupAnyDevice
A couple of coding style cleanups, a warning fix via removing a
now-unused label, and also put an else so we don't spuriously trip a
condition that should admittedly never occur anyway.
Signed-off-by: Peter Hutterer <peter.hutterer@redhat.com>
commit 97c9e6a7139e07a0761be05034fae42fcd65ba36
Author: Daniel Stone <daniel@fooishbar.org>
Date: Fri Mar 28 17:10:28 2008 +0200
XKB: Fix thinko, causing warning (erroneously fixed in 5544c51447)
newTypes is a local variable which always has an address. newTypesIn,
on the other hand, might be sus.
See also 5544c51447f551dfc6df64438873a7ce64743976.
Signed-off-by: Peter Hutterer <peter.hutterer@redhat.com>
commit caf1e6a1c92a2e70de9159f93d6f5b48c202dd81
Author: Daniel Stone <daniel@fooishbar.org>
Date: Tue Mar 18 10:05:00 2008 +0200
XKB: Move XKBrules.h to the server too
Get our own local copy of this, so we don't have to define XKB_IN_SERVER
anymore.
Signed-off-by: Peter Hutterer <peter.hutterer@redhat.com>
commit f4036f6ace5f770f0fe6a6e3dc3749051a81325a
Author: Daniel Stone <daniel@fooishbar.org>
Date: Wed Oct 22 22:40:44 2008 +1030
Remove XEvIE
It's unmaintained and has been broken for quite a while; MPX finally
smashed it completely.
Signed-off-by: Peter Hutterer <peter.hutterer@redhat.com>
commit 8c3753a0b711b5708b61f64ab4010ca01608d679
Author: Daniel Stone <daniel@fooishbar.org>
Date: Wed Oct 22 22:29:54 2008 +1030
A bit of whitespace cleanup in include directives.
It's #include <foo>, not # include <foo>
Signed-off-by: Peter Hutterer <peter.hutterer@redhat.com>
commit 889a8dc02bbd3926eaf16dce8f844dc58558e982
Author: Daniel Stone <daniel@fooishbar.org>
Date: Wed Oct 22 22:29:54 2008 +1030
Xi: XINPUT has been mandatory for ages
Ditch all #ifdef XINPUT, since it's always built.
Signed-off-by: Peter Hutterer <peter.hutterer@redhat.com>
commit 4cf2f4172abc4bf848c1726e6dac535713e08f0b
Author: Adam Jackson <ajax@redhat.com>
Date: Mon Nov 3 12:50:28 2008 -0500
Add xf86MonitorIsHDMI() helper.
commit a7951a4dad902edea76a5cd68f833f0e48ae804b
Author: Michel Dänzer <michel@tungstengraphics.com>
Date: Mon Nov 3 10:00:54 2008 +0100
AIGLX: Allow 2D driver to prevent zero-copy texturing of a pixmap.
The driver can return ~0ULL to achieve this, e.g. if the pixmap doesn't fit
into offscreen storage or if its pixel format isn't supported by the 3D engine
for texturing.
See http://bugs.freedesktop.org/show_bug.cgi?id=17723 or
http://bugs.freedesktop.org/show_bug.cgi?id=12385 .
commit f8af66ddb21b4fb1ae5b4f7f852418ca7b0e7aec
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Fri Oct 31 20:03:34 2008 -0700
XQuartz: Add option to allow access to the menu in fullscreen mode
(cherry picked from commit 637a9f4bd1ff2b55c870a08ead4940df0f9818e5)
commit c5086badf0387d4d5af10882de90a1faa180550f
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Fri Oct 31 18:58:57 2008 -0700
XQuartz: LP64 related casting fixes from Bob Murphy
(cherry picked from commit ea71710aaa7166ab510abe70f2dc47942de0ead7)
commit 20239a4deebccc9f86586ef6b8ef61311a6fa6a0
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Fri Oct 31 18:58:25 2008 -0700
Rootless: LP64 related casting fixes from Bob Murphy
(cherry picked from commit 40441c4e31167932721a79d7ca572caaa1d36e72)
commit ecd55bc859eb5d7c639d5a6d531d9df524124247
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Fri Oct 31 15:10:34 2008 -0700
XQuartz: displayScreenBounds uses quartzEnableRootless rather than !quartzHasRoot
(cherry picked from commit c883a78ef0c2e7e29437881db85d3815a89ab874)
commit 4e762b8aa37b588e6cffcdd4a0152090190005e2
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Fri Oct 31 14:39:54 2008 -0700
Rootless: Force initialization of static variable before use.
(cherry picked from commit cece29317269385aa7a0d3047e6f90e6a17d01eb)
commit 9f49f5172d10070ebd4a9e72ac3c5227c6f35853
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Fri Oct 31 13:00:01 2008 -0700
XQuartz: Silence pointer debug spam
(cherry picked from commit 9ca099e928653b5a0fb745186e17bfcc3d74ccc0)
commit 93298c7f8f73bdb9892da0e41d2c2a67719dc736
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Fri Oct 31 12:55:46 2008 -0700
XQuartz: Don't map the menu bar to the screen area.
(cherry picked from commit 1115917ada127a1cd6a8b61efe7fd134e2ea85fd)
commit 31907986a6d4dc726d8ce0071f5884ce6cfea33b
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Fri Oct 31 12:37:32 2008 -0700
XQuartz: Fixed Xplugin thread safety issues, so rea-enable background window check
(cherry picked from commit 5fc73b1141eca8b678e54412ca33afa31a76d088)
commit 227d782a1bddfa1393cddd0c73c0288e18645c47
Author: George Peter Staplin <gps@Georges-Workstation.local>
Date: Thu Oct 30 13:44:55 2008 -0600
XQuartz: GL: Mark visuals that are slower than others, due to lack of acceleration.
This is used in libGL to determine a preferred visual. glxinfo -v will also
report "visualCaveat=Slow" for such visuals.
(cherry picked from commit d5c17f585a240be9f9135975738e62951cde3353)
commit 5287602a4161cd036e3125cda09ba750190a0b47
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Wed Oct 29 17:20:11 2008 -0700
XQuartz: if 0 out a block to avoid thread-unsafe lockups
(cherry picked from commit 60d7359a67900ad4601dbc73e07bcd8c803100a5)
commit 93d7cd31c527afbf26f4e039afb6adbb6a60fab7
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Wed Oct 29 17:18:05 2008 -0700
XQuartz: Purge the old XQUARTZ_EXPORTS_LAUNCHD_FD option
(cherry picked from commit 490756c7fbe0792c4bd6ae434e7a48e0beffa5c7)
commit 0a076b6a7f3c97ff712412eee32e013d3bfd7364
Author: Peter Hutterer <peter.hutterer@redhat.com>
Date: Fri Oct 31 18:32:26 2008 +1030
xkb: remove unused label "out", clean up program flow.
commit 971aef64416058665bc903fee39fea1619cd3727
Author: Peter Hutterer <peter.hutterer@redhat.com>
Date: Fri Oct 31 17:05:40 2008 +1030
dix: FreeDeviceClass() and friends can be static.
commit 3c3a47d0f5ce7fb9548a3eefee9e72488d3ac279
Author: Peter Hutterer <peter.hutterer@redhat.com>
Date: Fri Oct 31 17:00:21 2008 +1030
include: remove unused declaration for RegisterPairingClient().
Matching functions got removed in 004876355b43fb4d3c2bc5653a7dc1bfd3f985ee.
commit 7c5dec9f716962a6e67dba99418061cebe10e1d2
Author: Peter Hutterer <peter.hutterer@redhat.com>
Date: Fri Oct 31 16:56:49 2008 +1030
dix: remove unused GuessFreePointerDevice().
Not used since the MD/SD hierarchy was introduced many moons ago.
commit 12599af285a610fb429245798330f2317c75ac2c
Author: Peter Hutterer <peter.hutterer@redhat.com>
Date: Fri Oct 31 16:50:28 2008 +1030
dix: NextFreePointerDevice() can be static.
commit 5d0a945a030cd7626046e9f6c8d5c6bd170649d9
Author: Peter Hutterer <peter.hutterer@redhat.com>
Date: Fri Oct 31 16:29:42 2008 +1030
dix: SwitchCorePointer is long gone, bury it.
commit eb014021c2b3604fc67daebd6860b5dc959fabb6
Author: Peter Hutterer <peter.hutterer@redhat.com>
Date: Fri Oct 31 16:27:58 2008 +1030
dix: PairDevices() can be static, remove from input.
PairDevices() is only ever called in EnableDevice().
commit b6b26560d65d9468c89dd046396d9aeb14e1b227
Author: Peter Hutterer <peter.hutterer@redhat.com>
Date: Fri Oct 31 16:23:34 2008 +1030
Move EXTENSION_BASE and EXTENSION_EVENT_BASE to misc.h.
commit f781a752e642cfe7d08f841b332c3ae507315598
Author: Peter Hutterer <peter.hutterer@redhat.com>
Date: Fri Oct 31 16:16:18 2008 +1030
Move MAX_DEVICES to misc.h, rename to MAXDEVICES for consistency.
commit 245d1c162c7b13c98a9a28dc7ad441366d7e8006
Author: Peter Hutterer <peter.hutterer@redhat.com>
Date: Fri Oct 31 11:50:47 2008 +1030
xkb: ProcXkbSetCompatMap should do dry-runs, then normal runs.
Was doing only dry-runs, which kinda explains why changing the compat map
didn't really have any effect.
Fallout from e8c2a3d7c996cb41c4c44ba67acae5ff9438fc06.
Signed-off-by: Peter Hutterer <peter.hutterer@redhat.com>
commit 70e18a3b6b9d52169bca650f6cd4ef5d8ab40d95
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Thu Oct 30 20:38:34 2008 -0700
Refactor Solaris mapping code to work with standard shared/vidmem.c
Also merge sun_bios.c into sun_vid.c and upstream Solaris patch to
keep aperture device open, to allow mappings to occur after X server
has given up uid 0.
commit 2809a56b4bc7f09f132c70dc39c6695495351c4d
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Thu Oct 30 16:05:40 2008 -0400
xace: Fix an incorrect call to the RECEIVE_ACCESS hook.
commit 0f2fd0577fe2740a32d3a2749e2c3582f891417c
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Thu Oct 30 15:35:33 2008 -0400
xselinux: send more specific message types to libaudit.
commit 4ce19b4477057a724b548e342d4c6da2b6721824
Author: Peter Hutterer <peter.hutterer@redhat.com>
Date: Thu Oct 30 16:02:13 2008 +1030
xfree86: fix xf86ScaleAxis once again.
Maybe one day I stop doing stupid patches like
a3a7c12fcf8e4ac1418f9ea53f76091f309a721b.
So, if X < low, reset to low, and _not_ to high.
If X > high, reset to high, and _not_ to low.
commit f12d7ad1647d12ccf92291ebc0607defe6a634a1
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Tue Oct 28 12:38:05 2008 -0700
XQuartz: Pass along SIGINT and SIGTERM from the stub to X11.app
(cherry picked from commit 183ca5d68b4f34e248749f304ce140de11bd451b)
commit 273df54685768f74ed29926e88a63dc9f86744f1
Author: George Peter Staplin <gps@Georges-Workstation.local>
Date: Mon Oct 27 22:07:00 2008 -0600
XQuartz: pbproxy: Fix a bug that prevented nedit CLIPBOARD from being proxied.
It seems that we were calling copy_completed: too soon. Now we return instead
of falling through to the free_propdata, and copy_completed:.
(cherry picked from commit 5797d5b662817a3369a74a673f4a7c995cde75cf)
commit 313d87341aff2396645d2c315086d487c0073d27
Author: George Peter Staplin <gps@Georges-Workstation.local>
Date: Mon Oct 27 20:44:02 2008 -0600
XQuartz: pbproxy: Work around bugs in some apps that aren't ICCCM compliant.
Eterm ends up setting the type of the property to TARGETS, instead of ATOM.
That's why it wasn't working.
(cherry picked from commit 9be5998ede7427f14dd9597e117b3d6b427ba4e5)
commit 9007d3beea2e2d8b271f696d433cb30e32cda401
Author: George Peter Staplin <gps@Georges-Workstation.local>
Date: Mon Oct 27 16:34:24 2008 -0600
XQuartz: pbproxy: Add code to handle PICT conversion to PNG and JPEG.
This may work, unfortunately I don't have test apps that fail.
The way it works is by using an NSImage class initWithPasteboard:
method, which we then get the TIFFRepresentation of, and convert
to PNG or JPEG.
The TIFFRepresentation uses NSTIFFCompressionNone; which should be
lossless.
(cherry picked from commit 8d048cfa956f4a0860250cc836a6748912b37ad8)
commit b742da0b719198a42a086049771792af84f470ca
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Sun Oct 26 13:17:49 2008 -0700
XQuartz: pbproxy: fixed blocking
(cherry picked from commit bb330a1b1c480e89727fb75ff5aeb71f4afc5ee3)
commit c885110aedc19e551de22a526397d77013c3dfcb
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Sun Oct 26 10:22:12 2008 -0700
Xquartz: pbproxy: Some debugging about unhandled mime types... this will spam up quick, but will be useful for a while...
(cherry picked from commit 3647215310f5a52126661b9ec473dcfeed25b40f)
commit e7c26964eef6732c9603b26b7396f95443c5ba8a
Author: George Peter Staplin <gps@Georges-Workstation.local>
Date: Fri Oct 24 19:12:05 2008 -0600
XQuartz: GL: Fix several error handling mistakes in handleRenderDescriptions, that were leftover before the final code evolved.
(cherry picked from commit fe35a3639081dc78ac6cc4123cde37770f6a39fd)
commit 21ea9d82aab8ff0e0d1904d188f96f9cfb2b051d
Author: George Peter Staplin <gps@Georges-Workstation.local>
Date: Fri Oct 24 18:11:46 2008 -0600
XQuartz: GL: Add feature detection of color sizes, and accum sizes.
This gives us a *lot* more visuals, and they should be more accurate.
Some of the visuals may have been wrong before. This may enable more
OpenGL programs to behave correctly.
I also suspect libGL needs a little work to handle some of these correctly.
(cherry picked from commit 98a084ce9c455260ecdb5f8eecb67f33dbb53b69)
commit c264826da96ad1859dd112b17eb8aa9e5278478f
Author: Peter Hutterer <peter.hutterer@redhat.com>
Date: Thu Oct 16 11:22:29 2008 +1030
xfree86: If AEI is on, disable "kbd" and "mouse" devices.
This consists of two parts:
In the implicit server layout, ignore those drivers when looking for a core
device.
And after finishing the server layout, run through the list of devices and
remove any that use mouse or kbd.
AEI is mutually exclusive with the kbd and mouse drivers, so pick either - or.
Signed-off-by: Peter Hutterer <peter.hutterer@redhat.com>
commit 6c451859552e1fc78f6589617482f9ff96d7ed8a
Author: Peter Hutterer <peter.hutterer@redhat.com>
Date: Mon Oct 20 12:19:55 2008 +1030
config: don't add duplicate devices through HAL.
If HAL is restarted, the device list is sent to the server again, leading
first to duplicate devices (and thus duplicate events), and later to a
FatalError "Too many input devices."
dev->config_info contains the UDI for the device. If the UDI of a new devices
is equal to one we already have in the device list, just ignore it.
Signed-off-by: Peter Hutterer <peter.hutterer@redhat.com>
commit 102c4dac7c521941f52652152b1660cd7f559d56
Author: Julien Cristau <jcristau@debian.org>
Date: Sun Oct 26 13:17:31 2008 +0100
x86emu: fix sparse warnings
ops2.c:113:18: warning: Using plain integer as NULL pointer
ops2.c:207:18: warning: Using plain integer as NULL pointer
commit ffaaa1a198a77eb6800c08d4613ee1cc0b068ba0
Author: Julien Cristau <jcristau@debian.org>
Date: Sun Oct 26 13:13:21 2008 +0100
xfree86: fix compiler warnings in DoModalias()
The precedence of == is higher than that of &, so that code was
probably buggy.
xf86Init.c: In function 'DoModalias':
xf86Init.c:300: warning: suggest parentheses around comparison in operand of &
xf86Init.c:304: warning: suggest parentheses around comparison in operand of &
xf86Init.c:308: warning: suggest parentheses around comparison in operand of &
commit 66fd05acd6118102aaaebc230d5c03e0758c6089
Author: Julien Cristau <jcristau@debian.org>
Date: Sun Oct 26 13:11:41 2008 +0100
xfree86: Silence compiler warnings about function prototypes
xf86Init.c:136: warning: function declaration isn't a prototype
xf86Init.c:243: warning: function declaration isn't a prototype
xf86Init.c:249: warning: function declaration isn't a prototype
commit 4b96ba8ddf36f84d4b8c0f2964535bd90477a742
Author: Julien Cristau <jcristau@debian.org>
Date: Sun Oct 26 11:56:35 2008 +0100
Nuke unused miBankNewSerialNumber
commit e85d5d707d51d6a1558dfcf0ebd50183b84be39d
Author: Julien Cristau <jcristau@debian.org>
Date: Sun Oct 26 11:55:50 2008 +0100
Ansify declaration of FontToXError()
commit 30a7a06a9e91a91b8517f67897831c1407713e57
Author: Julien Cristau <jcristau@debian.org>
Date: Sun Oct 26 11:38:44 2008 +0100
Nuke prototype for nonexistent function
miDoInitVisuals was removed in commit
94825ad3c72a1c3f6a61199c302841f63241cf87, but its prototype was left.
commit 5244690a5e0285b6243ee1f28ae6c8287a32b73d
Author: Julien Cristau <jcristau@debian.org>
Date: Sun Oct 26 11:37:11 2008 +0100
Add prototypes for strlcpy/strlcat
commit eadf90aa65d1ea63ddcd74e60e66a79ad567c7e8
Author: Julien Cristau <jcristau@debian.org>
Date: Sun Oct 26 11:20:33 2008 +0100
xaa: Fix compiler warning (implicit declaration)
xaaInit.c: In function 'XAAInit':
xaaInit.c:201: warning: implicit declaration of function 'miInitializeCompositeWrapper'
xaaInit.c:201: warning: nested extern declaration of 'miInitializeCompositeWrapper'
commit aee514cfb5e5a59b7770699765ccdad8fe42f904
Author: Julien Cristau <jcristau@debian.org>
Date: Sun Oct 26 11:16:05 2008 +0100
xfree86: Fix compiler warnings (implicit declarations)
Add missing includes to fix the following warnings:
xf86DGA.c: In function 'DGAProcessKeyboardEvent':
xf86DGA.c:1050: warning: implicit declaration of function 'UpdateDeviceState'
xf86DGA.c:1050: warning: nested extern declaration of 'UpdateDeviceState'
xf86Xinput.c: In function 'xf86ActivateDevice':
xf86Xinput.c:303: warning: implicit declaration of function 'AssignTypeAndName'
xf86Xinput.c:303: warning: nested extern declaration of 'AssignTypeAndName'
xf86Xinput.c:311: warning: implicit declaration of function 'DeviceIsPointerType'
xf86Xinput.c:311: warning: nested extern declaration of 'DeviceIsPointerType'
xf86Xinput.c:324: warning: implicit declaration of function 'XkbSetExtension'
xf86Xinput.c:324: warning: nested extern declaration of 'XkbSetExtension'
commit add946daed531e29935593fb2e7ee70286185baf
Author: Julien Cristau <jcristau@debian.org>
Date: Sun Oct 26 11:14:40 2008 +0100
Nuke unused variables
commit f2bda61c03f64133ef68dd1557b26ae7dc5beb0e
Author: Julien Cristau <jcristau@debian.org>
Date: Sun Oct 26 11:05:13 2008 +0100
Xext: Fix compiler warnings
Make GEClientGone static and include registry.h, to fix the following
warnings:
geext.c:225: warning: no previous prototype for 'GEClientGone'
geext.c: In function 'GEExtensionInit':
geext.c:280: warning: implicit declaration of function 'RegisterResourceName'
geext.c:280: warning: nested extern declaration of 'RegisterResourceName'
commit 24e863b0eb6ff11010a14cfd252a39df87a09d0e
Author: Bernhard R. Link <brlink@debian.org>
Date: Sun Oct 26 00:19:34 2008 +0200
Bug#16501: autodetection of sbus graphic cards
Add automatic detection of the graphic driver to load for sbus devices.
This allows xorg to work on those devices without a "Device" section.
Debian bug#483942.
Signed-off-by: Julien Cristau <jcristau@debian.org>
commit fd97ff1bdd30c358525068a4c833f681e00719a2
Author: Julien Cristau <jcristau@debian.org>
Date: Sat Oct 25 22:54:15 2008 +0200
Bug#5851: Document the "Log" option in xorg.conf(5)
commit 80b6768536fa439bfc5ce948bc8845a6f4af857b
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Thu Oct 23 17:32:32 2008 -0700
XQuartz: Do check_xinitrc() later to avoid possible deadlock.
(cherry picked from commit af95174a088dc787d124ec548b1005f5b67c9e8d)
commit d837d4e2af35a83c7932e4d0422097ebd1f6ba2c
Author: George Peter Staplin <gps@Georges-Workstation.local>
Date: Thu Oct 23 17:56:46 2008 -0600
XQuartz: pbproxy: pbproxy.h had invalid macro usage with 2 #else statements, so it wasn't building. Fix the build.
(cherry picked from commit 6bcbb9ba85d95d7df63811a482abc39c4d595366)
commit 6a2693b2f9cfdec6f30e2ca4c4176f986f97249e
Author: George Peter Staplin <gps@Georges-Workstation.local>
Date: Thu Oct 23 17:40:23 2008 -0600
XQuartz: Remove the enable_stereo default. We now use feature detection to enable stereo visuals.
We need to revisit the GL/indirect.c changes. I think indirect.c should
be using the same feature detection and GLX visual config code. The
indirect changes will require testing...
(cherry picked from commit 49b7a7c6f20ca85d4d624444eb83db2f91344591)
commit b015a021b28623b7b734833dc9b8269c41db4e8a
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Tue Oct 21 20:30:35 2008 -0700
Allow non-gcc compilers to build xf86Xinput.c
commit b7cc6ca22a4ff7a94abee6962a07fdd0b563d26a
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Thu Oct 23 16:33:11 2008 -0700
miext/rootless: Silence some warnings by using proper C prototypes.
(cherry picked from commit 050e46e09efcc7e6f090fa4a749e9076c972b760)
commit b397cc727787a854417b11b482cce4807fc8ab58
Author: George Peter Staplin <gps@Georges-Workstation.local>
Date: Thu Oct 23 16:19:58 2008 -0600
miext/rootless: Fix the usage of DeleteProperty so that this builds again.
(cherry picked from commit 3de250e28a9a86bcae4464a15c2025805877ce1e)
commit 28d4f71193d2be26d1dcae724067539ac9db1123
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Thu Oct 23 15:01:03 2008 -0700
XQuartz: pbproxy: Fix compilation on case-sensitive file systems...
(cherry picked from commit 6622efca216663c99d112c7a226bde691d1f3215)
commit 40f9b6bf0dc62098680235a958e0733770902cca
Author: Adam Jackson <ajax@redhat.com>
Date: Thu Oct 23 17:33:52 2008 -0400
Argh, macros.
commit 8b3c278fe7502f9343355f09213837622b0d9ca0
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Thu Oct 23 11:39:04 2008 -0700
Rootless: Properly typed expose_1
(cherry picked from commit 78e874fe17174ac8f61586573edaf7f16ece7b21)
commit 3e999d35c26b0ffb894c257a3057d44b949744bd
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Thu Oct 23 11:37:13 2008 -0700
XQuartz: Honor the Spaces preference for "When switching to an application, switch to a space with open windows for the application"
(cherry picked from commit bf561a06b2bf60395d26026ac7627d0cb254bc07)
commit 75067d12e4f4daa080dfb0209a9abf9c5654271f
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Tue Oct 21 19:36:48 2008 -0700
XQuartz: Added missing semicolons to Localizable.strings
(cherry picked from commit e9fe3f36d9529f00daeefa1379cdd6f01a88f410)
commit a003932dccc438c4500d383982cee2376e808bd5
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Tue Oct 21 11:23:42 2008 -0700
XQuartz: Default dpi to 96 instead of 75
(cherry picked from commit 08a5a333d7fea68146cd9cf50682b811378ab3ce)
commit 2d764e21f278ea26bae135db6dae07b94651951c
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Tue Oct 21 11:19:06 2008 -0700
XQuartz: pbproxy: SIGHUP reloads preferences.
(cherry picked from commit cbc0935ef74ebd76ed3db16d6ab86043eeed42a3)
commit 0b695262176e96f508921905ee7f9cc086c7daf0
Author: Adam Jackson <ajax@redhat.com>
Date: Thu Oct 23 15:01:58 2008 -0400
Change some #define foo() -> static void foo()
commit aab73d719a8de6b830e47c7f47860b7990ea8d03
Author: Adam Jackson <ajax@redhat.com>
Date: Thu Oct 23 13:20:59 2008 -0400
Fix previous cherry pick for API changes
commit 8767fc8d47276c7489ae50dd556a446a462776ea
Author: Keith Packard <keithp@keithp.com>
Date: Fri Apr 4 12:11:14 2008 -0700
Wrap AddTraps in exa and damage.
This fine (and unused) function wasn't ever wrapped which made it not work
under exa.
(cherry picked from commit 06e7e1d0486e8c516a9b3219a2c86026f88825fc)
commit 4c926dbac65ceb699b91bb0d3fd0005a5854572d
Author: Peter Hutterer <peter.hutterer@redhat.com>
Date: Thu Oct 23 22:07:37 2008 +1030
dix: fix two more endian issues, correct initial "enabled" value. #18111
EnableDevice and DisableDevice both change the property too.
And enabled must be set to FALSE in AddInputDevice, the device is not enabled
yet.
X.Org Bug 18111 <https://bugs.freedesktop.org/show_bug.cgi?id=18111>
commit 084ae9e38812f19751a086eea7ce555761ae5a17
Author: Jerome Glisse <glisse@freedesktop.org>
Date: Thu Oct 23 11:28:53 2008 +0200
dri2: fail at context creation if driver fail to create it's context
commit ff60e592f003d8bc45789a1a14e86be22f5242b2
Author: Peter Hutterer <peter.hutterer@redhat.com>
Date: Thu Oct 23 09:19:41 2008 +1030
dix: don't allow VCP/VCK be disabled through properties.
commit 98f01c2abe4771d76febf8fe70111b2bddfab776
Author: Peter Hutterer <peter.hutterer@redhat.com>
Date: Thu Oct 23 09:13:41 2008 +1030
dix: fix endianess issue in AddInputDevice. #18111
dev->enabled is a Bool. Bool is two bytes.
BOOL on the other hand is a protocol type and always 1 byte. So copy the value
into the one-byte type before passing it into XIChangeDeviceProperty.
Found by Michel Dänzer.
X.Org Bug 18111 <http://bugs.freedesktop.org/show_bug.cgi?id=18111>
commit f6cbe0326c57e3c9897f17baef78199b06537c44
Author: Peter Hutterer <peter.hutterer@redhat.com>
Date: Wed Oct 22 18:16:12 2008 +1030
dix: init remaining three xkb fields to zero in a new client.
commit 0b56b44addc323a00eb7cd86240cb0dd4275bcf8
Author: Peter Hutterer <peter.hutterer@redhat.com>
Date: Mon Oct 20 17:06:40 2008 +1030
xfree86: AllowEmptyInput is true by default - update the xf86Info defaults.
Also set AutoAddDevices and AutoEnableDevices to their defaults.
And in doing so, switch the rest of the defaults over to named intializers.
Signed-off-by: Peter Hutterer <peter.hutterer@redhat.com>
commit d72cd753b99fae147ef4c189700fc697f1ea7fb0
Author: Matthieu Herrb <matthieu.herrb@laas.fr>
Date: Tue Oct 21 22:32:57 2008 +0200
Close well known connections in ServerAbort()
commit 81e197b2a5457bb9f7ed72f82c2d33fd8dbfc202
Author: Adam Jackson <ajax@redhat.com>
Date: Tue Oct 21 16:00:32 2008 -0400
Bug #18159: Spell "anisotropic" correctly
commit 3891dd892449fcdb7a514e3c5e7e763ba7e74003
Author: Adam Jackson <ajax@redhat.com>
Date: Tue Oct 21 13:10:44 2008 -0400
exa: Add exaDrawableIsOffscreen() to the driver API.
commit c837d182c4674c01296bb7efd7d834d9dfd55f83
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Tue Oct 21 09:11:59 2008 -0700
XQuartz: Only send mouse events while in the background if we're over a visible window.
This "breaks" xeyes but gets rid of annoying tooltips.
(cherry picked from commit 10090a132a0110fe24c8c886d9f53e6e947f8038)
commit 2a9613980f93959eedf9396735785d4c50546e2d
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Tue Oct 21 09:07:08 2008 -0700
XQuartz: More fullscreen fixes
Start in rooted mode when enabled
Make the hotkey cmd-alt-a behave
(cherry picked from commit 22a54e46176c9cbdfaaa59ef33a6ae6a9c4969ef)
commit e4ea1494debda4d3da03864c2640921fe0430694
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Mon Oct 20 12:23:04 2008 -0700
XQuartz: Cleaned up keyboard init and map reload.
(cherry picked from commit f78c9fc06cac2cc6ddfd6e9ba435dd26a57d1f51)
commit ebb2e1449cfb382a806e04c52d42240670717069
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Mon Oct 20 09:46:34 2008 -0700
XQuartz: Fixed follow-keyboard-layout
≈
(cherry picked from commit a9f9fbf512c9fd5a773fce402182486edc71d5ab)
commit f67cd31d2cf1b8ad850bd21dbed5a975d77b4c54
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Tue Oct 21 09:29:37 2008 -0700
XQuartz: More progress towards fullscreen...
(cherry picked from commit 628cae86b4ad02c49d20df1e1afdcb7abcabb649)
(cherry picked from commit b47b7ab6d6d0a7f6cbf678a5755124d6b7516d3e)
commit d434ed400986653771bbd60c224a2275bd6147ef
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Fri Oct 17 09:25:26 2008 -0700
XQuartz: Fixed missing key-equiv for Hide-Others.
(cherry picked from commit 2c4b0f9615b646712609ebef3c0851c9a22e781b)
commit 3695f62d072e7864fdcee385c8b5ca40f2018101
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Thu Oct 16 22:36:00 2008 -0700
XQuartz: Require applewmproto-1.1.1
(cherry picked from commit ed235e3406e603a8a92c4b72f9f9018bae72ad65)
commit f935c11398b93860461672e88814026d75b71689
Author: George Peter Staplin <gps@Georges-Workstation.local>
Date: Thu Oct 16 13:09:21 2008 -0600
XQuartz: pbproxy: Fix 2 bugs with the preferences.
Add dump_prefs() for instrospection.
Make prefs_get_bool a little more clear.
In get_property don't assume that the Mac realloc(NULL, 0); returns
non-NULL. We shouldn't depend on implementation-defined behavior too
much.
Add more commentary in various spots.
Add TARGETS in the TARGETS response. I don't know why some X11 apps
do this, but it could be something that some weird toolkit/app tests
for.
In reload_preferences add preferences synchronization, so that xpbproxy
reloads the preferences, and picks up any changes.
Fix a typo/misspelling of the sync_clipboard_to_pasteboard preference.
(cherry picked from commit 165cbbb90c793d9335ea76f0274b1f60ad295903)
commit 4d978af5c71430f0043b1272f8dc6344b8f03f12
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Wed Oct 15 21:26:58 2008 -0700
XQuartz: Fixed window levels.
(cherry picked from commit ef4d37c73f31048dd74efee2c63fa08b92608f87)
commit 58eacf0b7beb8c6f1971570ede0bfd3976a84665
Author: Rémi Cardona <remi@gentoo.org>
Date: Tue Oct 21 10:07:24 2008 -0400
Force LC_ALL=C when building xf86DefModeSet.c
Fixes build in not-quite-latin locales.
commit 2188582e5ea90edb432a2f421d0a267439ba08f9
Author: Michel Dänzer <michel@tungstengraphics.com>
Date: Mon Oct 20 09:55:24 2008 -0400
EXA: Avoid excessive syncing in PutImage
commit 8d0cb507ae568c8da92f10ff1188d797bcaa3d1a
Author: Peter Hutterer <peter.hutterer@redhat.com>
Date: Fri Oct 17 09:59:29 2008 +1030
dmx: avoid hilarious #define Xcalloc xcalloc game.
commit 8a23707b866c11807e01056db97afec56e9b19c8
Author: Peter Hutterer <peter.hutterer@redhat.com>
Date: Fri Oct 17 09:15:39 2008 +1030
dmx: change remainder of manual EQ allocation to GetEventList().
commit 8de26770a41ec87c46eed2eddfde6f867d71fe1f
Author: Pierre Willenbrock <pierre@pirsoft.de>
Date: Thu Oct 16 14:28:14 2008 -0400
RANDR: Fix output property event delivery.
commit d936a4235c9625bd41569cef3452dd086284e0d7
Author: Peter Hutterer <peter.hutterer@redhat.com>
Date: Sun Oct 12 21:58:30 2008 +1030
xfree86: if AllowEmptyInput is true, enable RAW mode on the console.
Usually, the console is set to RAW in the kbd driver. If we hotplug all input
devices (i.e. the evdev driver for keyboards) and the console is left as-is.
As a result, the evdev driver must put an EVIOCGRAB on the device to avoid
characters leaking onto the console. This again breaks many things, amongst
them lirc, in-kernel mouse button emulation and HAL.
This patch sets the console to RAW if AllowEmptyInput is on.
Use-cases:
1. AEI is off
1.1. Only kbd driver is used - behaviour as-is.
1.2. kbd and evdev driver is used: if evdev does not grab the device,
duplicate events are generated.
2. AEI is on
2.1. Only evdev driver is used - behaviour as-is, but evdev does not need
to grab the device anymore.
2.2. evdev and kbd are used: duplicate key events are generated if evdev
does not grab the device.
1.2 is a marginal use-case that can be fixed by adding a "grab" option to the
evdev driver (update of xorg.conf is needed).
2.2 is an issue. If we have no ServerLayout section, AEI is on, but devices
specified in the xorg.conf are still added [1], resulting in duplicate events.
This is a common configuration and needs sorting out.
[1] 2eaed4a10fe5bf727579bca4ab8d4a47c8763a7d
Signed-off-by: Peter Hutterer <peter.hutterer@redhat.com>
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit 84ef8ed6fbefd8d6c0aaa3c862879f9804299bd8
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Wed Oct 15 14:11:18 2008 -0700
XQuartz: implemented primary-on-grab and fixed clipboard-to-pasteboard
(cherry picked from commit bcb83eea729a01026d99d1cfc2b77385b5b275fd)
commit 0195d318465d5a6a9039091bcb252202471df5a4
Author: Luc Verhaegen <libv@skynet.be>
Date: Wed Oct 15 21:46:27 2008 +0200
GLX: fix build when dri2 _is_ available.
Caught by Julien Cristau.
commit 398cdf959afadfa964aece13cc9d89b2dd589930
Author: Luc Verhaegen <libv@skynet.be>
Date: Wed Oct 15 18:24:10 2008 +0200
GLX: fix build when dri2 is not available.
commit 2e60ebbd254290e19492b97c960d9678513c94bf
Author: Daniel Stone <daniel@fooishbar.org>
Date: Wed Oct 15 14:10:51 2008 +0100
XFree86: Simplify DontZap/-retro interaction
How hard could it possibly be, right?
commit 66a87517bd80b21e107df9d57968d81a92f91fd5
Author: Alan Hourihane <alanh@tungstengraphics.com>
Date: Wed Oct 15 12:00:16 2008 +0100
re-enable DRI2
commit ced6690284fd334f225bbc94685c114ad3ab96d8
Author: Kristian Høgsberg <krh@redhat.com>
Date: Tue Oct 7 13:49:28 2008 -0400
dri2: Update to latest protocol draft.
Mainly rename SwapBuffers to CopyRegion, which adds the xfixes region
argument and the bitmask argument to let us extend it in the future.
commit 87a016ae00feac3fbaa7e7a518076a3852d49554
Author: Maarten Maathuis <madman2003@gmail.com>
Date: Wed Oct 15 00:02:13 2008 +0200
exa: restore {x,y}{Src,Dst} to their original values when !done
commit b677bff97b62c3931df853bae25ab485892ae173
Author: Adam Jackson <ajax@redhat.com>
Date: Tue Oct 14 14:30:19 2008 -0400
int10: Degrade the checksum warning to X_INFO.
I've seen about one case in three years where this has actually been
correlated with the real cause of failure, and we've trained people to
freak out about X_WARNING, so let's be less alarmist.
commit bd9c6b3a4d726a3f83ac6d8cf7211eddbc28f25a
Author: Adam Jackson <ajax@redhat.com>
Date: Tue Oct 14 14:04:01 2008 -0400
EDID: Catch even more cases of encoding aspect as size.
Very cute, Samsung, not only do you claim to be 16cm by 9cm in the
global size record, you also claim to be 160mm by 90mm in the detailed
timings. Grrr.
commit ad677238bc96a8578113bbe76d605d7a87aca44c
Author: Adam Jackson <ajax@redhat.com>
Date: Tue Oct 14 13:00:50 2008 -0400
Add backtrace definitions to dix-config.h.in
commit 8e368cf5b964f1d29fda0a463f9510457619b14d
Author: Nathaniel McCallum <nathaniel@natemccallum.com>
Date: Tue Oct 14 09:50:29 2008 -0400
Xorg: add -modalias option
This scans the installed video drivers and prints a Linux-style modalias
listing of the devices each driver claims to support.
commit 3eb52de7f28b0050582f9ac4c28bc894d3f06f4b
Author: Adam Jackson <ajax@redhat.com>
Date: Tue Oct 14 09:45:19 2008 -0400
kdrive: Hardcode a different wrong value for number of mouse buttons
This should really come from the input driver directly, but, kdrive.
commit f3f6ea89aa9e0ffe9e37bc059e5e6bf75be4ee9f
Author: Peter Hutterer <peter.hutterer@redhat.com>
Date: Wed Oct 8 14:12:21 2008 +1030
Xi: check all handlers before applying property changes.
The current code exposes to inconsistent updates, i.e. if handler N succeeds
but handler N+1 fails in setting the property, an error is returned to the
client although parts of the server now behave as if the property change
succeeded.
This patch adds a "checkonly" parameter to the SetProperty handler. The
handlers are then called twice, once with checkonly set to TRUE.
On the checkonly run, handlers _MUST_ return error codes if the property
cannot be applied. Handlers are not permitted to actually apply the changes.
On the second run, handlers are permitted to apply property changes.
Errors codes returned on the second run are ignored.
commit ad67e3f063aa79247270f29e989bbfe5f62c9ed7
Author: Peter Hutterer <peter.hutterer@redhat.com>
Date: Sun Oct 12 10:19:36 2008 +1030
dix: remove duplicate code in ReleaseActiveGrabs
Spotted by Colin Harrison.
commit 3fc4f40b6c6cb416c9dc4bdb35c91b4f32c03ccc
Author: Aaron Plattner <aplattner@nvidia.com>
Date: Sun Oct 12 16:08:26 2008 -0700
Restore xf86{Enable, Disable}GeneralHandler.
These were useful as part of the generic handler ABI, and are used by the NVIDIA
driver.
This reverts part of commit 50081d2dfb79878cb931a15c265f0d60698dfd39.
commit 2217d22a76cdb2460f9683a6bf74c7248612889d
Author: Aaron Plattner <aplattner@nvidia.com>
Date: Sun Oct 12 16:07:24 2008 -0700
Revert "xfree86: xf86{Enable, Disable}InputHandler can be static."
These were potentially useful as part of the input handler ABI, even if nobody
currently uses them.
This reverts commit 278c11f01fbc6d6bd91c5a7127928c9ef5d29fca.
commit 5b336585a4cdf11d20831a9536ad581e959ea7f1
Author: Maarten Maathuis <madman2003@gmail.com>
Date: Fri Oct 10 23:23:02 2008 +0200
dri: don't set the dixPrivate key to NULL, as this is a staticly set variable.
- This breaks on the 2nd server generation.
- No other subsystem seems to NULL their key.
- This should fix bug 17982.
commit b736f477f5324f79af30fc0f941ba0714a34ccda
Author: Adam Jackson <ajax@redhat.com>
Date: Fri Oct 10 16:33:24 2008 -0400
mieq: Backtrace when the queue overflows.
Since we're probably stuck down in a driver somewhere, let's at least
try to point out where. This will need to be rethought when the input
thread work lands though.
commit 94ed0ba1b5043ad9fc33b42756af447d5ab15bbd
Author: Adam Jackson <ajax@redhat.com>
Date: Fri Oct 10 15:53:48 2008 -0400
Move xorg_backtrace() up to the OS level so we can call it from DIX.
commit f650c1aeb06e957626bb0a74eddbb133f59dbecb
Author: Adam Jackson <ajax@redhat.com>
Date: Fri Oct 10 14:07:28 2008 -0400
Revert "Don't leak EDID_block"
This reverts commit 05cdef18ca668ffc86b71033f71cfbd262cdd994.
http://lists.freedesktop.org/archives/xorg/2008-October/039305.html
commit 0660dd9d7009147c395b9ea904539f76f55b9a7f
Author: Adam Jackson <ajax@redhat.com>
Date: Fri Oct 10 13:41:50 2008 -0400
EDID: Catch monitors that encode aspect ratio for physical size.
This is not legal in either EDID 1.3 or 1.4, but hey, when did a little
thing like legality stop anyone.
commit 956a4ba40b28251ab2d88b5d5b0796e01afd2bdd
Author: Maarten Maathuis <madman2003@gmail.com>
Date: Fri Oct 10 00:28:34 2008 +0200
pixmap: Add some notes to devKind and devPrivate.
commit 4808bdec45775342eb9a6352b41e4919e1a69279
Author: Peter Hutterer <peter.hutterer@redhat.com>
Date: Thu Oct 9 16:23:24 2008 +1030
Xi: don't memcpy the KeyClassRec from SD to MD. #16167
Most of its component get copied during CopyKeyClass anyway.
The ones that aren't:
postdown - never changed for virtual devices anyway.
down - shouldn't change that without sending events.
memcpy'ing the struct also copied mapWidth, which means we didn't realloc
during SetKeySymsMap lateron, overwriting the memory assigned to us.
X.Org Bug 16167 <http://bugs.freedesktop.org/show_bug.cgi?id=16167>
commit 18cdd733ad3dd36fa0a23dfbf18c7d99b86c0276
Author: Peter Hutterer <peter.hutterer@redhat.com>
Date: Thu Oct 9 17:26:00 2008 +1030
kdrive: fix dixflags so they're always defined before enqueuing events #17734
If absolute events were posted, dixflags got set conditionally on whether the
valuators are different from the last posted set of values.
If dixflags are undefined however, the DIX interprets them as relative
valuators. Fix this by making sure defining dixflags is always defined.
X.Org Bug 17724 <http://bugs.freedesktop.org/show_bug.cgi?id=17734>
commit d58f2c30c64e8b2d8179dac06e0a54be06099da6
Author: Peter Hutterer <peter.hutterer@redhat.com>
Date: Thu Oct 9 16:50:54 2008 +1030
kdrive: lastx/y needs to be set to the event coordinates #17728
X.Org Bug 17728 <http://bugs.freedesktop.org/show_bug.cgi?id=17728>
commit decec14219bcd992ec426e202ff3c8681b520b74
Author: Peter Hutterer <peter.hutterer@redhat.com>
Date: Thu Oct 9 15:10:21 2008 +1030
dix: silence "unused variable" compiler warning.
commit 0b4b683f3eeec43536e73be302a4c396fe4d9894
Author: Peter Hutterer <peter.hutterer@redhat.com>
Date: Tue Oct 7 18:44:42 2008 +1030
xfree86: export NewInputDeviceRequest/DeleteInputDeviceRequest
NIDR should be used to create a new SD from e.g. within a driver.
DIDR should be used to remove a device from the server.
Signed-off-by: Peter Hutterer <peter.hutterer@redhat.com>
commit 5e213fe1022bf96747834a3ac227929b23136ee6
Author: Peter Hutterer <peter.hutterer@redhat.com>
Date: Thu Oct 9 11:29:11 2008 +1030
xfree86: cache dev->isMaster before freeing the device.
commit 05cdef18ca668ffc86b71033f71cfbd262cdd994
Author: Zhenyu Wang <zhenyu.z.wang@intel.com>
Date: Fri Oct 10 13:45:51 2008 +0800
Don't leak EDID_block
commit 2d9da7a5f384d5f38b2be79b1ea0df5a3deb52d1
Author: Luc Verhaegen <libv@skynet.be>
Date: Thu Oct 9 22:22:53 2008 +0200
DGA: Track client state even when using old style DGA.
This fixes the issue that a badly killed DGA will keep on hogging
mode/framebuffer/mouse/keyboard.
commit 322335d5b5b6f155f56fe3c1cbe372f13dc20932
Author: Luc Verhaegen <libv@skynet.be>
Date: Thu Oct 9 22:21:05 2008 +0200
DGA: Mash together xf86dga.c and xf86dga2.c.
This in preparation for an upcoming client state tracking fix.
commit d13c3cbd43bc5e6b459c7df822292cf02ad2c9c4
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Wed Oct 8 18:39:41 2008 -0700
XQuartz: Some motion made towards supporting fullscreen.
(cherry picked from commit 99be3d68b64059caada739a373e5e01844c776e0)
commit dc166bf6423f4243ea05f17340ff9ff99ecad74b
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Tue Oct 7 11:39:08 2008 -0700
XQuartz: Fixed EXTRA_DIST for new GL files.
(cherry picked from commit a11c9052030b44045f037050a5825256b539ed50)
commit 803327929445256e159c10894e6305fbaa389982
Author: George Staplin <georgestaplin@george-staplins-mac-pro.local>
Date: Tue Oct 7 12:12:38 2008 -0600
XQuartz: GL: setVisualConfigs() copied the behavior of indirect.c which is wrong, with regard to the handling of xcalloc failure.
Use ErrorF for an error message after an xcalloc failure, and return instead of falling through to GlxSetVisualConfigs, or abort()ing at the test branch.
(cherry picked from commit 1056700971fd5c034396ed6dbea15e092f0c6332)
commit f1fec6f323b27a0165325d8fcf6af7ae163bde14
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Wed Oct 8 18:45:04 2008 -0700
XQuartz: Call setVisualConfigs in InitOutput, and only when GLXEXT is defined.
(cherry picked from commit 97173d4eda142c73bb975cc05225b791778f85af)
commit 52accec7dbc613a521e40449b8bb5f0c92ddb105
Author: George Staplin <georgestaplin@george-staplins-mac-pro.local>
Date: Tue Oct 7 11:31:48 2008 -0600
XQuartz: GL: Add the proper license information to the new files, and add more commentary to setVisualConfigs().
(cherry picked from commit 190a3d5e5de9915931928fb8e6da88bb9644cda4)
commit 63abdf61151cc90f769ed1708ee19b6c434c27c9
Author: George Staplin <georgestaplin@george-staplins-mac-pro.local>
Date: Mon Oct 6 18:05:12 2008 -0600
XQuartz: GL: Add the new C code to the Makefile.am.
Commit the darwin.c changes I missed in the last commit, for calling
setVisualConfigs().
(cherry picked from commit eb3c014e1710bf0b93bda10ddb9b795cd150d02d)
commit a8f5d422c9c0a39f55e80bbd180439b6ec3a805c
Author: George Staplin <georgestaplin@george-staplins-mac-pro.local>
Date: Mon Oct 6 18:01:23 2008 -0600
XQuartz: GL: Provide code for getting the capabilities of the underlying system's CGL.
Add a setVisualConfigs that is called before the fbScreenInit, to setup the __GLXvisualConfigs.
(cherry picked from commit fc86f9e4482043eca76d9d7a96e166be1aabf674)
commit 2998e48be343ab2a11d6d328fc961ab5b8eb9292
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Sat Oct 4 21:25:50 2008 -0700
Xquartz: Fix parallel builds
(cherry picked from commit 1fe7298a3b9a2ed82c612292f9e547cf78f99ae5)
commit 7aa535708f1f33173bf05abc17b75e0841ffc385
Author: Adam Jackson <ajax@redhat.com>
Date: Wed Oct 8 16:25:59 2008 -0400
Fix more xcalloc stupidity.
Did I mention the hate? Pretty sure I mentioned the hate.
commit 4fe80aa14a24df6d0611c47fc5654c3c4f56fdb1
Author: Adam Jackson <ajax@redhat.com>
Date: Wed Oct 8 16:22:35 2008 -0400
I hate you xlib. Please die in a fire.
commit 2c5332872f808e7a646a63ae7ec63a2b80f83ee7
Author: Adam Jackson <ajax@redhat.com>
Date: Wed Oct 8 13:39:49 2008 -0400
s/kdDontZap/kdAllowZap/
commit 1feb69eb63e6739ff5db255ad529e84adf941a10
Author: Luc Verhaegen <libv@skynet.be>
Date: Wed Oct 8 14:55:29 2008 +0200
DGA: Fix ProcXF86DGASetViewPort for missing support in driver.
Fixes a segfault when trying to activate a DGA mode without checking
whether DGA modesetting is at all possible.
commit d1bb5e3b47ab71aa2f18f69daaf2a4c5ce06d800
Author: Tiago Vignatti <vignatti@c3sl.ufpr.br>
Date: Wed Oct 8 03:19:45 2008 -0300
mi: functions here are carrying 'time' without need.
commit 4964a9ca6c3f26376469b6d8217815a47231f0a9
Author: Tiago Vignatti <vignatti@c3sl.ufpr.br>
Date: Wed Oct 8 03:06:32 2008 -0300
mi: remove deprecated and unused functions.
miPointerDeltaCursor, miPointerGetMotionBufferSize and
miPointerSetNewScreen.
commit adf3e296e2b00164fb22e89ad4f44acbd2e3deae
Author: Tiago Vignatti <vignatti@c3sl.ufpr.br>
Date: Wed Oct 8 02:12:49 2008 -0300
Remove unused declarations.
AvailableClientInput (LBX debris) and xf86XinputFinalizeInit.
commit bca9fa2efe97d2816a2e9412cdff08a0145c8f96
Author: Tiago Vignatti <vignatti@c3sl.ufpr.br>
Date: Wed Oct 8 01:38:27 2008 -0300
Everyone knows that the loader is present. Silence it.
commit 56c615368c5a8e7acb0398434c2c68578626aa38
Author: Zhenyu Wang <zhenyu.z.wang@intel.com>
Date: Wed Oct 8 13:33:55 2008 +0800
Check nextEnabledOutput()'s return in bestModeForAspect()
In case no enabled outputs, we will reference wrong index of
output array.
commit 278c11f01fbc6d6bd91c5a7127928c9ef5d29fca
Author: Tiago Vignatti <vignatti@c3sl.ufpr.br>
Date: Wed Oct 8 01:18:49 2008 -0300
xfree86: xf86{Enable, Disable}InputHandler can be static.
commit 50081d2dfb79878cb931a15c265f0d60698dfd39
Author: Tiago Vignatti <vignatti@c3sl.ufpr.br>
Date: Wed Oct 8 01:11:38 2008 -0300
xfree86: remove xf86{Enable, Disable}GeneralHandler and others unused.
commit 54294e15ecf4a8ec0fd9fa8b6ed1a1b2d912ec7e
Author: Tiago Vignatti <vignatti@c3sl.ufpr.br>
Date: Wed Oct 8 00:43:22 2008 -0300
xfree86: fix wrong function name message errors.
commit 57dbb90f198116dcaf17c8111a7f80644d7ebe7f
Author: Adam Jackson <ajax@redhat.com>
Date: Tue Oct 7 20:36:45 2008 -0400
Document zap/-retro interaction more.
commit 617933e8c259ad12388c0dd13421846a873975e3
Author: Daniel Stone <daniel@fooishbar.org>
Date: Wed Oct 8 02:45:59 2008 +0300
XFree86: Fix DontZap interaction with -retro
-retro will now _not_ override (No)DontZap, if it's set in the config
file.
commit d80bae2237e555025465d4d761a5cc537cc2bcdd
Author: Daniel Stone <daniel@fooishbar.org>
Date: Wed Oct 8 02:43:27 2008 +0300
Update docs to reflect new DontZap default
commit 42e7b64bf90604e0099702f5447163be80a2efb6
Author: Adam Jackson <ajax@redhat.com>
Date: Tue Oct 7 20:32:02 2008 -0400
-retro enables zapping
commit 9d135ac10a7374c7ccda705f1eeb02cc53076c34
Author: Daniel Stone <daniel@fooishbar.org>
Date: Wed Oct 8 02:30:05 2008 +0300
Input: Make DontZap the default
If you need to bail out the server, use Ctrl-Alt-Fx, or enable zapping
if it bothers you that much. If Ctrl-Alt-Fx is broken, nag me until
it's permanently fixed.
commit b574365fca954a999ebaeb7203d1e0ea6d99b3ea
Author: Aaron Plattner <aplattner@nvidia.com>
Date: Tue Oct 7 13:09:11 2008 -0700
Revert "Unexport (and unimplement) xf86SetAccessFuncs" for now.
The nvidia driver currently uses these hooks to work around problems where RAC
will disable access to the hardware at unexpected times. This change restores
these hooks until we can come up with a better API for working around RAC.
This reverts commit c1df4fbede8058c15ce3a5759a7758fecafbb9e7.
commit fe85ec34ec2b58188633dac4464a1e9e9977652b
Author: Aaron Plattner <aplattner@nvidia.com>
Date: Tue Oct 7 13:08:38 2008 -0700
Revert "Remove unused server state change callbackery" for now.
The nvidia driver currently uses these callbacks to work around problems where
RAC will disable access to the hardware at unexpected times. This change
restores these hooks until we can come up with a better API for working around
RAC.
This reverts commit d7c0ba2e9eae7044ef4c31d9c3cbb9a71ee0f9f9.
Conflicts:
hw/xfree86/loader/xf86sym.c
commit 94919480d8bb66e1807b4fe87b8f326ef6e012c6
Author: Adam Jackson <ajax@redhat.com>
Date: Tue Oct 7 13:41:25 2008 -0400
int10: Fix a nasty memory leak.
commit a57b2f172c1291f22f7ba2780c1b2f55e353c3e9
Author: Adam Jackson <ajax@redhat.com>
Date: Tue Oct 7 13:39:10 2008 -0400
int10: Don't warn when scanning for devices we don't have.
Some BIOSes (hi XGI!) will attempt to enumerate the PCI bus by asking
for the config space of every possible device number. This despite
perfectly functional BIOS methods to enumerate the bus exactly.
commit a65e36a873cd1ba9896cd0f9a3e94dd933666005
Author: Adam Jackson <ajax@redhat.com>
Date: Tue Oct 7 13:38:12 2008 -0400
int10: Remove useless check.
If you have more than one PCI device with the same d/b/d/f, you're
already in trouble.
commit 6dbfca571f6d214dc456710a60ebbbbd204cdbbd
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Tue Oct 7 10:07:03 2008 -0700
Depend on xtrans >= 1.2.2 for TRANS_NOXAUTH
commit 30193fbff9d9284fbbd81fe5f7b6c4d102daf1d1
Author: Adam Jackson <ajax@redhat.com>
Date: Tue Oct 7 10:36:12 2008 -0400
Reinstate cursorScreenDevPriv
commit e7cd5d84ed1fb3637dce6e9e6ef58c8611818c4e
Author: Dave Airlie <airlied@redhat.com>
Date: Tue Oct 7 16:09:17 2008 +1000
fixup another calloc build issue
commit 60cfaa45a532bd3cfcfb4bd57b2f657c0a8b6a6b
Author: Adam Jackson <ajax@redhat.com>
Date: Mon Oct 6 18:47:06 2008 -0400
Build fix.
commit c6d6d3e87a472b641d883a6c000f96e5bdf48532
Author: Adam Jackson <ajax@redhat.com>
Date: Mon Oct 6 16:18:21 2008 -0400
Loader: Unexport a handful of consumerless symbols from dixsym.
commit 8a5b89e8e184f4cbf33c6dee0b06e61d8f857576
Author: Adam Jackson <ajax@redhat.com>
Date: Mon Oct 6 15:36:51 2008 -0400
xalloc+memset(0) -> xcalloc
commit 0b7b89fbac0b3865b2cf51295c68a5f4c7523f28
Author: Adam Jackson <ajax@redhat.com>
Date: Mon Oct 6 14:19:30 2008 -0400
xalloc+bzero -> xcalloc
commit 9187f6ad9ec7ba9569a93d92561aac17eaa83491
Author: Keith Packard <keithp@keithp.com>
Date: Mon Oct 6 12:21:20 2008 -0400
RANDR: Delivery output property events.
commit 717c7492a0f6ba3fb3eabda33515881eef314155
Author: Dave Airlie <airlied@linux.ie>
Date: Tue Oct 7 02:38:44 2008 +1000
exa: don't call composite routines with no buffer.
We can get a case with gnome-terminal + links, where we get two arrays
of glyphs all with 0 width and 0 heights in them. If this happens
we manage to get to this case without any buffer setup and segfault.
commit aacac3edac7c6b82a0a0e3bc500f563d187e5df3
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Sat Oct 4 21:07:31 2008 -0700
XQuartz: Bumped bundle version to 2.3.2 for beta1
(cherry picked from commit 2021c4c4e726a6b8f27f19f16ed3d86e37dbe448)
commit ed3134918dcbbd58a5ef8359a77e8024c98396e6
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Sat Oct 4 21:06:58 2008 -0700
XQuartz: pbcopy: Re-enabled some code I commented out for testing
(cherry picked from commit 9b5d11409264080e394c8f18e06237122de80014)
commit b3a971d8b5df5ab4af0be49105ef32f67d010901
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Sat Oct 4 18:54:15 2008 -0700
XQuartz: xpbproxy: Support some of the preference toggles from X11.app, cleaned up CLIPBOARD_MANAGER atom management.
(cherry picked from commit f7673bb4de3c1f71eb390a3279eed3589efc3df4)
commit fc35c7a2e2888cb767413f5e85a79c7f422a6284
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Sat Oct 4 21:16:54 2008 -0700
XQuartz: GLX - enable_stereo defaults option should work now
(cherry picked from commit 3a6898f48756fdb2898292679301ef3dc109b4f6)
commit 7818aba1d1e74f4ffe68b7d6806622b94ae8a230
Author: Roland Scheidegger <sroland@tungstengraphics.com>
Date: Sat Oct 4 15:50:35 2008 +0200
dri2: fix compilation (remove no longer existing include file)
commit a29af6465883796a6acf04b72ce812a0632b2186
Author: Maarten Maathuis <madman2003@gmail.com>
Date: Fri Oct 3 23:54:10 2008 +0200
exa: remove "direct" case for exa{Trapezoids,Triangles}
- By adding a small hack to the xserver i was able to easily test the performance of the normally rare direct case (using cairo).
- It turned out to be 70% slower for me (large test on an otherwise idle computer), which seems enough of a reason to remove it.
- AddTraps could also use a 2nd look, but since noone is using that it's a bit hard and less useful to test.
commit 416870d8c9e7e383b87c8513c2296a0cb66e7ef4
Author: Maarten Maathuis <madman2003@gmail.com>
Date: Fri Oct 3 22:59:40 2008 +0200
exa: remove some excessive whitespace
commit b72a217ad59cc527327d7b1fc81898677b977d8f
Author: Adam Jackson <ajax@redhat.com>
Date: Fri Oct 3 18:30:37 2008 -0400
Dangling use of miDestroyGCOps
commit f5bbc54a93f53cd4ba124712159bb44c93282a8e
Author: Adam Jackson <ajax@redhat.com>
Date: Fri Oct 3 18:18:02 2008 -0400
Fix compile for miSetScreenPixmap prototype.
commit 9dbfcd89214241626ac2704d1ffffff1cc0c67ae
Author: Adam Jackson <ajax@redhat.com>
Date: Fri Oct 3 17:40:30 2008 -0400
Delete unused miModifyBanking()
commit 94825ad3c72a1c3f6a61199c302841f63241cf87
Author: Adam Jackson <ajax@redhat.com>
Date: Fri Oct 3 17:39:34 2008 -0400
Remove unused wrapping for visual initialization.
commit 4791f8e2ba9a0e318b7f13c83618ece036dd53ed
Author: Adam Jackson <ajax@redhat.com>
Date: Fri Oct 3 17:23:58 2008 -0400
staticize mi{G,S}etScreenPixmap
commit 14d98b4a2fdea4a4f5cc9b751151672cb392fba3
Author: Adam Jackson <ajax@redhat.com>
Date: Fri Oct 3 17:21:16 2008 -0400
miFindMaxBand is dead code
commit 48b47928133bc462947104bd0f4204f00b993862
Author: Adam Jackson <ajax@redhat.com>
Date: Fri Oct 3 17:16:28 2008 -0400
mi{Create,Destroy}GCOps are unused, nuke 'em.
commit bd0e87c74789bd5447ec731aa2d2d6e05dd54abc
Author: Adam Jackson <ajax@redhat.com>
Date: Fri Oct 3 17:13:10 2008 -0400
Remove a bunch of unused API from the mi export list.
commit ee5e07bc22f0c3af7a412b6bc430eae6a1dafe16
Author: Adam Jackson <ajax@redhat.com>
Date: Fri Oct 3 16:58:01 2008 -0400
loader: sort the mi symbol list
commit 77d0b0ecfa3c67ff8d11e773a7f083721cf4c6d7
Author: Adam Jackson <ajax@redhat.com>
Date: Fri Oct 3 16:53:08 2008 -0400
Remove unused pciNumBuses
commit 0ce61e21d6d7dcca0090e319bbcdb678570f2c3f
Author: Adam Jackson <ajax@redhat.com>
Date: Fri Oct 3 16:05:19 2008 -0400
Remove the Must_have_memory hack.
Also remove an astonishing amount of misunderstanding of how casts work.
commit e6b1c1fada19268af559d89375989973729fdb19
Author: Adam Jackson <ajax@redhat.com>
Date: Fri Oct 3 15:47:50 2008 -0400
const cleanup
commit fe616f9230b672edb89fca7516e750dc1b20c690
Author: Adam Jackson <ajax@redhat.com>
Date: Fri Oct 3 15:42:58 2008 -0400
Drop the never-called SkippedRequestCallback list.
commit 31136b9467c2a17bbed4a51d6a6c41e3290bd236
Author: Adam Jackson <ajax@redhat.com>
Date: Fri Oct 3 15:33:47 2008 -0400
Unexport MakeClientGrab{Imp,P}ervious
xtrap used to use these, but it's gone now. xtest still does but it's
linked statically.
commit eaf3fdf97014c27aececa8505c2713e7c9a537fc
Author: Adam Jackson <ajax@redhat.com>
Date: Fri Oct 3 15:24:35 2008 -0400
Unexport xf86NoSharedResources
commit d7d9edb506bfea1c10516b6c4eb72dee3559863c
Author: Adam Jackson <ajax@redhat.com>
Date: Fri Oct 3 15:17:44 2008 -0400
Unexport xf86DeallocateResourcesForEntity
commit 49673b43584928c22d699d1968ed6813b272aefe
Author: Adam Jackson <ajax@redhat.com>
Date: Fri Oct 3 15:13:39 2008 -0400
Unexport xf86SetEntityFuncs
commit 949ef6b79a36d6f6bbc192c20ef0f13cc95d4f28
Author: Adam Jackson <ajax@redhat.com>
Date: Fri Oct 3 15:10:26 2008 -0400
Unexport xf86ChkConflict
Also remove the unused internal ChkConflict()
commit d7c0ba2e9eae7044ef4c31d9c3cbb9a71ee0f9f9
Author: Adam Jackson <ajax@redhat.com>
Date: Fri Oct 3 15:06:42 2008 -0400
Remove unused server state change callbackery.
commit 9ada146a16bcf220b2dd2936fb3a0349a31e99d3
Author: Adam Jackson <ajax@redhat.com>
Date: Fri Oct 3 14:40:18 2008 -0400
xf86RegisterResources: Always print any failed registrations.
commit a5d3fa90f3de763a5dcbb0ff4987562449819323
Author: Adam Jackson <ajax@redhat.com>
Date: Fri Oct 3 14:38:48 2008 -0400
Typo fix.
commit cc3335858508ffbc52123eb5bb0c34f42800c8c4
Author: Adam Jackson <ajax@redhat.com>
Date: Fri Oct 3 14:37:59 2008 -0400
Remove the old implementation of RemoveOverlaps
commit 8fbf1185f5d6a1836b3e4265de6f605d82478e0b
Author: Adam Jackson <ajax@redhat.com>
Date: Fri Oct 3 14:32:32 2008 -0400
Internalise some resource list API.
commit 0ca4f3cee7e42a393cdd32d3a772a190ae68abc5
Author: Adam Jackson <ajax@redhat.com>
Date: Fri Oct 3 13:29:55 2008 -0400
Unexport xf86EnterServerState
commit c1df4fbede8058c15ce3a5759a7758fecafbb9e7
Author: Adam Jackson <ajax@redhat.com>
Date: Fri Oct 3 13:08:43 2008 -0400
Unexport (and unimplement) xf86SetAccessFuncs.
Because, no.
commit 44269e604eb60ebaa6189fd4409d39a4ec6b9f4b
Author: Adam Jackson <ajax@redhat.com>
Date: Fri Oct 3 13:02:50 2008 -0400
RAC: NO_SEPARATE_*_FROM_* are useless.
If anyone can come up with an example of a bus where:
- both i/o and memory resources are addressable
- access to them can be controlled
- but they can't be controlled independently
then by all means, reinstate this logic.
commit 51fcb58f45824c7cde88b8b4ccbd6bdcf760280e
Author: Adam Jackson <ajax@redhat.com>
Date: Fri Oct 3 12:39:49 2008 -0400
RAC: AccessEnable() and AccessDisable() are mandatory.
commit 9c5fc7762e9ca09847965e67e247d95dfc197266
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Fri Oct 3 11:24:34 2008 -0700
Partially reverts commit 505c216d030a8eb6e9fa757ecebed9597a850c88.
I don't know how the hell git-cherrypick messed that up to delete fbwindow.c
commit 7bb73a9513710feaebc127998950e9f472bfcc0d
Author: George Peter Staplin <gps@Georges-Workstation.local>
Date: Tue Sep 30 23:53:12 2008 -0600
XQuartz: pbproxy: Possibly fix a memory leak by using an [NSApp run] loop,
instead of calling CFRunLoopRun() directly. The leak wasn't reproducible on
this machine, but someone was able to produce a leak trace with Instruments
that indicates it was leaking in the CFRunLoopRun() path.
x-input.m: dequeue and ignore events when pbproxy_active is false.
x-selection.h: add an is_active method that is used by x-input.m to ignore
events.
x-selection.m: Handle nearly every preference, except for primary_on_grab,
which I don't really understand yet.
(cherry picked from commit 4d51ad851e64da83cbdfb0a4a22428418a7bcf75)
commit 2a5ce41f0371ad5df52586b8d4072578b6206321
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Tue Sep 30 13:54:08 2008 -0700
XQuartz: Use "pointer" and "pen" for device names to please GDK.
(cherry picked from commit 00ca0f4d839abf47e9573a1552473e039cf787e6)
commit d3f597a986dcbc7e4164f350300dbd2e438949d8
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Tue Sep 30 11:10:58 2008 -0700
XQuartz: Workaround for initial pressure/tilt being sent as 0 with motion during the proximity event
(cherry picked from commit 9a91d770a6411dd876187e64a8bda1f0745169ae)
commit 1657dfb843c0127ea31bfd0a8ef81d0c394cbc7b
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Tue Sep 30 08:46:08 2008 -0700
XQuartz: Using absolute ranges for pointer location to increase resolution and better support tablets.
(cherry picked from commit d79ccb45f68b65d65718b5b77efe2fae6eeda762)
commit 88bb8c6f485a7aaf40f684d484a33cfedfa74a70
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Mon Sep 29 22:33:02 2008 -0700
XQuartz: Removed resolved comment about localization.
(cherry picked from commit 8ed5faf058ac7b0782a9cc13a2c58b80168358d2)
commit b1d0b196617643619d24ed520b0a1161e26b66c6
Author: George Peter Staplin <gps@Georges-Workstation.local>
Date: Tue Sep 30 13:04:35 2008 -0600
XQuartz: pbproxy: Make the signal handler safer by using _exit, and only exit.
Remove some unnecesssary headers.
Remove some dead code that was never called or used in pbproxy.
Make use of an NSAutoreleasePool in x_init. It could potentially cause a leak
on a startup without this.
Start adding reload_preferences to the x_selection class, as well as event
handling for that.
(cherry picked from commit 602e8ba8f7ee196696bc9e3cea6ecdf3200dcf5c)
commit ecd260143cf9f012f033ba029ad04cb49567c89a
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Mon Sep 29 22:32:24 2008 -0700
XQuartz: Added some localizable strings that were missing.
(cherry picked from commit 2c8205ea8b709c5859412b466e83aec7a94acdcf)
commit aae878b89081ffba16386e8d4987469313049bea
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Mon Sep 29 22:26:20 2008 -0700
XQuartz: Actually send the pointer event from the pen even if it happes to actually have 0 pressure and 0 tilt.
(cherry picked from commit f41583761955cb9c92c43239bfaa8ae0e5d95e33)
commit b7ad86ff8a9115147c0cf02af9e80ec464129392
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Sat Sep 27 15:30:10 2008 -0700
Xquartz: xpbproxy: Split out app-specific stuff to app-main.m in prep for making this into a thread.
(cherry picked from commit c2012138a520560f8a2160518ea73fced410c3b7)
commit 5446adebfb085dd05471729bf5c55bf820b1cbe3
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Fri Oct 3 11:12:49 2008 -0700
XQuartz: Send AppleWMReloadPreferences where appropriate.
(cherry picked from commit 490cbe9888e2c1080495b003c429fdb1659444e1)
commit 6020c3fbfe06530cb2b90178d17a7d63beae028a
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Fri Oct 3 11:09:26 2008 -0700
XQuartz: Added a --enable-integrated-xpbproxy configure option for building xpbproxy as an app or as a thread.
(cherry picked from commit 8edc5fb38c922f28659d2f823148339a8907c4d9)
(cherry picked from commit 88033a66a5549870fd053795b019d4c22950425b)
commit 505c216d030a8eb6e9fa757ecebed9597a850c88
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Fri Oct 3 11:11:37 2008 -0700
Added dep on applewmproto 1.1.0
(cherry picked from commit b350b066740a2e72585153e35478538cf1bca9ef)
commit 1c1a6e965da412e767ad8bc15a5362116d64c6b0
Author: Adam Jackson <ajax@redhat.com>
Date: Mon Sep 22 22:09:19 2008 -0400
Remove an utterly, utterly ancient changelog.
Wow.
commit 9c8a2be2c73abf06245b1eb7f05f93e104dcfe42
Author: Peter Hutterer <peter.hutterer@redhat.com>
Date: Thu Oct 2 08:55:14 2008 +0930
dix: fix axis scaling.
For two axes [a, b] and [x, y] (inclusive), the formula to scale point P(ab)
to (x,y) is:
(P - a)/(b - a) * (y - x) + x
And the whole end result rounded of course to get the integer we need.
commit 93ef72fa26b27cf90bf5c64ec19ac295a113aaae
Author: Peter Hutterer <peter.hutterer@redhat.com>
Date: Sun Sep 28 21:47:21 2008 +0930
dix: don't lose subpixel precision when scaling.
Only scale x/y back from screen range if we have crossed screen, otherwise
leave it as it is.
commit 5ef5e89f0e4b9b8820093e072430e295efce32fa
Author: Simon Thum <simon.thum@gmx.de>
Date: Sun Sep 28 22:32:44 2008 +0930
dix: fix non-initialization of pointer accel in master devices.
Init MDs always with PtrAccelNoOp.
Signed-off-by: Peter Hutterer <peter.hutterer@redhat.com>
commit 036d424827726b0c804ae1532109253270744207
Author: Peter Hutterer <peter.hutterer@redhat.com>
Date: Fri Sep 26 17:01:12 2008 +0930
xfree86: don't let DGA steal key events outside of [9,255].
commit 56a24cf894a142b18c7f18e294074c32031f3d14
Author: Adam Jackson <ajax@redhat.com>
Date: Thu Oct 2 17:56:31 2008 -0400
xorg.conf.man: We don't look in root's ~ anymore, don't say we do.
commit 7921c4a0bfc843c772dcb2fc185d4bcab1316330
Author: Adam Jackson <ajax@redhat.com>
Date: Thu Oct 2 17:08:48 2008 -0400
Remove some stale IPv6 debugging
commit f836e1f11b7bf3449c3e469cc7799c4ed28d2356
Author: Adam Jackson <ajax@redhat.com>
Date: Thu Oct 2 17:03:54 2008 -0400
Unifdef ISC
commit b1a31734731a768d586b4cb18317d4a5c5e20fa8
Author: Adam Jackson <ajax@redhat.com>
Date: Thu Oct 2 17:03:21 2008 -0400
Fix bad preprocessor line
commit 00f01f39454001846869496d9124f62c01e5691a
Author: Adam Jackson <ajax@redhat.com>
Date: Thu Oct 2 15:48:18 2008 -0400
Don't inherit XAUTHORITY from the environment.
It's not especially obvious, and unpleasantly overloaded for the Xnest
case. Typically this gives you a server that looks for its auth data in
the authority file you were using for the running X session, which
generally doesn't have an entry for the display you just started.
All the major dm's, and startx, pass -auth explicitly, so this shouldn't
cause too much upheaval.
commit eb8be3e90a9c90a428696026d1e3b2152d7eefb4
Author: George Peter Staplin <gps@Georges-Workstation.local>
Date: Thu Sep 25 14:16:20 2008 -0600
XQuartz: pbproxy: Fix another STRING bug.
Fix the usage of the NSString cStringUsingEncoding: - it doesn't NUL
terminate the string, which lead to a bus error. So, we use
lengthOfBytesUsingEncoding: to get the length in bytes instead of
strlen().
(cherry picked from commit 6333d619e747c3b6bd3ba7557e35c0e5f6daa40f)
commit edfa3f8233fde490cb4255f21473684e96d595a3
Author: George Peter Staplin <gps@Georges-Workstation.local>
Date: Thu Sep 25 12:29:57 2008 -0600
XQuartz: pbproxy: Fix a bug that rxvt brought out in STRING copying. Now I can copy and paste to/from rxvt correctly.
(cherry picked from commit 82a4dc5f0f31a7911ee1cce5d1b162077befa811)
commit 12a59c44cb68843a60fc43257930d1cbeb971b7a
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Wed Sep 24 22:51:03 2008 -0700
XQuartz: Fixed threading issue with TSM.
(cherry picked from commit 93ab4e0071670bb80bfa1170dd97ed9d6d51c67a)
commit ee87c9b02401a7a08b396884ba412a503b078bbd
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Wed Sep 24 18:57:36 2008 -0700
XQuartz: pbproxy: Removed stray SPI include.
(cherry picked from commit 2fb2bc77b804d7b63002c1423cb0bfc658eeee45)
commit 591cc57627a9137159fb5a13287c1d61d8d2fc8c
Author: George Peter Staplin <gps@Georges-Workstation.local>
Date: Tue Sep 23 13:59:25 2008 -0600
XQuartz: pbproxy: Fix 3 paths that could leak memory.
2 of the paths leaked, when INCR transfers were done. Now we
are leak free according to the leaks program for all transfers
I have tried so far.
(cherry picked from commit aa98db576bc02f0765cb35d0282a894ba3778213)
commit 586fbc91df731150ff5e39170efe33f3cfac28a2
Author: George Peter Staplin <gps@Georges-Workstation.local>
Date: Tue Sep 23 12:39:32 2008 -0600
XQuartz: pbproxy: Fix NSObject memory leaks by properly using the
NSAutoreleasePool. Now the usage is consistent. In x_input_run()
we create a pool, and release it after processing the XEvents.
Add some getpid() output to main for debugging. It needs a bit more
testing before the next release.
Don't retain the NSPasteboard as the old code did. That may have
contributed to the leak, and it made it so that we needed the
NSAutoreleasePool created in main().
Remove the _known_types, and _pasteboard instance variables from
the x_selection class. They aren't needed anymore.
The leaks program now indicates 0 leaks after some usage. I want
to test further, but this seems much better, and my memory usage
graph indicates it's not growing.
(cherry picked from commit b245d84a72ee3929546cd11a6eba3c60fb4a4d95)
commit 238999cfc99dbf306184f0e846465a8707bcc9d2
Author: George Peter Staplin <gps@Georges-Workstation.local>
Date: Mon Sep 22 17:36:21 2008 -0600
XQuartz: pbproxy: Add a comment to pbproxy.h about how the DB()
macro causes a leak (according to the leaks program).
Attempt to fix several other leaks with release method calls.
For some reason the process still grows more than it should...
I will need to use some better methods than leaks, and malloc_history
I suspect. Whatever is leaking, it's hard to find. I need to isolate
the cases more.
Add a missing image/jpeg branch.
Remove read_prop_32 - it's not used.
(cherry picked from commit 63a680354dcb545fef935ac97596dd35ceaed960)
commit 106eb37e0214bbd864a59119b491abfc54f32629
Author: Peter Hutterer <peter.hutterer@redhat.com>
Date: Fri Sep 26 13:05:10 2008 +0930
Require inputproto 1.9.99.5
Pull and rebuild your input drivers, while you're at it.
commit fbd09486c6e6c64db28d81caa5ef04821e49f2eb
Author: Peter Hutterer <peter.hutterer@redhat.com>
Date: Tue Sep 23 16:55:04 2008 +0930
Push server-known properties into xserver-properties.h.
commit a2d83b9dc8387ec7e70689db1371cf6500b2f68e
Author: Peter Hutterer <peter.hutterer@redhat.com>
Date: Thu Sep 18 18:21:03 2008 +0930
Xi: add "deletable" flag to properties, add DeleteProperty handler.
A property can only be deleted if any of the following is true:
- if a property is deletable and all handlers return Success.
- if a property is non-deleteable and the all handlers return Success AND the
delete request does not come from a client (i.e. driver or the server).
A client can never delete a non-deletable property.
commit 22e90472681ebc7bdd28f82bbf2753a5b259e931
Author: Peter Hutterer <peter.hutterer@redhat.com>
Date: Thu Sep 18 16:12:02 2008 +0930
Xi: allow Set/GetProperties to return a status, and honour this status code.
If a property handler now bails out, return the error code to the caller. This
allows to be slightly more specific with the errors.
commit 1e24e7b9df3d02350c7ea18e9379e87fe4d00026
Author: Peter Hutterer <peter.hutterer@redhat.com>
Date: Thu Sep 18 15:58:46 2008 +0930
Xi: remove configure/query device property calls.
This removes all the meta-information about device properties (pending,
fromClient, range, valid_values, immutable).
commit feaa5fa6712c8c6f4ca97766e2ac0338253cf3b8
Author: Peter Hutterer <peter.hutterer@redhat.com>
Date: Thu Sep 25 11:03:22 2008 +0930
xfixes: realize the invisible cursor before displaying it.
AllocARGBCursor realizes the cursor but can only do so if we have devices
there already. If we don't - then the cursor needs to be realized elsewhere.
This is usually done in InitializeSprite, but since xfixes just hard-swaps the
(realized) cursor to the InvisibleCursor, we need to manually realize it
before trying to display it.
commit e58be0f3425fb3e946a222077672c3c01308f887
Author: Peter Hutterer <peter.hutterer@redhat.com>
Date: Tue Sep 23 10:01:30 2008 +0930
config: print error code if NIDR fails.
commit 30c3c13f1030268aaa6a3598d538fafd0592d77a
Author: Peter Hutterer <peter.hutterer@redhat.com>
Date: Mon Sep 22 11:10:46 2008 +0930
xkb: squash canonical types into explicit ones on core reconstruction.
If we update key types from core, and groups 2 - n have a canonical type but
the same symbols as the explicit type of group 1, assume that it was a core
sym duplication according to Section 12.4 of the XKB Protocol Spec.
Ignore the canonical types and pretend there's only one group for the key -
with the explicit key type.
The protocol spec does not cover this case, so we have to guess here.
commit ae986d1c73d2f720bd0309d8c33328d14e8eed25
Author: Peter Hutterer <peter.hutterer@redhat.com>
Date: Fri Sep 19 18:27:24 2008 +0930
xkb: fix core keyboard map generation. #14373
According to Section 12.4 of the XKB Protocol Spec, if a key only has a single
group but the keyboard has multiple groups defined, the core description of
the key is a duplication of the single group across all symbols. i.e.
G1L1 G1L2 G1L1 G1L2 G1L3 G1L4 G1L3 G1L4
The previous code generated G1L1 G1L2 G1L3 G1L4 G1L3 G1L4, leading to
"invented" groups when the process is reversed.
Note that this creates wrong key types on reconstruction from core to xkb,
i.e. any single-group key with a key type that is not one of the canonical
four (Sec 12.2.3), will get the assigned type on group 1, and a canonical type
for the other gruops.
X.Org Bug 14373 <http://bugs.freedesktop.org/show_bug.cgi?id=14373>
commit 5bf3f0fd4e00f96cfebd14b58580c3c8733626fb
Author: Dave Airlie <airlied@linux.ie>
Date: Thu Sep 25 15:40:19 2008 +1000
exa: make sure pixmap devPrivate.ptr is NULL at create time
commit 82f150d73cc9a7d8eaf7241a51b03af05bcec159
Author: Ian Romanick <ian.d.romanick@intel.com>
Date: Wed Sep 24 16:56:45 2008 -0700
GLX: Make sure GLX_SGI_make_current_read is enabled when possible
commit 8d9defe8c2a685709318c1d43379443df3d2322a
Author: Adam Jackson <ajax@redhat.com>
Date: Wed Sep 24 10:11:00 2008 -0400
Fix un-suppressing the initial cursor.
The intended behaviour was "show as soon as someone calls
XDefineCursor". What you actually got was, uh, slightly less well
defined, since the screen's ChangeWindowAttributes hook would run after
DIX handled the cursor change. Oops.
The trivial way to turn the cursor on is:
% xsetroot -cursor_name gumby
Refer to /usr/include/X11/cursorfont.h for cursor names.
Thanks to anholt for catching this.
commit a39377cbcbd3091095efbeab25bec18ae520147e
Author: Keith Packard <keithp@keithp.com>
Date: Tue Sep 23 09:22:07 2008 -0700
Revert "Render: Use built-in SHA1 library"
This reverts commit d3bd31fddff7894f89ba80a3cdddff49aff08db8.
X.org should not be providing a custom SHA1 implementation.
commit 10a9bac0257b381367cedff395b40425d584bf59
Author: Keith Packard <keithp@keithp.com>
Date: Tue Sep 23 09:21:37 2008 -0700
Revert "Update COPYING for SHA1 code"
This reverts commit 64387c8573ca8b3909667e32d7a9fba9567b21d3.
X.org should not be providing a custom SHA1 implementation.
commit 64387c8573ca8b3909667e32d7a9fba9567b21d3
Author: Daniel Stone <daniel@fooishbar.org>
Date: Tue Sep 23 19:05:14 2008 +0300
Update COPYING for SHA1 code
commit d3bd31fddff7894f89ba80a3cdddff49aff08db8
Author: John Tapsell <johnflux@gmail.com>
Date: Tue Sep 23 18:56:32 2008 +0300
Render: Use built-in SHA1 library
Getting an external library for SHA1 is a mess, so just use our own,
regrettably. Public domain implementation.
commit 991ed2949ba682684952fe323f8f0f51ebdca98e
Author: Adam Jackson <ajax@redhat.com>
Date: Tue Sep 23 10:22:22 2008 -0400
Rename SaveSetMap() to SaveSetShouldMap().
Avoids preprocessor collision with xfixeswire.h
commit ca9fae00795a114bca4397c32b543d6326a4c547
Author: Owen Taylor <otaylor@redhat.com>
Date: Mon Sep 22 12:42:41 2008 -0700
Change 'remap' to 'map' in saveset functions/macros
Now that the code has been fixed so that Unmap means unmap and not "don't
remap", 'remap' was confusing to have in the function names/parameters, so
change it to simple 'map'.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit ad14239a358cf65e5702ec7d054aa1db4f1cdd68
Author: Adam Jackson <ajax@redhat.com>
Date: Mon Sep 22 11:26:49 2008 -0400
Upgrade GLX Public License 1.0 to FreeB 2.0.
According to the press release:
Previous SGI contributions to the free and open source community
are now available under the new license. These contributions
include the SGI® OpenGL® Sample Implementation, the GLX™ API and
other GLX extensions.
[...]
"SGI has been one of the most ardent commercial supporters of free
and open source software, so it was important to us that we continue
to support the free software development community by releasing our
earlier OpenGL-related contributions under this new license," said
Steve Neuner, director of Linux, SGI. "This license ensures that all
existing user communities will benefit, and their work can proceed
unimpeded. Both Mesa and the X.org Project can continue to utilize
this code in free software distributions of GNU/Linux. Now more than
ever, software previously released by SGI under earlier GLX and SGI
Free Software License B is free."
"The GLX API" is here read to include the original GLX source release
from:
http://www.sgi.com/products/software/opensource/glx/download.html
ftp://ftp.sgi.com/sgi/opengl/glx/glx1_2.1.tgz
which includes glxext.c as included in XFree86, from which our copies
in glx/ and hw/dmx/glxProxy/ are derived.
commit 722c51960dd4948b8a64f8eff115fa69da597ef9
Author: Owen W. Taylor <otaylor@redhat.com>
Date: Mon Sep 22 11:04:26 2008 -0400
Don't remap windows for SaveSetUnmap
Since ReparentWindow() does a unmap/map pair for windows that are already
mapped, for saveset windows with SaveSetUnmap, we must unmap the window
before calling ReparentWindow() to avoid the generation of MapRequest
events, and so forth.
commit 0bb317a78b96fddcdac319c9706b3a12f931ea44
Author: Adam Jackson <ajax@redhat.com>
Date: Mon Sep 22 10:51:51 2008 -0400
Default to -br. Add -retro option for the nostalgic.
-retro also reverts to the classic cursor display behavior, meaning,
the cursor will be visible before anyone calls XDefineCursor().
commit ab17f88506a2dde32c50ff72b03743cd9c384ecc
Author: Julien Cristau <jcristau@debian.org>
Date: Mon Sep 22 01:59:31 2008 +0200
Don't use our version of ffs() if the system has one
commit af0d5e2ef7b1b3f42e3522568c5f56850823c102
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Sat Sep 20 19:41:46 2008 -0700
XQuartz: 64bit crash fix ... don't pass pointers through xe.
(cherry picked from commit 5f1265b82edead8f15f2affc79c2782519502fa2)
commit 852a0b0dde34e7179394d96d09122b99bf7fe904
Author: George Peter Staplin <gps@Georges-Workstation.local>
Date: Sat Sep 20 17:49:16 2008 -0600
XQuartz: pbproxy: Add an X error handler that returns 0.
Move the struct atom_list into the x-selection class, so that it's
no longer a global variable named atoms. This may ease pthread
integration and reduce the chances of symbols conflicting.
(cherry picked from commit c1403c713ca80104ae3736bd2ed1eb6ffa5192b6)
commit 7fa6fc5ad0b12bc52a1c22906709fbb003782d11
Author: George Peter Staplin <gps@Georges-Workstation.local>
Date: Fri Sep 19 21:28:46 2008 -0600
XQuartz: pbproxy: Fix a bug that occured when a PICT format was available.
We may need another branch to convert a PICT to a PNG or JPEG. For now
TIFF works well in all of the test image copying apps when converted to
PNG or JPEG with an NSBitmapImageRep class.
(cherry picked from commit adf339d8f948fc1e308dbcae38fcfce504b5b0ab)
commit f67490ceb5b9ddf25e734cc331705103599f3ed8
Author: George Peter Staplin <gps@Georges-Workstation.local>
Date: Fri Sep 19 14:29:37 2008 -0600
XQuartz: pbproxy: Make the proxy handle copy request races, and PRIMARY
INCR transfers mixed with a CLIPBOARD change.
Fix a bug with some UTF-8 transfers. I can only guess that my UTF-8
tests before were inadequate. I can now copy/paste any characters between
uxterm and Textedit.app.
(cherry picked from commit 7ca1532e8e6e2c733c9c508eee0de73d09ecb947)
commit b666ffd78155db228174041e9d7460b8a07dde0f
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Fri Sep 19 13:15:07 2008 -0700
XQuartz: "Disable" the text when syncing is disabled.
(cherry picked from commit 7713d7ab66e74b212a6c0d634a3ad82373e178db)
commit dba290ec231422740f453b69b187f80df3f50e4b
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Sun Sep 21 17:40:35 2008 -0700
XQuartz: Added a preferences UI for pbproxy options.
(cherry picked from commit d76cca5e1eae86450aa236e49a2024881d0bac01)
commit a928cae57b47625c9e3d136840d3e5d17fd3c51e
Author: George Peter Staplin <gps@Georges-Workstation.local>
Date: Fri Sep 19 00:18:44 2008 -0600
XQuartz: pbproxy: Add a missing include of Xutil.h. Another header
seems to have done this before, but correctness matters.
(cherry picked from commit 1b4987e779d97b90669bac2405a4672085677f7c)
commit 749bdf19b2a50201fddd04207e31122470f435e3
Author: George Peter Staplin <gps@Georges-Workstation.local>
Date: Fri Sep 19 00:02:48 2008 -0600
XQuartz: pbproxy: Add COMPOUND_TEXT handling. Do misc. cleanups with testing
to verify that the behavior didn't change.
main.m: XInternAtom compound_text, and atom_pair.
pbproxy.h: Add compound_text and atom_pair to the struct atom_list.
x-selection.m: Add an #include of Xutil.h. Refactor the reply struct
initialization to be done in a common place. Add send_reply: to simplify
the code a bit more. Add send_compound_text: which handles the
COMPOUND_TEXT type. Add the beginnings of a send_multiple:. Change
handle_image:extension: to handle_image:. The extension: message isn't
needed anymore.
(cherry picked from commit 1e9460abdf5bafe46215966bbef3e796cb1c33e0)
commit 00bfbee59fe3b0c8d1a55d1851206857ca563ece
Author: George Peter Staplin <gps@Georges-Workstation.local>
Date: Thu Sep 18 13:10:41 2008 -0600
XQuartz: pbproxy: pbproxy now responds to selection request events.
We can now copy and paste images to and from X11. Text copying and
pasting works as well.
The NSPasteboard can contain TIFF or PICT images, and pbproxy will
translate to an image/png or image/jpeg request, and list those in the
TARGETS.
I added a description of the basic design at the top of x-selection.m.
I removed the request_data x_selection class struct. It's not needed.
(cherry picked from commit 4a8daf884694c9c420c45d427f1f84e608e7e48f)
commit 811e9f5e9e9c07f4b8fb1e9a4d9df91a2e359221
Author: George Peter Staplin <gps@Georges-Workstation.local>
Date: Wed Sep 17 11:59:36 2008 -0600
XQuartz: pbproxy: Use an NSBitmapImageRep to convert an "image/png" selection
to a TIFFRepresentation for use with NSPasteboard.
This has been tested with the Gimp and works with some minor quartz-wm changes.
The Finder clipboard shows the image updates after an Edit -> Copy.
(cherry picked from commit 12912adaeea759d30f96d8ae51a84fd1659ea0ac)
commit d8d555bac77509248d1145e928a2edf500b326b9
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Wed Sep 17 10:11:00 2008 -0700
XQuartz: Don't enable 8bit visuals in the TrueColor server, since it's not working yet
(cherry picked from commit 1317c8ff94c4bd32617a5398e929f667bd87da58)
commit 23ec8261b6a746cb84e1328284fdc5587bca6faf
Author: George Peter Staplin <gps@Georges-Workstation.local>
Date: Tue Sep 16 21:09:22 2008 -0600
XQuartz: pbproxy: The greedy CLIPBOARD handling now works for text.
This change adds some [self own_clipboard] calls in the necessary places to get the proper greedy behavior.
UTF8_STRING and STRING properties seem to work well now with the test cases (PRIMARY, and CLIPBOARD). I can copy from several different X apps, and have the behavior be correct when pasting. I also verified that quartz-wm isn't doing the copying, by disabling the quartz-wm paths.
(cherry picked from commit 934669f732c28f07b9d934d8f8f0b63ccfebd900)
commit 7c2eb3d41af33d1c52500111d0d34f9aab8a4542
Author: George Peter Staplin <gps@Georges-Workstation.local>
Date: Tue Sep 16 15:21:18 2008 -0600
XQuartz: pbproxy: return the TARGETS list as a 32-bit list to fix a bug that was in the original.
Add TRACE() calls where appropriate to try to figure out why we are losing CLIPBOARD at times, after transferring PRIMARY to the NSPasteboard.
Use the new pbproxy_clipboard_to_pasteboard where appropriate.
(cherry picked from commit 40190675a6c1889cca3574e5d1a9c16ab74315a7)
commit 81c836902dc5b0b83cd95262d48cbc4c81ff3ae2
Author: George Peter Staplin <gps@Georges-Workstation.local>
Date: Mon Sep 15 13:35:46 2008 -0600
Rename reclaim_clipboard to claim_clipboard.
Convert the puts usage to use DB().
Add the initial handle_image method.
Check for nil in the NSString instantiation in various places.
Add some commentary to enhance the clarity of why I did some things.
(cherry picked from commit 37361567b65241eab64e8b30cd9729d0e71a86d2)
commit 85e23affea7bf9aa7615b0292e67f170266d85f8
Author: George Peter Staplin <gps@Georges-Workstation.local>
Date: Mon Sep 15 13:31:19 2008 -0600
Add an image_jpeg Atom.
(cherry picked from commit ea9dc27977c5eab666f2aa2d914e4e28d36758c7)
commit 6b42f40ff9b9ff3e74ccbb2ce5cfad65016934de
Author: George Peter Staplin <gps@Georges-Workstation.local>
Date: Mon Sep 15 13:28:50 2008 -0600
Rename reclaim_clipboard to claim_clipboard.
(cherry picked from commit d333a8e2b5514b8b76a78c6a13a3f5149ea8de27)
commit 2ab56981b1a64138d6c1f9ecfb75655477b3e575
Author: George Peter Staplin <gps@Georges-Workstation.local>
Date: Mon Sep 15 13:27:08 2008 -0600
Add image/jpeg type, and rename reclaim_clipboard to claim_clipboard.
(cherry picked from commit 32b175ef62b68a971784e51e937e358cb10e20ac)
commit cbd32645f7d1054f79ad137a16766da1076c610e
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Mon Sep 15 09:33:55 2008 -0700
XQuartz: pbproxy: Added global variables to customize how pbproxy behaves
(cherry picked from commit 21a2d0b8d03faf1c66ec0c5c11fbd2ab24547727)
commit 5b397642cdc29920245ebe64cc85243cac893e0e
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Sun Sep 14 09:23:17 2008 -0700
XQuartz: pbproxy: First round of updates to pbproxy from George.
(cherry picked from commit 5c8b956f8f3f17e8d577d97cb66424954be72684)
commit dac9e91870f9c787eac97c9d7d0607979c57eb5b
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Sun Sep 21 17:32:24 2008 -0700
mieq: Made custom event handlers safer for nevents >1
commit 8c46505d7d91e0644b19cccc4b342fceb6f86cab
Author: Kim Woelders <kim@woelders.dk>
Date: Mon Sep 22 08:37:29 2008 +0930
xkb: fix use of uninitialized variable.
And some cosmetic changes to use stuff->change consistently.
Signed-off-by: Peter Hutterer <peter.hutterer@redhat.com>
commit 2b266eda6e23d16116f8a8e258192df353970279
Author: Peter Harris <peter.harris@hummingbird.com>
Date: Thu Dec 20 15:58:01 2007 -0500
Fix panoramiX request and reply swapping
Fix panoramiX request and reply swapping
Set window and screen values in panoramix replies
Prevent buffer overrun in ProcPanoramiXGetScreenSize
commit 03ab8f11d25b0ca39a3b37b5350bca4c1028768e
Author: Keith Packard <keithp@keithp.com>
Date: Thu Sep 18 12:17:05 2008 -0700
When resizing a window with redirected descendents, don't expose them
Bit/window gravity computations need to recompute exposures to manage the
bits which are saved by gravity during the resize computation. That's easy
for non-redirected windows where the bits are all within the parent's
pixmap. For redirected windows, we don't need to deal with this at all, so
just skip the whole re-computation adventure.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit d26083fe02658e7312a8da6a5b11652f9fe57bc8
Author: Keith Packard <keithp@keithp.com>
Date: Thu Sep 18 12:14:58 2008 -0700
Switching from Automatic to Manual redirect needs to unmap/remap
When changing a window from automatic redirection to manual redirection, the
parent clip list needs to be recomputed; the easy way to get that computed
right is to unmap/map the window, just as when redirecting the window the
first time.
Thanks to Owen Taylor for helping diagnose this.
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 8bfd88ca61a1747714781a090d1c9dd8f3ad5dfc
Author: Adam Jackson <ajax@redhat.com>
Date: Fri Sep 19 12:13:43 2008 -0400
Revert accidental edid changes from previous commit.
commit 69b79c1a6648f0d04a1b37a728b2e3d76233530f
Author: Adam Jackson <ajax@redhat.com>
Date: Fri Sep 19 12:02:28 2008 -0400
Update to SGI FreeB 2.0.
Under the terms of version 1.1, "once Covered Code has been published
under a particular version of the License, Recipient may, for the
duration of the License, continue to use it under the terms of that
version, or choose to use such Covered Code under the terms of any
subsequent version published by SGI."
FreeB 2.0 license refers to "dates of first publication". They are here
taken to be 1991-2000, as noted in the original license text:
** Original Code. The Original Code is: OpenGL Sample Implementation,
** Version 1.2.1, released January 26, 2000, developed by Silicon Graphics,
** Inc. The Original Code is Copyright (c) 1991-2000 Silicon Graphics, Inc.
** Copyright in any portions created by third parties is as indicated
** elsewhere herein. All Rights Reserved.
Official FreeB 2.0 text:
http://oss.sgi.com/projects/FreeB/SGIFreeSWLicB.2.0.pdf
As always, this code has not been tested for conformance with the OpenGL
specification. OpenGL conformance testing is available from
http://khronos.org/ and is required for use of the OpenGL logo in
product advertising and promotion.
commit cc20112a65d3f641ce0261c86a541f94fae5215c
Author: Peter Hutterer <peter.hutterer@redhat.com>
Date: Fri Sep 19 08:44:04 2008 +0930
Xi: don't include client-side headers.
Spotted by Mikhail Gusarov.
commit e76b5b5e731e2d6c61ff6e6e9b2f42b20ac473d5
Author: Peter Hutterer <peter.hutterer@redhat.com>
Date: Thu Sep 18 14:51:15 2008 +0930
dix: calloc, not malloc, ValuatorClassRec.
For master devices, the ptraccel code could segfault on free since we'd be
dereferencing random memory. Callocing the valuatorClassRec is the easy fix.
commit f789408f7dbfe57a0111e185ac83d1c70f262ba8
Author: Peter Hutterer <peter.hutterer@redhat.com>
Date: Mon Aug 25 14:52:35 2008 +0930
Xi: remove broken SDeviceEnterNotifyEvent, replace with ...Leave...
The event format is the same for both (bar the type), so one is enough.
commit 97b9374a8af5a4cc52f9074feb4ce40cf0b90796
Author: Aaron Plattner <aplattner@nvidia.com>
Date: Wed Sep 17 15:48:56 2008 -0700
Conditionalize Composite-based backing store on pScreen->backingStoreSupport.
(cherry picked from commit 37876602957924c7cff759a800eddd574ee2385a)
commit b4762c0245ed2966606171cf27f40aa745fdc76e
Author: Julien Cristau <jcristau@debian.org>
Date: Tue Sep 16 17:13:42 2008 +0200
exa: disable shared pixmaps
They got re-enabled in ee7c684f21d220d5e046bab31ae617a7d64d60f6
("Reimplement ShmPutImage.")
commit 52bbfc5bfa64fd09ef625f35a2fb4a0518003825
Author: Mikhail Gusarov <dottedmag@dottedmag.net>
Date: Mon Sep 15 10:43:46 2008 -0400
scrnsaver is optional at build time.
commit b6ab114212c0e4c3346ceb5b207f14c526ab81e7
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Fri Sep 12 19:11:53 2008 -0400
Array-index based devPrivates implementation.
Note: DevPrivateKey is now pointer-to-int, which means
each key now needs to point to some global storage of
size at least sizeof(int).
commit 999f3362d50a753c1801d565766219808efdb1a5
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Fri Sep 5 17:32:16 2008 -0700
XQuartz: Dead code removal
(cherry picked from commit 43184cd379c4fb7254391b8a362016cbf89b5529)
commit 6548a55ebdf43231a3c48debf54aa5aa2f1aa956
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Fri Sep 5 17:05:03 2008 -0700
XQuartz: 256 color support
(cherry picked from commit 8dd6d5c825d457f26b41b79d02d57ed4a5ecf1f5)
commit bad7cd14c2021b14971b3f707f927803a053003e
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Fri Sep 5 10:46:36 2008 -0700
XQuartz: Dead code removal
(cherry picked from commit bf10fb0b1f776e72db7c76db11f764e26f9d62c4)
commit 1119fe136f8731f26fc6f50b92f5ddf78f3f83be
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Fri Sep 5 10:46:20 2008 -0700
XQuartz: Changed around fd handoff model to be more robust
(cherry picked from commit 4fe605c2bc62d50e0b5764d9edda245af227630b)
commit 183233b27beb441742a53e440c3389b4ea125b8a
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Fri Sep 12 15:25:44 2008 -0700
XQuartz: Don't warp the pointer on server start for XQuartz
(cherry picked from commit c0da576d4921c246a9ac747921b48ab9e718347f)
commit 7a46dd30d332bc1d42f82b0391e806d3b067ebbd
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Thu Sep 4 09:18:40 2008 -0700
XQuartz: Dead code removal
(cherry picked from commit 2e45344870f5d17181df6407da3448991036d783)
commit 1c70e53f2560cb877c8b149034f296232de67a4e
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Thu Sep 4 08:55:22 2008 -0700
XQuartz: Fixed proximity logic errors for tablets.
(cherry picked from commit d942849f248c368b92ca73e145e8a5bc339112d7)
commit c661c6ae7a9cd981f914484aa4c3007922280def
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Thu Sep 4 08:07:32 2008 -0700
XQuartz: Remove decls of crashtracer strings that we don't use anymore in here
(cherry picked from commit 4a653c6bfd270f2960a8c7e726e7628cfc3c9051)
commit 54162aca404a7de2e560cc2aea01445e14742efe
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Thu Sep 4 05:18:31 2008 -0700
XQuartz: Fixed a crash in RootlessNativeWindowMoved
(cherry picked from commit a16048cec08e173ce42a78a77704f5fdfcb4480f)
commit ce781cac1b52003da6c025cd29e2c2ad97dbb324
Author: Eric Anholt <eric@anholt.net>
Date: Thu Sep 11 16:24:20 2008 -0700
Fix distcheck.
commit 31c62495f1de6e9ba41e1f6d7fa263eeb849129b
Author: Keith Packard <keithp@keithp.com>
Date: Wed Sep 10 13:11:09 2008 +0800
Drop a reference to user mode after create
User mode has no customer when create until assigned
to some output.
commit 079625570d51e41569b73b2fd9237eb8f967f408
Author: Aaron Plattner <aplattner@nvidia.com>
Date: Mon Sep 8 08:50:52 2008 -0700
Bump ABI major versions for the TryClientExceptions change from commit 883811c.
commit 4e004c68283828660f2259a4a4120a84667dcafa
Author: Zhenyu Wang <zhenyu.z.wang@intel.com>
Date: Mon Sep 8 09:16:59 2008 +0800
Revert "randr: fix user mode create initial reference count"
This reverts commit 7c5ca85a9e6d49ab572831b3e0c08bb4cafb395e.
commit 40a9482f8c5b3eac86c221ccce78510e850f4d2b
Author: Jesse Barnes <jbarnes@virtuousgeek.org>
Date: Fri Sep 5 06:09:51 2008 -0700
Add cscope files to .gitignore
commit bf333c2f9833a178887e7bdd7fc338f1e09c387f
Author: John Tapsell <john.tapsell@john-desktop.(none)>
Date: Wed Sep 3 12:20:17 2008 +0100
fbdevhw: Remove pixclock check.
The check can fail because the output from FBIOGET_VSCREENINFO is used to set
Clock in fbdev2xfree_timing(). Then in fbdevHWSetMode(), xfree2fbdev_timing()
is called which sets the pixclock based on Clock. The resulting circle results
in slight rounding errors, causing the comparision check in fbdev_modes_equal
to fail.
commit 47bf269d5922a4998c33908a53ad1affa8de96c0
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Wed Sep 3 12:54:56 2008 -0700
mieq: Fix my broken cherry pick.
commit 1669308be6d4cc6265e5fa8ef47fbf2cbef6f093
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Wed Sep 3 09:23:06 2008 -0700
XQuartz: Added pasteboard proxy code stripped out of quartz-wm.
(cherry picked from commit 1f842c71c35db031a24de646429834d6054adf1d)
(cherry picked from commit 144746223d8dc3f6ff2a0e805aa27a6e57df558a)
commit 46168b3b404164c1f2e7876031e70fb77192fe75
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Wed Sep 3 09:11:25 2008 -0700
XQuartz: Updated Tablet code to include ranges for valuators and added cursor and erasor
(cherry picked from commit 6bca78760951cb5cb57ea66b7631a2dc230dc27a)
(cherry picked from commit fafcafd6de39cf6b5967793f03b30b49db36fec5)
commit 7f5318131ddf86bed5797c0d9641f6ff34f34be0
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Wed Sep 3 03:54:42 2008 -0700
XQuartz: Removed "Done" button from Applications Customization. Now properly save on exit.
(cherry picked from commit 2f1e163d5db6063e54fcaa045ea67c29ce3e46aa)
(cherry picked from commit 7542c00b96461c3474b8c23545171c4b6ddfd29d)
commit 9e70a3cf58c205948f6a415e203d825e9b660d9d
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Wed Sep 3 09:33:39 2008 -0700
mieqProcessInputEvents: Check custom event handlers first.
commit 700e8bf33f9b1c3921de912b8110fadf5e0626da
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Wed Sep 3 02:41:20 2008 -0700
XQuartz: Updated man page
(cherry picked from commit 6932d0d19ea75c64ed38b82a246b68c6bbfb8cec)
(cherry picked from commit 8e3da36b6b0a261975808bc67b5caca733a1a23d)
commit 7430bb9093ea8cf9589d745742c7353e53a144f8
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Wed Sep 3 02:37:09 2008 -0700
XQuartz: Removed dead code (unused option definitions)
(cherry picked from commit 3d74f77490105c0704c0b10dc7a6eb859bf6e985)
(cherry picked from commit c1e5ea9ba058f6a13f564165a3d6862335729630)
commit b3836e5bdd7e2e04e563246d90f385e1b4741baa
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Wed Sep 3 02:36:39 2008 -0700
XQuartz: Cleaned up our sleeping before adding the launchd socket.
(cherry picked from commit ebfe49dfca6e04d66232bad760f522629397cc35)
(cherry picked from commit 2cf74a76d54d795cfc3c0380a526b9177327782d)
commit 7c5ca85a9e6d49ab572831b3e0c08bb4cafb395e
Author: Zhenyu Wang <zhenyu.z.wang@intel.com>
Date: Wed Sep 3 09:41:00 2008 +0800
randr: fix user mode create initial reference count
Don't need extra reference count adding when creating user mode.
This fixes user mode destroy, otherwise we get BadAccess error.
commit 4e1f9f51a9eea115ce2a073824e9c5cef4e2f364
Author: Daniel Drake <dsd@laptop.org>
Date: Tue Sep 2 16:20:40 2008 -0400
Don't try to destroy a NULL pixmap.
commit 613ce0955032fb032de0a3940752828d314f057a
Author: Adam Jackson <ajax@redhat.com>
Date: Tue Sep 2 15:43:15 2008 -0400
Fix strict-aliasing silliness in XAA.
commit b5cdcfa55c399e83d51242e93d4f25d8bc4fec1f
Author: Julien Cristau <jcristau@debian.org>
Date: Mon Sep 1 19:45:30 2008 +0200
Xevie: swap replies as necessary
commit d3ae193f4ac87530f2745f8cb5e7b70dd516881e
Author: Thorvald Natvig <slicer@users.sourceforge.net>
Date: Mon Sep 1 19:36:56 2008 +0200
Xevie: always initialize rep.length (bug#17394)
The XEvIE extension doesn't clear the rep.length field for any reply but
the version check. Hence, if there is junk data in it and that is sent
to the client, it hangs.
X.Org bug#17394 (http://bugs.freedesktop.org/show_bug.cgi?id=17394)
commit 0466b8811ce8ebc1d993f177cbb7a22e997640f1
Author: Dave Airlie <airlied@redhat.com>
Date: Mon Sep 1 09:57:25 2008 +1000
exa: drop cw.h inclusion
this doesn't seem to be needed, at least I can't see any warning without it.
I'd like to build EXA into a driver and cw.h isn't exported
commit 881bd15f445bb62c3fdea863c968c95217408b6e
Author: Maarten Maathuis <madman2003@gmail.com>
Date: Sun Aug 31 18:07:22 2008 +0200
xf86Crtc: Set mode to NULL, so nothing bad happens if crtc == NULL.
- Fix is courtesy of math_b.
commit f4e9a1a98f97155de62908309e87c10487125926
Author: Maarten Maathuis <madman2003@gmail.com>
Date: Sun Aug 31 17:45:08 2008 +0200
damage: choose less ambiguous function names
commit 0cd6709db5febbe7fbd073e429421fcd81041e08
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Sat Aug 30 16:13:58 2008 -0700
XQuartz: Fixed editing of Applications menu
(cherry picked from commit da647f1add4c1ae7854c0fbfbf972666ce5d12c8)
commit c4d290fc54542ccba7c3a46bc75b0c3322d0ca48
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Sat Aug 30 14:19:47 2008 -0700
XQuartz: Fixed missing symbol in quartzKeyboard debugging
(cherry picked from commit 8ad55e484f0ba9073ce07a03de660cc546a7b668)
commit 5d7d959b1143979c3445639c9d108e02da0c1475
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Sat Aug 30 14:18:07 2008 -0700
XQuartz: Don't even build with GLX support since swrast now depends on libdrm
(cherry picked from commit 3739525d57dff2b3b034b5768f357b1c25577909)
commit 45def7f0a342f4733cafb06adbfed14932f0e01b
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Fri Aug 29 22:16:03 2008 -0700
Removed dead glcontextmodes
(cherry picked from commit c6d0ac7471209d835e8d9a25adcbda893ddfa1cb)
commit d01c5ca7935a8340a3cd68c325da6dfec005c952
Author: Matthieu Herrb <matthieu.herrb@laas.fr>
Date: Sat Aug 30 15:35:32 2008 +0200
Xserver.man: Typo (the the).
commit 229e60db8f95232afc8cdcb7cd0572d117c84b90
Author: Thomas Bodzar <Thomas.Bodzar@quest.com>
Date: Sat Aug 30 15:34:29 2008 +0200
Xorg.man: typo (the the).
commit 1885582444fb06da73dea1f118a777bea26e1dc1
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Fri Aug 29 21:18:26 2008 -0700
XQuartz: Placate automake which doesn't like escaped newlines even in comments...
(cherry picked from commit 73db1170129a31ad2d55a7e83ac6dfc8030e47f1)
commit 8abcc12fdd5bd9edc0288a1ab8f75e65ffcb8c71
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Fri Aug 29 20:55:25 2008 -0700
XQuartz: Added debugging output to the crash log to help track down two crashes, since people don't often report their system.log spew.
(cherry picked from commit aaf0f71db197526b6b866cc1b39fbdfe051879ef)
commit aee19c7b5542aa147b89b1ae8340e9931d81729f
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Fri Aug 29 03:54:55 2008 -0700
XQuartz: xp_is_symbolic_hotkey_event catches the input menu, but not our mainMenu, so we still need to do that the old way.
(cherry picked from commit 25eccf12c89d73b8bce2c9be14841efb230acedc)
commit 974db58f5b730c3770ee461665a02dd4334d1dea
Author: Maarten Maathuis <madman2003@gmail.com>
Date: Sat Aug 30 00:37:11 2008 +0200
damage: initial attempt at a damage marker mechanism
- This should allow drivers to recieve post submission events for X<->opengl synchronisation.
- Lacking a testcase, i'm open to suggestion how to do it better.
- The idea is:
- driver recieves event
- driver creates personal identification and inserts marker into X fifo.
- when something wants to use an X pixmap, it checks if something is pending.
- If so, it synchronizes the 2nd fifo using the initial identification.
- Driver is not required to use interrupt based systems (price too high).
- Lower latency is ofcource better.
- If this is somehow unusable for you, then come up with improvements.
- For that reason i wouldn't consider the api fixed for the moment.
commit 454cb0802eec3c2c2cdbcc17971bced868462b83
Author: Maarten Maathuis <madman2003@gmail.com>
Date: Fri Aug 29 22:28:02 2008 +0200
damage: DamageReportRawRegion should set pDamage->damage
- I found no evidence in the protocol, that it should be differently from all the other modes.
- It seems to have been like this from day 1.
- If anyone has evidence to the contrary, please enlighten me.
commit ae6ca434104405302f30a58bde8738d9579d9dc9
Author: Maarten Maathuis <madman2003@gmail.com>
Date: Fri Aug 29 22:21:54 2008 +0200
damage: internal functions start with a non-capital letter
commit 1861250cd7e84b05e8298b74e3c7e97da72ddfba
Author: Maarten Maathuis <madman2003@gmail.com>
Date: Fri Aug 29 22:15:23 2008 +0200
{damage,exa}: sanitise damage
- Redo damage naming for more consistency.
- Call post submission functions only where appropriate.
- EXA can now live without it's odd damage workarounds.
commit 5af77d43fe812e127d5d335527fa940ab9d95f38
Author: Kristian Høgsberg <krh@redhat.com>
Date: Mon Aug 11 16:59:17 2008 -0400
DRI2: Drop sarea use, implement server side swap buffers.
commit 60ad8d5d05485339e89d7f1f9f1ded75de7c7ea1
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Thu Aug 28 23:45:17 2008 -0400
Attempt getpeercon() on remote sockets as well as local ones.
commit ebea78cdba0ff14a397239ee1936bd254c181e1b
Author: Tomas Carnecky <tom@dbservice.com>
Date: Thu Aug 28 18:05:40 2008 -0400
Prepare for array-index based devPrivates.
TODO: static indices can be made just an int; some indices
can be combined.
commit ec7907f8fa04dcff2649cc4846975844314f737e
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Wed Aug 27 19:27:13 2008 -0400
Add an array of integers for use as per-screen cursor private keys.
Replaces the use of the screen pointer itself as the key, which was
nice but won't work now that an array index is being stored.
commit 86898491497a43814caf42013651086e62fe6162
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Wed Aug 27 19:17:15 2008 -0400
Remove unused GetGlyphPrivatesForScreen.
commit 90b178cc7feda1f9c4995b98364739e71233fff3
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Thu Aug 28 19:36:22 2008 -0400
Don't need to request space for Xnest pixmap private.
commit 835b532d6f51d08998d7ab49fcb41db8266487ce
Author: Adam Jackson <ajax@redhat.com>
Date: Thu Aug 28 14:49:35 2008 -0400
Build fix.
commit 040212ee60af9d043c4c3f98bba5120c3b8e33f7
Author: Adam Jackson <ajax@redhat.com>
Date: Thu Aug 28 13:49:35 2008 -0400
MIT-SHM pixmaps, if they exist, are ZPixmap.
commit ee7c684f21d220d5e046bab31ae617a7d64d60f6
Author: Adam Jackson <ajax@redhat.com>
Date: Wed Aug 27 16:05:47 2008 -0400
Reimplement ShmPutImage.
There's no reason to not just dispatch this straight into the GC. As a
bonus, if you do so, damage wraps correctly, and thus swcursor works.
The side effect is it's no longer possible to override ShmPutImage with
ShmRegisterFuncs().
Also remove the (broken) damage tracking for same from EXA, since it didn't
work right, and is now superfluous.
commit 2db1afbf2e56d8743c701d81a5797001ce9e5c52
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Tue Aug 26 23:09:20 2008 -0700
XQuartz: Always use TIS for the keyboard layout seed since KB* aren't thread safe.
(cherry picked from commit c8244177b0dbcb28d2f5509e6f2a3e8057889790)
commit 319405fa4a530804c19fb7d0fcece5c912e41c9d
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Tue Aug 26 21:11:35 2008 -0700
XQuartz: Fixed needed xplugin version. ><
(cherry picked from commit 01b3a99dff79e0d2b316e02658c19fa79d9144ae)
commit 3350770bd6d90fefa1133ac738c1d4eae2d568a6
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Tue Aug 26 19:13:56 2008 -0700
XQuartz: Use new Xplugin API to determine if a keypress event corresponds to an OS-X hotkey that we should dispatch to Appkit.
(cherry picked from commit e7658e745f8a3eaf5cec9f54a8a1b7e5a7708e09)
commit 7930ea9116f232a3762f0085e5ca65e06d1142fc
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Mon Aug 25 22:10:46 2008 -0700
XQuartz: Made a note to come back to the xinitrc race condition in the 1.5 branch when we move up to it.
(cherry picked from commit 54a882dcbdccef3f3eb4e6398e13c88185a8986c)
commit dc1171df5baa0c4aa366ff2b07af5b8eb44dae12
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Fri Aug 22 01:12:37 2008 -0700
XQuartz: Fixed bogus args to debug ErrorF
(cherry picked from commit f0351c2b80f30ae31f041798b84139141fc3d5a5)
commit ac936525afe46bad329387232f8d48e77f6a4175
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Fri Aug 22 01:11:33 2008 -0700
XQuartz: Cleaned up mouse event translation a bit more.
(cherry picked from commit c286f2a718fdaf6ad10249b59abb20731da8d904)
commit 1b42f550001c11c93d5a2144df98a5c687c010c2
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Fri Aug 22 00:45:12 2008 -0700
Xquartz: Added missing ev_type for NSTabletPoint event.
(cherry picked from commit 07548f13947a212dcc020d52fe0ad679255121e2)
commit 13a89f19208cf998808ff2896b7711310768f94c
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Wed Aug 20 10:21:23 2008 -0700
XQuartz: Added more explanation to debug keylayout spew to cut down on report-spam.
(cherry picked from commit fcdc9f8b5abd724d75f53d48fdadbed9859e9e79)
commit dd1e54d6eed0bce289517b3cb95e6b1a187ca6e0
Author: Maarten Maathuis <madman2003@gmail.com>
Date: Tue Aug 26 20:02:55 2008 +0200
exa: fix thinko from 988725f32e082aee9392a71464125157a83d1e67
- the drawable of the pixmap is not the same as the original drawable (possibly a DRAWABLE_WINDOW)
commit 7c14fdbacfcd2f4d56a346e6c72e44e4ba9909c1
Author: Maarten Maathuis <madman2003@gmail.com>
Date: Tue Aug 26 17:21:43 2008 +0200
exa: some minor cleanup
- Fix compile warning
- Order exa.h by source file that exports the function.
- Move the function i created earlier to private headers.
commit de79edbd9f67762950eaac2dc79668035239897c
Author: Maarten Maathuis <madman2003@gmail.com>
Date: Tue Aug 26 17:03:12 2008 +0200
exa: report damage manually for exa{Trapezoids,Triangles} when needed
- Plus a micro cleanup of unused variables.
commit 988725f32e082aee9392a71464125157a83d1e67
Author: Maarten Maathuis <madman2003@gmail.com>
Date: Tue Aug 26 16:54:29 2008 +0200
exa: move destination damage for internal calls to a special function
- This should improve clarity for someone who isn't familiar with the code.
commit ce193476808f54d946351458361c62132d81b62f
Author: Maarten Maathuis <madman2003@gmail.com>
Date: Tue Aug 26 13:18:58 2008 +0200
exa_glyphs: remove useless offset
commit fd94651fc3a6f49ec153ffb823b86c1d125bb298
Author: Kristian Høgsberg <krh@redhat.com>
Date: Tue Aug 26 10:58:35 2008 -0400
Fix driGetConfigAttribIndex unaligned access to GLboolean.
We don't actually send the float mode so just drop it. Drop a couple of
other unused or redundant fields from GLXconfig.
commit 41bd8d5dfe27d5c91fe7e4cdba1475a2a0741b1c
Author: Adam Jackson <ajax@redhat.com>
Date: Mon Aug 25 11:27:26 2008 -0400
EDID: Build fix.
commit 76ed409acd772f2c041239345c6dc64cbef0e5b2
Author: Adam Jackson <ajax@redhat.com>
Date: Mon Aug 25 10:44:45 2008 -0400
EDID: Publish the whole block on the root window if we've got it.
commit 5724f7fb5bea6fa1a354c64c0972c53d70e2f27b
Author: Adam Jackson <ajax@redhat.com>
Date: Mon Aug 25 10:39:36 2008 -0400
EDID: Publish the whole block in the RANDR property if we've got it.
commit 668f89eba3e8f9da7843f5cb350f8dc1e5d7efbe
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Fri Aug 22 10:32:18 2008 -0700
Remove unnecessary #ifdef __SOL8__'s
commit cc78d977cac74fcfb7c9b27e7109a1e369018dd8
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Fri Aug 22 10:14:11 2008 -0700
Convert Solaris #ifdef's for <sys/kd.h> to AC_CHECK_HEADERS check
Upcoming virtual terminal support changes in Solaris kernel will provide
<sys/kd.h> on SPARC too, so this gets us ready for them.
commit 95b466e457542bfe08b0ed2bbb5db8d28a961cfd
Author: Peter Hutterer <peter.hutterer@redhat.com>
Date: Thu Aug 21 17:24:40 2008 +0930
Xi: don't include .c files.
commit c696da75c7326c5e1f1cd48292c0519ddc22e11b
Author: Peter Hutterer <peter.hutterer@redhat.com>
Date: Thu Aug 21 17:23:11 2008 +0930
Xi: swap devices property replies.
commit 01264f17925005969c3b71ca945fc1014bcd8c8e
Author: Julien Cristau <jcristau@debian.org>
Date: Thu Aug 21 01:32:03 2008 +0200
Add swapped dispatch for randr 1.2 requests
commit e02f864fdf19a5ab1682336be343c57fdb69ef43
Author: Adam Jackson <ajax@redhat.com>
Date: Wed Aug 20 13:24:03 2008 -0400
Suppress cursor display until the first XDefineCursor() request.
Yes, this means the server will start without showing a cursor. Pretty
much any application that wants to interact with the mouse will define
cursors, so this essentially just delays showing it until gdm (or
whatever) loads.
commit 64ef7ed072007b1d0b4de5ff1e5eababa418c794
Author: Adam Jackson <ajax@redhat.com>
Date: Wed Aug 20 13:14:03 2008 -0400
Centralize declaration of ConnectionInfo.
commit f1f44940f10b0209946ec0f08104a372d7d945a0
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Wed Aug 20 09:50:54 2008 -0700
XQuartz: Support windowItemModMask=0 or -1 to disable window shortcuts.
(cherry picked from commit 81187364e512606a6aebb95ab2967d9d420f57f2)
(cherry picked from commit f2ec79e4a159dec6481691e4dd615db01770dd7a)
commit 6c5612c2e1df1e89388ffff97251f5328558f8e8
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Wed Aug 20 09:21:44 2008 -0700
XQuartz: Added window_item_modifiers defaults item (and option to localization) to change the modifier keys used for the windows menu.
(cherry picked from commit e4110861d307a55d9032cb83cf024ec1f294e8d7)
(cherry picked from commit fcfc05482a88696cb713c7a2ddfcf935ae8378a6)
commit bdc277c9b3dc6b3b95f74b20a49ce163c5fae980
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Wed Aug 20 09:58:48 2008 -0700
XQuartz: Just cleaned up formatting of event processing code... no "meat" changed...
(cherry picked from commit 745bc8ab387d6794f47d8b9dca33b4c81f6dd39c)
(cherry picked from commit a28a2be52478a1557a363140f7bd70ececf144dc)
commit ed42108920cc695b96ed57bf9dcfea1470e74669
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Tue Aug 19 02:02:11 2008 -0700
XQuartz: Added appkit_modifiers defaults option which users can set to 'rcommand' to get access to the input menu with right command
(cherry picked from commit 02af74d7a5a7225f408915254c40856159dc7f19)
(cherry picked from commit 2da32894dff8340f6ca7c980277fca7ec835a193)
commit be06961312e2111778bfd97b2c8a927acc61f43d
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Wed Aug 20 09:56:06 2008 -0700
XQuartz: More input fixes
stuck-modifier fixes (capslock)
3button-emulation now doesn't send the modifier key with the click
Added other options to fake_button2 and fake_button3 defaults options:
({l,r}{control,alt,command,shift})
(cherry picked from commit 8fb6a1cf44c35a20dfb0c05c9824f94898f88da7)
(cherry picked from commit ae9c1b3cfb3874b4d1251681c24bda91c398bcab)
commit 436b659091dd17bb3e316377ba31f5d2a5dfa12e
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Thu Aug 14 09:34:12 2008 -0700
XQuartz: Updated bundle version to 2.3.1
(cherry picked from commit eedecba0b882bb07931e8d9168589f5be7a08a69)
(cherry picked from commit 7d9d864461858b25c5eb5858fdf4b53771795f11)
commit bc4cef1d0ae7cbb8f5fe16d576db45abd4330370
Author: Maarten Maathuis <madman2003@gmail.com>
Date: Mon Aug 18 16:28:33 2008 +0200
exa: remove useless cache{X,Y}off from UploadToScreen() arguments.
commit 38bdc34d555f956a1ff1e1bb8eef95e3ba2bac64
Author: Adam Jackson <ajax@redhat.com>
Date: Tue Aug 19 15:12:39 2008 -0400
Remove redundant check.
commit 47b31233c26f710be70ffcca17e5402d03d5733f
Author: Adam Jackson <ajax@redhat.com>
Date: Tue Aug 19 15:10:12 2008 -0400
Simplify driver setup.
No point warning about missing driver hooks, that just means the person
who gave you the driver is inept. Might as well just crash. Also,
just name anonymous screens as screen%d instead of failing after the 36th
screen. Bonus points if you can figure out what the failure mode would
be on the 36th screen, and what the effective screen limit was.
commit b99fc65b53769400821a2bd8f691ece35a5b8847
Author: Adam Jackson <ajax@redhat.com>
Date: Tue Aug 19 15:06:53 2008 -0400
Simplify calling xf86EnableIO() a bit.
commit b1f2c7a89ace1f6e5750783f3c43c4c5a6d24374
Author: Adam Jackson <ajax@redhat.com>
Date: Tue Aug 19 15:06:11 2008 -0400
The ->Identify hook is not mandatory.
Best comment ever though. Mad props.
commit af5125968a738ec8f496d04eb65acb7c8f812115
Author: Adam Jackson <ajax@redhat.com>
Date: Tue Aug 19 14:47:10 2008 -0400
Refactor misprite a bit.
No variable declarations in header files, please.
commit 41b68e0dea9305d66bca2fc4ad96db01f5342c6d
Author: Adam Jackson <ajax@redhat.com>
Date: Tue Aug 19 11:02:31 2008 -0400
Remove unused -co option.
What did this even do anyway?
commit 1f416fba994ed7a7e072a9f0a86b515855ea3bac
Author: Adam Jackson <ajax@redhat.com>
Date: Tue Aug 19 10:56:45 2008 -0400
Remove unused -bestRefresh option.
commit 5a72c45d42abc7227c6cf3d14fd7043ea7527c54
Author: Adam Jackson <ajax@redhat.com>
Date: Tue Aug 19 10:54:11 2008 -0400
Remove unused -showunresolved option
commit 9f08ffc557b52e2e8cd54fb692b66700c83d61c6
Author: Adam Jackson <ajax@redhat.com>
Date: Tue Aug 19 10:29:23 2008 -0400
Remove unused xf86Info.pMouse
commit f227fbf74f0c619ecf3275cdb4c10b1a4b3a8cfc
Author: Michel Dänzer <michel@tungstengraphics.com>
Date: Tue Aug 19 11:36:12 2008 +0200
EXA: Inline Prepare/FinishAccessWindow into only caller, ChangeWindowAttributes.
Also check the requested mask in addition to the GC state before doing work.
commit 825b3fe11d1b813bf8d5b24a880ed04b78ae1acf
Author: Michel Dänzer <michel@tungstengraphics.com>
Date: Tue Aug 19 11:22:40 2008 +0200
EXA: Don't use exaGlyphs if the driver doesn't provide a PrepareComposite hook.
It's buggy without Composite acceleration (leading to cropped glyphs) and not
really useful in that case anyway. The bug probably still needs to be found and
fixed for drivers that provide a PrepareComposite hook but can't accelerate
text rendering though.
commit 75e495a4cd823b6fa42a8d167ecc9f4723320dea
Author: Adam Jackson <ajax@redhat.com>
Date: Mon Aug 18 17:58:08 2008 -0400
Remove unused xf86Info.mouseLocal
commit b3dfd7e3e4deef21b40c885f8e7eae34b55888b2
Author: Adam Jackson <ajax@redhat.com>
Date: Mon Aug 18 17:56:18 2008 -0400
Remove unused xf86Info.sharedMonitor
commit 5e43cd28692bc05cac80f38b47104a26c0524385
Author: Adam Jackson <ajax@redhat.com>
Date: Mon Aug 18 17:46:42 2008 -0400
Remove the remainder of grab deactivation and closedown.
commit cd1e8f26147919227e7624ac4c6b313d972a4d35
Author: Adam Jackson <ajax@redhat.com>
Date: Mon Aug 18 17:40:46 2008 -0400
Remove unused EstimateSizesAggressively option.
commit faaf0046155abbd15415d5a6b62ead4f58935c28
Author: Mathieu Bérard <mathieu.berard@crans.org>
Date: Mon Aug 18 17:23:26 2008 -0400
Remove xaaTEGlyphBlt.S
Should have been removed in 593144dddd977f53bcd1a115f9544eeece46df4c but
ajax was asleep at the wheel.
commit 562462e78dd6a5e2ed5b36aa22be52f31d55485d
Author: Mathieu Bérard <mathieu.berard@crans.org>
Date: Mon Aug 18 17:05:24 2008 -0400
Remove dead {bsd,lnx}Resource.c
commit e3e47b35e369bf4abb0fe15865acca0b34600b1f
Author: Adam Jackson <ajax@redhat.com>
Date: Mon Aug 18 17:03:22 2008 -0400
Remove MAX_PCI_{BUSES,DOMAINS} and some associated #if 0.
commit 593144dddd977f53bcd1a115f9544eeece46df4c
Author: Mathieu Bérard <mathieu.berard@crans.org>
Date: Mon Aug 18 16:46:36 2008 -0400
Remove some unused assembly code and assyntax.h
commit 2d3e478384ef8af2a760f39792e35e4a6174c967
Author: Adam Jackson <ajax@redhat.com>
Date: Mon Aug 18 15:09:44 2008 -0400
int10: Fix int1A for %ax == 0xB101.
pciNumBuses was pretty much always 1 post-pciaccess. That ain't good.
commit 539717fe1f08a000d1eef9f345d24cb49e3663b5
Author: Adam Jackson <ajax@redhat.com>
Date: Mon Aug 18 14:50:33 2008 -0400
Remove (unused) pciMaxBusNum.
commit 3c03d9f1efbbacec6e8be58da99bf0977a8e0fec
Author: Adam Jackson <ajax@redhat.com>
Date: Mon Aug 18 14:37:42 2008 -0400
Remove sparcPci.c
There is no way this code can have been building for anyone since pciaccess
was merged. BSD and Linux were already using OS code on sparc, the only
people who could want this are Solaris, who should be using pciaccess
anyway.
commit 9a39b6cfbda306eb594e87ce828afa01cd7aa01e
Author: Adam Jackson <ajax@redhat.com>
Date: Mon Aug 18 14:26:01 2008 -0400
Remove XF86SCANPCI_WRAPPER.
commit 470b05a610e641094d46742393684acd786d78a8
Author: Adam Jackson <ajax@redhat.com>
Date: Mon Aug 18 14:03:36 2008 -0400
Remove vestigial MAX_PCI_DEVICES.
commit 244a635fcdc9e0a7212d51b26d74f49d8e1b071f
Author: Fredrik Höglund <fredrik@kde.org>
Date: Mon Aug 18 19:27:34 2008 +0200
Fix the tile offset in miPaintWindow for ParentRelative windows.
commit fdf7c747a8e1bc59dfb31b7f90dd5eab2687315b
Author: Adam Jackson <ajax@redhat.com>
Date: Mon Aug 18 13:13:03 2008 -0400
Remove PciProbeType and associated weirdness.
This code was effectively only used in ix86Pci.c to select PCI config
access type. Nobody should be using that path anymore, in the glorious
pciaccess world; kernel services should get it right for you.
commit 95bb6f53624a3e6f4d62a2f789982c5544d2fc70
Author: Mathieu Bérard <mathieu.berard@crans.org>
Date: Mon Aug 18 11:47:19 2008 -0400
Remove ancient unused inline hack.
commit e1ae8db625b5e8c298a557592ef23656b3da4886
Author: Adam Jackson <ajax@redhat.com>
Date: Mon Aug 18 09:53:48 2008 -0400
Drop dead PowerPC PCI code.
Also add a warning for anyone still using legacy PCI code.
commit 99583b43a9a202d047ff417d47485e4c0e0c9670
Author: Jie Luo <clotho67@gmail.com>
Date: Sun Aug 17 23:13:22 2008 +0200
glx: avoid possible NULLptr deref, fix #16884
commit 421b7e8f12083e9518fa7deda968a2f73c9a0006
Author: Maarten Maathuis <madman2003@gmail.com>
Date: Sun Aug 17 19:57:02 2008 +0200
exa: fix assert logic thinko from 361a9eb953aaa38f8ebc057185de29e50f9eef26
- I guess failing PrepareAccess is rare, since this a 3 year old bug.
commit 1e62e773273539352bc21b2da5262678dd3fc7df
Author: Peter Hutterer <peter.hutterer@redhat.com>
Date: Fri Aug 15 15:19:44 2008 +0930
Require inputproto 1.9.99.4
commit 609c04b62bdb0e86f33860069033c7142eecf210
Author: Peter Hutterer <peter.hutterer@redhat.com>
Date: Fri Aug 15 14:51:59 2008 +0930
dix: stick a warning in about loss of subpixel precision.
commit de1573172ad2c2e98c101727930a468213295783
Author: Peter Hutterer <peter.hutterer@redhat.com>
Date: Wed Aug 13 13:11:44 2008 +0930
Backport device properties to XI 1.5 instead of XI 2.0
commit 8b9ed7dec2954d4890ddcc7c874fc0832b16495a
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Thu Aug 14 09:08:14 2008 -0700
XQuartz: Fixed a stuck modifier key bug.
(cherry picked from commit eeb6e5a9e98dcf045ec230f160d5992080dceba6)
commit 1770c85374883229ec5e9685229b2333e62705e6
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Thu Aug 14 07:32:37 2008 -0700
XQuartz: Made 3-button mouse simulation a little more consistent.
(cherry picked from commit d207b037d2ae213369e5627a17d8831c9bc16ad8)
commit f51f77d25e69b51fa3fd557ffdb5573b61759706
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Wed Aug 13 19:09:05 2008 -0700
XQuartz: Reverted "Control" text to be accurately "Command" in the input prefs.
(cherry picked from commit b287c481e1cbe77ff84d10a708505f148a0c8434)
commit 04956b80431169e0ae713a3e6ba4cdc157ce3a66
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Sat Aug 9 10:07:32 2008 -0700
Transport/Apple: Add TRANS_NOXAUTH to incoming connections when the listener is flagged as such
(cherry picked from commit ba4a7924261070ad0aff7211b7a1c9581fad4646)
commit e6813e8de65eee854bbffe6ab0f8ba158f43b10b
Author: Peter Hutterer <peter.hutterer@redhat.com>
Date: Wed Aug 13 14:24:45 2008 +0930
Xi: byte-swap device property requests.
commit 0ce687634fa5e0d955e896a0d0d5f584a4cfd1a4
Author: Adam Jackson <ajax@redhat.com>
Date: Wed Aug 13 17:28:08 2008 -0400
Eviscerate save-under support.
Use a compositing manager already. Plus I really wanted to use 'eviscerate'
in a commit message.
commit f456f32cd97684052cab4712e7f4c827132c554b
Author: Adam Jackson <ajax@redhat.com>
Date: Wed Aug 13 16:21:28 2008 -0400
Build fix.
commit c1e9b7dc6f4600fe6c301aecd7d67461cb884df0
Author: Adam Jackson <ajax@redhat.com>
Date: Wed Aug 13 14:13:55 2008 -0400
Sledgehammer off the DRI2 build system.
commit 544bfd06663ff71bc5275459cf74a3557530544f
Author: Adam Jackson <ajax@redhat.com>
Date: Wed Aug 13 11:09:54 2008 -0400
Remove xf86Version.h and related API.
We haven't meaningfully been API-compatible with xf86 modules in ages,
let's stop pretending.
commit 139c3ab7b754dc425a09d5f7b6d2a8fb2b88138a
Author: Peter Hutterer <peter.hutterer@redhat.com>
Date: Tue Aug 12 17:49:49 2008 +0930
Xi: return the state from the correct keyboard in QueryDevicePointer.
commit 998375f4154b000f75b2bafd4e276c0237d24dc7
Author: Peter Hutterer <peter.hutterer@redhat.com>
Date: Tue Aug 12 17:49:16 2008 +0930
dix: remove superfluous check.
commit 9f9268821b13038556fbc029df54ab0e9b2aa77f
Author: Mathieu Bérard <mathieu.berard@crans.org>
Date: Mon Aug 11 13:52:38 2008 -0400
The smart scheduler is not optional.
commit 2e2ce817ce404a5e000c9750fa96f656fed370b8
Author: Matthieu Herrb <matthieu.herrb@laas.fr>
Date: Sun Aug 10 23:07:46 2008 +0200
Move strcasecmp(), strcasencmp() and strcasestr() prototypes to os.h
And make sure os.h is included in files that use it.
commit 02efa78ce2da470b252289ff2af598d06bc84ece
Author: Matthieu Herrb <matthieu.herrb@laas.fr>
Date: Sun Aug 10 18:29:35 2008 +0200
add libXinerama to the list of dependencies.
Now that panoramiXext.h is installed bt libXinerama, it becomes required
to build Xext.
commit be2210b69defa225d8bc4bb90d94bfd740ef8b1f
Author: Matthieu Herrb <matthieu.herrb@laas.fr>
Date: Sat Aug 9 23:43:50 2008 +0200
remove OpenBSD/amd64 specific mtrr API.
The old code never worked anyways and was removed from OpenBSD.
OpenBSD/amd64 4.4 and later support mtrr with the same API as
OpenBSD/i386.
commit 6e33e6f355f7f04e77a165eb67b1414724c1fba3
Author: Matthieu Herrb <matthieu.herrb@laas.fr>
Date: Sat Aug 9 23:43:03 2008 +0200
Move string comparaison functions to from dix/ to os/.
commit 5968634996c08656a0c5e2fa35705cf7afac87e6
Author: Dave Miller <davem@davemloft.net>
Date: Sat Aug 9 16:45:59 2008 +1000
glx: fix crash in driGetConfigAttribIndex
Don't access GLboolean via int pointers
commit 4212599c922373a224d2235c74672a3a3aa8e0b1
Author: Michel Dänzer <michel@tungstengraphics.com>
Date: Fri Aug 8 12:17:58 2008 +0200
EXA: Make sure damage tracking code is inactive if the driver manages pixmaps.
It was always supposed to be like that... It was only recently pointed out (in
a rather convoluted way) that it was not in fact the case.
commit 073116cc44859e96374cde46325df8540621d5ee
Author: Michel Dänzer <michel@tungstengraphics.com>
Date: Fri Aug 8 12:15:27 2008 +0200
Remove commented out lines that make automake 1.9 puke.
commit 666781cd9b62207e45eebd3eb55a930f3a345f72
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Fri Aug 8 01:41:28 2008 -0700
Removed rogue #include
(cherry picked from commit af238e99da45a4dd8d8cbb6564bb8d0a3d79d590)
commit 4a0947bf06deacc3ae716730cfbbbeda1311bae3
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Fri Aug 8 01:53:36 2008 -0700
XQuartz: Disable the Xquartz AIGLX for now since it doesn't even compile any more...
(cherry picked from commit 4545ba91e9d6ad62b6cafde3c73a672d3ded91a2)
commit 5accc9b3ce1af539150d59b1800b66783fd3e947
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Fri Aug 8 00:19:41 2008 -0700
XQuartz: Re-added deprecated code fallback failsafe for keyboard layout on Leopard with some debugging spew.
(cherry picked from commit 5854e712e9ebc210d2f8de6f5d4fb650944f314a)
commit 465a9bb96e8a90e53e655b3245e22910201786d7
Author: Peter Hutterer <peter.hutterer@redhat.com>
Date: Fri Aug 8 17:37:06 2008 +0930
dix: don't try to create events if we don't have a screen. #16898
A NULL screen may happen during server shutdown, when the output has been shut
down but the devices still generate events.
X.Org Bug 16898 <http://bugs.freedesktop.org/show_bug.cgi?id=16898>
commit d684f5760f40b682a8b879641300abe689a263c5
Author: Peter Hutterer <peter.hutterer@redhat.com>
Date: Fri Aug 8 14:18:01 2008 +0930
xkb: actually initialise sli before using it.
commit e00cd54c1ac57ea6e7767e90592200f343d9d08a
Author: Simon Thum <simon.thum@gmx.de>
Date: Thu Aug 7 11:06:21 2008 +0200
dix: remove misleading comment in ptrvelo.c
Signed-off-by: Peter Hutterer <peter.hutterer@redhat.com>
commit 6ca34549b89e73e3e0ec3cb7585686b880534cef
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu Aug 7 16:27:57 2008 +0930
dix: remove obsolete FIXME comment.
Thanks to Simon Thum for pointing this out.
commit 2c3645581ee3f180d34e32c8016d5e4e1af4dca4
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu Aug 7 11:55:10 2008 +0930
dix: SetModifierMapping should only apply to the ClientPointer and it's SDs.
commit e1b286d495b760cf67ddf936eca11da50fba847a
Author: Simon Thum <simon.thum@gmx.de>
Date: Wed Aug 6 09:42:32 2008 +0200
dix: simplified debugging helper for pointer acceleration
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit d95136e1510a48cc3ad066d880d56061fc6a42ee
Author: Simon Thum <simon.thum@gmx.de>
Date: Thu Jul 31 00:39:03 2008 +0200
xf86: don't replicate dix defaults for pointer acceleration
the defaults from InitVelocityData() or hypothetic driver-side changes
are now respected, not overridden.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 4f333d53510b82db57cfac1bfea22422cbb7be79
Author: Simon Thum <simon.thum@gmx.de>
Date: Thu Jul 31 00:33:38 2008 +0200
dix: simplify velocity tracking filters
prefer fp-mul over fp-div and remove rather pointless check
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit bf084a0769eee36ff799e5e5f2d1e875c1ebcc51
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Wed Aug 6 13:36:43 2008 -0700
glcontextmodes.[hc] were not added with the removal of the meas symlinks patch. Copied from mesa head 2008.08.06.
(cherry picked from commit 409e1dd1e9524b5c1a1ae58a759da77e587e3780)
commit e72b1d21e44712e90595b1c31e67db6786d0d1bd
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Wed Aug 6 10:23:31 2008 -0700
XQuartz: Now properly disable xauth checking on launchd socket and mostly fix the xinitrc / launchd race condition
commit d1b96cdea96f5321e0d254abde81cdaab2eca979
Author: Aaron Plattner <aplattner@nvidia.com>
Date: Wed Aug 6 10:37:32 2008 -0700
Add an xf86PrintBacktrace wrapper around xorg_backtrace to aid driver debugging.
commit 26d31ad1c7f4c550d73419ecf76912d844186b30
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Tue Aug 5 15:14:08 2008 -0700
XQuartz: Added code and made comments more helpful for debugging first-client-auth bug.
(cherry picked from commit a8f0d32216e321b8ae6da182be9b1ea792f6e004)
commit 0ef3243fb59fa993a7a07a08debbd4329254c265
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Tue Aug 5 18:45:54 2008 -0700
XQuartz: More fd handoff cleanup.
(cherry picked from commit 199d2dcb708c9f9d6b9ede149ea0fe9fba6c007c)
commit e7dd3dd8f311d3872e0c4c9c2ca22c00f9d11f59
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Tue Aug 5 14:33:03 2008 -0700
XQuartz: Fixed some errors / typos in the preferences pane.
(cherry picked from commit e1e0c398bbb50394b164394e1f1870016489c25b)
commit 6836f9aac801c3add0ae4aece05b32e85a0c5f85
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Tue Aug 5 14:24:25 2008 -0700
XQUartz: UI Cleanup. Removed done/cancel buttons from Applications->Customize
(cherry picked from commit d3157ca45c1f88edd040d721c1e944b9d2c090aa)
commit c06e27b2f6fd9f7b9f827623a48876a225264132
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri Aug 1 16:42:15 2008 +0930
xkb: ProcXkbSetDeviceInfo should work on all attached SDs.
If called with XkbUseCoreKbd, run through all attached SDs and replicate the
call. This way, we keep the SDs in sync with the MD as long as core clients
control the MDs.
commit d9ca9819e975e0f6832a320f8be5958e5d942f85
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri Aug 1 16:41:40 2008 +0930
xkb: ProcXkbSetGeometry should work on all attached SDs.
If called with XkbUseCoreKbd, run through all attached SDs and replicate the
call. This way, we keep the SDs in sync with the MD as long as core clients
control the MDs.
commit 5ba87c3327786dd7c6e8e265a19c858e8faae8fd
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri Aug 1 16:41:08 2008 +0930
xkb: ProcXkbSetNames should work on all attached SDs.
If called with XkbUseCoreKbd, run through all attached SDs and replicate the
call. This way, we keep the SDs in sync with the MD as long as core clients
control the MDs.
commit 7e45c80204e06562d4475741caea65bc8758f3c7
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri Aug 1 16:40:25 2008 +0930
xkb: ProcXkbSetNamedIndicator should work on all attached SDs.
If called with XkbUseCoreKbd, run through all attached SDs and replicate the
call. This way, we keep the SDs in sync with the MD as long as core clients
control the MDs.
commit a609dbed7cf854a6ee9d33c7cf45615db9da1fb9
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri Aug 1 16:38:59 2008 +0930
xkb: ProcXkbSetIndicatorMap should work on all attached SDs.
If called with XkbUseCoreKbd, run through all attached SDs and replicate the
call. This way, we keep the SDs in sync with the MD as long as core clients
control the MDs.
commit e8c2a3d7c996cb41c4c44ba67acae5ff9438fc06
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri Aug 1 16:37:39 2008 +0930
xkb: ProcXkbSetCompatMap should work on all attached SDs.
If called with XkbUseCoreKbd, run through all attached SDs and replicate the
call. This way, we keep the SDs in sync with the MD as long as core clients
control the MDs.
commit 3c7740aa8f21c1fda4190a1bf5d6ce089db5e35b
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri Aug 1 16:36:00 2008 +0930
xkb: ProcXkbSetMap should work on all attached SDs.
If called with XkbUseCoreKbd, run through all attached SDs and replicate the
call. This way, we keep the SDs in sync with the MD as long as core clients
control the MDs.
commit 31afd51dd49c0d0db2465fbc987044fab8b89f22
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri Aug 1 16:32:37 2008 +0930
xkb: ProcXkbBell should work on all attached SDs.
If called with XkbUseCoreKbd, run through all attached SDs and replicate the
call. This way, we keep the SDs in sync with the MD as long as core clients
control the MDs.
commit de4936d7482f820728efeef338a2041c7a9186d2
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Mon Aug 4 20:11:45 2008 -0700
XQuartz: Fixed proper processing of tablet button presses
(cherry picked from commit ca0babafa4e9cf1b67ec460655bffe569ac9c3e9)
commit b70a8ba3dc52b277194ab267a101a3fd15062685
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Tue Jul 15 17:48:29 2008 -0700
XQuartz: Nuke Sparkle.
(cherry picked from commit 4991f54a8d84a9a8df89a99dbfc09391195578f8)
commit 30851efdd4313506e92aeb6d3e5099dea99ab99c
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Tue Aug 5 12:54:51 2008 -0700
XQuartz: Fixed first-client-can't-connect bug
Readded the old exec() server startup path for regression testing.
Don't use the dynamic fd addition code since it's not quite working correctly.
(cherry picked from commit 08f3fe153edc5ab4ca010e8ce82d5c3fc0ddb72c)
commit 277a74bcbb7d0a93c4f2e1de11daabd8c5f93ee8
Author: Tomas Carnecky <tom@dbservice.com>
Date: Mon Aug 4 23:26:00 2008 +0300
Redefine clients as a fixed array
This removes yet another xalloc() each server generation. Also, I
couldn't find the corresponding xfree() so I guess that used to be a
memory leak there.
commit 5532d63488ec45953ff7f925cfb4f87adb3b04a0
Author: Tomas Carnecky <tom@dbservice.com>
Date: Mon Aug 4 23:06:08 2008 +0300
Redefine WindowTable as a fixed array
Instead of xalloc'ing it every server generation. The array is always
the same size (MAXSCREENS), anyway.
commit e882ee7056f370e0619d137b4ec3973ecb4e3479
Author: Daniel Stone <daniel@fooishbar.org>
Date: Tue Jul 29 17:52:11 2008 +0300
EXA: Remove unnecessary #includes
There wasn't actually any font code here, so no problem.
commit 6c1bb64c6f2efd81856ca00591df37916713b142
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Mon Aug 4 15:19:45 2008 +0930
xkb: break up XkbCopyKeymap into bite-sized chunks.
commit 3c6a9c531f673b7a0cb9ca01860b4dbe79686363
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri Aug 1 15:52:07 2008 +0930
config: protect against potential out-of-bounds indexing.
commit 92c51b183c2ff06361dad7f918daed6577ba4935
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri Aug 1 14:24:54 2008 +0930
config: support type strlist for XkbOptions property.
For backwards compatibility with server 1.4.
commit 35b14519b4a3158592a089170ec039bbc219603e
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Tue Jul 29 12:59:57 2008 +0930
config: add parsing for input.x11_options.XkbOptions. #16874
X.Org Bug 16874 <http://bugs.freedesktop.org/show_bug.cgi?id=16784>
commit d762c08aebe3b7e8c88e2e7a6fcf66057a21b403
Author: Simon Thum <simon.thum@gmx.de>
Date: Mon Jul 28 14:07:48 2008 +0200
dix: export driver-side functions for acceleration
also add additional safety for accel driver api
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 18e9fd69fe01298d825b46415b9c6bd86c75dfe5
Author: Simon Thum <simon.thum@gmx.de>
Date: Tue Jul 29 10:07:43 2008 +0200
dix: use average of pointer accel profile
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 25882af6d3359e5ae42c927c555f5b257ba5665c
Author: Ivaylo Boyadzhiev <iboyadzhiev@nvidia.com>
Date: Sun Aug 3 18:55:12 2008 -0700
Fix a longstanding XAA CopyPlane bug.
TmpBitPlane is a plane mask, not a plane index.
Signed-off-by: Aaron Plattner <aplattner@nvidia.com>
commit d980913f3145cdc34baab27ff818c9631c4c8571
Author: Adam Jackson <ajax@redhat.com>
Date: Fri Aug 1 16:15:04 2008 -0400
Erk. Actually check all the BARs, not just the first.
commit 82d51e6df2bf677bdf24376092bcaa79b534f6e5
Author: Adam Jackson <ajax@redhat.com>
Date: Fri Aug 1 13:17:55 2008 -0400
Silence the "No matching Device section" warning in some harmless cases.
If the device doesn't have any BARs then it's just a stub for some
lame operating systems that need one PCI device per output for
multihead. No point in warning about it.
commit 9643e8d3482a35d355a243db7aa397ad47f29be0
Author: Adam Jackson <ajax@redhat.com>
Date: Fri Aug 1 11:35:47 2008 -0400
Handle XGI cards in autoconfig.
It's all a bit wonky since both sis(4) and xgi(4) claim to support the
Volari Z7 and V5/8 (0x0020 and 0x0040), so let's side with xgi(4), why
not. Note that the V3 (not V3XT) identifies itself as a trident chip.
commit 63bdd4c27d47323b3282bf0b6eaecae91c79b45c
Author: Adam Jackson <ajax@redhat.com>
Date: Thu Jul 31 17:31:36 2008 -0400
Unifdef XIDLE.
Seriously how was this still here.
commit 8d214bc26f9b7ab6a5c54d7749cd4b6811cb0b96
Author: Adam Jackson <ajax@redhat.com>
Date: Thu Jul 31 15:46:52 2008 -0400
Document more of the OS and library assumptions.
commit 2198e237b2ed85857c671eee2cd04dfc032befee
Author: Tomas Carnecky <tom@dbservice.com>
Date: Thu Jul 31 13:46:06 2008 -0400
Cosmetic cleanup to Xvfb/Xdmx configure check output.
commit 148175fb8b365dcf00b13539b3f03ce33f3df707
Author: Michel Dänzer <michel@tungstengraphics.com>
Date: Thu Jul 31 16:54:33 2008 +0200
EXA: Do still return FALSE if the driver PrepareCopy hook failed...
Thanks to Stuart Bennett for pointing out the problem on IRC.
commit 68fd6604a15b653d1fa244633eaaee9608a03ab3
Author: Tomas Carnecky <tom@dbservice.com>
Date: Thu Jul 31 10:03:56 2008 -0400
OutputPropertyNotifyMask is a valid thing to select for.
commit 64ebeeb5265a4c425b9397fdc86a6d81521a856e
Author: Michel Dänzer <michel@tungstengraphics.com>
Date: Thu Jul 31 10:58:52 2008 +0200
EXA: Fix exponential growth logic for GXcopy tiled fills.
Fixes http://bugs.freedesktop.org/show_bug.cgi?id=16908 .
commit 8405c25d9ddbfddb6b155a436f07ccad689e53bd
Author: Michel Dänzer <michel@tungstengraphics.com>
Date: Thu Jul 31 10:55:44 2008 +0200
EXA: Simplify exaFillRegionTiled() control flow.
Also only call REGION_TRANSLATE() when necessary.
commit b37b1e66996f8335dafc97b12d25aaec452b931e
Author: Aaron Plattner <aplattner@nvidia.com>
Date: Wed Jul 30 18:48:27 2008 -0700
Make shmint.h part of the SDK.
This includes ShmRegisterFuncs, ShmSetPixmapFormat, fbShmPutImage, and
ShmRegisterFbFuncs. Note that fbShmPutImage was already exported.
commit a3afa6f2fb80489f7b6a88d12def09281d32ed94
Author: Michel Dänzer <michel@tungstengraphics.com>
Date: Wed Jul 30 18:30:37 2008 +0200
EXA: Optimize GXcopy tiled fills.
commit 37087bc10630ee7740df1369b3e56a44fd2ad2b0
Author: Michel Dänzer <michel@tungstengraphics.com>
Date: Wed Jul 30 18:27:33 2008 +0200
EXA: Replace open coded CopyArea logic with GC op call.
commit bb2cacd33eb85f39b9e7fa554545611957df677d
Author: Xavier Bestel <xavier.bestel@free.fr>
Date: Tue Jul 29 13:06:10 2008 -0400
Cosmetic fix to EDID decoding.
commit a70754a9fdb019d85fbfca1898699f3c6f609fdd
Author: Alan Hourihane <alanh@tungstengraphics.com>
Date: Tue Jul 29 14:16:25 2008 +0100
require inputproto 1.9.99.3
commit 591ef3c047ab3597fef9d687205e99c254ff2040
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Tue Jul 29 10:00:01 2008 +0930
Xi: ChangeDeviceControl presence events should set the appropriate devchange.
Requires inputproto 1.4.4 or higher.
commit 25dd5ce0770c5ff91a79c12223fd4af52759900b
Author: Kristian Høgsberg <krh@redhat.com>
Date: Mon Jul 28 12:33:58 2008 -0400
Add atKeynames.h in hw/dmx/input and drop evil cross-ddx #include.
commit e39a16aa58456aaecee54edc64f189c958db0902
Author: Julien Cristau <jcristau@debian.org>
Date: Sat Jul 26 16:35:19 2008 +0200
xfree86: don't output a spurious newline to the log when loading a module
commit 2eaed4a10fe5bf727579bca4ab8d4a47c8763a7d
Author: Julien Cristau <jcristau@debian.org>
Date: Sat Jul 26 15:35:42 2008 +0200
xfree86: use xorg.conf input devices if there is no ServerLayout
If xorg.conf has no ServerLayout section, use the first mouse and
keyboard sections as core devices, even with AllowEmptyInput.
commit 805f28e96ceb20bc53792ae3cf17f9c26564ae0e
Author: Simon Thum <simon.thum@gmx.de>
Date: Wed Jul 23 12:10:52 2008 +0200
some trivial changes regarding C compat, indentation, etc.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 3209bd21d00b8673d321f70afb65720588ddacb3
Author: Simon Thum <simon.thum@gmx.de>
Date: Wed Jul 23 12:06:34 2008 +0200
xfree86: perform pointer accel scheme selection by name, not number
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit a17cb29f5acdfcdeac929d8c6be3600d44d038ef
Author: Simon Thum <simon.thum@gmx.de>
Date: Wed Jul 23 12:03:17 2008 +0200
dix: preparation change: make runtime exchange of filter chain safe
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 1a9f9ac50f2b0db735789905cc29572a50c8ae4c
Author: Simon Thum <simon.thum@gmx.de>
Date: Wed Jul 23 11:49:36 2008 +0200
dix: optimize precision in device velocity estimation
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit c184b91d9aa72031c2bac9f379f56633957ded30
Author: Simon Thum <simon.thum@gmx.de>
Date: Wed Jul 23 11:33:25 2008 +0200
dix: improve the driver interface to predictable pointer acceleration
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 87aa5298576ed335ac31347e14fb30430288157a
Author: Simon Thum <simon.thum@gmx.de>
Date: Wed Jul 23 11:28:09 2008 +0200
dix: introduce defines for accel profile numbers
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 4e32e6fb38d19c9993de86188e4f7e7916a028e2
Author: Simon Thum <simon.thum@gmx.de>
Date: Wed Jul 23 11:10:22 2008 +0200
dix: rename classic accel _scheme_ to lightweight to avoid confusion with
classic accel _profile_
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit d40183c665d458ac0a6e7952fbe986776a17fda7
Author: Simon Thum <simon.thum@gmx.de>
Date: Wed Jul 23 09:28:06 2008 +0200
dix: add legal statements to ptrvelo.{c|h}
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit ec10eccd56be8b947cd63cae0687b8319857fe60
Author: Michel Dänzer <michel@tungstengraphics.com>
Date: Mon Jul 28 09:33:04 2008 +0200
GLX: Unreference drawables bound to the old context, not the new one.
Apart from the obvious reference counting issue, this fixes
http://bugs.freedesktop.org/show_bug.cgi?id=16867 .
commit 6ab8d6010adfd5ad6f1e1094a26c84f0aff934b1
Author: Michel Dänzer <michel@tungstengraphics.com>
Date: Mon Jul 28 09:32:59 2008 +0200
AIGLX/DRI1: Pay more attention to return value from DRIGetDrawableInfo().
Could have crashed otherwise if the num(Back)ClipRects variables referenced by
the caller weren't pre-initialized to 0.
commit b3e981c9d4ff31263a43b47f83cf8db4c2b5aeff
Author: Michel Dänzer <michel@tungstengraphics.com>
Date: Mon Jul 28 09:32:54 2008 +0200
Fix Makefile.am crack.
Looks like an artifact from early modularization.
commit 3575d9584edf35ec1720bc3755b6576a56613685
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri Jul 25 16:46:44 2008 +0930
config: note that HAL options must be strings.
Only strings are parsed by the server, all others are ignored. Doesn't matter,
specifying int options as strings works fine anyway.
commit 54651ff5ec54f4c621e060b19f31d77d519ef158
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu Jul 24 17:41:48 2008 +0930
xkb: remove superfluous inputInfo.keyboard treatment.
Really not necessary, we can just walk the list and spare us the special
treatment of the VCK.
commit 70bd8261223366dae9dfdbb999691328d85f093c
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu Jul 24 17:38:16 2008 +0930
xkb: use PickPointer/PickKeyboard in _XkbLookupAnyDevice.
commit 47160edec7f0d9129576d83f1593a5549879a893
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu Jul 24 12:12:45 2008 +0930
xfree86: warn some more about potential missing input devices.
Put out a warning if xorg.conf has InputDevice sections, but these aren't
referenced in the used ServerLayout. This is only performed if AllowEmptyInput
is enabled.
The reason behind this is that the server used to auto-add the first
mouse/keyboard sections if none where referenced. Now, with HAL and AEI
enabled by default, setups that relied on this auto-adding break and are left
without input devices. The least we can do is warn them.
commit f30b0823dbfc5902e54b337b5b6b570ebf216584
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu Jul 24 09:56:00 2008 +0930
xfree86: if AllowEmptyInput is on, warn the user that we rely on HAL now.
commit ad4cd2e241691427689591f7769a1184c8c1c7f5
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Wed Jul 23 17:40:28 2008 +0930
xkb: don't send core events on SlowKeys.
Core events don't happen until later in the DIX, so pump device events down
instead. This makes modifiers work again when SlowKeys is enabled.
commit 7d9dece74fc2bf130ceb8818ced5d9e3ac526900
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Mon Jul 21 22:12:45 2008 +0930
dix: fix up enter/leave system once again.
Two corrections
1. the "detail" field has NotifyVirtual, etc., not the "mode" field. This was
a clear bug.
2. don't set/unset the flags for NotifyGrab or NotifyUngrab. Clients are
expected to deal with multiple enter/leave events per window if the mode is
not NotifyNormal.
Testable with TCL menu boxes (such as used in gitk):
tk_optionMenu .menu globVar Val1 Val2 Val3 ValJunk
pack .menu
Thanks to Michel Dänzer for pointing this out.
commit 2ce434f54bc0d6050ef115e310df62c035e84bf2
Author: Kristian Høgsberg <krh@redhat.com>
Date: Thu Jul 24 18:44:16 2008 -0400
Clean up unused definitions from glx headers.
commit ae67508392261ae47858692668a0c192ef4a9d7b
Author: Mathieu Bérard <mathieu.berard@crans.org>
Date: Fri Jul 25 10:05:30 2008 -0400
Fix AddExtension now that CloseDownProc can be NULL.
commit eff25430b4a391409e39337962ff7697165d23c7
Author: Daniel Drake <dsd@laptop.org>
Date: Thu Jul 24 21:06:34 2008 -0500
Don't abort if swrast library is not present
GLX is enabled by default, but the current swrast behaviour causes X
to abort with fatal error if the swrast dri library dlopen fails.
Handle the case where the swrast library is not present, and do not
register the GLX extension unless at least one screen has a usable
GL provider.
commit 62b5690415786c4a6e8bac464aa8db578beb74f5
Author: Adam Jackson <ajax@redhat.com>
Date: Thu Jul 24 16:13:10 2008 -0400
Remove some more MEMBUG garbage.
commit 036822584b26854e2f486f1bea84d8d19d9324de
Author: Kristian Høgsberg <krh@redhat.com>
Date: Thu Jul 24 16:03:58 2008 -0400
Drop xf86CommonSpecialKey() and atKeynames.h
These are AT scancode specific, should really be part of xf86-input-keyboard.
Remove from server, move to xf86-input-keyboard.
commit f3ff2386016ced7e677817e9761a535f0f385813
Author: Adam Jackson <ajax@redhat.com>
Date: Thu Jul 24 15:28:07 2008 -0400
Sync is built-in and mandatory.
commit 3fcf4d3eb89fecaa2be7b5ac4933b693c9c3d97e
Author: Adam Jackson <ajax@redhat.com>
Date: Thu Jul 24 15:09:05 2008 -0400
XC-MISC is built-in and mandatory.
commit 9757106bba8f7bea99c5211817fc6b5fde4e6f66
Author: Adam Jackson <ajax@redhat.com>
Date: Thu Jul 24 14:59:14 2008 -0400
Remove all empty extension reset hooks, replace with NULL.
commit 6bcde69585fcc8f8dbfe81c115649f19274922fa
Author: Adam Jackson <ajax@redhat.com>
Date: Thu Jul 24 09:13:26 2008 -0400
Allow extension closedown hook to be null.
commit f65c50c4e902c7b5619fb7bbee8462434d809ec7
Author: Adam Jackson <ajax@redhat.com>
Date: Thu Jul 24 09:07:42 2008 -0400
Bigreqs are built-in and mandatory.
commit d6228cb22aa89b90834d80d98b91862c1fc01b54
Author: Adam Jackson <ajax@redhat.com>
Date: Thu Jul 24 09:00:22 2008 -0400
Shape extension is built-in and mandatory.
commit 990fc643ae90c034187707e7de414d80640ec6da
Author: Kristian Høgsberg <krh@redhat.com>
Date: Thu Jul 24 15:02:40 2008 -0400
Ugh, remove trailing backslash.
commit 806e8cf3c01f955411445a7095f0957ea9a9b22a
Author: Kristian Høgsberg <krh@redhat.com>
Date: Thu Jul 24 14:25:24 2008 -0400
Remove SPARC muldiv code. Was used by ELF loader, which is no more.
commit dff1a609bb4c0171e2abb92b54c16e739aec9ca2
Author: Kristian Høgsberg <krh@redhat.com>
Date: Mon Jul 21 18:29:08 2008 -0400
Drop the glx resize hook and stop chaining PositionWindow.
commit 24dddcd0ef845f4120f8588dc63ec754338ffac8
Author: Kristian Høgsberg <krh@redhat.com>
Date: Mon Jul 21 18:16:38 2008 -0400
Drop unnecessary linked list of contexts from GLXDrawable.
commit 5c1e254cc85e9ad409b0217780545c29f62d5feb
Author: Daniel Stone <daniel@fooishbar.org>
Date: Thu Jul 24 03:01:45 2008 +0300
Remove xorgcfg
Us shipping a GUI configuration utility (especially as part of the
server!) was pretty pointless. There was pretty much nothing it could
configure which wasn't already runtime adjustable: if you could get a
server up with functioning input and output, there wasn't much xorgcfg
could do for you.
Au revoir.
commit b74927c3844bc2650d95f604fe782d95ade067f1
Author: Daniel Stone <daniel@fooishbar.org>
Date: Thu Jul 24 02:42:13 2008 +0300
Remove ioport
I don't know why we would possibly be shipping this.
commit 8c0518379089d230060e9ff672ba5eba34198325
Author: Daniel Stone <daniel@fooishbar.org>
Date: Thu Jul 24 02:40:02 2008 +0300
Remove kbd_mode
We only built this on BSD and Solaris, and if such a tool is generally
useful, ship it with the OS.
commit 0d785bd635d135fcd67b4c9c88f5c8217e9b9240
Author: Adam Jackson <ajax@redhat.com>
Date: Wed Jul 23 13:43:09 2008 -0400
Unifdef hpux.
commit 5035741fd4cb4918957064a8c9ded9c7c31b4e22
Author: Adam Jackson <ajax@redhat.com>
Date: Wed Jul 23 13:38:38 2008 -0400
Unifdef __osf__
commit bd8bd2c700e6ccac53b47c45766c0a3a08a59344
Author: Adam Jackson <ajax@redhat.com>
Date: Wed Jul 23 13:36:35 2008 -0400
Unifdef AIX.
commit 5f5eed7f790db2f0ae0cd0f5c5ee5a312079c0b0
Author: Adam Jackson <ajax@redhat.com>
Date: Wed Jul 23 13:27:24 2008 -0400
Unifdef DGUX.
commit 856db05b58b71c5ff22af727aba435a8c356abfa
Author: Adam Jackson <ajax@redhat.com>
Date: Wed Jul 23 13:25:37 2008 -0400
Unifdef sgi.
commit ab6557fcd4bb4fd580bb1727dc8764f7dfb2cb30
Author: James Cloos <cloos@jhcloos.com>
Date: Wed Jul 23 13:17:33 2008 -0400
Optimize commit 331cc3f0799a54910a99484264f76569beeee55a
Reorder to minimize comparisons
commit b699364b1c807d29666633523f5b5a608a07a8ee
Author: Adam Jackson <ajax@redhat.com>
Date: Wed Jul 23 11:43:59 2008 -0400
Unifdef VXWORKS.
commit 2e3c43d306616f8accdeaffec9c108ba88324805
Author: Adam Jackson <ajax@redhat.com>
Date: Wed Jul 23 11:35:06 2008 -0400
Assume __GNUC__ >= 3.
gcc 3.0 was seven years ago. Get with the times.
commit 0c1c9d75089aac0cf673820db83801d3cab5bfc7
Author: Adam Jackson <ajax@redhat.com>
Date: Wed Jul 23 09:11:40 2008 -0400
Remove some broken debugging scaffolding.
commit 0ff5bc404842f7264a8e77f9e2a0bd8d0b051356
Author: Adam Jackson <ajax@redhat.com>
Date: Wed Jul 23 09:09:11 2008 -0400
Unifdef QNX.
Again, hasn't worked since at least 7.0.
commit 331cc3f0799a54910a99484264f76569beeee55a
Author: James Cloos <cloos@jhcloos.com>
Date: Wed Jul 23 00:01:43 2008 -0400
Fix LookupColor
Using strncasecmp(3) with the lenght of the user-supplied colour name
will result in a false positive when the db key starts out with the
same string.
Eg, blue will also match BlueViolet (aka blue violet).
Since the shorter strings occur first in the database, avoid such
errors by treating a 0 result from strncasecmp(3) as a positive result
when the key’s length is longer than the supplied string’s.
commit bc3c03a3f3c091026310f0e8d55321cec570a0c5
Author: Pierre-Loup A. Griffais <pgriffais@nvidia.com>
Date: Tue Jul 22 17:34:37 2008 -0700
Don't return BadAlloc when trying to set a PictureFilter with no parameters when a filter with parameters was previously set.
Signed-off-by: Aaron Plattner <aplattner@nvidia.com>
commit 92fdd01d8e46dd4b41338754e1a34e9d3c387d4a
Author: Dodji Seketeli <dodji@seketeli.org>
Date: Wed Jul 23 01:07:29 2008 +0200
[Xephyr] various X86_64 build cleanups
commit 5de1867fbb0a336ff3fdc92cbf734849f6111b1b
Author: Dodji Seketeli <dodji@seketeli.org>
Date: Wed Jul 23 01:00:26 2008 +0200
[Xephyr] Fix #15839
Make sure the _XSERVER64 macro is not defined in Xlib client code.
That macro is meant to be define only on pure server code, when necessary.
commit d692e1a63e4718d3b6d486582c19f30259b813a7
Author: Adam Jackson <ajax@redhat.com>
Date: Tue Jul 22 10:21:22 2008 -0400
Build fix.
commit d8937ce58137ad675f1ead8f2345eaed0ca63c8a
Author: Daniel Stone <daniel@fooishbar.org>
Date: Tue Jul 22 16:52:50 2008 +0300
autogen.sh: Pass --force to autoreconf
Ensure we get all files installed when running autoreconf by passing
--force to overwrite previously-generated ones, which fixes running it
from tarballs.
Also revert Peter's local changes to pass arguments to configure, all of
which are the default now anyway, AIUI.
commit 880625eef5d8b168df3e42836fa1b763c51a91b5
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Tue Jul 22 14:34:28 2008 +0930
xfree86: plug memory leak, free driver's private data when deleting the device.
commit 67d7821ae783d3f123b6ba7203abf847374a1e36
Author: Keith Packard <keithp@keithp.com>
Date: Mon Jul 21 11:48:24 2008 -0700
dix: reset potential lastSlaves when disabling an SD
Unplug a mouse, then warp the pointer and the warp pointer code will try
to update the position of the last slave device associated with the
master. That pointer will be stale and the X server will crash.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 8c8c4fdf34bfc9d54ebea99fb0af14cad167b4a0
Author: Adam Jackson <ajax@redhat.com>
Date: Mon Jul 21 16:39:43 2008 -0400
EDID: Various reduced blanking fixes.
- Use a single common function to compute reducedness.
- Call it from both the old-school and new-school mode validation paths.
- Define monitor reduced-blanking support in accord with EDID 1.4.
- Attempt to filter RB DMT modes away from the "standard" EDID pool if
the monitor doesn't claim RB support.
commit e8cd77e14d3fa40e5cf1174acaf925362b2e0a11
Author: Adam Jackson <ajax@redhat.com>
Date: Mon Jul 21 16:15:03 2008 -0400
EDID: For standard timing blocks, prefer DMT timings if they exist.
commit 6ba70091e2325f534a37ef185fea568d2c43edec
Author: Adam Jackson <ajax@redhat.com>
Date: Mon Jul 21 15:40:34 2008 -0400
EDID: Correct DDCEstablishedModes to conform to DMT.
commit facb255fa9267e343cbc91f841f1b64e5dc99e98
Author: Kristian Høgsberg <krh@redhat.com>
Date: Mon Jul 21 16:05:53 2008 -0400
Need to unref pixmaps backing pbuffers too.
commit d5ae85b5b722821499d5796cf0973ecb6ec125f1
Author: Kristian Høgsberg <krh@redhat.com>
Date: Mon Jul 21 15:28:50 2008 -0400
Fix embarrasing GLXPixmap leak.
commit c74ddc87c995c73109827717a49f14846c7c4024
Author: Adam Jackson <ajax@redhat.com>
Date: Mon Jul 21 15:10:20 2008 -0400
EDID: Add quirk to clamp max pixel clock to single DVI link speed.
On some panels you end up with all of:
- No range descriptor
- No description of physical connectivity
- Native panel size mode in standard timings list
In principle you're supposed to use the timings for that mode from the DMT
spec, but in practice the DMT spec has timings for both 1920x1200 normal
and 1920x1200RB, and the standard timing field gives you no way to
distinguish. And, of course, the non-RB timings don't fit in a single
DVI link.
commit 55803473adb0a0975fea81035402bf6b4ec0e30b
Author: Alan Hourihane <alanh@tungstengraphics.com>
Date: Mon Jul 21 10:32:57 2008 +0100
Bump inputproto to 1.9.99.2 for XI_PROP_ENABLED
commit 69de40ee45a6e046be79b735cd1540f63b87aee9
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Mon Jul 21 17:05:04 2008 +0930
dix: shift the duplicate button mapping check to ProcSetPointerMapping.
XI 2 allows two buttons to have the same button code.
commit 0dbfe0ebc69c307c0626ba824de15d03de1251d4
Author: Daniel Stone <daniel@fooishbar.org>
Date: Mon Jul 21 03:50:15 2008 +0300
Revert "Try nvidia before nv under the assumption that people who install it usually want to *use* it, too."
Per mailing list discussion.
This reverts commit 66fb253082ea42179180303393e48846208987fa.
commit 6b5206e7cb8e5279816b48f014d47d3f03f16972
Author: Daniel Stone <daniel@fooishbar.org>
Date: Fri Jul 18 15:38:10 2008 +0300
dix: Remove insane BC hacks
If your DDX needs a 1bpp mode and doesn't set it up, your DDX is
incompetent.
commit 66fb253082ea42179180303393e48846208987fa
Author: Aaron Plattner <aplattner@nvidia.com>
Date: Tue Jul 8 02:39:00 2008 -0700
Try nvidia before nv under the assumption that people who install it usually want to *use* it, too.
commit 376620460ec50cb98a1e3746629b7f73c2e926d7
Author: Julien Cristau <jcristau@debian.org>
Date: Sun Jul 20 16:53:01 2008 +0200
Drop some more configure-generated files from the tarball
commit 35346a42271dfe65fe0a86dc522701028bf6daf6
Author: Julien Cristau <jcristau@debian.org>
Date: Sun Jul 20 16:40:59 2008 +0200
Don't put xf86Build.h in the tarball (bug#9277)
This file is generated by configure, we don't need to ship a stale
version in the tarball.
X.Org bug#9277 <https://bugs.freedesktop.org/show_bug.cgi?id=9277>
commit 43c6d5a6f83dfdf8596c8d0faf8ac1a64f73a8c1
Author: Julien Cristau <jcristau@debian.org>
Date: Sun Jul 20 16:30:24 2008 +0200
distcheck fixes
Still seems to fail because hw/xquartz has too long filenames
commit 92b0a04ffd630a89705fc73d587182a62c34cd84
Author: James Cloos <cloos@jhcloos.com>
Date: Sat Jul 19 18:21:37 2008 -0400
Fix compile failure
This fixes a compile failure by ensuring that mouse-cfg.c
can see the MTYPE_ constants.
commit 0b45ba488d8a3e901b83e445d17e7e9a67047b6c
Author: Adam Jackson <ajax@redhat.com>
Date: Fri Jul 18 10:54:10 2008 -0400
Drop the FONTCACHE extension.
This appears to have been dead code since X-TT was merged.
commit b85392e66b4cbfcc95897ac342f19ac8ab04d4cc
Author: Søren Sandmann <sandmann@redhat.com>
Date: Thu Jul 17 23:10:11 2008 -0400
Give priority to clients that are receiving expose and configure events
commit 3b687ffe1649449b3d182f5e7690274c6c96916a
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Thu Jul 17 18:16:59 2008 -0700
Make xstrcasestr prototype return value match the implementation
commit f7bfa4ae971b43c3ed81cc84e6d1e071c413f04c
Author: Daniel Stone <daniel@fooishbar.org>
Date: Thu Jul 17 23:03:57 2008 +0300
configure.ac: Remove non-existant directory
Oops.
commit 16e40ecf43ea7df349e54f757db0223764d752ee
Author: Daniel Stone <daniel@fooishbar.org>
Date: Thu Jul 17 22:37:31 2008 +0300
Remove dead code, useless #defines, et al
commit b0a99fb02bb7290266d7dddee4de0b9959fb3c52
Author: Daniel Stone <daniel@fooishbar.org>
Date: Thu Jul 17 21:42:17 2008 +0300
configure.ac: Fix release date
Instead of putting something that's always wrong, at least just put
unreleased, which will be more obviously wrong if it's, well, in a
release.
commit 711720650cc192022f0d91f5cf94292d48dbc891
Author: Daniel Stone <daniel@fooishbar.org>
Date: Thu Jul 17 21:39:46 2008 +0300
Everyone has urandom
If you don't have urandom, please just add a fallback to /dev/random,
rather than building our own random generator.
commit 446fe9eecddd1337f9d5164dd7c301e1ba3dfe32
Author: Daniel Stone <daniel@fooishbar.org>
Date: Thu Jul 17 21:37:50 2008 +0300
Dead code removal
Remove a whole bunch of code that was never built, be it entire files or
just dead ifdefs.
commit 0564b5454ac101d9e1218767bbbc2c2d9f3e0696
Author: Daniel Stone <daniel@fooishbar.org>
Date: Thu Jul 17 20:46:27 2008 +0300
XFree86: Restore AllowMouseOpenFail usage text
This was incorrectly stuck behind the XFree86-Misc define, so got
deleted with the rest of misc: restore it unconditionally, as it should
be.
commit 6c7c0ffeb71610ee00fc92b32fd2b1cc70383e38
Author: Daniel Stone <daniel@fooishbar.org>
Date: Thu Jul 17 20:45:01 2008 +0300
KDrive: Delete rafts of unused code
Most of this stuff was gone with the last real hardware drivers that
used it. Au revoir.
commit ad7a7ae290b05f007062161418c929d9cebeef78
Author: Julien Cristau <jcristau@debian.org>
Date: Thu Jul 17 18:51:05 2008 +0200
XF86BigFont is disabled by default
3c19ec47b434d4ca84db58363cc053cc0b6aa413 did that,
but pretended to make it 'auto'.
commit 058100fd19ed33a3100d18a9ca56fdcffac361b2
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Thu Jul 17 09:35:30 2008 -0700
Remove more Lynx leftovers
A couple #if defined(Lynx) && defined(sun) had become just if defined(sun),
resulting in wrong settings for Solaris builds, so they're now just deleted.
commit 47833eef35b20a2eb0a74782edbb0877fd491c4c
Author: Mathieu Bérard <mathieu.berard@crans.org>
Date: Thu Jul 17 11:59:24 2008 -0400
Drop a bunch of #ifdef Lynx.
commit af2138bfce34a28312b26106eaf9561d96712ee0
Author: Adam Jackson <ajax@redhat.com>
Date: Thu Jul 17 10:39:29 2008 -0400
Nuke some ancient code for commandline-challenged OSes.
This appears to have been dead code even in 6.7.
commit b9a0cee026361189dce63b87c738bd1d17e02830
Author: Adam Jackson <ajax@redhat.com>
Date: Thu Jul 17 10:32:35 2008 -0400
Drop hw/xfree86/os-support/lynxos/
This has never worked in any modular release, clearly no one cares.
commit d87f170bd99f7908eb14272ac42c8963d089f54f
Author: Adam Jackson <ajax@redhat.com>
Date: Thu Jul 17 10:29:52 2008 -0400
Remove XF86Misc code from xorgcfg.
commit e3ff8501749209ee2dd324d35ae16e37510e0574
Author: Jie Luo <clotho67@gmail.com>
Date: Thu Jul 17 10:27:24 2008 -0400
Remove duplicate load of freetype font renderer.
libXfont will do this for us in FontFileRegisterFpeFunctions.
commit 8441e26266701776f1416bec864ae2949355da76
Author: Jie Luo <clotho67@gmail.com>
Date: Thu Jul 17 10:23:37 2008 -0400
Remove freetype from the list of autoloaded modules.
commit 5d11ae7a69e3a7611c667be4628a15a4b514f72c
Author: Jie Luo <clotho67@gmail.com>
Date: Thu Jul 17 10:22:29 2008 -0400
Fix color lookup.
OsStrCaseCmp returned inverted comparison sense from normal strcasecmp.
commit 478d3918d5b23fba1a7e3aaea766dfa785e5a0a6
Author: Daniel Stone <daniel@fooishbar.org>
Date: Thu Jul 17 03:29:26 2008 +0300
XFree86: Remove remnants of XFree86-Misc
HandleMessage: dear god, no.
commit 95000e34df9ba066905430eb0eb39a616567183e
Author: Adam Jackson <ajax@redhat.com>
Date: Wed Jul 16 16:37:14 2008 -0400
Build fixes
commit affec10635343668839994ea2bac16c1d4524200
Author: Adam Jackson <ajax@redhat.com>
Date: Wed Jul 16 14:44:33 2008 -0400
Remove loadable font renderer support.
commit acc91054316208844742495dea0b80a860ef02bb
Author: Adam Jackson <ajax@redhat.com>
Date: Wed Jul 16 14:24:47 2008 -0400
Remove font module support from xorgcfg.
commit a82e6efb7b9b2ab9a1597b002f375c5ee105e7f5
Author: Adam Jackson <ajax@redhat.com>
Date: Wed Jul 16 14:19:04 2008 -0400
Remove the numVideoScreens xprintism.
This was to account for cases where you had video and print screens in
the same server. Lunacy. Leave the slot in ScreenInfo, but rename it,
and stop looking at it.
commit 1a573e402ec112913a404f092b5b97d8d9210f94
Author: Adam Jackson <ajax@redhat.com>
Date: Wed Jul 16 13:41:53 2008 -0400
Update the Allow*Grabs documentation for xf86misc removal.
The API to turn the grab-break keys back off is gone now, so don't
say it exists.
commit 55644d2f1cddf1777587f213ed581b6087d9fdad
Author: Daniel Stone <daniel@fooishbar.org>
Date: Wed Jul 16 14:23:34 2008 +0300
Make --enable-debug usable again
Enable region debugging causes assertion failures (should really look
into that, though), and I don't need four messages every time I move my
pointer.
commit 22e64108ec63ba77779891f8df237913ef9ca731
Author: Daniel Stone <daniel@fooishbar.org>
Date: Wed Jul 16 06:25:26 2008 +0300
XFree86: Remove XFree86-Misc extension
Its last remaining purpose in life has been destroyed by input
properties. Au revoir: it's been fun, by which I mean awful.
commit b8dd07f855c555af56cbf0f69df799f424da2cca
Author: Daniel Stone <daniel@fooishbar.org>
Date: Wed Jul 16 03:00:25 2008 +0300
HAL: Remove grotesque open-coded strcasestr
Not only was this pretty ugly, but it didn't even work on systems
without strcasestr anyway, due to the define not being in dix-config.h.
Lack of strcasestr is handled transparently with the version from
FreeBSD now anyway, so, huzzah.
commit ad87c72edcc0d1f56658e0c4e73af335c8d5a516
Author: Daniel Stone <daniel@fooishbar.org>
Date: Wed Jul 16 02:59:51 2008 +0300
DIX: Add strcasestr from FreeBSD
Add strcasestr for use on systems which don't have it.
commit c3c901cf44cf16bb33c4176494361b429099a372
Author: Daniel Stone <daniel@fooishbar.org>
Date: Wed Jul 16 02:54:41 2008 +0300
configure.ac: Fix SHA1 handling
Fix and marginally simplify the SHA1 handling. First, we allow people
to override it. Secondly, we try for libmd. Then, we try for OpenSSL
with pkg-config. In a last, desperate move, we try libcrypto on its
own. This allows the server to, y'know, _link_ when using OpenSSL,
instead of failing because we only have -lcrypto, and not -lssl.
commit 69b57dc651e12a0d9a5a4295b185c62d5c0df63f
Author: Daniel Stone <daniel@fooishbar.org>
Date: Wed Jul 16 02:03:36 2008 +0300
dix: Actually build str(n)casecmp if we don't have it
Remember to add stuff to dix-config.h when you add new AC_DEFINES,
people ...
commit dcf6293030126509d7d6c61d131222037d5ed7db
Author: Daniel Stone <daniel@fooishbar.org>
Date: Wed Jul 16 01:57:00 2008 +0300
strcasecmp: Actually use the right license
Forgot to update the license when I committed the FreeBSD version, so it
still had an old SGI license. Sorry. Sorry.
commit 441f084bfe87a6ea1c94ec63f82888b8b3d81d89
Author: Daniel Stone <daniel@fooishbar.org>
Date: Wed Jul 2 19:52:58 2008 +0300
config: Don't attempt to use D-Bus when not strictly necessary
If we have D-Bus but have explicitly disabled it, don't build it.
commit 35c89f3f5b8fa222e37b799d5bb01595e8f30d0c
Author: Daniel Stone <daniel@fooishbar.org>
Date: Wed Jul 16 01:43:58 2008 +0300
XFree86: Remove mysticism from Makefile.am
The variables were always the same, so just shove them in with the rest
of the plebs.
commit b89a59248a4a0ff06b9a0ddee45881efc6063063
Author: Daniel Stone <daniel@fooishbar.org>
Date: Fri Jun 27 12:20:56 2008 +0300
XFree86: Delete OSMouse code
This should be moved into the mouse driver, if anything.
commit d0de5ea96d084fc5da87d8f323ddfc08fe9c03ba
Author: Daniel Stone <daniel@fooishbar.org>
Date: Wed Jun 25 17:56:28 2008 +0300
XFree86: Remove useless debugging code
Also remove documentation which told you how to use a non-module-aware
GDB, albeit only with old, non-shared, modules.
commit 4b1273c9c2da113f634be80caa28e81df3beae98
Author: Daniel Stone <daniel@fooishbar.org>
Date: Wed Jun 25 17:51:12 2008 +0300
XFree86: Delete empty file & function
xf86InitXkb() has been empty for as long as I can remember.
commit 3a54f3f48fa1c0d60604c3ee767c569b5ec23430
Author: Daniel Stone <daniel@fooishbar.org>
Date: Thu Jun 12 01:05:04 2008 +0300
XFree86: Clean up init a tiny bit (no code changes)
Reshuffle and delete.
commit ddcefb50dda9e398647d1c84c7153127ed26a4d2
Author: Daniel Stone <daniel@fooishbar.org>
Date: Wed Jun 11 15:14:26 2008 +0300
XFree86: Remove trailing whitespace
commit e6f35f28fb3526b911101bde4aa761de8b055aef
Author: Daniel Stone <daniel@fooishbar.org>
Date: Wed Jun 11 15:13:21 2008 +0300
OS/KDrive/XFree86: Sanitise colour initialisation
OsInitColors always just returned TRUE, so just remove calls to it and
insane special-case logic. Remove unused kcolor.c implementation, and
merge oscolor.h into oscolor.c since it was the only user. Remove
open-coded strncasecmp in oscolor.c.
Since we no longer need to call OsInitColors after reading the config
file, just call PostConfigInit() from one place, and move PM handling to
one place so we can install the signal handlers earlier.
commit 11f9e3520249a603b95e64503ee759998ff17feb
Author: Daniel Stone <daniel@fooishbar.org>
Date: Wed Jun 11 15:09:46 2008 +0300
DIX: Add strncasecmp from FreeBSD, make strcasecmp args const
Add strncasecmp (as we're now using it) in case someone doesn't have it,
and also change strncasecmp args to be const, in accordance with
everything else.
commit ae38151ddda9984effca5bb7c582540061201dce
Author: Daniel Stone <daniel@fooishbar.org>
Date: Mon May 19 08:35:05 2008 +0300
configure.ac: Add GLX_SYS_LIBS for Xvfb and Xnest
This fixes the linking for these two when using DRI2, which requires
DLOPEN_LIBS.
commit ccec16e519c143f4c0017a37e93ebc52ac472e4e
Author: Adam Jackson <ajax@redhat.com>
Date: Tue Jul 15 11:24:08 2008 -0400
Bug #7300: Move xf86RAC to hw/xfree86/common
commit 9111944b292355f7478b4ae75bead8dc25edbbcb
Author: Julien Cristau <jcristau@debian.org>
Date: Tue Jul 15 10:36:38 2008 -0400
Bug #16674: Make sure RANDR reports refresh as 0 if pixel clock is 0.
commit 3f3f66de669caf3606eec8c5f8d405a283cbf12d
Author: Brad Smith <brad@comstyle.com>
Date: Mon Jul 14 22:20:41 2008 +0200
Fix the configure tests for swap16/__swap16 macros on OpenBSD.
BSD systems need <sys/types.h> included before <sys/endian.h> for
macros to work.
<https://bugs.freedesktop.org/show_bug.cgi?id=16531>
commit 11ee0ae9390a608a232ff94abcc0cbcf9ed7b70a
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Mon Jul 14 10:20:11 2008 +0930
xfree86: append, not prepent, new input devices to xf86InputDevs.
If devices are prepended to the list, their wake-up order on resume is not the
same as the original initialisation order. Hot-plugged devices, originally
inited last, are re-enabled before the xorg.conf devices and in some cases may
steal the device files. Result: we have different devices before and after
suspend/resume.
RedHat Bug 439386 <https://bugzilla.redhat.com/show_bug.cgi?id=439386>
commit 5bcc45e07e8726a5442567472dd29cfb5c901f2d
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Sun Jul 13 18:40:53 2008 +0930
Xi: expose Enable/DisableDevice through XI_PROP_ENABLED property.
commit c9eb0e870c87d291311491452adf7f91a911e24b
Author: Simon Thum <simon.thum@gmx.de>
Date: Thu Jul 10 22:33:39 2008 +0930
Add support for multiple pointer acceleration schemes. #8583
Available acceleration schemes:
- xorg classic scheme.
- the new "Predictable" polynomial accel scheme.
X.Org Bug 8583 <http://bugs.freedesktop.org/show_bug.cgi?id=8583>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit e7abe1676a6a4e4249504b8c9660cbad70569199
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Sun Jul 13 18:41:53 2008 +0930
Xi: protect against NULL handlers, don't try to dereference.
commit 2bbb12c355308d10bf123911044fbdf6ae7fb59c
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Sun Jul 13 20:23:14 2008 +0930
Xi: remove ChangeDeviceControl for CoreCtl.
If you want to set a device to core, attach it to a master device.
commit 18ff17756c988b6c21b76bf898e45685649d07bb
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu Jul 10 19:23:14 2008 +0930
Xi: GetDeviceProperty reply includes deviceid.
commit c3267106fb599213555829cb76df7848c4ebe23b
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Wed Jul 9 10:02:41 2008 -0700
XQuartz: Use CFEqual to compare keyboards
(cherry picked from commit 5538e43b9ae7d06d2f48842b065810ce74286eb6)
commit 90dd2de845ae12153296f6f1bff0c87f79c57854
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Mon Jul 7 10:55:58 2008 -0700
XQuartz: Some fd handoff cleanup.
(cherry picked from commit 9c20a4804d97e67a988f00f49866997209cce518)
commit 26d8030c3836816de8c12b2cb9d67315e5c887eb
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Fri Jul 4 19:23:21 2008 -0700
XQuartz: Remove deprecated keyboard code.
(cherry picked from commit 69cfc1a21e12bb38a6130dea2e5f20f1e6a3ee7c)
commit 5cfcbd54d98cc77ee02a3a099ebbad9af511a0ee
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Wed Jul 2 00:47:08 2008 -0700
Set machine dependent defaults for ppc64
(cherry picked from commit 0733ef2e8abda99cfd62966e73017949e9cd507f)
commit e69b9f9ca45c0c6bfb93ea9143737116bf1f2453
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Wed Jun 25 11:51:27 2008 -0700
XQuartz: Set noPanoramixExtension earlier to avoid a possible race.
(cherry picked from commit 49668e8a88137e9f258eae970826883b88b7d8ba)
commit 8d2e2e1d856efec4459de2a20af642dc1ec9b8a5
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Wed Jun 11 11:44:45 2008 -0700
Xquartz: Removed include directive for removed header
(cherry picked from commit e65a36d57f338410c5a5b02cb5ae1214a81d072d)
commit ebd70c82fdbe483d149ac9bdb5a64cc6e0c10e0a
Author: Aaron Plattner <aplattner@nvidia.com>
Date: Thu Jul 10 14:38:34 2008 -0700
Add LoaderShouldIgnoreABI to allow drivers that roll their own ABI checks (i.e. nvidia) to perform the check before ScreenInit.
commit c42427f63f0e0495e56909ee99ad1e3c4321c39b
Author: Ander Conselvan de Oliveira <ander@mandriva.com.br>
Date: Wed Jul 9 10:50:21 2008 -0300
Fix incorrect test regarding keyboard map.
In the map stored in each keyboard device, the first line refers to
minimum keycode, i.e., the 0th line refers to keycode 8. When not
using XKB the wrong test caused some keys to be interpreted as
locks ('m' for instance). The had to be pressed twice to generate
both KeyPress and KeyRelease events.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit e4054e5cb3d919dfc83021be3f2b9036d0e5a2be
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu Jul 10 11:03:31 2008 +0930
Xi: pack the property stuff into a struct, make handlers a linked list.
We may need more than one handler to deal with a property (e.g. one in the
driver, one in the DIX), so get the handlers into a linked list and call them
one-by-one. This is of course slightly less entertaining than the hilarious
WRAP/UNWRAP game we play in other parts of the server.
XIRegisterPropertyHandler/XIUnregisterPropertyHandler are the interface
drivers/the DIX should use to attach themselves to the device.
XIDeleteAllDeviceProperties destroys everything, including the handlers.
commit 2039c6ea43244339659323d05d96c14e41996c20
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Mon Jul 7 22:10:17 2008 +0930
Xi: add support for input device properties.
Basically just copied from randr properties, with minor changes only.
Each device supports arbitrary properties that can be modified by clients.
Modifications to the properties are passed to the driver (if applicable) and
can then affect the configuration of the device.
Note that device properties are limited to a specific device. A property set
on a slave device does not migrate to the master.
commit 4ab01fe5db7fb330b1ec463aa49b77859527e597
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu Jul 10 16:27:36 2008 +0930
Revert "Xi: add support for input device properties."
Note to self: don't mix up branches with half-finished cherrypicks.
This reverts commit 666838fcc8b71fdeae160844160187f345cbf4a6.
commit 666838fcc8b71fdeae160844160187f345cbf4a6
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Mon Jul 7 22:10:17 2008 +0930
Xi: add support for input device properties.
Basically just copied from randr properties, with minor changes only.
Each device supports arbitrary properties that can be modified by clients.
Modifications to the properties are passed to the driver (if applicable) and
can then affect the configuration of the device.
Note that device properties are limited to a specific device. A property set
on a slave device does not migrate to the master.
commit acce27093571497a0626cee1cdb61ddf751dbc40
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Tue Jul 8 16:02:13 2008 +0930
Xext: store the GenericMasks in the resource system.
This fixes a severe issue - when the client died the event mask didn't get
unregistered and a future event would dereference dangling pointers. By
storing the event masks in the resource system we can free them when the
client dies.
commit db86b8839f286e0e2efb5638b8ab2fe608707655
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Tue Jul 8 15:12:45 2008 +0930
dix: free GenericMask allocations when destroying window.
commit 08e2c625f620688d35f3b443ffb878e8e991ff57
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Wed Jul 9 20:07:59 2008 -0700
Remove README.font, since it's just an old text copy of xorg-docs/sgml/fonts
commit 5e847c1d4fc30a0d263a861a76982660f11998cd
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Mon Jul 7 17:08:01 2008 -0700
Improved driver selection when autoconfiguring driver without xorg.conf
- Allow returning multiple drivers to try for a given PCI id (for instance,
try "geode" then "amd" for AMD Geode hardware)
- On Solaris, use VIS_GETIDENTIFIER ioctl as well as PCI id to choose drivers
- Use wsfb instead of fbdev as a fallback on non-Linux SPARC platforms
commit 235fea0e1a2101fb76a54e6505db321674530c60
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Mon Jul 7 15:21:59 2008 -0700
Update bsd & solaris descriptions in README.OS-lib
commit d8af9d9ab1cd98c07fdf42490dcc0cab3c655b89
Author: Julien Cristau <jcristau@debian.org>
Date: Mon Jul 7 13:14:49 2008 +0200
Export xkbfile.h in the SDK
It's needed by xkbsrv.h
commit d78bebb20a00e8519788c75c90b467a5750c78be
Author: Tiago Vignatti <vignatti@c3sl.ufpr.br>
Date: Fri Jul 4 04:04:19 2008 -0300
Remove unused function and variables.
commit a8c4727f01949da0ae266369f0d12a96c2bf0da5
Author: Tiago Vignatti <vignatti@c3sl.ufpr.br>
Date: Fri Jul 4 04:03:46 2008 -0300
Fix typo in the last commit.
commit 3164288b121990a5990747c0f92d4af13b1c929a
Author: Tiago Vignatti <vignatti@c3sl.ufpr.br>
Date: Fri Jul 4 03:55:59 2008 -0300
Remove deprecated function miPointerPosition().
commit d1031a8972490ebf0ef6dc2762036a7a7172466b
Author: Tiago Vignatti <vignatti@c3sl.ufpr.br>
Date: Fri Jul 4 03:46:21 2008 -0300
Update README.OS-lib to reflect reality.
commit f72500c4a09cce5dbbd16639b1951a4bf943e4ac
Author: Tiago Vignatti <vignatti@c3sl.ufpr.br>
Date: Fri Jul 4 03:45:18 2008 -0300
Nuke libc wrapper remaining stuffs.
commit 3fd5fab5663fbdce2fc0b5377155aedf9a70b6c2
Author: Tiago Vignatti <vignatti@c3sl.ufpr.br>
Date: Fri Jul 4 02:51:42 2008 -0300
Remove inexistent function headers.
commit 0b9ef835a0fe900c121b84e43989591e58ab1126
Author: Dave Airlie <airlied@redhat.com>
Date: Fri Jul 4 07:29:32 2008 +1000
modes: fix initial xorg.conf mode selection.
This was all kinds of broken, we ignored user preferred modes for multiple
monitors and also for side-by-side configurations.
commit e317943c125d7fdbe62c750324640eb30c88fa15
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Wed Jul 2 12:23:03 2008 +0930
xfree86: AllowEmptyInput is now enabled by default if hotplugging is enabled.
Remove AEI check from configImpliedLayout as the setting isn't actually parsed
at this point anyway (written by Sasha Hlusiak).
Resurrect checkInput() and check for devices there if AEI is false (this also
creates the default devices if required).
Set AllowEmptyInput to enabled by default if hotplugging is enabled.
commit fe5cf7cb00fd926cefff933adbdbceea7353f4c2
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Tue Jul 1 13:18:54 2008 +0930
xfree86: handle missing Screen lines in the ServerLayout #16301
If no Screen is specified in the ServerLayout section, either take the first
one from the config file or autogenerate a default screen.
X.Org Bug 16301 <http://bugs.freedesktop.org/show_bug.cgi?id=16301>
commit 6674b87a7dca7d6ffd9dd9af888c5256b13d7877
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Sun Jun 29 20:05:27 2008 +0930
xfree86: move declaration of configured_device to start of function.
Last I checked C doesn't allow declarations halfway down a block.
commit 1e96782011f0b4ba6ed1d3d3df118964a58d15fd
Author: Dave Airlie <airlied@linux.ie>
Date: Thu Jul 3 20:00:22 2008 +1000
dri2: bump libdrm numbers as 2.3.1 is released without ttm interface
commit 1771edcb44b564f83f509748b4e4cd5b7586e2a8
Author: Dave Airlie <airlied@redhat.com>
Date: Thu Jul 3 18:57:09 2008 +1000
modes: check the crtc is valid before using its desired modes.
this fixes a crash I was getting on radeon rotate when gnome is running.
I'm sure g-s-d was doing something bad, but really not crashing ftw.
commit 689292e58cc5242cbfeaa29fcf65b6dcd9dfabb9
Author: Adam Jackson <ajax@redhat.com>
Date: Wed Jul 2 11:25:50 2008 -0400
Fix GLX in Xvfb and kdrive.
commit 9a73bca859be12721ef62304b1422c455d4aec49
Author: Chris Ball <cjb@laptop.org>
Date: Wed Jul 2 09:46:06 2008 -0400
Remove KdOffscreenMarkUsed() as all its callers are gone.
commit b84a27fd9fdcb579437cfa38f10cb12cf55dc7c3
Author: Ian Romanick <idr@us.ibm.com>
Date: Wed Jul 2 06:25:03 2008 -0700
VBO: Regenerate files based on recent changes to gl_API.xml
Since GL_ARB_vertex_buffer_object protocol isn't supported yet, these
changes are innocuous.
commit 703a9645f3d547144ea62dd81c41f5356a5f87d8
Author: Adam Jackson <ajax@redhat.com>
Date: Tue Jul 1 17:50:48 2008 -0400
Auf wiedersehen, KAA.
commit c8216aede6c4ac41976947521d884fa010913204
Author: Jeremy Uejio <jeremy.uejio@sun.com>
Date: Tue Jul 1 13:37:12 2008 -0700
Sun bug #6685465: Xephyr uses wrong or bad colortable in 8-bit mode
<http://bugs.opensolaris.org/view_bug.do?bug_id=6685465>
This bug is caused by Xephyr not handling the RGB byte order correctly
of the server where Xephyr is displaying on. The previous code just
assumed that the order was RGB and did not take into account that
Xservers may use different order (such as BGR).
The fix is to add a function to calculate the byte order and bits
to shift based on the visual mask and the visual bits_per_rgb (which
is usually 8, but could be server dependent). Since the shifts won't
change once the display connection has been made, I can cache these
values so that Xephyr doesn't have to keep recalculating them everytime
it tries to translate the Xephyr colormap entries for Xephyr clients to
the actual server colormap entries (i.e. calling the function
hostx_set_cmap_entry() repeatedly for every colormap entry).
commit 2e8daee05343b2853b677acf4554def0ceeada00
Author: Aaron Plattner <aplattner@nvidia.com>
Date: Mon Jun 30 17:29:35 2008 -0700
Work around the DIX losing mmWidth/mmHeight for RandR 1.1 DDXen.
RandR 1.1 has a physical size for each mode. It used to be that the DIX would
remember these modes and pass them back up to the DDX when changing the screen
configuration. The DDX uses RR_GET_MODE_MM to query the driver for the physical
dimensions of the screen, allowing it to preserve the DPI.
With RandR 1.2, the physical dimensions are stored as part of the output, rather
than per mode. The DIX only uses the sizes passed in from the DDX to select the
mode pool for the "default" output, and forgets the physical sizes. Then, when
reconfiguring the screen, it makes up a new RRScreenSizeRec using the dimensions
from the output, screwing up the DPI.
This change works around this problem by ignoring the DIX and querying the real
size from the driver.
commit e2bbf2d248a2d2a2db4adfe9d1bda94cf184d8bd
Author: Adam Jackson <ajax@redhat.com>
Date: Tue Jul 1 12:01:56 2008 -0400
Don't try to load DRI2 if built without it.
commit 66d7c9de82b5e733e4995f079a96efe612fca881
Author: Adam Jackson <ajax@redhat.com>
Date: Tue Jul 1 10:55:54 2008 -0400
Declare xf86InterpretEEDID() properly.
commit e4335e876d254e446a965259e845ad955da5b5c2
Author: root <root@samich.home.cworth.org>
Date: Mon Jun 30 15:29:04 2008 -0700
Revert "XInput ABI is 2.1, not 3.1."
This reverts commit 76576c87b0de106e006d1cfa59d42d3a483e966c.
which was an incorrect revert of previous ABI bumps. Those
responsible for the accidental ABI bumps in both directions
have all been sacked.
This allows xf86-input-mouse to build again, for example.
commit 6447f80c17077f924b2d58e07b38d32429edcb9b
Author: Carl Worth <cworth@samich.home.cworth.org>
Date: Mon Jun 30 13:16:49 2008 -0700
Use AC_CHECK_LIB before PKG_CHECK_MODULES for openssl
Previously, the code was using PKG_CHECK_EXISTS before PKG_CHECK_MODULES,
(to cater to OpenBSD systems that include openssl by default but without
a .pc file). But this meant that systems that didn't have openssl installed
at all would not get any error message at configure time.
Now, if the SHA1_Init function is found in -lcrypto without any additional
flags, then that's used. Otherwise, pkg-config is used to find the right
flags to link against libcrypto. And if that fails, a nice error message
is now generated.
commit 76576c87b0de106e006d1cfa59d42d3a483e966c
Author: Adam Jackson <ajax@redhat.com>
Date: Mon Jun 30 16:10:37 2008 -0400
XInput ABI is 2.1, not 3.1.
commit bed12dd3df0129b7f28d0a42d470266bd3ae6b38
Author: Adam Jackson <ajax@redhat.com>
Date: Sat Jun 21 16:07:54 2008 -0400
Do EEDID in RANDR 1.2.
commit 4fc18b5fc31aa287e807ee520dc9117296e3d306
Author: Adam Jackson <ajax@redhat.com>
Date: Sat Jun 21 16:07:36 2008 -0400
Hexdump the whole EDID block if extensions present.
commit b4fbc31e109f1efe78613597f9a91d5363523493
Author: Adam Jackson <ajax@redhat.com>
Date: Sat Jun 21 16:00:05 2008 -0400
Actually fetch all blocks of EEDID if asked to.
commit 9c4c323d50bd8b369e82a1dff28abdc15a219a5e
Author: Thomas Hellstrom <thomas-at-tungstengraphics.com>
Date: Mon Jun 30 18:59:13 2008 +0100
Avoid an EXA init segfault.
Don't allocate each VRAM buffer with a 16MB alignment.
commit 211e2bdcc677122145998829a7f26610c7c567e6
Author: Adam Jackson <ajax@redhat.com>
Date: Mon Jun 30 10:29:17 2008 -0400
Bump ABI minor numbers for the devPrivate ABI functions.
commit d6b8d9eaffaf3f976db330bc35da3d30eb656bac
Author: Dan Nicholson <dbn.lists@gmail.com>
Date: Fri Jun 27 17:16:35 2008 -0700
DRI: Ensure we have the DRI headers from Mesa
Change the DRI configure check to look for the dri pkg-config file. This
prevents people who built an Xlib libGL from bombing later in the build.
commit 7ddfb2f1587da3ec1cd27ae270e42700adf4f560
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Thu Jun 26 21:23:31 2008 -0400
Fix a leak of window devPrivates in window.c/CrushTree().
commit a65888d6785934a669ad3b822bf2d636db351858
Author: Alan Hourihane <alanh@tungstengraphics.com>
Date: Fri Jun 27 17:32:28 2008 +0100
fixes for gallium stride changes
commit e0c43fff3208350995c45604624dd4825f40598c
Author: Alan Hourihane <alanh@tungstengraphics.com>
Date: Fri Jun 27 09:46:24 2008 +0100
More error checking
commit 387ec961f2a5e791fd010906a5115cf8393471f3
Author: Alan Hourihane <alanh@tungstengraphics.com>
Date: Thu Jun 26 23:34:51 2008 +0100
add --with-gallium-dir to specify location of gallium tree
commit 410b0a4254ca48548b443c1e8fbbcf7a6b9aa862
Author: Alan Hourihane <alanh@tungstengraphics.com>
Date: Thu Jun 26 22:49:33 2008 +0100
NULL checks
commit 621fa337fb53d535f53cec30bb7161801001bb7f
Author: Alan Hourihane <alanh@tungstengraphics.com>
Date: Thu Jun 26 22:47:20 2008 +0100
Fix copy surface
commit ccd0c76472a7d8a85aed0ea6fea4011109f305d6
Author: Alan Hourihane <alanh@tungstengraphics.com>
Date: Thu Jun 26 22:27:44 2008 +0100
Add EXA winsys for gallium pipe driver interface.
Plug in the EXA framework into the pipe driver
for surface_copy & surface_fill.
Back pixmaps with drmBO's including the front buffer.
commit 0e1aa03708d95cc1542bee31709a345d0f748f0c
Author: Alan Hourihane <alanh@tungstengraphics.com>
Date: Thu Jun 26 22:27:14 2008 +0100
yet more
commit 2b3a3bc9202f4e6f9886a08a4dfa597a83a5e933
Author: Alan Hourihane <alanh@tungstengraphics.com>
Date: Thu Jun 26 22:26:16 2008 +0100
more formatting fixes
commit 2a45c28712a544c6f1c3eb753678ba1738cfdd67
Author: Alan Hourihane <alanh@tungstengraphics.com>
Date: Thu Jun 26 22:25:17 2008 +0100
formatting fixes
commit 15e4b6c57484b6afb790c7dc1db9f529ba2219cf
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Tue Jun 24 13:46:40 2008 +0930
input: for non-device events (e.g. DevicePresence) use MAX_DEVICES as id.
Using id = 0 only worked pre-MPX since XInput didn't allow XOpenDevice for the
core devices (0 and 1). Now we can now legally register for events so we may
overwrite our device-independent classes with the ones selected for the VCP.
So, increase the EMASKSIZE to MAX_DEVICES + 1 and use MAX_DEVICES as the ID
when we don't have a device.
commit f0c56ffd980db19bea271aeebf118bd931f6f40d
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Tue Jun 24 12:58:49 2008 +0930
dix: don't dereference dev->key if it doesn't exist.
This may happen if we check for a passive grab on a floating pointer device.
commit 01f0b9c9784c55c94104bafa6dd545b373c64104
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Wed Jun 25 19:23:20 2008 -0700
xf86GetOptValFreq wants a pointer to double, but maxPixClock is an int
commit 7ce6dcef118139d0ccfc136b9a07f5bf0c078d70
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Wed Jun 25 15:06:49 2008 -0700
Don't log null device name in XkbDDXLoadKeymapByNames
commit cbc20d92de92aad5ca240310a9156ccf97c24a01
Author: Adam Jackson <ajax@redhat.com>
Date: Wed Jun 25 09:52:36 2008 -0400
XTrap delenda est.
commit a81b5ce452766bbc4b2ac0849711284ba8591b46
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Wed Jun 25 13:23:09 2008 +0930
dix: free memory associated with the EventList. #16507
Un-deprecates CloseDownEvents.
X.Org Bug 16507 <http://bugs.freedesktop.org/show_bug.cgi?id=16507>
commit 3a2beb2f867fd47dc5a7723dcac345ea0b0ecf3d
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Wed Jun 25 13:12:41 2008 +0930
dix: InitEventList does not need to be _X_EXPORT.
commit 385943e0e97463ce4681a9b6a4a40d7e3c91e51e
Author: Tiago Vignatti <vignatti@c3sl.ufpr.br>
Date: Tue Jun 24 23:13:32 2008 -0300
Set --enable-builtin-fonts as default.
Some reasons to embed fonts by default:
1. X server doesn't pick a good default font path so it's easiest just
to built in the core fonts and let new X hackers more happy. Developers
and distro guys are wise enough to just set --disable-builtin-fonts
when they want.
2. Seems that this is by far the most popular FAQ
(http://www.x.org/wiki/FAQErrorMessages).
3. No one gave a good argument to not do this:
http://lists.freedesktop.org/archives/xorg/2008-May/035479.html
commit f3b29efc4d7bb346cdd3fd79e780f1022c8f46e8
Author: Tiago Vignatti <vignatti@c3sl.ufpr.br>
Date: Tue Jun 24 23:07:49 2008 -0300
Remove NOFONTSERVERACCESS macro
dix: this is semantically different but it goes through the same path in
the code.
commit 2ff7eb4995b663cf12a01124745de600f38d0bfc
Author: Tiago Vignatti <vignatti@c3sl.ufpr.br>
Date: Tue Jun 24 22:09:34 2008 -0300
xfree86: kill INHERIT_LOCK_STATE macro.
I don't know how this survived so long. Google didn't show
anything usable related with this.
commit a3ec22627355fc08730ad7e90022e374763d333f
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Tue Jun 24 20:32:24 2008 -0400
Fix a leak in the code that parses the protocol names.
Also added some comments.
Reported by Ben Gamari (bug #16492).
commit a4cb25f8c816adc3bdf6a28d5beb558e8be40121
Author: Ben Gamari <bgamari@gmail.com>
Date: Tue Jun 24 12:08:35 2008 +0930
dix: free FocusPrivates when deleting a window. #16493
Signed-off-by: Peter Hutterer <peter@cs.unisa.edu.au>
X.Org Bug 16493 <http://bugs.freedesktop.org/show_bug.cgi?id=16493>
commit 32a7bbbba6fec0535a8faa1d6d2ecebe786bcc81
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Tue Jun 24 09:28:05 2008 +0930
xfree86: fix up leftover allocation of xf86Events.
Thanks to Eamon Walsh for spotting this.
commit bcc88a1d46c7ba469c4e2861875f84f8c77d4b15
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Sun Jun 22 22:34:30 2008 +0930
xkb: remove unused variable is_core.
commit 9ed9d98dec58d1f7468d02c4b951811b8e1ca7c1
Author: Julien Cristau <jcristau@debian.org>
Date: Tue Jun 24 22:36:32 2008 +0200
x86emu: fix build, fallout from 9719354
commit e9b4f3cd856e2401675452c387b4155246239f91
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Mon Jun 23 16:18:20 2008 -0400
Fix "warning: suggest parentheses around && within ||".
commit 8910dde96ec4318c9c44fb9717b6b52fad56cd1d
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Mon Jun 23 14:51:38 2008 -0400
Fix "warning: assignment discards qualifiers from pointer target type".
commit 95d4ede538fbb68049ba3efa0acb0e9712e5cb01
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Fri Jun 20 23:49:32 2008 -0400
Fix "warning: passing argument 1 of `modeIsPresent' from incompatible pointer type".
commit fa1545eeda2a7feebc006840a44d390177634231
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Fri Jun 20 23:47:22 2008 -0400
Fix "warning: passing argument 1 of `xf86addNewLoadDirective' from incompatible pointer type".
commit 2725ba1fca45e5ba241695e24333d8efab1f862b
Author: Adam Jackson <ajax@redhat.com>
Date: Tue Jun 24 14:41:32 2008 -0400
Also remove xorgconfig from configure.ac.
commit 9719354ae04a41e9834ac9ba8fd9e895092ba4f1
Author: Adam Jackson <ajax@redhat.com>
Date: Tue Jun 24 14:37:06 2008 -0400
Check for __amd64__, not __x86_64__.
Spiritual revert of 1fa4de80fcfc697b5e5879cc351fb3e9dbf6acbe. Intel's C
compiler claims to be gcc-compatible; if they're not defining the same
macros as gcc then that's their bug, not ours. Even if we were to do
this aliasing we should do it once and for all in servermd.h.
commit 249c892784ca5e8c75863dd82097ca2bedec4723
Author: Roland Bär <roland@verifysoft.de>
Date: Tue Jun 24 14:13:02 2008 -0400
Bug #11857: Avoid running off the end of a MAXCLIENTS-sized array.
commit 9e5b3deafb97ec1f83e6bfe067bc68df7385bc6a
Author: Adam Jackson <ajax@redhat.com>
Date: Tue Jun 24 14:08:04 2008 -0400
Bug #11842: Fix emulation of int1A PCI BIOS services.
Use only %di to name the PCI register to read/write, rather than %edi.
DOS is only expecting the base PCI config space anyway, and the BIOS
might be using the high bits of %edi.
commit d34430414ac0e77eec61ab0ac9ef427b236eb639
Author: Adam Jackson <ajax@redhat.com>
Date: Tue Jun 24 13:32:55 2008 -0400
Remove xorgconfig. Use X -configure instead.
commit 574c62e305e5380bb1b0f4bfec4f7cc3e3f03ada
Author: Owen Taylor <otaylor@fishsoup.net>
Date: Tue Jun 24 12:40:47 2008 -0400
Bug #15369: Don't reduce Over to Src for transform + RepeatNone.
Only do no-src-alpha optimizations for a RepeatNone source if we can
easily probe that we won't sample outside the edges of the source.
commit 100afae578e59e31b65a6264c281ba7deea5ac39
Author: Adam Jackson <ajax@redhat.com>
Date: Tue Jun 24 10:52:31 2008 -0400
Bug #15586: (Correctly) refuse to redirect the root window.
commit 4c4e06af7950df509fa02099788be66cf37a4d01
Author: Paul Bender <pebender@gmail.com>
Date: Tue Jun 24 10:44:47 2008 -0400
Bug #15665: Fix building without Composite.
commit 59510a76436c739fd9421f01cc4210607d9e7f57
Author: Adam Jackson <ajax@redhat.com>
Date: Tue Jun 24 10:40:36 2008 -0400
Remove some default modes that really shouldn't be in the default set.
commit b622f6dc5d8d70d17be0374a85a9b16b43a62a01
Author: Julien Cristau <jcristau@debian.org>
Date: Mon Jun 23 23:45:57 2008 +0200
kdrive: fix building with --disable-xv (bug#16488)
commit 3b587826924c60f6736dc5faf584b964fde1b4da
Author: Jesse Ruffin <jesse@eloquentpeasant.net>
Date: Mon Jun 23 14:35:20 2008 -0400
Bug #16302: Fix GLX drawable refcounting in DMX.
commit c8d066a15142678041c1d82ccf530dcdb2ea74ca
Author: Adam Jackson <ajax@redhat.com>
Date: Mon Jun 23 13:59:48 2008 -0400
Implement bswap in x86emu.
Yes, this is a 486+ instruction and thus not strictly legal in vm86
mode, but enough BIOSes use it (looking at you VIA) that we might as
well implement it.
commit b55fbca4f0705aeff1c69d3ef851c5ff5af6ed94
Author: Adam Jackson <ajax@redhat.com>
Date: Fri Jun 20 13:27:32 2008 -0400
Bug #12414: Create full-fledged pixmaps in fb24_32ReformatTile().
... instead of creating pixmaps that only fb knows about, which will
have no devPrivates for any other subsystem and thus cause havoc if
(when) they leak out.
commit 155fcecb320dbcfb899d6bcd78048ce0993bf28b
Author: Matthieu Herrb <matthieu.herrb@laas.fr>
Date: Mon May 19 08:09:33 2008 +0200
Various messages clean-ups.
commit 41a65e110409a290288180e8e1517f053f877586
Author: Matthieu Herrb <matthieu.herrb@laas.fr>
Date: Mon May 19 06:12:04 2008 +0200
Fix ipc check on OpenBSD
commit ce4d4b3c1b0e25f64d6f781b09528b2f3ae33207
Author: Matthieu Herrb <matthieu.herrb@laas.fr>
Date: Mon May 19 05:19:01 2008 +0200
build fix
commit 19c7e9da55646f1f6e05c28cd71865cd8d84e1ff
Author: Matthieu Herrb <matthieu.herrb@laas.fr>
Date: Mon May 19 02:24:17 2008 +0200
preserve errno around the SIGIO handler
commit 0a81d476388c51f8aa723400dffc375e112ea97a
Author: Matthieu Herrb <matthieu.herrb@laas.fr>
Date: Mon May 19 02:20:44 2008 +0200
Remove RCS Id.
commit c0d7ad9c88172d753b932069743ae65f75de3aa9
Author: Matthieu Herrb <matthieu.herrb@laas.fr>
Date: Thu Jun 19 16:51:18 2008 +0200
Let code build with gcc 2.95
commit 219dd2d44a9da40427ad48b0f09b981fe0551f4b
Author: Matthieu Herrb <matthieu.herrb@laas.fr>
Date: Sun May 18 13:53:32 2008 +0200
sprintf() -> snprintf()
commit cfcb3da75e807dec225cc7ea469e04d2db10bf73
Author: Keith Packard <keithp@keithp.com>
Date: Wed Jun 18 11:37:00 2008 -0700
Make button down state a bitmask. Master buttons track union of slave buttons
Mixing usage where some parts of the code treated this field as a bitmask
and other parts as an array of card8 was wrong, and as the wire protocol
wanted bitmasks, it was less invasive to switch the newer counting code use
booleans.
Master devices track slave buttons by waiting for all slave buttons to be
released before delivering the release event to the client.
This also removes the state merging code in DeepCopyDeviceClasses -- that
code was changing master device state without delivering any events,
violating protocol invariants. The result will be that existing slave
button state which does not match the master will not be visible through the
master device. Fixing this would require that we synthesize events in this
function, which seems like a bad idea. Note that keyboards have the same
issue.
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
Signed-off-by: Peter Hutterer <peter@cs.unisa.edu.au>
commit 3cc5ae6a4f725483612c00fc8bcc2c61607f66a8
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Wed Jun 18 16:14:42 2008 +0930
dix: don't attempt to send Enter/Leave events if we have a keyboard.
Dereferencing into dev->valuator could crash the server, although it looks
like I could only reproduce this by having a keyboard send an event after it
was created and the WM was still replaying. Or so.
commit 528b4e36ade482df99747081688ae52cfaeb28eb
Author: Alan Hourihane <alanh@tungstengraphics.com>
Date: Wed Jun 18 22:34:02 2008 +0100
Set driverPriv immediately on CreatePixmap.
If it's NULL anyway, we bail, if not, it lets
ModifyPixmapHeader know about the private.
commit 068fa63496c7c363706f0d356b5132bc591c04c6
Author: Michel Dänzer <michel@tungstengraphics.com>
Date: Wed Jun 18 09:23:09 2008 +0930
dix: fix a crash when the client has a different byteorder.
Signed-off-by: Peter Hutterer <peter@cs.unisa.edu.au>
commit d21155a3e9b51df946766926bc6155c8972c4439
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Sun Jun 15 20:00:41 2008 +0930
input: fix up usage of button->down, used to be a bitmask, is now an array.
device->button->down used to be a 32-byte bitmask with one bit for each
button. This has changed into a 256-byte array, with one byte assigned for
each button. Some of the callers were still using this array as a bitmask
however, this is fixed with this patch.
Thanks to Keith Packard for pointing this out. See also:
http://lists.freedesktop.org/archives/xorg/2008-June/036202.html
commit 2b9c829bdebd16910bdf48b9d64862e3d34f5b7f
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Wed Jun 18 09:55:53 2008 +0930
Xi: don't drop the grab status in XExtendedGrabDevice().
commit 4f3ed54dc9ea7780ff03378b13de0fddfdec2e15
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Tue Jun 17 10:43:36 2008 +0930
mi: remove trailing whitespaces from misprite.c
commit 79dd600942bbac3c6b531f284b42c7b2c822da90
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Tue Jun 17 19:09:44 2008 -0400
SELinux: Add an extension alias under the OS-agnostic "Flask" name.
commit 656d3d7623c6b83024e9cdc60d1257f4d87aa268
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Tue Jun 17 17:55:11 2008 -0400
SELinux: Bring server-side name registry up to date.
commit f3490d3eba94c7d9e760d6d21991ab6677196c2b
Author: Ian Romanick <idr@us.ibm.com>
Date: Tue Jun 17 10:35:24 2008 -0400
Bug #15169: Make the server build again on Alpha.
Still won't work until the kernel makes the resource files actually exist.
commit 47969d79289ad92f658c9a6dd2a2fc6b5f1b6c99
Author: Alan Hourihane <alanh@tungstengraphics.com>
Date: Mon Jun 16 15:07:39 2008 +0100
Add DRI2 support.
Add EXA stubs.
Currently tested with i915.
commit 6a1910a0e562e36e0836e948b287ec37c90df02d
Author: Zack Rusin <zack@tungstengraphics.com>
Date: Mon Jun 16 00:31:53 2008 -0400
Adding some readme.
commit 8c9234a163eceda2abc0a2523e0f5587ea399935
Author: Keith Packard <keithp@keithp.com>
Date: Sun Jun 15 10:01:28 2008 +0930
Xi: avoid double button mapping.
Button events were mapped once in GetPointerEvents and then again in
UpdateDeviceState. While it might make sense to just fix up UpdateDeviceState,
it turns out to be better to leave the raw button number in the event because
DGA reports raw device events without button translation, and so when it calls
UpdateDeviceState, the button down counts get scrambled and buttons get stuck
down.
See also:
http://lists.freedesktop.org/archives/xorg/2008-June/036201.html
Signed-off-by: Peter Hutterer <peter@cs.unisa.edu.au>
commit d894e86aa5bea81147c4a7ad8630bcfb04156792
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Sun Jun 15 10:55:08 2008 +0930
randr: remove superfluous check against uninitialised variable.
Thanks to Eamon Walsh for pointing this out.
commit 5544c51447f551dfc6df64438873a7ce64743976
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Fri Jun 13 22:49:47 2008 -0400
Fix "warning: the address of ‘newTypes’ will always evaluate as ‘true’".
commit 2391c409a2840d61fed93832650c0d6c82ebebdf
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Fri Jun 13 22:48:17 2008 -0400
Fix "warning: unused variable `s'".
commit 61dafe384a88fc397d7cd55cb23f4fdc3fb0645c
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Fri Jun 13 22:47:10 2008 -0400
Fix "warning: unused variable `tsize'".
commit 37a64b02df02d42a19d4b777930dc5e457d97d63
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Fri Jun 13 22:41:58 2008 -0400
Fix "warning: ‘rc’ may be used uninitialized in this function".
commit e90fcd8294fe763c97610d39cab50f2836f87dca
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Fri Jun 13 22:26:43 2008 -0400
Fix "warning: no previous prototype for ‘miRROutputGetProperty’".
commit 0b00bbca5df140edbfaffab627bd82165f1b1420
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Fri Jun 13 22:22:22 2008 -0400
Fix "Warning: no previous prototype for `SecureRPCInit'".
commit 1c2f038d69605b0ed1067e47dc75ca6f216991f5
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Fri Jun 13 21:59:09 2008 -0400
Fix multiple warnings in os/xdmauth.c.
commit 384ebe02b354bf1ad0a2ac25e4b5290f2e795ea1
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Fri Jun 13 21:49:01 2008 -0400
Fix "warning: label ‘done’ defined but not used".
commit 720e44f9730b9e275579483c2a34b16bba77e146
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Fri Jun 13 21:42:37 2008 -0400
Fix "warning: no previous prototype for ‘XevieExtensionInit’".
commit 9d871e19c9dee5d3ee7f123249e8890417d83093
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Fri Jun 13 21:35:29 2008 -0400
Fix "warning: unused variable ‘pDev’, `pPointer'".
commit 60f64af075e8ac3e63586452f2f3d338a05785f0
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Fri Jun 13 21:23:31 2008 -0400
Fix "warning: passing argument 1 of 'pixman_fill' from incompatible pointer type".
commit c448460fdc23262f2b711a32599090c85c70447a
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Fri Jun 13 21:05:26 2008 -0400
Fix "warning: pointer targets in assignment differ in signedness".
commit 17ed6242e73c5f733601b15732ab30c23acf14d2
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Fri Jun 13 21:03:17 2008 -0400
Fix "warning: assignment from incompatible pointer type".
commit 02a8b118cd07d98f12aab8325d8443125703ba7d
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Fri Jun 13 21:01:50 2008 -0400
Fix "warning: implicit declaration of function ‘miPointerGetScreen’".
commit 2d7ba09dc4b5eff5dba8d7867f285111574b1737
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Fri Jun 13 16:39:40 2008 -0400
Make devPrivates lookup functions ABI instead of static inlines.
This is required to preserve compatibility across changes to the
internal representation of the privates list.
commit 9e0e558f263a132babf8c91d31230831653f19c1
Author: Adam Jackson <ajax@redhat.com>
Date: Fri Jun 13 11:17:49 2008 -0400
Fix unterminated endif.
commit 6bbfadb9094bb6437a6825b8293d13a32e041aff
Author: Adam Jackson <ajax@redhat.com>
Date: Fri Jun 13 11:00:50 2008 -0400
... and stay dead.
commit f31bd087e8a7f65cd588bd1d022bb18e72b2a60c
Author: Adam Jackson <ajax@redhat.com>
Date: Fri Jun 13 10:35:07 2008 -0400
Death to mfb.
Anyone still interested in 1 or 4 bpp framebuffers, talk to fb.
commit af86c3b7ce705c1711c8cf8bf05a7a02b8afccf6
Author: George Sapountzis <gsap7@yahoo.gr>
Date: Sat May 24 21:16:34 2008 +0300
clean .gitignore
commit 3108980f5e78c129b23ff32f72564cf9a746c693
Author: George Sapountzis <gsap7@yahoo.gr>
Date: Fri Jun 13 15:58:56 2008 +0300
glx: drop unused cleargc
commit 23b55a61f89f69454a3b0e3413b1f07d5fdf43aa
Author: Michel Dänzer <michel@tungstengraphics.com>
Date: Fri Jun 13 11:13:56 2008 +0200
AIGLX/DRI1: Switch to server context for calling pScreen->GetImage.
Fixes http://bugs.freedesktop.org/show_bug.cgi?id=16292 .
commit d15b3790307053587df8daed1936ff6923881b63
Author: Adam Jackson <ajax@redhat.com>
Date: Thu Jun 12 16:00:50 2008 -0400
Remove xgl.
This code hasn't been updated with anything even resembling what anyone is
shipping in nearly thirty months. It hasn't built out of the box since
7.1. Most of its features over AIGLX are accomplished with DRI2 and
friends.
commit c37a93b4850866c713e3cbf39a08bbc9645e24d4
Author: Dave Airlie <airlied@redhat.com>
Date: Thu Jun 12 14:54:56 2008 +1000
modes: make aspect choosing work on single output case.
In the single output enabled case we never enter the loop and test
never gets set and so we fail to match a good mode.
This was causing my 2560x1600 to end up at 2048x1536.
commit 23e71ef71a178505494d4b410f9314acfff81524
Author: Dave Airlie <airlied@redhat.com>
Date: Thu Jun 12 09:04:24 2008 +1000
dbe: fix DoS reported by iDefense.
This isn't a security problem just a user could DoS themselves for fun or profit.
commit 390b155135a451fa728b73c8107aea91dfd56ed1
Author: Tiago Vignatti <vignatti@c3sl.ufpr.br>
Date: Wed Jun 11 18:21:33 2008 -0300
Welcome to hotplug era.
`rm -rf xorg.conf` does not imply an error message. Maybe a warning.
checkInput() is defined but not used.
commit 6e018f6a30dab1259b8fdc1ae4c84056b2acf362
Author: Tiago Vignatti <vignatti@c3sl.ufpr.br>
Date: Wed Jun 11 18:10:55 2008 -0300
No need for inputPending field in xf86Info.
commit 881e551de92e5664f92ef1961092e35cd7a77b15
Author: Tiago Vignatti <vignatti@c3sl.ufpr.br>
Date: Wed Jun 11 18:03:33 2008 -0300
CopyGetMasterEvent() can be static.
commit 656949cbe24648a5b58f7df6ed49b25af0b47601
Author: Tiago Vignatti <vignatti@c3sl.ufpr.br>
Date: Wed Jun 11 17:57:19 2008 -0300
Remove more unused things.
In function ‘miSpriteCloseScreen’:
warning: unused variable ‘pDev’
commit 84db8837d0faaac008be61df9f1261cd3028e923
Author: Tiago Vignatti <vignatti@c3sl.ufpr.br>
Date: Wed Jun 11 17:47:00 2008 -0300
Remove unused xf86DeviceCursorUndisplay() function.
commit dba5455f06c439c7e7d399f30dc7067e98e6e50b
Author: Kristian Høgsberg <krh@redhat.com>
Date: Wed Jun 11 11:41:34 2008 -0400
Un-K&R shm extension.
commit 9171206db349a0c6fda719746be0b15049d57aaa
Author: Matthieu Herrb <matthieu.herrb@laas.fr>
Date: Tue Jun 10 12:23:03 2008 -0600
CVE-2008-2362 - RENDER Extension memory corruption
Integer overflows can occur in the code validating the parameters for
the SProcRenderCreateLinearGradient, SProcRenderCreateRadialGradient
and SProcRenderCreateConicalGradient functions, leading to memory
corruption by swapping bytes outside of the intended request
parameters.
commit 5257a0f83d5f3d80d0cd44dd76d047bac3869592
Author: Matthieu Herrb <matthieu.herrb@laas.fr>
Date: Tue Jun 10 12:22:30 2008 -0600
CVE-2008-2361 - RENDER Extension crash
An integer overflow may occur in the computation of the size of the
glyph to be allocated by the ProcRenderCreateCursor() function which
will cause less memory to be allocated than expected, leading later to
dereferencing un-mapped memory, causing a crash of the X server.
commit c5f69b297b1227cb802394fa90efdbe1de607f3c
Author: Matthieu Herrb <matthieu.herrb@laas.fr>
Date: Tue Jun 10 12:21:26 2008 -0600
CVE-2008-2360 - RENDER Extension heap buffer overflow
An integer overflow may occur in the computation of the size of the
glyph to be allocated by the AllocateGlyph() function which will cause
less memory to be allocated than expected, leading to later heap
overflow.
commit 063f18ef6d7bf834225ddfd3527e58c078628f5f
Author: Matthieu Herrb <matthieu.herrb@laas.fr>
Date: Tue Jun 10 12:20:43 2008 -0600
CVE-2008-1379 - MIT-SHM arbitrary memory read
An integer overflow in the validation of the parameters of the
ShmPutImage() request makes it possible to trigger the copy of
arbitrary server memory to a pixmap that can subsequently be read by
the client, to read arbitrary parts of the X server memory space.
commit 95d162c4389857d960da9b0158345c1714e91f31
Author: Matthieu Herrb <matthieu.herrb@laas.fr>
Date: Tue Jun 10 12:20:00 2008 -0600
CVE-2008-1377 - RECORD and Security extensions memory corruption
Lack of validation of the parameters of the
SProcSecurityGenerateAuthorization SProcRecordCreateContext
functions makes it possible for a specially crafted request to trigger
the swapping of bytes outside the parameter of these requests, causing
memory corruption.
commit 656d5d98855eb608ec6581f8c574f343a216ea32
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Wed Jun 11 17:32:59 2008 +0930
kdrive: fix wrong use of &, should be | instead.
Fallout from 26e7e69ab893d1f2b35213250ada40ec90944f62
commit 6528eb885dea0326aacdd026d44d82ab07f4a4fd
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Wed Jun 11 15:01:36 2008 +0930
Xext: init firstValuator to zero, otherwise core XTest events may get lost.
commit 6ab311c92d036dc63ee92ab4bb231f5f61ebe69f
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Mon Jun 9 11:45:57 2008 +0930
dix: Call RealizeCursor during InitializeSprite.
RealizeCursor should be called when the cursor is allocated. However, when the
root cursor is allocated, no devices exist yet, and thus RealizeCursor is
never called. This may lead to segfaults lateron in DDXes like Xnest that
actually need to do something for each cursor, and lateron rely on that
DDX-specific data for each cursor has been initialized.
commit e083b5a07507d53de0d1d365ef1565346284c997
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Mon Jun 9 11:23:53 2008 +0930
xnest: wrap the xnest cursor sprite funcs around the mi funcs.
Modelled after the xfree86 code. Call miDCInitialize to init the SW rendering
engine, then take the pointers, store it in a xnest-local variable, and put
the xnest-specific sprite funcs in place. In the xnest sprite funcs, call
through to the mi sprite funcs after doing xnest-specific stuff.
commit ea6a02c048e8589e99ee3b459f3612eb3d041558
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Mon Jun 9 11:22:33 2008 +0930
mi: protect mipointrst.h against multiple includes.
commit a3a7c12fcf8e4ac1418f9ea53f76091f309a721b
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Sun Jun 8 23:38:45 2008 +0930
xfree86: Fix up xf86ScaleAxis
Some driver still call it, so we might as well work correctly. Always
resetting X to the Sxhigh is sub-optimal.
commit f8431a62d57ab3118a0b409bce977db8261e2930
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Tue Jun 10 02:15:25 2008 -0700
XQuartz: Under the new startup model, we no longer need to do the foreground/background dance.
(cherry picked from commit 4505bae5d7341e1241be50c25cb3d1b941701de4)
commit c180a52332385b98635068d63a8fe0bba4835be7
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Tue Jun 10 10:47:37 2008 -0700
XQuartz: Removed code path for old startup
(cherry picked from commit a9ee6b0d00fab01a78408a85e6542e88c19fda7c)
commit 49751fee3b82ebc4917bfb168ec78aad7874f1f1
Author: Roland Scheidegger <sroland@tungstengraphics.com>
Date: Tue Jun 10 15:40:48 2008 +0200
glx: copy msaa visual capabilities
commit 5170c169db78cad3fe47dee4e438b48e67f0c7d1
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Tue Jun 10 01:39:15 2008 -0700
XQuartz: Fixed the "laggy" startup under the new model. This was caused by xinit blocking expecting SIGUSR1 and our stub never sending it.
(cherry picked from commit ee92aced10d0743c4658e53b58b5d9f5a094a415)
commit 01ace5f3fd56bc789ad7448059fcf907ef19a1c8
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Wed Jun 4 18:28:20 2008 -0700
XQuartz: Updated icon with more rsolutions and made it more dark-background friendly
(cherry picked from commit d8cf5623faab952a0f1196c8fe10baa09d1fc089)
commit 607b0d09ea003f87cfb3331e59e13495a483832a
Author: Aaron Plattner <aplattner@nvidia.com>
Date: Mon Jun 9 09:52:04 2008 -0700
CreateColormap returns Success on success, not TRUE.
Fixes a problem where enabling color index overlays disables the RENDER
extension.
commit 2854abd39d4deb79c9ee9bcc931fad969392cfc5
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Sun Jun 8 23:20:11 2008 +0930
xnest: fix up sprite funcs to stop compiler warnings.
commit c68ca0c7b2c72df0501d26bf7f640029ff2d9568
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Sun Jun 8 23:14:20 2008 +0930
xnest: switch to using EventList rather than xEvents.
commit 34429d16d319ef2709c22a5c22f45d0e82c78b20
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Sun Jun 8 23:08:34 2008 +0930
xnest: call miDCInitialize rather than miPointerInitialize.
This unfortunately gives us a lots of artefacts, so cursor rendering cannot be
assumed complete. But it's better than crashing.
commit a7d4bec884c24c0e1792fd7d6677cdd0a69978e3
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Sun Jun 8 23:03:20 2008 +0930
mi: remove leftover old license comment.
commit 585125685b5f09245021c8ee15f57950fe6cdd20
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Sun Jun 8 22:43:47 2008 +0930
ephyr: some whitespace changes.
commit 782394fe53220deafed06ad282b5f9ce42964c42
Author: Julien Cristau <jcristau@debian.org>
Date: Fri Jun 6 12:10:35 2008 +0200
mi: Fix typo in comments about deprecated functions
commit 6b96281100f2118fe9d99536c33d48298a5bce7b
Author: Michel Dänzer <michel@tungstengraphics.com>
Date: Fri Jun 6 11:01:03 2008 +0200
EXA: Fix exaGetPixmapFirstPixel() crash if the driver has a CreatePixmap hook.
Fixes http://bugs.freedesktop.org/show_bug.cgi?id=16243
commit d25ffcfbfcfe8e059f2889873c9dbe76a28ad00c
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Thu Jun 5 15:29:35 2008 +0930
mi: protect against possible NULL-pointer dereference.
commit 874dcdb3bdb9320aae252d3c7927d412685059d5
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Thu Jun 5 15:38:48 2008 +0930
dmx: remove a ifndef XINPUT, XINPUT is always defined now.
commit 52752911ea8470dd8805f5e6c3febb9e1e1cc4b3
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Wed Jun 4 17:04:16 2008 +0930
dmx: don't free event list after use.
commit 5c5e58124581b845a6bfa7a2991a4e0ee7f7ebdb
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Wed Jun 4 16:58:31 2008 +0930
dmx: add an XFlush.
Beats me why we need it, but without it we get segfaults lateron.
commit 246c10441bbf62646b77993b55233d5ceb93a81f
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Wed Jun 4 16:37:25 2008 +0930
dmx: fix false memory allocation.
beNumVisuals and the number of GLX Visuals can be significantly different.
commit 17cd26225749a1daf7460b44e52f43082399b265
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Wed Jun 4 16:05:36 2008 +0930
dmx: don't dereference a nullpointer.
commit 75eb635e3543fcb731331d01f50e62b696967667
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Tue Jun 3 22:25:33 2008 +0930
dmx: add stubs for DeviceCursorInitialize, DeviceCursorCleanup
commit 3ff2f3a00ef3c484d1d53569b6cbc1f25dc6bd35
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Tue Jun 3 22:17:14 2008 +0930
dmx: for now, don't acknowledge SDs.
commit 5bcd9e8953dfb5f13e90baeebea1f6eac797644b
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Tue Jun 3 22:01:43 2008 +0930
dmx: learn about the existence of IsXExtensionPointer and IsXExtensionKeyboard
commit 8da8a0fec4b1b9d9208635dedb2f449dc99e0004
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Tue Jun 3 21:59:33 2008 +0930
dmx: claim we support XI 2.
We don't really, yet, but at least we get the full device list this way.
commit 6f1d5147cb394b7c83c4c1447c78890fa2b40a45
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Tue Jun 3 21:36:03 2008 +0930
dmx: fix a segfault caused by GC devPrivates never being initalised.
commit d10ba4591a599a317093ffcbdd7cece11ab6de26
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Tue Jun 3 21:28:26 2008 +0930
dmx: some more build fixes.
commit 8d4d0b47a07a298a20ffae9fefe96c8c7ca9dccc
Author: Paulo Cesar Pereira de Andrade <pcpa@mandriva.com.br>
Date: Thu Jun 5 09:19:16 2008 +0930
gl: include assert.h if we're compiling with DEBUG.
Signed-off-by: Peter Hutterer <peter@cs.unisa.edu.au>
commit 8644aa47177bf20f3aa85181032ce75c08270fc5
Author: Paulo Cesar Pereira de Andrade <pcpa@mandriva.com.br>
Date: Thu Jun 5 08:55:09 2008 +0930
mi: minor build fix when compiling with debug enabled.
Signed-off-by: Peter Hutterer <peter@cs.unisa.edu.au>
commit fbf4b5f16ac23359872361c8c95a617fe8c92292
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Wed Jun 4 11:10:46 2008 +0930
dix: set dst->mapWidth when allocating a new map.
commit ff3adf3e564d94fea18e48f966de40a7ded1279e
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Wed Jun 4 11:10:11 2008 +0930
xkb: reset xkb_cached_map on CloseDownDevices.
Could lead to some invalid pointers in the second server generation.
commit 40855d8000b9b9f4e6c6b4317542378ecf516345
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Wed Jun 4 12:19:28 2008 -0700
XQuartz: Removed async debugging sleep
(cherry picked from commit 7812a8bdf9fab651ea5c07b852b2999547ec628d)
commit ee86b751192b690973ee2a1446a406bc721ce8eb
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Wed Jun 4 12:01:19 2008 -0700
XQuartz: use a condition variable to signal when darwinEvents is ready rather than polling
(cherry picked from commit ff1c443cadf11d12a7d939e51194f6105153870e)
commit 38da26cd36957a45b2a47ef124282f7d863a9fd3
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Wed Jun 4 11:35:24 2008 -0700
XQuartz: Don't forget to destroy the mutex and cond after we're done with them
(cherry picked from commit c3558bb8cd889e5b957190e9f5d23afad1e17b72)
commit ea40fcf4344c6e918d3be34354528940b05a70f3
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Wed Jun 4 11:18:52 2008 -0700
XQuartz: Fork for trigger
(cherry picked from commit dd0f8a0f59593d7831fe09a2a086fcd57c84910e)
commit 2393dae6ffff7db8281a7977039450e8754cc19f
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Tue Jun 3 00:06:26 2008 -0700
XQuartz: Switched over to new startup path for testing. Cleaned it up a bit. Server still crashes when using the icon to launch =/
(cherry picked from commit 7f840e9dc180421eaa9b0ea3ab993fdd5b2466e5)
commit 45b661c67aca1a728f1793dd94d701488f1f196c
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Wed Jun 4 13:39:39 2008 +0930
dix: Fix build with --disable-xinerama #16204
X.Org Bug 16204 <http://bugs.freedesktop.org/show_bug.cgi?id=16204>
commit cba8b25a7e2608cd093283f86f08fba50a6a62f7
Author: Alan Hourihane <alanh@tungstengraphics.com>
Date: Mon Jun 2 11:17:47 2008 +0100
Bring inline with current modesetting-101 branch for connector/encoder changes
commit 26e7e69ab893d1f2b35213250ada40ec90944f62
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Mon Jun 2 11:04:41 2008 +0930
kdrive: don't post motion event if there was no motion. #16179
Based on the patch by Tomas Janousek.
X.Org Bug 16179 <http://bugs.freedesktop.org/show_bug.cgi?id=16179>
commit ac1db454497ff1839aa7f7ee0649ede112824ed9
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Mon Jun 2 10:40:10 2008 +0930
xfree86: suspend signals while removing a device (corrected version).
Block/Release is now symmetrical.
commit 95ecaa411aefbcd8e2e00814132cb07b4be4e5bf
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Mon Jun 2 10:38:45 2008 +0930
Revert "xfree86: suspend signals while removing a device."
Left the signals blocked hanging after removing a master device.
This reverts commit 74372fd0049676787904f1f9f80f836b97f5f60e.
commit 5ba07cb54803b8c63e25e8ca1f1787860f684612
Author: Tiago Vignatti <vignatti@c3sl.ufpr.br>
Date: Sun Jun 1 18:31:52 2008 -0300
kdrive: changes ephyr API according mpx merge.
This fix host-cursor in Xephyr server.
Signed-off-by: Tiago Vignatti <vignatti@c3sl.ufpr.br>
Signed-off-by: Peter Hutterer <peter@cs.unisa.edu.au>
commit 5a3d06b8f42473cea3741dc722a775deaa2b73f6
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Sun Jun 1 15:20:42 2008 +0930
xkb: delete default rules when devices are closed.
We only have one set of default rules options in xkb. When the second keyboard
is brought up with Xkb options specified, these new options overwrite the old.
In future server generations, the rules used for the VCK are a mixture of the
default ones and ones previously specified for other keyboards. Simply
resetting the xkb default rules to NULL avoids this issue.
Reproducable by setting XkbLayout "de" and XkbVariant "nodeadkeys". In the
second server generation, the VCK has "us(nodeadkeys)". This again produces a
SIGABRT when the first key is hit.
I could not figure out why the SIGABRT happens. This patch is avoiding the
issue rather than fixing it.
commit 5ebe76f13fb6e96cebe5a386024a73eceeb828ff
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Sat May 31 22:13:03 2008 +0930
config: init dev to NULL to shut up a valgrind warning.
commit a7ae9cbd78193fdafcafd5d7af1f6fabbb434628
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Sat May 31 20:44:58 2008 +0930
dix: don't read valuators past numAxes.
commit f79ad5674ed41c3626e8055cd2bac0135de928c6
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Sat May 31 18:46:35 2008 +0930
kdrive: fix up callers to KdQueueEvent, need to pass xEvent, not EventListPtr
commit 58d12c99abc4d06cb8b43386d4bcd126f0bedf83
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Sat May 31 18:45:11 2008 +0930
mi: Remove #ifdef XINPUT, kdrive otherwise won't get events.
commit 942086fc965fc9a24be2db4f537f0ff54db51083
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Sat May 31 18:17:49 2008 +0930
dix: ProcQueryPointer doesn't need special grab handling, PickPointer does it
commit 6cecae0e8651b1fa58b3cd0e0a636db46f56f6a6
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Sat May 31 13:12:53 2008 +0930
dix: Remove superfluous comment.
This code can handle devices with < 2 valuators now.
commit 105d28652d1fb80dd8ce8511e2605dccc8812e99
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Fri May 30 15:20:35 2008 +0930
Xext: use GPE/GKE from XTestFakeInput #16145
This commit fixes two problems:
1) XTFI used to assemble the event itself, then passed it to the device. It's
much easier to just pass the variables into GPE/GKE and let the DIX do the
rest.
2) XTFI would pass the VCP/VCK as default device to event processing. As a
result, updating LEDs would be updated on the VCK, not on the actual keyboard.
Instead, we now pass the events through the last-used SD, thus toggling the
LEDs on the last keyboard that sent through this MD.
Also some cleanup in XTFI to merge validity checks a bit closer together
rather than having several different sections.
This breaks XTestFakeMotion with Xinerama though.
X.Org Bug 16145 <http://bugs.freedesktop.org/show_bug.cgi?id=16145>
commit 341a61b608873c77b1a17fe7d145ed3ad716e5a3
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Sat May 31 12:01:47 2008 +0930
mi: reduce noisyness. DebugF is enough if device ID can't be changed.
Also - printing out the event type is actually helpful.
commit 62c1a32976d571f3ced1812b8b96ed5a8e658b4a
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Sat May 31 10:24:37 2008 +0930
dix: null out dummyDev, otherwise Xephyr dereferences random pointers.
SendEventToAllWindow eventually causes a IsInterferingGrab(), which attempts
to dereference dev->deviceGrab.grab.
commit 150c2f55a508ed24b230f68e30ec140c0901d9ae
Author: Julien Cristau <jcristau@debian.org>
Date: Fri May 23 03:09:04 2008 +0200
Add xkbstr.h and xkbsrv.h to sdk_HEADERS
commit f9bcecbe51e4cf0cb2d82ad953f8c6741ed5558b
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Thu May 29 17:42:49 2008 +0930
Xext: only free events in case of core motion events.
commit 000ead4503ddcfdf66ce9fffc572a3a741f4055a
Author: Alan Hourihane <alanh@tungstengraphics.com>
Date: Wed May 28 19:59:38 2008 +0100
Plug in hardware cursor support
commit f9f7a872bf3f8522213aabb291d9d54e56d48c4b
Author: Alan Hourihane <alanh@tungstengraphics.com>
Date: Wed May 28 15:55:36 2008 +0100
Run indent
commit 106bea5ad1bdd5795d6ed625fc6351a161bffa6e
Author: Alan Hourihane <alanh@tungstengraphics.com>
Date: Wed May 28 13:33:07 2008 +0100
Initial commit of new modesetting driver
commit 8cf7755a85f5c1e5da7805c12b7511581a368782
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Wed May 28 18:05:25 2008 +0930
Require x11proto 7.0.13, xextproto 7.0.4 and inputproto 1.9.99.1
commit 9b544fa40062b342ff3aa75f8f21d0bd4cec80ab
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Wed May 28 12:27:07 2008 +0930
mi: ansify.
commit 64677f6a167a5bee99e5dfb599a3c3a6fb5dffe7
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Tue May 27 21:01:26 2008 +0930
xfree86: fix offset error in EDID parsing. #15964
X.Org Bug 15964 <http://bugs.freedesktop.org/show_bug.cgi?id=15964>
commit c8af7ce35a900ac9b898f51c1b95dabad3ba1d76
Author: Paulo Cesar Pereira de Andrade <pcpa@mandriva.com.br>
Date: Fri May 23 13:50:39 2008 -0300
Correct a NULL pointer deference
The problem happens if Monitor/Card combo doesn't provide EDID info,
and the XFree86-VidModeExtension extension is used.
Signed-off-by: Peter Hutterer <peter@cs.unisa.edu.au>
commit 3a1278907ea8059546c7b9ab0c02714832c693e3
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Mon May 26 18:01:07 2008 +0930
xfree86: Bump XINPUT ABI to 3.0.
commit 0050165a67bb462e0bf644a11644ad9d587c62bb
Author: Simon Thum <simon.thum@gmx.de>
Date: Mon May 26 17:56:08 2008 +0930
input: change dxremaind, dyremaind to floats for better acceleration #9156
X.Org Bug 9156 <http://bugs.freedesktop.org/show_bug.cgi?id=9156>
Signed-off-by: Peter Hutterer <peter@cs.unisa.edu.au>
commit 26c1958c322be3ac4dfec9ba2c41c5202bd03709
Merge: 5fe57787fa 29586101dc
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Mon May 26 17:37:31 2008 +0930
Merge branch 'master' into mpx
commit 5fe57787faa2ea4f2f57b25455d200bf924206d6
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Mon May 26 17:23:34 2008 +0930
dix: store the absolute values in the motion history.
The core protocol requires absolute values and it's a bit hard to get them if
we only have relative ones in the history. Switch the motion history to
absolute, and if we really need the relative values, we can probably generated
them from the abs. ones in the future.
commit 1883485edd7eb90c0b76bca41c71e26ae2c0b91a
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Mon May 26 16:35:23 2008 +0930
If core motion history is required, scale back to screen coords and INT16.
commit 0b88510069bdf6d020d73b424f62c2923c0db4a4
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Mon May 26 13:53:45 2008 +0930
Ensure the motion history is merged for master devices.
Add each event to the master's MH as well as to the SDs. In the MD, store
min/max and the actual value. When retrieving the MH, rescale all coordinates
to the current coordinate range and only post those valuators that are
currently active on the device.
commit d22c25bda450f6f1dfa634f0f72b32c4bec429cd
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Mon May 26 09:26:18 2008 +0930
dix: Allocate MD's motion history to be large enough for potential valuators
Since we can't predict how many valuators may be in a future SD attached to an
MD, we need to preallocate a history buffer that is large enough to keep
MAX_VALUATORS coordinates per event.
In addition, the history buffer needs to memorize the coordinate ranges at the
time, thus requiring MDs to store (min_val, max_val, current_val, time)
instead of (current_val, time) for each motion history entry.
This commit only fixes the allocation.
commit 0877de13ac6ddfb55108aa3456d47f970c6c442c
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Sun May 25 22:49:54 2008 +0930
Remove GetMotionProc from ValuatorClassRec.
With the MD/SD device hierarchy we need control over the generation of the
motion history as well as the conversion later before posting it to the
client. So let's not let the drivers change it.
No x.org driver currently uses it anyway, linuxwacom doesn't either so dumping
it seems safe enough.
commit 00b4339168c10dd4ce026deb8e04bfb63dfd11dc
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Sun May 25 22:34:11 2008 +0930
dmx: remove some #if 0'd code.
commit 096117cf023dc92dcadc91677931fc6ad1feb4a0
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Sun May 25 10:38:33 2008 +0930
Xi: reset motion history when swapping device classes.
This isn't really the correct solution, but it'll have to do until I figured
out how to transfer the history over correctly.
commit 29586101dc11d498b212510f8dedbfeca7f8c859
Author: Michel Dänzer <michel@tungstengraphics.com>
Date: Sat May 24 20:01:41 2008 +0200
EXA: Only record damage generated by rendering operations.
Recording damage from other operations (e.g. creating a client damage record)
may confuse the migration code resulting in corruption.
Option "EXAOptimizeMigration" appears safe now, so enable it by default. Also
remove it from the manpage, as it should only be necessary on request in the
course of bug report diagnostics anymore.
commit f6d61d3d86971d6a202b46ff2fab8c8799a4d057
Author: Michel Dänzer <michel@tungstengraphics.com>
Date: Sat May 24 20:01:36 2008 +0200
EXA: Don't migrate twice in exaImageGlyphBlt.
exaPrepareAccess already handles migration.
commit d73304398255e0c3b03a497a8d4a2f8d900eef44
Author: Michel Dänzer <michel@tungstengraphics.com>
Date: Sat May 24 20:01:31 2008 +0200
EXA: Don't suggest exaCopyDirty be inlined.
Leave the decision to the compiler toolchain.
commit 3baf3b42e079b4e7b61c1e20df305db0724d21f8
Author: Michel Dänzer <michel@tungstengraphics.com>
Date: Sat May 24 20:01:21 2008 +0200
EXA: Specify region used for source pixmap migration in exaCopyNtoN.
Avoids excessive migration overhead in some pathological cases. See
http://bugs.freedesktop.org/show_bug.cgi?id=15845 .
commit ba557e0263eee0b75847c596f31c71492611b22c
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Sat May 24 17:23:10 2008 +0930
Xi: remove deprecated comment.
Axis clipping wouldn't be necessary here, it's already performed in GPE.
commit e6cbb1e11e5da1a8b9001853c25f4e5a052e7110
Author: Julien Cristau <jcristau@debian.org>
Date: Fri May 23 23:00:40 2008 +0200
xfree86: fix build on GNU/kFreeBSD
GNU/kFreeBSD defines __FreeBSD_kernel__, but not __FreeBSD__.
Unify preprocessor conditionals between variable declaration and use.
Debian bug #482550.
commit 6c72961d8fa1ab1543f1b3e2cc7d34ff6d254bf8
Author: George Sapountzis <gsap7@yahoo.gr>
Date: Fri May 23 22:39:35 2008 +0300
glx: fix memory corruption with r5g6b5
should cherry-pick to xserver-1.5
commit 21a8052fdca2115668dfc747b0b58db437b4eb6d
Author: George Sapountzis <gsap7@yahoo.gr>
Date: Fri May 23 22:39:09 2008 +0300
glx: fix forgotten swrast -> SWRast
commit 877e6c35ff1f0f110627590ac0f12fddf47de506
Author: George Sapountzis <gsap7@yahoo.gr>
Date: Fri May 23 22:38:36 2008 +0300
glx: missing swrast is fatal
commit 1345c93ad4be875951256dae87bc4fd9a1b5e08a
Author: George Sapountzis <gsap7@yahoo.gr>
Date: Fri May 23 22:38:11 2008 +0300
glx: drop stray glcore.h include
commit ae0504d34d245f15b2f098a63ad1a9e1c4daef35
Author: George Sapountzis <gsap7@yahoo.gr>
Date: Fri May 23 22:40:03 2008 +0300
kdrive: need not export symbols for glx anymore
commit 7082929ef7db20b507dce5a8cec043e787d0b55e
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Fri May 23 02:27:58 2008 -0700
XQuartz: A 2 second delay for launchd socket connections should be sufficient.
(cherry picked from commit 2bb4251b3c6b30dbf1a556e1b51e6f03f02d2529)
commit 5a388b27a094c71b4214aa744b2ba0fdda7fd607
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Fri May 23 02:10:14 2008 -0700
XQuartz: Add the launchd fd to AllSockets as well
(cherry picked from commit 83f72529394be5871671d73b6ef4f8bc83708f8a)
commit 77b688a73025238ed9fe286a2bae8f78da65fce3
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Fri May 23 02:32:28 2008 -0700
XQuartz: Don't need launchd checking in configure.ac anymore since its functionality has been removed from libxtrans and into the mach startup code.
(cherry picked from commit 1e1f4fb717d2f3a3227be2a034d28d6a4f29b5d1)
commit 225dddbaeded4d64fcc104da538449e5c4dedd2d
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Fri May 23 01:39:02 2008 -0700
XQuartz: Move the launchd display grabbing into mach_startup
(cherry picked from commit c3866c98d23020d2151977ee1177b6054d05832e)
commit 3a22190061c7ebefee85564b0def5e1112c07ae8
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Mon May 19 03:13:09 2008 -0700
XQuartz: Fixed a few issues with fd passing... still not working =(
(cherry picked from commit 7dd351271522b475d8017e4bd1618f12817ee2fa)
commit 3ae0f4fc832462444d03024c5fbb867f19d5e960
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Fri May 23 15:02:43 2008 +0930
dix: update valuators > 2 as well.
master->last.valuator[x] for x > 2 is undefined. For all other devices, it's
the respective device's last valuators.
If the lastSlave did not have a valuator that is to be updated now, it is
reset to 0.
commit 0d1b41ace38bc918e2cc2a0a6ad107c76346fd00
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Fri May 23 13:32:33 2008 +0930
Xi: update device valuators based on the event.
Event is always absolute, update the device's valuators (always absolute too),
and then change the deviceValuator event to reflect the device's reporting
mode.
commit 7eec1c23a34591064ea64499acb24f22ada08dfa
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Fri May 23 13:23:02 2008 +0930
dix: don't allow relative data in deviceValuators.
In GPE, we don't care about the device mode. Let's put the absolute values
into the deviceValuator event and worry about relative valuators on the other
side of the EQ.
commit 75551a2ef949c2cfb53fdc4b97f3964a5e2f45f5
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Fri May 23 12:55:50 2008 +0930
Revert "dix: Correct values in the device axisVal are calculated in GPE"
We can't rely on GPE to update device->valuators->axisVal. If a SIGIO occurs
during event processing this may have incoherent results.
This reverts commit f6645ddbf754c80e9a8b1672519534a887622270.
commit fe59b1a62b2c7f467d20132db4913317bbf308eb
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Fri May 23 12:51:52 2008 +0930
dix: more device scaling insanity.
Assuming master->last.valuators is in screen coords, SD's are always in device
coordinates.
1. If an event comes in, scale masters->last to the device, drop into device's
last->valuators.
2. Apply motion from the actual event
3. Scale back to screen coords, check if we may need to cross screens
4. Drop screen coords into master->last
5. Rescale to device coords, drop into deviceValuator event and SD->last
6. Drop screen coords into ev->root_x/y
Whoopee...
commit 6c9e9f8a40e20fb1761440acd2755f5fd31f4d44
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Fri May 23 11:51:53 2008 +0930
input: instead of lastx/y, use a last.valuators[] array on the device.
During GetPointerEvents (and others), we need to access the last coordinates
posted for this device from the driver (not as posted to the client!). Lastx/y
is ok if we only have two axes, but with more complex devices we also need to
transition between all other axes.
ABI break, recompile your input drivers.
commit fb146cbb0f28e4e480e5d16d61476ac46b5d00ce
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Fri May 23 12:00:13 2008 +0930
dix: coreEvents doesn't have meaning here, use master instead.
We mustn't clip x/y if we are attached, otherwise we can't change screens.
commit fc1cc0adcb91fdfa4c547bf379a85f9558c959ff
Author: Magnus Vigerlöf <Magnus.Vigerlof@ipbo.se>
Date: Fri May 23 00:33:18 2008 +0200
dix: Cleanup of GetPointerEvents
Changed all the checks for x&y valuator so the more complex
calculation is only made once.
Added TODOs for valuator/axis 2 and above for future correct
handling of relative reporting of these.
Signed-off-by: Peter Hutterer <peter@cs.unisa.edu.au>
commit a0241d5380bb5d8b10865f8ea81a9a011de4aaf1
Author: Magnus Vigerlöf <Magnus.Vigerlof@ipbo.se>
Date: Fri May 23 00:36:11 2008 +0200
dix: Correct clipAxis so it can handle devices with value ranges properly
Signed-off-by: Peter Hutterer <peter@cs.unisa.edu.au>
commit f6645ddbf754c80e9a8b1672519534a887622270
Author: Magnus Vigerlöf <Magnus.Vigerlof@ipbo.se>
Date: Thu May 22 23:33:45 2008 +0200
dix: Correct values in the device axisVal are calculated in GPE
Signed-off-by: Peter Hutterer <peter@cs.unisa.edu.au>
commit 7f85acdf70c67c567de688439e25081be5a7d5df
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Thu May 22 23:27:15 2008 +0930
dix: fill valuators with the correct values depending on the device mode (GPE)
valuators[] is passed from the DDX. Depending on the device mode, update it
with either absolute values or relative values. The deviceValuator event sent
to the client will then contain the respective values.
commit 1a3f351c50cba66f71a73239318174b09fd9b63b
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Thu May 22 23:25:20 2008 +0930
dix: when floating a device, create a new cursor sprite.
This is essentially necessary to allow calls to miPointerGetSprite etc. to
work for floating slave devices.
commit e0fbe404a436aef24624a3a15e8405a9ca38aadb
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Thu May 22 23:24:29 2008 +0930
mi: handle sprite even for floating slave devices.
We still don't render it, but we accept all the other calls to update it's
internal state.
commit 0f15875a271889ae3cc4997ad15f787ea28b3a08
Author: Magnus Vigerlöf <Magnus.Vigerlof@ipbo.se>
Date: Sat May 17 19:24:00 2008 +0200
Make all conversion handling in GPE.
This isn't quite finished yet, but at least it gives us the ability to use a
tablet as a normal mouse - with all the scaling in place.
Signed-off-by: Peter Hutterer <peter@cs.unisa.edu.au>
commit 74372fd0049676787904f1f9f80f836b97f5f60e
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Thu May 22 18:02:10 2008 +0930
xfree86: suspend signals while removing a device.
Getting a keyboard event while halfway through freeing memory can be
unpleasant.
commit 30e9a33f7d1972dcf1c29c7455b2cea4e5857913
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Thu May 22 16:00:21 2008 +0930
xkb: fix crash caused by uninitialised variable.
commit e837244947fbb18192e9056c070ce439ef24d1a3
Author: Dan Nicholson <dbn.lists@gmail.com>
Date: Wed May 21 16:14:55 2008 -0700
Actually enable building GLX without Mesa source
commit ea4ec9e9983e25d94a3edf8a77ed2ad1db193284
Author: Dave Airlie <airlied@redhat.com>
Date: Tue May 20 13:59:09 2008 +1000
int10: add pci_device_enable support on Linux
commit 4230b92744d54528f48ddc3b096a265b488053c9
Author: Kristian Høgsberg <krh@redhat.com>
Date: Wed May 21 17:58:15 2008 -0400
Clean up remaining afb references.
commit 20ea99c655140e101f2d20cfab78fb22765fec62
Author: Adam Jackson <ajax@redhat.com>
Date: Wed May 21 17:03:25 2008 -0400
Death to afb.
Planar framebuffer people, please talk to wfb for all your 1988 hardware
needs.
commit c76fddeea28b4f88db97a2a3487d7a57cd9d578c
Author: Dan Nicholson <dbn.lists@gmail.com>
Date: Wed May 21 10:51:15 2008 -0700
Fix up paths for GL/glx -> glx renaming
commit c3eb5b80d8cc7ca6a425ccf359718d1ef3d5af55
Author: Kristian Høgsberg <krh@redhat.com>
Date: Wed May 21 13:33:36 2008 -0400
Move GL/glx on level up now that it's the only thing left under GL.
commit a8a9b40e554dd0c184866978889a39519afc466a
Author: Kristian Høgsberg <krh@redhat.com>
Date: Wed May 21 12:34:07 2008 -0400
Move the windows GL files to the xwin DDX.
commit e5aad4bc087036489e2af576628aa9b612054a6e
Author: Kristian Høgsberg <krh@redhat.com>
Date: Wed May 21 11:44:12 2008 -0400
Get out of the mesa symlinking business.
This copies over the files generated from mesa/src/mesa/glapi. There's
a corresponding mesa commit that makes it easy to generate the glapi files
straight into the xserver tree when the XML definitions change.
The only few files that are copied from mesa but aren't generated are
glapi.[ch] and glthread.[ch]. Everything in there is technically DRI
driver API and the whole setup is still a bit fragile, but it's not a new
problem.
The --with-mesa-source configure option is still around since other
parts of the server (XGL and DMX - grep for MESA_SOURCE) need that,
but for common case of building with GLX and AIGLX support, that
option is no longer needed.
commit f558c7d4d1d87affe1ce4aec2e62ff64545f2bc8
Author: Kristian Høgsberg <krh@redhat.com>
Date: Wed May 21 10:18:16 2008 -0400
Use LD_EXPORT_SYMBOLS_FLAG when linking Xnest.
commit 77ff8fd5072fa57158463bfd84656389eeb7b503
Author: Kristian Høgsberg <krh@redhat.com>
Date: Wed May 21 10:17:53 2008 -0400
Drop glcore GLX provider.
Obsoleted by the DRI swrast driver.
commit 61eaef22359ae2abcee7dcd73ee8610a83776fc7
Author: Kristian Høgsberg <krh@redhat.com>
Date: Tue May 20 16:56:27 2008 -0400
Stop symlinking glcontextmodes.[ch] from mesa.
commit 88f43e5d06fb5543bc40ca060b2c5d8e2673afad
Author: George Sapountzis <gsap7@yahoo.gr>
Date: Wed May 21 18:13:47 2008 +0300
glx: drop drm.h, sareaHandle from swrast loader
commit 255142b61eb73843b16c2afdb95aa4d1f27e4f0d
Author: George Sapountzis <gsap7@yahoo.gr>
Date: Thu Jan 3 17:53:56 2008 +0200
drop xprint remnants: InitGlobals
commit 641ce9c706ce3cbf726fb3fc9623161bb96ba127
Author: George Sapountzis <gsap7@yahoo.gr>
Date: Thu Jan 3 17:28:04 2008 +0200
drop xprint remnants: xpstubs
commit 5c5a1eaf68eb11053fd5b99d24eb8024b6d5b218
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Wed May 21 21:51:27 2008 +0930
Replace UniSA with full Uni name in Author affiliation.
Big boss says UniSA isn't unique enough. Who am I to argue?
commit 7509fb498c02fe1cebe4139612b8871ec877c130
Merge: 2ae3bed337 dfb7de6571
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Wed May 21 16:25:35 2008 +0930
Merge branch 'hwcursor' into mpx
commit 2ae3bed33731d800bb28a968e3a1c8066d179740
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Wed May 21 15:51:35 2008 +0930
mi: shut up compiler warning (return w/o a value)
commit 8b3d26f5b6caff1766669deb0e2100d2dee3f185
Author: Aaron Plattner <aplattner@nvidia.com>
Date: Tue May 20 12:39:28 2008 -0700
Short-circuit PanoramiXTranslateVisualID after verifying that the visual actually exists first.
This allows using PanoramiXTranslateVisualID to test whether a given visual made
it through PanoramiXVisualConsolidate.
commit 6ff6465931c397f72db27a4fd0ca0dcac0609537
Author: George Sapountzis <gsap7@yahoo.gr>
Date: Tue May 20 16:36:22 2008 -0400
Add loader for the swrast dri driver.
commit 4056595fc77c20052e226b402e38a2a914dca123
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Tue May 20 18:57:31 2008 +0930
xkb: remove superfluous checks in if statement.
commit 925e895b869e461a9e7f135891463c56ee633cd6
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Mon May 19 18:43:29 2008 -0700
Restore return type on xf86SetScrnInfoModes
Seems to have been accidentally lost by commit 76943fec860315f3c93539e59a59080b8a7b3e75
commit 7a550cefd9417c22a4397ea4d103ddc347ab1a0f
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Tue May 20 11:07:39 2008 +0930
dix: shut up two compiler warnings.
commit f9edecd1b53a2e234def9cbd954a47c4bda2bebc
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Tue May 20 11:07:17 2008 +0930
mi: sync declaration and definition of mieqResizeEvents.
commit e73a03d589b47ac9131f3932da7f78d2fef7bfb5
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Tue May 20 10:54:32 2008 +0930
fb: shut up two compiler warnings.
commit 99d28c3ef37aeffe7d8ec41e45a650ba248c6958
Merge: fc7e2566cc 0178b6a4ab
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Tue May 20 10:20:14 2008 +0930
Merge branch 'master' into mpx
Conflicts:
Xext/xprint.c (removed in master)
config/hal.c
dix/main.c
hw/kdrive/ati/ati_cursor.c (removed in master)
hw/kdrive/i810/i810_cursor.c (removed in master)
hw/xprint/ddxInit.c (removed in master)
xkb/ddxLoad.c
commit 0178b6a4abed0df3e90ba393709ed566105e7c2c
Author: Adam Jackson <ajax@redhat.com>
Date: Mon May 19 11:22:19 2008 -0400
Fix reduced-blanking mode filtering in RANDR 1.2.
If the monitor isn't reduced-blanking (either through EDID logic, or
config file setting), then remove RB modes from the default pool. Any
RB modes from the driver and config file pools will stick around though;
you asked for them, you got them.
commit bb687465d0c5aef3cc1c865e6ea67c01a8b417fb
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Mon May 19 02:45:47 2008 -0700
XQuartz: First stab at SCM_RIGHTS passing the $DISPLAY launchd fd from the stub to server
(cherry picked from commit cccee9cfc29f85cca635df3b8dd54199b45c4df8)
commit 4b69d22bcb79210225379da2cefb0cd8d5ffa10e
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Sun May 18 23:51:06 2008 -0700
XQuartz: Fixed dropped code in the !XKB blocks, disable XKB support until we figure out a solution for xkeyboard-config
(cherry picked from commit 2a72309c061f7060480d150791019ce232481462)
commit e997df8cd3c4222ea9fc3f0ebda728c4d1f15df5
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Sun May 18 23:31:41 2008 -0700
XQuartz: Cleaned up ListenOnOpenFD...
(cherry picked from commit 6fb587d3d5fbbaee9e46cdce24d03e5d1c66d58a)
commit 738672858d9399ecbc170500c15f90bf657502d2
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Sun May 18 23:02:12 2008 -0700
New XQuartz icon thanks to Simone Karin Lehmann
(cherry picked from commit c27e0c8f3c5108192362735db8a80bf3a9a1cc3a)
commit 4be2104c801340075e030d06d24ceb4d8a6d6549
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Thu May 15 12:26:32 2008 -0700
XQuartz: More work towards Mach-IPC startup... started working on FD passing
(cherry picked from commit 27fbfeacfa16d620801ac3492b25c1e50aec8588)
commit 82c4075d4ba3bea03341c80b754b0f9d2f62a826
Author: Julien Cristau <jcristau@debian.org>
Date: Mon May 19 03:15:11 2008 +0200
xfree86: fix initial output positions with Above or LeftOf and rotation
The fix in fa19e84714aa84a2f2e817e363d6440349d0b619 was incomplete,
as it was still using the wrong output's initial rotation to compute
the position.
commit 7dca84f3ee7265119fb81d598d7d2f7363e25f1f
Author: Dave Airlie <airlied@redhat.com>
Date: Mon May 19 11:16:08 2008 +1000
cursor: don't dereference NULL pointer is devPrivates not yet set.
This fixes a bug on server recycle with ati zaphod.
commit 5af5db5033582a84b616d5c50f4288adb0210459
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Sat May 17 14:51:09 2008 -0700
XQuartz: Ok, pass XQUARTZ_USE_XKB since it breaks worse without it... but we have issues when we have the keyboard configs installed... need to figure out what to do there...
(cherry picked from commit 301262b07024ad960f22d99a1267fe137f5c3fce)
commit 2408303d79297385063cae557195bd5fd3698478
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Sat May 17 14:56:53 2008 -0700
XQuartz: Added functionality to add a file descriptor to the connection list after the server is already running.
(cherry picked from commit 543c2cd68d1ffef65d4644b860faad7191c6b9da)
commit 01612fe612aa27262fc3c8167f52e0376941f1ef
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Thu May 15 07:08:21 2008 -0700
XQuartz: Disable xkb since it doesn't work after getting xkeyboard-config installed
Need to setup configs for the quartz keyboard
(cherry picked from commit c28fecc621b1803a4d4536afbc724d141de9e6ee)
commit 1d09deaa6e5a75420ea4f24f6b5533f0ebc3ba28
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Thu May 15 05:49:43 2008 -0700
XQuartz: Made DarwinSendDDXEvent a little more robust to context switching diring server init.
(cherry picked from commit 5626b0949b1a6bdd2fa3ec2ef53a688084349b87)
commit adc62f62b9f08aa6633718989ab61b61e3c1e8e2
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Wed May 14 01:33:43 2008 -0700
Xquartz: Xquartz stub now can send Mach IPC to start the server.
(cherry picked from commit 55a3bca8ea42f8677897f94bf0a429bdc08c6696)
commit 93c082a060bfa8d2a204c0c57ec3507a8edea087
Author: Brad Smith <brad@comstyle.com>
Date: Sat May 17 13:14:31 2008 +0200
OpenBSD doesn't define __x86_64__, simplify tests.
Seeing as this code seems to be specific to OpenBSD I don't think
__x86_64__ should have been added there at all. It appears to have
been added wherever __amd64__ existed before which is wrong. I
think that part of the commit should be reverted but also all four of
the checks should be __OpenBSD__ && __amd64__ instead of two one
direction and two flipped.
commit 895d4e274d2b4638f0e6838dfee0e543311dba34
Author: Brad Smith <brad@comstyle.com>
Date: Sat May 17 13:05:58 2008 +0200
BSD's also have /dev/urandom.
commit aad1c37b0951eae216ac323c5d8bfc6fbcf096bd
Author: Adam Jackson <ajax@redhat.com>
Date: Fri May 16 10:52:41 2008 -0400
RANDR 1.1 compat: remove senseless comparison against the virtual size.
commit 14726b776d6cebb7d864b6ffa7554e1ce5637d5c
Author: Adam Jackson <ajax@redhat.com>
Date: Fri May 16 10:51:32 2008 -0400
xf86SetDesiredModes(): Skip disabled CRTCs first thing.
commit 459f34b089aca4f4eee9752600c3a9e4f4e343ab
Author: Adam Jackson <ajax@redhat.com>
Date: Fri May 16 10:48:00 2008 -0400
Fix initial mode selection even harder.
The first guess used to be "is the preferred mode for one output the
preferred mode on all outputs". Instead, do "find the largest mode that's
preferred for at least one output and available on all outputs".
commit 96111c154713600dd534dd82104ac18b91466202
Author: Adam Jackson <ajax@redhat.com>
Date: Fri May 16 10:31:58 2008 -0400
Redo RANDR compatibility output selection.
Old logic was just the first one that happened to have an associated
CRTC. The new logic tries to find one that's definitely connected, has
probed modes, and has the largest candidate mode.
commit a4bbe1c8bca08f3df5ff7e50444af6aef7ec8b25
Author: Adam Jackson <ajax@redhat.com>
Date: Fri May 16 10:25:12 2008 -0400
Re-add sync range inference from legacy setup to RANDR 1.2.
commit f52f6c5c7efc281f9ac204fbaa4f71383df7463d
Author: Adam Jackson <ajax@redhat.com>
Date: Mon May 5 14:37:07 2008 -0400
Fix hal shutdown crash.
Removing the device invalidates its ->next pointer. Copy it aside before
destroying the device.
commit 99e4531f7c3fafce065dfd21f65bad1cf190c3f1
Author: Adam Jackson <ajax@redhat.com>
Date: Fri May 16 08:16:01 2008 -0400
The great kdrive purge.
Most of these drivers didn't work. ati was the only one that even came
close. The igs, ipaq, itsy, pcmcia, savage, sis530, trident, trio, ts300,
and vxworks directories have never built since modularisation, so clearly
no one can miss them.
commit fc7e2566cc076c0d979f74871bc436df43401058
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Fri May 16 16:59:34 2008 +0930
Xext: fix typo in condition.
Fall-out from dc3aba8a559d4304844ee1cc306c577a63b82762.
We must free the event if it is NOT an extension event.
commit 6fb76acc4524d6af4bfb6bc6d862c1ee2bbb8baa
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Fri May 16 19:22:32 2008 +0930
mi: remove miPointerUpdate() -> replaced by miPointerUpdateSprite().
In the xnest and vfb DDX we don't need the call anyway, it's performed by
mieqProcessInputEvent.
commit dfb7de6571345061d1cd88ab915064fc376529fd
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Fri May 16 20:56:04 2008 +0930
mi: don't call from miPointerMoved into the spriteFuncs for anything but VCP.
Calling ->MoveCursor for anything but the HW-rendered VCP causes the
SW-rendered cursor routines to be started, including mallocs, etc. Since
miPointerMoved is called during SIGIO, this is a bad idea.
commit f611719edce2ae51dca8e53947a3938b53c20b00
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Fri May 16 19:49:29 2008 +0930
xfree86: always render first cursor in HW, all others in SW.
commit 48ba58feacedf9781db81c82adbb37197d9a5cd1
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Fri May 16 19:22:32 2008 +0930
mi: remove miPointerUpdate() -> replaced by miPointerUpdateSprite().
In the xnest and vfb DDX we don't need the call anyway, it's performed by
mieqProcessInputEvent.
commit 622d7c1d899a6146773a2ebd1d632a805f24025e
Author: Tiago Vignatti <vignatti@c3sl.ufpr.br>
Date: Wed May 14 14:49:09 2008 -0300
Restructure and organize the code.
It was removed and simplified some conditionals. We don't need test for
pDev->isMaster inside xf86CursorSetCursor() because only MD enters there.
In the last chunk, ScreenPriv fields were being assigned without need, so
that code was wrapped inside the conditional to avoid it.
I also tried to make the identation more sane in some parts that I touched.
Signed-off-by: Tiago Vignatti <vignatti@c3sl.ufpr.br>
Minor modification, part of the original patch led to cursors not being
updated properly when controlled through XTest.
Signed-off-by: Peter Hutterer <peter@cs.unisa.edu.au>
commit 5af90025fee6a92e7d94642978feed21f902d0cb
Author: Tiago Vignatti <vignatti@c3sl.ufpr.br>
Date: Wed May 14 02:45:49 2008 -0300
Remove redundancy.
The only function that cat set SWCursor before xf86DeviceCursorInitialize()
is xf86InitCursor() when VCP and is created.
Signed-off-by: Tiago Vignatti <vignatti@c3sl.ufpr.br>
Signed-off-by: Peter Hutterer <peter@cs.unisa.edu.au>
commit 9fc94edfe3df4c4a84ad70714c0a4ef8bbf57fc9
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Fri May 16 16:59:34 2008 +0930
Xext: fix typo in condition.
Fall-out from dc3aba8a559d4304844ee1cc306c577a63b82762.
We must free the event if it is NOT an extension event.
commit 5127942f80983b2e053dddd5c5747d0c3d2f9d6d
Author: Brian Rogers <brian_rogers@comcast.net>
Date: Fri May 16 10:08:04 2008 +0930
DGA: pass nevents to UpdateDeviceState. #15936
Missing parameter caused event processing to go nuts when checking valuators.
X.Org Bug 15936 <http://bugs.freedesktop.org/show_bug.cgi?id=15936>
Signed-off-by: Peter Hutterer <peter@cs.unisa.edu.au>
commit 28378d26b4bae377ef1212f6a51cda9b5529f1b5
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Thu May 15 11:09:15 2008 +0930
Xi: assemble button/modifier state before updating the device. #15934
The state field of the event must specify the state of the devices before the
event occured. With the code as it was, the state would also include the
event (e.g. state from a button press event would show the button as pressed)
Gathering the state before updating the device should fix this.
X.Org Bug 15934 <http://bugs.freedesktop.org/show_bug.cgi?id=15934>
commit 7cabf81c8638739a15a1be6baa3fc569f38e7589
Author: Eric Anholt <eric@anholt.net>
Date: Thu May 15 13:24:27 2008 -0700
Add necessary include for COMPILEDDISPLAYCLASS.
Fixes build after 07f69023b0e75d98a4be8f0d1c3dd9391b8149a0.
commit 07f69023b0e75d98a4be8f0d1c3dd9391b8149a0
Author: Adam Jackson <ajax@redhat.com>
Date: Wed May 14 16:07:51 2008 -0400
Move defaultDisplayClass to xdmcp-only visibility.
commit 166177e36bfc7bd1df03663ad89500cff056d563
Author: Adam Jackson <ajax@redhat.com>
Date: Wed May 14 16:02:05 2008 -0400
Simplify default font path setup.
commit 2efe1abb6fc786a4f86464978ae0d23fc7347a98
Author: Adam Jackson <ajax@redhat.com>
Date: Wed May 14 15:53:11 2008 -0400
Remove global argc/argv variables.
Was only used in the logging code anymore, and uselessly so there.
commit 6c27b911222cdee9a057de0be7e8b2eff8b1ff2a
Author: Adam Jackson <ajax@redhat.com>
Date: Wed May 14 15:44:04 2008 -0400
Restore compression of duplicate log file entries.
This undoes the workaround for bug #964, which was an Xprintism.
commit 937e5aae33d3b5112b5d10d605e25f57b48caa3f
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Wed May 14 22:30:15 2008 +0930
dix: don't undisplay cursor if we don't own a sprite.
Sometimes we didn't have a cursor when coming back from suspend. Reason was
that the suspend caused the server to lose the device that was attached to the
VCP, and a RemoveDevice() would then set the cursor to NULL.
Solution: only set the cursor to NULL if we actually own the sprite.
commit cbb4e80eb7cc8dc2aff5e5268b49cdb7b3c3d5fa
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Wed May 14 01:13:15 2008 -0700
XQuartz: More work on the Mach-IPC startup path
(cherry picked from commit 49cd0b185fd6c99b07357a74734b6a4023faca84)
commit 3b57c59bb08c9a3211f4ae57d9e2fb569d61bf2f
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Tue May 13 10:40:20 2008 -0700
Xquartz: More work on the new Mach startup
(cherry picked from commit 6237acf75d3310d7d4f262556b677557c2907284)
commit e435acc84cb9477455ad005cee658630cbd363a2
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Mon May 12 17:57:07 2008 -0700
Added missing to EXTRA_DIST
(cherry picked from commit e39613f4633ed992bc276b70833a703560e528f9)
commit f7d6d20ad64b235700185784d317417a94d1814b
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Mon May 12 13:36:35 2008 -0700
XQuartz: Cleaned up the about box.
(cherry picked from commit 0279a5970694937e949ba533330ea48961c4edba)
commit b37e1f1f5ccc5a48df665449b0e31c4d25cc323c
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Mon May 12 11:34:06 2008 -0700
Don't need the fink-friendly printf in the DDX anymore.
(cherry picked from commit fe2279440450c795d67ba5a2234b0797d0bfe39c)
commit 68b4f250eef441a3d75e3b9b2665a51d3a1538d6
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Wed May 14 16:18:48 2008 +0930
dmx: fix build.
Just because it builds, doesn't mean it works.
commit 00db0f35acc00cb771ab1c23f35b0db1c25d81bb
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Wed May 14 15:29:28 2008 +0930
dix: InitAndStartDevices doesn't need a window parameter.
Leftover from the old pointer-keyboard pairing code, obsolete and gone now.
commit da728f2127aaa5c1ed5d22bb9f3d0c8ff19e4933
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Wed May 14 15:17:05 2008 +0930
dix: don't use serverClient in AddInputDevice, use the one supplied instead.
We pass in the client that wants to create the device anyway, lets use the
parameter instead of hardcoding the serverClient.
Wow. I hope this is merge detritus, otherwise it'd be a sign that I didn't
have enough coffee that day.
commit a6659291c798f417a76d9aa7944694ff27c01fa7
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Wed May 14 09:42:50 2008 +0930
mi: protect against NULL-pointer dereference.
Required by the recent patch to use a NullCursor instead of UndisplayCursor().
commit 7cdc19b29d93bf15cecfd6b69e269fab2501bca0
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Tue May 13 16:39:30 2008 -0700
When XKB fails to open rules file, log the file name, not the NULL file pointer
commit dc3aba8a559d4304844ee1cc306c577a63b82762
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Tue May 13 14:37:26 2008 +0930
Xext: emulate XI events from core events when faking input.
We need XI events for event processing, so lets get rid of the pure core
events ASAP.
commit 8b3802d32041547fd6ed5393a56281c5c83d260e
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Tue May 13 13:47:52 2008 +0930
Xext: core button events have rootX/Y unset too.
commit ed65e8b4f02a6da7f1c5d85984a9ccf6a94d0181
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Mon May 12 18:49:34 2008 -0700
Check for strcasestr and workaround it on systems without it
commit 8234af6c6a3ade13f7720743bde79957c7df3f6c
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Tue May 13 11:17:39 2008 +0930
xfree86: remove Ubuntu-ism.
Additional #include was required due to broken libc headers or something like
that. Remove it, there's more to the world than ubuntu alone.
commit 59b8d29b3a91c65787dfadb5610342a62e85c48c
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Mon May 12 21:22:54 2008 +0930
Xi: Fix up ProcIVector, got out of sync with the protocol.
When the opcode squash happened in the protocol, the processing vector got out
of sync for a few requests. As a result, client and server would interpret
requests differently, leading to a couple of BadLength problems.
commit 1fc1a2897e9185838c29d9ffff07c39d2fdf174f
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Mon May 12 20:14:05 2008 +0930
Remove UndisplayCursor API.
We can achieve the same thing by simply displaying a NullCursor, there's no
need for a separate API.
commit 913989d643595030e67e7c0a758a16ae0da62ed9
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Mon May 12 20:05:43 2008 +0930
mi: don't try to display a cursor for devices w/o cursors.
commit 248a1df63430717550adb0e79068d8f9fcfacb0b
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Mon May 12 20:05:21 2008 +0930
render: don't dereference cursor if cursor is NULL.
commit c50b5d978981b13cdb22a9ad41c1b64f90cebe51
Author: Aaron Plattner <aplattner@nvidia.com>
Date: Sun May 4 13:45:27 2008 -0700
Bug #14692: Allow drivers to have a say in Xinerama visual consolidation.
Create a new exported global variable, XineramaVisualsEqualPtr. Use this
pointer to decide whether two visuals are equal during visual consolidation.
This pointer can be wrapped, which allows drivers and extensions to control
which visuals are consolidated. A wrapper can reject the visuals without
calling down, but must call down and return that result if it deems the visuals
equal. This ensures that all layers agree that the visuals are equal.
Pass the screen of the other visual into the VisualsEqual callchain.
Don't free PanoramiXVisuals since we need it for PanoramiXTranslateVisualID.
Don't skip the first visual on the other screen in PanoramiXMaybeAddVisual.
Skip the loop in PanoramiXTranslateVisualID if screen is 0.
commit 86678e7cc2b021851ff508433fa160170f500c51
Author: Adam Jackson <ajax@redhat.com>
Date: Mon May 12 14:53:37 2008 -0400
Fix fbdevhw initialization for PCI drivers.
graphics/fb%d, not graphics:fb%d. Thanks sysfs. Thysfs.
commit 1c8bd318fbaf65890ef16fe26c76dd5e6f14dfde
Author: Adam Jackson <ajax@redhat.com>
Date: Mon May 12 14:15:11 2008 -0400
X n'est pas une print API.
commit f9fae16456c30479b0cb9317e57200af36795785
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Mon May 12 10:36:44 2008 -0700
XQuartz: Added some version checking protection so we don't trigger an infinite exec loop with new /usr/X11/bin/Xquartz and older X11.app
(cherry picked from commit 78032815aeb10c22ff45b49702e9c9df82ab471c)
commit ac4e33a9cd0ca2f0ec76181d11d5b90b82690c05
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Mon May 12 09:27:27 2008 -0700
XQuartz: More startup work... listen if we're the actual server
(cherry picked from commit 3b0afb47c3d8ad922cb2315ed8034f4d77d4a249)
commit a7800d9355377ac02833613c2ffc2423beec9970
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Fri May 9 16:44:31 2008 -0700
XQuartz: Starting to work on the new Mach IPC startup stuff for better launchd, ApplicationServices, and Dock support
(cherry picked from commit 9b67fca9b7d3050d3d5582a5210270db7eb2ed05)
commit 04211c3532ca078420e3745a5eac3d9de120bc32
Author: James Cloos <cloos@jhcloos.com>
Date: Mon May 12 03:03:13 2008 -0400
Prevent the -wm command line option from causing a SEGV
The -wm (when mapped) option for the BackingStore support has been
causing the server to dereference a NULL pointer.
This has probably been the case since backing store has been
implemented on top of Composite.
It looks like (some of?) Composite didn’t expect its WIndowPtr
argument to be the root window.
In Composite’s compCheckRedirect() function we now avoid calling
compAllocPixmap() and compFreePixmap() when the pWin pointer’s
parent member is NULL, as is it the case with a server’s root window.
This addresses:
https://bugs.freedesktop.org/show_bug.cgi?id=15878
commit 7e768c08f7809b8dba4db1931e63314e2b6e1cfa
Author: James Cloos <cloos@jhcloos.com>
Date: Mon May 12 02:53:59 2008 -0400
Clean up whitespace
commit 3b6735528efc6d69ab7a7cd63dd09c87db7ef115
Author: Dave Airlie <airlied@redhat.com>
Date: Mon May 12 16:36:42 2008 +1000
pci: don't do this pci stuff when we don't have hw access
commit 9dfb525f6c91acab5d1a65765a046bf9ee2aa082
Author: Julien Cristau <jcristau@debian.org>
Date: Sun May 11 23:17:27 2008 +0200
kdrive: allow disabling Composite
KdInitOutput() used to enable Composite when it was disabled by default,
but now this hack prevents ``-extension Composite'' from working.
Remove it, as Composite is enabled by default anyway.
commit 1a01e96c6d15ef17a8b5ab1afa361fb12476a25e
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Fri May 9 15:38:44 2008 -0700
Return a valid X error when stuck in font alias loop
Part of fix for Sun bug 4258475
<http://bugs.opensolaris.org/bugdatabase/view_bug.do?bug_id=4258475>
commit 7b3066d9b9099135d9c49e0682161d5568fc535b
Merge: 2a3d1421e0 315f089056
Author: Drew Parsons <drew@emerall.com>
Date: Sat May 10 00:01:15 2008 +1000
Merge branch 'master' of git://anongit.freedesktop.org/git/xorg/xserver into upstream-experimental
commit 2a3d1421e0cc18822ae8f478fcc272e16a9e9340
Author: Drew Parsons <dparsons@debian.org>
Date: Fri May 9 23:20:11 2008 +1000
Disable D-BUS from Xprint.
Use dummy config functions to replace those from config/config.c, and
therefore do not link Xprt with $CONFIG_LIB.
Works around an endlessly spinning loop in dix/dispatch.c::Dispatch()
(WaitForSomething() not waiting) when built with dbus, which was
causing Xprt to use 95% cpu.
commit 315f089056da67d4c463ed002eb2b74e38493b49
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Thu May 8 19:46:03 2008 -0700
XQuartz: Reorganized some of the build system in prep for the Mach IPC startup work.
(cherry picked from commit 2232c91d5c277673929eab2abb5e0495c00877cb)
commit 28ac79450c69219dc501e072c6e5028e7136380d
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Thu May 8 19:47:40 2008 -0700
Updated .gitignore for new Xquartz layout
(cherry picked from commit cd4d2355e227549a3410485a130549dd91ccdcfe)
commit a07c5ad172b343ef26d2b41ff25f143950441c23
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Thu May 8 16:57:42 2008 -0700
XQuartz: Set bundle version to 2.3.0
(cherry picked from commit 8a0524b30e1e860f3ae35741c116fc8da28aef79)
commit 05f23ed3ea6ee0f052aee41b6573325fe0063fd8
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Tue May 6 16:12:41 2008 -0700
XQuartz: Fixed some issue in our bundle creation
(cherry picked from commit 330ffad5477e32c5ab9ed338bc628bd5ae9f4c98)
commit 90b963c0da2b33bdc21483f1a089b95c7e717333
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Tue May 6 16:07:33 2008 -0700
Set CSRG_BASED on OSX
(cherry picked from commit ff085deba18682caa2f93d61a75b38db87d747b1)
commit ff013b0da4e6d33b2b69ce1212e9bd62050574e1
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Thu May 8 16:58:31 2008 +0930
config: override xkb_{r,m,l,v} with Xkb{r,m,l,v} if the latter is set.
The HAL spec says that input.xkb.{rmlv}* can be sent, but if the user
specifies a X-specific {rmlv}, then this is overridden through the use of
input.x11_options.Xkb{RMLV}.
However, the way how the server parses options--by ignoring capitalisation,
underscores and spaces--the HAL and the x11_options would override each other.
So we simply filter the options, letting Xkb{RMLV} override xkb_{rmlv} and
only actually add them to the device after parsing _all_ options.
* rmlv ... rules, model, layout, variant
See Bug 13037 <http://bugs.freedesktop.org/show_bug.cgi?id=13037>
(cherry picked from commit fc35d1e3be201e3821413bb2eeb8d43e1e56ba17)
commit 901978ebe0f446532255701cd536e246e805a55b
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Thu May 8 14:05:56 2008 +0930
config: remove trailing whitespaces.
It makes my vim look ugly. Put "let c_space_errors=1" into your .vimrc.
(cherry picked from commit 1f54c05cf8a6b82e5fc6362f7f8e8fdc2444b9e8)
commit 1c54c148895225e4ab3c781fe57d09e5f64353aa
Author: Daniel Stone <daniel@fooishbar.org>
Date: Fri May 9 00:26:16 2008 +0300
Revert "GL: Make errors non-fatal"
Turns out this just caused segfaults further down the line. Oops.
This reverts commit 268d61e00cf4bc52c05f19eda7ab4f6accce12c8.
commit f17ba5d5849c92603f453195aca384844ca76d74
Author: Adam Jackson <ajax@redhat.com>
Date: Thu May 8 16:04:24 2008 -0400
Bug #13104: Remove broken XAA a1 glyph fast path.
commit ddaecfa13cefee7c66b39b606c8640c6544d4943
Merge: 9c2e0871cf cf20df39cc
Author: Adam Jackson <ajax@redhat.com>
Date: Thu May 8 14:33:58 2008 -0400
Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver
commit fc35d1e3be201e3821413bb2eeb8d43e1e56ba17
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Thu May 8 16:58:31 2008 +0930
config: override xkb_{r,m,l,v} with Xkb{r,m,l,v} if the latter is set.
The HAL spec says that input.xkb.{rmlv}* can be sent, but if the user
specifies a X-specific {rmlv}, then this is overridden through the use of
input.x11_options.Xkb{RMLV}.
However, the way how the server parses options--by ignoring capitalisation,
underscores and spaces--the HAL and the x11_options would override each other.
So we simply filter the options, letting Xkb{RMLV} override xkb_{rmlv} and
only actually add them to the device after parsing _all_ options.
* rmlv ... rules, model, layout, variant
See Bug 13037 <http://bugs.freedesktop.org/show_bug.cgi?id=13037>
commit 1f54c05cf8a6b82e5fc6362f7f8e8fdc2444b9e8
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Thu May 8 14:05:56 2008 +0930
config: remove trailing whitespaces.
It makes my vim look ugly. Put "let c_space_errors=1" into your .vimrc.
commit 1a314a1ef06222977e7ccb94331ce31c17534b2a
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Thu May 8 13:16:48 2008 +0930
Revert "config: deprecate (and ignore) the use of input.xkb.whatever options."
daniels:
"Hrm, I'd prefer to have input.xkb.{m,l,v,o} be the primary keys, and
have input.x11_options be a backup for that, rather than the former
being deprecated, for the reasons I listed earlier ..."
see http://bugs.freedesktop.org/show_bug.cgi?id=13037#c51
This reverts commit 26188875de1ccc84ac60bfb251e3ec43de2b9e22.
commit cf20df39cc78203d17b99223908af388ecbf7d0e
Author: Daniel Stone <daniel@fooishbar.org>
Date: Wed May 7 22:24:19 2008 +0300
XKB: Actually explain keymap failures
When something went wrong building a keymap, try to explain to the user
what it actually was, instead of the dreaded 'Failed to load XKB keymap'
catch-all.
commit 641a5f955b7b3ae04eeb6bc45fb30b0b531898e4
Author: Daniel Stone <daniel@fooishbar.org>
Date: Wed May 7 22:29:04 2008 +0300
Build: Ensure xf86DefModeSet.c ends in an empty line
This shuts up a warning.
commit 268d61e00cf4bc52c05f19eda7ab4f6accce12c8
Author: Daniel Stone <daniel@fooishbar.org>
Date: Wed May 7 22:28:45 2008 +0300
GL: Make errors non-fatal
GLX, there's more to the world than just you. If you fail to load the
software renderer, don't bring the entire server down.
The error path probably needs better testing on this one, but it seems
mostly okay to me.
commit 9c2e0871cfbe54e73eec1f790a7e383d08555055
Author: Adam Jackson <ajax@redhat.com>
Date: Wed May 7 13:21:26 2008 -0400
Bug #13104: XAA: Adapt to glyph storage changes.
Glyph bits are now stored in a proper pixmap, not just hanging off the
end of a GlyphRec.
commit 26188875de1ccc84ac60bfb251e3ec43de2b9e22
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Wed May 7 13:13:57 2008 +0930
config: deprecate (and ignore) the use of input.xkb.whatever options.
These options are still sent by some HAL implementations (e.g. HAL on FC8),
and may overwrite the options set in the x11-input.fdi file.
For a more detailed description of why see Bug #13037, comment 42.
X.Org Bug 13037 <http://bugs.freedesktop.org/show_bug.cgi?id=13037#c42>
commit b6a0c6d4864f73a18beb841b16e9be56f2fcd77e
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Tue May 6 17:06:34 2008 -0700
Allow using libmd instead of libcrypto for SHA1 hashing in render/glyph.c
Builders can force one or the other by passing SHA1_LIB & SHA1_CFLAGS
to configure
commit 718652eaf9221e0eeec2c971dd7baa97f827451b
Author: Adam Jackson <ajax@redhat.com>
Date: Tue May 6 17:52:37 2008 -0400
Bug #13104: Don't let XAA glyph pixmaps anywhere near video memory.
Since glyphs are stored in pixmaps now, they can make their way into VRAM,
which invalidates a bunch of fast-path assumptions in the XAA code. Thus
you end up doing color-expands or WriteBitmap from la-la land and your
aliased glyphs go all funny.
Since XAA isn't ever growing the ability to do sane glyph accel, just force
glyph pixmaps into host memory by catching them at CreatePixmap time.
commit a85d3ac87cc354093bb1e88697c44254e7721bb9
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Tue May 6 02:59:13 2008 -0700
XQuartz: Fixed typo
(cherry picked from commit 56b7988d2662caa4d31094695b414080e4470ed4)
commit 077ced6384abad78253e857091e78f3685965b9d
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Tue May 6 02:47:03 2008 -0700
XQuartz: Added uncommitted files
(cherry picked from commit e414ec462cfc63f8eb7f504f526f5a2c73f51e69)
commit 80e502c5d1f7e9221c6ae40716d6402fd28d8806
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Tue May 6 02:28:36 2008 -0700
Fixed up dist
(cherry picked from commit f225222ba2bf4f03425107f258d60b73c88efaec)
commit 7295e544332b0fa929f651304f9d4aca3db4a33e
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Tue May 6 00:06:19 2008 -0700
XQuartz: Move server bits into bundle and setup stub in /usr/X11/bin/Xquartz in prep for startup rewrite
(cherry picked from commit 453a982e6382cff06ea27abba225440b07068f50)
commit d41d677ab4118e73140ea2392e0d48eb361af1cf
Author: Ben Byer <bbyer@bushing.apple.com>
Date: Mon May 5 20:55:08 2008 -0700
Xquartz: experimental embedding of Sparkle.framework
(cherry picked from commit b7a1a640cef8c69442859cbf89034ad362a19684)
commit 9e0d73fd8a43647b648ec5b2f0bcaae30c03259c
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Tue May 6 17:52:15 2008 +0930
xfree86: call SetCursor for the VCP when switching between SW/HW rendering.
We need a manual call to SetCursor when we switch from SW to HW rendering and
the other way round. This way we display the new cursor after removing the old
one.
In addition, we only update the internal state for the VCP's sprite. This way,
when we switch back to HW rendering the state is up-to-date and wasn't
overwritten with the other sprite's state.
The second part is a hack. It would be better to keep a state for each sprite,
but then again we don't have hardware that can render multiple cursors so we
might as well do with the hack.
commit e4ebfed1785597b48b68e1bbdde3e5c4061b749f
Author: Dave Airlie <airlied@linux.ie>
Date: Tue May 6 16:46:37 2008 +1000
xf86edid: fix typo in debug output
commit b9c1a57e7a98dea63cd362f714411547e728a85a
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Tue May 6 14:51:23 2008 +0930
xfree86: switch between to SW cursors if more than 1 sprite is available.
Switches back to HW cursors when sprites other than the VCP are removed.
The current state requires the cursor to change shape once before it updates
to SW / HW rendering (whatever is appropriate), e.g. by moving into a
different window. Until this is done, the cursor is invisible.
commit 3df88c17e315b5ae580096e4bc88920d1f452e83
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Tue May 6 11:50:20 2008 +0930
xfree86: re-enable hardware cursor (for a single cursor)
This commit enables HW rendering for cursors again, but only for a single
cursor. Other cursors can be created, however they will not be visible.
commit 6acc2acd0db2826add7c47e94e4061d169a41f88
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Mon May 5 15:32:26 2008 -0700
Rootless: mi doesn't let us resize root, so we need to do it ourselves...
(cherry picked from commit c1ec36e28cff857664090cc8792db1ae93b783fa)
commit efa65a0317e12c9ad34fa00fe90bf5eae9fa2670
Author: Keith Packard <keithp@keithp.com>
Date: Sun May 4 21:52:58 2008 -0700
Rework composite overlay window code to fix several resource management bugs.
The composite overlay window code had several misunderstandings of the
workings of the X server, in particular error handling paths would often
double-free objects. Clean all of this up by using resource destruction as
the sole mechanism for freeing resource-based objects.
commit 6c1accce87c9bd640c1b4bbc49bae7d44b1cc97b
Author: Keith Packard <keithp@keithp.com>
Date: Sun May 4 21:51:08 2008 -0700
Empty the borderClip of manual redirect windows. (bug 15823)
Thanks to Owen Taylor for root-causing this one.
If a TreatAsTransparent window has any area in the borderClip, that will be
added to the totalClip region for use by other windows. That's wrong.
Instead, simply empty the borderClip for TreatAsTransparent windows right up
front.
commit d500eeb9458336780d77baf8b7db96e1f7ff4f0d
Author: Aaron Plattner <aplattner@nvidia.com>
Date: Sun May 4 10:26:25 2008 -0700
Xephyr: Handle depth 30 and reject higher depths rather than crashing.
commit f4a68f3701889950d3b98842d021f357f3913fea
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Fri May 2 17:35:57 2008 -0700
XQuartz: Fix mouse input offsets earlier since GetPointerEvents does not like negative (x,y) values
(cherry picked from commit 8d9eab3a2ec5955cc2698fdcb1fa6ed12b2aadb7)
commit 96fa7da3b87e2f9187ec13dad259beefdc17cd94
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Fri May 2 16:53:45 2008 -0700
XQuartz: Avoid a possible crash at startup due to unfavorable context switching.
(cherry picked from commit ff10c37bdd09656cf2f7ee9577f5552caa1ffdb8)
commit 6f63724b28c8b3fd85314fb95d1e4f363b610e19
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Fri May 2 14:56:58 2008 +0930
xfree86: don't try to repaint the cursor before cursors exist.
commit 334456952930cb3e55c02fcdada2d0c074cd0520
Merge: 8e56fd9728 3b8d53452c
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Fri May 2 11:00:14 2008 +0930
Merge branch 'master' into mpx
Conflicts:
Xi/exevents.c
dix/devices.c
commit a338007be6fd4302af012109d959f43ac7eab2b1
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Thu May 1 18:02:59 2008 -0700
XQuartz: Adjust the screen origin offset properly for multimonitor setups
(cherry picked from commit f2020b9836bacd0593ac0b4c8541e32714ab02a9)
commit 8e56fd9728d63a7a48ef44503425c6e25c7c9ffb
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Fri May 2 10:22:06 2008 +0930
dix: continue to check for invalid valuator ranges.
In an ideal world, the drivers would init all axes with NO_AXIS_LIMIT. In the
real world, this is an ABI break, so let's just leave the old check in.
commit 3b8d53452cd6c74d32d7759964a7cd9ee775f161
Author: Michel Dänzer <michel@tungstengraphics.com>
Date: Thu May 1 15:10:52 2008 +0200
EXA: Fall back in CompositeRects if the driver can't accelerate Composite.
Fixes http://bugs.freedesktop.org/show_bug.cgi?id=15780 .
commit 01c61f3d972fc2f4e5bb536dd00d8b6bbeb0fb3d
Author: Paulo Cesar Pereira de Andrade <pcpa@mandriva.com.br>
Date: Thu May 1 01:02:39 2008 -0300
xorgcfg: Fix a crash if xorg.conf doesn't have a Files section.
This patch only creates a Files section if required, so if no entries are
added, an empty Files section will not be created.
Signed-off-by: Peter Hutterer <peter@cs.unisa.edu.au>
commit 6899ff81e8f668382e3e2f9afdd9cdf51d0e0f7d
Author: Paulo Cesar Pereira de Andrade <pcpa@mandriva.com.br>
Date: Wed Apr 30 16:38:42 2008 -0300
Fix an off by one read error in drmSIGIOHandler().
Signed-off-by: Peter Hutterer <peter@cs.unisa.edu.au>
commit ec0419b50534006a272278b79ee51538193661cb
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Wed Apr 30 17:30:57 2008 -0700
XQuartz: Moved some relevant stuff from darwin.h to darwinEvents.h
(cherry picked from commit 1fcf74a436f2e19cceb3f285b89859025d94c040)
commit 28d1e21f1523d475cb757d3cfa33737ed62c534d
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Wed Apr 30 17:30:32 2008 -0700
Dix: Cleaned up sanity checking in Get{Pointer,Keyboard}Events
XQuartz was crashing because the Appkit thread was trying to GetXXXEvents while the Xserver thread was exiting.
This adds some more sanity checks and avoids that crash
(cherry picked from commit 34ec4bd6acb834c0e3f9a5042a0cc3f52c6f3a68)
commit ce36ae526d88d20ff67cd6cb429fb06f48d231f6
Author: Kazuhiro Inaoka <inaoka.kazuhiro@renesas.com>
Date: Wed Apr 30 11:58:32 2008 +0300
Add M32R architecture support (bug #10020)
Still needs autotools support, so this won't actually _build_: it's just
a starting point.
commit a0e6a7d4f507c5c0a0b11adb10394af58a0a6e07
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Wed Apr 30 17:57:48 2008 +0930
dix: resize EQ to minimum size to avoid reallocs during SIGIO.
When a new device is added, calculate the event size needed if a DCCE event is
sent and set the EQ's event size to this minimum. This avoids reallocs when a
event is sent (which may happen during a SIGIO).
commit b71b51c982706501b6229532ce342752207426bb
Author: Ben Byer <bbyer@bushing.apple.com>
Date: Tue Apr 29 23:37:58 2008 -0700
xquartz: created darwinTablet, to represent tablet events
(cherry picked from commit 50641bce730ee03738fa0c4beb8125b34fda556f)
commit 519581b0bab5cc6dac397877da485745f18c2120
Author: Ben Byer <bbyer@bushing.apple.com>
Date: Tue Apr 29 23:00:09 2008 -0700
xquartz: remove unused params from DarwinEQInit
(cherry picked from commit 299a056737168ca1faefd675dce6d6ab13176be9)
commit d70487a4c09cfeb90d996ab40a23a74b2c15be6f
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Tue Apr 29 23:59:26 2008 -0700
XQuartz: Fix to tablet-event handling code; we now scale
more conservatively (to match Linux's Wacom driver) and
we now receive all tablet-related events.
(cherry picked from commit 588683cecca2cfc65a28de035cd6ee3d64ff59d2)
commit fea39c94bcc8b635d37530d8a27ee92acab484fe
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Wed Apr 30 13:17:14 2008 +0930
dix: fix typo from last commit.
commit ffaccc2dc91f4ca4ea10da010206a0a7d2b5540c
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Wed Apr 30 11:45:19 2008 +0930
input: replace -1 as default axis limit with NO_AXIS_LIMIT define.
This allows easier refacturing of the coordinate limit handling. Grepping for
-1 is boring.
commit 00acb40f2bc5bb4a1977b9b08db75630677ff787
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Wed Apr 30 11:29:03 2008 +0930
dix: fix typo in clipAxis.
Check needs to be (min_axis < max_axis), not (min_axis < min_axis)
commit f65a1a62f9eac2f6620d5d469dbf6c79b2eadab7
Author: Hong Liu <hong.liu@intel.com>
Date: Tue Apr 29 09:00:11 2008 -0700
Keep rotation wrappers in place while transforms are in use
LeaveVT/EnterVT cycles will free/realloc shadow frame buffers. Because of
this, the presense/absence of that data is insufficient to know whether
the screen function wrappers are necessary. Instead, the 'transform_in_use'
flag should be used.
This patch also adds 'xf86RotateFreeShadow' for drivers to use at LeaveVT
time to free the rotation data; it will be reallocated on EnterVT.
commit 18b33dd4ff46f63bad70b493b1d0b0758c961ada
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Tue Apr 29 15:24:55 2008 +0930
Xi: stop excessive use of _X_EXPORT.
commit 2b179c32ac40f5258d95ae16da96a79fa8eea696
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Tue Apr 29 15:15:16 2008 +0930
include: add declaration for CopyGetMasterEvent to shut up compiler warning.
commit ff36753755360aaa16ab8604a0ab78123884b57d
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Tue Apr 29 14:53:41 2008 +0930
mi: call the custom event handlers for both MD and SD.
commit ec2fca7e6f7ce8fdf33d959b7adeaae935ec4b37
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Tue Apr 29 14:40:44 2008 +0930
xfree86: DGA needs to call into Xi.
Two steps: first use UpdateDeviceState() instead of replicating the device
changing code. And emulate XI events instead of core events.
commit 8208b842b7dd3b30bafdd74147bdfa63bc00cc40
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Tue Apr 29 14:19:42 2008 +0930
Xi: add IEventBase global variable. Stores event base for X Input events.
commit 46340b740640b76b52b8e69bc67f9201c7e974c3
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Tue Apr 29 14:17:48 2008 +0930
Xi: change UpdateDeviceState to be _X_EXPORT.
commit 3a922c5d07509703a3eeda2bbec6f332e6b0ffac
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Mon Apr 28 17:32:54 2008 +0930
Xi: apply ValuatorEvent data to the device's valuators.
After UpdateDeviceState, the device has the current position in absolute
coordinates, the event has the correct valuator data to be delivered to the
client.
commit f2a20294fe26f4c9d245d24d065331fefd8f830d
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Mon Apr 28 16:56:22 2008 +0930
dix: store all valuators as they come from the device in the valuator events.
The event's sequenceNumber is mis-used to determine whether the values are
relative or absolute.
commit d5ab89f4f1acbe2614036e8934122185ac0f81ee
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Mon Apr 28 15:52:24 2008 -0700
XQuartz: Unset CFProcessPath... blech
(cherry picked from commit ce4fbfbc75c62a092214d140c7550279aebe69ef)
commit 0c2312b21b6700c1425baccaf9c26150b4f0fd6a
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Mon Apr 28 15:28:21 2008 -0700
XQuartz: xprIsX11Window can be called from the Appkit thread (see X11Application.m)
(cherry picked from commit 22cf72437601c07b8a6c744b4f2f1f4cd6713e60)
commit c3dc4bdbb018c0606d561e2dfb9a36e9297fa312
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Mon Apr 28 15:42:02 2008 -0700
XQuartz: Disabled DPMS extension
(cherry picked from commit 1448fed9b6d484f471b9b2982c76ca921a9273b9)
commit 07382a70c7ac9807dfb31821a4763bea2309bde6
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Mon Apr 28 12:36:54 2008 -0700
XQuartz: Added thread debugging to xprFrame.c
(cherry picked from commit 41542502b321c697271c1752525b600872b6df96)
commit 8349732a6720652bfbad7874a952be73a0e8e77b
Author: Michel Dänzer <michel@tungstengraphics.com>
Date: Mon Apr 28 21:09:35 2008 +0200
EXA: Try to accelerate non-antialiased text via the glyph cache as well.
Treat 1 bit glyphs and masks as PICT_a8 in the glyph cache. We're not able to
accelerate them otherwise.
commit a65d530040bb561ba88c5d8c71633a7c0bf11e89
Author: Michel Dänzer <michel@tungstengraphics.com>
Date: Mon Apr 28 21:03:12 2008 +0200
EXA: Accumulate glyphs whenever possible, for full benefits of the glyph cache.
commit e7eaac59c424a205dd106fc7d70734ff4b390f28
Author: Michel Dänzer <michel@tungstengraphics.com>
Date: Mon Apr 28 21:00:55 2008 +0200
EXA: Glyph cache upload tweaks.
Track damage after using UploadToScreen directly.
Don't waste any effort on empty glyphs.
commit cc08c06665ffe29ad44d023d75d0f86e5338875d
Author: Owen Taylor <otaylor@huygens.home.fishsoup.net>
Date: Mon Apr 28 21:00:55 2008 +0200
EXA: Use UploadToScreen() for uploads to glyph cache
When possible, use UploadToScreen() rather than CompositePicture()
to upload glyphs onto the glyph cache pixmap. This avoids allocating
offscreen memory for each glyph making management of offscreen
areas much more efficient.
commit 13fd2256300b61d88b840952d838f834523f5dd7
Author: Owen Taylor <otaylor@huygens.home.fishsoup.net>
Date: Mon Apr 28 21:00:55 2008 +0200
EXA: Clean up debug messages
commit fcb5949928f1c27f67f40c094c3c673786574422
Author: Owen Taylor <otaylor@huygens.home.fishsoup.net>
Date: Mon Apr 28 21:00:54 2008 +0200
EXA: Fix overlapping glyphs in glyph cache
Allocate each cache at a different vertical position in the
per-format pixmap. Fix width/height confusion when choosing
the cache for a glyph.
commit 40eb14c9482457969e0bde97c49edad536285e02
Author: Owen Taylor <otaylor@huygens.home.fishsoup.net>
Date: Mon Apr 28 21:00:54 2008 +0200
EXA: Add exaCompositeRects()
Add a function to composite multiple independent rectangles
from the same source to the same destination in a single
operation: this is useful for building a glyph mask.
commit 54184110f6f3e5d7276d5431e739a4fcf0c3523e
Author: Owen Taylor <otaylor@huygens.home.fishsoup.net>
Date: Mon Apr 28 21:00:54 2008 +0200
EXA: Use a single large glyph cache pixmap
Add back exaGlyphs(); the new version copies the glyph images
onto a single large glyph pixmap and draws from their to the
destination surface. This reduces the management of small
offscreen areas and will allow us to avoid texture unit setup
between each glyph.
commit e9734306088e12f2cd68bf347ecf8415be4f0268
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Mon Apr 28 11:47:49 2008 -0700
XQuartz: More startup / threading house cleaning.
(cherry picked from commit 72653c24c00dfba64ce35a3d400598bcd77defc1)
commit 4b46fc931e61bec0abd6a86062e46dd7a408e745
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Mon Apr 28 10:50:51 2008 -0700
XQuartz: Updated Localizable.strings
(cherry picked from commit d8d9c866b90fb24c93bd6e25fa90f8f2bf58ad34)
commit 4017ebe5bfa7a261cd1135801756c44e9fe93ca1
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Sun Apr 27 00:01:14 2008 -0700
XQuartz: Added missing Xquartz.man.pre to EXTRA_DIST
(cherry picked from commit 03e707987f7f32e47dd0355c6d16bfb9169a379b)
commit 53dba5381fdd8f644e16aaa0ecb05df4dc615b23
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Mon Apr 28 11:37:52 2008 +0930
dix: if alloc of a master keyboard fails, remove the master pointer.
commit 1fab51edfc82e1ef60dfa29fd5d93478066a3998
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Mon Apr 28 11:37:21 2008 +0930
mi: guard against NULL-pointer dereference.
commit b5004722a208479a4bc762ff428bf4cbeb430d53
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Mon Apr 28 10:26:01 2008 +0930
Xi: Only return VCP, VCK and floating SDs to Xi 1.x clients.
This is better than the approach implemented with
8973a3f7983240407dd6da59b3643f40e6a3d83a which disabled XI altogether for 1.x.
Instead, return a device list that resembles a traditional XI setup on pre XI
2.0 servers. If the client tries to open a device other than a floating SD,
return a BadDevice error.
commit 0bd28315afc3b7223f8ff9f17597db09500a9388
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Sat Apr 26 23:00:42 2008 -0700
Xquartz: Added missing to EXTRA_DIST
(cherry picked from commit f4b963256feb03e9e6b5521bdefeb390e9a49688)
commit ef1c52053755fa14b4ca98b22c506f73f5f4a4b7
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Sat Apr 26 19:21:05 2008 -0700
XQuartz: Cleaned up startup and thread creation a tad.
(cherry picked from commit c861fe00e112b21ee0156d09a6cd5281642a1dcc)
commit b114d4e861885cc5b49cd81b33ad825461811b3e
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Sat Apr 26 17:04:49 2008 -0700
XQuartz: Don't subtract the titlebar off of the pointer_y
(cherry picked from commit 00a9567acce2b27a649cbebd4790e3043688a7d8)
commit 684b5d8382bf0bc6cd55774226ee362e81c0adbf
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Sat Apr 26 19:55:59 2008 +0930
Xi: whoops, stray ! caused a bit of memory mess.
commit 87071b604c4b7c3c79ab784e2c09ff691e2bc5ad
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Sat Apr 26 19:37:57 2008 +0930
Revert "Xi: disable XI for clients < XI 2.0"
Turns out some programs don't like this change. gnome-settings-daemon crashes
hard if you tell it that XI doesn't exist. So, tell them we have XI, but leave
the other change (the one that pretends no devices are available).
This reverts commit 8973a3f7983240407dd6da59b3643f40e6a3d83a.
commit 7447a30fb27ed50a20a85b5a2de9afe7dea8cfa5
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Sat Apr 26 19:03:13 2008 +0930
Xi: if a pre-XI2 client tries to list the devices, pretend we don't have any.
XI 1.x isn't supported anymore, so let's pretend we don't have any devices.
This stops clients from opening them and thus stops interference.
commit 8973a3f7983240407dd6da59b3643f40e6a3d83a
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Sat Apr 26 17:48:52 2008 +0930
Xi: disable XI for clients < XI 2.0
Sorry. With the huge changes in the device handling I honestly don't know how
to support XI and XI2 alongside. So let's just pretend XI doesn't exist if a
client doesn't request it supporting XI2.
commit b304b0a65cc57127cdea103f2c5114e4ea79af41
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Sat Apr 26 17:38:55 2008 +0930
Xi: add versioning support.
Remember the version the client sent to us, so we can adjust our replies
accordingly. This requires the client to use the {major|minor}Version fields
in the GetExtensionVersion request. However, they were padding before, so we
must assume they are garbage if nbytes is non-zero. If nbytes is zero, the
client is probably a new client and we can handle it correctly.
commit b9ca7896356f79ee27be5d5aa62052f6984282b0
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Fri Apr 25 17:54:36 2008 -0700
XQuartz: Added some pseudoramiX debug traces
(cherry picked from commit 5bee1585a399eab0a7b6fc80ad476d81b5d227d3)
commit e251c9e75afdc5e32f2bc9801712272358934266
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Fri Apr 25 16:49:35 2008 +0930
Remove all traces of #ifdef XINPUT and the matching bits from the configure.ac
commit 1d0438de176551aaeff549664f00b8bd83d465af
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Fri Apr 25 16:28:58 2008 +0930
Xi: remove RemoveOtherCoreGrabs()
PickPointer() returns grabbed devices, so we can't get a double grab anyway.
commit be5ff2b8d8a392eb8611e1fcd6da4752d68a7f9d
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Fri Apr 25 16:25:13 2008 +0930
Xi: remove some superflous code
commit 0209e46249b61974a6e3ed54a51cc36dfaf0064f
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Thu Apr 24 23:48:11 2008 -0700
XQuartz: More multi-monitor work... reverted Ben's workaround (worked for side-by-side only) and added more debugging.
(cherry picked from commit 515b8b855ac5d2d5aef881053f73b2ad07a6dd2e)
commit b65dbd350b8518bb90bed9cdc64dd900bc75d20c
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Thu Apr 24 21:14:04 2008 -0700
XQuartz: Cleaned up multi-monitor support.
(cherry picked from commit c05abf0a19b0ef0fc4ace9400a095ce2521456bc)
(cherry picked from commit 9112f290434c246d3e797551aaaf3a89d2006b23)
commit b093bf3ec37367172be3b44a04f0f43890ba7d7d
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Fri Apr 25 15:15:31 2008 +0930
dix: don't search for grabbed devices, PickPointer does it for us now.
Follow-up to 93ee33830778b9ec85ad81496572677a30022b09.
commit 6198bad07edc51ff4a264a9361c5e9b6c74647a6
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Fri Apr 25 15:02:40 2008 +0930
dix: remove misleading (stale) comment
commit 93ee33830778b9ec85ad81496572677a30022b09
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Fri Apr 25 15:02:13 2008 +0930
dix: let PickPointer() return devices that are core-grabbed by the client.
If the client currently holds a core grab on any device, this device has
priority, even over the ClientPointer.
commit f5ac98747de921d48f36d4f3f66dbe73e26a6760
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Fri Apr 25 14:50:24 2008 +0930
Standardise copyright headers for all new files created as part of MPX.
commit 3fc67b4205851dcffcc431a07a885828549bd9cf
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Fri Apr 25 11:37:32 2008 +0930
Xi: remove leftover chpkpair.h file.
Used to contain declarations for ChangePointerKeyboardPairing request
handling.
commit 89add4ee986e38b833bb58750b3e5a664efb6f4a
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Fri Apr 25 11:19:12 2008 +0930
dix: remove obsolete InitWindowPrivates().
commit dcdc66fcfc7957aa7875fbf74fa3a55989a9a187
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Fri Apr 25 11:14:32 2008 +0930
dix: add mi.h include to stop compiler warning
commit 97552413d213337e4bff8c89b06d58a09d722b05
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Fri Apr 25 11:13:05 2008 +0930
dix: remove "unused variable" compiler warning.
commit d9c38e84cc492b931a2238757d438f562946e5bc
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Fri Apr 25 11:04:02 2008 +0930
dix: remove pairingClient definition.
This variable was used originally to determine which client is allowed to
change the pointer-keyboard pairing. For now, we just let anyone change it and
see how that works out.
commit c14b858aeced81ff43723644f2de0f5c43f55755
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Fri Apr 25 11:02:12 2008 +0930
Xi: fix two compiler warnings
unused variable in exevents.c
implicit declaration in warpdevp.c
commit 6015b7a81252cd1729e6f4045f9b0c885c95b183
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Fri Apr 25 10:41:30 2008 +0930
Xi: handle requests through a dispatch handler.
Same principle as e.g. in the RandR extension, rather than having a load of
if (type == XI_whatever)
use an array of function pointers.
commit cb8cb87bc6decf75832c3724687000ecb658226e
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Fri Apr 25 10:09:50 2008 +0930
Xi: remove unused #define DISPATCH
commit 5869e3f5551e7e2d18e06a2f220b77d8c4161db1
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Thu Apr 24 19:39:27 2008 -0700
darwin gots /dev/urandom, too yo!
(cherry picked from commit bf0144f38034bc59f108bb2c5270ff37fbe70e10)
commit b1ae7c79db78cc3b789701f81328669f9f8ed80f
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Thu Apr 24 19:02:43 2008 -0700
Bug 14247: If pkg-config can't find openssl.pc, just link with -lcrypto
X.Org bugzilla #14247 <http://bugs.freedesktop.org/show_bug.cgi?id=14247>
commit 1daae4574c19a122baf73b6f9457b0d383b1bc66
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Thu Apr 24 18:22:05 2008 -0700
Added missing HAVE_LAUNCHD to dix-config.h.in
(cherry picked from commit 1b4b73cefbc2f3e3f6d0cb84ea202f84fb60abb5)
commit 63853e4ad211945ed25541223207a78f83766ced
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Thu Apr 24 18:21:42 2008 -0700
XQuartz: Compile in missing glx source that we still need
(cherry picked from commit c611335dee267e41dcd1733a6bb5206b102f804e)
commit ae982a27e4059fecd4048d245e6aa02f8dcc97d0
Author: Dave Airlie <airlied@redhat.com>
Date: Thu Apr 24 16:37:29 2008 +1000
glx: test for valid read and draw privates before using them
this should fix a bug where f-spot exiting blows up the X server
commit f377141912594f87144d6d7f7fdd279a101d8e6c
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Thu Apr 24 13:30:28 2008 +0930
Xi: don't attempt to send to a NULL window.
Only applicable when the server comes down/restarts. In this case,
WindowTable[i] may be NULL. Let's not try to send an event then.
commit aec485f2dcc87b340759d67b60e7dee7931aaec5
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Thu Apr 24 13:29:46 2008 +0930
dix: NULL out WindowTable after freeing all the windows.
CloseDownDevices() tries to send PresenceNotify events. If the windows are
already freed, then we are accessing dangling pointers.
commit 9ab4e2fd8eaa87dbd16835affb1aa54dcb1a619e
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Wed Apr 23 11:38:08 2008 +0930
xfree86: don't free the config-file related information in DIDR. #15645
In DeleteInputDeviceRequest, leave the conf_idev (which is shared with
xf86ConfigLayout.input) alone for devices that were specified in the
ServerLayout section of the config file. This way, in the next server
generation we are left with what was the original config and can thus re-init
the devices.
This is an addon to 6d22a9615a0e6ab3d00b0bcb22ff001b6ece02ae, an attempt to
fix Bug 14418.
X.Org Bug 15645 <https://bugs.freedesktop.org/show_bug.cgi?id=15645>
X.Org Bug 14418 <https://bugs.freedesktop.org/show_bug.cgi?id=15645>
commit 7dc40c8eca90ec1bfab84b6f54418b64c0e62d63
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Thu Apr 24 12:47:29 2008 +0930
xfree86: Don't free master devices.
The previous check works in the master-branch, but doesn't work with MPX. We
actually copy the SD's information into the MDs public.devicePrivate, so we
need to explicitly check whether a device is a MD before freeing the module.
commit cc13f87cd8ac54223fdb0b3d3c043dc9b9be5a42
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Thu Apr 24 11:43:47 2008 +0930
Xext: XGE: change function definition to have return value on separate line.
This seems to be the common style in most parts of the server.
commit d0890c40b9a9c7965c08608e6950c078a29aac16
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Thu Apr 24 11:32:36 2008 +0930
Xext: add a few lines of comments to XGE.
commit 745b90cde1007383ec8c887f02439a34ab427f31
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Thu Apr 24 11:27:22 2008 +0930
Xext: re-do the XGE versioning handling.
Basically the same approach RandR takes. Remember which one the client
requested, send back the one the server supports. Also divide XGE server
version (now defined in geext.c) and the client's version (still in the
protocol definition).
commit 5f3e5b3462bb02e828c70d0e1890b5a83d399d42
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Thu Apr 24 11:03:23 2008 +0930
Xext: remove trailing whitespaces in geext.{c|h}
commit d09c520b322ba5c5f4d6b630a7c0c62e56732f82
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Wed Apr 23 10:22:34 2008 -0700
Moved Apple GL bits into our DDX subtree
(cherry picked from commit c9356f32892978faecb30f7b7af7488820ce37ff)
commit b05b416c622063b84747702a54ffd9a802d6fc11
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Wed Apr 23 09:59:48 2008 -0700
XQuartz: No need to include indirect.c a second time
(cherry picked from commit 41ed532525da85d1bd2c20af5ffa28ac6d1f4996)
commit 565492c70a280d7e749500c5c0073bdcaf175c86
Author: Ben Byer <bbyer@apple.com>
Date: Wed Apr 23 06:00:57 2008 -0700
xquartz: build fixes for GLX/DRI2 fallout (note: not guaranteed)
(cherry picked from commit 85a5796b667461bf1fafc68c07b3a704cd8efd5b)
commit 6f6505db51763d902142a8161e71cad44f52560c
Author: Ben Byer <bbyer@apple.com>
Date: Wed Apr 23 03:43:51 2008 -0700
glx / xquartz: we still need glxcontentmodes.[ch] kthx
(cherry picked from commit 27545fd37f8c703b72f7cfc329778abc1ceabfa0)
commit 4e3a8af5751ff88c0cadd612821b0ef349d250c5
Author: Ben Byer <bbyer@apple.com>
Date: Wed Apr 23 03:39:41 2008 -0700
xquartz: clean up linker line for main binary
(cherry picked from commit 821d7400f2ff917497b2ee58ceef2b69c2d47ec7)
commit 3685b171da51f853bfdb312d36622dfa03ee75be
Author: Ben Byer <bbyer@apple.com>
Date: Tue Apr 22 23:53:23 2008 -0700
xquartz: remove vestigial aglGlx.c
(cherry picked from commit 40bd041e4255f26fcbdf0831e68619ae0f46ab39)
commit f6e22d69af6bc8f63c3a46535a09e217696a679f
Author: Hans de Goede <j.w.r.degoede@hhs.nl>
Date: Wed Apr 23 12:28:30 2008 -0400
Prefer glxvisuals with stencil buffer for default visuals
The first fbconfig which has a depthbuffer > 0 and doublebuf is choosen
when associating fbconfigs with the visuals, indepenent of stencil bits.
This happens to work ok on intel as there all fbconfigs with a
depthbuffer > 0 also have stencil bits.
This patch fixes this by first trying to get a fbconfig for default X visuals
with both stencilbuf, depthbuf and doublebuffering, and if that fails fallback
to trying to get one with only a depthbuf and doublebuffering.
commit 00effad583713e882c3f2518bcd3da51bf4db716
Author: George Sapountzis <gsap7@yahoo.gr>
Date: Wed Apr 23 17:46:30 2008 +0300
xephyr: XEPHYR_DRI is identical to XF86DRI
commit 6a9f7f28ec455d2879ca1a315ce77c48af49e7f4
Author: George Sapountzis <gsap7@yahoo.gr>
Date: Wed Apr 23 17:46:15 2008 +0300
xephyr: sync with mesa
commit 7ffc68c5cc7108c9e56af25f9f9b4398f5b027df
Author: George Sapountzis <gsap7@yahoo.gr>
Date: Wed Apr 23 17:45:54 2008 +0300
xephyr: libGL is client lib
commit a27c244d72603e27766ff3900ab28fe094f7397e
Author: George Sapountzis <gsap7@yahoo.gr>
Date: Wed Apr 23 17:45:37 2008 +0300
xephyr: Makefile cleanup 2
commit d4d19b2f22002b1579438cb9cf08dd580c7ec005
Author: George Sapountzis <gsap7@yahoo.gr>
Date: Wed Apr 23 17:45:19 2008 +0300
xephyr: Makefile cleanup 1
commit cdc4571b580a8f4fd279404215bff0fb9a5b4816
Author: George Sapountzis <gsap7@yahoo.gr>
Date: Sun Apr 20 17:06:26 2008 +0300
drop TOGCUP remnants
commit 6cd9287aed3c128d9c10b9b042ba7b864143d522
Author: George Sapountzis <gsap7@yahoo.gr>
Date: Sun Apr 20 16:58:51 2008 +0300
drop EVI remnants
commit a88c6b66465c039bf92a54a496516fee4d900784
Author: George Sapountzis <gsap7@yahoo.gr>
Date: Fri Apr 18 17:47:16 2008 +0300
glcore: drop GLcore (files)
commit dd7a53f8f21e41e1ab43f7e684ba586abc97ef7e
Author: George Sapountzis <gsap7@yahoo.gr>
Date: Fri Apr 18 17:47:01 2008 +0300
glcore: drop GLcore (build system)
commit 567d389d47dee233a973b101e04ce41c47a68f34
Author: George Sapountzis <gsap7@yahoo.gr>
Date: Fri Apr 18 17:46:18 2008 +0300
glcore: build from mesa, dlopen from xorg
* The GLcore interface is disposable
* GLcore is installed in DRI_DRIVER_INSTALL_DIR which is overloaded for
GLX_PROVIDER_INSTALL_DIR
commit efb723e166e5fa89e90c7b400fb4c7979b1f50c0
Author: George Sapountzis <gsap7@yahoo.gr>
Date: Fri Apr 18 17:45:53 2008 +0300
glcore: prepare for dynamic loading
glcore gets linked with -ldl, -lpthread for s3tc and glapi
xserver needs
DLOPEN_LIBS - to dlopen the glcore dso
LD_EXPORT_SYMBOLS_FLAG - to export symbols for glcore to use
the ld flag is added to kdrive only when GLX is enabled, the net overhead for
Xephyr is ~155KB, could be reduced with --dynamic-list.
commit fbad87f2ae9f97fcb43546b0fa35f1100415dfec
Author: Julien Cristau <jcristau@debian.org>
Date: Tue Apr 22 23:50:11 2008 +0200
autoconfig: don't call closedir() when opendir() failed
If opendir() fails, return from matchDriverFromFiles() immediately.
Ubuntu bug 217647.
commit 76381092e8f650ec7d1f058fa4c8a7348893f775
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Wed Apr 23 02:22:14 2008 -0700
XQuartz: Make sure QuartzAudioInit() gets run.
(cherry picked from commit bb3d034675b70e22e78df5554cab0ec2a3d913d0)
(cherry picked from commit 824b31c7f8144a67a320442abd3d854e99d2bfe2)
commit 275cdc1c74b7e43ecd931d312469fecc8d998ed1
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Wed Apr 23 16:16:15 2008 +0930
xfree86: pass correct value to mieqEnqueue (merge detritus I guess)
commit c3659cb414ef05da8fa09009b2b82a3deeeb4f3a
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Tue Apr 22 21:54:02 2008 +0930
dix: always send FocusIn events if mode is NotifyUngrab.
In the case of a NotifyUngrab, the flag for the device may already be set but
we still need to send the FocusIn event.
commit 00815b3e5223e822f306db45cd4884a22ac9f7ed
Author: Julien Cristau <jcristau@debian.org>
Date: Mon Apr 21 14:34:39 2008 +0200
Don't set DRI2=yes if we can't find dri2proto or libdrm
commit e77f65768efbf05cdf363a2f41f036f74eaa45de
Author: Ross Burton <ross@burtonini.com>
Date: Tue Apr 22 18:07:46 2008 +0100
Reuse the existing framebuffer mode in kdrive/fbdev
When starting up kdrive/fbdev, if the current framebuffer mode is sensible use
that unless told otherwise.
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
commit c4fd1121531b0cba1a3e90fa747871d784365c7e
Author: Ross Burton <ross@burtonini.com>
Date: Tue Apr 22 18:05:53 2008 +0100
Add mediumraw support to the linux kdrive driver
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
commit 455383db95618a05ebdbeae78423e08065f0e14e
Author: Ross Burton <ross@burtonini.com>
Date: Tue Apr 22 18:04:31 2008 +0100
Enable the epson kdrive driver
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
commit 82b37d35af13a9f402755e167493ab256b664b9c
Author: Ross Burton <ross@burtonini.com>
Date: Tue Apr 22 16:38:14 2008 +0100
Add support for AVR32
commit 20a90bef8b4993f06cf76ad05e3d4c974e1614f6
Author: Ross Burton <ross@burtonini.com>
Date: Tue Apr 22 16:37:02 2008 +0100
Add a default touchscreen path
When enabling the touchscreen, open /dev/input/touchscreen0 if no path was
specified.
commit b44e89f4683ffcfd75eaf39f1f37d7461db44689
Author: Ross Burton <ross@burtonini.com>
Date: Tue Apr 22 16:28:39 2008 +0100
Update to tslib 1.0
Update the pkgconfig checks to tslib 1.0, and fix the LIBS definitions.
commit 3848422d2354b7a5302fda92b05b0d728190e050
Author: Ross Burton <ross@burtonini.com>
Date: Tue Apr 22 16:25:23 2008 +0100
Fix build when XKB is disabled.
commit 744d0cfda74f8283801cc2d6c5eda48402455bc3
Author: Ben Byer <bbyer@apple.com>
Date: Mon Apr 21 22:06:38 2008 -0700
add missing DARWIN_GLX_LIBS in configure.ac
(cherry picked from commit a033c0b3dbb3b963261faa39f0236457cb00ff44)
commit 8190ef87547b704848231bde10b1cdffc6442790
Merge: 179a082c26 2ddbfd3457
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Tue Apr 22 18:04:05 2008 +0930
Merge branch 'master' into mpx
Conflicts:
Xext/EVI.c
Xext/appgroup.c
Xext/cup.c
Xext/mitmisc.c
Xext/sampleEVI.c
dix/window.c
commit 179a082c26f9e562492ee2e59e7f44f949f39f9c
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Fri Apr 18 21:13:10 2008 +0930
Xext: route event through master if required (XTestFakeInput)
commit fb784d99c521823339bf00b70b9824f735d88875
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Fri Apr 18 20:57:42 2008 +0930
mi: fix typo in comment.
commit 8209fdbc7c7f2dd068b30ff184b5fbf00db78686
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Fri Apr 18 20:53:57 2008 +0930
Xext: Update sprite on fake input only for MDs and floating SDs.
commit 2ddbfd345786aa39b6ccaed82a1ca5c145284ee3
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Tue Apr 22 16:31:44 2008 +0930
xnest: re-enable XKB support. #10015
XKB was disabled in 08928afb0500d46b0caa0a1d1244dee2ed80e6a0, with the comment
"Disable XKB, as we can't yet use it". Seems like "yet" is over, running GNOME
and changing XKB settings seems to work in Xnest now.
X.Org Bug 10015 <https://bugs.freedesktop.org/show_bug.cgi?id=10015>
commit a8b8700c7345b89953c8b63cb5c347a95e6ab988
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Mon Apr 21 23:44:37 2008 -0700
XQuartz: Fixed cmd-tab to bring all windows forward.
(cherry picked from commit e48e2ce931228f4dfa36c39b8ec8c72a58025b1b)
commit a368ab757edf36ed7bbda023673d28883ce11231
Author: Dave Airlie <airlied@linux.ie>
Date: Tue Apr 22 15:13:57 2008 +1000
GLcore: make googleearth not crash the server on sw-rendering.
I don't think this is the 100% correct answer as I get log spam saying
(EE) DoSwapInterval: cx = 0x98b8998, GLX screen = 0x96dd780
(EE) AIGLX: cx->pGlxScreen->swapInterval == NULL
but thats better than X exiting in my book.
commit 449723510a1f9d024e23d9eb33795cac27f9443e
Author: Egbert Eich <eich@pdx.freedesktop.org>
Date: Tue Apr 22 13:30:03 2008 +0930
xkb: use the correct device instead of an uninitialised "dev". #15614
X.Org Bug 15614 <http://bugs.freedesktop.org/show_bug.cgi?id=15614>
Signed-off-by: Peter Hutterer <peter@cs.unisa.edu.au>
commit ba87c25321c3378fd1ad0c55dcb0af0a6e82a540
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Mon Apr 21 20:03:08 2008 -0700
Make rootless use dixLookupClient rather than deprecated LookupClient.
(cherry picked from commit 582b5b01f9697b66489ea906a2ecb8bfc5915571)
commit 8822110d7d6b684f373fc883aeb7cab9734e9ddb
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Mon Apr 21 20:08:05 2008 -0700
Fixed dixLookupClient to work with client=NullClient as it did in the 1.3 branch
(cherry picked from commit e41ccc64702f856e5e09dfa652fe73c14b8a0225)
(cherry picked from commit ce5a5f93990647de85e535734ee6bb430ad591cb)
commit 5ffb6a2fe8db5871eaf26b8535af1588c43f33d3
Author: Ben Byer <bbyer@apple.com>
Date: Mon Apr 21 19:55:54 2008 -0700
Nuke a call to deprecated LookupClient, and hopefully prevent a
null-pointer dereference, too!
(cherry picked from commit 3d28e9f953709914e18807bc74c241333671cb30)
commit 590688131d89595bdc78ca562ee88df86c9012a6
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Sun Apr 20 22:18:45 2008 -0700
XQuartz: Fixed quit dialog to be more conforming with HIG.
(cherry picked from commit 14c6b837bb03bd0956f90882f550847f13d0ca09)
commit d20b3ac22d960fa44632cc4a14be079daa2d5a33
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Sun Apr 20 22:18:19 2008 -0700
.gitignore: Added Xquartz stuff
(cherry picked from commit 0a9a3bec2de8d1f442493e13cf9f039902a4928f)
commit 570b0dca261920c9b01b4eb11fe9b9987b1c636a
Author: Ben Byer <bbyer@apple.com>
Date: Mon Apr 21 17:52:10 2008 -0700
Fix for pointer-offset issue when using a multi-display environment on X11.app.
(cherry picked from commit 9a7e14286ced55c5e2a4512e2629e03836443009)
commit 3f081b4de55e1378728a24d069bf06575ffca2d8
Author: Tilman Sauerbeck <tilman@code-monkey.de>
Date: Mon Apr 21 11:22:07 2008 +0200
EXA: Set pixmap->accel_blocked on the screen pixmap, too.
commit 26c1801a27b81fdd988d5bd210ba0e76ecc274ae
Author: Tilman Sauerbeck <tilman@code-monkey.de>
Date: Mon Apr 21 11:03:27 2008 +0200
EXA: Update sys_pitch/fb_pitch in exaModifyPixmapHeader.
exaModifyPixmapHeader now also only evaluates arguments that have a
meaningful value.
commit 4fa89fbe18c929e0d36305ab47e7e17841309ffd
Author: Jordan Crouse <jordan.crouse@amd.com>
Date: Mon Apr 21 12:09:00 2008 -0600
xf86: Change AutoConfig driver for PCI ID 022:2091 to 'geode'
commit 6c95fae1e9d6b0eb64bc78eced05a6e9f5faf02e
Author: Michel Dänzer <michel@tungstengraphics.com>
Date: Mon Apr 21 10:45:11 2008 +0200
EXA: Offscreen memory eviction improvements.
* Make sure available areas are considered to have no eviction cost. This seems
to help for https://bugs.freedesktop.org/show_bug.cgi?id=15513 but I'm afraid
that may just be coincidence.
* Only calculate eviction cost of each area once for each eviction pass.
Safeguard against potential (though unlikely) division by zero.
* Cosmetic enhancements: Name eviction cost related variables 'cost' instead of
'score' to emphasize that smaller values are better, update Doxygen file
comment to the way eviction works now.
commit 40c6be1408a1f0b236fdb28af27ae18aea0d578f
Author: Julien Cristau <jcristau@debian.org>
Date: Sun Apr 20 20:36:44 2008 +0200
Minor xorg.conf manpage fixups
Use __libmansuffix__ instead of __oslibmansuffix__ which isn't getting
replaced, and rewrap some text to get __xservername__ replaced in the
description of Option "Accel" (cpp doesn't like the preceding quote).
commit 4bcfed2f9cf5dbf682d3bc98873ba97c4efdff44
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Sun Apr 20 08:35:42 2008 -0700
Revert "Removed XWin DDX"
This reverts commit 6550078b0925f754e3eec3bbce94dbfe5de8c419.
Doctor, I'm starting to get a pulse...
commit 14396fdebac1868df17559220ed7aaa34c34251e
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Sat Apr 19 23:31:05 2008 -0700
XQuartz: Cleanup turning off COMPOSITE
(cherry picked from commit 8f920fca6f9149185649d52569d33bf81b6c6857)
commit d13828797fe22856b07e08a55d2b9375902194bf
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Fri Apr 18 20:38:31 2008 -0700
XQuartz: Cleaned up some casting to get rid of compiler warnings
(cherry picked from commit 6f1c85b96550adf0bc34efb6ca649b87bcc1b18c)
commit 6550078b0925f754e3eec3bbce94dbfe5de8c419
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Sat Apr 19 09:29:46 2008 -0700
Removed XWin DDX
commit 587c010a1cd733fded4d49dc339df0634bda8be6
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Sat Apr 19 09:27:21 2008 -0700
Rootless: Kill off rlAccel
commit d3d00d92586c3e1cbc88087c930b65c8b3832fcc
Author: Tilman Sauerbeck <tilman@code-monkey.de>
Date: Sat Apr 19 12:54:40 2008 +0200
Removed fbpseudocolor.h from sdk_HEADERS.
commit 5bdc4198795ffd011bb07cffe3817e4cded87f60
Author: Adam Jackson <ajax@redhat.com>
Date: Sat Apr 19 04:06:19 2008 -0400
Remove fbpseudocolor
"An experimental pseudocolor emulation layer. Not fully completed,
currently only works for 16bpp." That was almost four years ago.
It still doesn't work, only one driver even attempts to use it, it
contains an ad-hoc implementation of damage, and should really be
done up in Composite now anyway.
commit 60ff56050b64183cb6e58f54223c8a3ddc2e704b
Author: Daniel Stone <daniel@fooishbar.org>
Date: Fri Apr 18 22:17:53 2008 -0700
Revert "Optimize dixLookupPrivate for repeated lookups of the same private."
The patch was wildly unsafe for SIGIO, and made everything full of
crashy crashy fail.
This reverts commit 9b30cc524867a0ad3d0d2227e167f4284830ab4e.
commit ed9dabb47c467dbf49836b631d5d6bda4b0d98b0
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Fri Apr 18 20:30:43 2008 -0700
Last of the spam... I promise...
(cherry picked from commit 45ebee4f729b148a75e925a4863b4eb850c88f8e)
commit 49f2bb4681fdee9e45f952ef0ac9c34a090117de
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Fri Apr 18 20:25:38 2008 -0700
XQuartz: More sanitization of the namespace
(cherry picked from commit bc50d41f9d1aec04f0de0478cbd5036f1fe9b81e)
commit c2f0d020b5d7950267aa3df391a7a72b9ae5883b
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Fri Apr 18 20:10:57 2008 -0700
XQuartz: Removed unneccessary include
(cherry picked from commit 45ff59e69eddfcceafced31cf6e73e381d0f6914)
commit 5183fea6d38de4bcf657e9c2a983dfd81a2a223f
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Fri Apr 18 20:06:17 2008 -0700
XQuartz: Handled sanitization of namespace better
(cherry picked from commit 8cb23d672177da919257c885804cecd18cf9af88)
commit edd3fb784bad893550ee270e0a09f22f99783cf5
Author: Ben Byer <bbyer@bbyer.local>
Date: Fri Apr 18 17:17:01 2008 -0700
random flailing
(cherry picked from commit 7fb9b2dc615a3bd1a3c087438af7a8b88265cfaa)
commit a7503615a6893749d512f75d37646273f31b9dbf
Author: Adam Jackson <ajax@redhat.com>
Date: Fri Apr 18 19:56:41 2008 -0400
Death to TOG-CUP.
If you still care about 8bpp visuals that much, fix Composite to provide
synthetic visuals.
commit 4da9ec16e9725ebb9817b49e33ea1035b6aff09a
Author: Adam Jackson <ajax@redhat.com>
Date: Fri Apr 18 19:54:09 2008 -0400
Remove appgroup mentions from configure.ac
commit 25827fde68d3bb02a2b7e05fae53a1d97edf1f76
Author: Eric Anholt <eric@anholt.net>
Date: Fri Apr 18 15:32:04 2008 -0700
Nuke the MIT-SUNDRY-NONSTANDARD extension.
This extension provided bug-compatibility with pre-X11R6, but has been
stubbed out in our server since 2006 to return BadRequest when you actually
asked for it.
commit 13adef8a17d8815f4db2aaac30ae04438e125343
Author: Adam Jackson <ajax@redhat.com>
Date: Fri Apr 18 19:01:06 2008 -0400
Finish deleting EVI
commit eafaf40fb3368ca7e4cf48336fdb7a6c9f536bfa
Author: Adam Jackson <ajax@redhat.com>
Date: Fri Apr 18 18:50:05 2008 -0400
Death to APPGROUP.
commit f6617b4127125516583f321c961d70f762f728be
Author: Adam Jackson <ajax@redhat.com>
Date: Fri Apr 18 18:28:01 2008 -0400
Death to Extended Visual Information.
commit 3b93631e59ca4d312d318eac4015e0a79ad6351f
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Fri Apr 18 11:31:54 2008 +0930
dix: remove coreOnly check. Core pointer must generate XI events now.
This flag was only used when an event is generated by Warp[Device]Pointer.
Since the VCP now happily generates core events, this flag is obsolete.
commit e0eaf8e5e3fa7a11c087851dff93f50f6907c4a5
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Fri Apr 18 10:57:47 2008 +0930
Xext: Let XTestFakeInput update the sprite for XI events.
Since XI devices can have their own sprite now, we need to update the sprite
coordinates too when processing an XI event.
Note: This doesn't deal with the device hierarchy correctly yet.
commit cb0168b4ac5c59cdce6f0a6d89ddd9f30d93b5f3
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Fri Apr 18 09:48:06 2008 +0930
Xext: xtest.c: death to tabs+spaces indendation, remove #define XINPUT
commit eebdf69e9a52e071e0467a1f99de135df4d1eabc
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Fri Apr 18 09:22:37 2008 +0930
xkb: mixing up src and dst in a memcpy is suboptimal.
commit aa6687322de85a2d1025a3ae851fb290a089b2d3
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Tue Apr 15 23:03:06 2008 +0930
Xi: when copying button classes, copy xkb_acts as well.
This should be the last piece in the quest for the class copy.
commit c14f5dc237a31b13d98ae2d0d6143bd91083cf13
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Thu Apr 17 20:21:45 2008 -0700
XQuartz: Forgot to commit xprEvent.[hc] ...
(cherry picked from commit 70e543baf2508d636f01b2b7e8cb05172195b68c)
commit 22bb7608a025a4ec0f442637810b20e2cb0b0820
Author: Ben Byer <bbyer@apple.com>
Date: Thu Apr 17 17:04:08 2008 -0700
Added XKB support for Xquartz
(cherry picked from commit 56dc1215202746590dbe8758411f47e8876e1317)
commit 652479dba38470273313dc46f17e3bcb1bc5e383
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Thu Apr 17 15:49:13 2008 -0700
XQuartz: Moved some rootless-specific cruft into xpr
(cherry picked from commit 31625cc03b58317120c2ac7877e227e2322e1de8)
commit 2a1ba20af98c0e9a6a7f1a50d32058dcc9759c21
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Thu Apr 17 15:23:00 2008 -0700
XQuartz: Use a mutex to ensure we only have one thread calling mieqEnqueue at a time.
(cherry picked from commit 7b087c965bce9f440ab5233d6383aa4a7de969b8)
commit 55f80d754525398378de1ef28aa562bd29ee750f
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Thu Apr 17 14:21:31 2008 -0700
XQuartz: A little more debugging output from threadSafety
(cherry picked from commit f6fbdbf838ab77c3a4635f0b2356b1bbb060ff5b)
commit 0d61f6fca1efeb4f68488e323d1c0508b9b7a711
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Thu Apr 17 13:17:58 2008 -0700
XQuartz: Fixed some missing prototypes
(cherry picked from commit 95056afc562cfe58b116f5c36e4624018e79ff4a)
commit dbd4c031565d269fef90af23386ff045ec78688c
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Thu Apr 17 13:12:56 2008 -0700
XQuartz: Added framework for asserting which thread we're in.
(cherry picked from commit 00beb982510e7a82d77e1f1d43e77c84d7bf74c2)
commit fa0645b452cbebd1800a63f1c95cb77fef4ab211
Author: Ben Byer <bbyer@apple.com>
Date: Thu Apr 17 12:27:12 2008 -0700
removed Xquartz debugging code that leaked into master. Our Bad.
commit a3d40f0549f6c6f49fffc286bcdaad758fa92367
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Thu Apr 17 11:56:48 2008 -0700
XQuartz: Include version info for CrashReporter
(cherry picked from commit b4992755c3e29086c5939683c38fa8fd7d2e6754)
commit 6d11712c2a35b243c19eea3b26622d18c2446dbe
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Thu Apr 17 11:06:54 2008 -0700
XQuartz: Use strerror(errno)... cause I like text more than grepping header files
(cherry picked from commit 1b4c37d8f9b517fbec5b94ed4e4a5e86a31472a5)
commit dcf4f917cc9488de72711255bbb030d9aa8f8bfb
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Thu Apr 17 11:03:31 2008 -0700
merged darwinKeyboard.[ch] into quartzKeyboard
(cherry picked from commit 57bb07320908b74facea0a97822bb19ed6f960a9)
commit 582397cd024c68df65ab9dececd6d2c40a5a261b
Author: Ben Byer <bbyer@apple.com>
Date: Thu Apr 17 02:31:53 2008 -0700
oops, missed a spot
(cherry picked from commit 19872a6aeb8ee9cb0e33e4b4ffd794c9dbefe0cf)
commit 0bd1c369cce05d5a4da5e3fd7033aea8c68460ec
Author: Ben Byer <bbyer@apple.com>
Date: Thu Apr 17 02:30:36 2008 -0700
formatting cleanup
(cherry picked from commit 769acd29348abf9e5b0bebfca6ae695d345f3077)
commit 700e14c22616b209867e4ea4d1811e53ca996164
Author: Ben Byer <bbyer@apple.com>
Date: Thu Apr 17 02:21:33 2008 -0700
delete debugging spew
(cherry picked from commit f04f3af86a91d0cafbc86a0d71aeb0599d685f07)
commit a440eebf2541ae0bb06bf65281b5facff2f04e00
Author: Ben Byer <bbyer@apple.com>
Date: Thu Apr 17 02:21:11 2008 -0700
add support for horizontal scrolling (buttons 6 and 7)
(cherry picked from commit f525a4a432ebd0545ad1dd0a7ad84ad3e47e8b61)
commit 612e901ef6aa3edc54b39e55e8040cda0e5ab7b6
Author: Ben Byer <bbyer@apple.com>
Date: Thu Apr 17 01:32:56 2008 -0700
enable keyboard map debugging -- it's going to x11-debug.txt, anyway ... so no harm
(cherry picked from commit ab662c736e0654e2b4347091f0d9e87f26034216)
commit 5bdfbfbedcbd9ff61cbb0b678cbf7ce7889a5826
Author: Ben Byer <bbyer@apple.com>
Date: Thu Apr 17 01:29:46 2008 -0700
darwinKeyboard: refactor slightly so that we're not cutting and pasting code from dix, kthx
(cherry picked from commit a8a090b853e811b9843a5732572cbbe542224f32)
commit 58e42683c9e998f6b8a55d5653b9caec7b6acf96
Author: Ben Byer <bbyer@apple.com>
Date: Thu Apr 17 00:19:56 2008 -0700
hack to Xquartz to prevent xmodmap from wiping out our valid modmap, per daniels
(cherry picked from commit cab54466a61281cfafc12825017c23d720cd75f4)
commit cd3470a0cffbd6b8cec7c44227b33307c9e227ae
Author: Ben Byer <bbyer@apple.com>
Date: Wed Apr 16 22:48:54 2008 -0700
kludge: miEqEnqueue wants a device, even if we're passing custom messages,
so give it one
(cherry picked from commit a494ff04b2a14470eaf5a23c7cf6dbdea182c6d1)
commit 966ae1781f3ca563e15a9a1b8cab6fab94e07fe9
Author: Drew Parsons <dparsons@debian.org>
Date: Mon Mar 10 22:54:49 2008 +1100
Create dix/libXpdix.la for Xprint-specific build of libdix.la
(cherry picked from commit 4e2c6dbabdbbaaca213fd08edd422de15d0900cc)
required because of commit 7c0709a736c0f3aa011de67dd2c2962585ab146e,
which made requestingClient in dix specific to Xprint only.
Add to XPRINT_LIBS in hw/xprint/Makefile.am in front of
$(XSERVER_LIBS) to override definitions in libdix.la for standard xservers.
Follows 571206832d454771e3c638c7515767958365c19c (providing -DXPRINT
to xprint subdirs).
Note it may be possible to restructure the code so that
requestingClient is stored elsewhere than in dix. See discussions
following http://lists.freedesktop.org/archives/xorg/2008-March/033844.html
If this is done it may be possible to revert this commit (if not 571206...).
commit 571206832d454771e3c638c7515767958365c19c
Author: Drew Parsons <dparsons@debian.org>
Date: Mon Mar 10 13:48:05 2008 +1100
Define XPRINT in XPRINT_CFLAGS (configure.ac)
-DXPRINT had only been set for Xprt in hw/xprint/Makefile.am
After commit 7c0709a736c0f3aa011de67dd2c2962585ab146e it is also
required for ps/PsArea.c and PsFonts.c to ensure ‘requestingClient’ is
defined, so make it a global Xprint definition in configure.ac.
(cherry picked from commit 28a6719fd486d9a9cecad0b057d9ea7c59c66055)
commit 9b30cc524867a0ad3d0d2227e167f4284830ab4e
Author: Michel Dänzer <michel@tungstengraphics.com>
Date: Thu Apr 17 16:10:10 2008 +0200
Optimize dixLookupPrivate for repeated lookups of the same private.
This gives me a 20% speedup for EXA text rendering, though I still seem to burn
quite a lot of cycles in here...
commit 886af8f3849a0fcfc6b63a9695107ce26d7a6955
Author: Tilman Sauerbeck <tilman@code-monkey.de>
Date: Wed Apr 16 16:20:19 2008 +0200
EXA: Avoid some fallbacks in exaCopyNtoN.
In some cases we can still do the copying in hardware even if the
dimensions of the pixmaps are out of range. This is true when the boxes
that we're to copy are all in the card's range.
commit dc10f0a0e243b7ba38d02a4e2c43027563aead7c
Author: Julien Cristau <jcristau@debian.org>
Date: Thu Apr 17 11:13:47 2008 +0200
Fix composite on !darwin
2ffdb0eb641ab6949783b4eb574f77e7486ac929 changes the default value of
COMPOSITE to 'auto', but doesn't set it back to 'yes' as appropriate.
commit 8716d081fdf61ddf956c30aff7697c70507911fd
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Thu Apr 3 16:29:43 2008 -0700
XQuartz: Don't enable rootless accelerated functionality... crashy...
(cherry picked from commit cdb4c291d8c10c3a9ea59d8e79275a30d2ea82b4)
commit 2ffdb0eb641ab6949783b4eb574f77e7486ac929
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Wed Apr 16 21:54:00 2008 -0700
XQuartz: Don't use composite.
(cherry picked from commit 6d3d344b5b95b6dc4166556d03cfd8c9576dc3f0)
commit 757a1bf3a3d72e17eeb362f825124c4ba40cc080
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Wed Apr 16 21:48:52 2008 -0700
Xquartz: Don't need to link against rlAccel since we don't use it
(cherry picked from commit 180ec128adef11a9a90cea1189dc31ac5de8359f)
commit ab8c6a3c5acb2a3bf288f1d6339b09a125bbb930
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Mon Apr 14 19:12:00 2008 -0700
Update ac_define_dir macro in acinclude.m4 to 2008-04-12 version
commit b907258ebe62642af088f6e2970a45a68cf4be19
Author: Eric Anholt <eric@anholt.net>
Date: Wed Apr 16 12:07:51 2008 -0700
Update dolt from upstream, fixing fallback to libtool.
commit e1e189f8538f2b77ae0cf0d846d3899061e4c4b7
Author: Aaron Plattner <aplattner@nvidia.com>
Date: Tue Apr 15 14:49:51 2008 -0700
Include pciaccess in the xorg-server.pc Requires line.
This pulls in the include path for pciaccess.h, which is needed by, among other
things, xf86.h.
commit 9e7ced94a5e3a14762fe934aa69d91f0831cf5ca
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Tue Apr 15 12:06:07 2008 -0700
XQuartz: Removed a call to RootlessReorderWindow from the Carbon thread
(cherry picked from commit cb27d5ca8230707b276763c0ec20e586203144c9)
commit 51c8fd69ec9292f5e18cdc7f60e1716fbd6ae61a
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Tue Apr 15 15:09:40 2008 +0930
dix: free the unused device classes when closing a device.
This also requires to NULL-ify all pointers while we're actually using them,
otherwise we'd try to free them twice.
commit 48d33ab9b672b3b3ca308000cdbd573d1e368ff9
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Tue Apr 15 14:29:53 2008 +0930
dix: float attached devices _before_ disabling the master.
It also helps if we're actually providing the correct argument to
AttachDevice...
commit 4cf9c5909d926ec322ed1c7df47f95bd872bb607
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Tue Apr 15 13:56:11 2008 +0930
Xi: fix up button count.
Some leftover code from the previously used alloc/free device classes left us
with a incorrect button count. So a button release didn't come through if
a different pointer was moved after the button press.
commit 35982bc109d424c464551ab22ec90af69908c884
Author: Kristian Høgsberg <krh@redhat.com>
Date: Fri Apr 11 11:09:13 2008 -0400
Make DRI2 a serverlayout/serverflags option.
Add xf86DRI2Enabled() to export the value of the setting.
commit f133d85778462134f366389bde7673bff7845fa8
Author: Tilman Sauerbeck <tilman@code-monkey.de>
Date: Mon Apr 14 11:43:51 2008 +0200
EXA: Update pixmaps' accel_blocked field in ModifyPixmapHeader.
commit bb8868540f017b121d698da45e552ffb55a57cea
Author: Tilman Sauerbeck <tilman@code-monkey.de>
Date: Mon Apr 14 09:58:49 2008 +0200
EXA: Teach exaCompositeFallbackPictDesc() about x8r8g8b8.
commit 1a9d7205cd5640eb65f019336097d86301942ea7
Merge: 90f491cf8e 6866e84e3c
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Mon Apr 14 16:25:58 2008 +0930
Merge whot@wombat:~/potoroo/xserver into mpx
commit 3e12c5bb67f3049156475d5cbf4e899aaded76bb
Author: Dave Airlie <airlied@redhat.com>
Date: Mon Apr 14 11:45:12 2008 +1000
glx: silly nitpick...
even though i and j are the same, we use i to derefence visuals everywhere else
commit 97565c0f394f16d042c614695c8b7b4ac354f2a3
Author: Dave Airlie <airlied@redhat.com>
Date: Mon Apr 14 11:40:38 2008 +1000
glcore: make visualRating GLX_NONE - note GLX_NONE is not == 0
Finally glxinfo returns the set of 3 visuals and glxgears works again for me on
sw rendering
commit c61087c82784633e522bd9392172b43656bdf45e
Author: Dave Airlie <airlied@redhat.com>
Date: Mon Apr 14 10:47:28 2008 +1000
glcore: zero fbconfigs before filling them in.
I'm not sure this the complete proper solution, perhaps it should explicitly fill
in ever field.
This at least makes glxinfo on glcore return sensible information, it doesn't make
gears work yet though.
commit 6866e84e3c607d00d88eab2249c2619d6707c1a4
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Sun Apr 13 19:57:51 2008 +0930
Xi: store feedback classes in devProviates system as well.
This is a follow-up to cb48d880856fd196ab8e8de5eb1f14944a1b4fff.
commit cb48d880856fd196ab8e8de5eb1f14944a1b4fff
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Sun Apr 13 19:48:28 2008 +0930
Xi: store unused classes in devPrivates.
Rather than freeing/allocing classes each time the device capabilities need to
swap, store them in the devPrivates system.
When a class is unused, it is pushed into the devPrivates, and later recovered
when needed again. This saves us a lot of memory allocations/frees, admittedly
on the cost of some memory.
commit fde3c836628b6cdec3e5d107d6b1b99bc8b86912
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Sun Apr 13 17:08:51 2008 +0930
Xi: copy the KeySyms.map over from the source.
commit 3c4c9938f31755c5a59995fdcfa138c99db76bbf
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Sun Apr 13 16:52:14 2008 +0930
Xi: Fix pointer handling in KeyClassRec copy.
We don't free the class anymore, so just store the previous pointers, do the
memcpy from the SD and then restore the pointers.
Plugs a memleak too, before xkbInfo was never freed.
commit 755f9e5d7898056cf3bead69ce25a10e23995582
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Sun Apr 13 16:49:25 2008 +0930
dix: Ignore focus for passive grabs if the event is a pointer event.
commit 6faf5b97b92953c331d6540ceb18fd0a77197fea
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Sun Apr 13 15:42:33 2008 +0930
Xi: fix up modifierKeyMap copying.
Setting it to NULL isn't correct either. The correct behaviour is to realloc
it to the size necessary (or newly alloc it/free it). Otherwise we have a
memleak.
commit 3106ba1116e3b9d893f66a93e4a91cc61e23226a
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Sun Apr 13 11:48:06 2008 +0930
xkb: two fixes to avoid server crashes.
- map can be NULL in some cases, so don't try to dereference it.
- don't default to inputInfo.keyboard
This is firefighting, I presume something in the class copy may have gone
wrong to get a NULL map in the first instance?
commit 415c6df0da1197d487456b4c48e2e28e7ded8b8e
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Sun Apr 13 11:46:44 2008 +0930
Xi: copy feedback classes first, in some cases xkb relies on kbdfeed.
XkbInitIndicatorMap (in XkbInitDevice) calls XkbFindSrvLedInfo. This accesses
the devices kbdfeed struct, which is all nice and dandy if it is NULL. When
copying the device classes however, kbdfeed may not be NULL and thus
XkbFindSrvLedInfo goes on its merry way to do whatever it does.
By copying kbdfeed first, we avoid XkbFSLI to reference the "old" kbdfeed
struct of the previous SD.
commit 961f6660902163e99727c2dcc1a039f32b083859
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Sun Apr 13 09:31:16 2008 +0930
Xi: modifierKeyMap needs to be set to NULL when copying classes.
Otherwise we have a double reference to the same memory area.
commit bf6679cba40a936d46008c886d204ed521a4971a
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Sun Apr 13 08:28:07 2008 +0930
Xi: copy the XkbSrvLedInfo too when copying device classes.
commit 4219e94c2f7d431be433eceddfe79760a1ee31a1
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Sun Apr 13 08:27:31 2008 +0930
xkb: Add XkbCopySrvLedInfo, deep-copies a XkbSrvLedInfoRec.
commit 1fa4de80fcfc697b5e5879cc351fb3e9dbf6acbe
Author: Matt Turner <mattst88@gmail.com>
Date: Sat Apr 12 20:39:18 2008 +0200
Check for __x86_64__ when we check for __amd64__
It seems Intel C Compiler neglects to define __amd64__, __amd64, or
amd64, but *does* define __x86_64__.
commit b1f3f42840ec01db417345a0740b59ad5e4471cb
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Fri Apr 11 17:49:51 2008 -0700
Xquartz: Added applicationShouldHandleReopen:hasVisibleWindows to handle dock icon clicking
(cherry picked from commit 55d9973b053f25bb95b26e00351dc5531caf5b04)
commit eabcfce0a68d504d11be9479f09e66f574dd2f21
Author: Adam Jackson <ajax@redhat.com>
Date: Fri Apr 11 09:51:26 2008 -0400
Stop building mfb/afb/xf1bpp by default.
commit 0dab6fa3582b70ccd0f01459902415c28dbc81ff
Author: Adam Jackson <ajax@redhat.com>
Date: Fri Apr 11 09:47:51 2008 -0400
So long, and thanks for all the cfb.
commit 059b4876e6350aa1110648788cdfbb3f45b4d66d
Author: Adam Jackson <ajax@redhat.com>
Date: Fri Apr 11 09:46:48 2008 -0400
Add doltcompile to .gitignore
commit 6d22a9615a0e6ab3d00b0bcb22ff001b6ece02ae
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Fri Feb 22 11:01:51 2008 +1030
dix: Call DeleteInputDeviceRequest from CloseDownDevices (#14418)
The DDX (xfree86 anyway) maintains its own device list in addition to the one
in the DIX. CloseDevice will only remove it from the DIX, not the DDX. If the
server then restarts (last client disconnects), the DDX devices are still
there, will be re-initialised, then the hal devices come in and are added too.
This repeats until we run out of device ids.
This also requires us to strdup() the default pointer/keyboard in
checkCoreInputDevices.
X.Org Bug 14418 <http://bugs.freedesktop.org/show_bug.cgi?id=14418>
commit 90f491cf8eb869f27c4278b26c1bb84432b12d63
Merge: cbe01b3083 b4380d8030
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Fri Apr 11 08:29:52 2008 +0930
Merge whot@wombat:~/potoroo/xserver into mpx
commit 3c337e18b933881e22b0d03312511f1d23a8640b
Author: Tilman Sauerbeck <tilman@code-monkey.de>
Date: Thu Apr 10 21:36:19 2008 +0200
Fixed configure.ac for autoconf 2.62.
commit 13dcde6bf994fae09c67c3edce9de42df61ef043
Author: Eric Anholt <eric@anholt.net>
Date: Thu Apr 10 11:08:49 2008 -0700
Fix dolt to error out on compile error, and not print errors on race to mkdir.
Both of these changes have been submitted upstream.
commit a7e3ad1c6b455bda7c4abb352a20845d1d4574a0
Author: Eric Anholt <eric@anholt.net>
Date: Thu Apr 10 10:33:11 2008 -0700
Remove NDEBUG (assert() disable) define from the X Server.
A few pieces of code were abusing this define for other purposes, which are
converted to #ifndef DEBUG instead. There should be no ABI consequences
to this change.
The rationale is that having the define in xorg-server.h also disables
assert() drivers, which is unexpected, and also difficult to avoid since
xorg-server.h is included in their config.h, and you can't put a #undef in
config.h. As for removing it from the server instead of moving it to an
internal header, we probably shouldn't have unnecessary assert()s in
critical server paths anyway, and if we do we could #define NDEBUG in the
specific cases needed.
commit b4380d8030927c940ddaea83c4cf24e0b9eb7b96
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Thu Apr 10 19:25:43 2008 +0930
dix: don't free MDs classes on init.
The device classes aren't deleted anymore on a class change, so there's no
need to store the MD's original classes. We should however restore the MD to
sane defaults when disconnecting the last device, consider this as TODO item.
commit 04dff74ffdf727015e3721aae4ea13acc498cd1c
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Thu Apr 10 19:22:59 2008 +0930
dix: Rework Enter/Leave semaphore system.
Instead of a simple counter, use bits to keep track of which device is where
etc. When device enters a window (or sets focus), the bit matching the device
is set, when it leaves again, it is unset. If there are 0 bits set, then
Leave/Enter/Focus events may be sent to the client.
Same theory as before, but this should get around the insanity with
Grab/Ungrab special cases. Those cases are basically untested though.
commit a88386ee277d136caaaeec305f8753f23f9b6274
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Thu Apr 10 14:36:57 2008 +0930
Xi: only DeliverFocusedEvents if the event is not a pointer event.
A pointer device may have a focus class, but even if so, pointer events must
be delivered to the sprite window, not the focus window.
commit 48249425275cc90242497aee9968e5f1ffc86698
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Thu Apr 10 14:36:10 2008 +0930
Xi: dont copy FocusClassRec if the master already has one.
Blindly copying will override the focus setting of the master. If there's XI
applications running, they may set the SD focus, while leaving the
MD's focus as it was. In this case, after a class swap we still want to get
the MD's events to the same window as before.
commit bce6091c6b04ff2db704ae4f161179d21dcbec59
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Thu Apr 10 09:59:45 2008 +0930
dix: Extend IsKeyboardDevice() to not include pointer devices.
If a pointer devices has key classes as well, don't register it as a keyboard
device. Let's see how much that change will break.
commit cc7dab2d04da4ca164eeec1a3296df1706585466
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Thu Apr 10 09:58:50 2008 +0930
dix: Dont deliver grabbed pointer events to a focus window.
If an pointer event is being processed during a device grab, don't deliver it
to the focus window, even if the device has a focus class. Reason being that
some pointers may have a focus class, thus killing drag-and-drop.
commit df2545b98d888924209cb889a68737c15f1aa209
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Thu Apr 10 08:50:43 2008 +0930
xfree86: Sanity check before retrieving the paired device.
Some pointer devices send key events [1], blindly getting the paired device
crashes the server. So let's check if the device is a pointer before we try to
get the paired device.
[1] The MS Wireless Optical Desktop 2000's multimedia keys are sent through
the pointer device, not through the keyboard device.
commit 5a4c6621aaf4e886f2c3b633e837ba359fedf921
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Thu Apr 10 08:29:05 2008 +0930
Xi: some extra checks for validity of kbd and mouse.
Floating SDs are paired with themselves, so the paired device may not be a
proper keyboard or mouse. Put some extra checks in to avoid dereferencing a
nullpointer later.
commit 8e0a6529303a52acc10905dd47c72a0d60979676
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Thu Apr 10 08:25:36 2008 +0930
dix: When floating, set sprite to NULL before calling InitializeSprite.
InitializeSprite won't create a new one if it already exists, with the result
of overwriting the master's sprite. This master sprite is then assigned to the
floating slave, and freed when the slave is reattached later.
Setting the sprite to NULL forces InitializeSprite to alloc a new one, and
this one can be freed without further repercussions.
commit e7211eb0b3d10323dab681bcb18580405ea18ab2
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Thu Apr 10 08:08:54 2008 +0930
Xi: When attaching, check for ptr -> ptr and keybd -> keybd.
Some pointer devices have key classes (e.g. MS Optical Desktop 2000). The
previous test was performed as Error if ptr -> keybd or keybd -> ptr. This
doesnt work with such devices. New test is Succeed if ptr->ptr or
keybd->keybd.
commit 7909ebe7f163716520f843fae11ac7bdeffcb57c
Author: Eric Anholt <eric@anholt.net>
Date: Wed Apr 9 10:43:25 2008 -0700
dolt: add FreeBSD support (this and ppc have been submitted upstream).
commit b4842d8dc3b1619033c5c123c8adc6e164098dc3
Author: Michel Dänzer <michel@tungstengraphics.com>
Date: Wed Apr 9 16:17:35 2008 +0200
dolt works on powerpc Linux.
commit 0d1746995d91b55e40f233f0c38b56bafe896d38
Author: Michel Dänzer <michel@tungstengraphics.com>
Date: Wed Apr 9 13:37:59 2008 +0200
Fix off-by-one error in ProcXResQueryClients().
Fixes memory corruption reported at
http://bugs.freedesktop.org/show_bug.cgi?id=14004 .
commit 6d031cbdefd8072b61645955f01b470a3e6858c1
Author: Daniel Stone <daniel@fooishbar.org>
Date: Wed Apr 9 14:36:26 2008 +0300
configure.ac: Do the dolt
Use dolt instead of libtool whereever practical. See:
http://lists.debian.org/debian-devel/2008/04/msg00286.html
commit b19027fbaea4c3a146926e862983e0e3411fff3d
Author: Dave Airlie <airlied@linux.ie>
Date: Wed Apr 9 14:27:58 2008 +1000
quirk: add quirk for ACR 640x350 default mode is wrong
RH #440186
commit 1f8188656a075dc7b1bb27a0795b5bd43610bbc8
Author: Ben Byer <bbyer@apple.com>
Date: Tue Apr 8 20:37:25 2008 -0700
add missing dix-config include
(cherry picked from commit 126e9bc8c480b403dedc44c1e8c4fe1476340ed9)
commit cbe01b3083eb65c9d4259b1071683febebf11600
Merge: 5ffbcfec3d 389dae73cc
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Wed Apr 9 10:46:46 2008 +0930
Merge whot@wombat:~/potoroo/xserver into mpx
commit 3f51f493b6daf2464e6c2ba5a924219b88a9e57e
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Tue Apr 8 17:02:56 2008 -0700
XQuartz: Fix issue where clicking on an X11 window might send that event to an X11 window in another space.
(cherry picked from commit df21312c8b0e9ef0c809bfc57cdf64f27db0d8a7)
(cherry picked from commit 2d4194a8d124e7a9c7cd1b83635ba6957aa4ae1c)
commit 389dae73cc0f3693f49807fd2de146c454ba9783
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Wed Apr 9 08:26:00 2008 +0930
Xi: If device "to" has a class but "from" doesn't, free the class in "to".
commit 60c38d248c1a89392c2c6695c3802f4b54e4c00b
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Wed Apr 9 07:46:53 2008 +0930
Xi: plug memory leak, free previous motion history before allocating new.
commit ea05cf0813b2b7c8cd2151cb935820753ae7997a
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Tue Apr 8 22:09:11 2008 +0930
Xi: check if source has a key class before copying.
commit 08073862f8c4e1219b6459708ffd28e2bc35885f
Author: Hasso Tepper <hasso@estpak.ee>
Date: Tue Apr 8 13:00:38 2008 +0300
configure.ac: Fix monotonic test harder
This was only introduced in a later version of POSIX, so define that
version to get it from more conformant systems.
commit 5ffbcfec3d37d3b627a78acfa00dbafc5948df82
Author: Magnus Vigerlöf <Magnus.Vigerlof@ipbo.se>
Date: Tue Apr 8 14:42:00 2008 +0930
dix: Ensure Proximity events don't kill the server.
Add Prox events to the if-clauses with the other events
that are usually sent from the input devices.
Ensure that the event deliverers won't try to deliver
events of type '0' (some extended events doesn't have
an equivalent core-type)
Small modification by Peter Hutterer.
Signed-off-by: Peter Hutterer <peter@cs.unisa.edu.au>
commit 32e4a88ae613c7200d84d5621344b418b656346b
Author: Peter Hutterer <whot@potoroo.wearablelab.ml.unisa.edu.au>
Date: Tue Apr 8 08:42:58 2008 +0930
xkb: don't overwrite CtrlProc in the second run of XkbFinishDeviceInit.
XkbFinishDeviceInit is called once when the device is initialised, but also
when a class copy causes the key class of a device to change. In this case,
overwriting the CtrlProc of the KeybdFeedbackClass with XkbDDXKeybdCtrlProc
sets up a nice recursive loop of XkbDDXKeybdCtrlProc calling itself until the
cows come home.
commit 6271df6953bea462be7e9e01744e5dd46841e867
Author: Peter Hutterer <whot@potoroo.wearablelab.ml.unisa.edu.au>
Date: Tue Apr 8 08:42:58 2008 +0930
xkb: don't overwrite CtrlProc in the second run of XkbFinishDeviceInit.
XkbFinishDeviceInit is called once when the device is initialised, but also
when a class copy causes the key class of a device to change. In this case, overwriting the CtrlProc of the KeybdFeedbackClass with XkbDDXKeybdCtrlProc sets up a nice recursive loop of XkbDDXKeybdCtrlProc calling itself until the cows come home.
commit 726dcd9e4ebfb09c0685450dca6e9fae7e773814
Author: Adam Tkac <atkac@redhat.com>
Date: Mon Apr 7 10:20:02 2008 -0400
Fix Xvfb input when building against current X sources.
commit 0f87b41a432a6472a15ec0c9dee997e3bddbd0f2
Author: Hasso Tepper <hasso@estpak.ee>
Date: Mon Apr 7 14:09:04 2008 +0300
configure.ac: DragonFly BSD support
Add support for DragonFly BSD, which is just the same as FreeBSD for all
of these cases.
commit 6b1a27023e48b661c4bb3b61181ac57608d8e448
Author: Owen W. Taylor <otaylor@fishsoup.net>
Date: Thu Apr 3 14:50:05 2008 -0400
EXA: Fix TS origin computation when implementing RenderComposite with tiling.
commit fd06e8f8c1d82a9d91931e8532bee0fd9c9ca9ab
Merge: b46a009186 6c0cfe3d43
Author: Peter Hutterer <whot@potoroo.wearablelab.ml.unisa.edu.au>
Date: Mon Apr 7 07:56:41 2008 +0930
Merge branch 'master' into dcdc_rework
Conflicts:
Xext/xevie.c
dix/dispatch.c
commit 539bf3c2836727e7560c64144071b086f8ea32fe
Merge: 3ab33e7cd4 6c0cfe3d43
Author: Sascha Hlusiak <saschahlusiak@arcor.de>
Date: Mon Apr 7 00:10:16 2008 +0200
Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver
commit 3ab33e7cd46c25dfc461b2a1b13e138225a94524
Author: Sascha Hlusiak <saschahlusiak@arcor.de>
Date: Sun Apr 6 23:23:47 2008 +0200
Remove stale code
The jstk code for Joysticks is not used by any module, was never actually compiled and uses an API
that is deprecated these days.
No reason to keep it.
commit b46a00918691cbd5ca80b6d3acae7614f93e073b
Author: Peter Hutterer <whot@potoroo.wearablelab.ml.unisa.edu.au>
Date: Sun Apr 6 09:02:57 2008 +0930
dix: sprite may be NULL, don't dereference it then.
In some rare cases (e.g. when the init fails) a device's sprite is NULL,
dereferencing it to xfree the spriteTrace is a bad idea then.
commit 638a50552e3e2190eac9721deb72e7365bdd52e4
Author: Peter Hutterer <whot@potoroo.wearablelab.ml.unisa.edu.au>
Date: Sun Apr 6 08:36:21 2008 +0930
dix: remove debug error message about XI->core type conversion.
commit 8f38feb3e464986dc523dabd3447ba13263a3a4a
Author: Peter Hutterer <whot@potoroo.wearablelab.ml.unisa.edu.au>
Date: Sat Apr 5 20:37:09 2008 +1030
Xi: add comments for DeepCopyDeviceClasses, ChangeMasterDeviceClasses.
commit 6c0cfe3d43b177c4cfaf7e228f32c655f9a98459
Author: Julien Cristau <jcristau@debian.org>
Date: Fri Apr 4 19:01:40 2008 +0200
Fix the clock_gettime check for glibc-based non-Linux systems
We need to define _POSIX_C_SOURCE on glibc, not just Linux, so add a new
test for the __GLIBC__ macro.
commit cc7c045bae01d90d8f1b750080ba48a96e983c68
Author: Adam Jackson <ajax@redhat.com>
Date: Fri Apr 4 12:58:12 2008 -0400
Fix PCI config space cycles from int10 emulator.
The top bit of 0xCF8 is an enable bit, not part of the domain. Sending
cycles to domain 128 instead of domain 0 is rarely the right thing to do.
commit d1de3dda8efe501d4192c8a99c34ab4265316c32
Author: Eric Anholt <eric@anholt.net>
Date: Mon Mar 17 14:22:39 2008 -0700
Fix clock_gettime presence detect on FreeBSD.
For non-Linux, _POSIX_C_SOURCE and friends restrict symbols defined rather
than enabling defines of symbols. Additionally, CLOCK_MONOTONIC was
apparently added to the standard around 2000 anyway, not 1993.
commit ec17900f52bbd25d07566834756e5c7e832e0463
Author: Kristian Høgsberg <krh@redhat.com>
Date: Fri Apr 4 10:46:45 2008 -0400
Convert __DRIconfigs after we've made sure createNewScreen succeeded.
commit 16a8ce75585ea360c39e0ffce4f7bb26a359b754
Author: Kristian Høgsberg <krh@redhat.com>
Date: Thu Apr 3 16:44:32 2008 -0400
Only autoload RECORD if it was enabled.
commit d0395a753079f291a78d9ab86810b5f84f237491
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Fri Apr 4 15:05:26 2008 +1030
Xi: realloc to->valuator instead of allocing it blindly.
commit 502689847b86be5619da7134646d55a1ac322a2c
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Fri Apr 4 15:01:53 2008 +1030
Xi: ALLOC_COPY_CLASS_IF should only alloc if to->field doesn't exist.
commit 035b1b6995e670ce5593e8aceb08f9ec812c70ea
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Fri Apr 4 15:00:06 2008 +1030
Xi: remove duplicate copying of kbdfeed and ptrfeed.
commit 52fc7aed18930fc9e6bcfdd5dbc28ae559978288
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Fri Apr 4 14:47:23 2008 +1030
Xi: only alloc memory for feedback classes if it doesn't already exist.
commit 4eb87c8693b57d9354832c76417797394656333e
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Fri Apr 4 14:20:18 2008 +1030
Xi: don't free device classes before copying them.
First commit in a series to come.
commit f0915fb3c4a9712200882440a64d11dc595a02bb
Author: Dave Airlie <airlied@redhat.com>
Date: Fri Apr 4 09:29:51 2008 +1000
quirk: add quirk for ACER EDID
commit 2e42b67b82db0f9128dd00e339b9dfdd9fe6d667
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Wed Apr 2 18:05:34 2008 -0700
XQuartz: Change reporting of space change to debug log rather than stderr
(cherry picked from commit ed15556a9fc4ebdb88f42961052fc8456082165f)
commit c737d04c758e03e32f692a31ed2a665ccbafa931
Author: Ben Byer <bbyer@apple.com>
Date: Tue Apr 1 00:40:46 2008 -0700
The AppKit thread should not be calling directly into the X server
functions to change state when the keyboard is reloaded; instead,
pass it as an event.
(cherry picked from commit 7e653f806ff5508aace059312156f319a9ed4479)
commit 15b0084f1ab23042190d8beeb3f088b92dee5a10
Author: Ben Byer <bbyer@apple.com>
Date: Mon Mar 31 23:31:25 2008 -0700
formatting cleanup for X11Application.m (no code changes)
(cherry picked from commit eb083d3f68f459d90417558da1ed00729b749950)
commit e9e2d88436597875f102085d216dc0a8fce1450a
Author: Ben Byer <bbyer@apple.com>
Date: Mon Mar 31 22:55:24 2008 -0700
moved and renamed QuartzMessageServerThread to
DarwinSendDDXEvent to make more clear what it actually does.
(cherry picked from commit bee2b377efc930e25017636e5112093a3a6549c7)
commit c1be4e3379d8780dff20390939b657ca0973995a
Author: Ben Byer <bbyer@apple.com>
Date: Mon Mar 31 21:04:37 2008 -0700
shovelling code around ...
(cherry picked from commit 2143182ba49195bbb2e9163ea6872fd68e7a4a85)
commit 985c631b2e1f113039e6e620f030505435fd9815
Author: Ben Byer <bbyer@apple.com>
Date: Mon Mar 31 20:18:58 2008 -0700
just a bit of juggling headers around -- we're preparing
to call our Xquartz-specific event handlers directly
as mieqHandlers
(cherry picked from commit 4aedba5aa727e22316e8ca456f7218bea9ee0313)
commit 89f1d880e83e32b72d35c4dbd6795defa6efa847
Author: Ben Byer <bbyer@apple.com>
Date: Mon Mar 31 19:47:28 2008 -0700
nuke DarwinEventQueue
(cherry picked from commit 1e0ec02202eeaffae480048b91bf02140ee29f8a)
commit 8944b77ec0c18476a25ba3179bcc45b338be22b8
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Wed Apr 2 17:47:42 2008 -0700
continue with gutting darwinEvents.c
(cherry picked from commit c34fce7051b996633291dddc061b696ff737f3fb)
commit aa6d12e93e8661da841192ef7c3aa7c6a7731c7f
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Wed Apr 2 17:46:59 2008 -0700
turns out we weren't actually using these files. oops
(cherry picked from commit bfec44d7b4baf0ad0aae55c8209bc60ac93c5b58)
commit 6c5962e44730395f81cdb333322c9ad5242c32d4
Author: Ben Byer <bbyer@apple.com>
Date: Mon Mar 31 18:15:18 2008 -0700
remove vestigal DarwinEQPointerPost etc
(cherry picked from commit a25704c423598d596fd7f2ed4290d4b860bd5d5f)
commit c6f0d5d1e51326e5110d27918d834eb0096df7db
Author: Ben Byer <bbyer@apple.com>
Date: Mon Mar 31 17:48:09 2008 -0700
gut darwinEQEnqueue, and make it just call mieqEnqueue (for the moment)
(cherry picked from commit a9e081a60ca227c0d96d4613075d97d6b762366a)
commit 5b6c273eaa53d7b554d69c2b4865988068e73a26
Author: Ben Byer <bbyer@apple.com>
Date: Mon Mar 31 17:08:45 2008 -0700
add prototype for DarwinEventHandler
(cherry picked from commit 9a03ae33c4f9de830f15eabf3b994882ead7c000)
commit 3713be8b470b1ac0fcb4f1e4c6b79c526b2196db
Author: Ben Byer <bbyer@apple.com>
Date: Mon Mar 31 16:30:16 2008 -0700
add logging of current thread ID to DEBUG_LOG macro
(cherry picked from commit 5848510cc5a8091b30230ab920d904ca6b159480)
commit 1400a51ae70d8e498d9ae3975f58ba7c1768ca6f
Author: Ben Byer <bbyer@apple.com>
Date: Mon Mar 31 16:24:01 2008 -0700
Begin to move all of our Xquartz DDX-specific event handlers
to miEQ, in preparation to remove the DDX-specific code entirely.
(cherry picked from commit 3f4447b95f73a82b3aa0f7b0d1640aba5fb0d1bc)
commit 8746daa6732d9837f66d925f2fd74818ecbf8ba2
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Wed Apr 2 15:01:33 2008 -0700
XQuartz: Fixed missing close-paren in preference pane text.
(cherry picked from commit ea37e151dc6032d2a1a33cef809f2a7d507aae35)
commit b5a0a865c3045cc08c33388320d4ec3ab7065efb
Author: Kristian Høgsberg <krh@redhat.com>
Date: Wed Apr 2 19:21:41 2008 -0400
Pick up dri2proto from the standard proto header include path.
commit 8cde0af3c57f0375ba8ba77af9fdf74b79d9496d
Author: Kristian Høgsberg <krh@redhat.com>
Date: Wed Apr 2 19:06:40 2008 -0400
Send the GLX_EXT_texture_from_pixmap attributes to the client.
commit 7c20f65fea3dd3170cde89d7113d85f377671bfb
Author: Kristian Høgsberg <krh@redhat.com>
Date: Wed Apr 2 18:00:06 2008 -0400
Add @XORG_CFLAGS@ to satisfy xf86* includes.
Pointed out by Hasso Tepper.
commit b13ab156894074fb38cc812738bc7aeeebd9614d
Author: Kristian Høgsberg <krh@redhat.com>
Date: Wed Apr 2 12:38:36 2008 -0400
dri2: Unbreak glcore visual setup.
commit b31de6a59044f91f8230aa581c9ca8540289c168
Author: Xiang, Haihao <haihao.xiang@intel.com>
Date: Wed Apr 2 16:29:30 2008 +1000
dri2: fix crasher if DRI2Connect fails
commit ebc56aca8bdfec1918cac3c8380895dfddea48ce
Author: Hong Liu <hong.liu@intel.com>
Date: Wed Apr 2 10:43:19 2008 +0800
Bug #15160: quirk Proview AY765C
prefer first detailed timing
commit 9500033b9ecdfaf5a56a4355ffc94d74cb17ca17
Author: Goneri Le Bouder <goneri@rulezlan.org>
Date: Tue Apr 1 20:19:40 2008 +0200
xfree86: don't crash in AutoConfig if the primary device is not pci
Only call matchDriverFromFiles() if we found a pci device.
Debian bug#472823 (http://bugs.debian.org/472823).
commit 37b1258f0a288a79ce6a3eef3559e17a67c4dd96
Author: Thomas Jaeger <thjaeger@gmail.com>
Date: Tue Apr 1 15:27:06 2008 +0300
XKB: Fix processInputProc wrapping
If input processing is frozen, only wrap realInputProc: don't smash
processInputProc as well. When input processing is thawed, pIP will be
rewrapped correctly.
This supersedes the previous workaround in 50e80c9.
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
commit a4d034941100c6ca3b7cc4e59952c2745b9306cc
Author: Ben Byer <bbyer@bushing.apple.com>
Date: Fri Mar 28 20:47:44 2008 -0700
Add code to track 5 valuators for pointing device, in preparation
for supporting tablet input in Xquartz.
(cherry picked from commit 22c8849ea819eb70a14b2e06330b11b22aa63ebc)
commit 6648867d8bd1e86458d2ade77a3ee4567c3d6a97
Author: Ben Byer <bbyer@bushing.apple.com>
Date: Fri Mar 28 18:27:02 2008 -0700
add debug statements so we can see if/when our Xinput stubs are getting called.
(cherry picked from commit 6e160bbe15dd2c2b8685847c06831cb6aebc6f74)
commit 19ff23ab0e72a27d05ed4470f75a0934d6f6c1d1
Author: Ben Byer <bbyer@bushing.apple.com>
Date: Fri Mar 28 18:25:03 2008 -0700
Remove calls to InitValuatorAxisStruct -- these are now handled in dix by
InitValuatorDeviceClass.
Add InitProximityClassDeviceStruct call to prepare for tablet support.
(cherry picked from commit 1bd980a5b114f5320360943214f8f9f23b29c1e3)
commit 9f56fc580646a519875b5a1452738d8c6e1fa860
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Mon Mar 31 17:34:07 2008 -0400
XSELinux: Add a request to get a client's context from a resource ID.
commit c40e0b51f0d9ef5e1f30f233d7db1e6db9d6681b
Author: Kristian Høgsberg <krh@redhat.com>
Date: Wed Mar 26 19:28:09 2008 -0400
Implement DRI2 direct rendering and update AIGLX to DRI interface changes.
Get rid of glcontextmodes.[ch] from build, rename __GlcontextModes to
__GLXcontext. Drop all #includes of glcontextmodes.h and glcore.h.
Drop the DRI context modes extension.
Add protocol code to DRI2 module and load DRI2 extension by default.
commit 8074676d2df8d577b443e3fa5e22d7c71c944bd1
Author: Fredrik Höglund <fredrik@kde.org>
Date: Mon Mar 31 21:24:59 2008 +0200
EXA: Optimize the eviction scanning loop in exaOffscreenAlloc.
Reduce the cost of the inner loop, by keeping a set of pointers to the
first and the last areas in the series, subtracting the cost of the first
area from the score, and adding the cost of the last area while walking
the list. This commit also moves the scanning loop from exaOffscreenAlloc
into a separate function.
Idea by Michel Dänzer.
commit 93d876891dbba41b920a9a29a5de77f647f43928
Author: Fredrik Höglund <fredrik@kde.org>
Date: Mon Mar 31 21:15:50 2008 +0200
EXA: Improve the algorithm used for tracking offscreen pixmap use.
Replace the current score keeping algorithm with a rolling counter that's
incremented in ExaOffscreenMarkUsed, with the previous value being stored
in the area. exaOffscreenAlloc uses the difference between the counter
value and the value in the area when deciding which area to evict.
It now also takes the size of the areas into account, and favors evicting
smaller areas.
The credit for these ideas goes to Michel Dänzer.
commit 7034484f0887ea0f8ab956515f2d9301ea5842ce
Author: Daniel Stone <daniel@fooishbar.org>
Date: Fri Mar 28 10:23:36 2008 +0200
gitignore: Add two more bits
Get slightly better at ignoring vim swap files, and let people keep
local changes if they want to.
commit b8ea9f2a25aad88aee77a68f8e20ac07276f0dab
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Fri Mar 28 17:00:08 2008 -0700
XQuartz: Fixed names of enums to be more consistent
(cherry picked from commit c309a08806daf5d716a860c709e51eacad2c745a)
commit bd28839eb866a9e6dc3ff80f13a67611da7eaf64
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Fri Mar 28 17:02:02 2008 -0700
=?utf-8?q?XQuartz:=20Another=20Expos=C3=A9=20fix:=20F9=20doesn't=20raise=20all=20windows
=20(cherry=20picked=20from=20commit=20b9cffa20debae73737c674bf75ab65db1bd74556)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit
commit 933ffcdf7d2eaaf7caabfe6f861f04bcb149918f
Author: Adam Jackson <ajax@redhat.com>
Date: Fri Mar 28 17:53:55 2008 -0400
Compile fix.
commit 9e8451d869a4032ddb7de6a62920a3a7b0b1acc1
Author: Adam Jackson <ajax@redhat.com>
Date: Mon Dec 3 17:38:53 2007 -0500
Add E-EDID segment selection.
commit 0b4aef4d6df7a5525d381de035fbbf78c5fffeef
Author: Adam Jackson <ajax@redhat.com>
Date: Mon Dec 3 16:00:00 2007 -0500
Refactor DDC2 code to allow for proper segmented addressing.
commit 88ece11d6c45c6f4b94f7fb2da64a46e879d7c27
Author: Adam Jackson <ajax@redhat.com>
Date: Mon Dec 3 15:47:39 2007 -0500
Start E-EDID support in the DDC module.
Since there's no way to safely know how many blocks xf86DoEDID_DDC2 would
return, add a new xf86DoEEDID entrypoint to do that, and implement the
one in terms of the other.
commit b5f98fcea2024c67e598947782913982072cf4fb
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Fri Mar 28 14:01:34 2008 -0400
XSELinux: Add xorg.conf option for permissive/enforcing/disabled.
Patch by Joe Nall.
The option goes in the "extmod" subsection.
TODO: Make it easier for extension modules to handle their own options.
commit 415e49b940bba2d08870db410ebb47d2add5d836
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Tue Mar 25 23:01:02 2008 -0700
XQuartz: Sanity-check the removal of the 256-color option
Fixes the 'one-time-preferences' bug in 2.2.0_rc1
(cherry picked from commit 38cbd13490fc21724e8eef0ec7e1a20a9cc2e39d)
commit c1d37efe9aae5f2895b3437418f7e4bb2eb3400f
Author: Ben Byer <bbyer@bushing.apple.com>
Date: Tue Mar 25 19:25:00 2008 -0700
xquartz: copy in new stubs from Xi/stubs.c to replace our old
Xinput stubs. Hey, it's a start.
(cherry picked from commit 566412b4aece24ae6af8c7c835986b685aa456a2)
commit c4a616a741e15865ce0ff98781c6f1dca4d62887
Author: Ben Byer <bbyer@bushing.apple.com>
Date: Mon Mar 24 22:43:10 2008 -0700
prevent "fake mouse clicks" from generating spurious extra events
(cherry picked from commit bd85a24969427e41389688663ead2d4dd41c9999)
commit c747030a49dd289e873e2b686cd129d840e55468
Author: Dave Airlie <airlied@redhat.com>
Date: Thu Mar 27 15:18:39 2008 +1000
quirk: fix LPL monitors properly.
no point having a h cm fix when we really want to copy the sizes from the
other place.
RH BZ 435216
commit 9df915b84d45d39aed7557c98883b20a66da2e96
Merge: 47eb658e80 333e7123dc
Author: Sascha Hlusiak <saschahlusiak@arcor.de>
Date: Tue Mar 25 17:50:50 2008 +0100
Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver
commit 333e7123dc484888d79c0f5aa3977bd72f1eb341
Author: Adam Jackson <ajax@redhat.com>
Date: Tue Mar 25 12:48:22 2008 -0400
Fix that last commit.
I can apply patches, really.
commit 47eb658e802775021e3efec109f95431cca188ca
Author: Sascha Hlusiak <saschahlusiak@arcor.de>
Date: Tue Mar 25 17:37:25 2008 +0100
Support to pass arbitrary options via HAL hotplugging
Parse "input.x11_options" and pass every key/name pair to the driver.
Remove check for input.capabilities, because that's part of the fdi files.
Thanks to Dustin Spicuzza <dustin@virtualroadside.com> for the patch.
commit e7a364425547103a98acabfc67d16e1ae0c2967f
Author: Sascha Hlusiak <saschahlusiak@arcor.de>
Date: Tue Mar 25 12:32:33 2008 -0400
Fix getValuatorEvents to compute number of valuators correctly.
commit f028e245a7932362656701c08fcfbfa8e8949077
Author: David Nusinow <dnusinow@debian.org>
Date: Thu Feb 28 19:45:21 2008 -0500
Bug #10016: Implement WM_CLASS hints in Xephyr.
commit 862ff9ac92037e13629329eb6ba50ff6bd2c5f71
Author: Adam Jackson <ajax@redhat.com>
Date: Mon Mar 24 13:37:42 2008 -0400
Bug #11510: Fix build without RECORD.
commit 87bfd3bd96c714a1c252d42408b5a1a4ff9dab06
Author: Adam Jackson <ajax@redhat.com>
Date: Mon Mar 24 13:33:38 2008 -0400
Bug #11508: Fix build without XV.
commit 536f2ff5382aaaace3b55481e15366bb15d87801
Author: Adam Jackson <ajax@redhat.com>
Date: Mon Mar 24 12:22:19 2008 -0400
Bug #13962: Re-arm the DPMS timer when re-enabling DPMS.
commit 4217ba0cf0c9bbea3774760e836ab372acf3237c
Author: Julien Cristau <jcristau@debian.org>
Date: Sat Mar 22 17:31:08 2008 +0100
xaa: use xf86ReturnOptValBool instead of xf86IsOptionSet
The latter doesn't return the option's value, just whether it's present
in the configuration.
commit 6b9d2bb1f7f87acbf275027af9c2982e91e5faed
Author: Julien Cristau <jcristau@debian.org>
Date: Sat Mar 22 17:28:48 2008 +0100
exa: use xf86ReturnOptValBool instead of xf86IsOptionSet
The latter doesn't give you the option's value, it just tells you if
it's present in the configuration. So using Option "EXANoComposite" "false"
disabled composite acceleration.
commit 63859473965f911515bc6e8d87b32a65ec41eb73
Author: Jeremy Huddleston <jeremy@tifa.local>
Date: Fri Mar 21 19:31:31 2008 -0700
XQuartz: Disable 256 color option and fullscreen option
(cherry picked from commit 7c1964338a33558d3f25e369dfca99e3ef9d10f9)
commit 93daa3a3bf1a981757024847882ce92b6bdaae83
Author: Jeremy Huddleston <jeremy@tifa.local>
Date: Fri Mar 21 19:11:59 2008 -0700
Xquartz: Added separate preference tab for quartz-wm settings
Added FFM and "Focus on new window" options
(cherry picked from commit 6841d078b7cb0b0db3db948d26b4d5ec7747deb8)
commit c49e11268322712c211f29d51d664d3f8a59b00b
Author: Jeremy Huddleston <jeremy@tifa.local>
Date: Fri Mar 21 18:07:38 2008 -0700
XQuartz: Initial framework for dealing with spaces on OS-X
(cherry picked from commit 9831324998f9d1f05ff944c58c5bf60dcae17355)
commit 4c76607b699431183ee7e88fa7818cb7644a5a02
Author: Jeremy Huddleston <jeremy@tifa.local>
Date: Mon Mar 17 23:57:41 2008 -0700
Rootless: Removed safeAlphaXXXX() in favor of using fb/pixman
(cherry picked from commit f03202ad15457c98be7ca78cc59bac88cf5f1966)
commit 87c64cfd6901083da5a9375d0bde65691d374b5b
Author: Jeremy Huddleston <jeremy@tifa.local>
Date: Fri Mar 14 17:31:54 2008 -0700
=?utf-8?q?Apple:=20Xserver=20half=20of=20the=20Expos=C3=A9=20bug-fix=20(requires=20updated=20libXplugin=20from=20Apple...=20coming=20with=202.2)
=20(cherry=20picked=20from=20commit=2037be23e8c1d8e5c7a1157e9d66ef3f30a4c472c5)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit
commit 3bbd77ff98478153afe3251de9ba11d757218213
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Thu Mar 20 20:03:02 2008 -0400
XSELinux: Do a check for whether background "None" is allowed.
commit e323bb426ce8a072d119cb2720b773241259c137
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Thu Mar 20 19:42:09 2008 -0400
XSELinux: Correctly handle some permission bits that are used more than once.
commit da973e962d09854b571320dee7dd9569060bc39e
Author: Michel Dänzer <michel@tungstengraphics.com>
Date: Thu Mar 20 09:18:29 2008 -0400
Fix RandR 1.2 driver interface conversion of two colour cursors to ARGB
This patch (and not setting HARDWARE_CURSOR_BIT_ORDER_MSBFIRST on big endian
platforms) fixes it for me with the radeon driver and doesn't break intel.
Correct patch this time :)
commit f8c1eb29e28818895d744c4e1d6897353d51790b
Author: Alex Deucher <alex@cube.(none)>
Date: Thu Mar 20 09:14:41 2008 -0400
Revert "Fix RandR 1.2 driver interface conversion of two colour cursors to ARGB"
This reverts commit 267352579612155adfd4743432d6569b2cdeebde.
Pushed the wrong patch.
commit 267352579612155adfd4743432d6569b2cdeebde
Author: Michel Dänzer <michel@tungstengraphics.com>
Date: Wed Mar 19 19:12:37 2008 -0400
Fix RandR 1.2 driver interface conversion of two colour cursors to ARGB
See bug 11796
commit 060a99444ee25a684b0ab9b4819bf8e855aea2d8
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Wed Mar 19 16:04:16 2008 -0700
Make Xevie private symbol names less generic
Makes it easier to figure out what you're seeing in the stack trace
instead of wondering where in the server "ProcSend" is.
commit f37046984d7839faefa4d716624e4a85ddde9634
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Wed Mar 19 14:06:53 2008 -0700
Xevie cleanups, byteswapping fixes & request length check fixes
commit edad0a9dfebcce5c54b2f9c32bd9d45549e20c51
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Tue Mar 18 17:51:21 2008 -0400
Apply __glXDisp_GetVisualConfigs message patch
From http://bugs.freedesktop.org/show_bug.cgi?id=13863
Problem was that the glxcmds.c __glXDisp_GetVisualConfigs
function left garbage in the tail end of the message used for extensions.
commit cdadd2ff9bade318caac5c1d9bcdc8a001347da9
Author: Dodji Seketeli <dodji@seketeli.org>
Date: Tue Mar 18 14:00:15 2008 +0100
[Xephyr/DRI] correctly route motion events targeted at GL drawable
commit afd7428690d87097117ab20335658f6d59d60103
Author: Jesse Barnes <jbarnes@jbarnes-t61.(none)>
Date: Mon Mar 17 14:55:44 2008 -0700
Cleanup logic in xf86PrepareOutputs
Should have done this in the first place. Since we're checking for the absence
of the get_crtc callback in the first place, we'll short circuit the later call
and disable the output, so the ugly "continue" block is unnecesary.
commit ba85caacb565b9aa0aeace52a362350304b0566d
Author: Jesse Barnes <jbarnes@jbarnes-t61.(none)>
Date: Mon Mar 17 14:13:09 2008 -0700
Make xf86SetDesiredModes aware of current output configuration
By adding a new output callback, ->get_crtc, xf86SetDesiredModes is able to
avoid turning off outputs & CRTCs if the current output<->CRTC mappings are the
same as the desired configuration. This helps avoid flickering displays at
startup time, which speeds things up a little and looks better.
commit bee2ddf35f75086cee951142098637f2c756b96b
Author: Jesse Barnes <jbarnes@jbarnes-t61.(none)>
Date: Mon Mar 17 08:33:01 2008 -0700
Fail CRTC configuration if !vtSema
Unless we check for vtSema before calling into the CRTC and output callbacks,
we may end up trying to access video memory that no longer exists, leading to a
crash. So if we don't have vtSema, return FALSE to the caller, indicating that
we didn't do anything.
Fixes #14444.
commit db248ffb840a0c113b6eb508a0fa1e74e752474d
Author: Matthieu Herrb <matthieu.herrb@laas.fr>
Date: Sun Mar 16 18:46:11 2008 +0100
test for the presence of pci_system_init_dev_mem() before calling it.
This avoids creating a dependency on -current libpciaccess for
BSD systems other than OpenBSD (which don't otherwise need it).
commit aa231f28d56402d7daea6cbd3002fbf760f79497
Author: Donnie Berkholz <dberkholz@gentoo.org>
Date: Fri Mar 14 18:41:25 2008 -0700
Xephyr: Build fix: Port across XF86dri.c changes from Mesa.
commit a955c3b587b22b8bf20cb6bedbbec4ad5fcb32ac
Author: Donnie Berkholz <dberkholz@gentoo.org>
Date: Fri Mar 14 18:41:07 2008 -0700
Xephyr: Distribute ephyrdriext.h in tarballs.
commit 090b26db767d296e7a3452da83b136d1caa0ed01
Author: Daniel Stone <daniel@fooishbar.org>
Date: Fri Mar 14 21:58:27 2008 +0200
XkbCopyKeymap: Fix broken indentation
An astute observer will note that the entirety of XkbCopyKeymap is indented
with spaces, and no tabs whatsoever, and not commit changes which break the
otherwise consistent indentation.
A non-astute observer will note the breakage when the commit mail comes
through with clearly broken indentation.
A polite, non-astute, observer will then fix it.
C'est la vie.
commit 88bec0915e3867f8dbf859a3dfbb771d0d07092d
Author: Daniel Stone <daniel@fooishbar.org>
Date: Fri Mar 14 21:54:13 2008 +0200
mi: More meaningful assert crashes
When we fail an assert in miregion.c (which happens every now and then,
though I haven't yet checked up why), at least generate a segfault, so
we'll get a backtrace.
commit 57d48d94b8947c571925e6fd4c9bf041fbd1b2ac
Author: Adam Jackson <ajax@redhat.com>
Date: Fri Mar 14 14:37:42 2008 -0400
Fix a stray use of ALLOCATE_LOCAL.
commit 824853772241acf64bc37ac8b85254194741ae13
Author: Adam Jackson <ajax@redhat.com>
Date: Fri Mar 14 14:24:21 2008 -0400
RANDR 1.2: Fix initial mode aspect ratio match in a corner case.
Actually more like in the mainline case, where the ideal mode happens to
be the very first aspect match on the first monitor. But let's not
split hairs.
commit 1b9878ffcfc0c0dbc4a6e674827fe508ba77db4b
Author: Bart Trojanowski <bart@jukie.net>
Date: Thu Mar 13 17:42:16 2008 -0400
Bug #14332: Fix PCI access cycles from x86emu.
The address written to 0xcf8 contains the PCI slot address to send the
config cycle to. However, we would ignore that and always send the
cycle to the device whose BIOS we were running. This breaks some
integrated graphics platforms that have explicit knowledge about the
system's host bridge, for example.
commit f7abe05b3306ed9a6f2cf5e3e45ed524d725d029
Author: Doug Chapman <doug.chapman@hp.com>
Date: Thu Mar 13 17:40:34 2008 -0400
Bug #14091: Fix build (and runtime) on ia64.
commit 5d7437c29e686a081b20823450d78c4c2f4e0aec
Author: Adam Jackson <ajax@redhat.com>
Date: Thu Mar 13 17:37:12 2008 -0400
RANDR 1.2: Fix the RANDR 1.1 screen size estimation to approach reality.
While the ScreenRec's notion of size in millimeters would get updates,
the RANDR 1.1 notion wouldn't, so your screen would appear to be square
and probably at some ludicrous DPI.
commit 61c3f63a75d8b0cc47ffed4a0e30147fab2ae8f4
Author: Adam Jackson <ajax@redhat.com>
Date: Thu Mar 13 17:34:54 2008 -0400
RANDR 1.2: Don't report a square resolution to RANDR 1.1 clients.
It can't possibly do anything useful, and older versions of Gnome (and
proably others) get very confused by it. So do the drivers, for that
matter.
commit 06c0372c3a1b45005eb6d50406f77f4e93f1de1e
Author: Mark Kettenis <mark.kettenis@xs4all.nl>
Date: Wed Mar 12 21:45:37 2008 +0100
OpenBSD support for libpciaccess.
xserver and libpciaccess both need to open /dev/xf86, which can only
be opened once. I implemented pci_system_init_dev_mem() like Ian
suggested. This requires some minor changes to the BSD-specific
os-support code. Since pci_system_init_dev_mem() is a no-op on
FreeBSD this should be no problem.
commit 2036851125226065891f13583ade3ce559e7bd37
Author: Matthias Hopf <mhopf@suse.de>
Date: Mon Mar 10 19:29:07 2008 +0100
Return randr interface version in xf86CrtcScreenInit()
Necessary to allow drivers to be run-time backwards compatible when using the
modes/ functions w/o providing their own copy.
commit c7536f4b87e089a7e7c43026b189922fec70c565
Author: Kristian Høgsberg <krh@redhat.com>
Date: Tue Mar 11 13:11:04 2008 -0400
Silence REGION_INIT() warning.
Evaluating the address of a BoxRec as a boolean gives this warning:
i830_driver.c:2317: warning: the address of 'ScreenBox' will always
evaluate as 'true'
which is pretty annoying. This patch compares the address to NULL to
avoid the pointer->bool conversion and gets rid of the warning. Seems
like a lame hack, but the warning is worse.
commit cc05255191413b3f376edbc600122ff085f45f7b
Author: Kristian Høgsberg <krh@redhat.com>
Date: Tue Mar 11 00:51:43 2008 -0400
Make WriteToClient take a const void * like any decent IO write function.
Enough with the casting. Doesn't break API or even ABI, but does make
a lot of silly casts superfluos.
commit bc504ffbba3dec2e3467bab8ba1ac25db6dd317e
Author: Kristian Høgsberg <krh@redhat.com>
Date: Tue Mar 11 00:35:31 2008 -0400
DRI2: Add DRI2AuthConnection().
DRI2 uses the same authentication scheme as XF86DRI, so implement this
entry point so DRI2 protocol code can access it.
commit b2657ec5981122e7cc0bda0d8802aec63cde9014
Author: Keith Packard <keithp@keithp.com>
Date: Wed Feb 6 16:51:57 2008 -0800
XkbCopyKeymap was mangling doodads and overlays
commit ab9b0b36ac8ac72fc48c0abd91a83de49a18313c
Author: Adam Jackson <ajax@redhat.com>
Date: Mon Mar 10 13:40:00 2008 -0400
Add the "amd" driver to magic driver selection.
commit 0f6aaf636b7ac4c98467284ff7baf1b83e0b72e7
Author: Adam Jackson <ajax@redhat.com>
Date: Mon Mar 10 09:14:20 2008 -0400
Bug #14927: Fix the math for xf86NumDefaultModes.
commit 01c2e01f2aee580438b74bfb9da8f584f3878e6b
Author: Kristian Høgsberg <krh@sasori.boston.redhat.com>
Date: Sun Mar 9 21:40:27 2008 -0400
GLX: Track changes to DRI_TEX_BUFFER extension.
We now just pass in the __DRIdrawable.
commit acedc03367e9e69f03b4838f0f0e8d8a8e872b9b
Author: Kristian Høgsberg <krh@sasori.boston.redhat.com>
Date: Sun Mar 9 21:39:19 2008 -0400
DRI2: Return event buffer head index in DRI2CreateDrawable.
And pass it to the DRI driver in AIGLX.
commit 911f0c147699d3b8d97491be2ef6d2e4a6682a0b
Author: Julien Cristau <jcristau@debian.org>
Date: Fri Mar 7 23:24:06 2008 +0100
Programs in hw/dmx/examples/ want client-side xkb headers.
commit 9abaad115cb6245b12b2adb3552ace99b634ab4a
Author: Kristian Høgsberg <krh@redhat.com>
Date: Fri Mar 7 14:12:28 2008 -0500
Fix DRI2 texture target for GLX_EXT_texture_from_pixmap.
Thanks to Dennis Kasprzyk for pointing it out and for reminding me to
commit it.
commit 3bf7ff70323d533a3a05c0f3e22393e63beada99
Author: Adam Jackson <ajax@redhat.com>
Date: Fri Mar 7 09:25:06 2008 -0500
Size xf86DefaultModes explicitly.
i.e., don't check for the end of the list by ->name == NULL, since that
won't work now. Fix the consumers of xf86DefaultModes to use the new
explicit size as well.
commit 3fcb6445dc08f42488287162e3b7009d405e9c5b
Author: Adam Jackson <ajax@redhat.com>
Date: Fri Mar 7 08:29:49 2008 -0500
Fix segfault when a monitor exists but has no modes.
Thanks to Zhenyu Wang for finding this.
commit a8d760f567b19268329c4682495caa591f08a854
Author: Aaron Plattner <aplattner@nvidia.com>
Date: Sun Mar 2 20:13:11 2008 -0800
Get modes code building with old X servers again.
This change uses XORG_VERSION_CURRENT < 7.0 to mean "server newer than 1.2"
since XORG_VERSION current went backwards at some point.
commit ca616b902b2c5d0f046c7a042c11f045479e373a
Author: Jesse Barnes <jbarnes@jbarnes-t61.(none)>
Date: Thu Mar 6 13:47:44 2008 -0800
Allow RandR get output property to call into drivers
In order to report accurate values to users of the RandR property interface,
it's sometimes necessary to ask the driver to update the value (for example
when backlight brightness changes without the server's knowledge, due to hotkey
events or direct sysfs banging).
This patch wires up the core server code with a new xf86CrtcFuncs callback,
get_property, to allow for this.
The new code is available under the RANDR_13_INTERFACE define, which in turn
depends on the RANDR_12_INTERFACE code.
commit 34b69e3bc0e6462eb60029fbcb4f5479494007a2
Author: Adam Jackson <ajax@redhat.com>
Date: Wed Mar 5 23:56:49 2008 -0500
Fix distcheck.
(cherry picked from commit 2a47accff8dccded4dfe031f9366c028ba927824)
commit 8e562fe26ff77c03be0855afb08e43f3ed0bd4b9
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Wed Mar 5 15:11:41 2008 +1030
Xi: remove false memset from DeepCopyDeviceClasses.
It's wrong, needs to be different, but I haven't had enough coffee to figure
out what it needs to do yet.
commit d4101140f4e569f18554cf0cbf43138d08bd1277
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Tue Mar 4 22:39:41 2008 -0500
xselinux: Implement polyinstantiation support and related protocol.
commit cf984dcc156958d4f8d98110e7add150628ce97e
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Tue Mar 4 16:03:04 2008 -0800
Make sure SIOGLIFCONF buffer is properly aligned for socket structures
commit 27e7dacbf7ef17712be31ff90f98ee3a5c5cf909
Author: Adam Jackson <ajax@redhat.com>
Date: Tue Mar 4 11:38:34 2008 -0500
Make xf86InitialConfiguration slightly smarter.
Old heuristic was to find the first monitor that expressed a preference,
then attempt to get all other monitors to agree. This doesn't work
particularly well when the two sets of modes don't precisely intersect,
you get overlapping-but-not-identical output geometry and things go wrong.
New heuristic is:
- Exact user preference, if given
- Exact output preference, if the same for all outputs
- Best (largest) mode of modes common to all outputs:
- with the same aspect ratio as all outputs (may be NULL)
- with 4:3 aspect ratio
- Then the old heuristic to try to get something lit
Note that it is simply not doable to have a reliable initial output guess if
you insist on trying to clone all outputs together. It's far too easy to
end up with displays that simply don't have modes in common. We need to
switch to right-of placement someday, once we're not limited to CRTC size
limits and we have working multi-GPU in RANDR.
commit 95df04b744c6a3498a9a9e2ea9bb03ee780e60f8
Author: Adam Jackson <ajax@redhat.com>
Date: Tue Mar 4 10:59:24 2008 -0500
Remove all mention of the vga driver from the config logic.
commit 7b4f3616f75a541b819d99c28bb6cb73761b6066
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Tue Mar 4 18:29:15 2008 +1030
Xi: add deviceid to QueryDevicePointer request.
Why not, we had the padding anyway.
Suggested by Jim Gettys on the X.Org mailing list.
commit 056a2ce02ce85013e89055ee44a7aa3eabedac09
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Tue Mar 4 02:44:48 2008 -0500
XACE: Check the return value of the selection create hook call.
commit 4f2cd0ed96d3b10c78774c721c2ffbfb0556dddd
Merge: 23ae68a4c7 453661a9e1
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Tue Mar 4 18:11:10 2008 +1030
Merge branch 'master' into mpx
This merge reverts Magnus' device coorindate scaling changes. MPX core event
generation is very different, so we can't scale in GetPointerEvents.
Conflicts:
Xi/opendev.c
dix/devices.c
dix/dixfonts.c
dix/getevents.c
dix/resource.c
dix/window.c
hw/xfree86/common/xf86Xinput.c
mi/mipointer.c
xkb/ddxBeep.c
xkb/ddxCtrls.c
xkb/ddxKeyClick.c
xkb/ddxList.c
xkb/ddxLoad.c
xkb/xkb.c
xkb/xkbAccessX.c
xkb/xkbEvents.c
xkb/xkbInit.c
xkb/xkbPrKeyEv.c
xkb/xkbUtils.c
commit 72f2197545e734cd0aa785d05a57b2fc0351a763
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Tue Mar 4 02:02:54 2008 -0500
dix: Convert selection list to a linked list.
Fixes a bug where pointers were being invalidated after a realloc.
commit 0bd0f90d7c7928052197da7119177e5a1c9eee2c
Author: Daniel Stone <daniel@fooishbar.org>
Date: Tue Mar 4 03:47:36 2008 +0200
XKB: Fix initial map setting on startup
Due to an unwitting sense inversion when eliminating XkbFileInfo, we were
setting the complete wrong keymap on startup (non-XKB map if we had an XKB
map available, or the XKB map if we didn't have any available). Invert the
sense properly, and add two small bits that also went missing in that commit.
commit 613852ce6a821ce6f6382fc14629f517776a3701
Author: James Cloos <cloos@jhcloos.com>
Date: Mon Mar 3 16:10:04 2008 -0500
Fix some documentation typos
commit 3f23139137e024e09d207be05a61968100cf53e8
Author: Jesse Barnes <jesse.barnes@intel.com>
Date: Mon Mar 3 13:05:12 2008 -0800
Add cscope files to .gitignore
commit 708f07753ff22ade54e9ee8885e4198fff363b87
Author: Adam Jackson <ajax@redhat.com>
Date: Mon Mar 3 15:49:48 2008 -0500
RANDR 1.2: Inherit PreferredMode from the global configuration, if any.
If you don't do this, then Modes "800x600" in the Display subsection will
be dutifully ignored and the driver will start at whatever resolution it
feels like.
commit 605e6764dfd3e9cb917b9cfcd92fe89857c1a1c9
Author: Adam Jackson <ajax@redhat.com>
Date: Mon Mar 3 15:45:17 2008 -0500
Fix Motif menu drawing in Xnest.
See also Red Hat bug #229350, OpenSolaris bug #6366490.
commit 3b73d62791d925c465ec855f96981d151dd3c179
Author: Adam Jackson <ajax@redhat.com>
Date: Mon Mar 3 15:43:22 2008 -0500
xf86DDCMonitorSet: Honor the DisplaySize from the config file.
We honor sync ranges and pixel clock settings from the config here, no
reason to ignore DisplaySize.
commit 7c16b68ab879f5b4b1aedfc6b2aadbe56193dd19
Author: Adam Jackson <ajax@redhat.com>
Date: Mon Mar 3 15:09:11 2008 -0500
1.5 has branched, start 1.5.99.x.
commit f7ab2d3821e6bccc943f088e308fd58395a186d2
Author: David Nusinow <dnusinow@debian.org>
Date: Sun Mar 2 18:36:25 2008 -0500
Add missing file from previous commit.
commit b5ce0e1d0b861dc5521fcd9db6287ed6da817726
Author: David Nusinow <dnusinow@debian.org>
Date: Sun Mar 2 17:12:02 2008 -0500
Bug #13860: Ensure that the DRI mode is in octal format.
commit c934366424b0d20e013c84e6b94b226b20e7baa2
Author: Matthieu Herrb <matthieu.herrb@laas.fr>
Date: Sun Mar 2 19:27:53 2008 +0100
use UTILS_SYS_LIBS to pass SYS_LIBS to utils/ioports correctly
commit 2bb9c1f36f685044b837f42076dec2ea7d22d034
Author: David Nusinow <dnusinow@debian.org>
Date: Sat Mar 1 18:44:58 2008 -0500
bug #10008: Make Xvfb.1 document the correct default depth
commit b0b9c811cda3e35a8f6d0813483f750602c55ff6
Author: George Sapountzis <gsap7@yahoo.gr>
Date: Sat Mar 1 20:24:50 2008 +0200
fix typo
commit 3d642905477f4b1ec3223f1fbe0d0d37e959ec81
Author: George Sapountzis <gsap7@yahoo.gr>
Date: Sat Mar 1 16:18:18 2008 +0200
clean some "unused" warnings
commit e7a6f79754816976d92857d55840262cccff80a6
Author: George Sapountzis <gsap7@yahoo.gr>
Date: Sat Mar 1 16:16:29 2008 +0200
glcore: split mesa and X in build system
commit cdd46aa3cd2e720558186cdbe48d871ab385fcdd
Author: George Sapountzis <gsap7@yahoo.gr>
Date: Sat Mar 1 15:57:57 2008 +0200
configure: minor cleanup
- dmx
- darwin: remove from xorg options
- xephyr: libxv is client lib
commit 8af2c39bcc4ddc4693d5a2597c9622fa17b6c272
Author: Maarten Maathuis <madman2003@gmail.com>
Date: Sat Mar 1 16:54:01 2008 +0100
Fix big mistake in commit fd41f46ac62033a724bd1f4612f19448a21c1224.
- When a mode is deleted, the name pointer is also free()'ed.
- This leaves other modes with an invalid pointer.
commit ef60632e200853680282016e32a7a9fb01882852
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Fri Feb 29 18:00:27 2008 -0500
dix: Modify callers of property and selection API to use new interfaces.
commit cc76ea6e3ac6a405f0c198c4e62be40aa8d2b546
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Fri Feb 29 17:55:31 2008 -0500
XACE: Add generic support for property and selection polyinstantiation.
commit 34bf308a9e66f1a2f48630a15b1802afad50ec24
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Fri Feb 29 18:00:23 2008 -0500
dix: Refactoring of selection code to allow for polyinstantiation.
Introduces dixLookupSelection() API.
Removes NumCurrentSelections from API.
commit d5715f7beaad6816db27b01b67d7a3c69164d106
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Fri Feb 29 16:16:12 2008 -0500
dix: Refactoring of property code to allow for polyinstantiation.
Introduces dixLookupProperty() API.
commit c0e1959f285d7a7df66f42d55912a5a595decd0f
Author: Adam Jackson <ajax@redhat.com>
Date: Fri Feb 29 16:45:11 2008 -0500
On second thought, revert that, it'll make large pixmaps painfully slow.
Need to just fix the callers.
commit 4a44fe7c8678360d0549cf0e0d63870f3623b1db
Author: Chris Wilson <chris@chris-wilson.co.uk>
Date: Fri Feb 29 16:43:14 2008 -0500
Bug #10465: Use calloc() for allocating PixmapRec's.
commit 5d5fcc7198ca54fa9dc24fe974763eff9fddabee
Author: Chris Wilson <chris@chris-wilson.co.uk>
Date: Fri Feb 29 16:42:04 2008 -0500
Bug #10464: Set pixel value to 0 before FindColor()
commit 8f0a4282f0ac33625eda9466e3db0bcef64e403a
Author: Chris Wilson <chris@chris-wilson.co.uk>
Date: Fri Feb 29 16:39:29 2008 -0500
Bug #10463: Always initialize reference pixel before AllocColor()
commit b7eb92774a58639aff3f26bb28a3dcff910c3fb6
Author: Adam Jackson <ajax@redhat.com>
Date: Sat Jan 12 01:22:05 2008 -0500
EDID 1.4: Print additional CVT support data in the log.
commit 31014d88aff8dc8a502cf0f26e4cde141e1a92f5
Author: Adam Jackson <ajax@redhat.com>
Date: Sat Jan 12 01:03:44 2008 -0500
EDID 1.4: Decode additional CVT support information.
Table 3.28: Display Range Limits & CVT Support Definition
commit d1c48955f80692a32ab6adcee1384e3d298f471a
Author: Adam Jackson <ajax@redhat.com>
Date: Sat Jan 12 00:30:58 2008 -0500
Fix CVT abuse in DDCModesFromStandardTiming.
CVT is enough different from GTF that it should not be used on monitors
that aren't expecting it. This brings us closer to what the spec says
the correct behaviour is.
commit 26c2e95fa5bf30726356cf4bdd0fea32a771a179
Author: Adam Jackson <ajax@redhat.com>
Date: Sat Jan 12 00:09:34 2008 -0500
Nuke a duplicate SYMFUNC(xf86CVTMode)
commit ca5625b911e65fdfd410247b3eff57fedcfc1f79
Author: Adam Jackson <ajax@redhat.com>
Date: Sat Jan 12 00:08:00 2008 -0500
Add xf86GTFMode().
This should probably be shared like xf86CVTMode().
commit 4cb4817c1072e1d31333db47d95f71d08bf0d1dc
Author: Adam Jackson <ajax@redhat.com>
Date: Fri Jan 11 23:38:48 2008 -0500
Remove the duplicate copy of xf86cvt.c
commit e65e51a99b17a0510782775f010e9820ca567fcb
Author: Adam Jackson <ajax@redhat.com>
Date: Fri Jan 11 23:19:20 2008 -0500
Constify the built-in mode tables.
commit 6828d8fc2b464e0755f46e3fbdeb07be0c38b620
Author: Adam Jackson <ajax@redhat.com>
Date: Fri Jan 11 22:57:42 2008 -0500
Clean up DisplayModeRec handling in many places.
Use xf86DuplicateMode() instead of rolling our own, and change
malloc+memset to calloc.
commit 85617b56e5e00e7b8c7d8ce5b49af289056921a7
Author: Adam Jackson <ajax@redhat.com>
Date: Fri Jan 11 22:55:37 2008 -0500
Remove some #if 0 guarding code duplicated in xf86Modes.c
commit fd41f46ac62033a724bd1f4612f19448a21c1224
Author: Adam Jackson <ajax@redhat.com>
Date: Fri Jan 11 22:38:21 2008 -0500
Allow xf86DuplicateMode() to work correctly on read-only modes.
Before this it was meaningless to try to mark DisplayModeRec tables
const, since the mode name would be emitted as a pointer to an
anonymous string constant, and therefore would have to be fixed up by
ld.so and so couldn't live in .rodata. With this change the standard
mode lists can live in .rodata, and modes duplicated from them will
have their names filled in on the fly.
commit 8ac19d16a030ec416e30d3650cf43e024ada167f
Author: Adam Jackson <ajax@redhat.com>
Date: Fri Jan 11 21:58:21 2008 -0500
Add several comments documenting our EDID failures.
commit 13bfa5937d43392f686b76a99ea6331e3dce5987
Author: Kristian Høgsberg <krh@redhat.com>
Date: Fri Feb 29 15:10:36 2008 -0500
GLX: Adjust to changes in DRI driver interface.
commit d04ea267a4a51c16088d9ef429681a1edde536b1
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Thu Feb 28 21:53:16 2008 -0500
xselinux: Don't require device "read" permission for XQueryPointer.
These keyboard and pointer state polling calls are a real problem.
commit 3fb17a3e647e926688c91a49a9b5b97f37dbc367
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Thu Feb 28 21:52:57 2008 -0500
xselinux: Log messages to both libaudit and Xorg.0.log.
commit 4d91b1d5e422c5c460b1b7050baa9487a59b8aa8
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Thu Feb 28 21:52:32 2008 -0500
XACE: Adjust the location of the COMPOSITE creation hook.
Avoids incrementing the refcnt if the hook fails.
commit 5675ae1f72145e9b719c613023da525731b42461
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Thu Feb 28 18:12:52 2008 -0500
XACE: Call the creation hook to properly label COMPOSITE window pixmaps.
commit 27bcf40cda1d7c52b189cc76528f1f51cbe1d5eb
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Thu Feb 28 16:43:43 2008 -0500
XACE: Fix instances of DixUnknownAccess at hook callsites.
commit 453661a9e193a511cf5e54e6d330454163817316
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Wed Feb 27 20:43:50 2008 +1030
Xi: swap the control attached to a ChangeDeviceControl request. Bug #14170
Just swapping the request's data isn't enough, we need to swap the actual
control as well.
X.Org Bug 14170 <http://bugs.freedesktop.org/show_bug.cgi?id=14170>
commit aebd9dc252449747416b23c740a550d914275399
Author: Tiago Vignatti <vignatti@c3sl.ufpr.br>
Date: Thu Feb 28 01:22:31 2008 -0300
Oops, there's one more parenthesis.
commit f616735f17a681e3add866bf199540327c322490
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Wed Feb 27 22:46:14 2008 -0500
xselinux: Prefix a few remaining error messages with "SELinux".
commit e40cc5305bec656108077ab13fcc8e6e82b3707a
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Wed Feb 27 22:29:15 2008 -0500
xselinux: Don't throw BadAccess if DixUnknownAccess is passed in to a hook.
The avc will still appear, however, so that the callsite can be fixed.
commit 3b1df47bd400be9dca34b5e5d1ac2b117f8cc4ed
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Wed Feb 27 22:28:54 2008 -0500
XACE: Require "manage" permission for XKBSetNames.
commit 08afc70513e5496cc5cd8b76c8658c4292119e4b
Author: Dave Airlie <airlied@redhat.com>
Date: Thu Feb 28 10:45:41 2008 +1000
quirks: another LPL panel with the cm/mm wrong
commit f6d51797a523ecc2d4a8f18b2681160fcd5d1d55
Author: Maarten Maathuis <madman2003@gmail.com>
Date: Wed Feb 27 23:44:39 2008 +0100
EXA: Let the driver decide what repeat/extend types are supported.
commit 41aea6194bd29ab34cc166b3fd90eee64299ddf8
Author: Alan Hourihane <alanh@tungstengraphics.com>
Date: Wed Feb 27 17:06:27 2008 +0000
More checking for failed contexts/drawables
commit 43e46a654fa7cf69f0c8bcb7f583008d96a98686
Author: Alan Hourihane <alanh@tungstengraphics.com>
Date: Wed Feb 27 16:58:21 2008 +0000
Fix context sharing between direct/indirect contexts
commit d74b0327e8355546e6b41e8ce684f461d65fa9dc
Author: Dodji Seketeli <dodji@openedhand.com>
Date: Wed Feb 27 09:48:10 2008 +0100
[Xephyr/GL] unbreak the build
Don't touch Xephyr DRI stuff when not compiling in a DRI environment.
commit 2257e20900460d85254734b595238e7ad5ee55c8
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Wed Feb 27 17:15:28 2008 +1030
dix: set dev->key to NULL after freeing it in CloseDevice. (Bug #12830)
Otherwise XkbRemoveResourceClient may try to dereference it lateron.
X.Org Bug 12830 <http://bugs.freedesktop.org/show_bug.cgi?id=12830>
commit 3f0681fb0b2d0744c2ef892883ae5359b43a4a9a
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Tue Feb 26 23:14:29 2008 -0500
xselinux: Stub out selection protocol requests.
commit 4632ea22580c31d44b0786321668d9e78f02900e
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Tue Feb 26 22:00:52 2008 -0500
xselinux: Rip out the selection code in advance of polyinstantiation support.
This resolves an issue where BadWindow errors were being thrown.
commit c8e979b3b800e4c58be454daa0213285d4ee6510
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Tue Feb 26 21:34:22 2008 -0500
security: Register resource names in the server-side name registry.
commit d12b7b6632fb4cf41d2e28c7792eaa503f25404a
Author: Dave Airlie <airlied@redhat.com>
Date: Wed Feb 27 07:08:00 2008 +1000
xf86Crtc: add higher level modesetting entry point.
For kernel modesetting work we need a bigger stick to beat the modesetting path
commit dcc077c753137f37aa58231f1df3c4adb92b2c4b
Author: Michel Dänzer <michel@tungstengraphics.com>
Date: Tue Feb 26 12:13:06 2008 +0100
AIGLX: Switch to server context for calling DamageDamageRegion().
Fixes https://bugs.freedesktop.org/show_bug.cgi?id=14518 .
commit 23ae68a4c74a2ec90b4130c37b0d0aec3f4082ce
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Tue Feb 26 15:12:36 2008 +1030
dix: before copying the classes the first time, set the VCK's classes to NULL.
XkbFinishDeviceInit does the following:
xkbi->kbdProc= pXDev->kbdfeed->CtrlProc;
pXDev->kbdfeed->CtrlProc= XkbDDXKeybdCtrlProc;
If we directly copy the device classes for the VCK, pXDev->kbdfeed->CtrlProc
at the time of copying is still XbkDDXKeybdCtrlProc. So at some point
XkbDDXKeybdCtrlProc is called, and calls itself, and calls itself, and...
Setting the device's classes to NULL seems to fix things. The memory isn't
lost, it gets stored into the devPrivates and freed at device closing time.
commit ce9fb2f8c4610016e49321018fc9b24729380afc
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Tue Feb 26 13:19:54 2008 +1030
Xi: MDs return the paired device's ID in attached field of ListInputDevices.
commit c46f7b62d2bf9f35937cfef98325ed904895396a
Author: Tiago Vignatti <vignatti@c3sl.ufpr.br>
Date: Mon Feb 25 18:14:08 2008 -0300
Fine, we don't need pciInit() anymore. Nuke, nuke, nuke...
commit a9050d54249ed9f54c6fe59143b846c9c7548f59
Author: Tiago Vignatti <vignatti@c3sl.ufpr.br>
Date: Mon Feb 25 18:10:18 2008 -0300
Jesus, pciInit() was called 32 times in my machine without need!
xf86scanpci() will always call pciInit() before any other function, so
there's no need to guarantee it after.
commit 81272f7ec9a3465e1d102c2ce627a45f92268857
Author: Tiago Vignatti <vignatti@c3sl.ufpr.br>
Date: Mon Feb 25 17:39:33 2008 -0300
Some doc clean up:
clean up legacy things in os-support/bus/Pci.c.
Put InitOutput() comment to its right place.
commit 7c582dd6de27d2f4fedf73319d2dea2bfb240efa
Author: Tiago Vignatti <vignatti@c3sl.ufpr.br>
Date: Mon Feb 25 17:31:37 2008 -0300
remove lnxPciInit() unused function.
commit 9727db88d57089be6483104de435626cdbad883a
Author: Tiago Vignatti <vignatti@c3sl.ufpr.br>
Date: Mon Feb 25 17:08:07 2008 -0300
No more "-scanpci" given that we already have it in libpciaccess.
(Yeah, lets nuke dead code!)
commit f19f7b8e53ed6609fc1fdd272de5521417946209
Author: Tiago Vignatti <vignatti@c3sl.ufpr.br>
Date: Mon Feb 25 17:07:07 2008 -0300
Clean some garbage caused when pciaccess was merged:
FindPCIVideoInfo() function isn't need anymore.
xf86scanpci() is being called only once so we don't need permanent
(static) variables there.
restorePciState() is not used for now (until we find why multiple
cards aren't working).
commit d61f481a4455dd2a94674d2b7b26429cf9dcece3
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Mon Feb 25 17:52:45 2008 +1030
Xi: remove GetPairedPointer handling.
obsolete, ListInputDevices provides this information now.
commit 27b21278939a06ab6a22c9902f202eae6c5fae72
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Mon Feb 25 17:00:42 2008 +1030
Xi: remove ungrab handling of ExtendedUngrabDevice request.
This can be done by UngrabDevice, no need for separate codepaths.
commit 4b50e71bf127c8e0f289e3b76c786f0398effe65
Author: Adam Jackson <ajax@redhat.com>
Date: Sun Feb 24 20:25:13 2008 -0500
Bug #13736: Fix %bx in VBEGetPixelClock to match spec.
Reported by Yannick Henault.
commit 6dc369028d3ca741de57ad78febf2f5f82e0696e
Author: Jeremy Huddleston <jeremy@tifa.local>
Date: Sat Feb 23 00:01:02 2008 -0800
XQuartz: Quit now properly warns the user
(cherry picked from commit ed3d7b3959c2a0cb63e37210455bcc6cf195b807)
commit e6a4cde16dc99ea02ac93da1d1b9517b1073d159
Author: Adam Jackson <ajax@redhat.com>
Date: Fri Feb 22 18:36:29 2008 -0500
Use the client-side XKB headers for the config utilities
commit 347db49ebe4596db16455ea8a1a608cfa826c5c7
Author: Adam Jackson <ajax@redhat.com>
Date: Fri Feb 22 16:05:33 2008 -0500
s/via/openchrome/ in the autoconfig logic.
Xorg's via driver is effectively dead anyway.
commit 69f782676797744815ff76b8a11b11178066f501
Author: Adam Jackson <ajax@redhat.com>
Date: Fri Feb 22 16:04:35 2008 -0500
Match Xephyr DRI definitions to the ones in xf86dri.h
commit 060a66b6e2feddba43ed207b6fcf2cf1f7fe39fd
Author: Adam Jackson <ajax@redhat.com>
Date: Mon Dec 24 15:55:58 2007 -0500
Normalize swapped dispatch for Fixes{ChangeSaveSet,SelectSelectionInput}
commit 24bebdded44a9e184455b4fee7800257fee81efb
Author: Adam Jackson <ajax@redhat.com>
Date: Mon Dec 24 15:07:49 2007 -0500
fbFillRegionTiled() is now dead code.
Only ever called from the old PaintWindow* screen hooks, but those are
gone now. As a pleasant side effect, fb loses its #ifdef PANORAMIX.
commit ee21aba6be0078949204e315ddfffd99de60c2f1
Author: Adam Jackson <ajax@redhat.com>
Date: Mon Dec 24 13:13:19 2007 -0500
Fix Xinerama's consolidated visual handling.
Formerly the code claimed it could only handle up to 256 visuals, which
was true. Also true, but not explicitly stated, was that it could only
handle visuals with VID < 256. If you have enough screens, and subsystems
that add lots of visuals, you can easily run off the end. (Made worse
because we allocate visual IDs from the same pool as XIDs.) If your app
then chooses a visual > 256, then the Xinerama code would throw BadMatch
on CreateColormap and your app wouldn't start.
With this change, PanoramiXVisualTable is gone. Other subsystems that
were using it as a translation table between each screen's visuals now
use a PanoramiXTranslateVisual() helper.
commit a4202b898f07dd733590ae5adb21e48775369781
Author: Daniel Stone <daniel@fooishbar.org>
Date: Fri Feb 22 18:22:58 2008 +0100
XKB: Actually use the keymap we compile at startup
During XkbInitKeyboardDevice, we compiled a keymap and promptly threw it away;
brief inspection revealed the embarassingly simple problem. Sorry.
commit c14fd2a5cb3f45d5c4502e09f55f5e3732c5e698
Author: Dodji Seketeli <dodji@seketeli.org>
Date: Thu Feb 21 15:33:02 2008 +0100
[Xephyr/GL] properly route expose event on GL drawables
When an expose event happens on an host GL window paired with an
internal drawable, route that expose event to the clients listening
to the expose event on the internal drawable.
commit 437c78ef9ff1177e04b3d6781b5805d89b2ab81a
Author: Dodji Seketeli <dodji@seketeli.org>
Date: Thu Feb 21 15:29:27 2008 +0100
[Xephyr/GL] don't crash when the host returns a NULL server string
commit f343265a289724c81017f089c024a7618267c4e3
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Fri Feb 15 19:53:45 2008 -0500
XACE: Make the default window background state configurable per-window.
To recap: the original XC-SECURITY extension disallowed background "None" if
the window was untrusted. XACE 1.0 preserved this check as a hook function.
XACE pre-2.0 removed the hook and first abolished background "None entirely,
then restored it as a global on/off switch in response to Bug #13683.
Now it's back to being per-window, via a flag instead of a hook function.
commit 7c2f0a8befb310707ea923dbcdfde84521e52c88
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Fri Feb 15 19:17:40 2008 -0500
Remove COMPOSITE ifdefs around WindowRec bitfield as it has no ABI effect.
commit 5cb9e15562a32c1f102d94d5e15d5fd298baff3f
Author: Eric Anholt <eric@anholt.net>
Date: Wed Feb 20 10:36:06 2008 -0800
EXA: Fix Render acceleration in copy and tiling cases.
Code shuffling in a634c9b03494ba80aeec28be19662ac96657cc23 broke this by
leaving pSrcPixmap = NULL.
commit f14a62f823e257f92745bbcde11838f2ddd32ac8
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Tue Feb 19 21:44:10 2008 +1030
dix: set evlen to the size of the reallocated memory.
What a good idea this is... I'm very proud of myself.
commit 67a78e84a81571cedaf7fd214a21ce1bbdc4fb3b
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Tue Feb 19 21:31:50 2008 +1030
Revert "xfree86: plug a memory leak in xf86LoadModules."
This reverts commit 3abce3ea2b1f43bd111664d4a57e5ccd282acab0 and
6cbaf15e6109ba77819c4070f5b46c78237ec460.
The memory returned to xf86LoadModule was allocated in doLoadModule, which
calls the respective module's PreInit. As it turns out, input and output
drivers store a pointer to the module elswhere, so freeing it in
xf86LoadModule is a bad idea.
For further reference: hw/xfree86/common/xf86Helper.c
Input drivers: xf86InputDriverList[blah]->module = module;
Output drivers: xf86DriverList[blah]->module = module;
Unloading the module would not look pretty then.
commit 5f5ec5db35e82ddd9659763875e5d6c63cf1b691
Author: Jeremy Huddleston <jeremy@tifa.local>
Date: Tue Feb 19 00:00:11 2008 -0800
XQuartz: unsetenv("DISPLAY") before startx if X11.app can't connect to it.
Also fix casting to silence warning.
(cherry picked from commit a5cbf78471ec6e6ad672dc00118fc7edbd6ddc7c)
commit 750d70267679ddee10590c80ec621d890bd3d4a7
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Sun Feb 3 10:25:15 2008 +1030
dix: Ensure enough memory for ClassesChangedEvent for a new device.
Before we enable the device through the driver, we size it up and make sure
that the events in the event list contain enough bytes for a possible
ClassesChangedEvent lateron.
commit 74628d639719815c1beff4cac84662fa41c55925
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Sun Feb 3 10:15:40 2008 +1030
dix: change GetEventList to return length of list and set parameter in place.
Changing DDXs to use new prototype too.
commit 77dba004a9aaf35f183f61ff6875a491a52aa030
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Sun Feb 3 10:10:46 2008 +1030
dix: add InputEventListLen and SetMinimumEventSize
The latter is used to increase the amount of allocated memory for the event
list. This will be needed for ClassesChangedEvents that can be of more or less
arbitrary size (larger than 32 anyway).
commit 6cbaf15e6109ba77819c4070f5b46c78237ec460
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Tue Feb 19 12:02:22 2008 +1030
xfree86: guard against NULL-pointer dereferences in xf86LoadModules.
Should have been part of 3abce3ea2b1f43bd111664d4a57e5ccd282acab0, but I
forgot to git-update-index before I committed.
Thanks to Bill Crawford for pointing it out.
commit 3fe64d8d271aea0863bf01b0376f3eceec0c90b5
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Sun Feb 3 09:56:19 2008 +1030
Move input event list initialisation and storage from DDX to DIX.
Rather than letting the DDX allocate the events, allocate them once in the DIX
and just pass it around when needed.
DDX should call GetEventList() to obtain this list and then pass it into
Get{Pointer|Keyboard}Events.
commit 09a8fc5c7a79ca22fc23224bb544f2e709681f3f
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Sun Feb 3 07:47:18 2008 +1030
Xi: make SizeDeviceInfo public and re-use from CreateClassesChangedEvent.
commit 3abce3ea2b1f43bd111664d4a57e5ccd282acab0
Author: Arjan van de Ven <arjan@infradead.org>
Date: Mon Feb 18 18:13:10 2008 +1030
xfree86: plug a memory leak in xf86LoadModules.
LoadModule() returns the only reference to a fresh piece of memory (a
ModuleDescPtr). Sadly, xf86LoadModules dropped the return value on the floor
leaking memory for each module it loaded.
Signed-off-by: Peter Hutterer <peter@cs.unisa.edu.au>
commit 6dc71f6b2c7ff49adb504426b4cd206e4745e1e3
Author: Arjan van de Ven <arjan@infradead.org>
Date: Mon Feb 18 17:52:37 2008 +1030
xfree86: plug memory leak in InitPathList.
All the failure paths were very diligent in freeing the "fullpath" temporary
string, but the success case was not. All the content only got strdup()d, so
it's not live memory anymore.
Signed-off-by: Peter Hutterer <peter@cs.unisa.edu.au>
commit 1bec6ad8977cefa49cc297a310f5eb0b7cd0b8bc
Author: Arjan van de Ven <arjan@infradead.org>
Date: Mon Feb 18 17:46:04 2008 +1030
xfree86: plug memory leak in xf86LogInit()
xf86LogInit allocates a piece of memory, stores it in lf. LogInit() will then
effectively strdup it, but lf is never freed again.
Signed-off-by: Peter Hutterer <peter@cs.unisa.edu.au>
commit 6d9d18bf7708eb9e640ef732b5dc4c99aa6d5feb
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Mon Feb 18 17:25:15 2008 +1030
dix: add support for WindowAccessAllowAll in device access checking.
AllowAll is the last check before the parent window is checked. This allows
to override a DenyAll in the parent window in a simpler way than before (the
previous method required all devices to be in the permit list).
commit 088067c891a78670d9509f48f56bf3ff9c16a30d
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Mon Feb 18 16:46:07 2008 +1030
Xi: even if ChangeDeviceHierarchy fails, we may need to send an event.
Changes are committed instantly, so if at least one change was successful, we
must send an event to the client, even if subsequent ones fail.
commit 660739c6bc84cb74f43a277052ce163fae654417
Author: Benjamin Close <Benjamin.Close@clearchain.com>
Date: Fri Feb 15 13:36:34 2008 +1030
dix: Handle the case where a device cursor was removed correctly
In the case that the device cursor was the first in the list of cursors
the window knew about, unsetting the cursor could lead to a segfault
due to pPrev being NULL. Instead catch the condition and correctly remove
the node from the list. Since there is no cursor now set on the device,
we simply return success as the parent windows cursor will propogate
down later.
Signed-off-by: Peter Hutterer <peter@cs.unisa.edu.au>
commit 24db28230120ecc2b65b25164b6e7b407970f9e2
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Mon Feb 18 16:16:19 2008 +1030
dix: set num_events to 1 by default. (no RawDeviceEvents anymore)
This should have been part of acb412d5399f865b5048fdd683147cea0f19f0c1.
commit 45d00433e7bfbab476dd02ec92a9fbee40af5dad
Author: Dan Nicholson <dbn.lists@gmail.com>
Date: Tue Jan 15 19:43:16 2008 -0800
glx: Use glapi sources from the mesa tree
With recent mesa HEAD, the glapi sources used only in the xserver glx
module are carried in the mesa tree. Previously, these were generated
separately and committed to the xserver tree.
The build is changed to symlink these files like the other mesa sources.
This reduces the chance for mismatches between mesa's glX API and the
xserver's glX API.
commit fbd776894658e7afb2c55dc8582b2a3efab78a3c
Author: Daniel Stone <daniel@fooishbar.org>
Date: Sat Feb 16 20:01:18 2008 +0200
XKB: Ditch XkbFileInfo
Sorry about the megacommit, but this touches on a lot of stuff.
Get rid of XkbFileInfo, which was pretty seriously redundant, and move the
only useful thing it had (defined) into XkbDescRec. defined will be removed
pretty soon anyway. Is the compat map pointer non-NULL? Then you have a
compat map, congratulations! Anyhow, I digress.
All functions that took an XkbFileInfoPtr now take an XkbDescPtr, _except_
XkmReadFile, which returns an XkbDescPtr *, because people want to deal in
XkbDescPtrs, not XkbDescRecs.
commit e5f002eddef1abe324033a3155f01d048536a48d
Author: Daniel Stone <daniel@fooishbar.org>
Date: Sat Feb 16 20:00:47 2008 +0200
XkbProcessOtherEvent: Don't depend on now-removed header
We don't do XKBsrv.h anymore.
commit 2d256f098ae05033ad76672d5ebdb9dfa7e6b995
Author: Daniel Stone <daniel@fooishbar.org>
Date: Sat Feb 16 19:57:37 2008 +0200
XKB: Always set size correctly in XkbCopyKeymap's geometry routines
We were forgetting to set the sizes for sections and rows and a couple of
other misc bits in XkbCopyKeymap's geometry. Sort that out, and add a
couple of clarifying comments along the way.
commit ab79110a84b2d299ecae0605fa535edbebd99565
Author: Daniel Stone <daniel@fooishbar.org>
Date: Sun Feb 3 23:48:57 2008 +1100
XKB: Remove support for pre-built keymaps
Don't load prebuilt keymaps anymore.
commit 1332343910a1880854bae21a790cff198855cd24
Author: Daniel Stone <daniel@fooishbar.org>
Date: Sun Feb 3 23:43:18 2008 +1100
XKB: Remove usage of client-side types
Since we're no longer sharing with Xlib, don't pass Displays and XPointers
everywhere.
commit 534fc5140b039a8c98ab715d0a6740d513b41209
Author: Daniel Stone <daniel@fooishbar.org>
Date: Sun Feb 3 23:30:22 2008 +1100
XKB: Remove a bunch of mad ifdefs
We have SEEK_SET and size_t, seriously. Also use DebugF instead of
ifdef DEBUG, and ditch a couple of random bits that were never used.
commit 0f12a448dcbbbf1f40aa98d09c9d25ee511c5bbf
Author: Daniel Stone <daniel@fooishbar.org>
Date: Sun Feb 3 23:15:39 2008 +1100
XKB: Deprecate XKBSRV_NEED_FILE_FUNCS
There's no point in having the function definitions be conditional, so
whatever.
commit 68bd7ac1930b5cffb6657b8d5f5bf8ae58eae8d9
Author: Daniel Stone <daniel@fooishbar.org>
Date: Sun Feb 3 23:12:15 2008 +1100
XKB: Move headers into the server tree
We need to start breaking the XKB API to enforce sanity, so drag whichever
headers we need to do so into the server tree, as the client API is set in
stone, being part of Xlib.
commit 37867626e314e74031378a8a4ff06f69b899a3b2
Author: Daniel Stone <daniel@fooishbar.org>
Date: Fri Feb 1 14:41:04 2008 +1100
main(): Remove uncredible failure
NO, NO, NO.
NO.
The only way this could possibly be worse is if you were viewing it in
Comic Sans.
commit e4eb7e5842f0f56f07e9cf3b16249c172d0a975d
Author: Daniel Stone <daniel@fooishbar.org>
Date: Wed Jan 30 23:24:14 2008 +1100
XKB: Delete xkberrs.c
Get rid of the XKB errors code to save a bunch of space.
commit a48cc88ea2674c28b69b8d738b168cbafcf4001f
Author: Maarten Maathuis <madman2003@gmail.com>
Date: Sun Feb 17 18:47:28 2008 +0100
Fix rotation for multi-monitor situation.
- The (x,y)-coordinates of the crtc were not being passed as xFixed values, which made it an obscure bug to find.
- Fix bug #13787.
commit 70c0592a97c7dc9db0576d32b3bdbe4766520509
Author: Maarten Maathuis <madman2003@gmail.com>
Date: Sun Feb 17 11:21:01 2008 +0100
Resize composite overlay window when the root window changes.
- This allows some compositing managers to work, even after randr12 has changed the root window size.
- Thanks to ajax for figuring out the best place to put this.
- Example:
- xf86RandR12SetMode() calls EnableDisableFBAccess().
- That calls xf86SetRootClip() which in turn calls ResizeChildrenWinSize().
- The final step is the call to PositionWindow().
commit b95059c20746a71e60ef152bb627e1d5c2210d75
Author: Jeremy Huddleston <jeremy@tifa-2.local>
Date: Sat Feb 16 01:33:13 2008 -0800
Added Xquartz.plist to EXTRA_DIST
(cherry picked from commit 70f9495e0c1f1459507064b673fe57b1c90d3c2c)
commit d103820bb8635c63b34b85b45cad95ed9c152d90
Author: Jeremy Huddleston <jeremy@tifa-2.local>
Date: Sat Feb 16 00:35:50 2008 -0800
Fixed unescaped newline in EXTRA_DIST
(cherry picked from commit 567c172c4d400fdfe69e7b096a3877fce5c2de9f)
commit a7d936c4ac8e3d7227ecbfe0ddc6cc257b450458
Author: Jeremy Huddleston <jeremy@tifa.local>
Date: Mon Feb 11 16:09:03 2008 -0800
XQuartz: Fixed EXTRA_DIST to include localization
(cherry picked from commit 1b338c2a9330c85490a7c24d52adf24b124b70e6)
commit 0ffb6a3ad010e80fe8f973fc228d549f9dd3effd
Author: Kristian Høgsberg <krh@redhat.com>
Date: Thu Feb 14 22:20:56 2008 -0500
GLX: Implement support for TTM BO based TFP when available.
commit 879515b1399f87a47010532af70f34b9b09e2a9b
Author: Kristian Høgsberg <krh@sasori.boston.redhat.com>
Date: Mon Feb 4 13:13:35 2008 -0500
Add GLX provider for DRI2.
commit b71dc54352bc56a889823040ec19c1d8e118a1f3
Author: Kristian Høgsberg <krh@sasori.boston.redhat.com>
Date: Mon Feb 4 11:58:24 2008 -0500
Add DRI2 module.
commit 005e31d3de04e7003f84a94d30f2b75a9636266e
Author: Michel Dänzer <michel@tungstengraphics.com>
Date: Fri Feb 15 00:01:32 2008 +0000
AIGLX: Refactor code common between __glXDRI{drawableDestroy,releaseTexImage}.
commit cd78f0d0fc08e4e2339ed09dad1a12802de7729c
Author: Pierre Willenbrock <pierre@pirsoft.de>
Date: Thu Feb 7 21:28:28 2008 +0100
AIGLX: Fix crash after client using GLX_EXT_texture_from_pixmap died.
commit 3e0353c78571890f849a1db47b0540aacc6793bc
Author: Adam Jackson <ajax@redhat.com>
Date: Fri Feb 15 06:42:48 2008 +1100
Bah, macros are hard.
commit c38feeb1492d9a47379b2e4d77dbadd8c421d17f
Author: Maarten Maathuis <madman2003@gmail.com>
Date: Thu Feb 14 18:52:47 2008 +0100
Fix typo in commit b8b7cdf6df3d338c50db670ce4cfd245f9fa8844.
commit b8b7cdf6df3d338c50db670ce4cfd245f9fa8844
Author: Adam Jackson <ajax@redhat.com>
Date: Fri Feb 15 01:31:46 2008 +1100
Silence useless debug spew from XFree86-Misc extension.
commit 4573cb2ce4b859744118d9a33de3599f033cdd2b
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Wed Feb 13 20:16:56 2008 -0500
security: Revise set of permissions granted to untrusted clients.
Bug #14480: untrusted access broken on 7.3.
commit e99aadbc2635e87543fc9980d8156c3ede83544f
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Wed Feb 13 19:46:29 2008 -0500
xselinux: Add use to permission map for devices.
commit ae43d835bdaef96c3c73d7cee5b105f07340833d
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Wed Feb 13 19:39:49 2008 -0500
XACE: Change access modes for some device-related requests.
Opening a device is not really "reading" it.
Requests that globally configure a device should require "manage" access.
commit 921c298c4cdd2c879403ebdacbef48129058cad4
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Thu Feb 14 09:48:19 2008 +1030
Xi: QueryDevicePointer doesn't have a shared field anymore.
commit b885588756450e2fa25fdd191e300e1c5dd37ec3
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Thu Feb 14 09:47:31 2008 +1030
Xi: remove FakeDeviceData calls. And one leftover from GrabAccessControl.
FakeDeviceData needs more thoughtful integration.
commit c99a9a97290c51bf2843f42d5683888cea8a3ff6
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Thu Feb 14 09:43:49 2008 +1030
Xi: remove raw device events.
Need to be better refined.
commit b35a9efa16d9e14378a95c11fa39171b78710996
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Thu Feb 14 09:41:49 2008 +1030
Xi: Remove files for GrabAccessControl.
commit b81c330f70c4a4c8f37216aa4856c7f8db93a375
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Thu Feb 14 09:32:54 2008 +1030
mi: remove RawDeviceEvent's ID changing.
commit acb412d5399f865b5048fdd683147cea0f19f0c1
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Thu Feb 14 09:27:51 2008 +1030
dix: Don't generate RawDeviceEvents anymore.
These events have been removed from the protocol pending some more refinement
and more thoughtful integration.
commit ba69904148acf755bec8fbda2eb869144f0ef7d4
Author: Adam Jackson <ajax@redhat.com>
Date: Sun Feb 3 22:49:23 2008 +1100
Simplify dlloader a bit more.
commit f750ce53ac450824d0c792d11eafdf311cf8abc0
Author: Adam Jackson <ajax@redhat.com>
Date: Fri Feb 1 17:33:48 2008 +1100
Remove some braindamage from ModuleDesc.
Yay dead code elimination.
commit e91ff09568c5579818b6641e88e95c6fe122cbe7
Author: Adam Jackson <ajax@redhat.com>
Date: Fri Feb 1 17:21:34 2008 +1100
Friends don't let friends call xf86AddModuleInfo.
That code only existed to leak memory. It can go now, thanks.
commit 0bdd20a0454c94f902fd4874855125bf7510fcf5
Author: Adam Jackson <ajax@redhat.com>
Date: Fri Feb 1 16:15:58 2008 +1100
Eradicate the VTInit code.
"This option should rarely be used." Never sounds like a better idea.
commit 24089b06243101b1bff4f2fd79fcbfd6a93992d5
Author: Adam Jackson <ajax@redhat.com>
Date: Fri Feb 1 16:11:13 2008 +1100
Don't bother warning people about the keyboard driver rename, just do it.
commit 2aaf6ac134fa9f61984b1c03929c7b596c971cc8
Author: Adam Jackson <ajax@redhat.com>
Date: Fri Feb 1 16:10:23 2008 +1100
Don't even attempt to parse -bpp in xfree86 DDX option parsing.
This hasn't been valid since 1999. Get with the times, man.
commit ef77e4c4419703b5a802f3eee92476a43f788a86
Author: Adam Jackson <ajax@redhat.com>
Date: Fri Feb 1 16:03:01 2008 +1100
Remove useless commentary from environment and argument processing.
commit f3b3b37ec6197f8884417fbc26630d3a28f2e319
Author: Adam Jackson <ajax@redhat.com>
Date: Fri Feb 1 15:36:11 2008 +1100
Use strerror instead of errno values in user strings.
commit b740b865e4c156a40adc6b63fcf215156fc9151a
Author: Adam Jackson <ajax@redhat.com>
Date: Fri Feb 1 15:16:01 2008 +1100
Silence an error message in ConfigureWindow that never happens.
commit 89d3249c3e7611b22414bc84b10ca60aab4b9a77
Author: Adam Jackson <ajax@redhat.com>
Date: Fri Feb 1 15:11:27 2008 +1100
Silence FreeResource()
commit 238b816469355159eea98600ca900e3baa8fa313
Author: Adam Jackson <ajax@redhat.com>
Date: Fri Feb 1 15:08:03 2008 +1100
X.Org Group -> X.Org Foundation
commit 9113fa3de36e84bbae2727cace82b1cf0d709a86
Author: Adam Jackson <ajax@redhat.com>
Date: Fri Feb 1 15:03:57 2008 +1100
Silence the harmless FreeFontPath error message.
commit 7c0709a736c0f3aa011de67dd2c2962585ab146e
Author: Adam Jackson <ajax@redhat.com>
Date: Fri Feb 1 14:59:58 2008 +1100
requestingClient is an xprintism, hide it for other servers.
commit 62cfe8863823c0994f20555cb35ee3bacb9e5225
Author: Adam Jackson <ajax@redhat.com>
Date: Fri Feb 1 14:57:25 2008 +1100
Redact all mention of PanoramiX from user strings.
commit eb8dc11d19dd0b5354de408578ab0cfb865df672
Author: Adam Jackson <ajax@redhat.com>
Date: Thu Jan 31 21:45:14 2008 +1100
Remove some MAX* #defines that never get used.
commit 2ce35f6d45c3e1761d33b786520ff5ba56a3c518
Author: Adam Jackson <ajax@redhat.com>
Date: Thu Jan 31 21:39:48 2008 +1100
Simplify critical output flushing.
commit 3eaecdd66e791e0f3d86b23ce10be057ca44c044
Author: Adam Jackson <ajax@redhat.com>
Date: Thu Jan 31 21:36:14 2008 +1100
Disable Record by default.
commit aa5216e89797b600f382c04e3eaa657e808a5c3e
Author: Adam Jackson <ajax@redhat.com>
Date: Thu Jan 31 12:05:08 2008 +1100
Rip out useless indirection in the callback list management.
commit 0d492b2166c4026b9078ffd86d89a31ebe590be4
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Tue Feb 12 19:59:10 2008 -0500
XACE: Move the selection access hook to its own function.
commit 4be69e41c07b784f75918141eead70415c0ec4a4
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Mon Feb 11 16:03:25 2008 -0500
Revert "Bug #8937: Extension setup functions not called on server resets"
This reverts commit 5e946dd853a4ebc2722ae023429ce5797de3d7a6.
The devPrivates rework makes this workaround unnecessary.
commit 8a244c2bc04a4184535e42d1f2f8c9e3e55678b4
Author: Jeremy Huddleston <jeremy@yuffie.local>
Date: Mon Feb 11 12:09:41 2008 -0800
XQuartz: Fixed layout of Applications->Customize menu
Now resizing it won't produce weir overlaps of the widgets. Thanks to
Pelle Johansson for his help showing me how to do this.
(cherry picked from commit ef3498e92d13c82633fdbe8120396bfbe1e7489a)
commit 3570ca1cb76f084272f7d8bd22c4cfdf03201a77
Author: Jeremy Huddleston <jeremy@tifa.local>
Date: Sun Feb 10 18:27:52 2008 -0800
XQuartz: Added option for setting quartz-wm click-through preference
(cherry picked from commit bf54c267cba97b2b3b9a621da0575776a388b2cb)
commit 8004e160fa8cc75a3f1b7385fee64e5864b3b50a
Author: Jeremy Huddleston <jeremy@tifa.local>
Date: Sun Feb 10 16:34:40 2008 -0800
XQuartz: Converted interface to nib 3.x format
(cherry picked from commit 656aaab95773bd70fc3504b68bf7e1d292891d93)
commit 0b0a09797302ac2171db5df20fc5110aafc8efbb
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Thu Feb 7 15:48:04 2008 +1030
xkb: when copying the keymap, make sure the structs default to 0/NULL.
It actually does help if a pointer is NULL rather than pointing to nirvana
when you're trying to free it lateron. Who would have thought?
(cherry picked from commit 7a97ca667405a42d008265c3a870210cc1da97dd)
commit 7018f280406eb0ef899a4046de274cfdd582881b
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Thu Feb 7 15:48:04 2008 +1030
xkb: when copying the keymap, make sure the structs default to 0/NULL.
It actually does help if a pointer is NULL rather than pointing to nirvana
when you're trying to free it lateron. Who would have thought?
commit 66f8001b61d12eaf4905ac71ccbb3f304914d00d
Author: Bart Trojanowski <bart@symbio-technologies.com>
Date: Thu Feb 7 21:26:54 2008 -0500
X86EMU: handle CPUID instruction
After trying to switch from X to VT (or just quit) the video-amd driver
attempts to issue INT 10/0 to go to mode 3 (VGA). The emulator, running
the BIOS code, would then spit out:
c000:0282: A2 ILLEGAL EXTENDED X86 OPCODE!
The opcode was 0F A2, or CPUID; it was not implemented in the emulator.
This simple patch, against 1.3.0.0, handles the CPUID instruction in one of
two ways:
1) if ran on __i386__ or __x86_64__ then it calls the CPUID instruction
directly.
2) if ran elsewhere it returns a canned 486dx4 set of values for
function 1.
This fix allows the video-amd driver to switch back to console mode,
with the GSW BIOS.
Thanks to Symbio Technologies for funding my work, and ThinCan for
providing hardware :)
Signed-off-by: Bart Trojanowski <bart@jukie.net>
Acked-by: Eric Anholt <eric@anholt.net>
commit de16a8c53046764dbdf26a87acc5c984ef00d818
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Thu Feb 7 20:14:16 2008 -0500
XACE: Correct some protocol error values in the colormap routines.
commit 31934132a490b1b8ae73010c44e0b23217d8dab2
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Thu Feb 7 16:32:06 2008 -0500
xselinux: Use the device name in debugging output.
commit 6dcb7d732bfeadc214228d68c5a13eef30248eb1
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Thu Feb 7 16:00:52 2008 -0500
xselinux: Split devPrivate state into subject and object records.
commit 2259b144f0fd4855085a656111a0c64246733e78
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Thu Feb 7 14:35:02 2008 -0500
xselinux: Add getattr and setattr to the permission map for properties.
commit 9d5edebe9664f4ac35b82830e000a72d5ca9cbe4
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Thu Feb 7 21:22:50 2008 +1030
Xi: finish XKB initialisation before copying the keymap.
commit 96eafa3d4f05997dac8be6a8d66a92410511824c
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Tue Feb 5 16:01:56 2008 +1030
xkb: when copying sections, make sure num_rows is set too.
(cherry picked from commit 41991fb991313202e8e6b513fe928ba14f8fcb87)
commit 5c30327275509576b7848a5f842e7a1bffabe980
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Tue Feb 5 21:06:05 2008 -0500
XACE: Push the dix "structure" includes down to the security modules.
commit bb1a577a6822f781f1e38d2434a13914e74f89aa
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Tue Feb 5 20:07:08 2008 -0500
XACE: Move the property access hook to its own function.
commit 019ad5acd20e34dc2aa3b89cc426138db5164c48
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Tue Feb 5 15:44:41 2008 -0500
XFixes: squash a pointer/integer size mismatch warning.
commit d3c36fe721edc55636438bc3e0e7a6c03f62784e
Author: liuhong <liuhong@devlinux-hong.sh.intel.com>
Date: Tue Feb 5 10:54:58 2008 +0800
validate mode clock for probed modes
Some modes claimed in monitor EDID data may not be supported by
the monitor. So also validating the max clock for probed modes.
commit 4b5b6e7baab58072a983d2ec136965f404c3a74a
Author: liuhong <liuhong@devlinux-hong.sh.intel.com>
Date: Tue Feb 5 10:54:10 2008 +0800
fix max clock unit
max clock from EDID data is in MHz, while we need KHz to validate modes.
commit a56ef7aaa4b6ac13c8181f68fc7dad3ca89e6973
Author: Magnus Vigerlöf <Magnus.Vigerlof@ipbo.se>
Date: Sat Feb 2 23:04:46 2008 +0100
dix: Move motion history update until after screen crossing and clipping
Cross screen and clip the coordinates before updating the motion history
so that it will have the same contents as the events that are reported.
commit a0284d577aabea8406b72dd63773e341430ebe56
Author: Magnus Vigerlöf <Magnus.Vigerlof@ipbo.se>
Date: Sat Feb 2 23:03:51 2008 +0100
dix: Skip call to clipAxis for relative core-events
Relative events that generates both core and extention
events will have its axis cliped and screen changed by
miPointerSetPosition when the events are processed. For
absolute and non core-generating relative events the
axis must be clipped if we shouldn't end up completely
outside the defined ranges (if any).
commit d9e23c4ff1607a62164b34717ef9afd352ce2b94
Author: Magnus Vigerlöf <Magnus.Vigerlof@ipbo.se>
Date: Sat Feb 2 22:57:32 2008 +0100
Bug # 10324: dix: Add scaling of X and Y on the reported pointer-events
Restore the rescaling code for x and y axis when generating
motion events.
commit f04c0838699f1a733735838e74cfbb1677b15dc4
Author: Magnus Vigerlöf <Magnus.Vigerlof@ipbo.se>
Date: Sat Feb 2 22:45:31 2008 +0100
Bug # 10324: dix: Allow arbitrary value ranges in GetPointerEvents
Don't use a possitive value as a marker for if a max-value
is defined on the valuators. Use the existence of a valid
value range instead. This will also make it possible to
define arbitrary start and end-values for min and max as
long as min < max.
commit 12e532403210c15a25200ef448bfe9701735ab20
Author: Magnus Vigerlöf <Magnus.Vigerlof@ipbo.se>
Date: Sat Feb 2 22:44:31 2008 +0100
dix: Always add valuator information if present
Send valuator information for all event types, not only for
MotionEvents and absolute button events.
commit 41991fb991313202e8e6b513fe928ba14f8fcb87
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Tue Feb 5 16:01:56 2008 +1030
xkb: when copying sections, make sure num_rows is set too.
commit 521a7f26e088029707fb9a2bb80c9ddc734a3f8b
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Tue Feb 5 18:34:31 2008 +1030
mi: Only UpdateSpriteForScreen if we actually changed the screen. (Bug #12650)
X.Org Bug 12650 <http://bugs.freedesktop.org/show_bug.cgi?id=12650>
commit 10617dc0fb7166ccd5b2e92fa708390c2d7d0d27
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Fri Feb 1 14:24:04 2008 +1030
xfree86: stick two more checks in for num_valuators < MAX_VALUATORS
commit c68f063be639f39c2facbb496e8455e8e3771b41
Author: Matthieu Herrb <matthieu.herrb@laas.fr>
Date: Fri Feb 1 14:13:29 2008 +1030
xfree86: don't call xalloc from signal handlers when posting events.
Reviewed-by: Peter Hutterer <peter@cs.unisa.edu.au>
commit e5e531ce96264518f278f572a4d0bfcd345aa618
Merge: 6c38682084 1692dcf197
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Thu Jan 31 16:36:17 2008 +1030
Merge branch 'master' into mpx
Conflicts:
dix/events.c
commit 6c38682084e24b18bac0ea75729b1183aeb01600
Author: Benjamin Tissoires <tissoire@cena.fr>
Date: Thu Jan 31 15:51:32 2008 +1030
kdrive: AddInputClient takes a ClientPtr.
commit 1692dcf197470d074f69d5af1608cb2ff1d08872
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Wed Jan 30 13:04:58 2008 +1030
dix: print out event type if a bogus pointer event occurs.
commit d954f9c80348de294602d931d387e5cd1ef4b9a5
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Wed Jan 30 10:39:54 2008 +1030
xkb: don't update LEDs if they don't exist. (Bug #13961)
In some weird cases we call this function when there is no SrvLedInfo on the
device. And it turns out null-pointer dereferences are bad.
X.Org Bug 13961 <http://bugs.freedesktop.org/show_bug.cgi?id=13961>
commit df325be394e1f75c396b2768f81373f2989aef7c
Author: Coleman Kane <cokane@cokane.org>
Date: Tue Jan 29 09:47:00 2008 -0800
Bug 13101: xorg-server has a typo in hw/xfree86/os-support/bsd/i386_video.c
X.Org Bug #13101 <https://bugs.freedesktop.org/show_bug.cgi?id=13101>
Patch #12360 <https://bugs.freedesktop.org/attachment.cgi?id=12360>
commit 94f412cb7e954fe872fed979057cbdfbef953c6f
Author: Julien Goodwin <julien@studio442.com.au>
Date: Sun Jan 27 12:30:16 2008 +1100
Loader: Fix verbosity confusion
'Loading foo' is verbosity 3, whereas 'already built-in' is verbosity 0.
This means that gdm's log would just be full of bare 'module already
built-in' messages.
commit 442838fcb3bf07ac57553ae5600d9e6c59a559bb
Author: Julien Goodwin <julien@studio442.com.au>
Date: Sun Jan 27 12:27:26 2008 +1100
xorg.conf.man: Fix monitor/output confusion in monitor positioning
On the Intel driver at least, LeftOf/RightOf/Above/Below in xorg.conf refers
to output names, not monitor names. Fix nomenclature in xorg.conf.man.
commit 5b8641a5fdc112c19e78ca2954878712e328d403
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Tue Jan 29 10:01:37 2008 +1030
xfree86: fix AlwaysCore handling. (Bug #14256)
Assume AlwaysCore being set by default, just like the other options.
X.Org Bug 14256 <http://bugs.freedesktop.org/show_bug.cgi?id=14256>
commit 975ab11799c819a81da1dfe83505194410dbcb95
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Sat Jan 26 09:39:54 2008 +1030
config: don't reset connection info on disconnect.
If dbus is restarted, we try to connect again and this is difficult if the
busname and/or busobject is not set.
(cherry picked from commit 210eeef495770c1883c842ff003c28ce25f279d4)
commit 7dde5a694a06efed0a9186f05d33f5be6f5dba71
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Fri Jan 25 13:54:47 2008 +1030
config: check connection != NULL before getting dbus' dispatch status.
(cherry picked from commit d23266522390a4ef7203ae7c062b2b920e45f9d7)
commit f0ba7707161b8866e6fde32d6f25be6afcdecb48
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Fri Jan 25 13:45:22 2008 +1030
config: only shutdown libhal if the connection is valid.
Thanks to libdbus' extensive use of assert we won't just get an error, it'll
bring the whole server down for us.
(cherry picked from commit fb07fab2c07e7b0834724541dc47bfba02ba8574)
commit 2cb0ebec2b85d96289c23c17cfdcdf97ef6877d2
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Fri Jan 25 11:48:13 2008 +1030
config: add a debug message, fix a whitespace error.
(cherry picked from commit 7732898aaa70e076000f6e6aa9420482896ed996)
commit 4fc2d3cef8d7868b025aa14af7ed4b730e8f2c49
Author: Jeremy Huddleston <jeremy@tifa.local>
Date: Mon Jan 28 12:18:43 2008 -0800
Rootless: RootlessEnsureFrame: Added check for !IsRoot
This was causing an issue with Apple-DRI and was reported here:
http://trac.macosforge.org/projects/xquartz/ticket/51
(cherry picked from commit 116800279d2ec783c63f43d3902627edde6a4cff)
commit 16b0614c8c441eb1692bde9e58fadf54a9c6f00f
Merge: 1a88aed5c8 e915a26397
Author: David Nusinow <dnusinow@debian.org>
Date: Sat Jan 26 16:13:25 2008 -0500
Merge commit 'upstream/master'
commit 0ac175597712edfeae676f536746a4d26d625e30
Merge: 210eeef495 e915a26397
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Sat Jan 26 13:55:07 2008 +1030
Merge branch 'master' into mpx
Conflicts:
Xext/sampleEVI.c
commit e915a2639752bc0ea9e6e192e020cc2031c08063
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Fri Jan 25 19:22:19 2008 -0500
xselinux: Move the extension to extmod instead of being built-in.
commit 210eeef495770c1883c842ff003c28ce25f279d4
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Sat Jan 26 09:39:54 2008 +1030
config: don't reset connection info on disconnect.
If dbus is restarted, we try to connect again and this is difficult if the
busname and/or busobject is not set.
commit f6a78ee143e3a3ad69538adf2b9675d724468ffa
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Fri Jan 25 18:04:10 2008 -0500
XACE: Remove the extension code entirely, XACE is completely static now.
commit 7724c30a751c653ca3e2e8a6752af27bc37de3f0
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Fri Jan 25 17:28:17 2008 -0500
XACE: Stop using fake requestVectors in favor of a simple hook call.
commit f82329b0811469ddae5c44dcfffa38185c11a67c
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Fri Jan 25 16:20:46 2008 -0500
XACE: Don't need to actually register a protocol extension.
commit d23266522390a4ef7203ae7c062b2b920e45f9d7
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Fri Jan 25 13:54:47 2008 +1030
config: check connection != NULL before getting dbus' dispatch status.
commit fb07fab2c07e7b0834724541dc47bfba02ba8574
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Fri Jan 25 13:45:22 2008 +1030
config: only shutdown libhal if the connection is valid.
Thanks to libdbus' extensive use of assert we won't just get an error, it'll
bring the whole server down for us.
commit 7732898aaa70e076000f6e6aa9420482896ed996
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Fri Jan 25 11:48:13 2008 +1030
config: add a debug message, fix a whitespace error.
commit 46794d0c9665f07913980830d038c88d00407612
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Thu Jan 24 19:49:13 2008 -0500
xselinux: Rename SelectionManager to more generic SecurityManager.
commit 466f6552190d1b83d66ebfd71e07921ed6210ee2
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Wed Jan 23 16:11:31 2008 +1030
Xi: if deviceid is > 127 assume GE mask is for all devices (XiSelectEvent).
commit 379f057646588fa3211d7ba0ec8d77d2fc0ad246
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Wed Jan 23 16:08:37 2008 +1030
Xext: add GEDeviceMaskIsSet (GE mask checking per device)
If a mask was set for the NULL device, then we pretend the mask is set for all
devices.
commit 91dc8c43d2343e494c59023484883f4683bdc639
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Wed Jan 23 15:45:02 2008 +1030
Xi: Change window access right check to RecieveAccess in XiSelectEvent.
commit 94a6a65ae7414c8247aa1741ec5c7561e6f4bbe0
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Wed Jan 23 15:43:48 2008 +1030
Xext: allow per-device GE masks.
Instead of a single mask per client we allow the storage of a mask per client
per device.
commit 6ffeecabb7f3f3173864e0f0af21a99bdc5b5044
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Thu Jan 24 18:11:49 2008 -0500
xselinux: Use a privileged bit in the state instead of passing an index
to the permission checking function.
commit 7ba8e97cbabfef4d614a6a38314830ec0f925471
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Thu Jan 24 19:09:58 2008 -0500
xselinux: Implement "get context" protocol requests.
commit f0bf9a5231d4f612ac916355118484d055715f32
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Thu Jan 24 19:02:35 2008 -0500
xselinux: Whitespace fixups.
commit 734e115871ce98badb8800383c423493802ae3d3
Author: Hong Liu <hong.liu@intel.com>
Date: Wed Jan 23 21:04:32 2008 +0800
Bug #12439: add a quirk to use +hsync +vsync for the probed detailed mode.
Samsung 205BW quirk is somehow reworked.
commit cc22b05ea06e08568d0f0abdaccf67bd32662e94
Author: Adam Jackson <ajax@redhat.com>
Date: Tue Jan 22 18:57:11 2008 -0500
There is no such thing as /dev/cpu/mtrr.
commit 1a88aed5c82c7c131e3d473ef7b8766a418fdf1b
Author: David Nusinow <dnusinow@debian.org>
Date: Mon Jan 21 21:16:13 2008 -0500
Add tags/TAGS to .gitignore for ctags usage
commit be6c17fcf9efebc0bbcc3d9a25f8c5a2450c2161
Author: Matthias Hopf <mhopf@suse.de>
Date: Mon Jan 21 16:13:21 2008 +0100
CVE-2007-6429: Always test for size+offset wrapping.
commit ba315ae5ddd00763147a4b0cdcacba7691793dfc
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Mon Jan 21 23:43:53 2008 +1030
Xi: add XACE hooks for device creation (ChangeDeviceHierarchy)
AddInputDevice checks for permissions already, so all we do is modify a few
callers to let AID sort it out.
commit 94a21d757ce58254accbd5dd3a86810aadeec9f0
Author: Michel Dänzer <michel@tungstengraphics.com>
Date: Sat Jan 19 13:17:45 2008 +0100
AIGLX: Fix GLX_EXT_texture_from_pixmap fallback with EXA.
Use pScreen->GetImage to obtain the pixmap contents instead of dereferencing
pPixmap->devPrivate.ptr directly.
commit e9fa7c1c88a8130a48f772c92b186b8b777986b5
Author: Adam Jackson <ajax@redhat.com>
Date: Fri Jan 18 14:41:20 2008 -0500
CVE-2007-6429: Don't spuriously reject <8bpp shm pixmaps.
Move size validation after depth validation, and only validate size if
the bpp of the pixmap format is > 8. If bpp < 8 then we're already
protected from overflow by the width and height checks.
commit 6492d513c0022d70f838d1b2561442c7a41e401f
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Fri Jan 18 21:44:22 2008 +1030
dix: if a client has a core grab, return the grab device on QueryPointer.
The correct thing would be to return the ClientPointer. However, if the client
for some reason has a core grab on another device (e.g. as result of a passive
grab), return the coordinates of the grabbed device instead.
This makes the use of nautilus a bit saner.
commit cd2ad4c2ed58b49cee085174e77c242048159321
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Fri Jan 18 20:11:55 2008 +1030
dix: remove some superfluous lines in ProcChangeActivePointerGrab.
commit 8a925d201efac52ef663ea3ff46acc5046178666
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Fri Jan 18 20:06:29 2008 +1030
dix: free the genericMasks when ungrabbing.
This finally plugs a memory hole created by grabs registering for generic
events.
commit 8949d81a3c79eef351d7c018c76692dcca74b63e
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Fri Jan 18 19:45:54 2008 +1030
include: mark CoreProcessPointerEvent, CoreProcessKeyboardEvent as deprecated.
ProcessOtherEvent does all the work now.
commit d323fd64206ddb4221daa7cf7504daf62c5e7d90
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Fri Jan 18 19:17:42 2008 +1030
dix: remove inputInfo.pointer refernce in EventSelectForWindow
If the window being changed is set as the motion hint window for any device,
the device's motion hint window is set to NULL. Which is kinda what the old
code did, except that it did it with only the VCP.
commit 883811c2bed9c6fcb706effbf83ddc97518b6f0c
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Fri Jan 18 18:48:46 2008 +1030
dix: remove inputInfo.pointer reference in TryClientEvents.
Unfortunately, this requires a change in the TCE API, and thus a change in all
callers. Tough luck.
commit 6e17184486c4309ec8b47c7cfd11fef60bb360ac
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Fri Jan 18 17:52:38 2008 +1030
Xi: Check for DestroyAccess when trying to delete a master device.
commit 23f3f0e27dc90b7b3a375f2a5dd094e6f53552b5
Author: Jeremy Huddleston <jeremy@yuffie.local>
Date: Sun Jan 13 14:00:25 2008 -0800
XQuartz: Moved SetFrontProcess haco to set_front_process
So it is done by the other thread...
(cherry picked from commit 7429379eb1001ee3dc769daa8fe6b3aef1b9cc8a)
commit 8e133d96740d010a4fd969a8188e6e71fb2cafe2
Author: Matthieu Herrb <matthieu@bluenote.herrb.com>
Date: Thu Jan 17 15:29:06 2008 +0100
Fix for CVE-2008-0006 - PCF Font parser buffer overflow.
commit 6de61f82728df22ea01f9659df6581b87f33f11d
Author: Matthieu Herrb <matthieu@bluenote.herrb.com>
Date: Thu Jan 17 15:28:42 2008 +0100
Fix for CVE-2007-6429 - MIT-SHM and EVI extensions integer overflows.
commit 7dc1717ff0f96b99271a912b8948dfce5164d5ad
Author: Matthieu Herrb <matthieu@bluenote.herrb.com>
Date: Thu Jan 17 15:28:03 2008 +0100
Fix for CVE-2007-6428 - TOG-cup extension memory corruption.
commit dd5e0f5cd5f3a87fee86d99c073ffa7cf89b0a27
Author: Matthieu Herrb <matthieu@bluenote.herrb.com>
Date: Thu Jan 17 15:27:34 2008 +0100
Fix for CVE-2007-6427 - Xinput extension memory corruption.
commit bbde5b62a137ba726a747b838d81e92d72c1b42b
Author: Matthieu Herrb <matthieu@bluenote.herrb.com>
Date: Thu Jan 17 15:26:41 2008 +0100
Fix for CVE-2007-5760 - XFree86 Misc extension out of bounds array index
commit e85130c85f727466fc27be1cfa46c88b257499fb
Author: Daniel Stone <daniel@fooishbar.org>
Date: Sat Jan 5 10:47:39 2008 +0200
Xephyr: One-time keyboard leak fix
Don't leak the originally-allocated keysym map.
commit 0137b0394a248f694448a7d97c9a1a3efcf24e81
Author: Daniel Stone <daniel@fooishbar.org>
Date: Sat Jan 5 10:43:53 2008 +0200
XKB: XkbCopyKeymap: Don't leak all the sections
Previously, we'd just keep num_sections at 0, which would break the
geometry and lead us to leak sections. Don't do that.
commit b99a43dfe97c1813e1c61f298b1c83c5d5ca88a2
Author: Daniel Stone <daniel@fooishbar.org>
Date: Sat Jan 5 10:38:16 2008 +0200
OS: IO: Zero out client buffers
For alignment reasons, we can write out uninitialised bytes, so allocate
the whole thing with xcalloc.
commit a6a7fadbb03ee99312dfb15ac478ab3c414c1c0b
Author: Kristian Høgsberg <krh@redhat.com>
Date: Wed Jan 16 20:24:11 2008 -0500
Don't break grab and focus state for a window when redirecting it.
Composite uses an unmap/map cycle to trigger backing pixmap allocation
and cliprect recomputation when a window is redirected or unredirected.
To avoid protocol visible side effects, map and unmap events are
disabled temporarily. However, when a window is unmapped it is also
removed from grabs and loses focus, but these state changes are not
disabled.
This change supresses the unmap side effects during the composite
unmap/map cycle and fixes this bug:
http://bugzilla.gnome.org/show_bug.cgi?id=488264
where compiz would cause gnome-screensaver to lose its grab when
compiz unredirects the fullscreen lock window.
commit e46f6ddeccd082b2d507a1e8b57ea30e6b0a2c83
Author: Michel Dänzer <michel@tungstengraphics.com>
Date: Wed Jan 16 14:24:22 2008 +0100
Yet another Xv extension byte swapping fix.
commit b0bf4308acb706abc87c51658c2251fa86231c35
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Tue Jan 15 19:15:09 2008 +1030
dix: print out an error when core type can't be converted.
Helps a bit in tracking down bugs.
commit 2a988ed75b7634d7cb6e83bb7aa89bc8768d3a58
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Tue Jan 15 19:14:46 2008 +1030
xkb: don't do core key repeats, XI only is the path to light.
commit 4fd0885978be286a68b689824f1d910f929a52b0
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Tue Jan 15 18:58:42 2008 +1030
Xi: remove some leftovers from ProcessOtherEvents.
Core handling not needed anymore here.
commit 32aa252e988be8cbfd4f7e373fb7b7736ef1f5f2
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Tue Jan 15 15:22:39 2008 +1030
dix: Process an input event as a single event, instead of two separate ones.
This is a significant shift in how input events are perceived. The common
approach was to treat a core event as a different entity than the XI event.
This could result in the XI event being delivered to a different client than
the core event. This doesn't work nicely if they come from the same device.
Instead, we treat an input event as a single event, that is delivered through
two separate APIs. So when delivering an event, we first try the XI event,
then the core event. If the window want's neither, we go to the parent and
repeat. Once either core or XI has been delivered, the processing stops.
Important: Different to the previous method, if a client registers for core
button events, the parent window will not get XI events. This should only
cause problems when you're mixing core and XI events, so don't do that!
Generic events don't fit into this yet, they cause me headaches.
commit 7a0d16ef0a103bcb25fa8a20322685f017aaf5a3
Author: Tiago Vignatti <vignatti@c3sl.ufpr.br>
Date: Tue Jan 15 03:27:16 2008 -0200
Removed some warnings.
commit 315d6a2b1d2a3de308e98d548afe780c59a784fc
Author: Tiago Vignatti <vignatti@c3sl.ufpr.br>
Date: Tue Jan 15 02:59:56 2008 -0200
Fix Xephyr compilation without GLX.
commit 0969a9f7497e10794a6534321c10a0e1ac680ad7
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Tue Jan 15 11:31:12 2008 +1030
dix: Emulate core events within CheckDeviceGrabs and ComputeFreezes.
This should restore the correct passive grab processing. When checking for
passive grabs, the core event is emulated and we check first for XI grabs on
the window, then for core grabs. Regardless of which event activates the grab,
the XI event is stored in the device's EQ.
When replaying the event, we take the XI event and replay it on the next
window, again including the emulation of the core event.
commit 1f83f40525acd3aff8f50b3c519bc1f307ff1e19
Author: Dave Airlie <airlied@linux.ie>
Date: Tue Jan 15 10:20:50 2008 +1000
xf86Cursors: fix memset for non-square cursors
commit e6ea3147bfb686798dac381eb8900f9f18beb88e
Author: Bernardo Innocenti <bernie@codewiz.org>
Date: Sun Jan 13 19:50:37 2008 -0500
exa: make the prototype for exaGetPixmapFirstPixel() public
This fixes a warning in amd_drv which is using it.
Signed-off-by: Bernardo Innocenti <bernie@codewiz.org>
commit a83a0c5a144da67dab96a857b849a5692b73245d
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Sun Jan 13 16:14:29 2008 +1030
dix: remove obsolete comment.
Pairings don't exist anymore and the documented issue is a non-issue now.
commit 180a5aba4de3104fed8bc4e7d42a1e3a51575318
Author: Jeremy Huddleston <jeremy@yuffie.local>
Date: Sat Jan 12 21:24:34 2008 -0800
XQuartz: Fixed copy-paste error with login_shell commit
(cherry picked from commit 6deec3acc6f8010b5b53a1e55a0a2c4080ba69d2)
commit 6fd4a5e2e4d0be0ba0773df831687e11e1262c72
Author: Jeremy Huddleston <jeremy@yuffie.local>
Date: Sat Jan 12 11:56:00 2008 -0800
XQuartz: Corrected copyright X.org Project -> X.org Foundation
(cherry picked from commit f21631444816fc12b8a534c2cf79e6ac6c2af7c9)
commit f72255639c065d795f7767683e851b1b5b2d9480
Author: Jeremy Huddleston <jeremy@yuffie.local>
Date: Sat Jan 12 11:35:48 2008 -0800
XQuartz: added 'login_shell' option to defaults
so the user can choose something other than /bin/sh
(cherry picked from commit b549cf18cebd3435d70f62855239484974c455a1)
commit ec24a6b5aa732ec6999a27889d9a33cf80123886
Author: Jeremy Huddleston <jeremy@yuffie.local>
Date: Sun Jan 6 18:29:54 2008 -0800
XQuartz: Fixed switching into XQuartz via expose.
(cherry picked from commit 627ed60ce5d7499761028edf379ebd95250d3e04)
commit 6844bd2e63490870bab3c469eec6030354ef2865
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Wed Jan 9 19:52:00 2008 -0800
More Xv extension byte swapping fixes
commit 38bf01bd1c925614a6e67a38aa3cefc7b8fe3bca
Merge: 4e85c7c322 0883e838e2
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Thu Jan 10 13:38:46 2008 +1030
Merge branch 'master' into mpx
commit 0883e838e25227f0af84d2a90979175724166d16
Author: Peter Harris <peter.harris@hummingbird.com>
Date: Wed Jan 9 14:52:33 2008 -0500
xf86misc.c: Avoid use of swapped values
commit 59a63d72a1407a8aaf9878eeff7ee7a66f65a42b
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Wed Jan 9 18:42:58 2008 -0800
Fix reference to old versions of XFree86 to not say "Xorg 4.2 or earlier"
commit 4e85c7c322faf14c14e4229fa294b8e3d3a4d304
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Wed Jan 9 17:36:39 2008 +1030
Xi: keep a counter of buttons down to avoid duplicate press/release events.
If two devices are attached to the same master device, pressing button 1 on
each of them leads to two button presses from the same device. Some apps
really don't like that.
So we just put a counter in place and only send the first press and the last
release.
commit e070c2cbef0d6fbbafce8d417e8b29231c2fdc50
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Fri Dec 7 20:18:49 2007 +1030
mi: change infamous "Tossed event ..." error for something more explanatory.
Few whitespace errors fixed.
Two ErrorF's prefixed with [mi].
(cherry picked from commit 117458d2db49efd3f04432ff45871b44c7d4ad57)
commit c31aead0fe9fe424120ce221cd9f76cb6d29a5b5
Author: Richard Purdie <rpurdie@openedhand.com>
Date: Tue Jan 8 12:12:06 2008 +0100
[Kdrive] make XCalibrate 'orientation aware'
commit 30375cd6d1439a3390b41714fe116aecc94743ca
Author: David Nusinow <dnusinow@debian.org>
Date: Mon Jan 7 20:57:30 2008 -0500
Don't log DPMS enabling as being from xorg.conf if it's not
commit 981bb9f1e33e4564d1b59c00c808cc43a2e9497b
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Tue Dec 18 13:57:07 2007 +1030
dix: set the correct number of valuators in valuator events.
(first_valuator + num_valuators) must never be larger than the number of axes,
otherwise DIX freaks out. And from looking at libXI, anything larger than 6 is
wrong too.
(cherry picked from commit 9f6ae61ad12cc2813d04405458e1ca5aed8a539e)
commit 20ace6321ac464d821c67a82c7023f74ae038176
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Mon Jan 7 20:08:56 2008 +1030
dix: don't try to confine cursor on screen restructure if there is no cursor.
Stops segfaulting when using xrandr. Yay.
commit 57a491e6d3ebec464c0c861b02c9ddcb1cc62c3c
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Mon Jan 7 20:06:32 2008 +1030
dix: init GrabPrivateKey to correct value.
Merge detritus from last pull.
commit 260505e3c5a18044e97d31ea3bcc0955e46335c8
Author: David Nusinow <dnusinow@debian.org>
Date: Sun Jan 6 16:37:13 2008 -0500
Log enabling of DPMS even when it's not set in xorg.conf
commit 7e7622165940934e56ae96ae785a8f88eec1a5cf
Author: Julien Cristau <jcristau@debian.org>
Date: Sun Jan 6 18:23:09 2008 +0100
Fix the name of the XFree86-Misc extension in the xorg.conf manpage.
commit 59df687835c68eda147de47edfe9bc415c0efb4f
Author: Julien Cristau <jcristau@debian.org>
Date: Sun Jan 6 16:57:45 2008 +0100
Document the AllowEmptyInput, AutoAddDevices and AutoEnableDevices flags
Add documentation for the new AllowEmptyInput, AutoAddDevices and
AutoEnableDevices server flags in the xorg.conf manpage.
commit 7d226d6a251cb90765be2b50a1973986c5b7605b
Author: Jeremy Huddleston <jeremy@yuffie.local>
Date: Sat Jan 5 03:14:07 2008 -0800
XQuartz: Cleanup for strict-prototyping
Also fixed DarwinEQEnqueue to match changes to the callback
And also use dpmsstubs.c rather than copying the code into darwin.c
(cherry picked from commit 4c5c30a4beb7a427b00b18097f548876ad3c11d7)
commit 11967dce11cd953d123d53bb3389aa257c5158e8
Author: Jeremy Huddleston <jeremy@yuffie.local>
Date: Fri Jan 4 22:54:26 2008 -0800
XQuartz: Fixed copyright in About box for 2008. Happy New Year!
commit aca75f389e2b08096c3cacec03b12a58075cf12c
Author: Jeremy Huddleston <jeremy@yuffie.local>
Date: Fri Jan 4 12:23:09 2008 -0800
XQuartz: Flush the debug log for easier debugging
Also cleaned up formatting in xpr's eventHandler
(cherry picked from commit 16861d6d4239c7f3918332ef07752f1e211afb23)
commit 57468a696e1259c1e1c185fc60230e1d195defb7
Author: Alan Hourihane <alanh@tungstengraphics.com>
Date: Fri Jan 4 12:37:55 2008 +0000
Fix Line drawing with CapNotLast set in PolySegment.
commit 39cb782f28be4efb2621fd8c614f2367eb834412
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Thu Jan 3 23:16:06 2008 -0500
XACE: DeleteCallbackList zeroes out its argument so don't do it twice.
commit 7f376f23db463a65176de632ca6094acb55db951
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Thu Jan 3 23:08:49 2008 -0500
devPrivates rework: Free callback lists after use.
commit de18703d2a25999e391d11b4c82ee018fb87372d
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Thu Jan 3 23:07:24 2008 -0500
dix: Fix bug+leak in callback manager DeleteCallbackList function.
commit 20eb26f9d149993ae360a2cbd1b536b68c9f4069
Author: Alex Deucher <alex@samba.(none)>
Date: Thu Jan 3 22:53:36 2008 -0500
Fix potential crasher in xf86CrtcRotate()
xf86CrtcRotate() is called by randr 1.2 drivers via xf86CrtcSetMode() or xf86SetDesiredModes()
during ScreenInit() at which point pScrn->pScreen is not set. If a user specifies a rotation
in their config file pScrn->pScreen is dereferenced and boom.
commit 249b9b30c11e03bb113b37cf4712bf88debf6f05
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Fri Jan 4 13:49:48 2008 +1030
Xi: remove file for the obsolete ChangePointerKeyboardPairing request handling.
commit e4a214e40d35aa957c83b86b4e4abc86c22fbde0
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Fri Jan 4 13:32:53 2008 +1030
dix: don't free device's devPrivates manually, dixFreePrivates does it.
Merge detritus from last pull.
commit cd0603c2dc5ee000ebce66056bc1a72f99bfb617
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Thu Jan 3 21:41:02 2008 -0500
Bug #13765: Heap corruption in XC-SECURITY extension code.
commit e46d559739e020dc7f6fcbdc6d1fb39c57aab4b1
Author: Jeremy Huddleston <jeremy@yuffie.local>
Date: Sat Dec 22 15:09:12 2007 -0800
XQuartz: Cleaned up color map configuration.
8 bit color still doesn't work, but the -depth command line argument now works properly.
(cherry picked from commit 6765949c27c053d22882f54337cfd09203aa5383)
commit 17a9714a6789a389d52dbb40fd1eed1e24c04d64
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Thu Jan 3 14:46:54 2008 -0500
Bug #13794: Update MBE extension devPrivates to new interface.
commit b2da44c76d68a76f20e90bccb268ebf65e132b49
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Thu Jan 3 18:51:44 2008 +1030
dix: DoChangeKeyboardControl shouldn't be using inputInfo.keyboard.
commit 9cc41b88dfebb3f1e0a7cb5c224146e651a2cda4
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Thu Jan 3 18:47:28 2008 +1030
Xi: ProcXSetClientPointer should directly check for the client from the id.
The window ID includes the client ID anyway, so we might as well just look up
the client directly instead of trying to get the window first and the client
from the window.
This also fixes a possible issue with XACE. If the client had permission to
write on the client but not on the window, the previous approach would have
failed.
commit 521fdc28d86d091495da3558d26ab4a938250ffe
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Thu Jan 3 18:43:18 2008 +1030
xfixes: switch a few inputInfo.pointer to PickPointer
commit 37194b13554f0d36343cf73324b128b15bb6a338
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Thu Jan 3 18:36:33 2008 +1030
Xi: switch to using "rc" (instead of "err") as returncode.
All the rest of XI uses rc and returns rc in case of error, so make
mpx-related stuff comply. This stops the rest of XI sending the error
manually.
This is just a cosmetic change to be in line with the rest.
commit c7e9b67c547c97b2c943eab555b4fe2844e8a91f
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Thu Jan 3 18:09:56 2008 +1030
dix: free ClassesRec when a BadAlloc occurs during CoreKeyboardProc.
commit 8da83836b60f7cdb75d08482f4311fa0e2ab4e1d
Merge: eace88989c ae869fc766
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Thu Jan 3 17:04:54 2008 +1030
Merge branch 'master' into mpx
Conflicts:
XTrap/xtrapddmi.c
Xext/security.c
Xext/xprint.c
Xext/xtest.c
Xext/xvdisp.c
Xi/exevents.c
Xi/grabdevb.c
Xi/grabdevk.c
Xi/opendev.c
Xi/ungrdev.c
Xi/ungrdevb.c
Xi/ungrdevk.c
dix/cursor.c
dix/devices.c
dix/dixutils.c
dix/events.c
dix/getevents.c
dix/main.c
dix/window.c
hw/xfree86/ramdac/xf86Cursor.c
include/dix.h
include/input.h
include/inputstr.h
mi/midispcur.c
mi/miinitext.c
mi/misprite.c
render/animcur.c
xfixes/cursor.c
xkb/xkbAccessX.c
commit ccf6636d2ca8acdaaeb8da34db507a10a082b0de
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Wed Jan 2 19:28:33 2008 -0800
Kill xf86getpagesize even harder (dummylib & ioport)
commit dfd682b582636a36345144bcf835e3ee46718d90
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Wed Jan 2 19:27:22 2008 -0800
X.Org bug 4947/Sun bug 6646626: Xv extension not byte-swapping properly
X.Org Bugzilla #4947 <https://bugs.freedesktop.org/show_bug.cgi?id=4947>
Sun bug 6646626 <http://bugs.opensolaris.org/bugdatabase/view_bug.do?bug_id=6646626>
Don't use swapped data after swapping it. When done swapping data,
send the swapped data, not the address of the pointer to it, to the client.
commit f6666dcc3b1ac60f850ea53c357a9ef61672a52a
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Wed Jan 2 19:19:55 2008 -0800
Add dixAllocatePrivate stub to dummylib for utils
Normally not necessary, except when building non-optimized/debug causes
the inline functions from private.h to appear in os-support/libxorgos.la
commit 73f422996016107d5f53492e4197bb05ed9c4bb9
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Wed Jan 2 19:17:54 2008 -0800
Fix names/types of new vuidMouse{Get,Set}ScreenPrivates macros
commit 895073f6b41d9313cfe748232c492c5e9f76b443
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Wed Jan 2 18:09:26 2008 -0800
Restore include & typedef needed by dtrace
996b621bec1bbc4fb21970c75eaec62053bc6ccb deleted a couple lines too many
commit 306fde4082044dfecbedd9af41e660bafb3ce438
Author: Brian <brian@i915.localnet.net>
Date: Tue Jan 1 09:27:44 2008 -0700
regenerated to add framebuffer object tokens (bug 13800)
commit 5c362c2eb2cfdf1f6d667a3e64a0a7bc4942c950
Author: Brian <brian@i915.localnet.net>
Date: Tue Jan 1 09:07:48 2008 -0700
regenerated, adds GL_MAX_3D_TEXTURE_SIZE (see bug 13811)
commit 85365ddf16e2b954d8249b380df53337420ed684
Author: Adam Jackson <ajax@redhat.com>
Date: Fri Dec 28 17:35:54 2007 -0500
EDID 1.4: If given a native pixel format, use it when inferring virtual.
commit 312b30cb03e439644ea10e08fa93268116333f0d
Author: Adam Jackson <ajax@redhat.com>
Date: Fri Dec 28 17:18:30 2007 -0500
EDID 1.4: First detailed mode is always preferred.
... so act like it in the modelist generator, not just the parser.
commit 9dbb73033ae60e7ab85f1469a696e2a52f0cb0fe
Author: Colin Harrison <colin.harrison@virgin.net>
Date: Sat Dec 29 00:02:16 2007 +0200
Rootless: Fix lvalue error from devPrivates change
Instead of trying to use an invalid expression as an lvalue, use the function
call instead.
commit 36ff05771b0699aa80ad718e24097bc25cb4fb00
Author: Jurij Smakov <jurij@wooyd.org>
Date: Fri Dec 28 23:59:53 2007 +0200
GL: Add GLX compile flags lost in modular X server changes
RISC chips that trap on unaligned loads and stores need to
define __GLX_ALIGN64. This used to get added to the cflags
in the old *.cf files but it no longer does in the modular
X server.
Also, Alpha needs to pass -mieee to the compiler as well.
This is a simple backport of a patch that debian, and probably other
distributions, have been applying forever. To the best of my
knowledge the patch was written by Jurij Smakov. See Debian bug
number #388125.
I just checked and this has been rotting for more than a year in
freedesktop bugzilla as #8392.
Signed-off-by: David S. Miller <davem@davemloft.net>
commit bae459cfc4f17a5ec5f2810e9f913e3ad2d8b8d4
Author: Adam Jackson <ajax@redhat.com>
Date: Fri Dec 28 16:50:18 2007 -0500
Don't carp on EDID 1.4 blocks anymore.
Also whine more loudly when we get something other than 1.x.
commit 70b2d6cfeb3bcb7b862a2ae29f6ef7cb84d69486
Author: Adam Jackson <ajax@redhat.com>
Date: Fri Dec 28 16:39:00 2007 -0500
Check the gamma value, not its address.
commit 592d814ee09e86e283116a7a1052762c8398e8e5
Author: Adam Jackson <ajax@redhat.com>
Date: Fri Dec 28 16:37:23 2007 -0500
EDID 1.4: Additional semantics for display feature bits.
First mode is _always_ preferred in 1.4; the bit that used to mean this
now means that the preferred mode is also the native pixel format. The
old "is GTF" bit now means "is continuous-frequency" instead.
Section 3.6.4, Table 3.14: Feature Support, Notes 4 and 5.
commit 322d0103aee317500057c80d542d7270d69a5731
Author: Adam Jackson <ajax@redhat.com>
Date: Fri Dec 28 16:28:44 2007 -0500
EDID 1.4: Alternate color encodings for digital inputs.
Section 3.6.4, Table 3.14: Feature support.
commit f1f43caf7e26a84dbacd4e5d7d47c8b4e4982836
Author: Adam Jackson <ajax@redhat.com>
Date: Fri Dec 28 16:12:11 2007 -0500
EDID 1.4: Allow for gamma definition in extension blocks.
Section 3.6.3, Table 3.13: Display Transfer Characteristics (Gamma)
commit 861ee38817523a647e6be10d7e8fe26f66054217
Author: Adam Jackson <ajax@redhat.com>
Date: Fri Dec 28 16:06:45 2007 -0500
EDID 1.4: Additional aspect ratio semantics for screen size fields.
Section 3.6.2, Table 3.12: Horizontal and Vertical Screen Size or
Aspect Ratio.
commit 14b5c8a447db0395fb14b2d404eafb1d8e4fb817
Author: Adam Jackson <ajax@redhat.com>
Date: Fri Dec 28 15:52:42 2007 -0500
EDID 1.4: Extended support for digital interfaces.
Section 3.6.1, Table 3.11: Video Input Definition.
commit a948216dccb5ee577a50a42035dc9bc49d0a00c6
Author: Adam Jackson <ajax@redhat.com>
Date: Fri Dec 28 15:00:41 2007 -0500
EDID 1.4: Decode CVT 3-byte codes and add them to the mode pool.
Section 3.10.3.8: CVT 3 Byte Code Descriptor Definition.
commit f6df66cc89bcd0a0be2e7bca05839fdd428c1d4c
Author: Adam Jackson <ajax@redhat.com>
Date: Fri Dec 28 13:55:39 2007 -0500
EDID 1.4: Trivial support for new detailed sections.
Nothing actually decoded yet, but at least we print what they are.
New in EDID 1.4:
- Color Management Data (0xF9), Section 3.10.3.7
- CVT 3 Byte Code Descriptor (0xF8), Section 3.10.3.8
- Established Timings III Descriptor (0xF7), section 3.10.3.9
- Manufacturer-specified data tag (0x00 - 0x0F), section 3.10.3.12
commit bac3ecde39cc914ab515991234b7dc2138005b84
Author: Adam Jackson <ajax@redhat.com>
Date: Fri Dec 28 13:33:39 2007 -0500
EDID 1.4: Allow for sync range offsets.
Table 3.26: Display Range Limits & Timing Descriptor Block Definition
commit 3b23dd9fd43a28033d0af7b02088b0c6ca433158
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Fri Dec 28 13:29:45 2007 -0500
xselinux: Fix whitespace warnings.
commit 643c52be32c187a0fdb9a031b1e31d97cd551339
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Fri Dec 28 13:26:26 2007 -0500
xselinux: Remove "X" prefix on remaining functions and strings.
Should be evident from the context.
commit f4bc333fc1e8d9fa9911771d2072df4df741c553
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Fri Dec 28 11:56:54 2007 -0500
xselinux: don't FatalError on an invalid class mapping, just disable support.
commit f3780ece528ed3ead809ba6a388fa0f8aab2a775
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Thu Dec 20 20:32:07 2007 -0500
xselinux: Implement swapped protocol request logic.
commit 1bbf64ab115e2a1121d6f9c0830b1b977f025178
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Thu Dec 20 20:31:34 2007 -0500
xselinux: Remove unnecessary structure definition.
commit 938da5ee389975f910721f1c2cebc2dcec793117
Author: Adam Jackson <ajax@redhat.com>
Date: Fri Dec 28 12:23:44 2007 -0500
Add HDMI and DisplayPort connector types.
commit 24105cf6582201a94bc39aeac5a795297018aeb5
Author: Daniel Stone <daniel@fooishbar.org>
Date: Fri Dec 28 15:49:50 2007 +0200
Input: Don't reinit devices
If a device is already initialised (i.e. the virtual core devices) during
IASD, don't init them again. This fixes a leak.
commit 941058f8da0d725f909dc97f68c32ce244a9dc0a
Author: Daniel Stone <daniel@fooishbar.org>
Date: Fri Dec 28 15:48:57 2007 +0200
KDrive: Xephyr: Don't leak screen damage structure
commit b2f6cd290c43b88f0d08fb29f8657618a067d2a0
Author: Daniel Stone <daniel@fooishbar.org>
Date: Fri Dec 28 15:48:25 2007 +0200
OS: Don't leak connection translation table on regeneration
commit 190a0506243b39cd8dfc0e12068e3a3f416330f1
Author: Daniel Stone <daniel@fooishbar.org>
Date: Fri Dec 28 15:47:57 2007 +0200
Config: HAL: Don't leak options on failure to add device
This showed up in Xephyr in particular, which denies new device requests.
commit f44fd3f9e41bf467360ace93ef5b532d8f61fb2c
Author: Daniel Stone <daniel@fooishbar.org>
Date: Fri Dec 28 15:47:21 2007 +0200
Config: D-Bus: Don't leak timers
TimerCancel doesn't free the timer: you need TimerFree for that.
commit ae869fc7669764729e13fdd70149ed636753f2a3
Author: David S. Miller <davem@davemloft.net>
Date: Tue Dec 25 22:42:50 2007 -0800
[SBUS]: Fix build, use getpagesize() instead of xf86getpagesize().
xf86getpagesize() was removed, but this one call site was
not fixed up.
Signed-off-by: David S. Miller <davem@davemloft.net>
commit 009f1e4e55200425de2fe0dbc1f0ac0f431fb4cf
Author: Fatih Aşıcı <fatih@pardus.org.tr>
Date: Tue Dec 25 23:09:49 2007 +0200
Config: Don't forget to add xkb_rules option
commit 389e8917f66a489455f1d5c70f44c262717538ad
Author: Fatih Aşıcı <fatih@pardus.org.tr>
Date: Tue Dec 25 22:59:24 2007 +0200
Config: Fix a memory leak
commit 743008a4812d6b046211ebcf4eab202687b458d5
Author: Adam Jackson <ajax@redhat.com>
Date: Sun Dec 23 14:27:14 2007 -0500
Report serverClient resources in the X-Resource extension.
commit beb29c605b8c66e1a18b89668aa421c1519645f6
Author: Jeremy Huddleston <jeremy@yuffie.local>
Date: Fri Dec 21 02:09:01 2007 -0800
XQuartz: *REALLY* use CFStringCreateWithCString
I need sleep! Why am I making these stupid mistakes... sorry for pointless commit spam. ugg.
(cherry picked from commit b16351fc6457aabead328472d16dc25789032940)
commit 5dd895efa305954e2695aa22a9e49acfb65b4d5e
Author: Jeremy Huddleston <jeremy@yuffie.local>
Date: Fri Dec 21 02:06:47 2007 -0800
XQuartz: Use CFStringCreateWithCString
(cherry picked from commit 79782b0e14761dcf5d6635b8eec161b74f06763a)
commit 2c24231fc2027cf5034bb1b6636332687f586726
Author: Jeremy Huddleston <jeremy@yuffie.local>
Date: Fri Dec 21 01:57:43 2007 -0800
XQuartz: Reduce code duplication in X11.app
(cherry picked from commit b81809cd91a9f90b7f2de77b1dcf514cee87c32d)
commit f3042a63be0748bb60567144276d2c61b75ba0b7
Author: Jeremy Huddleston <jeremy@yuffie.local>
Date: Fri Dec 21 01:24:06 2007 -0800
XQuartz: Handle Pseudorami init in miinitext
(cherry picked from commit a585c94fedd4ecbc87524703c01bb128fc2aa951)
commit fa9680a7305d7f906da1bdeb40a0863ef66316e6
Author: Jeremy Huddleston <jeremy@yuffie.local>
Date: Thu Dec 20 19:38:20 2007 -0800
XQuartz: Added localization.
(cherry picked from commit 7a5cc7bfbb296a2c41a580b063324c448f7131db)
commit 603a8b73d46d59e5f9f0be39be8317f3fadfe7e6
Author: Jeremy Huddleston <jeremy@yuffie.local>
Date: Thu Dec 20 18:29:57 2007 -0800
XQuartz: Cleaned up command line arguments.
commit 4cf3002b6020024f2fc2ed0cc40a872a066e482d
Author: Jeremy Huddleston <jeremy@yuffie.local>
Date: Thu Dec 20 18:08:40 2007 -0800
XQuartz: Kill off server-main.c and launcher-main.c
Now using xinit
(cherry picked from commit 5d6ae3d299f72df714117948b3d31dcbddf6c0bc)
commit 1f74bef1ad1399323fc0d2e309b808bf32c622e4
Author: Jeremy Huddleston <jeremy@yuffie.local>
Date: Thu Dec 20 17:33:38 2007 -0800
XQuartz: Don't fork to exec app_to_run.
Plus other housecleaning...
(cherry picked from commit ae302db472f127be082d05b418ede332fae8ccc5)
commit 2d15d439f844d4016f169664a338595c11b91b77
Author: Jeremy Huddleston <jeremy@yuffie.local>
Date: Thu Dec 20 15:46:40 2007 -0800
Xquartz: Use X11ControllerMain()
(cherry picked from commit a9ac932543374aa2540f5a12cc85ef82c85b0e0c)
commit 1393a97ea97b5f7d7b90e3e8c58b5996b600e0c6
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Thu Dec 20 16:23:35 2007 -0500
xselinux: Send AVC messages to audit system instead of log file/stderr.
commit 42802a8e6b3d3795acc4f8b7597ea5a48619b5cd
Author: Jeremy Huddleston <jeremy@yuffie.local>
Date: Thu Dec 20 13:17:30 2007 -0800
Xquartz: General Cleanup
General code cleanup, whitespace, dead code removal, added missing prototypes.
Made Xquartz come to foreground later in startup, so it doesn't appear for Xquartz -version
(cherry picked from commit 36922e8ff4316c93843aa3fe959cf8df3c7d5892)
commit 7ef7727b800fa4715b80a82850d65b88fde5fe6c
Author: Dave Airlie <airlied@clockmaker.usersys.redhat.com>
Date: Thu Dec 20 10:11:26 2007 +1000
entity sharing: make !shareable entity non-fatal.
Just because the entity isn't shareable, we should bring down the server.
Just ignore the extra screen and keep going.
commit 50e80c39870adfdc84fdbc00dddf1362117ad443
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Wed Dec 19 16:20:36 2007 +1030
include: never overwrite realInputProc with enqueueInputProc. Bug #13511
In some cases (triggered by a key repeat during a sync grab) XKB unwrapping
can overwrite the device's realInputProc with the enqueueInputProc. When the
grab is released and the events are replayed, we end up in an infinite loop.
Each event is replayed and in replaying pushed to the end of the queue again.
This fix is a hack only. It ensures that the realInputProc is never
overwritten with the enqueueInputProc.
This fixes Bug #13511 (https://bugs.freedesktop.org/show_bug.cgi?id=13511)
(cherry picked from commit eace88989c3b65d5c20e9f37ea9b23c7c8e19335)
commit d0308b64655360517d83e07e866d103c3f2b389d
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Wed Dec 19 18:18:10 2007 +1030
Xi: specify correct struct when calculating size of GetDeviceControl reply.
This doesn't change much, as the struct previously given has the same size as
the ones now anyway. Still, we should be pendantic.
Thanks to Simon Thum for reporting.
commit 66b00029e587cec628d0041179a301e888277f8e
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Wed Dec 19 18:10:50 2007 +1030
Xext: remove redefinition of Bool.
Thanks to Simon Thum.
commit eace88989c3b65d5c20e9f37ea9b23c7c8e19335
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Wed Dec 19 16:20:36 2007 +1030
include: never overwrite realInputProc with enqueueInputProc. Bug #13511
In some cases (triggered by a key repeat during a sync grab) XKB unwrapping
can overwrite the device's realInputProc with the enqueueInputProc. When the
grab is released and the events are replayed, we end up in an infinite loop.
Each event is replayed and in replaying pushed to the end of the queue again.
This fix is a hack only. It ensures that the realInputProc is never
overwritten with the enqueueInputProc.
This fixes Bug #13511 (https://bugs.freedesktop.org/show_bug.cgi?id=13511)
commit bcad2a5a24f30cfdf9eca31915ed5a55ed094285
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Tue Dec 18 20:19:26 2007 -0500
XACE: Too many arguments to selection access hook.
commit 7721d3e9217b41aab3a0ee5eaa52f5b53cbb07db
Author: Adam Jackson <ajax@redhat.com>
Date: Tue Dec 18 19:14:26 2007 -0500
Reference cvt and gtf in the xorg.conf man page.
commit 51fab1eb30691c503f1b4dc98b465f2bc2e1394e
Author: Sam Lau <sam.lau@sun.com>
Date: Tue Dec 18 11:38:47 2007 -0800
Sun bug 6278039: Xevie checking wrong size in swapped XevieSelectInput requests
<http://bugs.opensolaris.org/bugdatabase/view_bug.do?bug_id=6278039>
commit 97c82ce0510808ea9d8a37a0a121e750f6dd8158
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Mon Dec 17 23:11:29 2007 -0500
XACE: Restore the old background None behavior in response to bug #13683.
From the X11 protocol spec:
"If background None is specified, the window has no defined background."
This means that toolkits and apps cannot rely on the "transparent" nature
of the current implementation! At some point before the next release,
XACE will switch back to a solid background as the default.
commit 9f6ae61ad12cc2813d04405458e1ca5aed8a539e
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Tue Dec 18 13:57:07 2007 +1030
dix: set the correct number of valuators in valuator events.
(first_valuator + num_valuators) must never be larger than the number of axes,
otherwise DIX freaks out. And from looking at libXI, anything larger than 6 is
wrong too.
commit 6a5c3e04fa43b98ccffd69ad86dd781602f88d0b
Author: Dave Airlie <airlied@redhat.com>
Date: Mon Dec 17 14:59:12 2007 +1000
mi: set the private key to a unique non-zero value
commit a18d28a5efbe6021d6c800506cece28a73545aad
Author: Dave Airlie <airlied@redhat.com>
Date: Mon Dec 17 13:49:16 2007 +1000
damn then my cut-n-paste ate my end of lines...
commit d096bbd01bf7c7e15b5a2c582718f3333e063ddc
Author: Dave Airlie <airlied@redhat.com>
Date: Mon Dec 17 13:45:15 2007 +1000
Xquartz ate my DMX - thanks
commit bf20c4374aeb5160a0dc372df9b49f1bbc05f078
Author: Jeremy Huddleston <jeremy@yuffie.local>
Date: Sun Dec 16 01:14:32 2007 -0800
Xquartz: Removed launchd plist and x11-exec. The relevant code is now in xinit.
(cherry picked from commit 767b4c9d9daa5d0ea59ac1f0d70146798da631cb)
commit 58c2898b62fbf0d8e0f175de7cc208dc29d93788
Author: Samuel Thibault <samuel.thibault@ens-lyon.org>
Date: Sun Dec 16 01:21:45 2007 +0100
xfree86: permit access to io port 0xffff on the hurd
commit b4ef8885e1697b83a0dcc9f7fe79155f19241798
Author: Jeremy Huddleston <jeremy@yuffie.local>
Date: Sat Dec 15 14:00:19 2007 -0800
Xquartz: Fixed launchd detection
commit ff5abc72fcc459d7eac663e5f8e4d40b28749841
Author: Otavio Salvador <otavio@ossystems.com.br>
Date: Fri Dec 14 17:59:29 2007 -0200
registry: XREGISTRY_UNKNOWN needs to be defined even if XREGISTRY isn't enabled
In case XREGISTRY isn't enabled, XREGISTRY_UNKNOWN is used but it's
not being available. It's now always available.
commit a3f7f7b60e391e6106f5db40b3fe5fbc67ccd836
Author: Ben Byer <bbyer@bbyer.apple.com>
Date: Thu Dec 13 20:45:14 2007 -0800
clarified debug message to indicate that we're sleeping
(in case we get reports about slow launch times, this will
help clarify what's happening)
(cherry picked from commit 2eea3483cf893f8f81bacd434b31408dfb38cb06)
commit e0e59b3bbc4d8e7ac3934a6f6a9e4a15b328c475
Author: Ben Byer <bbyer@bbyer.apple.com>
Date: Thu Dec 13 20:44:33 2007 -0800
we need to link against CoreServices, not ApplicationServices
(cherry picked from commit ba4d2096e7953ef5b971682f0e28535da968acb1)
commit 062d9234e233fc4c1c617f59093da973c9d3e2ce
Author: Ben Byer <bbyer@bbyer.apple.com>
Date: Thu Dec 13 20:40:27 2007 -0800
fixed bug in x11-exec that prevent icon from showing up
(cherry picked from commit e1f4a0c20d3a52d98954c4b28d0ec4d44564bc32)
commit 95c02adea80a14e18bb51876bc1418eccdade31d
Author: Jeremy Huddleston <jeremy@yuffie.local>
Date: Fri Dec 14 15:21:40 2007 -0800
Xquartz: Fixed cpprules include
commit 86730337001ba4db6d77fe42406695e32784b157
Author: Otavio Salvador <otavio@ossystems.com.br>
Date: Fri Dec 14 08:46:35 2007 -0200
kdrive/ati: use operating system input devices
commit e110255501e2f699709e6978f5e52d3be96333c8
Author: Otavio Salvador <otavio@ossystems.com.br>
Date: Fri Dec 14 08:45:09 2007 -0200
kdrive/vesa: use operating system input devices
commit 863ba390e9fdf0d37cdf03bf5eebe7fdfe6288f5
Author: Otavio Salvador <otavio@ossystems.com.br>
Date: Fri Dec 14 00:03:13 2007 -0200
kdrive/fbdev: use operating system input devices
commit ca59d3f7bdb5f3724ff45ea57912c0b1098a73d6
Author: Arkadiusz Miskiewicz <arekm@maven.pl>
Date: Thu Dec 13 00:09:08 2007 +0200
Xprint: Clean up generated files
Remember to clean generated wrapper files.
commit 5b02a6ca5b31db69d08f2f452494c0f93a6260d9
Author: Bartosz Fabianowski <freebsd@chillt.de>
Date: Fri Dec 7 02:38:14 2007 +0000
Input: Fix proximity events with valuators
Initialise num_events to 1, so we always send a proximity event, and then
optionally valuator events. Also make sure mieq can deal with valuator
events sent after proximity events.
commit a14a143832be844b4b890b0160ccb9fc8293c28c
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Fri Dec 14 00:57:16 2007 -0500
Bump server version for devPrivates rework / XACE.
commit a2df51f8e95a814c54b806814020155ac8bd177d
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Fri Dec 14 00:53:54 2007 -0500
Bump video driver ABI and extension ABI for devPrivates rework.
commit 86b2e59bfb79bd042a13c35fbb4ccecec576f629
Merge: 1c1a4bc970 cb0d7e2c26
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Fri Dec 14 00:32:24 2007 -0500
Merge branch 'master' into XACE-SELINUX
Conflicts:
configure.ac
This is the last pull before merging to master.
commit 1c1a4bc970be061484bb8dcccf945eb08144c656
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Thu Dec 13 19:51:40 2007 -0500
devPrivates rework: more cleanup from previous merge operation.
commit cb0d7e2c2692a332e2bd5495478ebf9a6cd601d0
Author: Jeremy Huddleston <jeremy@yuffie.local>
Date: Thu Dec 13 16:23:46 2007 -0800
Xquartz: Don't hardcode libexec dir
(cherry picked from commit 67b479ef80cb740a24981335eb8d596744168a62)
commit c39212fd7353fc1a07a30bade90f78356c748e2d
Author: Jeremy Huddleston <jeremy@yuffie.local>
Date: Thu Dec 13 15:56:31 2007 -0800
Xquartz: Don't hardcode LaunchAgents dir
(cherry picked from commit 07a12d71fefd78c380078efa835700f2868ab204)
commit 82e1aff9fbc1d15e3451707e3ccbf4b13eedda94
Author: Ben Byer <bbyer@bbyer.apple.com>
Date: Thu Dec 13 15:57:39 2007 -0800
Modified X11 plist to use x11-exec
(cherry picked from commit 7d9a11329e476f45e4d9f9aebcb43469321347c7)
commit 1a5910588a60af0c136595e2457d897d9e54ac88
Author: Ben Byer <bbyer@bbyer.apple.com>
Date: Thu Dec 13 15:55:28 2007 -0800
created x11-exec wrapper, which uses LaunchServices to find
(and then exec) X11.app
(cherry picked from commit fc04c9759b30d062111d4a7f3f411ed0f18cbde4)
commit c8feb73f5841e7812d8dfdb91f1064e2033d028c
Merge: 9a7ce57363 a125ce4a84
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Thu Dec 13 18:38:25 2007 -0500
Merge branch 'master' into XACE-SELINUX
Conflicts:
Xext/EVI.c
Xext/bigreq.c
Xext/cup.c
Xext/dpms.c
Xext/fontcache.c
Xext/mitmisc.c
Xext/xcmisc.c
Xext/xf86bigfont.c
Xext/xtest.c
configure.ac
dbe/dbe.c
hw/darwin/darwin.h
hw/darwin/darwinEvents.c
hw/darwin/iokit/xfIOKit.h
hw/darwin/iokit/xfIOKitCursor.c
hw/darwin/quartz/fullscreen/fullscreen.c
hw/darwin/quartz/fullscreen/quartzCursor.c
hw/darwin/quartz/quartz.c
hw/darwin/quartz/quartzCommon.h
hw/darwin/quartz/quartzCursor.c
hw/darwin/quartz/xpr/dri.c
hw/darwin/quartz/xpr/dristruct.h
hw/darwin/quartz/xpr/xprCursor.c
hw/darwin/quartz/xpr/xprFrame.c
hw/xfree86/modes/xf86RandR12.c
include/cursor.h
miext/rootless/rootlessCommon.h
miext/rootless/rootlessScreen.c
miext/rootless/rootlessWindow.c
render/picturestr.h
Trying to pick up the pieces from the darwin churn here...
commit efcdc0d7010f4e6ec833842cb010a07068edf7ab
Author: Adam Jackson <ajax@redhat.com>
Date: Thu Dec 13 15:38:41 2007 -0500
Correct the documentation comments in xf86Modes.c
Most of those functions do not, in fact, work with circular mode lists,
and by this point the API isn't really "proposed" anymore.
commit 1768af38c737f4c14d32f587b51a8ec3d3d6ed5f
Author: Adam Jackson <ajax@redhat.com>
Date: Thu Dec 13 15:06:18 2007 -0500
Add infrastructure for validating modes by memory bandwidth.
commit 4359193aaa522599c502d012b9c163e993c01d79
Author: Adam Jackson <ajax@redhat.com>
Date: Thu Dec 13 10:59:48 2007 -0500
Explain a confusing #ifdef.
commit 8cedbb0a53d47b12f03edb726db9d5879c8a63a4
Author: Adam Jackson <ajax@redhat.com>
Date: Thu Dec 13 10:57:35 2007 -0500
Clean up some #if 0.
commit 9a7ce573636e349ee2967991c7cc1407e80ae524
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Wed Dec 12 20:44:59 2007 -0500
xselinux: Add new protocol for setting device create context.
commit a125ce4a84f5fb5934fefebd7cfb22a83180874d
Author: Aaron Plattner <aplattner@nvidia.com>
Date: Wed Dec 12 12:20:54 2007 -0800
Fix dist by including modeline2c.awk.
This was broken by commit cb44b6121c4b7b9dd7ff4ff52aaab914c82ff013, which
removed modeline2c.pl from EXTRA_DIST without adding modeline2c.awk.
commit 671592343701d8174a70f1ffb9c818784ea3af7a
Author: Aaron Plattner <aplattner@nvidia.com>
Date: Wed Dec 12 10:59:15 2007 -0800
Get rid of xf86DefModes.c.
It's out of date and not included in the build. Instead, xf86DefModeSet.c is
built from vesamodes and extramodes using modeline2c.awk and *that's* what gets
built.
commit d86e7f2ecc0a0129a722ffaca93dfc7c0c60e842
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Fri Dec 7 20:40:21 2007 +1030
dix: when getting a bogus event, at least print out the type.
commit eab0c4e49015fe96f6d985316f9c5fa28a7eb1fe
Author: Jeremy Huddleston <jeremy@yuffie.local>
Date: Mon Dec 10 20:57:24 2007 -0800
Xquartz: Pre-process Xquartz man page
(cherry picked from commit dec2633c41dd0adf73264afdf251a6522d6ae76a)
commit 1ff945a8e43e622b39b360ee49efd6ae3b77be67
Author: Jeremy Huddleston <jeremy@yuffie.local>
Date: Mon Dec 10 20:47:48 2007 -0800
Xquartz: Make Alt work with Xmodmap again
(cherry picked from commit 0e017177dcca7185716ca760dcce9ddedc7bfef9)
commit 7d61893b49569a72bccb63f1ae8c9ce4ef4e354f
Author: Jeremy Huddleston <jeremy@yuffie.local>
Date: Mon Dec 10 20:33:30 2007 -0800
Xquartz: Removed Xplugin.h from EXTRA_DIST
(cherry picked from commit a746383eca77c9b9ea2cba0cf1c8fc39c0f7d536)
commit 8f2eff643bf421bc4233fbaa2409b75d9f80d147
Author: Ben Byer <bbyer@bbyer.local>
Date: Sat Dec 8 23:34:40 2007 -0800
remove Xplugin.h, because we should use the one in /usr/include
(cherry picked from commit 3e881032f35f774ff9638678d7e3f77c81f62976)
commit 7b573ed43672b1fac7b4e6df85a657942ab4cba6
Author: Jeremy Huddleston <jeremy@yuffie.local>
Date: Sun Dec 9 12:02:04 2007 -0800
Xquartz: Added missing link to libconfig.a
(cherry picked from commit 14ec1cf1cb7ebc183c05e13f9c2b4b4eed679ff3)
commit cd13c4ba5b7a1bdfb419cb492a96a72dccf2681e
Author: Jeremy Huddleston <jeremy@yuffie.local>
Date: Sat Dec 8 13:18:17 2007 -0800
.gitignore: added hw/xquartz/bundle/org.x.X11.plist
commit 020b0e92b039d6ddaea0bbdb890b6a01037bf9b6
Author: Jeremy Huddleston <jeremy@yuffie.local>
Date: Sat Dec 8 11:49:37 2007 -0800
Xquartz Added quartzKeyboard.h to EXTRA_DIST
(cherry picked from commit 37c9781fdb672229ceab101b080762e15512943f)
commit 5e016fa9b2bf28971ed1794f4706c6538b1d411c
Author: Ben Byer <bbyer@bbyer.local>
Date: Sat Dec 8 06:12:46 2007 -0800
Added darwinEvents.h to EXTRA_DIST
(cherry picked from commit 45e5247564c423a2bf02cfec1993155858c91a14)
commit 6bb5dacc1710cdbededb9b28ba89a184ecd0931c
Author: Jeremy Huddleston <jeremy@yuffie.local>
Date: Sat Dec 8 01:41:37 2007 -0800
Xquartz: Actually add quartzForeground.[hc]
Sorry for the commit spam... I'm tired and was overly quick to commit... forgot to include a neccessary file.
(cherry picked from commit e564b7aeaab63e4c943445275af680b3b5898a94)
commit 02df03667052fa6a4e0405b91a005dc48e9b39c4
Author: Jeremy Huddleston <jeremy@yuffie.local>
Date: Sat Dec 8 01:28:26 2007 -0800
Xquartz: Actually, it should be org.x.X11 for case-sensitive FS
(cherry picked from commit c5ccb98d5d461c8a22fc0f3942a607ac90e1e37e)
commit 740cc54f081393d4ffe1a3e91c9e504dfaee3fe9
Author: Jeremy Huddleston <jeremy@yuffie.local>
Date: Sat Dec 8 01:24:58 2007 -0800
Xquartz: Use org.x.X11 instead of com.apple.X11 for preferences
Fixed inconsistency so preferences get read from the correct source.
(cherry picked from commit a74c38bd9f28735acd602d359d7ca6357aed1e93)
commit 41a0aeaae9b7b2f8cc2468fd1f3ee11287d34828
Author: Jeremy Huddleston <jeremy@yuffie.local>
Date: Sat Dec 8 00:13:47 2007 -0800
XQuartz: Fixed "Multiple Dock Icons"
BAM!
(cherry picked from commit d0dca8a88506f50b51f41f99a2f1feb6954c8a31)
(cherry picked from commit 0502955a2af487b51bf22916ac02e497c2d96aba)
commit a1b0346853720e98963910b82603c5cda72bb7f9
Author: Jeremy Huddleston <jeremy@yuffie.local>
Date: Fri Dec 7 23:26:11 2007 -0800
XQuartz: Cleaned up configure, X11.app path in launchd script
Don't hardcode X11.app's path in the launchd plist.
Only install the launchd plist if we --enable-launchd.
(cherry picked from commit 6b74c535dc331d1d621b2541492a3336f69d70a2)
commit 1157cfcc5a4e2a7299a4c48df04a1cc8d5093906
Author: Ben Byer <bbyer@bbyer.local>
Date: Fri Dec 7 21:55:42 2007 -0800
Just a couple of small uninitialized pointer fixes
(cherry picked from commit d12b650362da100ceaecb7e859cd4ef1908d4407)
commit 0ad1c359c5b0be63748f5c630c97be88a8cc92ce
Author: Jeremy Huddleston <jeremy@dhcp-38-248.EECS.Berkeley.EDU>
Date: Fri Dec 7 18:54:58 2007 -0800
Darwin: Use __APPLE__ instead of __DARWIN__
(cherry picked from commit 54654815fa5e59b25cfd1fa72610120b72c10175)
commit 85ed0bb44011312dfaa9f2dc31642a0f89ec0bd3
Author: Brice Goglin <bgoglin@debian.org>
Date: Sat Dec 8 02:53:27 2007 +0100
Add a missing linebreak after LoadModule: "foo"
http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=454742
commit 4fc288a13f825db942c9dcd64f4abd0265652faf
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Fri Dec 7 17:28:37 2007 -0800
Check for <sys/sdt.h> as well when determining to enable dtrace probes
Avoids auto-detecting dtrace is present on systems with the ISDN trace tool
named dtrace installed, but not the dynamic tracing facility named dtrace
commit 67907904f094c803d5faf6fa2ce23c01f9a5a521
Author: Ben Byer <bbyer@bbyer.local>
Date: Fri Dec 7 01:51:53 2007 -0800
fixed pathname in GL/apple/Makefile.am
(cherry picked from commit b6357cec6d837226009c0d2b69026027da36656e)
commit 56f5066d477836a975122f4e5748c0f4fb790175
Author: Ben Byer <bbyer@bbyer.apple.com>
Date: Thu Dec 6 20:51:32 2007 -0800
ALLOCATE_LOCAL is dangerous on Darwin due to memory layout differences
from Linux, so let's define NO_ALLOCA.
(cherry picked from commit 7caf51d1a5a86ae884e0087795636222c082962c)
commit c238ef06a270c0c1d48cdb9175b6d5815c7c2a49
Author: Jeremy Huddleston <jeremy@yuffie.local>
Date: Wed Dec 5 21:36:34 2007 -0800
Darwin: Dead coded removal
Kill off assert macro
(cherry picked from commit d6493abedb2caf03b2bc3a6440b637df67eff081)
commit 3a058456e0ce531b21ae2b37be8868b8e0d56e56
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Fri Dec 7 20:23:36 2007 +1030
mi: unify ErrorFs, prepend [mi]
commit c5acf401dad6fbca47f2bb870185c1d08ac947a5
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Fri Dec 7 20:19:43 2007 +1030
mi: unify last two ErrorF's in mieq.c
commit 117458d2db49efd3f04432ff45871b44c7d4ad57
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Fri Dec 7 20:18:49 2007 +1030
mi: change infamous "Tossed event ..." error for something more explanatory.
Few whitespace errors fixed.
Two ErrorF's prefixed with [mi].
commit 8a8239f2e21795602fcff5281833b350e6b2a286
Author: Jeremy Huddleston <jeremy@yuffie.local>
Date: Wed Dec 5 21:23:36 2007 -0800
Darwin: Renamed DarwinModeBlah to QuartzBlah
(cherry picked from commit 08ebf86d379b1ddfb08df65d29aea5df66de4327)
commit 540439a966cce3fc68a7e4bffdb5bcab1b20725f
Author: Jeremy Huddleston <jeremy@yuffie.local>
Date: Wed Dec 5 20:55:06 2007 -0800
.gitignore: Added Xcode user files
commit bc65a243930e4b02f06a861495420b0a120eae8c
Author: Jeremy Huddleston <jeremy@yuffie.local>
Date: Wed Dec 5 19:43:49 2007 -0800
Darwin: Flattened quartz into darwin, renamed darwin xquartz
Leaving xpr unflattened since we want modularity to replace that with xpc (XPluginComposite) at some point
(cherry picked from commit 48e6a75fbdd0fee86e364f02ace83f20b312a2b2)
commit e00f7061b22001989edf5bd38c2d0cc1566fdd19
Author: Jeremy Huddleston <jeremy@yuffie.local>
Date: Tue Dec 4 23:18:37 2007 -0800
Darwin: Cleaned up keyboard interface headers
(cherry picked from commit 141f69dc3d8d6e7d8ff65607f43700ac11243041)
commit cb44b6121c4b7b9dd7ff4ff52aaab914c82ff013
Author: Andrew Oakley <andrew@ado.is-a-geek.net>
Date: Wed Dec 5 20:23:05 2007 -0500
Fix commit aa0dfb3f42f19bb351ca7f1a9507ff5ec4590e96
From bugzilla bug 13467¹:
Currently the xserver fails to build without this (now deleted) file, as the
Makefile tries to distribute it. The patch simply removes the reference to
modeline2c.pl.
1] http://bugs.freedesktop.org/show_bug.cgi?id=13467
Signed-off-by: James Cloos <cloos@jhcloos.com>
commit 320abd7d1d906807448fa01ad3377daf707f46cc
Author: Daniel Stone <daniel@fooishbar.org>
Date: Wed Dec 5 19:37:48 2007 +0000
XKB: Actions: Don't run certain actions on the core keyboard
Don't run VT switches, terminations, or anything, on the core keyboard: only
run actions which affect the keyboard state. If we get an action such as VT
switch, just swallow the event.
commit 85dd8efac1bc0715f03c99d261b1c5d0980623e1
Author: Daniel Stone <daniel@fooishbar.org>
Date: Wed Dec 5 19:36:59 2007 +0000
WaitForSomething: Ignore EAGAIN
If select ever returns EAGAIN, don't bother complaining.
commit b7f3618f3933a810778093fd47564a1e3bf3fde6
Author: Rich Coe <Richard.Coe@med.ge.com>
Date: Wed Dec 5 19:36:37 2007 +0000
OS: Connection: Keep trying select while it gets interrupted (bug #9240)
If we got interrupted (EINTR or EAGAIN) during select, just try again, rather
than shutting clients down on either of these errors.
commit d8b2cad3771a09860e7be1726f67e684cf7caeec
Author: Rich Coe <Richard.Coe@med.ge.com>
Date: Wed Dec 5 19:31:07 2007 +0000
OS: Connection: Don't shut down disappeared clients (bug #7876)
If a client disappears in the middle of CheckConnections (presumably
because its appgroup leader disappears), then don't attempt to shut it down
a second time, when it's already vanished.
commit a8e27a108abeba73b2888da4e0604008f4b02045
Author: Kanru Chen <koster@debian.org.tw>
Date: Mon Dec 3 12:46:45 2007 +0000
Config: HAL: Fix XKB option parsing
Actually combine the XKB options into a string, rather than just repeatedly
writing a comma.
commit 2d723bbd0d36f6d7763b4df3298d40720f97fdd0
Author: Peter Harris <peter.harris@hummingbird.com>
Date: Mon Oct 29 18:05:19 2007 -0400
Add missing swaps in panoramiXSwap.c
commit 0fccb24aa978b838cf0fb008e9695837e612c529
Author: Daniel Stone <daniel@fooishbar.org>
Date: Fri Nov 30 20:35:26 2007 +0200
ProcessOtherEvent: Don't do double translation of button events
We already deal with the button mapping in GetPointerEvents, so don't
do the remapping again in ProcessOtherEvent.
commit c6cfcd408df3e44d0094946c0a7d2fa944b4d2d1
Author: Hong Liu <hong.liu@intel.com>
Date: Wed Dec 5 17:48:28 2007 +0100
Bug 13308: Verify and reject obviously broken modes.
commit 8d0efe4c2a48047680af40e5f6d639f426902e07
Author: Jeremy Huddleston <jeremy@yuffie.local>
Date: Tue Dec 4 17:59:13 2007 -0800
Darwin: Rework build system to more accurately reveal code infrastructure and facilitate future modularity.
(cherry picked from commit e8399fd4d66a2b77b770c277e2fa424229a721b2)
commit cc98a8e2415f12c7a90fd846d1ec858068e8c796
Author: Jeremy Huddleston <jeremy@yuffie.local>
Date: Mon Dec 3 23:59:19 2007 -0800
Darwin: RIP dumpkeymap, cr, and fullscreen
Taking out the trash.
We don't need dumpkeymap since we'll be getting keymaps straight from the OS. .Xmodmap should be sufficient for any user-needed changes. If this is not
the case, please let us know, so we can address any problems you have.
fullscreen never worked AFAIK
cr isn't being used and xpr is much better.
(cherry picked from commit e41af2967e885466c4d194fa4c3b358e6be37c30)
commit 13af2d1efcc83d1412a4c727afddd97577b00f32
Author: Adam Jackson <ajax@redhat.com>
Date: Tue Dec 4 17:36:21 2007 -0500
Restore xf86getsecs() as not having an ANSI equivalent.
commit 447cd5d411875b62eb1a501bf00e604225b74d26
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Tue Dec 4 19:09:37 2007 +1030
dix: update comments about inputInfo.pointer.
commit f44d7dcb5fefca3ddfd45e75d0bd0b47ec785e48
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Tue Dec 4 19:07:46 2007 +1030
dix: change the filters to be per-device.
If we have one global filter, one pointer may change the filter value and
affect another pointer.
Reproduceable effect:
blackbox and xterm, start dragging xterm then click anywhere with the other
pointer (attached to different masterd device!). The button release resets
the filter[Motion_Filter(button)] value, thus stopping dragging and no event
is sent to the client anymore.
Having the filters set per device gets around this.
commit 0931f40bf1bd6e00b8d95968d761a495b2c9a46c
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Tue Dec 4 17:08:56 2007 +1030
dix: comments, whitespaces, copyright fixes.
Removing my copyright message for now, should eventually be in line with the
rest of the messages.
commit 09c0c1a3cc4807813774a3c0e28a7ba9a87bb5c7
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Tue Dec 4 16:51:52 2007 +1030
dix: remove #ifdef XINPUT.
No escaping XINPUT anymore.
commit f8d7729df388c142624def36ba6d8c3b15922018
Author: Jeremy Huddleston <jeremy@yuffie.local>
Date: Mon Dec 3 20:20:05 2007 -0800
Darwin: Combine launcher and server X11.app
This should hopefully eliminate confusion some people have over which X11.app is which.
Now BOTH are in /A/U/X11.app and we intelligently determine whether to execute our app_to_run
or launch the server. If arguments are given, we launch the server. Otherwise if we can
connect to an X DISPLAY, we execute app_to_run. Otherwise, we launch the server.
(cherry picked from commit e7026216ccaa8e4fb073800ba947c9909d4faada)
commit 678f786715d76e972f8a77807c9caf3e90c24418
Author: Dave Airlie <airlied@redhat.com>
Date: Tue Dec 4 12:24:47 2007 +1100
xf86crtc: oh mon could be NULL, so check before quirks
commit a9df4bb555fd91707a68794c2dce24fb06e6cf64
Author: Dave Airlie <airlied@redhat.com>
Date: Tue Dec 4 12:17:29 2007 +1100
xf86Crtc: pass correct parameter.
quite how this has worked I've no idea.
commit fe25f897c62bb324660217e15dbd3091c808dbba
Author: Adam Jackson <ajax@redhat.com>
Date: Mon Dec 3 18:34:40 2007 -0500
xf86getpagesize -> getpagesize elsewhere in os-support/
commit b84f2833a681585162b8dabfb02ff62e7e0ef4d6
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Mon Dec 3 14:52:17 2007 -0800
xf86getpagesize() -> getpagesize() in os-support/solaris/sun_bios.c
commit aa0dfb3f42f19bb351ca7f1a9507ff5ec4590e96
Author: James Cloos <cloos@jhcloos.com>
Date: Mon Dec 3 16:57:58 2007 -0500
Remove Perl dependency from the build
From bugzilla bug 13467¹:
The modeline2c script is the only part of the Xorg server that requires Perl.
[This] is a simpler replacement that works with any normal AWK.
1] http://bugs.freedesktop.org/show_bug.cgi?id=13467
Bug was posted by Joerg Sonnenberger <joerg@NetBSD.org>.
commit 60086d90168265795e07a60939e9e2fe95c6e15c
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Mon Dec 3 11:30:58 2007 -0800
Use pkg-config to get -I, -L & -R flags needed for OpenSSL
Still just uses -lcrypto instead of the full library list from --libs
commit b77ca7cc9c23184c4ab367baf1b3ed0acf27c269
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Mon Dec 3 11:29:54 2007 -0800
Use _X_EXPORT instead of __attribute__((visibility("default")))
commit 1faba797cbfe1a4804b7ea6b47e1ca9d4e4324e4
Author: Adam Jackson <ajax@redhat.com>
Date: Mon Dec 3 14:12:58 2007 -0500
Death to libcwrapper.
This has been deprecated since 1.1. Since we're breaking ABI again anyway,
remove it entirely.
commit 28b93d74a11a1064d68a214fcaa7b0aede864a38
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Mon Dec 3 14:32:53 2007 +1030
ephyr: miPointerWarpCursor needs the device parameter.
Thanks to Mitchell Quille for spotting it.
commit 004876355b43fb4d3c2bc5653a7dc1bfd3f985ee
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Fri Nov 30 13:56:04 2007 +1030
dix: Remove RegisterPairingClient and UnregisterPairingClient.
commit f4dc521b38560c8f93b614316a3a5511941a93a9
Author: Jeremy Huddleston <jeremy@tifa.local>
Date: Sun Dec 2 18:21:40 2007 -0800
Darwin: Added {/,/System/}Library/Fonts to DEFAULT_FONT_PATH
(cherry picked from commit b0069b04dddaa2df6d4cdf86f96fd8a2a257e47e)
commit 0fff01f5660fb3bb9284f97c45dc76154435d02b
Author: Adam Jackson <ajax@aspartame.nwnk.net>
Date: Sun Dec 2 14:15:36 2007 -0500
Fix swapped Xv dispatch under Xinerama.
Same-endian dispatch was properly calling through the Xinerama wrapping,
but other-endian dispatch wasn't.
commit fa47910045c3700d8d668b5e214e5ffc1e8dc3e7
Author: Adam Jackson <ajax@redhat.com>
Date: Sun Dec 2 12:39:05 2007 -0500
Clean up many #if 0.
commit 83ba1e167c1473ac7d85239a6ee5ed629353cb16
Author: Ben Byer <bbyer@bbyer.local>
Date: Sat Dec 1 18:28:19 2007 -0800
added missing call to xcb_connect()
(cherry picked from commit dc2fb323ee11f081d447605be151024f9e2487f9)
commit 9ad4560b3cbd42e647d6227746d4d037616d57cf
Author: Jeremy Huddleston <jeremy@tifa.local>
Date: Sat Dec 1 16:23:23 2007 -0800
Darwin: Alt is Mode_switch Switching to Mode_switch to maintain compatibility with Tiger X11.
(cherry picked from commit 8a76c99c0ebbaf7375f3a9c75c4f7921a79024da)
commit f83d758dcc4878849a851c8466f6fa16b2b7cd8e
Author: Jeremy Huddleston <jeremy@yuffie.local>
Date: Fri Nov 30 16:11:15 2007 -0800
Darwin: properly implemented xcb check for stale sockets
(cherry picked from commit f543cb8fbb3d9213cb03396f4252ab9821319993)
commit f54b28eeba119c42d0fcccfbe295306dd670221a
Author: Jeremy Huddleston <jeremy@yuffie.local>
Date: Fri Nov 30 16:09:23 2007 -0800
Darwin: Undo focus-hack which didn't work right.
commit f30abe30c5fea10e680aa12f3fe37ee8ce1a0201
Author: Dave Airlie <airlied@linux.ie>
Date: Fri Nov 30 13:52:06 2007 +1000
edid quirk for MAX 0x77e monitor
From RH bugzilla 306441
commit 6216abe0c1a94efa4b2f0d14e88278f128304cd2
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Fri Nov 30 11:34:24 2007 +1030
dix: avoid activating the VCP/VCK twice.
This may set dev->key-xkbinfo to NULL, causing a segfault in xkb code lateron.
Spotted by David Huggins-Daines.
commit 9eb8ea9e615ebd8b568711eeca36aa84aa781ad3
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Fri Nov 30 11:32:59 2007 +1030
dix: only freeze the paired MD on a grab, not all other devices.
commit 8a079be0dd0f2ce37868988cde4ac8895522b088
Author: Jeremy Huddleston <jeremy@yuffie.local>
Date: Thu Nov 29 02:19:22 2007 -0800
Darwin: #ifdefs around dix-config.h include and NDEBUG/assert.h workaround.
(cherry picked from commit d2b768890f0878ae4e3fec8f7219e82b79256133)
commit 38397560612424b5b348f34c1a0bea8c47a574be
Author: Jeremy Huddleston <jeremy@yuffie.local>
Date: Wed Nov 28 23:07:41 2007 -0800
Darwin: Removed support for darwinSwapAltMeta
(cherry picked from commit 3d153c8fa40986d194b7701f5eafa0080e32399a)
commit 89c3dfe41e3a17a4f27b20e23623dc5777670feb
Author: Dave Airlie <airlied@redhat.com>
Date: Thu Nov 29 19:57:24 2007 +1100
modes: use xf86RandR12Index to stop illegal access
xf86RandR12Index set to -1, and if initialised it gets 0 or higher.
This allows the server to start with xinerama turned on with only one head
commit 725710fd0bc990b2c35e4c76128ef1c668013299
Author: Dave Airlie <airlied@redhat.com>
Date: Thu Nov 29 19:40:53 2007 +1100
randr: make randr code not segfault when xinerama set
commit e4fe0a3cb789b8757f1c80f606dfe32bccada582
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Thu Nov 29 09:55:24 2007 +1030
xkb: swap a LookupKeyboardDevice over in favour of GetPairedDevice
The former always returns the VCK, which is obviously wrong if we have
multiple devices.
commit 23b8ca8a373d919225de9739af7b064f650eceec
Author: Adam Jackson <ajax@redhat.com>
Date: Tue Nov 27 13:20:40 2007 -0500
RANDR 1.2: Only enable unknown outputs if there are no connected outputs.
Otherwise you end up with a confusing initial geometry, and xscreensaver
and friends get very angry.
commit edebe76cfdb31072d18a6fcd3ee8f1d95006855f
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Tue Nov 27 10:22:44 2007 +1030
Xi: set DeviceXXXState's length fields to the correct size of the struct.
Setting it to the size of a pointer is an interesting but equally wrong
approach. Luckily Xlib never used this field anyway so nobody got hurt so far.
Spotted by Simon Thum.
(cherry picked from commit 0f2398d06ce591724e388b3270800c5e22b3de2d)
commit 0f2398d06ce591724e388b3270800c5e22b3de2d
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Tue Nov 27 10:22:44 2007 +1030
Xi: set DeviceXXXState's length fields to the correct size of the struct.
Setting it to the size of a pointer is an interesting but equally wrong
approach. Luckily Xlib never used this field anyway so nobody got hurt so far.
Spotted by Simon Thum.
commit 601307615e4955be23fd86a057285074242ad83e
Author: Jeremy Huddleston <jeremy@yuffie.local>
Date: Mon Nov 26 13:04:57 2007 -0800
Darwin,Rootless: Makefile cleanup
(cherry picked from commit 9c6d8a035b712b219833653ac637b89703a9b0c3)
commit 8503072e1c2b89dca786d4afb72aa60a170d2fbd
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Mon Nov 26 16:52:41 2007 -0500
registry: add missing include statement.
commit 996b621bec1bbc4fb21970c75eaec62053bc6ccb
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Mon Nov 26 15:59:44 2007 -0500
registry: swap out the DTRACE XErrorDB stuff for the new registry call.
commit 54cb729ecc2d366c1af836cb3d2ffc8e864e9b79
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Mon Nov 26 15:59:01 2007 -0500
registry: Add a call for DTRACE compatibility.
commit decd5a7c605e42c99b6a4523c8e1833b859d9b24
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Mon Nov 26 15:26:49 2007 -0500
registry: Rebase registry to use the server config file of protocol names.
commit 9b0e72c8d960d056276f5fa93f3cc2872825711e
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Mon Nov 26 15:26:04 2007 -0500
registry: Add a great big list of protocol names, like the XErrorDB that
ships with Xlib. This is considered temporary, until server-side XCB can
solve the problem programmatically.
commit c0f9e204baf0218466973868c5ea6ed0f78e6b8b
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Mon Nov 26 15:24:15 2007 -0500
registry: rename the SERVERCONFIGdir and relocate it to /usr/lib/xorg
by default.
commit a344920ae86c1970e4cc34ee91e2f2008d490c49
Author: Adam Jackson <ajax@redhat.com>
Date: Mon Nov 26 11:53:08 2007 -0500
Allow Virtual to be specified globally in the Screen section.
The Display subsections are optional, and it's confusing to need to create
them just to set a Virtual size.
commit c6c284e64b1f537a3243856cf78cf3f2324e4c2b
Author: Matthias Hopf <mhopf@suse.de>
Date: Mon Nov 26 15:38:20 2007 +0100
Initialize Mode with 0 in xf86RandRModeConvert.
Asking for trouble if non-initialized values contain random data.
commit a4edfbef022f9635c2c9b9eb229cb622834dc68c
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Sat Nov 24 16:16:48 2007 +1030
mi: only call UpdateSpriteForScreen if the screen actually changed.
If we call it unconditionally, we flip the dev->spriteInfo->sprite permanently
when using XTestFakeInput (once in CheckMotion as called from the
processInputProc, another time in UpdateSpriteForScreen when we actually warp
the cursor). USFS also updates to the screen's root window unconditionally,
which is not really what we want if we haven't changed screen at all.
commit bf3198c8c56289244c58d36c6869442479fd3481
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Sat Nov 24 15:00:57 2007 +1030
dix: fix typo
commit 5dabe448bda68a483bf444a4adfed2b25b30f600
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Sat Nov 24 15:00:43 2007 +1030
dix: Add special treatment of NotifyUngrab for enter/leave events.
In some cases (e.g. using x2x) the previous model broke, with a window ending
not counting down to 0 anymore. Special treatment for NotifyUngrab seems to
help here.
Current solution: If a NotifyGrab is to be sent ignore it. If a NotifyUngrab
enter is sent, only adjust the semaphore if it is on 0. Likewise, do the same
for a NotifyUngrab leave if the semaphore is on 1. This seems to work alright
so far.
commit 33b94da6327d3423b4ebc1a58d5894c9904e67c9
Author: Keith Packard <keithp@keithp.com>
Date: Fri Nov 23 16:01:11 2007 -0800
Re-add call to XFixesExtensionInit for static servers.
This reverts a portion of bcbaf2a0ce34b6c5e41d2831b8b87dbd0617a89b which
removed the call to XFixesExtensionInit and some cpp lines.
commit f6401f944d327cc5d9a7ee0bbdf4f7fc8eaa31e8
Author: Matthias Hopf <mhopf@suse.de>
Date: Fri Nov 23 16:12:49 2007 +0100
Don't segfault if referring to a relative output where no modes survived.
commit fa19e84714aa84a2f2e817e363d6440349d0b619
Author: Matthias Hopf <mhopf@suse.de>
Date: Tue Nov 20 16:54:50 2007 +0100
Fix initial placement of LeftOf and Above.
commit 184e571957f697f2a125dc9c9da0c7dfb92c2cd9
Author: Matthias Hopf <mhopf@suse.de>
Date: Tue Nov 20 13:05:26 2007 +0100
Adjust offsets of modes that do not fit virtual screen size.
Fixes memory corruption if a too small "Virtual" was specified in xorg.conf
for the selected multi-monitor configuration.
commit a80e64f1503a4d8b11c4a6608d296422c69e3e8b
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Sat Nov 17 22:50:07 2007 +0100
XKB: Generate correct key repeat events (bug #13114)
Make sure we send the correct event for the type of device when we're
sending key repeat events, which stops repeats being sent to incorrect
windows.
commit 63351df0eec320aa3ce27d4d2ee6bcdb58aa2d92
Author: Jeremy Huddleston <jeremy@tifa.local>
Date: Thu Nov 22 18:02:07 2007 -0800
Darwin: Fix compilation/linking problems
commit bf4ef4da759c01e6794ed28ba4988a2c8ee049bf
Author: Jeremy Huddleston <jeremy@tifa.local>
Date: Thu Nov 22 17:45:15 2007 -0800
Darwin: Remove the PaintWindow optimization which snuck back in.
commit 2082e7aa878fe1221fd50895a9de1f408b3157a8
Author: Jeremy Huddleston <jeremy@tifa.local>
Date: Thu Nov 22 17:18:48 2007 -0800
Rootless: Remove the PaintWindow optimization which snuck back in.
commit a751bc12bee1d4d2ed35e3a0c64d9c8c9bf30a82
Author: Jeremy Huddleston <jeremy@tifa.local>
Date: Thu Nov 22 13:53:00 2007 -0800
Rootless: Imported changes made in xorg-server-1.2-apple branch
commit 59c7ca6586e7c20e28ad407ca9a0883c4d621d64
Author: Jeremy Huddleston <jeremy@tifa.local>
Date: Thu Nov 22 13:29:15 2007 -0800
Darwin: Added missing Makefile.am
commit 23596291c30a85e38c00aef2c01b46d561e2916e
Author: Jeremy Huddleston <jeremy@tifa.local>
Date: Thu Nov 22 13:17:44 2007 -0800
Darwin: More syncing witn xorg-server-1.2-apple
commit 4e18c626350c7c2e0fb540aa64a98957699f3abe
Author: Jeremy Huddleston <jeremy@tifa.local>
Date: Thu Nov 22 12:21:59 2007 -0800
Rootless: Pulled in changes from fb{Blt,Fill} into rl{Blt,Fill}
(cherry picked from commit 3f857e129df7ce492191e0c51b8e53eaf6179366)
(cherry picked from commit 70374a58937d7a6f01c210bd6ac66cafb63e895a)
commit ed9524d36e42a310bb128284f2b507f76b8c40d9
Author: Jeremy Huddleston <jeremy@tifa.local>
Date: Thu Nov 22 01:07:02 2007 -0800
Darwin: Copied over missing file (Localizable.strings) from xorg-server-1.2-apple
commit 4d9cef197b12548e0716dab3557e48311519e325
Author: Jeremy Huddleston <jeremy@tifa.local>
Date: Thu Nov 22 00:35:09 2007 -0800
Darwin: Misc cleanups to line up with xorg-server-1.2-apple
commit 5e950123daa167c9ffe289b3bd89e3bd288da0e3
Author: Jeremy Huddleston <jeremy@tifa.local>
Date: Wed Nov 21 23:32:00 2007 -0800
Darwin: Removed cvs tags from Xquartz man page
commit 3a2f714eea475a13cde65921e24c7ee3f70ffc3c
Author: Jeremy Huddleston <jeremy@tifa.local>
Date: Wed Nov 21 23:30:37 2007 -0800
Darwin: Removed .svn dir
commit 691da031319dc59b9496101358c267f317abfd1e
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Thu Nov 22 17:44:39 2007 +1030
Xi: allocate motion history for master device.
We're still missing out on the actual content of the history but at least this
way we don't segfault.
commit 602de4f70b6f4aab93b514f3a01917bd5d4ad640
Author: Jeremy Huddleston <jeremy@tifa.local>
Date: Wed Nov 21 16:53:10 2007 -0800
Darwin: Use UTF8String since lossyCString is deprecated
(cherry picked from commit 1786f9464af51ff606a612aec6fe420fa9688a28)
commit 13666e287c347aab2a5e9d8ee5f6bb29b9b85171
Author: Ben Byer <bbyer@bbyer.local>
Date: Sun Nov 18 17:44:12 2007 -0800
Darwin: Added some DEBUG_LOG sauce to the XP_EVENT handling code
(cherry picked from commit ec84a4cef66a2b46ed71f9758c434ea629d2f270)
commit 829b6641bd64c352e1e8a7c619f84dedbdb07a09
Author: Ben Byer <bbyer@bbyer.local>
Date: Sun Nov 18 17:43:40 2007 -0800
Darwin: Disabled ALT_IS_MODE_SWITCH
(cherry picked from commit fd181254f85543558190140787dc7b41f6cf90db)
commit 8486f8af91b477c7bcb8438a0e9a72d0c11d1d63
Author: Ben Byer <bbyer@bbyer.local>
Date: Thu Nov 15 02:25:50 2007 -0800
Darwin: Added a lightweight debugging facility to support troubleshooting
(for example) the stuck modifier key issue
(cherry picked from commit 0e0b452d10c0af55497c3299b5f3db45d5b381cb)
commit 74214a9f42b931f99d83ddb4efb3720881a2de16
Author: Ben Byer <bbyer@bbyer.local>
Date: Thu Nov 15 00:56:54 2007 -0800
Darwin: Patch to avert (some) damage / rootless crashes, courtesy of Ken Thomases
(cherry picked from commit 148a87ff20aa5e7a6d839610aa14fa1a31505c4a)
commit f5f833b80609f1f98c93113183bd2b1bab3bfec9
Author: Ben Byer <bbyer@bbyer.local>
Date: Sun Nov 11 04:30:34 2007 -0800
Darwin: These changes are necessary, yet not sufficient, to get 8-bit indexed
color mode working in Xquartz.
(cherry picked from commit a415f62f5289fae99ea9b0038d21fad7695b1336)
commit 8358334180a4f8c1e73fc5647a62bcd3539dee45
Author: Ben Byer <bbyer@bbyer.local>
Date: Sun Nov 11 04:30:00 2007 -0800
Darwin: Fixed the call to xp_init so that we now receive Motion notifications even
if X is not the active application.
fixes <rdar://problem/5167664> xeyes dead until window activation
(cherry picked from commit c7573379a85a1480cc51650075078e41dafe56af)
commit 512dee90878e552ad1b2bb5b27366707f6464f28
Author: Ben Byer <bbyer@bbyer.apple.com>
Date: Thu Nov 8 22:17:38 2007 -0800
Darwin: fix for spurious "Are you sure you want to quit?" message
(cherry picked from commit 30cbfc786e4fedda3fe070bacceabe1d9212d00b)
commit 28e73e99a9a59223963312c5dd43ce5566d1db9d
Author: Ben Byer <bbyer@bbyer.apple.com>
Date: Thu Nov 8 22:12:41 2007 -0800
Darwin: Adding "fake RandR" support from old X11.app
(cherry picked from commit 633490c4e8dab30af7ecbe1bef076c22ad5f5da9)
commit 01b70afaac0990b41d1fb6fadbfd64df1486b669
Author: Ben Byer <bbyer@bbyer.local>
Date: Sat Nov 3 05:34:19 2007 -0700
Darwin: Initial support for Spaces -- if you use Expose to drag an X11
window to another Space, it will work correctly (as opposed
to just leaving a ghost window). We accomplish this by listening
for the notification from Xplugin that our window has been moved,
and then we ask X11 to move the window to the new location.
(cherry picked from commit 2d50ea8013e7c1639d570e227b53b037fb567565)
commit b39edc01a6588697b65f831e8ab1dbb24cbe7b24
Author: Ben Byer <bbyer@bbyer.local>
Date: Wed Oct 31 23:46:50 2007 -0700
Darwin: Swap modifier keys for buttons 2 and 3 -- now Option-click is the middle click
(cherry picked from commit 0aa61293b62aeb69a93b2035d0aef8644343eed3)
commit 606a8dc73d91a198d72d249934dc027a23f4c338
Author: Ben Byer <bbyer@bbyer.local>
Date: Wed Oct 31 03:39:47 2007 -0700
Darwin: Trap Deactivate messages and release modifiers to avoid "stuck shift lock" (etc) bugs
(cherry picked from commit 2b189a99330eb465fa0d17020fb1db1e38829151)
commit 4c18ef4331aaee268431a3ba50991f0312b82870
Author: Ben Byer <bbyer@bbyer.local>
Date: Wed Oct 31 03:22:18 2007 -0700
Darwin: Workaround for a bug where the holding down Command to make a "fake"
button 2 click would actually result in a Command-2 chord.
(I.e. it wasn't releasing Command before clicking the fake button.)
(cherry picked from commit 0d5dd5dffa4c5ce3f54dfe53720a39d524dc8e37)
commit f9269bebae27bbc9d0e03e02943166b83946623d
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Thu Nov 22 17:30:14 2007 +1030
DeviceIntRec: move lastx/lasty from valuator into DeviceIntRec.
We free the ValuatorClassRec quite regularly. If a SIGIO is handled while
we're swapping device classes, we can bring the server down when we try to
access lastx/lasty of the master device.
commit 7f2972d47a5d74fe92268c6d609b1eb6ad845824
Author: Jeremy Huddleston <jeremy@tifa.local>
Date: Wed Nov 21 21:59:59 2007 -0800
Darwin: Really add launcher this time
commit bcbaf2a0ce34b6c5e41d2831b8b87dbd0617a89b
Author: Jeremy Huddleston <jeremy@tifa.local>
Date: Wed Nov 21 19:51:14 2007 -0800
Darwin: Dead code removal, Code cleanup, Added launcher
Imported changes from xorg-server-1.2-apple to make master more current wrt
file layout, build system changes, and dead code removal.
commit 9ed43eff48201520797f89a12bb3b2f5819bd99f
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Wed Nov 21 17:16:27 2007 +1030
Xi: allow clients to specify pure client id in SetClientPointer.
If no window was found with the given ID, try if there's a client with the ID.
Allows us to set the CP for apps that don't open windows (e.g. x2x).
commit 33f15689922ad9f1193f803bc1636c82c23ab99e
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Wed Nov 21 16:06:44 2007 +1030
xtest: switch an inputInfo.pointer over to PickPointer.
Couple of whitespace fixes too.
commit e5dd7a95791748c57cab75c0d8ba9d37f72edccf
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Wed Nov 21 15:59:31 2007 +1030
Xext: Scruffy the janitor don't like no "register" keywords.
commit a55ec1a9f4b62139dc5e5462d79d47b330c27c79
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Tue Nov 20 18:31:03 2007 -0800
Restore checks for __i386 where needed for Sun compilers on Solaris
commit 2f387d913aa76f1b6d21d8e2698be165301c6bc1
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Tue Nov 20 18:27:12 2007 -0800
Enable use of /dev/urandom on Solaris as well
commit 4363d70c6b420648b501126d1fbdebfafc7ae09f
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Tue Nov 20 18:58:55 2007 -0500
registry: Fix some mistakes in the reversion of prior commits.
commit 140a4660aca1c283613d5b62f51668b44b45baf6
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Tue Nov 20 18:49:30 2007 -0500
Revert "registry: Register XTrap extension protocol names."
This reverts commit b38a91993364aa80cfd99721e319e1458d9fb760.
Moving all the names into dix/registry.c
commit ed8a39c48ab9dac085fcf58b9641364b5608f3f4
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Tue Nov 20 18:47:52 2007 -0500
Revert "registry: Register XKB extension protocol names."
This reverts commit a5cf3f21f712e46dbf9bca289e67be75f2b531d3.
Moving all the names into dix/registry.c
commit 17b0c729b553e2f0f8f82497698b282a47db3326
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Tue Nov 20 18:46:43 2007 -0500
registry: Remove registry code from XInput extension.
Moving all the names into dix/registry.c
commit e86852aff62a861823b8e419434e0401b8cdc8e0
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Tue Nov 20 18:44:56 2007 -0500
Revert "registry: Register XFixes extension protocol names."
This reverts commit 106758893b68033f14f69c4ee6591fb6a149ba37.
Moving all the names into dix/registry.c
commit 5269da2bde3cf4feb12fa2bd87bff6ee6d8730a1
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Tue Nov 20 18:43:38 2007 -0500
Revert "registry: Register XvMC extension protocol names."
This reverts commit 853ea337bdad17f8f6ec7d940de14ce2cbbbf93e.
Moving all the names into dix/registry.c
commit 03a86c8d5e20a6e47f3c294f0087f205cf2a72dd
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Tue Nov 20 18:42:19 2007 -0500
Revert "registry: Register Xv extension protocol names."
This reverts commit 12766c5b5ffdab95255a63b2c8421ee773fd43b5.
Moving all the names into dix/registry.c
commit edcf490cdb965e2a5bfc0169c01732d2924da3ae
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Tue Nov 20 18:41:10 2007 -0500
registry: Remove registry code from XTest extension.
Moving all the names into dix/registry.c
commit 5fea1ed50f37691a5273bf2897479781de808ff5
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Tue Nov 20 18:39:48 2007 -0500
registry: Remove registry code from SELinux extension.
Moving all the names into dix/registry.c
commit 9a8af33718d085656a672e4c27df200485c84154
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Tue Nov 20 18:38:24 2007 -0500
Revert "registry: Register Resource extension protocol names."
This reverts commit 5c8b1a91726817816d20faefad21c7a68ab634cc.
Moving all the names into dix/registry.c
commit e6023e0208fae8f19c566f9df1a8aa20494f40ab
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Tue Nov 20 18:36:49 2007 -0500
Revert "registry: Register XPrint extension protocol names."
This reverts commit f077578e42eee424b0e534774574c84af9d6f85b.
Moving all the names into dix/registry.c
commit 277345fb7065d74c3b0d076382affb78cbe67569
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Tue Nov 20 18:35:57 2007 -0500
registry: Remove registry code from XF86Bigfont extension.
Moving all the names into dix/registry.c
commit bf27edd365ffd275e5453f44d130eeacbfe0ecd9
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Tue Nov 20 18:34:14 2007 -0500
Revert "registry: Register EVIE extension protocol names."
This reverts commit 48891d5696f56711f23743cb03be39cf6b26c522.
Moving all the names into dix/registry.c
commit 687427179420b18a55a1a02b8a9f2a32ea8eac8d
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Tue Nov 20 18:32:54 2007 -0500
registry: Remove registry code from XC-MISC extension.
Moving all the names into dix/registry.c
commit 4b0274e8f712e51b18618a2a0bdbe03b17b9736b
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Tue Nov 20 18:25:15 2007 -0500
Revert "registry: Register SYNC extension protocol names."
This reverts commit 9f597f6c87e0b14cc382d8e5929e42f822db4329.
Moving all the names into dix/registry.c
commit 4c7cf5aa4c802dcde895c723879a80a87620c0f7
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Tue Nov 20 18:23:57 2007 -0500
Revert "registry: Register SHM extension protocol names."
This reverts commit 2c9646ad4e65bb061d910c9e2b1a8a978f21fa17.
Moving all the names to dix/registry.c
commit 67e82e306f67a215c6c89868cc1d3649747bd93d
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Tue Nov 20 18:22:59 2007 -0500
Revert "registry: Register SHAPE extension protocol names."
This reverts commit 4e274e90e16b1d954391e1af3e2074fb10f70ee7.
Moving all the names to dix/registry.c
commit 8583bf78ad056ffe2d83b54e5c9a0a217e425a7b
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Tue Nov 20 18:21:09 2007 -0500
registry: Remove registry code from XC-SECURITY extension.
Moving all the names to dix/registry.c
commit 55744d8e5d7bf1ff27cd25de54e14e799dd1a70a
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Tue Nov 20 18:19:44 2007 -0500
Revert "registry: Register MIT-SCREEN-SAVER extension protocol names."
This reverts commit 58c3240fcbec23aad122e1c340f6bb6d3b18f779.
Moving all the names into dix/registry.c
commit 36ef45928c783292cef18acfdd83ae057826c989
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Tue Nov 20 18:18:01 2007 -0500
registry: Remove registry code from MIT-MISC extension.
Moving all the names to dix/registry.c
commit 816e6e612e4bc3cea1e67e7ea79d5b640458011f
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Tue Nov 20 18:15:37 2007 -0500
Revert "registry: Register Multibuffer extension protocol names."
This reverts commit 3877faf7d9fe00ed634077e38a198ae4b91a2bb4.
Moving all the names into dix/registry.c
commit 40a0da044e911ea51de003f3621331ffbe2842bc
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Tue Nov 20 18:13:43 2007 -0500
registry: Remove registry code from Fontcache extension.
Moving all the names into dix/registry.c
commit 46412baf60ed639ddc1d5fb601f73a75e39737f7
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Tue Nov 20 18:11:06 2007 -0500
registry: Remove registry code from EVI extension.
Moving all the names into dix/registry.c
commit 460c43032f05aad3f0f552901a52d199f61c7f4f
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Tue Nov 20 18:08:18 2007 -0500
registry: Remove registry code from DPMS extension.
Moving all the names into dix/registry.c
commit 76e89d45b497d4afa4e60e1d0ec50b62f54f6b88
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Tue Nov 20 18:06:40 2007 -0500
registry: Remove registry code from TOG-CUP extension.
Moving all the names into dix/registry.c
commit ce93c5772da52ab88faef7e5b661b681d5b60b1e
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Tue Nov 20 18:03:57 2007 -0500
registry: Remove registry code from BigRequests extension.
Moving all the names into dix/registry.c
commit 0756d1271209e6ae14cc641dddca095271b43150
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Tue Nov 20 17:59:40 2007 -0500
Revert "registry: Register APPGROUP extension protocol names."
This reverts commit b504678ba5407a6fd8d47d051305f7c3d5606dfe.
Moving all the names into dix/registry.c
commit 5aff37d1d69be493727856a29628bd782d50b90f
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Tue Nov 20 17:57:06 2007 -0500
Revert "registry: Register RENDER extension protocol names."
This reverts commit 8964c6d8e14ae47798762191e359b2bf138ca32e.
Moving all the names into dix/registry.c
commit e585a2ddb495b50a53e15cccc368ca0858fc9d23
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Tue Nov 20 17:55:47 2007 -0500
Revert "registry: Register Record extension protocol names."
This reverts commit ea09c9acc8f0d5577f54c864ff88b7f03d93b2f4.
Moving all the names into dix/registry.c
commit d4577e485367468227e031eb434b739eff7b5e9a
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Tue Nov 20 17:51:27 2007 -0500
Revert "registry: Register RANDR extension protocol names."
This reverts commit c827db57e4d9ca14c82b099dcfc9b7a0c0b5ba0a.
Moving all the names into dix/registry.c
commit a541e826c9310d3051e53834833c6c3a08654148
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Tue Nov 20 17:50:26 2007 -0500
Revert "registry: Register WINDOWSWM extension protocol names."
This reverts commit 4c3285c883cc50a91bc5262bbc9d073d816f860a.
Moving all the names into dix/registry.c
commit 993595430bd0580ab4d936be6b70fb91b8bb1d16
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Tue Nov 20 17:48:46 2007 -0500
Revert "registry: Register XF86DRI extension protocol names."
This reverts commit b7786724080fd3928ef7b8c294346661d7ffd90b.
Moving all the names into dix/registry.c
commit 6b73c215c9d612534af290230b2e914d42d819cd
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Tue Nov 20 17:47:30 2007 -0500
Revert "registry: Register XF86VidMode extension protocol names."
This reverts commit 960677e876c068400fb45e1764bb5470cd8c389f.
Moving all the names into dix/registry.c
commit 8e2cd7a804664bbd2d03789dcd5c93223122e929
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Tue Nov 20 17:45:30 2007 -0500
Revert "registry: Register XF86Misc extension protocol names."
This reverts commit 2cd1b32b77e0ceeaccb3f01c4ac13a97c557668c.
Moving all the names into dix/registry.c
commit 0356153a58cef87d655bccacd8e2cf03d577bd19
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Tue Nov 20 17:43:18 2007 -0500
Revert "registry: Register XF86DGA extension protocol names."
This reverts commit 3815284e899b61731b6a63c4ba14c5d773e24eb6.
Moving all the names into dix/registry.c
commit de93c1e9df14577e158b6dc3ccec7ee48f592386
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Tue Nov 20 17:40:57 2007 -0500
Revert "registry: Register DMX extension protocol names."
This reverts commit 32f3f5a1e7654f8bb43ea16b9227b3994e616739.
Moving all the names into dix/registry.c
commit 2d3e0cdf4bd7ab069bad7244ede7c2d489e92b17
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Tue Nov 20 17:39:56 2007 -0500
Revert "registry: Register APPLEDRI extension protocol names."
This reverts commit 3464b419230c6d17e940d967b567c5d2cb22d232.
Moving all the names into dix/registry.c
commit 546d46224e355d4f00232da5538548e3c8853e40
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Tue Nov 20 17:37:48 2007 -0500
Revert "registry: Register XINERAMA extension protocol names."
This reverts commit b9f5ab98c8dea36dcce1ad15fd2e059a77e77c39.
Moving all the names into dix/registry.c
commit fd2d83d5bf5b35c8a2b05f725486be166783921e
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Tue Nov 20 17:34:48 2007 -0500
Revert "registry: Register APPLEWM extension protocol names."
This reverts commit eee46b4681ec55297604b0425705f2b18381f7ca.
Moving all the names into dix/registry.c
commit c934e1af27189571c1e7dd838872e380c3580eeb
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Tue Nov 20 17:32:35 2007 -0500
Revert "registry: Register DBE extension protocol names."
This reverts commit 2e1e5be1d9067816525aa13a1d818e8ca6899599.
Moving all the names into dix/registry.c
commit b9ab6f300a46aa8879b11eac51857357cc379c2f
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Tue Nov 20 17:31:00 2007 -0500
Revert "registry: Register DAMAGE extension protocol names."
This reverts commit 20db50b4c44a14f7eeac2b1de17ada68482521da.
Moving all the names into dix/registry.c
commit 26586a7ad5e999b34996d147fb43998deea89178
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Tue Nov 20 17:27:37 2007 -0500
Revert "registry: Register composite extension protocol names."
This reverts commit 166ef972febc00c665e1d5aeb68e75d7bbcf9879.
Moving all the names into dix/registry.c
commit fae39db7957c0ebdc7af36f8d8f484473beb6d38
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Tue Nov 20 15:21:31 2007 -0500
devPrivates rework: put back some changes that were mistakenly removed
during merge conflict resolution.
commit 709c1a70c8c6a9e132bf0d92f78a12be72beee51
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Tue Nov 20 15:18:02 2007 -0500
Remove some duplicate include statements.
commit be0cbe5a330f62cef47fffbc49e83b5e1637b7d0
Author: Dodji Seketeli <dodji@openedhand.com>
Date: Tue Nov 20 15:39:49 2007 +0100
kaa: update kaaCreatePixmap to support the new usage_int
commit 5b0dfb73ca4699cc4b33720f10416de7440081b7
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Mon Nov 19 21:01:22 2007 -0500
devPrivates rework: put back a comment that was mistakenly removed
during merge conflict resolution.
commit 2d17f47cc7d6b174857617d31ad1b437d8e97d94
Merge: 60be452c2e ea9c63e93b
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Mon Nov 19 18:10:46 2007 -0500
Merge branch 'master' into XACE-SELINUX
Conflicts:
hw/xnest/Pixmap.c
include/dix.h
commit 60be452c2e88342f92a76ba5ec7d90b5b0211aaf
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Mon Nov 19 16:55:09 2007 -0500
xace: restore the old SaveScreens function and introduce new API, since the
old version is called from drivers...
commit a95bb52b4366d85fc049130c60af5c9e727c565b
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Mon Nov 19 16:34:38 2007 -0500
devPrivates rework: add missing include of dix/privates.h
commit ea9c63e93b9bb731796e8a8de2d127e6cc720076
Author: Michel Dänzer <michel@tungstengraphics.com>
Date: Mon Nov 19 15:53:49 2007 +0100
DEFAULT_DPI was undefined here.
commit db9ae863536fff80b5463d99e71dc47ae587980d
Author: Adam Jackson <ajax@aspartame.nwnk.net>
Date: Sun Nov 18 11:57:01 2007 -0500
Bump DEFAULT_DPI to 96.
75 is just nonsense.
commit ee2d4626dca6e0d4fc6f524e5de4bdefa2ed43df
Author: Tormod Volden <bugzi06.fdo.tormod@xoxy.net>
Date: Sun Nov 18 11:56:31 2007 -0500
Bug #12932: Use DEFAULT_DPI in randr1.2 instead of hardcoded 96.
commit a46c30c3be33ffb304a885503c8aaa78396ed3d9
Author: Jernej Azarija <azi.stdout@gmail.com>
Date: Sun Nov 18 11:44:36 2007 -0500
Bug #12531: RRModesForScreen can fail to allocate.
commit fac7e7e4e1809e865b9b3cf5b7eb69ba9d3a3759
Author: Adam Jackson <ajax@aspartame.nwnk.net>
Date: Sun Nov 18 11:39:26 2007 -0500
Document the requirement for interleaved code and declarations.
commit bad96e5a864e40fbd47265d7fb6eaa67c55fac11
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Sun Nov 18 15:02:24 2007 +1030
dix: getevents.c remove trailing whitespaces.
commit 75e5e9f88c5f974d996dd81e672cd3709d361a44
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Sat Nov 17 13:46:01 2007 +1030
Xi: add missing XI_DeviceClassesChangedMask to XI filters array.
commit d15339a92c4d689d2ab8a86e4f10107f3e45eff8
Author: Adam Jackson <ajax@aspartame.nwnk.net>
Date: Sat Nov 17 22:12:10 2007 -0500
Bug #9725: Don't look in root's $HOME for config files, that's just confusing.
commit 748cfbc820f8cdeb544c54a6db495fecf2e2457b
Author: Adam Jackson <ajax@aspartame.nwnk.net>
Date: Sat Nov 17 21:23:05 2007 -0500
Disinfect mi/ of mfb.
commit a969db091cab16a448f82782e85b3dd19c81627a
Author: Daniel Stone <daniel@fooishbar.org>
Date: Sat Nov 17 22:34:47 2007 +0100
XKB: Don't ring the bell when we don't have a BellProc (bug #13246)
commit c89b543198d5ec56ff025bdd6bb7229523478e58
Author: Ben Skeggs <skeggsb@gmail.com>
Date: Sat Nov 17 18:20:49 2007 +1000
exa: set driverPriv to NULL before it might get used later with garbage
commit 514ba4ca727f0b1076bc67500617722203d34daa
Author: Adam Jackson <ajax@aspartame.nwnk.net>
Date: Fri Nov 16 19:53:11 2007 -0500
Bug #1612: Use a stronger PRNG.
Currently just reads from /dev/urandom, and only on Linux.
commit 12dd6e9911de187e0ebee86434e8c24a67c990f9
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Fri Nov 16 17:23:09 2007 +1030
dix: reset MD's devPrivate classes to NULL before device initialisation.
XkbInitKeyboardDefviceStruct may call FatalError if it fails. FatalError then
cleans up all the devices, resulting in a segfault if the pointer is
uninitialised.
commit be3321c2e9fad228a9ee5fef47680a47bc9e39a4
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Fri Nov 16 12:12:41 2007 +1030
dix: Free both current classes and original classes when closing an MD.
commit 3c39dd19ec2a53b8854279e3b03131098031473a
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Fri Nov 16 12:12:14 2007 +1030
Xi: Deep-copy full list of FeedbackClasses.
All feedback classes are linked lists and the whole list has to be duplicated,
not just the first entry.
Xkb stuff still missing.
commit 497862df2fcd67531fbe0f876c20a09884ee74df
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Fri Nov 16 11:20:22 2007 +1030
dix: explicitly float all attached SDs before closing down devices.
Some drivers flush on shutdown, if our SD is still attached we'd be trying to
route an event through a non-existing device.
commit 9de1ebe2a80164507cbe2ef688f284225e0ec808
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Fri Nov 16 10:45:28 2007 +1030
dix: Fix up class restoring when last SD disconnects.
Old code was fundamentally broken, fixes now are:
- free the MDs current device classes
- copy the device classes instead of flipping the pointers
- check for the old MD, not the new one.
commit 20fd4783247b1b93d9675dc36768dd1ed59ba2d3
Author: Adam Jackson <ajax@redhat.com>
Date: Thu Nov 15 17:01:33 2007 -0500
Small static cleanups on dix/
commit 70e50fa51f05663f289eeeea4521e737e8e24bca
Author: Adam Jackson <ajax@redhat.com>
Date: Thu Nov 15 17:00:37 2007 -0500
Allocate RRCrtcRecs with calloc.
commit 8d0cd1cd2c57ee5a2fc4d577d8182d66369f0617
Author: Aaron Plattner <aplattner@nvidia.com>
Date: Thu Nov 15 12:16:36 2007 -0800
Fix a really dumb typo.
commit f797c96845a3fab37cda6839ebecf9ac5401fd6e
Author: Aaron Plattner <aplattner@nvidia.com>
Date: Thu Nov 15 12:12:02 2007 -0800
Save pixmap allocation hints into the PixmapRec.
commit 6bc50de02108f822977fc7545da81fce95ea7ff4
Author: Adam Jackson <ajax@redhat.com>
Date: Thu Nov 15 15:03:58 2007 -0500
Simplify system resource range setup.
osRes only existed to get copied into Acc. Waste of effort.
commit e1ff14a9246e12d42ce8ca5afbe3b957333a5620
Author: Adam Jackson <ajax@redhat.com>
Date: Thu Nov 15 14:45:49 2007 -0500
Delete some dead code in X -configure.
commit 01cfba75229f4b9bf1e4fe80814931acdacde14c
Author: Adam Jackson <ajax@redhat.com>
Date: Thu Nov 15 14:27:03 2007 -0500
Nuke the debugging allocator.
This has never been hooked up in the modular build, and can not possibly
have built since before 6.7. Clearly no one's using it.
commit c67b9c5fc33002b13a2360929a37f24169710f64
Author: Adam Jackson <ajax@redhat.com>
Date: Thu Nov 15 14:24:36 2007 -0500
Clean up some garbage in driver enumeration.
commit 0706e5e790060fbf046cfaff295b78806b7841c6
Author: Adam Jackson <ajax@redhat.com>
Date: Thu Nov 15 14:15:09 2007 -0500
Eliminate some redundancy in autoconfiguration.
We already synthesize Monitor and Module sections for you, no need to
specify them explicitly in the fake config buffer.
commit 2c01a49bf0a407bd5510bb9ceb4ef86a2cc36be9
Author: Adam Jackson <ajax@redhat.com>
Date: Thu Nov 15 13:32:59 2007 -0500
Don't sleep(1) at exit on any platform.
commit 83926cb8bef6288b89e801c5e60b3f40e923e16e
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Thu Nov 15 17:41:07 2007 +1030
Xi: Only alloc modifierKeyMap if <slave device>->maxKeysPerModifier > 0
Sometimes (e.g. on my debian ppc box) maxKeysPerModifier of the SD is 0. So we
try to malloc(0), bringing the whole server down with a FatalError because it
looks as if the malloc failed. This is bad, so only alloc if we actually have
something to alloc.
commit 070195dbf88eb121e65f802e023aa37ed1f2c2ac
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Thu Nov 15 16:27:18 2007 +1030
Xi: fix up sloppy class copying causing segfaults.
commit 53539688cab990a7df1851d64f3ee4e11920a86b
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Thu Nov 15 16:23:48 2007 +1030
dix: SetKeySymMap should alloc the map if dst doesn't have one already.
commit b40646dc104fb03ea7cc0b27fae573aecaab486e
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Thu Nov 15 15:43:44 2007 +1030
dix: Add FreeDeviceClass and FreeFeedbackClass for centralised xfree.
Ensures that we only have one way of freeing a device class to avoid leaks in
ChangeMasterDeviceClasses and other places.
commit 4c9cc82fc4461d180ae2c2fbe50e7f98b0777f91
Author: Tiago Vignatti <vignatti@c3sl.ufpr.br>
Date: Thu Nov 15 01:46:11 2007 -0200
For some reason "-nozap" appeared twice. Weird.
commit 18833d648fd7e1a5e962b93636bbbb38aca9c454
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Thu Nov 15 12:13:59 2007 +1030
Xi: reset xkb-stuff to NULL after copying (DeepCopyDeviceClasses)
Having two devices point to the same xkb stuff causes SIGABRTs.
Also, don't init a MD's xkbInfo unless the SD has an xkbInfo.
commit 1635832c1635374033686d3a943b77adbd60bb98
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Thu Nov 15 11:35:07 2007 +1030
Revert "xkb: disable xkb key repeats (temporarily)"
This reverts commit 2b1d946392ce28b96941341778b2b526aa0fb126.
commit b05246696d14bd35aa53b49302707b51206c72a6
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Thu Nov 15 11:31:43 2007 +1030
Xi: free XkbSrvLedInfos as well when freeing an MD's device classes.
commit c758e5a664a52045ad419340044beebb6774a336
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Thu Nov 15 10:47:20 2007 +1030
dix: Make sure core MDs copy their initial classes before they are used.
Anything in dev->key, dev->valuator etc. of a MD must always be a copy of the
original class. The intial classes of an MD (the ones set up before an SD is
attached) as well, as we may have to restore them if no SD is attached
anymore.
commit a08665d4d3b0a7d567a90bb9bbfe4abafd6f3887
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Thu Nov 15 10:42:29 2007 +1030
mi: don't call SwitchCoreKeyboard, we switch during event processing now.
commit 64711a094893e83764bbeda538c6e877ebe2af79
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Thu Nov 15 10:41:34 2007 +1030
Xi: When switching MD classes, make a deep copy instead of pointer flip.
Turns out it's really really hard synchronising device state across multiple
duplicated events if they all share the same struct. So instead of doing so,
when the SD changes deep-copy all it's classes into the MD. The MD then has
the same capabilities, but the state can be set separately. This should fix
xkb, key state, repeat etc. problems.
Updating the device state allows us to remove the SwitchCoreKeyboard from the
event gathering, it's all done during event processing now.
commit 3dde66f96b9b8431381871cf85266da3ec57a0d4
Author: Adam Jackson <ajax@redhat.com>
Date: Wed Nov 14 15:10:59 2007 -0500
Start 1.4.99
commit c3897ca7099fc007b4134a8fabd4c707f99f2ac7
Author: Adam Jackson <ajax@redhat.com>
Date: Fri Nov 9 13:55:32 2007 -0500
Add -pogo option for init/teardown performance testing.
commit cecac794451b793871f297b91a11d3b52eeb6d1b
Author: Adam Jackson <ajax@redhat.com>
Date: Thu Nov 8 17:25:36 2007 -0500
Don't sleep(1) at server exit.
commit 1603130236c55ddabc3854d4ba62d544debcf1f5
Merge: f207e69d62 f7dd0c72b8
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Wed Nov 14 13:35:50 2007 -0500
Merge branch 'master' into XACE-SELINUX
Conflicts:
Xext/xace.c
Xext/xace.h
commit f207e69d62bc04c7f254347b03e6d8fa8b569d66
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Wed Nov 14 12:23:29 2007 -0500
xselinux: adjust receive hook to use new synthetic_event class.
commit cc4586df600af571815d5cdda2028c0d074c8469
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Wed Nov 14 14:27:52 2007 +1030
Xi: toggle the public.devPrivate as well when switching device classes.
The master needs to have the same devPrivate as the slave, in case a client
issues a request that goes down to the driver.
Example: if a driver wants to ring the keyboard bell, it'll pick a keyboard.
The KeyClassPtr will direct it to the matching method in the driver, but
because the MD doesn't have the devPrivate set the driver segfaults.
Even if all drivers were updated to not dereference the nullpointer, nothing
would actually ever happen.
To avoid this, we flip the master's public.devPrivate to the last SDs
devPrivate.
commit b44c1118f3bab6d5f28fa42e0c322fbaec005012
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Wed Nov 14 14:08:21 2007 +1030
dix: Return Success from ProcBell if no BellProc is set.
We must not return BadDevice, this causes applications to crash. If no
BellProc is set, just quietly do nothing and report a Success.
commit 240b10fa9c32510a380a73a8acdd8267c81e538b
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Wed Nov 14 12:18:08 2007 +1030
Xi: Move updating the device state from POE into separate function.
POE now only deals with processing the event and calling the appropriate
delivery methods. Actually modifying the device state is done in
UpdateDeviceState. This separation should make it easier to avoid setting the
state twice when master events are processed.
commit 0bdfeb55fc559ffe0334df69ba6e9e711b26dc18
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Tue Nov 13 17:31:20 2007 +1030
Xi: remove RegisterPairingClient handling. Deprecated with device hierarchy.
commit e96d926d64f7fb63f6bf2aa0ea0a8440a188947b
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Tue Nov 13 17:14:35 2007 +1030
Xi: remove trailing whitespaces.
commit 5031238aad2b6b7511aab0f9d15edfbdd2b4cce7
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Tue Nov 13 16:58:23 2007 +1030
dix: remove trailing/wrong whitespaces from devices.c and events.c
commit c703849e79391bb1bb01a994bb8d5cf2eb64e48b
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Tue Nov 13 16:50:18 2007 +1030
dix: Attach spriteInfoRec to same memory block as the DeviceIntRec.
No need to alloc a separate one, we never do anything special with it anyway.
commit 51239f87ce42ad564ceee1761980391947294511
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Tue Nov 13 11:26:16 2007 +1030
dix: Send MappingNotify when keyboard maps change.
If a slave device is attached to a master device, then we need to send a
mapping notify to the client.
Mapping notify needs to be sent if
- different slave device but on same master
- different master
This gives you funny behaviour with the ClientPointer. When a
MappingNotify is sent to the client, the client usually responds with a
GetKeyboardMapping. This will retrieve the ClientPointer's keyboard mapping,
regardless of which keyboard sent the last mapping notify request. So
depending on the CP setting, your keyboard may change layout in each app...
commit 2b1d946392ce28b96941341778b2b526aa0fb126
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Tue Nov 13 09:51:33 2007 +1030
xkb: disable xkb key repeats (temporarily)
Haven't quite figured out yet how to make these repeats work. Because we share
the class between devices, the key state is already set when we process the
master device's event, causing a repeat on each event.
commit f7dd0c72b8f861f4d5443a43d1013e3fe3db43ca
Author: Matthias Hopf <mhopf@suse.de>
Date: Mon Nov 12 15:11:03 2007 +0100
Only clear crtc of output if it is the one we're actually working on.
Upon recreation of the RandR internal data structures in RRCrtcNotify() the
crtc of an output could be NULLed if the crtc was shared (cloned) between two
outputs and one of them got another crtc assigned.
commit 70b4087c4dd1904d9d655f4afb9dfcea4f137f7a
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Mon Nov 12 13:10:39 2007 +1030
dix: don't unconditionally update valuators during key events.
Master may not have valuators, device may not have valuators.
commit 23365d28651f7942fdafb889bcbbd019470a4274
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Mon Nov 12 13:08:38 2007 +1030
dix: allow grab modifier device to be NULL.
This can happen if we check for a passive core grab and our device is a
floating slave device. Doesn't really change anything as SDs can't send core
events but it stops the server from segfaulting.
commit 5a7a65a3c978a65e8ff39d0cc9878527ec42adc9
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Mon Nov 12 12:37:39 2007 +1030
mi: avoid SIGABRT by setting master_event to NULL.
commit a05f43bf3e9629df98e93c366d4327f20ed81e6c
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Mon Nov 12 11:35:18 2007 +1030
dix: When the last slave is removed, set master to the original classes.
DeviceClassesChangedEvent is sent to the client, where device == new slave.
commit 45f884d79c0eebaa1eb24d7db76c1177f6b710c9
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Fri Nov 9 14:45:27 2007 -0500
xselinux: add new synthetic_event security class, and fix registry code.
commit b092856baba5bd43b23950f23236b5cc3ce78c1e
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Fri Nov 9 14:45:02 2007 -0500
registry: Register XC-SECURITY extension protocol names.
commit 7a81bafc9bc7048560b17483e6addf58469a05d0
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Fri Nov 9 23:10:24 2007 +1030
Xi, dix: Add ability to change MD classes + send event when doing so.
Each time a different slave device sends through a master, an
DeviceClassesChangedEvent is enqueued. When this event is processed, all
classes of the matching master device are changed, and the event is sent to
the clients.
Next time the master is queried, it thus shows the evclasses of the last slave
device. The original classes are stored in the devPrivates.
TODO: if all slave devices are removed, the master's original classes need to
be restored.
commit c0a05805783ee3d38fbcc0fb45f4aa3c511785f0
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Fri Nov 9 23:07:10 2007 +1030
Xext: add simple macro to easily check a generic event's type.
commit f48087b6c33c1f84bf2cfc0744b1c38697321c07
Author: Kristian Høgsberg <krh@temari.boston.redhat.com>
Date: Fri Nov 9 05:49:26 2007 -0500
Regenerate GLX dispatch code for recent gl_API.xml changes (#12935).
commit f2a3728868376a3646832d4af3a29549ce0b8f5d
Author: Ben Byer <bbyer@bbyer.apple.com>
Date: Thu Nov 8 18:49:05 2007 -0800
Patch to rootless code that should fix many crashes. Credit to Ken Thomases
at CodeWeavers for the patch. From his description:
Fix a display bug with the X server. The Generic Rootless extension
installs overrides for certain GC (graphics context) operations. Within
these overrides, they temporarily uninstall themselves, perform their work,
and then reinstall themselves. Except sometimes they would return early
and wouldn't reinstall themselves when they should. Now they do in all cases.
Fix a bug in RootlessCopyWindow where early returns could leave the screen's
dispatch table entry for CopyWindow unwrapped. We think that this is
another case (hopefully the last) of the rootless drawing bug.
commit 338c1aedbdf3964e542947140f7c50d58542cf12
Author: Ben Byer <bbyer@bbyer.local>
Date: Wed Nov 7 03:56:44 2007 -0800
formatting fixes
commit bd269d0d783d418ef99363478fdf849fd89eed76
Author: Ben Byer <bbyer@bbyer.local>
Date: Wed Nov 7 03:55:08 2007 -0800
Fix for off-by-one error in menu bar height calculation -- props to Nicholas Riley!
commit b4d14484056e6f4a7374fc1acf3f223be4bd116f
Author: Ben Byer <bbyer@bbyer.local>
Date: Wed Nov 7 03:10:52 2007 -0800
Undo some last-minute breakage in xpr.h
commit 05d5b9baa05a4ba14a4383d8a981bc327d99290c
Author: Ben Byer <bbyer@bbyer.local>
Date: Wed Nov 7 02:28:49 2007 -0800
removed debugging output
commit 9a8abcfa6d6d0cdc17be02a3443a7e116eb07d07
Author: Ben Byer <bbyer@bbyer.local>
Date: Wed Nov 7 02:22:39 2007 -0800
Fixed focus problem (clicking on an X11 window that sits behind
an Aqua window would not always bring it to the top of the stack.
commit b34d2ffc38002f7c4980c138f57e9a828cd79c37
Author: Ben Byer <bbyer@bbyer.local>
Date: Wed Nov 7 01:56:37 2007 -0800
formatting changes.
commit 50dac9b2cb3b40810fb79253adc0265a838a497b
Author: Ben Byer <bbyer@bbyer.local>
Date: Wed Nov 7 01:35:48 2007 -0800
Fixed Spaces issue, correctly -- dragging an X window from one
Space to another in Expose mode now works.
commit ce7cfbe261b7fd4fcd09d1a4a61344d1555a71f2
Author: Ben Byer <bbyer@bbyer.apple.com>
Date: Thu Nov 8 20:10:51 2007 -0800
Fixed check to refer to DarwinApp, not all Darwin targets
commit d68bd5510437c1fd3850e020f7cd90901fae8e1b
Author: Ben Byer <bbyer@bbyer.apple.com>
Date: Thu Nov 8 20:08:49 2007 -0800
fixing GLX in Xquartz
commit a6ac9002956767fefa37aac95513e21ac5246d15
Author: Ben Byer <bbyer@bbyer.apple.com>
Date: Mon Nov 5 20:25:10 2007 -0800
formatting cleanup
commit 67e96be13cdb45be31db121ce216295cd9496d20
Author: Ben Byer <bbyer@bbyer.apple.com>
Date: Mon Nov 5 20:01:34 2007 -0800
Fixed logic error that prevent JIS (Japanese) keyboard layouts from
being detected.
commit 154fb6417e5d0bae5191984beac5ce045ce754bb
Author: Ben Byer <bbyer@bbyer.local>
Date: Sat Nov 3 05:34:19 2007 -0700
Initial support for Spaces -- if you use Expose to drag an X11
window to another Space, it will work correctly (as opposed
to just leaving a ghost window). We accomplish this by listening
for the notification from Xplugin that our window has been moved,
and then we ask X11 to move the window to the new location.
commit 5bbc468b702f62d7c91d41aabcc27eeb553f6959
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Fri Nov 9 11:33:27 2007 +1030
dix: grabbing an attached SD sets it floating for the duration of the grab.
commit 676b26ca3e9b142cf007af3f439aa1993f2247c4
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Thu Nov 8 17:54:17 2007 +1030
Xi: notify the clients when the device hierarchy has been changed.
commit cb75f09146a3c17b1a67b636bbf7229c65c83b35
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Fri Nov 9 11:29:18 2007 +1030
dix: calloc root window's Generic Event mask, stops segfaults.
commit 169f83e366f678ac5441ad21beb84c9b8c65d28e
Author: Ben Byer <bbyer@bbyer.local>
Date: Sun Nov 4 19:14:10 2007 -0800
Disable deferred updates in xp_init to fix performance problems
-- thanks to Eric Gouriou for pointing out the issue
commit 1c6cb353f77747c101ce47716ff1fa055fbf85a4
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Thu Nov 8 16:46:49 2007 -0500
Restore the XC-SECURITY option in configure.ac, but disabled by default.
commit 9d03cad1446c27b397c198cf6247e71e46bc9e6d
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Thu Nov 8 16:41:47 2007 -0500
Remove SecurityPolicy file and associated references in the manpages.
commit 8b5d21cc1d1f4e9d20e5d5eca44cb1e60a419763
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Thu Nov 8 16:32:42 2007 -0500
Rework of the XC-SECURITY extension. The gen-auth protocol has not changed,
but the XC-QUERY-SECURITY-1 authorization method and the SecurityPolicy
configuration file have been removed. The semantics of the trusted vs.
untrusted split have been changed. This will be documented in a future
commit.
commit 476a9d85f819f454a6901ccb7eb028d1c563c341
Author: Dodji Seketeli <dodji@openedhand.com>
Date: Thu Nov 8 09:11:05 2007 +0100
Xephyr: do not AM_CONDITIONAL inside a shell if branch
commit 59b304d8a24fecd094296feb217823f0c73d6f82
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Thu Nov 8 15:44:18 2007 +1030
dix, mi: stop segfaults when a floating device emits events.
For pointers: don't try to set master->valuator fields if there is no master.
For keyboards: check if device is valid before trying to access the fields in
miPointerGetScreen (btw. this disables DGA events for floating keyboards).
Also stop the hideous number of ErrorFs if we request the paired device for a
floating dev.
commit 3063f0c6679bdbea13f360cff8d09a88b9871da9
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Thu Nov 8 11:51:03 2007 +1030
mi: change the device id to the master devices' when duplicating the event.
Move the event duplication into a CopyGetMasterEvent(), makes the code a bit
better to read.
commit 0e9ef65fa583bf2393dd0fda82df6f092387b425
Author: Keith Packard <keithp@koto.keithp.com>
Date: Wed Nov 7 16:33:10 2007 -0800
Don't frob timers unless SmartSchedule is running
commit 180220f284823c486e7001ef00f1279dc548c9c7
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Thu Nov 8 10:00:35 2007 +1030
Xi: return BadDevice for slave devices on ProcXSetClientPointer
Also clean up to return error codes instead of sending the error manually.
commit 184a7b8917a15bb2c719153b9b016c03aab42101
Merge: a8808ac3d0 0b729051c0
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Thu Nov 8 09:34:35 2007 +1030
Merge branch 'mpx' into mdsd
Conflicts:
Xi/opendev.c
commit e94ab0b502160376d1956345196f7e1c7e2e886f
Merge: 26e1fc7b42 9bee1c6912
Author: Dodji Seketeli <dodji@openedhand.com>
Date: Wed Nov 7 19:04:24 2007 +0100
sync with 'master'
commit 9bee1c6912817f65bbb8cf4078f0ad016d9d51cb
Author: Michel Dänzer <michel@tungstengraphics.com>
Date: Wed Nov 7 18:56:45 2007 +0100
EXA: Disable problematic optimization of dest pixmap migration by default.
Also add some code comments about these optimizations.
commit 26e1fc7b42de850d69fba89703ffddd36480b997
Author: Dodji Seketeli <dodji@openedhand.com>
Date: Wed Nov 7 18:48:23 2007 +0100
Xephyr: don't use Xv or GL when those are disabled.
commit 950f9995d11aff2c51139b34fb27eba594f2bd20
Author: Dodji Seketeli <dodji@openedhand.com>
Date: Wed Nov 7 18:43:16 2007 +0100
Xnest: fix lib dependancy to make libtool happy
This fixes an undefined symbol error happening when compiling
the server with the --disable-xv configure switch.
Basically, xnest was linking against
@XSERVER_LIBS@ and @XNEST_LIBS@ and the order of the libraries
given to the linker at the end of the process was bogus.
* configure.ac: make XNEST_LIBS contain the $XSERVER_LIBS re-ordered
in such a way that the linker finds the symbols of all the libs contained
in $XNEST_LIBS.
* hw/xnest/Makefile.am: don't link against @XSERVER_LIBS@ anymore because
XNEST_LIBS contains the right thing.
commit 0b729051c04da7068f1e6dd319190bd0a362b2c0
Merge: b7ee005d32 d7c5e8bfc1
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Wed Nov 7 15:37:23 2007 +1030
Merge branch 'master' into mpx
Conflicts:
Xi/extinit.c
Xi/grabdev.c
Xi/setmode.c
Xi/ungrdev.c
dix/devices.c
dix/events.c
dix/getevents.c
include/dix.h
mi/midispcur.c
mi/misprite.c
xkb/xkbActions.c
xkb/xkbEvents.c
xkb/xkbPrKeyEv.c
commit e717409bae355df9a617a226f12fbb8c54ae77e5
Author: Daniel Stone <daniel@fooishbar.org>
Date: Tue Nov 6 21:36:13 2007 +0000
DIX/getevents: Document GetMaximumEventsNum() a little better
Note that the number returned by GMEN can _never_ change, and be a little more
explicit about the figure for repeats.
commit 66fe554a59bb7de37354b618945cd5f30d78250d
Author: Daniel Stone <daniel@fooishbar.org>
Date: Tue Nov 6 18:57:09 2007 +0000
COPYING: Collapse 'canonical license' into one statement
For a few of us, the license statement is identical, and the only variant is
the copyright. For these, aggregate the copyrights, and only list the license
once. Put this at the top, and note that this is more or less our agreed
canonical license.
commit fda832772b3e630037bf1b822534996154a50861
Author: Daniel Stone <daniel@fooishbar.org>
Date: Tue Nov 6 15:05:06 2007 +0000
.gitignore: Ignore build directories
Ignore directories people might use for building.
commit 512bac25ec0e980968b93a2ebe88bd89bf99b697
Author: Daniel Stone <daniel@fooishbar.org>
Date: Tue Nov 6 14:52:03 2007 +0000
DIX: XKB: Set xkbInfo to NULL as well as freeing it (bug #10639)
XkbRemoveResourceClient wants to access xkbInfo if it exists, so make
sure we NULL it after freeing it. It doesn't make much sense to move
the RemoveResourceClient call first, as there's not much point in
notifying clients while we're shutting the server down anyway.
commit a8808ac3d093f33b39de109107d396fe0a02c4fc
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Wed Nov 7 11:42:58 2007 +1030
Xi: don't call CheckMotion for slave devices.
This essentially disables enter/leave for slave devices, but re-enables them
for master devices. Which is a good thing after all.
commit 15944b8f02752eedd61be34a6a29dd6b82a0ac97
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Wed Nov 7 11:33:24 2007 +1030
mi: duplicate event before processing it, so master has original values
Event values may get changed in the event processing stage, so we need to
duplicate it to pump different events through for slave and master device.
commit d7c5e8bfc1aecbd23a4cbb2eab08656587aac2e8
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Tue Nov 6 16:26:09 2007 -0500
Modified performance patches from Arjan van de Ven <arjan@infradead.org>
Subject: [PATCH] fix some performance gaps in Xace
The XaceHook function is used in several hotpaths.
The problem with it (performance wise) is twofold:
* The XaceHook function has a big switch() statement for the hook number in it
* The XaceHook function uses varargs to reassemble the final dispatch arguments again
Both are expensive operations... for something that is known at compile time
This patch turns the hotpath XaceHook call into a direct call to avoid
the switch and varargs; this gives me over 10% performance gain
on the x11perf benchmark.
commit aaa50b64113b122aaebd46e3b78e3fb7a8d70500
Merge: 868e303630 ddce48ede0
Author: Dodji Seketeli <dodji@openedhand.com>
Date: Tue Nov 6 16:25:40 2007 +0100
resync with 'master'
commit 868e303630d8b84070c2f1fd8d6da2cef045b029
Author: Dodji Seketeli <dodji@openedhand.com>
Date: Tue Nov 6 16:24:46 2007 +0100
Xephyr: fix a crash when using xrandr twice
* hw/kdrive/ephyr/ephyr.c:
(ephyrScreenFini): don't forget to
free shadowfb data (if necessary) upon server is reset.
commit ddce48ede036f3996f8e584b0012c396c5df42fb
Author: Elvis Pranskevichus <el@prans.net>
Date: Tue Nov 6 09:40:14 2007 +0000
Config: D-Bus: Fix dbus_bus_request_name failure check
The code in connect_hook incorrectly checks for dbus_bus_request_name failure.
The dbus_bus_request_name error indicator is -1, not 0. This leads
to subsequent assertion failure in libdbus.
commit a52c9b2a59f27266557ff9d5d2c08492e04135a6
Merge: c7e18beb3c 58332894c0
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Mon Nov 5 19:08:36 2007 -0500
Merge branch 'master' into XACE-SELINUX
Conflicts:
dix/dispatch.c
dix/property.c
hw/xfree86/common/xf86VidMode.c
include/xkbsrv.h
render/glyph.c
xkb/xkbActions.c
commit 58332894c061ae96d6a457f65266660f5f65e88b
Author: Adam Jackson <ajax@redhat.com>
Date: Mon Nov 5 17:17:25 2007 -0500
Export the server ABI versions from xorg-server.pc
commit c7e18beb3c87eb1ada9b21c4ffacd11c1939c087
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Mon Nov 5 15:01:13 2007 -0500
xselinux: Register SELinux extension protocol names.
commit 632c33c5c18b3e091c4fce98280af4d583e99640
Merge: 4113f040c5 dda10c9066
Author: Dodji Seketeli <dodji@openedhand.com>
Date: Mon Nov 5 17:52:33 2007 +0100
pull 'master'
commit 4113f040c587fc536adc693d7ee5a4c0a60b75d4
Author: Dodji Seketeli <dodji@openedhand.com>
Date: Mon Nov 5 17:33:01 2007 +0100
GL: fix crash at mesa destruction time
* GL/glx/glxglcore.c:
(_glXMesaScreenDestroy): delete the same amount of visuals
that those which were created in createMesaVisuals().
commit dda10c9066a660b647384179f82e1da8e063264f
Author: Daniel Stone <daniel@fooishbar.org>
Date: Mon Nov 5 16:28:35 2007 +0000
Remove all traces of external RGB database (and Speedo)
Remove all references to an external RGB database (which hasn't been enabled
for a very long time). Also get rid of some references to Speedo fonts.
commit 6ff79ea5f7d3ff0c3b14e39849514784ccd40190
Author: Dodji Seketeli <dodji@openedhand.com>
Date: Mon Nov 5 16:46:49 2007 +0100
Xephyr: fix some DRI build breakage
commit 5e363500c86042c394595e1a6633581eb8fcd1bb
Author: Daniel Stone <daniel@fooishbar.org>
Date: Mon Nov 5 14:38:28 2007 +0000
OS: Remove ALLOCATE_LOCAL from os.h
Remove ALLOCATE_LOCAL_FALLBACK and DEALLOCATE_LOCAL_FALLBACK from os.h, and
remove the include of Xalloca.h as well.
commit 83e5d9e75d0fa1135e2c9d8b59caee98c3291681
Author: Daniel Stone <daniel@fooishbar.org>
Date: Mon Nov 5 14:36:54 2007 +0000
DIX: Remove last alloca call
Replace with heap allocations.
commit 1179ddea94efae6606162e9a1b0f2bf752ae4dd0
Author: Daniel Stone <daniel@fooishbar.org>
Date: Mon Nov 5 14:36:36 2007 +0000
EXA: Remove usage of alloca
Replace with heap allocations.
commit 1eb6a1d0d2817cd0ce96fb27db3ceb2d0ff024af
Author: Daniel Stone <daniel@fooishbar.org>
Date: Mon Nov 5 14:18:35 2007 +0000
XTrap: Remove usage of alloca
Replace with xalloc/xfree.
commit 934281126f6c602fa4bd0c2e29d8c9f44fe532b8
Author: Daniel Stone <daniel@fooishbar.org>
Date: Mon Nov 5 14:18:22 2007 +0000
Xext: Remove usage of alloca
Replace with heap allocations.
commit fb32bb9839b615f7297fbfac2050bc216682f01c
Author: Daniel Stone <daniel@fooishbar.org>
Date: Mon Nov 5 14:17:54 2007 +0000
Xi: Remove usage of alloca
Replace with xalloc/xfree.
commit 683ee1776d172035c465aa8fc84ccd53bb8ba7fd
Author: Daniel Stone <daniel@fooishbar.org>
Date: Mon Nov 5 14:14:25 2007 +0000
afb: Remove usage of alloca
Replace with heap allocations.
commit ca75261beedc3e00767b3812a81b7dac4437f4a1
Author: Daniel Stone <daniel@fooishbar.org>
Date: Mon Nov 5 14:14:04 2007 +0000
cfb: Remove usage of alloca
Replace with xalloc/xfree.
commit 914922fd6100a409a3dfd1c64511ed6bdc344bef
Author: Daniel Stone <daniel@fooishbar.org>
Date: Mon Nov 5 14:12:59 2007 +0000
DIX: Remove usage of alloca
Replace with heap allocations.
commit 3b77689266e729411229ec83d2a90578ebc1d82f
Author: Daniel Stone <daniel@fooishbar.org>
Date: Mon Nov 5 14:12:34 2007 +0000
EXA: Remove usage of alloca
Replace with heap allocations.
commit 34cdf06e4ccb243664005cc33009d8759a7f6e4d
Author: Daniel Stone <daniel@fooishbar.org>
Date: Mon Nov 5 14:12:22 2007 +0000
fb: Remove usage of alloca
Replace with heap storage.
commit 733d42065f2c24505b3874ce51c18f6063c2b67e
Author: Daniel Stone <daniel@fooishbar.org>
Date: Mon Nov 5 14:11:59 2007 +0000
XFree86: Remove usage of alloca
Replace with heap allocations.
commit caf545063457591f88e1f7bcd25dbd0342f44343
Author: Daniel Stone <daniel@fooishbar.org>
Date: Mon Nov 5 14:10:55 2007 +0000
KDrive: Remove usage of alloca
Replace with heap allocations.
commit d57060f16714f5667722001bd1a4500059dd59e1
Author: Daniel Stone <daniel@fooishbar.org>
Date: Mon Nov 5 14:10:21 2007 +0000
DMX: Remove usage of alloca
Replace with heap allocations.
commit def6f74f2d7342f85f3df2053e0b9c1ac483b51d
Author: Daniel Stone <daniel@fooishbar.org>
Date: Mon Nov 5 14:10:03 2007 +0000
Xvfb: Remove usage of alloca
Replace with heap allocations
commit 259f4c36d581896ce605741b9e557a589013a9b8
Author: Daniel Stone <daniel@fooishbar.org>
Date: Mon Nov 5 14:09:49 2007 +0000
Xprint: Remove usage of alloca
Replace with heap-based allocations.
commit 1c84337af0ac40498a53aa36289e2f6f5ff8b1c6
Author: Daniel Stone <daniel@fooishbar.org>
Date: Mon Nov 5 14:09:32 2007 +0000
Xwin: Remove usage of alloca
Replace with heap allocations.
commit f7d5c292e44113ea8eb32e67e91cd02e520df5e3
Author: Daniel Stone <daniel@fooishbar.org>
Date: Mon Nov 5 14:09:14 2007 +0000
mfb: Remove usage of alloca
Replace with heap-based allocations.
commit be9ee17f960cc3d8a8f999cab1579e83d9aea520
Author: Daniel Stone <daniel@fooishbar.org>
Date: Mon Nov 5 14:08:51 2007 +0000
mi: Remove usage of alloca
Replace with heap allocations.
commit 3633ae6efb57c5405c26e8ae132b9371e5f920de
Author: Daniel Stone <daniel@fooishbar.org>
Date: Mon Nov 5 14:04:27 2007 +0000
Damage: Remove usage of alloca
Replace with heap allocations.
commit 2761c103311a1160bc483fd0367d654733df8598
Author: Daniel Stone <daniel@fooishbar.org>
Date: Mon Nov 5 14:03:26 2007 +0000
OS: Remove usage of alloca
Replace with heap allocations.
commit 2d738efb959912d8a89864e41190e0064fa77906
Author: Daniel Stone <daniel@fooishbar.org>
Date: Mon Nov 5 14:01:11 2007 +0000
RandR: Remove usage of alloca
Replace with heap allocations.
commit 3c1d2fdeff0ed61d86fa7d35cb0a61535d9b2816
Author: Daniel Stone <daniel@fooishbar.org>
Date: Mon Nov 5 14:00:40 2007 +0000
Record: Remove usage of alloca
Replace with xalloc/xfree.
commit e0491f470e130147191388168e878e3a7348afaf
Author: Daniel Stone <daniel@fooishbar.org>
Date: Mon Nov 5 13:59:51 2007 +0000
Render: Remove usage of alloca
Replace it with heap-based allocations.
commit 59774af86b851c7fb8989cef6c013522549000b8
Author: Daniel Stone <daniel@fooishbar.org>
Date: Mon Nov 5 13:59:15 2007 +0000
XKB: Remove usage of alloca
alloca has no way to return failure, and instead can possibly arbitrarily
overflow the stack. Let's avoid that one.
commit 6e4f5cf83f35ffebb51633ab30b1826e63e37223
Author: Ben Byer <bbyer@bbyer.local>
Date: Mon Nov 5 05:53:34 2007 -0800
changing ALLOCATE_LOCAL to xalloc to prevent stack overflow
commit b1764ddf133cfdf979db62ee2491124a4798b55b
Author: Ben Byer <bbyer@bbyer.local>
Date: Mon Nov 5 05:44:54 2007 -0800
pulling more patches over from xorg-xserver-1.2-apple branch
commit 10fde62fc88302f7d3b2546239b1679be249567c
Author: Ben Byer <bbyer@bbyer.local>
Date: Sun Nov 4 18:59:41 2007 -0800
more CVS tags
commit 27ecb89250398f45564fe454e20bfdd66f62c8e4
Author: Ben Byer <bbyer@bbyer.local>
Date: Sun Nov 4 18:53:41 2007 -0800
Removed CVS tags.
commit f2e310132fbe1520c1b5f3da4faa2d2d47835e72
Author: Aaron Plattner <aplattner@nvidia.com>
Date: Wed Oct 31 14:15:35 2007 -0700
Add CreatePixmap allocation hints.
These hints allow an acceleration architecture to optimize allocation of certain
types of pixmaps, such as pixmaps that will serve as backing pixmaps for
redirected windows.
commit 3f1b6765aadf665ede8253464da19a5878f16e56
Author: Markku Vire <markku.vire@movial.fi>
Date: Thu Nov 1 22:43:04 2007 +0200
Config: HAL: Touchpads are pointers too
Treat touchpads -- not just mice -- as pointer devices.
commit 41c3069f7cf28155f8e6cfe0c10a12a1f5f76c7d
Author: Mark Vytlacil <mrv@wi.rr.com>
Date: Thu Nov 1 21:05:43 2007 +0200
XFree86: Input: Save/restore errno around SIGIO (bug #10683)
Make sure errno is saved and restored from the SIGIO handler, so errors
from system calls in input handlers don't break the interrupted code.
commit ff9929ed48f2dec8b536d348e25e66a0bc4ac1a6
Author: Ben Byer <bbyer@bbyer.local>
Date: Sun Nov 4 05:13:19 2007 -0800
pulling in changes from xorg-server-1.2-apple branch
commit 181468db92d44a58080fc9a76e46dfc7011bf9f1
Author: Ben Byer <bbyer@bbyer.local>
Date: Sun Nov 4 04:50:26 2007 -0800
add missing null-pointer checks
commit 4d0f35c81df307609b29c0f12aa1b4c6ee6fd8d2
Author: Matthias Hopf <mhopf@suse.de>
Date: Fri Nov 2 19:27:32 2007 +0100
Always duplicate mode name when duplicating a mode.
If the originating mode didn't have a name, we would end up with the name of
the original mode being setup correctly, but with the name of the copy still
being NULL.
commit dfb1cce28ac07d412598f7b9ab2ee908978b38e7
Author: Adam Jackson <ajax@redhat.com>
Date: Fri Nov 2 12:51:56 2007 -0400
Restore build of xf8_16bpp.
It doesn't link against cfb, so don't conditionalize its build against cfb.
commit 7a0555e9bb59d02816803a1100f807d2d29f31d4
Author: Kristian Høgsberg <krh@redhat.com>
Date: Sun Oct 28 09:37:52 2007 +0100
Fix crash in xf86InitOrigins()
In a multihead setup, if only the first screen can be
initialized, but the second screen is mentioned first in the
ServerLayout section, the xf86InitOrigins() function will crash
because the screen referred to in the e.g. "RightOf" part is
non-existent.
commit 5b41d4e60be35cfb96bedec0931fd5922823b4b9
Author: Adam Jackson <ajax@redhat.com>
Date: Sun Oct 28 09:37:52 2007 +0100
Don't filter modes away during VBE mode list construction.
Pass all VBE modes back up to the driver, on the assumption that it
knows how to filter modes intelligently.
commit c095da04fe7c73b6503ef5b93549b13796c51b22
Author: Adam Jackson <ajax@redhat.com>
Date: Sun Oct 28 09:37:52 2007 +0100
Fix magic number in fbdevhw
The transformation between fbdev and xfree86 mode timings needs to be
invertible, otherwise Xen and other framebuffers that don't have real
pixel clocks won't initialize.
commit f4fe66f6767d1941317dc0280ac359421a152587
Author: Adam Jackson <ajax@redhat.com>
Date: Sun Oct 28 09:37:52 2007 +0100
Disable explicit commenting in Monitor section.
commit 22f0e3a8b04e574047a51c8f928a007787303294
Author: Adam Jackson <ajax@redhat.com>
Date: Sun Oct 28 09:37:52 2007 +0100
Avoid PS/2 protocol probing for /dev/input/mice
The kernel will always upconvert to ExplorerPS/2 for all readers of
/dev/input/mice, so don't waste time on startup trying to figure
that out.
commit b97518666dc32710fe69eee33ee56881dcff1bbc
Author: Adam Jackson <ajax@redhat.com>
Date: Sun Oct 28 09:37:52 2007 +0100
Fix accidental ABI usage in RANDR 1.2 drivers.
Due to RANDR 1.2, xf86findOptionValue and xf86nameCompare are now ABI.
Make sure they're exported from the server.
commit f01e149d1af14ef9ee0e8a6743ab6a08f3bb677c
Author: Adam Jackson <ajax@redhat.com>
Date: Thu Nov 1 15:41:11 2007 -0400
Move SIGUSR1 notification as late as possible.
If we inherited a signal mask from the parent process that ignores SIGUSR1,
then we will send SIGUSR1 to the parent to indicate when we're ready to
accept connections. Unfortunately, we send this notification way too
early, right after creating the sockets rather than just before entering
the main loop.
Move it to just before Dispatch() so we're not lying quite so much.
commit a2ee5fe0c4e863c7ff4f644e5ac86f2793903103
Author: Adam Jackson <ajax@redhat.com>
Date: Thu Nov 1 13:46:20 2007 -0400
Enable MIT-SHM in Xdmx.
The extension is entirely DIX-level, no new DDX changes needed.
commit 2338d5c9914e2a43c3a4f7ee0f4355ad0a1ad9e7
Author: Arjan van de Ven <arjan@linux.intel.com>
Date: Sun Oct 28 09:37:52 2007 +0100
reduce wakeups from smart scheduler
The smart scheduler itimer currently always fires after each request
(which in turn causes the CPU to wake out of idle, burning precious
power). Rather than doing this, just stop the timer before going into
the select() portion of the WaitFor loop. It's a cheap system call, and
it will only get called if there's no more commands batched up from the
active fd.
This change also allows some of the functions to be simplified;
setitimer() will only fail if it's passed invalid data, and we don't do
that... so make it void and remove all the conditional code that deals
with failure.
The change also allows us to remove a few variables that were used for
housekeeping between the signal handler and the main loop.
Signed-off-by: Keith Packard <keithp@koto.keithp.com>
commit 692654b4300e61a9481e6fa588bcb44a3c3ca150
Author: Kristian Høgsberg <krh@redhat.com>
Date: Mon Oct 29 18:13:58 2007 -0400
Set up visuals for the existing X visuals.
This makes the root visual a GLX capable visual again and adds a GLX visual
for the COMPOSITE ARGB visual cleanly (as opposed to the hack we had before).
commit a5546a99ac4da61aee0d49c55bcb38bbce9a96aa
Author: Kristian Høgsberg <krh@redhat.com>
Date: Mon Oct 29 18:06:41 2007 -0400
Change the GLX module to initialize after COMPOSITE.
This changes the module initalization order so that the GLX module initializes
after COMPOSITE. The reason for this change is to be able to initialize a
GLX visual config for the COMPOSITE ARGB visual.
commit 8ead41388e36e21eea6fa0408c847f174911eab0
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Thu Sep 6 18:57:00 2007 +0930
xfree86: wrap keyboard devices for XKB.
Call ProcessOtherEvents first, then for all keyboard devices let them be
wrapped by XKB. This way all XI events will go through XKB.
Note that the VCK is still not wrapped, so core events will bypass XKB.
(cherry picked from commit d627061b48ae06d27b37be209d67a3f4f2388dd3)
commit e717cf08e99746761d74289c426bbd84176f4435
Author: Daniel Stone <daniel@fooishbar.org>
Date: Sat Oct 27 21:32:47 2007 +0300
XKB: Cope with all events in XkbProcessKeyboardEvent
Cope with Xi and pointer events in the (now increasingly misnamed)
XkbProcessKeyboardEvent. If it's the wrong type, call through the wrapping
chain to get out; else, process it.
commit 9db8846fa53d91193bbfe541b244e2326440011d
Author: Daniel Stone <daniel@fooishbar.org>
Date: Sat Oct 27 21:31:39 2007 +0300
XKB: Don't update indicators on all devices, add missing include file
Don't get XkbUpdateIndicators to update the indicators on all our devices: we
already deal with that ourselves.
Add exevents.h include to get more (proto)types.
commit ee3aa948eb8ed181d037294ed87df6ceec81684e
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Wed Sep 26 18:04:59 2007 +0930
xkb: Unwrap properly in ProcessPointerEvent.
Instead of hardcoding CoreProcessPointerEvent, actually try to unwrap properly
and then call the unwrapped processInputProc. Seems to be a better idea,
especially since it makes stuff actually work...
(cherry picked from commit 8f9bf927e1beecf9b9ec8877131ec12c765e4d84)
commit d3588a0aee33fbd233082f881c0d37152c6d4d8b
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Thu Sep 27 11:44:03 2007 +0930
xkb: xkbHandleActions: let wrapping take care of event delivery.
This is hopefully better than hardcodey calling CoreProcessPointerEvent.
(cherry picked from commit 32d0440c7f6e604807cb14dd32349df6f22c903b)
commit 352c5a311200bf491153fe9ef16126c5877a57bb
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Wed Sep 12 17:40:11 2007 +0930
dix: don't compress motion events from different devices (EventEnqueue)
(cherry picked from commit 8840829ab93c4eb62eb58753c015da5307133fe5)
commit 8d3d027062c105b50863dce43b8070ec560bc12e
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Thu Sep 6 18:52:02 2007 +0930
dix: add XI event support to FixKeyState.
FixKeyState needs to be able to handle XI events, otherwise we get "impossible
keyboard events" on server zaps and other special key combos.
(cherry picked from commit 5ee409794ee604fcf84886f70429fc2d6b1ff4f1)
commit 99e826e867c1c5520153c539ba07a884aec88d0c
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Thu Sep 6 18:49:57 2007 +0930
xkb: enable XI event processing for xkb.
XI events can now take the same processing paths as core events, and should do
the correct state changes etc.
There's some cases where XKB will use KeyPress as type for an event to be
delivered to the client. Stuck warnings in, not sure what the correct solution
is yet.
(cherry picked from commit 6334d4e7be18de5f237c12a6dc20f75aa23477d0 with some
additional compile fixes and non-MPX adaptations)
commit 91077bfc50d54be37c217e377c55b6bf886a2fab
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Thu Jun 21 18:24:30 2007 +0930
Save processInputProc before wrapping it and restore it later, instead of
using a hardcoded ProcessKeyboardEvent. Otherwise we lose the ability to
process DeviceKeyEvents after the first key press.
This should be the correct fix now.
(cherry picked from commit 4d5df14f2c4a3108a8c8adfcf4766c0d1a9daad2)
commit 8b9481a113b56078191e2298bf590905978f6289
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Tue Sep 4 17:44:51 2007 +0930
xkb: Store the action filters per device in the XkbSrvInfoRec.
Using a global array for action filters is bad. If two keyboard hit a modifier
at the same time, releaseing the first one will deactivate the filter and
thus the second keyboard can never release the modifier again.
(cherry picked from commit bfe6b4d2d9952a80f8dbc63eec974ef894e5c226)
commit 493b83bd097372ae0023da9919da83af39e3fc1c
Author: Daniel Stone <daniel@fooishbar.org>
Date: Sat Oct 27 21:33:52 2007 +0300
XFree86: Remove ridiculous SIGIO debugging
YOU PRESSED A KEY
AND AGAIN
YOU RELEASED A KEY
AND AGAIN
YOU PRESSED A KEY
AND AGAIN
... not so much.
commit a3d48de5f2b7eacf3193c60f0fb461912201210b
Author: Daniel Stone <daniel@fooishbar.org>
Date: Sat Oct 27 21:35:31 2007 +0300
XKB: Add more bits to xkbsrv.h
Add the device private index, given we use that in a macro here, and also the
prototype for xkbUnwrapProc, since that's also useful.
commit e29e69960d67aa4b7a4d1551af509dbac193f438
Author: Daniel Stone <daniel@fooishbar.org>
Date: Sat Oct 27 21:34:22 2007 +0300
Xi: Include XI protocol header in exevents.h
Make sure we have all the types we need to use this header.
commit df57ae1639ba4f1719883c5bf868394e4748a022
Author: Daniel Stone <daniel@fooishbar.org>
Date: Sun Oct 28 15:46:26 2007 +0200
configure.ac/XFree86: Only build XF86Misc and XF86VidMode when appropriate
Don't build XF86Misc or XF86Vidmode in hw/xfree86/dixmod when it's been
explicitly disabled in configure, or we don't have the proto modules
installed.
commit 3b7af72fe315c7c26c89838c0c5dacbe58765d0f
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Fri Oct 26 20:32:10 2007 -0400
xselinux: Add a SetDeviceContext request and stubs for more requests.
commit 2251572062b2c25643671b8d5070de1c3f7ae976
Author: Aaron Plattner <aplattner@nvidia.com>
Date: Fri Oct 26 15:13:50 2007 -0700
Restore the CompositeGlyphs -> ps->Glyphs -> miGlyphs callchain to allow acceleration architectures to wrap above miGlyphs.
commit 497aba894904b08b15bb19916e2a163f96212a7d
Author: Kristian Høgsberg <krh@redhat.com>
Date: Fri Oct 26 11:25:57 2007 -0400
Weed out some unused fluff from __GLXcontext.
commit 0e749ceab421d72b48e18292c5ca0e337baf5ce8
Author: Bernardo Innocenti <bernie@codewiz.org>
Date: Sat Oct 20 20:31:57 2007 -0400
Include stddef.h for size_t.
This is required by a buggy version of the openssl/sha.h header
which is distributed with Fedora 7.
commit 80d8a3e1767609a92b0b85a7e92cea5f0748038a
Author: Kristian Høgsberg <krh@redhat.com>
Date: Fri Oct 26 10:19:57 2007 -0400
Quiet glx visual debug info.
commit 27b13eeb56a5cbac00b381309604505002e77228
Author: Matthias Hopf <mhopf@suse.de>
Date: Fri Oct 26 13:15:07 2007 +0200
Nuke superfluous ",", added missing include for xf86i2c.h.
commit 6d59bb5709a99ab60b482bbf3393ebffda7f9407
Author: Daniel Stone <daniel@fooishbar.org>
Date: Fri Oct 26 09:12:15 2007 +0300
XFree86 Misc/VidMode: Remove ridiculous debug ErrorFs
When we're building with --enable-debug, don't emit an ErrorF every time a
function gets called.
commit 5f9095f0d29bac0190d82c87a09cf32d6a34c17c
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Thu Oct 25 19:02:03 2007 -0400
registry: Remove synthetic bit from event types in lookup function.
commit 8c6923018c7d71cd15d9cf4ef9e8528ef5ec7c2e
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Thu Oct 25 19:01:29 2007 -0400
xace: Add a "manage" access check when setting the Redirect event bits.
commit 7d14ca59c5b942c09feaa2429c394cde9d8d3fd1
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Thu Oct 25 19:00:50 2007 -0400
xselinux: Don't include the client in the receive hook audit messages.
commit f62277d421023b3150d3a1accb00a8206ab2bde3
Author: Kristian Høgsberg <krh@redhat.com>
Date: Thu Oct 25 18:48:39 2007 -0400
Clean up unused pVisual part of __GLXcontext.
commit 30bcaa966d6b00f1630609a78db18dee683cc43d
Author: Kristian Høgsberg <krh@redhat.com>
Date: Thu Oct 25 18:48:06 2007 -0400
Make glx destroy path handle cases where the X window goes away first.
commit 40de9fcf18930811dd5ae355c83275af887a9f83
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Thu Oct 25 12:35:01 2007 -0400
xselinux: Label the default device directly with the process context.
commit b633d54b94d746d26e13014634d9f63bbb7e8f7d
Merge: 4b05f19cb9 48ca5961ca
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Thu Oct 25 12:19:30 2007 -0400
Merge branch 'master' into XACE-SELINUX
Conflicts:
GL/glx/glxscreens.c
hw/xnest/Screen.c
render/glyph.c
render/glyphstr.h
render/render.c
commit 242f56f722243938e908d1957781ee53c2999783
Author: Naoki Hamada <nao@tom-yam.or.jp>
Date: Thu Oct 25 18:45:50 2007 +0300
Input: Fix key down test (bug #12858)
Fix the botched previous key_is_down test, which would give false positives.
Also move key_autorepeats to a separate inline function.
commit 4b05f19cb9e42d8c8eff5ca4e463f5bc2a05433d
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Wed Oct 24 19:59:58 2007 -0400
xselinux: Introduce a type transition when labeling events.
commit 0d2ef187e77b12713d2a9661932fa01dba58a945
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Wed Oct 24 18:23:31 2007 -0400
xselinux: Add audit message fields for selection and event names.
commit 48ca5961caee62f2980017a6bdc96a1b4c747727
Author: Matthias Hopf <mhopf@suse.de>
Date: Wed Oct 24 20:31:51 2007 +0200
Prefer configured DisplaySize to probed DDC data, if available.
Based on patch by Hong Liu <hong.liu@intel.com>.
commit 0388a59a6ef212c497cc3f64d677b1ca5b410982
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Tue Oct 23 20:59:21 2007 -0400
Revert "registry: special case minor number when looking up core requests."
This reverts commit 31110d6837ee52fd654729d9e5c4b0c5395abab0.
This is handled properly by StandardMinorOpcode().
commit 46521f529841e032e198e5df87974088548a68de
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Tue Oct 23 20:58:48 2007 -0400
xselinux: Add basic support for selection access control and redirection.
Probably not fully baked yet. It's difficult to test since so few apps
actually follow the ICCCM with respect to cut & paste.
commit b7ee005d327372c1e414ee6c526f9f7aee14bc86
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Wed Oct 24 10:26:12 2007 +0930
dix: Don't interfere grabs the interfering device is of different type.
A pointer device should be able to send events while the client has a core
grab on a keyboard device, and likewise.
commit 02508614b9f882ba1559fb4581dcf812118fdf89
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Wed Oct 24 10:09:18 2007 +0930
dix: check for core passive grabs on inferiors when replaying events.
commit 825f09dffd94cfcd0562a01c5181998503851461
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Tue Oct 23 17:12:57 2007 -0400
xace: Still more changes to selection code. Removed the SelectionPtr from
the hook - the hook only needs the Atom to control access to the selection
object. Upgraded the SelectionCallback to take a client argument and
additional type codes so that it can be used for redirection.
commit 660557593ea961948722298ea8ffba83891c9914
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Tue Oct 23 14:46:37 2007 -0400
xselinux: Remove synthetic bit when looking up event type.
commit d7db549db41a27aef28cff9bfb7973bc741f88b2
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Tue Oct 23 14:08:54 2007 -0400
xselinux: Unregister callbacks on server reset.
commit 9e0a468af19d8e46330bcff37c9adc5e11d3aee7
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Tue Oct 23 13:35:30 2007 -0400
xace: try to pretend events were sent when a denial occurs.
Probably need to redo the error return paths in these functions
at some point.
commit d502521c3669f3f22b94c39a64ab63bfd92c6a97
Author: Pierre Willenbrock <pierre@pirsoft.dnsalias.org>
Date: Tue Oct 23 16:45:13 2007 +0200
EXA: Fix off-by-one in polyline drawing.
commit a8a148919b84a293e3e7a49409ab833590357edb
Author: Matthias Hopf <mhopf@suse.de>
Date: Tue Oct 23 16:23:28 2007 +0200
Superfluous ','.
commit 75f05086d04a90c3dcdcdd31bf79d7033708e3e0
Author: Matthias Hopf <mhopf@suse.de>
Date: Tue Oct 23 15:39:23 2007 +0200
Get rid of unnecessary GNU extended variadic macro.
commit 7ef863720dc79107fc2cd17ce684366c87e001a4
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Tue Oct 23 17:28:03 2007 +0930
dix: Create new sprite for floating devices.
Floating devices get sprites, but still aren't spriteOwners. This prevents
them from getting rendered, and also stops segfaulting.
(not really solving the problems with keyboards though)
commit d808d653d1fc16f1d5af76ab00fa862fb80fa3ba
Author: David Nusinow <dnusinow@debian.org>
Date: Mon Oct 22 21:30:04 2007 -0400
Define PCI_TXT_IDS_DIR more cleanly
commit 29e0e180729a4f0cc020985a4de4c8bc4b9c7f5f
Author: Keith Packard <keithp@koto.keithp.com>
Date: Mon Oct 22 13:38:16 2007 -0700
Leave hardware-specified preferred modes alone when user preference exists.
Instead of removing the preference bit marking the hardware declared mode
preference, leave it in place and just move the user preferred mode to the
front of the list while marking it with the USERPREF bit which will cause it
to be selected by the initial mode selection code.
commit fbe19c66c36acfb484809111cf02579a3baf2f0f
Author: Michel Dänzer <michel@tungstengraphics.com>
Date: Mon Oct 22 18:28:03 2007 +0200
GLX: Fix leak of X pixmaps associated with GLX pixmaps.
commit c6d36b1cee44a9cbb690dff62a4683d7f6fbf30c
Author: Michel Dänzer <michel@tungstengraphics.com>
Date: Mon Oct 22 18:28:03 2007 +0200
GLX: Don't crash on unused client array members when switching to/from console.
commit be9b0e558d6172ef01ed880d47da897d2ceb25fa
Author: David Nusinow <dnusinow@debian.org>
Date: Sun Oct 21 23:49:14 2007 -0400
Add a note as to why the text file based PCI ID scheme is present at all
commit b79b965bd9a96f79781e85c0428068caa1ba381b
Author: David Nusinow <dnusinow@debian.org>
Date: Sun Oct 21 23:46:54 2007 -0400
Fix compilation issue on FreeBSD (bug #12841)
Hide getline call by checking for glibc. If not, use fgetln instead. Even
though this section is now #ifdef'ed for linux only, this should help make
it more portable if non-linux folks end up wanting it.
commit 7f5e71fa7347fb4ec2657ccc453831c04a0f288d
Author: David Nusinow <dnusinow@debian.org>
Date: Sun Oct 21 23:41:49 2007 -0400
Make PCI text file directory configurable
commit ce7f6fe1268fef4f89aa21c7b44d73ecd98efe24
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Fri Oct 19 19:40:04 2007 -0400
xselinux: properly update sizes when dynamic arrays are resized...
commit 4b14c9a9cd2033d3839c4ba364d41ab4c4b198ab
Author: Eric Anholt <eric@anholt.net>
Date: Fri Oct 19 16:34:54 2007 -0700
Replace calls to Glyphs screen hook with CompositeGlyphs and remove dead code.
Not all of the DDX/miext Glyphs hook implementations have been removed, but
they should be.
commit a3a95d3475dc91ed2e8a55bf484a6b3f2b5ac32a
Merge: a358b87f45 7e1cada6c6
Author: Eric Anholt <eric@anholt.net>
Date: Fri Oct 19 15:44:17 2007 -0700
Merge branch 'master' into glyph-pixmaps
Conflicts:
configure.ac
commit 12e889d202ac9849f534c51167cbfed91c32027a
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Fri Oct 19 18:43:38 2007 -0400
xace: Bug fixes, name changes to selection access hooks and fields.
commit 7e1cada6c6b9fa41ef3ead00bf7725d626dda193
Author: Eric Anholt <eric@anholt.net>
Date: Fri Oct 19 15:16:19 2007 -0700
Disable debian pci-id-list autoconfig code on non-linux.
It contains static paths, fails to build on non-glibc, and apparently just
exists to support distributions managing binary drivers and open-source drivers
together. Also restores previous code for fallback to vesa if nothing is
detected.
commit 89c6108531e603bdc81faf2ea860f318a2e94a39
Author: Kristian Høgsberg <krh@redhat.com>
Date: Fri Oct 19 16:21:54 2007 -0400
Fix software GL to provide a list of supported fbconfigs like the DRI case.
commit 74e84b8d891632141a60e2d29463ab46f622df3f
Author: Matthias Hopf <mhopf@suse.de>
Date: Fri Oct 19 17:28:15 2007 +0200
Only issue XF86_APM_CAPABILITY_CHANGED for video change ACPI events (not e.g. brightness etc.).
commit 6fdf3ddfef2707755cec0fc9cbce354fd472bb52
Author: Matthias Hopf <mhopf@suse.de>
Date: Fri Oct 19 17:20:21 2007 +0200
Fix ids of ACPI events according to ACPI spec.
commit d9caa469b9bb4eb6125b890820853062fc2c4441
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Fri Oct 19 15:26:09 2007 +0930
Xi: allow VCP/VCK to be OpenDevice'd as well.
All devices deserve to be equal. Except master devices, they are a bit more
equal than the others.
commit 155e2c559ed0dbf31b6d39d48648a3ee22b37635
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Fri Oct 19 14:37:07 2007 +0930
Xi: advertise as XInput v2 capable
commit 5ba738935f0d786e4670adf3b05ad42fc5e710fd
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Fri Oct 19 14:36:37 2007 +0930
Xi: remove ChangePointerKeyboardPairing in favour of ChangeDeviceHierarchy.
commit 6dcde0e9c1d068d9fc4a772d29d1d4c6cc57aeb9
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Thu Oct 18 12:21:07 2007 +0930
Xi: set master device's id in ListDevices Reply.
commit cfcc6e14b9a15f7979ba0df9c105cf563bef98fa
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Fri Oct 19 11:28:44 2007 +0930
Xi: return all master devices as type IsXPointer/Keyboard when listing devs.
Slave devices are reported as IsXExtensionPointer/Keyboard.
commit 8e3c1dfc48930c455529313a42efa35e3b9071b2
Author: Kristian Høgsberg <krh@redhat.com>
Date: Thu Oct 18 21:01:51 2007 -0400
Introduce a new "GlxVisuals" option that controls which visuals are added.
Right now we default to "all" which gives us a situation much like before,
but when the "typical" option is implemented, we can change the default and
reduce the number of visuals the GLX module bloats the X server with.
commit 9e3cfd950d279353f1795352ad2c4132aabc1bab
Author: Kristian Høgsberg <krh@redhat.com>
Date: Thu Oct 18 19:12:24 2007 -0400
Add code to set up GLX visuals and add one for the first double buffered FBConfig.
commit 8fc635e6a8072c7cd2777d804dd6f8eda2eecc15
Author: Kristian Høgsberg <krh@redhat.com>
Date: Thu Oct 18 15:51:11 2007 -0400
Separate handling of GLX visuals and GLX FBConfigs.
XIDs for GLX visuals and FBConfigs used to be interchangable and the list of
GLX visuals was identical to the list for FBConfigs. This patch splits handling
of these two data types and allows the X server to pick and choose the FBConfigs
that are exposed as visuals.
commit 0af8180683247955ce4cfd48e6a5b4d00bbe618a
Author: Kristian Høgsberg <krh@redhat.com>
Date: Wed Oct 17 17:18:47 2007 -0400
Drop VisualConfigPriv support from the DRI module.
No DDX driver uses this, and this patch stops the DRI module from
poking around GLX module data structures.
commit 7d74690536b64f7b8e8036507ab7790807349c50
Author: Kristian Høgsberg <krh@redhat.com>
Date: Sun Oct 14 15:39:21 2007 -0400
Simplify and clean up GLX visual initialization.
Instead of the fragile setup where we filter the modes common between the
DDX generated GLX visuals and the DRI driver generated fbconfigs, we now
just take the fbconfigs returned by the DRI driver to be our supported set.
commit ab4bce02a9457dd9c86b774fc74caf3dd6b287ca
Author: Eric Anholt <eric@anholt.net>
Date: Thu Oct 18 15:22:42 2007 -0700
Add a quirk for Philips 107P5 which lacks the preferred bit on detailed timing.
Also fix the prefer-large-75 quirk if the prefer-first-detailed bit was set,
though it's not the case for the existing prefer-large-75 consumer.
commit 55a96aa6b0995fda6660b7e78c85b955a62b9735
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Thu Oct 18 14:11:11 2007 -0400
xselinux: add basic event labeling.
commit e974bc1233608ec09fbd40b12217925e4d2205aa
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Thu Oct 18 12:33:39 2007 -0400
xselinux: add hooks for send and receive access.
commit 06eb830169afd0631a31e8846c7d2533c49ea378
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Thu Oct 18 12:31:14 2007 -0400
xace: Fix bug in AddPassiveGrabToList(), was using wrong GrabPtr.
commit 6107a245035366fe762756b6aa05ac0e3a5482bb
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Thu Oct 18 12:24:55 2007 -0400
dix: Add client parameter to AddPassiveGrabsToList().
commit ce50bfd3369686cfecee5a138bd84ef1107a249d
Author: Michel Dänzer <michel@tungstengraphics.com>
Date: Thu Oct 18 17:44:48 2007 +0200
EXA: Skip empty glyphs.
commit 5d74416740de883b7ef0994afea4bbd4d3901be0
Author: Michel Dänzer <michel@tungstengraphics.com>
Date: Thu Oct 18 17:44:14 2007 +0200
EXA: Don't attempt to move in pixmaps that can't be accelerated.
Fixes https://bugs.freedesktop.org/show_bug.cgi?id=12815 .
commit 31110d6837ee52fd654729d9e5c4b0c5395abab0
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Thu Oct 18 10:30:44 2007 -0400
registry: special case minor number when looking up core requests.
commit e3fd90ae9c3ddfc5d78e62614e311b73505d7ead
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Thu Oct 18 10:29:10 2007 -0400
registry: Add "X11:" prefix to core protocol names.
commit aa340b2c7cbe9ddab53cff08c8ba165558209187
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Wed Oct 17 19:27:16 2007 -0400
xselinux: add hook for device acceses.
commit 503f918f55d0cb29585d83b022bbb8dc29f446c5
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Wed Oct 17 19:14:15 2007 -0400
xselinux: Move functions around; add some more comments.
commit 50b27e1ad2a98d36728dc8157492ef5c59c132cd
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Wed Oct 17 16:09:40 2007 -0400
devPrivates rework: update new GL/glxext code.
Need to merge so this type of thing stops happening.
commit c3f7b862550fa8f46633162f83db8c27e46fc672
Merge: af4dde0ac1 feac075952
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Wed Oct 17 15:00:54 2007 -0400
Merge branch 'master' into XACE-SELINUX
Conflicts:
os/access.c
commit af4dde0ac19ecec1d0ad988eb25b15401e7c6b36
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Wed Oct 17 14:13:02 2007 -0400
xselinux: Remove config file, this has been moved to the policy.
commit baabae623b3658196b67a710dc72663c2105bf31
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Wed Oct 17 13:54:56 2007 -0400
xselinux: Started reworking extension using new XACE hooks.
commit db66e66dbf26b91c655f1659859c022cc31f0db6
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Wed Oct 17 13:51:11 2007 -0400
xace: Add an access_mode field to the extension structure.
This allows the same callback to be used for both extension hooks.
commit e3a8cbe523bae8b771ad3c8ad497f4444f6d05d5
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Wed Oct 17 13:48:44 2007 -0400
xace: add creation/labeling hook to CreateRootWindow().
commit feac0759522cbdc3e61ccfa373df735903c5cb27
Author: Keith Packard <keithp@koto.keithp.com>
Date: Wed Oct 17 11:42:28 2007 +0800
Make config file preferred mode override monitor preferred mode.
Add a new even-more-preferred bit to each mode which is used to make config
file preferences selected instead of the monitor preferred mode.
commit f2da10f7bc2ddb6ad2f18b793afc10d04b97c51c
Author: Keith Packard <keithp@koto.keithp.com>
Date: Wed Oct 17 10:50:22 2007 +0800
KDRIVE_LOCAL_LIBS includes some system libraries, not just internal x server libs
commit 9aadde377991bfbd88524d02106bec3dedd6e7c9
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Wed Oct 17 12:05:50 2007 +0930
mi: don't call UndisplayCursor for non-sprite-owners.
Segfaults are bad.
commit 8b7c4249d82d07e852d8d8c15c7ab9977dd1f31c
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Wed Oct 17 10:41:58 2007 +0930
mi: call processInputProc for master devices after slave event processing.
More work is needed to sort out grabs though.
commit ae9fc10adec8f9bf0492d14d435f8f11e0163b27
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Wed Oct 17 10:41:04 2007 +0930
Xi: don't send core events for slave devices.
commit de70cfdbe60eb6e7bf3e74dfd1ac34de554deff1
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Wed Oct 17 09:52:30 2007 +0930
mi: fix some macros to allow multiple cursors for master devices.
Macros defaulted to inputInfo.pointe rfor devices that weren't spriteOwners.
Changed to take the device's master device now.
This includes sticking in a number of checks and warnings that cursor
rendering won't be called for floating devices.
commit 773f6491c1cc8819038e753d08c32ba213f80f8f
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Tue Oct 16 19:11:36 2007 -0400
xace: update the DeleteProperty prototype to include the client argument.
This should have been part of 8f23d40068151ad85cde239d07031284f0b2c4dc.
commit 9dde53ed179336c7b483c9a94a97182ad1777dfb
Author: Alan Hourihane <alanh@tungstengraphics.com>
Date: Tue Oct 16 19:55:56 2007 +0100
Fix walking of GLX providers.
commit 70a5d33c9e41c077a8cd92abd43376e2956d3aed
Author: Michel Dänzer <michel@tungstengraphics.com>
Date: Tue Oct 16 12:46:07 2007 +0200
Always check the return value of __glXGetDrawable first.
Fixes spurious GLX protocol errors because __glXGetDrawable doesn't set the
error code in case of success. Maybe it should, though.
commit 1d9ebbac8c589cae7e4952083692b6d148def9bc
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Tue Oct 16 18:46:12 2007 +0930
dix: Make InitCoreDevices use AllocMasterDevice.
Also change naming a bit, append "pointer" and "keyboard" to master devices
instead of -ptr and -keybd.
commit 299573f4617c3b5599bb65069e96d050277b9471
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Tue Oct 16 18:40:15 2007 +0930
dix: add AllocMasterDevice for creation of new master devices.
Devices are initiated pretty much the same as the core devices.
commit 5fe9bfd23f17b84c3afaa82f75a7c517c9f8e0d3
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Tue Oct 16 18:23:48 2007 +0930
xfree86: NIDR: don't call PairDevices explicitly.
set isMaster to FALSE explicitly.
Pairing isn't necessary, attachment should be done in EnableDevices.
commit 5eb033835e92ea951cc385fd709af9656b3772d8
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Tue Oct 16 18:03:52 2007 +0930
mi: don't exclude inputInfo.pointer from rendering.
commit b697c4ed145968d3c3281bb85e628f1b068b09fc
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Tue Oct 16 17:47:06 2007 +0930
dix: CheckPassiveGrabOnWindow: only get paired device for non-keyboards.
commit caa69d8f7b92b80669df02e1001409d7c653e7e4
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Tue Oct 16 17:38:13 2007 +0930
dix: fix detritus from adding lastSlave field.
commit 90d077e537ac4cb7d79d67afcf3984a3e8d65fe8
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Tue Oct 16 17:37:33 2007 +0930
dix: GetPointerEvents: get state from master device before applying valuators.
We need to get lastx/y from the master device before we start applying
acceleration etc. Otherwise we get jumping cursors, which is reasonably bad.
commit b6ccf721b0a582150858d68f91967fb4e319c340
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Tue Oct 16 17:35:06 2007 +0930
include: add "lastSlave" field to DeviceIntRec.
Set to the last slave device that routed events through the master.
commit e6bd8ae0608bd8379c5ac962f69cd0bcc54f9734
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Tue Oct 16 15:59:30 2007 +0930
dix: set the device's sprite when using AttachDevice
Sprite is set to the master device's sprite.
commit 271d4c3d6255318aabb9ad1ea444f534ed456f0b
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Tue Oct 16 15:50:07 2007 +0930
xfree86: remove XI86_SHARED_POINTER flag.
Not needed anymore. By default, all devices are slaves of first master device.
commit c7b878b90406781c97db751a9b454e2b6baee0e1
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Tue Oct 16 15:07:31 2007 +0930
dix: don't treat VCK/VCP separately in DevHasCursor, IsPointer/KeyboardDevice.
commit e9f149fb56747f7eaa0f714dce97b067b007c47e
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Tue Oct 16 14:24:20 2007 +0930
Fix up detritus from removing GetPairedPointer/Keyboard.
commit 840bde3d32f3627dfc3d7d8b6564a61a8014933b
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Tue Oct 16 13:09:35 2007 +0930
dix: GetPairedDevice: return dev paired with master for slave devices.
commit 6c259a08d917f94fd7381453b625b07826d3ef9c
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Tue Oct 16 13:09:19 2007 +0930
include: remove unused GetPairedPointer/Keyboard declarations.
commit fe97f7c54a1b42acd542696b6cdc9e83e89548f3
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Mon Oct 15 22:46:08 2007 -0400
registry: Add some missing #include's.
commit 9ecbbf198f4cec398897736e173e7e8c56bf6f94
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Sun Oct 14 08:00:06 2007 +0930
dix: adjust PickPointer and PickKeyboard to get the first master device.
Simplifies it a lot, since we always have at least one master device
available at all times, so less mucking around.
commit 0c5f65ecd3ad11fbdb1cab3cb1d0eb4f33bb4e35
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Sun Oct 14 07:57:24 2007 +0930
dix: don't allow slave devices as ClientPointer
commit 9ccc9ab6f29f68298b68cdb5c9b4bd57a095f05a
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Sun Oct 14 07:53:00 2007 +0930
dix: don't call CloseDevice on VCP/VCK separately.
commit e4fd981b48723b77a6c1a528638a771b9cc35472
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Sun Oct 14 07:52:11 2007 +0930
dix: check for isMaster before calling DeviceCursorCleanup.
commit 7503d1340726e0a529f04304d177ed2ceb8fbc91
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Sun Oct 14 07:50:13 2007 +0930
dix: don't check VCK and VCP separately when looking for device ids.
Both are part of the device list again, so we cover them there.
commit 032e906711202d376af95b37bb0cdf14a3648256
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Tue Oct 16 11:57:42 2007 +0930
dix: Remove GetPairedPointer, GetPairedKeyboard in favour of GetPairedDevice.
commit 853ea337bdad17f8f6ec7d940de14ce2cbbbf93e
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Mon Oct 15 22:13:02 2007 -0400
registry: Register XvMC extension protocol names.
commit 58c3240fcbec23aad122e1c340f6bb6d3b18f779
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Mon Oct 15 22:09:47 2007 -0400
registry: Register MIT-SCREEN-SAVER extension protocol names.
commit 3e07e73fefc100e491d1e465cb162373d1d82425
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Tue Oct 16 11:34:29 2007 +0930
dix: remove pairing/attachment from InitAndStartDevices.
If we enabled in the correct order, this has all been done already.
commit 4e274e90e16b1d954391e1af3e2074fb10f70ee7
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Mon Oct 15 22:04:20 2007 -0400
registry: Register SHAPE extension protocol names.
commit 9f597f6c87e0b14cc382d8e5929e42f822db4329
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Mon Oct 15 22:01:20 2007 -0400
registry: Register SYNC extension protocol names.
commit 38baac71bdbb8c7e882e3e39133615cfed894a6b
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Sun Oct 14 04:21:42 2007 +0930
dix: Set bidirectional pairing, don't allow pairing with already paired devs.
commit 70efd3d06a15093661933bda4ec21e306dece4a4
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Tue Oct 16 11:30:32 2007 +0930
dix: fix up Activate/Enable/Disable device.
Set isMaster for VCP/VCK.
Init sprites for master pointer devices.
Pair master kbds with master pointers (1:1 pairing!).
Attach other devices to VCP/VCK.
commit b504678ba5407a6fd8d47d051305f7c3d5606dfe
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Mon Oct 15 21:54:25 2007 -0400
registry: Register APPGROUP extension protocol names.
commit 204f2dc89ef662b57400b128c30c15e8cf32f323
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Sun Oct 14 04:13:06 2007 +0930
include: add "isMaster" field to DeviceIntRec.
Set to TRUE for master devices.
Also fixing up comment for paired field in spriteInfo, will be set
bidirectional from now on.
commit bd7d5255ce4865b684f7d8bcf80ba9872a1af22d
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Tue Oct 16 11:18:31 2007 +0930
dix: add AttachDevice, needed to attach a slave device to a master device.
For now, we don't allow attaching slaves to other slaves, and we don't allow
pairing slaves with other slaves.
Pairing is for master keyboard->master pointer only.
Attaching is for slave device->master device only.
commit 6ec35a8cf539c900b334dd6df146b394f54e3706
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Mon Oct 15 21:46:56 2007 -0400
registry: Register BigRequests extension protocol names.
commit 1254cc399c53eadcc32eeabf69990ed2526c7ae0
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Mon Oct 15 21:43:06 2007 -0400
registry: Register Fontcache extension protocol names.
commit e987648cf2c21dcbd77dd9a71793090a48e4f521
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Mon Oct 15 21:38:56 2007 -0400
registry: Register EVI extension protocol names.
commit be1565f6b8fb09eba9941d6f7c485bf5fb25fe7a
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Sun Oct 14 01:53:54 2007 +0930
dix: Set core devices to ProcessOtherEvents, set sendCore and XKB.
Even the virtual core devices should send through ProcessOtherEvents.
commit ce9bf9a19185a36ac2f7ae75acd320ab8d03d247
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Sun Oct 14 01:50:40 2007 +0930
include: add "master" field to DeviceIntRec.
"master" points to the device this device is attached to. Event sent by the
device will also be routed through the master.
master and spriteOwner are mutually exclusive.
commit f6226d3bfe1515058e2092e8662ae87825501209
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Mon Oct 15 21:35:12 2007 -0400
registry: Register TOG-CUP extension protocol names.
commit 7e182a5d89d618e20dcc77850131690733322d39
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Mon Oct 15 21:13:39 2007 -0400
registry: Register MIT-MISC extension protocol names.
commit 32f6171862461d17ebea58a2fb6ddd16ac71358c
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Mon Oct 15 21:10:14 2007 -0400
registry: Register XF86Bigfont extension protocol names.
commit 12766c5b5ffdab95255a63b2c8421ee773fd43b5
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Mon Oct 15 21:00:46 2007 -0400
registry: Register Xv extension protocol names.
commit 35ae03871af88b2f420dd83448011a077852d7a0
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Mon Oct 15 20:50:26 2007 -0400
registry: Register XC-MISC extension protocol names.
commit 32fe282d5b8306514d641e15bc6d9fd4ab360977
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Mon Oct 15 20:45:18 2007 -0400
registry: Register XTest extension protocol names.
commit 3877faf7d9fe00ed634077e38a198ae4b91a2bb4
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Mon Oct 15 20:35:13 2007 -0400
registry: Register Multibuffer extension protocol names.
commit 16764a2d299c7c0c98002aadd52ab4a1a36758c3
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Mon Oct 15 20:29:23 2007 -0400
registry: Register DPMS extension protocol names.
commit f077578e42eee424b0e534774574c84af9d6f85b
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Mon Oct 15 19:43:02 2007 -0400
registry: Register XPrint extension protocol names.
commit 5c8b1a91726817816d20faefad21c7a68ab634cc
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Mon Oct 15 19:35:04 2007 -0400
registry: Register Resource extension protocol names.
commit 48891d5696f56711f23743cb03be39cf6b26c522
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Mon Oct 15 19:32:01 2007 -0400
registry: Register EVIE extension protocol names.
commit 2c9646ad4e65bb061d910c9e2b1a8a978f21fa17
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Mon Oct 15 19:18:03 2007 -0400
registry: Register SHM extension protocol names.
commit 8964c6d8e14ae47798762191e359b2bf138ca32e
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Mon Oct 15 19:10:51 2007 -0400
registry: Register RENDER extension protocol names.
commit c827db57e4d9ca14c82b099dcfc9b7a0c0b5ba0a
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Mon Oct 15 19:06:01 2007 -0400
registry: Register RANDR extension protocol names.
commit 20db50b4c44a14f7eeac2b1de17ada68482521da
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Mon Oct 15 18:56:59 2007 -0400
registry: Register DAMAGE extension protocol names.
commit b38a91993364aa80cfd99721e319e1458d9fb760
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Mon Oct 15 18:50:06 2007 -0400
registry: Register XTrap extension protocol names.
commit 106758893b68033f14f69c4ee6591fb6a149ba37
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Mon Oct 15 18:31:40 2007 -0400
registry: Register XFixes extension protocol names.
commit ea09c9acc8f0d5577f54c864ff88b7f03d93b2f4
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Mon Oct 15 18:25:12 2007 -0400
registry: Register Record extension protocol names.
commit 2e1e5be1d9067816525aa13a1d818e8ca6899599
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Mon Oct 15 18:18:57 2007 -0400
registry: Register DBE extension protocol names.
commit 4c3285c883cc50a91bc5262bbc9d073d816f860a
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Mon Oct 15 18:04:47 2007 -0400
registry: Register WINDOWSWM extension protocol names.
commit 3815284e899b61731b6a63c4ba14c5d773e24eb6
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Mon Oct 15 17:57:59 2007 -0400
registry: Register XF86DGA extension protocol names.
commit 2cd1b32b77e0ceeaccb3f01c4ac13a97c557668c
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Mon Oct 15 17:37:58 2007 -0400
registry: Register XF86Misc extension protocol names.
commit 960677e876c068400fb45e1764bb5470cd8c389f
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Mon Oct 15 17:30:00 2007 -0400
registry: Register XF86VidMode extension protocol names.
commit b7786724080fd3928ef7b8c294346661d7ffd90b
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Mon Oct 15 17:15:34 2007 -0400
registry: Register XF86DRI extension protocol names.
commit eee46b4681ec55297604b0425705f2b18381f7ca
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Mon Oct 15 17:06:22 2007 -0400
registry: Register APPLEWM extension protocol names.
commit b9f5ab98c8dea36dcce1ad15fd2e059a77e77c39
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Mon Oct 15 16:18:37 2007 -0400
registry: Register XINERAMA extension protocol names.
commit 3464b419230c6d17e940d967b567c5d2cb22d232
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Mon Oct 15 15:45:12 2007 -0400
registry: Register APPLEDRI extension protocol names.
commit 32f3f5a1e7654f8bb43ea16b9227b3994e616739
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Mon Oct 15 15:32:17 2007 -0400
registry: Register DMX extension protocol names.
commit 166ef972febc00c665e1d5aeb68e75d7bbcf9879
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Mon Oct 15 15:22:02 2007 -0400
registry: Register composite extension protocol names.
commit a5cf3f21f712e46dbf9bca289e67be75f2b531d3
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Mon Oct 15 14:27:32 2007 -0400
registry: Register XKB extension protocol names.
commit 5277a6ff589b5ddb475b90e1aaf5dbd9172d9711
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Mon Oct 15 13:38:35 2007 -0400
registry: Register Input extension protocol names.
commit 8b5078b7d9ec08a588a78eb49096b698c6f4916b
Author: Kristian Høgsberg <krh@redhat.com>
Date: Mon Oct 15 13:10:10 2007 -0400
Fix byte swapping for GetFBConfigs.
commit c922d2eebe29f08f463ee76293dc9042712fb21c
Author: George Sapountzis <gsap7@yahoo.gr>
Date: Sun Oct 14 20:40:18 2007 +0300
glx: drop duplicate GetDrawableAttributesSGIX declarations.
They are officially autogenerated in indirect_dispatch.h now.
commit 3d4eb17b38dcb1468493f3686dc5ea3623ef9a73
Author: Ben Byer <bbyer@bbyer.local>
Date: Sun Oct 14 18:07:03 2007 -0700
mass change from #ifdef i386 to #ifdef __i386__ to conform to ANSI
commit ec0fc012e91e703bb399a380df2912f71957a220
Author: Kristian Høgsberg <krh@redhat.com>
Date: Sun Oct 14 14:59:12 2007 -0400
Fix GLX byteswapping.
commit 927757e1028f45f7fd94b9a2ab35567e0f34b2a8
Merge: ccda4b66bd 17ffc34ad5
Author: Kristian Høgsberg <krh@redhat.com>
Date: Fri Oct 12 19:28:39 2007 -0400
Merge branch 'master' of git://git.freedesktop.org/git/xorg/xserver
commit ccda4b66bdfc179e661b24adc8ec72bb7db75b2b
Author: Kristian Høgsberg <krh@redhat.com>
Date: Mon Aug 27 14:43:48 2007 -0400
Implement ChangeDrawableAttributes so we can support GLX_EVENT_MASK.
We never need to actually send out the clobber event, so this should be
sufficient for GLX 1.3.
commit 695eb8b2e88abc9fa3a76d8da48c3214c7dd1f08
Author: Kristian Høgsberg <krh@redhat.com>
Date: Mon Aug 27 14:23:50 2007 -0400
Implement GLX pbuffers.
commit 516c181f57367847c3f317f8f8f5cc3211026f4c
Author: Kristian Høgsberg <krh@redhat.com>
Date: Thu Aug 23 21:40:01 2007 -0400
Add dispatching for GLX_SGIX_pbuffer.
commit d7ded953c4d263e3dd3374dc03eea19e80c05bc6
Author: Kristian Høgsberg <krh@redhat.com>
Date: Thu Aug 23 19:07:52 2007 -0400
Implment GLXPixmaps.
commit 526f40434c86548830c4f72940462b6253fe9790
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Fri Oct 12 18:18:00 2007 -0400
NULL is not a valid argument to CreatePicture, please use serverClient
as the client argument if no real client is creating the object.
commit 2b0847c7aaf95b6b10f062dfff601032b2430a9b
Author: Kristian Høgsberg <krh@redhat.com>
Date: Wed Aug 8 10:07:03 2007 -0400
Implement damage reporting for AIGLX.
commit 600028305cc047e824b18369a026f89c9eb7e437
Author: Kristian Høgsberg <krh@redhat.com>
Date: Thu May 31 22:55:47 2007 -0400
Move hyperpipe and swapbarrier extension funcs to screen private struct.
This gets rid of a couple more global arrays and gets the two extensions
more in line with the general extension mechanism.
commit 781515bb637de4fd79e3c83817cb6ffa8f2d8a4f
Author: Kristian Høgsberg <krh@redhat.com>
Date: Wed May 30 23:25:03 2007 -0400
Convert GLX module to use screen private indexes like everything else.
commit 72a3d68a2f5abcd09fef1a55e976e1a5731d4b02
Author: Kristian Høgsberg <krh@redhat.com>
Date: Thu May 10 11:16:50 2007 -0400
Update the AIGLX DRI loader to use the new DRI interface.
This lets us drop a bunch of workarounds and use the new DRI extension
mechanism.
commit 17ffc34ad5e9a8e2269afef05f209701f1895c01
Author: Matthias Hopf <mhopf@suse.de>
Date: Fri Oct 12 15:33:31 2007 +0200
Drivers include miscstruct.h which requires pixman.h.
commit eaf0e2a21c2cb14e19852e61a4521b3c240253af
Author: David Nusinow <dnusinow@debian.org>
Date: Thu Oct 11 22:31:24 2007 -0400
Fix another compiler warning
commit a5089af726b6a4f833b95a31274743c994277e20
Author: David Nusinow <dnusinow@debian.org>
Date: Thu Oct 11 22:24:31 2007 -0400
Fix a warning about the control logic in xchomp()
commit cdf29ff45a3cb45573c9d0cb8f82e6ee97953fb5
Author: David Nusinow <dnusinow@debian.org>
Date: Thu Oct 11 22:23:34 2007 -0400
Remove some unused variables
commit 3367091f7fa14497aab40e668cad179e244eef81
Author: David Nusinow <dnusinow@debian.org>
Date: Thu Oct 11 22:21:38 2007 -0400
Separate choosing driver from the file-based implementation
This clears the implementation out of the way to prepare for development
of a symbol-based resolution scheme
commit 3aa41bcb8215c037512ddbd68a3f7bcad3b80a1f
Author: David Nusinow <dnusinow@debian.org>
Date: Thu Oct 11 21:29:13 2007 -0400
Remove obsolete error message define from parser
commit e3e12221111886c4063d2da5d70d3830c56d39e2
Author: David Nusinow <dnusinow@debian.org>
Date: Thu Oct 11 21:27:07 2007 -0400
Don't bother validating the Device section of the conf file
All the previous tests can now be recovered from if not specified.
commit 28ef7f59416677be380561709197b04df0479bef
Author: David Nusinow <dnusinow@debian.org>
Date: Thu Oct 11 20:56:46 2007 -0400
Re-enable validation of the screen section of xorg.conf
This also fixes a problem where the server can't find the device section
when it is specified in the screen section.
commit ea2d4dc468dcebe6d38e676469ec51ed1d43490b
Author: David Nusinow <dnusinow@debian.org>
Date: Thu Oct 11 20:26:02 2007 -0400
When there's no xorg.conf, use the video driver autoloading function
commit fc092334ac0a323b80a9602cb8bf60ca9dee3bfa
Author: Eric Anholt <eric@anholt.net>
Date: Thu Oct 11 16:48:56 2007 -0700
Bug #10304,12784,11603: Add quirks for several physical size issues.
A lot of EDID writers apparently end up stuffing centimeters (like the
maximum image size field) into the detailed timings, instead of millimeters.
Some of them only get it wrong in one direction. Also, add a quirk to let
us mark the largest 75hz mode as preferred, which will often be used for
EDID 1.0 CRTs.
commit 6adeba17301a309be2f34cd51eca84a13d5503fd
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Thu Oct 11 14:17:17 2007 -0400
dix: Add a new "registry" mechanism for registering string names of things.
Supports protocol requests, events, and errors, and resource names.
Modify XRES extension to use it.
commit 45cc03726b49f6ad4afe6c3fb4ad65d1051928b4
Author: Matthias Hopf <mhopf@suse.de>
Date: Thu Oct 11 18:23:25 2007 +0200
Make mode checking more tolerant like in pre-RandR times.
commit 8f23d40068151ad85cde239d07031284f0b2c4dc
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Wed Oct 10 19:56:03 2007 -0400
xace: move the property deletion hook inside the DeleteProperty function.
commit 473bc6ec4c59e1a962b0b897c449a69aa5064ab0
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Wed Oct 10 19:43:12 2007 -0400
xace: remove the special-cased "ignore" functionality from the property code.
There will be no more faking of Success to hide things. XACE does not
provide polyinstantiation.
commit 7e9e01a4a34fa45521067d43c5bbff942dd5d51a
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Wed Oct 10 17:40:22 2007 -0400
dix: pass a valid ClientPtr to SetFontPath in all cases.
commit 8825d36a38c76ff8faf409c853061be2bd33430d
Author: David Nusinow <dnusinow@debian.org>
Date: Tue Oct 9 22:49:07 2007 -0400
Allow the user to not have a screen section
If none is present, a default one will be created. This will be attached
to either the first device section in the xorg.conf (allowing you to
specify something like using EXA without having a screen section) or a
default screen section if none is present in the file.
commit 8665cf3327b713f334b0483593a924c197f892f2
Author: David Nusinow <dnusinow@debian.org>
Date: Tue Oct 9 22:45:15 2007 -0400
Don't require that the screen explicitly attach the device section
This will allow the screen to not explicitly have a device section. If
this is the case and there is a device section in the xorg.conf, the first
one will be used. If there is no device section at all, a default one will
be created that loads the automatically determined module.
commit 37898b824fdc94735495e3494aa2b9a681d477b9
Author: David Nusinow <dnusinow@debian.org>
Date: Tue Oct 9 22:11:58 2007 -0400
Use the best guess heuristic as a fallback for autoloading
This prevents breaking the current behavior
commit 847fbbf4d25132e6c1f99fcf82fe757dbca94a34
Author: David Nusinow <dnusinow@debian.org>
Date: Tue Oct 9 22:07:49 2007 -0400
Fix autoloading of drivers for pci-rework
commit 6033d8150be3a115b90226eaa42f237bb0cf3369
Author: David Nusinow <dnusinow@debian.org>
Date: Tue Oct 9 21:17:27 2007 -0400
First pass at improved video driver autoloading
This is what we're currently shipping in Debian. Enables the ability for
drivers to ship a text file listing PCI ID's they support, and have the
server read them on startup when no driver is specified. This works, but
isn't the final solution.
commit 81d7b81146224f2b83278f5e21b3f9a36f30bd56
Author: David Nusinow <dnusinow@debian.org>
Date: Sat Aug 25 15:00:30 2007 -0400
Load intel instead of i810 when autoconfiguring
commit fdef7be5c8d5989e0aa453d0a5b86d0a6952e960
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Tue Oct 9 18:44:04 2007 -0700
Sun bug 6589829: include zoneid of shm segment in access policy for MIT-SHM
<http://bugs.opensolaris.org/bugdatabase/view_bug.do?bug_id=6589829>
<http://www.opensolaris.org/os/community/arc/caselog/2007/500/>
commit 49c8285e38e0e71c9ea43df63add08a4f2564ed1
Author: Christian Weisgerber <naddy@freebsd.org>
Date: Tue Oct 9 15:25:16 2007 -0700
FreeBSD/alpha server build requires libio (missed in modularization).
commit 042e16458b751ad0fcfa1ebbdd74d7d48036b22a
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Tue Oct 9 23:07:51 2007 +0930
dix: change a few inputInfo.keyboard over to PickKeyboard()
commit 6aab6a6e2ae0ef5fdedae09cf2cdc86f382e3a8a
Author: Dodji Seketeli <dodji@openedhand.com>
Date: Mon Oct 8 13:25:38 2007 +0200
EXA: dude, don't validation driver hooks twice !
commit d42909b23a9be64a26aa349c1d6dcd8b228bffa7
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Fri Oct 5 13:04:10 2007 +0930
dix: when disabling a device, make sure all paired devices are re-paired.
We re-pair them with the VCP, not a real device! If we would do otherwise,
somebody may change our keyboard focus and thus get us typing where we don't
want to type.
commit ff2351246da30b56a3a8f90654993c41b8eb3921
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Fri Oct 5 12:19:03 2007 +0930
dix: When pairing, only check for access right if client is set.
If the pairing client is not set, then the pairing is initiated internally
(e.g. when a new keyboard device is configured). In this case we _must_ pair
regardless of who is the pairing client.
commit 4611f9568cdadf9c00f4b7ca4c77c8c6f07e94f8
Merge: ab11bad547 3549a12823
Author: Dodji Seketeli <dodji@openedhand.com>
Date: Thu Oct 4 13:07:50 2007 +0200
updated from 'master'
commit ab11bad54707941eb41be62c025b983760ce3900
Author: Dodji Seketeli <dodji@openedhand.com>
Date: Thu Oct 4 13:05:29 2007 +0200
Xephyr: remove a potential crasher
* hw/kdrive/ephyr/hostx.c:
(hostx_has_dri): be more defensive.
commit 06c8977966e76255ce7798f4839ef6e3530264a8
Author: Dodji Seketeli <dodji@openedhand.com>
Date: Thu Oct 4 13:01:24 2007 +0200
Xephyr: better handling of the -nodri option
* hw/kdrive/ephyr/ephyr.c:
(ephyrInitScreen): try and detect when the host has no
DRI support. In that case, switch to the -nodri behaviour.
When in the -nodri case, make sure not to skip glx visual
initialisation.
commit ea94f59e9b8824b1a638c63e06ca16f0efd43869
Author: Dodji Seketeli <dodji@openedhand.com>
Date: Thu Oct 4 12:54:26 2007 +0200
Xephyr: don't disable glx visual init by default
* hw/kdrive/ephyr/ephyrinit.c:
(ddxProcessArgument): disabling visual init here
is bad because it gets disabled even when we want
to use software GL, leading to Xephyr :1 -nodri
crashing in mesa.
commit a7f210e6fcda14eae4de64186904c6c676c758ee
Author: Dodji Seketeli <dodji@openedhand.com>
Date: Thu Oct 4 12:51:08 2007 +0200
Xephyr: fix a compiler warning
commit 5d6eac1251f1e17baa74d0893bb225b775e8ec2e
Author: Dodji Seketeli <dodji@openedhand.com>
Date: Thu Oct 4 12:47:05 2007 +0200
Xephyr: remove an unused variable
commit 8018733c39c283a931df424dcfd11e7aefbcd8cf
Author: Dodji Seketeli <dodji@openedhand.com>
Date: Thu Oct 4 12:06:19 2007 +0200
Xephyr: better compilation without GLX
* hw/kdrive/ephyr/ephyrinit.c: protect GLX related code with GLXEXT
macro
commit 3549a1282365e69e70c7c2546cfa7d25923cce31
Author: Michel Dänzer <michel@tungstengraphics.com>
Date: Thu Oct 4 11:38:01 2007 +0200
EXA: Disable 1x1 pixmap fill optimization for drivers that handle pixmaps.
This reverts commit 1365aeff5499a051375e43a9fcbf54733ac93929.
It defeated the optimization for drivers that don't provide a CreatePixmap
hook. The optimization makes no sense for drivers that do anyway, so disable
it for them completely.
commit 604ebb5a6de372e6a8a96e0ee997db7929126860
Merge: 1365aeff54 4ba76a7e2b
Author: Dodji Seketeli <dodji@openedhand.com>
Date: Wed Oct 3 16:13:16 2007 +0200
Merge Xephyr-XV/GL stuff into master
commit 4ba76a7e2b62d26f43c0e670de571afb75ec92f4
Author: Dodji Seketeli <dodji@openedhand.com>
Date: Wed Oct 3 13:03:34 2007 +0200
Xephyr: port XV/GL stuff of the new multiscreen architecture
We can now launch GL or XV apps in any of the
Xephyr screens we want.
* hw/kdrive/ephyr/hostx.c,h:
(hostx_get_window):
(hostx_create_window): make these functions be screen
number aware.
* hw/kdrive/ephyr/XF86dri.c : fix some compiler warnings.
* hw/kdrive/ephyr/ephyrdri.c:
(ephyrDRIQueryDirectRenderingCapable),
(ephyrDRIOpenConnection),
(ephyrDRIAuthConnection),
(ephyrDRICloseConnection),
(ephyrDRIGetClientDriverName),
(ephyrDRICreateContext),
(ephyrDRIDestroyContext),
(ephyrDRICreateDrawable),
(ephyrDRIGetDrawableInfo),
(ephyrDRIGetDeviceInfo): in all those functions, don't forward
the screen number we receive - from the client - to the host X.
We (Xephyr) are always targetting the same X display screen, which is
the one Xephyr got launched against. So we enforce that in the code.
* hw/kdrive/ephyr/ephyrdriext.c:
(EphyrMirrorHostVisuals): make this duplicate the visuals of the host X
default screen into a given Xephyr screen. This way we have a chance
to update the visuals of all Xephyr screen to make them mirror those
of the host X.
(many other places): specify screen number where required by the api
change in hostx.h.
* hw/kdrive/ephyr/ephyrglxext.c: specify screen number where required
by the api change in hostx.h
* hw/kdrive/ephyr/ephyrhostglx.c: don't forward the screen number we
receive - from the client - to the host X.
We (Xephyr) are always targetting the same
X display screen, which is
the one Xephyr got launched against. So we enforce that in the code.
* hw/kdrive/ephyr/ephyrhostvideo.c,h: take in account the screen number received
from the client app. This is useful to know on which Xephyr screen we
need to display video stuff.
* hw/kdrive/ephyr/ephyrvideo.c: update this to reflect the API change
in hw/kdrive/ephyr/ephyrhostvideo.h.
(ephyrSetPortAttribute): when parameters are not valid
- they exceed their validity range - send them to the host anyway
and do not return an error to clients.
Some host expose buggy validity range, so rejecting client for that
is too harsh.
commit ab88cb8d2e7c1410f9ed2be928b38f176b132e11
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Wed Oct 3 18:08:33 2007 +0930
Xext: add missing geint.h to Makefile.am (un-breaks make dist)
commit 9f2b493e34e93881101f31e631901d3fe56da4f0
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Thu Sep 27 15:35:41 2007 +0930
xkb: remove some warning comments.
Obsolete with 340911d7243a7f1095d79b5b2dcfa81b145c2474.
commit 1eebb03a3190947a8102f2ddc73766cf98d34c84
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Wed Oct 3 15:18:17 2007 +0930
dix: ignore passive grab if the client already has a grab on the device.
In some cases a button press may activate a passive core grab. If the client
owning the passive grab already has a core grab on another device, don't
actually activate it. Otherwise the client gets two simultaneous passive
core grabs, and may never ungrab the device again (only if the other grab uses
GrabModeSync).
Reproducable: fire up gnome-session, open up gnome-terminal. Click with the
ClientPointer onto the window decoration, then click with another pointer onto
an application icon in the panel. Drag the icon out, release the button and
voila - you just lost your second mouse.
commit 0b485067823620b5dbd9ef2b3e13bd35ad5a4410
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Wed Oct 3 14:22:55 2007 +0930
dix: send NotifyGrab/NotifyUngrab focus events regardless of semaphore state.
This is just papering over a problem. The whole focus system needs to be
revised.
commit 05106ac9839102c0e4a3ce5d9d83d19abf129f8a
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Wed Oct 3 11:33:10 2007 +0930
dix: change Enter/Leave semaphore handling to accommodate for NotifyGrab.
This is a half-assed attempt at getting rid of some enter-leave problems. When
a grab is activated, the events didn't get sent before, leading to interesting
results. This commit papers over it but doesn't actually fix it properly. The
whole enter/leave (focusin/out) structure needs to be ripped out and changed
for multiple devices.
commit 1365aeff5499a051375e43a9fcbf54733ac93929
Author: Dave Airlie <airlied@redhat.com>
Date: Wed Oct 3 12:00:16 2007 +1000
exa: direct access to the pixmap sys ptr is bad if the pixmap isn't mapped
commit 566dd3b7d789ba60d0adf33b3f729cfb02ff33cd
Author: Dave Airlie <airlied@redhat.com>
Date: Wed Oct 3 11:59:52 2007 +1000
exa: add new flags to denote driver handles all pixmap migration/hiding
commit 1df1fee82d3565f6d8cfb91ce25a81c23a10a4b5
Author: Dave Airlie <airlied@redhat.com>
Date: Wed Oct 3 11:56:04 2007 +1000
exa: make sure we set fb_ptr to NULL
commit a358b87f45ce75e5d013fc904a07dfe394f74387
Author: Eric Anholt <eric@anholt.net>
Date: Tue Oct 2 13:13:51 2007 -0700
Just link against libcrypto instead of relying on openssl pkg-config.
Also fix incorrect library inclusion by kdrive which broke the build.
commit 439edc768eea17667846ce573c843b8377e0dfb4
Merge: c8ccf469dc 93ae6fe18c
Author: Eric Anholt <eric@anholt.net>
Date: Tue Oct 2 12:14:04 2007 -0700
Merge branch 'glyph-pixmaps'
Conflicts:
configure.ac
exa/exa_render.c
commit 59cebcd2e9302d15a52588ecafbbc2d2c5ae3a6c
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Tue Oct 2 13:39:25 2007 -0400
xace: add creation hook for new input devices.
Unfortunately, more information is needed to properly label the device.
This will come from the configuration file, the hotplug messages, etc.
It will either have to be passed into this function,
or this hook moved down into the callers.
commit b77d272d7555c1e0f176ee74b8717030a6d6c7b0
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Tue Oct 2 13:21:53 2007 -0400
xace: add hooks + new access codes: XTEST extension
commit c8ccf469dcb2d7609b23faa8b4999c436263051e
Author: Keith Packard <keithp@koto.keithp.com>
Date: Tue Oct 2 08:59:40 2007 -0700
Do not build hw/xfree86/os-support/bus/ix86Pci.c on Linux.
Linux has custom PCI bus support functions, so this generic code is
unnecessary.
commit dcb4db1bf5b6fcfaed4e7162eb6c7a3a509e14bd
Author: Dodji Seketeli <dodji@openedhand.com>
Date: Wed Sep 19 15:46:09 2007 +0200
Xephyr: glx fixlet
* hw/kdrive/ephyr/ephyrhostglx.c:
(ephyrHostGLXQueryVersion): properly query
the host for its gxl version.
commit 6a435b00003fb00930299a0e0810c93afc23a72e
Author: Dodji Seketeli <dodji@openedhand.com>
Date: Wed Sep 19 15:35:51 2007 +0200
Xephyr: check presence of extensions in host X
* hw/kdrive/ephyr/hostx.c,h:
(hostx_has_xshape),
(hostx_has_glx),
(hostx_has_dri): added these new entry points
* hw/kdrive/ephyr/ephyrdriext.c:
(ephyrDRIExtensionInit):
check presence of DRI and XShape extensions before
trying to use them.
* hw/kdrive/ephyr/ephyrglxext.c:
(ephyrHijackGLXExtension):
check presence of glx extension before we use it.
commit 2b217fc055300d4c709dd27c4e8ec8166183993b
Author: Dodji Seketeli <dodji@openedhand.com>
Date: Wed Sep 19 15:00:43 2007 +0200
Xephyr: cleanup XF86dri.c a bit
commit f731b9da7dbafad50dd5a1e8da28ce86ffab19b7
Author: Dodji Seketeli <dodji@openedhand.com>
Date: Tue Sep 18 18:41:18 2007 +0200
Xephyr: add -nodri and -noxv switches.
* hw/kdrive/ephyr/ephyr.c,ephyrinit.c::
add -nodri and -noxv to disable either DRI or XV.
When -nodri, mesa GL (non acceleretated) works.
commit 50674391388b3cfe987782a3ad81b4f240f3db67
Author: Dodji Seketeli <dodji@openedhand.com>
Date: Tue Sep 18 18:37:49 2007 +0200
Kdrive: use fbcmap_mi.c instead of fbcmap.c
* hw/kdrive/src/Makefile.am: use fb/fbcmap_mi.c
and not fb/fbcmap.c. This allows kdrive to take advantage of
extensions redefining the entry points of micmap.c stuff.
For instance it allows Xephyr to have a working GL, which is not
possible otherwise, because GL redefines mInitVisualsProc
to initialise its visuals.
commit a5bd536869f646e4024befa84f6e677b990310bc
Author: Dodji Seketeli <dodji@openedhand.com>
Date: Tue Sep 18 18:28:25 2007 +0200
fbcmap_mi.c: add a missing api
* fb/fbcmap_mi.c:
(fbSetVisualTypesAndMasks): added this entry point that was missing.
This is useful so that servers using this entry point can use fbcmap_mi.c,
and be obliged to stick to fbcmap.c. Note that fbcmap.c does implement this
entry point. Up to now, kdrive based server could not use fbcmap_mi.c because this
entry point was missing. The will allow Xephyr to properly use GL.
commit 6307ee77091041af2d34e93bc164352d4438a808
Author: Dodji Seketeli <dodji@openedhand.com>
Date: Tue Sep 18 18:22:44 2007 +0200
GLX: allow skipping of visual init wrapping
* GL/glx/glxvisuals.c: added boolean to disable
calling init_visuals(). This gives a chance to Xephyr
to take over visuals manipulation and avoid a crash at
server shutdown in __glXMesaScreenDestroy(), due to the fact
that mesa might sees more visual than what it has actually created in
init_visuals(). It might see more visuals because Xephyr can augment
the number of visuals, dynamically.
* os/utils.c: the boolean is actually defined here.
commit ffe9ce6a843443606ad9367eca1645bf5e0635e5
Author: Dodji Seketeli <dodji@openedhand.com>
Date: Mon Sep 17 22:13:51 2007 +0200
Xephyr: fix a clipping issue xephyr-dri
* hw/kdrive/ephyr/ephyrdri.c:
(ephyrDRIGetDrawableInfo): force the back clipping rects
to equal the front clipping rects.
* hw/kdrive/ephyr/ephyrdriext.c:
(ProcXF86DRIGetDrawableInfo): properly overclip the clipping rects we
got from the client. This bug fixes a clipping rect that was too
small in height, basically. Also fix a possible mem corruption.
* hw/kdrive/ephyr/hostx.c:
(hostx_set_window_geometry): remove a useless XSync
commit 79782726617d4b5a4f9b376f21936d035fc870e1
Author: Dodji Seketeli <dodji@openedhand.com>
Date: Mon Sep 17 18:15:03 2007 +0200
Xephyr: properly clip GL drawables in Xephyr
commit 3816d64e50a59e0ef276ddd6cb250cab98a49392
Author: Dodji Seketeli <dodji@seketeli.org>
Date: Sun Sep 9 15:20:51 2007 +0200
Xephyr: oops, forgot to add ephyrdriext.h
commit cf58781eee7d91a3bbca701a2c4523a36f8e0abb
Author: Dodji Seketeli <dodji@openedhand.com>
Date: Sat Sep 8 00:33:59 2007 +0200
Xephyr: make accelerated glxgears work in Xephyr
* hw/kdrive/ephyr/ephyr.c:
(ephyrInitialize): cleanup ephyrDRI extension init.
remove functions that belongs in ephyrdriext.c .
* hw/kdrive/ephyr/ephyrdri.c:
(ephyrDRICreateDrawable): create the drawable on the host X peer
window, not on the host xephyr main window.
(ephyrDRIGetDrawableInfo): get drawable info of the host X peer
window.
* hw/kdrive/ephyr/ephyrdriext.c: make ephyr DRI extention wrap
a bunch of screen ops so that it can update the host X peer
window whenever DRI bound drawable are moved in Xephyr.
Also code the building blocks of the management of the
host X window peer.
* hw/kdrive/ephyr/hostx.c,h:
(hostx_create_window): added this new entry point
(hostx_destroy_window): ditto
()hostx_set_window_geometry): ditto
commit 6d1e44d3d53b451d466d43197be589d0ecc4b9f6
Author: Dodji Seketeli <dodji@openedhand.com>
Date: Tue Sep 4 18:28:16 2007 +0200
Xephyr: fix a host X hang.
* hw/kdrive/ephyr/ephyrdri.c:
(ephyrDRIGetDrawableInfo): quickly hook
this into getting the drawable info from the host
X server. For the time being, this only gets the drawable info
of the Xephyr main window in the host. It should really get
the info of a the peer drawable in the host X. So there should be a
peer drawable to begin with.
* hw/kdrive/ephyr/ephyrdriext.c:
(ProcXF86DRIGetDrawableInfo): some cleanups. Properly get the
the drawable info otherwise there is a host X hang.
* hw/kdrive/ephyr/ephyrhostglx.c: do not
(ephyrHostGLXQueryVersion): do not use C bindings of the glx protocol
calls. Some of those actually access DRI context directly, resulting
in the context having three clients. Instead all XF86DRI proto
fowarding request should be coded by hand and only forward the
protocol requests
commit a39b57d2f784f14e3198c8506f5eb865bacc2440
Author: Dodji Seketeli <dodji@openedhand.com>
Date: Fri Aug 31 16:53:18 2007 +0200
Xephyr: add more logging to GLX forwarding
* hw/kdrive/ephyr/ephyrhostglx.c: added more logging.
commit 9e192d2118246ad715e23cf5626a038274eb1eaa
Author: Dodji Seketeli <dodji@openedhand.com>
Date: Fri Aug 31 14:43:39 2007 +0200
Xephyr: better error handling in GLX forwarding
* hw/kdrive/ephyr/ephyrglxext.c:
fixed various logging functions
(ephyrGLXGetStringReal): make sure all the string is sent to clients
including the ending zero.
* hw/kdrive/ephyr/ephyrhostglx.c:
(ephyrHostGLXGetStringFromServer): better error handling.
(ephyrHostGLXSendClientInfo): ditto.
(ephyrHostGLXMakeCurrent): ditto
commit 4dd4be99df38b70d43b02d9cb19e09e0ed94462b
Author: Dodji Seketeli <dodji@seketeli.org>
Date: Thu Aug 30 23:54:49 2007 +0200
Xephyr: Make glxinfo work on the ATI R200 free driver.
* hw/kdrive/ephyr/ephyr.c:
(EphyrDuplicateVisual): when duplicating the
visual, copy the color component masks and the class
from the hostX
(EphyrMirrorHostVisuals): don't mix blue and green mask.
* hw/kdrive/ephyr/ephyrdri.c: add more logs.
(ephyrDRICreateDrawable): actually implement this.
for the moment it creates a DRI drawable for the hostX window,
no matter what drawable this call was issued for.
(ephyrDRIGetDrawableInfo): actually implemented this.
for the moment the drawable info queried for its attrs is the
Xephyr main main window.
* hw/kdrive/ephyr/ephyrdriext.c:
(ProcXF86DRIGetDrawableInfo): properly hook this dispatch
function to the ephyrDRIGetDrawableInfo() function.
* hw/kdrive/ephyr/ephyrglxext.c: add a bunch of GLX implementation hooks
here. Hijack some of the xserver GLX hooks with them. Still need to
properly support byteswapped clients though.
* hw/kdrive/ephyr/ephyrhostglx.c,h: actually implemented the protocol
level forwarding functions used by the GLX entr points in
ephyrglxext.c. Here as well, there are a bunch of them, but we are
far from having implemented all the GLX calls.
* hw/kdrive/ephyr/hostx.c,h:
(hostx_get_window_attributes): added this new entry point
(hostx_allocate_resource_id_peer): added this to keep track of
resource IDs peers: one member of the peer is in Xephyr, the other
is in host X.
(hostx_get_resource_id_peer): ditto.
commit 8c78df0ea36abc7d46c4f59670289f4280f75507
Author: Dodji Seketeli <dodji@seketeli.org>
Date: Thu Aug 30 22:31:47 2007 +0200
Xserver: fix potential crash
* dix/extension.c:
(AddExtensionAlias): don't crash when failed to add
extension alias.
commit 024abe825cd702334266f6b8da289907bbd05970
Author: Dodji Seketeli <dodji@seketeli.org>
Date: Tue Aug 28 15:59:45 2007 +0200
Xephyr: add logging in the DRI extension
commit 1dd589410c6c5e8b62b4d15ec681b01452ec68c6
Author: Dodji Seketeli <dodji@seketeli.org>
Date: Tue Aug 28 15:58:55 2007 +0200
mirror the visuals of the host X at startup.
* hw/kdrive/ephyr/ephyr.c: make Xephyr mirror
the visuals of the host X upon startup. This
is important for GLX client apps.
* hw/kdrive/ephyr/hostx.c,h: add a hostx_get_visuals_info()
to get the visuals of the host X.
commit 26da625055a3876c93a7a005520657b971748c4e
Author: Dodji Seketeli <dodji@seketeli.org>
Date: Tue Aug 28 15:55:05 2007 +0200
proxy the glXGetFBConfigSGIX call
* hw/kdrive/ephyr/ephyrglxext.c:
(ephyrGLXGetFBConfigsSGIX): proxy the GLXGetFBConfigsSGIX call.
It is a vendor extension to get the visual configs as a list of
name/value pairs.
(ephyrHijackGLXExtension): hijack the VendorPriv_dispatch_info
dispatch table to register our implementation of GLXGetFBConfigsSGIX
(ephyrGLXGetFBConfigsSGIXReal): added this where the real
implementation of GLXGetFBConfigsSGIX is. It support bytes swapping.
(ephyrGLXGetFBConfigsSGIX,ephyrGLXGetFBConfigsSGIXSwap): these are
the dispatch entry points. They just call
ephyrGLXGetFBConfigsSGIXReal.
* hw/kdrive/ephyr/ephyrhostglx.c,h: reorganize the proxies to get
visual params from the host so that they clearly support the different
methods of doing so.
commit 5af73f98c46dfe5640185ca90feb20c39c6e06fa
Author: Dodji Seketeli <dodji@seketeli.org>
Date: Fri Aug 24 16:30:50 2007 +0200
EPHYR: Add an experiment proto proxy extension.
* hw/kdrive/ephyr/Makefile.am: add the proxy extension to
ephyr. The proxy extension is an experimental extension that
forwards protocol packets targeted at a given extension to the
host X.
* hw/kdrive/ephyr/ephyr.c: init proxy ext.
* hw/kdrive/ephyr/ephyrhostproxy.c,h: added this new file as part of the
proxy extension.
* hw/kdrive/ephyr/ephyrproxyext.c,h: ditto
* hw/kdrive/ephyr/hostx.c: add the hostx_get_get_extension_info() entry
point.
commit c06fa924b4781a35b86e4a78d95ff3e9d95b02d1
Author: Dodji Seketeli <dodji@seketeli.org>
Date: Thu Aug 23 11:53:02 2007 +0200
XEPHYR: more GLX/DRI proxying work.
* hw/kdrive/ephyr/XF86dri.c: re format this correctly.
Make function decls honour the Ansi-C standard.
* hw/kdrive/ephyr/ephyr.c: protect glx/dri related
extension initialisation with the XEPHYR_DRI
macro. Initialize the GLX ext hijacking
at startup.
* hw/kdrive/ephyr/ephyrdri.c: add more logging to ease debugging
* hw/kdrive/ephyr/ephyrdriext.c: ditto. reformat.
* hw/kdrive/ephyr/ephyrglxext.c,h: add this extension to
proxy GLX requests to the host X. started to proxy those nedded to
make glxinfo work with fglrx. Not yet finished.
* hw/kdrive/ephyr/ephyrhostglx.c,h: put here the actual
Xlib code used to hit the host X server because Xlib stuff cannot be
mixed with xserver internal code, otherwise compilation erros due to
type clashes happen. So no Xlib type should be exported by the
entrypoints defined here.
commit 0b8545144975bf7ed43c2564d01c697144eb1244
Author: Dodji Seketeli <dodji@seketeli.org>
Date: Thu Aug 16 17:30:13 2007 +0200
Implement ReputImage and StopVideo
* hw/kdrive/ephyr/ephyrhostvideo.c/h:
(ephyrHostXVStopVideo): add this entry point.
* hw/kdrive/ephyr/ephyrvideo.c:
Basically add ReputImage and StopVideo implementations.
Now, when other windows obscur the video window, the reclipping
seems to be well handled using StopVideo and ReputImage.
To do this, I was obliged to save the frame in PutImage, so
that I could resend it un ReputImage.
commit 810dc55866d1c2343512354646c7ab309ea1fad2
Author: Dodji Seketeli <dodji@seketeli.org>
Date: Thu Aug 16 17:11:22 2007 +0200
Ephyr-Xv: add a new line to a log
* hw/kdrive/ephyr/ephyrvideo.c:
(ephyrQueryImageAttributes): add newline to log.
commit 47e6dff89e48249828e828502e98951eee7f85bc
Author: Dodji Seketeli <dodji@seketeli.org>
Date: Thu Aug 16 17:07:36 2007 +0200
Xephyr-Xv: fix a crash when host X support several ports
* hw/kdrive/ephyr/ephyrvideo.c:
(ephyrXVPrivQueryHostAdaptors): properly set
port private luke. This fixes a crash when
the host Xv supports multiple ports.
Make sure number of ports cannot be zero.
commit a38ad562a6f50e9d76a37917b936035215ea460e
Author: Dodji Seketeli <dodji@seketeli.org>
Date: Wed Aug 15 19:40:10 2007 +0200
make xephyr talk DRI protocol with hostX
* configure.ac,include/dix-config.h.in: define the XEPHYR_DRI macro.
define it when --enable-xephyr and --enable-dri are both turned on.
* hw/kdrive/ephyr/XF86dri.c: copy this from mesa source to enable
Xephyr to talk DRI protocol the host X. In mesa, this is used by libGL.so to
talk DRI protocol with the server.
* hw/kdrive/ephyr/ephyr.c: finally initialise the DRI extension
in the ephyrInitScreen() function.
* hw/kdrive/ephyr/ephyrdri.c,ephyrdriext.c: safeguard the compilation
using the XEPHYR_DRI macro.
commit e4239a48075c77e6a8d2d5cb21f58dd67687482f
Author: Dodji Seketeli <dodji@openedhand.com>
Date: Tue Aug 14 22:48:41 2007 +0200
Initial dri forwarding big bricks.
* hw/kdrive/ephyr/ephyrdriext.c: added this to implement a DRI extension
into Xephyr. Normally the DRI extension is only present in the
xfree86 server, but I have ported it to Xephyr. The extension calls
functions that declared/defined in ephyrdri.h ephyrdri.c that
forwards the DRI calls to the host X. It does not work yet, as this
entry is just to put the big bricks in place.
* hw/kdrive/ephyr/ephyrdri.c,h: declaration & definition of the
DRI client API that would hit the hostX server.
* hw/kdrive/ephyr/GL/internal/dri_interface.h: added this, otherwise
inclusion of /usr/include/X11/dri/xf86dri.h won't compile
commit e01d3dd98d1b596e75d25f94dd89c7d41223011d
Author: Dodji Seketeli <dodji@openedhand.com>
Date: Thu Aug 9 10:55:10 2007 +0200
Support clipping region in PutImage.
* hw/kdrive/ephyr/ephyrhostvideo.c,h:
(ephyrHostXVPutImage): make this support clipping region.
The clipping region is propagated to host using XSetClipRectangles.
This changes the API of ephyrHostXVPutImage.
* hw/kdrive/ephyr/ephyrvideo.c:
(ephyrPutImage): propagate the clipping region to the new
ephyrHostXVPutImage() entry point.
commit 39d3895469f07304d72800d8dcef6c7732f13d5f
Author: Dodji Seketeli <dodji@openedhand.com>
Date: Wed Aug 8 14:27:32 2007 +0200
make EphyrXVPriv be a singleton
* hw/kdrive/ephyr/ephyrvideo.c:
(ephyrInitVideo) make the EphyrXVPriv object be a
singleton instance, otherwise a new object is created at each
generation.
commit 4ed083095a13ec92bb4c8e705f26500f8312c138
Author: Dodji Seketeli <dodji@openedhand.com>
Date: Tue Aug 7 14:16:13 2007 +0200
add [Get/Put]Video and [Get/Put]Still support
* hw/kdrive/ephyr/ephyrhostvideo.c,h:
(ephyrHostXVAdaptorHasXXX): fix these.
(ephyrHostXVAdaptorHasGetVideo): added this
(ephyrHostXVAdaptorHasGetStill): ditto
(ephyrHostXVPutVideo): added this
(ephyrHostXVGetVideo): ditto
(ephyrHostXVPutStill): ditto
(ephyrHostXVGetStill): ditto
* hw/kdrive/ephyr/ephyrvideo.c:
(ephyrPutVideo): implement this
(ephyrGetVideo): ditto
(ephyrPutStill): ditto
(ephyrGetStill): ditto
(ephyrXVPrivSetAdaptorsHooks): advertise GetVideo and GetStill
when the host X supports it.
commit 6f7961bc218169aaa0d10cfad0952adb7fac2f00
Author: Dodji Seketeli <dodji@openedhand.com>
Date: Mon Aug 6 18:38:54 2007 +0200
advertise only the hooks implemented by host X
* hw/kdrive/ephyr/ephyrhostvideo.c,h:
(ephyrHostXVAdaptorHasPutVideo): detect if
host X has the PutVideo call.
(ephyrHostXVAdaptorHasPutStill): detect if
host X has the PutStill call
(ephyrHostXVAdaptorHasPutImage): detect if
host X has the PutImage call
* hw/kdrive/ephyr/ephyrvideo.c:
(ephyrXVPrivQueryHostAdaptors): make sure to create
atoms for attribute names otherwise subsequent
calls to get/set attribute from clients won't work.
(ephyrXVPrivSetAdaptorsHooks): don't hardwire advertising
of the PutImage call. Instead, advertise the calls advertised
by the host.
commit 1de89239bdfa68ded2ef25fbb7d08369f527f7a9
Author: Dodji Seketeli <dodji@openedhand.com>
Date: Sat Aug 4 01:13:38 2007 +0200
don't crash when hostX reports an error.
* hw/kdrive/ephyr/ephyrhostvideo.c,h:
(ephyrHostXVLogXErrorEvent): add this to
log X error events. Heavily copied from libx11
(ephyrHostXVErrorHandler): new x error handler that
logs the error but does not exits.
(ephyrHostXVInit): add this to be called at the beginning
of xvideo lifetime. It sets an xerror handler that does not
exit.
* hw/kdrive/ephyr/ephyrvideo.c:
(ephyrXVPrivIsAttrValueValid): this validates an attribute
value.
(ephyrSetPortAttribute): before setting an attribute,
validate the new value so that we don't send a buggy
request to host X.
* hw/kdrive/ephyr/*.c: fix case in ephyrvideo code.
* hw/kdrive/ephyr/ephyr.c: fix a typo
commit 207714b60d18e94bbe2d755a431dbb29fe5677f7
Author: Dodji Seketeli <dodji@openedhand.com>
Date: Fri Aug 3 01:10:39 2007 +0200
first implementation of putimage
* hw/kdrive/ephyr/ephyrhostvideo.c,h:
(EphyrHostXVPutImage): first implementation. does not
support clipping regions yet.
* hw/kdrive/ephyr/ephyrvideo.c:
(DoSimpleClip): clip using a clipping box. Does not
support regions yet.
(EphyrPutImage): first implementation.
Uses a simple clipping rectangle, no region yet.
* hw/kdrive/ephyr/hostx.c:
(hostx_get_window): added this to get the main
window of the host x.
commit aa478e09e25a1cb19b808e7e52b2ee155e34f03b
Author: Dodji Seketeli <dodji@openedhand.com>
Date: Thu Aug 2 12:49:36 2007 +0200
make properties setting/query code work and hopefully complete.
* hw/kdrive/ephyr/ephyrhostvideo.c,h:
(EphyrHostXVQueryImageAttributes): add this call. It calls
XvQueryBestSize xserver entry point. It uses the protocol
level machinery because Xvlib does not expose that entry point
as a C function.
(EphyrHostXVQueryBestSize): added this wrapper around XvQueryBestSize().
(EphyrHostGetAtom, EphyrHostGetAtomName): added this to get
an atom or atom name from the host server
* hw/kdrive/ephyr/ephyrvideo.c:
(EphyrSetPortAttribute): convert the atom into an host server
server atom before attacking the host server with it, because in
in its current form, the input atom is only valid in xephyr.
This fix makes this call work.
(EphyrGetPortAttribute): ditto.
(EphyrQueryBestSize): implement this.
(EphyrQueryImageAttributes): implement this.
commit 24c837c0be6f85a917582156ab61d6c9c69301f9
Author: Dodji Seketeli <dodji@openedhand.com>
Date: Tue Jul 31 23:18:52 2007 +0200
implement setportattribute and getportattribute calls
commit b8cd313be467fd14b8e5c9ba68e1a2029c1e888b
Author: Dodji Seketeli <dodji@seketeli.org>
Date: Mon Jul 23 12:43:43 2007 +0200
make xvinfo work
* hw/kdrive/ephyr/ephyrhostvideo.c:
(EphyrHostXVAdaptorGetVideoFormats): properly get visual class instead of
returning the visual id.
(EphyrHostXVQueryEncodings): properly copy the fields because simple casting does
truncate some fields.
(EphyrHostAttributesDelete): XFree the whole array instead of trying to free invidial members.
* hw/kdrive/ephyr/ephyrvideo.c:
(ephyrInitVideo): fix a typo
(EphyrXVPrivQueryHostAdaptors): set XvWindowMask mask to adaptors type.
use host adaptor name. Don't forget to set nImages field.
(EphyrXVPrivRegisterAdaptors): report an error when KdXVScreenInit() fails.
commit aa2fae7b75f741e57bc4a9b754b5ea7518d78f47
Author: Dodji Seketeli <dodji@seketeli.org>
Date: Sat Jul 21 23:56:13 2007 +0200
misc fixes.
*(EphyrHostXVQueryAdaptors): return the queried adaptors list
* (EphyrHostXVQueryPortAttributes): return port attributes number
commit 2bf7f3c223fd32cd4922f98eadda2e3f06d9e119
Author: Dodji Seketeli <dodji@seketeli.org>
Date: Sat Jul 21 17:55:12 2007 +0200
link and init xv
commit 66b28532e533ff5688705c5286425e68d6403cee
Author: Dodji Seketeli <dodji@seketeli.org>
Date: Sat Jul 21 12:08:39 2007 +0200
initial commit of xv support work
commit 1e8f8b36a56a884092ee01a0bb3f40436e30fa42
Author: Dodji Seketeli <dodji@seketeli.org>
Date: Sat Jul 21 18:22:20 2007 +0200
works with no adaptors
Debug the early code to make work when the host has no video adaptors
commit 50ff2377cac50ae25218be5b30612fb8bf6046a6
Author: Dodji Seketeli <dodji@seketeli.org>
Date: Sat Jul 21 18:20:59 2007 +0200
add -verbosity <level> option to command line
commit 8426eb2433f964ea19848f24dc99eb4588d10d1a
Author: Dodji Seketeli <dodji@seketeli.org>
Date: Sat Jul 21 17:55:12 2007 +0200
link and init xv
commit 50a64c84e1556ef7f8efcc7f8655e0c5e023ef4d
Author: Dodji Seketeli <dodji@seketeli.org>
Date: Sat Jul 21 12:08:39 2007 +0200
initial commit of xv support work
commit 95fadbd4022ec99f42ba78ec8a18a064903e8a7f
Author: Dodji Seketeli <dodji@seketeli.org>
Date: Mon Jul 16 17:37:21 2007 +0200
Add basic Exa driver entry point validation.
In exaDriverInit(), quickly check if the programmer forgot to set some
mandadory driver hooks, in that case display a meaningful error message.
commit e5e6514ffa0fd132e0cc1b15b94119e6e8755f43
Author: Andrew Christan <andrew.christian@nokia.com>
Date: Tue Oct 2 13:25:51 2007 +0200
Xephyr: add "multiscreen" suport
* This patch adds multiscreen support to Xephyr. For instance,
the command line : "Xephyr :4 -ac -screen 320x240 -screen 640x480"
will launch with two "screens" - namely two main windows.
The first main window represents a screen that has the number :4.0, with
a geometry of 320x240 pixels, and the second one represents a screen
that has the number :4.1 with a geometry of 640x480.
The command line: "DISPLAY=:4.1 xclock" will launch the xclock program
on the second screen, for intance.
* this patch was edited by Dodji Seketeli <dodji@openedhand.com> for:
- better style compliance with the rest of the Xephyr code
- make sure Xephyr could be launched with no -screen option. By
default that creates a default screen of 640x480 pixel like before
- display full titles on the windows - with insctructions to grab
keyboard and mouse - like before.
commit 81692b628f41cb64329f3cccc0503fb216a2b8e3
Author: Dodji Seketeli <dodji@openedhand.com>
Date: Tue Oct 2 13:11:28 2007 +0200
Fix #12650: "windows not receiving mouse events in multiple screens context"
* dix/events.c, include/dix.h:
(UpdateSpriteForScreen): added this to update the mouse sprite context
when we switch from a pScreen to another.
* mi/mipointer.c:
(miPointerWarpCursor): as we are switching to a new pScreen,
don't forget to update the mouse sprite context.
commit f965a5f3454a95ddffb2faf9b291feff46305adf
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Tue Oct 2 16:20:27 2007 +0930
dix: Ignore devices when deleting passive core grabs.
commit dc90d500085dd74e90073be008fc514bd97b160a
Author: Dave Airlie <airlied@redhat.com>
Date: Tue Oct 2 14:05:07 2007 +1000
exa: increase minor version number for pixmap allocation hooks
commit f15af2ae60bb8503c336bc3cba0560bd314a34bc
Author: Kristian Høgsberg <krh@redhat.com>
Date: Fri Aug 3 16:33:33 2007 +1000
exa: only setup offscreen allocator if driver doesn't provide CreatePixmap
commit ffb58f4fa8d86e87f831430b8627f27d85f971a9
Author: Dave Airlie <airlied@redhat.com>
Date: Tue Oct 2 14:03:39 2007 +1000
exa: add hooks for drivers to take over pixmap allocation
This adds hooks for the driver to access Create/DestroyPixmap and ModifyPixmapHe
ader.
It allocates a 0 sized pixmap using fb and calls the driver routine to do
work of allocating the actual memory.
ModifyPixmapHeader is mainly required for hooking the screen pixmap which
isn't create by normal methods
commit 2b075e97ec913ebe19290181e36bb169410b820b
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Tue Oct 2 13:28:40 2007 +0930
mi: switch core keyboard on XI events, not only on core events.
We only get core events through the EQ in exceptional cases, so make sure we
actually swap the core keymap for XI events as well. Gives us back the ability
to have multiple keyboard layouts simultaneously.
commit 31555af0005a0bc4d7ef785214696ac84681e29f
Author: Dave Airlie <airlied@redhat.com>
Date: Tue Oct 2 13:32:57 2007 +1000
exa: add a pixmap private pointer for drivers to retrieve.
commit 45ec6cd1fb242363c91ad8af1fd4a27a7f02621a
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Tue Oct 2 13:19:07 2007 +0930
xfree86: fix DGA to use the correct devices.
DGAStealXXXEvent modified to take in device argument.
The evdev driver only sends one valuator when only one axis changed. We need
to check for DGA either way (xf86PostMotionEventP), otherwise we lose purely
horizontal/vertical movements.
Note that DGA does not do XI events.
commit 122ae65ed90195c584a770027b4d14ef65f72492
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Tue Oct 2 10:50:59 2007 +0930
xfree86: xf86DGA: some cleanup to use the correct devices instead of VCP/VCK.
commit 54ce7436b2579bb20728eab7c8d460b531c378af
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Tue Oct 2 10:49:46 2007 +0930
xfree86: update all pointers when calling xf86SwitchMode
Center the frame around the first pointer found and then update all pointers
on the same screen to move to the edges (if necessary).
Note: xf86WarpCursor needs to be modified, is using deprecated
miPointerWarpCursor and will kill the server when called with
inputInfo.pointer.
commit 113011221a4fcbd70bc592930b35f20d55809f1e
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Mon Oct 1 21:42:01 2007 +0930
Xi, xfree86: Remove leftovers of the XI wrapper code.
commit 50551ec693f40b91652fe4814e9fe2e1f9ab6517
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Fri Sep 28 15:04:33 2007 -0400
xace: remove obsoleted DRAWABLE_ACCESS hook.
commit 8b548657204000e18c7a38706a0071ae2f93159f
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Fri Sep 28 13:34:18 2007 -0400
xace: add hooks + new access codes: XKB extension.
Removes "LookupKeyboardDevice" and "LookupPointerDevice" in favor of
inputInfo.keyboard and inputInfo.pointer, respectively; all use cases
are non-XI compliant anyway.
commit 5c03d131815cfe2f78792277ab8352e69e830196
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Fri Sep 28 08:02:00 2007 -0400
xace: add new hooks + access controls: XInput extension.
Introduces new dix API to lookup a device, dixLookupDevice(), which
replaces LookupDeviceIntRec and LookupDevice.
commit a511c445debbd13e8c48146ecd2d7c97e793f788
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Fri Sep 28 18:46:41 2007 +0930
Remove generation of core events, long live XI!
Let the drivers only generate XI events and put those into the event queue.
When processing events, generate core events as needed. This fixes a number of
problems with XKB and the DIX in general.
The previous approach was to put core events and XI events as separate events
into the event queue. When being processed, the server had no knowledge of
them coming from the same device state change. Anything that would then change
the state of the device accordingly was in danger of changing it twice,
leading to some funny (i.e. not funny at all) results.
Emulating core events while processing XI events fixes this, there is only one
path that actually changes the device state now. Although we have to be
careful when replaying events from synced devices, otherwise we may lose
events.
Note: XI has precedence over core for passive grabs, but core events are
delivered to the client first.
This removes the wrapping added in 340911d7243a7f1095d79b5b2dcfa81b145c2474
commit be466d8df808c4e4067a7963617bc3f506768f2d
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Thu Sep 27 22:23:05 2007 +0930
dix: GetPairedKeyboard() always returns a valid keyboard (VCK if necessary).
We need it unconditionally in a few places, and the rest checked for NULL and
then set it to VCK anyway. So, fixing up all callers to appreciate the defined
return value.
commit 53434edc3d306137d019d95189ecdf0dbff75205
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Thu Sep 27 22:14:09 2007 +0930
dix: take paired keyboard instead of VCK (CoreProcessPointerEvents)
commit 2d93e69690d2c5d4a89a795ede6423796528e5df
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Thu Sep 27 16:47:06 2007 -0700
Rework local client id finding code to be more uniform
commit c7ead3a68e5839cb92129e35b21f55007fba8445
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Thu Sep 27 16:13:28 2007 -0700
xorgcfg needs $(DIX_CFLAGS) for pixman-1 include path
commit 62a9fb4cda988a896909a5620a68c51e46d0e403
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Thu Sep 27 16:12:29 2007 -0700
Fix PCI rework build on Solaris (copy what BSD does)
commit cfe549d1ba28396c44af94133d8c1d323e3c7086
Author: Tilman Sauerbeck <tilman@code-monkey.de>
Date: Thu Sep 27 22:36:52 2007 +0200
EXA: Added back the maxPitchPixels initialization code.
This doesn't add real value yet, but it will be useful once I add code
that splits large render operations into smaller parts if necessary.
commit c11a27ef85674f1e77ffa7f083646b848e1dc0b8
Author: Alan Hourihane <alanh@tungstengraphics.com>
Date: Thu Sep 27 14:54:40 2007 +0100
Add the FB_ACCESS_WRAPPER checks
commit e0bb33b3d2e4f54cf20853cde9a1664a7dbd0dc7
Author: Alan Hourihane <alanh@tungstengraphics.com>
Date: Thu Sep 27 14:50:28 2007 +0100
Fix bug #12286
commit 6d5c1e0d896666bcb2b3c1de7bfa424f140be364
Author: Michel Dänzer <michel@tungstengraphics.com>
Date: Thu Sep 27 13:04:41 2007 +0200
EXA: Remove bogus pitch checks.
exaCreatePixmap should handle all cases correctly.
commit 598698678b07cb3a9406a9ee98bd3186366949e7
Author: Michel Dänzer <michel@tungstengraphics.com>
Date: Thu Sep 27 13:07:09 2007 +0200
EXA: Punt for all fallbacks in exaFillRegion*.
Now that PaintWindow is gone, all callers already handle fallbacks.
commit 006f6525057970a74382132237b2131286ad147c
Author: Michel Dänzer <michel@tungstengraphics.com>
Date: Thu Sep 27 13:08:41 2007 +0200
EXA: Make sure tile offsets passed to drivers are never negative.
Thanks to Björn Steinbrink for pointing out the problem on IRC.
commit da7d9aa1fb60e13a59c9f842fed7aefc5b97c195
Author: Michel Dänzer <michel@tungstengraphics.com>
Date: Thu Sep 27 13:08:40 2007 +0200
EXA: Tile offscreen pixmap coordinate offsets are always 0.
commit d6f4764bf5f3a601a0034ded039857e8ea5563b2
Author: Michel Dänzer <michel@tungstengraphics.com>
Date: Thu Sep 27 13:08:40 2007 +0200
EXA: Remove some clearly bogus code from exaCopyNtoN.
Not sure what I was thinking when I wrote this... it would cause the box
coordinates to be off for exaCopyNtoNTwoDir or fallbacks.
Thanks to Tilman Sauerbeck for pointing out the problem on IRC and testing the
fix.
commit c7d6d1f589d729fa689d22d82fe30afbc6e1cacb
Author: Michel Dänzer <michel@tungstengraphics.com>
Date: Thu Sep 27 13:08:40 2007 +0200
EXA: Punt on fallback case not handled correctly in exaFillRegionTiled.
Fixes http://bugs.freedesktop.org/show_bug.cgi?id=12520 .
commit 1d938a80fd4fa58d1791c146b6b5c2dfe148dce7
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Wed Sep 26 19:42:46 2007 -0700
Remove unused pciAddrHostToBus functions from ix86Pci.c
Matches linuxPci.c changes made in 8279444a54f38c5e2e5d4c2d936a10d74990e0be
Fixes compiler errors:
"ix86Pci.c", line 194: too many struct/union initializers
"ix86Pci.c", line 204: too many struct/union initializers
"ix86Pci.c", line 214: too many struct/union initializers
commit de06a47d4ad9c845b098438d9492a5f42483a2ad
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Thu Sep 27 11:45:03 2007 +0930
dix: GetMaximumEventsNum() needs to return 3 + MAX_VALUATOR_EVENTS.
Raw events can be generated for pointer events, so 2 + MVE isn't enough.
commit 32d0440c7f6e604807cb14dd32349df6f22c903b
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Thu Sep 27 11:44:03 2007 +0930
xkb: xkbHandleActions: let wrapping take care of event delivery.
This is hopefully better than hardcodey calling CoreProcessPointerEvent.
commit 27612748e0ec20f3a23839f0a12e39f598dd722c
Merge: b61461425e 3b114f2603
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Wed Sep 26 07:47:29 2007 -0400
Merge branch 'master' into XACE-SELINUX
Conflicts:
dix/devices.c
commit 3b114f2603fc2adeec7f5f8f20fe4870afb8dff1
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Tue Sep 25 07:55:17 2007 -0400
Input: Properly swap DevicePresenceNotify events.
commit 31a7994ac7365562ef1d00e0a7b25f967a961a4e
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Mon Sep 24 13:33:01 2007 -0400
Input: Return errors to the dispatcher instead of sending them ourself.
Also fixed two "unused variable: stuff" warnings.
commit 56ffc381d32687242dd094395fcf2216339bab2a
Author: Tilman Sauerbeck <tilman@code-monkey.de>
Date: Wed Sep 26 16:47:54 2007 +0200
EXA: Removed duplicated exaGetDrawablePixmap() calls.
commit aa0325db7e8ab11d9418cae14f11c488f443ccaa
Author: Dodji Seketeli <dodji@openedhand.com>
Date: Wed Sep 26 15:26:42 2007 +0200
Xephyr: fix compiler warnings
* hw/kdrive/ephyr/ephyr_draw.c:
(ephyrDownloadFromScreen),
(ephyrUploadToScreen): fix compiler warnings
commit 8f9bf927e1beecf9b9ec8877131ec12c765e4d84
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Wed Sep 26 18:04:59 2007 +0930
xkb: Unwrap properly in ProcessPointerEvent.
Instead of hardcoding CoreProcessPointerEvent, actually try to unwrap properly
and then call the unwrapped processInputProc. Seems to be a better idea,
especially since it makes stuff actually work...
commit 3342b5ad47be25c6838321c0aafc28c329c308b5
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Wed Sep 26 18:03:21 2007 +0930
Xi: fix the wrapper code for processInputProc wrapping.
Followup to [1].
If a core grab causes the device to freeze, it overwrites the processInputProc
of the device. [1] would then overwrite this while unwrapping, the device
does not thaw anymore.
Changing this to only re-wrap if the processInputProc hasn't been changed
during the event handling.
[1] 340911d7243a7f1095d79b5b2dcfa81b145c2474
commit e2cb8515661b1f7826981931d82dee6e05529f04
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Wed Sep 26 18:01:17 2007 +0930
xfree86: pass in the XKB event processing proc instead of the XI one.
We need to pass ProcessPointerEvent or ProcessKeyboardEvent to
XkbSetExtension, otherwise we lose the xkb layer.
commit 27bc1a8fef2bfd3d62fb44f7c7eb0d463ed08632
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Wed Sep 26 15:24:41 2007 +0930
xkb: XkbFilterEvents: Remove unused variable compiler warning.
commit bfc89c035542a10594f5f0cbde1c7e28b7d024a7
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Wed Sep 26 15:23:37 2007 +0930
xkb: unify ErrorFs. Prefix all with [xkb].
Output for XkbUseMsg intentionally skipped.
commit 8b508f5d6bd0d3995294d5ff300a856754442999
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Wed Sep 26 15:19:53 2007 +0930
dix: unify ErrorFs. prepend all with [dix].
commit 394f3c1dbee7270a1d930846d49278424c3072d4
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Wed Sep 26 15:19:37 2007 +0930
dix: GetPointerEvents: remove unused variable compiler warning.
commit 55fd50273ea67eb99a0c8a830349851931298387
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Wed Sep 26 15:15:34 2007 +0930
Xi: unify ErrorFs. Prefix all with [Xi].
commit 340911d7243a7f1095d79b5b2dcfa81b145c2474
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Wed Sep 26 15:12:49 2007 +0930
Wrap core event handling through ProcessOtherEvents.
When processing events from the EQ, _always_ call the processInputProc of the
matching device. For XI devices, this proc is wrapped in three layers.
Core event handling is wrapped by XI event handling, which is wrapped by XKB.
A core event now passes through XKB -> XI -> DIX.
This gets rid of a sync'd grab problem: with the previous code, core events
did disappear during a sync'd device grab on account of mieqProcessInputEvents
calling the processInputProc of the VCP/VCK instead of the actual device. This
lead to the event being processed as normal instead of being enqueued for
later replaying.
commit b2a4883bd89d406713d4f808e72721ecc1456d67
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Wed Sep 26 09:20:11 2007 +0930
dix: add comments to PlayReleasedEvents()
Also stick another warning in, more changes needed for XGE if panoramix is
active.
commit 275dc77c2972147407584323b866b8acc1654ea0
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Tue Sep 25 21:40:08 2007 +0930
dix: add comments to ComputeFreezes() and syncEvents struct.
commit ae8b4f7dcf1291a2f5a0d0159f3e6089eea0578a
Author: Tilman Sauerbeck <tilman@code-monkey.de>
Date: Mon Sep 24 22:06:52 2007 +0200
EXA: Added pitch limitations.
Drivers can now specify the max pitches that the accelerator supports.
commit b61461425eb15fcff2a58330d74fe5a5a1f226fc
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Tue Sep 25 09:56:00 2007 -0400
xace: add hooks + new access codes: XV extension.
May need to revisit this extension in the future, depending on observed use.
commit 9bd04055a2175ec16756d3bf73ae03b5e163a28a
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Tue Sep 25 09:33:51 2007 -0400
xace: change prototype of VALIDATE_DRAWABLE_AND_GC macro to allow access
mode to be passed to dixLookupDrawable.
commit 988f446fe00ac2b92c484a4440613dd82191eadd
Author: Eric Anholt <eric@anholt.net>
Date: Mon Sep 24 20:23:35 2007 -0700
[EDID] Ignore reserved bits in deciding monitor vs detailed timing descriptor.
Even though they're defined to zero by the spec, we've seen an EDID block
where the (empty) ASCII strings were stuffed in a byte early, leading to the
descriptor being considered a detailed timing instead.
commit 5d9f6cf51becdeb1d2be9bdeec4bb5d0c4dd0e8b
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Thu Sep 13 23:33:07 2007 +0930
dix: cosmetic change. Remove "pointer" variable, might as well use pDev.
commit c4db4d1fcf7fa2ba802a208beee6b3adc83921f5
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Thu Sep 13 23:27:07 2007 +0930
include: remove register keywords.
commit 1c25c46f3d5f98be8dbf36684aad4302b220e163
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Thu Sep 13 23:22:27 2007 +0930
dix: fix compiler warnings about unused variables.
commit 68e0c4988e359e3c9da933946bc703cf8530bdbc
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Wed Sep 12 20:48:48 2007 +0930
dix: fix "possible use of uninitialized variable" warning.
The device passed through to UnrealizeCursor isn't used anyway, so setting it
to NULL is enough.
commit b484451eab261a919fe94c0c0f56877f7571fc9e
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Wed Sep 12 18:34:51 2007 +0930
dix: don't try to access "time" field for GenericEvents in PlayReleasedEvent.
GenericEvents can't be parsed to keyButtonPointer, and there's no guarantee
that it has a time field anyway. PlayReleasedEvent needs to store the millis
when we know it (core events, XI event) and just re-use them for GenericEvents.
Yes, this is a hack. But it looks like the time has zero significance anyway.
commit 1c38eac442a3ab9e8469e944f382251957996c5a
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Wed Sep 12 18:09:57 2007 +0930
dix: fix comment for DeliverDeviceEvents.
DDE is not always called, grabbed or focused devices go through
Deliver{Grabbed|Focus}Event first.
Thanks to Eamon Walsh for spotting it.
commit 06188ce90d2a8146140773f9367f23404b464282
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Wed Sep 12 18:00:03 2007 +0930
dix: Make EnqueueEvent aware of GenericEvents.
GenericEvents can be > sizeof(xEvents), so we need to make sure we're
allocating and copying enough memory for the event.
commit 8840829ab93c4eb62eb58753c015da5307133fe5
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Wed Sep 12 17:40:11 2007 +0930
dix: don't compress motion events from different devices (EventEnqueue)
commit 27ad5d74c20f01516a1bff73be283f8982fcf0fe
Author: Daniel Stone <daniel@fooishbar.org>
Date: Sun Sep 23 17:17:03 2007 +0300
Input: Generate XKB mapping changes for all core-sending devices (bug #12523)
When we change the mapping on a core device, make sure we propagate this
through to XKB for all extended devices as well.
commit 0e800ca4651a947ccef239e6fe7bf64aab92257c
Author: Daniel Stone <daniel@fooishbar.org>
Date: Sun Sep 23 12:43:31 2007 +0300
GetKeyboardEvents: Reject out-of-range keycodes (bug #12528)
We can only deal with keycodes between 8 and 255, so make sure that we never
accept anything out of this range.
commit e1860f241b7322c54c109cf5727df45b54b73916
Author: Alex Deucher <alex@botch2.(none)>
Date: Sat Sep 22 17:54:51 2007 -0400
Document xf86_crtc_clip_video_helper better.
commit 19d30c1c771c0f5c9dfc0f4cfb084dd2e528d992
Author: Alex Deucher <alex@botch2.(none)>
Date: Sat Sep 22 17:51:27 2007 -0400
Revert "Fix possible crash if Xv window is outside of either crtc"
This reverts commit 92355314103d2193ca20786915eaf608922a36dc.
This changes ABI. False means there was a memory failure of some kind,
not that the video shouldn't be displayed
commit 92355314103d2193ca20786915eaf608922a36dc
Author: Michel Dänzer <daenzer@debian.org>
Date: Sat Sep 22 14:25:02 2007 -0400
Fix possible crash if Xv window is outside of either crtc
commit edd88170836ec985ab1a59179de69d50644b8dff
Author: Tilman Sauerbeck <tilman@code-monkey.de>
Date: Sat Sep 22 13:02:08 2007 +0200
EXA: Check ABI compatibility earlier.
If the driver isn't compatible to the server, all bets are off anyway wrt
the contents of the fields that we're validating, which can lead to bogus
error messages.
commit abe0a51f3f790f8c055289465e130177c4b647cc
Author: Ben Byer <bbyer@bbyer.apple.com>
Date: Fri Sep 21 17:07:36 2007 -0700
So, like, checking return codes of system calls (signal, etc) is good.
Also, only restore an old signal handler if one was actually set
(prevents the server from dying on OS X).
commit eb82b19aa71333b46e927516cc228f25d3e05e4d
Author: Ben Byer <bbyer@bbyer.apple.com>
Date: Thu Sep 20 19:55:48 2007 -0700
XDarwin: build fix for X11.app
commit 5b08932bfbb7e4612733fffd2acc9682c6856d90
Author: Ben Byer <bbyer@bbyer.apple.com>
Date: Thu Sep 20 19:27:31 2007 -0700
XDarwin: pulling in Indirect GLX fixes from downstream
commit 742d5d6adc4d4a1b6fceeb3443d7931e107462f7
Author: Ben Byer <bbyer@bbyer.apple.com>
Date: Thu Sep 20 18:03:51 2007 -0700
XDarwin: Fixes to quartzKeyboard.c to prevent a crash using certain non-US keyboards
commit 374bd88d1025835fe36ca0ff6620eb1d3b0a06b0
Author: Ben Byer <bbyer@bbyer.apple.com>
Date: Thu Sep 20 16:50:49 2007 -0700
XDarwin: Merging misc changes from downstream.
The only functional changes in this patch are a removal of use of
Xtrans internals -- replaced by xcb, which doesn't seem to be used
elsewhere in the server? Pity.
Also, a fix to make all X11 windows pop to the front of the display
when the X11.app icon is clicked -- currently takes two clicks,
not sure why.
commit 3a965fdadccea7beff09a28c9c0ef4b4975eae38
Author: Aaron Plattner <aplattner@nvidia.com>
Date: Thu Sep 20 16:22:24 2007 -0700
Don't segfault on shutdown if we never managed to connect to dbus.
commit 50fa8722d35c12e5f0322cebe25faf99c39d4f50
Author: Aaron Plattner <aplattner@nvidia.com>
Date: Thu Sep 20 14:00:33 2007 -0700
Set noCompositeExtension to TRUE when failing to initialize the extension (e.g. when Xinerama is enabled).
commit a247886b082cea93fa8f8980616a9c388ba70111
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Thu Sep 20 13:06:38 2007 -0400
xace: add hooks + new access codes: XF86-Bigfont extension
commit f6532a81eec5f096e27285687964b77c17987f72
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Thu Sep 20 12:17:17 2007 -0400
xace: add hooks + new access codes: APPGROUP extension
commit 82f7195a628cc7ec94abc0cfe5bae2be8af443bc
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Thu Sep 20 09:17:09 2007 -0400
xace: modifications to ChangeWindowAttributes special case: separate
Receive and SetAttr. Refer to 963e69b8efc39369915e7f0c6f370ac0d5d2b60f
commit 661b1328cf992d8855552677a94d60de1d8ce942
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Thu Sep 20 08:41:26 2007 -0400
xace: add hooks + new access codes: SYNC extension
May need to revisit this extension in the future, depending on observed use.
commit 90bacdef723e1e49c72775144916750758d3568c
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Thu Sep 20 06:53:51 2007 -0400
xace: add hooks + new access codes: MIT-SHM extension
commit 12a18cc8903fac53c3c77b23dd8093187594a4f3
Author: David Nolden <david.nolden.git@art-master.de>
Date: Fri Sep 14 22:42:19 2007 +0200
compilation-fix in debug mode
commit e93cff52fed9074aa007c2e6ec6b578f69aef3cb
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Wed Sep 19 14:48:20 2007 -0400
xace: add hooks + new access codes: DOUBLE-BUFFER extension
commit 082c0f7fb34458ebb303cf875d1d75686eca25e6
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Wed Sep 19 13:59:35 2007 -0400
devPrivates rework: move devPrivates field in drawable structure types
to just below the DrawableRec. Wish there were a better way to do this
but it has to be in the same place for all drawable types.
commit 5b36b64192517e2470766ce7ff1d4dc04c936fad
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Wed Sep 19 11:11:54 2007 -0400
xace: add missing argument to hook call.
commit 963e69b8efc39369915e7f0c6f370ac0d5d2b60f
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Wed Sep 19 11:11:41 2007 -0400
xace: add special-case for just setting the event mask on a window,
this should only check "receive" permission, not "setattr" permission.
commit c140d20f4ade973496dcbbd06453402ef0c0e85c
Author: Ben Byer <bbyer@bbyer.local>
Date: Wed Sep 19 05:58:22 2007 -0700
XDarwin: mass change from using xorg-config.h to dix-config.h cuz we're not using the X.org ddx anymore
commit bcb5e3e6276ce9ae7a4dae7434cf2247764da078
Author: Ben Byer <bbyer@bbyer.local>
Date: Wed Sep 19 04:46:10 2007 -0700
XDARWIN: More fixes to Makefile.am
At least on my system (10.5 with the latest and greatest modules),
Xquartz now builds out of the box. It doesn't quite work yet, but
hey -- you have to start somewhere. ;)
commit 97c150b61bbe436453b05d3c07cd2173870aac40
Merge: 57907e0943 547ad2125e
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Wed Sep 19 07:25:55 2007 -0400
Merge branch 'master' into XACE-SELINUX
Conflicts:
afb/afbpntwin.c
afb/afbscrinit.c
afb/afbwindow.c
cfb/cfb.h
cfb/cfballpriv.c
cfb/cfbscrinit.c
cfb/cfbwindow.c
configure.ac
fb/wfbrename.h
hw/xfree86/xf4bpp/ppcIO.c
hw/xfree86/xf4bpp/ppcPntWin.c
hw/xfree86/xf4bpp/ppcWindow.c
hw/xfree86/xf8_32bpp/cfbscrinit.c
mfb/mfb.h
mfb/mfbpntwin.c
mfb/mfbscrinit.c
mfb/mfbwindow.c
mi/miexpose.c
Note: conflicts caused by devPrivates rework vs. paintwindow changes.
commit 5e209b21f3d6b3268fa7dab1e8df892d8352cc08
Author: Ben Byer <bbyer@bbyer.local>
Date: Wed Sep 19 03:44:46 2007 -0700
XNEST: removed obsolete hack to build under Darwin
commit 378c7ebef444cdc9ae62ebf05c7111088a0c4bc1
Author: Ben Byer <bbyer@bbyer.local>
Date: Wed Sep 19 03:43:40 2007 -0700
XVFB: Removed obsolete hack to build on Darwin
commit 7813392d1c9a38d01cfff17732278bb7798eee5d
Author: Ben Byer <bbyer@bbyer.local>
Date: Wed Sep 19 01:52:58 2007 -0700
XDarwin: changes to Makefile.am to use new conditionals
commit 170fc77d9e73151f5c1c1f0f04598b3497db4284
Author: Dodji Seketeli <dodji@openedhand.com>
Date: Wed Sep 19 09:54:09 2007 +0200
xserver: don't force DTRACE detection by default
this fixes a breakage caused by 7a4ec34e256bf36b041c011a083916ad75a1d8bc.
When running a non DTRACE aware system that is not darwin*, DTRACE was getting
required. Now it is not anymore.
commit 9b4f5157179a0d20756c16ea1f5130b171f72bb1
Author: Ben Byer <bbyer@bbyer.apple.com>
Date: Tue Sep 18 21:40:32 2007 -0700
XDarwin: We build many many different targets, let's break them out into autoconf conditionals
commit 7a4ec34e256bf36b041c011a083916ad75a1d8bc
Author: Ben Byer <bbyer@bbyer.apple.com>
Date: Tue Sep 18 20:37:09 2007 -0700
XDarwin: Disable dtrace support on Darwin 9 (since it doesn't work ... yet ...)
commit 3c19ec47b434d4ca84db58363cc053cc0b6aa413
Author: Ben Byer <bbyer@bbyer.apple.com>
Date: Tue Sep 18 20:15:44 2007 -0700
XDarwin: changed XF86BigFont support default from yes to auto so XDarwin can disable it
commit 547ad2125ece93bbe01f6d09a3baf176ebd16bb3
Author: Michel Dänzer <michel@tungstengraphics.com>
Date: Mon Sep 17 20:33:56 2007 +0200
EXA: Make sure driver hooks get correct offscreen offsets from exaCopyDirty.
This should ensure the driver UploadTo/DownloadFromScreen hooks can always
work as intended.
commit 56cc24ffb21f7fd41f9ea9e8f969aa85021b9f53
Author: Alan Hourihane <alanh@tungstengraphics.com>
Date: Mon Sep 17 20:33:56 2007 +0200
EXA: Don't crash in ExaCheckPolyArc.
See https://bugs.freedesktop.org/show_bug.cgi?id=12286 .
commit 7ac89060e02c7a803018afd580720f8326561fd8
Author: Michel Dänzer <michel@tungstengraphics.com>
Date: Mon Sep 17 20:33:55 2007 +0200
EXA: Don't crash in exaGetImage when swapped out.
commit 3876c6c80534a6f7412ec806a2ba9ada22c5e505
Author: Tilman Sauerbeck <tilman@code-monkey.de>
Date: Mon Sep 17 18:47:45 2007 +0200
EXA: Fixed compiler warnings.
commit d5738ff2e0f93df4729c075ce31a1041d580e50e
Author: Tilman Sauerbeck <tilman@code-monkey.de>
Date: Mon Sep 17 16:59:03 2007 +0200
EXA: Added missing exaPrepare/FinishAccess calls in ExaCheckPushPixels.
commit a0dafd95e1e13a2f1b77ab9f82fd365a7be19de5
Author: Tilman Sauerbeck <tilman@code-monkey.de>
Date: Mon Sep 17 16:45:20 2007 +0200
Removed hw/xwin/winpntwin.c from Makefile.am.
winpntwin.c was removed in e4d11e58ce349dfe6af2f73ff341317f9b39684c.
commit 7bd65577018a574970b767b67967b65fcd5c2bf0
Author: Tilman Sauerbeck <tilman@code-monkey.de>
Date: Sat Sep 15 14:01:57 2007 +0200
Initialize output->pendingProperties.
commit b9f7aeb20015290a8acf938a11bf9272bf3527cf
Merge: e4d11e58ce 06d27f8045
Author: Eric Anholt <eric@anholt.net>
Date: Thu Sep 13 00:15:45 2007 +0000
Merge remote branch 'origin/master' into paint-window
Conflicts:
mi/miexpose.c
commit e4d11e58ce349dfe6af2f73ff341317f9b39684c
Author: Eric Anholt <eric@anholt.net>
Date: Wed Sep 12 13:58:46 2007 +0000
Remove the PaintWindow optimization.
This was an attempt to avoid scratch gc creation and validation for paintwin
because that was expensive. This is not the case in current servers, and the
danger of failure to implement it correctly (as seen in all previous
implementations) is high enough to justify removing it. No performance
difference detected with x11perf -create -move -resize -circulate on Xvfb.
Leave the screen hooks for PaintWindow* in for now to avoid ABI change.
commit 06d27f8045966c1fb154eafaff308a01b93f265b
Author: Keith Packard <keithp@koto.keithp.com>
Date: Wed Sep 12 23:57:30 2007 +0100
Try again to fix drawable and tile offsets in miPaintWindow
Many coordinate spaces are hard. Let's go drinking.
commit dd3992eb86377684a5dbe86fa19c756a9e53cda2
Author: Keith Packard <keithp@koto.keithp.com>
Date: Wed Sep 12 22:39:31 2007 +0100
miPaintWindow draw to window for background.
Instead of drawing to window pixmap for everything, draw to window for
background as that works for Xnest and Xdmx; draw to pixmap for borders
which neither of those X servers use.
commit 6da39c67905500ab2db00a45cda4a9f756cdde96
Author: Eric Anholt <eric@anholt.net>
Date: Wed Sep 12 13:23:13 2007 +0000
Fix build on FreeBSD after Popen changes.
commit 257c8ed17f4f908e0d0d5e53aaf13aa3b1313f50
Author: Keith Packard <keithp@koto.keithp.com>
Date: Wed Sep 12 12:11:49 2007 +0100
Rewrite miPaintWindow to draw to window pixmap.
miPaintWindow was drawing to the root window, or (sometimes) drawing to the
window after smashing the window clip list. This is losing, and easily fixed
by just drawing to the window pixmap.
commit 43dc41034735d84765233a78bd619f3f0e7ace75
Author: Brice Goglin <bgoglin@debian.org>
Date: Wed Sep 12 01:43:37 2007 +0200
Replace a non-ascii char with the corresponding groff escape in exa.man.pre
commit a5b8053606d6e786cdcf6734f271acc05f9cc588
Author: Adam Jackson <ajax@benzedrine.nwnk.net>
Date: Tue Sep 11 11:37:06 2007 -0400
Ignore - not just block - SIGALRM around Popen()/Pclose().
Because our "popen" implementation uses stdio, and because nobody's stdio
library is capable of surviving signals, we need to make absolutely sure
that we hide the SIGALRM from the smart scheduler. Otherwise, when you
open a menu in openoffice, and it recompiles XKB to deal with the
accelerators, and you popen xkbcomp because we suck, then the scheduler
will tell you you're taking forever doing something stupid, and the
wait() code will get confused, and input will hang and your CPU usage
slams to 100%. Down, not across.
commit 2e3e08d31e908ceadeef16d6069cdaf8c61d7ed1
Author: Dodji Seketeli <dodji@openedhand.com>
Date: Tue Sep 11 08:50:41 2007 +0200
xserver: test presence of strlcpy in configure
* configure.ac: define HAVE_STRLCPY when function strlcat is present
this serves at least to unbreak libxtrans code compilation.
commit e8c73ac697aa472e10b4d8c093a715df0bf545af
Author: Dodji Seketeli <dodji@openedhand.com>
Date: Tue Sep 11 00:20:45 2007 +0200
Xephyr: fix compilation breakage.
* hw/kdrive/ephyr/ephyr_draw.c:
(exaDDXDriverInit): pExaScr->hideOffscreenPixmapData does not exist
anymore, so don't set it.
commit 321e0a21600e418bbeb164043a9a21a0ff80cbe9
Author: Ben Byer <bbyer@bbyer.local>
Date: Sun Sep 9 16:28:41 2007 -0700
fixed cut-and-paste typo
commit 0ff273fd1e2ea7242b3e6c5effb2a623ef32ec6f
Author: Ben Byer <bbyer@bbyer.apple.com>
Date: Thu Sep 6 18:52:26 2007 -0700
XDARWIN: fixes to make Xquartz build again
commit f8637137ab43818d45d249b337820cbf427a05ec
Author: Ben Byer <bbyer@bbyer.local>
Date: Thu Sep 6 05:39:57 2007 -0700
XDARWIN: build fix for quartz/pseudoramiX.c
commit e8093e15c7df7a3d5a9717bc9d7d7517b0743f29
Author: Michel Dänzer <michel@tungstengraphics.com>
Date: Mon Sep 3 13:52:29 2007 +0200
EXA: Exclude bits that will be overwritten from migration in exaCopyNtoN.
Also plug a region leak in exaPolyFillRect.
commit e81af8ba643df3be53b0a46d9d4a0eaf21557c9e
Author: Michel Dänzer <michel@tungstengraphics.com>
Date: Mon Sep 3 13:14:29 2007 +0200
EXA: exaFillRegion{Solid,Tiled} improvements.
Use region to exclude bits that will be overwritten from migration.
Also make exaFillRegionSolid use the same logic as exaFillRegionTiled.
commit 5f7da4da8de7449e1c2a4c679632a0b2a5858b7e
Author: Michel Dänzer <michel@tungstengraphics.com>
Date: Fri Aug 31 16:59:28 2007 +0200
EXA: Use exaShmPutImage for pushing glyphs to scratch pixmap in exaGlyphs.
commit be922b30486abce3a8c13996d579b211a7b56f0e
Author: Michel Dänzer <michel@tungstengraphics.com>
Date: Thu Aug 30 13:59:07 2007 +0200
EXA: exa(Shm)PutImage improvements.
Improve exaShmPutImage performance and reuse its core in exaPutImage as it
seems faster than the previous code when the driver doesn't provide an
UploadToScreen hook.
Make sure all damage records are notified of the damage incurred by actual
ShmPutImage calls.
Remove superfluous manual damage tracking for actual PutImage calls.
commit ea92ea415665e294a1ba233e9a1d39b6daa0cee1
Author: Michel Dänzer <michel@tungstengraphics.com>
Date: Thu Aug 30 13:54:18 2007 +0200
EXA: exaGetImage improvements.
Use the new migration infrastructure to cache FB bits we need in the system
copy, for the benefit of repeated calls.
commit aa2ed73e0ec881947c969b67269e3206da4de359
Author: Michel Dänzer <michel@tungstengraphics.com>
Date: Thu Aug 30 13:50:42 2007 +0200
EXA: Remove superfluous manual damage tracking.
These should all be covered by damage wrappers.
commit a634c9b03494ba80aeec28be19662ac96657cc23
Author: Michel Dänzer <michel@tungstengraphics.com>
Date: Thu Aug 30 13:48:03 2007 +0200
EXA: RENDER improvements.
Exclude bits that will be overwritten from migration.
Use exaGlyphs even when Composite can't be accelerated, to avoid PolyFillRect
roundtrip via offscreen memory.
Initialize mask pixmap in exaGlyphs in FB in addition to system if the driver
provides Composite hooks to avoid migration overhead.
Remove manual damage tracking where superfluous.
commit 1f457ff3db24178eefecfbbf177aaf6554adb204
Author: Michel Dänzer <michel@tungstengraphics.com>
Date: Thu Aug 30 13:44:20 2007 +0200
EXA: Improvements for 1x1 pixmaps.
Initialize system and FB copy in exaFillRegionSolid and adapt
exaGetPixmapFirstPixel to the new migration infrastructure.
This should mostly eliminate migration overhead for these, whether they are
used for acceleration or fallbacks.
commit 489bc7551ffc7360ba9648ca5c98b59c7e7a1fd1
Author: Michel Dänzer <michel@tungstengraphics.com>
Date: Thu Aug 30 13:37:53 2007 +0200
EXA: exaImageGlyphBlt improvements.
As we can't actually accelerate anything interesting here, just migrate out
once and call fbSolidBoxClipped instead of taking a round trip via offscreen
memory with exaSolidBoxClipped.
Reuse pending damage region for extents and to prevent any actual migration of
pixmap contents when we're overwriting the whole pending damage region.
Remove superfluous manual damage tracking.
commit 2e0895a4ba27c1308713022820444c8f57f7a69f
Author: Michel Dänzer <michel@tungstengraphics.com>
Date: Thu Aug 30 13:30:03 2007 +0200
EXA: Improvements for trapezoids and triangles.
Only migrate once in exaTrapezoids/Triangles instead of every time in
exaRasterizeTrapezoid/AddTriangles. Adapt manual damage tracking to new
infrastructure.
Also move definition of NeedsComponent() closer to where it's used.
commit 6c9d7ed61bc4a19d21c53717b8af3d90b5d82ca9
Author: Michel Dänzer <michel@tungstengraphics.com>
Date: Thu Sep 6 13:10:16 2007 +0200
EXA: Hide pixmap pointer outside of exaPrepare/FinishAccess whenever possible.
We finally want to catch all cases where the pixmap pointer is dereferenced
outside of exaPrepare/FinishAccess.
Also fix a couple of such cases exposed by this change.
commit 962eddd7a2863a8475f5fd8107d3112df08d1172
Author: Michel Dänzer <michel@tungstengraphics.com>
Date: Wed Aug 29 19:55:22 2007 +0200
EXA: Support partial migration of pixmap contents between Sys and FB.
The initiator of migration can pass in a region that defines the relevant area
of each source pixmap or the irrelevant area of the destination pixmap. By
default, the pending damage region is assumed relevant for the destination
pixmap, and everything for source pixmaps.
Thanks to Jarno Manninen for reassuring me that my own ideas for this were
feasible and for providing additional ideas.
commit f27931bdd26fc9a1e6bb5173b5537e32c51a98b3
Author: Michel Dänzer <michel@tungstengraphics.com>
Date: Wed Aug 29 19:41:52 2007 +0200
Add DamagePendingRegion.
DamagePendingRegion returns a pointer to the region of a drawable that will
be damaged by the current operation for damage records that chose to get damage
reported only at the end of the operation.
commit 5c7ee3f47fa0c067102a17dee3f75a51cc0bdb3a
Author: Michel Dänzer <michel@tungstengraphics.com>
Date: Fri Aug 24 19:24:18 2007 +0200
EXA: Track valid bits in Sys and FB separately.
Also consolidate exaCopyDirtyToFb/Sys.
commit 8cfcf9973c765f11d1b45b95b8091ef7e01d7f01
Author: Michel Dänzer <michel@tungstengraphics.com>
Date: Wed Sep 5 20:10:09 2007 +0200
EXA: Migrate out pixmap in exaPrepareAccess.
Also fix exaFinishAccessGC not to use the same index for tile and stipple.
commit e510a77ba4d65d5d6ead514cd698f1b1e3f8a2b6
Author: Dave Airlie <airlied@linux.ie>
Date: Tue Jul 17 17:16:51 2007 +1000
EXA: Add a couple of missing exaPrepare/FinishAccess calls.
commit 72b347e681f5667b68257822e7cec02ab4c9cb6d
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Fri Sep 7 14:31:19 2007 +0930
dix: Enabling devices must not overwrite existing sprites/pairing.
EnableDevices is (amongst others )called after a VT switch. We must not create
a new sprite or re-pair the device, otherwise we lose the input device setup
that we had before the VT switch.
This requires the devices to be in exactly the same order as before
the VT switch. Removing a device while on a different VT is probably a bad
idea.
commit 57907e0943da0c3fd3bf6c128d210b544629ce72
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Thu Sep 6 16:55:51 2007 -0400
devPrivates rework: register an offset for every resource type, use
signed values so -1 actually works correctly, and provide a macro for
adding an offset to a pointer.
commit 84eb7e62248ddc2761af8cefe33d1b7147477528
Author: Alan Hourihane <alanh@fairlite.demon.co.uk>
Date: Thu Sep 6 13:36:37 2007 +0100
Fix Xdmx build
commit 35ec8b89f4cdf5ec48b292d47b2dad42d2fb9534
Author: Ben Byer <bbyer@bbyer.local>
Date: Thu Sep 6 05:34:14 2007 -0700
DDX changes for XDarwin
Creating a real DDX section for XDarwin instead of
stuffing it into the XORG section in a half-assed manner.
commit d627061b48ae06d27b37be209d67a3f4f2388dd3
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Thu Sep 6 18:57:00 2007 +0930
xfree86: wrap keyboard devices for XKB.
Call ProcessOtherEvents first, then for all keyboard devices let them be
wrapped by XKB. This way all XI events will go through XKB.
Note that the VCK is still not wrapped, so core events will bypass XKB.
commit 5ee409794ee604fcf84886f70429fc2d6b1ff4f1
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Thu Sep 6 18:52:02 2007 +0930
dix: add XI event support to FixKeyState.
FixKeyState needs to be able to handle XI events, otherwise we get "impossible
keyboard events" on server zaps and other special key combos.
commit 6334d4e7be18de5f237c12a6dc20f75aa23477d0
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Thu Sep 6 18:49:57 2007 +0930
xkb: enable XI event processing for xkb.
XI events can now take the same processing paths as core events, and should do
the correct state changes etc.
There's some cases where XKB will use KeyPress as type for an event to be
delivered to the client. Stuck warnings in, not sure what the correct solution
is yet.
commit 49dbe9a757a3d7a0b9ab318242c6cc0cbd4dd1f0
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Thu Sep 6 17:27:28 2007 +0930
dix: close virtual core devices after other devices.
If a device is paired with the VCP, deleting the VCP before the device will
segfault the server when the sprite should get updated.
commit 03680a384aa423ece75b658f00b96db2628c39fa
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Thu Sep 6 15:43:47 2007 +0930
dix: don't change the device struct while processing core events.
The device state needs to be changed while processing the XI event. Core
events are always processed after XI, so by then the device is already set up
properly. However, we now rely on DeviceButtonMotionMask to be equal to
ButtonMotionMask. It already is, but stick a big fat warning in so nobody
attempts to change it.
This commit disables XKB for the VCK, thus essentially for all devices.
Temporarily anyway.
commit f3f614cd01ae56d84d61b4f5c907c6edd7c8c6d3
Author: Ben Byer <bbyer@bbyer.local>
Date: Wed Sep 5 20:34:00 2007 -0700
Revert "configure.ac: exclude pci-access dependency from XDarwin"
This reverts commit 20c6677d1b5f8d77325dd878ffa3df1d0fb01864.
commit bf1641b94cffa54b786e18eaeff3839d8790b9f2
Author: Ben Byer <bbyer@bbyer.local>
Date: Wed Sep 5 20:33:43 2007 -0700
XDARWIN: Add launchd support
This adds a bit of glue to configure.ac to support launchd detection;
on OS X (or other platforms which choose to implement launchd), this allows
the system to automagically start the Xserver as necessary to serve clients.
commit 71c21dea748ea0dcad758679c40ee39192d170f9
Author: Ben Byer <bbyer@bbyer.apple.com>
Date: Wed Sep 5 18:45:50 2007 -0700
added HAVE_LAUNCHD check to configure.ac (mostly for OSX)
commit 81c28ffd2b13a83770eadcfd7829d35d319d637f
Author: Daniel Stone <daniel@fooishbar.org>
Date: Wed Sep 5 17:46:23 2007 -0700
Fix key repeats during VT switch.
Add keyc->postdown, which represents the key state as of the last mieqEnqueue
call, and use it when we need to know the posted state, instead of the
processed state (keyc->down). Add small functions to getevents.c to query and
modify key state in postdown and use them all through, eliminating previously
broken uses.
commit e332335241af28ef0ab66b102d0cbc4e5c73ac68
Merge: 7381e9149e accd71bda6
Author: Ben Byer <bbyer@bbyer.apple.com>
Date: Wed Sep 5 15:51:23 2007 -0700
Merge branch 'master' of ssh://git.freedesktop.org/git/xorg/xserver
commit 7381e9149e3cbb7e672070781a16e3f096202be9
Author: Ben Byer <bbyer@bbyer.apple.com>
Date: Wed Sep 5 15:51:11 2007 -0700
added an exclusion for setting XORG on darwin
commit accd71bda6f958ea6892ad3a10879232d345774c
Author: Keith Packard <keithp@koto.keithp.com>
Date: Wed Sep 5 14:19:19 2007 -0700
Deliver correct event when releasing keys on VT switch.
In commit 41bb9fce47f6366cc3f7d45790f7883f74289b5a, the event delivery loop
for Xinput enabled keyboards was changed and accidentally used the wrong
index variable, causing random events to be delivered when returning from VT
switch.
In addition, in commit aeba855b07832354f59678e20cc29a085e42bd99,
SIGIO was blocked during delivery of these events, but not for the entire
period the xf86Events array was being used. Block SIGIO for the whole loop
to avoid other event delivery from trashing the key release events.
(cherry picked from commit aa7ed1f5f35cd043bc38d985500aa0a32e857e84)
commit 8b77dc7e808f61f1ed10fe05cf898bb47459a76d
Author: Ben Byer <bbyer@bbyer.apple.com>
Date: Wed Sep 5 14:48:38 2007 -0700
XDARWIN: build breakage fix
commit 20c6677d1b5f8d77325dd878ffa3df1d0fb01864
Author: Ben Byer <bbyer@bbyer.apple.com>
Date: Wed Sep 5 14:31:01 2007 -0700
configure.ac: exclude pci-access dependency from XDarwin
XDarwin doesn't need any of this pci stuff since it doesn't talk directly to hardware,
so it doesn't make sense to require it when building on OSX/Darwin.
commit ff01e44e33fd072958fb0157dae072f1b1c88944
Merge: 8ba8c16af7 47300ed2be
Author: Ben Byer <bbyer@bbyer.apple.com>
Date: Wed Sep 5 13:56:08 2007 -0700
Merge branch 'master' of ssh://git.freedesktop.org/git/xorg/xserver
commit 8ba8c16af773ec83a0b1c0661a23d746b401944e
Author: Ben Byer <bbyer@bbyer.apple.com>
Date: Wed Sep 5 13:46:30 2007 -0700
build fixes for XDarwin
commit 47300ed2be59d0ba7ea9345b954bf3104877c095
Author: Eric Anholt <eric@anholt.net>
Date: Wed Sep 5 12:34:29 2007 -0700
Fix server version reporting to be the server package version.
Previously, the server version reported by xdpyinfo and Xorg -version would
bear some vague resemblance to a X.Org katamari version, but in the presence
of modularization (and client-server relationships with different katamari
versions on each side) those numbers don't really make sense. Instead, just
report the package version.
When branching a stable branch, master's version should be immediately updated
to the endpoint of the stable branch plus a snapshot of 1 (for example,
1.4.0.1 after server-1.4-branch). The stable branch should then be changed to
RC0 at that time (1.3.99.0, for example).
This scheme was partially attempted for server 1.3, but lacked the appropriate
master updates, thus why it had to be revisited now. While here, we can also
remove a lot of versioning complexity since everything is based on the package
version.
commit 6c89d1237c4fdce961b30a8eaee964af5d56565e
Author: Dodji Seketeli <dodji@openedhand.com>
Date: Wed Sep 5 17:46:49 2007 +0200
Kdrive: unbreak kdrive linking
* configure.ac: re-sort Kdrive libs so that symbols get properly resolved.
Basically, all some libs are present in both $KDRIVE_LIBS and $XSERVER_LIBS,
and some libs orders are not correct. So I made sure Kdrive servers don't have
to link against $KDRIVE_LIBS *and* $XSERVER_LIBS. They just have to link
against $KDRIVE_LIBS now.
* hw/kdrive/*/Makefile.am: update those makefile to reflect the change in configure.ac
commit 0003ccfcdfae1b473aa024342304b84256d378b9
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Wed Sep 5 11:18:36 2007 -0400
xace: add new fields to resource access hook to allow parent resource objects
to be passed in at create time. Also added a missing devPrivates initializer.
commit 28e48cd8e6e4c412a49d7177daad6d3c93c28e08
Author: Ben Byer <bbyer@bbyer.local>
Date: Wed Sep 5 04:43:17 2007 -0700
Another pathname fix for event_status_driver.h
commit b6c0697fd67323893a9ad3676c33f2f1ec48e15e
Author: Ben Byer <bbyer@bbyer.local>
Date: Wed Sep 5 04:40:03 2007 -0700
fixed path for event_status_driver.h
(The path currently used is deprecated on Tiger and invalid on Leopard.)
commit c4fff050836feeef8390b7197f1de39af2997811
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Wed Sep 5 16:19:45 2007 +0930
Revert "Input: Fix stuck modifiers (bug #11683)"
This reverts commit 6b055e5d9751e3679ff98065e43225ec8a960053.
MPX relies on the XI event being delivered before the core event. Device grabs
break, amongst other things. I guess stuck modifiers need to be fixed some
other way.
Conflicts:
dix/getevents.c
commit bfe6b4d2d9952a80f8dbc63eec974ef894e5c226
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Tue Sep 4 17:44:51 2007 +0930
xkb: Store the action filters per device in the XkbSrvInfoRec.
Using a global array for action filters is bad. If two keyboard hit a modifier
at the same time, releaseing the first one will deactivate the filter and
thus the second keyboard can never release the modifier again.
commit cc5c926267be099d793e6dfec17916f21c73c64d
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Thu Aug 30 15:51:22 2007 +0930
randr: RRPointerScreenConfigured needs to move all pointers.
Previous version only moved the VCP, causing "bogus pointer events" lateron.
Now we run through the device list, updating each pointer separately if
necessary.
Also stick a big warning into RRPointerMoved, not sure what device we need to
work on here.
commit 136fde2c7b5ed590bc6c63d11ede31e92dc679a2
Author: Ademar de Souza Reis Jr <ademar@mandriva.com.br>
Date: Tue Jul 3 13:44:28 2007 -0300
Add Xserver man section about catalogue:<dir> FPE
catalogue:<dir> FPEs were introduced in libXfont 1.2.9
commit eb6a933dc60bec5601260794eeb973e946af37b6
Author: Ademar de Souza Reis Jr <ademar@mandriva.com.br>
Date: Tue Jul 3 13:44:03 2007 -0300
Add xorg.conf man section about catalogue:<dir> FPE
catalogue:<dir> FPEs were introduced in libXfont 1.2.9
commit 205183a733237ea418a25c7423b689fcc8eae628
Author: Eric Anholt <eric@anholt.net>
Date: Tue Sep 4 16:19:22 2007 -0700
Fix driver build by including an appropriate Requires.private line on pixman.
We'd previously been substituting PIXMAN_CFLAGS, but we've got a better tool
now, plus I deleted the PIXMAN_CFLAGS substitution without noticing.
commit d67e210f3458b62d7d4a6032aabfda0004d661c1
Author: Gerte Hoogewerf <g.hoogewerf@gmail.com>
Date: Tue Sep 4 16:09:38 2007 -0700
Add stub symbols to make xprint build.
commit f7f79724fdea0cc6fda0e90e56431df937d49335
Author: Eric Anholt <eric@anholt.net>
Date: Tue Sep 4 15:10:49 2007 -0700
Increase despair by fixing xprint build after my _DEPENDENCIES changes.
commit e89d16be07e45e487913509788a9e8cb1ee09bc7
Author: Ian Romanick <idr@us.ibm.com>
Date: Tue Sep 4 14:49:49 2007 -0700
Revert part of 529acb175440969af9d7fa38aab8d7dea0dc2661 because libtool is smart.
commit bf5948518763b5e21eff806a0a9abc5f7757fa10
Merge: 4062db4020 735da3dcd0
Author: Matthieu Herrb <matthieu@bluenote.herrb.com>
Date: Tue Sep 4 22:40:31 2007 +0200
Merge branch 'master' of git+ssh://herrb@git.freedesktop.org/git/xorg/xserver
commit 4062db4020c671fc0921a3a4e7fe5d8dc1be2e1d
Author: Matthieu Herrb <matthieu@bluenote.herrb.com>
Date: Tue Sep 4 22:39:14 2007 +0200
typo in comment
commit ce9e83d913511fe619da42f805d7bcd1a2a60d90
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Tue Sep 4 14:01:55 2007 -0400
xace: add hooks + new access codes: Damage extension
commit 735da3dcd09f59c40f68eca8c9a91c2e826cd1b9
Author: Egbert Eich <eich@freedesktop.org>
Date: Tue Sep 4 16:42:57 2007 +0200
Fixing xf86I2CGetScreenBuses(), now dereferencing the correct pointer.
commit 7c5de093d499de63d39fe038d86da0a085262017
Author: Egbert Eich <eich@freedesktop.org>
Date: Tue Sep 4 15:07:17 2007 +0200
Fixing sig11 in xf86I2CGetScreenBuses().
Dereferencing a pointer once too often caused a
sig11 in xf86I2CGetScreenBuses().
commit 9adea807038b64292403ede982075fe1dcfd4c9a
Author: Hong Liu <hong.liu@intel.com>
Date: Tue Sep 4 08:46:46 2007 +0100
bgPixel (unsigned long) is 64-bit on x86_64, so -1 != 0xffffffff
This patch should fix bug 8080.
commit 529acb175440969af9d7fa38aab8d7dea0dc2661
Author: Eric Anholt <eric@anholt.net>
Date: Sun Sep 2 15:16:01 2007 -0700
Fix Xorg build by listing circular dependency libraries twice.
One of these I introduced by listing dix and mi in the same library list to
simplify other servers. The other had been hacked around using libosandcommon,
which is now gone.
commit c56930e6ca90a61d2f4cbd845f7d0a51a66f83cb
Author: Eric Anholt <eric@anholt.net>
Date: Fri Aug 31 18:27:41 2007 -0700
Remove backend.[ch] from neomagic to fix distcheck.
commit f98dfec79dadb70fa7bba84e7335f92b3a73dc02
Author: Keith Packard <keithp@koto.keithp.com>
Date: Sat Sep 1 21:14:22 2007 -0700
[COMPOSITE] Composite used for pixmap population on redirect. (Bug #7447)
compNewPixmap copies bits from the parent window to the redirected child
pixmap to populate the pixmap with reasonable data. It cannot always use
CopyArea as that only works across matching depths. Use Composite when
the depths do not match.
commit 1afdf8b0a92437dffe84fa98b6083b3d8fd55e27
Author: Adam Jackson <ajax@redhat.com>
Date: Fri Aug 31 22:11:13 2007 -0700
[RANDR] Don't mark Xinerama as active if no crtcs are enabled. (bug #11504).
Clients expect any Xinerama-enabled screen to report at least one
monitor, but with RandR, there may not be any enabled crtcs. In this case,
tell the client that Xinerama is not active.
commit 0dc2bb6101704d0fd25f36e2c3df79687f119f5b
Author: Marius Gedminas <mgedmin@b4net.lt>
Date: Fri Aug 31 21:36:37 2007 -0700
[RANDR] Compare only milliseconds of config time. (Bug #6502)
The timestamp transferred in the X protocol is a 32-bit number of
milliseconds.
The timestamp stored in the server is a structure that contains two fields:
months (!) and milliseconds.
When the server passes the config timestamp to the client, it discards the
months part and sends only the milliseconds part.
When the server receives the config timestamp from the client, it tries to
guess the "months" part by looking at the current time and then maybe adding
or
subtracting one. The guess is wrong after the server has been running long
enough (several hours).
I have added two ErrorF calls around the 'if' statement that returns
RRSetConfigInvalidConfigTimestamp in randr/randr.c and my Xorg.0.log has
this:
randr request got good config time: 0:-2103495671
for the first few successful xrandr calls, and
randr request failed with RRSetConfigInvalidConfigTime: client passed
1:-2103495671, server has 0:-2103495671
when it fails. The server has been running for 8 and a half hours.
The obvious fix would be to ignore the months field and only compare the
milliseconds.
commit 07630d897ef37cad8b79d073d9edc891d5a7bddd
Author: Eric Anholt <eric@anholt.net>
Date: Fri Aug 31 15:16:01 2007 -0700
Bug #7364: Require renderproto 0.9.3 on 64-bit, and fix build with it.
commit ca82d4bddf235c9b68d51d68636bab40eafb9889
Author: Eric Anholt <eric@anholt.net>
Date: Fri Aug 31 13:00:23 2007 -0700
Bug #7186: Fix an excessive request size limitation that broke big-requests.
MAXBUFSIZE appears to be a leftover of some previous time. Instead, just
use maxBigRequestSize when bigreqs are available (limiting buffers to ~16MB).
When bigreqs are not available, needed won't be larger than the maximum
size of a non-bigreqs request (256kB).
commit a02db0d500cac20d0f0f107d27c064a175018421
Author: Eric Anholt <eric@anholt.net>
Date: Fri Aug 31 12:24:07 2007 -0700
Convert servers to using _DEPENDENCIES to ensure proper rebuilds.
This cleans up server Makefile.ams a little bit, but also means that people
messing with configure.ac need to be careful with whether they put libraries
in the _LIBS or _SYS_LIBS targets. Hopefully the comment in configure.ac will
clarify the issues.
commit c9ceb4878063ca22487c708d9d1f86e367f2cec8
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Fri Aug 31 11:03:54 2007 -0400
xace: add hooks + new access codes: Composite extension
commit fd04b983db6a70bf747abe02ca07c1fbbaae6343
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Fri Aug 31 09:55:27 2007 -0400
xace: add hooks + new access codes: Render extension
commit 3f42af8c0ef1e5379bc836f589e0cbee43c02ac5
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Thu Aug 30 18:22:12 2007 +0930
config: Use [config/dbus] consistently for error messages.
commit 0fcde83d94507eadd9f99d4e6a63584b221c989c
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Thu Aug 30 18:20:20 2007 +0930
config: return BadValue to caller if add/remove doesn't have parameters.
If message iterator cannot be created, the caller didn't supply any
parameters. Return BadValue, instead of dying a horrible death while being
stuck in an endless loop.
commit 87495fc7064d5e0a7575a0713b6895a4172df0fa
Author: Alan Hourihane <alanh@fairlite.demon.co.uk>
Date: Thu Aug 30 21:57:41 2007 +0100
Allow yres_virtual to be greater for some kernel fbdev drivers.
(temporary fix for older fbdev drivers)
commit 1005b29cc6939851b40397cc9cd0de9476ad3046
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Thu Aug 30 14:48:24 2007 -0400
xace: Correct some access modes.
commit d8ab2353cbd7694b556b7b9d550104dc8c460a1b
Author: Eric Anholt <eric@anholt.net>
Date: Thu Aug 30 10:39:53 2007 -0700
Remove dead xf86GetPciSizeFromOS and xf86GetPciOffsetFromOS.
commit c2d80529fc7f514d80cf3cbed6f580cb999aca1b
Author: Eric Anholt <eric@anholt.net>
Date: Thu Aug 30 10:20:55 2007 -0700
Remove the now-dead PciAvoid symbol.
commit 53f346b158fa8e10de5a8777fa6d8d86f918878b
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Thu Aug 30 13:20:04 2007 -0400
xace: add hooks + new access codes: SHAPE extension
commit 766c693ef3637ee6fc402df594060ed2c1346761
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Thu Aug 30 13:06:28 2007 -0400
xace: add hooks + new access codes: MIT-SCREEN-SAVER extension
commit cda92bbf12107865e93c03c71b901ef51466dc31
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Thu Aug 30 11:48:45 2007 -0400
xace: add hooks + new access codes: XFixes extension.
Required a new name argument to the selection access hook to handle
XFixesSelectSelectionInput.
commit 47ab4d648b31ea1d5800e0bc84cf5f25025bffe3
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Thu Aug 30 11:40:39 2007 -0400
devPrivates rework: convert CursorRec and CursorBits over to new interface.
commit 1d11e4bc4ccb169fb23fc18583f0b648f0a6a4e0
Author: Egbert Eich <eich@freedesktop.org>
Date: Thu Aug 30 12:50:21 2007 +0200
Fixing a misleading comment which could suggest a GPL violation.
The author of the int10 code looked at the VBIOS POSTing code
in DOSEMU to get some initial idea on how to POST a VBIOS.
To give credit to the DOSEMU Team for this inspiration a comment
was added to the code which could suggest that code from the
GPLed DOSEMU was directly incorporated into this code.
This patch should clearify the situation.
commit 45efe85003195bd45501630cef08349abb180c3a
Author: Eric Anholt <eric@anholt.net>
Date: Wed Aug 29 16:05:51 2007 -0700
Remove stale changelogs from kdrive.
commit 5aaf00190157114780ab51f7268b396459ed1cad
Author: Eric Anholt <eric@anholt.net>
Date: Wed Aug 29 16:05:23 2007 -0700
Add more generated files to .gitignore.
commit 87295b66a972a2bd194a79af6aa4f715018fcded
Author: Eric Anholt <eric@anholt.net>
Date: Wed Aug 29 15:54:32 2007 -0700
Bug #9629: Remove badly-licensed neomagic kdrive files.
Licensing issues of these files include:
- They claim to be licensed under the GPL, yet we haven't allowed that in the
xserver repository in the past.
- They refer the user to the top of the tree for GPL license text, yet it isn't
there.
- They claim to be derived from the (MIT-licensed) ati kdrive code, yet don't
follow the licensing terms of those files.
commit 4795df62456b73c6790f271e0a20a83c60496490
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Wed Aug 29 14:40:10 2007 -0400
xace: add hooks + new access codes: TOG-CUP extension.
commit e39694789e31e221fc8dec44ace9c697daf7acad
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Wed Aug 29 14:16:46 2007 -0400
xace: drop map-window checking hook, add new hooks for controlling the
delivery of events to windows and clients.
This is tentative. It's likely that an additional last-resort hook will
be necessary for code that calls TryClientEvents or WriteEventsToClient
directly. It's also possible that new xace machinery will be necessary
to classify events and pull useful resource ID's out of them.
The failure case also needs some thinking through. Should event delivery
"succeed" or should it report undeliverable?
Finally, XKB appears to call WriteToClient to pass events. Sigh.
commit 41355a53c29bbf879da0c6ea562294fcc7ef89ff
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Tue Aug 28 15:10:20 2007 -0400
xace: add hooks + new access codes: core protocol input requests
commit adf46b57ce6c69ab13a38b09a8104c802d54d052
Author: Eric Anholt <eric@anholt.net>
Date: Tue Aug 28 10:08:38 2007 -0700
Replace BSD custom PCI code with a stub implementation thanks to pciaccess.
Note that pciaccess doesn't yet have Net/OpenBSD support, but the relevant
code should go there instead of disconnected code in the X Server.
While here, remove the now-disabled INCLUDE_XF86_NO_DOMAIN from the headers,
and un-disable xf8StdAccResFromOS for those OSes without domain support which
will need it.
commit 4017d3190234e189a0bbd33193a148d4d3c7556b
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Tue Aug 28 09:28:25 2007 -0400
devPrivates rework: since API is already broken, switch everything
over to new system.
Need to update documentation and address some remaining vestiges of
old system such as CursorRec structure, fb "offman" structure, and
FontRec privates.
commit 85547073265ae9bc4ae3af920a6d3214fd1ca0c5
Merge: 860a09cfb8 7d54399cfd
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Tue Aug 28 07:25:21 2007 -0400
Merge branch 'master' into XACE-SELINUX
Conflicts:
include/miscstruct.h
mi/mibstore.c
mi/midispcur.c
os/Makefile.am
commit 3fe67d23edaae3ddde20cd5f349aa5dfde1d26a3
Author: Eric Anholt <eric@anholt.net>
Date: Mon Aug 27 19:02:41 2007 -0700
Remove the BusAccWindows resource code which is now unused.
This was a bunch of poorly defined resource ranges per OS/platform combination
which were supposed to represent what regions could potentially have resources
allocated into them.
commit 9e2112b2b56af099a7f380ece9b5c1d25b20cce4
Author: Eric Anholt <eric@anholt.net>
Date: Mon Aug 27 18:50:34 2007 -0700
Remove unused xf8GetBlock and xf86GetSparse entry points.
commit 801c359574d08ff2d6ac75a3325ff522bc862e30
Author: Eric Anholt <eric@anholt.net>
Date: Mon Aug 27 15:46:05 2007 -0700
Fix fbdevhwstub for pci-rework.
commit 7d54399cfdaa7f54e28828267a76b89c4e8e798f
Author: Keith Packard <keithp@koto.keithp.com>
Date: Sun Aug 26 22:11:45 2007 -0700
Add XSERVER_LIBPCIACCESS to xorg-server.h when using libpciaccess
commit affda73a1d6e291516880dfbcb74b661374524c6
Author: Eugeniy Meshcheryakov <eugen@univ.kiev.ua>
Date: Mon Aug 27 00:41:03 2007 +1000
Xprint: fix handling of TrueType font name
Debian bug #272368
http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=272368
In certain locales, some characters from some TrueType fonts were not
appearing in the Xprint postscript output due to the font not being
identified in the postscript output.
commit 6f44a2c8a8d6e8f95681ebc7b2dd5ad9c3a02c6e
Author: Adam Jackson <ajax@benzedrine.nwnk.net>
Date: Sun Jul 29 14:16:10 2007 -0400
Refactor PictureInitIndexedFormats.
The plural version is now static, which is fine since it was only ever called
from within picture post-init anyway. The body of the work is now done with
a one-shot (public) function that operates on a single format at a time.
commit ae7f71a8b3d6756161e55d998d6eec37d2695c98
Author: Adam Jackson <ajax@benzedrine.nwnk.net>
Date: Sat Aug 25 15:08:20 2007 -0400
Implement core protocol backing store exclusively in terms of Composite.
Composite's automatic redirection is a more general mechanism than the
ad-hoc BS machinery, so it's much prettier to implement the one in terms
of the other. Composite now wraps ChangeWindowAttributes and activates
automatic redirection for windows with backing store requested. The old
backing store infrastructure is completely gutted: ABI-visible structures
retain the function pointers, but they never get called, and all the
open-coded conditionals throughout the DIX layer to implement BS are gone.
Note that this is still not a strictly complete implementation of backing
store, since Composite will throw the bits away on unmap and therefore
WhenMapped and Always hints are equivalent.
commit bf0883ae5081bd75569115a3eb27c6d3d336c9f2
Author: David Nusinow <dnusinow@debian.org>
Date: Sat Aug 25 14:53:17 2007 -0400
Fix bug in debugging info related to pci-rework merge
commit 4eed88af8b7b6881b44ccf9f4a5c5875af6d2b78
Author: Ian Romanick <idr@us.ibm.com>
Date: Fri Aug 24 18:06:50 2007 -0700
Remove files made obsolete by pci-rework.
commit 1ab4b3e183d04bb20fb5039f7d2671752ab24cf6
Author: Aaron Plattner <aplattner@nvidia.com>
Date: Fri Aug 24 16:00:31 2007 -0700
Bump video driver ABI for pci-rework.
commit 91f358336f77c0e4f577be65cca977d17298e36c
Merge: b9a806f0b3 8b6b40b727
Author: Ian Romanick <idr@us.ibm.com>
Date: Fri Aug 24 15:04:21 2007 -0700
Merge branch 'pci-rework'
commit b9a806f0b3d495c7616b469281e5892ae7f3f6b3
Author: Michel Dänzer <michel@tungstengraphics.com>
Date: Fri Aug 24 19:04:55 2007 +0200
exaPolyFillRect: pGC->alu doesn't matter with a single rectangle.
commit d0f0d1092c7587a02404e1db07740e6334462ba6
Author: Michel Dänzer <michel@tungstengraphics.com>
Date: Fri Aug 24 14:10:13 2007 +0200
exaGetImage: Don't migrate pixmap out of FB with no DownloadFromScreen hook.
Based on the assumption that GetImage is relatively rare, so the overhead of
the migration is probably bigger than any potential savings.
commit 5d9e2c282145897008d7d941e2a0a3fdc71f2373
Author: Michel Dänzer <michel@tungstengraphics.com>
Date: Fri Aug 24 14:03:14 2007 +0200
EXA: Improve ShmPutImage.
Share as much code with exaPutImage as possible, and fall back to fbShmPutImage
when that fails.
commit 6085522d91e875c0e1ab8d4300e7378701c19b7c
Author: Michel Dänzer <michel@tungstengraphics.com>
Date: Fri Aug 24 14:02:35 2007 +0200
Export fbShmPutImage to modules.
To be used by EXA.
commit c19f227b468d039c5ea136cc8a53c420da30263b
Author: Michel Dänzer <michel@tungstengraphics.com>
Date: Fri Aug 24 13:05:52 2007 +0200
EXA: Only mark offscreen memory as used when it really is.
commit 095850596114178119a8cc854716ce0cc6e05121
Author: Michel Dänzer <michel@tungstengraphics.com>
Date: Fri Aug 24 13:04:48 2007 +0200
__glXDRIbindTexImage: Fail if no texture bound to pixmap's texture target.
We would most likely crash somewhere in Mesa if we tried to continue in this
case.
commit 8b6b40b7271acd81a9548f502c18f46f3b640640
Merge: ab7a6d860d 3305d17195
Author: Ian Romanick <idr@us.ibm.com>
Date: Thu Aug 23 18:19:17 2007 -0700
Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver into pci-rework
Conflicts:
hw/xfree86/common/xf86.h
hw/xfree86/common/xf86Init.c
hw/xfree86/common/xf86pciBus.c
hw/xfree86/int10/generic.c
hw/xfree86/int10/helper_exec.c
hw/xfree86/loader/xf86sym.c
hw/xfree86/os-support/bus/Pci.c
hw/xfree86/os-support/bus/Pci.h
hw/xfree86/os-support/bus/linuxPci.c
hw/xfree86/os-support/linux/int10/linux.c
commit 93ae6fe18c417a22f1fccb22add4890a20cae713
Author: Carl Worth <cworth@cworth.org>
Date: Thu Aug 23 16:33:05 2007 -0700
Avoid leaking a Pixmap for every glyph
commit 3305d17195e3a0a5555300555bd7703312fa489f
Author: Matthieu Herrb <matthieu@deville.herrb.com>
Date: Thu Aug 23 22:48:19 2007 +0200
Fix indentation.
commit a66c0f1dca2958835ff65a5b50579e3304ed316a
Author: Matthieu Herrb <matthieu@bluenote.herrb.com>
Date: Thu Aug 23 22:11:56 2007 +0200
Remove an extra cast.
Thou should not apply patches manually without testing.
commit 12d27cf33c6d963eae77795c0d247175907162a5
Author: Otto Moerbeek <otto@openbsd.org>
Date: Thu Aug 23 21:59:25 2007 +0200
A high resolution device that's moving fast can potentially generate
an int overflow, making dx*dx+dy*dy negative. Now pow(negative,
non-integer) yields NaN, so you loose. Use fp math to avoid that.
commit ff089e6cae634ac3eb509abd448a250bcbb17275
Author: Brian Paul <brian.paul@tungstengraphics.com>
Date: Thu Aug 23 19:38:53 2007 +0200
glx: fix crash when freeing visuals
Don't set screen->num_vis to a value greater than the actual number of visuals.
X.Org Bug #10809 <http://bugs.freedesktop.org/show_bug.cgi?id=10809>
commit 943dd6ad99670c283a6869ea6c5f751acbd73134
Author: Søren Sandmann Pedersen <sandmann@redhat.com>
Date: Thu Aug 23 12:15:03 2007 -0400
Revert "Revert "Require pixman 0.9.5; Use pixman_image_set_source_clipping() to fix"" since the pixman changes have been pushed now.
This reverts commit 57f7f2a5327a2d967a726bb4706e4f6b2f4b2cea.
commit 13949f997289068354e83bc83e50d97b8232efb1
Author: Julien Cristau <jcristau@debian.org>
Date: Thu Aug 23 11:27:33 2007 +0200
Get rid of the type1 font module.
It is completely replaced by freetype these days.
commit 88a9828ef906bba973debc191e35ea669b7ec271
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Thu Aug 23 18:02:10 2007 +0930
dix: Only check device events for possible ACLs.
We shouldn't be able to restrict events like Expose, etc. with device based
ACLs. So we just ignore all non-input events when checking for permissions.
commit 76bf3cd7b8c6189b6b08518cde00c8bd991bdfb7
Author: Dave Airlie <airlied@redhat.com>
Date: Thu Aug 23 16:22:03 2007 +1000
randr: fixup crtc and output destroy
if you are moving pointers, you want to move the pointers not just a byte
commit 81f8b652d99ee0f7116c1e34aed0e585d23a91fb
Author: Alex Deucher <alex@botch2.(none)>
Date: Wed Aug 22 19:26:34 2007 -0400
Add _X_EXPORT to exported functions in hw/xfree86/modes/*
Also add missing exports to hw/xfree86/loader/xf86sym.c
commit 57f7f2a5327a2d967a726bb4706e4f6b2f4b2cea
Author: Eric Anholt <eric@anholt.net>
Date: Wed Aug 22 09:02:03 2007 -0700
Revert "Require pixman 0.9.5; Use pixman_image_set_source_clipping() to fix"
The corresponding pixman code hasn't been pushed, so revert until the code is
ready.
This reverts commit 53941c8e68014619d3ded7f8bc0f07d9a38bb9b1.
commit d0dc9698ae4324d44ed4c0482d6858d0b73bff33
Author: Eric Anholt <eric@anholt.net>
Date: Wed Aug 22 09:00:45 2007 -0700
Revert "Fix <pixman.h> include to <pixman/pixman.h>"
The pixman headers have been located under pixman-1/ instead of pixman/ since
around 2007-08-06, and pixman-1.pc has the updated include paths to account
for this.
This reverts commit feb1b3e45513bd6eaa2e6a5ee536183f20d9cb68.
commit bc2d516f16d94c805b4dfa8e5b9eef40ff0cbe98
Author: Eric Anholt <eric@anholt.net>
Date: Fri Aug 17 12:14:16 2007 -0700
Fix overly-restrictive integer overflow check in EXA pixmap creation.
The result was that at 32bpp, pixmaps of width 8192 or greater couldn't be
created, due to treating a pitch value as a width.
commit feb1b3e45513bd6eaa2e6a5ee536183f20d9cb68
Author: Alan Hourihane <alanh@fairlite.demon.co.uk>
Date: Wed Aug 22 16:54:29 2007 +0100
Fix <pixman.h> include to <pixman/pixman.h>
commit b6a7c0112c42a3287e53647c38b2c0c5bf8fefa0
Merge: 53941c8e68 6ef4ecd826
Author: Søren Sandmann Pedersen <sandmann@redhat.com>
Date: Tue Aug 21 14:26:34 2007 -0400
Merge branch 'master' of ssh+git://sandmann@git.freedesktop.org/git/xorg/xserver
commit 53941c8e68014619d3ded7f8bc0f07d9a38bb9b1
Author: Søren Sandmann Pedersen <sandmann@redhat.com>
Date: Tue Aug 21 14:26:14 2007 -0400
Require pixman 0.9.5; Use pixman_image_set_source_clipping() to fix
bug 11620 (reported by Jens Stroebel.
commit 6ef4ecd82670c37a354243166750d76a97959c8b
Author: Julien Cristau <jcristau@debian.org>
Date: Tue Aug 21 18:17:35 2007 +0200
config: fix default xkb model (pc105, not keyboard)
commit 1834cfb4470341aace64a2fa47d04f85dbf98a47
Author: Adam Jackson <ajax@benzedrine.nwnk.net>
Date: Tue Aug 21 10:44:37 2007 -0400
Fix an error message to not point to @xfree86.org.
commit 265a633cf1fcbf497d6916d9e22403dffdde2e07
Author: Keith Packard <keithp@koto.keithp.com>
Date: Sun Aug 19 20:29:37 2007 -0700
Screen size changing should leave FB alone when X is inactive.
xf86RandR12ScreenSetSize must protect calls to EnableDisableFBAccess with
suitable vtSema checks to avoid invoking driver code while the X server is
inactive.
commit 7dc8531548cc9573e28bb04363dcbb3af5864c9a
Author: Keith Packard <keithp@koto.keithp.com>
Date: Sun Aug 19 20:28:05 2007 -0700
Ref count cursors used in hw/xfree86/modes code.
The multi-crtc cursor code in hw/xfree86/modes holds a reference to the
current cursor. This reference must be correctly ref counted so the cursor
is not freed out from underneath this code.
commit 1f6ddae003ec65d6bc567831bf32bf75dfefdd6c
Author: Alex Deucher <alex@botch2.com>
Date: Tue Aug 21 00:37:33 2007 -0400
add xf86_crtc_clip_video_helper to xf86sym.c
commit c839859d1bc35451923a2cbd5dfac4f3ca5eb3f9
Author: David Nusinow <dnusinow@debian.org>
Date: Mon Aug 20 21:09:27 2007 -0400
Move module defaults from the header to the source file.
This is where they should have been in the first place. All the rest of
the code in the server defines such things in the source files, not the
headers.
commit 53c04351c462d2ae307684e50d5960debe1ee557
Author: Alex Deucher <alex@botch2.com>
Date: Mon Aug 20 19:46:38 2007 -0400
move intel crtc xv clipping helper to the xserver
The code is generic and can be used by any overlay-based card when
adding randr 1.2 support. Tested on radeon.
commit a1fe36b772f7edc162ea97368f86588c0fb77148
Author: Julien Cristau <jcristau@debian.org>
Date: Mon Aug 20 12:57:06 2007 +0200
xfree86: Fix build on Linux/alpha.
A bunch of CFLAGS had gone missing, so the build failed with errors like:
../../../../../hw/xfree86/os-support/linux/lnx_ev56.c:7:19: error: input.h: No such file or directory
../../../../../hw/xfree86/os-support/linux/lnx_ev56.c:8:24: error: scrnintstr.h: No such file or directory
commit 2c1431a76e7219e3bd14fd7f7888a8bc4fea0f58
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Mon Aug 20 10:06:13 2007 +0930
dix: ProcChangeActivePointerGrab: make sure variable is initialised.
Thanks to Ben Close for spotting it.
commit 65a49f0ca198e0366175367729a101211388b16b
Author: Blair Sadewitz <blair.sadewitz@gmail.com>
Date: Sun Aug 19 20:29:22 2007 +0200
Autoconfiguration of wsmouse for NetBSD.
commit 3c448b0eb67337b56641e09a6d168aad6745e3ef
Author: Fredrik Höglund <fredrik@kde.org>
Date: Sat Aug 18 19:02:18 2007 +0200
EXA: Fix a couple of logic errors in exaGetPixmapFirstPixel.
The fb pointer would be left uninitialized when exaPixmapIsOffscreen
returned false. When it returned true and the pixmap was damaged,
fb would be initialized from the pixmap's devPrivate.ptr before the
exaDoMigration and exaPrepareAccess calls, at which point
devPrivate.ptr would still be pointing at offscreen memory.
commit 23fbd5292d356067e85e1eec4eb4f743532b0503
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Fri Aug 17 15:29:16 2007 -0700
Actually build Secure RPC authentication support (missed in modularization)
commit 6a32a96d8df184c3ace4847beb48fdcb846d2286
Author: Aaron Plattner <aplattner@nvidia.com>
Date: Thu Aug 16 17:43:29 2007 -0700
stride is in FbBits-sized chunks, but xoff is not.
Fixes corruption problems with composite rendering to redirected windows in
depth 16.
commit 32666d77227fcd2c066de16bf3c07366f92b0457
Author: Aaron Plattner <aplattner@nvidia.com>
Date: Thu Aug 16 14:57:18 2007 -0700
Bug #12015: Use the right offsets in the dst arguments of pixman_blt.
commit daee59b1703ac07c2def9e9fecc479e59b93f761
Author: Fredrik Höglund <fredrik@kde.org>
Date: Wed Aug 15 19:19:11 2007 +0200
EXA: Wrap Trapezoids to prevent excessive migration of the alpha pixmap.
miTrapezoids creates an alpha pixmap and initializes the contents
using PolyFillRect, which causes the pixmap to be moved in for
acceleration. The subsequent call to RasterizeTrapezoid won't be
accelerated by EXA, which causing the pixmap to be moved back out
again.
By wrapping Trapezoids and using ExaCheckPolyFillRect instead of
PolyFillRect to initialize the pixmap, we avoid this roundtrip.
commit 860a09cfb8afc0a293c7eb5e01762724eb86847a
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Thu Aug 16 16:10:44 2007 -0400
devPrivates rework: Nevermind, can't const due to return value warnings.
This reverts commit 6fd0a0b08de912421718aca17fe34a55ae285ae7.
commit 6fd0a0b08de912421718aca17fe34a55ae285ae7
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Thu Aug 16 16:01:42 2007 -0400
devPrivates rework: add const qualifier to key type.
commit b2b7817497dd5da73d23ec9cc637c563041fc490
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Thu Aug 16 15:30:25 2007 -0400
devPrivates rework: use camelcase standard for name of key type.
commit 0a994d4f859a4e48d41a90ed9d2a282bb528c555
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Thu Aug 16 12:54:35 2007 -0400
xace: add hooks + new access codes: core protocol selection requests
commit 3ef2e9e623819c625a92f464fb14f1e5c181df42
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Thu Aug 16 12:27:48 2007 -0400
xace: add hooks + new access codes: core protocol pixmap requests
commit be536b79f2a364399937314cfa6c88bf8188da9c
Author: Jeremy C. Reed <reed@glacier.reedmedia.net>
Date: Thu Aug 16 11:23:28 2007 -0500
Update for support on NetBSD and DragonFly. From
Joerg Sonnenberger and pkgsrc.
commit 1d4bea6106d7a1c83e1dfe37fad8268589feaa0b
Author: Jeremy C. Reed <reed@glacier.reedmedia.net>
Date: Thu Aug 16 11:20:12 2007 -0500
Add some more support for DragonFly. From Joerg Sonnenberger
and pkgsrc.
commit fe9bc481efb0821134e10760c23993c6a7386450
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Thu Aug 16 12:02:59 2007 -0400
xace: add hooks + new access codes: core protocol font requests
commit e89301c8790df9fc49de13dd7c7f36e5340c0c31
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Thu Aug 16 10:57:49 2007 -0400
xace: add hooks + new access codes: core protocol client requests
commit 5bee8db003a5d552ee1d85bb6c40a3cb93bd6b2b
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Thu Aug 16 10:44:51 2007 -0400
xace: drop background-none checking hook, add new hook for controlling
access to other clients.
commit b82557c9fb60f11fd2696c8fb2ae17b9dfd915ed
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Thu Aug 16 10:36:05 2007 -0400
xace: add hooks + new access codes: core protocol screensaver requests
commit 568ae737d1d5d476a0bf85659d88910c4e0ef5e0
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Wed Aug 15 14:14:45 2007 -0400
xace: add hooks + new access codes: core protocol server requests
commit 14c13b8d62eb37cba8a044daffcddec578ba1644
Author: Dave Jones <davej@redhat.com>
Date: Thu Aug 16 09:46:27 2007 +0200
Kdrive: fix nasty thinko in TslibEnable()
commit 026534f945ae5652592a090a9d41375ca37ab618
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Wed Aug 15 16:47:53 2007 -0700
Update pci.ids to 2007-08-15 snapshot
Remove nvidia ids in extrapci.ids that are now in pci.ids
commit 6cef7b9611297cb1d93cefe3890b26b69c87bce2
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Wed Aug 15 16:44:49 2007 -0700
Correct XErrorDB path and make it configurable (used by DTrace support)
commit 3c9553ac2cac7f3a41966def44a50d722d7e645b
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Wed Aug 15 14:14:25 2007 -0400
xace: rename hostlist security hook to "server" as this hook will be used
for other types of server access besides just the host list.
commit dc84bb3418933297a8c005070902d9a91ed3d18f
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Wed Aug 15 14:13:53 2007 -0400
xace: add hooks + new access codes: core protocol cursor requests
commit b424e01ec59d9600a02823f1522949325797268c
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Tue Aug 14 13:20:42 2007 -0400
xace: add hooks + new access codes: core protocol property requests
commit 14d0397cded699378fa3c19f4e61dbab7d3a9b2c
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Wed Aug 15 22:12:29 2007 +0930
dix: ProcUngrabKeyboard: make sure grab is initialized.
This should fix the random segfaults with ProcUngrabKeyboard.
Thanks to David Nolden for spotting it.
commit 0f9e89b4e309e570d7d366489d250ca2143f0ad7
Author: Fredrik Höglund <fredrik@kde.org>
Date: Tue Aug 14 22:47:49 2007 +0200
Fix the value comparisons in the IDLETIME wakeup handler.
LessThan/GreaterThan comparisons were used in the wakeup handler,
and LessOrEqual/GreaterOrEqual in the block handler.
Change it to use LessOrEqual/GreaterOrEqual in both functions,
since this is what XSyncNegativeComparison and
XSyncPositiveComparison imply.
commit 42d6112ec21949a336ee8b34469f2695273ee2d6
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Tue Aug 14 13:09:38 2007 -0400
xace: add hooks + new access codes: core protocol GC requests
commit 9a183d7ba50e31afa133cc03aee7991517a283ea
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Tue Aug 14 11:39:26 2007 -0400
dix: remove caching of drawables and graphics contexts. The security checks
simply bypass the cached values so they are unused.
commit 2763056ab5ae31bed422a0948198d98c6ace6d55
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Mon Aug 13 13:40:47 2007 -0400
xace: add hooks + new access codes: core protocol window requests
commit 6a195e816b9d60f728d77cc1c23538e7af00a879
Author: Kristian Høgsberg <krh@redhat.com>
Date: Mon Aug 13 10:43:48 2007 -0400
Revert "Implement damage tracking for AIGLX."
This reverts commit 2243b30e54df07892f75e3d65b687abe5b183cf3. The existing
DRI interface doesn't let us get from a __DRIdrawable to the corresponding
X drawable, and thus, we can't implement AIGLX damage tracking with the
current interface.
commit f367285fd5825e0adc271982a529c9904ad65c89
Merge: b1272eefd9 ff4bd3addb
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Sun Aug 12 15:31:10 2007 +0930
Merge branch 'master' into mpx
Conflicts:
Xi/exevents.c
dix/devices.c
dix/getevents.c
include/dix.h
mi/mieq.c
commit 03f9da672466b9ab9a9814d784b8c44f1030587e
Author: Samuel Thibault <samuel.thibault@ens-lyon.org>
Date: Sun Aug 12 03:07:04 2007 +0200
xfree86: Improve default mouse handling on the Hurd
Make /dev/mouse the default device. This makes Xorg works with empty
or missing InputDevice sections.
commit c5741438a3a171f493e9da32a6b39f73403f6993
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Fri Aug 10 16:13:55 2007 -0700
Only use evdev drivers in Xephyr #ifdef linux
commit 59961e47df4ea621a6713a8c7d060555f8746c3a
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Fri Aug 10 16:08:41 2007 -0700
xorgcfg needs PIXMAN_CFLAGS in order to build libc_wrapper.c
commit 2243b30e54df07892f75e3d65b687abe5b183cf3
Author: Kristian Høgsberg <krh@redhat.com>
Date: Fri Aug 10 15:53:05 2007 -0400
Implement damage tracking for AIGLX.
commit ff4bd3addb48df3eacc4b121cc249a7f38eb981a
Author: Eric Anholt <eric@anholt.net>
Date: Wed Aug 8 14:24:42 2007 -0700
Fix the swapped decode of the EDID DTD h/v sync polarity fields.
As a result, we can remove the quirks that existed to flip the bits back around
for us. This is not confirmed in all cases due to lack of bugs containing EDID
blocks associated with the quirks, but is likely true.
commit 2926cf1da7e4ed63573bfaecdd7e19beb3057d9b
Author: Gustavo Pichorim Boiko <boiko@mandriva.com>
Date: Thu Aug 2 18:09:52 2007 -0300
[PATCH] Allocate the right number of entries for saving crtcs
commit b2dcfbca2441ca8c561f86a78a76ab59ecbb40e4
Author: Keith Packard <keithp@koto.keithp.com>
Date: Wed Aug 8 12:16:12 2007 -0700
RRScanOldConfig cannot use RRFirstOutput before output is configured.
RRFirstOutput returns the first active output, which won't be set until
after RRScanOldConfig is finished running. Instead, just use the first
output (which is the only output present with an old driver, after all).
commit b1272eefd9a3e340d65c14903f337747ec82d021
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Wed Aug 8 15:00:02 2007 +0930
Fix typo from last commit. Oh well.
commit c02128532e910e813fba94983733942d30c2d5cb
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Wed Aug 8 13:10:00 2007 +0930
dix: Allow flexible devices for passive core grabs.
A passive core grab doesn't specify the device, and is thus created with the
ClientPointer as device. When this grab is activated later, don't actually
activate the grab on the grab device, but rather change the device to the one
that caused the grab to activate. Same procedure for keyboards.
Makes core apps _A LOT_ more useable and reduces the need to set the
ClientPointer.
Only applies to core grabs!
commit ab3f601149e15789edfb7c9a0c33387070279582
Author: Tiago Vignatti <tiagov@balalaika.(none)>
Date: Tue Aug 7 23:17:32 2007 -0300
Updates some piece of the dead mouse evdev code under the new hotplug scheme.
I exported the evdev driver to Xephyr server. I'm running it using something
like:
$ ./hw/kdrive/ephyr/Xephyr :1 -mouse evdev,,device=/dev/input/event4 -keybd \
evdev,,device=/dev/input/event1,xkbmodel=abnt2,xkblayout=br
It also closes /#5668.
commit 7d1a749b210ba5b9f8d0e5a1feb9a9ef9fa4d992
Author: Tiago Vignatti <tiagov@balalaika.(none)>
Date: Tue Aug 7 22:59:12 2007 -0300
Export device path key options to be called by the command line of server.
commit aee3588a4a6829326770c84b860061f47f2cbcae
Author: Tiago Vignatti <tiagov@balalaika.(none)>
Date: Tue Aug 7 22:49:07 2007 -0300
Update KdUseMsg() for completeness.
commit 30259d5a4e95ff20b30807e5e207ab5995a3fdaf
Author: Daniel Stone <daniel@fooishbar.org>
Date: Tue Aug 7 20:58:49 2007 +0300
Hotplug: HAL: Fix error handling
Don't use our DBusError for property getting, because we simply don't care:
this fixes D-Bus error spew to stderr. Thanks Michel Dänzer for debugging
and testing.
commit aef255425a3521d66c3405d34f7787628a22703e
Author: Daniel Stone <daniel@fooishbar.org>
Date: Tue Aug 7 16:37:42 2007 +0300
Config: HAL: Use input.xkb namespace
Use an explicit input.xkb.foo namespace, not input.xkb_foo.
commit 838e59c02ec06446fc180fb9d86fa8793c7b9903
Author: Daniel Stone <daniel@fooishbar.org>
Date: Mon Aug 6 16:07:20 2007 +0300
configure.ac: Add $CONFIG_LIB to server libraries
Make sure all DDXes get $CONFIG_LIB. Build-tested with Xvfb and Xdmx.
commit b4193a2eee80895c5641e77488df0e72a73a3d99
Author: Keith Packard <keithp@koto.keithp.com>
Date: Tue Aug 7 12:45:53 2007 -0700
RRScanOldConfig wasn't getting crtcs set correctly
The output crtc is set by RRCrtcNotify, which is called at the end of
RRScanOldConfig. Several uses of output->crtc in this function were wrong.
commit 2b93cbb5f8bac9b1b75f723baaa728430b5fefff
Author: Keith Packard <keithp@koto.keithp.com>
Date: Tue Aug 7 12:44:19 2007 -0700
Decrement mode count when removing RandR output mode.
Removing an output mode without decrementing the mode count scrambles the
output mode array badly.
commit fef4c7a6f1a1ef34233b36137bb66d9a657307fb
Author: Eric Anholt <eric@anholt.net>
Date: Tue Aug 7 09:01:14 2007 -0700
Fix driver build after pixman changes.
commit 1339e57485db5a285cfbecbe0bba7154458680ad
Author: Tiago Vignatti <tiagov@balalaika.(none)>
Date: Tue Aug 7 04:24:34 2007 -0300
Fix typo.
commit d9ee5f3e3a3a814ebcd257736c305b41139cc354
Author: Tiago Vignatti <tiagov@balalaika.(none)>
Date: Tue Aug 7 04:22:26 2007 -0300
Clean a little bit the code.
commit 7a5eb3e96b74daaaeb6babf46b13d698280aa3f6
Author: Tiago Vignatti <tiagov@balalaika.(none)>
Date: Tue Aug 7 02:16:44 2007 -0300
Let xkb options be passed through command line in kdrive servers. I start my
Xephyr using something like:
./hw/kdrive/ephyr/Xephyr :1 -fp /usr/share/fonts/X11/misc/ -mouse ephyr -keybd ephyr,,xkblayout=br,xkbmodel=abnt2
commit 955d5f6c0d14fae63bfe7c4ab39ee0a708919479
Author: Tiago Vignatti <tiagov@balalaika.(none)>
Date: Tue Aug 7 01:39:29 2007 -0300
When we call Xephyr with '-pointer' a new pointer is added inside the server
and the Xephyr virtual mouse keeps alive. With this patch the semantic changes
turning '-pointer' && 'Xephyr virtual mouse' always false.
Now we can open a device pointer and pass its options in Xephyr's command line
without having other pointer unused.
commit b8abeaf74ee8296d4bc3164a5a253624f984a6d4
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Tue Aug 7 12:32:46 2007 +0930
dix: get the paired keyboard for a passive grab (ProcGrabButton).
Taking the VCK is only correct if no physical device is connected, and even
then it's not really a good idea.
commit a0b87f87fb8753955505958bf3d438eef191302d
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Tue Aug 7 10:49:33 2007 +0930
dix: check for core event to determine if grab is a core grab (CreateGrab).
Checking for VCP/VCK is simply not a safe way to check if a grab is a core grab.
commit aa3c6aaaab213200591d29ddb2921adfb87ee5b4
Author: Søren Sandmann Pedersen <sandmann@redhat.com>
Date: Mon Aug 6 19:00:59 2007 -0400
Require pixman-1 0.9.4, update pixman includes to new scheme
commit 74feba4d77d74979a0ea478d666439ffc55001e5
Author: Aaron Plattner <aplattner@nvidia.com>
Date: Wed Aug 1 14:30:03 2007 -0700
Don't unwrap too early in libwfb for Composite.
Don't call fbFinishWrap until the pixman_image_t that stores the pointer is
actually freed. This prevents corruption or crashes caused by accessing a
wrapped pointer after the wrapping is torn down.
commit f6aa2200f2fb4f4d4bb51e67d68e86aabcac0c4b
Author: Roland "Test-tools" Bär <roland@verifysoft.de>
Date: Mon Aug 6 12:37:52 2007 -0700
Probable off by one buffer overflow in .../xorgconfig/xorgconfig.c
X.Org Bug #11858 <http://bugs.freedesktop.org/show_bug.cgi?id=11858>
Patch #11005 <http://bugs.freedesktop.org/attachment.cgi?id=11005>
commit d744df32a15103aa14237175f506350d25b2fec0
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Mon Aug 6 12:23:21 2007 -0400
xace: add hooks + new access codes: core protocol colormap requests
commit acc9a42c926a3f84159780de12ecc1dc6186068a
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Mon Aug 6 12:16:59 2007 -0400
Temporarily disable Security and SELinux extensions
while changes to XACE are being made.
commit 102df4f9bac59d95963572d1a7f31d1a064ca4ca
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Mon Aug 6 09:16:30 2007 -0400
xace: drop site-policy and declare-extension-security hooks, add 2 new hooks
for controlling access to screens and screen savers.
commit 9eddede039f6cbcc323b7e3e4e841c43d3ed4f43
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Mon Jul 16 18:01:00 2007 +0930
mieqEnqueue: Don't try to update the time for GenericEvents.
Doing so may overwrite the event's length field and cause havoc. Also check if
realloc'd memory did actually return valid pointer.
commit e717eb82dc2e55f852919312d04f5cfc8ee55bc8
Author: Dave Airlie <airlied@redhat.com>
Date: Thu Aug 2 10:50:01 2007 +1000
xserver: stop bcopy from going really slow
The outport is most likely unnecessary on any currently used hardware,
the byte copy is necessary from what I know on IA64 and friends so leave it.
Add a new API entry point which lets a driver select the old behaviour if
such a needs is ever found.
This gives me ~20% speed up on startup on 945 hardware.
commit 600ef07113caa7a901c7d486bc8ebd1ae47f885c
Author: Tiago Vignatti <tiagov@balalaika.(none)>
Date: Fri Aug 3 15:33:41 2007 -0300
Fix kdrive command line parser.
commit 375864cb74cced40ae688078b1f7750998972535
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Fri Aug 3 13:23:34 2007 -0400
security: drop support for XC-QUERY-SECURITY authorization method.
commit d445d2f22b5c97fa010370f4ba9cb0555df4a853
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Fri Aug 3 10:56:18 2007 -0400
security: drop the "declare extension security" dix call. Use the
SecurityPolicy configuration file instead.
commit 0a71e1542a07abc5e32501973a7cf6de3f641317
Author: Carl Worth <cworth@cworth.org>
Date: Thu Aug 2 22:48:32 2007 -0700
Create a Picture as well as a Pixmap at the time of AllocateGlyph
This avoids some inefficiency in creating a temporary Picture
for every glyph at rendering time. My measurements with an i965
showed the previous patch causing a 10-15% slowdown for NoAccel
and XAA cases, (while providing an 18% speedup for EXA).
With this change, the NoAccel and XAA performance regression is
eliminated, and the overall EXA speedup, (before any of the
glyphs-as-pixmaps work), is now 32%.
commit a2af34d5a861982a03afad8e586bb0181b72bbd0
Author: Carl Worth <cworth@cworth.org>
Date: Wed Aug 1 15:48:30 2007 -0700
Use per-screen Pixmaps for glyphs
Instead of system-memory data which prevents accelerated
compositing of glyphs, (at least without forcing an upload
of the glyph data before compositing).
commit 19b3b1fd8feb343a690331cafe88ef10b34b9d98
Author: Carl Worth <cworth@cworth.org>
Date: Tue Jul 31 17:04:13 2007 -0700
Use strong hash (SHA1) for glyphs
Using a cryptographically strong hash means that comparing the
hash alone is sufficient for determining glyph equality (no need
to compare the glyph bits directly). This will allow us to replace
system-memory copies of the glyph bits, (which we've only been
holding onto for comparisons), with Pixmaps.
commit 516b96387b0e57b524a37a96da22dbeeeb041712
Author: Carl Worth <cworth@cworth.org>
Date: Mon Jul 30 17:31:47 2007 -0700
ProcRenderAddGlyphs: Avoid allocating a glyph just to find it cached
This is a cleanup without any real savings (yet). Previously, the
implementation would allocate a new glyph, then (often) find it in
the cache, and immediately discard the allocated object. This
re-organization first uses a new FindGlyphByHash function and only
allocates the glyph if nothing is found.
This isn't a real savings yet, since FindGlyphByHash currently still
does a temporary glyph allocation, but this is expected to be replaced
immediately as we switch to an alternate hashing mechanism (SHA1).
commit 4c6abe1c7c8abcf203572bbf86b21d97ea4e756f
Author: Carl Worth <cworth@cworth.org>
Date: Mon Jul 30 21:43:20 2007 -0700
Split HashGlyph functionality out into HashGlyphInfoAndBits
This is in preparation for a future change that will take advantage
of being able to compute a hash for a separate xGlyphInfo and chunk
of bits without a combined Glyph object.
commit 363d764ea32b938f3dff35df7cf3370363c04d5c
Author: Carl Worth <cworth@cworth.org>
Date: Mon Jul 30 15:10:11 2007 -0700
ProcRenderAddGlyphs: Take advantage of the for loops to simplify the code a bit
commit dc8a528cd6b9a4da3e60fa31428c37f5b34a897f
Author: Carl Worth <cworth@cworth.org>
Date: Wed Jul 25 14:57:13 2007 -0700
ProcRenderAddGlyphs: Convert while loops to for loops where more natural
commit e34fcd2bf42dbd72ab6ce2df80f2dcaa13416e74
Merge: 32c0dcc8c0 f3955c0a02
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Thu Aug 2 14:27:03 2007 -0400
Merge branch 'master' into XACE-SELINUX
Conflicts:
dix/devices.c
dix/property.c
include/dix.h
commit f3955c0a020b39021050cd33c20a17f14fc4b579
Author: Arkadiusz Miskiewicz <arekm@maven.pl>
Date: Wed Aug 1 21:04:22 2007 +0300
XFree86: xf1bpp: distclean generated files as well
Make sure we clean up after ourselves: not sure why distcheck didn't flag
this one.
commit a04c95f4446e5c169dea71019321d790ab4fa139
Author: Julien Cristau <jcristau@debian.org>
Date: Wed Aug 1 20:37:05 2007 +0300
configure.ac: Fix argument quoting for argv[]
m4 quoting. Yar boo sux.
commit 99a88826e5e8cfa25c5f8a88c12799d33114729c
Author: Daniel Stone <daniel@fooishbar.org>
Date: Wed Aug 1 20:34:58 2007 +0300
configure.ac: Actually use -lrt in monotonic clock test
If we need -lrt to use clock_gettime, then make sure we link with it.
commit 1c80e04f876e9254b93ef87eadfcff71234340c6
Author: Daniel Stone <daniel@fooishbar.org>
Date: Wed Aug 1 20:08:31 2007 +0300
configure.ac: Disable D-Bus config API support by default
This is problematic, so don't even bother with it unless someone wants it.
respeclaration is dead, long live HAL.
commit c46663367329615bd2c9b63e93c9534036e5a2ae
Author: Michel Dänzer <michel@tungstengraphics.com>
Date: Wed Aug 1 18:32:09 2007 +0200
GLX/DRI: Remove some unused variables.
commit 17cb4f64e3c39725e83b1e311c09422d7e1c0e52
Author: Michel Dänzer <michel@tungstengraphics.com>
Date: Wed Aug 1 18:13:18 2007 +0200
GLX_EXT_texture_from_pixmap: Use client provided texture target when available.
This prevents situations where the server doesn't use the target the
client thinks it does, usually resulting in the texture being sampled as all
white.
commit a4197db9504adae6af005b2218eee36b8af0d98b
Author: Daniel Stone <daniel@fooishbar.org>
Date: Wed Aug 1 14:04:51 2007 +0300
GL: GLX: Make sure glxbyteorder.h is distributed
commit ad7421fc764e2b82e20d90f12225a03a1d636f18
Author: Daniel Stone <daniel@fooishbar.org>
Date: Wed Aug 1 08:30:00 2007 +0300
Bump version to 1.3.99.1 for development
This is not actually .1, just bumping for a different devel version.
commit 43e71a54502d9ab28ece7f6296d1416d60948dad
Author: Daniel Stone <daniel@fooishbar.org>
Date: Wed Aug 1 08:16:35 2007 +0300
XFree86: xf1bpp: Fix previous build system commit
Amateur error.
commit 6d6bc93b0a13c5356544561e326d4aedf33e61c2
Author: Daniel Stone <daniel@fooishbar.org>
Date: Wed Aug 1 08:11:22 2007 +0300
Build system: Add missing files
A couple of headers weren't added to the build.
commit 505ec436af3a173e0ba32c6f14b4cf9837a553eb
Author: Daniel Stone <daniel@fooishbar.org>
Date: Wed Aug 1 08:11:08 2007 +0300
XFree86: Properly clean up after ourselves
CLEAN is not a useful variable. CLEANFILES/DISTCLEANFILES, on the other hand,
are useful variables.
commit 1ace9770fed4a2ba354ff06a96189428beb36088
Author: Daniel Stone <daniel@fooishbar.org>
Date: Wed Aug 1 08:10:38 2007 +0300
Build system: Non-dtrace distcheck hacks
automake 1.10 really wants foo.c for foo.O, so give it some dummy files to
deal with if it really needs them.
commit cacbdf18ee771d43228c2e96e8ef9a32251ceb55
Author: Daniel Drake <d.drake@mmm.com>
Date: Wed Aug 1 08:08:37 2007 +0300
Remove duplicated licenses
Some files had two copies of the same license.
commit bd49332e4772bd57ffb76c829f0e4770ab876057
Author: Daniel Drake <d.drake@mmm.com>
Date: Wed Aug 1 08:07:08 2007 +0300
Add proper COPYING file
I went through the entire xorg-server distribution and aggregated all
the licenses I could find (except the questionable GPL files, see my
last mail).
There are many many permutations on essentially the same license terms,
but I have been pedantic and treated slight differences as separate
licenses.
Here is a description of the process I used:
tar xvjf /usr/portage/distfiles/xorg-server-1.1.1.tar.bz2
cd xorg-server-1.1.1
find -name '*.c' -o -name '*.h' | xargs gvim
egrep -Rli "permission|copyright" * | grep -v "\.[ch]" \
| grep -v "\.in$" | xargs gvim
cd ..
tar xvjf /usr/portage/distfiles/xorg-server-1.3.0.0.tar.bz2
diff -urNp xorg-server-1.1.1 xorg-server-1.3.0.0
git clone git://anongit.freedesktop.org/git/xorg/xserver
cd xserver
git diff xorg-server-1.3.0.0..
For each file, licenses have been aggregated as follows:
If 2 files have identical license text but different copyright notices,
the copyright notices are aggregated and the license text
is included only once.
Note that by identical I mean really identical, i.e.:
'AUTHOR(S)' is not the same as 'AUTHORS'
'KEITH PACKARD DISCLAIMS' is not the same as 'KEITH PACKARD AND COMPAQ
DISCLAIM'
Otherwise, licenses and accompanying copyright notices have been
stacked.
When going through the changes from 1.1.1 to 1.3.0.0 then HEAD, licenses
have been added and removed (so I have reflected this since the original
version of my COPYING file). It's slightly concerning to see that even
between 1.3.0.0 and HEAD, new license permutations are being added. I'd
suggest that a primary license be chosen and this would be indicated at
the top of this COPYING file.
commit 51b735394f0aa9f953f9c320617c7a56028ec458
Author: Daniel Drake <dsd@gentoo.org>
Date: Mon Apr 30 11:37:46 2007 -0400
[PATCH] xserver: Add COPYING terms
I went through the entire xorg-server distribution and aggregated all
the licenses I could find (except the questionable GPL files, see my
last mail).
There are many many permutations on essentially the same license terms,
but I have been pedantic and treated slight differences as separate
licenses.
Here is a description of the process I used:
tar xvjf /usr/portage/distfiles/xorg-server-1.1.1.tar.bz2
cd xorg-server-1.1.1
find -name '*.c' -o -name '*.h' | xargs gvim
egrep -Rli "permission|copyright" * | grep -v "\.[ch]" \
| grep -v "\.in$" | xargs gvim
cd ..
tar xvjf /usr/portage/distfiles/xorg-server-1.3.0.0.tar.bz2
commit 7fa58385724fa7f441107a1793b601ba3dcb1f4c
Author: Arkadiusz Miskiewicz <arekm@maven.pl>
Date: Wed Aug 1 08:01:28 2007 +0300
XFree86: xf1bpp: Fix parallel build
One of the constructs wasn't parallel-build safe: fix that.
commit 18ab4d559409d4b682aab99fb75f8d861122eab6
Author: Daniel Stone <daniel@fooishbar.org>
Date: Wed Aug 1 07:27:53 2007 +0300
Darwin: Remove missing file
Xserver.m is missing and still hasn't been added, so just remove it for now.
commit 0bd6fe7401b2524cf34793c0b0c642e3d32fae00
Author: Daniel Stone <daniel@fooishbar.org>
Date: Wed Aug 1 07:27:30 2007 +0300
Config: Add missing include
commit 48b3034d13bbbb69072eb11f4579389cc32b0850
Author: Daniel Stone <daniel@fooishbar.org>
Date: Wed Aug 1 07:01:51 2007 +0300
Config: Add current FDI file
Add the FDI file we're using at the moment, until it gets into upstream HAL.
commit 82b720cf3e09d8a6adcd40b25c4d48b34ba1ae80
Author: Daniel Stone <daniel@fooishbar.org>
Date: Wed Aug 1 06:57:11 2007 +0300
Config: Fix merge detritus
commit 6b055e5d9751e3679ff98065e43225ec8a960053
Author: Daniel Stone <daniel@fooishbar.org>
Date: Wed Aug 1 06:55:36 2007 +0300
Input: Fix stuck modifiers (bug #11683)
Disclaimer: It's 6:51am. I'm trying to be as understandable as possible.
What was happening previously was this:
* Press Alt
* Extended event generated and processed: state is now Alt down once
* Core event generated
- keyboard switched: inherited state is Alt down once
- event processed: Alt down twice
* Release Alt
* Extended event generated and processed: state is now null
* Core event generated and processed: Alt down once
If we switch the order:
* Press Alt
* Core event generated:
- keyboard switched: inherited state is null
- event processed: Alt down once
* Extended event generated and processed: state is now Alt down once
* Release Alt
* Core event generated and processed: state is now null
* Extended event generated and processed: state is now null
When we carry over the previous state, it needs to be the _previous_ state
(state and modifiersPerKey), assuming that we're going to catch now-core
events for any of these. For example, if Ctrl is held down as we pivot, we
need to carry Ctrl over with a count of one, for which an extended + core
release will then clear. Carrying over the union of the previous state _and
the state resulting from the immediate action_ was what broke things.
commit 0e0174d45ecbeb7b6dddc4af53da9d6211038e0e
Author: Daniel Stone <daniel@fooishbar.org>
Date: Wed Aug 1 03:30:07 2007 +0300
XFree86: Allow disabling of HAL
If NoAutoAddDevices is given as a server flag, then no devices will be added
from HAL events at all. If NoAutoEnableDevices is given, then the devices will
be added (and the DevicePresenceNotify sent), but not enabled, thus leaving
policy up to the client.
commit cd8e99e56ec5d02026e401cc15e0f8d75f2a4727
Author: Daniel Stone <daniel@fooishbar.org>
Date: Wed Aug 1 03:29:12 2007 +0300
Input: Don't enable devices when we open them
Thanks to Xi's braindead design, it's otherwise impossible to query input
devices without enabling them. Hurrah.
commit 0a31db14b7c7c21ef550dbcc73a9f649f3613cbe
Author: Daniel Stone <daniel@fooishbar.org>
Date: Wed Aug 1 02:54:14 2007 +0300
Config: D-Bus core: Fix hook removal
Make sure we properly initialise the entire hook when adding it, and
bust out when we're done removing.
commit 89f628394f7d831f2ba1e45c5884c3983bef6031
Author: Daniel Stone <daniel@fooishbar.org>
Date: Wed Aug 1 02:08:02 2007 +0300
XFree86: Input: Fix whitespace
commit aec0d06469a2fa7440fdd5ee03dc256a68704e77
Author: Aaron Plattner <aplattner@nvidia.com>
Date: Tue Jul 31 16:33:37 2007 -0700
Fix a crash when rotating the screen.
Remember output->crtc before setting a NULL mode because RRCrtcNotify now sets
output->crtc to NULL. Use the saved crtc to set the new mode.
commit a93033b0bc14ed0bb95c680ded26b63cfe5fd1d3
Author: Daniel Stone <daniel@fooishbar.org>
Date: Wed Aug 1 01:53:08 2007 +0300
XFree86: Module: Bump input version
config_info changes the size (and ordering) of DeviceIntRec, so bump the
input major.
commit 1150969b826e2bd6d8345fa245ed499f2e4cf101
Author: Daniel Stone <daniel@fooishbar.org>
Date: Wed Aug 1 01:52:20 2007 +0300
Convert all my license statements to the standard form
Convert all my license statements to the standard, accepted form:
cf. <20070717142307.GD13478@fooishbar.org>
http://lists.freedesktop.org/archives/xorg/2007-July/026451.html
keithp's license on configure.ac changed with his verbal permission.
commit 8658f5d923a69fb55b4cd9e1e84c2d271679f6e2
Author: Daniel Stone <daniel@fooishbar.org>
Date: Wed Aug 1 01:10:50 2007 +0300
Hotplug: Add HAL support
Add support for HAL-based hotplugging, in which we just get the list of
input devices and properties from HAL. Requires an FDI which is not yet
in mainline HAL.
commit aa75b3481724834da2f855d8dd2ff36074bd5706
Author: Daniel Stone <daniel@fooishbar.org>
Date: Wed Aug 1 01:09:07 2007 +0300
Hotplug: D-Bus: Dispatch harder
Dispatch until we've got nothing left to dispatch, since apparently
dispatching will only ever fire a single message ...
commit 4d238c5c67461ed747aa6c021d1532734f4c63fe
Author: Daniel Stone <daniel@fooishbar.org>
Date: Wed Aug 1 01:08:26 2007 +0300
Input: GetPointerEvents: Deny events from devices without valuators
For some reason, my keyboard has 25 mouse buttons, but zero valuators. This
causes GPE to blow up spectacularly, trying to get (and set) co-ordinates from
devices without valuators. For now, just prevent this from ever happening,
and whack a dirty great FIXME in.
commit 7c9e8fd56e1830f7a971187d14877ebbdf35c4b0
Author: Daniel Stone <daniel@fooishbar.org>
Date: Wed Aug 1 00:19:14 2007 +0300
Input: Allow enabling and disabling of devices
Add DEVICE_ENABLE to KDrive and XFree86 to allow us to enable and disable
devices on the fly.
commit 0afeb0241a83796575da827bd81375c99ff10af5
Author: Daniel Stone <daniel@fooishbar.org>
Date: Sun Jul 8 20:48:57 2007 +0300
DIX: Clean up null root cursor handling
Move the null root cursor handling out of main() and into CreateRootCursor.
commit 62ec6d09b3adaea82ff52c8672e6f611c15ec56d
Author: Daniel Stone <daniel@fooishbar.org>
Date: Sun Jul 8 20:47:28 2007 +0300
dix.h: Remove duplicate ffs() prototype.
commit 4d3379d418a781938358e511fd41deb4115a032c
Author: Daniel Stone <daniel@fooishbar.org>
Date: Sun Jul 8 14:31:35 2007 +0300
Fonts: Fix builtin fonts
Make sure the font path is always 'built-ins' when we use built-in fonts,
rather than having it as a fixed path for a while, then clobbering it
halfway through startup.
commit 9ac7e8a559fe6008cafc95e8264680c50e72ba19
Author: Daniel Stone <daniel@fooishbar.org>
Date: Sun Jul 8 14:30:53 2007 +0300
Hotplug: D-Bus: API version 2
Use uint32s instead of int32s where practical, and add an API version
request. Also, try to return all devices added, not just the first,
and box device arguments.
commit 1cdadc2f43d9069572814510d04b1a560c488fcb
Author: Daniel Stone <daniel@fooishbar.org>
Date: Sun Jul 8 14:28:58 2007 +0300
Hotplug: Separate D-Bus into core and hotplug API components
Break up D-Bus into two components: a D-Bus core that can be used by any
part of the server (for the moment, just the D-Bus hotplug API, and the
forthcoming HAL hotplug API), and the old D-Bus hotplug API.
commit 8bfa41e1bf3f588780d7e9f6f900b1fde0570a7e
Author: Daniel Stone <daniel@fooishbar.org>
Date: Sun Jul 8 04:29:43 2007 +0300
gitignore: Add automake lex/yacc wrapper
commit 06dd2748da8b7af343f6cab409b9f351567de5f3
Author: Daniel Stone <daniel@fooishbar.org>
Date: Sun Jul 8 00:27:40 2007 +0300
configure.ac: Properly check XFree86 proto modules
Not sure why these are conditionals, anyway. This one really needs
revisiting, but at least causes configure, rather than the compilation,
to bomb out.
commit fd10312b4224197b937d9e696b53dc2a16c8912f
Author: Daniel Stone <daniel@fooishbar.org>
Date: Sun Jul 8 00:26:26 2007 +0300
configure.ac: Fix KDrive VESA/fbdev conditionals
Make sure we actually respect anything explicitly given on the configure
line, instead of just stomping it with what we detect.
commit f37612c6f2375ca904411e6caa0be19fa24f032c
Author: Nicolas Trangez <eikke@eikke.com>
Date: Sun Jul 8 00:23:57 2007 +0300
Hotplug: Remove unused function definition from hotplug.h
configDispatch hasn't been used in a long time.
commit 951c058e7800308f7c472e77178c14400f45c1b3
Author: Aaron Plattner <aplattner@nvidia.com>
Date: Tue Jul 31 14:23:58 2007 -0700
Don't fail compScreenInit if the driver added its own alternate visuals.
commit 722d73a0ef54c2ebd8ef38c4a6afa0e7c5aa3e30
Author: Dave Airlie <airlied@redhat.com>
Date: Tue Jul 31 10:34:56 2007 +1000
Revert "Fix RandR 1.2 conversion of two colour to ARGB cursor on MSB first platforms."
This reverts commit 0f057ebb272f0ee0b51b9ab37d4b07da0924fec4.
This screws my cursor up just starting a bare X server on Intel,
I get the X more like <> than ><..
commit 57b5b97a0710fc043b8a1c01d756cdb73dfe4567
Author: Adam Jackson <ajax@benzedrine.nwnk.net>
Date: Sun Jul 29 11:02:47 2007 -0400
ReduceCompositeOp returns a Render op, not a boolean.
commit f62beb6f3609e8b6e61325ac89017590811bbd07
Author: Adam Jackson <ajax@benzedrine.nwnk.net>
Date: Fri Jul 27 13:23:15 2007 -0400
Remove all trace of Option "BiosLocation".
This code was deeply dangerous. If anyone actually had a use for this code,
we should find a better way of doing it.
commit 486fd4145aed93093d1f1655de40c0a8582bb8b1
Author: Adam Jackson <ajax@benzedrine.nwnk.net>
Date: Fri Jul 27 13:10:39 2007 -0400
exaGetPixmapFirstPixel: avoid framebuffer readbacks if possible.
If the pixel in framebuffer memory isn't modified since we uploaded it, we
can just read from the system memory copy, wihch avoids both a readback and
an accelerator stall.
In principle this function is still wrong, and all the framebuffer pixel
access should be going through (w)fb so we can get pixel layout corrections.
commit 50cb6c7e4419e067c1f080d1de940811d21fc725
Author: Kristian Høgsberg <krh@redhat.com>
Date: Fri Jun 15 15:29:00 2007 -0400
Don't map the front buffer in libdri if the ddx driver doesn't set the size.
This lets drivers map the front buffer themselves
by setting dontMapFramebuffer.
commit cec793ef7a6dac9fa2a6538683e363a72672cde9
Author: Aaron Plattner <aplattner@nvidia.com>
Date: Thu Jul 26 11:49:46 2007 -0700
Include picturestr.h in xf86Crtc.h to pick up definition of PictTransform.
commit 27845fe197b74bf453d99f352e83513e201fdaae
Author: Adam Jackson <ajax@benzedrine.nwnk.net>
Date: Thu Jul 26 09:32:16 2007 -0400
libconfig shouldn't be an installed library.
commit 276f8e2ca42eec982d16b86d67217d68ff98f81d
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Wed Jul 25 17:42:23 2007 -0700
Include comment/copyright/license for AC_DEFINE_DIR in acinclude.m4
commit eba2be448bdd298ff2f7b8603bd9e976da1fdf72
Author: Brice Goglin <Brice.Goglin@ens-lyon.org>
Date: Wed Jul 25 20:53:45 2007 +0200
Minor fixes in cvt and gtf manpages
Reported by "A. Costa" <agcosta@gis.net> in
http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=432065
commit 8d230319040f0a7f72231da2bf5ec97dc3612e21
Author: Gustavo Pichorim Boiko <boiko@mandriva.com>
Date: Tue Jul 24 16:19:19 2007 -0300
Fix the output->crtc initialization in the old randr setup
commit 0f057ebb272f0ee0b51b9ab37d4b07da0924fec4
Author: Michel Dänzer <michel@tungstengraphics.com>
Date: Wed Jul 25 17:04:04 2007 +0200
Fix RandR 1.2 conversion of two colour to ARGB cursor on MSB first platforms.
Doesn't seem necessary to do anything here...
commit 5b424b562eee863b11571de4cd0019cd9bc5b379
Author: Gustavo Pichorim Boiko <boiko@mandriva.com>
Date: Mon Jul 23 18:27:41 2007 -0300
Set the crtc before the output change is notified
Set the new randr crtc of the output before the output change notification is
delivered to the clients.
Remove RROutputSetCrtc as it is not really necessary. All we have to do is set
the output's crtc on RRCrtcNotify
commit 7da38bb6a15247948c90e00a59230453fcf13cbd
Author: Adam Jackson <ajax@benzedrine.nwnk.net>
Date: Sat Jul 21 15:27:40 2007 -0400
Partial redundancy elimination in PropertyNotify generation.
commit 0f91abd5c68eb044d09733d18ef0f6b8ed128200
Author: Julien Cristau <jcristau@debian.org>
Date: Thu Jul 19 20:37:26 2007 -0400
Fix alpha build failures
Don't include <asm/pci.h> in os-support/linux/lnx_axp.c, use "lnx.h" and
<unistd.h> instead
commit dc9c5196282ba61bd542e198dfe0d53d93181591
Author: Keith Packard <keithp@neko.keithp.com>
Date: Thu Jul 19 13:28:00 2007 -0700
Make PreferredMode option in config file override EDID mode preferences.
When the PreferredMode option is selected in the config file, remove the
M_T_PREFERRED bit from all other preferred modes to force the config file
mode to be selected.
commit 73a93c5a6b68f7ba21f9e75f50b1032603a3b39e
Author: Keith Packard <keithp@neko.keithp.com>
Date: Thu Jul 19 13:26:36 2007 -0700
Query modes on disabled (but not ignored) outputs.
Code that disabled mode detection on disabled outputs would confuse
applications by listing said outputs as connected but without any modes.
This makes the disabled state in the config file affect only the initial
configuration and not subsequent modifications by RandR.
commit 9fc36a391c11170cde1a28f548a2cae5f6f20d5b
Author: Keith Packard <keithp@neko.keithp.com>
Date: Sat Jul 14 12:36:15 2007 -0700
Make pending property changes trigger mode setting.
The DDX code was ignoring pending properties for computing when mode setting
was required. This meant that configurations differing only in property
values would not cause the mode to be set.
commit aed6569309223ecc7e26fa84e4d430e422455607
Author: Adam Jackson <ajax@benzedrine.nwnk.net>
Date: Sat Jul 14 15:21:46 2007 -0400
Refactor how Composite adds visuals to the screen.
Besides being slightly simpler to read, it's now trivial to add a depth-16
visual to a depth-24 screen just by adding a line for it in the alternate
visual list. Visuals for indexed depths are slightly tricky still.
commit 21bbd7d64b5f74915afd7a312e589654442f3461
Author: Adam Jackson <ajax@benzedrine.nwnk.net>
Date: Tue Feb 6 21:42:50 2007 -0500
Delete some pre-dlloader debugging scaffolding.
If your loader is as bad as elfloader, then it makes sense for the
server to have some stubs for you to assign to / break on. However it
is no longer 1996.
commit 1f71f0c0574bafb36da20fec669f9a1138c69a47
Author: Adam Jackson <ajax@benzedrine.nwnk.net>
Date: Tue Feb 6 21:28:03 2007 -0500
Remove (long-)deprecated xf86EnablePciBusMaster.
commit 0a63d874e9c2f4fe4b38839a744461f9d41040b2
Author: Adam Jackson <ajax@benzedrine.nwnk.net>
Date: Tue Feb 6 21:22:49 2007 -0500
Always normalize the module name.
commit 9a1c6afd12caf0143483f72bfbba0c4c3daaa6ff
Author: Adam Jackson <ajax@benzedrine.nwnk.net>
Date: Tue Feb 6 21:19:50 2007 -0500
Remove dead code for screen crossing.
commit 8ca2fe8914af1a67bf597f99025e5cbe9b08da57
Author: Adam Jackson <ajax@benzedrine.nwnk.net>
Date: Tue Feb 6 21:11:13 2007 -0500
Delete dead module test code.
commit e2413cc7cae4e578b8e9b408ea85bef596b03ea3
Author: Adam Jackson <ajax@benzedrine.nwnk.net>
Date: Tue Feb 6 21:07:37 2007 -0500
Remove MEMDEBUG
This existed (but may not have worked) in the monolith, but is gone now.
commit d1d65a84150dfbc3a4dbe108f237a85ab6e09bbb
Author: Adam Jackson <ajax@benzedrine.nwnk.net>
Date: Tue Feb 6 21:01:08 2007 -0500
Dead ifdefs for BITMAP_SCANLINE_UNIT == 64
This appears to be a legacy of cfb24 not being smart enough to deal with this
case. But since cfb24 unexists, die die die.
commit cbe74394a5ed21ed80c0aab6eefd2716122cce11
Author: Adam Jackson <ajax@benzedrine.nwnk.net>
Date: Tue Feb 6 20:44:34 2007 -0500
Nuke dead X -configure code.
commit 5657fb065cc79ba3ca5a836f45637ba9894f9abf
Author: Dodji Seketeli <dodji@seketeli.org>
Date: Tue Jul 17 12:12:02 2007 +0200
exaDriverInit: Fail if pScreenInfo or a member of it is invalid.
EXA may attempt to use the invalid value and crash otherwise.
commit bbe7ce10fa93017374d7a4611427b70a22d7507a
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Mon Jul 16 17:25:59 2007 -0700
Update pci.ids to 2007-07-16 snapshot
Remove nvidia ids in extrapci.ids that are now in pci.ids
Add nvidia ids to extrapci.ids that are in xf86-video-nv but not pci.ids
commit ac979c165128704116cd40086320b6edc79018e2
Author: Keith Packard <keithp@neko.keithp.com>
Date: Sat Jul 14 12:13:17 2007 -0700
MakeAtom needs length without trailing NUL. sizeof("string") includes NUL.
I made a mistake in some new code using MakeAtom, passing the size of the
string instead of the length of the string. Figuring there might be other
such mistakes, I reviewed the server code and found four bugs of the same
form.
commit 393171034c15d8a1b82232b8f9455a358035e932
Author: Keith Packard <keithp@neko.keithp.com>
Date: Sat Jul 14 09:03:40 2007 -0700
Add RandR reflection support.
Replace the ad-hoc transformation mechanisms with matrices.
Prepares for more general transformation as well.
commit 8773ad023eb28950eb0f802d2ca31a67f84adddc
Author: Keith Packard <keithp@neko.keithp.com>
Date: Sat Jul 14 08:47:50 2007 -0700
Screen size bounds check in ProcRRSetCrtcConfig not masking out reflections.
When checking how to validate the selected mode and position against the
current screen size, the test against 90/270 rotation did not mask out
reflection, so that when reflection was specified, the 90/270 test would
never succeed. This caused incorrect bounds checking and would return
an error to the user instead of rotating the screen.
commit 881a620b4d6ea7a54af14c8f8fbe6924c9aa9291
Author: Keith Packard <keithp@neko.keithp.com>
Date: Sat Jul 14 08:45:10 2007 -0700
When sync'ing logfile, also flush it.
When the logfile is set to sync, the actual sync occurs whenever the log
file is flushed. If the log file is not also set to flush, no syncing
occurs.
commit 031b009ea678809bf1ddca883c2082b304c408c9
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Fri Jul 13 14:54:45 2007 -0700
Use %S instead of %s for strftime seconds when printing build time
commit c0e91777a9874fe2cd9a7e9180263f512c1e8f8d
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Thu Jul 12 16:37:11 2007 -0700
Add __SOL8__ to xorg-server.h.in since xf86-input-kbd needs it to build
commit 6b4231e3b5b49b731c9a00930ae465fff8539831
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Thu Jul 12 16:36:27 2007 -0700
Use kbd driver when xorg.conf specifies "keyboard" or "Keyboard" (bug #11301)
X.Org Bug #11301 <https://bugs.freedesktop.org/show_bug.cgi?id=11301>
Sun Bug #6560332 <http://bugs.opensolaris.org/bugdatabase/view_bug.do?bug_id=6560332>
commit 9fcb30ebf7b7b2137955f759e95c1d58c4f27a11
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Thu Jul 12 13:00:32 2007 -0700
Make SOLARIS_INOUT_ARCH substitutions work better with automake-1.10
commit 7c0ca27f6dd0a800dc27429a33dbc8e133f9a9c1
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Wed Jul 11 17:15:29 2007 -0700
"fbpict.c", line 215: void function cannot return value
commit 0a4e9311158ed3ecda0722640f860ace2f87a97e
Author: Hanno Boeck <hanno@gentoo.org>
Date: Thu Jul 12 10:17:07 2007 +1000
xnest: fix linking since dbus
Fixes bug 8955
commit b2f9ca6ac400d426d7a1ef0162f7e7ce28288dd1
Author: Keith Packard <keithp@neko.keithp.com>
Date: Tue Jul 10 21:33:34 2007 -0700
Redirect fix: Manual + Automatic - Manual = Automatic
A window with redirect manual *and* redirect automatic which loses the
manual redirecting client becomes redirect automatic.
commit 561989f2f0fc31e3d3bf8df978a9cb3d4c85af59
Author: Keith Packard <keithp@neko.keithp.com>
Date: Tue Jul 10 21:06:51 2007 -0700
Generate ChangeLog file for make dist.
Copy Makefile.am snippet which generates a complete git change history to
the ChangeLog file during the distribution generation process.
commit e316fa59fea8b7b18cdf3a227890351a9567ec65
Author: Adam Jackson <ajax@benzedrine.nwnk.net>
Date: Tue Jul 10 14:20:55 2007 -0400
Add per-monitor config file option for maximum pixel clock.
commit ffdf8f3e452638e6b050fccabee465d6c0300f45
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Tue Jul 10 13:56:38 2007 +0930
DeliverEventsToWindow: ensure that genericMask has a defined value.
commit 161624a5a45808fd56141dc2c64be729944f03ed
Author: Michel Dänzer <michel@tungstengraphics.com>
Date: Tue Jul 10 09:02:40 2007 +0200
GLX: Only build code dealing with GLXPixmap damage field when DRI is enabled.
commit 4abd00dab7e648dab8172f6009371e4e63d0c521
Author: Michel Dänzer <michel@tungstengraphics.com>
Date: Tue Jul 10 09:02:08 2007 +0200
Make sure DRI drawables are cleaned up when client dies.
The previous scheme didn't work when the client didn't create the core drawable,
e.g. the root or composite overlay window. Use refcounting via special client
resources to fix that.
commit 583e988b9f7cfb9293144c8309023c0dd1766715
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Tue Jul 10 09:19:02 2007 +0930
Install geext.h, otherwise drivers won't build.
commit 9809715afaafee9baf2aef348c1ebda7e8b3f076
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Mon Jul 9 10:42:03 2007 +0930
Change CheckMotion to ignore non-pointer events but acknowledge XI events.
Call CheckMotion from ProcessOtherEvents() to make sure absolute XI events
update the sprite before an event is sent.
commit 62efc3951a96648cf975302aa6651cb67b87fa64
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Fri Jul 6 17:00:20 2007 +0930
DeliverGrabbedEvent: stop segfault when gemask == NULL.
commit 3312e4dd5e055b2cb445b5d5c617aa7a611eedc1
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Fri Jul 6 16:41:52 2007 +0930
Call CheckMotion for all core events.
We need to do this to update the sprites x/y coordinate before we assemble a
button event. Absolute devices may send a buttonEvent with valuators attached.
If we don't update the sprite before assembling the event, the valuators are
lost and the button press is delivered to the previous position of the device.
Doesn't have any effect on relative devices.
commit c1a6841a64576b7e688e9ca0d3e0db8acf52d4ae
Author: Paulo Ricardo Zanoni <prz05@c3sl.ufpr.br>
Date: Tue Jul 10 10:08:44 2007 +0930
ProcX{Change|Query}WindowAccess: change device list from char* to XID*.
commit 5957aa6fdc580ccad4557eeefa0636ffad823f33
Author: Michel Dänzer <michel@tungstengraphics.com>
Date: Mon Jul 9 08:47:05 2007 +0200
Fix regression from recent composite changes.
One pWin->redirectDraw test was converted incorrectly, causing incorrect
rendering in some cases.
commit 5ccc09b18244f91a06b3bea20b02a97280d1a229
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Fri Jul 6 15:43:08 2007 +0930
Use the same struct for generic event masks throughout the code.
Renaming those structs too.
Previously grabs were using a different struct than windows, which was
reasonably stupid.
commit bcb23527421578bd4c9397d4c2c19cbefa22fc59
Author: Adam Jackson <ajax@benzedrine.nwnk.net>
Date: Thu Jul 5 15:56:25 2007 -0400
Clean up unused #ifdefs from fb.
commit 9ff7ff2fda30f334515b16ef0867c1500c41bc0f
Author: Keith Packard <keithp@neko.keithp.com>
Date: Wed Jul 4 23:38:27 2007 -0700
Fix MEMORY SMASH in XkbCopyKeymap.
XkbCopyKeymap reallocates the destination keymap when it is not large enough
to hold the source data. When reallocating the map->types data, it needs to
zero out the new entries. The computation for where to start bzero'ing was
accounting for the size of the data type twice, once implicitly in the
pointer arithmetic, and once explicitly with '* sizeof (XkbKeyTypeRec)'.
This would often lead to random memory corruption when the destination
keymap had existing map->types data.
commit 9131d560a0d42067cc4e726e445e060216c9acdc
Author: Tiago Vignatti <vignatti@c3sl.ufpr.br>
Date: Thu Jul 5 02:47:34 2007 -0300
Postpone options variable assignment to fix segfault when we got a device but
its driver is incorrect. Also if (!ki && !pi) can never be true.
This one also adds the device option field.
commit 41b485d5507821e41c3281c3c565647ae7582101
Author: Tiago Vignatti <vignatti@c3sl.ufpr.br>
Date: Thu Jul 5 02:40:07 2007 -0300
kdrive must to know that devices are unplugged.
commit a92dc6b5295e4f352115fed2856169929819863f
Author: Tiago Vignatti <vignatti@c3sl.ufpr.br>
Date: Thu Jul 5 02:28:14 2007 -0300
Remove redundant linking in kdrive. Fix configure.ac variable name and clean
it up a little.
commit 41b5155c8be75c4e171c0f64616cc09598b8ec54
Author: Tiago Vignatti <vignatti@c3sl.ufpr.br>
Date: Thu Jul 5 01:57:41 2007 -0300
For each kdrive server put a dependencie on its own libraries.
commit 16e429bcbf2f62cfc58162ab2857afb7376dda41
Author: Jonathan Lim <jlim@sgi.com>
Date: Wed Jul 4 20:08:49 2007 +0200
Bug 5000: Fix domain support for SGI Altix
commit f106c04b627d9f57b38627971dc79c75129e66d6
Author: Keith Packard <keithp@neko.keithp.com>
Date: Tue Jul 3 14:47:19 2007 -0700
Have Composite always report server version.
It was reporting the lessor of the server and client versions, which doesn't
make sense with the 0.4 semantic change in clipping.
commit 4f88d68bdb90cc7d12170355105b4fd020acd306
Author: Keith Packard <keithp@neko.keithp.com>
Date: Tue Jul 3 14:43:17 2007 -0700
Force advertised Composite version to 0.4 instead of using header version.
Installed protocol header version may be newer than the server code base.
Use internal version number for Composite extension to make sure the server
doesn't advertise capabilities it doesn't support.
commit 866f092ca0160a366add01b48ad03438926c4d16
Author: Keith Packard <keithp@neko.keithp.com>
Date: Tue Jul 3 14:29:11 2007 -0700
Make Composite manual redirect windows not clip their parent.
This patch changes the semantics of manual redirect windows so that they no
longer affect the clip list of their parent. Doing this means the parent can
draw to the area covered by the child without using IncludeInferiors. More
importantly, this also means that the parent receives expose events when
that region is damaged by other actions.
commit 2a75c774975b50dd4e71b7dbea7bd65ca2984a43
Author: Dodji Seketeli <dodji@seketeli.org>
Date: Tue Jul 3 11:00:29 2007 +0200
ExaOffscreenMarkUsed: Don't crash when there's no offscreen memory.
commit 0ede39a25cf5b0b6c2c89677f810c21ce42b95df
Author: Michel Dänzer <michel@tungstengraphics.com>
Date: Tue Jul 3 10:55:13 2007 +0200
Fix build when int10 doesn't use x86emu.
commit 028a00bc518dc6908839e8ce7c50ab1837100945
Author: Adam Jackson <ajax@benzedrine.nwnk.net>
Date: Mon Jul 2 18:41:55 2007 -0400
Make x86emu's I/O cycle tracing more useful.
Print debug messages only when the appropriate debug bit is set in the
8086 state vector, so you can focus in on the call you're actually
interested in.
commit 00e8295b7e0c7c0ba97707903004272818e3d87d
Author: Gero Mudersbach <geroxp@web.de>
Date: Mon Jul 2 11:40:11 2007 -0700
Bug #10814: Add needed quirk for Samsung 225BW like the 226BW.
commit 667e95f2e8389d9f23c50446d6d664eddd16d260
Author: Eric Anholt <eric@anholt.net>
Date: Mon Jul 2 11:36:11 2007 -0700
Correct the xf86EdidModes.c file description.
commit 3de1f0d03b329b01856f664651db23ffefb58646
Author: Eric Anholt <eric@anholt.net>
Date: Tue May 29 10:08:58 2007 -0700
Fix documentation of association of outputs to monitor sections in xorg.conf(5)
commit c1a16bdcfe7aa907fe78f27dc606a8e5a2699952
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Wed Jun 27 18:08:03 2007 +0930
Add 'evfill' field to GEExtensions.
We need this to allow extensions to fill in extra data for an event before it
is sent to the client. This is probably to be used like
FillUpEventsFromWindow().
commit 4d76075dbb618a47ff9fc15c4be2e2d34210fa8d
Author: Adam Jackson <ajax@benzedrine.nwnk.net>
Date: Fri Jun 29 14:06:52 2007 -0400
Death to RCS tags.
commit 2691c05fd647d9fa10f791ac397ecb9c423a076f
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Fri Jun 29 11:56:18 2007 +0930
Make sure window->optional is allocated before assigning it.
DeletePassiveGrabFromList() may remove the window optional, so we need to
re-alloc it if it isn't there anymore.
Thanks to Colin Harrison for spotting the bug.
commit f7f3fe7fe7233a2ffc43106c48f44cbbd82b7c19
Author: Adam Jackson <ajax@benzedrine.nwnk.net>
Date: Thu Jun 28 18:59:05 2007 -0400
Remove the remnants of OS/2 support.
This has never worked in any modular server release, and as far as I know
was never tested in 6.7 through 6.9.
commit 8a06ff9ffa4816d192e58e43e7fe569b97b4dd7c
Author: Adam Jackson <ajax@benzedrine.nwnk.net>
Date: Thu Jun 28 16:41:28 2007 -0400
Fix another usage of MAX_PCI_DEVICES.
Fixes cases where the VGA device is above the 128th device on the system.
commit 928836a5abd85466e920eb487fab9ccb295e0c5b
Author: Adam Jackson <ajax@benzedrine.nwnk.net>
Date: Thu Jun 28 16:29:28 2007 -0400
Bug #10770: "Inputdevs" isn't a valid config file keyword.
commit 62f43d8b33f67d8f3d0bd65787ffae9e6b634d65
Author: Tiago Vignatti <vignatti@c3sl.ufpr.br>
Date: Wed Jun 27 16:24:42 2007 -0300
Relink properly all kdrive servers when changes happen.
commit 3860996d5666b76600b1537e2cbd58e36b086308
Author: Tiago Vignatti <vignatti@c3sl.ufpr.br>
Date: Wed Jun 27 16:06:12 2007 -0300
Remove double-defined.
commit 1e189ed1daab58c1de67d387306fde0a9e7984a4
Author: Aaron Plattner <aplattner@nvidia.com>
Date: Wed Jun 27 10:16:40 2007 -0700
Handle tileStride > 1 in fbEvenTile.
Patch courtesy of James Jones.
commit bf1ad1aa4270dccf1540943d97e80b317c0adb56
Author: Adam Jackson <ajax@benzedrine.nwnk.net>
Date: Wed Jun 27 09:19:28 2007 -0400
Add VBE PanelID support.
Originally found only in the i810 driver.
commit d73835efda4995a310188537233a984f4b73628d
Author: Tiago Vignatti <vignatti@c3sl.ufpr.br>
Date: Wed Jun 27 03:34:13 2007 -0300
More janitor work. Remove 'defined but not used' warnings from kdrive and some minor cosmetic.
commit 38f8e536684193c3f70b23be22d818053c676072
Author: Tiago Vignatti <vignatti@c3sl.ufpr.br>
Date: Wed Jun 27 03:19:37 2007 -0300
Janitor work. Remove 'defined but not used' warnings from xorg and other cosmetic.
commit 1340f34ec98c41781164018d43bd7bb858d8132b
Author: Tiago Vignatti <vignatti@c3sl.ufpr.br>
Date: Wed Jun 27 03:04:55 2007 -0300
Fix kdrive XKB.
commit 08779c62ba2f4cbfa47e3cf738daf8abd74b60cf
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Wed Jun 27 11:16:55 2007 +0930
Reset grab->next to NULL when we're creating a grab.
This is definitely necessary in CheckDeviceGrabAndHintWindow (thanks to Paulo
Zanoni for spotting it). We're resetting it everywhere else too, just to be
save.
commit 49136d3e9fe2d065090ee90c18a49f65fb027c9f
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Tue Jun 26 19:43:54 2007 +0930
mieqEnqueue: use modulo for queue tail wrapping.
This was previously committed by Michael Daenzer, but was lost during a pull.
commit 8396bf7c8b4eb6b8f2d1e1ef19887064c69591da
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Tue Jun 26 12:58:37 2007 +0930
Init genericMasks to 0, make sure list is NULL terminated.
commit 9725516b4274ceaf9d6caf372c5439b4c9db2316
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Fri Jun 22 17:05:21 2007 -0700
Split checks for dtrace & getpeerucred()
commit edb9ccf3ecb4e35a840aa13815979c5fbd73f32d
Author: Michel Dänzer <michel@tungstengraphics.com>
Date: Mon Jun 25 10:51:38 2007 +0200
Make sure DRIScreenPrivIndex is -1 when no DRI screen private is allocated.
Fixes https://bugs.freedesktop.org/show_bug.cgi?id=11340 .
commit c4e850a781e3b85631cb386d24efcca2a835d4c9
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Mon Jun 25 13:38:25 2007 +0930
Quickfix to stop core key events from doubling up.
commit 4c601b904ee6fb01da3343ff9ef00d36f1341fcb
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Mon Jun 25 10:53:05 2007 +0930
configFiles(): don't return anything when declared as void.
commit bec4e47d128ec40b58a2c9aae475f6a6fc4323c3
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Mon Jun 25 10:51:42 2007 +0930
NULL-terminate device list when synthesizing core devices.
This fix is required for 93ca526892c0d22afa05cce6496198c652043a19 to work.
commit 8e5102b9f01821048e72e7f068193a0b3e1816f9
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Thu Jun 21 15:47:48 2007 +0930
Set the detail field for DeviceKeyEvents to the keycode.
(cherry picked from commit 0c33dc152e372cdc8ae59d9a5696b0774bcd03b7)
commit 87564543d92c1ee1f8cb6fb9716a15d693e08cf5
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Tue Jun 19 18:20:05 2007 +0930
Only decrement buttonsDown when the button count is greater than 0.
Device drivers flush their buttons on device init and cause a button down
event to be generated. If we unconditionally decrease the buttons, we won't be
able to ever get a passive device grab.
Format documentation for CheckDeviceGrabs to make it readable.
(cherry picked from commit 3e894974cdd6a75683d4601f71622d1da7ec4395)
Conflicts:
Xi/exevents.c
commit 24ee89fd60f489f2d3af0399e0d667057df74d02
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Tue Jun 19 15:31:56 2007 +0930
Add a few comments to devices.c
commit 93ca526892c0d22afa05cce6496198c652043a19
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Wed Jun 13 15:28:15 2007 +0930
Split up memory for devices configured in the config file.
If we're using a continuous block here, we segfault when a device removal
triggers an xfree call.
commit b141b85c254afff3ce2221d899787fab3dc295bd
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Wed Jun 13 15:26:03 2007 +0930
Check for identical grabs when adding a new passive grab. If an identical grab
exists, remove the old one and prepend the new one.
X.org Bug 2738 <https://bugs.freedesktop.org/show_bug.cgi?id=2738>
commit 19cde59c41cf167cc609debfee75bfc015beac12
Author: Søren Sandmann Pedersen <sandmann@redhat.com>
Date: Fri Jun 22 00:38:50 2007 -0400
In fbFill() make sure the drawable is validated when pixman_fill() succeeds.
In fbSolidBoxClipped() don't return when pixman_fill() succeeds.
commit d2177c80915f2fe2e8a5c948d4ba2fa51dbfbea2
Author: Keith Packard <keithp@neko.keithp.com>
Date: Fri Jun 22 02:08:21 2007 +0100
Skip driver mode detection/configuration when !vtSema.
When the server is not active, make sure the driver functions related to
mode setting are not called.
commit 32c0dcc8c0d1edba5d7e418fd2dc916847a4f069
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Thu Jun 21 15:39:19 2007 -0400
xselinux: adjust the config file format to that expected by libselinux.
This file will eventually be moved out of the X source tree.
commit 2030e9e5395be43bd8eab15b65c21ca4c2f1e619
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Thu Jun 21 15:37:18 2007 -0400
xselinux: use new libselinux support for context labeling.
Remove all the config file parsing code and use the new lookup interface
instead.
commit 4d5df14f2c4a3108a8c8adfcf4766c0d1a9daad2
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Thu Jun 21 18:24:30 2007 +0930
Save processInputProc before wrapping it and restore it later, instead of
using a hardcoded ProcessKeyboardEvent. Otherwise we lose the ability to
process DeviceKeyEvents after the first key press.
This should be the correct fix now.
commit f6f3322fc7562dbfccaf798b05d42ea222860ba8
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Thu Jun 21 18:16:21 2007 +0930
Revert "Save processInputProc before wrapping it and restore it later, instead of"
Mixed up source trees, this was a very bad fix.
This reverts commit 8431f6083076cf1e701366767d8f8d32a628200f.
commit 8431f6083076cf1e701366767d8f8d32a628200f
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Thu Jun 21 17:00:41 2007 +0930
Save processInputProc before wrapping it and restore it later, instead of
using a hardcoded ProcessKeyboardEvent. Otherwise we lose the ability to
process DeviceKeyEvents after the first key press.
commit 0c33dc152e372cdc8ae59d9a5696b0774bcd03b7
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Thu Jun 21 15:47:48 2007 +0930
Set the detail field for DeviceKeyEvents to the keycode.
commit e523859a952d49b20f3d10152cc0ef695d2c12a1
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Wed Jun 20 17:54:38 2007 -0700
Include module name in "already built-in" message
commit 5138f710a1574fef6f553f3fe2fccac0620d2584
Author: Arcady Goldmints-Orlov <arcadyg@nvidia.com>
Date: Wed Jun 20 16:31:55 2007 -0700
Fixed fbSolidBoxClipped() to fill the right place.
Changed an X2 to a Y1.
Signed-off-by: Aaron Plattner <aplattner@nvidia.com>
commit c9b79a355845c895aca8303a39798264d80b6212
Author: Michel Dänzer <michel@tungstengraphics.com>
Date: Wed Jun 20 18:56:06 2007 +0200
exaPolyFillRect: Don't track damage explicitly.
All callers should already do it.
Also don't leak pReg.
commit 87966c5d2889873cea6cbc16b7e4399490dfaec1
Author: Michel Dänzer <michel@tungstengraphics.com>
Date: Wed Jun 20 18:42:00 2007 +0200
exaGetImage: Don't migrate or try to accelerate for 1x1.
This is mainly to avoid wasting effort for XSync(), but just reading a single
pixel directly is probably faster than DownloadFromScreen anyway. Though in
light of the latter, even larger thresholds might be useful.
Also move the swappedOut check before the migration checks because migration
can't actually occur when swapped out.
commit 1f97a7647606226cde61d6ad7a94f2b0b571a06c
Merge: 5dee64fc99 2e7fef7d08
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Tue Jun 19 17:20:52 2007 +0930
Merge branch 'master' into mpx
Conflicts:
dix/devices.c
hw/xfree86/common/xf86Xinput.c
hw/xfree86/loader/xf86sym.c
mi/mieq.c
commit 40f27a2df4906d9ceb1c78f6163a62c497321535
Author: Michel Dänzer <michel@tungstengraphics.com>
Date: Tue Jun 19 09:11:16 2007 +0200
mieqEnqueue: Make local queue tail variables unsigned.
So the modulo arithmetic actually works as intended... thanks to Peter Hutterer
for pointing out the problem.
commit 5dee64fc99f34e091abce65d47c4b6f026ab4849
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Tue Jun 19 11:31:22 2007 +0930
Add a few comments to ProcXGrabDevice.
commit 9e257029c760883c4ea0715d4fd06476f3fe8053
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Tue Jun 19 11:28:07 2007 +0930
Add implicitGrab field to GrabInfoRec.
Is set when passive grab is implicit as result of a ButtonPress event. If this
is the case, we need to store the XI mask as well as the core mask to ensure
delivery of XI events during the grab's lifetime.
Remove all core grabs on other devices when client issues a GrabPointer or
GrabKeyboard request. Let's assume that the client really only wants one
device to interact, so this seems like a reasonable solution.
commit ab7a6d860d4a275a810a64b1ba7b13726ed10575
Merge: e9130b8bac 2e7fef7d08
Author: Ian Romanick <idr@us.ibm.com>
Date: Mon Jun 18 16:51:13 2007 -0700
Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver into pci-rework
Conflicts:
hw/xfree86/os-support/bus/Pci.c
hw/xfree86/os-support/bus/linuxPci.c
commit 2e7fef7d0837939e822c40b6ac77e7f0e66d57bd
Author: Adam Jackson <ajax@benzedrine.nwnk.net>
Date: Mon Jun 18 12:08:39 2007 -0400
Make xf86{En,Dis}ableInterrupts no-ops on Linux.
commit 831d3b7f8d053aba649c8d04af3bef96376bdc3a
Author: Lennart Buytenhek <buytenh@wantstofly.org>
Date: Mon Jun 18 12:05:55 2007 -0400
Compile fixes for Linux ARM platforms.
commit 562ca3f2f9005e7c5ed0a24b0759051ded2173e9
Author: Zephaniah E. Hull <warp@agamemnon.b5>
Date: Mon Jun 18 12:00:49 2007 -0400
In NewInputDeviceRequest, only call EnableDevice if xf86Screens[0]->vtSema is
true, preventing unwanted behavior in the case where a device is added while
the user is in a different VT.
commit 3e894974cdd6a75683d4601f71622d1da7ec4395
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Fri Jun 15 17:16:16 2007 +0930
Only decrement buttonsDown when the button count is greater than 0.
Device drivers flush their buttons on device init and cause a button down
event to be generated. If we unconditionally decrease the buttons, we won't be
able to ever get a passive device grab.
Format documentation for CheckDeviceGrabs to make it readable.
commit 42c2e14b254f6f882b3e79444360ab855db43e27
Author: Matthieu Herrb <matthieu@deville.herrb.com>
Date: Fri Jun 15 00:14:02 2007 +0200
swap xOrigin and yOrigin in SProcRenderSetPictureClipRectangles.
Fixes Xrender clipping rectangles when X server and client are of
different endianness, shown by xterm 225 among others.
commit 0aaf51546666f71e8d1711978bc7988ec2ecc7d9
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Tue Jun 12 16:55:26 2007 +0930
Zero deviceMask and genericMask when creating a grab via CreateGrab().
commit 78179ae827bb5d19abb1340084362bc51ad5c1e5
Author: Søren Sandmann Pedersen <sandmann@redhat.com>
Date: Mon Jun 11 22:46:42 2007 -0400
Remove fbmmx.[ch] files
commit eb2d7fe02f9cbca57b462bba05498e2d59316fbc
Author: Søren Sandmann Pedersen <sandmann@redhat.com>
Date: Mon Jun 11 22:43:01 2007 -0400
Replace fbFillmmx() with pixman_fill() and remove fbmmx.[ch]
commit f52ae237d3eec79ccd64cdd77271aeacc37af70c
Author: Søren Sandmann Pedersen <sandmann@redhat.com>
Date: Mon Jun 11 22:02:39 2007 -0400
Require pixman 0.9.2
commit d1d85c04e248f46b1cf1b1d25fdd56aa69b8f0ee
Author: Søren Sandmann Pedersen <sandmann@redhat.com>
Date: Mon Jun 11 21:25:42 2007 -0400
Delete fbBltmmx().
commit e2a720c9a17dc860ee0a858c2b21fd71e86cdcd0
Merge: 878cac71aa 3f9adb18f1
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Mon Jun 11 15:29:11 2007 -0400
Merge branch 'master' into XACE-SELINUX
Conflicts:
dix/dixutils.c
commit 3f9adb18f127318d054f30a57e3a77176e14c692
Author: Søren Sandmann Pedersen <sandmann@redhat.com>
Date: Mon Jun 11 15:19:27 2007 -0400
Port a few forgotten fbSolidFillmmx()'es to fbFillmmx(). Use pixman_blt() instead of fbBltmmx()
in fbCopyNToN().
commit 878cac71aa0018deee861b297638c0744dba631b
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Mon Jun 11 14:19:37 2007 -0400
xselinux: use new libselinux support for private Flask definitions.
Removes indirect dependency on kernel headers.
commit d06099b38e8445e6e31f5178ffefcc31a71080ef
Author: Søren Sandmann Pedersen <sandmann@redhat.com>
Date: Mon Jun 11 13:28:24 2007 -0400
Remove fbCopyAreammx() and fbSolidFillmmx()
commit d4a034370c8ae71b2cc4fe824ceee58b19624f35
Author: Søren Sandmann Pedersen <sandmann@redhat.com>
Date: Mon Jun 11 13:26:24 2007 -0400
Split fbSolidFillmmx() into a new FbFillmmx() function. Call that from fbFill().
commit 3210902a7334f3d8d6c18a34a3cb3f55803b0043
Author: Søren Sandmann Pedersen <sandmann@redhat.com>
Date: Mon Jun 11 13:14:50 2007 -0400
Split fbCopyAreammx() into a new fbBltmmx() function; call this
function from fbCopyNToN().
commit 8d5f4368eac1b259db3e61f877a4cc10f04efa2f
Author: Clark Rawlins <clark.rawlins@escient.com>
Date: Mon Jun 11 16:53:38 2007 +0200
Really make sure BUILD_TIME doesn't have a leading zero.
date +'%k%M%S' still gives a leading zero in the hour after midnight...
Add a leading 1 and remove it in xf86PrintBanner().
commit 54e023cec07aa7e392da36e11d0a4667b8341370
Author: Søren Sandmann Pedersen <sandmann@redhat.com>
Date: Mon Jun 11 09:16:46 2007 -0400
Don't pass regions to pixman_image_composite() anymore.
commit 5cbec267b6426960c90f6bcff1d051af5084538c
Author: Michel Dänzer <michel@tungstengraphics.com>
Date: Mon Jun 11 12:38:41 2007 +0200
Make sure BUILD_TIME doesn't have a leading zero.
It causes the compiler to treat it as an octal constant instead of decimal as
intended, which could even cause a build failure in the cases of 08 and 09.
Thanks to Clark Rawlins for pointing out the problem.
commit 1aceec61ff203848576c47a1eab13f90a67d7176
Author: Michel Dänzer <michel@tungstengraphics.com>
Date: Mon Jun 11 09:23:19 2007 +0200
DRI: Clip cliprects obtained from DRIGetDrawableInfo to screen dimensions.
This is to avoid issues with redirected windows which are located partly or
fully outside of a screen edge, resulting in unusual cliprects which the 3D
drivers generally can't handle. The symptoms in such cases would be incorrect
rendering or even crashes or hangs.
commit 5d896e43fd056d935935b4eb66562791edc247a1
Author: Michel Dänzer <michel@tungstengraphics.com>
Date: Mon Jun 11 09:23:19 2007 +0200
DRITreeTraversal: Stop walking tree when we've seen all DRI windows.
commit 0fb44c6f9a0415184818ba8357a21ff920e907dc
Author: Michel Dänzer <michel@tungstengraphics.com>
Date: Mon Jun 11 09:23:19 2007 +0200
DRI: Fix build warning.
commit 644f7ddc0cb029e2ebca43742fd8a46a1a3f4c9f
Author: Michel Dänzer <michel@tungstengraphics.com>
Date: Mon Jun 11 09:23:18 2007 +0200
dixLookupClient: Use access parameter.
commit 30a3297fed9af3a594aba0875a8f58a0a38b33fc
Author: Michel Dänzer <michel@tungstengraphics.com>
Date: Mon Jun 11 09:23:18 2007 +0200
mieq queue handling cleanups.
In particular, fix handling of wraparounds in mieqEnqueue.
commit c1a49a9269f14b6975a1a2c751bb179757373f11
Author: Adam Jackson <ajax@benzedrine.nwnk.net>
Date: Sun Jun 10 22:14:57 2007 -0400
GNU is wrong and ` is not left-quote.
commit 67a0a4da1a225ee3bd6bbd1846f8141fe333c884
Author: Dave Airlie <airlied@linux.ie>
Date: Mon Jun 11 11:55:11 2007 +1000
update xproto dependency to at least 7.0.9
commit c079cce9d884ab03f305b3fba4a4e1247c023480
Author: Daniel Ciocea <daniel.ciocea@eosystems.ro>
Date: Fri Jun 8 18:12:21 2007 -0700
Fix sync polarity on Samsung SyncMaster 205BW monitor.
need to use standard VESA sync polarity instead of the
EDID provided -hsync -vsync values.
commit 9c47b86bd9a4633fda5fd305a09ac8623187efa0
Author: Aaron Plattner <aplattner@nvidia.com>
Date: Thu Jun 7 13:57:12 2007 -0700
Add new fb symbols to wfbrename.h.
Avoids crashes when wfbComposite calls the wrong image_from_pict.
commit 567b5bf765254a4ae9cc7711bb6acfa89a9fd61c
Author: Søren Sandmann Pedersen <sandmann@redhat.com>
Date: Tue Jun 5 20:26:49 2007 -0400
Delete fbCompositeCopyAreammx()
commit 49ed31c0b323dd8c5887a803c199875e6f2330d8
Author: Søren Sandmann Pedersen <sandmann@redhat.com>
Date: Tue Jun 5 17:44:21 2007 -0400
Remove most of the fast-path MMX operations from fbmmx. fbCopyAreammx
and fbSolidFillmmx are still needed by other code.
commit dfbe32b5b828cc4e3da36a0e2e6ad641164eaa5e
Author: Adam Jackson <ajax@benzedrine.nwnk.net>
Date: Mon Jun 4 18:07:00 2007 -0400
Remove the old Kerberos 5 authentication code.
Before you complain, this code hasn't seen material change since at least
X11R6. It certainly does not build with any modern version of Kerberos.
Anybody wanting krb5 auth to their X server should probably be using
GSSAPI instead of internal krb5 API anyway.
commit 793470a8356976ddd427280a738dfb6e1c0e4e70
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Mon Jun 4 12:33:49 2007 -0400
dix: fix null pointer dereference in new resource lookup function.
commit 75dece08fb72803d5116e6776e9f1534ff20e37b
Author: Zephaniah E. Hull <warp@agamemnon.b5>
Date: Mon Jun 4 09:09:20 2007 -0400
xf86PostMotionEvents[P] calls xf86SendDragEvents, xf86SendDragEvents
unconditionally checks device->button->buttonsDown.
Let's make it possible to have a device with motion, but no buttons.
Without segfaulting.
commit fbb9b203950e9d0e82574cde5b3e006b0e6b404f
Author: Zephaniah E. Hull <warp@agamemnon.b5>
Date: Mon Jun 4 06:59:42 2007 -0400
Let's not do a calloc and a free on every call to xf86PostMotionEvents.
commit 3f4295e643ca56c40f33af7966e8efd367ef8749
Author: Zephaniah E. Hull <warp@agamemnon.b5>
Date: Mon Jun 4 06:48:06 2007 -0400
Add xf86PostMotionEventP, takes a pointer instead of a variable number of
arguments.
Bump input ABI to 1.1 since we export this.
commit a4f3473c88370b8411e016ebab619cffd33e58f9
Author: Zephaniah E. Hull <warp@agamemnon.b5>
Date: Mon Jun 4 06:39:02 2007 -0400
Fully init the AbsoluteClassRec in InitAbsoluteClassDeviceStruct.
(Specificly, we were missing the screen field.)
commit 0cbc3a4da2ddb6e4f30f60d2bc7f405d31aa554a
Author: Zephaniah E. Hull <warp@agamemnon.b5>
Date: Mon Jun 4 02:03:44 2007 -0400
Print the build time as well as the date if we can.
commit 9a7aaeb3f6ff79af60fde91cd0575a54ba0b9587
Author: Daniel Stone <daniel@fooishbar.org>
Date: Mon May 28 13:54:16 2007 +0300
XFree86: Input: Assume core events per default
Assume that a device will be sending core events, unless explicitly
specified otherwise.
commit 94361cbba7f866144691f6f5e9251a550e0e0cb8
Author: Daniel Stone <daniel@fooishbar.org>
Date: Mon May 28 13:54:47 2007 +0300
XFree86: Input: Perform case-insensitive comparisons on option names
commit e5ce982381c4092252d6b55fcefcc9a3cd21e656
Author: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Date: Sun Jun 3 09:40:37 2007 +1000
Include pixman.h from fb.h or compile of some files will fail
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
commit 90eb22656c34d2d08a8dccaf05e6d081c56bd7f3
Author: Adam Jackson <ajax@benzedrine.nwnk.net>
Date: Sat Jun 2 16:49:26 2007 -0400
Minor cleanup/robustification to config parsing.
commit f6a983533bdc84752562ef0be25b320678bf08a1
Author: Adam Jackson <ajax@benzedrine.nwnk.net>
Date: Sat Jun 2 16:37:39 2007 -0400
Don't warn about default behaviour when autoconfigging.
commit 21e8f4eb02842f877336db08c332d8ee4a381ee0
Author: Adam Jackson <ajax@benzedrine.nwnk.net>
Date: Sat Jun 2 16:13:01 2007 -0400
Don't print lack of DRI support as an error in AIGLX init.
commit 0e1384d8318637f75d04d3d1b7600f7cad40117e
Author: Adam Jackson <ajax@benzedrine.nwnk.net>
Date: Sat Jun 2 16:07:20 2007 -0400
Delete VDIF support; it was never used anyway.
commit 66702f3c1c6c884e83744c72da173cc32f22b2f4
Author: Henry Zhao <henryz@localhost.localdomain>
Date: Fri Jun 1 23:55:40 2007 -0700
Need to use minPitch in miScanLineWidth() to get the shrinked
linePitch.
commit 26b21157cf934ae387b15faa9ebb060120e6a0d6
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Thu May 31 17:05:14 2007 +0930
Add a deviceMask to the GrabRec and don't interfere with passiveGrabs.
This quickfixes event delivery problems with XI events when a grab was on.
deviceMask is only used when the grab was from a ButtonPress to preserve
potential XI event masks.
This is not an ideal solution but it works until I have time to work on
PassiveGrabs.
commit fa877d7ff25c4ec45288e1fea70d4f5e1baf3ef3
Author: Alan Hourihane <alanh@fairlite.demon.co.uk>
Date: Wed May 30 13:06:45 2007 +0100
Fix mode validation against the maximum X/Y values configured
at server startup, and not against the virtual X/Y parameters
as they can change.
This fixes an issue when canGrow is TRUE and modes get dropped
when using the virtual X/Y parameters.
commit 182ab3a3d5b28daa86e6d6155e76ce759687ae6d
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Wed May 30 17:44:31 2007 +0930
Fix up comments for event.c
commit b5db863945fa8045995b3bf742c44e40f2650f04
Author: Paulo Ricardo Zanoni <prz05@c3sl.ufpr.br>
Date: Wed May 30 16:15:15 2007 +0930
Allow value None for windows when setting ClientPointer.
We need this for clients that need to set the ClientPointer but don't have a
window on display yet. If used, it will set the device as the ClientPointer
for the requesting client.
commit 99eae8bea6724a24477375ad5b2d31cc4883cf6b
Author: Samuel Thibault <samuel.thibault@ens-lyon.org>
Date: Tue May 29 22:04:36 2007 -0400
I/O enable/disable update for the Hurd
commit 3c6f1428489c1f71acd41066ea73ef4ae7c60f17
Author: Julien Cristau <jcristau@debian.org>
Date: Tue May 29 22:01:30 2007 -0400
Make sure that the ramdac symbols are present in the server
The former ramdac module is now built into the server, so its symbols need to
be explicitly exported to drivers (Debian #423129).
commit ee20c481eede0954f4a8bef5113979b101863c32
Author: Matthieu Herrb <matthieu@deville.herrb.com>
Date: Tue May 29 14:54:27 2007 -0600
Remove wscons keyboard handling stuff that doesn't belong there anymore.
commit 60de6c7ef9bdcee043f63e8e0d493e6feba6a9d0
Merge: 3a6549a163 2f13b7c113
Author: Matthieu Herrb <matthieu@deville.herrb.com>
Date: Tue May 29 12:14:49 2007 -0600
Merge branch 'master' of ssh://herrb@git.freedesktop.org/git/xorg/xserver
commit 3a6549a163aba26bf4ac58b050c493fba0df14c6
Author: Matthieu Herrb <matthieu@deville.herrb.com>
Date: Tue May 29 12:14:23 2007 -0600
Make this build on OpenBSD
commit 2f13b7c113c17239e382dd3640e9c29201d8ab1f
Author: Drew Parsons <dparsons@debian.org>
Date: Wed May 30 02:13:36 2007 +1000
Update Xprint build for pixman.
Xprt links libfb, which now uses pixman. Update configure.ac to
require module $PIXMAN for XPRINT.
Also, use $(top_builddir) to reference libfb.la and other local
libraries, rather than using the relative reference ../..
commit ba0b7d47ab0c24d5a29228f8af583044060464bd
Author: David Nusinow <dnusinow@debian.org>
Date: Mon May 28 21:57:04 2007 -0400
Fix for GNU/kFreeBSD
commit 2267bf48b385c93243e26c3bb84ebb04c7fdb39f
Author: Bastian Blank <waldi@debian.org>
Date: Mon May 28 21:55:05 2007 -0400
Fixes for s390
commit 857ddbb660a21cad1c16f4fb2dc8a904d6655304
Author: Eugene Konev <ejka@imfi.kspu.ru>
Date: Mon May 28 21:53:02 2007 -0400
Allow configurable serverconfigdir for security policy location
Allow the location of the SERVERCONFIGdir variable to be defined at
compile-time. This allows us to specify where the security policy will be
located (Debian uses this to put it in /etc). The default is to the
previous location.
commit 78d01d1008973899d931ef44b47d5f0b5f220b0d
Author: Gerhard Tonn <gt@debian.org>
Date: Mon May 28 21:48:58 2007 -0400
Miscellaneous fixes for S/390.
commit d98bd4bf908c2c51fcfd3a4c3230de17f2567244
Author: Branden Robinson <branden@debian.org>
Date: Mon May 28 21:44:59 2007 -0400
Overhaul xorg.conf manpage
Major stylistic cleanups, greatly expanded cross-reference ("SEE ALSO")
section and some typo fixes.
This patch by Branden Robinson. Forward-ported by Fabio M. Di Nitto.
commit 6bf8d5019313ee2251a44dfb7ad3435a3c6db7eb
Author: David Nusinow <dnusinow@debian.org>
Date: Mon May 28 21:42:10 2007 -0400
Read ROM in chunks
This patch speeds up reads of the ROM by reading in large chunks rather
than one byte at a time. This patch was by Dann Frazier.
commit 6fdd134a0c3e6fdde9b089100e8783705c9cc6ac
Author: David Nusinow <dnusinow@debian.org>
Date: Mon May 28 21:39:12 2007 -0400
Fix up xnest manpage
I believe this patch was originally by Branden Robinson
commit 6a870992d81a6bacfa9d313c15784fdb281d474f
Author: Keith Packard <keithp@dulcimer.keithp.com>
Date: Fri May 25 20:33:08 2007 -0700
xf86XVFillKeyHelper assumed root clip never changed.
When the root window changed size, xf86XVFillKeyHelper would not revalidate
the GC, leaving the clip at the old size causing lossage (and possibly
memory corruption if the screen and frame buffer shrank).
Fixed by just using a scratch GC; saving memory, eliminating bugs and
shrinking the code.
commit 3c982bc1a49509dda7bc469b0eced44df02755b3
Author: Luo Jie <luojie@nlsde.buaa.edu.cn>
Date: Thu May 24 11:13:03 2007 -0700
Reinstate an apparently mis-deleted ';' from a for loop with no body.
Fixes an error returning "No core keyboard" with multiple keyboards.
commit 4d7469f75fadfc4a59664e88e18eb304203670f4
Author: Luo Jie <luojie@nlsde.buaa.edu.cn>
Date: Thu May 24 11:04:06 2007 -0700
Fix a typo in using memcpy in xwin.
commit 0b988450462ddb005311e68502357baf272e6371
Author: Luo Jie <luojie@nlsde.buaa.edu.cn>
Date: Thu May 24 11:02:28 2007 -0700
Fix os/utils.c compile with mingw.
commit 1f48995d66c0072caa7e5ce2845be642221dd56d
Author: Luo Jie <luojie@nlsde.buaa.edu.cn>
Date: Thu May 24 11:01:15 2007 -0700
Fix build of composite, dix, and randr when Xinerama is disabled.
commit 8f98be7db303bc3db650054efb86843c70114451
Author: Eric Anholt <eric@anholt.net>
Date: Thu May 24 11:00:04 2007 -0700
Fix bswap detection on BSD (mis-added '_' in function names).
commit 9616a042855399f0ee9c6489ea824621ea5fee18
Author: Matthias Drochner <drochner@netbsd.org>
Date: Tue Apr 10 16:15:40 2007 -0700
Fix build on NetBSD/amd64.
commit ddb26bccd275f4fc011f7a2be685d1ce58555a00
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Thu May 24 12:20:24 2007 -0400
dix: Add a bunch of new access codes.
These were determined through an analysis of the core protocol and 35 of
the most common protocol extensions. There remain four bits for future
use.
commit 649e7f82d8d4333443493056b81eb20d6cf022bc
Author: Michel Dänzer <michel@tungstengraphics.com>
Date: Thu May 24 12:10:05 2007 +0200
Consolidate portPriv->pDraw assignments into xf86XVEnlistPortInWindow.
This avoids a crash in xf86XVReputVideo and also cleans up the code slightly.
commit 047bf3349bb697c73c95729a8bbf15f72605901f
Author: Soren Sandmann Pedersen <ssp@dhcp83-218.boston.redhat.com>
Date: Wed May 23 16:56:05 2007 -0400
Delete trapezoid rendering code; replace with pixman calls
commit 9d87ef4e0dff40ea39f1b209c67b90079fc79065
Author: Soren Sandmann Pedersen <ssp@dhcp83-218.boston.redhat.com>
Date: Wed May 23 15:50:25 2007 -0400
- Make image_from_pict() non-static
- Delete fbedge.c and fbedgeimp.h
- Use pixman_rasterize_edges() in fbtrap.c
commit 2a960c442bd7560630f52b55d82ec0517542ee5a
Author: Soren Sandmann Pedersen <ssp@dhcp83-218.boston.redhat.com>
Date: Wed May 23 13:08:26 2007 -0400
Port renderedge.c to pixman
commit 3ba3ede9bbdfc6376b6f6e0b6ce8280a05e6584d
Author: Soren Sandmann Pedersen <ssp@dhcp83-218.boston.redhat.com>
Date: Wed May 23 12:56:04 2007 -0400
Add missing offsets for window coordinates - reported by Colin Harrison
commit 2a4aa63a23ddd816b647b851a01865861827a7eb
Merge: 9cee4ec5e6 cc648e609d
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Tue May 22 14:50:26 2007 -0400
Merge branch 'master' into XACE-SELINUX
Conflicts:
include/miscstruct.h
commit cc648e609d472472bac4a2e568eb3598b3690ba3
Author: Michel Dänzer <michel@tungstengraphics.com>
Date: Tue May 22 10:51:56 2007 +0200
EXA: Export ExaOffscreenMarkUsed.
Can be used to inform EXA that an offscreen area is used outside of EXA.
commit e6a7198e7cd96f1fe0654cc6811a977821579258
Author: Adam Jackson <ajax@benzedrine.nwnk.net>
Date: Tue May 22 10:51:55 2007 +0200
Bug #8991: Add glXGetDrawableAttributes dispatch; fix texture format therein.
Adapted to master branch by Michel Dänzer <michel@tungstengraphics.com>.
commit 6324bfc468f7a645d2fee59f1c921a4328a4639f
Author: Michel Dänzer <michel@tungstengraphics.com>
Date: Tue May 22 10:51:53 2007 +0200
AIGLX: Zero-copy texture-from-pixmap.
When available, use the 2D driver texOffsetStart hook and the 3D driver
setTexOffset hook to save the overhead of passing the pixmap data to
glTex(Sub)Image.
The basic idea is to update the driver specific 'offset' for bound pixmaps
before dispatching a GLX render request and to flush immediately afterwards
if there are any pixmaps bound. This should ensure that the 3D driver can
use pixmaps for texturing directly regardless of the X server moving them
around.
commit 5006d08d7fc56d3d380cc6b75297f94e8594eb54
Author: Michel Dänzer <michel@tungstengraphics.com>
Date: Tue May 22 10:51:52 2007 +0200
DRI: Add TexOffset driver hooks.
To be used by AIGLX for GLX_EXT_texture_from_pixmap without several data copies.
The texOffsetStart hook must make sure that the given pixmap is accessible by
the GPU for texturing and return an 'offset' that can be used by the 3D
driver for that purpose.
The texOffsetFinish hook is called when the pixmap is no longer being used for
texturing.
commit ff2eae86b6a8760befbbc5d605debebe7b024c05
Author: David Nusinow <dnusinow@debian.org>
Date: Mon May 21 19:50:04 2007 -0400
Fix boolean thinko that prevented working without a server layout
commit 56fd92715567cd32e4b725b3791de9ac4e3879aa
Author: Soren Sandmann Pedersen <sandmann@redhat.com>
Date: Mon May 21 20:00:25 2007 -0400
Remove fast path code from fbpict.c
Remove the various fast path functions from fbpict, and instead use
pixman_image_composite().
commit d0e8f474099dea40bbea555427772724ccb787d1
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Mon May 21 13:06:21 2007 +0930
Change GrabDevice's parameter name back to "coreGrab".
Was changed during a global search/replace for
5c680e94938c16e04a4349715cf11796b80400db.
Otherwise people like me introduce bugs (e.g. in
333bab4b235801efd2b2de5b60df5b0c44048d3e)
commit 167e1773de0fb566559d4362ff929eedcdb6d055
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Mon May 21 10:45:10 2007 +0930
Remove unused include "gestr.h"
commit 7e2c935920cafadbd87c351f1a3239932864fb90
Author: Fredrik Höglund <fredrik@kde.org>
Date: Fri May 18 20:06:14 2007 +0200
Add a new IDLETIME system sync counter.
This counter exposes the time in milliseconds since the last
input event. Clients such as screen savers and power managers
can set an alarm on this counter to find out when the idle time
reaches a certain value, without having to poll the server.
commit 756acea23a0cc56c470bcd77c6f5638d923ab3d1
Author: Soren Sandmann Pedersen <sandmann@redhat.com>
Date: Fri May 18 13:39:12 2007 -0400
Use pixman_image_set_indexed() to make 8 bit work
commit 7916419a0092b8bf9713c0840f9e969950d7aa85
Author: Soren Sandmann Pedersen <sandmann@redhat.com>
Date: Fri May 18 11:58:24 2007 -0400
Comment out setup of general MMX code
commit 998164bac648756e5b5254aa36e075ae360d3972
Author: Soren Sandmann Pedersen <sandmann@redhat.com>
Date: Fri May 18 11:36:20 2007 -0400
Move fbCompositeGeneral() to fbpict.c and remove fbcompose.c
commit a2e3614eb8f0fa198615df492b03ff36bc9c1121
Author: Soren Sandmann Pedersen <sandmann@redhat.com>
Date: Fri May 18 11:33:11 2007 -0400
Break image_from_pict() into a few subfunctions.
commit c5ef84c325440af5fbdf9f44c3781d99a0392df9
Author: Soren Sandmann Pedersen <sandmann@redhat.com>
Date: Thu May 17 21:31:08 2007 -0400
Make the general compositing code create a pixman image and call
pixman_image_composite(). Leave the general code commented out for now.
commit 076d070e186afeb416976ae74fbfd50c86db10c5
Author: Keith Packard <keithp@neko.keithp.com>
Date: Thu May 17 20:24:18 2007 -0700
Use Screen block handler for rotation to draw under DRI lock.
DRI uses a non-screen block/wakeup handler which will be executed after the
screen block handler finishes. To ensure that the rotation block handler is
executed under the DRI lock, dynamically wrap the screen block handler for
rotation.
commit 915563eba530c5e2fdc2456cf1c7c3cc09b3add0
Author: Keith Packard <keithp@neko.keithp.com>
Date: Thu May 17 20:22:43 2007 -0700
Disable all outputs and crtcs at startup.
Leaving devices enabled during server startup can cause problems during the
initial mode setting in the server, especially when they are used for
different purposes by the X server than by the BIOS. Disabling all of them
before any mode setting is attempted provides a stable base upon which the
remaining mode setting operations can be built.
commit 0375009a97c2ab7f0e0f0265463d45c0580388c6
Author: Soren Sandmann Pedersen <sandmann@redhat.com>
Date: Thu May 17 12:59:24 2007 -0400
Remove excessive unrolling in fbCompositeSrc_x888x8x8888() and fix bug where
the source alpha was used instead of 0xff.
commit 0b4db74922299df785e6273fdb1bf65c38d36070
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Thu May 17 18:00:07 2007 +0930
Squish the flags into the upper bits of the mode field for EnterLeave events.
This way we have enough space for the detail field.
commit 333bab4b235801efd2b2de5b60df5b0c44048d3e
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Thu May 17 17:59:02 2007 +0930
Clean up, correct some comments.
Send event type down with the RawEvents.
commit bc334286b060bc8d0c829b18acebadf24fbdaf19
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Thu May 17 10:36:46 2007 +0930
Init device axis with -1,-1 minimum values.
This is needed to be able to cross to screens located east/north of the
current active screen.
commit 546465ee6aa6584780aec6357f32d205c807ae71
Author: Soren Sandmann Pedersen <sandmann@redhat.com>
Date: Wed May 16 17:42:04 2007 -0400
Make fbFetch_b8g8r8() actually write the read value to the buffer
commit 0fcd17c9181901c419cc32bc24c07fe5a6934d81
Author: Soren Sandmann Pedersen <ssp@dhcp83-218.boston.redhat.com>
Date: Tue May 15 17:59:13 2007 -0400
Use pixman short formats, revert the gradient_stop change
commit f4c1d5fc28a5a7fe2592505350f9e2331f6049b7
Author: Soren Sandmann Pedersen <ssp@dhcp83-218.boston.redhat.com>
Date: Tue May 15 17:12:22 2007 -0400
Use pixman types for transforms and vectors
commit f2e30e7d0a1d075e7e83c5b5ceca9e4752951138
Author: Soren Sandmann Pedersen <ssp@dhcp83-218.boston.redhat.com>
Date: Tue May 15 16:51:21 2007 -0400
Use the pixman fixed point types and macros
commit 3da842bf930d7875599ca0c06cb4a09cfa987ac5
Author: Soren Sandmann Pedersen <ssp@dhcp83-218.boston.redhat.com>
Date: Tue May 15 14:57:14 2007 -0400
Revert various fast path functions to their pre-pixman-merge state
since they fail rendercheck. Remove their associated macros.
See bug 10903.
commit 1568b6b6a0d7337f29c7b87cc46ae64b3b0f8fdf
Author: Soren Sandmann Pedersen <ssp@dhcp83-218.boston.redhat.com>
Date: Sat May 12 20:33:23 2007 -0400
Port large amounts of the region code to pixman
commit dde0ceac4ea7639d0096bfd26f37c5851778854c
Author: Soren Sandmann Pedersen <ssp@dhcp83-218.boston.redhat.com>
Date: Sat May 12 17:41:47 2007 -0400
Add new InitRegions() function called from dix/main
commit e037052ac522150786abf44d3a04c813cc490050
Author: Soren Sandmann Pedersen <ssp@dhcp83-218.boston.redhat.com>
Date: Sat May 12 16:58:54 2007 -0400
Turn boxes and regions into typedefs for pixman types
commit 8e56f5be4b70773c899f01b9ccd2e88d523327e4
Author: Soren Sandmann Pedersen <ssp@dhcp83-218.boston.redhat.com>
Date: Fri May 11 11:45:37 2007 -0400
Add dependency on pixman 0.9.0
commit a8c56372ba8aa36bac09877c478ff53ea5358df7
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Tue May 15 10:24:22 2007 +0930
Revert "Allow events to grabWindows event if the device is not grabbed."
This reverts commit 339b73e710a0920608a3fbcb20b406f0f6c4e0f6.
Allowing those events can lead to race conditions.
Conflicts:
dix/events.c
commit 81fc6a128b64ad412064405ed45db0175398e3f0
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Mon May 14 18:12:56 2007 +0930
Add ungrab support to ExtendedGrabDeviceRequest handling.
Polish the code a bit.
commit 5c680e94938c16e04a4349715cf11796b80400db
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Mon May 14 12:34:53 2007 +0930
Remove double-grab option. We only want one grab per device.
commit 4dc973f08c54294e06bc831bd2839fd3aa24ecfb
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Mon May 14 10:42:03 2007 +0930
Add ExtendedGrabDevice handling.
Add XGE handling in DeliverGrabbedEvent.
We can now grab something selecting XGE events, but the current code is a
bit messy and doesn't work too well yet.
commit a277f04ab08514462b7f10b4dd92eb326af85501
Author: Adam Jackson <ajax@benzedrine.nwnk.net>
Date: Wed May 9 22:03:12 2007 -0400
Remove mfb and cfb from include paths where they're not needed.
commit 20c5250e487e032d392e2e4624021fccb1bfb72c
Author: Adam Jackson <ajax@benzedrine.nwnk.net>
Date: Wed May 9 21:49:44 2007 -0400
Use system copy of cbrt() if available.
Also move the replacement inline into miarc.c, since that's the only user.
commit 8dcc37520d5e8c8b52cee81faa67fd5205548377
Author: Adam Jackson <ajax@benzedrine.nwnk.net>
Date: Wed May 9 18:57:05 2007 -0400
Use _X_INLINE instead of ad-hoc #defines.
commit 6ff239cb4e67c0a2ea497a1714e5585c1d941af3
Author: Adam Jackson <ajax@benzedrine.nwnk.net>
Date: Wed May 9 18:38:33 2007 -0400
Make the use of ICEIL slightly less ugly.
commit 178d426311bb3c7160f72b5d95b0a137eda09ba9
Author: Colin Harrison <colin.harrison-at-virgin.net>
Date: Fri May 11 10:08:42 2007 +0100
Missing piece from bug 9808
commit ebaa6c920c82401952a0ccc991b94574306449bd
Author: Matthias Hopf <mhopf@suse.de>
Date: Thu May 10 15:25:31 2007 +0200
Disable Simba PCI bridge routing code (Bug #8020).
The code in hw/xfree86/os-support/bus/sparcPci.c:simbaCheckBus()
is trying to mimmick VGA routing by disabling I/O space responses
behind the Simba PCI-PCI controller.
Unfortunately, doing this also happens to disable access to the
IDE controller I/O space registers, thus crashing the system. The
granularity of the I/O disabling in the Simba controller is not
fine enough to disable VGA without also disabling the IDE controller
registers.
commit 86c4941727f7c673ae6bb88c67443fa25935c7f5
Author: Colin Harrison <colin.harrison-at-virgin.net>
Date: Wed May 9 16:55:27 2007 +0100
fix an occasional crash in GetWindowName() (bug: 9798)
commit be44018a3c6172caf3e91c36ea321420d104e79f
Author: Colin Harrison <colin.harrison-at-virgin.net>
Date: Wed May 9 16:55:09 2007 +0100
Fix bad use of hwnd (bug: 9808)
commit d3248b66a650c6c629cd66240e25004869217d2e
Author: Colin Harrison <colin.harrison-at-virgin.net>
Date: Wed May 9 16:54:46 2007 +0100
Migrate some code to the new mi apis
commit 021e5df85d7c9373a2fed55512751d16e08128db
Author: David Nusinow <dnusinow@debian.org>
Date: Mon May 7 21:03:40 2007 -0400
Add more informative logging for module default loading
When the modules section is parsed, if a module is set to be loaded by
default, this will be logged. If it is redundantly specified in xorg.conf,
this will also be noted. None of this logging will happen if the xorg.conf
lacks a modules section.
commit 1b3a0508a7aee1c7b14cd62216b4727fcc9181d4
Author: Jesse Barnes <jbarnes@jbarnes-mobile.amr.corp.intel.com>
Date: Sun May 6 01:30:59 2007 -0700
Fix documentation for Copy hook -- it can copy memory to the scanout
buffer too.
commit 030a578391c634bc68add6ada3f251cf3f8c3069
Author: David Nusinow <dnusinow@debian.org>
Date: Thu May 3 22:51:07 2007 -0400
Provide UseDefaultFontPath option
This provides a new option, UseDefaultFontPath. This option is enabled by
default, and causes the X server to always append the default font path
(defined at compile time) to the font path for the server. This will allow
people to specify additional font paths if they want without breaking
their font path, thus hopefully avoiding ye olde "fixed front" problem.
Because this option is a ServerFlag option, the ServerFlags need to be
processed before the files section of the config file, so swap the order
that they are processed.
commit e91b9ddc7aa95abc2d4d314e8db204860771a099
Author: David Nusinow <dnusinow@debian.org>
Date: Thu May 3 22:00:23 2007 -0400
Improve modules loading defaults
Provide default modules that may be overrided easily. Previously the
server would load a set of default modules, but only if none were
specified in the xorg.conf, or if you didn't have a xorg.conf at all. This
patch provides a default set and you can add only the "Load" instructions
to xorg.conf that you want without losing the defaults. Similarly, if you
don't want to load a module that's loaded by default, you can add "Disable
modulename" to your xorg.conf (see man xorg.conf in this release for
details). This allows for a minimal "Modules" section, where the user only
need specify what they want to be different. See bug #10541 for more.
The list of default modules is taken from the set loaded by default when
there was a xorg.conf containing no "Modules" section.
A potential problem for some users is that some users disable a module,
most notably DRI, by commenting out the "Load" line in their xorg.conf.
This needs to be changed to an uncommented "Disable" line, as DRI is
loaded by default.
commit d2f813f7db157fc83abc4b3726821c36ee7e40b1
Author: Soren Sandmann Pedersen <ssp@dhcp83-218.boston.redhat.com>
Date: Wed May 2 19:10:22 2007 -0400
New fbWalkCompositeRegion() function
This new function walks the composite region and calls a rectangle
compositing function on each compositing rectangle. Previously there
were buggy duplicates of this code in fbcompose.c and
miext/rootles/safealpha/safeAlphaPicture.c.
commit e0959adcd8df2c61e98e76e708fceef9c7cd54eb
Author: Soren Sandmann Pedersen <ssp@dhcp83-218.boston.redhat.com>
Date: Tue May 1 13:41:48 2007 -0400
Add fbCompositeRect() as another special case in the switch of doom in fbpict.c
This is phase one of getting the two region walkers in fbcompose.c and
fbpict.c merged together.
commit cb22bdbe678a9948eda75d464d6701a729664ef0
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Thu May 3 10:05:58 2007 +0930
Add selected RamDac functions to xfree86LookupTab.
Adding those makes drivers for s3 and tga work again.
commit c1e1d6b98a6708860e5b5f6e21d8d5b1d8ce9075
Author: Brian <brian@yutani.localnet.net>
Date: Wed May 2 15:55:40 2007 -0600
In __glXCreateARGBConfig(), insert the new GL mode at the _end_ of the linked list.
Previously, the new mode was added at the head of the list. This caused the
positional correspondence between modes and the XMesaVisuals array to be off
by one. The net result was GLX clients failing when they tried to use the
last GLX mode/visual.
We still have the problem of DRI drivers not being able to use the extra
mode/visual introduced by __glXCreateARGBConfig(). glXCreateContext fails
with BadAlloc if it's attempted. This is also the source of the often-
seen warning "libGL warning: 3D driver claims to not support visual xxx"
Look into fixing that someday...
commit bd0abb2844ef9faf28703e592cfebb886004234c
Author: Tilman Sauerbeck <tilman@code-monkey.de>
Date: Wed May 2 17:20:48 2007 +0200
Bug #10823: Fixed default OSNAME value.
We try to get OSNAME from uname by default now.
commit 71fc5b3e9309182978ead676965d65ca93a4e3b9
Author: Keith Packard <keithp@keithp.com>
Date: Wed May 2 11:41:11 2007 +0200
Fix for a divide by zero that can be triggered by a malicious client.
Problem reported by Derek Abdine of rapid7.com. Thanks.
commit c03d9a7217f9895feed8cfed3ede4752faf6187c
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Wed May 2 18:16:40 2007 +0930
Cleaning up a bit.
Register correct event in EventSwapVector.
Fix up event swap for GE events, register XI's swap function at GE.
commit e6fd4a24ebd205013b41e44aacbbfb847709d2fd
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Wed May 2 17:49:20 2007 +0930
Add handling for FakeDeviceEvent request.
Fix a stupid bug from last commit, mask names were wrong.
commit af25720598bb35d9d953ac8d9a07528289ebfb4a
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Wed May 2 13:51:16 2007 +0930
Add missing files for ProcXiSelectEvent.
Should have been a part of 5e439109292e54b5c4d1a7bc7b6ac0e42ee285f7. Oh well.
commit 58c0fd29272fb6c2f193cff82fb0b0573c607eec
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Wed May 2 13:50:09 2007 +0930
Adjust EQ to support long events.
Add RawDeviceEvent (pointers only for now).
This commit changes the event queue to use EventLists instead of xEvent
arrays. Only EQ is affected, event delivery still uses xEvent* (look for
comment in mieqProcessInputEvent).
RawDeviceEvents deliver driver information to the client, without clipping or
acceleration.
commit 0214d0b96a9b900a8cf5c7f2183add3a411441f3
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Tue May 1 15:49:41 2007 +0930
Start devices after windows are initialized.
This fixes the hotplug segfault introduced with the multihead changes and
cleans up the code a bit as well.
commit 11d0e2109b699714055e263e8963f2c39eded28b
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Tue May 1 14:16:36 2007 +0930
Correct enterleave semaphore value for root window.
commit 8b42ba64e169a35df2a90528dcb0cd06be0f67a1
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Tue May 1 12:12:58 2007 +0930
Send PointerKeyboardPairingChangedNotifyEvent using XGE.
Needs updated inputproto and libXi.
commit 325380adb20ec2b82e176d75599fd4bc97a3b918
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Tue May 1 11:02:05 2007 +0930
Check and re-set paired devices when initializing sprites.
If we don't do this, a device that is paired before a sprite has been
initialized for the paired device will not actually get the right sprite and
segfault the server on focus events. Happens for the VCK.
commit b043a184509cfe5c4c4691ecde1a4a065e53d575
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Tue May 1 09:54:33 2007 +0930
Check VCP's and VCK's ids when searching for a new device id.
Both VCP and VCK are not in the inputInfo.devices list anymore, so we need to
check them separately. If we don't do this, we end up re-using ids 0 and 1,
causing all sorts of grief for clients.
commit 873ef75b1e8c94d39670c981c4d830ab8bcc018b
Author: Colin Guthrie <gmane@colin.guthr.ie>
Date: Mon Apr 30 10:33:12 2007 -0600
fix __glXErrorCallBack() proto
commit 6b33459bf5aac23c3ecc7002d091c02f327d907a
Merge: 18252a515d 3c91a993e8
Author: Brian <brian@yutani.localnet.net>
Date: Mon Apr 30 10:26:19 2007 -0600
Merge branch 'master' of git+ssh://brianp@git.freedesktop.org/git/xorg/xserver
commit 5e439109292e54b5c4d1a7bc7b6ac0e42ee285f7
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Mon Apr 30 12:57:42 2007 +0930
Add GenericEvent extension to Xext.
This adds (unconditional) support for the GE extension. Anything from now on
that sends events in MPX will have to use the GE extension. No GE, no MPX
events. GE is not actually used yet from anywhere with this commit.
You will need to update x11proto, xextproto, libX11, libXext and xcb to the
matching xge branches. Things will _NOT_ work without the updated protocol
headers and libraries.
commit 3c91a993e8c752002adf85c317216e1487c20780
Author: Michel Dänzer <michel@tungstengraphics.com>
Date: Sun Apr 29 23:49:41 2007 +0200
EXA: Fix OffscreenValidate build with DEBUG_OFFSCREEN enabled.
commit a261e1325057974d58440812b93c00c0caa4423a
Author: Michel Dänzer <michel@tungstengraphics.com>
Date: Sun Apr 29 23:49:35 2007 +0200
EXA: Remove DrawableDirty.
Convert the remaining callers to PixmapDirty.
commit b1b6674a919943a8ac37e54d02e8d0d23a642b1d
Author: Michel Dänzer <michel@tungstengraphics.com>
Date: Sun Apr 29 23:49:28 2007 +0200
EXA: FillSpans improvements.
* Don't need to track damage.
* Always migrate for fallbacks.
commit 584697a2231ac782f362a925e1489c15483a8791
Author: Michel Dänzer <michel@tungstengraphics.com>
Date: Sun Apr 29 23:49:09 2007 +0200
EXA: SolidBoxClipped improvements.
* Centralize handling of fallbacks and damage tracking.
* Always migrate for fallbacks.
commit 982d7c2c0b948ba04c8eefa475d660981e6ed9f9
Author: Michel Dänzer <michel@tungstengraphics.com>
Date: Sun Apr 29 23:48:59 2007 +0200
EXA: CopyNtoN improvements.
* Centralize handling of fallbacks and damage tracking.
* Always migrate for fallbacks.
commit d2245386eed200e77a8c84bdda36ab29e39fd593
Author: Michel Dänzer <michel@tungstengraphics.com>
Date: Sun Apr 29 23:48:31 2007 +0200
EXA: GetImage improvements.
Only migrate when appropriate. In particular, don't migrate to offscreen in the
no-fallback case as copying from system memory should usually be as fast if not
faster than DownloadFromScreen, in particular if the bits need to be uploaded
to offscreen first.
commit 0880aaac9c83019fec2e3d32871f74c7a407f8b3
Author: Michel Dänzer <michel@tungstengraphics.com>
Date: Sun Apr 29 23:48:19 2007 +0200
EXA: PutImage improvements.
* Migrate for fallbacks when appropriate.
* Add damage tracking in ExaCheckPutImage.
commit 7fca16901187ade48e83e6a2684ef464b1912357
Author: Michel Dänzer <michel@tungstengraphics.com>
Date: Sun Apr 29 23:48:11 2007 +0200
EXA: ImageGlyphBlt improvements.
* Don't waste effort on invisible glyphs.
* Only track damage for bounding box instead of each glyph separately.
* Always migrate for fallbacks.
commit a8d6ebdf9338dc2f6ff9a532e6fec460a70d3b1e
Author: Michel Dänzer <michel@tungstengraphics.com>
Date: Sun Apr 29 23:47:53 2007 +0200
EXA: Defer to FillRegionTiled in Composite when possible.
Committed separately as this case is hard to hit and has only been tested
lightly.
commit 81b055605c34b5823f6c5f63cc0f92f43c6b7252
Author: Michel Dänzer <michel@tungstengraphics.com>
Date: Sun Apr 29 23:47:43 2007 +0200
EXA: Composite improvements.
* Defer to simpler hooks in more cases (inspired by XAA behaviour).
* Move damage tracking from lower to higher level functions.
* Always migrate for fallbacks.
commit ce317a5b76c053f449122c46e1372bf8e067cb4c
Author: Michel Dänzer <michel@tungstengraphics.com>
Date: Sun Apr 29 23:47:16 2007 +0200
EXA: Glyphs improvements.
* Don't waste effort on invisible glyphs.
* Add damage tracking where necessary.
* Always migrate for fallbacks.
commit 0c8905ebc91cf654facef84ee52231a358deec5c
Author: Michel Dänzer <michel@tungstengraphics.com>
Date: Sun Apr 29 23:47:08 2007 +0200
EXA: PolyFillRect improvements.
* Convert rects to region and use it for damage tracking.
* When possible, defer to exaFillRegion{Solid,Tiled} using converted region.
* Always migrate for fallbacks.
* Move damage tracking out of ExaCheckPolyFillRect.
commit 567f18a09bfb05f448be40c7ebe0f210f955601c
Author: Michel Dänzer <michel@tungstengraphics.com>
Date: Sun Apr 29 23:46:49 2007 +0200
EXA: FillRegion{Solid,Tiled} improvements.
* Support planemasks, different ALUs and arbitrary tile origin.
* Leave damage tracking and non-trivial fallbacks to callers.
* Always migrate for fallbacks.
This is in preparation for using these from more other functions.
commit e869573b52fac69fb88cea120daaeec59c7a3461
Author: Michel Dänzer <michel@tungstengraphics.com>
Date: Sun Apr 29 23:45:48 2007 +0200
EXA: exaAssertNotDirty improvements.
* Return early if the valid region is empty or the pixmap is pinned.
* Fix loop for several cliprects.
commit d3f8667341bfe6dc7d0258c4ad69377f37d88d95
Author: Michel Dänzer <michel@tungstengraphics.com>
Date: Sun Apr 29 23:44:27 2007 +0200
EXA: Fix exaEnableDisableFBAccess for nested disables and enables.
commit 5e4b3232dafe3b0dec65bf639bebaba4774210b7
Author: Michel Dänzer <michel@tungstengraphics.com>
Date: Sun Apr 29 23:38:22 2007 +0200
Fix fbCompositeTrans_0888xnx0888 build for wfb on big endian.
commit 2866e0bac9b8dd3892c5e68abcfc6c97cebaf88a
Author: Michel Dänzer <michel@tungstengraphics.com>
Date: Sun Apr 29 23:38:13 2007 +0200
Fix a couple of picture repeat fields incorrectly compared to RepeatNormal.
commit 78a20455356ccc310f73cfc65ad65a7677eee7e5
Author: Soren Sandmann Pedersen <ssp@dhcp83-218.boston.redhat.com>
Date: Fri Apr 27 15:20:24 2007 -0400
Pixman merging
More msvc++ porting
commit 6c4f1826bf2c5f30f5fe6e489a02b6375478b380
Author: Soren Sandmann Pedersen <ssp@dhcp83-218.boston.redhat.com>
Date: Fri Apr 27 08:13:08 2007 -0400
Bug fix in fbCompositeIn_nx8x8888
Make sure both halves of the dst word is set to zero when the masks
are both 0.
commit f28eea0647f007c2e2415ecc6fceef46201faad4
Merge: 339b73e710 ae04f2cb0a
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Fri Apr 27 16:34:36 2007 +0930
Merge branch 'master' into mpx
Conflicts:
dix/devices.c
dix/events.c
commit 339b73e710a0920608a3fbcb20b406f0f6c4e0f6
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Fri Apr 27 13:24:27 2007 +0930
Allow events to grabWindows event if the device is not grabbed.
This kinda makes popup windows useable if the WM doesn't set the
ClientPointer. Kinda.
commit ae04f2cb0a068cdc1e519627bf745de0c9e4a85a
Author: Adam Jackson <ajax@benzedrine.nwnk.net>
Date: Thu Apr 26 15:28:04 2007 -0400
Fix the 'relink' target for kdrive servers.
commit 6c8152d6ee9eeb21a68a8bbfed1540939e5bcd1f
Author: Adam Jackson <ajax@benzedrine.nwnk.net>
Date: Thu Apr 26 14:59:04 2007 -0400
Remove old edid_modes.c, it lives in hw/xfree86/modes/ now.
commit 2208c6087d6bffcb24a30891a56430e28735874c
Author: Soren Sandmann Pedersen <ssp@dhcp83-218.boston.redhat.com>
Date: Thu Apr 26 14:40:30 2007 -0400
Change expand_alpha_rev to expand_alpha in mmxSaturateU
commit a300ef84cee26febfbe08c497d0d063588130bdd
Author: Soren Sandmann Pedersen <ssp@dhcp83-218.boston.redhat.com>
Date: Thu Apr 26 14:37:53 2007 -0400
Fix typo in previous commit
commit 0ebe48be59368b55c618f60d4656300bd7f52ed9
Author: Soren Sandmann Pedersen <ssp@dhcp83-218.boston.redhat.com>
Date: Thu Apr 26 14:36:32 2007 -0400
Pixman merge
- Changes to support MS Visual C++
- use inline instead of __inline__
- Fix rounding errors (Billy Biggs, from xserver via pixman)
commit 4fe918b38553133c27e5ae672e5c43984a9bbaea
Author: Soren Sandmann Pedersen <ssp@dhcp83-218.boston.redhat.com>
Date: Thu Apr 26 12:41:01 2007 -0400
Fix bug 8871 - scrolling corruption with a compositing manager
Call miHandleExposures() in CopyArea/CopyPlane explicitly in cw to
generate GraphicsExposes correctly.
commit 0ff7c94fcf6497ee8575f81cf97eeeb3a857739e
Author: Soren Sandmann Pedersen <ssp@dhcp83-218.boston.redhat.com>
Date: Thu Apr 26 10:56:02 2007 -0400
Pixman merge
Make use of fbCompositeSrcAdd_8888x8x8mmx
commit 701ccb4a22cfd646ccb7f19b7b3a476aeb5ce2da
Author: Soren Sandmann Pedersen <ssp@dhcp83-218.boston.redhat.com>
Date: Thu Apr 26 10:49:06 2007 -0400
Pixman merge
- Remove stray default label
- Integrate new MMX ops SolidMaskSrc_nx8x8888mmx, In_8x8mmx, and
In_nx8x8mmx
- Formatting changes to reduce diff noise
commit a54ef54db19dcd36ed86b33cff2bc369f9690a15
Author: Soren Sandmann Pedersen <ssp@dhcp83-218.boston.redhat.com>
Date: Thu Apr 26 10:24:25 2007 -0400
Pixman merge
Make sure fbCompositeSrc_x888x8x8888mmx and fbCompositeSrc_8888x8x8888mmx
are used when possible.
commit 3571b8e65b0857322d12e291305cfe29ea497c3c
Author: Soren Sandmann Pedersen <ssp@dhcp83-218.boston.redhat.com>
Date: Thu Apr 26 09:45:11 2007 -0400
More pixman merging
- Move some code around to minimize diff noise
- Add mmx ops from pixman that never made it into X
- Merge Jeff Muizelaar's bugfixes to fbCompositeSrc_8888x8x8888mmx and
fbCompositeSrc_x888x8x8888mmx.
commit cfc01115af4136b2dad8218ba6b389513a356a2e
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Thu Apr 26 22:18:35 2007 +0930
Fix cursor rendering for multi-head.
Before putting anything on the screen, check if the GC was made for the
ScreenRec we want to render to. If not, toss the GC and create a new one. This
is not the best solution but it does the job for now. Same thing for ARGB
cursors except that it's even uglier.
Also remember the screen the cursor was rendered to and check for the right
screen in the BlockHandler, SourceValidate and a few others. Only remove or
restore the cursor if we are rendering to the same screen, otherwise we get
artefacts that are both funky and really annoying.
commit 82f97e1c0cc15b050edc82a8f3b9a423d6cf5fe7
Author: Paulo Ricardo Zanoni <prz05@c3sl.ufpr.br>
Date: Thu Apr 26 15:58:50 2007 +0930
Enable event delivery for multiple heads.
Requires moving the spriteTrace into the DeviceIntRec and adjusting a few
functions to take in device argument, most notably XYToWindow().
Cursor rendering on the second screen is busted.
commit c0346e57e6d3857994f7af76060c502c2fdea294
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Thu Apr 26 12:02:45 2007 +0930
Require inputproto 1.4.2.
Requirement was introduced with c7e2ba0c9b9b1fc1aed8f91f86471c4c8e650b78.
commit 67347739b0571b2978468e8088480b105f505ad2
Author: Soren Sandmann Pedersen <ssp@dhcp83-218.boston.redhat.com>
Date: Wed Apr 25 14:19:39 2007 -0400
Don't treat convolution filters as transformations.
Some rearrangement of code to get it closer to pixman.
commit c056ce95d89ef1df57edf47149fc34cd3925496e
Author: Soren Sandmann Pedersen <ssp@dhcp83-218.boston.redhat.com>
Date: Wed Apr 25 13:21:47 2007 -0400
Port MSVC++ CPU detection code from pixman. (Vladimir Vukicevic).
commit c19ece1d8c32dc81740a4036a642661f54064e75
Author: Soren Sandmann Pedersen <ssp@dhcp83-218.boston.redhat.com>
Date: Wed Apr 25 12:34:19 2007 -0400
Integrate optimization from xserver from David Reveman where repeats
get handled by fbFetchTransformed() rather than in the region walking
code.
commit 48c73dfc369fdf8f6023436ebe82bb604f76bb80
Author: Soren Sandmann Pedersen <ssp@dhcp83-218.boston.redhat.com>
Date: Wed Apr 25 12:09:22 2007 -0400
Add function fbCompositeSrcAdd_8888x8x8(), and fix a bug where
srcRepeat = FALSE would be set in the wrong place.
commit 66ba3d758a368bf83d75bab8b08bdb6b34925e40
Author: Soren Sandmann Pedersen <ssp@dhcp83-218.boston.redhat.com>
Date: Wed Apr 25 10:31:38 2007 -0400
Various fixes from xserver via pixman (Billy Biggs)
commit c09e68ce30dabd6b7068b163b9d2382d85d0d0bc
Author: Adam Jackson <ajax@benzedrine.nwnk.net>
Date: Wed Apr 25 16:46:26 2007 -0400
Paper over a crash at exit during GLX teardown.
commit 9c80eda826448822328bb678a7d284cc43fffb17
Author: Adam Jackson <ajax@benzedrine.nwnk.net>
Date: Wed Apr 25 16:35:04 2007 -0400
Disable RANDR's fake Xinerama protocol when there's more than one screen.
... in the protocol sense. Xinerama doesn't have any provision for more
than one protocol screen each with its own geometry.
Red Hat bug #231257.
commit d322608dc929d5f8cda07a53143a4f28423e0460
Author: Adam Jackson <ajax@benzedrine.nwnk.net>
Date: Wed Apr 25 16:29:48 2007 -0400
Fix a buffer overrun on machines with excessively large PCI busses.
Formerly we sized an array with a compile time constant, then initialized
its size to the same constant, but the Linux PCI init code would increase
that "constant". So if you happened to have more than 128 PCI devices,
you'd happily scribble into whatever variables happened to be in .bss
after that array.
Only really fixed for Linux atm. Other OSes will simply (still) fail to
work on video devices above the 128th PCI device.
commit 3ba1e8ab6d69566e1a3f8f0eb4605631aeffc8e5
Author: Aaron Plattner <aplattner@nvidia.com>
Date: Tue Apr 24 17:20:14 2007 -0700
Include xf86Rename.h in xf86RandR12.h.
commit 0a2fe443d25b1ca25349aba3f748df986952e20f
Author: Soren Sandmann Pedersen <ssp@dhcp83-218.boston.redhat.com>
Date: Tue Apr 24 19:02:44 2007 -0400
Use READ/WRITE macros for new functions introduced in previous commits.
commit 7e16da7b78c422f96387502b9cc29eaa1741543f
Author: Soren Sandmann Pedersen <ssp@dhcp83-218.boston.redhat.com>
Date: Tue Apr 24 18:15:34 2007 -0400
Remove #if 0'ed blocks
commit 18252a515d4989b983a3b7389636045e06d0f246
Author: Brian <brian@yutani.localnet.net>
Date: Tue Apr 24 14:10:09 2007 -0600
bump release date to reflect input code updates
commit 2d9a7a768747ca39a800475f12c424c298018dc6
Author: Soren Sandmann Pedersen <ssp@dhcp83-218.boston.redhat.com>
Date: Tue Apr 24 14:46:59 2007 -0400
From pixman (Jeff Muizelaar)
Fix up the fast-path compositing operators; those are useful for
sources without alpha, but can't be used for sources with
alpha. Also, replaced fbCompositeSrcSrc_nxn with call to fbBlt as
this function must handle 1, 4, 8, 16, 24, 32 bpp objects. Would
be nice to optimize fbBlt for common cases involving 8, 16, 24 and
32bpp.
From Keith Packard.
commit fde4a5adf02d3067a064ebf6bdd666aa5784cfe9
Author: Soren Sandmann Pedersen <ssp@dhcp83-218.boston.redhat.com>
Date: Tue Apr 24 13:30:43 2007 -0400
From xserver via pixman (Jeff Muizelaar)
Add some optimizations from jaymz. Also adds some compile
warnings that will hopefully go awa y as we continue merging.
commit 13e1d5ea55b0a3b7729316c8e37d3d8fca2075b5
Author: Soren Sandmann Pedersen <ssp@dhcp83-218.boston.redhat.com>
Date: Tue Apr 24 12:59:18 2007 -0400
Fix format vs formatCode in previous commit
commit 077a5d4555676d5775e990468a697b6890c6d609
Author: Soren Sandmann Pedersen <ssp@dhcp83-218.boston.redhat.com>
Date: Tue Apr 24 12:57:55 2007 -0400
Add functions fbCompositeSrcSrc_nxn() and fbCompositeTrans_0565xnx0565
from xserver via pixman. Add READ/WRITE and fbFinishAccess as
appropriate.
commit 09436fb7c38a9819bde770c4c21143591671c4d7
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Tue Apr 24 22:52:33 2007 +0930
Disable devices before removing, remove unrecoverable devices.
commit c7e2ba0c9b9b1fc1aed8f91f86471c4c8e650b78
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Tue Apr 24 21:34:47 2007 +0930
Use DevicePresence events to tell the client about enabled/disabled devices.
Include the device id in the event sent to the client.
commit ce099a9b78195540ec251a6a3dbe26019c1a686d
Author: Brian <brian@yutani.localnet.net>
Date: Mon Apr 23 12:34:01 2007 -0600
fix bug in which maxKeysPerModifier wasn't getting set
commit b5e1f7869b2f12a1c2baa7f699ae609fc9ad50aa
Author: Soren Sandmann Pedersen <ssp@dhcp83-218.boston.redhat.com>
Date: Mon Apr 23 14:16:30 2007 -0400
Remove #if 0'ed merge leftovers
commit 84838268b34661d598f8e4856fab355f414930d9
Author: Soren Sandmann Pedersen <ssp@dhcp83-218.boston.redhat.com>
Date: Mon Apr 23 13:19:54 2007 -0400
Gradient fixes
* Port fix for bug 7685 from pixman. Patch by Carl Worth
* Add projective version of radial gradient code.
* Make sure that all Pict*Gradient types have PictGradient as prefix,
since code in various places relies on that.
commit 38d14e858980a1b0c087344d24bf6aebf755663c
Author: Aaron Plattner <aplattner@nvidia.com>
Date: Sun Apr 22 18:04:27 2007 -0700
Adjust the screen pixmap's dimensions in xf86RandR12ScreenSetSize.
commit ca784df84e07227a4cc0a1add079884f557b7a00
Author: Aaron Plattner <aplattner@nvidia.com>
Date: Sun Apr 22 16:26:01 2007 -0700
Fix unbalanced fbGetDrawable added in commit 0a9239ec.
commit 55bd8668e7d4100579bcd6c16a804d9f25267070
Author: Soren Sandmann Pedersen <ssp@dhcp83-218.boston.redhat.com>
Date: Fri Apr 20 14:53:37 2007 -0400
Remove #if 0'ed leftovers from merge
commit 41dd7ab067adde8f66cd9f74c5a6570c325518a5
Author: Soren Sandmann Pedersen <ssp@dhcp83-218.boston.redhat.com>
Date: Fri Apr 20 14:51:40 2007 -0400
Fix gradient walker to not reset needlessly
Previously the gradient walker was doing excessive resets, (such
as on every pixel in constant-colored regions or outside the
gradient with CAIRO_EXTEND_NONE). Don't do that.
Carl Worth, from pixman
commit c1b73f0f2acd56b423b91a04f1e1b3cdcad0069f
Author: Soren Sandmann Pedersen <ssp@dhcp83-218.boston.redhat.com>
Date: Fri Apr 20 14:34:13 2007 -0400
Fixing gradient repeat mode computations in previous patch. From David
Turner.
commit 38f718799c68995c2d9a1680355bd55fd925009e
Author: Soren Sandmann Pedersen <ssp@dhcp83-218.boston.redhat.com>
Date: Fri Apr 20 13:59:11 2007 -0400
Remove a few memory references in fbFetchTransformed
commit 9c4b14d4f6a1fe018acd64789434216cd1560a4a
Author: Soren Sandmann Pedersen <ssp@dhcp83-218.boston.redhat.com>
Date: Fri Apr 20 13:23:58 2007 -0400
Integrate David Turner's gradient optimizations from pixman
commit cd2c1714eb4946bf7b1fc194fe074f8024a2ec23
Author: Brian <brian@yutani.localnet.net>
Date: Sat Apr 21 12:40:51 2007 -0600
add slang_mem.c
commit 67545333ec0b08db783e94e9e3ec55873dea19a3
Author: Brian <brian@yutani.localnet.net>
Date: Sat Apr 21 12:40:33 2007 -0600
replace occlude.c w/ queryobj.c
commit 39bc8bb0fdc854dcf9bbc0857fec84d50fa4f3b2
Author: Aaron Plattner <aplattner@nvidia.com>
Date: Fri Apr 20 14:22:42 2007 -0700
Don't call xf86RandR12TellChanged if it doesn't exist. Add some exports to xf86Rename.h.
commit 3daa5c1a991d659b1386a09e33b044470d489cb3
Author: Soren Sandmann Pedersen <ssp@dhcp83-218.boston.redhat.com>
Date: Fri Apr 20 09:43:16 2007 -0400
Fix pixman bug 5777, patch by David Reveman
commit 9c2e955f6792e80fb84f848ed9e6ebbfd79f7130
Author: Brian <brian@yutani.localnet.net>
Date: Fri Apr 20 07:21:19 2007 -0600
regenerated to add GL_CLIENT_ATTRIB_STACK_DEPTH (bug 9823)
commit 96ef0f78438b60436c3940817980a3ab4070c7e8
Author: Keith Packard <keithp@neko.keithp.com>
Date: Thu Apr 19 17:39:51 2007 -0700
Disable SourceValidate in rotation to capture cursor.
SourceValidate is used exclusively by the software cursor code to pull the
cursor off of the screen before using the screen as a source operand. This
eliminates the software cursor from the frame buffer while painting the
rotated image though. Disabling this function by temporarily setting the
screen function pointer to NULL causes the cursor image to be captured.
(cherry picked from commit 05e1c45ade9c558820685bfd2541617a2e8de816)
commit 7ca4baffb5569ea12b578a4a3f69e93d272d6c6d
Author: Keith Packard <keithp@neko.keithp.com>
Date: Thu Apr 19 17:37:18 2007 -0700
Was accidentally disabling rotation updates in mode set.
Setting a mode on an unrotated CRTC was causing all of the rotation updates
to be disabled; the loop looking for active rotation wasn't actually looking
at each crtc, it was looking at the modified crtc many times.
(cherry picked from commit 8b217dee3a6c46b13fc9571a4a9a95bc55686cdb)
commit 806a537e644d8cc9e53f3ac52efb49453e5aa1fb
Author: Keith Packard <keithp@neko.keithp.com>
Date: Thu Apr 19 17:49:34 2007 -0700
Revert "Suppress software cursor removal during rotated shadow buffer drawing."
This reverts commit 999b681cf3973af4191506e49cde06963b11a774.
Replacing this with simpler code that just disables SourceValidate
during rotation redisplay.
commit 0a9239ec258828ec1da6c208634a55fc4053d7da
Author: Soren Sandmann Pedersen <ssp@dhcp83-218.boston.redhat.com>
Date: Thu Apr 19 18:19:34 2007 -0400
Merge David Reveman's gradient optimization patch from pixman
commit d0e55774e0da641ba85c5173f27f68de27372747
Author: Thomas Hellstrom <thomas-at-tungstengraphics-dot-com>
Date: Thu Apr 19 11:39:53 2007 +0200
libdri: Make sure the new DRIInfo keepFDOpen member is honoured.
commit e1f0b3e70b696d7ea4cf9e6ed30d751e7fdbc577
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Thu Apr 19 12:00:24 2007 +0930
config: Return errors as negative numbers, device ids as positive numbers.
Update dbus-api documentation.
commit c6972c893359f8fa7631ae674330f3f4f7010ba0
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Wed Apr 18 12:10:05 2007 +0930
Change dbus 'listDevices' call to not require an argument.
Update dbus-api documentation, plug memory leak on dbus reply error.
commit d61ed6c8a2823a3532439d5cb9f355129c93f523
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Thu Apr 19 18:08:55 2007 +0930
Check for NULL devices in CloseDevice().
commit 9c30f7422121a0443c8d612d06181e17d8af9730
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Thu Apr 19 12:00:24 2007 +0930
config: Return errors as negative numbers, device ids as positive numbers.
Update dbus-api documentation.
commit 999b681cf3973af4191506e49cde06963b11a774
Author: Eric Anholt <eric@anholt.net>
Date: Wed Apr 18 14:33:27 2007 -0700
Suppress software cursor removal during rotated shadow buffer drawing.
commit 28bb34eec63bf3c98f38ba7fc044f6419aaa3307
Author: Eric Anholt <eric@anholt.net>
Date: Wed Apr 18 13:48:28 2007 -0700
Belatedly bump XORG_VERSION for 7.2.
commit 5d8e8a7f4b3226bffd9e4d6d9326688f475b0183
Author: Eric Anholt <eric@anholt.net>
Date: Wed Apr 18 13:22:26 2007 -0700
Remove libminimi build.
It appears to have been a leftover of a previous incarnation of the build
system that didn't handle miinitext.c well.
commit 53fb42e65c2b2ff58a4a324b7f05cff8a587720a
Author: Erik Andrén <erik.andren@gmail.com>
Date: Tue Apr 17 21:34:47 2007 -0700
Syncmaster 226 monitor needs 60Hz refresh (#10545).
I've managed to solve my own bug (#10545) by applying the following
patch to the xserver.
Please apply.
<Conspiracy mode on>
This monitor is "Vista Certified". I wonder if this is a pure coincidence...
<Conspiracy mode off>
With kind regards
Erik Andrén
(cherry picked from commit a63704f14a1d97b9a00fef6fa290e74e51b9732b)
commit ae75afcb1b5419102c5be10b8826ceed50d2ef5d
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Wed Apr 18 12:10:05 2007 +0930
Change dbus 'listDevices' call to not require an argument.
Update dbus-api documentation, plug memory leak on dbus reply error.
commit 9cee4ec5e6e06d23aafb302494b082c77ade4623
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Tue Apr 17 16:01:56 2007 -0400
xace: change the semantics of the return value of XACE hooks to allow
arbitrary X status codes instead of just TRUE/FALSE.
The dix layer in most cases still does not propagate the return value of
XACE hooks back to the client, however. There is more error propagation
work to do.
commit 47bd311e3dcc501cbb202ce79a55ac32e9db50f2
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Tue Apr 17 13:46:55 2007 -0400
security: remove debugging code.
commit 1f06d32ef58749d0f0c062193d237ee98f60e90f
Merge: cf962a849d fc162c6cfa
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Tue Apr 17 12:10:22 2007 -0400
Merge branch 'master' into XACE-SELINUX
Conflicts:
dix/privates.c
commit b6aec7f6f906a18d13586d63afabf1ee4fbb11c3
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Tue Apr 17 16:51:16 2007 +0930
Change FocusIn/Out semantics to match Enter/Leave semantics.
commit 451d5464b4e8a2516b8a4598b3c4eb14656be90e
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Tue Apr 17 11:17:04 2007 +0930
Change enter/leave semantics for events with detail Notify{Nonlinear}Virtual.
Core enter/leave events with detail Notify{Ancestor|Inferior|Nonlinear} are
only sent for the first/last pointer to enter/leave. Events with detail
Notify{Nonlinear}Virtual are sent at all times, but not to those windows that
currently have one or more pointers inside their boundaries.
commit fc162c6cfa06f0b012743d6d79cef45cf0166229
Author: Keith Packard <keithp@neko.keithp.com>
Date: Mon Apr 16 09:55:58 2007 -0700
Allow outputs to be explicitly enabled in config, overriding detect.
Option "Enable" "True" will force the server to enable an output at startup
time, even if the output is not connected. This also causes the default
modes to be added for this output, allowing even sync ranges to be used to
pick out standard modes.
(cherry picked from commit a3d73ba2cb7e13a6d129cd88d6a7f7d756e2ced2)
commit c41e3bd713206c0bbd8ab8cef4c83eb7ba7e1c3c
Author: Keith Packard <keithp@neko.keithp.com>
Date: Mon Apr 16 09:53:42 2007 -0700
Use default screen monitor for one of the outputs.
By default, use the screen monitor section for output 0, however, a driver
can change which output gets the screen monitor by calling
xf86OutputUseScreenMonitor.
(cherry picked from commit f4a8e54caf6b9431711383a39f55a18e7fd654f4)
commit 97a2c2579c56c304705c934f3b536473645747df
Author: Keith Packard <keithp@neko.keithp.com>
Date: Mon Apr 16 09:39:47 2007 -0700
Using wrong log level in extension to built-in message
was: typo in built-in module log message
(cherry picked from commit 00cfd1f765895b4d1b2234f3203727a8871b64b0)
commit deda7791dfa34d0563c8d7fa2a0660ac27e6858c
Author: Brian <brian@yutani.localnet.net>
Date: Mon Apr 16 11:35:22 2007 -0600
remove sources deleted in Mesa
commit 02d42f344ce020c9b84723671cb9c68d5c064933
Author: Thomas Hellstrom <thomas-at-tungstengraphics-dot-com>
Date: Mon Apr 16 17:24:53 2007 +0200
Changes for single-entity multi-screen DRI.
The entity (device) has a locking SAREA and a master file descriptor
that optionally isn't closed between server generation.
The locking SAREA contains the device hardware lock.
Each DRI screen creates an new SAREA containing the drawable lock,
drawable-and private info, the drawable SAREA.
The first screen optionally shares its drawable SAREA with the
device SAREA.
Default is to close the master descriptor between server generations,
and to share the drawable SAREA of the first screen with the device locking
SAREA. Thus we should (hopefully) have full backwards compatibility.
Mesa changes to support single-device multiple screens are pending.
commit b5823ea3e1ed5a0449d44da05165a46719dcf287
Author: Keith Packard <keithp@neko.keithp.com>
Date: Sun Apr 15 22:59:19 2007 -0300
RandR 1.2 spec says CRTC info contains screen-relative geometry.
Was reporting mode size instead of adjusting for rotation.
(cherry picked from commit e2e7c47a528447e90cff6cf10d2ce457742ef48d)
commit cc4eb1c7ea1bace7ed69cfd80c99d22933282ae1
Author: Keith Packard <keithp@neko.keithp.com>
Date: Fri Apr 13 15:04:29 2007 -0300
Add quirk for Acer AL1706 monitor to force 60hz refresh.
This Acer monitor reports support for 75hz refresh via EDID, and yet when
that rate is delivered, the monitor does not sync and reports out of range.
Use the existing 60hz quirk for this monitor.
(cherry picked from commit 1328a288e9030a472a915077160f090d1afd4126)
commit eba81a0a01f8a61151d8bf9f3d83bda85ca26e73
Author: George Sapountzis <gsap7@yahoo.gr>
Date: Sat Apr 14 18:30:09 2007 +0300
glx: move __glXMesaProvider from GLcore module to glx module.
This treats the GLcore provider similar to DRI provider, using a subset of
XMesa as the GLcore interface.
commit 6b040b79f0e247b6f2da8f7d239443743e96de67
Author: George Sapountzis <gsap7@yahoo.gr>
Date: Sat Apr 14 18:29:52 2007 +0300
glx: drop xmesaP.h include from xf86glx.c
The declarations for the xfree86-specific XMesa functions were moved up to
xmesa.h, requires Mesa as of 2007-04-13.
commit 2c833f60acb3dc358815a99cd295ef7fc695c45d
Author: George Sapountzis <gsap7@yahoo.gr>
Date: Sat Apr 14 18:29:25 2007 +0300
glx: drop stray CAPI define.
SI imports/exports were dropped from Mesa.
commit ea27b09d3a973d9a4943f205b24940b8624cf405
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Fri Apr 13 17:15:22 2007 +0930
Deliver FocusIn/FocusOut events for all devices.
Don't use VCK in SetInputFocus and DeliverFocusedEvent.
commit 7ccebc50b98ac175fdbdfaab081bcead62e60ee3
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Fri Apr 13 13:08:44 2007 +0930
Documentation for events.c.
commit 2bb3c81fc1ca98c909309f3af7e9c8ca6b695657
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Thu Apr 12 16:35:43 2007 +0930
Use paired kbd instead of VCK for EnterLeaveEvents, sanitize variable naming.
commit e7b47b1758ed20e75ee267b3a09e91bf2861f6fd
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Thu Apr 12 16:24:42 2007 +0930
Change core enter/leave semantics for multiple pointers.
Send EnterNotify when first device enters the window, LeaveNotify when the
last device leaves the window. Additional devices will not cause additional
Enter/LeaveNotifies.
commit 547d720938b3668666d60110d79b150b1e9325c6
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Thu Apr 12 11:16:19 2007 +0930
Remove workaround for a NULL core pointer in ProcessInputEvents.
This workaround is obsolete with 33a5d9605e3e282f6aa1921d7321a2a12ef02c42
commit d4dad6f84f82a4ade5005c3aa93511c1295875b8
Merge: f1f8b562aa 33a5d9605e
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Thu Apr 12 11:11:03 2007 +0930
Merge branch 'master' into mpx
Conflicts:
configure.ac
dix/events.c
hw/xfree86/common/xf86Xinput.c
commit 33a5d9605e3e282f6aa1921d7321a2a12ef02c42
Author: Daniel Stone <daniel@fooishbar.org>
Date: Wed Apr 11 18:28:57 2007 +0300
XFree86: DGA: Don't call ProcessInputEvents from CloseScreen
By the time CloseScreen gets called, we can't call ProcessInputEvents, as
the event queue will get unhappy. So just unregister our hooks instantly,
and hope that they don't get called.
commit 0910540e4322bba72a2fa0a907072eab2547a7b6
Author: Remigiusz Marcinkiewicz <enleth@enleth.com>
Date: Wed Apr 11 01:09:26 2007 +0300
Config: Extend D-BUS API
Return device ID where available.
Add listDevices call, which does what it says on the box.
commit aecbc712144dd1aaf462bd758821438b1d22d957
Author: Remigiusz Marcinkiewicz <enleth@enleth.com>
Date: Wed Apr 11 00:38:16 2007 +0300
Input: Allow a pointer to a device to be returned in NIDR
Allow a pointer to the first device added to be returned, so we know which
device(s) were added by the NIDR call.
commit 4f05f9591e5492c72f3856bd7a2ff13378f59f2b
Author: Magnus Vigerlöf <Magnus.Vigerlof@home.se>
Date: Tue Apr 10 23:57:48 2007 +0300
Input: Always add devices with first available ID
Scan the device list when adding a new device, and make sure we can use
the first available ID, instead of always incrementing.
commit 20674dcbb2373a0af287883bc008fb6fb23d4466
Author: Magnus Vigerlöf <Magnus.Vigerlof@home.se>
Date: Tue Apr 10 23:55:36 2007 +0300
Config: Fix memory leaks
Fix memory leaks that could occur along the error path.
commit 82962bbae2b4fda274625d1712ef839ce1ab9dc8
Author: Magnus Vigerlöf <Magnus.Vigerlof@home.se>
Date: Tue Apr 10 23:54:32 2007 +0300
Input: Add DeleteInputDeviceRequest
Add DIDR, which asks the DDX to remove a device, analogous to
NewInputDeviceRequest. Only implemented for XFree86 at the moment.
commit 7b82a836c66ba88566255052caff63577e1a0384
Author: Magnus Vigerlöf <Magnus.Vigerlof@home.se>
Date: Tue Apr 10 23:52:08 2007 +0300
XFree86: Fix memory leaks, option parsing, in NewInputDeviceRequest
Plugged some possible memory leaks, and added some more checks on the
options, particular for driver/identifier. Added an unwind.
commit 4771fa8747791498e504d73afccfb5833499a38b
Author: Magnus Vigerlöf <Magnus.Vigerlof@home.se>
Date: Tue Apr 10 23:48:00 2007 +0300
XFree86: Fix memory leak in option parsing
Fix option parsing functions and callers thereof to not leak memory.
commit 07c56abf84080c020a3e7b7703a447c7f996975c
Author: Magnus Vigerlöf <Magnus.Vigerlof@home.se>
Date: Tue Apr 10 23:43:58 2007 +0300
Input: Plug memory leak in device free
Remember to also free the motion history, if we're using the DIX-managed
history.
commit e92743bc9839c36914a44f3e5bc8cd85773ac794
Author: Daniel Stone <daniel@fooishbar.org>
Date: Sun Apr 8 14:02:02 2007 +0300
getevents: Copy modifier state from extended to core devices
Make core events carry the same modifier state as the extended events, so
that holding down Ctrl on keyboard A and pressing Q on keyboard B won't
cause your app to quit.
commit e49f836d6fa2768cd6d2a6d0227b5dbf516013dc
Author: Daniel Stone <daniel@fooishbar.org>
Date: Sun Apr 8 13:56:41 2007 +0300
mieq: Use larger default queue size
Use a default queue size of 512 rather than 256, else Xephyr is too slow
without a host cursor, so events get stuck in the queue.
commit 4aae2de74b9224bac2b2e2522637dac09abc3837
Author: Jared D. McNeill <jmcneill@netbsd.org>
Date: Tue Apr 10 12:57:15 2007 -0700
Add a real xf86EnableIO/xf86DisableIO for NetBSD/PPC.
commit f77a8ea849d171a8ca00b2b7334866ace1ffbf73
Author: Keith Packard <keithp@neko.keithp.com>
Date: Mon Apr 9 14:29:46 2007 -0700
Rotate screen size as needed from RandR 1.1 change requests.
Screen size must reflect rotated mode size when setting rotated mode using
RandR 1.1 SetScreenConfig request.
(cherry picked from commit efcec7dbd3c2736c7b421d29c4d37e231aa681d2)
commit bcf17df69a232e5e84609abacdca36274316e170
Author: Keith Packard <keithp@neko.keithp.com>
Date: Mon Apr 9 14:12:27 2007 -0700
Disable CRTC when SetSingleMode has no matching mode. Update RandR as well.
xf86SetSingleMode tries to resize all crtcs to match the selected mode. When
a CRTC has no matching mode, it now disables the CRTC (instead of crashing).
Also, poke the RandR extension when xf86SetSingleMode is done so that
appropriate events can be delivered, and so that future RandR queries return
correct information.
(cherry picked from commit dc6c4f6989f87149d8605604f4514f5cbf11de67)
commit 67e1c98895a566f927e1ae2384d56cfca104f971
Author: Adam Jackson <ajax@benzedrine.nwnk.net>
Date: Mon Apr 9 19:08:52 2007 -0400
Look for the PCI ROM file elsewhere in sysfs.
/sys/devices reflects the bus topology, and we don't care that much.
Easier (and more reliable) to just look in /sys/bus/pci/devices, which
is a flat view.
commit a08d5157f70567a0aa9583d4a15e62437340cf34
Author: Adam Jackson <ajax@benzedrine.nwnk.net>
Date: Mon Apr 9 19:04:56 2007 -0400
VT activate or waitactive are fatal if they fail.
Also, be sure to waitactive on the way down, to make sure we're off the VT
before exiting.
commit 72b477f964c748a1ab668781643cc11877f19738
Author: Adam Jackson <ajax@benzedrine.nwnk.net>
Date: Mon Apr 9 18:59:01 2007 -0400
Don't write out empty sections from the parser.
commit 1f6741db19d4c91b1eacb497dff1814acb1bf0c3
Author: Stefan Huehner <stefan@huehner.org>
Date: Mon Apr 9 14:33:15 2007 -0700
Bug #10560: Code-Cleanup: function declarations () -> (void)
X.Org Bugzilla #10560: <https://bugs.freedesktop.org/show_bug.cgi?id=10560>
Patch #9511 <https://bugs.freedesktop.org/attachment.cgi?id=9511>
commit f24391dbfd12a84253dfec794ee7884afd52e197
Author: Keith Packard <keithp@neko.keithp.com>
Date: Mon Apr 9 12:30:31 2007 -0700
In AIGLX EnterVT processing, invoke driver EnterVT before resuming glx.
As the driver EnterVT function generally re-enables the hardware and
prepares it for rendering, it must be called before any gl functions are
called which could touch the hardware.
commit 4c2e28b0916b5f75cfefb6df9fa0a7a09675539a
Author: Keith Packard <keithp@neko.keithp.com>
Date: Mon Apr 9 12:28:53 2007 -0700
Add setrlimit call in -core option to make dumps occur.
Default core size limit for most environments is 0, which disables core
dumps. Add code in the -core option processing path to set the core limit to
the maximum value.
commit f1f8b562aaaa6ec32ab0d0697f964d92d6d536a4
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Mon Apr 9 19:31:59 2007 +0930
Alloc sprite memory in devices' devPrivates, allow undisplaying cursors.
Improve memory usage by allocating the sprite's memory only to devices that
actually have a sprite and provide means to remove a device's cursor from the
screen (more hotplugging, yay!).
This commit breaks ScreenRec's ABI.
commit 7cef789fa13ae53bfba6dc7b5a7928b7362b2522
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Mon Apr 9 18:37:48 2007 +0930
Close down virtual core devices when closing all devices.
commit 6081b8c76f7d934bd4e9584a2f6d55636c5289d2
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Mon Apr 9 18:35:47 2007 +0930
Don't explicitly init sprite for VCP, EnableDevice() will take care of that.
commit 00b1d52f4103a07568dcebcdaa860b9b51f19b4d
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Mon Apr 9 18:32:00 2007 +0930
Adding some comments to devices.c.
commit aa77ffb510abe004802ab9acc6996e4c6fe3ebb2
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Mon Apr 9 18:27:22 2007 +0930
Fix: pick new ClientPointer when device is closed.
commit 4beeab8424774ea4c3142f29b90e33f1fc7cb154
Author: Daniel Stone <daniel@fooishbar.org>
Date: Sun Apr 8 13:39:06 2007 +0300
XFree86: Treat evdev and vmmouse as mouse drivers (bug #10512, #10559)
When we see an evdev or vmmouse section, assume that it's a mouse, and
don't add a default mouse device. This will break users who have an
evdev keyboard section but no mouse, and want the mouse to get added
by default.
commit 0a6ac992363343487dfe0a0fc985ea55bd448382
Author: Brian <brian@yutani.localnet.net>
Date: Sat Apr 7 12:41:57 2007 -0600
regenerated to fix bug 10371
commit 7e385598613778de14c0feea0d32f17d7aa66a8e
Author: George Sapountzis <gsap7@yahoo.gr>
Date: Fri Apr 6 13:38:12 2007 +0300
GLcore: fix after moving xf86glx_util.[hc] to Mesa.
commit cf962a849db2b259ca558c6265ea7e3328a4d312
Merge: 5ad562565a 5a804f2e97
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Thu Apr 5 14:41:39 2007 -0400
Merge branch 'master' into XACE-SELINUX
Conflicts:
configure.ac
commit 5ad562565ac8ef9257da3afb0de1ae4f90f80fe9
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Thu Apr 5 14:18:05 2007 -0400
devPrivates rework: properly free devPrivates on compatibility structures,
type pixmap. Requires ddx'es to call the free function from DestroyPixmap.
commit 5a804f2e97ab59745482660a635b801ac2b9e769
Author: George Sapountzis <gsap7@yahoo.gr>
Date: Thu Apr 5 19:14:31 2007 +0300
configure: minor cosmetic, move GLX extension options together.
commit a4e2fc703484fffed8dd50c1b4b24c564be4d3cd
Author: George Sapountzis <gsap7@yahoo.gr>
Date: Thu Apr 5 19:13:47 2007 +0300
glx: Remove stray __GLinterface.
__GLinterface was droped from glcore.h
commit 38ca7d388c47c4800c74442172d6595a9b3dfcc7
Author: George Sapountzis <gsap7@yahoo.gr>
Date: Thu Apr 5 19:13:14 2007 +0300
glx: fix symlink, glcontextmodes.c was moved to mesa/src/glx/
commit 1d550bb2c5cb5b3e588f0e0b68a421dc1cb8bd7c
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Thu Apr 5 12:12:58 2007 -0400
devPrivates rework: minor fix; use calloc and avoid initialization.
commit 5c4deb71a1cb981ea7e2e25d2b3a1179f27efa5a
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Thu Apr 5 14:21:46 2007 +0930
Synthesize WarpPointer events for the actual device rather than the VCP.
commit ed75b056511ccb429c48c6c55d14dc7ae79e75a3
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Wed Apr 4 12:00:15 2007 -0400
dix: add new, combined resource lookup function. Move all dix lookup API
deprecated so far to a new file dix/deprecated.c. Remove the deprecation
warnings for the time being.
commit 63e46e4fc3e98751f2edbed9c79ef3d5dc2dadc6
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Wed Apr 4 15:59:51 2007 -0400
devPrivates rework: properly free devPrivates on compatibility structures,
excluding pixmap.
commit f8482967ae8080f49dd1bbb0b79cc65020df679f
Author: Thomas Hellstrom <thomas-at-tungstengraphics-dot-com>
Date: Wed Apr 4 12:28:48 2007 +0200
Add an EXA driver callback to determine whether a pixmap is
"offscreen" in exa terms, which means accessible to the GPU.
Bump exa minor. The change is backwards-compatible.
commit 7f36ba57062096e9c67889d5b7dd64e2fb0004e7
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Wed Apr 4 17:38:10 2007 +0930
Allow for multiple animated cursors.
commit 676188531b2bd7679ee1831b5c517df3e6d215c5
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Wed Apr 4 17:35:06 2007 +0930
Unrealize cursor only once, not per device.
commit c10df5b967d4da4e11786520317e2917de5541fa
Author: Aaron Plattner <aplattner@nvidia.com>
Date: Tue Apr 3 15:47:01 2007 -0700
Swap RRScreenChangeNotifyEvent dimensions when the screen has one crtc and it's rotated.
RandR 1.1 clients expect the size fields in this event to be the unrotated
dimensions of the screen. This behavior is "weird", but that's the way the old
code worked so we need to be bug-compatible with it.
commit 1cb84768f376b477a08a558854609b0743f2bd29
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Tue Apr 3 15:31:16 2007 -0400
security: rewrite to use new devPrivates support.
commit 14aea12cadef647369e44639ff5024dd7034570a
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Tue Apr 3 15:23:56 2007 -0400
xace: forgot one of the hook call arguments. Add it.
commit 353e19fd5e18ad55a0dd12a7b63f6af9df7bfe6b
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Tue Apr 3 14:06:02 2007 -0400
devPrivates rework: zero out newly allocated private space.
commit e1dea151db6405e12d991feacba9446320739ee8
Author: Brian <brian@yutani.localnet.net>
Date: Tue Apr 3 11:21:50 2007 -0600
Implement a minor hack in dmxCheckFunctionKeys() to detect special keys.
Keep track of status of (left) alt/ctrl keys so that ctrl-alt-q to exit
can be detected. Not ideal, but works for now.
commit 0ee40c935750e25a9e178cdd70f6b2c667e79344
Author: Brian <brian@yutani.localnet.net>
Date: Tue Apr 3 09:31:00 2007 -0600
s/intead/instead/
commit 23974f20bf0e0c2786cc75af026af5484f6dc331
Author: Brian <brian@yutani.localnet.net>
Date: Tue Apr 3 09:30:24 2007 -0600
add DDXRingBell() stub to solve link problem
commit a240c039c47c0be22ea5e100692307b26d938747
Author: Brian <brian@yutani.localnet.net>
Date: Tue Apr 3 09:27:57 2007 -0600
Split the xserver/fb/fbcmap.c file into two files.
Now, fbcmap_mi.c contains the fb functions which just wrap mi functions.
Previously, these were in fbcmap.c and compiled when XFree86Server was defined.
Now, clients of fbcmap should either use fbcmap.c or fbcmap_mi.c and not worry
about setting the XFree86Server symbol.
commit 1cc8db72816cd079f30255046e10043c350bf683
Merge: 645d87cf8e a39f297ada
Author: Matthieu Herrb <matthieu@roadrock.(none)>
Date: Tue Apr 3 16:04:45 2007 +0200
Merge branch 'master' of ssh://herrb@git.freedesktop.org/git/xorg/xserver
commit 645d87cf8ef724d4591614f9994cdc4d7549a7a8
Author: Matthieu Herrb <matthieu@roadrock.(none)>
Date: Tue Apr 3 15:47:18 2007 +0200
CVE-2007-1003: XC-MISC Extension ProcXCMiscGetXIDList() Memory Corruption
commit 207f710d16337839c2427aa16fad70a49834153e
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Tue Apr 3 19:02:14 2007 +0930
Delete all grabs from all devices when deleting a window.
commit 5f382c9c7fbda6eccf8e76c28a90b55ff2f0aef3
Merge: 9b0b340668 f09ee168e2
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Tue Apr 3 15:07:18 2007 +0930
Merge branch 'master' into mpx
commit f09ee168e234d0a9416e15f2916726b975cad293
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Tue Apr 3 15:07:00 2007 +0930
Revert "o fix minor error in comment for GetPointerEvents()"
This reverts commit 96ce17aa94413c4b8bcb61cae71167050130a307.
commit 9b0b3406682b5a3161e6c3895771523214c37207
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Tue Apr 3 15:06:26 2007 +0930
Make GrabDevice differ between core grabs and device grabs.
commit a39f297ada4fa87c858395ae2aacefac5f8fba05
Author: Keith Packard <keithp@viola.jf.intel.com>
Date: Mon Apr 2 14:15:36 2007 -0700
Don't erase current crtc for outputs on CloseScreen
Erasing this variable causes some outputs (SDVO on intel) to fail
to be correctly reset at server reset time.
(cherry picked from commit 56262a4ee943f328d089a8eb4aa70b9a4bd5d135)
commit 11797ffdcc22160317a5ebbc9291472570a51c6d
Author: Eric Anholt <eric@anholt.net>
Date: Mon Apr 2 18:21:58 2007 -0700
Move modes/ debugging output under Option "ModeDebug" in the Device section.
commit e44f106ffc796c025abdfb66717c06db8b12b4e4
Author: Brian <brian@yutani.localnet.net>
Date: Mon Apr 2 16:26:15 2007 -0600
clean-up, debug code
commit 8d8bc8927760fad631bef83fa2841b455ff6d511
Author: Brian <brian@yutani.localnet.net>
Date: Mon Apr 2 16:21:57 2007 -0600
fix formatting
commit 3e482de7b145a5eed79b81c30c359fe43647824a
Author: Brian <brian@yutani.localnet.net>
Date: Mon Apr 2 15:38:15 2007 -0600
checkpoint: more clean-up
commit 76a7a5ca1f068c27c9b5fbd49d5a1da80ed6f488
Author: Brian <brian@yutani.localnet.net>
Date: Mon Apr 2 15:24:05 2007 -0600
formatting fixes
commit 69baad321d35dae0bfa535be0c6ed2131fed1e60
Author: Brian <brian@yutani.localnet.net>
Date: Mon Apr 2 15:21:22 2007 -0600
clean-up dmxCoreMotion() dmxCoreMotion2()
commit 44eb15adeee3b299677070f39625daa53679bd13
Author: Brian <brian@yutani.localnet.net>
Date: Mon Apr 2 15:12:04 2007 -0600
checkpoint clean-up
commit 0f873a9d4f02b399c37b4058c6a9a2e21aa205e8
Author: Brian <brian@yutani.localnet.net>
Date: Mon Apr 2 14:51:38 2007 -0600
remove some debug code
commit 3a0ce1084a18e17a3c8a009d99c228652b8763a9
Author: Brian <brian@yutani.localnet.net>
Date: Mon Apr 2 14:51:21 2007 -0600
for completeness, init dummy's min/maxval[1] values (vertical axis)
commit 12016f20f7f5365f30cfbeb05568b3fb89759e5a
Author: Brian <brian@yutani.localnet.net>
Date: Mon Apr 2 14:50:48 2007 -0600
As for normal mouse device, init valuator maxval[] to real values, not zero.
commit 0aaf28e5633a59563b89a2e42d19fabc84adc3ed
Author: Brian <brian@yutani.localnet.net>
Date: Mon Apr 2 12:41:30 2007 -0600
In dmxBackendMouGetInfo() initialize the info->minval[], maxval[] arrays to the size of the backend display.
It seems that the changes to X input exposed a problem that wasn't detected
before. The axis clipping code in GetPointerEvents() uses those limits to
constrain the pointer's coordinate range. The max was zero so the pointer
couldn't move.
commit 0013bf6ddb3867c9a504603434d8c2ec83f3f3bc
Author: Brian <brian@yutani.localnet.net>
Date: Mon Apr 2 12:39:04 2007 -0600
undo 1280 valuator hack
commit 08a88d1803f672555141011e082fbc0edeedcf05
Author: Brian <brian@yutani.localnet.net>
Date: Mon Apr 2 12:28:14 2007 -0600
Pass num_valuators=0 for ButtonPress/Release. This seems to fix the button coordinate problem
commit 70683e338dacc48e3adf489d66ec33b29dfc3b77
Author: Brian <brian@yutani.localnet.net>
Date: Mon Apr 2 12:26:27 2007 -0600
formatting fixes
commit e8777a91f37d828b9df839bf3d9cf2f954bdddb0
Merge: a12054757d 96ce17aa94
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Mon Apr 2 15:36:26 2007 +0930
Merge branch 'master' into mpx
Conflicts:
Xi/closedev.c
Xi/exevents.c
Xi/extinit.c
Xi/listdev.c
dix/window.c
hw/xfree86/common/xf86Xinput.c
include/extinit.h
mi/mipointer.c
commit 96ce17aa94413c4b8bcb61cae71167050130a307
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Wed Nov 15 17:50:02 2006 +1030
o fix minor error in comment for GetPointerEvents()
commit a12054757d21edacc1c24c3077b9214726652829
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Mon Apr 2 11:20:44 2007 +0930
Xi: fix ProcXListInputDevices to include the virtual core devices.
commit f2808005f4ee72c5fd7f5f3dcca181306485113e
Author: Alberto Mardegan <mardy@users.sourceforge.net>
Date: Sat Mar 31 16:51:24 2007 +0200
Bug #6620: Fixed a missing 'else' in ATIPseudoDMAInit().
Before this, we'd write some registers twice on R200 hardware and also
possibly end up with a bad value in atis->cce_pri_size.
commit 5257b32e492bd2082bef6a4cd0fea03ce093c0f8
Author: Aaron Plattner <aplattner@nvidia.com>
Date: Wed Mar 28 15:51:24 2007 -0700
Bump video driver ABI to 2.0 for cw change (commit 6ed08949af4f7ac09170d3d9581e4092b24a84ee).
commit 73fdc16bc4f4e21ff604b3f9ded23b40398fb1b6
Author: Brian <brian@yutani.localnet.net>
Date: Fri Mar 30 16:07:26 2007 -0600
formatting fixes
commit ebdc8ce5c108dc3b6b0004e7c7939d1a5bef8676
Author: Brian <brian@yutani.localnet.net>
Date: Fri Mar 30 16:05:46 2007 -0600
Checkpoint DMX updates: things are working much better now, but still not 100% right.
Use new dmxCoreMotion2() function which enqueues motion events with
GetPointerEvents()/mieqEnqueue().
The clipAxis() code in GetPointerEvents() is causing some grief. The
limits seem to have always been (0,0) according to the original calls
to InitValuatorAxisStruct() in dmxinputinit.c.
Terrible hack for now: Call InitValuatorAxisStruct() with hard-coded max
values of 1280 (my screen width).
commit e9130b8bac73a0843d5ff6b2216eccfb3e094a48
Merge: 2c6d471088 92e8cdbd32
Author: Ian Romanick <idr@us.ibm.com>
Date: Fri Mar 30 13:39:15 2007 -0700
Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver into pci-rework
commit 3c7413e0c2f87e154aa8aa4a83bd585a6d1091e8
Author: Brian <brian@yutani.localnet.net>
Date: Fri Mar 30 14:07:04 2007 -0600
Tweak some parameters, etc. Things seem a little better now, but still a ways to go.
commit 7989dacdcb1449b10d7733dda11cd96e260e9fae
Author: Brian <brian@yutani.localnet.net>
Date: Fri Mar 30 13:44:24 2007 -0600
num_valuators=1 for GetPointerEvents(), hack ButtonPress/Release position
commit 1ea842960fddbc6363cc6e7f914d70ba45525a6b
Author: Brian <brian@yutani.localnet.net>
Date: Fri Mar 30 13:43:15 2007 -0600
more debug
commit 92e8cdbd32b0d86cabd4ad88e3240bf90c018b9a
Author: Brian <brian@yutani.localnet.net>
Date: Fri Mar 30 13:19:33 2007 -0600
Checkpoint fixes to DMX for X input changes.
Xdmx builds and runs now.
Keyboard seems OK, and mouse pointer moves, but everything else is flakey.
Something is still seriously wrong.
commit d92da3d5f309392ac398c0975ef17bb04312d5e2
Author: Brian <brian@yutani.localnet.net>
Date: Fri Mar 30 12:56:34 2007 -0600
more formatting fixes
commit 44acb2517d9fb07790d9d799aa9cc727d1b7d35c
Author: Brian <brian@yutani.localnet.net>
Date: Fri Mar 30 12:54:22 2007 -0600
Fix some bad formatting.
Doing this:
if (something) stmt;
is evil if you're debugging and want to break on stmt!
commit 9f24798af50896cc3262c1201f75c10a688f2a83
Author: Brian <brian@yutani.localnet.net>
Date: Fri Mar 30 12:49:34 2007 -0600
ompile fbcmap.c w/ -DXFree86Server instead of linking libfbcmap.a.
The former works, the later doesn't (DMX blows up on visuals/pixel formats).
This undos Daniel's patch, which undid my prev patch. Revisit someday.
commit 76756f27561c6386cba0d338441e8ec7b98500ce
Author: George Sapountzis <gsap7@yahoo.gr>
Date: Thu Nov 30 04:20:32 2006 +0200
Make xf86glx.c unaware of Mesa internals
Use newly added XMesaCopyContext() and drop the GlxSetRenderTables() call
for Xgl, as this is now done inside XMesaForceCurrent(). This leaves xmesaP.h
but only for the declarations of the three XMesa/XFree86 functions. Also,
GlxSetRenderTables() stays but is only used in hw/xgl/glxext/ .
Also drop xf86glxint.h, no longer used.
Depends on mesa commit 7439a36785b6a2783e80a40a96c09db8f56dc2bc of 2007-03-30.
commit 63d8f01819ef44ea3bf0d4fb20ba1d698ae91cd2
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Fri Mar 30 14:59:43 2007 +0930
dix: Fix wrong cursor refcount.
Calloc cursor struct to ensure devPrivates are zeroed out and don't
increase the refcnt for devices automatically when allocating a new
cursor. Use new DeviceIsPointerType() to detect if device is a pointer
_before_ device has been activated and can thus be identified and set
up grab functions accordingly. This way we can increase the refcnt
when we get a pointer grab.
commit 20e4314b178e1a093bce85e93329d4bcfb4f4210
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Thu Mar 29 19:12:32 2007 +0930
dix: Try to get closer to the correct refcnt for cursors.
This commit introduces a memory leak, as the refcnt never seems to get
down to 0 and thus cursors will not be freed. Solves the problems with
GNOME segfaulting every 30 seconds though.
commit 307d2b57bbfcc281656011533627bea6ab98189e
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Thu Mar 29 15:23:41 2007 +0930
Xi: remove 'register' keywords.
commit 0c607f4b1902f993597e09ea7a2c83bc1cca9b96
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Thu Mar 29 14:43:50 2007 +0930
dix: Pick keyboard instead of using virtual keyboard in Grab/UngrabKey.
commit 82a8b99a6c46018885600011913267d8af9dfe13
Author: Adam Jackson <ajax@benzedrine.nwnk.net>
Date: Wed Mar 28 15:17:02 2007 -0400
Move the XAA private indices to be static.
Technically this is an ABI break, if you aren't smart enough to be using the
getter functions. Cope.
commit 8c7f56d92d8471ee059c14d322af5f7f555dd5c6
Author: Tomas Janousek <tomi@nomi.cz>
Date: Wed Mar 28 14:46:30 2007 -0400
Bug #10296: Fix timer rescheduling.
commit 327bc332a61294209d39286228199f54bdde73d1
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Wed Mar 28 13:00:03 2007 -0400
xace: minor comment fixes.
commit 299ff4c82998d2a32204bfbecde4993dfbd3d4a5
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Wed Mar 28 12:57:11 2007 -0400
xace: provide creation-time resource hook call in CreateWindow().
commit 99b220969f2f8ba829bc8294b27ca90fd9311be4
Merge: 728ad64d97 82a8b99a6c
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Wed Mar 28 12:54:04 2007 -0400
Merge branch 'master' into XACE-SELINUX
commit 5ba4d9eedf1b4ce4795bf910cd184872e2d9b3fc
Author: Adam Jackson <ajax@benzedrine.nwnk.net>
Date: Wed Mar 28 12:03:19 2007 -0400
Refuse to create tiny modes from EDID detailed timing.
commit 2c6d47108880584f1221ff86c6c8947627f9f607
Merge: c4fe1bcce1 8522044635
Author: Ian Romanick <idr@us.ibm.com>
Date: Wed Mar 28 08:08:04 2007 -0700
Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver into pci-rework
Conflicts:
hw/xfree86/Makefile.am
hw/xfree86/dri/dri.c
commit 85220446359a75ea2c359b418b4051c04eea739c
Author: Daniel Stone <daniel@fooishbar.org>
Date: Wed Mar 28 13:03:32 2007 +0300
GL: Update for Mesa changes
Added s_fragprog.c to fix the build.
commit 1af2ef0b25fd8017a3271e624a5f1548f02b09f9
Author: Eric Anholt <eric@anholt.net>
Date: Tue Mar 27 13:13:45 2007 -0700
Enable Composite by default now that it disables itself in the known bad cases.
commit 0bfc3cc22db94ec6867596606fe93228e315c847
Author: Eric Anholt <eric@anholt.net>
Date: Tue Mar 27 13:12:21 2007 -0700
Disable composite when Xinerama is active.
It will likely take a decent bit of work to make that work right.
commit 5e7936371c9e1ac48e19bf1e9e3f71f037fd9b5d
Author: Eric Anholt <eric@anholt.net>
Date: Mon Mar 26 20:18:18 2007 -0700
Disable Composite when the screen's visual is pseudocolor.
Rendering fails badly in this case, and I don't care enough to fix it.
commit 8afc7e2eb3ebec48d3879bf269143259c8bc18c8
Author: Eric Anholt <eric@anholt.net>
Date: Mon Mar 26 15:55:38 2007 -0700
Refuse to initialize Composite if Render is not present.
Composite relies on the presence of Render, in particular for the automatic
compositing.
commit 6ed08949af4f7ac09170d3d9581e4092b24a84ee
Author: Eric Anholt <eric@anholt.net>
Date: Tue Mar 27 17:31:28 2007 -0700
Move libcw setup to the only renderer requiring it (XAA).
Additionally, protect libcw setup behind checks for Render, to avoid
segfaulting if Render isn't available (xnest).
The previous setup was an ABI-preserving dance, which is better nuked now.
Now, anything that needs libcw must explicitly initialize it, and
miDisableCompositeWrapper (previously only called by EXA and presumably binary
drivers) is gone.
commit e76b6349516d5d1c8f7167d6f5419e0d06a546c3
Author: Eric Anholt <eric@anholt.net>
Date: Mon Mar 26 16:04:50 2007 -0700
Fix indentation of fakexa help text.
commit 728ad64d979fd9e5cca28e8c15118c18d707c431
Merge: 0331c6a8fc 6a0bed16e8
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Tue Mar 27 13:16:40 2007 -0400
Merge branch 'master' into XACE-SELINUX
commit 6a0bed16e80a91891cee6c7033c90875bc2af193
Author: Michel Dänzer <michel@tungstengraphics.com>
Date: Tue Mar 27 16:51:12 2007 +0200
Fix typo in GL/mesa/shader/slang/Makefile.am.
commit b8f846a9dfc6697d59ad5482ba7c9d738875318e
Author: Dave Airlie <airlied@linux.ie>
Date: Tue Mar 27 14:17:40 2007 +1000
gl: oops dodgy s appeared pointed out by jcristau on irc..
commit a63ee90bc2d490f6c5c1802c164391963cf6c1d9
Author: Dave Airlie <airlied@pegasus.(none)>
Date: Tue Mar 27 11:05:52 2007 +1000
gl: update for latest mesa glsl-compiler merge
commit d387a3ddf76716791e5e8b8f0954ca0df3c579d6
Author: Dave Airlie <airlied@pegasus.(none)>
Date: Tue Mar 27 11:00:13 2007 +1000
fix loading of GLcore after recent loading changes
commit 92ba435bd9aa7b6eca9aef8e5193576ef62fc9db
Author: Eric Anholt <eric@anholt.net>
Date: Mon Mar 26 12:44:58 2007 -0700
Update xorg.conf manpage for new RandR 1.2 monitor options.
commit 0331c6a8fcba1dc27ef45aaf5f694799d0085413
Merge: 84a066cc88 f7c5aa0dc0
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Mon Mar 26 10:28:05 2007 -0400
Merge branch 'master' into XACE-SELINUX
commit f7c5aa0dc0fa3569a2ee412c4f996960f936b6ed
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Mon Mar 26 10:21:44 2007 -0400
Remove dead NEED_DBE_BUF_BITS code.
commit 2e3cc861f90415f200826bc71dab6298d759c42b
Author: Adam Jackson <ajax@benzedrine.nwnk.net>
Date: Sun Mar 25 22:01:34 2007 -0400
Since ddc, i2c, and ramdac are in core now, remove their ModuleData stubs.
commit e88fa75c9b468b88bb7b87b1da235c6eb2fe8164
Author: Adam Jackson <ajax@benzedrine.nwnk.net>
Date: Sun Mar 18 17:39:08 2007 -0400
Static cleanup on Xi/
commit 4b5802ddbd45271be3cadeae0a83a6742df2515b
Author: Adam Jackson <ajax@benzedrine.nwnk.net>
Date: Sun Mar 25 17:57:54 2007 -0400
General DIX static and dead code cleanup.
commit 04b87d6dfae02e4ecdb5216d12c6cdafd1e8c2b4
Author: Adam Jackson <ajax@benzedrine.nwnk.net>
Date: Sun Mar 25 17:57:22 2007 -0400
Static and dead code cleaup for Xext/
commit af769892a91c9af59de53ca3bcd77fc4967daffb
Author: Adam Jackson <ajax@benzedrine.nwnk.net>
Date: Sun Mar 25 17:56:32 2007 -0400
Static and dead code cleanup from mi/
commit 62224e39727fd6f1cf11a461983662f615a9fea1
Author: Adam Jackson <ajax@benzedrine.nwnk.net>
Date: Sun Mar 25 17:55:15 2007 -0400
Static cleanup for xf86 ddx.
commit e8bc1988d9ff10b65717574175f70df3c4d6334d
Author: Adam Jackson <ajax@benzedrine.nwnk.net>
Date: Sun Mar 25 15:13:05 2007 -0400
Un-staticise VTSwitchEnabled, since kbd wants it apparently.
commit 70e493d223b1e943e652191150bd0b7e1a6ebcfb
Author: Adam Jackson <ajax@benzedrine.nwnk.net>
Date: Sun Mar 25 14:55:28 2007 -0400
Static and dead code cleanup over afb/
commit f36bf1a3e4ce9465ea4a6159c209924a3cafbe58
Author: Adam Jackson <ajax@benzedrine.nwnk.net>
Date: Sun Mar 25 12:28:13 2007 -0400
Delete a dead file.
commit 9a0f25de7ca3c68af867b38936103d17daa92ac6
Author: Adam Jackson <ajax@benzedrine.nwnk.net>
Date: Sun Mar 25 12:27:01 2007 -0400
Static cleanups, dead code deletion.
commit ac2356843e38b3400142bc54b65393c12976fc07
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Sun Mar 25 09:41:33 2007 +0930
dix: Increase allocation size for core keyboard keymap to avoid buffer overrun when copying keymap from extension devices.
commit 5f9c10e8da0d9d96cc00a38cdf9a8c3030063e03
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Sun Mar 25 15:00:03 2007 +0930
Clean up DeviceIntPtr, prepare for Server 1.4 ABI. Move sprite-related
information into a new SpriteInfoRec, remove isMPDev flag.
commit e54311395e1e7ae458c8ce59da0914706c4a04f6
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Sun Mar 25 09:41:33 2007 +0930
dix: Increase allocation size for core keyboard keymap to avoid buffer
overrun when copying keymap from extension devices.
commit 1072b88a8f352484e70bc749e300c936e5600480
Author: Dave Airlie <airlied@linux.ie>
Date: Sun Mar 25 10:06:00 2007 +1000
loader: fix already built-in message
commit 804080a7096347d48c686f2c8fbfd06326bce400
Author: Keith Packard <keithp@neko.keithp.com>
Date: Fri Mar 23 23:41:36 2007 -0700
Make pending properties force mode set. And, remove AttachScreen calls.
Yes, two changes in one commit. Sorry 'bout that.
The first change ensures that when pending property values have been
changed, a mode set to the current mode will actually do something, rather
than being identified as a no-op. In addition, the driver no longer needs to
manage the migration of pending to current values, that is handled both
within the xf86 mode setting code (to deal with non-RandR changes) as well
as within the RandR extension itself.
The second change eliminates the two-call Create/AttachScreen stuff that was
done in a failed attempt to create RandR resources before the screen
structures were allocated. Merging these back into the Create function is
cleaner.
(cherry picked from commit 57e87e0d006cbf1f5b175fe02eeb981f741d92f0)
Conflicts:
randr/randrstr.h
randr/rrcrtc.c
I think master and server-1.3-branch are more in sync now.
commit 1f77120775dc05fc84a00dd55190af2fa50ae509
Author: Keith Packard <keithp@neko.keithp.com>
Date: Fri Mar 23 14:39:10 2007 -0700
Ensure that crtc desired values track most recent mode.
desiredX and desiredY were not recorded during xf86InitialConfiguration.
desiredX, desiredY and desiredRotation were not recorded during
xf86SetSingleMode.
(cherry picked from commit 36e5227215e0912ddf8a010db042467f00efe0fc)
commit 84a066cc88fe4326ddacd04ab5e1158a80571c33
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Fri Mar 23 10:33:53 2007 -0400
xace: pass serverClient as default argument to dixChangeWindowProperty
instead of NullClient.
commit 476f2b5aefa518262b69e487555e6094818d857a
Author: Keith Packard <keithp@guitar.keithp.com>
Date: Fri Mar 23 01:17:14 2007 -0700
Incorrect extra memory copy in RRChangeOutputProperty.
Left over from previous version of the code, this memmove will break when
the mode is not Replace.
(cherry picked from commit 945aa0aa556429b50dea8e8ebc0008304b093eb7)
commit 7093367c3976bef5b9d219d9f2a7dc7dd3eeb091
Author: Keith Packard <keithp@guitar.keithp.com>
Date: Fri Mar 23 01:05:55 2007 -0700
Fix Pending property API, adding RRPostPendingProperty.
Pending Properties take effect when the driver says they do, so provide an
API to tell DIX when a property effect is made. Also, allow driver
to reject property values in RRChangeOutputProperty.
(cherry picked from commit 8eb288fbd69e2ffd02521d2c6a964c8180d08ec8)
commit 86d76390eb182f271f5fa5dc19205e97a867f7e7
Author: Keith Packard <keithp@guitar.keithp.com>
Date: Fri Mar 23 01:03:40 2007 -0700
Make sure RandR events are delivered from RRCrtcSet.
Some paths were skipping the event delivery stage.
(cherry picked from commit 9ca7ba5d6012295a77ed773c656e786440da973d)
commit 510eaa346e68fd82c852c7b41fb0e2c5be12da78
Author: Keith Packard <keithp@guitar.keithp.com>
Date: Fri Mar 23 00:59:11 2007 -0700
Clean up xf86CrtcRec and xf86OutputRec objects at CloseScreen.
Erase pointers to structures which are freed at server reset time.
(cherry picked from commit 492c768065f49306a2194a88edf96b85de0ff4ff)
commit 479b2be4badab0a67b1f091feb83c1364e27d783
Author: Keith Packard <keithp@guitar.keithp.com>
Date: Fri Mar 23 00:57:18 2007 -0700
Clear allocated RandR screen private structure.
Use xcalloc instead of xalloc when allocating this structure to ensure
consistent contents at startup.
(cherry picked from commit 16f4c0c1750824f2e5a001cef82a4122a7a2beb0)
commit b63e0d2545bb75e14d9de019a88f31e20a2f7377
Author: Keith Packard <keithp@guitar.keithp.com>
Date: Tue Mar 20 07:17:27 2007 -0700
Clean up Rotate state on server reset.
The rotation state is stored in the xf86_config structure which is not
re-initialized at server reset time. Clean it up at CloseScreen time.
(cherry picked from commit f8db7665dcd7af78ca4db2461e0bf787ec662cb1)
commit e1cc68add0bcdd5e0e4e15cf6ee8a3da136d3534
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Thu Mar 22 17:33:16 2007 -0400
xace: drop the name argument from the property callback.
commit c9fb8a35332d101897607d8f06ed5a6512eac7cf
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Thu Mar 22 17:23:26 2007 -0400
dix: move access codes to separate header file, add DixCreateAccess.
commit 1b766ffc0647d5e9a9bf6938d33548d977b5535e
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Thu Mar 22 15:55:35 2007 -0400
dix: reorganize property code to better support xace hook; requires new API for
changing a property, dixChangeWindowProperty, taking an additional client argument.
commit 1b58304ac837735920747ed0f0d10ba331bdaeb7
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Thu Mar 22 13:06:50 2007 -0400
xace: add new argument to property hook for property structure itself.
commit 5486be4898766205149fadce71529724eb78fbf3
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Thu Mar 22 10:59:21 2007 -0400
dix: devPrivates support for PropertyRec.
commit f8cd19bd1692d12a6047c088a626a6ae715d469d
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Thu Mar 22 17:47:01 2007 +1030
Xi: add GetClientPointer and GetPointerPairing requests.
dix: use PickKeyboard for ProcSetInputFocus and ProcGetInputFocus instead
of the core keyboard.
commit a3296d111dc4d76aa3afa7e338cbab93eb390ec4
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Wed Mar 21 17:01:26 2007 -0400
xace: add access_mode argument to selection hook.
commit 4c1fb8069d5dd30a73277698503e9dcc2e9d64c6
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Wed Mar 21 16:17:14 2007 -0400
dix: add new selection fields supporting redirection.
This is a minor ABI break.
commit 4fa482b4be1150bcffeabb64d018c00ac5951e41
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Wed Mar 21 14:49:56 2007 -0400
xace: bump major version since the hooks have changed.
commit 9c144f8ac5cea25deaa543767dbaf371d029c608
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Wed Mar 21 14:39:00 2007 -0400
xace: add XACE_SELECTION_ACCESS hook for selection redirection/access.
commit 3e9f7a5504ab41d845e88f293d8498c963d8a7d8
Author: Daniel Stone <daniel@fooishbar.org>
Date: Wed Mar 21 02:35:31 2007 +0200
XFree86 DGA: Guard against NULL pointer dereferences.
Ass, u, me ...
commit f292de2ef13dc994a38029cee9e2642576893332
Author: Daniel Stone <daniel@fooishbar.org>
Date: Wed Mar 21 02:04:12 2007 +0200
XKB: Fix size_syms calculation bug
Apparently it needed to be nSyms*15/10, not *12/10; make it match the
other allocation code.
commit f34b9a20b0181d3c2641c305e91180711afbd4b9
Author: Daniel Stone <daniel@fooishbar.org>
Date: Wed Mar 21 02:03:37 2007 +0200
XKB: Be a tiny bit more conservative with type allocation
Make sure size_types will _always_ be 0 if we don't have any types.
commit 021fc5cb2cb4a7972b4a6fcb570c1da92787d68d
Author: Adam Jackson <ajax@benzedrine.nwnk.net>
Date: Sun Mar 18 16:31:19 2007 -0400
Static markup and dead code cull over xkb/.
The former <X11/extensions/XKBsrv.h> has been pulled into the server now as
include/xkbsrv.h, and the world updated to look for it in the new place,
since it made no sense to define server API in an extension header. Any
further work along this line will need to do similar things with XKBgeom.h
and friends.
commit 9398d62f27ee1b287e4458fd8b011c10f7b59efd
Author: Daniel Stone <daniel@fooishbar.org>
Date: Wed Mar 21 00:18:24 2007 +0200
XFree86 input: Add backwards compatibility for motion history
Add the old motion history API back, as a shim around the new mi API.
commit 0f75c47e0c5f4b2778930a6fabf894fc1dffd9d3
Author: Daniel Stone <daniel@fooishbar.org>
Date: Wed Mar 21 00:12:02 2007 +0200
xfree86 input: Re-enable DGA support
Re-enable DGA support for relative mouse motion.
commit 80d29475b9a2ebbb303a8e324e09a15c528d5556
Author: Daniel Stone <daniel@fooishbar.org>
Date: Wed Mar 21 00:10:38 2007 +0200
mieq: Allow event handlers for arbitrary events to be set
Allow arbitrary events to use mieq by letting custom handlers be set.
commit b8df961843a95b29258ae9c5d46ccfc620d8de1c
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Mon Mar 19 18:03:26 2007 -0700
Define XF86PM on Solaris x86 builds now that we have sun_apm.c
commit 2945deba1d4a7dce4f6dd0c568297a1c537fdfb4
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Mon Mar 19 17:09:10 2007 -0400
xace: drop XACE_WINDOW_INIT hook, it has been superseded by ResourceStateCallback.
commit 78c962da76efe644b8d485265f1ecdda84b45d27
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Mon Mar 19 17:04:51 2007 -0400
xselinux: use the new ResourceStateCallback instead of the XACE_WINDOW_INIT hook.
commit 6a89106e9c963a495fd40427d242ba0abd44f764
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Mon Mar 19 16:51:29 2007 -0400
xselinux + security: remove confusing CALLBACK macro.
commit 0acf993e2878d0866fd4e2db8252c1ea6841e494
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Mon Mar 19 16:11:01 2007 +1030
dix: Move sprite initalization/pairing from ActivateDevice to
EnableDevice.
zero out spriteTrace, otherwise GetCurrentRootWindow() may return
invalid data.
Evdev adds previously hotplugged devices on its own when rescanning,
and ActivateDevice does not get called for those devices. Sprites need
to be initialized or paired before the device gets started, so the
safest place to do so is EnableDevice (which actually does get called
by the evdev driver).
commit 015d728bcde5b16a72a976579755421e3023626b
Merge: 65b0eb60b0 b167583fe2
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Mon Mar 19 09:42:56 2007 +1030
Merge branch 'master' into mpx
Conflicts:
dix/devices.c
dix/events.c
mi/misprite.c
commit 720f302d241e88e6e9f2962207da1aa9a79728b7
Author: Keith Packard <keithp@neko.keithp.com>
Date: Sat Mar 17 20:14:05 2007 -0700
Slow down DDC I2C bus using a RiseFallTime of 20us for old monitors.
This time value makes the bus run slowly enough for even the least reliable
of monitors. Thanks to Pavel Troller for finding the necessary change.
commit b5a8a71e64c76b8dd42962cbd7984215c6ce4aa8
Author: Keith Packard <keithp@neko.keithp.com>
Date: Sat Mar 17 17:26:11 2007 -0700
Remove extra (and wrong) I2C ByteTimeout setting in DDC code.
The DDC code sets the I2C timeouts to VESA standards, except that it had an
extra setting of the ByteTimeout value which was wrong (off by a factor of
50). Removing this should help DDC work on many more monitors. Note that the
Intel driver duplicated these settings, along with the error. Yay for cult
and paste coding.
commit 2489dae9f7def788910eee5733931392df83a0d6
Author: Keith Packard <keithp@guitar.keithp.com>
Date: Thu Mar 15 20:26:07 2007 -0700
Correct ref counting of RRMode structures
RRModes are referenced by the resource db, RROutput and RRCrtc structures.
Ensure that the mode reference count is decremented each time a reference is
lost from one of these sources. The missing destroys were in
RRCrtcDestroyResource and RROutputDestroyResource, which only happen at
server reset time, so modes would be unavailable in subsequent server
generations.
commit 9d0c3b52f25df89738fb1a62ccffda8c8cbb4689
Author: Keith Packard <keithp@guitar.keithp.com>
Date: Tue Feb 20 23:04:26 2007 -0800
Eliminate RRModeRec devPrivate field.
The xf86 mode setting code was mis-using this field to try and store a
pointer to a DisplayModeRec, however, each output has its own copy of every
DisplayModeRec leaving the one in in the RRModeRec devPrivate field pointing
at a random DisplayModeRec.
Instead of attempting to rectify this, eliminating the devPrivate entirely
turned out to be very easy; the DDX code now accepts an arbitrary RRModeRec
structure and set that to the hardware, converting it on the fly to a
DisplayModeRec as needed.
(cherry picked from commit 3506b9376c2b0db09bfff58d64e07af88a6e8195)
commit 2c93083edd29a65e73bb2e8eff9d353e92845c9b
Author: Keith Packard <keithp@guitar.keithp.com>
Date: Sun Feb 18 23:49:38 2007 -0800
Add support for user-defined modelines in RandR.
The RandR protocol spec has several requests in support of user-defined
modes, but the implementation was stubbed out inside the X server. Fill out
the DIX portion and start on the xf86 DDX portion. It might be necessary to
add more code to the DDX to insert the user-defined modes into the output
mode list.
(cherry picked from commit 63cc2a51ef87130c632a874672a8c9167f14314e)
Conflicts:
randr/randrstr.h
Updated code to work in master with recent security API changes.
commit b167583fe234a536aa6187e17f21da85be4f0b7f
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Wed Nov 15 17:50:02 2006 +1030
o fix minor error in comment for GetPointerEvents()
commit 65b0eb60b0b9e6405aa2e3d4c712ec4d2f0da070
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Fri Mar 16 15:52:24 2007 +1030
Xi: move IsPointerDevice into dix.
dix: IsPointerDevice and IsKeyboardDevice, use same ways to identify type
of device as XI does for the XListInputDevices reply.
Autopair each non-pointer device with VCP when activating, pair with
real device after activation.
Don't return non-keyboard devices when calling GetPairedKeyboard or
PickKeyboard, otherwise we segfault for 'evdev brain'.
commit 3bffb281260476d2f74f0bf451d85d2f7cacd6c4
Author: Keith Packard <keithp@neko.keithp.com>
Date: Thu Mar 15 16:16:16 2007 -0700
Don't wedge when rotating more than one CRTC.
Rotation block handler was re-registering the rotation damage structure,
creating an infinite loop in the damage code. Track registration of the
damage structure to avoid this.
(cherry picked from commit b14f003b0ed1252766c9e3b1c086ea2809521047)
commit 9562b6abe1da566cf73a08c4f4c4339fb67fbc71
Author: Keith Packard <keithp@neko.keithp.com>
Date: Thu Mar 15 10:50:45 2007 -0700
Allow xf86_reload_cursors during server init.
xf86_reload_cursors is supposed to be called from the crtc mode setting
commit hook; as that happens during server initialization, check for this
case.
(cherry picked from commit 5b77bf2d020b1ee56c1c5f2db089a8f7f64a76a6)
commit 3b71b0f89f1db837da91650baa0ef4bb7ef2e98f
Author: Eric Anholt <eric@anholt.net>
Date: Thu Mar 15 13:21:00 2007 -0700
Set the RandR version returned, rather than just passing the proto's version.
commit 2fe74ef339c3a4902ae8214f5a0454662895422c
Author: Matthias Hopf <mhopf@suse.de>
Date: Thu Mar 15 16:56:01 2007 +0100
Fix calculations in x86 emulator for the long long case (Andreas Schwab).
commit 456f429ad655ab4d80e30c58291d801966a613b2
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Thu Mar 15 21:48:19 2007 +1030
dix: fix: don't return when device is same as argument.
fix: set access default rule to 0 on init.
commit ae75019ccf1edac9e8be31b6a96293624f672ccb
Author: Keith Packard <keithp@guitar.keithp.com>
Date: Wed Mar 14 23:59:29 2007 -0700
Create driver-independent CRTC-based cursor layer.
This moves most of the cursor management code out of the intel driver and
into the general server code. Of course, the hope is that this code will be
useful for other driver writers as well.
Check out xf86Crtc.h for the usage information, making sure you add the
needed hooks to the crtc funcs structure for your driver.
(cherry picked from commit 4d81c99a4660a0bf9014f789de55edabd185bd14)
commit c5b07fb717289f61b54d7b093421bcb92124b839
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Wed Mar 14 17:42:30 2007 +1030
kdrive: update kdrive to new mi API with additional device argument. Includes
an update of ati_cursor.c and i810_cursor.c
commit c3eb248cf93a3afd9168acfb88254606beddd7a8
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Wed Mar 14 13:21:33 2007 +1030
dix: fix: don't skip first item in list when seeking for a device cursor.
commit ce9409acebd994cf1809050f2cc8e1db66130f12
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Tue Mar 13 19:16:56 2007 +1030
dix: Get the state from the paired device and the real device to fill the
state field in the event, rather than using the virtual devices.
ProcessPointerEvent: name argument "device" instead of "other".
Add GetPairedKeyboard().
commit 4bf1b280f7cb676ec2b172f26dd2ad9bac2eb2ca
Author: Alan Hourihane <alanh@fairlite.demon.co.uk>
Date: Fri Mar 9 14:18:14 2007 +0000
Set pScreen on context
commit c366b82bd50066019cf82b3464445d5bc27d6f9f
Author: Jay Estabrook <Jay.Estabrook@hp.com>
Date: Fri Mar 9 12:26:55 2007 +0000
Ensure domain is stripped from the bus ID.
commit 577464af4362e5a32cf7165b5128655dd86c6200
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Fri Mar 9 17:13:05 2007 +1030
dix: restore commit b3b2a6a0d43d1724e04d69588f8a55c3270e5523 that for some
reason got wiped.
fix ProcGrabKeyboard to use PickKeyboard
fix PickKeyboard to actually work.
commit 07806f4081f8dcd3b5733b590eb6e5b4cae734ad
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Fri Mar 9 15:45:25 2007 +1030
Xi: Add SetClientPointer request handling.
commit 405483496538f1c82cbd7fe1e76c5d94e1a90525
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Fri Mar 9 14:16:23 2007 +1030
mi: remove 'register' keywords.
commit fe05ba75a10ec080e7ec34bff6936103185586b3
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Thu Mar 8 12:14:30 2007 -0500
devPrivates rework: pass address of pointer to private callbacks instead of
the pointer itself.
commit 18339375cd332f0ab1cbdade3dcd9140212ce1ca
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Thu Mar 8 12:14:06 2007 -0500
xselinux: remove context validation function for now.
commit b9cff1670f29949a5bc41afc19aca443f434febb
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Thu Mar 8 12:13:52 2007 -0500
Add ResourceStateCallback similar in function to ClientStateCallback.
commit 2fcb45eb5dc1803b372df8b5765f6a43bea83611
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Thu Mar 8 12:13:36 2007 -0500
devPrivates rework: redo field offset registration, drop RC_PRIVATES class.
commit 947f8d249bac61beb10669d935888c4c280b5062
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Thu Mar 8 12:13:18 2007 -0500
devPrivates rework: redo interface again, dropping parent and type parameters
as well as preallocation routine.
commit c45f6762080ef00b41d9f73441a9f0e605253008
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Wed Mar 7 11:22:42 2007 -0500
devPrivates rework: hook up new mechanism in backwards-compatibility mode
on existing structures that support devPrivates.
commit b3b2a6a0d43d1724e04d69588f8a55c3270e5523
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Thu Mar 8 22:16:17 2007 +1030
dix: Check if client has a grab on any other device before mouse/kbd
event is delivered to the client. Client's don't cope well with
receiving core events from other devices when having a grab on a
pointer or keyboard.
commit 63169ce52d354b4345dcfc46b89f0ea88379718f
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Thu Mar 8 17:50:19 2007 +1030
dix: remove 'register' keyword for all variables.
commit ceca5670fee99b5feceaa2453f1ac32d1bfe7dcd
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Thu Mar 8 17:17:23 2007 +1030
dix: Each device needs to differ between a core grab and an XI grab,
otherwise a Xi grab may overwrite or release a core grab.
Replace grab and associates with coreGrab and deviceGrab structures,
adjust rest of dix/Xi/etc to compile.
xfree86: Don't check for core devices, we'll have the virtual ones anyway.
If we check, the first mouse device is duplicated and sends
double events.
commit 40ae4f246d8818410490236ab183204a84765629
Author: Keith Packard <keithp@guitar.keithp.com>
Date: Wed Mar 7 20:52:31 2007 -0800
Remove stale monitor data when output becomes disconnected.
Remove parsed EDID and EDID property from disconnected outputs.
(cherry picked from commit ae9d5aa479dd50cc81b755079fcf96a0d02f135a)
commit b5fde366e2e21234ac0b81222fd5c42ca3e49cba
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Wed Mar 7 12:29:55 2007 -0500
Properly free device devPrivates - memory leak fix.
commit a3d2c5d622d9ca36d6fa2966aff09524e3ea39ac
Author: Adam Jackson <ajax@benzedrine.nwnk.net>
Date: Wed Mar 7 11:02:47 2007 -0500
XORG_VERSION_CURRENT, not XF86_VERSION_CURRENT.
If only this was the least wrong thing in this code.
commit aaef4d6a4121d9341b670a0ce8fabc3b491049cf
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Wed Mar 7 09:57:02 2007 -0500
devPrivates rework: move reset functions into a single call.
commit bb111291d854b4329e47367ce3c67e8a2785e6e9
Merge: 74175e0af7 e9bfb2b3d7
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Wed Mar 7 09:03:46 2007 -0500
Merge branch 'master' into XACE-SELINUX
commit 537bc2ead4d154552cbdc3a19e335f82af63792c
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Wed Mar 7 18:19:20 2007 +1030
Xi: Don't deactivate core grabs from non-core button/key releases.
dix: set coreGrab flag for grabs caused by GrabPointer and button presses.
remove virtual core devices from device list, only real devices are in
the list now.
Auto-pair each keyboard with a real pointer if one is available,
provides multiple keyboards automatically after startup if devices
are configured.
fix GuessFreePointerDevice() to do what it's supposed to do.
mi: fix: call miPointerMove from miPointerWarpCursor.
fix: remove unused id field from miCursorInfoRec
don't update sprite for virtual core pointer.
commit e9bfb2b3d7dfaafd90d2ad0fa3d0e1acced4380b
Author: Keith Packard <keithp@neko.keithp.com>
Date: Tue Mar 6 23:19:30 2007 -0800
Add hw/xfree86/docs/README.modes, documenting new mode setting APIs.
This document covers both API and xorg.conf usage of the new mode setting
APIs.
(cherry picked from commit a59c31b0f7b94ed1f395c7586c37ef5fe7ba2a25)
commit 72a23d88d73a8c72ed18847b004db05092d3e7be
Author: Keith Packard <keithp@guitar.keithp.com>
Date: Tue Mar 6 23:15:34 2007 -0800
Add xf86CrtcScreenInit to share initialization across drivers.
xf86CrtcScreenInit performs initialization that needs to happen at
ScreenInit time.
(cherry picked from commit 558a4f5588ad2ec11254e0b5d6ce9515b137369e)
commit 81526232bc0119d2ec7b8590be4f78cf066ae359
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Tue Mar 6 17:19:11 2007 -0500
remove PIXPRIV check as this flag is always set.
commit a7cd53deb99957dec27a55ffd75e548b322ae0ce
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Tue Mar 6 15:32:13 2007 -0500
remove PIXPRIV checks as this flag is always set.
commit 024bbc7cbb924daaf3e305ddfc8e74509acd1e15
Author: Eric Anholt <eric@anholt.net>
Date: Tue Mar 6 16:18:59 2007 -0800
Bug #9931: Fix linear allocations with a non-1-byte granularity.
This was introduced in 83080809f9a1c1d24b0318e54632f25f5940da25. Instead of
aligning the offset, it doubled it. Results were appropriately spectacular.
commit 9d94c137596d3f9d9118ec70455b7a30b3582046
Author: Ben Byer <bbyer@apple.com>
Date: Tue Mar 6 11:09:30 2007 -0800
updated todo list
commit 81d581e655fc989da3be4256b83849a63b8607b7
Merge: a05ffca8dd d5aba03fef
Author: Ben Byer <bbyer@bbyer.(none)>
Date: Tue Mar 6 10:37:29 2007 -0800
Merge branch 'master' of git+ssh://bbyer@git.freedesktop.org/git/xorg/xserver
commit a05ffca8dd0da9bdb5c1bf4c481028aeabf21e34
Author: Ben Byer <bbyer@bbyer.(none)>
Date: Tue Mar 6 10:36:51 2007 -0800
rewrote event handling, Xquartz now has working mouse and keyboard. use it\!
commit d5aba03feff41722c72b4c6193f09d141cbf1678
Author: Drew Parsons <dparsons@debian.org>
Date: Tue Mar 6 23:53:23 2007 +1100
Xprint: shorten font filename to fit in tar length limit
The length of the Xprint font file NewCenturySchlbk-BoldItalic.pmf
pushes the full path over the traditional 100 character limit for
tarballs (when module version number is included). Shorten it to
NewCentSchlbk-BoldItal.pmf to get back below the limit and rename
other font files in that family to match.
commit 3206e9225897989638ad553e1f392b918ac4d21f
Author: Ben Byer <bbyer@bbyer.(none)>
Date: Tue Mar 6 02:31:59 2007 -0800
moved new event-handling code from X11Application.m to darwinEvents.c in preparation for making all Darwin servers use it
commit 0ccd1443fd6db397b42e5b99ce733ce1316c785e
Merge: ec1ef8a56d 9b6bb06f13
Author: Ben Byer <bbyer@bbyer.(none)>
Date: Tue Mar 6 01:04:50 2007 -0800
Merge branch 'master' of git+ssh://bbyer@git.freedesktop.org/git/xorg/xserver
commit ec1ef8a56d6217ca2b04899043874ce0bcad9784
Author: Ben Byer <bbyer@bbyer.(none)>
Date: Tue Mar 6 00:57:23 2007 -0800
Fixed Darwin's Makefile.am to fix a problem building X11.app
commit 9b6bb06f13a71f6078f762b4a78fa516faccb638
Author: Keith Packard <keithp@guitar.keithp.com>
Date: Mon Mar 5 23:49:35 2007 -0800
Allow relative positions to use output names or monitor identifiers.
Previous version used monitor identifiers if present, otherwise output
names. That caused existing working configurations to break when additional
information was added to the configuration file.
(cherry picked from commit 3f5cedf00a82f08a433c95ffbb7f8ac69dcf6a50)
commit bed76caa6caaea6a6598755b82a54425a9d9f73e
Author: Keith Packard <keithp@guitar.keithp.com>
Date: Mon Mar 5 23:36:00 2007 -0800
Use EDID data to set screen physical size at server startup.
Screen physical size is set to a random value before the RandR code gets
control, override that and reset it to a value based on the compat_output
physical size (if available). If that output has no physical size, just use
96dpi as the default resolution and set the physical size as appropriate.
(cherry picked from commit 843077f23a1b49bd712d931421753e3a09d4008c)
commit 47f8361c3a64834587e54507653d8d5b258c2530
Author: Keith Packard <keithp@guitar.keithp.com>
Date: Mon Mar 5 22:07:01 2007 -0800
Add xf86SetDesiredModes to apply desired modes to crtcs.
xf86SetDesiredModes applies the desired modes to each crtc (as selected by
xf86InitialConfiguration initially and modified by successful mode settings
afterwards). For crtcs without a desired mode, pScrn->currentMode is used to
select something workable.
(cherry picked from commit bcade98ccaa18298d844a606cb44271f0254c185)
commit 33d2cf93fb50464941e74efe246b10aee212223a
Author: Keith Packard <keithp@neko.keithp.com>
Date: Sat Mar 3 23:10:31 2007 -0800
Move xf86SetSingleMode into X server from intel driver.
This function applies a single mode to the screen (as from RandR 1.1,
XFree86-VidModeExtension or XFree86-DGA) using a policy that selects one
output to reconfigure to the requested mode and then makes all other outputs
fit within that size.
(cherry picked from commit 5a595c1f767a8d666348b845d18934aee0cfe38f)
commit 689d52b6242434507a64a8fff27b01607628c393
Author: Jens Granseuer <jensgr@gmx.net>
Date: Mon Mar 5 15:31:44 2007 -0800
Bugzilla #7145: fix build with gcc 2.95
Bugzilla #7145: <http://bugs.freedesktop.org/show_bug.cgi?id=7145>
Patch #8987: <http://bugs.freedesktop.org/attachment.cgi?id=8987>
commit 74175e0af74c530cb712a6772d3c5d61d1be9748
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Mon Mar 5 12:34:37 2007 -0500
devPrivates rework: remove some debugging code from dixFreePrivates.
commit 23fc429aad5b2721911862617772c314e1036bb0
Merge: e684824709 fe7b8f4237
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Mon Mar 5 12:18:54 2007 -0500
Merge branch 'master' into XACE-SELINUX
commit e684824709fa8ffe03dde3c8dfbc58c267515a4f
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Thu Mar 1 15:00:02 2007 -0500
devPrivates rework: redo interface and implementation.
commit fe7b8f4237874e3e45fe25a6bf06faddfa1ab8e1
Author: Ben Byer <bbyer@bbyer.(none)>
Date: Mon Mar 5 03:48:27 2007 -0800
began to factor out code to move to darwinEvents.c
commit 537dc5ecde46d0525c503d1d2b39b6eb89a1298e
Author: Ben Byer <bbyer@bbyer.(none)>
Date: Mon Mar 5 02:30:56 2007 -0800
started moving new input code into darwinEvents.c so that it may be shared by the three servers
commit 39aa79177196e21bcdbaf8e44adead9ef91e6ee5
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Mon Mar 5 15:31:16 2007 +1030
dix: Add GuessFreePointerDevice(). Runs through device list and tries to
find a pointer that hasn't been paired yet.
xfree86: Use GuessFreePointerDevice() for newly connected non-sprite devices.
commit 8ba5e8d82014b774a52f3e050ddbbb8bde4e0933
Author: Dave Airlie <airlied@linux.ie>
Date: Mon Mar 5 13:46:41 2007 +1100
add a standard connector type and name for us as an output property
commit 2e31872e05c2408d53ba0182bcddc5dabb3615fe
Author: Dave Airlie <airlied@linux.ie>
Date: Mon Feb 26 09:40:00 2007 +1100
modes: add commit/prepare hooks
commit 1f0075786fedde538a95e2f39681052e25021d88
Merge: 57aa5e908d 12175b668a
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Mon Mar 5 12:37:17 2007 +1030
Merge branch 'master' into mpx
Conflicts:
configure.ac
dix/getevents.c
hw/xfree86/ramdac/xf86Cursor.c
mi/mipointer.c
xkb/xkbUtils.c
commit 06b01186f6ae17aafdd1f628c306466ddea9e065
Author: Keith Packard <keithp@neko.keithp.com>
Date: Sun Mar 4 17:15:24 2007 -0800
Remove debugging ErrorF from rotation code.
(cherry picked from commit e6af7569f201842b4754aec6e72b30dc2daefdfb)
commit c14507b6837387d867792a24778786311b2b38d5
Author: Keith Packard <keithp@neko.keithp.com>
Date: Sun Mar 4 17:06:37 2007 -0800
Handle non-zero origin rotated crtc. Damage crtc area on re-rotate.
Box transformation from source to dest area was broken, leaving the wrong
areas painted when the crtc origin was non-zero.
When rotating from left to right, the pixmap doesn't get reallocated, and so
no damage was left in the pixmap from xf86RotatePrepare. Separately damage
the whole crtc area when this occurs to repaint the area.
(cherry picked from commit 2a50ca2160bc05af1c24421ec079e902ff730277)
commit 97978b515b7af5fbaaa32b1729e835f3bfb9f5c6
Author: Drew Parsons <drew@pug.localdomain>
Date: Sun Mar 4 16:28:54 2007 +1100
Xprint: fix font symlinks
Change symlinks to Xprint base fonts in model/PSdefault using local
relative links. This facilitates moving the Xprint config files, for
instance for FHS compliance placing data files in /usr/share rather
than /usr/lib. Also ensures NewCenturySchlbk-BoldItalic.pmf is
installed.
commit 215e3691b76a63e6af19865790193b20b105ec5a
Author: Ben Byer <bbyer@xyzzy.local>
Date: Sat Mar 3 21:52:56 2007 -0800
stopped using XTrans internals in X11.app because they're apparently no longer public
commit ea8dcc458ea8870126cf8d3e21cab9d63d094c5e
Author: Ben Byer <bbyer@xyzzy.local>
Date: Sat Mar 3 21:51:20 2007 -0800
Makefile fix for X11.app
commit 18508212599bf0964c450c69b9790208e5d428be
Author: Ben Byer <bbyer@xyzzy.local>
Date: Sat Mar 3 21:41:33 2007 -0800
fixed X11.xcodeproj to get CFLAGS and LDFLAGS from autoconf script
commit 7f2b9f3790456044d01bf8e6404f9a1239b41da6
Author: Ben Byer <bbyer@xyzzy.local>
Date: Sat Mar 3 19:27:53 2007 -0800
autoconf fixes for XDarwin (created DARWIN_LIBS)
commit 12175b668a94e23994f724b366a691ec312cce69
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Wed Nov 15 17:50:02 2006 +1030
o fix minor error in comment for GetPointerEvents()
commit ea1a72946d1aa4c256e6afb9d834c582ba4ac3a1
Author: Aaron Plattner <aplattner@nvidia.com>
Date: Wed Feb 28 14:26:47 2007 -0800
Add a canGrow argument to xf86InitialConfiguration.
canGrow indicates to the DDX that the driver can enlarge the desktop via the
xf86_config->funcs->resize hook. If so, xf86InitialConfiguration will set
virtual[XY] to match the configuration it chooses and will leave the crtc config
size ranges alone. If FALSE, it will bloat the screen to fit the largest probed
mode and also set the crtc config max size to limit the desktop to the initial
virtual[XY] size.
commit 04d15da95d608766c7832a7aa881be499c1395ba
Author: Aaron Plattner <aplattner@nvidia.com>
Date: Wed Feb 28 13:36:58 2007 -0800
Add a screen resize hook to xf86CrtcConfigRec.
This hook is called when the DDX needs to resize the screen. The driver is
responsible for changing virtualX and virtualY, along with any other related
screen properties (devPrivate.ptr, devKind, displayWidth, etc.).
Use the size range from the crtc config instead of randrp->virtual[XY] when
reporting the min and max screen sizes to the DDX.
commit b11dfac287d65de7b83f63749087cba4e8ddaf4a
Author: Matthias Hopf <mhopf@suse.de>
Date: Fri Mar 2 12:30:26 2007 +0100
Legacy framebuffer support wasn't compiled if Xorg wasn't explicitly enabled.
commit 57aa5e908dc11d5d8c27ed705c526f1416c1e8ad
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Fri Mar 2 17:14:37 2007 +1030
dix, Xext, Xtrap, Xi: replace inputInfo.pointer with PickPointer where
possible. More replacements to come.
commit e43b8a4e40991ca6e545bda4cf9b9bd7a2bf22e2
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Fri Mar 2 15:21:46 2007 +1030
dix: Add ClientPointer to client, used for picking which pointer to use in
ambiguious request. PickPointer and PickKeyboard are used for getting
the appropriate pointer when situation is unclear.
Fix some issues with InitializeSprite.
dix, xfree86: Remove last traces of InitSprite.
commit 2dafc46e3d814e02b25e5a2fa2e931f0257402a8
Author: Ben Byer <bbyer@bbyer.apple.com>
Date: Thu Mar 1 17:44:39 2007 -0800
Fixed pointer events in Xquartz -- Keyboard events work, but
the keycodes are incorrect.
commit 74f1de1de9633119c2cf26086875717181c8a6f7
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Thu Mar 1 12:07:33 2007 -0500
devPrivates rework: unhook resource system; will try a different approach.
commit 39ecd6fff4f946deebe310b4b26b171c842db223
Author: Ben Byer <bbyer@bbyer.(none)>
Date: Thu Mar 1 01:45:19 2007 -0800
Rewrote parts of the Xquartz event-handling code (thanks daniels and whot!)
It should still be considered a work in progress, but mouse events almost work.
commit ed7ccc481ad1caaa518cafe944c2327a5d0b6c65
Author: Ben Byer <bbyer@bbyer.(none)>
Date: Thu Mar 1 00:51:10 2007 -0800
AIGLX support for Darwin -- works well enough to run
glxgears and glxinfo, but still needs more testing.
commit 43bd35fcf85b51b7e5714844bade90184dbd746f
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Thu Mar 1 17:19:37 2007 +1030
dix: Remove InitSprite, work can be done by InitializeSprite.
Free sprite struct if a spriteOwner is paired.
xfree86: Use PairDevices instead of passing booleans around when creating a
sprite.
Xext: Switch back to using LookupPointer/KeyboardDevice instead of
inputInfo.xyz.
commit 90ca76ba28fcd8bed945e33cf9674784fa2eb533
Author: Jay Cotton <jay.cotton@sun.com>
Date: Wed Feb 28 17:40:58 2007 -0800
Add sun_apm.c for Suspend-and-Resume support on Solaris
<http://bugs.opensolaris.org/bugdatabase/view_bug.do?bug_id=6205248>
commit 06c3021aec720837bef432656e88ae9b4e35101d
Author: Aaron Plattner <aplattner@nvidia.com>
Date: Wed Feb 28 16:09:11 2007 -0800
Don't crash setting a NULL mode with a randr classic DDX. Also remember to update the screen size during modesets.
commit 68c64ad7b1eea79c786b5a7f3459076780163a47
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Thu Mar 1 09:51:20 2007 +1030
Xext: Update device's lastx/lasty when sending a motion event with XTest.
commit 8b245758845523d5f8f017bb9d0e9aa57b616c28
Author: Aaron Plattner <aplattner@nvidia.com>
Date: Mon Feb 26 17:45:40 2007 -0800
Return BadMatch if a client tries to clone non-cloneable outputs.
commit 2a35d44b6d87f96a7ce90dc8f0142f48cc176e95
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Wed Feb 28 15:43:06 2007 +1030
Update device valuators on XTest motion event, otherwise the cursor jumps
between coordinates stored in device and coordinates sent by the event.
commit d9bcb22d199e8444b9762a35754e04d327dd5915
Merge: 272d9341d0 c16343ac2c
Author: Ben Byer <bbyer@bbyer.apple.com>
Date: Tue Feb 27 16:28:20 2007 -0800
Merge branch 'master' of git+ssh://bbyer@git.freedesktop.org/git/xorg/xserver
commit 272d9341d0f7c3e9e0c9b9a8c0d4d8779cdcc5cf
Author: Ben Byer <bbyer@bbyer.apple.com>
Date: Tue Feb 27 16:27:26 2007 -0800
fix for hw/darwin/Makefile.am to properly use XSERVER_LIBS
commit c16343ac2ca18391b21022b2edd02ad9f413d2b3
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Tue Feb 27 14:14:47 2007 -0500
Make mfb, cfb, and afb support configurable at build-time.
commit 5680efc0d2baf0a9451e82e490e3690fc23dda0f
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Tue Feb 27 09:55:48 2007 -0800
Sun bug 6529003: Xorg should not be including <sys/immu.h> on Solaris
<sys/immu.h> was removed from the latest Solaris Nevada build, but it's
been useless to Xorg for a long time (it only declared a couple of kernel
variables)
<http://bugs.opensolaris.org/view_bug.do?bug_id=6529003>
commit ab0fc8c1ad7ea2dc3389a4a4bb1c45bbded5e7ad
Author: Ben Byer <bbyer@bbyer.(none)>
Date: Tue Feb 27 00:14:35 2007 -0800
verbiage corrected per daniels
commit cdd4c84572cc3bdd004f8dca6d8b64e710344ac0
Author: Ben Byer <bbyer@bbyer.(none)>
Date: Mon Feb 26 23:57:02 2007 -0800
added hw/darwin/README.apple file with some todo items and props.
commit 776d4d6587c57f94bca8732f915d07a0d4e137c8
Author: Ben Byer <bbyer@bbyer.(none)>
Date: Mon Feb 26 23:40:00 2007 -0800
X11.app now builds correctly
commit 154d2c13f4ec22b7e6332808bbcd049d63784891
Author: Ben Byer <bbyer@bbyer.apple.com>
Date: Mon Feb 26 19:39:26 2007 -0800
more changes for X11.app
commit fa06e11f972e2a75c84b2f1586997ffc1239cbd9
Author: Ben Byer <bbyer@bbyer.apple.com>
Date: Mon Feb 26 17:06:53 2007 -0800
added hw/darwin/apple directory, which contains source and data files to build
a version of the X11.app shipped with Mac OS X, using the X.org server.
commit a16360733ea393ec1fc267e88fc604d9d7534484
Author: Jay Estabrook <Jay.Estabrook@hp.com>
Date: Sun Feb 25 19:58:26 2007 +0000
Fix root bus/domain selection on alpha
commit 566610680c4e1cab3e7fc7146adbeaba52fdd0ad
Author: Adam Jackson <ajax@benzedrine.nwnk.net>
Date: Fri Feb 23 15:20:35 2007 -0500
Don't install libi2c.a
commit 81372f9096b952f4be545654b0b44ac37ef4f2c2
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Fri Feb 23 13:23:12 2007 -0500
devPrivates rework: hook up new interface in resource system; add new
resource-adding function that takes an additional ScreenPtr argument.
commit 16f2b8892d9ebcef6410a675d10549043223f617
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Fri Feb 23 13:20:43 2007 -0500
devPrivates rework: add new interface implementation.
commit 779faccfb78648a9f7e70b77dcfa9f6e19559772
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Fri Feb 23 13:19:53 2007 -0500
devPrivates rework: add dix header file containing new interface.
commit bc4ae25433e38a25a2012f9f233d500665172a4b
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Fri Feb 23 12:06:51 2007 +1030
xfree86: Don't initialize sprites for devices that don't own a sprite (stops
keyboard hotplug segfaults)
commit af550ea91c451cf4f831c2413266a19d1f211d0e
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Thu Feb 22 14:38:40 2007 -0800
Move SecurityPolicy file format from Xserver(1) to it's own man page
Don't make users looking for Xserver information page through pages of
details only interesting to the handful of people writing security policies.
commit b1142cdbce76fed8cb22ba6d7ac027751dd56a76
Author: Brice Goglin <brice.goglin@ens-lyon.org>
Date: Thu Feb 22 12:26:04 2007 -0800
Bug #10034: 'man Xserver' typos: s/dqoute/dquote/
Bugzilla #10034: <http://bugs.freedesktop.org/show_bug.cgi?id=10034>
Patch #8780: <http://bugs.freedesktop.org/attachment.cgi?id=8780>
commit 4b8b0e377a27ec904b2028c89aed11c6416af26c
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Thu Feb 22 20:00:59 2007 +1030
Xi: Add access control request handling.
dix: New file access.c to handle all access control for devices.
commit 9a3eb0357e779d5d5f76858f23667956c4c5d721
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Fri Feb 16 19:30:03 2007 -0500
devPrivates rework: add RC_PRIVATES class, make ResourceRec visible in
the API, and add extra fields and structure supporting private storage.
commit cd0af7a7856e8246e27acc5513d219a094211625
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Wed Feb 21 10:08:41 2007 +1030
Xi, dix: Only one client at a time can change the pointer-keyboard pairing,
using xRegisterPairingClient request.
commit 3344a4eda704edc7dc30037f095de277a60a70bb
Author: Michel Dänzer <michel@tungstengraphics.com>
Date: Thu Feb 15 16:27:50 2007 +0100
DRI: Make sure number of DRI windows is accurate in driver ClipNotify hook.
Always call DRI{De,In}creaseNumberVisible (which in turn calls
DRIDriverClipNotify) after updating pDRIPriv->nrWindows.
commit 3c7a27dc77595ad018bb7c4f7cef6bc178268cb6
Author: Michel Dänzer <michel@tungstengraphics.com>
Date: Wed Feb 14 16:17:18 2007 +0100
DRI: New ClipNotify driver hook.
The hook is called whenever the clipList of any DRI window changes, be it via
DRIClipNotify, DRICreateDrawable or DRIDrawablePrivDelete. This allows the
driver to keep track of which DRI windows are visible where.
commit eedf148e5a1273ebbf4dc8dcac9c435712fc00ea
Author: Michel Dänzer <michel@tungstengraphics.com>
Date: Fri Feb 2 18:27:40 2007 +0100
Track number of visible DRI windows separately for transitions.
This allows e.g. doing page flipping with multiple DRI windows as long as
only one of them is visible.
commit 8a42af6a935b1cf0e15102e986bb527f4fab31a8
Author: Keith Packard <keithp@neko.keithp.com>
Date: Mon Feb 19 15:28:37 2007 -0800
Check for clientGone before sending events from XFixes (bug #1753).
Freeing resources during client closedown can cause cursor changes which
attempt to send cursor events through the XFixes extension; a client in the
process of closing down has no file to send events to, causing a crash when
this path is hit.
commit 4660eaaffb36f526f71d5847ae1309c10ee133c6
Author: Ben Byer <bbyer@bbyer.(none)>
Date: Sun Feb 18 14:09:51 2007 -0800
configure fixes for darwin
commit 5631a67f648f5f151a849a918ee12871c71c32e9
Author: Keith Packard <keithp@neko.keithp.com>
Date: Fri Feb 16 10:06:22 2007 -0800
Don't set subpixel order during startup; the screen won't be ready.
in xf86CrtcSetMode, scrn->pScreen will be NULL during server startup time,
so don't try to set the subpixel order. subpixel order will be set in the
randr initialization anyways.
(cherry picked from commit 5f6f8616d862ce4a37f6d3df4bdbc44fd21cc82a)
commit 096965ec9c7514f0c9fc0d17e5166f2d26781f87
Author: Keith Packard <keithp@guitar.keithp.com>
Date: Fri Feb 16 02:17:11 2007 -0800
Ensure drivers can use new modes header files.
New modes header files required a few minor changes to be used by external
drivers, the most notable of which is the publication of the config file
parser header files.
commit 55797dd252382d35ebab5d9e18a5e0e77872d775
Author: Keith Packard <keithp@guitar.keithp.com>
Date: Fri Feb 16 00:56:00 2007 -0800
Respect rotation in initial screen size computation.
commit e4507825bf0328ea59673f2bbe652de3a9105c86
Author: Keith Packard <keithp@guitar.keithp.com>
Date: Fri Feb 16 00:41:29 2007 -0800
Enable startup-time rotation; change rotation pixmap creation API.
Add monitor "Rotate" option taking one of "normal", "left", "inverted" or
"right". However, because initial mode selection is made before the screen
is completely initialized, we cannot create the shadow pixmap object at this
point. Pend the shadow pixmap creation until the block handler.
Note that this code is not completely functional yet.
commit 8606aeb9b2ab2dafc11e64436db4d3a7e67dbcc0
Author: Keith Packard <keithp@guitar.keithp.com>
Date: Thu Feb 15 22:23:16 2007 -0800
RRConfigureOutputProperty is a variable length request.
Replace REQUEST_SIZE_MATCH with REQUEST_AT_LEAST_SIZE
commit a88844eccb0e423e71d4fcb286866a026308babd
Author: Daniel Stone <daniel@fooishbar.org>
Date: Sat Feb 17 20:35:07 2007 +0200
configure.ac: disable dmx per default
Disable DMX until it gets ported to the new input API.
commit e9a2cc7d9fcc73e16576be2522522cce675dc3f3
Author: Daniel Stone <daniel@fooishbar.org>
Date: Sat Feb 17 16:17:48 2007 +0200
config: error message cleanup
Demote failure to connect from ErrorF to DebugF.
commit 81876bc5ddc2f3eda5078fe4bd101917fb32e586
Author: Ben Byer <bbyer@apple.com>
Date: Sat Feb 17 04:07:11 2007 -0800
oops, missed a spot
commit d287b76471f66c9aea54f969d050b35643cb2501
Author: Ben Byer <bbyer@apple.com>
Date: Sat Feb 17 03:47:42 2007 -0800
cleaned up some linking ugliness in hw/darwin/quartz
commit 81444486be4f182dde778bac6f7edcbfc4368482
Author: Ben Byer <bbyer@apple.com>
Date: Sat Feb 17 02:23:11 2007 -0800
autoconf goodness for XDarwin, courtesy of pogma
commit cf4994b0db2fef4c10ce8804adef766bc5118daf
Author: Ben Byer <bbyer@apple.com>
Date: Sat Feb 17 01:21:43 2007 -0800
dix mods for Darwin
commit cece0601571f6304e392a3a40505664544b249f3
Author: Ben Byer <bbyer@apple.com>
Date: Sat Feb 17 01:00:13 2007 -0800
build fix for configure.ac / BUILD_DARWIN, oops
commit 00b0657b815b95964401c3e36eed54063afbd003
Author: Ben Byer <bbyer@bbyer.(none)>
Date: Sat Feb 17 00:55:32 2007 -0800
glx fixes for XDarwin
commit 93777c7b96e560da087963040e372aecbfca7bbc
Author: Ben Byer <bbyer@bbyer.(none)>
Date: Sat Feb 17 00:22:39 2007 -0800
more patches to make the Quartz part of XDarwin work again
(thanks Peter and Torrey!)
commit 612144c811fdf06b7c03cf48a321388fe411acd4
Author: Ben Byer <bbyer@bbyer.(none)>
Date: Sat Feb 17 00:09:58 2007 -0800
More build fixes / updates for XDarwin:
quartz/cr: "Cocoa Rootless" support (deprecated in favor of xpr?)
quartz/fullscreen: Fullscreen support using Xplugin (not yet functional)
commit 68d39d8571d8717d26cedc84015d537549520a14
Author: Daniel Stone <daniel@fooishbar.org>
Date: Fri Feb 16 23:02:13 2007 +0200
kdrive/ephyr: fix keysym type confusion once and for all
Take keysyms in as an XID in hostx_load_keymap() and explicitly
convert them to CARD32 for loading into the server. Fixes Xephyr on
AMD64, wa-hey.
commit 5507cb885d861e974be240120ada2ace2a980a72
Author: Daniel Stone <daniel@fooishbar.org>
Date: Fri Feb 16 23:01:27 2007 +0200
kdrive: delete input debugging, yet again ...
I have no idea how this keeps on coming back.
commit 2534f5a9027c196f677923aaa38fa9ed9917f73d
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Fri Feb 16 15:33:48 2007 -0500
Remove nasty function pointer type from DevUnion, return to documented type.
commit 84efe23ae834dd3a4d3f3e08832b69469c7382aa
Author: Ben Byer <bbyer@bbyer.(none)>
Date: Fri Feb 16 04:37:38 2007 -0800
updated darwin/quartz/xpr (libXplugin interface for Mac OS X) support
commit 5e7f7436a755a33e48ab91831cc6af710a8344ef
Author: Ben Byer <bbyer@bbyer.(none)>
Date: Fri Feb 16 04:12:26 2007 -0800
merged in miext/rootless changes for XDarwin support
commit f350909d1696fcfda87e8f12c729254d762313c9
Author: Keith Packard <keithp@guitar.keithp.com>
Date: Thu Feb 15 21:50:48 2007 -0800
Kludge around duplicate code added in hw/xfree86/modes.
Code added in hw/xfree86/modes came from the server-1.3-branch.
Portions of this code had previously been integrated into xf86Mode.c
and edid_modes.c.
To preserve hw/xfree86/modes as much as possible, the duplicate code from
the other files has been disabled; a more careful review would figure out
where that code actually belonged.
commit 258beebc77510f84fbea66d6ebf29c5097bd11db
Author: Keith Packard <keithp@guitar.keithp.com>
Date: Thu Feb 15 20:13:15 2007 -0800
Report correct RandR 1.0 sizeID. Report correct subpixel order.
RandR 1.0 sizeID must be computed the same way every time, so when reporting
it in the ScreenChangeNotify event, just construct the usual 1.0 data block
and use that.
subpixel geometry information can be computed by looking at the connected
outputs and finding any with subpixel geometry and using one of those for
the global screen subpixel geometry. This might be improved by reporting
None if more than one screen has information and they conflict.
commit ef6b1235fd7d6dc422e8a150c089496a8e648067
Author: Keith Packard <keithp@guitar.keithp.com>
Date: Thu Feb 15 11:27:35 2007 -0800
Allow new modes code to build inside drivers as well as server.
Use config.h for driver builds where xorg-config.h isn't available.
commit 3dbe8f6b6ea32a9a137ad6e9235f74009b095bd8
Author: Tilman Sauerbeck <tilman@code-monkey.de>
Date: Thu Feb 15 17:51:01 2007 +0100
Distribute hw/xfree86/modes.
commit d4eb4d065032112a38444e36f791cb468a5ca8f4
Author: Keith Packard <keithp@guitar.keithp.com>
Date: Thu Feb 15 20:36:20 2007 -0800
Merge crtc/output-based mode selection code.
This code comes from the intel driver, so there's no history in this tree.
As the crtc/output-based mode selection code uses ddc, the ddc and i2c
modules have been merged into the server. Attempts to load them are safely
ignored now.
commit 37fe4c49dc3a5faf2d3d56112b6bd78453045f6a
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Fri Feb 16 09:57:57 2007 +1030
mi: Move WarpPointer event generation to miPointerMove to avoid duplicate
events, cache event array allocation.
commit c2f3f705f1db8ca78292912544a7e416116175f3
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Thu Feb 15 14:38:24 2007 -0500
Bug #6988: Change behavior of Security extension per user feature request.
commit 811675733e97416c990e6dc9c19271b43d96248d
Author: Daniel Stone <daniel@fooishbar.org>
Date: Thu Feb 15 19:09:00 2007 +0200
os: fix client privates leak
Minor leak here. Oops.
commit 8f6961d385bda92703f18090cff551409d2710c9
Author: Daniel Stone <daniel@fooishbar.org>
Date: Thu Feb 15 19:08:46 2007 +0200
configure.ac: add xdarwin stubs
Add stub AM_CONDITIONALs to at least fix the build.
commit a3b62623b8aac56b219633bdb2c2f6de19b0580b
Author: Daniel Stone <daniel@fooishbar.org>
Date: Thu Feb 15 17:07:42 2007 +0200
change versioning for new server version scheme
See:
http://xorg.freedesktop.org/wiki/XDC2007Notes#head-2719037a1905516c45cf74f0e155c8703221e446
commit f452507ca9209598401d15da0039aaa4e1fed1a3
Merge: 04632835b7 811675733e
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Thu Feb 15 09:47:20 2007 -0500
Merge branch 'master' into my-XACE-SELINUX
commit 04632835b7402456fdcf6c8fa01970cd2804e27c
Merge: 88f89b9ac1 9ecf79ca01
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Thu Feb 15 09:27:05 2007 -0500
Merge branch 'master' into my-XACE-SELINUX
commit 0f6dd4aea6176507dbe1c90c950d332fecbcaacb
Author: Daniel Stone <daniel@fooishbar.org>
Date: Thu Feb 15 16:14:57 2007 +0200
kdrive/ephyr: free screen struct
Free screen->driver on screenFini, instead of just leaking it.
commit 9ecf79ca0111dd899ca88dd54156f71013220fcc
Author: Ben Byer <bbyer@apple.com>
Date: Thu Feb 15 05:22:21 2007 -0800
Beginnings of an update Darwin driver
commit 136bb4874aadf4a731d7eb8671e8bb641f9980a7
Author: Ben Byer <bbyer@apple.com>
Date: Thu Feb 15 05:14:38 2007 -0800
iokit support for XDarwin
commit 3ead1afe78d2913f08c8144cb2d3813c6b159488
Author: Ben Byer <bbyer@apple.com>
Date: Thu Feb 15 05:09:29 2007 -0800
Beginning of patches to add XDarwin support to the modular tree;
special thanks to Torrey Lyons and Peter O'Gorman for making this possible.
This is the automake framework for the XDarwin.app interface files.
commit f6c3b9fa97ccf85e96f15435d564a1c261e40532
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Thu Feb 15 13:51:20 2007 +1030
xfree86: mouse and keyboard hotplugging support. New mouse devices will get
new cursors, keyboard devices use VCP's focus until paired.
commit d570ff7c81858a3174686b46a088f67563b4a2d5
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Wed Feb 14 17:09:33 2007 +1030
fix: WarpCursor needs to send MotionNotify.
commit c4fe1bcce1c1e4822e688959b331b47a051d6e0a
Merge: e540d572c5 d570ff7c81
Author: Ian Romanick <idr@us.ibm.com>
Date: Wed Feb 14 15:39:52 2007 -0800
Merge branch 'master' of ssh+git://idr@git.freedesktop.org/git/xorg/xserver into pci-rework
commit e540d572c5acba877b3ce01e7b31e399dac2d44a
Author: Ian Romanick <idr@us.ibm.com>
Date: Wed Feb 14 15:38:10 2007 -0800
Merge fix missed on previous commit.
commit 81aa7f059d3cfd8d28420b7932b8ff7e06d67979
Author: Eric Anholt <eric@anholt.net>
Date: Wed Feb 14 12:48:15 2007 -0800
Add missing dirty marking in a couple of fallback cases in the exaGlyphs path.
commit a5f19c5150a7b3dc2ff3ad759ee1a6ab0ad8925c
Author: Eric Anholt <eric@anholt.net>
Date: Wed Feb 14 10:39:46 2007 -0800
Mark sync when UploadToScreen succeeds in exaGlyphs().
commit a492d494f51caf15a5cb979dc335387486c105d1
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Tue Feb 13 18:32:59 2007 -0800
Update Xvfb man page: remove monolith build instructions, use /var/tmp instead of /usr/tmp
commit 25104ed2e6050f86691104b34eeaf3147eb83c4a
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Wed Feb 14 11:26:53 2007 +1030
dix: fix typo in condition.
commit 33ef546b942977bb2573156eaba5269350d16f99
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Wed Feb 14 11:18:43 2007 +1030
dix: Clean up GetPointerEvents. If pDev == inputInfo.pointer, assume that
we do not want Xi events.
mi: Remove POINTER_CORE_ONLY flag.
commit a23b0b069cac8a48e2b306b2095515d75f647705
Author: Adam Jackson <ajax@benzedrine.nwnk.net>
Date: Mon Feb 12 17:50:00 2007 -0500
Typo fix.
commit d21c95f80bdba2f29eedd57fb0b00e580391c08e
Author: Adam Jackson <ajax@benzedrine.nwnk.net>
Date: Mon Feb 12 17:22:39 2007 -0500
Hook up --with-builderstring for vendor build identification.
commit 46784d24c11767455a4986449a8037295912dcee
Author: Adam Jackson <ajax@benzedrine.nwnk.net>
Date: Mon Feb 12 17:18:29 2007 -0500
Remove spurious LIBADD from xf4bpp
commit 16eb7254f861465f988ae3861ac3449c2c966062
Merge: 3814862a86 c4b7e9d1c1
Author: Ian Romanick <idr@us.ibm.com>
Date: Fri Feb 9 12:38:49 2007 -0800
Merge branch 'master' of ssh+git://idr@git.freedesktop.org/git/xorg/xserver into pci-rework
commit c4b7e9d1c16797c3e4b1200b40aceab5696a7fb8
Author: Aaron Plattner <aplattner@nvidia.com>
Date: Tue Feb 6 14:57:22 2007 -0800
Add an RDTSC implementation to the x86 emulator.
This instruction is being used in some debug VBIOSes. This implementation
doesn't even try to be accurate. Instead, it just increments the counter by a
fixed amount every time an rdtsc instruction in encountered, to avoid divides by
zero.
commit 262b9b104a04e55969593ef96a16004e53ecd00a
Author: Soren Sandmann Pedersen <ssp@dhcp83-218.boston.redhat.com>
Date: Tue Feb 6 17:30:22 2007 -0500
Use the new 8888x0565mmx function in fbpict.c
commit 876b806ec09d5ff0c6cd19df91006c4eefedfaa6
Author: Soren Sandmann Pedersen <ssp@dhcp83-218.boston.redhat.com>
Date: Tue Feb 6 17:16:23 2007 -0500
Reapply patch to fix AMD CPU detection
commit 13568d2aa43da4216bbcb46e1125ff28c323ac54
Author: Soren Sandmann Pedersen <ssp@dhcp83-218.boston.redhat.com>
Date: Tue Feb 6 17:12:01 2007 -0500
Revert "Fix for AMD cpu detection. Bug 9614, Dan Williams."
This reverts commit b2cd3b133748cc5aa541905a703a6fdb1cbbb1e6 since
unrelated changes in fbpict.c broke the build.
commit 5a3334410367a2186b2c667fa1eb6cf0baf93e95
Author: Soren Sandmann Pedersen <ssp@dhcp83-218.boston.redhat.com>
Date: Tue Feb 6 17:11:01 2007 -0500
Add new fbCompositeSrc_8888x0565mmx() function, based on patch by Dan
Williams. Bug 9682.
commit b2cd3b133748cc5aa541905a703a6fdb1cbbb1e6
Author: Soren Sandmann Pedersen <ssp@dhcp83-218.boston.redhat.com>
Date: Tue Feb 6 16:43:37 2007 -0500
Fix for AMD cpu detection. Bug 9614, Dan Williams.
Credit for the fixes in this patch goes to:
Marco Gritti <mpg at redhat dot com>
Jordan Crouse <jordan dot crouse at amd dot com>
commit 7cd73b00a29469d37a7f526cc9b35cc927a13ae2
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Mon Feb 5 14:48:48 2007 +1030
dix: If POINTER_CORE_ONLY is set, GetPointerEvents() only creates a core event
mi: fix: Create motion event in miPointerMoved
commit 760a38c4c7ab66ae653d3acb92f5cda4bd44edd6
Author: Daniel Stone <daniel@fooishbar.org>
Date: Mon Feb 5 03:39:36 2007 +0200
XkbCopyKeymap: fix copy-and-waste accident
When we reallocated modmap, we accidentally clobbered syms with the
result, leaving syms definitely too small, and modmap also potentially too
small (as well as not actually allocated anymore).
commit 17d85387d1e6851d35474b65929e268ca64ef65b
Author: Daniel Stone <daniel@fooishbar.org>
Date: Thu Jan 18 15:23:57 2007 +1100
dmx, vfb, xnest: fix fbcmap compilation
Don't always define XFree86Server, but only for damn fbcmap.c.
Split fbcmap.c into its own library to achieve this.
commit a309c936bb79e2fea04a96ce33c7da99ed902484
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Mon Feb 5 11:38:44 2007 +1030
xkb: Daniel's patch to stop evdev keyboard segfaults.
mi: Remove quickfix from ba547d4f6a2707f51f0d826389d2d418fb62367a
commit 236f04b638e7d4d1656c6bedd8a6e8d7cec285ec
Author: Dave Airlie <airlied@linux.ie>
Date: Mon Feb 5 09:09:12 2007 +1100
remove array_cache from everywhere
commit eb228e8d1eaa78911541b2fec5d04a74c1299718
Author: Alan Hourihane <alanh@fairlite.demon.co.uk>
Date: Sun Feb 4 22:06:59 2007 +0000
clean up more of the vbo fallout
commit fb1bc1c65b88527b42a0e4abed23e5ddaae711b7
Author: Dave Airlie <airlied@linux.ie>
Date: Sun Feb 4 18:39:58 2007 +1100
add vbo to .gitignore
commit d8e148ec841d340327e6813127b0e0ffc4db712d
Author: Dave Airlie <airlied@linux.ie>
Date: Sun Feb 4 18:39:04 2007 +1100
update xserver for vbo code in mesa
commit 5dcad9e9d7d9993d65f989219bee94a060bbf476
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Fri Feb 2 14:44:55 2007 -0800
Fix bus error on startup in 64-bit Xephyr
hostx_get_visual_masks takes unsigned long * arguments, but was being
passed pointers to CARD32's.
commit 170a55022ebc7b148bff93886eda152a0d5ce79a
Author: Alan Hourihane <alanh@fairlite.demon.co.uk>
Date: Fri Feb 2 20:56:12 2007 +0000
remove file
commit e6a505be84f5f72349d6860dc5a5058367516019
Author: Dan Nicholson <dan@conor.dwcab.com>
Date: Fri Feb 2 20:53:01 2007 +0000
The array_cache sources don't exist anymore in the Mesa tree,
so we shouldn't try to build them.
commit af20485ec370801f2aabfaeae17bbd030a849bd1
Author: Alan Hourihane <alanh@fairlite.demon.co.uk>
Date: Fri Feb 2 19:14:46 2007 +0000
Remove array_cache for recent Mesa changes
commit cf5b29d75dad7c74543f49f010c817623a3df747
Author: George Sapountzis <gsap7@yahoo.gr>
Date: Fri Feb 2 12:57:38 2007 +0200
dmx: drop leftover __GLXdrawablePrivateRec struct.
commit 4f2f3233c808fd86bf9f6c09937feda9e0b367fd
Author: Eric Anholt <eric@anholt.net>
Date: Thu Feb 1 15:10:29 2007 -0800
Fix the size expectations of xRRSetCrtcGamma.
It was using REQUEST_SIZE_MATCH (client request length must equal request size)
rather than REQUEST_AT_LEAST_SIZE (client request length must be at least
big enough for request size), and this request has data following the request
structure.
commit 8274ea6aa97b06a56b7468c3908894c0ff72b687
Author: Eric Anholt <eric@anholt.net>
Date: Thu Feb 1 12:15:54 2007 -0800
Set the Damage version supported in the server, instead of using damageproto.
This was caught by distributions upgrading damageproto to 1.1, before the
server they had supported it. The server then advertised the new version
without supporting the protocol.
commit 8bce182568f14edfb03911d8c5d791fd83bb6222
Author: Eric Anholt <eric@anholt.net>
Date: Mon Jan 29 17:30:59 2007 -0800
Restore a few important lines killed in the previous commit.
Typical results were failure to sync, and a black screen.
commit 3814862a869ee83d307eb01225d5949039f435d8
Merge: a216de9b7f 31f2d4a57e
Author: Ian Romanick <idr@us.ibm.com>
Date: Mon Jan 29 15:14:31 2007 -0800
Merge branch 'master' of ssh+git://idr@git.freedesktop.org/git/xorg/xserver into pci-rework
Conflicts:
hw/xfree86/os-support/bus/linuxPci.c
commit 31f2d4a57e04f5ea635fbb50c508405c4fc37b65
Author: Eric Anholt <eric@anholt.net>
Date: Mon Jan 29 09:39:33 2007 -0800
Bug #9680: Remove bogus blank length limiting in xf86SetModeCrtc().
Our modes typically come from EDID or default modes, and when the monitor
asks for a specific mode, deciding to tweak it usually results in incorrect
display. And if the user is specifying a mode by hand, tweaking it then is
still pretty rude.
Reviewed by: ajax
commit 4aaaa70d1b52346213fad46777c006a93c4ece5d
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Mon Jan 29 18:23:24 2007 +1030
Xi: Adding ChangePointerKeyboardPairing request
Adding PointerKeyboardPairingChanged event
Correct error values for XWarpDevicePointer
dix: Adding device argument to SendMappingNotify
Adding spriteOwner flag to devices
commit f3418b52dcf2ab4982504856ab9fae3e726ee6d2
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Mon Jan 29 16:10:03 2007 +1030
mi: Fix cursor rendering issues.
commit 15a81b6325d359990017b8e9f17ce18a7eff1354
Merge: 3759254c09 cc3d66d4a5
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Sun Jan 28 17:18:57 2007 +1030
Merge branch 'master'
commit cc3d66d4a53fee8f1d940bb8c7f032c94b9c25f6
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Wed Nov 15 17:50:02 2006 +1030
o fix minor error in comment for GetPointerEvents()
commit 3759254c0967ae83bdcbf097d9e8a58733c8e6f9
Merge: ba547d4f6a ca5ebe3971
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Sun Jan 28 17:05:55 2007 +1030
Merge branch 'master'
commit 1627af54497bee659ea30f2850b39cbbf576e22d
Author: Jonathan Lim <jlim@sgi.com>
Date: Fri Jan 26 13:00:45 2007 +0100
Call linuxPciOpenFile() for r/w access if applicable.
Currently, the call to linuxPciOpenFile() is always made for read
only access which causes the subsequent mmap call to fail when the
memory is mapped read/write.
Xorg #9692
commit a216de9b7ff55e2b73c487d037f248f00bd2e63b
Merge: 24506ea65b cf7ca9d09c
Author: Ian Romanick <idr@us.ibm.com>
Date: Thu Jan 25 10:17:32 2007 -0800
Merge branch 'master' of ssh+git://idr@git.freedesktop.org/git/xorg/xserver into pci-rework
commit cf7ca9d09cba14d107152a5179de38e5ef7bd784
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Wed Jan 24 20:20:48 2007 -0800
Plug memory leak in doLoadModule()
commit 5abd50e37ceda134897891ed32e05215db67e0b4
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Wed Jan 24 18:54:38 2007 -0800
Correct help lines for configure's --with-vendor-name flags
commit b32a40817fc0e2ac2edf2fa22a8813087fce2e7b
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Wed Jan 24 16:29:49 2007 -0800
Correct variable descriptions in comment for SecurityCheckResourceIDAccess
commit 24506ea65be4cb29c5e1486aa0a529a40ce5c230
Author: Ian Romanick <idr@us.ibm.com>
Date: Wed Jan 24 15:33:49 2007 -0800
Move xf86ReadLegacyBIOS to the one place that uses it.
xf86ReadLegacyBIOS is only used by one function in int10/generic.c.
Move a generic implementation of that function there, rename it to
read_legcay_BIOS, and delete all remnants of it from all other places.
commit fdb3a0798f0d17e72ec7293d59a7a81b5ffdf95b
Merge: 39b51e1bfc a53586eebc
Author: Ian Romanick <idr@us.ibm.com>
Date: Wed Jan 24 14:49:39 2007 -0800
Merge branch 'master' of ssh+git://idr@git.freedesktop.org/git/xorg/xserver into pci-rework
commit a53586eebc166e35c1f48942205832810061daee
Author: Eric Anholt <eric@anholt.net>
Date: Wed Jan 24 13:36:25 2007 -0800
Warning fix for RRCrtcSetRotations().
commit 7a12952fd437b105ea0d013d680f9c3a775a183c
Author: Eric Anholt <eric@anholt.net>
Date: Wed Jan 24 13:34:29 2007 -0800
Bug #7639: Only swap out pixmaps (rather than everything) on VT switch in EXA.
This is a new behavior for version 2.1 of EXA, and only takes effect if the
driver has requested that. Otherwise, the previous behavior remains the same.
commit b6b855932109b4bc3454f07bef8cb079d79ca369
Author: Keith Packard <keithp@keithp.com>
Date: Thu Jan 25 00:29:20 2007 +0800
Make Xinearama screen information reflect CRTC rotation.
commit 39b51e1bfc4924fc3bda4342ef9c6c0125d9f4fa
Merge: 637b19b3ee 788cfce911
Author: Ian Romanick <idr@us.ibm.com>
Date: Tue Jan 23 13:25:56 2007 -0800
Merge branch 'master' of ssh+git://idr@git.freedesktop.org/git/xorg/xserver into pci-rework
commit 788cfce911793a26aed16f38f30678ecee82c873
Author: Michel Dänzer <michel@tungstengraphics.com>
Date: Tue Jan 23 10:15:22 2007 +0100
Bump video driver ABI version to 1.2.
This is necessary because server-1.2-branch bumped to 1.1 for xf86CVTMode and
we have xf86XVFillKeyHelperDrawable on top of that.
commit 637b19b3ee7345c2d449ce94ceabe998d817c02e
Author: Ian Romanick <idr@us.ibm.com>
Date: Mon Jan 22 09:58:33 2007 -0800
Eliminate pciControlBridge, pciGetBridgeBuses, and pciGetBridgeResources.
commit a232e4ae938fa3a68f7614995676eda7929260db
Author: Ian Romanick <idr@us.ibm.com>
Date: Mon Jan 22 09:16:45 2007 -0800
Convert xf86GetPciHostConfigFromTag to get_parent_bridge.
Convert xf86GetPciHostConfigFromTag to a new function called
get_parent_bridge. This name better represents what
xf86GetPciHostConfigFromTag is used for: walking up the lists of PCI
bridges from a device.
commit 844560a02fa6c4ce18ea2af3ec27beaa60b7af11
Author: Ian Romanick <idr@us.ibm.com>
Date: Mon Jan 22 09:13:59 2007 -0800
Elminiate ARCH_PCI_OS_INIT.
Never, ever use the ix86Pci stuff on Linux. This renders the whole
ARCH_PCI_OS_INIT mechanism useless. Remove it.
commit 7dfb3cea913b02a6b36c308d1330bd40abe6b41f
Merge: c279d5fdc5 2dc866252c
Author: Ian Romanick <idr@us.ibm.com>
Date: Mon Jan 22 08:44:36 2007 -0800
Merge branch 'master' of ssh+git://idr@git.freedesktop.org/git/xorg/xserver into pci-rework
commit 2dc866252c84ed0e7b3afa25e8a5312f448d405b
Author: Eric Anholt <eric@anholt.net>
Date: Mon Jan 22 08:41:50 2007 +0800
Really fix optimized render cases being hit when they shouldn't.
I don't know how this define slipped in there. Fixes
6fdfd9dad91d7b7aa292f8c4d268dd27c34de8d3.
commit 88f89b9ac1b92a0916c46488350ff68c3ffdd490
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Fri Jan 19 19:15:49 2007 -0500
Policy updates: use x prefix in property and ext types.
commit 2fb8b7f8199c35ae0870cb54b40ee28a4e01d479
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Fri Jan 19 19:14:51 2007 -0500
Split ObjectSIDByLabel into two functions since property labeling now
involves an additional compute_create lookup.
commit 0d6d373af95d0004d33b987d14ad7e04dd5d2003
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Fri Jan 19 14:52:23 2007 -0800
Update Xserver man page to match commit ed33c7c98ad0c542e9e2dd6caa3f84879c21dd61
Remove unused -xkbdb and -noloadxkb options. Rename -ar1 and -ar2 to
-ardelay and -arinterval, respectively.
commit c279d5fdc53612a90f33fafe9e9c59ced008dd51
Merge: 88f248e671 14d6a9b327
Author: Ian Romanick <idr@us.ibm.com>
Date: Fri Jan 19 12:59:54 2007 -0800
Merge branch 'master' of ssh+git://idr@git.freedesktop.org/git/xorg/xserver into pci-rework
commit 700fccf863593cbea1691789f1f1cafc08a32fee
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Fri Jan 19 14:56:38 2007 -0500
Remove the root window context line from the configuration file.
This context will be derived through a type_transition rule instead.
commit 3a9791b456f35adb252a9059b19265c6c447f1ba
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Fri Jan 19 14:53:09 2007 -0500
Policy updates.
commit 14d6a9b327381a6bb2dac59c62728e5fd0f0bcfb
Author: Michel Dänzer <michel@tungstengraphics.com>
Date: Fri Jan 19 18:30:21 2007 +0100
fbdevhw: Only deal with RGB weight if default visual is True- or DirectColor.
commit 27a01e100bff21ac0b70c6d72071d7226fc91264
Author: Michel Dänzer <michel@tungstengraphics.com>
Date: Fri Jan 19 18:28:05 2007 +0100
fbdevhw: Consider mode set equal to mode requested if virtual width is larger.
commit 65f4690ecb4576f60396fcccff8e5bd5d4b6645f
Author: Michel Dänzer <michel@tungstengraphics.com>
Date: Fri Jan 19 17:54:03 2007 +0100
__glXDRIscreenProbe: Use drmOpen/CloseOnce.
Fixes https://bugs.freedesktop.org/show_bug.cgi?id=9275 . Based on patch from
Alan Swanson.
commit 8b3a591cd39f2d51209dc71b641cac79663e1b16
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Thu Jan 18 16:03:30 2007 -0800
Update pci.ids to 2007-01-18 snapshot
(includes a whole bunch of ATI device id updates)
commit 0f0c321adf2850b3d7aafe281362bfe424cb0ca1
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Thu Jan 18 15:31:53 2007 -0800
Make xf1bpp build correctly with compilers that don't support -include
commit a811e92104028ae60ba69f73e32ee1e0533b088c
Author: Eric Anholt <eric@anholt.net>
Date: Thu Jan 18 14:28:01 2007 -0800
Account for CRTC rotation in the cursor containment code.
commit df147c10ce597c56c16cbca552e8a3e3ecb3cdaa
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Wed Jan 17 16:47:07 2007 -0800
Xserver man page: remove bc, add -wr
commit 2dfd1aab244a2c8da3b62b522b9a8434e474af17
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Wed Jan 17 14:39:28 2007 -0800
Always include compiler.h in cfbmskbits.h instead of checking #ifdef XFREE86
commit 42a48786acf54f83167de4f561526986d4e27033
Author: Eric Anholt <eric@anholt.net>
Date: Wed Jan 17 14:34:42 2007 -0800
Add a setter for randr_crtc->rotations.
commit 88f248e67143175532cbafd6faf8fc6df97c7894
Author: Ian Romanick <idr@us.ibm.com>
Date: Wed Jan 17 14:04:43 2007 -0800
Replace PciBusId with 'struct pci_device *'
There's no need to store the slot information for a PCI device as its
ID. Instead, skip the middle man and just store a pointer to the
pci_device structure.
commit 0361611080267727f570e17f2212aaa890223f6e
Author: Ian Romanick <idr@us.ibm.com>
Date: Wed Jan 17 13:06:04 2007 -0800
Convert xf86IsolateDevice to a 'struct pci_slot_match'.
This change was accidentally not committed on the previous commit.
commit c1808f148405a28256e0480d6f8714691b0e964e
Author: Ian Romanick <idr@us.ibm.com>
Date: Wed Jan 17 13:02:27 2007 -0800
Convert xf86IsolateDevice to a 'struct pci_slot_match'.
commit d2f8c42c48ecc398d224d9e3b280a66042e68664
Author: Ian Romanick <idr@us.ibm.com>
Date: Wed Jan 17 12:59:17 2007 -0800
Convert xf86FindPrimaryDevice to use a static buffer and snprintf.
Rather than allocate a 9 byte buffer on each invocation, use a static
16 byte buffer. Use snprintf for safety. This commit should probably
be cherry-picked to the trunk.
commit 28976bebec8b6475d0703f8356edd116e25d40b2
Author: Ian Romanick <idr@us.ibm.com>
Date: Wed Jan 17 12:15:09 2007 -0800
Eliminate unused fields in pciAccRec.
commit f36a447d20c0a89b78c5899eeb303cab568ebac6
Author: Ian Romanick <idr@us.ibm.com>
Date: Tue Jan 16 14:49:19 2007 -0800
Eliminate use of Tag field.
The Tag field was removed from the int10 structures in commit
ca9c41e09ddb72d150d86f5d372eb07eeca7c1a2. This file was over looked.
commit cde17015dff1ced2aabb8b76c08f9110237821a5
Author: Eric Anholt <eric@anholt.net>
Date: Tue Jan 16 13:01:03 2007 -0800
When changing a non-pending property, call the screen rrOutputSetProperty hook.
commit e3add7c8ecbb2a0a662860f208f6ae7d1857c717
Author: Eric Anholt <eric@anholt.net>
Date: Tue Jan 16 12:59:34 2007 -0800
Don't forget to add the property we configure to the properties list.
commit 780b55ec6f97864b50f00170b201e93eba188f1b
Author: Ian Romanick <idr@us.ibm.com>
Date: Mon Jan 15 15:30:16 2007 -0800
Fix accidental commit (bug) in linuxOpenLegacy.
commit 31bd8d150749c548eb70404395b4a52d46412f43
Author: Ian Romanick <idr@us.ibm.com>
Date: Mon Jan 15 15:19:30 2007 -0800
Fix domain insanity.
Eliminate xf86GetPciDomain. The domain from libpciaccess is the
domain. Period. This means that 0 is a valid domain. Make sure that
INCLUDE_XF86_NO_DOMAIN is *not* set. Always run in "domain mode,"
even if the only domain possible is 0.
commit 079a6a55a516778871a8b2f8e9c8dd9162105a76
Author: Ian Romanick <idr@us.ibm.com>
Date: Mon Jan 15 11:39:24 2007 -0800
Convert to new pci_device_cfg_write_u* interface.
commit d8bd0c41de11d12976a5ea9f185b7ac6c7060b71
Author: Ian Romanick <idr@us.ibm.com>
Date: Mon Jan 15 11:38:22 2007 -0800
Convert to new pci_device_cfg_write_u* interface.
commit a87af8218f97da76433a5192d5e51aca0d5c3ed0
Author: Ian Romanick <idr@us.ibm.com>
Date: Mon Jan 15 11:21:37 2007 -0800
Remove unnecessary files from the sources list.
commit 1c326bf75fc0d2c39507834d159d031291eddac4
Author: Ian Romanick <idr@us.ibm.com>
Date: Fri Jan 12 12:07:19 2007 -0800
Eliminate unused INCLUDE_XF86_MAP_PCI_MEM define.
commit 3936caa00535d0b7543be5a4b315562111a6b3ab
Author: Ian Romanick <idr@us.ibm.com>
Date: Fri Jan 12 10:59:35 2007 -0800
Refactor pciTagConvertRange2Host and pciConvertRange2Host.
commit 1a493509e30412a0f6c6f8f8e47a446678dbbc1a
Author: Ian Romanick <idr@us.ibm.com>
Date: Fri Jan 12 10:58:59 2007 -0800
Fix typos in conditionally compiled code.
commit 8279444a54f38c5e2e5d4c2d936a10d74990e0be
Author: Ian Romanick <idr@us.ibm.com>
Date: Fri Jan 12 10:41:03 2007 -0800
Eliminate unused pciAddrHostToBus infrastructure.
commit e32fa10a04a15ce1b15c6faa7a64e68ee3906d59
Author: Ian Romanick <idr@us.ibm.com>
Date: Fri Jan 12 10:33:17 2007 -0800
Remove prototype for pciGetBaseSize.
commit 7411f5c389db73a6731d853d603029b8cf0a66ba
Author: Ian Romanick <idr@us.ibm.com>
Date: Fri Jan 12 10:32:04 2007 -0800
Eliminate pciHostAddrToBusAddr from interface.
pciHostAddrToBusAddr is no longer used anywhere in the tree. Remove
it with extreme prejudice.
commit 60c5e023e8ddaae8e011f80736e7cc3e8c12583d
Author: Ian Romanick <idr@us.ibm.com>
Date: Fri Jan 12 10:24:03 2007 -0800
Eliminate some dead code.
commit dd12a94885bad9c9d064dcf7e0d9a7a7114ae3e6
Author: Ian Romanick <idr@us.ibm.com>
Date: Fri Jan 12 10:21:25 2007 -0800
Eliminate xf86GetPciEntity from public interface.
xf86GetPciEntity was folded into the only place (xf86CheckPciSlot) in
the tree that still called it.
commit c3016a29964761478305cf2f5241c563ff3eab0a
Author: Ian Romanick <idr@us.ibm.com>
Date: Fri Jan 12 09:56:00 2007 -0800
Missed file from previous commit.
Convert xf86ReadLegacyVideoBIOS to take a 'struct pci_device *'
parameter instead of a PCITAG.
commit ca9c41e09ddb72d150d86f5d372eb07eeca7c1a2
Author: Ian Romanick <idr@us.ibm.com>
Date: Thu Jan 11 21:09:20 2007 -0800
Convert int10 and vgaHW to use 'struct pci_device' instead of PCITAG.
Convert all uses of PCITAG in int10 and vgaHW to 'struct pci_device'.
This allows the conversion of xf86ReadLegacyVideoBIOS and
xf86MapDomainMemory to 'struct pci_device' from PCITAG.
commit ba547d4f6a2707f51f0d826389d2d418fb62367a
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Fri Jan 12 14:42:02 2007 +1030
mi: Quick fix to stop segfault on non-core keyboards.
commit 5e2f8dee6331645fcbd2734c43698eb4f9c5b116
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Thu Jan 11 14:05:39 2007 +1030
mi: remove core pointer special handling. No event has core pointer as
device now.
dix: zero pSprite memory, stop segfaults on server restart.
commit 7fccec91c46baac4f8d2965180dc535b4eb7d65c
Author: Eric Anholt <eric@anholt.net>
Date: Wed Jan 10 13:10:43 2007 -0800
Bug #9555: Always define _GNU_SOURCE in glibc environments.
This keeps us from having to define _POSIX_C_SOURCE, _BSD_SOURCE, and
_XOPEN_SORUCE to get the C environment we want in different places. It also
fixes the build on linux due to RTLD_DEFAULT having not been defined.
commit 78f9592c112d4245f6119b98c244bbb4cae3e5aa
Author: Alan Hourihane <alanh@fairlite.demon.co.uk>
Date: Wed Jan 10 16:04:20 2007 +0000
lnx_ev56.c has to be built with -mcpu=ev56. Fix it.
commit ea82333dc1799a7e013205adbc89874bc8d273cb
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Wed Jan 10 14:52:13 2007 +1030
Xi: add missing call for SProcXChangeDeviceCursor
add DeviceEnterNotify and DeviceLeaveNotify
fix: QueryDevicePointer crashed if called with keyboard device
commit 6a2fb2928714ce77ee342cdc23a1178e5e766cf2
Author: Eric Anholt <eric@anholt.net>
Date: Tue Jan 9 16:34:40 2007 -0800
Track rename of DamagePost -> DamageAdd.
commit da09964a931cc64d05ab571bf545fdad35a6d395
Merge: e1f73d2208 e3aa6ad201
Author: Ian Romanick <idr@us.ibm.com>
Date: Tue Jan 9 15:27:34 2007 -0800
Merge branch 'origin' into pci-rework
Conflicts:
hw/xfree86/int10/generic.c
commit e3aa6ad201eb20862c11c000e76206e317a96dc9
Author: Matthieu Herrb <matthieu@blues.laas.fr>
Date: Tue Jan 9 14:14:19 2007 +0100
Multiple integer overflows in dbe and render extensions
CVE IDs: CVE-2006-6101 CVE-2006-6102 CVE-2006-6103
commit 359d20532bdcef6a540a551578d000afbb609c2d
Author: Michel Dänzer <michel@tungstengraphics.com>
Date: Tue Jan 9 09:53:45 2007 +0100
Require glproto >= 1.4.8 for GLX.
It builds against 1.4.7 as well, but it hardcodes the GLX_EXT_tfp tokens that
were finalized in 1.4.8, so GLX_EXT_tfp breaks if the client side was built
against an older glproto. This will hopefully alert people to rebuild other
components (in particular Mesa) against the new glproto as well.
commit 88740c4855babedbea420b5e1b35ae105d1f1026
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Mon Jan 8 17:36:07 2007 -0800
Use PKG_CHECK_EXISTS(libdrm) to determine if DRI should be enabled on Solaris
commit 282a4dcaabc5f0cd6f7d3819aa648333b93b265e
Author: Michel Dänzer <michel@tungstengraphics.com>
Date: Mon Jan 8 19:22:41 2007 +0100
Attempt to fix drawable type checks in dixLookupDrawable().
Not sure this is 100% correct either, but it fixes at least one reproducible
crasher where it returned a pixmap to dixLookupWindow().
commit a7ab7932938820a795bb6fb8e0444e0824433b99
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Mon Jan 8 17:31:16 2007 +1030
xfree86: fix XI86_SHARED_POINTER flag setting
commit 95e1a88050dde61e9b2407428042a43e47b46e18
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Mon Jan 8 12:31:18 2007 +1030
Xi: Adding ChangeDeviceCursor request
commit 0b73a7eb17fd848c6bdc6a65ba835aa2cbfc3cfd
Author: Eric Anholt <eric@anholt.net>
Date: Fri Jan 5 18:12:04 2007 -0800
Add support for the DamagePost (XDamage 1.1) request.
This makes damageproto >= 1.1 a requirement to build.
commit dfb2c10413e22afd8d486a982870f874326d5ef4
Author: Ian Romanick <idr@us.ibm.com>
Date: Fri Jan 5 10:15:09 2007 -0800
Add missing #else from previous commits.
commit f90c3e226b105bf77beb94723fc08bdff14834be
Author: Ian Romanick <idr@us.ibm.com>
Date: Thu Jan 4 15:38:16 2007 -0800
Re-regenerate from Mesa scripts.
DO NOT HAND EDIT THESE FILES! For cryin' out loud, there's even a
comment to that effect in the file's header...
commit b7ca5d14ce7ba410b0dab5c2289f6d7b75e763df
Author: Ian Romanick <idr@us.ibm.com>
Date: Thu Jan 4 15:37:33 2007 -0800
Incorporate new byte-order related configure changes.
commit 8dd5771a1b91c331860b667fb18e484452000aad
Merge: 45aa26ccb4 7d2ec92170
Author: Ian Romanick <idr@us.ibm.com>
Date: Thu Jan 4 15:01:38 2007 -0800
Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver
Conflicts:
GL/glx/indirect_dispatch_swap.c
GL/glx/swap_interval.c
commit 45aa26ccb4f61c2919ce2475d0907c6e1b177da2
Author: Ian Romanick <idr@us.ibm.com>
Date: Thu Jan 4 14:55:51 2007 -0800
Regenerate from Mesa scripts.
Regenerate source files from Mesa scripts. This causes the generated
files to use glxbyteorder.h.
commit 6d603bb47ff9d238637adbf30c6e9697e6e7e6fa
Author: Ian Romanick <idr@us.ibm.com>
Date: Thu Jan 4 14:49:26 2007 -0800
Add new header file containing byte-order wrappers.
Move the byte-order related wrappers out of the individual source
files into a dedicated header file. Modify the single hand-coded
source file that uses the byte-order wrappers to use the new header
file.
commit 7d2ec92170ebbdfa10a05734cb7cfaac97d19d65
Author: Eric Anholt <eric@anholt.net>
Date: Thu Jan 4 12:24:48 2007 -0800
Keep track of how many visuals we set up for GLcore, to avoid an invalid free.
The proper fix would involve actually setting up the ARGB visual for GLcore,
but I just want the server to not crash at exit.
commit aab2ca204279b638c7e5bb6b8427c58be9704c57
Author: Eric Anholt <eric@anholt.net>
Date: Thu Dec 21 09:16:19 2006 -0800
Try dlsym(RTLD_DEFAULT) first when finding symbols.
The previous mechanism failed when finding drm symbols now that libdrm has
moved to being linked by libdri instead of being linked into the server.
commit 2fd4626fa6969b84d8e2f9db16d6e2d44c4bc499
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Wed Jan 3 15:44:55 2007 -0800
Make GLX byteswap macros more portable
- Use autoconf tests instead of platform-specific #ifdef's to decide
which macros to use.
- Provide fallbacks for platforms like Solaris that don't provide any
of the existing known forms.
commit 66fa87292ef26bd0f464481287f3af992cd5741c
Author: Aaron Plattner <aplattner@nvidia.com>
Date: Wed Jan 3 10:27:07 2007 -0800
Fix BSF and BSR instructions in the x86 emulator.
Patch courtesy of Michael Yaroslavtsev.
commit 3b5b7ef5c2ab1d196806f6359e0972fd78d204dd
Author: Fredrik Höglund <fredrik@kde.org>
Date: Wed Jan 3 21:05:35 2007 +0100
Move the code for resetting the DPMS mode in response to input events,
from WaitForSomething to mieqProcessInputEvents.
mieqProcessInputEvents already handles resetting the screen saver.
commit 953a9ef949b4c57d28daeec57031fe1ce368c27c
Author: Keith Packard <keithp@guitar.keithp.com>
Date: Thu Dec 21 23:50:39 2006 -0800
Track physical screen size and send out updates when that changes.
Events and internal data structures need to be updated whenever the physical
or pixel size of the screen changes. The code was ignoring the physical
size, so changing only that would not be registered anywhere.
(cherry picked from f42e3cea236fa0091ed398a818fc8e17b0e1b3df commit)
commit e79602fca2f2cced66136729cdda4d356b0bdda0
Author: Keith Packard <keithp@neko.keithp.com>
Date: Sat Dec 30 21:52:22 2006 -0800
Use RRScreenSetSizeRange in 1.0 compat. Check RRGetInfo for error.
The RRScreenSizeSetRange function is used externally for 1.2 API drivers,
but can also be used in the 1.0 compatibility code. This also ensures that
the right changed bits are set so that clients are correctly notified when
the range changes.
RRGetInfo can return an error, use that to return BadAlloc to clients
instead of blindly going on with various requests.
(cherry picked from f05dd384d38c76dd9662933a03625dfef5b1c81f commit)
commit dc5eb4523298f966bd5fd9ae6672160034b5e82c
Author: Michel Dänzer <michel@tungstengraphics.com>
Date: Sun Dec 31 17:59:44 2006 +0100
fbdevhw: Override RGB offsets and masks after setting initial mode.
This is a hack, but it should be a NOP for all the setups that worked before
and actually seems to fix some others...
Based on a patch by Peter Teichmann from
http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=338241 .
commit d077c0da470ab7291e8d838eaace57b066477d6f
Author: Michel Dänzer <michel@tungstengraphics.com>
Date: Sun Dec 31 17:23:31 2006 +0100
fbdevhw: Use displayWidth for fbdev virtual width when appropriate.
The fbdev API doesn't allow setting the pitch explicitly, so we have to set
the virtual width to the pitch we're using for drawing. This fixes corruption
after changing the virtual width with RandR.
commit c385bcf0bde38dd869f7065f859dd4b4126f5690
Author: Michel Dänzer <michel@tungstengraphics.com>
Date: Sat Dec 30 16:44:31 2006 +0100
fbdevhw: Fix some issues with the previous commit.
Fix a TRACE_ENTER typo and only update the internal fbdev mode state cache
after actually setting a mode.
commit f6815cb68b0f6698497348fc6e4214dacef33b95
Author: Michel Dänzer <michel@tungstengraphics.com>
Date: Sat Dec 30 10:18:28 2006 +0100
fbdevhw: Consolidate modeset ioctl calling, report failure if it modifies mode.
The fbdev API allows the driver to 'accept' modes it doesn't really support by
modifying it to the nearest supported mode. Without this check, e.g. vesafb
would appear to accept all modes, even though it actually can't set any modes
other than the bootup mode at all.
commit 083b790515faaf134a78abc4b0a7ef0d6ea5db75
Author: Eric Anholt <eric@anholt.net>
Date: Thu Dec 28 13:21:25 2006 -0800
Switch the default migration heuristic for EXA to "always".
This has been what has been used the most successfully post-damagetrack.
The current thinking is that:
1) We should be able to accelerate basically everything. So we don't need to
try to migrate trees of pixmaps permanently out of framebuffer to speed
CPU drawing up.
2) Migration is cheaper in the thrashing case, so we don't want to go to a lot
of effort to try (and fail badly) to find a working set.
commit cfbc7379f0232bb336461f6d2a8496d3d0763e7e
Author: Eric Anholt <eric@anholt.net>
Date: Thu Dec 28 13:15:11 2006 -0800
Export exaMove{In,Out}Pixmap().
commit 683ca3f7afaf15fd3ca7918f6175b5a9e4a6f05b
Merge: 05f915050c 9563b2eea2
Author: Eric Anholt <eric@anholt.net>
Date: Wed Dec 27 16:11:31 2006 -0800
Merge branch 'exa-damagetrack'
commit 05f915050cad72d4fb39cbb886be57beeac18749
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Wed Dec 27 16:38:06 2006 +0000
dix/events: take screen number, not pointer, in PostSyntheticMotion
Since we were using PostSyntheticMotion incorrectly anyway, update the
declared API to match.
commit c1674660a7115ebf993dcde78f4e45f756e4c951
Author: Daniel Stone <daniel@fooishbar.org>
Date: Sun Dec 24 06:28:44 2006 +0200
os: test for userland, not kernel
It doesn't matter which kernel we're running on, the relevant part when
dealing with includes is what our userland is.
commit 83080809f9a1c1d24b0318e54632f25f5940da25
Author: Marc Aurele La France <tsi@ualberta.ca>
Date: Sun Dec 24 06:28:21 2006 +0200
xfree86: deal with pitch that isn't a multiple of the granularity
When the pitch isn't a multiple of the granularity, allocate more space to
compensate.
commit 329f6417275bb1201ba66c29b202028eeab3a355
Author: Daniel Stone <daniel@fooishbar.org>
Date: Sat Dec 9 22:51:59 2006 +0200
XkbCopyKeymap: make sure sym_interpret is always valid
Make sure we're not copying sym_interpret across from an empty source.
commit 43a4376bd72ef1b6486cddb60ad57b2d6169292a
Merge: 4b1c9ac3d1 d9e079d2a3
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Fri Dec 22 13:53:55 2006 -0500
Merge branch 'master' into my-XACE-SELINUX
commit d9e079d2a385203fdd18d958cfc19d759cab4ba8
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Fri Dec 22 13:07:09 2006 -0500
Zero out client devPrivates on allocation.
commit 4b1c9ac3d13767e395b47e76b37f9f3a569e7be1
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Fri Dec 22 13:04:50 2006 -0500
Policy updates.
commit cd71e861830081807e5b93ae89c73c17986c6330
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Wed Dec 20 13:45:24 2006 -0500
Naming change: Security*Access -> Dix*Access.
Clarify some error message strings.
commit 9fd2f167ec02ee170b87f02ddca89eba0b2e2389
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Wed Dec 20 16:30:36 2006 +1030
xfree86: fix xf86ProcessCommonOptions() core and shared pointer assignment
TAG: mpx-0.3.0
commit 056c919d849a78c8d507bfcecfa74c0b0165751a
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Wed Dec 20 14:49:17 2006 +1030
removing MPX extension files
commit b55e1239ac3b2962a33d8af1f911cc0f01f40f23
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Wed Dec 20 14:43:38 2006 +1030
xfree86: fix xf86ActivateDevice(): only set to MP device if not a keyboard
commit 202b46eb6bf0d5f94973c2bf1e4ebe9d154eadbf
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Wed Dec 20 13:05:53 2006 +1030
xfree86: Changing "IsMPDevice" to "SharedPointer" option. Devices will default
to MP devices.
Xi: Adding QueryDevicePointer request/reply
Adding WarpDevicePointer request/reply
commit e437f357b6850a6c87ca6696870b3abd40e5b8ed
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Tue Dec 19 16:38:34 2006 -0800
xorg.conf man page should say "XFree86-DGA", not "Xorg-DGA"
commit a81dbaae0597492f0245080c6f5af7158e05e2d0
Merge: fb6d676de5 d442998e39
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Tue Dec 19 16:11:19 2006 -0500
Merge branch 'master' into my-XACE-SELINUX
commit d442998e39611be6805ea261f2286a2fd00f49b1
Author: Eric Anholt <eric@anholt.net>
Date: Fri Dec 8 13:35:36 2006 -0800
Only do the _POSIX_C_SOURCE hackery on linux where it's required.
On other OSes, the nasty hack was resulting in prototypes being hidden, so just
don't do it.
commit 228b9f77696190e47d4c96d6e0809bf645751557
Author: Eric Anholt <eric@anholt.net>
Date: Fri Dec 8 13:32:22 2006 -0800
Include sys/select.h to get FD_ISSET.
commit 9563b2eea2f61246b6a9e14e00c701f693efa4e1
Author: Michel Dänzer <michel@tungstengraphics.com>
Date: Tue Dec 19 18:57:22 2006 +0100
EXA: Lots of damage tracking fixes.
Mostly due to exaDrawableDirty() now calculating the backing pixmap coordinates
internally, for cases where they aren't trivially known. There's a new
exaPixmapDirty() function for the other cases.
commit 467c00cf450826e0bf06fe94470ec193af625d68
Author: George Sapountzis <gsap7@yahoo.gr>
Date: Tue Dec 19 18:45:25 2006 +0100
exaGlyphs: mark dirty for software path also.
This affects drivers with no UploadToScreen or UploadToScreen failures.
commit 4334860e69e7d5b156082bd05c7a86708e5bad4c
Merge: 7e4717683d fdcc22ca17
Author: Michel Dänzer <michel@tungstengraphics.com>
Date: Tue Dec 19 16:29:26 2006 +0100
Merge branch 'master' into exa-damagetrack
Conflicts:
exa/exa_accel.c
exa/exa_migration.c
commit fdcc22ca1704d3519156c66804528c21b04fea65
Author: Michel Dänzer <michel@tungstengraphics.com>
Date: Tue Dec 19 16:11:17 2006 +0100
exaCopyNtoN: Fix usage of 'dx' and 'dy' instead of 'reverse' and 'upsidedown'.
commit 67c2a86e59e915d9a5681e9d233478cfea3e51ed
Author: Michel Dänzer <michel@tungstengraphics.com>
Date: Tue Dec 19 15:44:18 2006 +0100
EXA: Compare backing pixmaps instead of drawables against driver limits.
The driver operations are always contained within the backing pixmaps, it
doesn't matter if the drawables are bigger.
commit 6b1e354dbb6e8ed9f2c654bbe7f8bbf241843d1c
Author: Eric Anholt <eric@anholt.net>
Date: Tue Dec 19 15:24:19 2006 +0100
EXA: Disable SHM pixmaps.
See https://bugs.freedesktop.org/show_bug.cgi?id=6772 .
commit ca5ebe3971d8ebcfed00c5ebcd026cdd0ce0c6ba
Merge: 4d07b50372 1b029fd896
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Tue Dec 19 10:51:01 2006 +1030
Merge branch 'master' of git://anongit.freedesktop.org/git/xorg/xserver
commit 2d0a63126b3d3a17005b7e122617ee0c5f44a55b
Merge: d8b5394eda 1b029fd896
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Tue Dec 19 10:31:40 2006 +1030
Merge branch 'master' of git://anongit.freedesktop.org/git/xorg/xserver
commit 1b029fd896b76096905c516925ce0214fe14632c
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Mon Dec 18 14:51:04 2006 -0800
Xorg & Xserver man page updates for 1.2 release
- Added -extension & +extension to Xserver man page
- Changed Xorg synopsis from X11R6 to X11R7
- Clarified Xorg ancestry description
- Moved Solaris to free/Open Source OS list
- Removed references to MetroLink module loader & getconfig
- Converted (1) to (__appmansuffix__) in a few more places
- Replaced http://www.freedesktop.org/cvs/ with http://gitweb.freedesktop.org/
commit d8b5394eda9d92b7193004931caa6c24a337b2e6
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Mon Dec 18 17:35:34 2006 +1030
Cleaning up ifdef MPX from remaining files, removing it from configure.ac.
Removing building mpx extension from Makefile.am
commit 03c554283e49e449fd1282cf32564d15d9fd2c77
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Mon Dec 18 15:33:54 2006 +1030
mi: removing MPX ifdefs
global sprite renaming in mipointer and misprite
fixed: multiple remove cursor call in miSpriteInstallColormap
fixed: wrong core pointer usage in miSpriteStoreColors
dix: bugfix in CheckCursorConfinement
removing MPX ifdefs
removing MPX event generation (using Xi solely now)
bugfix GrabDevice: uninitialized field in grab struct caused segfault
xfree86: removing MPX fdefs
Xi: removing MPX protocol events
commit a5fcf1e5e7452c9be82f63b6c2be2a25c4109523
Author: James Steven Supancic III <arrummzen@arrummzen.net>
Date: Sat Dec 16 12:02:38 2006 -0500
Fix RENDER issues (bug #7555) and implement RENDER add/remove screen
support (bug #8485).
commit c92f7bef54fa737766d65fe32c200f405f39228c
Author: Kevin E Martin <kem@freedesktop.org>
Date: Sat Dec 16 12:01:49 2006 -0500
For Xvfb, Xnest and Xprt, compile fbcmap.c with -DXFree86Server
commit 012807356883128fde58bb2d4f91dd356d6418fc
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Fri Dec 15 18:27:16 2006 -0500
Add loud warnings to deprecated lookup functions.
Hopefully this will alert external driver maintainers.
commit ab1d5b0c31a1cfce95ab6b1d06f209f2c44e19ac
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Fri Dec 15 17:26:58 2006 -0500
Convert callers of LookupClient() to dixLookupClient().
commit f11dafaafc68f5cff1a1538d9566907786d8ab72
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Fri Dec 15 16:51:58 2006 -0500
Convert callers of SecurityLookupDrawable() to dixLookupDrawable().
commit 10aabb729d1586db344f9c1abdf1cf45e7ddaa7a
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Fri Dec 15 16:36:29 2006 -0500
Convert callers of LookupDrawable() to dixLookupDrawable().
commit 25d5e0a629f82d95bd71daf9a920a70e095b5188
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Fri Dec 15 15:50:46 2006 -0500
Convert callers of SecurityLookupWindow() to dixLookupWindow().
commit 04c721854fbf1bd6379c165a53fab2bdc09961c0
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Fri Dec 15 14:11:40 2006 -0500
Convert callers of LookupWindow() to dixLookupWindow().
commit 670bbb87310503fcc17203cecfa6f4f2f5db51d2
Author: Keith Packard <keithp@neko.keithp.com>
Date: Wed Dec 13 01:21:32 2006 -0800
RandR 1.2 rotation code must adjust width/height.
Mode lines reflect the monitor mode, not the projected size into the frame
buffer. Flip width/height around so that the dimensions are oriented
correctly.
(cherry picked from 612a8e61803da8db0e305cbb093696b8e4284572 commit)
commit 6c6901434ab469dd03b79fc98cd4a2b64d339305
Author: Keith Packard <keithp@mandolin.keithp.com>
Date: Wed Dec 13 00:58:54 2006 -0800
RandR 1.0 refresh rates unscrambled. SetScreenConfig uses RRCrtcSet right.
RandR 1.0 refresh rates were scrambled when working with a 1.2 driver that
returned sizes in a mixed order. SetScreenConfig was treating RRCrtcSet as
returning an RandR status instead of a Bool.
(cherry picked from 6dc711833d7387372012fdff1ce1df3aefa2d234 commit)
commit 628c7daeb12713d28e85e6b49fa037a7748dff83
Author: Keith Packard <keithp@guitar.keithp.com>
Date: Tue Dec 12 22:59:03 2006 -0800
RandR: config time updates when hardware config changes.
The config time in the RandR protocol reflects when the hardware state has
changed. It was getting changed anytime the driver changed the usage
of the hardware as well.
(cherry picked from 98d18a6578130adb411ca4bcc776fcb7e07f189f commit)
commit d742025f435f3eb7458cf8284d59300bc9a850aa
Author: Keith Packard <keithp@guitar.keithp.com>
Date: Tue Dec 12 20:16:49 2006 -0800
RandR mode list needs both output and crtc modes.
When an output no longer reports the current mode, it must still be included
in the list advertised by the X server. Walk the crtcs to ensure it is
included.
(cherry picked from 78689d0d6630afcbcd3ce5394d12c2564a489f45 commit)
commit 9e32bf98bc9ab17a137664d01f59a8f426f7ff3b
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Thu Dec 14 19:31:58 2006 -0500
Remove now-unused macro definitions from dix.h.
commit 00f0705b3bb444ac934fc902cd23130f1777eab2
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Thu Dec 14 19:15:21 2006 -0500
Remove instances of macros SECURITY_VERIFY_GEOMETRABLE and SECURITY_VERIFY_GC.
commit 5e334f06a1ef89891f9df2a371e4662340bec26b
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Thu Dec 14 18:27:09 2006 -0500
Remove instances of macros VERIFY_GEOMETRABLE and VERIFY_GC.
commit 51b69ff499c05f59cb1e577c4e8abf6f7f283b3e
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Thu Dec 14 17:53:43 2006 -0500
Remove instances of macro SECURITY_VERIFY_DRAWABLE.
commit 0cf75e74322e2b6a6efc7acf892e04365fde503b
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Thu Dec 14 17:27:12 2006 -0500
Remove instances of macros LOOKUP_DRAWABLE and VERIFY_DRAWABLE.
commit ab1886df73b73360fa3bd7ce8e01affc074cbc8d
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Thu Dec 14 15:42:19 2006 -0500
Add new, combined dix lookup functions (tweak).
commit 60cdc592fe042c03ceb5d4c3344acfbbf5d8ae28
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Thu Dec 14 14:46:03 2006 -0500
Add new, combined dix lookup functions.
commit 6c46645cfc1afda8aeabfe0ed4d9342673b702f1
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Thu Dec 14 14:45:42 2006 -0500
Naming change: Security*Access -> Dix*Access
commit a96788058e48f3e97c66da6dafd58828f0c2ce53
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Thu Dec 14 10:50:18 2006 +1030
mi: removing MPX ifdefs
global sprite renaming in mipointer and misprite
fixed: multiple remove cursor call in miSpriteInstallColormap
fixed: wrong core pointer usage in miSpriteStoreColors
dix: bugfix in CheckCursorConfinement
removing MPX ifdefs
removing MPX event generation (using Xi solely now)
commit b88ad820fac81d0dfd557a384bf0406e8893e7af
Author: Alan Hourihane <alanh@fairlite.demon.co.uk>
Date: Wed Dec 13 12:13:11 2006 +0000
Set Int10Current->Tag for the linux native int10 module
Fixes bug #9296
(cherry picked from 731952c561a3972d09d1315f4fd31466e459ccb9 commit)
commit fb6d676de5aa606d943715437a12a68d9a41f386
Author: Eamon Walsh <ewalsh@moss-huskies.epoch.ncsc.mil>
Date: Tue Dec 12 16:17:51 2006 -0500
Add xserver object class to list of object classes.
commit 7b90944258eba66b61328480759833ad7589bcca
Author: Eamon Walsh <ewalsh@moss-huskies.epoch.ncsc.mil>
Date: Tue Dec 12 15:59:38 2006 -0500
Change MLS levels in config file contexts to more sane defaults.
commit 568c09481e5d62091d032837171a36f409f39379
Author: Eamon Walsh <ewalsh@moss-huskies.epoch.ncsc.mil>
Date: Tue Dec 12 15:59:08 2006 -0500
Split AssignClientState() into two routines, new routine is server-specific.
commit 62e7722ebd8d341a23eb56cb330eeb00e6a975a6
Merge: e124806994 f3c60900e5
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Tue Dec 12 13:54:33 2006 -0500
Merge branch 'XACE-SELINUX' into my-XACE-SELINUX
commit e124806994675e16ca8e3937388f2cadeb529fc3
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Tue Dec 12 13:35:22 2006 -0500
Remove trailing whitespace (whitespace police).
commit ca77c121075a9de1f47d42f6aaf91c20185231de
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Tue Dec 12 13:26:52 2006 -0500
Naming change: Security*Operation -> Xace*Operation
commit a60da1db7cced28c07960a713eb18deb45beb432
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Wed Nov 29 22:19:57 2006 -0500
Add required root window context to config file.
commit 5719afe6d3a246985709e6f045617c1e16a7da51
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Thu Oct 26 20:20:57 2006 -0400
Change symbol in libaudit library test.
commit 354c80da66af141e8ba6d75fed75a0f482987956
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Thu Oct 5 16:07:26 2006 -0400
Improve error handling, messages during initialization.
commit 3714d9149928754afcd6b2466a1371ca32e17985
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Wed Oct 4 16:23:35 2006 -0400
Experimental window property holding security context.
commit 7f16c38ae2b47b195609d8fedefb7b28f612b2d4
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Fri Sep 8 15:31:18 2006 -0400
Add SELinux extension configure-time support.
commit a7f4bbea87ada1d699bfd9e3b6a98f06191650f6
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Fri Sep 8 15:17:01 2006 -0400
Add SELinux extension to the module/extension loader.
commit 28e80cd65b1207b123c02f895851bb6d207aa3c1
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Fri Sep 8 15:15:19 2006 -0400
Add SELinux extension configure-time support.
commit 83aad2be8a80890f349c2f9caf84786333f7cc8c
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Fri Sep 8 15:11:04 2006 -0400
Add SELinux extension source files.
commit 81281cb298a5825bc7a2e692375a86199293bbbe
Author: Alan Hourihane <alanh@fairlite.demon.co.uk>
Date: Tue Dec 12 11:28:24 2006 +0000
Fix bad commit
commit 792e0f71c6a435b2e28f8a4cdcc790f3b982e62c
Author: Alan Hourihane <alanh@fairlite.demon.co.uk>
Date: Mon Dec 11 14:54:49 2006 +0000
Fix Xming fails to use xkb bug
bug #5049 (Colin Harrison)
commit 27d4b84f268ac21601f7f52a7e257f70753396b3
Author: Alan Hourihane <alanh@fairlite.demon.co.uk>
Date: Mon Dec 11 14:50:08 2006 +0000
Fix Tooltip from minimized clients
Bug #3678 (Colin Harrison)
commit ae3c24da34cd8eeb77a6389861856fd51e0841f5
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Mon Dec 11 18:09:59 2006 +1030
dix: Moving SpriteRec into DeviceIntRec
removing global sprite structure
beginning to remove MPX ifdefs
xnest: Fix to make xnest compile again
commit fb8364bca30fe9268e807b0a9a3ebf875ee1fce2
Author: Adam Jackson <ajax@benzedrine.nwnk.net>
Date: Sun Dec 10 11:24:05 2006 -0500
Accept EDID > 1.3 but < 2.0 if we find it, assume it's compatible.
commit e1f73d220873fa091695e46b7fcd008663a95a6f
Merge: 27d682fa03 d56249a15e
Author: Ian Romanick <idr@us.ibm.com>
Date: Fri Dec 8 17:24:15 2006 -0800
Merge branch 'master' of ssh+git://idr@git.freedesktop.org/git/xorg/xserver into pci-rework
Conflicts:
hw/xfree86/common/xf86Configure.c
hw/xfree86/common/xf86Helper.c
hw/xfree86/common/xf86pciBus.c
hw/xfree86/int10/helper_exec.c
hw/xfree86/os-support/bus/Pci.c
hw/xfree86/os-support/bus/linuxPci.c
hw/xfree86/os-support/linux/lnx_pci.c
hw/xfree86/scanpci/Makefile.am
hw/xfree86/utils/pcitweak/Makefile.am
hw/xfree86/utils/scanpci/Makefile.am
commit d56249a15ead51ad4d2117d5538ada24af05b693
Merge: f1f8df1889 ec84f72d07
Author: Jeremy C. Reed <reed@glacier.reedmedia.net>
Date: Fri Dec 8 15:52:37 2006 -0600
Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver
commit f1f8df1889ab656bb57596e2f85408f15f42cd5d
Author: Jeremy C. Reed <reed@glacier.reedmedia.net>
Date: Fri Dec 8 15:51:44 2006 -0600
For MANDEFS, also replace __mandir__ for $(mandir) which includes
the prefix. Noticed wrong path to man pages on both Ubuntu and on
NetBSD with pkgsrc.
commit ec84f72d077eaf2e7768a1f5398f65a5e1714d08
Author: Daniel Stone <daniel@fooishbar.org>
Date: Fri Dec 8 21:31:47 2006 +0200
XkbCopyKeymap: always initialise map and preserve
If we don't have map or preserve in the source map, make sure the
destination is initialised to NULL, and freed if it's a valid type.
commit e59aeac1ff13ea53f44dba1ac7800f37f4532ca1
Author: Daniel Stone <daniel@fooishbar.org>
Date: Wed Dec 6 23:44:06 2006 +0200
xfree86: remove stray debug line
commit 729fca33a417ae3dfb180caf0ea8946ef9eee1df
Author: Michel Dänzer <michel@tungstengraphics.com>
Date: Thu Dec 7 12:09:18 2006 +0100
Revert "xfree86 DDX: Delete DDX screens in ddxGiveUp()."
This reverts commit a6381e69845f58d2b3282992b1f881015190f1bc.
See https://bugs.freedesktop.org/show_bug.cgi?id=9224 .
commit 4ea6dfb984063117eef5c2f931205b1c3eb3108b
Author: Daniel Stone <daniel@fooishbar.org>
Date: Wed Dec 6 23:24:39 2006 +0200
whitespace police
commit 4cba1a1ebfbdd7ab489b1b1ffb6656cbe88eb61e
Author: Daniel Stone <daniel@fooishbar.org>
Date: Wed Dec 6 23:21:38 2006 +0200
config: bus reconnect support
Add support for reconnecting to the bus when it restarts.
commit 0c5dab5c8eaa174f28054b9d20244a709c015210
Author: Daniel Stone <daniel@fooishbar.org>
Date: Wed Dec 6 23:21:15 2006 +0200
config: move config.h to hotplug.h
Also, move configInitialise to after OsInit, since the next commit will
make it use a timer.
commit 72e7f2ac6cf0db474d0defa7918f2a3ba76c0e46
Author: Daniel Stone <daniel@fooishbar.org>
Date: Wed Dec 6 23:18:52 2006 +0200
GetPointerEvents: always send valuator events for MotionNotify
Always chase a DeviceMotionNotify event with a DeviceValuator, which is
not required in the spec, but will silently break the lib if you don't
include.
commit c458a70d650bd62b8f4706f022d1f3f347636db1
Author: Daniel Stone <daniel@fooishbar.org>
Date: Wed Dec 6 20:30:44 2006 +0200
GetPointerEvents: fix typo
Fix typo that resulted in inverted axes when using an absolute positioning
device that didn't report y, and thus relied on the previous value.
commit edabf45425f9ed79547f918cc0dfff4c268de386
Author: Daniel Stone <daniel@fooishbar.org>
Date: Sat Dec 2 16:37:19 2006 +0200
configure.ac: add CONFIG_LIB to Xvfb
commit 8724af248cd6c93182fecd060fed09a556361080
Author: Daniel Stone <daniel@fooishbar.org>
Date: Sat Dec 2 16:20:34 2006 +0200
kdrive/mga: fix compiler warning
Change a case that only made one test for an if, preventing the compiler
warning about all other PICT_* types being unsupported.
commit 2f0a800ffdc881cdb3adf84f1ed97bbb63cba34c
Author: Daniel Stone <daniel@fooishbar.org>
Date: Mon Nov 27 22:22:53 2006 +0200
config: move to block/wakeup handler
commit 99378b58dbc63160382ad9c41f9cb0dd2a24e9d1
Author: Daniel Stone <daniel@fooishbar.org>
Date: Mon Nov 27 22:22:33 2006 +0200
kdrive/tslib: remove vendor-specific hacks
Parts of the KDrive merge accidentally contained a bunch of
vendor-specific hacks; sorry.
commit 8884a73a3f4efa8276c5e38b9573201574c4f1f6
Author: Daniel Stone <daniel@fooishbar.org>
Date: Mon Nov 27 22:39:56 2006 +0200
xfree86/input: re-add support for disabling drag events
commit f2903c12bb4bb0b7c94b96c55af8fa55507f9d7d
Author: Daniel Stone <daniel@fooishbar.org>
Date: Tue Nov 7 11:13:32 2006 +0200
SyntheticMotion: don't dereference sprite.screen when not using Xinerama
(cherry picked from aa052e43c6c293e14f78837e00c6b7581f9713bb commit)
commit d17ec01e8395a8f14b75a10c8bf082b3f5a4fb36
Author: Daniel Stone <daniel@fooishbar.org>
Date: Fri Dec 1 00:41:41 2006 +0200
remove CID support (bug #5553)
Remove CID from all our fontpaths.
(cherry picked from 69820a10e33e4582c192360996e866007114639d commit)
commit abe5e079af715713097ab0daad29a3e9f523c398
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Wed Dec 6 07:58:03 2006 -0800
Update pci.ids to 2006-12-06 from pciids.sf.net
commit 724f9cb578086e8483a2d0636dd6eb05d664d31c
Author: Aaron Plattner <aplattner@nvidia.com>
Date: Tue Dec 5 13:44:05 2006 -0800
Bug #9219: Use pWin->viewable instead of pWin->realized to catch InputOnly windows too.
commit 3690de9b1b0902d395bc7d071fc05ebc8f75be2b
Author: Aaron Plattner <aplattner@nvidia.com>
Date: Tue Dec 5 12:42:12 2006 -0800
Bug #9219: Return BadMatch when trying to name the backing pixmap of an unrealized window.
Before this change, ProcCompositeNameWindowPixmap would name the screen pixmap
if !pWin->realized.
commit eb1d9f51af19dab20a95c2830ca1c508d8ee66bb
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Tue Dec 5 18:50:19 2006 +1030
Ironing some glitches caused by the merge
commit 3c8f166022a2d19af14eb670fa382503ba1451cd
Merge: 2a511492f9 f9f7d7f3be
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Tue Dec 5 18:28:33 2006 +1030
Merge branch 'master' of git://anongit.freedesktop.org/git/xorg/xserver into mpx
Conflicts:
dix/events.c
commit 2a511492f9a235d3f5390ab87b6c643cbea92d88
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Tue Dec 5 15:45:18 2006 +1030
Xi: adding MPX checks to ProcessOtherEvents
mpx: adding QueryPointer request and reply
adjusting names of requests to Xlib compatible naming (xMPX*** instead of
mpx***)
commit f9f7d7f3be53c808abb5eaceb7a1abc55744a210
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Mon Dec 4 13:36:30 2006 -0800
Check for __sparc as well as __sparc__ for compatibility with Sun cc
(gcc defines __sparc__, Sun cc defines __sparc)
commit ac90ce58ba1da3ed605adf75f4d54c34b578c402
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Fri Dec 1 21:12:21 2006 -0500
Naming change: Security*Operation -> Xace*Operation
commit f44f14fe564d834568a0afefba944223a73ea0f5
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Fri Dec 1 20:48:15 2006 -0500
Define calls away when not building XACE, allowing ifdef's to be removed.
commit a5d6499d666fea4a9988118ddd3a5e4c9cfcc32c
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Fri Dec 1 16:42:37 2006 -0800
Fix syntax error in configure check for SYSV_IPC that broke with Sun cc
commit 89b2aa9be81613cb1a06bd535bf50ecf2a00208d
Author: Keith Packard <keithp@guitar.keithp.com>
Date: Mon Nov 27 21:40:24 2006 -0800
Destroying RandR crtc or output overwrites memory.
RRCrtcDestroyResource and RROutputDestroyResource had matching
bugs that would overwrite memory past the end of the storage
of the crtc or output arrays. Oops.
(cherry picked from 4202b23ed86405a4cebfdcf239df1b023c1d10ca commit)
commit 23ba72323af785516db6cbcf6c1b2fa907a8232f
Author: Keith Packard <keithp@ukulele.keithp.com>
Date: Thu Nov 30 23:16:42 2006 -0800
RandR ListOutputProperties has nAtoms element, not nProperties
Earlier RandR 1.2 encoding revisions used 8-bit nProperties field.
Final RandR 1.2 spec uses 16-bit nAtoms field instead.
(cherry picked from 66b6358a393972946f16394918db2401c51dc5ed commit)
commit 416f1bb99a6d4557f2863ae941868e47e11bbb3b
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Fri Dec 1 15:56:52 2006 +1030
mpx: SelectEvents and GetEventBase requests.
Some renaming and cleaning up in extinit.c
MPXLastEvent added
Xi: ShouldFreeInputMask() from XI is not static any more, used in mpx
dix: GetPointerEvents() allocates MPX event for MPX devices.
DeliverDeviceEvents() caters for MPX devices.
commit ccd804c6c01cdfffe938fa5336be9b5668a6f0c0
Merge: 9423ac134a 82912ad770
Author: Drew Parsons <drew@pug.localdomain>
Date: Fri Dec 1 15:21:57 2006 +1100
Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver
commit 9423ac134a2a9800787c4978d384827cc4e61fc8
Author: Drew Parsons <drew@pug.localdomain>
Date: Fri Dec 1 15:21:05 2006 +1100
GNU/FreeBSD support in GLX: include byteswap.h for FreeBSD systems
defining __GLIBC__, as done already for Linux and Hurd (cf. bug #5613).
Also includes some more __GNU__ checks on top of those made in
commit ade4bf09076d13dbf3549c0a2d987a0afe76d5c1.
Thanks Petr Salinger (Debian bug #400869).
commit 82912ad7709e8cf4a5f8a9fa6b47f789842a3fe9
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Thu Nov 30 20:13:52 2006 -0800
Make solaris version of xf86OSRingBell return void like other OS'es
commit 8956f63a941bf0a5f157d47b33e6221601a75040
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Thu Nov 30 19:53:29 2006 -0800
Tell automake to STFU about the *.O files
automake will not stop whining about the *.O files not being in normal library
name format, so just tell automake they are PROGRAMS so it builds them without
bitching.
commit f3c60900e575e65254cd2576cc6c90b97c8f63ae
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Wed Nov 29 22:19:57 2006 -0500
Add required root window context to config file.
commit 143558500a89a5c887c75c03798bae68c953cac9
Merge: e3d3d29db5 ee9bdd3f4a
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Wed Nov 29 20:41:41 2006 -0500
Merge branch 'master' into my-XACE-SELINUX
commit ee9bdd3f4a14a42fb0747acc420966f0f669129b
Author: Aaron Plattner <aplattner@nvidia.com>
Date: Wed Nov 29 12:01:43 2006 -0800
Add DIX_CFLAGS to util builds.
Fixes a build breakage when $(top_srcdir) != $(top_builddir) because
-I$(top_srcdir)/include is missing for the cvt, ioport, pcitweak, and scanpci
builds.
Signed-off-by: Adam Jackson <ajax@nwnk.net>
commit a6381e69845f58d2b3282992b1f881015190f1bc
Author: Michel Dänzer <michel@tungstengraphics.com>
Date: Wed Nov 29 19:25:09 2006 +0100
xfree86 DDX: Delete DDX screens in ddxGiveUp().
This allows video drivers to clean up in the FreeScreen hook things they set up
in the PreInit hook.
commit afd6af65510b0147f16f08314045b3506bfa9d89
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Wed Nov 29 17:55:15 2006 +1030
mpx: Infrastructure for MPX extension, GetExtensionVersion request works.
commit b0c8558b9d9a9984c0067960392e28f5a7622b29
Author: Keith Packard <keithp@neko.keithp.com>
Date: Sun Nov 26 19:31:48 2006 -0800
Ensure RandR resource types are registered before resources are created.
Now that resources can be created during server initialization, make sure
the crtc, output and mode resource types are created before attempting to
create associated resources.
(cherry picked from commit ec83d674167e7045d5317b179c9998e3172a26dc)
commit 6245e9dd4719c5dc15ff45d49cf626123794038b
Author: Keith Packard <keithp@neko.keithp.com>
Date: Tue Nov 21 16:52:28 2006 -0800
Allocate correct size for RRPropertyRec (oops).
Neglected to change the allocation size from sizeof (PropertyRec) to
sizeof (RRPropertyRec). Lots of fun crashes this way.
(cherry picked from commit 0626eb8e5c9fa05de6bdc9aa0c654f5148bf7cff)
commit 24abce8032940e96bb2ccf9e463a7fff6f36283a
Author: Keith Packard <keithp@neko.keithp.com>
Date: Tue Nov 21 01:15:26 2006 -0800
Change RandR property datatype to include pending/valid values.
This patch tracks the protocol changes which introduce more complex
semantics for RandR output properties including pending and valid value
information.
(cherry picked from commit af55c65bea40669fdc038aa34c6a1ec9ecb33e87)
commit f62ac3ec39c6593df476985c630e499864c19c72
Author: Eric Anholt <eric@anholt.net>
Date: Tue Nov 28 10:31:40 2006 -0800
Separate DDC mode list creation from MonPtr creation.
This will be used by the intel driver, and likely other RandR 1.2 drivers.
commit fbd09443385c533416fa530399d54f130afaf985
Author: Eric Anholt <eric@anholt.net>
Date: Tue Nov 28 10:15:51 2006 -0800
Replace bad mode name-setting code with xf86SetModeDefaultName().
commit 4ad0bde661be2af4a17771d66066d49736e85cbe
Author: Eric Anholt <eric@anholt.net>
Date: Tue Nov 28 10:12:02 2006 -0800
Clean up a bunch of long lines and trailing whitespace.
commit 05778432dc6e688bc0beff0c20ffd7e27b74888e
Author: Eric Anholt <eric@anholt.net>
Date: Tue Nov 28 10:07:57 2006 -0800
Move code to get a mode list from EDID data from ddcProperty.c to edid_modes.c.
commit 38ecc66cd9c61346a46697bbf1d8319f4f6f9800
Author: Eric Anholt <eric@anholt.net>
Date: Tue Nov 28 10:06:15 2006 -0800
Typo that was missed in testing.
commit 834e4b079866594b50be64ae79f3cb2a5baa2070
Author: Matthias Hopf <mhopf@suse.de>
Date: Tue Nov 28 18:57:13 2006 +0100
Fix potential NULL pointer access in timer code.
https://bugzilla.novell.com/show_bug.cgi?id=223718
commit bdf718907b3202815a04ec28a868689708f43da9
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Tue Nov 28 18:06:34 2006 +1030
dix: missing parameter to SetCursorPosition in CheckMotion ifndef MPX
mi: missing include in misprite.c ifndef MPX
commit e88bc0e55a6937ff0b47fe38f60bfa8991196578
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Tue Nov 28 14:34:36 2006 +1030
mi: Bugfix: FreeCursor ignores negative refcounts.
mieq: Bugfix: Motion notifies did overwrite DeviceMotionNotifies
commit 5dbcd34a0a6c0d10dbfea8fdc9d7dfe7a0261b19
Author: Eric Anholt <eric@anholt.net>
Date: Mon Nov 27 16:26:14 2006 -0800
Register dependency on new RandR protocol.
commit 16f8f10dc2106bc6253b2d89a1f8efee8d80e2ba
Author: Eric Anholt <eric@anholt.net>
Date: Mon Nov 27 16:21:31 2006 -0800
Move mode handling helpers from ddcProperty.c to xf86Mode.c.
commit b4b0d901d98371a8aa7b17d195e18e83e2a6a618
Merge: 64de3baf85 d6cd0313c7
Author: Eric Anholt <eric@anholt.net>
Date: Mon Nov 27 15:43:15 2006 -0800
Merge branch 'randr-1.2'
Conflicts:
dix/events.c
dix/getevents.c
hw/xfree86/common/xf86Mode.c
hw/xfree86/dri/Makefile.am
hw/xfree86/os-support/drm/xf86drm.c
hw/xfree86/os-support/xf86drm.h
commit d6cd0313c7f23f32c9c7dda00ff739e772bf7db3
Author: Eric Anholt <eric@anholt.net>
Date: Mon Nov 27 14:46:50 2006 -0800
Add some mode helper functions from the intel driver.
This also removes static from some other functions that had been copied out
to at least the intel driver, but perhaps others that were doing mode list
handling.
commit 85ea408e38f452bcf9109f14fd1016d159692a99
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Mon Nov 27 18:07:16 2006 +1030
mi: malloc checks for misprite and midispcur, code cleanup
removed IsMPDev()
commit 023da4e804ad260eaf0c50d2ec7213dd514e2113
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Mon Nov 27 15:54:33 2006 +1030
mi: mipointer.c cleanup, reducing code duplication, using MPHasCursor()
instead of IsMPDev()
commit a2340a73687dfd93affb6de28a33d73fd808c96b
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Mon Nov 27 14:47:23 2006 +1030
mi: free allocated memory in miDCCloseScreen and in miDCInitialize in case
of errors.
Some copyright notices.
misprite.c passes DeviceIntPtr around and down to DC (previously
miCursorInfoPtr and the plain device id).
Large cleanup in misprite.c to avoid code duplication.
commit 1c7568b8a1417257fa67c7fca69aa253099b9461
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Thu Nov 23 17:15:14 2006 +1030
mi: closing memory leak, miPointer is freed in miPointerCloseScreen
bugfix: uninitialized pPointer in miPointerGetPosition ifndef MPX
adding DeviceIntPtr parameter to ScreenRec's cursor functions.
cleanup of miPointer code to use same scheme in each function
dix: MPHasCursor() function determines checking whether to invoke
cursor rendering.
animcur: adding DeviceIntPtr parameter to cursor functions but animcur relies
on the core pointer right now.
xfixes: adding DeviceIntPtr parameter to cursor functions but xfixes relies on
the core pointer right now.
rac: adding DeviceIntPtr parameter to cursor functions but RAC relies on
the core pointer right now.
ramdac: adding DeviceIntPtr parameter to cursor functions but ramdac relies on
the core pointer right now.
commit 64de3baf85f6df274f71f736016f0848567cd9f6
Author: Aaron Plattner <aplattner@nvidia.com>
Date: Wed Nov 22 14:46:51 2006 -0800
Add a -showDefaultLibPath option.
A corollary to the previous change, this option prints $libdir.
commit 0a2a6e4070718b90af7ca0e047f028e0cabdfb9d
Author: Aaron Plattner <aplattner@nvidia.com>
Date: Fri Nov 17 18:27:23 2006 -0800
Add a -showDefaultModulePath option.
As discussed on the mailing list, people would rather have an X command-line
option to print the module path so installers can know where to put modules,
rather than the installers using `pkg-config --variable=moduledir xorg-server`,
since some distros choose not to install xorg-server.pc.
commit 61832cb94c8a4d62cddb92188caeed86519e9d62
Author: Brian <brian@i915.localnet.net>
Date: Wed Nov 22 09:16:43 2006 -0700
Regenerated from Mesa w/ latest gl_API.xml file
commit 61863f09d22935406371e92bb75173d55ff9b29f
Author: Brian <brian@i915.localnet.net>
Date: Wed Nov 22 09:16:17 2006 -0700
Regenerated from Mesa, fixes glMap* protocol problem (bug 8899)
commit f52d53e060d0468b658a565688d1f92c156405c7
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Wed Nov 22 17:58:57 2006 +1030
dix: DeliverEventsToWindow adjusted for MPX
mi: sprite debugging disabled
commit 8c16f21d5df08b028e93440d632939a5fdbf5876
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Wed Nov 22 17:06:47 2006 +1030
dix GetSpriteWindow() adjusted for MPX
added device dependency for MPX to DoEnterLeaveEvents,
EnterLeaveEvents, EnterNotifies, LeaveNotifies and
FixUpEventFromWindow.
commit 70383105de279df553874efa56b37a7b3e426ea1
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Wed Nov 22 15:27:16 2006 +1030
mi: added DevToSprite() conversion function
fixed miSpriteRealize to use passed pDev argument instead of looping.
dix: changed sprite dependency and added MPX functionality to parts of
events.c (XineramaChangeToCursor, XineramaCheckPhysLimits,
XineramaConstrainCursor)
Xi: fix: accessing other->buttons for keyboard segfaulted the server
commit 33ff4cec5ff7533ec725f71d357c096dfb0acb79
Author: Alan Hourihane <alanh@fairlite.demon.co.uk>
Date: Tue Nov 21 21:23:17 2006 +0000
Issue CloseDownDevices() in os/log.c and remove from dix/main.c.
This ensures that all calls to FatalError() will shutdown the input devices.
commit efd4f3c6ffec804c68ba5df17cc117da264fb7c4
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Tue Nov 21 20:31:30 2006 +1030
dix: WindowsRestructured() calls CheckMotion() on all devices
mi: core pointer was checked twice in miSpriteReportDamage,
miSpriteInstallColormap, miSpriteStoreColors, miSpriteSaveDoomedAreas
and miSpriteRealiseCursor
using damage bug (see comment in file) to avoid artefacts
commit 9db851c22d4befb95bfb074b96620261d8e32ac9
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Tue Nov 21 18:15:04 2006 +1030
dix: moved sprite from static to be pointer of type SpritePtr
added SpriteRecs for MPX devices
changed sprite dependency and added MPX functionality to parts
of events.c (ConfineToShape, PostNewCursor, XineramaCheckMotion,
CheckMotion, XineramaChangeToCursor, ChangeToCursor, CheckPhysLimits,
PointerConfinedToScreen)
added DeviceIntRec param to GetSpritePosition(). This required some
minor changes in ddx, xtest, xkb and xfixes.
mi: changed miPointer to pointer instead of static struct.
commit fd8b9a6eaee28a453a00af14195b81ef1890a577
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Tue Nov 21 15:24:43 2006 +1030
TAG: MPX_BEFORE_DIX_API_BREAK
commit 447efdc01d4f8922205ba26e52c9e5ff9f5cb90e
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Tue Nov 21 14:46:00 2006 +1030
mi: constrain MPX cursors to screen
commit 1107d8bea22eea26f7b666f1c00a53360b7d237e
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Tue Nov 21 14:00:46 2006 +1030
mi: added device ID to miSpriteCursorFuncRec functions
added MPX code to midispcur.c
BUG: Core pointer changes whenever MPX cursor changes shape.
commit 3bad452d12d620df91b1f37d06c650ded96bfafe
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Tue Nov 21 11:26:21 2006 +1030
mi: added MPX to miSpriteReportDamage
added id field to miCursorInfoPtr, required to pass through to miDC
core pointer uses mpCursors array as well.
added miDCBufferRec for future use with MPX
TAG: MPX_BEFORE_MIDC_API_BREAK
commit b1bbdf464d2f8799fa3429c1c27ca998c5f3e94a
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Mon Nov 20 17:58:30 2006 +1030
mi: added MPX to miSprite functions.
NOTE: This version will render multiple cursors but with an artefact each time
when devices alternate.
commit 7b4b619d4c268804199f9f4775eb56604f0b80e8
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Mon Nov 20 13:10:07 2006 +1030
mi: moved core pointer information from miSpriteScreenRec into a
miCursorInfoRec.
bugfix in mipointer, semicolon after preprocessor statement
commit ca2874b273232d9f51881b1cd754ed6847bfaf47
Merge: c9a5f9d391 e2f6dacc73
Author: Alan Hourihane <alanh@fairlite.demon.co.uk>
Date: Sat Nov 18 19:56:32 2006 +0000
Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver
commit c9a5f9d3911c2e6a8f81b0721c9eb914fb7719b5
Author: Alan Hourihane <alanh@fairlite.demon.co.uk>
Date: Sat Nov 18 19:55:42 2006 +0000
Shutdown input devices if FatalError occurs during startup.
Fixes Xdmx problems when the input device has been initialized
and the keyboard map has been destroyed.
commit e2f6dacc736527790ed8e304698678afc17f71c6
Author: Dave Airlie <airlied@linux.ie>
Date: Sat Nov 18 11:26:55 2006 +1100
dri: setup libdrm hooks as early as possible.
This is due to radeon doing drm stuff before DRI extension gets initialised
commit 90bea69dfdd63f58ee326887359ad1b35a31cb5f
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Fri Nov 17 18:03:43 2006 +1030
mi:
added miCursorInfoRec to contain info of the MPX cursors.
calling miUpdatePointerSprite() from event queue for MPX devices.
adding device-specific processing to miPointer*() functions.
dix: Call to SetCursorPosition in CheckMotion() temporarily disabled.
xfree86/common: call to miPointerUpdateSprite() disabled, is done from the EQ
NOTE: This build will not display cursor images.
BUG: The second mouse does to take correct x coordinates.
commit 94e106a898c44daeb228bcb031b85f996ddc96b0
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Fri Nov 17 15:10:37 2006 +1030
dix: moved isMPdev field to end of _DeviceIntRec structure
mi:
added miMPPointers array to mipointer.c
added DeviceIntPtr to all miPointerSpriteFuncs. Coming from miPointer
we use inputInfo.pointer as standard value. ABI BREAK!
ramdac:
forcing failed HW Cursor initialisation. MPX needs software rendering.
changes to use new miPointerSpriteFunc (this required externing
inputInfo, should probably be fixed at a later point).
RAC: changes to use new miPointerSpriteFuncs.
commit ef47d9c3ba63e9a6243fe5c81ccc60c8246352b4
Author: Keith Packard <keithp@neko.keithp.com>
Date: Thu Nov 16 13:50:48 2006 -0800
Reduce calls to RRGetInfo.
RRGetInfo can be expensive. Don't invoke it when quering Xinerama
information or setting a new CRTC configuration.
(cherry picked from commit b5aa9eb8e6eda36856a075f4b008c33f6c706bad)
commit 07b26e690cd9a4fc626132feed0702515cbe5a88
Author: Keith Packard <keithp@neko.keithp.com>
Date: Thu Nov 16 09:48:33 2006 -0800
Remove RandR output options.
RandR output options are now expected to be handled by properties instead.
(cherry picked from commit 8b2a7e94a1dc2776ab2cfaaebb309be02502602a)
commit f17e3c34dfd1f1418440bdebf45764e4dbf550f0
Author: George Sapountzis <gsap7@yahoo.gr>
Date: Thu Nov 16 02:18:03 2006 +0200
Fix GL context destruction with AIGLX.
The logic for freeing GL contexts introduced by "Fix AIGLX VT switching." is
inverted. As it is now, GL context destruction is deferred for glxDRIEnterVT().
commit ae3c9ad4abe66784d7ee474455003d2745699286
Author: Bjorn Helgaas <bjorn.helgaas@hp.com>
Date: Thu Nov 16 17:29:06 2006 +0100
Bug 9041: Check the return code in xf86MapDomainMemory().
commit 5388423eb05daefcc71067b6ab96b6e57c44ef5c
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Thu Nov 16 20:43:27 2006 +1030
mieq: EQ processing handles MP devices
global: MPX define added to xorg-server.h.in
xfree86/common: small fix to avoid byte overflow
commit c957a16180810fbd58526e1a670d82384fb4a61d
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Thu Nov 16 15:11:14 2006 +1030
dix: added isMPdev field to _DeviceIntRec, is used in GetPointerEvents()
mieq: avoid merging events from different devices in mieqEnqueue()
xfree86/common
isMPdev field used from xf86ActivateDevice(), xf86PostMotionEvent()
and xf86PostButtonEvent()
commit 7ce2dc57844872cc340b60387d4d1cb3d982633e
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Thu Nov 16 12:51:08 2006 +1030
dix:
merge with code cleanup from master
GetPointerEvents treats events in the same way as XINPUT devices when flag
has POINTER_MULTIPOINTER set.
xfree86/common:
added XI86_MP_DEVICE flag and parsing in xf86ProcessCommonOptions
added POINTER_MULTIPOINTER define. Is used in xf86PostMotionEvent and
xf86PostButtonEvent for the flags that are passed into GetPointerEvents()
global:
added flags to configure.ac to enable/disable MPX define
added flags to dix-config.h.in to define MPX
commit 4d07b503727ba86315b90d6f45b06ed6185724b2
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Thu Nov 16 10:55:15 2006 +1030
dix: cleaned up GetPointerEvents() to avoid code duplication.
commit 6ff7f2ad6a5e2e769244590578e6809974b5235d
Author: Eric Anholt <eric@anholt.net>
Date: Tue Nov 7 13:13:53 2006 -0800
Fix build on FreeBSD after input-hotplug.
(cherry picked from commit 4e6e4baead6c565363abbcd9e06cc685be121596)
commit bffb1f9b67c8d3d264c0c3fd703cf7e57dcdf7b7
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Wed Nov 15 17:53:13 2006 +1030
removed unused variables drag and local from xf86PostMotionEvent
commit f737cd925efe452787443b039ae65b8d85081bb3
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Wed Nov 15 17:50:02 2006 +1030
o fix minor error in comment for GetPointerEvents()
commit 2eab230d9bd3f73ffe1b5a42111f89e85904ee11
Author: Jeremy C. Reed <reed@glacier.reedmedia.net>
Date: Tue Nov 14 16:37:18 2006 -0600
For NetBSD, define PCVT_SUPPORT (System has PCVT console).
Noticed by Joerg Sonnenberger. This fixes problem with console
switching.
This was in original imake NetBSD.cf.
commit 26d2e45bdb0cf4d18ba7b0365425da49d60b3d5c
Author: Matthias Hopf <mhopf@suse.de>
Date: Tue Nov 14 15:33:07 2006 +0100
Bug #9023: Only check mice for "mouse" or "void" if identifier is != NULL.
commit a724b7f1302ba7a59f140b521f13d2ddf0fcf9bf
Merge: 6facd958c2 f80a8ae6e6
Author: Jeremy C. Reed <reed@glacier.reedmedia.net>
Date: Mon Nov 13 20:32:26 2006 -0600
Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver
commit 6facd958c2e7098cb68eac2810a88b8cd40f19c0
Author: Jeremy C. Reed <reed@glacier.reedmedia.net>
Date: Mon Nov 13 20:23:06 2006 -0600
On DragonFLy, default to /dev/sysmouse (just like on FreeBSD).
TODO: use autoconf to handle this so the code is not platform
based but feature based.
commit f80a8ae6e6820378ea70ac0849cee8bf3055e0e8
Author: Adam Jackson <ajax@benzedrine.nwnk.net>
Date: Mon Nov 13 18:26:05 2006 -0500
Disable Xprt server build by default.
commit 5bfe7f4dfc6ab51b6790d74faf11574385234423
Author: George Sapountzis <gsap7@yahoo.gr>
Date: Mon Nov 13 01:54:32 2006 +0200
DRI: call drmSetServerInfo() before drmOpen().
Also, remove some libdrm remnants.
commit acb5ff4c73ac4d52201d7c421f488e2ead5c8b9c
Author: Jurij Smakov <jurij@wooyd.org>
Date: Sat Nov 11 14:09:15 2006 +0200
ffs: handle 0 argument (bug #8968)
Handle an argument of 0 in ffs(), instead of looping indefinitely.
Add an ffs prototype to dix.h, and add includes to ffs.c.
(cherry picked from 34164e551e4c3909322d50b09835ca4ac1d49d68 commit)
commit ca094684196886a4a1c10273049fae0705a3edc2
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Fri Nov 10 18:02:05 2006 -0800
Correct symlink-mesa.sh usage message
commit 28337cc1060bc08adef81c304dd9ed02d0a0e37b
Author: Eric Anholt <eric@anholt.net>
Date: Thu Nov 9 19:51:17 2006 -0800
Fix typo before the last commit.
commit e1720b1089328af80ca0cb85e5289ced05263f95
Author: Eric Anholt <eric@anholt.net>
Date: Thu Nov 9 18:53:37 2006 -0800
Bug #8868: Remove drm from SUBDIRS now that the directory is gone.
commit 0dee48b8af3e054228aef0d15c1cb1c9e23790cc
Author: Keith Packard <keithp@mandolin.keithp.com>
Date: Wed Nov 8 23:17:55 2006 -0800
Add RRInit function to create resource types for RR objects.
To allow RandR objects to be created before the screen object exists,
the resource types must be registered with the resource database.
A driver wishing to create RandR objects must call RRInit before doing so.
Also, fix a segfault when setting Output data before it is associated with a
screen.
commit ec77a95a02329a2ee3a94d7de9d2a234aecb9ca0
Author: Keith Packard <keithp@mandolin.keithp.com>
Date: Wed Nov 8 21:36:35 2006 -0800
Allow RandR objects to be created before the associated ScreenRec.
xf86 drivers need to create RandR object in the PreInit stage,
before the ScreenRec is allocated. Changing the RandR DIX code
to permit this required the addition of functions that later associate the
objects with the related screen.
An additional change is that modes are now global, and no longer associated
with a specific screen. This change actually makes mode management cleaner
as there is no more per-screen list of modes to deal with.
This changes the RandR 1.2 ABI/API for drivers.
commit fd91630b73100e9d77ccb492c52807448bc772a5
Author: Dave Airlie <airlied@linux.ie>
Date: Thu Nov 9 09:30:33 2006 +1100
make X server use system libdrm - this requires libdrm >= 2.3.0
This patch blacklists the load "drm" line, moves some functions in dri module
links dri module against libdrm, and removes the X copy of libdrm
commit 0409e1627a167db2efc1355f292d3c02a6989ffc
Author: Adam Jackson <ajax@benzedrine.nwnk.net>
Date: Wed Nov 8 16:17:20 2006 -0500
'make dist' fixes.
commit 7e0aeebb8f8a5dff3cb4d88756e535dd70edeec4
Author: Adam Jackson <ajax@benzedrine.nwnk.net>
Date: Wed Nov 8 12:03:37 2006 -0500
Bug #6786: Use separate defines for server's Fixes support level.
commit b5d09d4adb8088719ff494a4281a793717046576
Author: Rich Coe <Richard.Coe@med.ge.com>
Date: Wed Nov 8 18:10:14 2006 +0200
CheckConnections: don't close down the server client (bug #7876)
When an appgroup is shutting down, the list of clients can change, so make
sure we're not trying to shut the server down.
commit 0567a6337b84fa045b5732e98203f488274aa2a2
Author: Bram Verweij <amverweij@gmail.com>
Date: Wed Nov 8 18:00:52 2006 +0200
xfree86/linux acpi: fix tokenising
Split on a space, rather on the 'video' string, as strtok takes a char,
not a string.
commit e7900d68c3ee657158813f0650886d680c0a9a3c
Author: Daniel Stone <daniel@fooishbar.org>
Date: Wed Nov 8 15:36:47 2006 +0200
remove trailing whitespace
Whitespace police in full effect.
commit 2035f115b7db3c4b7deabeab0d814b3107d6ef30
Author: Daniel Stone <daniel@fooishbar.org>
Date: Wed Nov 8 15:28:10 2006 +0200
xfree86: remove xf86Keymap.h
commit 809e2841aaa54662a42498aacec558bc813bba1c
Author: Daniel Stone <daniel@fooishbar.org>
Date: Wed Nov 8 15:27:58 2006 +0200
xfree86: add general handler, port ACPI to it (bug #5665)
Add 'general' handler registration, which will not trigger DPMS when an
event comes in.
Make ACPI use this.
commit b5438f7fb2879e0226b578f60b22a490e73c3a83
Author: Daniel Stone <daniel@fooishbar.org>
Date: Wed Nov 8 15:24:58 2006 +0200
Get*Events: massive reorganisation
Reorganise the code logically, and put more comments in.
Clip valuators in proximity calls.
commit b0a7443ca8bd224994f98c1c1e25de88f2573224
Author: Daniel Stone <daniel@fooishbar.org>
Date: Wed Nov 8 15:23:52 2006 +0200
configure.ac: axe redundant SDL test
commit 332f179db7c38310db1f752d45f51b6d8301fd30
Author: Daniel Stone <daniel@fooishbar.org>
Date: Wed Nov 8 15:23:35 2006 +0200
kdrive/sdl: fix compilation
commit 988757a44197c91027109076e2e33ff6510ed71d
Author: Daniel Stone <daniel@fooishbar.org>
Date: Wed Nov 8 14:06:51 2006 +0200
config: error messages non-fatal, and before we free them
Move error messages before we free the error structure, and make them all
non-fatal.
commit e2b78df5800fb4e3f0ed01b38a1974ba3577949c
Author: Daniel Stone <daniel@fooishbar.org>
Date: Tue Nov 7 11:13:56 2006 +0200
xkb: warning fix
commit b55007d8cc9d20baa23d5de67683e414c827d3e5
Author: Daniel Stone <daniel@fooishbar.org>
Date: Tue Nov 7 11:13:32 2006 +0200
SyntheticMotion: don't dereference sprite.screen when not using Xinerama
commit f93d10ce9bb4a6de83b561f44fb7b046def16234
Author: Daniel Stone <daniel@fooishbar.org>
Date: Mon Nov 6 18:33:45 2006 +0200
dix: remove staggeringly broken vendor workarounds
Dear SGI,
No.
Scant regards,
Daniel
commit 389275d240e4ba19d62fda0f138a45c7ecb245ff
Author: Daniel Stone <daniel@fooishbar.org>
Date: Sun Nov 5 02:47:59 2006 +0200
XkbCopyKeymap: don't iterate broken types, or dereference null pointers
Don't iterate invalid destination types (>= num_types) when coping key
types.
Don't free key_aliases if it's NULL (theoretical, but sure).
Make sure dst's label_font gets allocated if it's NULL.
(Thanks, Chris Lee.)
commit d585b4189aff8d7952847f75b19b4f092ab3b88b
Author: Daniel Stone <daniel@fooishbar.org>
Date: Sat Nov 4 21:47:55 2006 +0200
xkb: fix uninitialised warning
Fix uninitialised warning with memset(); we never actually use it
uninitialised, but gcc doesn't know that.
commit b6d7b537ed8975363ad0f7c4180a62822358e418
Author: Daniel Stone <daniel@fooishbar.org>
Date: Sat Nov 4 21:43:22 2006 +0200
os: fix sun extensions test
'else if' is not very valid, plus the logic is kind of broken, so just
move it outside the ifdef in the first place.
commit 8ba0c7b62c78dead722b0c8aa414f37bac4414b7
Author: Daniel Stone <daniel@fooishbar.org>
Date: Sat Nov 4 21:41:03 2006 +0200
xace: avoid 'unused variable pScreen'
Initialise pScreen explicitly, as REGION_* macros ignore pScreen.
commit c3ea1f7db494365032526dc06a7283384bd0ecd1
Author: Daniel Stone <daniel@fooishbar.org>
Date: Sat Nov 4 21:38:31 2006 +0200
dix/mi: still more warning fixes
Fix up prototypes for PrintChildren and PrintWindowTree in the dix.
Make miPrintRegion be unconditionally defined, and move the prototype into
regionstr.h.
Change a bunch of ScreenPtr pScreen = foo; to
ScreenPtr pScreen; pScreen = foo; in window.c, so we avoid unused variable
references (as inline REGION_* doesn't reference pScreen).
commit 3a9b96425851b495503bd2eb0fd0d01c08f6a097
Author: Daniel Stone <daniel@fooishbar.org>
Date: Sat Nov 4 21:33:09 2006 +0200
dix: add missing prototypes
Add missing prototype for ffs, and include headers from ffs.c.
Move PostSyntheticMotion prototype to input.h.
commit 6716488fa256798070017232405b107d5c985479
Author: Daniel Stone <daniel@fooishbar.org>
Date: Sat Nov 4 21:30:23 2006 +0200
dix: remove unused debug code
commit 51813d77bfb84609a58a98e678efe9b6c0bf5503
Author: Daniel Stone <daniel@fooishbar.org>
Date: Sat Nov 4 21:29:05 2006 +0200
dix: remove unused variable
commit 844090a5b557705dd0adce2b7ed98813b5104d85
Author: Daniel Stone <daniel@fooishbar.org>
Date: Sat Nov 4 21:21:29 2006 +0200
xfree86/xf86misc: warning fixes
commit 61b570d0c1eb448f0aa08b4598118f0d43bc7345
Author: Daniel Stone <daniel@fooishbar.org>
Date: Sat Nov 4 21:21:09 2006 +0200
xfree86/os-support: update prototype for OSRingBell
commit c51fadc07d938f6a3edfd5620170fcb7d6486a11
Author: Daniel Stone <daniel@fooishbar.org>
Date: Sat Nov 4 21:20:45 2006 +0200
mieq: annotate with some more comments
commit 578899139f133746634a7bf8845e25362b5dfca2
Author: Daniel Stone <daniel@fooishbar.org>
Date: Sat Nov 4 20:35:55 2006 +0200
RemoveGeneralSocket: don't touch EnabledDevices
RemoveGeneralSocket. Harmless, but.
commit ae58d349c1cf5d63ad3616c485baa858350978d5
Author: Laurence Withers <l@lwithers.me.uk>
Date: Sat Nov 4 19:34:37 2006 +0200
CreateColormap: fix return value (bug #7083)
Return BadMatch when an unsupported visual type is given, not BadValue --
this is correct according to the spec.
commit 96f78e3886791b723ccd9ba40bea701603537b0c
Author: Erik Andren <erik.andren@gmail.com>
Date: Sat Nov 4 19:29:49 2006 +0200
remove XFree86 changelogs (bug #7262)
Without being able to tie these to specific commits, the text changelog is
useless, as well as being huge.
commit 5a40448f2d0ac2c86c617bebe3fb649174bf0d7f
Author: Eric Anholt <eric@anholt.net>
Date: Tue Nov 7 15:48:05 2006 -0800
A couple more cases of error message before freeing strings.
commit 05f1c302460a14c8fa9a943a12d69adcd3c30d58
Merge: 3e7e0e3509 46af6d1e95
Author: Adam Jackson <ajax@benzedrine.nwnk.net>
Date: Tue Nov 7 18:42:54 2006 -0500
Merge branch 'autoconfig-for-7.2'
commit 3e7e0e35094d09e0e764818ed125314be75be01a
Author: Eric Anholt <eric@anholt.net>
Date: Tue Nov 7 14:13:23 2006 -0800
Report the error before freeing the error strings.
commit 4e6e4baead6c565363abbcd9e06cc685be121596
Author: Eric Anholt <eric@anholt.net>
Date: Tue Nov 7 13:13:53 2006 -0800
Fix build on FreeBSD after input-hotplug.
commit 20e9144c0746943624ff77a61791b8596f3f8458
Author: Keith Packard <keithp@neko.keithp.com>
Date: Tue Nov 7 12:49:28 2006 -0800
Add $(DIX_CFLAGS) to remaining Makefile.am files
commit 5e946dd853a4ebc2722ae023429ce5797de3d7a6
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Tue Nov 7 13:50:19 2006 -0500
Bug #8937: Extension setup functions not called on server resets
commit 1dcda4f3c56214464c0b6123fea6daa69aae69fc
Author: Keith Packard <keithp@neko.keithp.com>
Date: Tue Nov 7 01:29:51 2006 -0800
Avoid dereferencing sprite.screen when Xinerama is not running. (#8925)
With Xinerama support built into the X server but not in use,
sprite.screen is NULL and yet the SyntheticMotion
macro would dereference it. Avoid that by just passing sprite.screen
to PostSyntheticMotion which can then dereference it when Xinerama is
enabled.
Also, define PostSyntheticMotion in dixevents.h and include dixevents.h in
getevents.c
commit c20d3bf7533da0bf26beaf7d8c359d18edbd70e8
Merge: 028bbdc041 3d39c02fe6
Author: Keith Packard <keithp@neko.keithp.com>
Date: Tue Nov 7 01:21:28 2006 -0800
Merge branch 'origin' into randr-1.2
commit 3d39c02fe6aaa602c52f1d4f0ea6cd3bd000cf9f
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Mon Nov 6 21:25:52 2006 -0500
More work on Bug #8875: revert previous fix and try using client argument
instead of serverClient. Also don't use totalClientSize as it is not
initialized until after the first call to InitClient.
commit 75fe0670eb1f71144246f1c20759d58788bbee00
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Mon Nov 6 15:30:25 2006 -0500
whitespace adjust
commit 0539d9cf2423fc0bed6f5c413beba3080f8abd85
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Mon Nov 6 15:29:17 2006 -0500
Bug #8875: Security extension causes Xorg to core dump on server reset
commit aa0261a98e9d5b1349b33e2639bd83c556dd4000
Author: Juliusz Chroboczek <jch@pps.jussieu.fr>
Date: Mon Nov 6 02:29:49 2006 +0100
Improve vm86 error handling in Xvesa.
commit 6b2c65fdd169037c6ede250d4a8fec3d29a080ae
Author: Juliusz Chroboczek <jch@pps.jussieu.fr>
Date: Mon Nov 6 00:30:09 2006 +0100
Fix typo in Xvesa: incorrect reporting of DAC capabilities.
commit 028bbdc0417173803695808ba9f48498519273a3
Merge: 50504c68e1 8deaaa312a
Author: Keith Packard <keithp@neko.keithp.com>
Date: Sat Nov 4 17:46:26 2006 -0800
Merge master back to randr-1.2
commit 50504c68e1d407232cf83465981b235e542ef31f
Merge: 8b87ce1974 cde8806c29
Author: Keith Packard <keithp@neko.keithp.com>
Date: Sat Nov 4 17:43:19 2006 -0800
Merge branch 'randr-1.2-origin' into randr-1.2
commit 8b87ce19741753eafbd99e7093bc3dea8f26e838
Author: Keith Packard <keithp@neko.keithp.com>
Date: Sat Nov 4 17:41:25 2006 -0800
Allow X server to build against libdrm 2.1
commit 7ffbe9d232e3a4621a204448d67e434736465cbe
Author: Keith Packard <keithp@neko.keithp.com>
Date: Sat Nov 4 17:41:09 2006 -0800
Add DIX_CFLAGS to hw/vfb/Makefile.am
commit 2db62bce0725ba2d88cbe40fc440b6bda45046f3
Author: Keith Packard <keithp@neko.keithp.com>
Date: Sat Nov 4 17:40:34 2006 -0800
Define fbHasVisualTypes in fb.h as it is exported
commit 8deaaa312ad7f9b492a2ae8ad17d74650112c25c
Author: Bernhard Rosenkraenzer <bero@arklinux.org>
Date: Sat Nov 4 18:59:39 2006 +0200
automake: avoid use of reserved _SOURCES keyword (bug #8866)
Avoid using _SOURCES unless we're directly referencing a program or
library to be built; use _SRCS instead. Shuts automake 1.10 up.
commit f72927d26cd112d321f7bf187df3c740b3129d22
Author: Samuel Thibault <samuel.thibault@ens-lyon.org>
Date: Sat Nov 4 19:00:57 2006 +0200
xfree86/hurd: remove OsMouseProc (bug #5613)
Remove OsMouseProc, let the mouse driver deal with it.
commit 0273610578485564c3c0be11b336b6554cc31b43
Author: Samuel Thibault <samuel.thibault@ens-lyon.org>
Date: Sat Nov 4 19:02:04 2006 +0200
xfree86/hurd: add bell support, remove SERVER/LOADER defines (bug #5613)
Add no-op bell ringing support, and remove obsolete @SERVER_DEFINES@ and
@LOADER_DEFINES@ from CFLAGS.
commit ade4bf09076d13dbf3549c0a2d987a0afe76d5c1
Author: Samuel Thibault <samuel.thibault@ens-lyon.org>
Date: Sat Nov 4 19:03:13 2006 +0200
mesa/indirect: include byteswap.h on GNU userland (bug #5613)
Include byteswap.h on all GNU-userland systems (including with the Hurd
and FreeBSD kernels), not just Linux.
commit 412e93349e1656c9650115328af4be0e59a66f74
Author: Samuel Thibault <samuel.thibault@ens-lyon.org>
Date: Sat Nov 4 19:05:02 2006 +0200
kdrive: make building of Linux support conditional (bug #5613)
Only try to build Linux support on Linux. We should probably disable all
OS-dependent DDXes if we don't have a workable OS (and only build
Xephyr/Xfake), but that's future work.
commit cde8806c2930788ba8076e94651d391e45f3ccdb
Author: Eric Anholt <eric@anholt.net>
Date: Fri Nov 3 16:36:34 2006 -0800
Don't bump the refcnt if the new mode is NULL.
commit 97fd471a627be185bee8cda3f709cfccea3fa12d
Author: Aaron Plattner <aplattner@nvidia.com>
Date: Fri Oct 27 12:36:56 2006 -0700
Fix standard VESA modes.
The built-in mode timings were off slightly for the 640x480@60, 640x480@72,
and 1024x768@75 modes.
commit 22ee2e4e1f1d9fd9ca9f25c9bf25370034b771d4
Merge: 49a26681b2 bd0c829654
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Fri Nov 3 12:54:56 2006 -0800
Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver
commit 49a26681b2bdd95ed65c425f1fa1441d2f092a6e
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Fri Nov 3 12:54:43 2006 -0800
Add DTrace probe points for X server <-> client communications
See http://people.freedesktop.org/~alanc/dtrace/ for more details
commit bd0c829654903ca45543dfa59cda967c4fafd8ac
Author: Bjorn Helgaas <bjorn.helgaas@hp.com>
Date: Fri Nov 3 18:54:06 2006 +0100
Do not map full 0-1MB legacy range
If we're mapping something in the "legacy range" (0-1Mb), we shouldn't
expand the requested range to the entire 0-1Mb range. Typically this
is for mapping the VGA frame buffer, and some platforms support mmap of
the frame buffer but not the entire 0-1Mb range.
For example, HP sx1000 and sx2000 ia64 platforms can have memory from
0-0x9ffff, VGA frame buffer from 0xa0000-0xbffff, and memory from
0xc0000-0xfffff. On these platforms, we can't map the entire 0-1Mb
range with the same attribute because the memory only supports WB,
while the frame buffer supports only UC. But an mmap of just the
frame buffer should work fine.
commit c1828a8ff51c8db326c47e6710f4f42fab94fb6d
Author: Egbert Eich <eich@freedesktop.org>
Date: Fri Nov 3 18:32:48 2006 +0100
Fixing mach64 driver bailing out on ia64
Mach64 driver bails out on ia64 because it cannot map device
memory. It turns out that some bogus and unneeded code attempts
to find the root bridge of the device and fails to do so proberly
as there this host-to-pci bridge is not existant. This code has
been around for years although it completely unclear what it had
been intended for. Fixing this by eliminating the bogus code.
commit d50fc413b39f52663b46084c28e81fc4933a7b49
Author: Matthias Hopf <mhopf@suse.de>
Date: Thu Nov 2 18:53:41 2006 +0100
Fix device path in altixPCI.c to be domain aware.
commit 1d731fc54a2cf5d3f353d8ee1c7c4989df27f011
Author: Matthias Hopf <mhopf@suse.de>
Date: Thu Nov 2 18:50:15 2006 +0100
Add domain support to linuxPciOpenFile().
Loosely based on patch from David S. Miller <davem@davemloft.net>
See also bug #2368.
commit caaa113acf4144fd47a1ac93ca440d78d1983e54
Author: Matthias Hopf <mhopf@suse.de>
Date: Thu Nov 2 18:38:45 2006 +0100
Fixing domain support for ia64
ia64 specific functions + defines.
Still uses /proc interface for some scaning code.
Based on code from Egbert Eich <eich@freedesktop.org>.
commit 16c5043fc0c84b14323cd211c2645106455ac320
Author: Matthias Hopf <mhopf@suse.de>
Date: Thu Nov 2 18:22:09 2006 +0100
Fix 2 warnings.
commit 072c022e731c3aadf34096f16364e29df47280d2
Author: Matthias Hopf <mhopf@suse.de>
Date: Thu Nov 2 17:58:19 2006 +0100
Fix obviously wrong boundary checks + cleanup unused vars.
Also disable compilation of code that is no longer used anywhere in the whole
Xserver tree.
commit 5afc6c1a14fea2966017493b045fa7209faeb8eb
Author: Matthias Hopf <mhopf@suse.de>
Date: Thu Nov 2 15:42:03 2006 +0100
Added linux 2.6 compatible domain aware device scanning code.
Additional scanning code uses the /sys interface of 2.6 kernels.
Cleaned up the use of tags and already split domain/bus/dev/fn.
commit 6319f7d713971f70f06166480f069eca3bcace36
Author: Egbert Eich <eich@freedesktop.org>
Date: Thu Nov 2 12:50:52 2006 +0100
Make int10 fully domain aware.
commit f4dd2665b0f9aa9c00a5152c73bc72cb7514eeb5
Author: Matthias Hopf <mhopf@suse.de>
Date: Thu Nov 2 12:36:12 2006 +0100
Added missing domain stripping in already domain aware code.
commit 46901063e8edc82b67989f4e5eec39d17c67dc98
Author: Matthias Hopf <mhopf@suse.de>
Date: Thu Nov 2 12:25:03 2006 +0100
Build with -D_PC on ix86 only.
commit 543b397277d1f03b8091e44812010abcd5d80102
Merge: 4056e6e79a 645d057620
Author: Keith Packard <keithp@neko.keithp.com>
Date: Thu Nov 2 19:00:35 2006 -0800
Merge branch 'origin' into randr-1.2
commit 037f23e6f8fbe6e6fc8e71ed21958fc553df72d0
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Thu Nov 2 18:30:58 2006 -0800
Convert Xprt DDX to new motion history api
commit 7dc54a40e900cbea1e509620623b091d54a3c2d1
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Thu Nov 2 16:38:47 2006 -0800
Remove references to xf86Info.kbd* from solaris code
commit e46f7f78b362e76f5a553184e3f5ec7e109aa39d
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Thu Nov 2 16:38:12 2006 -0800
sun_bell.c needs to #include "xf86_OSlib.h"
commit 58bf9a142d1957f4d77038ee4ce7b1116b1f7955
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Thu Nov 2 14:43:02 2006 -0800
PostSyntheticMotion needs to be extern, not static, since it's in getevents.c
commit 1ecd45fb8e4250fb51daa2bdf1a960af0f8b53fb
Author: Daniel Stone <daniel@fooishbar.org>
Date: Thu Nov 2 04:51:03 2006 +0200
Makefile.am: add config to DIST_SUBDIRS as well
commit 01afa533aa872d1a101a41153f95d800e68fea3e
Author: Daniel Stone <daniel@fooishbar.org>
Date: Thu Nov 2 04:32:37 2006 +0200
xfree86/os-support: axe more unused files
commit 57c1409151cb1f6e0e528fb92ebda58f86f12c1a
Author: Daniel Stone <daniel@fooishbar.org>
Date: Thu Nov 2 04:21:06 2006 +0200
xfree86/os-support: remove unused file from dist
commit de5a4c63747a417cdece919f4fb5a4004a3ee7bb
Author: Daniel Stone <daniel@fooishbar.org>
Date: Thu Nov 2 04:18:33 2006 +0200
xkb: note that we allow full xi interaction
We now allow maps to be set (etc) on different keyboards, so stop putting
XkbXI_KeyboardsMask in unsupported.
commit 1d65429a9e03871969552d0c31b022546cc46b12
Author: Daniel Stone <daniel@fooishbar.org>
Date: Thu Nov 2 04:12:55 2006 +0200
xfree86: don't attempt to enable and disable non-DIX devices
Don't try to enable and disable devices with no entry in the DIX, such as
the evdev brain.
commit 64139c1950ea825c0a0124abc5f88499e91f797f
Author: Daniel Stone <daniel@fooishbar.org>
Date: Thu Nov 2 03:22:09 2006 +0200
bump to 1.2.99.0
commit 18c246a13b887b865de6a17e6cd1c259b9bc383d
Merge: 794f2e7291 4843d823f4
Author: Daniel Stone <daniel@fooishbar.org>
Date: Thu Nov 2 03:21:37 2006 +0200
Merge branch 'input-hotplug'
commit 4843d823f4d38d8bd468ce3a8feddbff229ed416
Merge: ba9f5138fc a7b944f0d9
Author: Daniel Stone <daniel@fooishbar.org>
Date: Thu Nov 2 03:18:13 2006 +0200
Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver into input-hotplug
commit ba9f5138fc32a7a7b97bcf941bc92751b7c6c2c0
Author: Daniel Stone <daniel@fooishbar.org>
Date: Thu Nov 2 03:16:10 2006 +0200
xfree86: allow starting with no input devices
Add a server flag (AllowEmptyInput), which will inhibit adding the
standard keyboard and mouse drivers, if there are no input devices in the
config file.
commit be291a6d9764cf29a7d9a8114d47d9f41ce856e9
Merge: a2d6242106 6fdfd9dad9
Author: Daniel Stone <daniel@fooishbar.org>
Date: Thu Nov 2 03:15:25 2006 +0200
Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver into input-hotplug
commit a7b944f0d96c3e0e15e75378a04def1ac96089fb
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Wed Nov 1 16:17:49 2006 -0800
If getpeerucred() is available, include pid & zoneid in audit messages too
commit fbfb35189ef6666707097704b43e052cb2f919ae
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Wed Nov 1 15:11:48 2006 -0800
Bug #1997: AUDIT messages should contain uid for local accesses
<https://bugs.freedesktop.org/show_bug.cgi?id=1997>
commit a2d6242106bb3a440faa9cad157e0120dbfa7b6e
Author: Daniel Stone <daniel@fooishbar.org>
Date: Thu Nov 2 00:46:33 2006 +0200
kdrive:remove Change{Keyboard,Pointer}Device
This was removed in the DIX, so just axe it.
commit d9a5e3e964b6c91fbca88b50674fce9660b972a4
Author: Daniel Stone <daniel@fooishbar.org>
Date: Thu Nov 2 00:45:23 2006 +0200
XkbCopyKeymap: be more careful with levels, allocate compat/geom
Take various extra precautions with copying levels across (thanks Chris
Lee for a gdb session), including allocating when we don't already have a
coherent map.
Only free type components if they're present.
Allocate geometry and compat components if we don't already have them in
the dest map.
commit 6fdfd9dad91d7b7aa292f8c4d268dd27c34de8d3
Author: Eric Anholt <eric@anholt.net>
Date: Wed Nov 1 14:29:59 2006 -0800
Fix several cases where optimized paths were hit when they shouldn't be.
This fixes a number of rendercheck cases.
commit 40f84793bca40dcc6883d51aefa1bda44bd1ac61
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Wed Nov 1 14:34:46 2006 -0800
Propogate $LIBS for xtrans, clock_gettime, libm, etc. to libs used for each server
commit d7d931abe01a8cf555b027f2bcfcccd5e9053e52
Author: Daniel Stone <daniel@fooishbar.org>
Date: Wed Nov 1 23:48:58 2006 +0200
configure.ac: remove check for rate/period
Keyboard stuff is now handled in the kbd driver.
commit 81728558a044fdde0e1d63da7b6314755f77296e
Author: Daniel Stone <daniel@fooishbar.org>
Date: Wed Nov 1 23:10:26 2006 +0200
input: add non-keyboard bell ringing function
Add a generic 'ring the bell' function (console bell on Linux and BSD,
/dev/audio on Solaris), and add DDX functions for this. Make this the
core keyboard's bell.
Port Xvfb and Xnest to this.
Port XFree86 to this, with OS-specific hooks for Linux, BSD, and Solaris
taken from foo_io.c in the old layer.
commit 3df454719f9cbf6a046cb7458019ec621b3b42ee
Author: Daniel Stone <daniel@fooishbar.org>
Date: Wed Nov 1 23:02:57 2006 +0200
kdrive: add KdRingBell prototype
commit 4056e6e79a4e37101d298ae29139c83d3816368b
Author: Keith Packard <keithp@mandolin.keithp.com>
Date: Wed Nov 1 00:29:46 2006 -0800
Move physical size from mode to output.
Modes can be shared across different sized monitors this way.
Also caught some missing byteswapping and an incorrect return type.
commit c03311a1e78daa291477a67b1bb7206772108c5d
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Tue Oct 31 16:05:48 2006 -0800
Fix automake error: BUILT_SOURCES was defined multiple times on Solaris
commit a2434ec5f3c9dc79d1f05c2d704a82a766718ed4
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Tue Oct 31 15:57:59 2006 -0800
Make _POSIX_C_SOURCE hack work with Solaris headers
Solaris headers are very literal - if you ask for POSIX_C_SOURCE 199309L,
they limit to only the functions in that standard and no more, unless you
also specify __EXTENSIONS__ to allow functions beyond the standard base.
commit 645d0576205532a3610ae351267d5b84d76236bd
Author: Matthieu Herrb <matthieu.herrb@laas.fr>
Date: Sun Oct 29 18:19:56 2006 +0100
Handle building in a separate objdir
commit 59584c375f4e4b2670a92002ecb7a78a0bc50cce
Author: Matthieu Herrb <matthieu.herrb@laas.fr>
Date: Sun Oct 29 17:49:46 2006 +0100
kill GNU-make'ism.
commit 0107320fac0913aae2cb169992e31c670b4bd2f7
Merge: 06b6b971d0 a34446f5b3
Author: Thomas Hellstrom <thomas-at-tungstengraphics-dot-com>
Date: Sun Oct 29 15:23:35 2006 +0100
Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver
commit 06b6b971d065226b983ba25da7ea8236ec37df04
Author: Thomas Hellstrom <thomas-at-tungstengraphics-dot-com>
Date: Sun Oct 29 15:22:37 2006 +0100
Make sure we have 64-bit file-offsets in libdrm.
commit 644ee2434a4e09f5baea00a486911f8c24b9a261
Author: Daniel Stone <daniel@fooishbar.org>
Date: Sun Oct 29 03:52:11 2006 +0300
kdrive: avoid null dereferences
Avoid jumping into NULL pointers for OS or card functions which do not
exist.
commit 738d2e88171bcce8782d670a1cda9a1d941d7977
Author: Daniel Stone <daniel@fooishbar.org>
Date: Sun Oct 29 03:48:02 2006 +0300
kdrive: move bell ringing into an OS function
Move the bell into an OS function, and use that if it's declared; else,
fall back to using the driver's function.
Remove the Linux keyboard bell function; just move it into the OS layer.
Use named initialisers when converting the old structures, and eliminate
unused functions.
commit 96e32805d12fc36f0fa0926dbfb0dd8a5cadb739
Author: Daniel Stone <daniel@fooishbar.org>
Date: Sun Oct 29 03:43:34 2006 +0300
Xi: disallow changing core keyboard and pointer
Just short-circuit the change core keyboard/pointer requests.
commit 68f595ca6c7883e030947b7f95c50e92aa733f2b
Author: Daniel Stone <daniel@fooishbar.org>
Date: Sun Oct 29 03:41:34 2006 +0300
GetTimeInMillis: use correct units for clock_gettime
Make sure we're treating the nanoseconds as a long, not an int, so we
don't overflow.
commit 51a06b3c44509c72279b5cfcf2b52b9a35c461b0
Author: Daniel Stone <daniel@fooishbar.org>
Date: Sun Oct 29 03:40:57 2006 +0300
WaitForSomething: only rewind when delta is more than 250ms
Only rewind time when we're more than (original delta + 250ms) away from
executing the timer.
When we're walking the timer list, use a goto to iterate all of them from
the start again, since timers may drop out of the list.
Don't bother trying to be smart in TimerSet, we'll pick it up in
WaitForSomething anyway.
commit a34446f5b3d90714969a90583c49cb1eae1c9651
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Fri Oct 27 13:43:43 2006 -0400
Add missing file to list in Makefile.am
commit 92d04e746bd9b8ad3ee217c165ace20468e079cf
Author: Thomas Hellstrom <thomas-at-tungstengraphics-dot-com>
Date: Fri Oct 27 18:26:30 2006 +0200
Import libdrm functions for the drm memory manager.
commit e3d3d29db5eef057b4e8294377c9c3147436bc2f
Merge: 92387e99d0 004d00e668
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Thu Oct 26 20:21:16 2006 -0400
Merge branch 'master' into my-XACE-SELINUX
commit 92387e99d085b0b081fcedb2f20304eb0ac536b1
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Thu Oct 26 20:20:57 2006 -0400
Change symbol in libaudit library test.
commit 196c5836f463c28f633bbba847f59acd5935359d
Author: Daniel Stone <daniel@fooishbar.org>
Date: Fri Oct 27 01:27:31 2006 +0300
CoreKeyboardProc: annotate with FIXME
Setting an empty keymap by default isn't wildly useful.
commit f9a1e456f8a4eaa1a9c71fd0fe5231140975c22d
Author: Daniel Stone <daniel@fooishbar.org>
Date: Fri Oct 27 01:25:39 2006 +0300
CoreKeyboardProc: don't leak keymap and modmap
SetKeySymsMap does a copy here, so try not to leak them.
commit a5be65401769fabcb5001dc63035c69f9e4a2712
Author: Daniel Stone <daniel@fooishbar.org>
Date: Fri Oct 27 01:25:21 2006 +0300
mieqEnqueue: only compare DEVICE_BITS of deviceid
Only compare DEVICE_BITS of the two deviceids, so we don't decide that
a valuator event isn't for us, because (id | MORE_EVENTS) != id.
commit 85212eb504f860b054eb0f0a5029fed86cb8d1c0
Author: Daniel Stone <daniel@fooishbar.org>
Date: Fri Oct 27 01:23:58 2006 +0300
getValuatorEvents: make sure we put MORE_EVENTS in the right places
Make sure we put MORE_EVENTS in with the device id if there are, in fact,
more valuator events coming.
commit 794f2e7291ccb4e48f9fbfc8f08302e3aac0f79f
Author: Myron Stowe <myron.stowe@hp.com>
Date: Thu Oct 26 20:38:58 2006 +0300
xfree86: re-enable chipset-specific drivers for Linux/ia64
Re-enable chipset-specific support for Linux/ia64, by linking in
lnx_ia64.c.
commit 8c0556e7cb1de8c387ddd886a03a8f8afff1fd0e
Merge: cdc8a4b7b2 004d00e668
Author: Daniel Stone <daniel@fooishbar.org>
Date: Thu Oct 26 15:21:22 2006 +0300
Merge branch 'master' into input-hotplug
commit 004d00e6689f452fc9fdf91f5ffc6d6aed697d54
Author: Daniel Stone <daniel@fooishbar.org>
Date: Thu Oct 26 01:10:08 2006 +0300
GetTimeInMillis: simplify monotonic test
We don't actually need to get the CPU clock ID, which means we don't need
the monotonic_usable test. Since there's now only one branch, the
compiler will treat that as likely, so we don't need xproto 7.0.9 anymore.
The fallthrough to gettimeofday() is preserved.
commit cdc8a4b7b2f099b8860a54c5c9f488e6f7c4913a
Merge: 3da918a16c d285833290
Author: Daniel Stone <daniel@fooishbar.org>
Date: Thu Oct 26 00:28:30 2006 +0300
Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver into input-hotplug
commit d285833290316cb5dd1e7f1e52c96be3e9cf21cd
Author: Daniel Stone <daniel@fooishbar.org>
Date: Wed Oct 25 23:57:00 2006 +0300
GetTimeInMillis: spuport monotonic clock
Add support for CLOCK_MONOTONIC from clock_gettime, and use that in
GetTimeInMillis() if available, falling back to the old gettimeofday()
implementation.
This is _slightly_ faster on some 64-bit architectures, and _slightly_
slower on others (though barely measurable).
commit d3e57faffee63df1424a209d0418d3a712f91ae6
Author: Daniel Stone <daniel@fooishbar.org>
Date: Wed Oct 25 23:55:43 2006 +0300
WaitForSomething: allow time to rewind
If time rewinds dramatically, reset all the timers to fix their expiry.
commit e21604914dccece6bc64c69b55512d1f1a969235
Author: Keith Packard <keithp@neko.keithp.com>
Date: Wed Oct 25 09:48:23 2006 -0700
Merge master back in and clean up some unfinished code (closes 8745)
commit becbda6d519a11c2c211afb8d46f9ea1a2676bc3
Author: Michel Dänzer <michel@tungstengraphics.com>
Date: Wed Oct 25 11:39:27 2006 +0200
Fix test for Option "IgnoreABI".
This option has plenty of potential for wasting the time of bug triagers
without pretending it's always on.
commit 59511974db843fa7e11133894cfc10c20fdaf60f
Merge: 054f8cd267 598ac7a836
Author: Keith Packard <keithp@neko.keithp.com>
Date: Tue Oct 24 17:26:20 2006 -0700
Merge branch 'master' into randr-1.2
commit 598ac7a83698327b607084abaebcbd22f8d25fbb
Merge: 828c34e83c 948a97b97e
Author: Keith Packard <keithp@neko.keithp.com>
Date: Tue Oct 24 17:23:12 2006 -0700
Merge branch 'origin'
commit 828c34e83ccdf3bcd2844d5af8b0cac4164b04ab
Author: Keith Packard <keithp@neko.keithp.com>
Date: Tue Oct 24 17:23:02 2006 -0700
Byte swap RRSelectInput enable flags.
commit 3da918a16c8908fdfaf89f2a1bcaec19e01528a9
Author: Daniel Stone <daniel@fooishbar.org>
Date: Wed Oct 25 02:22:07 2006 +0300
mipointer: remember to update pointer location
Update pointer location so it doesn't get quickly reset by the next
pointer update.
commit aabc087998e680c2fcf0ebc1c5022c1fe8f58f0c
Author: Daniel Stone <daniel@fooishbar.org>
Date: Wed Oct 25 02:21:39 2006 +0300
GetPointerEvents: always ensure correct number of events
Ensure correct number of valuator events are returned, and that we always
increment events correctly.
commit 65cd5aa4d754624566c2263015f1a018d137fce1
Author: Daniel Stone <daniel@fooishbar.org>
Date: Wed Oct 25 01:12:45 2006 +0300
kdrive/input: remove unnecessary #ifdef XINPUTs
Xi is now mandatory, so don't bother with the ifdefs.
commit 0514d53e10b3521bb708a9cbde4bab525248eadb
Author: Daniel Stone <daniel@fooishbar.org>
Date: Wed Oct 25 01:10:44 2006 +0300
xfree86: remove motion history handling
Remove motion history handling, as we now deal with this in the DIX.
commit b1debebf8fe20ded20ba27e871fd1a6a9de029e3
Author: Daniel Stone <daniel@fooishbar.org>
Date: Wed Oct 25 01:10:20 2006 +0300
mi: remove mi motion history
This is now unneeded as we do motion history in the DIX.
commit b9e180e632d04bf685ade9e32bd0b20882794486
Author: Daniel Stone <daniel@fooishbar.org>
Date: Wed Oct 25 01:09:19 2006 +0300
port all users to the new DIX motion history API
Port KDrive, Xvfb, and Xnest, as well as the virtual core devices, to the
new motion history API. Make GetPointerEvents also update the history.
commit 5b38eb69cdaa154791c7f74e35dbe4d3256b19bd
Author: Daniel Stone <daniel@fooishbar.org>
Date: Wed Oct 25 01:08:29 2006 +0300
dix: add motion history support
Add motion history support (sort of based on the XFree86 DDX's
implementation) to the DIX.
commit 11fb58be77ac163844e494b2b0a260cf28a7ecd1
Author: Daniel Stone <daniel@fooishbar.org>
Date: Wed Oct 25 01:07:36 2006 +0300
miscellaneous warning fixes
Use the correct type for time, and fix the mi prototype of EnqueueEvent.
commit 2a74b8a91da1a98669993078f7fe9081f2d743ce
Author: Daniel Stone <daniel@fooishbar.org>
Date: Wed Oct 25 01:04:53 2006 +0300
xfree86: re-bump input abi to 1.0, yet again
commit 37d1fffe79c35ada056ce9a56292c000014fe48a
Author: Daniel Stone <daniel@fooishbar.org>
Date: Tue Oct 24 23:06:57 2006 +0300
inputstr: try to keep device structs the same size
Try to make sure DeviceIntRec and friends stay the same size,
regardless of whether or not XKB is enabled.
commit 9f9ac01a819ee96fb5be5d7d346c91f461bf3979
Author: Daniel Stone <daniel@fooishbar.org>
Date: Tue Oct 24 23:01:05 2006 +0300
inputstr: fix indentation
commit 27d682fa030501611a5b52f41f29738134b45c0b
Author: Ian Romanick <idr@us.ibm.com>
Date: Tue Oct 24 09:04:14 2006 -0700
Fix from HEAD accidentally reverted during merge.
commit 8b909135664abb69ada522e8e39495d9eca717ac
Merge: 21291d6ca7 948a97b97e
Author: Ian Romanick <idr@us.ibm.com>
Date: Tue Oct 24 08:57:59 2006 -0700
Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver into pci-rework
Conflicts:
hw/xfree86/Makefile.am
hw/xfree86/common/xf86.h
hw/xfree86/common/xf86DoScanPci.c
hw/xfree86/os-support/bus/linuxPci.c
hw/xfree86/scanpci/extrapci.ids
hw/xfree86/scanpci/pci.ids
hw/xfree86/scanpci/pciid2c.pl
hw/xfree86/scanpci/xf86PciStdIds.h
commit 0cd6a3d8efb5cc1ce4f85ab95bcdf4fb66c7245d
Author: Daniel Stone <daniel@fooishbar.org>
Date: Mon Oct 23 06:56:07 2006 +0300
xfree86/input: add proximity support, free valuators
Re-add support for proximity events, and remember to both va_end our
varargs, and free our valuators.
commit cccf7ae0ff24d0c84b5144c457f3f86bbbc36e12
Author: Daniel Stone <daniel@fooishbar.org>
Date: Mon Oct 23 06:55:21 2006 +0300
GetProximityEvents: add (untested) function
Add untested first guess at what GetProximityEvents should look like.
commit 35fa4ac12b3da33f81e2a12bc9661ed075f323ed
Author: Daniel Stone <daniel@fooishbar.org>
Date: Mon Oct 23 06:23:45 2006 +0300
GetPointerEvents: break into separate functions
Break out clipAxis, clipValuators, and getValuatorEvents, into
separate functions, to be used by the proximity event code.
commit a7c2d9a15dc2ff253bb69c3b0738ad993521b9c7
Author: Daniel Stone <daniel@fooishbar.org>
Date: Mon Oct 23 06:08:27 2006 +0300
kdrive: numerous warning fixes
commit c8f76fb3a473a022d497bd0acd6c84f58fc6efbe
Author: Daniel Stone <daniel@fooishbar.org>
Date: Mon Oct 23 05:12:15 2006 +0300
xfree86/input: disallow pointer device changes, fix drag event calculation
Don't allow users to change the core pointer.
Fix xf86SendDragEvents to check the device button state, not the core
pointer's.
Remove unused xf86CheckButton.
commit c5b5b046e86b159a9d32451308f38246cc4587f7
Merge: fab1d37ecb 948a97b97e
Author: Daniel Stone <daniel@fooishbar.org>
Date: Mon Oct 23 02:58:30 2006 +0300
Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver into input-hotplug
commit fab1d37ecbeee9777ad1485b0cc62b55042d5014
Author: Daniel Stone <daniel@fooishbar.org>
Date: Mon Oct 23 02:57:00 2006 +0300
xfree86/options: don't blindly dereference NULL pointers
Sure, conf_idev should be initialised, but if it's not, try to make the
best of a bad situation.
commit 523fe64ba16cf7a40f4095432d81300726d83e8d
Author: Daniel Stone <daniel@fooishbar.org>
Date: Mon Oct 23 02:56:28 2006 +0300
kdrive/lots of DDXes: make stubs use KdOsAddInputDrivers()
In theory, removing LinuxPciScan should make these drivers OS-independent.
commit 57f98e2b72d5c7fea93a9f6da86228ffb4856bf3
Author: Daniel Stone <daniel@fooishbar.org>
Date: Mon Oct 23 02:55:41 2006 +0300
kdrive/tslib: port to new absolute API, remove debugging
Port to new absolute device (not touchscreen) API, and remove some
leftover debugging.
commit a6dc629052f0ad509cfa30e98217043a63c09552
Author: Daniel Stone <daniel@fooishbar.org>
Date: Mon Oct 23 02:54:59 2006 +0300
kdrive/os: add KdOsAddInputDrivers
Add KdOsAddInputDrivers, which adds all relevant input drivers.
Could possibly be refactored to KdAddInputDrivers, which called through
OsFuncs to a new function, if it existed.
commit ac240b00ff6fc354c1aa641406ae8b49244c0b8b
Author: Daniel Stone <daniel@fooishbar.org>
Date: Mon Oct 23 02:54:07 2006 +0300
kdrive/input: use Absolute instead of Touchscreen
Adjust to suit Zepheniah's new absolute device API.
commit b1ba4b3e8ad427af1fa8618b0bd839f741ec2ce3
Author: Daniel Stone <daniel@fooishbar.org>
Date: Mon Oct 23 02:53:15 2006 +0300
kdrive/neomagic: include vesa.h, use DebugF
commit 29f28dd1a8a7ed07e945a67946e3510f4b32d12a
Author: Daniel Stone <daniel@fooishbar.org>
Date: Mon Oct 23 02:52:52 2006 +0300
configure.ac: add XSERVER_LIBS to XNEST_LIBS
commit 2f33f4065d89ae2b6fdda43c7105d72f89920cae
Author: Daniel Stone <daniel@fooishbar.org>
Date: Mon Oct 23 02:52:35 2006 +0300
Xnest: port to new input API
Port Xnest to Get{Pointer,Keyboard}Events, plus the new mieq API.
commit 08928afb0500d46b0caa0a1d1244dee2ed80e6a0
Author: Daniel Stone <daniel@fooishbar.org>
Date: Mon Oct 23 02:51:52 2006 +0300
Xnest: disable XKB, reshuffle code
Disable XKB, as we can't yet use it; move Composite disabling to
ddxInitGlobals, along with XKB.
commit cd3b16a57efaf89108054f18a94c91e2dd74fafa
Author: Daniel Stone <daniel@fooishbar.org>
Date: Mon Oct 23 02:51:13 2006 +0300
Xvfb: port to new mieq API
commit bf4df9b73f0c1a84093aaf9a2e2cbc56fb341c60
Author: Daniel Stone <daniel@fooishbar.org>
Date: Mon Oct 23 02:50:53 2006 +0300
include: move POINTER_* flags from inputstr.h to input.h
Given they're just numeric constants, they should be included in
input.h, not inputstr.h.
commit 4dd91c45abea9fb561a5acb10290e29487df6722
Author: Daniel Stone <daniel@fooishbar.org>
Date: Mon Oct 23 02:50:03 2006 +0300
miinitext: Xi and XKB are not hardware-only extensions
Xi is now a required extension, and XKB can be used without hardware,
so include them both when NO_HW_ONLY_EXTS is defined.
commit 562096a012f4bb8f44d5ec6320a32f4010c189e4
Author: Daniel Stone <daniel@fooishbar.org>
Date: Mon Oct 23 02:49:22 2006 +0300
XkbCopyKeymap: increment shapes and outlines when copying
Remember to increment the source and destination shapes when copying,
instead of just endlessly copying the first one.
commit eec182259112fba240751f974f7e5ca09fce8b9d
Author: Daniel Stone <daniel@fooishbar.org>
Date: Mon Oct 23 02:48:30 2006 +0300
dix/getevents: move SyntheticMotion to getevents.c
Mostly, this is just a cheesy hack to ensure that getevents.o gets
included when linking. Sigh.
commit bc701a14292da5abfb601e3a040651a74f46df8f
Author: Daniel Stone <daniel@fooishbar.org>
Date: Mon Oct 23 00:08:32 2006 +0300
dix/getevents: cosmetic cleanups, remove keymap copy from GKVE
Remove keymap copy from GetKeyboardValuatorEvents, as
SwitchCoreKeyboard now takes care of this for us.
Remove unused variable and function prototype.
Update comments to be as informative as possible.
commit b03e2f7029506640a8fe5cb88818b329c23503ff
Author: Daniel Stone <daniel@fooishbar.org>
Date: Sun Oct 22 19:56:49 2006 +0300
xi: fix NIDR return yet again
For a one-line function, it was pretty broken.
commit 90de7ce25a84cfe6c6790f9af2bc2399d25b9b9c
Author: Daniel Stone <daniel@fooishbar.org>
Date: Sun Oct 22 19:54:36 2006 +0300
xi: fix return type for NIDR
commit f46dc272913ffb6b5b234a7ec6f4ba5cae44a831
Author: Daniel Stone <daniel@fooishbar.org>
Date: Sun Oct 22 19:51:35 2006 +0300
xi: add NewInputDeviceRequest to stubs
commit 31a6307b7ba5adaa96deb8101ddfcda0262f537d
Author: Daniel Stone <daniel@fooishbar.org>
Date: Sun Oct 22 19:49:31 2006 +0300
xi: change DEVICE_TOUCHSCREEN to ABS_{AREA_CALIB} for stubs
commit eae6594d03a606ddf1f433b5897b5938aa940c1e
Author: Daniel Stone <daniel@fooishbar.org>
Date: Sun Oct 22 16:39:44 2006 +0300
Xi: swap control in DevicePresenceNotify
commit be21630164e865eca72ff2a686a38ae4e30fd79c
Author: Daniel Stone <daniel@fooishbar.org>
Date: Sun Oct 22 16:33:02 2006 +0300
dix, Xi: make use of deviceid in DevicePresenceNotify
Use the deviceid and control fields in DevicePresenceNotify since
the last push to inputproto to send a DPN whenever a control changes
on a device.
commit f08b6b2367705cb5b60e996e6328197430bf1919
Author: Daniel Stone <daniel@fooishbar.org>
Date: Sun Oct 22 12:30:02 2006 +0300
kdrive: change DEVICE_TOUCHSCREEN to DEVICE_ABS_{CALIB,AREA}
commit 77e724585f6c53feb55475b94d8cfcb6acf1159b
Author: Daniel Stone <daniel@fooishbar.org>
Date: Fri Oct 20 00:44:46 2006 +0300
minor formatting fixes
commit 948a97b97e93cee05a23f1f1ae699c5e181bc8ce
Author: Drew Parsons <dparsons@debian.org>
Date: Sat Oct 21 23:09:22 2006 +1000
Minor typo fix to xorg.conf man page.
commit 04554a3adcddc32de5fdb0b3122da0bcdd4c24a9
Author: Drew Parsons <dparsons@debian.org>
Date: Sat Oct 21 22:06:43 2006 +1000
Minor typos in Xserver man page.
commit e26a494f417c3c700636ee68892c3015b2e0f27a
Merge: 736b0d5078 aeba855b07
Author: Zephaniah E. Hull <warp@agamemnon.b5>
Date: Sat Oct 21 04:26:14 2006 -0400
Merge branch 'input-hotplug' of git+ssh://git.freedesktop.org/git/xorg/xserver
commit 736b0d5078597abbda80444deef852879260af90
Author: Zephaniah E. Hull <warp@agamemnon.b5>
Date: Sat Oct 21 04:24:49 2006 -0400
DEVICE_TOUCHSCREEN becomes DEVICE_ABS_CALIB.
Update the DEVICE_ABS_CALIB stuff to include the new elements.
New DEVICE_ABS_AREA support.
dev->touchscreen becomes dev->absolute, with _CALIB and _AREA stuff in it.
Update xfree86 to compile with this, kdrive needs an update too.
commit edd5f1745461f995670969cb736d1569ca94643f
Author: Carl Switzky <Carl.Switzky@Sun.COM>
Date: Thu Oct 19 17:30:54 2006 -0700
Add ast driver/device info to Xorg server & config utilities
commit aeba855b07832354f59678e20cc29a085e42bd99
Author: Daniel Stone <daniel@fooishbar.org>
Date: Fri Oct 20 00:30:28 2006 +0300
move keymap copy to event processing, from enqueuing
Move the keymap copying to event processing time (in
ProcessInputEvents), instead of being at event enqueuing time.
Break SetCore{Pointer,Keyboard} out into separate functions.
Change mieqEnqueue to take a device pointer, that asks for the
_original_ device associated with this event.
commit a8d3dad9d9f2b9053843e655abe463a68ba8dcb7
Author: Daniel Stone <daniel@fooishbar.org>
Date: Fri Oct 20 00:28:40 2006 +0300
xi: add DEVICE_ENABLE control
Add DEVICE_ENABLE control, which allows runtime enabling and disabling
of specific devices.
commit b0780312d80ea4af0136227f90fdd7ada3db71c5
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Thu Oct 19 13:51:53 2006 -0700
Pre-release message should tell users to check git, not CVS, for updates
commit c5dc997baf57ffa08025efadbbaf761296ce4bc4
Author: Joshua Baergen <joshuabaergen@gentoo.org>
Date: Thu Oct 19 11:14:26 2006 -0700
Create xorg.conf.example (Gentoo bug #138623).
commit d029c8f1b72019446a5c873f55ffa43504b03dfb
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Wed Oct 18 18:11:06 2006 -0700
Use getisax() instead of asm code to determine available x86 ISA extensions on Solaris
commit a8a0abdbea0573c861a5af9d58f3ce66790455ca
Author: Daniel Stone <daniel@fooishbar.org>
Date: Wed Oct 18 10:59:07 2006 +0300
config/dbus: always unref the connection, not close
commit 80642f37d40216035786eaf490952d16f6b5f597
Author: Adam Jackson <ajax@benzedrine.nwnk.net>
Date: Tue Oct 17 14:53:28 2006 -0400
Stop building xorgcfg by default.
commit 5e17cde27b064174584d478130b0f95dcef78deb
Author: Matthias Hopf <mhopf@suse.de>
Date: Tue Oct 17 17:06:44 2006 +0200
StorePixels() macro could create invalid *x++=*x... code - fixed.
commit 205c6788d7a34704e36b23f1a93d89e9b986266a
Author: Daniel Stone <daniel@fooishbar.org>
Date: Mon Oct 16 23:48:09 2006 +0300
config/dbus: properly initialise vtable
Properly initialise the vtable, so we don't end up with an unregister_function
pointing to god knows where.
commit 85ac2f16abe9f6e88b4e71609da334d336a9a600
Author: Alan Hourihane <alanh@fairlite.demon.co.uk>
Date: Mon Oct 16 12:39:05 2006 +0100
Small modification to blocking signals when switching modes.
commit 0901eec87ee9f3a2a067695bdbd569ff42149879
Author: Michel Dänzer <michel@tungstengraphics.com>
Date: Sun Oct 15 16:57:09 2006 +0200
Fix __glXDRIbindTexImage() for 32 bpp on big endian platforms.
commit a232693c8c2a206aac47c07b133c071938204e0b
Author: Michel Dänzer <michel@tungstengraphics.com>
Date: Sun Oct 15 16:48:59 2006 +0200
Add per-drawable Xv colour key helper function.
This allows overlay Xv adaptors to work slightly better with compositing
managers.
Bump the video driver ABI minor so drivers only need to check for this at build
time.
commit 5563861ab7e56ec891cfce6b34af43fec53ccee3
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Fri Oct 13 19:05:28 2006 -0700
Make sure xorgcfg files are included even when dist made with --disable-xorgcfg
commit e1dd1904c6c7ce33f347d822272831d54a6497c8
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Thu Oct 19 13:51:53 2006 -0700
Pre-release message should tell users to check git, not CVS, for updates
commit 62d24097932708fbbb62a23614fe63b4b7acf3bd
Author: Joshua Baergen <joshuabaergen@gentoo.org>
Date: Thu Oct 19 11:14:26 2006 -0700
Create xorg.conf.example (Gentoo bug #138623).
commit 357b37b3826fa6e9878c0bd895164259c2ed3c0d
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Wed Oct 18 18:11:06 2006 -0700
Use getisax() instead of asm code to determine available x86 ISA extensions on Solaris
commit 1b1698af41b9038d9f9dbf521737d0baab5a2237
Author: Zephaniah E. Hull <warp@agamemnon.b5>
Date: Wed Oct 18 04:57:22 2006 -0400
Pass SetDeviceValuators down to the driver.
NOTE: This changes the LocalDeviceRec struct, which breaks input drivers.
commit 5eca750fe2f3f243fb352271ad8da196af0cb16a
Author: Adam Jackson <ajax@benzedrine.nwnk.net>
Date: Tue Oct 17 14:53:28 2006 -0400
Stop building xorgcfg by default.
commit df979b75c8cd8a7e0566aea58031bb9b8f5cd3d3
Author: Matthias Hopf <mhopf@suse.de>
Date: Tue Oct 17 17:06:44 2006 +0200
StorePixels() macro could create invalid *x++=*x... code - fixed.
commit d430e76a161c963169067875c3654f5fd8f42b19
Author: Alan Hourihane <alanh@fairlite.demon.co.uk>
Date: Mon Oct 16 12:39:05 2006 +0100
Small modification to blocking signals when switching modes.
commit 6dd4fc4652f942724039dc2317c560ea7276ab59
Author: Daniel Stone <daniel@fooishbar.org>
Date: Mon Oct 16 00:22:00 2006 +0300
xkb: fix virtual modmap size computation
Compute virtual modmap size bounded by nVModMapKeys-1, rather than
nVModMapKeys.
This is sort of a best guess. The other way seems a little more
logical, but also leads to segfaults pretty quickly if you hammer
GetMap hard enough. So let's try this one.
commit a484ba15277e66e7ef9b21b238dcbf760695bc63
Author: Daniel Stone <daniel@fooishbar.org>
Date: Sun Oct 15 23:47:34 2006 +0300
XkbCopyKeymap: copy server vmods, and name atoms
Copy server->vmods, and all the atoms in names.
commit ad355fecee3965be576596aeed5da54d776edf1d
Author: Daniel Stone <daniel@fooishbar.org>
Date: Sun Oct 15 21:59:06 2006 +0300
xkb: make sure we set the map on the right device, not necessarily core
Forgot that all XKB requests took a device spec: the comparison of
'if working on the core keyboard, does this device send core events; or,
is this device the core keyboard?' was broken. Instead, what we want is
'if working on the core keyboard, does this device send core events; or,
is this device the one we're working on?'.
commit 4ae7745a0dc86de6346409a69c1e396e0b954514
Author: Daniel Stone <daniel@fooishbar.org>
Date: Sun Oct 15 21:48:01 2006 +0300
xfree86 input: always open devices on NewInputDeviceRequest
commit acd8419948003032056a56d46adbef7c35e7739c
Author: Daniel Stone <daniel@fooishbar.org>
Date: Sun Oct 15 20:42:31 2006 +0300
config: unref connection, don't close it
Just unref the connection instead of explicitly closing it (thanks, Rob
McQueen).
Add a commented-out unregister_object_path call: unfortunately, when we
call it, libdbus segfaults. But if we don't unregister the path, we
can't register it again. So regenerations are broken either way, but a
little less violently like this.
commit fc9b5f84b244ea08480b73bd15ac919b875800fb
Author: Daniel Stone <daniel@fooishbar.org>
Date: Sun Oct 15 20:01:01 2006 +0300
dix/devices: add devices in proper forward order
Add devices in forward order with the normal linked list convention.
Previously, AddInputDevice would add all the devices in reverse order to
off_devices, before they were added again in reverse order to devices with
EnableDevice.
This just makes both work in forward order, which provides the ordering as
you'd expect when hotplugging devices (i.e. adds them to the head, not the
tail).
commit ec35e7198debf938f1115f584e675ce5995743e3
Author: Daniel Stone <daniel@fooishbar.org>
Date: Sun Oct 15 19:44:49 2006 +0300
config: add replies and dbus api documentation
Add replies, which use standard X error values, to the two currently-supported
input configuration requests.
Document the D-BUS API we use.
Make sure we free everything when we encounter an error.
Add a _source option to all incoming requests, noting that it came from a
client.
Reject all requests to add a device where an option name contains an
underscore.
commit 7e4717683d6c08d1e490a60b7493a94bbc57bf8d
Author: Michel Dänzer <michel@tungstengraphics.com>
Date: Sun Oct 15 18:12:28 2006 +0200
exaDrawableDirty: Fix initialization of BoxRec.
This will hopefully fix the partial window corruption experienced by some
people.
commit 3ad1642f1bbaa5f96558cdf3384b40f7122f8781
Author: Michel Dänzer <michel@tungstengraphics.com>
Date: Sun Oct 15 16:57:09 2006 +0200
Fix __glXDRIbindTexImage() for 32 bpp on big endian platforms.
commit f9bfee50981006a2c58d3f73e2b0d123bb2a41b7
Author: Michel Dänzer <michel@tungstengraphics.com>
Date: Sun Oct 15 16:48:59 2006 +0200
Add per-drawable Xv colour key helper function.
This allows overlay Xv adaptors to work slightly better with compositing
managers.
Bump the video driver ABI minor so drivers only need to check for this at build
time.
commit a05044cfc14a8bc6cc31236dcecada60bec09924
Author: Daniel Stone <daniel@fooishbar.org>
Date: Sat Oct 14 22:14:56 2006 +0300
xkb: better support of XkbDfltXIId
XKB.h specifies that XkbDfltXIId should be used where the client doesn't
care about the device identifier. We take this to mean core devices,
where practical.
commit 4d8030076ed1a7680bdfcb7b89af1045bdc40304
Author: Daniel Stone <daniel@fooishbar.org>
Date: Sat Oct 14 22:14:07 2006 +0300
dix: move GetKeyboardEvents/GetPointerEvents to a new file, export symbols
Move GKE and GPE to a separate file, to help stem the events.c explosion.
Mark GKE/GKVE/GPE as _X_EXPORT.
commit 6afc7c284690b1e2bb7544b5bc4f31a3f6a05519
Author: Daniel Stone <daniel@fooishbar.org>
Date: Sat Oct 14 15:54:35 2006 +0300
dix/devices: remove XACE merge debris
commit 93302452e737bd91a893eb495592538d40d921e5
Author: Daniel Stone <daniel@fooishbar.org>
Date: Sat Oct 14 15:54:12 2006 +0300
XkbCopyKeymap: add geometry support
Add a first cut at geometry support, which seems to generally work.
commit b9108a13fc126d97c0393f911a1d9292563444ce
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Fri Oct 13 19:05:28 2006 -0700
Make sure xorgcfg files are included even when dist made with --disable-xorgcfg
commit 054f8cd2675a80b14bc1ce266377fcfee2335cee
Author: Keith Packard <keithp@neko.keithp.com>
Date: Fri Oct 13 17:34:53 2006 -0700
Limit pointer to valid crtc areas. Add event swapping. Fix change tracking.
Add function to keep pointer within valid crtc areas.
Finish event delivery and swapping code.
Separate configuration from layout changes to send correct events.
commit 335b503c5e7041bb0c44611e496d1c46f554e630
Merge: bd3d93be82 cf948b7b04
Author: Daniel Stone <daniel@fooishbar.org>
Date: Fri Oct 13 18:10:45 2006 +0300
Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver into input-hotplug
commit cf948b7b04dfeb61a294889027b9a54f6b9b478e
Author: Alan Hourihane <alanh@fairlite.demon.co.uk>
Date: Fri Oct 13 14:48:10 2006 +0100
Block IO on switchmode just as we do for VT switching
to avoid cursor movements signalling io.
commit 4b53a5e4b147ab748b28dffc1d330b7148d8efa6
Merge: 23f6f08b7b 042d4a407d
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Wed Oct 11 20:50:31 2006 -0400
Merge branch 'master' into my-XACE-SELINUX
commit a6df780e4d3f90cc699b0b864bade03d6f15afd7
Author: Ian Romanick <idr@us.ibm.com>
Date: Wed Oct 11 15:41:22 2006 -0700
Fix bug #8608.
Regenerate files based on recent commits to Mesa (that fix Mesa bug
that return pixel data.
commit 042d4a407d0eca9131d0420b0b9189559aac326d
Author: Aaron Plattner <aplattner@nvidia.com>
Date: Mon Oct 9 16:32:11 2006 -0700
Bug #8459: Don't forget to include AM_CFLAGS in libfb_la_CFLAGS on non-MMX platforms.
Reported by Edgar Toernig.
commit 1b94c117e0f294ef2f89bf24d45ba7a8e45efe35
Author: Matthias Hopf <mhopf@suse.de>
Date: Tue Oct 10 19:37:22 2006 +0200
Fixing probably long-standing bug in domain support.
commit 6776c0f0e9677a65ec36ceef9618ff701b99596c
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Mon Oct 9 17:24:37 2006 -0700
Use bash on Solaris to run symlink-mesa.sh
symlink-mesa.sh won't run with Solaris Bourne Shell (/bin/sh) so explicitly
run it with /usr/bin/bash instead
(cherry picked from cde68728860179dc84e615ccb378ce992513fd62 commit)
commit bd3d93be82d91e4cf35ae317dfd658d1706257ea
Author: Daniel Stone <daniel@fooishbar.org>
Date: Sun Oct 8 23:21:12 2006 +0300
xkb: remove random broken vendor workarounds
commit 33406da096b4ae21134484113b280e07d0c8f0d9
Author: Daniel Stone <daniel@fooishbar.org>
Date: Sun Oct 8 23:20:56 2006 +0300
GetKeyboardEvents: add first_valuator argument to GKVE
commit ef7e05e9de57b9c9c27ed3307eede6d8fc6c1af3
Author: Daniel Stone <daniel@fooishbar.org>
Date: Sun Oct 8 21:42:15 2006 +0300
xfree86/xinput: pass first_valuator params, don't clip to first screen bound
Pass first_valuator to GetPointerEvents/GetKeyboardValuatorEvents.
Don't clip axis bounds to that of screen 0 when initialising axes.
commit 1546a398144619a14ff06aaf84ebc1bf293eac66
Author: Daniel Stone <daniel@fooishbar.org>
Date: Sun Oct 8 21:40:53 2006 +0300
GetKeyboardValuatorEvents: also take first_valuator param
Take a first_valuator parameter, which specifies the first valuator.
commit b05a11478edc7e6d1e38ef7f8d6788c7bd917493
Author: Daniel Stone <daniel@fooishbar.org>
Date: Sun Oct 8 21:23:12 2006 +0300
doc/extensions: rename to c-extensions
The old name could be somewhat confusing.
commit 41bb9fce47f6366cc3f7d45790f7883f74289b5a
Author: Daniel Stone <daniel@fooishbar.org>
Date: Sun Oct 8 20:34:32 2006 +0300
mipointer: take device arguments, split miPointerAbsoluteCursor
Update mipointer API to take a device argument to (almost) all functions,
and split miPointerAbsoluteCursor into a couple of separate functions.
Remove miPointerAbsoluteCursor call from mieq, as we now deal with it in
GetPointerEvents.
Make miPointerSetPosition (successor of miPointerAbsoluteCursor) take
pointers to x and y, so it can return the clipped values.
Modify callers of miPointer*() functions to generally use the new
functions.
This should fix things with multi-head setups.
commit be8dfafd1d58b27bbfd953fc1216311523353db1
Author: Daniel Stone <daniel@fooishbar.org>
Date: Sun Oct 8 20:32:16 2006 +0300
warning cleanups
Fix still more warnings.
commit ca474e0920dd29ebe7ccf346cddc526732ad01ba
Author: Daniel Stone <daniel@fooishbar.org>
Date: Sun Oct 8 20:30:49 2006 +0300
Xi: move SendEventToAllWindows and FindInterestedChildren to exevents
Move SendEventToAllWindows and FindInterestedChildren from chgptr to exevents,
so the DIX can more easily use it.
Clean up two warnings (type mismatch, unused variable) in exevents.c.
commit c2fab469b66f2796c541e911202faa411d116b04
Author: Daniel Stone <daniel@fooishbar.org>
Date: Sun Oct 8 18:26:26 2006 +0300
dix/devices: clean up debugging
commit 4493acb88c59721f7807093a3ed3c39396c2076d
Author: Daniel Stone <daniel@fooishbar.org>
Date: Sun Oct 8 17:51:03 2006 +0300
xkb: add FIXMEs to procedures which need to act on all core devices
Add FIXME comments above request handlers which need to act on all core-sending
devices if called on the core keyboard.
commit ef68273f5bdb27a492ec0b69548ec4fbede46c08
Author: Daniel Stone <daniel@fooishbar.org>
Date: Sun Oct 8 17:44:37 2006 +0300
mi/mipointer: deprecate functions which don't take a device
Deprecate all mi pointer functions which don't take a device argument, and
replace them with versions which do, in preparation for MPX.
commit 6eab4c55890660089067da0e944256b1ed3a8c67
Author: Daniel Stone <daniel@fooishbar.org>
Date: Sun Oct 8 17:24:33 2006 +0300
doc/extensions: document C extension use in the X server
commit 80cdd26581508dd17c5d0a5739cd540113996bbb
Author: Daniel Stone <daniel@fooishbar.org>
Date: Sun Oct 8 17:23:54 2006 +0300
mi/pointer: mark public pointer functions as deprecated
Deprecate miPointer functions which don't take a device pointer. Pointer
movement should be handled through GetPointerEvents, and functions which
take a device as an argument (e.g. miPointerPosition) will be added.
commit 97030b6c6b0fb6ff629ae31e483704d0a2207a53
Author: Daniel Stone <daniel@fooishbar.org>
Date: Sun Oct 8 17:07:05 2006 +0300
config: fix compilation
Accidentally built with --disable-config, didn't notice that the previous
commit to clean up the debugging broke things horribly.
commit 14b157bdb1f2cd5feba03ba0815d7c5b2dd6633f
Author: Daniel Stone <daniel@fooishbar.org>
Date: Sun Oct 8 17:04:12 2006 +0300
include: actually declare DebugF
DebugF is ErrorF when DEBUG is defined, else a no-op.
commit 9e37de193f5d7412ffd8de76d5eed0158c0a3609
Author: Daniel Stone <daniel@fooishbar.org>
Date: Sun Oct 8 16:32:15 2006 +0300
configure.ac: reactivate warnings when building with gcc
We were inadvertently stomping XSERVER_CFLAGS after adding the warnings, so
move them after we do that.
commit b559cbb1601f93cb03ea3dcfb2c5ca94ee6b73bb
Author: Daniel Stone <daniel@fooishbar.org>
Date: Sun Oct 8 16:23:14 2006 +0300
dix/CoreProcessKeyboardEvent: remove debugging for every key event
Also change #ifdef DEBUG/ErrorF/#endif to DebugF in FixKeyState.
commit 3ae4d250185e71a0a218c062426f92b9b1adbf05
Author: Daniel Stone <daniel@fooishbar.org>
Date: Sun Oct 8 16:20:42 2006 +0300
xfree86 Xinput: remove still more excessive debugging
There isn't any more debugging left for input events in the XFree86 DDX.
commit 58314756aeecbb8fb04706c3e04d98e9ac531a02
Author: Daniel Stone <daniel@fooishbar.org>
Date: Sun Oct 8 16:18:05 2006 +0300
GetPointerEvents: add first_valuator parameter
Add a first_valuator parameter. Looks correct by inspection, but untested
with first_valuator != 0 as yet.
commit 84f5d2291c1fe92fd8358e999e909bf3aab86c98
Author: Daniel Stone <daniel@fooishbar.org>
Date: Sun Oct 8 15:30:24 2006 +0300
GetPointerEvents: fix relatively harmless typo
Change !(cp->button || !cp->valuator) to (!cp->button || !cp->valuator).
commit cfc3e9ede2dc83741bd38bf3df13f096ecb8adc0
Author: Daniel Stone <daniel@fooishbar.org>
Date: Sun Oct 8 15:27:52 2006 +0300
config: remove excessive debugging
commit 8d8e7f8bae4099f9e90ef9aac687607dae1d32bf
Author: Daniel Stone <daniel@fooishbar.org>
Date: Sun Oct 8 15:26:54 2006 +0300
kdrive/input: remove excessive debugging in NIDR
commit 22a836fafd39a8ef413826dc2c94bc5f96990e2d
Author: Daniel Stone <daniel@fooishbar.org>
Date: Sat Oct 7 14:16:51 2006 +0300
xfree86/loader: bump input major ABI version
Bump input major ABI version to 1.0, since we removed the OS keyboard
layer.
commit 4c342246300e06bdf5c9c62cc1d2f6aa57a524db
Merge: 8382234a7f 49a70c8570
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Fri Oct 6 18:01:13 2006 -0700
Merge branch 'XACE-modular'
commit 3686cd0fbf56d883f2f3b3fda11ffba1058b74e4
Author: Daniel Stone <daniel@fooishbar.org>
Date: Fri Oct 6 17:20:42 2006 +0300
xkb: make XkbSetControls work on all core-sending devices
commit 7b4dc171b036107cfba87a1a16bf692b982005a5
Author: Daniel Stone <daniel@fooishbar.org>
Date: Fri Oct 6 16:26:54 2006 +0300
xkb: remove unused #ifndef
commit ab56f0c5b516269bb99ae8b5f479e49e61a3af76
Author: Daniel Stone <daniel@fooishbar.org>
Date: Fri Oct 6 16:12:36 2006 +0300
xkb: simplify core device loop in GetKeyboardByName
commit 4b6e2f12f7296e17b2850f36b3adcf8156125cbe
Author: Daniel Stone <daniel@fooishbar.org>
Date: Fri Oct 6 16:08:21 2006 +0300
xkb: make LatchLockGroup work on all core-sending devices
Apply the settings to all devices sending core events, if we're working on the
core keyboard.
commit ebf9b3bbbb04acb78cdf8a84e47a96755fbfe854
Author: Daniel Stone <daniel@fooishbar.org>
Date: Fri Oct 6 14:17:59 2006 +0300
xkb: update all core-sending keyboards on GetKeyboardByName
Update the keymaps of all keyboards which send core events on
GetKeyboardByName; still a few other procedures which need this treatment.
commit 1178796a4dff5ebf0bd9fb3cacb35be9709b41e5
Author: Keith Packard <keithp@neko.keithp.com>
Date: Thu Oct 5 22:31:35 2006 -0700
Add preferred modes for each output. Round vrefresh. Deliver crtc events.
commit 23f6f08b7b5c9a4297fd223d232a7e9f45376550
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Thu Oct 5 16:07:26 2006 -0400
Improve error handling, messages during initialization.
commit de63a469dcd0a8ae98554bca540ac0106cccf2a5
Merge: 9c7440bdf5 8382234a7f
Author: Daniel Stone <daniel@fooishbar.org>
Date: Thu Oct 5 20:29:19 2006 +0300
Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver into input-hotplug
commit b4659faf9b455b44ac8e691cc7a8fc00a967c80b
Merge: c4f30c6353 8382234a7f
Author: Keith Packard <keithp@neko.keithp.com>
Date: Wed Oct 4 14:46:04 2006 -0700
Merge branch 'master' into randr-1.2
commit df351f1efbcc95f94c719fcf993c480155c511e9
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Wed Oct 4 16:23:35 2006 -0400
Experimental window property holding security context.
commit c4f30c63538e1451f15ed1991439869127d9b148
Author: Keith Packard <keithp@guitar.keithp.com>
Date: Tue Oct 3 21:06:11 2006 -0700
Add mode origins and output options. Fix memmoves in resource free funcs.
Output options and mode origins both affected driver ABI. memmove mistakes
were causing 'Freeing resource which isn't there' messages.
Prune unused non-user defined modes from available list now.
commit 8382234a7f318057de66490299d63807cefb5201
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Tue Oct 3 17:49:48 2006 -0700
Update pci.ids to Tue 2006-10-03 daily snapshot
commit 96edf7b853c1045d12d957a2957a11879100a2de
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Tue Oct 3 17:48:50 2006 -0700
Don't insert RCS tag into generated pci id header files
commit 75e0cc41b201b9ceb2615e7cec0dd5b4c136b343
Merge: 6926776f0e 20c0ceedfb
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Tue Oct 3 13:58:03 2006 -0400
Merge branch 'my-XACE-modular' into my-XACE-SELINUX
commit df800d87e04ce984a8a9ab4252ac6478ab1e4426
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Mon Oct 2 11:28:47 2006 -0700
Add (void) casts to clear compiler errors about ?: results having type mismatch
commit 9c7440bdf5a4ecd113e102004c804a2ba354c422
Author: Daniel Stone <daniel@fooishbar.org>
Date: Mon Oct 2 20:58:33 2006 +0300
xkb: remove the world's most staggeringly broken vendor workaround
Certain versions of LynxOS needed to sleep up to five seconds for closing a
pipe to actually, y'know, be useful.
commit d7c89c7c1c8c1e110345d9d8d300adbf5fe5804a
Author: Daniel Stone <daniel@fooishbar.org>
Date: Mon Oct 2 02:15:36 2006 +0300
symlink-mesa.sh: expand *.{c,h}
commit d6ea96b13e2ea01c51998c41ae2a3677bdedf61c
Author: Ivan Pascal <pascal@info.tsu.ru>
Date: Mon Oct 2 02:17:14 2006 +0300
xkb: fix wrapping when switching between groups
Use XkbCharToInt as that's what we're doing.
commit 3c98cebb6e954855528794fec46830f456cbdec1
Merge: fa1ac94178 2cf1098436
Author: Daniel Stone <daniel@fooishbar.org>
Date: Mon Oct 2 02:18:17 2006 +0300
Merge branch 'input-hotplug' of git+ssh://git.freedesktop.org/git/xorg/xserver into input-hotplug
commit fa1ac94178cf976d4c8dae9a4dc8703303a62d4b
Author: Ivan Pascal <pascal@info.tsu.ru>
Date: Mon Oct 2 02:17:14 2006 +0300
xkb: fix wrapping when switching between groups
Use XkbCharToInt as that's what we're doing.
commit c31672e6aab168262bd7824a8082ecdf841fc3c0
Author: Daniel Stone <daniel@fooishbar.org>
Date: Mon Oct 2 02:15:36 2006 +0300
symlink-mesa.sh: expand *.{c,h}
commit 2cf1098436d6b4382d9ed3f6b88214d37bdd8ddb
Author: Daniel Stone <daniel@fooishbar.org>
Date: Sat Sep 30 17:05:46 2006 +0300
dix/events, mi/eq: remove utterly ridiculous debugging
Remove debugging which can cause long-lived Xorg logs to grow well above 1GB
if built with --enable-debug.
commit 20c0ceedfbce9ae5c70703900b52973917ac4cd0
Merge: 49a70c8570 84eb2c0a06
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Fri Sep 29 15:37:00 2006 -0400
Merge branch 'master' into my-XACE-modular
commit 518db35ca3f569e7cb95dbddeddb93f3691de498
Merge: 5d99e05f05 84eb2c0a06
Author: Daniel Stone <daniel@fooishbar.org>
Date: Fri Sep 29 00:35:21 2006 +0300
Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver into input-hotplug
commit 5d99e05f05a42a82a9f02844df9bfebaa673759d
Merge: ad631afcf3 5893375786
Author: Daniel Stone <daniel@fooishbar.org>
Date: Fri Sep 29 00:35:07 2006 +0300
Merge branch 'input-hotplug' of git+ssh://git.freedesktop.org/git/xorg/xserver into input-hotplug
commit ad631afcf3fbc74024cddaaacd05d38addc047a2
Author: Daniel Stone <daniel@fooishbar.org>
Date: Fri Sep 29 00:34:23 2006 +0300
make core keyboard/pointer map functions act on all core-sending devices
Make Set{Keyboard,Modifier,Pointer}Mapping act on all devices which send core
events.
Change LegalModifier to accept a DeviceIntPtr.
commit 84eb2c0a06de60e88e14bb03fabe661d7cd8f1d3
Author: Brian <brian@yutani.localnet.net>
Date: Thu Sep 28 15:09:40 2006 -0600
Replace hard-coded filesnames with loops (all .c and .h files).
Should fix problems with Mesa adding/removing source files, for the most part.
Patch by Dan Nicholson.
commit 4bc5dc2854e33bf343cdea44a3c3b4c41f6f4145
Merge: cf6e9687ff f9542e7495
Author: Aaron Plattner <aplattner@nvidia.com>
Date: Thu Sep 28 13:27:13 2006 -0700
Merge branch 'wfb'
commit f9542e749544c7a3084fd72ecc6642ca3262f7c7
Author: Aaron Plattner <aplattner@nvidia.com>
Date: Thu Sep 28 13:26:54 2006 -0700
Restore the global xx* symbols and add them to wfbrename.h.
I don't think they're ever used, but it's best to just leave them alone for ABI
compatibility.
commit cf6e9687ffcc52af0d64e9098186570719a575a2
Author: Jeff Smith <whydoubt@yahoo.com>
Date: Thu Sep 28 15:34:17 2006 -0400
Bug #8449: Yet another Mesa symlink script resync.
commit a5d639cd87f30f9b3d765352d27253940f33b2b7
Author: Daniel Stone <daniel@fooishbar.org>
Date: Wed Sep 27 16:15:27 2006 +0300
remove merge detritus
commit 2206a92a97901977910a6e39b4174ca805f9f4a7
Author: Michel Dänzer <michel@tungstengraphics.com>
Date: Wed Aug 30 19:15:55 2006 +0200
Push information about cliprects of DRI windows to the DRM.
commit 54d371e7a4ebab79a0f616669e2f601d8370cef3
Author: Michel Dänzer <michel@tungstengraphics.com>
Date: Wed Aug 30 19:12:17 2006 +0200
Add wrapper for new ioctl to update drawable information in the DRM.
commit ad321fad4b9ab3a2c70cfff37ca6c8faaa5cce9c
Merge: 5e9d33fe87 f7c1d94241
Author: Daniel Stone <daniel@fooishbar.org>
Date: Sun Sep 24 17:56:43 2006 +0300
Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver into input-hotplug
commit f7c1d942416db8d0d4c5a21f5ece1ccacb926b69
Author: Brian <brian@yutani.localnet.net>
Date: Sat Sep 23 10:38:10 2006 -0600
Check for visual==NULL in dmxBECreateColormap() before calling XCreateColormap()
to prevent potential segfault.
commit 945b7c63946f5257d0f9b0dcf2f8f4882fb2c6f8
Author: Brian <brian@yutani.localnet.net>
Date: Sat Sep 23 10:35:25 2006 -0600
The fbcmap.c file used by Xdmx _must_ be compiled with XFree86Server defined.
Otherwise, Xdmx generates a slew of protocol errors.
commit 891e9c3e6cbd0869a57395b96c8e18ff522c2bb4
Author: Brian <brian@yutani.localnet.net>
Date: Sat Sep 23 10:28:24 2006 -0600
Replace broken DMXDBG3() with DMXDBG2()
commit a10039a100dfe5f87e29e9cc4fa656176e0890f9
Author: David Nusinow <dnusinow@debian.org>
Date: Thu Sep 21 23:58:32 2006 -0400
Allow the xfree86 ddx utils to be optionally built. Patch by Eugene Konev.
commit ce78b0cd2b1c35d60eb5683a1d00222aa4797c79
Author: Adam Jackson <ajax@benzedrine.nwnk.net>
Date: Thu Sep 21 20:42:47 2006 -0400
Close with Pclose() that which we open with Popen().
commit c1655f0fd457f9bdf0857c5e0904639925bb01f1
Author: Aaron Plattner <aplattner@nvidia.com>
Date: Thu Sep 21 14:45:17 2006 -0700
Bug 8386: Grow parser buffers to fit an entire line if it's longer than CONFIG_BUF_LEN.
commit b36fde9257263fa502147df37e8331184c323e14
Author: Keith Packard <keithp@guitar.keithp.com>
Date: Thu Sep 21 09:52:04 2006 -0700
When no mode is specified, don't validate mode-specific parameters.
commit 8b4ed47c5d39f219866e3c72fa973c6fc4c70f18
Author: Drew Parsons <dparsons@debian.org>
Date: Thu Sep 21 22:19:44 2006 +1000
* Install Xprint's Xsession script to $(sysconfdir)/X11/Xsession.d
* Removing outdated references to CDE and dt, rename script to
92xprint-xpserverlist.
commit 219546fd76750f358ffb6738f17b9237c58c15a6
Author: Keith Packard <keithp@guitar.keithp.com>
Date: Wed Sep 20 22:43:05 2006 -0700
Steal Xinerama code from SiS driver. Add missing files.
Provide a Xinerama implementation when DIX version isn't enabled. This
version exposes each crtc as a separate 'screen' and reports the size of
that patch. The extension also sends ConfigureNotify events to the root
window whenever crtcs change so that applications will re-fetch xinerama
information. This actually works for metacity.
commit bde0a4c12cb393a6d7f1552b067624da1b0502ae
Author: Keith Packard <keithp@guitar.keithp.com>
Date: Wed Sep 20 19:42:34 2006 -0700
RRSetCrtcConfig status fix. RRGetScreenResources timestamp fix.
RRSetCrtcConfig was returning the wrong status values.
RRGetScreenResources was always returning currentTime.
commit d812f486a01a6276aed7b4ebd3cd8eb8ddfe10d3
Author: Donnie Berkholz <donnie@supernova.(none)>
Date: Wed Sep 20 15:39:39 2006 -0700
Really fix sparc on 64-bit kernel/32-bit userland.
Commit b3a3020fd018df8bc5a8193d36e1a1c7ae8af8ba used a sparc64 ifdef instead of
sparc. But for 32-bit userland, __sparc64__ is not defined so the wrong code is
used.
commit 09f7499851bd2f2eba1e30460c61c7a82ed9e853
Author: Keith Packard <keithp@guitar.keithp.com>
Date: Wed Sep 20 13:15:20 2006 -0700
typo
commit 9f870e0aa1ada238d6a0cd099996e8c47f6ba1d9
Author: Keith Packard <keithp@guitar.keithp.com>
Date: Wed Sep 20 13:14:53 2006 -0700
When setting output state, leave output unchanged when setting to current.
commit d16e83413e7e06adebd629d04de57bbedd8c3765
Author: Aaron Plattner <aplattner@nvidia.com>
Date: Wed Sep 20 12:47:17 2006 -0700
Hide or rename more global symbols to avoid clashes with libfb.
Rename composeFunctions, xxSetup, and xxPrintVisuals. Hide the other xx*
symbols by making them static.
commit d08718d8fd31477e90f13b9e122504c515b46ee0
Author: Keith Packard <keithp@guitar.keithp.com>
Date: Wed Sep 20 12:05:52 2006 -0700
Avoid calling xalloc(0). Change rrScreenSizeSet to rrScreenSetSize.
commit ef1f3248cb5fff0a02c0059f865c4d931eba23a6
Author: Keith Packard <keithp@guitar.keithp.com>
Date: Tue Sep 19 22:48:54 2006 -0700
Split out 1.0-style info and new property routines to their own files.
commit 07112adb0802d28488de5a495aa61bb3cfc280b6
Author: Keith Packard <keithp@guitar.keithp.com>
Date: Tue Sep 19 00:46:27 2006 -0700
RRGetScreenResources and RRGetOutputInfo are working now.
Removed separate id field in RRModeRec.
Pull screen subpixel order from Render extension.
Implement RGetScreenResources and RRGetOutputInfo
commit afe5e9483b352ed06075ed68a6ffa50799194e2d
Author: Keith Packard <keithp@guitar.keithp.com>
Date: Mon Sep 18 12:18:22 2006 -0700
RandR working with old clients and old API.
commit 2be1ac15aee592782d7693b8de2c3815478a094e
Author: Keith Packard <keithp@guitar.keithp.com>
Date: Mon Sep 18 12:11:18 2006 -0700
Remove smashing of CFLAGS from server build.
CFLAGS is a user variable, extracted from the environment at configure time
and settable by the user at build time. We must not override this variable.
commit bf07893947cfca945598e194ed416fda6162b11c
Author: Keith Packard <keithp@neko.keithp.com>
Date: Sun Sep 17 23:03:23 2006 -0700
Split out RandR dispatch code from randr.c to rr*dispatch.c.
More disassembly to ease ongoing development.
commit 3e745745fecef1cb59e53bde52ded311b51e1dac
Author: Keith Packard <keithp@neko.keithp.com>
Date: Sat Sep 16 23:21:37 2006 -0700
Split RandR implementation into separate files.
RandR is getting too big to live in one file; split into one file per object
type (crtc, mode, screen), leaving the rest of the code in randr.c.
Code is slowly approaching the point where it will drop-in as a replacement
for the old 1.0 implementation.
commit d17fb9672e238a089e463ac74cc4cd3325b67e1f
Author: Keith Packard <keithp@neko.keithp.com>
Date: Sat Sep 16 21:44:42 2006 -0700
Start moving to new randr 1.2 definition
commit 8dec74321d916f204f8182f1b93a65defbe50e78
Author: Keith Packard <keithp@neko.keithp.com>
Date: Mon Jul 17 14:43:07 2006 -0400
Successful legacy RandR API/Protocol emulation for query.
These changes clean up minor errors to make it possible to list the
available modes for a monitor using legacy APIs in both the X server DDX and
RandR protocol. Setting modes is untested, so it probably doesn't work.
commit cab3a0145f2483fe43b5db5f5dd2076db9757fe5
Author: Keith Packard <keithp@neko.keithp.com>
Date: Mon Jul 17 01:21:11 2006 -0400
RandR: New data structure, old API. At least it compiles now
commit d95c758630f4aacec339a7ec80d2c4a9d7de1e4a
Author: Keith Packard <keithp@neko.keithp.com>
Date: Sat Jul 1 19:46:38 2006 -0700
Preliminary RandR 1.2 work
commit f057de4f73fa593fa3fc5f05f65b89e76273b158
Author: Adam Jackson <ajax@benzedrine.nwnk.net>
Date: Sat Sep 16 03:49:11 2006 -0400
Don't install librac.a.
Thanks, automake.
commit 6926776f0ecd1e8e81c5c40ccd3a97227bc44dcb
Merge: 6950267dd6 49a70c8570
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Fri Sep 15 15:28:13 2006 -0400
Merge branch 'my-XACE-modular' into my-XACE-SELINUX
commit 49a70c8570b03aff8239324a2474918a6fbc52a0
Merge: d1110c5c83 05231e336d
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Fri Sep 15 15:26:57 2006 -0400
Merge branch 'master' into my-XACE-modular
commit 46af6d1e953f1eefb6edbba3d29fb9700e42c2bb
Author: Adam Jackson <ajax@benzedrine.nwnk.net>
Date: Thu Sep 14 19:28:44 2006 -0400
Always believe the monitor when it reports a reduced-blanking mode.
CVT reduced blanking modes are typically only seen on digital connections to
LCDs, but there are some monitors that report them as supported over the
VGA connector too, which is perfectly legitimate, electrically speaking.
commit 63acf18b7e4ce3a9f7deab3a9088a1c41cab0191
Author: Adam Jackson <ajax@benzedrine.nwnk.net>
Date: Thu Sep 14 19:26:37 2006 -0400
In xf86MatchPciInstances, fail gracefully when there's no PCI device at all.
This allows the autoconfig logic to fall through sanely on non-PCI machines,
which importantly includes Xen virtual machines.
commit a8f9936f55c5364bb02e8c3187507eb1f70e2ef2
Author: Adam Jackson <ajax@benzedrine.nwnk.net>
Date: Thu Sep 14 19:24:41 2006 -0400
Prefer driver-provided modes when matching name strings to modelines.
Well, kinda. Strictly we prefer M_T_BUILTIN strongest since those are modes
where the driver has said it absolutely can't do anything else (VBE). Then
we look for user-defined modes, ie, modelines from the config file. Then
we consider modes reported by the monitor via EDID. Finally if nothing has
matched yet we consider the default mode pool.
Within each of the above-mentioned classes, modes with the M_T_PREFERRED bit
take priority over other modes in the same class.
This logic ensures that the timings sent to the monitor exactly match the
timings it reported as supported, which occasionally don't match the numbers
you might get for that mode from CVT or GTF.
commit 81ef1b6d6063c20db4963abf7b7848e235aa4ebb
Author: Adam Jackson <ajax@benzedrine.nwnk.net>
Date: Thu Sep 14 19:18:58 2006 -0400
Mark EDID modes as driver modes. Infer virtual size from driver modes.
This allows the server to guess an appropriate initial virtual size and
resolution. The heuristic is to select the largest driver-reported mode
that matches the monitor's physical aspect ratio. We revalidate this
estimate after mode validation, since we may have filtered away all
modes that would fill that size.
Also, the EDID preferred timing is now marked as M_T_PREFERRED as well.
commit 43d9edd31e31b33b9da4a50d8ab05004881c8d5a
Author: Adam Jackson <ajax@benzedrine.nwnk.net>
Date: Thu Sep 14 19:09:02 2006 -0400
Attempt to add the 'mouse' driver in more situations.
Always add a mouse driver instance configured to send core events, unless
a core pointer already exists using either the mouse or void drivers. This
handles the laptop case where the config file only specifies, say,
synaptics, which causes the touchpad to work but not the pointing stick.
We don't double-instantiate the mouse driver to avoid the mouse moving twice
as fast, and we skip this logic when the user asked for a void core pointer
since that probably means they want to run with no pointer at all.
commit 739224d05eb4f356c9cab9dcb8a44a8d78287765
Author: Adam Jackson <ajax@benzedrine.nwnk.net>
Date: Thu Sep 14 19:03:32 2006 -0400
Load the default module set when no Module section is given in the config.
Also, synchronize that list with the list for the pseudoconfig file used
when starting with no config file. These really need to be better unified.
commit beac2bf1e48e6b77dbf7d95f086abc5abcd90cf0
Author: Adam Jackson <ajax@benzedrine.nwnk.net>
Date: Thu Sep 14 19:01:13 2006 -0400
Expand the default sync ranges to be large enough for 800x600@60.
commit 71a15a7d5721073eccb3a275f353b3aa584c0d68
Author: Adam Jackson <ajax@benzedrine.nwnk.net>
Date: Thu Sep 14 19:00:10 2006 -0400
Publish the raw EDID block as a property on the root window.
This was removed in the patch for bug #5386, but is still useful.
commit 7939c8dfb7c7bed4febcdc12922fb2e17619ea36
Author: Adam Jackson <ajax@benzedrine.nwnk.net>
Date: Thu Sep 14 18:57:57 2006 -0400
Bump the default pixel depth to 24, and default bpp to 32.
commit 72af975f9c8de0ff6796f1ce4b76dcf841d21e99
Author: Adam Jackson <ajax@benzedrine.nwnk.net>
Date: Thu Sep 14 18:56:34 2006 -0400
Fix up EDID blocks where the max pixclock exceeds the preferred mode clock.
Base EDID only lets you specify the maximum dotclock in tens of MHz, which
is too fuzzy for some monitors. 1600x1200@60 is just over 160MHz, but if
the monitor really can't handle any mode at 170MHz, then 160 is more
correct. Fix up the EDID block before the driver can see it in this case,
so we don't spuriously reject modes.
commit d05e0a97bb704a4986cf638487205da759c4ce17
Author: Adam Jackson <ajax@benzedrine.nwnk.net>
Date: Thu Sep 14 18:49:12 2006 -0400
Enable DPMS by default.
commit 334f7db9f653113d5d46236911d7de2ec4173f28
Author: Adam Jackson <ajax@benzedrine.nwnk.net>
Date: Thu Sep 14 18:46:10 2006 -0400
Allow hsync and vsync ranges to be overridden independently again.
commit ced46e17777b635df9371c4cfaec3f8968b4dbcf
Author: Adam Jackson <ajax@benzedrine.nwnk.net>
Date: Thu Sep 14 18:41:59 2006 -0400
Record all standard timings from EDID as modes, instead of just the first five.
commit d89fee68d0e49211871cd9eb3893ed55c1d478a6
Author: Adam Jackson <ajax@benzedrine.nwnk.net>
Date: Thu Sep 14 18:41:15 2006 -0400
Record the maximum dot clock of the monitor, and filter by it.
commit fa8ef7166839a7435e0017683f3e3c7f7904b285
Author: Adam Jackson <ajax@benzedrine.nwnk.net>
Date: Thu Sep 14 18:33:00 2006 -0400
Don't translate monitor gamma to X gamma.
The X gamma is used to set the output ramp of the card. Setting a 2.2 output
gamma going into a 2.2 monitor gives an effective gamma of 4.84, which is
very much not what you want.
commit 511c60bc7399b07c267d686a969880e5ec92408a
Author: Luc Verhaegen <libv@skynet.be>
Date: Thu Sep 14 18:30:36 2006 -0400
Bug #5386: Synthesize modelines from EDID data.
commit 05231e336db8f959c15dda518641976f061df1a6
Author: Ian Romanick <idr@us.ibm.com>
Date: Thu Sep 14 14:13:39 2006 -0700
Use correct opcodes for GLX_EXT_texture_from_pixmap.
Regenerate from glX_API.xml 1.3 from Mesa. The glproto package and libGL
(from Mesa) must also be updated.
commit 0a62840e2ce25e5c2554e7e5ab4c9c5b96899e2d
Author: Bill Nottingham <notting@redhat.com>
Date: Wed Sep 13 15:40:23 2006 -0700
Bug 7641: fix comment written to Xorg.conf (s/VertSync/VertRefresh/)
X.Org Bugzilla #7641 <https://bugs.freedesktop.org/show_bug.cgi?id=7641>
Patch #6349 <https://bugs.freedesktop.org/attachment.cgi?id=6349>
commit 182e5e0f4ba4c98a34bc52bdf4032ba315fe80ad
Author: Drew Parsons <dparsons@debian.org>
Date: Tue Sep 12 14:30:46 2006 +1000
Xprint: revert installation of /etc/X11/Xsession.d/cde_xsessiond_xprint.sh
pending resolution of #8232.
commit 594d4019c613b0f4bf8f48cc074ecc3c8366f1d7
Author: Tilman Sauerbeck <tilman@code-monkey.de>
Date: Tue Sep 12 01:15:40 2006 +0200
transformIsIdentity() now doesn't accept a zero matrix as the identity.
Added a non-zero test for one of the diagonal values.
commit fc30370d14125f86ee1192890a184881fa139546
Author: Tilman Sauerbeck <tilman@code-monkey.de>
Date: Mon Sep 11 19:43:09 2006 +0200
Bug #8226: Fixed SetPictureTransform()'s handling of the argument matrix.
It now recognizes scaled variants of the identity matrix, too.
commit 2b357e9a2f9038cf9cd07da908e3103a3d0965c9
Author: Donnie Berkholz <dberkholz@gentoo.org>
Date: Sun Sep 10 22:17:20 2006 -0700
If we're installing libxf86config, install headers needed to build against it.
commit 58933757862c458e2da39bd464e50d9c0e41b313
Author: Zephaniah E. Hull <warp@agamemnon.b5>
Date: Sun Sep 10 15:50:51 2006 -0400
Warning fix, and a syntax fix in a #if 0 section of code.
commit 0a3740a0000191e3039fe183ae51b938d0548340
Author: Zephaniah E. Hull <warp@agamemnon.b5>
Date: Sun Sep 10 15:49:25 2006 -0400
Typo correction, 'i' is not a '1', so no longer crash on some Xi requests.
commit 8d709f0280b458515b32c2b87938749428e5c149
Author: Zephaniah E. Hull <warp@agamemnon.b5>
Date: Sun Sep 10 15:48:35 2006 -0400
Remove a merge artifact so that we can compile.
commit b3a3020fd018df8bc5a8193d36e1a1c7ae8af8ba
Author: Jesse Barnes <jbarnes@nietzche.virtuousgeek.org>
Date: Sun Sep 10 11:13:18 2006 -0700
the new PCI mapping routines are broken on sparc64 (in fact they look
broken for any 32 bit X server running on a 64 bit kernel) so #ifdef
them out for now. the PCI rework tree will make all this crap go away,
so I think we can tolerate the extra #ifdef for the next release.
commit 60db190ecfce52cbfa888c0af3210634f9186bed
Merge: 5e9d33fe87 65256109bb
Author: Zephaniah E. Hull <warp@agamemnon.b5>
Date: Sun Sep 10 03:49:17 2006 -0400
Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver
commit 65256109bb8f5a26704ed960e1dd113981df5787
Author: Drew Parsons <dparsons@debian.org>
Date: Sun Sep 10 17:40:37 2006 +1000
* Define XPSERVERLIST with `/etc/init.d/xprint get_xpserverlist`
instead of `/bin/sh /etc/init.d/xprint get_xpserverlist`
- allows the initscript to set its own different shell under #!
- allows disabling of XPSERVERLIST by making the script non-executable
* Allow files to be installed by using dist_*_DATA instead of EXTRA_DIST.
Also, use dist_*_SCRIPTS to install scripts.
* Fix minor typos in man pages.
commit 6950267dd690ef8e29b1c32a157dd64c9b79c06d
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Fri Sep 8 15:31:18 2006 -0400
Add SELinux extension configure-time support.
commit fb34c02861ab3629c1c85c156e73b158518db7c7
Merge: 9c503f09ce d1110c5c83
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Fri Sep 8 15:30:12 2006 -0400
Merge branch 'my-XACE-modular' into my-XACE-SELINUX
commit d1110c5c83a7f439158f369ab2f3ae614fa9d2a5
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Fri Sep 8 15:28:48 2006 -0400
Generalize the handling of configuration files that ship with extensions.
commit 9deb579dc9366590203afe0576bf88643ab36c89
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Fri Sep 8 15:25:17 2006 -0400
Zero out newly created ExtensionEntry structures, but only after the
devPrivates have been initialized.
commit cec392656cda1c938d5462e1949e6eef489f9168
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Fri Sep 8 15:24:23 2006 -0400
Zero out newly allocated ClientRec structures.
This is required to initialize the devPrivates to a known state.
commit 0fba09cdfcc78161f5c92bef6cca53e5309656bd
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Fri Sep 8 15:23:06 2006 -0400
Include dix-config.h.
commit c93877100eb98647c5b6b8556730d54677f730b6
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Fri Sep 8 15:21:57 2006 -0400
Don't need to allocate memory now that devPrivates are being used.
commit 9c503f09ce78d952d0ece77c424e42b6df3fa9ad
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Fri Sep 8 15:17:01 2006 -0400
Add SELinux extension to the module/extension loader.
commit 9aa44e3e4c321f42d8e64f83c7f0932470593c26
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Fri Sep 8 15:15:19 2006 -0400
Add SELinux extension configure-time support.
commit 150eabc4c8a08c81c48493583f922a1240b7e91c
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Fri Sep 8 15:11:04 2006 -0400
Add SELinux extension source files.
commit 86450998da616e3d00d4d6293acc35eccc2061e7
Author: Kristian Høgsberg <krh@redhat.com>
Date: Thu Sep 7 15:35:16 2006 -0400
Fix AIGLX VT switching.
See https://bugs.freedesktop.org/show_bug.cgi?id=7916
There may be a simpler, less intrusive fix that involves just rearranging
DRI locking between 2D and 3D drivers around VT switch.
commit 5e9d33fe87f9d24e55c468d4b2bb761c9efdb26a
Merge: 629798c73a 64479fffa2
Author: Daniel Stone <daniel@fooishbar.org>
Date: Thu Sep 7 15:43:31 2006 +0300
Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver into input-hotplug
commit 629798c73ad76a77fa6a55bc6403fd9b95ade2bb
Author: Daniel Stone <daniel@fooishbar.org>
Date: Thu Sep 7 15:17:04 2006 +0300
XkbCopyKeymap/SrvXkbCopyKeymap: free geom harder, add cheery comments
Unconditionally free geometry when copying the keymap (so we have none on
core, oh well), add a couple of heartening comments.
commit 64479fffa22581cc7d753065c33eda5520b7db9a
Author: Ian Romanick <idr@us.ibm.com>
Date: Wed Sep 6 16:13:21 2006 -0700
Remove prototypes and externs for non-existant functions and variables.
commit a0179281a6522ec59830e8f2549633741bc56e10
Author: Ian Romanick <idr@us.ibm.com>
Date: Wed Sep 6 15:45:48 2006 -0700
Remove prototypes for non-existant functions.
commit 8356be492c6b46abdffa08b13836571ed872e16f
Author: Michel Dänzer <michel@tungstengraphics.com>
Date: Wed Sep 6 15:20:55 2006 +0200
Make sure _XSERVER64 is defined when it should be and gets tested.
commit f6ce0839ba5b73247097826d28f7388fe248ec0c
Author: Michel Dänzer <michel@tungstengraphics.com>
Date: Wed Sep 6 13:18:02 2006 +0200
Fix #include paths for fontcacheproto headers.
commit f39fd4242902eaa862321d39337f429dd14ebacf
Author: Aaron Plattner <aplattner@nvidia.com>
Date: Tue Sep 5 15:23:54 2006 -0700
(unsigned long)(1 << 31) = bad news on x86_64.
(cherry picked from 410e5b1d738ba47b36778e6cbed44023a27ce259 commit)
commit 410e5b1d738ba47b36778e6cbed44023a27ce259
Author: Aaron Plattner <aplattner@nvidia.com>
Date: Tue Sep 5 15:23:54 2006 -0700
(unsigned long)(1 << 31) = bad news on x86_64.
commit 0b81fccd2ee4e054e5cffb739de07460ff2c13f7
Merge: 20c4ac6e03 c2813514cf
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Tue Sep 5 18:03:25 2006 -0400
Merge branch 'master' into my-XACE-modular
Conflicts:
configure.ac
commit c2813514cf7b1a36caa848cbc2ceef99cf2eb769
Author: Ian Romanick <idr@us.ibm.com>
Date: Thu Aug 31 15:36:13 2006 -0700
Add missing file from previous commit.
commit 0f9cfb2f752a9010ff07f4b2bd891db0cc30b8e6
Author: Ian Romanick <idr@us.ibm.com>
Date: Thu Aug 31 13:54:10 2006 -0700
Implement GLX_SGI_swap_control.
Regenerate from glX_API.xml 1.2. Add infrastructure to support
GLX_SGI_swap_control for AIGLX when the DRI driver enables it. Tested
with R300.
commit a9ef5862919313582f72fc0cfb5ab0af4df6507e
Author: Ian Romanick <idr@us.ibm.com>
Date: Thu Aug 31 13:47:50 2006 -0700
Fix problems with vertex program protocol
There were two sets of bugs in the vertex program (ARB and NV)
protocol. First, several of the ARB functions were missing the
'doubles_in_order="true"' annotation. Second, after the ARB decided
that glVertexAttrib*ARB functions must not alias fixed-function state
for GLSL, Nvidia re-assigned GLX protocol opcodes for
glVertexAttrib*NV (circa Septeber 2004). For some reason gl_API.xml
was never updated to reflect this, and the updated version of the
GL_NV_vertex_program spec never made into the registry.
This is just a server-side regeneration from gl_API.xml version 1.68.
commit 69d5becce4ca2cfc8f8de53672ed54a47de62164
Author: Matthew Allum <mallum@openedhand.com>
Date: Thu Aug 31 17:30:24 2006 +0100
Fix previous commit breaking other kdrives pulling in fbdev.a
commit fd609956f27d76ee76ac8623787f0fc8633a5546
Author: Matthew Allum <mallum@openedhand.com>
Date: Thu Aug 31 17:18:57 2006 +0100
Add framebuffer device command line switch for Xfbdev
commit 2fb7b8795a9a36cce61f6449f6ca26ffd1b071f0
Author: Ian Romanick <idr@us.ibm.com>
Date: Tue Aug 29 16:35:32 2006 -0700
Minor extension tweaks.
GLX_EXT_texture_from_pixmap should always be enabled.
GLX_SGI_video_sync is only for direct rendering and should never
appear in the server's string.
commit 1c8851ad491dd02d1c79e620b46384956838ed42
Merge: d59b52fc08 5ddbf4bcd4
Author: Ian Romanick <idr@us.ibm.com>
Date: Tue Aug 29 16:34:04 2006 -0700
Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver
commit d59b52fc08f2d80b38993e383e61c3eeb0bb0763
Author: Ian Romanick <idr@us.ibm.com>
Date: Tue Aug 29 14:40:13 2006 -0700
Make sure unsupported extensions are disabled.
GLX protocol isn't supported for GLX_SGI_swap_control or
GLX_SGI_video_sync. Remove them from the list of available extensions
until they are supported.
commit db6d04d4b87fd9b6409a3ddf0479a88440c2eda1
Author: Ian Romanick <idr@us.ibm.com>
Date: Tue Aug 29 14:35:08 2006 -0700
Add support for AIGLX drivers to enable GLX extensions that they support.
commit 5ddbf4bcd46fe0d3d682668c2748c712fea410ae
Author: Matthew Allum <mallum@openedhand.com>
Date: Tue Aug 29 22:07:15 2006 +0100
Re-add support for tslib (1.0 release) and Xcalibrate extension.
commit 4524a2bf6f22c871ed109b027a065f0262137dc5
Author: Daniel Stone <daniel@fooishbar.org>
Date: Tue Aug 29 23:49:26 2006 +0300
configure.ac: move tslib from KDRIVE_PURE_LIBS to KDRIVE_LIBS
Yeah. That was dumb.
commit 942b4369990a255257f66835caf8671432c405a3
Merge: 77d315bd2f 393dc0a338
Author: Ian Romanick <idr@us.ibm.com>
Date: Tue Aug 29 13:30:37 2006 -0700
Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver
commit 77d315bd2fd2f9014c831d313efbe5821189177c
Author: Ian Romanick <idr@us.ibm.com>
Date: Tue Aug 29 13:30:20 2006 -0700
Remove __glXNoSuchRenderOpcode because it is no longer used.
commit 260c3f32b69c98f8fc5360f860f69d32c19f04a7
Author: Daniel Stone <daniel@fooishbar.org>
Date: Tue Aug 29 23:18:12 2006 +0300
configure.ac: fix XSDL test
commit 393dc0a3388d56186181b2bd9bcc1d267747e709
Author: Daniel Stone <daniel@fooishbar.org>
Date: Tue Aug 29 22:53:54 2006 +0300
kdrive: remove @KDRIVE_LIBS@ from Xfoo_DEPENDENCIES
commit cff23616fe45e10c6786a303c8dcfc0a80463a53
Author: Daniel Stone <daniel@fooishbar.org>
Date: Tue Aug 29 22:44:09 2006 +0300
configure.ac: allow disabling of XSDL
commit 89d272bb183e85715d8e6047929fb2d912033d82
Author: Daniel Stone <daniel.stone@nokia.com>
Date: Tue Aug 29 15:05:31 2006 +0300
[PATCH] kdrive/linux keyboard: remove more debugging spew
commit bd6f539ff9409aa7d9056fabe120b457b0a15997
Author: Daniel Stone <daniel.stone@nokia.com>
Date: Tue Aug 29 13:21:58 2006 +0300
[PATCH] kdrive/linux keyboard: silence excessive debugging noise
commit 5436fce09003e20744a388fa4ae49007c9cf8ede
Author: Daniel Stone <daniel.stone@nokia.com>
Date: Tue Aug 29 13:21:40 2006 +0300
[PATCH] GetKeyboardValutorEvents: be even more careful
Don't accept devices without a keyboard feedback class.
commit 0eb7299f445455a7bcacf2410e83227b23259675
Author: Daniel Stone <daniel.stone@nokia.com>
Date: Tue Aug 29 13:19:12 2006 +0300
[PATCH] XkbCopyKeymap: still more range fixes
Make sure we don't stomp preserve if it doesn't already exist, and fix a
couple of range-related thinkos in level name copying.
commit 7fa3383e3c8eea7d1eb0e556393f2431cf8e6ed2
Merge: 8d77d44fda ebbdc1342a
Author: Daniel Stone <daniel@fooishbar.org>
Date: Tue Aug 29 15:16:01 2006 +0300
Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver into input-hotplug
commit ebbdc1342a243b301723390696f742dc91f59764
Author: Adam Jackson <ajax@benzedrine.nwnk.net>
Date: Mon Aug 28 18:17:32 2006 -0400
Remove calls to LoaderCheckUnresolved(), since it's now a stub.
commit 8d77d44fda3aacbae62864a3620e09095b79e92d
Merge: d6f36bd280 2fde560bbb
Author: Daniel Stone <daniel@fooishbar.org>
Date: Sun Aug 27 23:08:49 2006 +0300
Merge branch 'origin' into input-hotplug
commit 20c4ac6e038607ebbf6c04639670514c016d8597
Merge: 13c6713c82 8d4f21ab53
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Fri Aug 25 18:49:46 2006 -0400
Merge branch 'my-XACE-SELINUX' into my-XACE-modular
commit 13c6713c82763a85c725c998b37ad02156d803ba
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Fri Aug 25 18:17:01 2006 -0400
Add four new XACE hooks: auditing, key event notification, window init
commit 2fde560bbb9c1148f26fd969dc30c4e736672b7c
Author: Ian Romanick <idr@umwelt.(none)>
Date: Fri Aug 25 13:01:51 2006 -0700
Enable GL_EXT_texture_filter_anisotropic and GL_EXT_blend_equation_separate.
Re-generate from gl_API.xml 1.65. This provides the missing bits for
GL_EXT_texture_filter_anisotropic and GL_EXT_blend_equation_separate.
Enable those extensions.
commit e2d529963ed40b5f113cf82c17809d241cd4aac1
Author: Ian Romanick <idr@umwelt.(none)>
Date: Fri Aug 25 12:05:16 2006 -0700
Enable vertex and fragment programs.
Implement glGetProgramStringARB and glGetProgramStringNV. With these
functions implemented, GL_ARB_{vertex,fragment}_program,
GL_NV_{vertex,fragment}_program, and related extensions can be enabled.
commit 21291d6ca7188e5733ed0c93215ee0f1f0f90cc9
Merge: 1a5561c4ec cd2da4e41e
Author: Ian Romanick <idr@umwelt.(none)>
Date: Fri Aug 25 09:34:21 2006 -0700
Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver into pci-rework
commit d6f36bd28009881ef7f7a20cdadb3808d808ed97
Author: Daniel Stone <daniel@fooishbar.org>
Date: Fri Aug 25 12:43:17 2006 +0300
xfree86/parser: use 'kbd' driver when 'keyboard' specified
Now that we've completely ditched the old driver, we should probably make a
best-effort attempt to keep configs working.
commit 7c4167f0d6b33c9c602b04fcfd246fd3aeddd709
Merge: 393f8347ed cd2da4e41e
Author: Daniel Stone <daniel@fooishbar.org>
Date: Fri Aug 25 11:15:33 2006 +0300
Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver into input-hotplug
commit 393f8347edcccfc24d8902a86ea9def7ada2537b
Author: Daniel Stone <daniel@fooishbar.org>
Date: Fri Aug 25 10:46:32 2006 +0300
xorgconf.cpp: kbd, not keyboard
commit c33e39c86be2010b169ffbd8adbe53b93222dc5f
Author: Ian Romanick <idr@umwelt.(none)>
Date: Thu Aug 24 20:33:57 2006 -0700
Finish support for GL_ARB_texture_compression.
Fill in __glXDisp_GetCompressedTexImageARB and
__glXDispSwap_GetCompressedTexImageARB to finish support for
GL_ARB_texture_compression. With this extension (and the related
compression extensions), the server-side GLX supports all of the
protocol for GL 1.4. w00t!
The bad news is that this has received only minimal testing, and Mesa
does not contain any good tests for GL_ARB_texture_compression.
commit cd2da4e41eae233b50f8830d9a8f5d1d916a5a1b
Author: Ian Romanick <idr@umwelt.(none)>
Date: Thu Aug 24 18:00:16 2006 -0700
Remove GL/glx/g_disptab.c, GL/glx/g_disptab_EXT.c, and
GL/glx/g_disptab_EXT.h. Unfortunately GL/glx/g_disptab.h has to be
kept around a bit longer.
commit a29e6dd2d2d45c18c52737bb3b7945aafcea5032
Author: Ian Romanick <idr@umwelt.(none)>
Date: Thu Aug 24 17:58:52 2006 -0700
Add some missing bits of GL_SGI_color_table.
commit ae608b2071d882966e9c7ede71f846b1ecec0b23
Merge: 2c865277fe b879356ce9
Author: Ian Romanick <idr@umwelt.(none)>
Date: Thu Aug 24 14:56:33 2006 -0700
Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver
commit 2c865277fe1d056981d1020e1af001d2319252c0
Author: Ian Romanick <idr@umwelt.(none)>
Date: Thu Aug 24 14:54:49 2006 -0700
Regenerate from gl_API.xml 1.63. Enable extensions.
gl_API.xml 1.63 corrects some problems with GLX protocol for
GL_EXT_paletted_texture and GL_SGI_color_table. Regenerate from that
file, and enable those extensions and GL_EXT_shared_texture_palette.
commit 7d5de5c6657304246473d7ddd5c29bb0c7a3bc34
Author: Ian Romanick <idr@umwelt.(none)>
Date: Thu Aug 24 14:49:46 2006 -0700
Regenerate from gl_API.xml 1.62. Functions move, no real changes.
commit 3a36b0a24aa9e9e238faa7f00100f59800f5142b
Merge: db1ab1bdb2 b879356ce9
Author: Daniel Stone <daniel@fooishbar.org>
Date: Thu Aug 24 23:35:28 2006 +0300
Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver into input-hotplug
commit db1ab1bdb2f79eca593fe247056309a16ebd29c6
Author: Daniel Stone <daniel@fooishbar.org>
Date: Thu Aug 24 23:33:59 2006 +0300
XkbCopyKeymap: fix various range issues
Fix a bunch of range issues caused by incorrect assumptions (e.g. that the
design was at least halfway sensible), and copy types by hand, instead of
just blindly memcpy()ing the lot, since it itself cleverly contains a ton
of allocated pointers.
commit 5fb8d947bb88d715b9b236342885c445cb5a9387
Author: Daniel Stone <daniel@fooishbar.org>
Date: Thu Aug 24 23:16:43 2006 +0300
configure.ac: more thinkos
Fix auto tests for vidmode and xf86dga. I win at life.
commit 4e37c07ba6e5d299d4f8922dc6cf054c814f7baf
Author: Daniel Stone <daniel@fooishbar.org>
Date: Thu Aug 24 23:16:17 2006 +0300
config: clean up debugging messages, make failure to acquire name fatal
Bomb with FatalError when we can't acquire the bus and name.
Clean up a bunch of debugging ErrorFs to be hidden behind #ifdef DEBUG.
commit b879356ce96929d02bcb75b9aa24b17ac7e28125
Author: Adam Jackson <ajax@benzedrine.nwnk.net>
Date: Thu Aug 24 15:50:15 2006 -0400
More #ifdef USE_DEPRECATED_KEYBOARD_DRIVER.
commit 4ed311cf1c29090c53e474a3001c5702ff8409df
Merge: 73e58adda9 b29b236d88
Author: Matthias Hopf <mhopf@suse.de>
Date: Thu Aug 24 20:17:10 2006 +0200
Merge branch 'master' of git://anongit.freedesktop.org/git/xorg/xserver
commit b29b236d88789fd45d823a55dbedb393bb134c5b
Author: Lukáš Turek <8an@centrum.cz>
Date: Thu Aug 24 15:57:09 2006 +0200
Adapt to Mesa header name change.
commit ce4a0a4ddafd3833d7025f83ed3729915c8aba70
Author: Alan Hourihane <alanh@fairlite.demon.co.uk>
Date: Thu Aug 24 13:56:22 2006 +0100
Apply patch in bug #7919, blit improvements in
multiwindow mode for Xming/CygwinX
commit 866ca1f929c95689bac9f0a0b3478f7b4d77214b
Author: Daniel Stone <daniel@fooishbar.org>
Date: Thu Aug 24 15:46:44 2006 +0300
configure.ac: fix XF86VidMode test
commit 2b06c69c8feaf3bdc065635ee711efa45b3033b3
Author: Daniel Stone <daniel@fooishbar.org>
Date: Thu Aug 24 14:51:26 2006 +0300
GKVE: pass correct arguments to XkbCopyKeymap
Fix horrendous thinko. Indicators now work perfectly.
commit 4adf9af313c9f63b6ad734e174efe1d36ddb5813
Merge: 33af05d58f 67bd672c88
Author: Daniel Stone <daniel@fooishbar.org>
Date: Thu Aug 24 10:59:33 2006 +0300
Merge branch 'master' into input-hotplug
commit 67bd672c880869ef625ae0c0163c3ec1eba46abf
Author: Alan Hourihane <alanh@fairlite.demon.co.uk>
Date: Thu Aug 24 08:47:06 2006 +0100
Fix typo
commit 733c4beb16c2c4ad9e9a4ea9a85b09fc5062a775
Author: David Nusinow <dnusinow@debian.org>
Date: Wed Aug 23 22:39:42 2006 +0000
Add xorg.conf IgnoreABI option which does the same thing as -ignoreABI
commit b983773d446cef6a0948ca264ed48126e404ae9a
Merge: 0623d3643f d9a86566c2
Author: Ian Romanick <idr@umwelt.(none)>
Date: Wed Aug 23 17:16:50 2006 -0700
Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver
commit 0623d3643fc28ebc514b2ca872c985d0cf0c753a
Author: Ian Romanick <idr@umwelt.(none)>
Date: Wed Aug 23 17:16:02 2006 -0700
Fix the sorting of the extension string. Add a few extensions that
are supported by the new code. A few of these were actually supported
before but weren't advertised.
commit 5d2caacff570dd68bb3fb05e776e02515b2a9da0
Author: Ian Romanick <idr@umwelt.(none)>
Date: Wed Aug 23 16:47:00 2006 -0700
Refector __glXDisp_Render and __glXDispSwap_Render to DoRender.
Refector __glXDisp_RenderLarge and __glXDispSwap_RenderLarge to
DoRenderLarge.
commit 866bb3f34046045c9fa0744db1d76e035b3da9c7
Author: Ian Romanick <idr@umwelt.(none)>
Date: Wed Aug 23 16:41:53 2006 -0700
Memo to myself: Whenever a Makefile.am changes, autogen.sh must be
re-run. This is especially true if the change is to remove a source
file.
Fix RenderLarge to actually use the new protocol decode tables.
commit d9a86566c21afd7985673f3ed851b055d9dac46f
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Wed Aug 23 16:15:19 2006 -0700
Add LOCALCONN to dix-config.h template for xtrans
commit f6fd7d8f8393f93705e76b2b2777a0d9bcafa991
Author: Ian Romanick <idr@umwelt.(none)>
Date: Wed Aug 23 16:05:37 2006 -0700
Convert protocol decode tabels for Render and RenderLarge to use nice,
compact N-way search trees generated by scripts in Mesa.
commit 7ae82b5fc8721be78b43a322bbf2c46aac08b8cf
Author: Ian Romanick <idr@umwelt.(none)>
Date: Wed Aug 23 16:00:48 2006 -0700
Fix __glXDispatchInfo::dispatch_functions and
__glXDispatchInfo::size_table. dispatch_functions had the const in
the wrong place, and size_table was declared as an array of two
pointers to int_fast16_t instead of a pointer to an array of 2
int_fast16_t. cdecl to the rescue!
commit 39a620d17809dc71fb5ad61a955fe3c442f90a05
Author: Ian Romanick <idr@umwelt.(none)>
Date: Wed Aug 23 14:24:34 2006 -0700
Rename __glXDrawArraysSize to __glXDrawArraysReqSize. This makes its
name match the pattern of all the other functions in
__glXRenderSizeTable.
commit 86406455f0e5fc977431948611e9bb5fda1e1d46
Author: Ian Romanick <idr@umwelt.(none)>
Date: Wed Aug 23 13:30:59 2006 -0700
Re-generated files after a fix to glX_API.xml (in Mesa).
commit d7a7f12361d31001bbd9394a57de029ef0b934b8
Author: Ian Romanick <idr@umwelt.(none)>
Date: Wed Aug 23 13:30:13 2006 -0700
Convert protocol decode tables for Single, VendorPrivate, and
VendorPrivateWithReply message to use nice, compact N-way search trees
generated by scripts in Mesa.
The Render protocol decode tables are next...
commit bdec9680fa74dd23cf319d09af1940f8cf71a5b1
Author: Adam Jackson <ajax@benzedrine.nwnk.net>
Date: Wed Aug 23 14:43:23 2006 -0400
Make sure Composite is never enabled for Xnest.
commit 9f2a108051aad9b024ab737b45fc12290a113e37
Author: Adam Jackson <ajax@benzedrine.nwnk.net>
Date: Wed Aug 23 14:38:34 2006 -0400
Make 'Xvfb -render' also disable Composite, lest we segfault on startup.
commit 33af05d58f1f4f021036e9ce4b60fd76dbaebe73
Author: Daniel Stone <daniel@fooishbar.org>
Date: Wed Aug 23 19:05:50 2006 +0300
XkbCopyKeymap: use correct range for MapNotify
We haven't copied {min,max}_key_code by the time the notifies run, so use
src instead of dst to determine number of keys, et al.
commit 6323a11d0db4d3cf0317af83f0362730142f5325
Author: Daniel Stone <daniel@fooishbar.org>
Date: Wed Aug 23 18:53:04 2006 +0300
XkbCopyKeymap: optionally send NewKeyboardNotify/MapNotify events
Optionally send a NewKeyboardNotify or MapNotify event when copying the
keymap; modify GetKeyboardValuatorEvents to make use of this.
commit 728fbadd16a748b45c80bc2c65c46f82cf803578
Author: Daniel Stone <daniel@fooishbar.org>
Date: Wed Aug 23 14:33:59 2006 +0300
gitignore: ignore vi swap files
commit 8f8487ff997670a4af0293fed77ff920cfc39fb1
Author: Daniel Stone <daniel@fooishbar.org>
Date: Wed Aug 23 14:33:41 2006 +0300
xkb/gkve: copy XKB map, not pointer-assign
Write a new function to copy an XKB map (does everything but geometry at
the moment), and use that instead of nasty pointer assignments.
commit 52ba722e4c89c052609b4fc62e965d92778aa2dd
Merge: 9138d5a51e 05541259bd
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Mon Aug 21 18:49:31 2006 -0400
Merge branch 'XACE-modular' into my-XACE-modular
commit 05541259bdb0dfaab015a01caa3722b7a1b782e2
Merge: c2535f6792 a1ac0440bb
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Mon Aug 21 13:07:41 2006 -0700
Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver into XACE-modular
commit a56b98bb047003a05e26ca9365c212a2da7ac200
Author: Daniel Stone <daniel.stone@nokia.com>
Date: Fri Aug 18 18:03:41 2006 +0300
dix: enable null root cursor
Enable a blank root cursor, selectable with --enable-null-root-cursor at
configure time.
commit 0704bb298cc826cd117815898c6bc015a693c2c9
Merge: c14036977f a1ac0440bb
Author: Daniel Stone <daniel@fooishbar.org>
Date: Fri Aug 18 17:30:14 2006 +0300
Merge branch 'master' into input-hotplug
commit a1ac0440bba690368aa4226468ce571be1a09d95
Author: Daniel Stone <daniel@fooishbar.org>
Date: Fri Aug 18 17:30:00 2006 +0300
dix: fix whiteroot thinko
Note to self: run git update-index _after_ testing, not just before.
commit c14036977fef7b8787c0b68f5262fa0b6a2834f5
Author: Daniel Stone <daniel@fooishbar.org>
Date: Fri Aug 18 17:24:34 2006 +0300
input.h: add InitCoreDevices prototype
commit 1c2cb30cd88ba4453f9da339025f8ff39f7f5412
Merge: 633b6a69f5 70ddd0f39d
Author: Daniel Stone <daniel@fooishbar.org>
Date: Fri Aug 18 17:05:50 2006 +0300
Merge branch 'origin' into input-hotplug
commit 19f673b7788d32c220e7e06734f1074b0e4a999c
Merge: cb0a565d2b 70ddd0f39d
Author: Daniel Stone <daniel@fooishbar.org>
Date: Fri Aug 18 17:05:41 2006 +0300
Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver
commit cb0a565d2b2cf8823abbd77b4426cc2237731dc1
Author: Daniel Stone <daniel@fooishbar.org>
Date: Fri Aug 18 17:04:48 2006 +0300
dix: add whiteroot flag
Add a -wr option to use a white root window, and use a BackPixel rather
than BackPixmap for both white and black root windows.
commit 70ddd0f39d5118db72a1a4e473cbfb502f1ed9ec
Author: Alan Hourihane <alanh@fairlite.demon.co.uk>
Date: Fri Aug 18 14:43:10 2006 +0100
Fix bug #5735, Serious flaw in CygwinX clipboard
integration prevents paste from X to Windows apps
(Brett Stahlman & Colin Harrison)
commit 708b225689b5a4ba9ffe3372b584b715ef9eacdc
Merge: e1f4565be5 ee5e2cbd2b
Author: Alan Hourihane <alanh@fairlite.demon.co.uk>
Date: Fri Aug 18 09:13:52 2006 +0100
Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver
commit e1f4565be5ce80be4655e81f77f4073fa3fbf8d0
Author: Alan Hourihane <alanh@fairlite.demon.co.uk>
Date: Fri Aug 18 09:11:48 2006 +0100
Fix bug #7302, make Xn.hosts work from the
Microsoft Windows install directory on Xming.
(Colin Harrison)
commit 1880defe4eaba02f9585b154d0883235eabc6d11
Author: Alan Hourihane <alanh@fairlite.demon.co.uk>
Date: Fri Aug 18 09:09:53 2006 +0100
Fix bug #7281, clipboard viewer should not
call SetClipboard viewer when bogus in Xming/CygwinX
(Colin Harrison)
commit a1a8e4f7f5917f537eb3dd51d3d6fa3e129236ce
Author: Alan Hourihane <alanh@fairlite.demon.co.uk>
Date: Fri Aug 18 09:08:12 2006 +0100
Fix bug #7280, round title corner background
should be transparent not black in Xming/CygwinX
(Colin Harrison)
commit ee5e2cbd2bee610a95facc6b486c4a5070973099
Author: Adam Jackson <ajax@benzedrine.nwnk.net>
Date: Thu Aug 17 17:29:32 2006 -0400
Un-cut-and-paste the mode rejection message.
commit 43e42eef1f5a22703eb64fc9cffecde036ea38e0
Author: Adam Jackson <ajax@benzedrine.nwnk.net>
Date: Thu Aug 17 16:22:07 2006 -0400
Fix default mouse device on Linux, again.
It would be really nice if we only did this in one place instead of 40.
commit 633b6a69f560c0a77dcff78fdef5fcf0041e2e04
Merge: 95dbfcf882 7da51447ea
Author: Daniel Stone <daniel@fooishbar.org>
Date: Thu Aug 17 21:25:14 2006 +0300
Merge branch 'master' into input-hotplug
commit 7da51447eaab34292e14077fb5a48e6b2e587781
Author: Daniel Stone <daniel@fooishbar.org>
Date: Thu Aug 17 21:24:07 2006 +0300
events.c: fix tiny XEvIE thinko
Make sure xeviehot gets updated after the ConfineToShape() call.
commit 5d082f05632906c29296a44ef5c3a4962c0cbe62
Author: Daniel Stone <daniel@fooishbar.org>
Date: Thu Aug 17 21:18:18 2006 +0300
events.c: make XEvIE a little less verbose
Change a lot of:
#ifdef XEVIE
xeviehot.x =
#endif
sprite.hot.x = ...
#ifdef XEVIE
xeviehot.y =
#endif
sprite.hot.y = ...
to one single
#ifdef XEVIE
xeviehot.x = sprite.hot.x;
xeviehot.y = sprite.hot.y;
#endif
at the end of the functions.
commit 95dbfcf8828c041c218145afc87d21a6c9c7bc02
Author: Daniel Stone <daniel@fooishbar.org>
Date: Thu Aug 17 21:18:18 2006 +0300
events.c: make XEvIE a little less verbose
Change a lot of:
#ifdef XEVIE
xeviehot.x =
#endif
sprite.hot.x = ...
#ifdef XEVIE
xeviehot.y =
#endif
sprite.hot.y = ...
to one single
#ifdef XEVIE
xeviehot.x = sprite.hot.x;
xeviehot.y = sprite.hot.y;
#endif
at the end of the functions.
commit c6c39afde3e5f43b623ca6b52162b83c98a28d45
Author: Daniel Stone <daniel@fooishbar.org>
Date: Thu Aug 17 21:13:09 2006 +0300
dix/events.c: add YAFIXME
Add another FIXME to the cacaphony of XXX and FIXMEs in this file.
commit f9624e0109cf12b6af43fb4235aaa0b54340a4bb
Author: Daniel Stone <daniel@fooishbar.org>
Date: Thu Aug 17 16:09:51 2006 +0300
kdrive/input: verify SIGIO with --enable-debug
commit 73e58adda96c1d1b5176d819107faa7697c3eb94
Author: Matthias Hopf <mhopf@suse.de>
Date: Wed Aug 16 18:17:58 2006 +0200
Fixed segfault w/ broken Xinerama configs.
commit cd3f744b1f983f71476db99c050045d981c5f5b2
Author: Daniel Stone <daniel@fooishbar.org>
Date: Tue Aug 15 15:54:13 2006 +0300
fix missing brace, trim unused variables
commit 5d073697adb3864133fa3221b82ab8d2f4a59758
Author: Daniel Stone <daniel@fooishbar.org>
Date: Tue Aug 15 15:37:10 2006 +0300
kdrive/input: minor warning cleanups
And also a compiler error fix when VERIFY_SIGIO is defined.
commit 47c1c948e69cfba950ad37a3133fa2db0bd0ff2c
Author: Daniel Stone <daniel@fooishbar.org>
Date: Tue Aug 15 15:25:16 2006 +0300
kdrive/input: only run special key behaviours on non-XKB
Only attempt to manually deal with special key behaviours (e.g. terminating
the server) when not using XKB, and leave locking behaviour up to GKVE.
commit 34228d8b280ef105a0c60b8de5dacf70a5ce24b5
Author: Daniel Stone <daniel@fooishbar.org>
Date: Tue Aug 15 15:23:53 2006 +0300
GPE: fix absolute button events / GKVE: (non-XKB) don't repeat lock keys
Fix absolute button events in GPE, where we would previously send valuator
events without bumping numEvents accordingly, causing the core event to
go missing.
In the non-XKB path in GKVE, implement proper lock behaviour (one press to
enable, one press to disable, discard releases).
Fix debug_events prototype.
commit d003bada3352ec7d734498c4c732904876a9d1e2
Merge: d6433be3cc a815b9b990
Author: Daniel Stone <daniel@fooishbar.org>
Date: Sat Aug 12 22:48:55 2006 +0300
Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver into input-hotplug
commit a815b9b990e068f02d9cbba2b17f2cc3a30a9310
Merge: 37943e2f1a 984babe86b
Author: George Sapountzis <gsap7@yahoo.gr>
Date: Sat Aug 12 21:58:33 2006 +0300
Merge branch 'master' of git+ssh://gsap7@git.freedesktop.org/git/xorg/xserver
commit d6433be3cca807dd78fbb1f45d9ba0212283083d
Merge: 2bf9e3dc1e 984babe86b
Author: Daniel Stone <daniel@fooishbar.org>
Date: Sat Aug 12 21:50:52 2006 +0300
Merge branch 'master' into input-hotplug
commit 2bf9e3dc1ec5fd7bf84a4a96899e5663a721d4a4
Author: Daniel Stone <daniel@fooishbar.org>
Date: Sat Aug 12 21:50:39 2006 +0300
make DIX more tolerant of devices without a CtrlProc (Debian #269860)
Return BadDevice on client requests for devices without a CtrlProc, instead
of tanking horribly.
commit 984babe86bf82002b4d6589b2750c7b5a5489bd5
Author: Daniel Stone <daniel@fooishbar.org>
Date: Sat Aug 12 21:43:38 2006 +0300
remove obsolete vendor defines
Remove random behaviour changes for SGI and MetroLink.
commit 37943e2f1abc6709ff739000372b0394d5cd18c5
Author: George Sapountzis <gsap7@yahoo.gr>
Date: Sat Aug 12 20:54:33 2006 +0300
Call exaTryComponentAlphaHelper() for solid src also.
Also, rename to exaTryMagicTwoPassCompositeHelper() as it is now called for
non-component-alpha masks also, and add function description from
http://anholt.livejournal.com/32058.html.
commit f7919c287936f55569c2301ebb1b5f52358e70fa
Author: Bastian Blank <waldi@debian.org>
Date: Sat Aug 12 20:43:25 2006 +0300
xfree86: don't do legacy IO on ARM or S/390 (Debian #362641)
Don't attempt to poke legacy IO ranges on ARM or S/390.
commit 59dcc62906d8ee597cd43aa307f414cb47995cea
Author: Daniel Stone <daniel@fooishbar.org>
Date: Sat Aug 12 20:39:08 2006 +0300
xfree86: remove Xqueue support completely
commit e641000b98e7c2e92e3c801eaa42aa15d5c16ad0
Author: Samuel Thibault <samuel.thibault@ens-lyon.org>
Date: Sat Aug 12 19:41:59 2006 +0300
xfree86: add Hurd support (#5613)
Add support for GNU/Hurd.
commit 5a3488ccac8e5dabd9fc98bc41ef178ead1b2faf
Author: Daniel Stone <daniel@fooishbar.org>
Date: Sat Aug 12 19:25:06 2006 +0300
configure.ac: fix execinfo.h test (Debian #363218)
Define HAVE_EXECINFO_H as well as HAVE_BACKTRACE, when we find execinfo.h.
commit 26c3cd1c9e3f52548389817a6d89a377e20c4269
Merge: 008aa7eb6e c4951e0a6b
Author: Daniel Stone <daniel@fooishbar.org>
Date: Sat Aug 12 18:58:18 2006 +0300
Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver into input-hotplug
commit 008aa7eb6ed090384e6c44f861410e317c78a1cd
Author: Daniel Stone <daniel@fooishbar.org>
Date: Sat Aug 12 18:56:05 2006 +0300
completely remove OS keyboard layer
Completely axe the keyboard layer from os-support.
commit c4951e0a6b6cf3eeee710cc5cda1d9bc929ee3d7
Author: Adam Jackson <ajax@benzedrine.nwnk.net>
Date: Thu Aug 10 20:49:06 2006 -0400
Fix a mode sanity check to not break reduced-blanking setups (LCDs).
commit e1921f014b102e3eecf3b41972f8672cf23264d6
Author: Adam Jackson <ajax@benzedrine.nwnk.net>
Date: Thu Aug 10 20:43:15 2006 -0400
Rename some mode tokens to better reflect their use.
Per #5386, M_T_EDID -> M_T_DRIVER, since it's really for any driver-detected
mode. Also add M_T_PREFERRED bit, to select a 'best' mode out of a set.
commit c2535f67923bde0bfb0e72363467110806e2f40f
Merge: c0cb8d1fb8 db82e12fac
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Thu Aug 10 10:37:59 2006 -0700
Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver into XACE-modular
commit 9525c2709ea3245c6518d4c3b5a0a4afff37181d
Author: Daniel Stone <daniel@fooishbar.org>
Date: Thu Aug 10 20:29:57 2006 +0300
configure.ac: fix xephyr conditionals
Fix Xephyr build conditions, allowing it to actually be disabled.
commit 6d8d4abaaacf08140b673472d985117d448a62e7
Author: Daniel Stone <daniel@fooishbar.org>
Date: Thu Aug 10 20:28:06 2006 +0300
configure.ac: allow conditional building of XF86{DGA,Misc,VidMode}
Allow conditional building of the above three extensions, defaulting to
auto.
commit 1a5561c4ecccaf32b03c41373adf376100d457aa
Merge: 190f229ed7 db82e12fac
Author: Ian Romanick <idr@umwelt.(none)>
Date: Thu Aug 10 10:20:37 2006 -0700
Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver into pci-rework
commit cec284f2b3e948deb9e56a1a8519fddf693ab952
Author: Daniel Stone <daniel@fooishbar.org>
Date: Thu Aug 10 18:03:58 2006 +0300
kdrive: properly ifdef composite enabling
commit 45bce556e8665412b9f6e89f88ed5bedb41de1ba
Author: Daniel Stone <daniel@fooishbar.org>
Date: Thu Aug 10 18:02:47 2006 +0300
GetMaximumEventsNum: be more conservative
Be slightly more conservative in our maximum event count if we're using
XKB (and thus don't need to count the extra repeat events).
commit 172d45b9b75f95c997d1e9358040eead496e2a06
Merge: 3832a3d7db db82e12fac
Author: Daniel Stone <daniel@fooishbar.org>
Date: Thu Aug 10 14:14:54 2006 +0300
Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver into input-hotplug
commit 3832a3d7db0f3b5d7167e3b3b5ea6d6b3d96351a
Author: Daniel Stone <daniel@fooishbar.org>
Date: Thu Aug 10 14:13:51 2006 +0300
GKVE: don't repeat modifiers when using XKB
Make sure we don't ever repeat modifiers (previously was repeating when
using XKB); only do explicit KP/KR repeats in the non-XKB case. XKB will
take care of repeating when we're using it.
commit 9f188416bb6b4837d4c3f8773053d5eee0ff0ee1
Author: Daniel Stone <daniel@fooishbar.org>
Date: Thu Aug 10 14:00:34 2006 +0300
core devices: clear devicePrivates on close
commit 539d1f33475484d35fb5a377efc76dba2d868e3f
Author: Daniel Stone <daniel@fooishbar.org>
Date: Thu Aug 10 14:00:14 2006 +0300
GKVE/GPE: have DDX allocate events
Don't allocate events on every GKE/GKVE/GPE call, just have the DDX manage
it instead. Introduce GetMaximumEventsNum(), which is the maximum number
of events these functions will ever produce.
commit db82e12fac5eaa16a39fc1bd0bc31ad95089dc95
Author: Adam Jackson <ajax@benzedrine.nwnk.net>
Date: Wed Aug 9 14:55:17 2006 -0400
Remove TargetRefresh option from the autoconfig logic.
The default target of 75Hz is almost always wrong for LCDs.
commit fcd4167e8913f77bdf9e17a6955d0f2a9f4eeb10
Author: Adam Jackson <ajax@benzedrine.nwnk.net>
Date: Wed Aug 9 14:48:51 2006 -0400
Remove the bc flag from the -help text, since it's gone.
commit 767f372dd02232469f9fd804b811a17eaf762e1e
Merge: c4f5de6cc3 462bb61b0f
Author: Tilman Sauerbeck <tilman@code-monkey.de>
Date: Wed Aug 9 20:23:30 2006 +0200
Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver
commit c4f5de6cc3b935025829af971b0b8010c1ecfedb
Author: Tilman Sauerbeck <tilman@code-monkey.de>
Date: Wed Aug 9 20:21:52 2006 +0200
Sanitized glxdri's Block/Wakeuphandler calling.
__glXDRIleaveServer() and _enterServer() used to call DRIDoBlockHandler
(resp DRIDoWakeupHandler) directly. They are now calling DRIBlockHandler
(resp DRIWakeupHandler) to account for driver specific block/wakeup
hooks.
commit 5506b4ad200745236f997c121e8200179c47b749
Merge: 4be9abb850 462bb61b0f
Author: Daniel Stone <daniel@fooishbar.org>
Date: Wed Aug 9 07:21:01 2006 +0300
Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver into input-hotplug
commit 4be9abb8504b3761b5f3a01851e4eb3da86c76e2
Author: Daniel Stone <daniel@fooishbar.org>
Date: Wed Aug 9 07:20:16 2006 +0300
kdrive: remove ddx_DEPENDENCIES
Remove foo_DEPENDENCIES as they weren't guaranteed to just be libs,
and loader arguments (-lfoo, -Lfoo) might've crept in.
commit 462bb61b0fe968fae1b99cf98ec6f7de09105dcd
Author: Aaron Plattner <aplattner@nvidia.com>
Date: Tue Aug 8 18:07:22 2006 -0700
Add CompositeRegisterAlternateVisuals.
This provides drivers the ability to add their own alternate visuals and then
register them with Composite for implicit redirection.
commit 190f229ed77d87797e0f2f6762c86b3ad3a3dcbe
Author: Ian Romanick <idr@umwelt.(none)>
Date: Tue Aug 8 16:47:32 2006 -0700
Make xf86PciVideoInfo static since it is only used within this file.
Dummy out all of the PCI bus and device access control functions. We
need a better way to do this, and that will probably be in
libpciaccess and / or the kernel.
Refactor xf86GetPciInfoForEntity to use pci_device_find_by_slot.
Refector xf86CheckPciSlot to use xf86GetPciEntity.
Eliminate disablePciBios and the one place that calls it.
commit 5508f7646f9754b054e961a1025b7a52913b563b
Author: Ian Romanick <idr@umwelt.(none)>
Date: Tue Aug 8 16:43:31 2006 -0700
Remove prototypes from some functions that were previously removed.
commit 9df53d903ed68073bf7d2c2a275b6f6556a85c0f
Author: Ian Romanick <idr@umwelt.(none)>
Date: Tue Aug 8 16:42:23 2006 -0700
Rename xf86ReadDomainMemory to xf86ReadLegacyVideoBIOS, since that's
what it is actually used for. Modify a few routines in linuxPci.c to
take pci_device structures as parameters in stead of PCITAGs.
commit fe351a711ef55c3ae1e784d4551147c080eda109
Author: Daniel Stone <daniel@fooishbar.org>
Date: Tue Aug 8 14:54:10 2006 +0300
GKVE: send XkbMapNotify, not XkbNewKeyboardNotify
Sending MapNotify is more correct in this case than NKN, so do that.
commit 31089816317f27c668b12a15c74fdd226a8df9f7
Merge: ab3ebfefdb 12dbd8a02f
Author: Daniel Stone <daniel@fooishbar.org>
Date: Tue Aug 8 12:01:12 2006 +0300
Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver into input-hotplug
commit ab3ebfefdb7d21aba72a5030f6f93bf4fafed709
Author: Tiago Vignatti <tv02@c3sl.ufpr.br>
Date: Tue Aug 8 12:00:34 2006 +0300
xorgcfg: fix compilation error
Add missing parentheses to IS_KBDDRIV macros.
commit 12dbd8a02f797ad57a1be683a02a1fcb1ca35438
Author: Daniel Stone <daniel@fooishbar.org>
Date: Mon Aug 7 23:43:40 2006 +0300
remove optional R3 backwards compatibility
Remove the permitOldBugs flag, which enabled backwards compatbility with
broken R2/R3 era clients.
commit 7721ee308fbbb6fc9c969f15fe04b3346c04f843
Author: Daniel Stone <daniel@fooishbar.org>
Date: Mon Aug 7 23:03:02 2006 +0300
config client: fix minor race with event queue
Fix a small race whereby you could remove a device while events from it
were still in the queue, by calling ProcessInputEvents immediately before
RemoveDevice, to (hopefully) flush the event queue.
commit 458c63a84110f64c7fce397a531a3a779c2239a2
Author: Daniel Stone <daniel@fooishbar.org>
Date: Mon Aug 7 23:02:17 2006 +0300
enable adding devices after removal of a middle device
Allow new devices to be added after a device that _wasn't_ the last on the
list was removed, by ensuring inputInfo.numDevices always increases, and
never decreases.
commit a31d11a7a8485cdc799f76c4d407d3b7f7c9b350
Author: Daniel Stone <daniel@fooishbar.org>
Date: Mon Aug 7 23:01:23 2006 +0300
GKVE: get rid of bogus double-release check
Get rid of a bogus double-release check which broke non-XKB servers.
commit bedc4ecf23c7150e3156e0d24602ed3bc3977225
Author: Daniel Stone <daniel@fooishbar.org>
Date: Mon Aug 7 23:00:45 2006 +0300
xephyr: aid input debugging
Add the 'ephyr' mouse and keyboard drivers to the driver list so we can
re-add devices.
Set the names properly in Ephyr{Keyboard,Mouse}Init, not in InitInput.
commit baf93b3abe1e88d82ee6a3d6939f50f96ded271a
Author: Daniel Stone <daniel@fooishbar.org>
Date: Mon Aug 7 21:12:45 2006 +0300
kdrive: move map initialisation to KdNewPointer
Do a linear n -> n initialisation on the map up until KD_MAX_BUTTON in
KdNewPointer, moving it out of both KdParsePointer, and KdPointerProc.
Also remove dead pointer acceleration code.
commit ccb53340b66a778abf10182fd88a7d699207fb84
Author: Daniel Stone <daniel@fooishbar.org>
Date: Mon Aug 7 21:12:00 2006 +0300
ephyr: cleanup
Remove extraneous KdAddPointerDriver call.
commit d1c18af27e0aed73104743afb4bf4b8d3d1186cf
Author: Daniel Stone <daniel@fooishbar.org>
Date: Mon Aug 7 21:11:38 2006 +0300
GPE: use button map for DBP/DBR, not just BP/BR
Make sure we use the button map for extended events, not just core.
commit 9b7ecbd1dd8d092221897e29c85f3306c7367716
Author: Daniel Stone <daniel@fooishbar.org>
Date: Mon Aug 7 21:09:32 2006 +0300
kdrive: prevent overrun in map
We actually need n + 1 elements for the mouse button map, not n.
commit eb6e8d4042252b13328dbb122e0e6186796a80ac
Author: Daniel Stone <daniel@fooishbar.org>
Date: Mon Aug 7 21:05:37 2006 +0300
kdrive: increase maximum number of buttons
Increase KD_MAX_BUTTONS to 32.
commit 1c72290cdf4d9b214e1b9c0526cb7cb8641051f3
Author: Aaron Plattner <aplattner@nvidia.com>
Date: Mon Aug 7 09:57:58 2006 -0700
Use DrawablePtrs instead of PixmapPtrs for Prepare/Finish access.
Also, define some wfb functions even if FB_ACCESS_WRAPPER is not defined. This allows a client to use libfb and libwfb at the same time.
commit afcad4ad99bbfc8bdcd0f4fdd70e072108410d30
Author: Daniel Stone <daniel@fooishbar.org>
Date: Mon Aug 7 18:11:05 2006 +0300
xfree86 ddx: always free GKE/GPE events
free() events we get passed back from GKE and GPE so we don't just, er,
leak them all. *cough*.
commit 98fdf874eeadd5b37413922d8afba8415d0c56bb
Author: Daniel Stone <daniel@fooishbar.org>
Date: Mon Aug 7 16:51:39 2006 +0300
move all autorepeat logic to DIX
Move core autorepeat logic for keyboards down to the DIX, remove it from
KDrive.
commit 5c7001fef8ffc6e3d8585a37d3f79a9495be8ed0
Author: Daniel Stone <daniel@fooishbar.org>
Date: Mon Aug 7 16:51:09 2006 +0300
memcpy() events in
memcpy events into our event structure instead of doing pointer assignment.
commit c85e64cba1d2d88f676ca7cf23b52a6f8219e90e
Merge: a406f6bfea f54b71b772
Author: Daniel Stone <daniel@fooishbar.org>
Date: Mon Aug 7 15:54:55 2006 +0300
Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver into input-hotplug
commit f54b71b772a1f587394ae3968782b611e52f0e2d
Author: David Nusinow <david@nee.(none)>
Date: Sun Aug 6 18:11:00 2006 +0000
Document enable/disable flag for AIGLX in xorg.conf manpage.
commit a406f6bfeaa46e3236f7ab46813fe6c30b936a35
Author: Daniel Stone <daniel@fooishbar.org>
Date: Fri Aug 4 12:40:19 2006 +0300
mieq: don't leak events
free all events posted through mieqEnqueue.
commit 997ba45b192f21810099ed888792a45f1677a9ce
Author: Daniel Stone <daniel@fooishbar.org>
Date: Fri Aug 4 11:18:16 2006 +0300
fix incorrect button test
Test for n (1..nButtons) being under nButtons, not button (1..(1<<nButtons)).
commit 9138d5a51e411f598bc0e75a3e73d2c16187a518
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Thu Aug 3 18:24:04 2006 -0400
Make SecurityLookupIDBy* part of the base functionality.
commit 45c229f526bf1dafb5e81b50d700449ba4e1613d
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Thu Aug 3 14:26:06 2006 -0400
Remove LBX code.
commit 96e45626c43b7674b66e0258b0b1730d5ce71357
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Wed Aug 2 20:29:59 2006 -0400
Rebase Security extension to use devPrivates for storing security state.
commit 83ebf61ec03ff31005375900bee1e55e0e694c4b
Author: Ian Romanick <idr@umwelt.(none)>
Date: Wed Aug 2 13:33:33 2006 -0700
Eliminate the last few places outside xf86pciBus.c that use
xf86PciVideoInfo. In all cases this means converting the code to use
the pci_device_iterator interfaces.
commit 5bfb2ee9652e5ef6d076ef8b6df54baaa43b8e0c
Author: Ian Romanick <idr@umwelt.(none)>
Date: Wed Aug 2 13:29:21 2006 -0700
Remove the last remants of the pci{Read,Write}{Long,Word,Byte}
functionality. This also allows the removal of PCI_CPU, PCI_CPU16,
and a few other dangling bits of cruft.
commit a0f2e1cae46f189ed97e2d92b485d315b3d2627a
Author: Ian Romanick <idr@umwelt.(none)>
Date: Wed Aug 2 10:54:41 2006 -0700
Move xf86FindPciDeviceVendor and xf86FindPciClass from xf86pciBus.c to
xf86int10.c. Refactor common code from those functions to do_find.
commit de8234606f87ce79d016f7ddeabdf57c4ad212f3
Author: Ian Romanick <idr@umwelt.(none)>
Date: Wed Aug 2 10:44:11 2006 -0700
Modify xf86FindPciDeviceVendor and xf86FindPciClass to use the
pci_interator interface instead of the xf86PciVideoInfo array.
commit 3c23dec5962b8b81ae838fe0ee2c7b0a789f5386
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Wed Aug 2 13:39:49 2006 -0400
Call ClientStateCallback on serverClient devPrivates initialization.
commit 23f44df9009023e77508f03ac4a7595c7e3d40cb
Author: Ian Romanick <idr@umwelt.(none)>
Date: Wed Aug 2 09:55:32 2006 -0700
Remove pciConfigPtr and all of the associated cruft.
commit 966ebd3d2d84b440e89504d055a0e937303ed11d
Merge: a94176627c 39169fd373
Author: Ian Romanick <idr@umwelt.(none)>
Date: Wed Aug 2 08:14:58 2006 -0700
Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver into pci-rework
commit ee02e647882a4be29e1130bd79904ee79ed6b802
Author: Aaron Plattner <aplattner@nvidia.com>
Date: Tue Aug 1 13:45:43 2006 -0700
Wrap libwfb memory access.
Use the READ and WRITE macros to wrap memory accesses that could be in video
memory. Add MEMCPY_WRAPPED and MEMSET_WRAPPED macros to wrap memcpy and
memset, respectively.
commit 39169fd373b97f34923f6494d697d9429d0b8aa3
Author: Matthew Allum <mallum@polystyrene.(none)>
Date: Tue Aug 1 13:39:22 2006 +0100
Back out 'mystery' spurious host window hints.
commit f737cc38baea6af8bf284c9e207e60a7d90eebe1
Author: Eamon Walsh <ewalsh@moss-uranus.epoch.ncsc.mil>
Date: Mon Jul 31 19:58:42 2006 -0400
Adding devPrivates support to the ExtensionEntry structure.
commit b04d64854712678701d5243aacf5cc93444cfadc
Author: Eamon Walsh <ewalsh@moss-uranus.epoch.ncsc.mil>
Date: Mon Jul 31 19:35:08 2006 -0400
Added devPrivates support to the ExtensionEntry structure.
commit a94176627cdd6122ffadb618995f9bcec872609a
Author: Ian Romanick <idr@umwelt.(none)>
Date: Mon Jul 31 14:33:58 2006 -0700
Eliminate all uses of the businfo field of pciDevice / pciConfigPtr.
commit a69335dc299be6de8b82ed34de1cb30f1255feb4
Author: Aaron Plattner <aplattner@nvidia.com>
Date: Mon Jul 31 14:15:55 2006 -0700
Make ReadMemoryProcPtr take a const pointer.
Fixes some warnings when using READ with a const pointer.
commit 26c9587f90806cce1c0d2a98e656e9c311a34ee5
Author: Ian Romanick <idr@umwelt.(none)>
Date: Mon Jul 31 13:54:36 2006 -0700
Build fixes for last pull from HEAD.
commit 65dc25d8f86b962f2adc765a9ff327419f98092b
Merge: 69533fc04f b74c845a12
Author: Ian Romanick <idr@umwelt.(none)>
Date: Mon Jul 31 12:30:30 2006 -0700
Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver into pci-rework
commit b74c845a1233f78b841ff8840272c50873300c20
Merge: 3112a6c4f2 02daa6bb10
Author: Ian Romanick <idr@umwelt.(none)>
Date: Mon Jul 31 10:26:06 2006 -0700
Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver
commit 3112a6c4f26d5e9258b8def7ce4109b4bd408c67
Author: Ian Romanick <idr@umwelt.(none)>
Date: Mon Jul 31 10:25:31 2006 -0700
Noting uses libdummy.a, so don't build it. Only libdummy-nonserver.a
is actually used.
commit 02daa6bb103e53e5a33db2bb6acbe57d0bf2c30e
Author: Matthew Allum <mallum@polystyrene.(none)>
Date: Mon Jul 31 17:32:05 2006 +0100
Improve XRes to;
- Better estimate general pixmap memory usage.
- Account for pixmaps shared between clients.
- Account for window background and border pixmaps,
and GC stripple and tile pixmaps.
commit 69533fc04f38c67fd424776c5191a4ba57ba8c8f
Merge: ef1aecaaf6 24051ef974
Author: Ian Romanick <idr@umwelt.(none)>
Date: Mon Jul 31 09:26:04 2006 -0700
Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver into pci-rework
Conflicts:
hw/xfree86/Makefile.am
hw/xfree86/common/xf86AutoConfig.c
commit 24051ef97406f28c102cf46a78223400b61fdae2
Author: Daniel Stone <daniel@fooishbar.org>
Date: Sun Jul 30 12:15:33 2006 +0300
remove filename that's too long for tar
commit ecb7d43a76d507d04891ab7f189b23be5eccda51
Author: Daniel Stone <daniel@fooishbar.org>
Date: Sun Jul 30 11:52:41 2006 +0300
add sym.h to sources
commit bf2d7499c84c94f228d03b21448f5688b3cda1a8
Author: Daniel Stone <daniel@fooishbar.org>
Date: Sun Jul 30 11:17:02 2006 +0300
add securitysrv.h
commit e87e68634d8eb66ab783e2802e2d5d12ff1031be
Author: Daniel Stone <daniel@fooishbar.org>
Date: Sun Jul 30 11:11:59 2006 +0300
remove .cvsignores from EXTRA_DIST
commit ed0c807de9f07468385fcbd2e8a9c0737759a461
Author: Daniel Stone <daniel@fooishbar.org>
Date: Sun Jul 30 11:08:54 2006 +0300
bump to 1.1.99.3
commit a68dc013a33d867e65a7e76b3eec5947b862a5b4
Author: Daniel Stone <daniel@fooishbar.org>
Date: Sun Jul 30 11:08:47 2006 +0300
remove README (which doesn't exist) from EXTRA_DIST
commit 87fe85f38b6f781bf0e2eb555526e3d77779f9fa
Merge: 3518e2d0de 654619d76c
Author: Daniel Stone <daniel@fooishbar.org>
Date: Sun Jul 30 10:51:34 2006 +0300
Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver into input-hotplug
commit 654619d76c779606f2315782fc01d1410399fa3b
Author: Kevin E Martin <kem@freedesktop.org>
Date: Fri Jul 28 17:16:32 2006 -0400
Revert xkb changes that broke XkbGetKeyboard()
commit 79016d4036786b091a9b9d1133a6cdfedd6c277d
Author: Luc Verhaegen <libv@skynet.be>
Date: Fri Jul 28 16:02:02 2006 -0400
Bug #5386 (partial): Move CVT mode generator from cvt(1) to server core, and
export it from the X server to modules.
commit e6ae1612be519ee6224d354244d076d85d44a750
Author: Aaron Plattner <aplattner@nvidia.com>
Date: Thu Jul 27 18:24:59 2006 -0700
Add fbHasVisualTypes and fbSetVisualTypesAndMasks to wfbrename.h and include -DXFree86Server.
commit 2a4ceb09ed5a09dc5763754ab865ec23df91ac9f
Author: Adam Jackson <ajax@benzedrine.nwnk.net>
Date: Wed Jul 26 19:39:17 2006 -0400
Remove dead function prototypes.
commit 990a4009057e068f41d20b95aa0c59357185650d
Author: Adam Jackson <ajax@benzedrine.nwnk.net>
Date: Wed Jul 26 19:03:39 2006 -0400
Remove getconfig horrorshow. Replace with a static built-in rule list for now.
commit 377a581ddf5e428a368efb1b59fcb317666fecdd
Author: Aaron Plattner <aplattner@nvidia.com>
Date: Tue Jul 25 15:27:31 2006 -0700
Switch to using void* pointers.
Pass the size of the data pointed to by src or dst as an argument to
wfb{Read,Write}Memory. This allows one set of macros to be used with any size
pointer. Assumes that sizeof(FbBits) >= sizeof(FbStip).
commit a4005c15fbb48231cb958c32b2c791a2d23a135a
Author: Aaron Plattner <aplattner@nvidia.com>
Date: Mon Jul 10 18:58:09 2006 -0700
Add framebuffer access wrapper infrastructure.
Create fbPrepareAccess macros to call into the driver to set up the
wfbReadMemory and wfbWriteWemory pointers. Call these from fbGetDrawable and
fbGetStipDrawable.
Add the READ and WRITE macros, which expand to simple memory accesses for fb,
and calls through the function pointers for wfb.
Add fbFinishAccess macro to give the driver an opportunity to clean up. Add
calls to this in the appropriate places.
commit 319efac445cebda5a2ac1db67efebe54bc47ba9d
Author: Aaron Plattner <aplattner@nvidia.com>
Date: Fri Jul 7 18:45:30 2006 -0700
Prefix all of the exported symbols in libwfb.so with "wfb".
For now, just #define all of the exported symbols in wfbrename.h. Later,
we should add FBPREFIX() around the exported symbols and use -fvisiblity=hidden
to hide the rest.
commit 7608a63ff7409f399c9a26962a304b84196a1868
Author: Aaron Plattner <aplattner@nvidia.com>
Date: Thu Jul 6 17:05:21 2006 -0700
Build infrastructure for libwfb.so.
Builds fb/* twice, defining FB_ACCESS_WRAPPER for libwfb.la. Define a macro,
FBPREFIX(X) which expands to fbX for libfb.la and wfbX for libwfb.la. Use the
macro on [w]fbModuleData so the new module loads.
commit 39158e98acb29e97a2682d4a37385f9141b484c4
Author: Adam Jackson <ajax@benzedrine.nwnk.net>
Date: Wed Jul 26 18:39:28 2006 -0400
Remove another latent PowerMAX hunk.
All your favorite running jokes of 2005, today!
commit ef1aecaaf6cd7e9e4f9d0c6373664e774500bc13
Author: Ian Romanick <idr@umwelt.(none)>
Date: Wed Jul 26 13:25:13 2006 -0700
Pass correct pointer to xf86MapLegacyIO.
commit 3518e2d0debc97e2bacdefe604b280e7fdfdd216
Merge: eb7733a48a 3821f6aeaa
Author: Daniel Stone <daniel@fooishbar.org>
Date: Wed Jul 26 11:29:21 2006 +0300
Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver into input-hotplug
commit eb7733a48a92405660d5d2ab60913b62c30daaed
Author: Daniel Stone <daniel@fooishbar.org>
Date: Wed Jul 26 11:28:45 2006 +0300
kdrive: drop excessive NewInputDeviceRequest debugging
commit 3821f6aeaa714582ee0a631de96c6e7cfd96303e
Author: Kristian Høgsberg <krh@redhat.com>
Date: Wed Jul 26 01:56:02 2006 -0400
Unlibc-wrap DMX glxscreens.c and fix tag-removal typo.
commit 28ba8d56912ae56d7b9835188f621b0a491add30
Author: Ian Romanick <idr@umwelt.(none)>
Date: Tue Jul 25 15:38:09 2006 -0700
Gut anything having to do with the PciBusPtr (or PciBusRec) type.
Bump required version of libpciaccess to 0.5.0 so that
pci_device_get_bridge_buses can be used.
commit 380b51d605a82c98082a2cebd70a0d1d0735eaa7
Merge: 82f6b7e75e 8977b07434
Author: Ian Romanick <idr@umwelt.(none)>
Date: Tue Jul 25 11:30:04 2006 -0700
Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver into pci-rework
Conflicts:
hw/xfree86/common/xf86Init.c
hw/xfree86/int10/pci.c
hw/xfree86/scanpci/xf86PciData.h
hw/xfree86/scanpci/xf86PciStdIds.h
hw/xfree86/scanpci/xf86PciStr.h
hw/xfree86/scanpci/xf86ScanPci.h
hw/xfree86/utils/pcitweak/pcitweak.c
hw/xfree86/utils/scanpci/scanpci.c
Re-removed most of the conflicting files.
commit 4ea475924c557ad0819b796f5369e5e669465709
Author: Daniel Stone <daniel@fooishbar.org>
Date: Tue Jul 25 20:00:48 2006 +0300
re-add OpenedHand copyright
Ae-add OpenedHand copyright, accidentally dropped in KDrive new world
order patch. Sorry guys.
commit 82f6b7e75e04e3fb951ab71ad3c553c8b34ea995
Author: Ian Romanick <idr@umwelt.(none)>
Date: Mon Jul 24 13:52:58 2006 -0700
Don't re-look-up pointers that are already stored in structures.
commit 2fd6b995ff927c8ca7267c201f535564b82e691f
Author: Ian Romanick <idr@umwelt.(none)>
Date: Mon Jul 24 13:33:34 2006 -0700
Global s/xf86MapDomainIO/xf86MapLegacyIO/. Let's call a duck a duck,
okay? Since xf86MapLegacyIO is called from only one place, cut the
parameter list down to the one parameter that actually conveys some
information: the one that gives a PCI device. Change from using a
PCITAG to a pci_device.
commit aed6fe0bb12c68b94e564252bc03594728ed8c5b
Author: Ian Romanick <idr@umwelt.(none)>
Date: Mon Jul 24 13:13:05 2006 -0700
Refactor linuxGetSizesStruct to take a pci_device pointer instead of a
PCITAG. Modify xf86BusAccWindowsFromOS and xf86AccResFromOS to call
linuxGetSizesStruct directly with a pci_device pointer. Remove
linuxGetSizes.
commit e48762799248eb7e16ea2c0df1561ae1430f2112
Author: Ian Romanick <idr@umwelt.(none)>
Date: Mon Jul 24 12:23:23 2006 -0700
Modify xf86BusAccWindowsFromOS and xf86AccResFromOS to use the
libpciaccess interfaces.
commit 4b474cbc1a0fe17da2438a15291f04ee67ea28f8
Author: Ian Romanick <idr@umwelt.(none)>
Date: Mon Jul 24 12:17:27 2006 -0700
The functions xf86PciBusAccWindowsFromOS and xf86BusAccWindowsFromOS
are identical. Just have one call the other.
commit 7dff8d98a9ed11f92806cb8c4b3f10e01c5d063f
Author: Ian Romanick <idr@umwelt.(none)>
Date: Mon Jul 24 11:56:37 2006 -0700
Remove source files that have been dead since day-1 of this branch.
commit eb95128f615e2f3fab17dcafd4fc260c6d4d0644
Author: Ian Romanick <idr@umwelt.(none)>
Date: Mon Jul 24 11:53:37 2006 -0700
Changes that were missed on the previous commit. Perhaps oddness
caused by doing git-update-index at the wrong time.
commit 05f8b772aec2b05d92078bb60a07bd8413386363
Author: Ian Romanick <idr@umwelt.(none)>
Date: Mon Jul 24 11:23:03 2006 -0700
ScanPciDisplayPCICardInfo now uses pci_device interface for PCI
scanning. Log messages simplified to make the code shorter and less
convoluted. ScanPciDisplayPCICardInfo is now void since it was only
called from one place with a constant parameter.
commit ca3f4fc1b0c21a0620ab1eb35c199cd55d795095
Author: Daniel Stone <daniel@fooishbar.org>
Date: Sun Jul 23 19:02:12 2006 -0400
add fallback ChangeDeviceControl, allow XOpenDevice on closed device
Add a fallback ChangeDeviceControl, which allows the attributes we know about
so far.
Allow XOpenDevice on closed devices.
commit e73e5e2a4d8f22889d840a7719479f9af686cb9c
Merge: a73cef1f00 8977b07434
Author: Daniel Stone <daniel@fooishbar.org>
Date: Sat Jul 22 13:56:30 2006 -0400
Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver into input-hotplug
commit 8977b07434d75ca396d236dc1324f0c862b633c7
Author: Dave Airlie <airlied@linux.ie>
Date: Sun Jul 23 03:36:47 2006 +1000
glx: fix typo from tag removal
commit a73cef1f005ca66db18e952e676ee5a21b829700
Merge: 672ca156bf 70869fc677
Author: Daniel Stone <daniel@fooishbar.org>
Date: Sat Jul 22 12:07:22 2006 -0400
Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver into input-hotplug
commit 70869fc6777f87cd05794446caa739e3d9a91ffe
Author: Adam Jackson <ajax@theobromine.nwnk.net>
Date: Fri Jul 21 23:39:37 2006 -0400
Yet more dead code.
commit 7c1b2ee7a8238c267bc97e78bbff204dc7723dd3
Author: Adam Jackson <ajax@theobromine.nwnk.net>
Date: Fri Jul 21 23:35:13 2006 -0400
static markup, more dead code.
commit 1c4f90b1d05d4c49279f3224a6dd94850a6bd8d0
Author: Adam Jackson <ajax@theobromine.nwnk.net>
Date: Fri Jul 21 23:03:21 2006 -0400
Open-coded path checks make baby Jesus cry.
commit 114264584ca43091a5e07282566a30a6378a1502
Author: Adam Jackson <ajax@theobromine.nwnk.net>
Date: Fri Jul 21 22:55:41 2006 -0400
Remove a useless open() of the module we're about to load.
commit 985611d5cd079f97da700c7b8e898d33da004be0
Author: Adam Jackson <ajax@theobromine.nwnk.net>
Date: Fri Jul 21 22:37:59 2006 -0400
Delete some long-unused testing code.
commit 525257eb98b46209c69c8576daa6bd7afc1f48a9
Author: Ian Romanick <idr@umwelt.(none)>
Date: Fri Jul 21 19:16:38 2006 -0700
Fix stupid typos.
commit 672ca156bfb11440e6e234650bfba9d38e1edb52
Merge: d14d91f094 6cf844ab69
Author: Daniel Stone <daniel@fooishbar.org>
Date: Fri Jul 21 19:58:42 2006 -0400
Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver into input-hotplug
commit 6cf844ab69926b6d23619a12c97734af3881ba67
Author: Daniel Stone <daniel@fooishbar.org>
Date: Fri Jul 21 19:57:28 2006 -0400
loader: walk directory paths with readdir(), don't stat() everything
Walk the directories with readdir, and don't stat everything we can
find. Thanks to davej for the public humiliation reminding me to go back
and re-fix this one.
commit d14d91f094c3897c889f6aafb66d738820dae0aa
Author: Daniel Stone <daniel@fooishbar.org>
Date: Fri Jul 21 19:57:28 2006 -0400
loader: walk directory paths with readdir(), don't stat() everything
Walk the directories with readdir, and don't stat everything we can
find. Thanks to davej for the public humiliation reminding me to go back
and re-fix this one.
commit e18d34f4238e13e226b0407fa2f5f77d2038de39
Author: Ian Romanick <idr@umwelt.(none)>
Date: Fri Jul 21 16:47:45 2006 -0700
Make the various implementations of xf86ExtendedInitInt10 use the
libpciaccess interfaces. This eliminates all calls to mapPciRom,
which in turn allows the elimination of hw/xfree86/int10/pci.c.
commit 87a6346bf7f086b5f98b2b2ecd52f27efe864e56
Merge: b73fb2ae35 0486d3966d
Author: Daniel Stone <daniel@fooishbar.org>
Date: Fri Jul 21 19:36:25 2006 -0400
Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver into input-hotplug
commit 0486d3966d2888ef86d36c19f31bdbc2a3e8c652
Author: Daniel Stone <daniel@fooishbar.org>
Date: Fri Jul 21 19:35:04 2006 -0400
fix kbproto dependency
Depend on kbproto >= 1.0.3, for unconditional definition of
XkbSA_XFree86Private.
commit b73fb2ae35a82e0bdd48f01132e971fb84946ff1
Merge: e7ac27ad81 aff404f293
Author: Daniel Stone <daniel@fooishbar.org>
Date: Fri Jul 21 19:30:26 2006 -0400
Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver into input-hotplug
commit e7ac27ad81efbea6128b3cec443ca98e228d14ad
Author: Daniel Stone <daniel@fooishbar.org>
Date: Fri Jul 21 19:29:28 2006 -0400
revert accidental deletion of lnx_io.c; re-delete lnx_kbd.c
Thinko'd which file to remove after merging from master.
commit 81913a12910e39d7ea6af8657c1c66cc6791cd65
Author: Daniel Stone <daniel@fooishbar.org>
Date: Fri Jul 21 19:10:26 2006 -0400
remove undead files from master
Remove dead files which worked their way back in when merging from master.
Ugh.
commit 7465010d59ec435bd00b738f0cef766b352dc7eb
Merge: 1d31ed7782 0aaac95b0d
Author: Daniel Stone <daniel@fooishbar.org>
Date: Fri Jul 21 19:05:41 2006 -0400
Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver into input-hotplug
commit 1d31ed778284082e1060bff63317c94581d9eb9b
Author: Daniel Stone <daniel@fooishbar.org>
Date: Fri Jul 21 19:02:52 2006 -0400
xephyr: load keysyms at init, not enable
Load keysyms at init time, not enable, so we don't get the wrong map width.
commit 63dfaa1d5ba556e09314ec914936e5471aab94b0
Author: Adam Jackson <ajax@theobromine.nwnk.net>
Date: Fri Jul 21 18:47:18 2006 -0400
Delete internal usage of the symbol ref/req lists.
commit bca9364f3f4a2376edbcf57a34f704ce28be21ba
Author: Adam Jackson <ajax@theobromine.nwnk.net>
Date: Fri Jul 21 18:41:46 2006 -0400
Remove the loader's required and referenced symbol lists, dead code.
commit 07ad92d2c4cb07db8487d76efc822fd7b88137cb
Merge: 18624a9b7c 22db3fdb54
Author: Ian Romanick <idr@umwelt.(none)>
Date: Fri Jul 21 15:25:35 2006 -0700
Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver into pci-rework
Conflicts:
hw/xfree86/common/xf86DoScanPci.c
hw/xfree86/common/xf86Init.c
hw/xfree86/common/xf86pciBus.c
commit aff404f293ed86a44a093a51a9f11e79e6c3f4f6
Author: Adam Jackson <ajax@theobromine.nwnk.net>
Date: Fri Jul 21 18:24:37 2006 -0400
Detach xf4bpp from cfb.
commit 0aaac95b0d12089b256c97f6ff955c8c229ae095
Author: Adam Jackson <ajax@theobromine.nwnk.net>
Date: Fri Jul 21 17:56:00 2006 -0400
Remove RCS tags. Fix Xprint makefile braindamage.
commit eeaad0e956640aac653d194a992df7792e4abcbb
Author: Aaron Plattner <aplattner@nvidia.com>
Date: Thu Jul 20 18:19:07 2006 -0700
Fix the RandR failure path for rotated screens.
commit 22db3fdb54d2f7f6b72638b46c186af6db04e214
Merge: 2f98841fde 93cd53860c
Author: Ian Romanick <idr@umwelt.(none)>
Date: Fri Jul 21 13:55:37 2006 -0700
Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver
commit 3eeb62e8f587732e6b433c2b9c6879eb26a3f1b4
Author: Kristian Høgsberg <krh@redhat.com>
Date: Fri Jul 21 16:33:28 2006 -0400
bug #890: completely remove deprecated keyboard driver
Remove all remnants of the old built-in keyboard driver.
commit 60ea7b51fe2b8a19a08b63db48504971a7a50ee6
Author: Daniel Stone <daniel@fooishbar.org>
Date: Fri Jul 21 15:23:37 2006 -0400
xorg ddx: move to new input API, remove old keyboard driver
Remove most of the rest of the old keyboard driver.
Move to the new Get{Keyboard,Pointer}Events API, which is mostly
complete at this stage: just missing the proximity events.
commit d32dc8bf19e1071fc30af2f0bc6a6699b351f39e
Author: Daniel Stone <daniel@fooishbar.org>
Date: Thu Jul 20 18:40:47 2006 -0400
be more careful in IVAS
Don't walk off the end of a NULL pointer in InitValuatorAxisStruct.
commit 7711c56d2e2aeae4dcd6d9297bc144c1cb3cfab1
Author: Daniel Stone <daniel.stone@nokia.com>
Date: Thu Jul 20 18:38:57 2006 -0400
xephyr: fix keymap, pointer; dix: fix multiple axes
Initialise our axes properly in the DIX, and make sure we don't
unnecessarily clip maxval when it's not set.
Fix keymap copying in Xephyr (to some degree: it's still broken),
and set nAxes and nButtons properly.
commit f18c3122a57df9770087e5fc70ac488552222233
Author: Daniel Stone <daniel.stone@nokia.com>
Date: Thu Jul 20 16:49:17 2006 -0400
sanitise debug output
Don't spit out huge chunks of pointless ephemera, especially without
--enable-debug.
commit 463e0fe35bec3c91b19be9aacf34babb146a88c9
Author: Daniel Stone <daniel.stone@nokia.com>
Date: Thu Jul 20 16:45:15 2006 -0400
update KDrive to new input API
Update KDrive to fit the new API (mieqInit and InitPointerDeviceStruct), and
include InitTouchscreenDeviceStruct in the DIX.
commit 1987af8c498a1bf394a8951ca6d5b0b7f7a35188
Author: Daniel Stone <daniel.stone@nokia.com>
Date: Thu Jul 20 16:39:54 2006 -0400
add virtual core devices to DIX
Add virtual core devices, with proper keymaps etc, to the DIX.
commit 737e6e4836a6af26fedc22cda8e7d366b52c8fa7
Author: Kristian Høgsberg <krh@redhat.com>
Date: Wed Jul 19 20:10:48 2006 -0400
define SDevicePresenceNotifyEvent prototype
commit 7f36cc533e7f6ae44e973c5f00f9bfec7c6b7b50
Author: Daniel Stone <daniel@fooishbar.org>
Date: Wed Jul 19 20:09:13 2006 -0400
distribute config.h
commit e896195eab726a2b307200958308eda8c93dd3cd
Author: Daniel Stone <daniel.stone@nokia.com>
Date: Wed Jul 19 20:05:33 2006 -0400
remove extraneous font debugging code
Some of it didn't compile, and some of it was just unnecessary.
commit 99c57674c002c5e88c6db34488a27b05004c9197
Author: Daniel Stone <daniel.stone@nokia.com>
Date: Wed Jul 19 19:59:11 2006 -0400
avoid using font servers with built-in fonts
commit ecfad74c48f633916305bcc25baaaad74aa52b78
Author: Daniel Stone <daniel.stone@nokia.com>
Date: Wed Jul 19 19:55:13 2006 -0400
add support for built-in fonts
Use --enable-builtin-fonts to only use built-in fonts, and avoid loading
fonts.
commit 0a2068d123520d35818c38a555ae3ba06d8ca7fb
Author: Daniel Stone <daniel.stone@nokia.com>
Date: Wed Jul 19 17:29:23 2006 -0400
Xi: add XExtension{Keyboard,Pointer} types
Report XExtensionKeyboard for non-core keyboards, and XExtensionPointer for
non-core pointers/mice.
commit c7577f9b88aac84d59404f29d994ee7af583d33b
Author: Kristian Høgsberg <krh@redhat.com>
Date: Wed Jul 19 17:27:58 2006 -0400
Xi: add DevicePresenceNotify
Add support for DevicePresenceNotify events.
commit 3a23e499017d5823157806029263edac53c663fd
Author: Daniel Stone <daniel.stone@nokia.com>
Date: Wed Jul 19 17:00:23 2006 -0400
make XInput mandatory
Always build Xi, since GetPointerEvents/GetKeyboardEvents relies on it.
commit 02d09105113fb9b560a770fe15f7bb041165831c
Author: Daniel Stone <daniel.stone@nokia.com>
Date: Wed Jul 19 16:51:04 2006 -0400
new KDrive input world order
Convert KDrive to GPE/GKE interface.
Add first-class drivers and enumerate every device separately through
Xi, instead of lamely attempting to aggregate them.
Add XKB support to the Linux keyboard driver.
Add 'thumb button' support to the tslib driver.
Rejig InitInput, so each DDX has to add a list of drivers it supports.
Support NewInputDeviceRequest, et al.
commit a274e7296b1bdd6f6c921f28b087610cec9548e0
Author: Daniel Stone <daniel.stone@nokia.com>
Date: Wed Jul 19 13:56:23 2006 -0400
add GetPointerEvents/GetKeyboardEvents framework
Add GetPointerEvents (with XFree86 pointer acceleration) and GetKeyboardEvents
to the DIX. Extend the ValuatorClass structure to account for same.
commit b308dbf273f8c26361b0fee7aca64aec3245f60b
Author: Daniel Stone <daniel.stone@nokia.com>
Date: Wed Jul 19 12:15:18 2006 -0400
add DEVICE_TOUCHSCREEN and DEVICE_CORE Xi controls (DeviceIntRec ABI break)
Add DEVICE_TOUCHSCREEN and DEVICE_CORE controls to the Xi code, and the
TouchscreenClassRec and a coreEvents flag, to toggle propagation of core
events.
commit c9a3d9baa81ceb940032ffe529d9eadf2d202ab2
Author: Daniel Stone <daniel@fooishbar.org>
Date: Wed Jul 19 11:41:16 2006 -0400
xorg DDX: implement NewInputDeviceRequest
Implement NewInputDeviceRequest for Xorg, mainly written by Kristian Høgsberg.
Move MatchInput to xf86Helper.c, as xf86LookupInputDriver.
commit 02a95311568e24e1055ea52c7df8cb7aa3f38ad0
Author: Daniel Stone <daniel@fooishbar.org>
Date: Wed Jul 19 10:05:12 2006 -0400
add basic D-BUS configuration mechanism
Also move LookupDeviceIntRec into the DIX, and add InputOption type, and
NewInputDeviceRequest prototype (DIX requests DDX to add a device). Does not
link without an implemented NIDR.
commit 93cd53860c3aca182a0a02543c41b5d71d65926b
Author: Daniel Stone <daniel.stone@nokia.com>
Date: Thu Jul 20 16:52:31 2006 -0400
kdrive: allow debugging
commit cd0874dda1c30ef91a7d2b3cd455676422599ccf
Author: Daniel Stone <daniel.stone@nokia.com>
Date: Wed Jul 19 20:13:02 2006 -0400
never define MEMBUG
Definining MEMBUG causes allocations to randomly fail.
commit 093943d4d02f1dbc8935b8cf835866a6e3885193
Author: Daniel Stone <daniel.stone@nokia.com>
Date: Wed Jul 19 20:09:55 2006 -0400
define DEBUG in DIX
Which makes #ifdef DEBUG actually useful. Incredible.
commit 68b0678254240a984db9adefefb0cf68e9bfd4e4
Author: Daniel Stone <daniel.stone@nokia.com>
Date: Wed Jul 19 20:08:32 2006 -0400
exa: only disable cw when COMPOSITE is built
commit 27df2eda795681c9f05e2907d74e2c102d3441e4
Author: Daniel Stone <daniel.stone@nokia.com>
Date: Wed Jul 19 16:18:28 2006 -0400
fix KdXvCopyPackedData to actually work
Remove extraneous bit shift in KdXvCopyPackedData, so it's actually
useful.
commit 00b24f119f03da86fa98ffea545c5b041810ce53
Author: Daniel Stone <daniel@fooishbar.org>
Date: Wed Jul 19 17:01:20 2006 -0400
fix minor typo
commit f8a7a1e40c14a85ebde11c5854c07a8d529d38b9
Author: Daniel Stone <daniel.stone@nokia.com>
Date: Wed Jul 19 17:06:00 2006 -0400
fix XEvIE build without XKB
Don't unconditionally play with XKB stuff in XEvIE.
commit 2f98841fde6bad807967ed15e954291240714198
Author: Ian Romanick <idr@umwelt.(none)>
Date: Thu Jul 20 16:08:27 2006 -0700
Remove unused variable.
commit 985c34bf06af70a7296db8307899a17347a25558
Author: Adam Jackson <ajax@theobromine.nwnk.net>
Date: Thu Jul 20 17:33:13 2006 -0400
Remove the DDXTIME conditional, for being unused.
commit c69c00d6523a35232a32e54a533811fc2b37815a
Merge: 46369350d4 84683f19b4
Author: Ian Romanick <idr@umwelt.(none)>
Date: Thu Jul 20 12:08:38 2006 -0700
Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver
commit 84683f19b4d1c712281036bcabf8dc623e64b26a
Author: Daniel Stone <daniel@fooishbar.org>
Date: Tue Jul 18 18:16:12 2006 -0400
get rid of XFree86LOADER, XFree86Server, XFree86Module, and IN_MODULE
Get rid of almost all uses of these definitions. They're still defined for
delinquent out-of-tree drivers, and also for the Mesa build. As well as
for miinitext.c. But largely gone.
commit 881953813c7307f2aac4057b48d233e5f4a574cd
Author: Adam Jackson <ajax@theobromine.nwnk.net>
Date: Mon Jul 17 13:50:38 2006 -0400
Fix the Linux ACPI reopen code to use a repeating timer, rather than a
one-shot sleep-and-reopen attempt.
commit f029e9a32dcaa95b84e08ec173a0cc78fd92bdbf
Author: Kristian Høgsberg <krh@redhat.com>
Date: Sat Jul 15 22:05:38 2006 -0400
Un-glx-libcwrap DMX GLX proxy so it works without GL/include.
commit 46369350d40819ecc2a9f37ed4aaa95866b80997
Author: Ian Romanick <idr@umwelt.(none)>
Date: Fri Jul 14 15:51:55 2006 -0700
Add some const qualifiers to serveral function parameters.
commit 490fb304599b1f24b36439e5c1397781e7d2f612
Author: Ian Romanick <idr@umwelt.(none)>
Date: Fri Jul 14 15:26:56 2006 -0700
Rearrange code in xf86int10ParseBiosLocation to use strncasecmp. This
eliminates the need for the first use of xstrdup in this function.
The second use of xstrdup was *never* necessary and has also been
eliminated.
commit d3ee49bcbafe4b4e6b308686020847e978473779
Author: Ian Romanick <idr@umwelt.(none)>
Date: Fri Jul 14 15:13:35 2006 -0700
Refactor common code from the generic.c and linux.c version of
xf86ExtendedInitInt10 to xf86int10GetBiosLocationType and
xf86int10GetBiosSegment.
These changes were tested on MGA hardware on x86-64 with various
combinations of InitPrimary and BiosLocation.
commit 8793c7fd4ba7d1b3e2eff3f2c18d042ee9bb3f62
Author: Ian Romanick <idr@umwelt.(none)>
Date: Fri Jul 14 09:11:39 2006 -0700
Refactor identical xf86InitInt10 function from generic.c and linux.c
to helper_exec.c.
commit 1450fd596433f7adfe3d0798dc2ddceb9d0a9034
Author: Ian Romanick <idr@umwelt.(none)>
Date: Fri Jul 14 09:10:32 2006 -0700
Trivial refactor of libint10_la_SOURCES.
commit 18624a9b7cf88e769c53cc3a876b3647c5d5057c
Author: Ian Romanick <idr@umwelt.(none)>
Date: Thu Jul 13 21:10:48 2006 -0700
Modify linuxGetSizesStruct to use pci_device instead of pciConfigPtr.
commit 12595a77d6c2f037f48dfe751bdc10505b3317df
Merge: 37838de62e 4c225a3a8b
Author: Ian Romanick <idr@umwelt.(none)>
Date: Thu Jul 13 12:48:03 2006 -0700
Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver into pci-rework
commit 4c225a3a8b2e7e5e5510347d8473f1318bbac769
Author: James Steven Supancic III <arrummzen@arrummzen.net>
Date: Thu Jul 13 10:03:57 2006 -0400
Bug #7482: Fix Xdmx's Render code to match reality; fixes BadLength client
crashes.
commit bb3aa94845a74d7718ba9539bb76203ec82957fc
Author: Drew Parsons <dparsons@debian.org>
Date: Tue Jul 11 18:26:55 2006 -0700
Bug #7346: Disable Composite extension in Xprt
Xorg Bug #7346 <https://bugs.freedesktop.org/show_bug.cgi?id=7346>
Patch #6184 <https://bugs.freedesktop.org/attachment.cgi?id=6184>
commit 10f3e32726d5b4981abd1a3a022e5b4f219fb41e
Author: Gustavo Pichorim Boiko <boiko@mandriva.com>
Date: Mon Jul 10 16:37:53 2006 -0700
Fix the configure check for the --{enable,disable}-dpms option
commit 2194d99d9ca3c607e0f5ddd911ee3df536d77564
Author: Matthieu Herrb <matthieu.herrb@laas.fr>
Date: Sun Jul 9 16:16:08 2006 +0200
Replace GNU make-ism.
commit 90a9b82272446fdaebe71c966325fd7e670f75c6
Author: Matthew Allum <mallum@polystyrene.(none)>
Date: Sat Jul 8 21:57:07 2006 +0100
Fix crash in Xephyr when running on host X with keymap width < 4 ( i.e xvnc )
commit 21e3e3ca298dce22e5fad6ef38aa6fe9736a1d3b
Merge: e805621894 39b2f7b218
Author: Matthew Allum <mallum@polystyrene.(none)>
Date: Sat Jul 8 21:13:52 2006 +0100
Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver
commit e8056218944e873135c93039d1e9646d51364467
Author: Matthew Allum <mallum@polystyrene.(none)>
Date: Sat Jul 8 21:10:58 2006 +0100
Add support to Xephyr for simulating 8bit grayscale.
commit 39b2f7b2182aedb1ab45415efb4c263012ace512
Author: Tilman Sauerbeck <tilman@code-monkey.de>
Date: Sat Jul 8 19:55:53 2006 +0200
Bug #3042: Use autoconf to get the correct name of a struct member.
This allows us to remove the kernel version ifdefs from the code, which
are ugly and broken.
commit 63f13e01ee6e7df1753f2113f4cff9538596be0a
Author: Tilman Sauerbeck <tilman@code-monkey.de>
Date: Sat Jul 8 11:33:44 2006 +0200
Bug #7097: do case-insensitive comparison for some hotkeys.
xkb's strcasecmp implementation has been moved to the dix so it's now
safe to just use strcasecmp().
commit 5416f90e9c939027005fc01fa3ce3df56919ae0d
Author: Kristian Høgsberg <krh@redhat.com>
Date: Thu Jul 6 21:22:34 2006 -0400
Implement GLX_MESA_copy_sub_buffer.
commit b84374b2917a91a7732e780ffab6a29c807a3ecc
Author: Kristian Høgsberg <krh@redhat.com>
Date: Thu Jul 6 02:28:55 2006 -0400
Add GLX_MESA_copy_sub_buffer marshalling support.
commit 2152e2d364bdd179cf218cde446c763d8c8bb833
Author: Ed Catmur <ed@catmur.co.uk>
Date: Thu Jul 6 17:45:36 2006 -0700
Remove hardcoded 'lib' in XPRINTDIR.
commit 233c004641483a75985e09fea5416ab2c7a97fc4
Author: Ed Catmur <ed@catmur.co.uk>
Date: Thu Jul 6 17:41:53 2006 -0700
Generate xprint.pre from xprint.cpp.
commit b3e4d1d1f4bcf900146d7b8cd19e008209294663
Author: Adam Jackson <ajax@benzedrine.nwnk.net>
Date: Thu Jul 6 18:51:29 2006 -0400
PPC64 build fix.
commit f847f3c0a956c0aec8ade8e32f770daae147f40b
Author: Keith Packard <keithp@neko.keithp.com>
Date: Thu Jul 6 15:33:31 2006 -0700
xorgcfg now needs libxkbui version 1.0.2 or better.
Old versions of libxkbui use XkbStrCaseCmp which doesn't exist any longer;
the server fails to link with that version of the libkbui library, so
require the current version (1.0.2).
commit 27ffd7e03c05dd2083a10e5acebd2b385d729eeb
Author: Keith Packard <keithp@neko.keithp.com>
Date: Thu Jul 6 14:43:10 2006 -0700
GL proto version 1.4.7 needed for texture-from-pixmap defines.
GLX_TEXTURE_TARGET_EXT and GLX_TEXTURE_RECTANGLE_EXT are defined as a part
of the new texture from pixmap GL extension in gl proto version 1.4.7 and
are now used by the X server code.
commit d7a96dd6f18e54c26fc5881772d033ac078db3a1
Author: Adam Jackson <ajax@benzedrine.nwnk.net>
Date: Thu Jul 6 17:39:14 2006 -0400
Switch the default mouse device on Linux to /dev/input/mice.
commit 37838de62edc474f44c0a48bd56470a6c23f8956
Merge: fd49a0dcc1 8d07ee070e
Author: Ian Romanick <idr@umwelt.(none)>
Date: Thu Jul 6 13:01:57 2006 -0700
Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver into pci-rework
Conflicts:
hw/xfree86/os-support/bus/linuxPci.c
commit 8d07ee070ecf0d403d9d27c80764d343b80af6f0
Author: Ian Romanick <idr@umwelt.(none)>
Date: Thu Jul 6 12:48:51 2006 -0700
Refactor linuxGetIOSize and linuxGetSizes. Eliminate the unnecessary
optimization in the search loop.
commit 704e645207d88a2d0a372cf69f6abd778ed4c30b
Author: Adam Jackson <ajax@benzedrine.nwnk.net>
Date: Thu Jul 6 14:22:33 2006 -0400
Remind dlloader that it needs to search the global scope as well as the
loaded modules. Fixes LoaderSymbol() on symbols provided by the server.
Spotted by Aaron Plattner.
commit fd49a0dcc13280cf195bd6c7ee0f23d0840cb665
Merge: e66e7b48e1 28b95fd9d1
Author: Ian Romanick <idr@umwelt.(none)>
Date: Thu Jul 6 09:52:15 2006 -0700
Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver into pci-rework
commit 28b95fd9d1c2f078aaaac75c310a27b17c74a6fc
Author: Kristian Høgsberg <krh@redhat.com>
Date: Thu Jul 6 03:25:38 2006 -0400
Drop unused GL/include subtree.
Woo, less Makefile's to generate.
commit fc1a55671dceae0e2a701e044ff8203fae5eb1ba
Author: Kristian Høgsberg <krh@redhat.com>
Date: Thu Jun 29 04:35:45 2006 -0400
Implement glXCreateWindow and glXDestroyWindow.
commit ee012588d28b468bd41da8d216210f8cb2bf8cb5
Author: Kristian Høgsberg <krh@redhat.com>
Date: Thu Jun 29 04:25:54 2006 -0400
Move __GLXdrawable lookup and creation into GetDrawableOrPixmap.
Also refactors __glXSwapBuffers to use GetDrawableOrPixmap for
getting the __GLXdrawable. This patch paves the way for GLXWindows
with XIDs different from the X Windows they are created for, a
prerequisite for glXCreateWindow().
commit 8b5bc6a9ab487fdea754266b120c686d75d9e100
Author: Kristian Høgsberg <krh@redhat.com>
Date: Thu Jun 29 00:05:01 2006 -0400
Drop global GLX error integer variables and use __glXError() instead.
Also drop glxerror.h (__glXError is now declared in glxserver.h)
and global.c (last remaining globals are in glxext.c now).
With this change we now support all GLX 1.3 error codes.
commit 7cf3ec7b59223f15314a0629f122ecb796678421
Author: Kristian Høgsberg <krh@redhat.com>
Date: Wed Jun 28 17:00:23 2006 -0400
Move createDrawable from __GLXcontext to __GLXscreen.
commit eea8efe4516750b2505b52ebc9f769f5e8a6f94c
Author: Kristian Høgsberg <krh@redhat.com>
Date: Wed Jun 28 15:59:01 2006 -0400
Add marshalling for GLX 1.3 requests.
Also, hook up glXGetDrawableAttributes and glXQueryContext to existing
DoGetDrawableAttributes and __glXQueryContextInfoEXT.
commit e66e7b48e15543f3753951a19376f0446759963a
Merge: a9d4842893 eb35f812a5
Author: Ian Romanick <idr@umwelt.(none)>
Date: Wed Jul 5 15:21:36 2006 -0700
Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver into pci-rework
commit eb35f812a5b65adcc5f6cbb91b31b69cae5d7f3d
Author: Greg Kroah-Hartman <gregkh@suse.de>
Date: Wed Jul 5 13:27:26 2006 -0700
add another file to .gitignore
commit 863f5cc31b747bc9f2fcd6a9e20c613a11733bf4
Author: Greg Kroah-Hartman <gregkh@suse.de>
Date: Wed Jul 5 13:26:34 2006 -0700
fix compiler warning in hw/xfree86/common/xf86Config.c
commit f059b61ab3af25b03c704669eddb838d3ce4366c
Author: Greg Kroah-Hartman <gregkh@suse.de>
Date: Wed Jul 5 11:47:25 2006 -0700
fix compiler warning about xnestRecolorCursor() not being defined
commit cc3e99f747586f9d32622e5a682de39891b1fcba
Author: Greg Kroah-Hartman <gregkh@suse.de>
Date: Wed Jul 5 10:13:19 2006 -0700
fix some more compiler warnings due to defines being declared differently
commit 59836c0f2abee3339e1aa30dacadb82e477943d6
Author: Greg Kroah-Hartman <gregkh@suse.de>
Date: Wed Jul 5 09:30:48 2006 -0700
fix wrong function pointer type in hw/dmx/dmxcmap.c
commit 12563db59dd613ecc926e3bed9534152ebc0a2fb
Author: Eric Anholt <anholt@FreeBSD.org>
Date: Mon Jul 3 12:52:27 2006 -0700
Revert "Optimize out computing a gradient pixel if the mask value is 0."
This reverts cf46242e337481cd3b9b39d77dd621d2a63b11f9 commit. It wasn't meant
to be pushed to master yet, and doesn't work.
commit 002e28c12c74aa63777f65cbfb382c2bfd0d6850
Author: Eric Anholt <anholt@FreeBSD.org>
Date: Mon Jul 3 12:48:12 2006 -0700
Correct AGP memory deallocation argument on *BSD.
This fixes leaks and eventual crashes with RandR resizing on Intel.
commit cf46242e337481cd3b9b39d77dd621d2a63b11f9
Author: Eric Anholt <anholt@FreeBSD.org>
Date: Wed Jun 28 18:35:59 2006 +0200
Optimize out computing a gradient pixel if the mask value is 0.
Obtained from: kdrive CVS (DavidR XGL fb/ megapatch)
commit a838fb70c52a829872680f6a2a2e7dd6d2dc9247
Author: Eric Anholt <anholt@FreeBSD.org>
Date: Mon Jul 3 19:22:36 2006 +0200
Bump server version to 7.1.99.2 for gradient and repeat fixes.
commit 25d871d98462f0481ee419295ddc94b8c79dc881
Author: Eric Anholt <anholt@FreeBSD.org>
Date: Mon Jul 3 19:22:26 2006 +0200
Fix source picture filter check for multiple screens.
Now, we only check for filter commonality if we're operating on a source
picture, and we compare the id (screen-independent index of the filter name)
rather than the pointer to the filter (per-screen state).
commit 7106a77df37c06d2b5568eceeb9297096bff3137
Author: Eric Anholt <anholt@FreeBSD.org>
Date: Sun Jul 2 12:41:35 2006 +0200
Fix bugs in support for new repeatTypes in XAA and EXA.
EXA now won't pass pictures with new repeatTypes to drivers. We can add a flag
for them to support it at a later time.
commit f5e92542a14f51029347b6476e4e4af69144930b
Author: Eric Anholt <anholt@FreeBSD.org>
Date: Fri Jun 30 12:03:47 2006 +0200
Bug #7366: Fix crashes when setting filters on source pictures.
Now, filters may only be set on source pictures when the filter is common to
all screens. Also, like SetPictureTransform, ChangePictureFilter is now not
called on source pictures.
commit 6ef457913955d4289081c7d07d528963ccf5272c
Author: Eric Anholt <anholt@FreeBSD.org>
Date: Fri Jun 30 03:01:14 2006 +0200
Bug #7366: Fix two crashes in operations on source pictures.
A screen's ChangePictureTransform now isn't called when changing the transform,
as source pictures aren't associated with screens. Also, attempting to set
an AlphaMap to a source picture will fail with BadMatch just like a Window
would, preventing another crash.
commit 50a3e1ad18c815a5adafee22beccdf970bae62d6
Author: Rudo Thomas <rudo@matfyz.cz>
Date: Sat Jul 1 12:34:36 2006 -0700
Missing close parenthesis in one of the setuid() fixes.
commit 124a81eb389dfa510ac07ca93ee17c4c9d6e56ea
Merge: d3d6c5f4d0 179737d4a0
Author: Keith Packard <keithp@neko.keithp.com>
Date: Sat Jul 1 11:12:50 2006 -0700
Merge branch 'origin'
commit d3d6c5f4d05e0ca5b566e19657e0fe2b3898482a
Author: Paul Mackerras <paulus@samba.org>
Date: Sat Jul 1 11:10:18 2006 -0700
Bug #7381: Coordinates get wrapped in accelerated line drawing on pixmap
XAAPolylinesWideSolid was adding the drawable origin onto each element in the
pPts array. Since the values got stored back into the pPts array, they got
truncated to 16 bits, causing the overflow I saw. This patch avoids storing
the coords back into the pPts array (and actually reduces the size of the
code too :). Now the 32-bit sum of coords + origin doesn't get truncated to
16 bits, and the problem is solved.
commit 179737d4a07ed10a734fe017b5680f8e78ffda96
Author: Jens Granseuer <jensgr@gmx.net>
Date: Wed Jun 7 01:46:00 2006 -0700
Bug 7145: fix build with gcc 2.95 & other c89 compilers
Move variable declarations to start of blocks as required by c89
commit a9d4842893b65232d61fe4c63f074d30e81021d2
Merge: 66cac9b174 6bd4c25439
Author: Ian Romanick <idr@umwelt.(none)>
Date: Fri Jun 30 11:49:29 2006 -0700
Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver into pci-rework
commit 6bd4c254396cb0f4e8ae21ff455ebb15cd9f4f10
Author: Martin Bochnig <mb1x@gmx.com>
Date: Mon Jun 26 01:52:24 2006 +0200
Updated Solaris aperture driver to build on sun4v & amd64 kernels
Updated for Solaris 10 changes to DDI
commit 66cac9b17498497d939bfb7a4075bcee5a485e5f
Merge: 7c4e540253 54d9acd511
Author: Ian Romanick <idr@umwelt.(none)>
Date: Wed Jun 28 14:11:49 2006 -0700
Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver into pci-rework
commit 54d9acd5113318274e291abab4554b8e678227df
Author: Kristian Høgsberg <krh@redhat.com>
Date: Tue Jun 27 19:44:52 2006 -0400
Add damage tracking to GLX_EXT_tfp implementation.
- Only update when pixmap content actually change;
- Only update the regions that acutally changed.
This is a worthwhile optimization, but it doesn't completely remove
the bottleneck, as mesa still uploads then entire texture whenever
it changes.
commit adfe8e7437ff739f54d1d074008e8cc0e3bcb4d3
Author: Eric Anholt <anholt@FreeBSD.org>
Date: Tue Jun 27 21:49:00 2006 +0200
Bump server release to 7.1.99.1.
This will be important for a couple of cairo workaround tests.
commit 63c169e3b1f7d6a7375a414fcd50cce32358a525
Author: Eric Anholt <anholt@FreeBSD.org>
Date: Tue Jun 27 04:11:47 2006 +0200
Fix MMX Saturate implementation.
The code was expanding the source blend factor from the wrong channel. Fixes
cairo's clip-operator test.
commit 7c4e54025345455f420cd2abaa7a40679689d3cb
Merge: 9d0a15dca5 ff6b59a0db
Author: Ian Romanick <idr@umwelt.(none)>
Date: Mon Jun 26 14:39:44 2006 -0700
Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver into pci-rework
commit ff6b59a0dbadbe61a53e48c23965d3073d95791b
Merge: b3c869304c 48c871564d
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Mon Jun 26 13:02:33 2006 -0700
Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver
commit b3c869304cd85af034aa9debaa874e29d14fcbe6
Author: Peter Breitenlohner <peb@mppmu.mpg.de>
Date: Mon Jun 26 10:48:44 2006 -0700
Free small, one-time memory leak in xdmcp -from handling
Part of Patch #6046 <https://bugs.freedesktop.org/attachment.cgi?id=6046>
commit 48c871564d493203d434d5da015903399287f619
Author: Eric Anholt <anholt@FreeBSD.org>
Date: Mon Jun 26 15:57:32 2006 +0200
Move EXA_PM_IS_SOLID() to the public API, since drivers will want it frequently.
commit afb84c2fca56887b3bfe7aa93f337c49b087acdc
Author: George Fufutos <fufutos610@hotmail.com>
Date: Sat Jun 24 15:23:14 2006 +0200
Bug #6911: Check return value of exaGetPixelFromRGBA().
commit 930b9a069a425818d4e9965f53be7df1f4d7d422
Author: Michel Dänzer <michel@tungstengraphics.com>
Date: Sat Jun 24 15:21:17 2006 +0200
Bug #6818: Avoid infinite loop in exaLog2() with negative arguments.
commit 36756fdb2ddc154b406f664a6af0f38d26e6973d
Author: Michel Dänzer <michel@tungstengraphics.com>
Date: Sat Jun 24 15:09:24 2006 +0200
Make sure <execinfo.h> is actually included when needed.
configure only defines HAVE_BACKTRACE, not HAVE_EXECINFO_H.
This could cause problems on platforms where the size of a pointer is greater
than that of an integer, see
http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=363218 .
commit 4426215a6e99f84550aaac23ac9c2018668bfbc1
Author: Michel Dänzer <michel@tungstengraphics.com>
Date: Sat Jun 24 15:02:56 2006 +0200
Bug #7213: Fix the XFree86-DRI extension for byte-swapped clients.
These clients are by definition non-local and thus not direct rendering
capable, but they still need the QueryVersion and QueryDirectRenderingCapable
requests to find out cleanly.
commit a195a3debca02572d9f7d7a9976b5bf67acc5d08
Author: Michel Dänzer <michel@tungstengraphics.com>
Date: Sat Jun 24 14:54:52 2006 +0200
Fix byte swapping in some GLX requests.
commit bc6cfde19887eff7a07dc739ffa29609fb55b83d
Author: Eric Anholt <anholt@FreeBSD.org>
Date: Fri Jun 23 20:07:34 2006 -0700
Use correct OSNAME setting so we can find os-specific modules like libdrm.
commit c7ac485a59709572307b9a4a9abacc52c7021b65
Author: Eric Anholt <anholt@FreeBSD.org>
Date: Wed Jun 21 09:34:55 2006 -0700
Remove the default case from fbcompose.c switches which should cover all cases.
Instead, stick the NULL return default case afterwards, so that the compiler can
warn us when we've got unimplemented cases. Removes some unimplemented and
unused 8bpp, depth 4 picture format names.
commit 2cf1f39ca974c81a2f52d2f7509aa3d098a87176
Author: Eric Anholt <anholt@FreeBSD.org>
Date: Wed Jun 21 09:30:59 2006 -0700
Add a manpage for EXA.
commit 9d0a15dca56b14821cad474f9db9c332acb3b1e6
Merge: 6c514ca14c d67fd10696
Author: Ian Romanick <idr@umwelt.(none)>
Date: Thu Jun 22 16:21:10 2006 -0700
Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver
Conflicts:
hw/xfree86/loader/xf86sym.c
commit 6c514ca14c2326c2cf82b73196429789d11e4a01
Author: Ian Romanick <idr@umwelt.(none)>
Date: Thu Jun 22 15:51:16 2006 -0700
Use XSERVER_LIBS instead of XORG_LIBS for -lpciaccess. The former is
only for libraries that are built as part of the xserver build.
commit d67fd106968e371d8be3966ed5ecdd3c69f36e3a
Author: Adam Jackson <ajax@benzedrine.nwnk.net>
Date: Thu Jun 22 12:47:51 2006 -0400
Add kdrive servers to .gitignore
commit bf17c6dede1c0cf1edee10f2cc7e1e619b944d3a
Author: Adam Jackson <ajax@benzedrine.nwnk.net>
Date: Thu Jun 22 12:24:09 2006 -0400
Drop libz from the server's link line, it was only needed for LBX.
commit c0cb8d1fb80540e093da54da3ee2f55bdf139274
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Wed Jun 21 18:12:41 2006 -0700
Use XACE, not XCSECURITY to decide if SecurityLookup* are exported
commit 3177dc498a955cd58cd6054a7c7e69724db4a59b
Merge: 3f19803e0b 91dcac5295
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Wed Jun 21 18:06:06 2006 -0700
Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver
commit 3f19803e0b1adc66e695f63f915b8dc85eb84215
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Wed Jun 21 18:05:51 2006 -0700
APPGROUP requires both X-ACE & XC-SECURITY now
commit 91dcac5295486cc55a34ad91704bfa483bd31eeb
Merge: d8135eb9e4 77c947b900
Author: Adam Jackson <ajax@benzedrine.nwnk.net>
Date: Wed Jun 21 20:49:30 2006 -0400
Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver
commit d8135eb9e414bf6957f64c5102ee0ef7c2404c6f
Author: Adam Jackson <ajax@benzedrine.nwnk.net>
Date: Wed Jun 21 20:49:21 2006 -0400
Unbreak unbreaking the loader. Re-add the symbol reference lists so that the
linker will include everything it's supposed to. This is a terrible solution,
but ld semantics don't let you do anything better.
commit f83cee0338eca095ad601374a87775be823a2565
Author: Eamon Walsh <ewalsh@epoch.ncsc.mil>
Date: Wed May 5 20:07:37 2004 +0000
Modify XC-SECURITY and XC-APPGROUP extensions to work with XACE
commit 15c9002d68a7eeb02a6db1f231af7a18a3cf7512
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Wed Jun 21 16:24:20 2006 -0700
Correct ifdef - should be XACE, not XSECURITY
commit 90af38fa0c46c2081d2becac262a614c26ba6ef1
Merge: 3e098efa35 77c947b900
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Wed Jun 21 16:23:31 2006 -0700
Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver
Conflicts:
Xext/appgroup.c
commit 3e098efa35ba70ad4d5699af3130a3b02e1cb06e
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Wed Jun 21 16:21:03 2006 -0700
Correct ifdef - should be XACE, not XCSECURITY
commit 77c947b900faf34f425eef1549d8210c475e093b
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Wed Jun 21 16:18:41 2006 -0700
Move Xserver internal API for appgroup from Xagsrv.h to appgroup.h
(Since all use is inside the xserver module, might as well keep the header
in the Xserver module instead of in proto/XExt to allow easier synchronization
of updates.)
commit aa131c51e06e735d7b54cadf51205f703a3de4ef
Merge: 1708b0c7d9 77aa701e89
Author: Ian Romanick <idr@umwelt.(none)>
Date: Wed Jun 21 14:39:52 2006 -0700
Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver
commit 1708b0c7d962b80073500eb1c483447bbf965bc9
Author: Ian Romanick <idr@umwelt.(none)>
Date: Wed Jun 21 14:39:39 2006 -0700
Eliminate "ugly" spaces around parenthesis. Add const qualifier.
General code clean-ups.
commit a3c26d01a16e4ae20a5d1acf9d888e95760c3da1
Author: Ian Romanick <idr@umwelt.(none)>
Date: Wed Jun 21 14:38:07 2006 -0700
Move declaration of "j" inside #ifdef block where it is used to
eliminate compiler warning.
commit 40aafaf154ba8a2cba857689d1481be2d4a610c2
Author: Greg Kroah-Hartman <gregkh@suse.de>
Date: Wed Jun 21 14:36:09 2006 -0700
fix a number of compiler warnings in os/*
commit 77aa701e898c6525322cc4029d95167dd9f6e618
Author: Greg Kroah-Hartman <gregkh@suse.de>
Date: Wed Jun 21 14:16:48 2006 -0700
add some function prototypes to hw/xprint/DiPrint.h as they are exported
commit 865884d050e1778180f7677e15f9ee1625ea4bb2
Author: Greg Kroah-Hartman <gregkh@suse.de>
Date: Wed Jun 21 14:16:28 2006 -0700
fix compiler warning in dix/xpstubs.c when XPRINT is not defined
commit ed18d776f02e2ab235954501ef64936af9f9d909
Author: Kristian Høgsberg <krh@redhat.com>
Date: Wed Jun 21 16:22:14 2006 -0400
Fix #2488 for fb too: sample pixel center when transforming.
commit ea5e0eabd1303a55d8fc10f44d21a3d371ce8919
Author: Matthias Hopf <mhopf@suse.de>
Date: Wed Jun 21 17:08:51 2006 +0200
Bug 4320: Fastpath corner case improvement for Composite.
commit 9af315a9be19b48faa1249e0575cbe3d1e31dec5
Author: Eamon Walsh <ewalsh@epoch.ncsc.mil>
Date: Wed May 5 20:07:37 2004 +0000
Modify XC-SECURITY and XC-APPGROUP extensions to work with XACE
commit f68ecfa482b2c2037f929710310c7b9ce6fe9291
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Tue Jun 20 19:01:34 2006 -0700
Add X-ACE to build system
- Added --disable-xace to configure.ac and issue configure error if trying
to build XC-Security without X-ACE
- Added XACE #define to dix-config.h
- Added X-ACE sources to Xext/Makefile.am
commit a46c06dab8392cf8012c7cc0b916de9a9e569671
Merge: 49b368c0bb d44b2a0a57
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Tue Jun 20 18:40:18 2006 -0700
Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver
Conflicts:
Xext/appgroup.c
Xext/security.c
dix/devices.c
dix/dispatch.c
dix/dixutils.c
dix/events.c
dix/extension.c
dix/property.c
dix/window.c
os/access.c
commit d44b2a0a57fb89741173c31676af0ccc822387dc
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Tue Jun 20 18:22:51 2006 -0700
Move Xserver API for security extension to securitysrv.h
commit a54435946544a039fc333bb5e3438501d0d1ffc6
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Tue Jun 20 18:14:27 2006 -0700
Move Xserver API for security extension to securitysrv.h
commit 49b368c0bb04816c4a3579071c596b2398cae3ec
Merge: 63f6e6bbfd 481d4012e7
Author: Alan Coopersmith <alanc@alf.(none)>
Date: Tue Jun 20 16:22:39 2006 -0700
Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver
commit 481d4012e74d9b0e98911f0ae02700ecf4cfc5ac
Author: Alan Coopersmith <alanc@alf.(none)>
Date: Tue Jun 20 16:16:19 2006 -0700
Don't add -ldl to XORG_LIBS if it's not needed for dlopen
commit 63f6e6bbfd0d3677e29621af982c9392ead98dd7
Merge: 88ede2cec7 6df52fb774
Author: Alan Coopersmith <alanc@alf.(none)>
Date: Tue Jun 20 16:03:34 2006 -0700
Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver
commit 6df52fb7745c185c0168060f69cc6b4f5315914e
Author: Alan Coopersmith <alanc@alf.(none)>
Date: Tue Jun 20 16:02:55 2006 -0700
Delete code that's been inside #if 0 since X11R6.7.
commit 75398cff82b56c0a8fc301e84e2087f59a61a360
Merge: 1f91b5726c 2b58685402
Author: Ian Romanick <idr@umwelt.(none)>
Date: Tue Jun 20 15:49:47 2006 -0700
Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver
Conflicts:
hw/xfree86/loader/Makefile.am
hw/xfree86/loader/xf86sym.c
commit 88ede2cec79281a43cecb43ee6dec65770f82530
Merge: 227a319340 2b58685402
Author: Alan Coopersmith <alanc@alf.(none)>
Date: Tue Jun 20 15:29:55 2006 -0700
Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver
commit 227a3193405147fbbee2971cc15bac92cc13285a
Author: Eamon Walsh <ewalsh@epoch.ncsc.mil>
Date: Tue Jun 1 21:09:25 2004 +0000
Add XACE extension source files.
(Copied from XACE-SELINUX branch in Xorg monolith CVS since these were never
imported to modular cvs or git trees.)
commit 1f91b5726c721778de0627c0139100744db06934
Author: Ian Romanick <idr@umwelt.(none)>
Date: Tue Jun 20 15:03:13 2006 -0700
Fix a compiler warning about varibles being used without being set.
Add some const qualifiers.
Remove some "ugly" space around parenthesis.
commit 2b58685402e70f123e131fd8146e6083ff5214a4
Author: Matthieu Herrb <matthieu@deville.herrb.com>
Date: Tue Jun 20 21:07:53 2006 +0200
Check setuid() return value. Bugzilla #7116.
commit 4365d16c8629e824973ee0c357efdfbfd28b672c
Author: Kristan Høgsberg <krh@redhat.com>
Date: Mon Jun 19 22:13:22 2006 -0400
Pull over convolution filter fixes from xgl-0-0-1 branch.
Cherry-picking patches:
8a5ea68800b9d7dca90ff4e573ad8533852f1ea3 and
4d755fe14274a7293748ce9aa666ab85df6297c5
commit f818e0ab60da3779ab2602c6e6d3ff261b50917e
Author: Eamon Walsh <ewalsh@epoch.ncsc.mil>
Date: Wed May 5 20:07:37 2004 +0000
Modify XC-SECURITY and XC-APPGROUP extensions to work with XACE
(cherry picked from 0106715000196c7b349a0b4494b61545f0f5e138 commit)
commit 0707eb33d6826e1300a905edea28c12134600b12
Merge: 37f0ae0245 98d17bba71
Author: Alan Coopersmith <alanc@alf.(none)>
Date: Mon Jun 19 17:09:51 2006 -0700
Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver
commit 37f0ae02457bd22b27f8f30a373e5cb19f2fbaea
Author: Eamon Walsh <ewalsh@epoch.ncsc.mil>
Date: Wed May 5 20:04:52 2004 +0000
Replace XC-SECURITY code with XACE security hooks
(cherry picked from 8526cd6395490b03b279f1962df777fb0e4a9878 commit)
commit 98d17bba716619e3402bd74c7c3e1c01d055ef6e
Author: Alan Coopersmith <alanc@alf.(none)>
Date: Mon Jun 19 17:07:59 2006 -0700
Tell git to ignore emacs *~ droppings and git .msg files
commit 569c808a2375be71f835ee8693605487484bd22e
Author: Eric Anholt <anholt@FreeBSD.org>
Date: Mon Jun 19 16:42:09 2006 -0700
Fix crash when using PICT_x4a4 by supplying an appropriate fbFetchPixel_x4a4.
commit 8d9ccc90a54c786ca4ba5620ab0a965e3f3bc8ea
Author: Eamon Walsh <ewalsh@epoch.ncsc.mil>
Date: Wed May 5 20:15:41 2004 +0000
Add XACE extension
(partially cherry picked from 8d4f21ab53c44ca48501d6211ea6db0c0b8af916 commit)
commit 55426650417df4ec22ea0e2a67f6074f0ac1d54e
Author: Eric Anholt <anholt@FreeBSD.org>
Date: Mon Jun 19 15:04:46 2006 -0700
Clean up gcc warnings from picture format CARD32 -> enum change.
commit 520c80f4b807ae6419e70fe2b524532465b509ac
Author: Eric Anholt <anholt@FreeBSD.org>
Date: Mon Jun 19 14:40:27 2006 -0700
Don't forget to step the rows when verifying the equivalence of fb/sys areas.
This is only used by fakexa, but we would have missed some errors without this
fix.
commit e793f0eeee3e9c83b6a7b50d451fb6db12839087
Author: Eric Anholt <anholt@FreeBSD.org>
Date: Mon Jun 19 14:06:02 2006 -0700
Correct component ordering when fetching [ax]4b4g4r4 pixels.
Noticed by: rendercheck
commit e1672a12eb70836a2ceec803d505294897ae8cd2
Author: Eric Anholt <anholt@FreeBSD.org>
Date: Mon Jun 19 13:20:56 2006 -0700
Convert PICT_* names from #defines to an enum to aid in debugging.
commit 9742d55c820a260a42a4537502295931d4529deb
Author: Greg Kroah-Hartman <gregkh@suse.de>
Date: Mon Jun 19 14:40:14 2006 -0700
update .gitignore to handle Xprint move
commit d97a21acb878bc4e5e6542912fbd820503bba312
Author: Greg Kroah-Hartman <gregkh@suse.de>
Date: Mon Jun 19 14:36:54 2006 -0700
fix compiler warnings in hw/xfree86/i2c/fi1236.c
commit 29c78321e86956c4ce0c1c899d82557f927e04da
Author: Greg Kroah-Hartman <gregkh@suse.de>
Date: Mon Jun 19 14:36:41 2006 -0700
fix compiler warning in hw/xfree86/i2c/tda9850.c
commit 9f2793551f335e5fb08990fc8bb9e05e0ffb68d5
Author: Greg Kroah-Hartman <gregkh@suse.de>
Date: Mon Jun 19 11:50:47 2006 -0700
fix compiler warning in hw/vfb/InitOutput.c
commit b20ae5ddb7682bafcee6f8bf0c8208a3f70b882b
Author: Greg Kroah-Hartman <gregkh@suse.de>
Date: Mon Jun 19 11:38:52 2006 -0700
fix compiler warnings in hw/xfree86/xf4bpp/ppcGC.c
commit 4d258f31967141e3c4a6e4abbef89ffa717e85aa
Author: Greg Kroah-Hartman <gregkh@suse.de>
Date: Mon Jun 19 11:27:47 2006 -0700
fix compiler warnings in XTrap/xtrapdi.c
commit 870cecb72c2cba44dc64cb202917453603c8f287
Author: Greg Kroah-Hartman <gregkh@suse.de>
Date: Mon Jun 19 11:22:42 2006 -0700
fix compiler warnings in XTrap/xtrapdiswp.c
commit a28652f9c35fbc009245382a5cc2a022f42366fc
Author: Adam Jackson <ajax@theobromine.nwnk.net>
Date: Mon Jun 19 00:57:18 2006 -0400
Another round of loader sense-beating. Remove the (unused) server export
lists, a really bad hash table, the last vestiges of the other backends,
and some miscellaneous cleanups. Good for dropping 300k from the size of
the built server on x86.
commit 98a602fab1f307a07a96868d7dae12b6f8d7f405
Author: Adam Jackson <ajax@theobromine.nwnk.net>
Date: Sun Jun 18 23:54:04 2006 -0400
Don't bother building RAC as a module, that's just absurd.
commit 76aaf7eae7409162c5ed2963f2e27d019cb30263
Author: Eric Anholt <anholt@FreeBSD.org>
Date: Sun Jun 18 19:47:29 2006 -0700
Add a couple of (doxygen) comments I wrote while looking at modesetting.
commit 6aaf0e5b581b06fc73e56f863a26cd9d684eb9c0
Author: Eric Anholt <anholt@FreeBSD.org>
Date: Sun Jun 18 19:12:15 2006 -0700
Add options to disable EXA acceleration for Composite/UTS/DFS, and always print
out how much memory EXA is managing for offscreen pixmaps.
commit 21ef7e17ef6dca177461c9438b9df707a4d664a2
Author: Eric Anholt <anholt@FreeBSD.org>
Date: Sun Jun 18 18:57:55 2006 -0700
Add some missing .gitignore stuff for Mesa symlinks and other generated files.
commit 71fbda8049f64c7fefae8ab817fb5f37ee2ee134
Author: Adam Jackson <ajax@theobromine.nwnk.net>
Date: Sun Jun 18 21:07:28 2006 -0400
Xprint/ -> hw/xprint
XpConfig -> hw/xprint/config
commit 868e2cab706e317618646e064b0559d4e68c7b32
Author: Eric Anholt <anholt@FreeBSD.org>
Date: Fri Jun 16 10:17:51 2006 -0700
Add explicit dependencies (Xorg_DEPENDENCIES = ) on the internal libraries
(such as libcw.la) that we link into the server, causing it to be rebuild
automatically when they're updated. Some system libraries are included, but
don't appear to cause any harm. You would think this would be automatic...
commit 53f74b6aa95fe57fda45fd8a051595e772f00402
Author: Eric Anholt <anholt@FreeBSD.org>
Date: Fri Jun 16 10:14:30 2006 -0700
Bugzilla #5120, #7246: In CW's GC ops, validate the backing GC against the
backing drawable if the serial numbers differ. Fixes crash in XAA which
occurred when the DDX bumped the serial number on the backing drawable and
expected it to get re-validated, and we didn't because the wrapped drawable
hadn't been bumped.
commit 72ac20c0e878ad48ff61f7e846cbf1005a4eb435
Merge: fc3e81473a b90088321e
Author: Ian Romanick <idr@localhost.localdomain>
Date: Tue Jun 13 21:13:02 2006 -0700
Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver
commit b90088321e6ef84970aa97d7c851af93f49bf4b7
Author: Ian Romanick <idr@localhost.localdomain>
Date: Mon Jun 12 15:22:31 2006 -0700
Add arrayobj.c to the Makefile as well.
commit f9f33b72e34eaeccea2a20f4a3dd68c2dbefc90e
Author: Michel Dänzer <michel@tungstengraphics.com>
Date: Mon Jun 12 20:19:11 2006 +0200
Track per-drawable damage to minimize UTS and DFS transfers.
Based on work by Eric Anholt.
commit 6060b612de6b41f872d034c6130770c1d189d0a3
Author: Eric Anholt <eric@anholt.net>
Date: Mon Jun 12 20:12:31 2006 +0200
Provide option to report damage after operation is complete.
commit fc3e81473a98d3b932faa73c0c01c21366a48a9e
Merge: 4bedaad17d 041ef23192
Author: Ian Romanick <idr@localhost.localdomain>
Date: Mon Jun 12 09:41:06 2006 -0700
Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver
commit 041ef23192b193b87f6cfc3e74e2e77f9f47cd4b
Author: Ian Romanick <idr@localhost.localdomain>
Date: Mon Jun 12 09:39:18 2006 -0700
Add new Mesa files arrayobj.c and arrayobj.h.
commit 4bedaad17dc75dfbada91f47e1007a8c090300a9
Author: Ian Romanick <idr@localhost.localdomain>
Date: Mon Jun 12 09:29:05 2006 -0700
Add new Mesa files arrayobj.c and arrayobj.h.
commit 4e3c9ab8c90d474a2224dbfa0807bc01fc012f7c
Author: Ian Romanick <idr@localhost.localdomain>
Date: Fri Jun 9 16:56:54 2006 -0700
Remove some static declarations for things that were removed in
previous commits.
commit 8b6596b1e1864dd79a3c53ee3ceb7a8e9bdb6ec7
Author: Ian Romanick <idr@localhost.localdomain>
Date: Fri Jun 9 16:08:06 2006 -0700
Move probe_devices_from_device_sections,
add_matching_devices_to_configure_list, and check_for_matching_devices
from xf86Helper.c to xf86Init.c. These functions are only called from
a single place in xf86Init.c, so it makes sense for them to live
there. They were originally in xf86Helper.c because they evolved out
another function that was already in that file.
commit 7810d87cd6ae9316d88f6a2e7696deb8837cec27
Merge: dcfaa9f4f8 caad8b724b
Author: Ian Romanick <idr@localhost.localdomain>
Date: Fri Jun 9 15:16:50 2006 -0700
Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver
commit caad8b724b97074e41de447fe77dda189f287a26
Author: Greg Kroah-Hartman <gregkh@suse.de>
Date: Fri Jun 9 11:24:57 2006 -0700
fix compiler warnings in record/set.c
(note this only fixed up the function definitions for the static functions
which can not cause any abi incompatibility)
commit 51489bb5ed86cb6aa07e26a13618765c29f913e4
Author: Greg Kroah-Hartman <gregkh@suse.de>
Date: Fri Jun 9 10:59:47 2006 -0700
more .gitignore updates
commit c4d251bd3e88cf8dfd6872537dbe30c07344b196
Author: Greg Kroah-Hartman <gregkh@suse.de>
Date: Fri Jun 9 10:46:18 2006 -0700
updated .gitignore with more pre-generated files
commit 9f31ef83be61a900c701fcbc9a43ffae40ca7005
Author: Greg Kroah-Hartman <gregkh@suse.de>
Date: Fri Jun 9 10:44:46 2006 -0700
fix compiler warning in hw/xfree86/loader/loaderProcs.h
commit 490ffc205a7714145cac0c63efeb6374ea28141f
Author: Greg Kroah-Hartman <gregkh@suse.de>
Date: Fri Jun 9 10:44:25 2006 -0700
fix compiler warning in hw/xfree86/loader/loadmod.c
commit 6119845d1ff832ea2b7c9cbe7ed6c6637cdcf305
Author: Greg Kroah-Hartman <gregkh@suse.de>
Date: Fri Jun 9 10:14:08 2006 -0700
fix compiler warnings in hw/xnest/Keyboard.c
commit 1a7335ff932baa59a3283c50dd6007d81989b7e3
Author: Greg Kroah-Hartman <gregkh@suse.de>
Date: Fri Jun 9 10:02:08 2006 -0700
remove unneeded externs from Xprint/ps/psout.c
commit 9583859d538394e98ac1f38b8e6f0997e321621d
Author: Greg Kroah-Hartman <gregkh@suse.de>
Date: Fri Jun 9 09:59:22 2006 -0700
remove unneeded "extern" in Xprint/ddxInit.c
commit cb9e29c184474edd75645e3b52e22a097a242e40
Author: Greg Kroah-Hartman <gregkh@suse.de>
Date: Fri Jun 9 09:54:50 2006 -0700
removed unneeded extern in Xprint/ps/PsWindow.c
commit 96c19a3ec1b7e43782d373b8015fa0ca24cb4f5b
Author: Greg Kroah-Hartman <gregkh@suse.de>
Date: Fri Jun 9 09:51:28 2006 -0700
put function prototype for ShapeExtensionInit() in proper place
based on FIXME in mi/miinitext.c
commit dcfaa9f4f8fb10b75be50c9a49ccd88caf6d0f6a
Merge: af9afe4cc5 576e6fb112
Author: Ian Romanick <idr@localhost.localdomain>
Date: Thu Jun 8 15:03:00 2006 -0700
Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver
commit 576e6fb1124a47493371210adf99d6f2076e72c5
Author: Adam Jackson <ajax@benzedrine.nwnk.net>
Date: Thu Jun 8 17:49:02 2006 -0400
Bug #7120: Multimonitor (non-Xinerama) support for xwin servers.
(Tom Whittock)
commit d42cf4a2a4980fdd29fb15c4fd8fddda67b36256
Author: Adam Jackson <ajax@benzedrine.nwnk.net>
Date: Thu Jun 8 17:46:53 2006 -0400
Bug #7121: fix clipboard handling in Xming (Colin Harrison)
commit af9afe4cc50df973bea2293a803f7dfdefaa6411
Merge: caffac3843 3930da3f62
Author: Ian Romanick <idr@localhost.localdomain>
Date: Thu Jun 8 11:37:09 2006 -0700
Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver
commit 3930da3f6209312dd0f10aba0b16ef45996a07fe
Author: Greg Kroah-Hartman <gregkh@suse.de>
Date: Thu Jun 8 11:27:29 2006 -0700
fix compiler warnings in Xprint/ps/psout.c
commit c496a3b9c981dc079fcc6c0ac4db3aa912b3dcf1
Author: Greg Kroah-Hartman <gregkh@suse.de>
Date: Thu Jun 8 11:23:53 2006 -0700
fix compiler warning in Xprint/ps/PsImageUtil.c
commit ea24b5a25c2544f3b3de6480da125edb23a6b3a9
Author: Greg Kroah-Hartman <gregkh@suse.de>
Date: Thu Jun 8 11:22:01 2006 -0700
add proper function prototypes for Xprint/ps/PsCache.c to Xprint/ps/Ps.h
commit ee2bb4d1929e20436cf0e830ece02fe07db2d524
Author: Greg Kroah-Hartman <gregkh@suse.de>
Date: Thu Jun 8 11:15:34 2006 -0700
fix compiler warnings in Xprint/ps/PsArea.c
commit 92303d534a91cb0ea30e4cd0f639efd70b9739b4
Author: Greg Kroah-Hartman <gregkh@suse.de>
Date: Thu Jun 8 11:12:16 2006 -0700
fix compiler warning in Xprint/ps/PsGC.c
commit cf6169f9e99e6e8ab264f284cfa13cb379b36207
Author: Greg Kroah-Hartman <gregkh@suse.de>
Date: Thu Jun 8 11:09:56 2006 -0700
fix compiler warnings in Xprint/ps/PsFonts.c
commit 1abc7f96edf37a1e2c766b9cdba7fc9b2cb06d19
Author: Greg Kroah-Hartman <gregkh@suse.de>
Date: Thu Jun 8 11:06:51 2006 -0700
fix compiler warnings in Xprint/ps/PsInit.c
commit 2dc291384c550badf55542ae645240e166676848
Author: Greg Kroah-Hartman <gregkh@suse.de>
Date: Thu Jun 8 11:04:40 2006 -0700
fixed compiler warnings in Xprint/ps/PsPixmap.c
commit aef092e0290143c2b8b1cb98fdf55c9630032aaf
Author: Greg Kroah-Hartman <gregkh@suse.de>
Date: Thu Jun 8 10:53:17 2006 -0700
fix compiler warnings in Xprint/ps/PsPolygon.c
commit 511b231ded61159ebd70cab020ca1ca003fd0784
Author: Greg Kroah-Hartman <gregkh@suse.de>
Date: Thu Jun 8 10:41:34 2006 -0700
fix compiler warnings in Xprint/ps/PsPrint.c
commit 35fccb0068e8d73d1e6a16aefdc771506e620f83
Author: Greg Kroah-Hartman <gregkh@suse.de>
Date: Thu Jun 8 10:40:24 2006 -0700
remove some compiler warnings in Xprint/ps/PsText.c
Note that one of the existing warnings is pointing out a
real bug (uninitialized use for fontPage in PsPolyText16())
if anyone really cares about this code.
commit caffac38432009e8dc01e7d3e72a7fa6fba2f078
Merge: c5b3aa120b 9fa73721f0
Author: Ian Romanick <idr@localhost.localdomain>
Date: Thu Jun 8 10:38:43 2006 -0700
Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver
commit 1ac30947f4a222ba78558eddf8e5f03cec31f613
Author: Greg Kroah-Hartman <gregkh@suse.de>
Date: Thu Jun 8 10:35:18 2006 -0700
fix compiler warnings in Xprint/ps/PsWindow.c
commit 9fa73721f0c3df73e508da909a5665f47a54cb57
Author: Greg Kroah-Hartman <gregkh@suse.de>
Date: Thu Jun 8 10:27:28 2006 -0700
fix up EnableDisableExtension() and EnableDisableExtensionError() prototypes
commit c405659626477f2009603d8c0e381b8b62277bb6
Author: Greg Kroah-Hartman <gregkh@suse.de>
Date: Thu Jun 8 10:19:24 2006 -0700
comment out QualifyName in Xprint/Init.c which is not used anymore
If someone else wants to delete this function, that's fine with me too.
commit a940b851faba569e36983f7885aefa72f7bf2ade
Author: Greg Kroah-Hartman <gregkh@suse.de>
Date: Thu Jun 8 10:17:53 2006 -0700
fix function pointer warning in Xprint/Init.c
commit 9e0c82386ae389bcc296a5ad44e996790b033ad3
Author: Greg Kroah-Hartman <gregkh@suse.de>
Date: Thu Jun 8 10:16:37 2006 -0700
fix already-defined warning in Xprint/Init.c
commit 40fb7eecaf14a76f35ac2dc350ad2fffdaf6e0d0
Author: Greg Kroah-Hartman <gregkh@suse.de>
Date: Thu Jun 8 10:11:17 2006 -0700
fix noDamageExtension warning in Xprint/Init.c
Also took out duplicate definition of this variable in mi/miinitext.c
commit 494895e0fbbf0a71bc535c0a2358c9db54c95c5a
Author: Greg Kroah-Hartman <gregkh@suse.de>
Date: Thu Jun 8 09:43:44 2006 -0700
Properly define dispatchExceptionAtReset to fix compiler warnings
commit d90eecf40ea768b2bf6340f15bb0af9dab2f3cf3
Author: Greg Kroah-Hartman <gregkh@suse.de>
Date: Thu Jun 8 09:11:41 2006 -0700
add some missing function prototypes to Xprint/AttrValid.h to fix compiler warnings
commit bccde1609153dee93f6fe5a138fc0c0f2fe08212
Author: Greg Kroah-Hartman <gregkh@suse.de>
Date: Thu Jun 8 09:01:59 2006 -0700
fix incompatible pointer warning in Xprint/ddxInit.c
commit 60bd8893d50ed1da9b94f4b96a07ea432e23f467
Author: Greg Kroah-Hartman <gregkh@suse.de>
Date: Thu Jun 8 09:01:21 2006 -0700
Properly #ifdef out ddxBeforeReset() to fix compiler warning
commit ac21e6a594eac69101aa8920d70a9d60412b57f6
Author: Greg Kroah-Hartman <gregkh@suse.de>
Date: Thu Jun 8 09:00:42 2006 -0700
remove unused variable warning in Xprint/ddxInit.c
commit 71dd44b0ad617dd36ce4ed328f9e1e8c5ef713a5
Author: Greg Kroah-Hartman <gregkh@suse.de>
Date: Wed Jun 7 19:17:26 2006 -0700
Fixed up most "warning: function declaration isn't a prototype" warnings from Xprint/
commit 839305bac98856a2bb1d96691e4dcf49db229f90
Author: Greg Kroah-Hartman <gregkh@suse.de>
Date: Wed Jun 7 19:12:23 2006 -0700
Remove unused variables from Xprint/attributes.c
commit c5b3aa120bf96ee169d07c33a2698499944a1624
Author: Ian Romanick <idr@localhost.localdomain>
Date: Wed Jun 7 17:46:23 2006 -0700
Added a comment about some suspicious code.
commit 50112dfcc82dd476727fa453b9e3d1852e06d678
Author: Ian Romanick <idr@localhost.localdomain>
Date: Wed Jun 7 17:46:05 2006 -0700
Fixed severly broken calls to pci_device_find_by_slot. I mis-read the
tag bits when I originally coded it. I mistakenly thought that the
original code masked off the PCI function bits, so I just always
passed 0 as the function. That was a mistake.
commit f9e7128d948a0b62e6f03295305e0080d9233fd8
Author: Ian Romanick <idr@localhost.localdomain>
Date: Wed Jun 7 17:44:06 2006 -0700
Added missing include of Pci.h. This caused the server to terminate
when the symbol PCI_DOM_FROM_TAG couldn't be resolved at run-time.
commit 23182315f34e3a0065739b43b15d4560e75b41a1
Merge: bc05158a5a 757f40fca5
Author: Ian Romanick <idr@localhost.localdomain>
Date: Wed Jun 7 17:03:48 2006 -0700
Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver
commit 7a40ac2585028860730ffcd333eb3fe9de63680c
Author: Greg Kroah-Hartman <gregkh@suse.de>
Date: Wed Jun 7 16:23:45 2006 -0700
remove a bunch of unused variables in Xprint/Init.c (fixing the compiler warnings)
commit 163980138cc0bfc9124456781b3dc45a49e2a129
Author: Greg Kroah-Hartman <gregkh@suse.de>
Date: Wed Jun 7 16:11:20 2006 -0700
remove some unused local variables in Xprint/Oid.c
commit 8e41640db884a4633b598d0a52b269e6547c8bf0
Author: Greg Kroah-Hartman <gregkh@suse.de>
Date: Wed Jun 7 15:56:43 2006 -0700
add bison generated files to .gitignore
commit 78f4ab6b89fca3086b9c9471b40c11c23fbb6142
Author: Greg Kroah-Hartman <gregkh@suse.de>
Date: Wed Jun 7 14:12:40 2006 -0700
Fix compiler warning about undefined ReinitializeRootWindow function
commit 757f40fca50a99377e437949ee77b983c8cd6087
Author: Greg Kroah-Hartman <gregkh@suse.de>
Date: Wed Jun 7 14:09:13 2006 -0700
updated the .gitignore file with more auto-generated files
commit bc05158a5ab00c548e4b04b5638afe07bc702260
Merge: 46f55f5dea cc465800dd
Author: Ian Romanick <idr@localhost.localdomain>
Date: Wed Jun 7 14:09:12 2006 -0700
Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver
commit 46f55f5dead5d70cdff30531d80a72f6be042315
Author: Ian Romanick <idr@localhost.localdomain>
Date: Wed Jun 7 14:09:02 2006 -0700
Initial batch of changes for PCI rework. All future changes will be
tracked individually.
commit cc465800ddca5fb6c9ec09fdfa8f1f05359cf396
Author: Greg Kroah-Hartman <gregkh@suse.de>
Date: Wed Jun 7 14:03:35 2006 -0700
Fix compiler warnings about SetVendorRelease and SetVendorString
commit 785c9789704ed142fe98cd17b5995e4a95b7141f
Merge: 21ebcfd702 36d786e9f0
Author: Greg Kroah-Hartman <gregkh@suse.de>
Date: Wed Jun 7 13:20:21 2006 -0700
Merge ../xserver
commit 36d786e9f051c5c95c1cc8c098c84e118ed3cc85
Author: Greg Kroah-Hartman <gregkh@suse.de>
Date: Wed Jun 7 12:47:50 2006 -0700
add more files to .gitignore
commit 8f5aa38abf1158a789b5528df9d98826342e30cf
Author: Greg Kroah-Hartman <gregkh@suse.de>
Date: Wed Jun 7 12:33:44 2006 -0700
fix compiler warning about XKB_IN_SERVER redefinition
commit 101ae616962c355388722e05ab8413eb5f5c3402
Author: Greg Kroah-Hartman <gregkh@suse.de>
Date: Wed Jun 7 12:06:22 2006 -0700
Add PanoramiXExtensionDisabledHack to globals.h as it was missing.
commit e5b72bd9c6fb06640a5de4031be0dc9b04b4b215
Author: Greg Kroah-Hartman <gregkh@suse.de>
Date: Wed Jun 7 12:05:39 2006 -0700
Remove 3 compiler warnings in the Xext/xevie.c file
commit e3c11f66516521959127b9ab8fd88cc4c954f5bb
Author: Greg Kroah-Hartman <gregkh@suse.de>
Date: Wed Jun 7 12:05:01 2006 -0700
Added first cut at a .gitignore file to make using git easier.
commit 21ebcfd7027b2a6182d4065e56a2ef814f5181ae
Author: Adam Jackson <ajax@benzedrine.nwnk.net>
Date: Wed Jun 7 14:17:31 2006 -0400
Demolish now-unused loader functions.
commit f90761b06eaa5fa44fe85289e54eed5f47eff3b9
Author: Adam Jackson <ajax@benzedrine.nwnk.net>
Date: Wed Jun 7 13:58:24 2006 -0400
Add a token for EDID-supplied modes.
commit d00aa6b8559d3e5f70c6558ce0abd12f7d758491
Author: Adam Jackson <ajax@benzedrine.nwnk.net>
Date: Wed Jun 7 11:44:36 2006 -0400
Delete a (now misleading) message from the crash handler.
commit f8535edec736cf19740bd41ed2adfe531f2c26ac
Author: Keith Packard <keithp@neko.keithp.com>
Date: Tue Jun 6 10:29:34 2006 -0700
Remove ChangeLog file.
commit 8444bb77c91cf8a23d32b3cc9749e2a3d3f9f9eb
Author: Daniel Stone <daniel@fooishbar.org>
Date: Mon Jun 5 20:22:06 2006 +0000
When we can, bound the maximum number of PCI devices to attempt to scan, by
the number found on the system. Only implemented for Linux right now.
commit 11cf4d2fde9219e8d6ca427acae89a0c9f5d71b1
Author: Keith Packard <keithp@keithp.com>
Date: Mon Jun 5 07:15:23 2006 +0000
Update AC_DEFINE_DIR to version compatible with CVS autoconf which requires
double eval to avoid leaving ${prefix} in output
commit 52fc7c8dc70226cc7f03454e9be86a627672295f
Author: Adam Jackson <ajax@nwnk.net>
Date: Mon Jun 5 03:00:24 2006 +0000
Ensure all *ModuleData symbols are marked _X_EXPORT. Start removing
XFree86LOADER ifdefs, non-loadable hasn't been supported for a while
now. Remove completely gratuitious REMOVE_LOADER_CHECK_MODULE_INFO
ifdefs surrounding a call to a function added in XFree86 4.1 (!).
Miscellaneous static markings.
commit d22582dc5a070f72d4653e24d1e4ebe4a112276e
Author: Adam Jackson <ajax@nwnk.net>
Date: Sun Jun 4 16:13:26 2006 +0000
Remove a stray LBX reference.
commit ddc6b99505e227f99585b8c2392da524022a73e6
Author: Daniel Stone <daniel@fooishbar.org>
Date: Sat Jun 3 11:24:33 2006 +0000
Bump to 1.1.99.2.
commit 4fd668940f2155c4b06d24b6da8bcccd01f66f4c
Author: Daniel Stone <daniel@fooishbar.org>
Date: Sat Jun 3 10:58:37 2006 +0000
Bug #6619: Fix disappearing hardware cursor. (Colin Harrison)
commit ee71cb61f8da29bcf36ea4b199d629e34f89b119
Author: Daniel Stone <daniel@fooishbar.org>
Date: Sat Jun 3 10:54:38 2006 +0000
Bug #6956: Fix crash when removing session leader before its children.
(Rich Coe)
commit cd384af3058fe15077c57eccdffed3b61e261e7f
Author: Daniel Stone <daniel@fooishbar.org>
Date: Sat Jun 3 10:50:23 2006 +0000
Completely remove relocation pointer table.
commit 8e8c6faecddbe014d8760822e1f705b43a00fa33
Author: Daniel Stone <daniel@fooishbar.org>
Date: Sat Jun 3 10:48:37 2006 +0000
Add support for kFreeBSD systems. (Robert Millan, Aurelien Jarno)
commit 5b703f847d166176920077c1e6ba1d9559fc8481
Author: Daniel Stone <daniel@fooishbar.org>
Date: Fri Jun 2 12:05:32 2006 +0000
Fix type confusion.
commit 56f21bda1ce95741c88c423b60bd709eef26eb12
Author: Daniel Stone <daniel@fooishbar.org>
Date: Thu Jun 1 22:30:52 2006 +0000
Bug #6583: Only open /proc/bus/pci/devices once. (Bill Nottingham)
commit a9ed5a87902a839a5a135af03db78f113b18bd86
Author: Daniel Stone <daniel@fooishbar.org>
Date: Thu Jun 1 22:06:41 2006 +0000
Kill LBX, too.
commit df6da66525836d515f408a82f1a13ca5251ff0f7
Author: Daniel Stone <daniel@fooishbar.org>
Date: Thu Jun 1 20:56:39 2006 +0000
Simplify the unsupported XI function list.
commit 97203f1cf6e5b7c6389f69cbb1b75ac675d09531
Author: Daniel Stone <daniel@fooishbar.org>
Date: Thu Jun 1 20:41:21 2006 +0000
Clean up a warning, and remove excess multiple-suffix code.
commit 6d594ebc667afd404556ec3e108c810946b20ac5
Author: Daniel Stone <daniel@fooishbar.org>
Date: Thu Jun 1 20:22:39 2006 +0000
Ditch more alternate-loader braindamage.
commit c9468177486833d521ec62c7b0266b4be8200de7
Author: Daniel Stone <daniel@fooishbar.org>
Date: Thu Jun 1 20:18:30 2006 +0000
Kill a.out, COFF and ELF loaders with FIRE.
commit a3a4221495dfe4cc0a3874a08dd5364ef45a7f2e
Author: Adam Jackson <ajax@nwnk.net>
Date: Thu Jun 1 19:53:06 2006 +0000
Add bitmap to the ignored module list.
commit ee689c104287140db38bbd26959ab1b4847c168e
Author: Daniel Stone <daniel@fooishbar.org>
Date: Thu Jun 1 19:49:55 2006 +0000
Ignore requests to load GLcore and speedo.
commit 07c731a2bc21e6b98f28a2c0ebc42f01b67b824b
Author: Adam Jackson <ajax@nwnk.net>
Date: Thu Jun 1 19:37:53 2006 +0000
Bug #5089: Die, libbitmap, die!
commit 32be08ba7242da74de5defd6a4dcb536a273f57a
Author: Daniel Stone <daniel@fooishbar.org>
Date: Thu Jun 1 19:22:38 2006 +0000
Remove horrendously ugly DDX backward-compatibility.
commit d81edb9e00680e3c0001f343fa1d0c310b86cb93
Author: Daniel Stone <daniel@fooishbar.org>
Date: Thu Jun 1 19:22:01 2006 +0000
Forgot to remove this one too.
commit a73e0f8cdfec1c9199ffe696146ba7d677c4c10d
Author: Daniel Stone <daniel@fooishbar.org>
Date: Thu Jun 1 18:47:47 2006 +0000
Die XTESTEXT1, die!
commit fc5ca97284ef237a91f6adb433148ff57a673c08
Author: Matthieu Herrb <matthieu.herrb@laas.fr>
Date: Tue May 30 22:56:36 2006 +0000
Powerpc machines also need ioperm_noop.c
commit 07b168c8d8b2d79a4e7cf8dc5124eafc0f2bbcd0
Author: Adam Jackson <ajax@nwnk.net>
Date: Tue May 30 16:10:59 2006 +0000
Properly document the DPMS, SyncOnGreen, and TargetRefresh options.
commit 107defd920d9b1eb52b15e8ca8665bc48bb933d6
Author: Kristian Høgsberg <krh@redhat.com>
Date: Mon May 29 19:53:18 2006 +0000
Remove superfluous definition of tfp tokens.
commit fd8bde8bb0f9d796b3464973b53285c0a6d22a31
Author: Daniel Stone <daniel@fooishbar.org>
Date: Mon May 29 11:14:03 2006 +0000
Remove -xkbmap argument.
commit db0680cf70b8367e1f8a7fff9c0f6ec414db0542
Author: Daniel Stone <daniel@fooishbar.org>
Date: Mon May 29 09:26:32 2006 +0000
Minor #include cleanups.
commit c38aab293a06f43c04f14223f94f822d91d73396
Author: Matthieu Herrb <matthieu.herrb@laas.fr>
Date: Sat May 27 23:15:05 2006 +0000
check buffersize before reading next char, fixes the "mouse stuck at left"
bug (bugzilla #3113) for BSD systems using wscons. (Dale Rahn).
commit 2102fdd0a58e18aeaa842b2ec73b6071970fafb7
Author: Jeremy C. Reed <reed@reedmedia.net>
Date: Fri May 26 00:12:18 2006 +0000
RGB color database and XErrorDB install to "share" not "lib" by default (by
app/rgb and libX11).
TODO: They are customizable, so maybe cpprules.in should be extended.
commit 354086d7e8e13fc7acbcc6603ca2a03c8cc806ee
Author: Jeremy C. Reed <reed@reedmedia.net>
Date: Thu May 25 23:32:33 2006 +0000
Don't do fixup_video_driver_list if no drivers. (I had signal 11 and core
dump when drivers not installed yet.)
TODO: fix fixup_video_driver_list to handle NULL argument.
commit c6b1cff43238deded11dc58945778aec3d844598
Author: Matthieu Herrb <matthieu.herrb@laas.fr>
Date: Thu May 25 13:27:42 2006 +0000
update to build against Mesa CVS HEAD (Carlos Eduardo Rodrigues Diogenes).
commit 99724c16c9c58eb3e20ba91c79464747b8ee3fcf
Author: Matthieu Herrb <matthieu.herrb@laas.fr>
Date: Thu May 25 10:14:39 2006 +0000
typo
commit 5c7aef148de23f39027fda647bbb53bb5b992683
Author: Matthieu Herrb <matthieu.herrb@laas.fr>
Date: Thu May 25 09:57:47 2006 +0000
Don't destroy a pixmap twice on server exit (bugzilla #4247).
commit 693079442377daa2dc48bf318a0d7dd256cb2738
Author: Jeremy C. Reed <reed@reedmedia.net>
Date: Wed May 24 22:58:03 2006 +0000
NetBSD also has curses.h instead of ncurses.h. (TODO: Maybe instead of
checking for SCO, UnixWare, Sun SVR4 and NetBSD, the curses.h versus
ncurses.h should be tested in configure.)
commit 9477e5e0be04f4f6fa311de8b3693fbc8a082fbf
Author: Jeremy C. Reed <reed@reedmedia.net>
Date: Wed May 24 22:43:13 2006 +0000
On NetBSD, add -li386 for i386 and -lx86_64 for x86_64 to SYS_LIBS. (x86_64
on NetBSD not tested.)
commit b3031532ca96b22e81863202efb8bbcb9d701fac
Author: Jeremy C. Reed <reed@reedmedia.net>
Date: Wed May 24 20:11:38 2006 +0000
Remove tolower() which was missed in the _XkbStrCaseCmp/strcmp changes.
commit eb696f72a0819edef550bce9ff55730c02f70452
Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
Date: Tue May 23 16:17:09 2006 +0000
Add AC_SUBST([SOLARIS_ASM_CFLAGS]) that I forgot when splitting them out of
the XORG_CFLAGS.
commit bc0c56c407117d1545e20d21f7d30eb3472d618b
Author: Adam Jackson <ajax@nwnk.net>
Date: Mon May 22 15:47:56 2006 +0000
Bug #6924: Restore the ABI for DrawableRec and ColormapRec to the state
they were in prior to the fix for #6438. Based on a patch from Andy
Ritger.
commit cc3b882bd141218052cdde0144fc2a707ceee83d
Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
Date: Sat May 20 00:55:44 2006 +0000
Update to 2006-05-19 snapshot
Remove entries now present in pci.ids
Regenerate from updated pci.ids & extrapci.ids
commit 0b2c2b6bba5b578d5f0ac2d709d5d2ce7cb32bef
Author: Adam Jackson <ajax@nwnk.net>
Date: Fri May 19 20:29:47 2006 +0000
Remove dead DPMS timer functions from the installed headers. (Fredrik
Höglund)
commit deebf6bd51117c01a3217f134bd952481b9e41ab
Author: Adam Jackson <ajax@nwnk.net>
Date: Thu May 18 23:52:51 2006 +0000
Bug #4139: Fix a BAR remapping bug that could lead to IERR and system hang.
(Egbert Eich)
commit 91239d83f4e27835cf871348b5ff6c892bd4f4f4
Author: Adam Jackson <ajax@nwnk.net>
Date: Thu May 18 23:52:41 2006 +0000
file getemptypci.c was initially added on branch server-1_1-branch.
commit c11cfcfaffc79be5686c666f881c4c08f69e1b86
Author: Adam Jackson <ajax@nwnk.net>
Date: Thu May 18 23:48:57 2006 +0000
Bug #6377: Ignore disabled BARs, and allow matching BARs aligned to less
than 16 bytes. (Felix Kühling, ATI)
commit fa9a49a92db52de968d7147c71c6b9a8fd480f1e
Author: Adam Jackson <ajax@nwnk.net>
Date: Thu May 18 18:18:41 2006 +0000
Bug #5877: Avoid burning CPU when acpid dies. Require acpid to be running
for ACPI support on Linux. Minor errno handling fixes. (Valery
Inozemtsev, Adam Jackson)
commit 7893dadb2f6df218a4f4ea30a41c1aa9838da1f0
Author: Adam Jackson <ajax@nwnk.net>
Date: Thu May 18 14:39:59 2006 +0000
Bug #6827: Fix texel fetch in fbFetchTransformed to avoid crashes. Still
not 100% correct, but better than 7.0. (Radek Doulik, Matthias Hopf)
commit 2892dd6d2e34957650ef1630a94d471dfa71f888
Author: Daniel Stone <daniel@fooishbar.org>
Date: Wed May 17 16:20:03 2006 +0000
Make Xv symbols conditional. (Enrico Wiegelt)
commit a317bf482257f0e1b612dec7961fdfa564f0b9f2
Author: Daniel Stone <daniel@fooishbar.org>
Date: Wed May 17 15:00:18 2006 +0000
Make DBE support conditional. (Enrico Wiegelt)
commit 321dbed5f5a857a23525167ab85d4d7699429132
Author: Adam Jackson <ajax@nwnk.net>
Date: Mon May 15 18:27:18 2006 +0000
Bug #5209: Fix APM/ACPI support, again. (Michel Dänzer, Valery Inozemtsev)
commit dd38d3bd673cf830c2cd591fe1245909aa729892
Author: Matthieu Herrb <matthieu.herrb@laas.fr>
Date: Sun May 14 16:22:24 2006 +0000
Don't use AM_CONDITIONAL inside shell conditionals. Bugzilla #6916.
commit 6558ba4e62dba99f2a4d830f1c16f8d1c255b316
Author: Søren Sandmann Pedersen <sandmann@daimi.au.dk>
Date: Fri May 12 21:53:28 2006 +0000
Fri May 12 17:51:26 2006 Søren Sandmann <sandmann@redhat.com>
Keep track of the previous item and update its next pointer when deleting
from the linked list.
commit 9e239a0df7ededb50de091e5271cbfddd2b683c3
Author: Matthias Hopf <mhopf@suse.de>
Date: Thu May 11 11:23:43 2006 +0000
Bug #5796: Wrong fastpath selection for repeating sources.
commit 9db5d2dfc33e384ea4db1b7cbc377e0b05cfb3ff
Author: Matthias Hopf <mhopf@suse.de>
Date: Thu May 11 10:18:08 2006 +0000
Bug #4320: Improved XAA Composite fastpath.
commit 9a2a63ca3ff30d15e82a29e75a3720ba5b446978
Author: Adam Jackson <ajax@nwnk.net>
Date: Wed May 10 15:44:27 2006 +0000
Bug #3561: Crash fix in the Record extension. (Paul Anderson)
commit ab1a0249ba5e3174f18a1db212bc511fd7d74cb0
Author: Adam Jackson <ajax@nwnk.net>
Date: Tue May 9 22:36:01 2006 +0000
Bug #6867: Yet another Render crash fix. (Michel Dänzer)
commit 24310f827b71009c7510a674d2f92ced89847e37
Author: Adam Jackson <ajax@nwnk.net>
Date: Tue May 9 18:12:50 2006 +0000
Revert accidental commit
commit 86ffb46358965509aa3ee536f15cb5a4e5e04426
Author: Adam Jackson <ajax@nwnk.net>
Date: Tue May 9 18:04:29 2006 +0000
Bug #5209: Re-enable building APM and ACPI support. (Michel Dänzer)
commit b46d6a44fa97a3e66de828385026b7f84d9e59b8
Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
Date: Wed May 3 23:45:16 2006 +0000
Make Xephyr build on Solaris:
Add #include <sys/file.h> on Solaris for FNONBLOCK/FASYNC definitions
hw/kdriver/linux/Makefile.am Move agp.c & agp.h to KDRIVE_HW_SOURCES since
they're not needed for Xephyr-only builds
Add -lrt to XEPHYR_LIBS if needed to get nanosleep().
commit fc91ca069dd55490b99b096f029e0864b049120c
Author: Adam Jackson <ajax@nwnk.net>
Date: Wed May 3 17:50:10 2006 +0000
Redact a few mentions of speedo font support.
commit b9a9cf618566bdd796556b8a1f31949f66184352
Author: Matthieu Herrb <matthieu.herrb@laas.fr>
Date: Tue May 2 14:09:30 2006 +0000
Typo in ALLLOCATE_LOCAL() arguments, causing mis-computation of the buffer.
Bugzilla #6642.
commit 1e8a594957d84a37e66183e9c0cb9d42b62bdb24
Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
Date: Tue May 2 01:37:25 2006 +0000
Fix Solaris build with Sun compilers to work when exa is built before
hw/xfree86/os-support/solaris (as it is by default now).
commit 724dbc2f8bbe2f21bf16f20ca7b8bb555516626c
Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
Date: Tue May 2 01:30:37 2006 +0000
Use min() [defined in include/misc.h] instead of MIN() [not defined in any
Xorg header].
commit ad124742ae2a265a54a4a7ac91709ec6fd6ced34
Author: Adam Jackson <ajax@nwnk.net>
Date: Sun Apr 30 20:33:27 2006 +0000
Remove stray mfb/cfb references.
commit 291e89d4f2a4bb3177b2dfe6421680e23f120b8e
Author: Adam Jackson <ajax@nwnk.net>
Date: Sun Apr 30 19:16:14 2006 +0000
Remove NEED_LINEHELPER BC cruft for pre-R6 DDXes.
commit fdcacc5a4bc1d6cb7347fc66041a9c686c5c74d1
Author: Eric Anholt <anholt@freebsd.org>
Date: Fri Apr 28 03:27:12 2006 +0000
Add Polylines and PolyPoint acceleration as well. This is primarily to
clean up fallback debugging output, so I can focus on more imporant
cases. Performance is comparable but without hardware stalls, and
passes Xlib9.
commit 005529a1c9c9e78f06565dff081f03b74988081e
Author: Eric Anholt <anholt@freebsd.org>
Date: Fri Apr 28 03:26:30 2006 +0000
Correct some bugs causing performance issues in the "Smart" scheme.
commit 8738bc295bba229e36d064713e0c28aa8720c494
Author: Eric Anholt <anholt@freebsd.org>
Date: Thu Apr 27 20:27:27 2006 +0000
Improve EXA fallback debugging output to include the locations of pixmaps.
This is being used in tracking down recent compositing performance
regressions.
commit 83b061776a57025076fc26d6d01fe2e049c2243b
Author: Eric Anholt <anholt@freebsd.org>
Date: Thu Apr 27 19:17:34 2006 +0000
Add trivial PolySegment acceleration for 0-width horizontal/vertical lines,
which still happen somewhat frequently and were cluttering up my
fallback debugging output. x11perf says it's a major performance win in
those cases (though probably irrelevant), and it passes Xlib9.
commit 69164ec00c749787dd59d5913ec6b3d159ad74d7
Author: Eric Anholt <anholt@freebsd.org>
Date: Thu Apr 27 02:15:19 2006 +0000
In drawing glyphs, shortcut our way to exaComposite instead of going
through the whole CompositePicture stack and doing things like
computing damage over again. This is a sizeable win for text drawing
with a compmgr. Also avoid calling down into the server for dealing
with the scratch pixmap when we are able to do UploadToScreen
successfully and never need it.
commit 3d4ca57b69c40d27fe191170d0819013f8cc4947
Author: Eric Anholt <anholt@freebsd.org>
Date: Wed Apr 26 18:27:40 2006 +0000
Add a helper for the Component Alpha Over case, which breaks the operation
down into an OutReverse and an Add. Turn off the fallback to software
glyphs when component alpha, now that we expect all (new) drivers to be
able to support it. Also, make Xephyr fall back in the CA Over case to
exercise this code. This speeds up my rgb24text and ls -lR in
gnome-terminal by a factor of 5.
commit 26fa45b64258894201496f921eccb0cb7028c28c
Author: Dave Airlie <airlied@linux.ie>
Date: Wed Apr 26 11:40:58 2006 +0000
Bug #6751: Use the Linux PCI ROM interface on Linux properly. The old
domain code, still modified BARs not a good idea, Just talk to sysfs,
if 0 read, fallback to old methods.
commit c339b221d3f59130a39e63d4cec3de7e3de95bf3
Author: Dave Airlie <airlied@linux.ie>
Date: Wed Apr 26 11:31:07 2006 +0000
Bug #6750: This patch detects Intel bridges that are transparent but aren't
reported as such. From the Linux kernel fixups. This patch also removes
the reserved BIOS area from the area to allocate resources in.
commit 6d156c044085881c6ecbd8a13521c0a26df71c30
Author: Eric Anholt <anholt@freebsd.org>
Date: Wed Apr 26 01:33:15 2006 +0000
Improve the migration debugging output.
commit eaed7545a25a08b3223bf620c2ab6f80fe7cfdf6
Author: Eric Anholt <anholt@freebsd.org>
Date: Wed Apr 26 01:32:55 2006 +0000
Fix a bug in the intersection computation that could concievably cause
incorrect results to be returned (but would probably usually be
over-conservative).
commit 5d00859c6e7d4b7ebce56f438ec4993334de2328
Author: Eric Anholt <anholt@freebsd.org>
Date: Tue Apr 25 23:56:17 2006 +0000
Bug #4668: Check if the lists of glyphs don't have any intersecting glyphs,
and if they all have a maskFormat matching the format of the actual
glyphs If so, we can avoid the temporary pixmap for accumulating
glyphs, which reduces the number of operations done, and makes it
easier on the migration system. This fixes some significant performance
issues, particularly with subpixel antialiasing. Note that it does
increase the amount of damage computation which is done, so is not
always a win with a compositing manager running.
commit 074dc9a023b3967ce00aa42c26a7c988423afe8a
Author: Eric Anholt <anholt@freebsd.org>
Date: Tue Apr 25 16:47:23 2006 +0000
Add an option to verify at the point of migration that pixmaps which aren't
marked dirty are in fact not dirty. This will hopefully help catch
issues like the previous commit. Leave it on in fakexa.
commit 702d9226d57ec1584de2e8a85c268795650b1094
Author: Eric Anholt <anholt@freebsd.org>
Date: Tue Apr 25 15:46:04 2006 +0000
Don't forget to mark the drawable as dirty in exaPutImage(). Fixes
corruption with drivers that have UTS. (Michel Dänzer)
commit 39ca0867c7dd6f3bdecc52aec8df435946682098
Author: Donnie Berkholz <spyderous@gentoo.org>
Date: Mon Apr 24 05:44:06 2006 +0000
Remove another reference to cfb16.
commit 81f3c2937df6230542f3223c201da8c41ff59945
Author: Donnie Berkholz <spyderous@gentoo.org>
Date: Mon Apr 24 05:39:47 2006 +0000
strlcpy() doesn't exist on Linux, so use the implementation in os/.
commit a715634d23fb3124261dbbd8d7d4e6522551bb9b
Author: Matthieu Herrb <matthieu.herrb@laas.fr>
Date: Sun Apr 23 13:14:50 2006 +0000
Don't access free memory after unloading a module. Bugzilla #4168.
commit 79dc6892610c9f8385cde4f0d601cc7481225c16
Author: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Date: Sat Apr 22 03:22:17 2006 +0000
When reading the kernel keyboard mapping (readKernelMapping in
os-support/linux/lnx_KbdMap.c) we overrun the usefully-named global
array 'map', scribbling on other random static variables elsewhere.
This is fixed by changing the size of at2lnx. (David Woodhouse). Bug
#5169
commit b37c515320dc8df2b1d160cc3f37d6bfac109b91
Author: Keith Packard <keithp@keithp.com>
Date: Wed Apr 19 21:56:13 2006 +0000
Add support for x4a4 format (depth 4 at 8bpp). Bug #6325.
commit c947d796aad0b81d661a10b787deed967376da79
Author: Eric Anholt <anholt@freebsd.org>
Date: Tue Apr 18 19:18:43 2006 +0000
Missed in previous commit: Add a new migration scheme, called "Smart" for
lack of a better name. This one behaves somewhat between Greedy and
Always. It moves in if we can accelerate, unless the destination is
clean and shouldn't be kept in framebuffer according to the score, in
which case we migrate out (and force-migrate anything where migration
is free). This should help fix lack of acceleration for drivers without
UTS since removing exaAsyncPixmapGCOps, and has removed one performance
trap with Radeon I'd noticed. It is the new default.
commit b17a4de83e7ab18bef29ae898195889638f1cc6a
Author: Eric Anholt <anholt@freebsd.org>
Date: Tue Apr 18 19:14:07 2006 +0000
Add a new migration scheme, called "Smart" for lack of a better name. This
one behaves somewhat between Greedy and Always. It moves in if we can
accelerate, unless the destination is clean and shouldn't be kept in
framebuffer according to the score, in which case we migrate out (and
force-migrate anything where migration is free). This should help fix
lack of acceleration for drivers without UTS since removing
exaAsyncPixmapGCOps, and has removed one performance trap with Radeon
I'd noticed. It is the new default.
commit 771b366abe0bc060592b548612ec413291e14bf0
Author: Eric Anholt <anholt@freebsd.org>
Date: Tue Apr 18 18:50:35 2006 +0000
Fix exaGetPixmapFirstPixel to migrate as unaccelerated. Also adds a bit of
fallback debugging info to PolyGlyphBlt.
commit 782d61a03176264e0a9eb222ae97be3d175cf0ab
Author: Donnie Berkholz <spyderous@gentoo.org>
Date: Tue Apr 18 17:28:44 2006 +0000
Update all prefixes in config tools, so they mostly work again. Also, make
RgbPath commented out when using xorgconfig. Start using
/dev/input/mice as the default mouse location on Linux.
commit 0f065059dcaf9c452f1cdec115f619f697fd71cc
Author: Donnie Berkholz <spyderous@gentoo.org>
Date: Mon Apr 17 07:27:43 2006 +0000
Wrap a couple more SDK headers in if XORG, as per Dave Airlie's commit on
2006-01-18.
commit ba632f697a782cd47870705b6cecaac2c60d30ff
Author: Donnie Berkholz <spyderous@gentoo.org>
Date: Mon Apr 17 07:10:31 2006 +0000
Fix kdrive build by linking in libexa before KDRIVE_LIBS.
commit 0e62d92d5b809bc3a6503e9bc386cf961fc22557
Author: Adam Jackson <ajax@nwnk.net>
Date: Fri Apr 14 23:43:32 2006 +0000
Coverity #804: Another leak on OOM path.
commit d61219aaadf9e4aa83644a69627d3a1d3282c95f
Author: Adam Jackson <ajax@nwnk.net>
Date: Fri Apr 14 23:38:11 2006 +0000
Coverity #806: Another memory leak on OOM path.
commit 1b04e313920447e4c1f42bdd5a61f188d463210c
Author: Adam Jackson <ajax@nwnk.net>
Date: Fri Apr 14 23:32:22 2006 +0000
Coverity #847, #848, #849: Three more memory leaks.
commit 6545051902f2ce00c98bd1373f97ebc942667e9c
Author: Adam Jackson <ajax@nwnk.net>
Date: Fri Apr 14 23:10:59 2006 +0000
Coverity #1003, #1004: Two more useless null checks.
commit ab1d420022fb09d36a0d6ad948c38147c65b9adf
Author: Adam Jackson <ajax@nwnk.net>
Date: Fri Apr 14 23:09:38 2006 +0000
Coverity #1005: Avoid a null deref.
commit d01e0956a8903fb41e8a34c78973b9b2860b6446
Author: Adam Jackson <ajax@nwnk.net>
Date: Fri Apr 14 23:08:10 2006 +0000
Coverity #1007: Fix a silly null check.
commit 6d29f659318364afe046dc242d6f506ce40a944a
Author: Luc Verhaegen <libv@skynet.be>
Date: Fri Apr 14 23:01:35 2006 +0000
CVT means Coordinated Video Timing instead of Common.
commit 82b6ea1a4b414426072bf001daeb3e9de0e93589
Author: Adam Jackson <ajax@nwnk.net>
Date: Fri Apr 14 22:51:19 2006 +0000
Bug #6580: Don't install xf86drm.h, that's libdrm's job.
commit aefa347bded9a3179ab139d0ccddce314040e9b9
Author: Ian Romanick <idr@us.ibm.com>
Date: Thu Apr 13 21:08:25 2006 +0000
Fix build for added file to Mesa CVS. This is always fun. :(
commit 6aadd454e70d83921685b58bf57ec30d95920734
Author: Daniel Stone <daniel@fooishbar.org>
Date: Mon Apr 10 10:11:19 2006 +0000
Fix stupid thinko.
commit c9f6e60d42dec82d06995c05a2a011c338cadd87
Author: Daniel Stone <daniel@fooishbar.org>
Date: Mon Apr 10 08:50:33 2006 +0000
Coverity #826: Fix potential memory leak.
commit 1357af2474be9a3bce7ee2350fd4252eee89a3b1
Author: Daniel Stone <daniel@fooishbar.org>
Date: Sun Apr 9 17:39:10 2006 +0000
Coverity #340: Fix potential NULL dereference. Clean up proliferation of
'register int n' in loops of ProcXkbGetNames.
commit f324be00c547effc698ae6679d12ffe90bd90e43
Author: Daniel Stone <daniel@fooishbar.org>
Date: Sun Apr 9 17:28:42 2006 +0000
Coverity #324: Fix potential NULL dereference. (Alan Coopersmith)
commit 7637aa17f21e26d979fbb210a638d6751c98b1eb
Author: Daniel Stone <daniel@fooishbar.org>
Date: Sun Apr 9 17:26:17 2006 +0000
Coverity #169: Fix potential fgets() into NULL (?!?).
commit d5bc41b88272b4a3a1841cc1189720b0549db215
Author: Daniel Stone <daniel@fooishbar.org>
Date: Sun Apr 9 17:15:51 2006 +0000
Coverity #323, #445, #446, #447: Fix potential NULL dereferences.
commit 2387bfa5ff5ed82f3f732fb9152c1ea95850a914
Author: Aaron Plattner <aplattner@nvidia.com>
Date: Fri Apr 7 18:56:04 2006 +0000
Bump the ABI versions. Due to Glyph privates and the XV update below, the
video driver ABI needs to be bumped to 1.0. The rest of the ABI minor
versions were bumped to include the LoaderGetABIVersion function.
Add a DrawblePtr argument to the XV hooks. This allows drivers to determine
that the target window is redirected and draw to the appropriate place.
commit dc43909219fe2a4d03139638814b89032b2921b9
Author: Søren Sandmann Pedersen <sandmann@daimi.au.dk>
Date: Fri Apr 7 17:49:32 2006 +0000
Fri Apr 7 13:46:45 2006 Søren Sandmann <sandmann@redhat.com>
Use FreeResource instead of deleteCompOverlayClient()
commit 94e7213d594dbbb53a6bb05d1dab7514c4ff5350
Author: Adam Jackson <ajax@nwnk.net>
Date: Fri Apr 7 16:08:50 2006 +0000
Remove libc wrapper types from Xisb interfaces.
commit 47bdc9528c2dd4ea9d59a0944c023173ea7a7a66
Author: Daniel Stone <daniel@fooishbar.org>
Date: Fri Apr 7 16:07:50 2006 +0000
Coverity #844, #845, #846: Fix memory leaks.
commit 2c90c3bfef8563f739a72bb645dd52b35b6ff6d5
Author: Daniel Stone <daniel@fooishbar.org>
Date: Fri Apr 7 15:57:17 2006 +0000
Coverity #987: Avoid potential NULL dereference.
commit 843146cfbaef234e13df9a62b6f0232a5efdf7f0
Author: Daniel Stone <daniel@fooishbar.org>
Date: Fri Apr 7 15:53:21 2006 +0000
Coverity #1216: Fix double-close of file on error.
commit 5dacc822327689c0f096093756473c96fba67d76
Author: Keith Packard <keithp@keithp.com>
Date: Fri Apr 7 02:20:11 2006 +0000
Coverity #333, #334 - eliminate unncessary test for always true condition
in fbEvenStipple.
commit 75a9afdbf42e4196471774102e1758f18866bec6
Author: Adam Jackson <ajax@nwnk.net>
Date: Fri Apr 7 01:53:43 2006 +0000
Coverity #488: Avoid smashing an array on malformed config files.
commit 20c1ef2cc30abe45eeaf5b0833cbc0095ed05c02
Author: Adam Jackson <ajax@nwnk.net>
Date: Fri Apr 7 01:50:07 2006 +0000
Coverity #769: Fix a potential memory leak for systems that allocate on
malloc(0)
commit 5ef711032b821be82fd7281fe64872bcbaff0327
Author: Adam Jackson <ajax@nwnk.net>
Date: Fri Apr 7 01:41:00 2006 +0000
Coverity #838: Plug two more memory leaks.
commit 69477ea4b6e666940c5dd4422bedfa6432dead04
Author: Adam Jackson <ajax@nwnk.net>
Date: Fri Apr 7 01:37:11 2006 +0000
Coverity #837: Fix another another memory leak.
commit b472ce7307dd88a21c7713a2b127e34f5c2bc817
Author: Adam Jackson <ajax@nwnk.net>
Date: Fri Apr 7 01:35:43 2006 +0000
Coverity #836: Fix another memory leak.
commit 9c84ed5f8d9eded1a8b509c9cad1ca0ebcf2166a
Author: Adam Jackson <ajax@nwnk.net>
Date: Fri Apr 7 01:34:29 2006 +0000
Coverity #835: Plug memory leak in extension section parsing.
commit 12924d0da36ad2266bb040caac58534c07e85261
Author: Adam Jackson <ajax@nwnk.net>
Date: Fri Apr 7 01:29:39 2006 +0000
Coverity #812: Fix parser memory leak.
commit 49abff79957799e9229d5c0226ee1b0d7505003d
Author: Adam Jackson <ajax@nwnk.net>
Date: Fri Apr 7 01:26:33 2006 +0000
Coverity #818: Avoid memory leak on error path.
commit bda292120fc97f890c1f58a31177c0f7c0bfa048
Author: Adam Jackson <ajax@nwnk.net>
Date: Fri Apr 7 01:23:50 2006 +0000
Coverity #985: Avoid segfault on malloc failure.
commit 536628bb4bcb0a0d749e0c01412a5eb5d6d24063
Author: Adam Jackson <ajax@nwnk.net>
Date: Fri Apr 7 01:18:01 2006 +0000
Coverity #1037: Sanity check idx before use.
commit 53e97ce4ddd993248561c245143b61915ea254b5
Author: Adam Jackson <ajax@nwnk.net>
Date: Thu Apr 6 22:04:12 2006 +0000
missed a line while removing cfb16
commit 4ae12636694af05cee4287b119bde08e9ceaa8aa
Author: Adam Jackson <ajax@nwnk.net>
Date: Thu Apr 6 18:59:11 2006 +0000
Remove cfb16, no longer used.
commit e1fc15a85fb367ee9afd63c920c3327c3f45158d
Author: Fredrik Höglund <fredrik@kde.org>
Date: Wed Apr 5 21:08:45 2006 +0000
Put the screensaver extension back in the Xext module.
Move the screenSaverSuspended variable to DIX globals.
Restore the old link order for the Xorg and Xdmx binaries.
commit 383c2e1e9ec54ab9de356993ad552c1aa6ec094f
Author: Ian Romanick <idr@us.ibm.com>
Date: Wed Apr 5 19:52:12 2006 +0000
Include fbmmx.h in fb/fbwindow.c when USE_MMX is defined. Fixes build
problem on x86-64 resulting from fbHaveMMX being a macro instead of a
function on that platform.
commit 4697da177d545a2f8bb6fd0d6588a1c40532c339
Author: Adam Jackson <ajax@nwnk.net>
Date: Tue Apr 4 18:30:28 2006 +0000
Initial checkin
commit 83ea57bcc82f478a7ecdcd6ed73ca4be01cd9c26
Author: Adam Jackson <ajax@nwnk.net>
Date: Tue Apr 4 14:39:06 2006 +0000
Bug #5729: Convert xf8_16bpp to fb. chips(4) users please test.
commit 4c7da861185080d15b3ff4301af4af0e85a71f93
Author: Adam Jackson <ajax@nwnk.net>
Date: Tue Apr 4 14:17:04 2006 +0000
Bug #5300: Fix missing spaces in the Build OS line in the log. (Egmont
Koblinger)
commit fb6f61b50f1c701041680e49f6a406a6603f1577
Author: Adam Jackson <ajax@nwnk.net>
Date: Tue Apr 4 12:36:16 2006 +0000
Bug #4806: Dump the raw EDID contents in hex to the log file for better
debugging. (Philip Prindeville)
commit 14af50371c7f23855781924cdf6afa6ab7566a87
Author: Adam Jackson <ajax@nwnk.net>
Date: Mon Apr 3 22:00:06 2006 +0000
Bug #2142: Make font path logging more readable. (Eduard Fuchs)
commit 373f9f92566290d979730c09c9c5c5d50e23390c
Author: Adam Jackson <ajax@nwnk.net>
Date: Mon Apr 3 21:45:54 2006 +0000
Bug #4766: Convert all Xprint drivers to fb.
commit d9b8bfbfafe8758ceb629606607e37546d51ca52
Author: Adam Jackson <ajax@nwnk.net>
Date: Mon Apr 3 21:16:30 2006 +0000
Bug #5478: More use of fbSOlidFillmmx. (Jim Huang)
commit b0e67782653033c6518944adfbf23e466bd8bc39
Author: Adam Jackson <ajax@nwnk.net>
Date: Mon Apr 3 19:50:15 2006 +0000
Bug #6346: Build fix when using gcc -mno-sse. (Jonathan Adamczewski)
commit 66500819b1ca730a7b1df400a8368a08cbe49335
Author: Daniel Stone <daniel@fooishbar.org>
Date: Mon Apr 3 11:37:30 2006 +0000
Bug #1358: Make ISO_Prev_Group cycle/wrap as ISO_Next_Group does.
commit 2a6c11aa3b06f13dad94f3441c7184e6720a2bf4
Author: Alan Hourihane <alanh@fairlite.demon.co.uk>
Date: Mon Apr 3 09:12:28 2006 +0000
Fix a server crash due to memsetting beyond allocated memory when running
GL applications.
commit f6ca2b3ea92b7fe98408c51a17a590435e808b1d
Author: Adam Jackson <ajax@nwnk.net>
Date: Mon Apr 3 02:15:55 2006 +0000
Coverity #38: Dead branch elimination.
commit 9b9dd747d8f4697c6d5c947c160d5991c7c8fde5
Author: Adam Jackson <ajax@nwnk.net>
Date: Mon Apr 3 02:13:47 2006 +0000
Coverity #75: Dead variable elimination.
commit 3f87aeefb4be3ac23ae636d3756ffdc446eaa62d
Author: Adam Jackson <ajax@nwnk.net>
Date: Mon Apr 3 02:12:11 2006 +0000
Coverity #82: Dead variable elimination.
commit 61926dbe592468076f8c9a666f0098d067d2213e
Author: Adam Jackson <ajax@nwnk.net>
Date: Mon Apr 3 02:09:05 2006 +0000
Coverity #271: Fix an unbelievably boneheaded NULL chase.
commit 7ef95da8a3e22e710882590fc47d56893159cb5d
Author: Adam Jackson <ajax@nwnk.net>
Date: Mon Apr 3 01:51:54 2006 +0000
Coverity #616: Fix a rare memory leak.
commit 01ebd633017249c496f378df511586c973d49708
Author: Adam Jackson <ajax@nwnk.net>
Date: Mon Apr 3 01:43:33 2006 +0000
Coverity #833: Fix a rather nasty memory leak.
commit a01f17d6dec02f80144e108f748783cb4e429ebb
Author: Adam Jackson <ajax@nwnk.net>
Date: Mon Apr 3 01:35:05 2006 +0000
Coverity #983: Move some risky debugging code inside #ifdef DEBUG.
commit c03cfca3806f45948627715b25b46839a07be979
Author: Adam Jackson <ajax@nwnk.net>
Date: Mon Apr 3 01:31:59 2006 +0000
Coverity #986: Prevent a NULL chase.
commit 07ecf49521973bbb205b199c39e1171f1163df2b
Author: Adam Jackson <ajax@nwnk.net>
Date: Mon Apr 3 01:28:11 2006 +0000
Coverity #992: Prevent a NULL chase.
commit c6b3b3354c2d9139b19b132051d434e97dd19715
Author: Adam Jackson <ajax@nwnk.net>
Date: Sun Apr 2 22:51:42 2006 +0000
Bump to 1.1.99.1.
commit 7e085f52b6f07c076bd3bcfdce27c17d14d7822e
Author: Kristian Høgsberg <krh@redhat.com>
Date: Sun Apr 2 22:31:13 2006 +0000
Use xf86LoaderCheckSymbol to check for DRI symbols instead of dlsym,
avoiding RTLD_DEFAULT. (__glXDRIscreenProbe): Change GLX-DRI to AIGLX
in LogMessage for consitency.
commit b2097b99a2e6cc045ee9b6d80946bc06c4d9302c
Author: Adam Jackson <ajax@nwnk.net>
Date: Sun Apr 2 21:45:03 2006 +0000
../stub
commit 4e3a4cfdd1d7153eb88aab05ed02ddb32601ae93
Author: Eric Anholt <anholt@freebsd.org>
Date: Sun Apr 2 06:22:05 2006 +0000
Use RTLD_DEFAULT, rather than relying on NULL happening to map to it as it
does on Linux.
commit 323fec20292fc5ad90bfee9015ecccdc13c968ad
Author: Adam Jackson <ajax@nwnk.net>
Date: Sun Apr 2 00:46:20 2006 +0000
Reorder link order for Xdmx to fix new screensaver variable reference
properly; remove previous awful hack.
commit a605b9ffd3c2e7d227e35b911761f720bf07b7e6
Author: Adam Jackson <ajax@nwnk.net>
Date: Sun Apr 2 00:09:43 2006 +0000
Fix some includes to point into X11/fonts/ properly.
commit e5b1d38e142807b59ce4ec89764c949f707ec541
Author: Adam Jackson <ajax@nwnk.net>
Date: Sat Apr 1 23:53:33 2006 +0000
Disable Xprint freetype support momentarily. Needs ttf2pt1.c, which exists
in the monolith but has an advertising clause in the license.
commit ccca76b8083b83825fa16483b44e8926a35412bb
Author: Eric Anholt <anholt@freebsd.org>
Date: Sat Apr 1 23:41:23 2006 +0000
Clean up warnings and a debug printf.
commit 6afa814ab16f351b2eb787e5bf481a1f9738b391
Author: Eric Anholt <anholt@freebsd.org>
Date: Sat Apr 1 23:28:17 2006 +0000
Pull out fb's tile handling during fbValidateGC so we can do the necessary
exaPrepare/FinishAccess()es. Revealed by xtest with fakexa.
commit 277f612d4eeb89adb8ccda4e8fd3d211d8d1705e
Author: Adam Jackson <ajax@nwnk.net>
Date: Sat Apr 1 23:19:08 2006 +0000
Hack around the new screensaver variable for DMX, which is otherwise
blissfully ignorant of it.
commit 5f95146fcfcae60cc29265799ba3b851647105d6
Author: Eric Anholt <anholt@freebsd.org>
Date: Sat Apr 1 22:35:16 2006 +0000
Export exaPrepare/FinishGC to the rest of EXA, and use it in the ImageGlyph
implementation to avoid unprepared access to the tile. Also, relocate
the fbGetDrawable to avoid using a stale dest pointer after
exaSolidBoxClipped() may have migrated it. Revealed by xtest.
commit c720ffe875e4b2038746ff9b4767f8b90db0a307
Author: Eric Anholt <anholt@freebsd.org>
Date: Sat Apr 1 22:17:44 2006 +0000
Use fb's depth-to-planemask computation, which doesn't suffer from getting
a 1 planemask at depth 32. Fixes Get/PutImage xtest tests.
commit 5c0a2088e229d05c38e5df7daea45af0d7db7daf
Author: Daniel Stone <daniel@fooishbar.org>
Date: Sat Apr 1 21:49:44 2006 +0000
Bug #6428: Fix off-by-one error when walking off the end of the vmodmap
list.
commit 1e764feab595b781dab22d6e41c26f118c9d41b5
Author: Daniel Stone <daniel@fooishbar.org>
Date: Sat Apr 1 21:20:31 2006 +0000
Bug #5801: Check for MTRR support under Linux. Minor refactoring of MTRR
checks for other OSes.
commit 978c7b14a18caffde5600480824d04492fc32aef
Author: Daniel Stone <daniel@fooishbar.org>
Date: Sat Apr 1 21:02:40 2006 +0000
Make Xprint AC_ARG_ENABLEs and AC_ARG_WITHs unconditional also.
commit 71a6f2ef6c1138c5c6918a54dfb856183f4f242c
Author: Daniel Stone <daniel@fooishbar.org>
Date: Sat Apr 1 20:58:42 2006 +0000
Unconditionally run XP_USE_FREETYPE AM_CONDITIONAL, not only in the Xprint
path.
commit d1e90113fc32b6ddc4dbe1a074763c31bc133e75
Author: Eric Anholt <anholt@freebsd.org>
Date: Fri Mar 31 23:22:29 2006 +0000
Don't attempt to Prepare/FinishAccess NULL pDrawables. Exposed by new
gradient testing in rendercheck.
commit 2e38fedd29e7e55d01e3edce6a73b8ceaac17911
Author: Eric Anholt <anholt@freebsd.org>
Date: Fri Mar 31 19:41:28 2006 +0000
Add an option to EXA for the DDX to request that EXA hide the pixmap's
devPrivate.ptr when pointing at offscreen memory, outside of
exaPrepare/FinishAccess(). This was used with fakexa to find (by NULL
dereference) many instances of un-Prepared CPU access to the
framebuffer:
- GC tiles used in several ops when fillStyle == FillTiled were never
Prepared.
- Migration could lead to un-Prepared access to mask data in render's
Trapezoids and Triangles
- PutImage's UploadToScreen failure fallback failed to Prepare.
commit f480dc797b51f080f912efc7867d6d8e50be074c
Author: Eric Anholt <anholt@freebsd.org>
Date: Fri Mar 31 19:25:42 2006 +0000
Revert mistaken commit to exa_unaccel.c. Should have been to
exa_offscreen.c: Correct a typo in debug-only offscreen validation
code. (Wang Zhenyu)
commit 1a8167c1baa767fc056d1e17d96d0ea98a5f3b17
Author: Eric Anholt <anholt@freebsd.org>
Date: Fri Mar 31 19:16:51 2006 +0000
Correct a typo in debug-only offscreen validation code. (Wang Zhenyu)
commit 7ea30b507f4ce5ce20fbfaca80f7d5b53a99eb1d
Author: Fredrik Höglund <fredrik@kde.org>
Date: Fri Mar 31 18:49:38 2006 +0000
Move the screensaver extension from module to builtins.
Add the server side implementation of the ScreenSaverSuspend request.
Require scrnsaverproto >= 1.1, and change the linking order of the Xorg
static libs.
commit acca49b1a5a6c034f3b9d51d9016b8a7d43da809
Author: Søren Sandmann Pedersen <sandmann@daimi.au.dk>
Date: Fri Mar 31 17:39:35 2006 +0000
Fri Mar 31 12:37:16 2006 Søren Sandmann <sandmann@redhat.com>
Fix copyright statement
commit b074ce22470ba0a51eda2af7100d09a260a1e8bb
Author: Egbert Eich <eich@suse.de>
Date: Fri Mar 31 15:11:51 2006 +0000
fixed typo.
commit 710bb2e6c8b2874406e48fa8ad24539290c98d41
Author: Daniel Stone <daniel@fooishbar.org>
Date: Fri Mar 31 14:52:57 2006 +0000
Reindent with -cbi0.
commit 7c44bb8c49656133eae675377edea55322d254ca
Author: Daniel Stone <daniel@fooishbar.org>
Date: Fri Mar 31 07:33:34 2006 +0000
Simplify XkbWriteXKBKeymapForNames a bit, and remove debug spew.
commit 4c317bbc1259fa555dc5d5278226b21c42845c0c
Author: Daniel Stone <daniel@fooishbar.org>
Date: Fri Mar 31 07:21:41 2006 +0000
Add full FreeType support for Xprint. (Drew Parsons)
commit 759033703ce17b20d57756206f48a7ae410a50d1
Author: Eric Anholt <anholt@freebsd.org>
Date: Thu Mar 30 21:44:36 2006 +0000
Remove the exaAsyncPixmapGCOps mostly-unaccelerated ops vector, and always
plug in the accelerated one, even if the destination pixmap is
currently offscreen. This was a leftover from when kaa originally got
accelerated offscreen pixmap support, and its only concievable use was
to avoid a little overhead on ops to in-system pixmaps that weren't
going to get migrated. At this point, we probably care more about just
getting everything accelerated that we easily can, which should happen
with the new migration support.
commit b9203dc068ccd4c0d22d49a94b910783432b96a8
Author: Eric Anholt <anholt@freebsd.org>
Date: Thu Mar 30 21:25:43 2006 +0000
Don't do an extra fallback path for CopyWindow while swappedOut, since
exaCopyNtoN takes care of the fallback anyway, and we don't care about
the performance of this path.
commit 5c04610f8aeceed9ec7cd0ca8c5eb314cacc3c25
Author: Eric Anholt <anholt@freebsd.org>
Date: Thu Mar 30 21:21:59 2006 +0000
Add a dependency on EXA, so it rebuilds when the library does. The manual
indicated I shouldn't do this, but experience indicates I should.
commit 8ec42a10ff04e51e8d0b4cffb15064d901bc398d
Author: Kristian Høgsberg <krh@redhat.com>
Date: Thu Mar 30 20:08:44 2006 +0000
Mark the ARGB FBConfig as nonconforming to prevent drivers and apps from
falling over.
Add @GLX_DEFINES@ so GLcore gets compiled with TLS support if configured.
Only destroy the mesa buffer if it got initialized.
commit 08e319091fae7a60ae9fa757659cfde2966af9e9
Author: Egbert Eich <eich@suse.de>
Date: Thu Mar 30 18:53:41 2006 +0000
Added notice to last ChangeLog entry
Fixes for some vsw4 failures on 64bit BE platforms such as PPC64 and s390x.
Provided by Hong Bo Peng of IBM (slightly modified). Patches try to
resolve some of the careless mixtures of ulong and uint (which are
different size on
64bit). > This patch will break the driver ABI! < Bugzilla #6438.
commit 9da1d2257d02155cc8b4541cf5fcb4e64d756945
Author: Egbert Eich <eich@suse.de>
Date: Thu Mar 30 18:48:11 2006 +0000
Fixes for some vsw4 failures on 64bit BE platforms such as PPC64 and s390x.
Provided by Hong Bo Peng of IBM (slightly modified). Patches try to
resolve some of the careless mixtures of ulong and uint (which are
different size on
64bit). Bugzilla #6438.
commit 6d7ad353bafe914f0b50887daaeaae89ada6ebd3
Author: Kristian Høgsberg <krh@redhat.com>
Date: Thu Mar 30 18:29:53 2006 +0000
Regenerate these files using updated scripts to avoid unused variable
warnings.
commit 2153fa97482bae5737def3ecd4fe1cdc03834991
Author: Eric Anholt <anholt@freebsd.org>
Date: Thu Mar 30 05:24:27 2006 +0000
Bug #2986: Add PutImage acceleration for the ZPixmap, planeMask ~=
FB_ALLONES, bitsPerPixel >= 8, GXcopy cases. With the radeon driver on
my machine, this gives about 10% speedup in PutImage
10x10 and 500x500, and 40% speedup for 10x10 ShmPutImage, up to 65%
improvement in 500x500 ShmPutImage. Also fixes a crasher in GetImage
that slipped in at the last minute.
commit 3cf46cc1e32efc0e4be1d88be111ba0438e0f021
Author: Eric Anholt <anholt@freebsd.org>
Date: Thu Mar 30 05:15:58 2006 +0000
Add an UploadToScreen implementation, for testing PutImage support, and
make the DownloadFromScreen more robust.
commit e799dd68e2bd0fa8ac3c344111fb12e1f32d4c10
Author: Eric Anholt <anholt@freebsd.org>
Date: Wed Mar 29 22:25:17 2006 +0000
Bug #2986: Add acceleration of GetImage using DownloadFromScreen for the
ZPixmap, planeMask ~= FB_ALLONES, bitsPerPixel >= 8 case. I'm pretty
convinced that this is the only case that we care about at all. Tested
with xwd -root and xwd on a gnome-terminal, in a composited environment
or not.
commit 4bb5ab0b4453208573b91b334940f190a8f7210a
Author: Eric Anholt <anholt@freebsd.org>
Date: Wed Mar 29 22:03:18 2006 +0000
Add a DownloadFromScreen implementation, used for testing GetImage
acceleration, and set the migration scheme to Always on init (since
this is all for testing, and Always should make migration happen more
frequently than Greedy).
commit e31e8ace1043eab340d6b60a6e98b23ebf102786
Author: Deron Johnson <deron.johnson@sun.com>
Date: Wed Mar 29 17:51:54 2006 +0000
Fix composite overlay window bug 6411
commit ff6f88348c7498e83b0b143ef3737fd6eb0995e4
Author: Adam Jackson <ajax@nwnk.net>
Date: Wed Mar 29 01:05:09 2006 +0000
More warning cleanup.
commit 52d9ce7f4fc599d30dec2e61fc1720597043d91c
Author: Kristian Høgsberg <krh@redhat.com>
Date: Tue Mar 28 21:45:14 2006 +0000
Fix another typo.
commit 7df64898eac46a487e8eab2af7213d133b9ca419
Author: Kristian Høgsberg <krh@redhat.com>
Date: Tue Mar 28 07:46:04 2006 +0000
Fix a couple of typos.
commit bd283c2464e2c0e1fd0aca1dedff0f39c2564c34
Author: Aaron Plattner <aplattner@nvidia.com>
Date: Tue Mar 28 07:21:50 2006 +0000
Add a new export, LoaderGetABIVersion. This function allows modules to
query the versions directly instead of having to guess. Bug #6416: Add
LoaderGetABIVersion.
commit a06342eccc76035ff859fee4d283b288c90ee923
Author: Kristian Høgsberg <krh@redhat.com>
Date: Tue Mar 28 02:57:07 2006 +0000
Add --enable-glx-tls ./configure option to enable use of TLS for storing
current GL context. Use this option to let AIGLX load DRI drivers
compiled for TLS.
commit 77531dfb9f9f3ca0e38ad0555ee3735d6f28cf19
Author: Adam Jackson <ajax@nwnk.net>
Date: Tue Mar 28 01:22:01 2006 +0000
Silence some editorializing in the configure help text.
commit 7deaaa797cf8e7ca71e9b34fa6f413d1ed2b3dab
Author: Adam Jackson <ajax@nwnk.net>
Date: Tue Mar 28 01:21:00 2006 +0000
Big old pile of warning fixes.
commit 7342dbe4b2108827eaf30993ceeecbd828da2290
Author: Adam Jackson <ajax@nwnk.net>
Date: Tue Mar 28 00:18:31 2006 +0000
Remove long-dead screen region code.
commit 0e88cefbfecbff0c7dd606ce0caca840f45cbc0d
Author: Daniel Stone <daniel@fooishbar.org>
Date: Mon Mar 27 23:03:47 2006 +0000
Prune XKB code to only what we need to run the server. Remove dead
!XKB_IN_SERVER codepaths. Remove HAVE_CONFIG_H codepaths.
commit 5be8a66d324f3d5840b134ad29069eace64e6f12
Author: Daniel Stone <daniel@fooishbar.org>
Date: Mon Mar 27 22:28:32 2006 +0000
Fix remnants of previous busted _XkbStrCaseCmp commit.
commit 9e202dfe40e2bdd66f461a6ba531e927f82096ae
Author: Daniel Stone <daniel@fooishbar.org>
Date: Mon Mar 27 22:25:56 2006 +0000
Remove remnants of XkbCF code.
commit 7257590651328f89d23e80da1ec6241542a660cd
Author: Daniel Stone <daniel@fooishbar.org>
Date: Mon Mar 27 21:15:06 2006 +0000
Move XFree86 DDX XKB actions into dixmods.
commit d7b9e2b0e9d6889ea6b05e63892e612f4e5f19f5
Author: Daniel Stone <daniel@fooishbar.org>
Date: Sat Mar 25 23:09:50 2006 +0000
Bug #3819: Remove open-coding of strcasecmp.
commit b3570dd94aa72f94e537a17680150e91e7712f5a
Author: Daniel Stone <daniel@fooishbar.org>
Date: Sat Mar 25 22:37:58 2006 +0000
Remove INITARGS braindamage, change to void; add XkbExtensionInit prototype
to xkb.h. Explicitly initialise nTypes in xkb.c.
commit 1ef60ce8ebb681b3cfb5e515be5c187c0442dcda
Author: Daniel Stone <daniel@fooishbar.org>
Date: Sat Mar 25 22:35:48 2006 +0000
Really remove all DDX pre-config code.
commit ec10f70b2114e5369a5b2f34b084dcf55634dcb4
Author: Daniel Stone <daniel@fooishbar.org>
Date: Sat Mar 25 21:52:49 2006 +0000
Remove XkbCF DDX configuration code.
commit aae4238360b842ac34dc8ee16e165a1821f9a801
Author: Daniel Stone <daniel@fooishbar.org>
Date: Sat Mar 25 20:17:58 2006 +0000
Fix two glaring unconditional-NULL-dereferences.
commit a68c11bb1d7c5419004a1714e49dffac57304e78
Author: Adam Jackson <ajax@nwnk.net>
Date: Sat Mar 25 19:52:05 2006 +0000
Mark everything in xf86sym.c as _X_EXPORT.
commit ae935832facfa81a9689882406ecca74b0346790
Author: Fredrik Höglund <fredrik@kde.org>
Date: Fri Mar 24 20:50:13 2006 +0000
Refactored the screensaver and DPMS timer code to use the screensaver timer
for both screensaver and DPMS. Removed the SetDPMSTimers() and
FreeDPMSTimers() functions.
commit d1746ec0f0c8a0b750f390e7a7faf21b67683f4a
Author: Kristian Høgsberg <krh@redhat.com>
Date: Fri Mar 24 17:58:39 2006 +0000
Make sure DRI module is loaded before calling DRI functions.
commit f1616508c95d12dfaad2cfd61b40228b3dba6f60
Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
Date: Thu Mar 23 23:54:08 2006 +0000
Add ast driver/pci id (Carl Switzky, Sun Microsystems)
commit 6d2896b384e17512e8f12036daabcd575d21f804
Author: Kristian Høgsberg <krh@redhat.com>
Date: Wed Mar 22 22:49:52 2006 +0000
Improve error logging.
commit 5449634e3c9428005aba5b3322ced7e86c62f185
Author: Søren Sandmann Pedersen <sandmann@daimi.au.dk>
Date: Wed Mar 22 21:37:49 2006 +0000
Wed Mar 22 16:28:46 2006 Søren Sandmann <sandmann@redhat.com>
Use inline assembly for copy area, since gcc doesn't generate movq
instructions.
commit 5b3084c64f7bd1232603ffb3e985600b8d045453
Author: Søren Sandmann Pedersen <sandmann@daimi.au.dk>
Date: Wed Mar 22 21:13:08 2006 +0000
Wed Mar 22 16:05:09 2006 Søren Sandmann <sandmann@redhat.com>
Use inline assembly for solid fills, since gcc doesn't use the movq
instructions.
commit a08e5e0c68baaf85b0fc3ecde74a6bcf80bcd4bf
Author: Søren Sandmann Pedersen <sandmann@daimi.au.dk>
Date: Wed Mar 22 18:44:26 2006 +0000
Wed Mar 22 13:42:44 2006 Søren Sandmann <sandmann@redhat.com>
Patch by Keith Packard to make sure redirected windows don't get considered
"FullyObscured".
commit 966d93ef6d1f2ed02f3b81b5bf5a1ebbdd48c93d
Author: Kristian Høgsberg <krh@redhat.com>
Date: Tue Mar 21 22:54:38 2006 +0000
Make the server distcheck and tag 1.0.99.1 snapshot.
Bump CVS version to 1.0.99.1.
Distcheck fixes.
commit 8e3ad87d01c102591c7dc25614f6ac10e444a1b1
Author: Kristian Høgsberg <krh@redhat.com>
Date: Tue Mar 21 22:32:13 2006 +0000
#include indirect_dispatch to get prototypes for FBO functions.
Fix a couple of warnings.
commit dcc43d57cbe9d2b65384fe9ba2e4e4fbb43cb0a1
Author: Donnie Berkholz <spyderous@gentoo.org>
Date: Mon Mar 20 20:10:29 2006 +0000
Finish glx_ansic.h wrapper changes to make Xvfb and Xnest link again.
commit 9509c6799e31e96677b6d07bdf24ea91ddd30020
Author: Adam Jackson <ajax@nwnk.net>
Date: Mon Mar 20 19:32:18 2006 +0000
dead file removal
commit 61a020265c5915e3d671d5b2047b81a5d15594c3
Author: Adam Jackson <ajax@nwnk.net>
Date: Mon Mar 20 18:43:18 2006 +0000
Bug #5549: Fix build for sparc64. (Matthieu Herrb)
commit 6eb4e2303aaab8d64e3f6cbc0bbee55689bdcb82
Author: Adam Jackson <ajax@nwnk.net>
Date: Mon Mar 20 14:01:05 2006 +0000
Bug #6213: Check geteuid's return value, not its address, otherwise
unprivileged users can set the modulepath and run arbitrary code. Patch
from Matthieu Herrb. (CVE-2006-0745, Coverity #4)
commit 8c1bb37d0649b269b78c457b8b41ff59a41d89af
Author: Daniel Stone <daniel@fooishbar.org>
Date: Fri Mar 17 08:55:07 2006 +0000
Typo fix, reindent.
commit 2d2d38d17cc2558f8a41166a4a1578bc4c663c37
Author: Kristian Høgsberg <krh@redhat.com>
Date: Fri Mar 17 01:47:25 2006 +0000
Check for glproto when building GLX and make sure we have at least 1.4.6.
Drop glx_ansic.h wrapper and call xalloc, xrealloc, xfree and str-funcs
directly.
commit 2c11cde3367fcd22740b577a4364b1e41cf3e1d2
Author: Kristian Høgsberg <krh@redhat.com>
Date: Fri Mar 17 00:35:18 2006 +0000
More patches from David Reveman:
Add GL_ARB_texture_non_power_of_two, GL_EXT_framebuffer_object and
GL_NV_texture_env_combine4 extensions.
Add __GLXcontext destructor and flush context cache there and on
loseCurrent.
Chain back to new __GLXcontext destructor. (__glXMesaContextForceCurrent):
Set render table on forceCurrent. (init_screen_visuals): Index pVis
array correctly. (GlxGetMesaProvider): Add this.
Hook up FBO marshalling.
commit 14aafc258cd774cf937f9798a888c2d3c97ccacf
Author: Eric Anholt <anholt@freebsd.org>
Date: Thu Mar 16 18:43:55 2006 +0000
Change EXA so that exaMoveOutPixmap() retains the framebuffer copy of the
pixmap, and damage is tracked so that a later exaMoveInPixmap won't
result in an upload if no upload is necessary. This will likely improve
the performance of the "Always" migration scheme significantly, and is
a step in the path to more exact damage tracking between framebuffer
and system memory.
commit d0d336efd58896718f31a400651bacd9b769fb5a
Author: Daniel Stone <daniel@fooishbar.org>
Date: Thu Mar 16 16:29:17 2006 +0000
Add support for ZX2 PCI-E local bus adaptors. (Alex Williamson, HP)
Use soft timeout register to avoid MCAs when probing for non-existent local
bus adaptors on ZX2. (Alex Williamson, HP)
commit 175980580e572745a9a381b4432e3ba0457d3ba3
Author: Adam Jackson <ajax@nwnk.net>
Date: Wed Mar 15 23:05:53 2006 +0000
Bump to requiring fixesproto >= 4.0 and compositeproto >= 0.3.
commit 6fe377af5a82deb6f8b0f3b75414335e7845caac
Author: Matthieu Herrb <matthieu.herrb@laas.fr>
Date: Wed Mar 15 21:25:38 2006 +0000
- OpenBSD needs -Wl,-export-dynamic to export symbols from main executable
to modules.
- Probe for OpenBSD aperture driver and define HAS_APERTURE_DRV
accordingly.
commit 21f7f2fb113ee4f9cd011c3cc2d45d43bbdd35fa
Author: Felix Kuehling <fxkuehl@gmx.de>
Date: Wed Mar 15 18:43:32 2006 +0000
Enable correct handling of the BTS instruction (opcode 0f ab) The code was
there but #ifdefed out. Insead of BTS, BT was executed. This patch
enables the BTS function and hooks it up the the correct opcode. (ATI
Technologies Inc.)
commit b726aa502a871c700bc42b5325abf2c6820ff756
Author: Felix Kuehling <fxkuehl@gmx.de>
Date: Wed Mar 15 18:37:44 2006 +0000
Update to build against Mesa CVS HEAD.
commit c74464d92cd673ff0669375757caab798cc57e95
Author: Eric Anholt <anholt@freebsd.org>
Date: Wed Mar 15 16:59:45 2006 +0000
Don't let pinned pixmaps get migrated in when using the "Always" migration
scheme. This notably keeps the visible screen from getting migrated in
to a new location in framebuffer.
Reported by: Michel Dänzer.
commit b9c43cde1e368903786977b06368d5e36db9ffe8
Author: Adam Jackson <ajax@nwnk.net>
Date: Wed Mar 15 16:56:10 2006 +0000
Coverity #1042, 1043: Nuke some dead variables.
commit 5e106a71b9f8077216d41619402952b0005dd8a4
Author: Adam Jackson <ajax@nwnk.net>
Date: Wed Mar 15 16:49:04 2006 +0000
Coverity #807: Fix a memory leak in XFixesExpandRegion.
commit a3ef63696cac950b2520e7c85564befc0a830fde
Author: Adam Jackson <ajax@nwnk.net>
Date: Wed Mar 15 16:36:31 2006 +0000
Coverity #490: Fix a range check in xf86vidmode extension.
commit 152090ce442e94de1ae920208a92931af6493c8c
Author: Adam Jackson <ajax@nwnk.net>
Date: Wed Mar 15 16:33:12 2006 +0000
Coverity #487: Check version number correctly.
commit 72cc6307257fcbb800267464487bf918ee674328
Author: Adam Jackson <ajax@nwnk.net>
Date: Wed Mar 15 16:32:05 2006 +0000
Coverity #491: Check version number correctly.
commit 460f2ea4a594a53536f34c4ad27795fceec50bcc
Author: Adam Jackson <ajax@nwnk.net>
Date: Wed Mar 15 16:21:04 2006 +0000
Coverity #794: Fix a highly unlikely memory leak.
commit 116d158e85ec43577ff69aeb3271ab1f888500c9
Author: Adam Jackson <ajax@nwnk.net>
Date: Wed Mar 15 16:16:24 2006 +0000
Coverity #269: Compare the requested ABI class against the ABI class of the
module, not the module class.
commit d8221a9b70a11606a0f7e1f69afee6049d7f182f
Author: Adam Jackson <ajax@nwnk.net>
Date: Wed Mar 15 16:11:34 2006 +0000
Coverity #484: Fix an off-by-one in module refcounting.
commit 6bb2dc02a7cffd6ed7dd28e88d584920a4150749
Author: Adam Jackson <ajax@nwnk.net>
Date: Wed Mar 15 16:01:47 2006 +0000
Coverity #337: Remove useless NULL check.
commit 1e5c0842af99027cc6c30a16f967d8b60c9a894d
Author: Adam Jackson <ajax@nwnk.net>
Date: Wed Mar 15 15:34:57 2006 +0000
Coverity #1053: Nuke a dead variable.
commit 7314d16cde4c3f99d9d9f1d539f0c5ff4942e653
Author: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Date: Wed Mar 15 03:18:42 2006 +0000
Fix DRIExtensionInit() to not register callbacks when it hasn't been
initialized for the current server generation. Fixes a problem where it
would use stale private index and blow up in colorful ways if no driver
called DRIScreenInit() on the second generation (which happens due to a
bug in radeon that i'll fix separately). Note: clearing the index in
DRIReset() wouldn't work as DRIReset() is called before the
CloseScreen() chain
commit 02d80a0de93f7592e69065b0fbe5820dcdebdb44
Author: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Date: Wed Mar 15 03:12:32 2006 +0000
Make xf86 linear allocator smarter when dealing with alignment constraints
when falling back to X/Y allocations. Fixes various problems of Xv
allocation failures, notably with "nv" driver.
commit c1601717d536419693b3ef6e8a3d69b9f2fdc2b3
Author: Eric Anholt <anholt@freebsd.org>
Date: Wed Mar 15 01:20:08 2006 +0000
Add a new migration scheme, "always", which will move pixmaps to their
desired location always (unless they don't fit in FB, in which case
they all get moved out for software rendering). The default remains as
before, but can be controlled by the MigrationHeuristic xorg.conf
option (which is intentionally not documented, as it may be
short-lived). This is part of the exa-damagetrack work, which appears
stable in testing with fakexa, unlike the work as a whole.
commit a90cff266cc81993ed804fb320c1dbfe5e0d4787
Author: Eric Anholt <anholt@freebsd.org>
Date: Wed Mar 15 00:13:52 2006 +0000
Add more doxygen documentation, including notes on WaitMarker() and
MarkSync() that I noticed were needed while reading the VIA driver.
commit 693e42114f1127528448126d78a5209dd1198d8d
Author: Eric Anholt <anholt@freebsd.org>
Date: Tue Mar 14 21:30:12 2006 +0000
Move migration logic to a new function, exaDoMigration(). This is largely a
manual conversion to allow for different migration schemes to be
implemented reasonably, but does include some minor improvements such
as accounting for pinned pixmaps not being acceleratable, and for our
current GetImage and GetSpans not being accelerated.
commit d30905478078036383977ae9d4a3685c2e2c642f
Author: Eric Anholt <anholt@freebsd.org>
Date: Tue Mar 14 20:38:06 2006 +0000
Pull code for getting the (0,0) pixel from a pixmap out to a separate
function, since it gets repeated (with bad error handling, in one
case).
commit 01aa209f2056ef04e3f2735756a0f8b4a67a3d87
Author: Kristian Høgsberg <krh@redhat.com>
Date: Tue Mar 14 19:32:27 2006 +0000
Bail out early if screen doesn't support DRI.
commit 0cc34266d6e84bb491fcf9aa74e34615b2fca4fc
Author: Deron Johnson <deron.johnson@sun.com>
Date: Mon Mar 13 22:43:42 2006 +0000
Updated ChangeLog for my latest composite and xfixes changes.
commit 450018f48b2796345a4eaccbb94c1971ebd30114
Author: Deron Johnson <deron.johnson@sun.com>
Date: Mon Mar 13 21:59:55 2006 +0000
Part 3 of 3 (Other parts are in proto and lib) Composite Version 0.3:
CompositeGetOverlayWindow, CompositeReleaseOverlayWindow Xfixes Version
4.0: XFixesHideCursor, XFixesShowCursor
commit e5956f49b217b0ee9c9f35b6a58f339a8d22b1d7
Author: Kristian Høgsberg <krh@redhat.com>
Date: Mon Mar 13 01:54:59 2006 +0000
First batch of AIGLX fixes from David Reveman.
Add getter for Mesa provider.
Export this for Xgl.
Move resource tracking out of drawable constructor to allow wrapping.
Use corrent reply size #define.
Add this function. (DoGetDrawableAttributes): Fix array length.
commit eb63e50d95da4e1e08fc6fcec46ac63d5e3b7bf4
Author: Matthieu Herrb <matthieu.herrb@laas.fr>
Date: Sun Mar 12 17:14:03 2006 +0000
Fix build when AIGLX is false.
commit 9ed3463450469c3108e0be7e4baabc0a403a78b2
Author: Eric Anholt <anholt@freebsd.org>
Date: Sun Mar 12 03:04:52 2006 +0000
Improve doxygen formatting, and attempt to clarify the 1:1 ratio of
successful PrepareCopy()s to DoneCopy()s.
commit 9a7fba5fd07c8831d0acab8d901605de537ae273
Author: Eric Anholt <anholt@freebsd.org>
Date: Sun Mar 12 03:02:26 2006 +0000
Make exaCopyNtoNTwoDir() call DoneCopy() at the end of each string of
consecutive Copy() calls (rather than exactly once at the end of the
function).
Reviewed by: jbarnes
commit c3342c8000f6d2bfb61e2cf95e028d11b59698fa
Author: Kristian Høgsberg <krh@redhat.com>
Date: Sun Mar 12 00:11:34 2006 +0000
Merge accel_indirect branch to HEAD.
commit b1b731c28630965d9e2defe62d1108270dc8264c
Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
Date: Sat Mar 11 02:43:51 2006 +0000
Fix buffer size checks to prevent 2-byte buffer overflows. (Coverity #480,
#481, #482, #483)
commit fc0772de36315f19f5b57220db69f48a3b1fdc9a
Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
Date: Sat Mar 11 02:10:14 2006 +0000
Add HAS_MMAP for Xvfb
Fix Xvfb option parsing to exit on bad arguments, not just issue error
messages and continue on. (Coverity #492)
commit f2ecbb30187000547a98ca7cbaee433ea4ba8fe3
Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
Date: Sat Mar 11 01:58:32 2006 +0000
Pass sizeof the correct buffer to XmuSnprintf. (Coverity #489)
commit d6955798489813ef77cca13cf5f5c67d49e6dece
Author: Eric Anholt <anholt@freebsd.org>
Date: Fri Mar 10 21:36:24 2006 +0000
If fakexa is enabled, create a larger buffer in the Ximage, but keep the
same width/height for front-buffer drawing. The fakexa code then uses
this extra space for offscreen pixmaps. Note that this tones down the
absurdity of fakexa's offscreen pixmap alignment requirements (odd
alignment is too weird, so stick with "24", which is still strange but
exists out there). It also fixes a couple of bugs in the fakexa
implementation revealed by using offscreen pixmaps.
commit 5b1a7b478f072f56e836f2d4c0fbc1985842e2bb
Author: Eric Anholt <anholt@freebsd.org>
Date: Fri Mar 10 21:32:34 2006 +0000
Move the exaDrawableDirty in exaPrepareAccess to exaFinishAccess, which is
after the drawing is done. Previously, a failed PrepareAccess could
have migrated and cleared the dirty flag before the damage was ever
done.
commit ffdbb547becc71f1cfdd035d0d6c71539f185fb1
Author: Eric Anholt <anholt@freebsd.org>
Date: Fri Mar 10 08:06:42 2006 +0000
Coverity #1011: Remove a useless NULL check on a pVbe that had been
dereferenced many times before.
commit 1bc72dce5f8bc40e369e69b684816fdaaa07da43
Author: Eric Anholt <anholt@freebsd.org>
Date: Fri Mar 10 08:03:24 2006 +0000
Coverity #857: Fix resource leak in error path by freeing earlier.
commit 55f677d600370b19d62ef821025481f2be6f5edb
Author: Eric Anholt <anholt@freebsd.org>
Date: Fri Mar 10 07:58:27 2006 +0000
Coverity #813, #814, #815, #816: Fix resource leaks in error paths of
config parsing code.
commit 2bd41105496b729395fbcf97f09581eb0efb3510
Author: Eric Anholt <anholt@freebsd.org>
Date: Fri Mar 10 07:45:25 2006 +0000
Document the restriction on PrepareAccess() failure, from discussion with
benh.
commit 21dcd0304879f38ea8ea01ba88e7cc7783771adf
Author: Jeremy C. Reed <reed@reedmedia.net>
Date: Fri Mar 10 01:34:45 2006 +0000
Just like FreeBSD, let DragonFly's default mouse Device be /dev/sysmouse
(since /dev/mouse don't even exist by default).
commit 9a99afdfb292f303f914039952fdd772eed9e03a
Author: Jeremy C. Reed <reed@reedmedia.net>
Date: Fri Mar 10 01:22:26 2006 +0000
Add DragonFly support. (It is like FreeBSD.)
This patch is from DragonFly developer Joerg Sonnenberger and the pkgsrc
collection.
I tested using /dev/sysmouse with moused using my serial /dev/cuaa0.
commit 7a0f7f739804bc7d9c5562701abee8d134878977
Author: Eric Anholt <anholt@freebsd.org>
Date: Thu Mar 9 23:29:44 2006 +0000
Coverity #349: Fall back to software early if pSrc->pDrawable is NULL, or
pMask is non-NULL but pMask->pDrawable is NULL. This prevents NULL
dereferences on gradients and other Pictures which have no pDrawable.
commit 8a3ff42abb726d1604af39b4653ede5f760b7e69
Author: Eric Anholt <anholt@freebsd.org>
Date: Thu Mar 9 23:25:35 2006 +0000
Commit changes missed in last commit (mis-typed path and didn't notice): Do
a first pass of doxygen documentation of EXA. This removes the
corresponding pieces of exa-driver.txt, which were becoming stale.
Hopefully the documentation will stay much more up-to-date this way.
Many thanks to jbarnes for writing exa-driver.txt which was used a lot
in writing this documentation.
commit ab35c3fbc135bafdfc5057ef5d6227ca3534ed26
Author: Eric Anholt <anholt@freebsd.org>
Date: Thu Mar 9 23:18:15 2006 +0000
Do a first pass of doxygen documentation of EXA. This removes the
corresponding pieces of exa-driver.txt, which were becoming stale.
Hopefully the documentation will stay much more up-to-date this way.
Many thanks to jbarnes for writing exa-driver.txt which was used a lot
in writing this documentation.
commit d8f8bfeccef0750d79f852b9ae7152e841227d5a
Author: Matthias Hopf <mhopf@suse.de>
Date: Thu Mar 9 14:23:57 2006 +0000
Do Xorg configure checks for Xgl only as well
commit 2822cbc1fb2271844e7ae10c3629aaa940ae4042
Author: Eric Anholt <anholt@freebsd.org>
Date: Thu Mar 9 06:04:07 2006 +0000
Rearrange EXA driver structures so that there's a hope of maintaining ABI
when extending the driver interface. The card and accel structures are
merged into the ExaDriverRec, which is to be allocated using
exaDriverAlloc(). The driver structure also grows exa_major and
exa_minor, which drivers fill in and have checked by EXA
(double-checking that the driver really did check that the EXA version
was correct). Removes exaInitCard(), which is replaced by the driver
filling in the rec by hand, and the exaGetVersion() and related
EXA_*VERSION which are replaced by always using the XFree86 loadable
module versioning.
commit 65aa33f9173b1554924437685698f7c5f645a3c4
Author: Lars Knoll <lars@trolltech.com>
Date: Wed Mar 8 06:19:37 2006 +0000
render/picture.c Initialize the format of a source picture to
PICT_a8r8g8b8. Fixes a failure in the gradients test of rendercheck. In
the long term we could do better by setting the format to something
without alpha whenever the gradient doesn't contain colors with alpha.
This triggers a reduction of the over operation to a pure source
operation.
commit cb5090e8d60f4e9780c859faeea5c24587f6bee7
Author: Eric Anholt <anholt@freebsd.org>
Date: Wed Mar 8 03:32:07 2006 +0000
Bug #6150: Do the obvious fix of an insane sanity check in
xf86InitFBManager. (Julio M. Merino Vidal)
commit 2e6f801fe1a749f6a4db2cfd8a43abec5caceae0
Author: Ian Romanick <idr@us.ibm.com>
Date: Tue Mar 7 23:58:22 2006 +0000
Numerous amounts refactoring and comment adding (see ChangeLog for file by
file details). The primary intention for these changes is to pave the
way for the new device probing and PCI configuration code that I'm
working on.
commit b7d2dfc1e5e07051732303731ff3e4e76852dd94
Author: Eric Anholt <anholt@freebsd.org>
Date: Tue Mar 7 20:06:15 2006 +0000
Add appropriate MIT license. Oops.
commit 9d8c0e4bcbb111e860b7c3c33c224c22589006b1
Author: Eric Anholt <anholt@freebsd.org>
Date: Tue Mar 7 19:57:46 2006 +0000
Add a new flag to ephyr, "-fakexa", which turns on an EXA acceleration
implementation that calls fb to get its work done. The purpose is to
have a trusted EXA driver for use with testing changes to the core of
EXA. However, fakexa has not received much testing yet, lacks offscreen
pixmaps support, and doesn't reliably provide garbage when EXA doesn't
get its syncing right. All of these should be fixed soon.
commit 0a3d6c739968bf5af81fc0e8ea7211c20d52080b
Author: Eric Anholt <anholt@freebsd.org>
Date: Tue Mar 7 19:49:31 2006 +0000
Remove stale EXA files, which failed to get removed during the move to
top-level, somehow.
commit 68a8963f726cb92624665669813b6d952d53556e
Author: Luc Verhaegen <libv@skynet.be>
Date: Tue Mar 7 16:00:57 2006 +0000
Fix cvt -r check again. CH7011 TV encoder had 800x600 PAL hit the check.
commit 0693083335185ce05ee64546151f3fc43ce98575
Author: Lars Knoll <lars@trolltech.com>
Date: Mon Mar 6 21:00:09 2006 +0000
render/picture.c Correctly initialize devPrivates variable in source only
pictures to 0
miext/cw/cw.h Don't try to access devPrivates of source only pictures
commit 448997ebcd2bab02be1059b07b91b63b0d05d268
Author: Matthieu Herrb <matthieu.herrb@laas.fr>
Date: Sun Mar 5 16:43:10 2006 +0000
Only output SetClientVersion message if verbosity > 1, like other
extensions do
commit d921173833cc207380eb08b6675393f5e8139d5f
Author: Matthieu Herrb <matthieu.herrb@laas.fr>
Date: Sun Mar 5 16:35:08 2006 +0000
define SYS_LIBS to hold system dependant libraries that may needed. and add
it to libraries list where needed. Update ChangeLog for previous
changes too
commit 82cbd2ee0d20225b9edbb5246c8ed116b4614e1a
Author: Matthieu Herrb <matthieu.herrb@laas.fr>
Date: Sun Mar 5 16:33:17 2006 +0000
Don't hard-code -DUSE_DEV_IO here. configure generates the proper OS
specific values here.
commit b56a1513d27f84dcd55f3dc6053f183aa6f7855b
Author: Matthieu Herrb <matthieu.herrb@laas.fr>
Date: Sun Mar 5 16:32:40 2006 +0000
Definitions for bswapxx() macros on OpenBSD.
commit 4335868476af7c821c64def52b102b93ae91f8b0
Author: Matthieu Herrb <matthieu.herrb@laas.fr>
Date: Sun Mar 5 16:13:21 2006 +0000
Fix build with non GNU make.
commit b2f8f410c0bb8bc24039b2a593f8a2a483659914
Author: Alan Hourihane <alanh@fairlite.demon.co.uk>
Date: Fri Mar 3 09:54:54 2006 +0000
https://bugs.freedesktop.org/show_bug.cgi?id=4341 Make Xming error messages
more meaningful.
commit 29237c1977e454511e0d0244c68d34d572b68458
Author: Alan Hourihane <alanh@fairlite.demon.co.uk>
Date: Fri Mar 3 09:50:55 2006 +0000
https://bugs.freedesktop.org/show_bug.cgi?id=4538 Fix mouse button release
on multiwindows scrolling.
commit 06f01623fde61f1a11c2c1ecfae6a4c346473b05
Author: Alan Hourihane <alanh@fairlite.demon.co.uk>
Date: Fri Mar 3 09:43:42 2006 +0000
https://bugs.freedesktop.org/show_bug.cgi?id=5138 Check for NULL pointer
commit 054c291b274b238893e408e070aef13a7933400b
Author: Felix Kuehling <fxkuehl@gmx.de>
Date: Thu Mar 2 18:35:08 2006 +0000
Fix build against Mesa CVS HEAD: added s_blit.c to symlink-mesa.sh.
commit c1a82b9554028640dc4e08f042f1a8faf3372627
Author: Brian Paul <brian.paul@tungstengraphics.com>
Date: Thu Mar 2 03:43:26 2006 +0000
added s_blit.c file
commit 5f4d11c8d926cf396e0a8e203e14a8e1e123e011
Author: Jesse Barnes <jbarnes@virtuousgeek.org>
Date: Wed Mar 1 16:31:53 2006 +0000
fix spelling error, document EXA_TWO_BITBLT_DIRECTIONS device flag
commit 044a3abb382a4850722c391f04d09d3160790814
Author: Jesse Barnes <jbarnes@virtuousgeek.org>
Date: Wed Mar 1 16:28:34 2006 +0000
Add accelerated two directional blt support to EXA
commit 96ca329382141fd50dccb1cc35a71a333d80bce4
Author: Ian Romanick <idr@us.ibm.com>
Date: Tue Feb 28 23:07:09 2006 +0000
Remove redundant definition of struct Inst. Safeguard xf86AddDriver against
future additions to DriverRec.
commit 1cfa9f647e0241f4b9e56556b128d7bfd987eaca
Author: Daniel Stone <daniel@fooishbar.org>
Date: Tue Feb 28 16:55:26 2006 +0000
Bug #5216: Allow options to appear with other components.
commit e3b6b95f29cb2ea00b4290d694c5e202b8d180ad
Author: Adam Jackson <ajax@nwnk.net>
Date: Tue Feb 28 16:26:16 2006 +0000
Bug #5627: Fix Xprint font symlinking. (TIlman Sauerbeck)
commit e7f0b84fa7bd0c40cb456ec4e447103442c8dae3
Author: Jesse Barnes <jbarnes@virtuousgeek.org>
Date: Tue Feb 28 05:20:20 2006 +0000
fix exaInitCard by making it a real function
commit 088e5768faa90fe16de41b135b1111b5d25c64ad
Author: Felix Kuehling <fxkuehl@gmx.de>
Date: Mon Feb 27 18:12:24 2006 +0000
Fixing the Mesa build again, sigh. Add slang_execute_x86.c. Add
-I../shader/slang to swrast INCLUDES.
commit 345d99c972cac67f2cdc38750e4ba2dea1cdb360
Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
Date: Mon Feb 27 16:19:39 2006 +0000
Typo fixes (Nicholas Joly, XFree86 bugzilla #1658)
commit 6b08a5013b4e9e350ba461c9a59d30bb41feef8f
Author: Jesse Barnes <jbarnes@virtuousgeek.org>
Date: Sat Feb 25 20:26:49 2006 +0000
EXA driver doc cleanups and additions.
commit f41ec003f39c575299429897d4287233184583ad
Author: Roland Scheidegger <rscheidegger_lists@hispeed.ch>
Date: Sat Feb 25 01:17:10 2006 +0000
Add two radeon pci ids (one is used for a radeon mobility X700 XL in a
medion notebook, the other is for a AIW X800 VE)
commit 01a0bf881ada03ca3c27bdef7423c760c3bc2f9c
Author: Matthieu Herrb <matthieu.herrb@laas.fr>
Date: Fri Feb 24 17:01:57 2006 +0000
OpenBSD supports PCVT and WSCONS. PCCONS is long gone.
commit d3e1587c20c155b7873b6646ddf0b96f806f8a7f
Author: Kristian Høgsberg <krh@redhat.com>
Date: Fri Feb 24 16:50:42 2006 +0000
file glxdri.c was initially added on branch accel_indirect_branch.
commit 5d9a620726d2b0ad89625574478d2fd4536485b0
Author: Adam Jackson <ajax@nwnk.net>
Date: Thu Feb 23 19:25:57 2006 +0000
Remove redundant composite op reduction, done in Render now.
commit 028d6903f674fa77617f333b25356710d1682b05
Author: Alexander Gottwald <alexander.gottwald@s1999.tu-chemnitz.de>
Date: Wed Feb 22 16:29:07 2006 +0000
Bug #5978: Added missing swap of input variables. Added missing cases for
GL_SECONDARY_COLOR_ARRAY and GL_FOG_COORD_ARRAY (Colin McDonald)
commit 43324132afcbb6b231efcc24ec72ee44678d5771
Author: Alexander Gottwald <alexander.gottwald@s1999.tu-chemnitz.de>
Date: Wed Feb 22 16:08:56 2006 +0000
Added Mesa include directory
commit 43fbcc28c960ce5abe1d3223441c3dc5a10cde27
Author: Jeremy C. Reed <reed@reedmedia.net>
Date: Wed Feb 22 02:47:00 2006 +0000
Update to build against Mesa HEAD. (Thank you Felix for feedback on xorg
list.)
commit cfdacab33a62b47f22bb54683e3ca20ec9824864
Author: Ian Romanick <idr@us.ibm.com>
Date: Tue Feb 21 00:02:08 2006 +0000
Eliminate unused PCI BIOS reading functionality. The old code used several
function pointers to implement a level of flexability that was never
used. The code also had unused support for extracting a single image
type from a larger expansion ROM.
Fix the spelling of PCI_BIOS_OPEN_FIRMWARE.
Fix a couple errors in #ifdef debug code.
These changes have been tested on x86 and x86-64 Linux.
commit 5fd0f94006775e2271107c960dfa3314dddd9a5f
Author: Ian Romanick <idr@us.ibm.com>
Date: Mon Feb 20 23:45:50 2006 +0000
Eliminate all the code for querying the PCI class from the PCI ID database.
Class information is not, and never has been, stored there. Therefore,
this is just a bunch of elaborate code to read 0x00000000.
This has received testing on x86 and x86-64 Linux.
commit 6d7083bd69724586338d79784655328f1fcd2ae5
Author: Adam Jackson <ajax@nwnk.net>
Date: Mon Feb 20 22:16:49 2006 +0000
indent fixes (OMG SO UGLY), and nuke old RCS keywords.
commit 5480c537cee79b324736eac3e438a4713dfa1036
Author: Adam Jackson <ajax@nwnk.net>
Date: Mon Feb 20 21:50:49 2006 +0000
ANSIfy Xi/. Mostly automated via protoize(1).
commit cc42e153c2437fe9c94b0c20e1b56277474d94d0
Author: Felix Kuehling <fxkuehl@gmx.de>
Date: Mon Feb 20 03:00:09 2006 +0000
Update to build against Mesa HEAD.
commit ed3ea887a6b1c9fdc83895c40da34076121f05e9
Author: Eric Anholt <anholt@freebsd.org>
Date: Thu Feb 16 21:49:51 2006 +0000
Fix the encoding of DES's name.
commit ea0b3f65f77a78df1671b09739c00762a8875607
Author: Eric Anholt <anholt@freebsd.org>
Date: Thu Feb 16 21:45:12 2006 +0000
Fix build of Xorg by putting xf86bigfont back into builtin instead of
module sources list.
commit d97f29be22e22e6f5bc23229ffa5ef087f992c8c
Author: Eric Anholt <anholt@freebsd.org>
Date: Thu Feb 16 21:35:32 2006 +0000
Bug #5453: Don't forget to still do AM_CONDITIONAL for XVMC even if XV is
disabled, and also force XVMC disabled if XV is disabled. (Dag-Erling
Sm�rgrav)
commit d33c2e0d1079f93f4ba8b28d19950d384a9e7c32
Author: Keith Packard <keithp@keithp.com>
Date: Thu Feb 16 19:36:39 2006 +0000
Add oscolor.h
commit 60d4839a2d373cc6d8c0d5004284494d3a994a63
Author: Keith Packard <keithp@keithp.com>
Date: Thu Feb 16 19:03:07 2006 +0000
Forgot to include this file in previous patch
commit 8987b2c1efc9a4667e278e6ba411772ba2a4a4e6
Author: Keith Packard <keithp@keithp.com>
Date: Thu Feb 16 07:17:31 2006 +0000
Make more extensions optional in build (for kdrive). Fix kdrive build for
actual hardware. Fix kdrive pointer signed/unsigned types. Add
kdrive-required YX rotation functions. Replace rgb text file loading
with static rgb color table.
commit c8acb342695936db062c966029019a458d45459e
Author: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Date: Thu Feb 16 06:52:12 2006 +0000
Fix an occasional crash on VT switches: the server would save a pointer to
the current cursor when disabling FB access and would try to restore
that cursor when re-enabling. However, that cursor might have been
destroyed in between. This fixes it by updating the saved cursor
pointer when a cursor is set and vtSema is FALSE.
commit c845e152f52b3e8cef579797c5c8834ad2fd2cd5
Author: Eric Anholt <anholt@freebsd.org>
Date: Thu Feb 16 05:46:08 2006 +0000
Bug #5871: Drop special build infrastructure left over from libcwrapper
times. (George Fufutos)
commit c2f685e64464ccf86ed47ae37f74bf46877e0739
Author: Dave Airlie <airlied@linux.ie>
Date: Thu Feb 16 05:18:20 2006 +0000
Fix XSERVER64 should be _XSERVER64
commit 1bbd5e49b1dcc2e3f9785bd2bb58f946b9998099
Author: Eric Anholt <anholt@freebsd.org>
Date: Thu Feb 16 04:59:45 2006 +0000
Bug #5869: Remove traces of EXTMODULE define, which doesn't appear to be
useful any more. (George Fufutos)
commit c03b06bdf04fa8500d0f85314c7268848b4d50be
Author: Eric Anholt <anholt@freebsd.org>
Date: Thu Feb 16 04:39:00 2006 +0000
Bug #5888: Remove orphaned laymodule.c from miext/layer removal. (George
Fufutos)
commit 3b32e902c7a12aa2320da27d984029cde28fd8c3
Author: Eric Anholt <anholt@freebsd.org>
Date: Thu Feb 16 01:49:23 2006 +0000
Add entry missed in my last commit.
commit c4767794ef5b014ae25fe8541e72348ecfb1ee49
Author: Zephaniah E. Hull <warp@aehallh.com>
Date: Thu Feb 16 01:03:09 2006 +0000
Export xf86ActivateDevice, used by the evdev driver.
commit dc0354104cb4057dfcc7b2ccb8e2ae8474d70b15
Author: Eric Anholt <anholt@freebsd.org>
Date: Thu Feb 16 00:14:11 2006 +0000
Move EXA implementation up to the top level and remove its XFree86
dependencies. It was nearly abstract enough already to be used by
multiple DDXes. This will be useful for EXA development through
providing a fake acceleration implementation within Xephyr, so that
testing can be done on new EXA code without worrying about buggy
drivers.
commit c170aa830d0ce3dbff6b30081e04c3f91bf921be
Author: Eric Anholt <anholt@freebsd.org>
Date: Wed Feb 15 23:27:40 2006 +0000
Forced commit to note repocopy from hw/xfree86/exa/
commit 6770f1bdb145e7a6c431d0523f10d12155f58273
Author: Eric Anholt <anholt@freebsd.org>
Date: Wed Feb 15 21:09:14 2006 +0000
Define NO_LIBCWRAPPER in dix-config.h, and rely on Mesa including
dix-config.h if DIX_HAVE_CONFIG_H is defined to get it and _XSERVER64,
instead of defining things like this per directory.
commit 7d7fc927cd90146788780477b8e3379d91c3b910
Author: Adam Jackson <ajax@nwnk.net>
Date: Wed Feb 15 20:47:44 2006 +0000
Remove a few #ifdef vms; whatever problem that was solving should assuredly
be solved some other way.
commit f105b8da11fcf337512b3c39da3368f98da07a33
Author: Adam Jackson <ajax@nwnk.net>
Date: Wed Feb 15 20:44:13 2006 +0000
Mark everything in dixsym.c as _X_EXPORT.
commit 010d6effa6fa210251b12459882e88aeee82c2c0
Author: Adam Jackson <ajax@nwnk.net>
Date: Wed Feb 15 19:15:32 2006 +0000
Mark everything in {ext,font}sym.c as _X_EXPORT.
commit 3fe482c77e7b3e46739d011d8bbdee527d7a42fc
Author: Adam Jackson <ajax@nwnk.net>
Date: Wed Feb 15 19:05:55 2006 +0000
Mark everything in misym.c as _X_EXPORT.
commit 6ad4325b87889e1aada9333d750b7bb586c38b52
Author: Kristian Høgsberg <krh@redhat.com>
Date: Wed Feb 15 18:26:45 2006 +0000
Update to build against mesa head.
commit 50e2ff9a2500078ebbd833fddab0d93f3a50b6a6
Author: Eric Anholt <anholt@freebsd.org>
Date: Wed Feb 15 03:20:55 2006 +0000
Remove the waitSync from KdDisableScreen and push it off to drivers'
disableAccel hook, which is more correct anyway. This makes kdrive.c
not have any knowledge of kaa, opening the way for using exa from
kdrive.
commit 0446aafa9467f43515fb578d50f45e2c3153c8cf
Author: Eric Anholt <anholt@freebsd.org>
Date: Wed Feb 15 03:07:23 2006 +0000
Avoid some more libcwrapper damage that prevented kdrive linking.
commit 5c9b6f0fb01252d704de1bbdf3015dee7f956593
Author: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Date: Tue Feb 14 08:14:42 2006 +0000
DRIGetSecs() would call getsecs() when XFree86LOADER is defined, relying on
the wrappers to provide it. Wrapper gone, and getsecs doesn't exist on
linux so it now blows up. Fixes it by just calling gettimeofday() in
all cases instead.
commit 049dca0f43eb2179d2c61033a17ff1a89f8fb689
Author: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Date: Tue Feb 14 08:11:41 2006 +0000
Remove useless line of code that contained a bug and triggered a gcc
warning. This variable will be overriden before being used anyway.
(Bugzilla #5595)
commit 1132d0e6102d4564f70f0e8c98854e3acf25b109
Author: Dave Airlie <airlied@linux.ie>
Date: Tue Feb 14 06:27:59 2006 +0000
update to latest Mesa CVS HEAD
commit bb8c36690ab411c11aa8dd3d4520d513eb8f9091
Author: Alan Hourihane <alanh@fairlite.demon.co.uk>
Date: Tue Feb 14 04:20:37 2006 +0000
Bump shadow module version number to 1.1.0 from 1.0.0
commit cc9dfab0b31c7956f99d1f1b9c195065b5e18c29
Author: Adam Jackson <ajax@nwnk.net>
Date: Mon Feb 13 18:57:38 2006 +0000
(Reverted)
commit 83dd6241c8cd81e8d897bd17588ada92a945e647
Author: Adam Jackson <ajax@nwnk.net>
Date: Mon Feb 13 18:55:44 2006 +0000
Reverted, did nothing anyway, I'm not smart today.
commit 4a7f6f53cad541e8c5042a6472e3b3886fc9b7e6
Author: Adam Jackson <ajax@nwnk.net>
Date: Mon Feb 13 18:09:51 2006 +0000
Further op reduction when both src and dst alpha are absent.
commit 28ced9f3e0dd4bd81067f590a1d64ba0844edb06
Author: Eric Anholt <anholt@freebsd.org>
Date: Mon Feb 13 05:29:00 2006 +0000
Add missing ChangeLog text for r1.2 of GL/glx/indirect_reqsize.h
commit 4839e91fcab4c344e672154a447d8c7035fce1f4
Author: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Date: Mon Feb 13 05:03:13 2006 +0000
HAS_MKSTEMP vs. HAVE_MKSTEMP (From Fredrik Höglund)
commit 1a4f20541a9f4f41f444d826d743899ea2dee2db
Author: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Date: Mon Feb 13 04:56:27 2006 +0000
Fix linux build without libc wrappers (From Fredrik Höglund)
commit 2dc7b5e0d96a187bfbb355caa788f0fdcd88eaad
Author: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Date: Mon Feb 13 04:43:40 2006 +0000
Move call to xf86WrapperInit() to OsVendorInit() in xf86Init.c and remove
stubs in other DDX.
commit 34d0b9228f46c2f87be74dddc9c7d97aab091d03
Author: Eric Anholt <anholt@freebsd.org>
Date: Sun Feb 12 20:53:35 2006 +0000
Simplify ops that would use the alpha channel when an alpha channel is
always 1.0, and short circuit PictOpDst for good measure.
commit 5f45776ef3b9256bea44842d1c50f269422531a1
Author: Eric Anholt <anholt@freebsd.org>
Date: Sun Feb 12 10:30:47 2006 +0000
Add missing HAVE_DIX_CONFIG_H which caused issues with mismatched screen
structure interpretations, and remove a bunch of unused junk from
kdrive-config.h. Xephyr almost works on my amd64.
commit 5249416d091d59c248c8dda44529b8aa4910b1a0
Author: Eric Anholt <anholt@freebsd.org>
Date: Sat Feb 11 22:40:50 2006 +0000
Add stub xf86WrapperInits so that the servers will build even if os/ was
built with XFree86LOADER set.
commit a2a5254675a6b7ef0f7da9caa76c028b7c526502
Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
Date: Sat Feb 11 19:16:51 2006 +0000
Add <string.h>, <stdlib.h>, and <stdio.h> to clear undefined function
warnings after the removal of libcwrapper headers.
commit d6337c83241f0fa4bb03039a9767b58d8a1a7c91
Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
Date: Sat Feb 11 17:42:31 2006 +0000
<sys/limits.h> -> <limits.h> so we can compile on non-BSD OS'es
commit 4fafba61d5402d4e4d2c21ba1be3ed8969b99334
Author: Eric Anholt <anholt@freebsd.org>
Date: Sat Feb 11 03:03:45 2006 +0000
Remove libcwrapper damage from GLX (requires fresh Mesa HEAD), and get it
compiling in kdrive.
commit c3d14036729fd186d4ec7ca1de603e1f2d174e2f
Author: Eric Anholt <anholt@freebsd.org>
Date: Fri Feb 10 22:00:30 2006 +0000
Remove libcwrapper usage from xorg server modules. The libcwrapper is only
of (marginal) use in the drivers, and that usage remains.
commit a8cec1b656f57746758613213de1d6e5acb79451
Author: Eric Anholt <anholt@freebsd.org>
Date: Fri Feb 10 09:00:02 2006 +0000
Merge from kdrive: use RECT_PRIM to avoid tearing in xvideo.
commit efc3fab7f4b29f56fffd21304c64c03a48aa5b4b
Author: Eric Anholt <anholt@freebsd.org>
Date: Fri Feb 10 07:52:05 2006 +0000
Make kdrive (i.e. Xephyr only) buildable on FreeBSD and probably other OSes
without linux VT switching, fbdev, and vm86 support.
commit fa3a65e33d8c893c7867ea507afc7caa1361aa9c
Author: Eric Anholt <anholt@freebsd.org>
Date: Fri Feb 10 07:47:21 2006 +0000
Remove the include of X11/misc.h, which fails to compile and isn't
necessary.
commit d875bdb2756b082ce93bd86016c369ea85c04d17
Author: Jeremy C. Reed <reed@reedmedia.net>
Date: Fri Feb 3 02:44:19 2006 +0000
hw/xfree86/os-support/xf86_OSlib.h Fix sysmouse handling on DragonFly,
mostly garbage arrived. From Joerg Sonnenberger.
commit 0946bb9427695a4314e5c43de573b3a75a18e466
Author: Jeremy C. Reed <reed@reedmedia.net>
Date: Fri Feb 3 02:37:52 2006 +0000
Fix sysmouse handling on DragonFly, mostly garbage arrived. From Joerg
Sonnenberger.
commit 5e2a7af23bd0f46fbddca34098cb297be58b7a55
Author: Eric Anholt <anholt@freebsd.org>
Date: Thu Feb 2 21:07:06 2006 +0000
Move the frequently-repeated code to get the pixmap that backs a drawable
to a new function, exaGetDrawablePixmap().
commit ee3c7ccb175752dbeaed6b0113d0819b3fcd2398
Author: Eric Anholt <anholt@freebsd.org>
Date: Thu Feb 2 20:51:54 2006 +0000
Remove more debugging leftovers.
commit 3366b6836572461209bb2f8aa28d9e662067dc54
Author: Eric Anholt <anholt@freebsd.org>
Date: Thu Feb 2 20:09:14 2006 +0000
Rearrange and rename EXA code to be a bit more logically organized. Also
removes a little bit of debugging leftovers. Summary:
exa.c -> exa.c (miscellaneous code) exa_accel.c (all acceleration code)
exa_migration.c (migration logic) exaasync.c -> exa_unaccel.c (software
fallbacks) exapict.c -> exa_render.c (render extension stuff)
exaoffscreen.c -> exa_offscreen.c exaPriv.h -> exa_priv.h
commit 25d4ff870d49533d82a77f144722ff7934d52e0b
Author: Eric Anholt <anholt@freebsd.org>
Date: Thu Feb 2 20:04:15 2006 +0000
Forced commit to note repocopies: exa.c -> exa_accel.c exa_migration.c
exaasync.c -> exa_unaccel.c exapict.c -> exa_render.c exaoffscreen.c ->
exa_offscreen.c exaPriv.h -> exa_priv.h
commit 2ab487d4d20e4e34e73cc6d87f41bf0836c7a8af
Author: Alan Hourihane <alanh@fairlite.demon.co.uk>
Date: Wed Feb 1 22:20:05 2006 +0000
Add a new function RRGetRotation() which does exactly the same thing as
xf86GetRotation(), but allows for drivers to provide their own RandR
implementation. xf86GetRotation could be obsoleted by this change.
commit f4898b409376803c9a9dd8475bdd5576ff1cc59d
Author: Luc Verhaegen <libv@skynet.be>
Date: Tue Jan 31 14:49:43 2006 +0000
Further bug #5386 fixes: Fix some problems with the EDID code: Some
bitoffsets were wrong. Unknown Detailed Sections weren't handled
properly and defaulted to Detailed Timing.
commit 437b385ce4cc3ff00e14d3d39f4a2f6c8f0c67a0
Author: Luc Verhaegen <libv@skynet.be>
Date: Tue Jan 31 13:55:01 2006 +0000
Bring the cvt utility up to date with bug #5386 changes. Fix 2 issues with
the generator routine: the allocated modeline wasn't nulled and
mode->name's \0 wasn't copied over. PrintModeLine was rewritten and
HDisplay gets rounded up to character width instead of refused.
commit 8f3c69dcf17691f71bca7b0a2cd34f7788a97b8c
Author: Luc Verhaegen <libv@skynet.be>
Date: Tue Jan 31 13:04:02 2006 +0000
Accept modes with less than 25% horizontal blanking again (you can push old
gtf timing to below 25%), only stop cvt reduced blanking. Users should
be free to blow up their monitors if they so choose.
commit 701b63cf1dcd3e49602114fb1dde45a74b4e1122
Author: Donnie Berkholz <spyderous@gentoo.org>
Date: Mon Jan 30 20:04:56 2006 +0000
Update to build against Mesa trunk.
commit dd50015b05b901fe0c60717512c854389610aea2
Author: Eric Anholt <anholt@freebsd.org>
Date: Sat Jan 28 02:20:37 2006 +0000
Add libc_wrapper support for random(), which will be used in upcoming EXA
memory manager work.
commit 3d1667278ff309d7f8e61a6d330f712bae5bcd41
Author: Eric Anholt <anholt@freebsd.org>
Date: Sat Jan 28 00:37:52 2006 +0000
Remove leftover variables for cfb24 build, and finish commenting out Xglx
standalone stuff, which some versions of automake get whiny about.
commit ab01eb247f9e5d7c9995bf2d6432358cd64bf11d
Author: Alan Hourihane <alanh@fairlite.demon.co.uk>
Date: Fri Jan 27 12:27:34 2006 +0000
update pci ids
commit 261aa4403c77203f8f02b399ddd382c731dda324
Author: Alan Hourihane <alanh@fairlite.demon.co.uk>
Date: Thu Jan 26 09:04:22 2006 +0000
remove that, and will put it in a i810 driver specific Changelog
commit 94e678fd014c61d12591d7398b6591f24c3d71f1
Author: Alan Hourihane <alanh@fairlite.demon.co.uk>
Date: Thu Jan 26 08:49:19 2006 +0000
add changelog for i810 updates
commit c5e93182905332383ca3ef5db3f334cec69c8dda
Author: Donnie Berkholz <spyderous@gentoo.org>
Date: Thu Jan 26 04:32:45 2006 +0000
Really allow linking against Mesa trunk to work.
commit 0dc0f17f27f99da79c99031b41b0c0e95ef035f5
Author: Adam Jackson <ajax@nwnk.net>
Date: Thu Jan 26 04:10:43 2006 +0000
Speed up checkout and autogen by removing disused iplan2p4 and ilbm.
commit 023d2b4e3c392eed1f149dc5b13a83429cd052a3
Author: Daniel Stone <daniel@fooishbar.org>
Date: Thu Jan 26 00:23:44 2006 +0000
Add forgotten HAVE_BACKTRACE define.
commit 14fdd81614cdd6ef7e01976a43da8b6a3bf8386e
Author: Adam Jackson <ajax@nwnk.net>
Date: Wed Jan 25 23:05:26 2006 +0000
Remove xf8_32wid, it's dead code with no maintainer interest. Also remove
cfb24, since xf8_32wid was the only user.
commit 2e28f4104ddf94a8f9a70fe6b2a2a6859ffedc8f
Author: Alan Hourihane <alanh@fairlite.demon.co.uk>
Date: Tue Jan 24 22:05:33 2006 +0000
Allow current trunk to build against Mesa trunk
commit 0d9ed2624fe8fb95c57930da523351556ba11351
Author: Alan Hourihane <alanh@fairlite.demon.co.uk>
Date: Mon Jan 23 22:01:34 2006 +0000
Commit #4633 - Initial mouse pointer incorrect with EXA which also fixes
the repaint of the cursor image with randr events.
commit 9148d8700b7c5afc2644e5820c57c509378f93ce
Author: Alan Hourihane <alanh@fairlite.demon.co.uk>
Date: Mon Jan 23 13:59:14 2006 +0000
Commit slight variation of bug #5460 which is the merge of the new shadow
code from kdrive.
commit cfd3988ed906ab48ca4362256f8dbb8852d7ca0a
Author: Alan Hourihane <alanh@fairlite.demon.co.uk>
Date: Mon Jan 23 13:58:19 2006 +0000
wrap with if XORG / endif
commit f51ecc66e9ad6d2c3541b1dafa7659da5a0a3a86
Author: Alan Hourihane <alanh@fairlite.demon.co.uk>
Date: Mon Jan 23 13:54:59 2006 +0000
#include "gcstruct.h"
commit 80f45fa4dfa011c2ae7bcb34f87aafb91763f1fe
Author: Alan Hourihane <alanh@fairlite.demon.co.uk>
Date: Mon Jan 23 13:54:34 2006 +0000
add damage.h & damagestr.h to SDK headers
commit af5b3ea4b3df9e9c6dd6993c5e7238a366a3f508
Author: Alan Hourihane <alanh@fairlite.demon.co.uk>
Date: Thu Jan 19 14:51:09 2006 +0000
add randrstr.h to sdk_HEADERS
commit 03ebd37baba2f5af3ab502ff02ec14c15859dc3f
Author: Daniel Stone <daniel@fooishbar.org>
Date: Thu Jan 19 12:25:01 2006 +0000
Make error() bomb with exit code 1, not 0.
commit adce1f16e0d815e5c762407da3544a7d2eff9303
Author: Eric Anholt <anholt@freebsd.org>
Date: Thu Jan 19 00:06:57 2006 +0000
Only try to use byteswap.h on linux. Assume that everyone else (thinking of
BSDs here) has sys/endian.h, and use macros as appropriate for the
names. This should probably be in a gloabl header.
commit 1c3f8727b2349c9b988eaa744f11366322d42538
Author: Adam Jackson <ajax@nwnk.net>
Date: Wed Jan 18 19:42:56 2006 +0000
More kdrive merge, fast path fbBlt to use memcpy() when possible. Good for
-5% to 60% speedup on XGetImage, and 0% to 10% speedup on copies within
host memory. Based on work by Jaymz Julian.
commit e70b64b93024d05519014fb1b76fe26bd9f3a496
Author: Dave Airlie <airlied@linux.ie>
Date: Wed Jan 18 07:15:55 2006 +0000
Updated xgl code drop from Novell + xserver tree changes
commit b5356e0afaf2b660c8905f63d5fdcb03402b81c5
Author: Dave Airlie <airlied@linux.ie>
Date: Wed Jan 18 07:00:50 2006 +0000
typo in last change
commit 506eca5f57b960a6650c3387047a6ae8a22181e9
Author: Dave Airlie <airlied@linux.ie>
Date: Wed Jan 18 06:56:52 2006 +0000
Wrap sdk_HEADERS in if XORG as otherwise installing non-xorg servers
breaks.
commit 8ccf4f2b8fdb5e57d2ec5f2d54731fbf83fb9d8c
Author: Dave Airlie <airlied@linux.ie>
Date: Wed Jan 18 06:49:17 2006 +0000
This is a fix from David Reveman from the xserver tree, Make fbPadPixmap
work with negative stride
commit a1f9262c6acd195c0fcf5f602d5ca0c252993521
Author: Kristian Høgsberg <krh@redhat.com>
Date: Tue Jan 17 21:27:49 2006 +0000
file glxvisuals.c was initially added on branch accel_indirect_glx.
commit c2dedf4d17f8a5b1a8037fd2b4e29122ef78945a
Author: Søren Sandmann Pedersen <sandmann@daimi.au.dk>
Date: Thu Jan 12 22:14:56 2006 +0000
Thu Jan 12 17:09:18 2006 Søren Sandmann <sandmann@redhat.com>
Add new functions to enable and disable events on Map and Unmap.
Use them here to make sure Composite redirect doesn't cause Map/UnmapNotify
events that would confuse window managers.
commit 847d83ec3c90c5b298eaf19ba55251b4a30f4155
Author: Ian Romanick <idr@us.ibm.com>
Date: Thu Jan 12 00:21:59 2006 +0000
Bug #2996: libglx / libGLcore should use a dispatch table
Port all changes from the (monolithic) accelerated_indirect-0-0-1 branch to
the modular trunk. This will break the Darwin and cygwin builds. Other
than the changes to symlink-mesa.sh and the various Makefile.am files,
to code is identical to what's in the branch.
Reviewed by: airlied, krh
commit c56e9a8849ce8dd5c09732ae1860e409e7886690
Author: Daniel Stone <daniel@fooishbar.org>
Date: Tue Jan 10 03:24:53 2006 +0000
Bomb when symlink-mesa.sh continues, instead of silently failing.
commit 2949c705f11f8710301555c039bcecbe748cabd9
Author: Daniel Stone <daniel@fooishbar.org>
Date: Tue Jan 10 03:23:05 2006 +0000
Add all subdirs used to DIST_SUBDIRS, and files to EXTRA_DIST.
Attempt to build xeglmodule.c, not xglxmodule.c.
Add xf86Sbus.h to EXTRA_DIST, as _HEADERS doesn't appear to get the same
treatment as _SOURCES in terms of automatically DISTing.
commit 4fc9eb592a446ad5711bdaa82c60e9fe010fd76a
Author: Daniel Stone <daniel@fooishbar.org>
Date: Tue Jan 10 02:32:20 2006 +0000
Bomb out if symlink-mesa.sh failed.
commit 890ec849479db2510a9b4bc5e5e2f7978ca37b83
Author: Daniel Stone <daniel@fooishbar.org>
Date: Tue Jan 10 02:30:56 2006 +0000
Add xgl to DIST_SUBDIRS.
commit 53dbd00a75313ec5301ca95b2e91d5d02bdaf820
Author: Adam Jackson <ajax@nwnk.net>
Date: Sun Jan 8 23:43:54 2006 +0000
Remove remaining #ifdef DPSEXT stanzas.
commit 7fc9bc44e099f8f046bf707cb87ef7d736933f80
Author: Adam Jackson <ajax@nwnk.net>
Date: Sat Jan 7 01:29:05 2006 +0000
Compile fix, again, stupid non-clean builds
commit 9d62d1e6903ccc095f784279a699b3f40a8f0cf8
Author: Adam Jackson <ajax@nwnk.net>
Date: Sat Jan 7 00:45:17 2006 +0000
Bug #5218: Don't crash on unconfigured interfaces. (Andrei Barbu)
commit 3c58072956c28ebc3ca2eb50c1ff09823e1219d7
Author: Adam Jackson <ajax@nwnk.net>
Date: Sat Jan 7 00:33:41 2006 +0000
One more build fix.
commit 07303c1b42afd1ada98cbc11d1ba616d366017fb
Author: Adam Jackson <ajax@nwnk.net>
Date: Sat Jan 7 00:05:46 2006 +0000
This version will actually compile
commit 7f46aba35ee482e9b28ecc81d1a99d423fc88a70
Author: Adam Jackson <ajax@nwnk.net>
Date: Fri Jan 6 23:52:23 2006 +0000
Compile fix
commit 25babf2791ad42101a86ba2a0f14564328256ee2
Author: Adam Jackson <ajax@nwnk.net>
Date: Fri Jan 6 23:36:53 2006 +0000
Missed file.
commit 13c9e0c094c4e34cd1e43a7cc08b2dca39a32412
Author: Adam Jackson <ajax@nwnk.net>
Date: Fri Jan 6 23:06:15 2006 +0000
Bug #5525: Build a working Xprt. (Drew Parsons)
commit fe0c838b5d8bc8d9cf5a686bb7d3e90682d2d19a
Author: Adam Jackson <ajax@nwnk.net>
Date: Fri Jan 6 18:06:02 2006 +0000
Move drawable lock acquisition into DRIClipNotify from DRIValidateTree, so
we only take it when clipping a DRI drawable instead of on every tree
update. Note drawable lock acquisition per- screen instead of globally,
and drop it in BlockHandler if necessary.
commit 39ce5f1544029412f4060f3e89ce1d87222ef42b
Author: Adam Jackson <ajax@nwnk.net>
Date: Fri Jan 6 17:05:26 2006 +0000
Remove unused X11R4 DDX compatibility function miClipNotify.
commit 07ecb969d7eb8d4ab0bb0b8a55a5f40f3c8ec5e3
Author: Eric Anholt <anholt@freebsd.org>
Date: Wed Jan 4 03:29:15 2006 +0000
Forced commit to note that glyph privates commit was:
Obtained from: xserver tree (David Reveman)
commit b6b88d2f62d8c596171f487dd25fbdbc85d0c5a8
Author: Eric Anholt <anholt@freebsd.org>
Date: Wed Jan 4 00:05:16 2006 +0000
Correct rounding in divide-by-255 code. Obtained from xserver.
commit b9c0ae867e1b52186c26841a77745f7f5a0a76dd
Author: Eric Anholt <anholt@freebsd.org>
Date: Tue Jan 3 22:36:46 2006 +0000
Remove the manual AddFilter for convolution, which I'm pretty sure
shouldn't be necessary due to it already happening from
PictureSetDefaultFilters.
commit 601ab861b46a62b0742ffd3e937c4fab129664f0
Author: Eric Anholt <anholt@freebsd.org>
Date: Tue Jan 3 22:06:23 2006 +0000
Add glyph privates for Xgl, which uses them to implement a glyph cache. EXA
would probably also like to do this. This breaks module ABI for EXA and
XAA, and likely breaks proprietary drivers as well.
commit 1729fc882ceec392331566c95efd5968fe9e97fd
Author: Eric Anholt <anholt@freebsd.org>
Date: Sat Dec 31 08:06:00 2005 +0000
Change REGION_INIT(pScreen, &foo, NullBox, 0) to REGION_NULL(pScreen,
&foo). While it is no longer (or rather, once again not) required as of
regionstr.h r1.4, it matches the style of the rest of the xorg code.
commit c25536a7937b11a5347bfb8796d5cb6eb0445b51
Author: Eric Anholt <anholt@freebsd.org>
Date: Sat Dec 31 08:01:31 2005 +0000
Initialize the fourcc value in stack-allocated glitz_pixel_format_t
structures. Greatly reduces the number of uninitialized-value accesses
during Xgl startup according to valgrind. Allocating and filling these
in by hand on the stack seems very shady to me.
commit e6dab3d7c429a2d30d31f188c4554e870011e051
Author: Eric Anholt <anholt@freebsd.org>
Date: Fri Dec 30 12:05:47 2005 +0000
Fix the AC_TRY_RUN for sys/linker.h which had no hope due to lacking a
main() to instead use a nice AC_CHECK_HEADERS that works. Also, fix the
nearby SYSV IPC check which was lacking an argument and giving bogus
results (it's "AC_TRY_LINK(includes, main, yes, no)").
commit eef16c36ad6e90fd8eaad4d8bdbc1205bc28a66f
Author: Eric Anholt <anholt@freebsd.org>
Date: Fri Dec 30 05:44:14 2005 +0000
Add #undef BSD44SOCKETS, without which the listener socket on FreeBSD would
be created without the port number due to xtrans's define not being
used when xtrans was compiled in the X Server.
commit 7aa0ea23bc9b8df582fe06f2bc39dcfe34583c7e
Author: Eric Anholt <anholt@freebsd.org>
Date: Fri Dec 30 04:11:42 2005 +0000
Add an empty all-local target for FreeBSD make's sake, which doesn't deal
with .PHONY.
commit 49a9249239b0dd105b83a101db6e32549978f0d5
Author: Adam Jackson <ajax@nwnk.net>
Date: Thu Dec 29 21:11:41 2005 +0000
Make kdInputMachine static const, shrinks .data a bit.
commit 6d7ee4167d9daeef9b793789a70aa724c4fe6bf4
Author: Adam Jackson <ajax@nwnk.net>
Date: Thu Dec 29 20:54:08 2005 +0000
Style fix, make SCREEN_EPILOGUE two arguments instead of three.
commit b1efb3810cfea8116d76bae3ff3acfee521f4793
Author: Adam Jackson <ajax@nwnk.net>
Date: Thu Dec 29 20:42:54 2005 +0000
Missed one
commit 858b4bc14a7adc7314ce5043c7ff8ca1891dd0c9
Author: Adam Jackson <ajax@nwnk.net>
Date: Thu Dec 29 20:38:29 2005 +0000
missed changelog entry:
Enough build fixes to get {sdl,ephyr,fake} to link.
commit 54922aeadb29df0a1819afd3f616131aa56e140a
Author: Adam Jackson <ajax@nwnk.net>
Date: Thu Dec 29 20:29:26 2005 +0000
Disable building LBX by default.
commit fc69a2e729532ee062af6676fb187a89f7fffe8a
Author: Dave Airlie <airlied@linux.ie>
Date: Thu Dec 29 08:42:49 2005 +0000
Remove PowerMAX_OS define it never worked , it'll never work again,
finishes running joke of OLS2005
commit 25d3852b833bc0b61ce8313ce116251a2602b827
Author: Eric Anholt <anholt@freebsd.org>
Date: Thu Dec 29 00:44:20 2005 +0000
Undo spamming of libv's ChangeLog entry.
commit d6646307f063b938c44d6193a2e8872e178aa90f
Author: Eric Anholt <anholt@freebsd.org>
Date: Thu Dec 29 00:19:33 2005 +0000
Add necessary *CONFIG_H declarations and a force-off of XF86* extensions in
miinitext in the XGL case. Prevents mismatched structure sizes on my
_XSERVER64 machine. At this point, with the uncommitted render/ diffs,
Xglx starts up but displays badly.
commit 3664c3ebf348d07ae3fe301fb8720adf32cf6d64
Author: Luc Verhaegen <libv@skynet.be>
Date: Wed Dec 28 15:22:21 2005 +0000
Bug #5153: standalone CVT modeline generator.
- add hw/xfree86/utils/cvt/, cvt.c, cvt.man.pre and Makefile.am.
- Adjust configure.ac and hw/xfree86/utils/Makefile.am for cvt.
- Add MonPtr->reducedblanking and Option "ReducedBlanking" to the Monitor
section.
- Check for reduced blanking in xf86CheckModeForMonitor and disallow modes
with less than 25% blanking otherwise.
- Fix some warnings in hw/xfree86/common/xf86Config.c.
commit 08708f7d616a7c0a596fb71dd7acd76d45257fec
Author: Eric Anholt <anholt@freebsd.org>
Date: Wed Dec 28 11:48:14 2005 +0000
Merge from xserver: Make the existing ChangePictureFilter and
ChangePictureTransform screen hooks get called at appropriate times.
commit 31d0fdde19598ce9375cc9638ad4e2c8b5af8d9a
Author: Adam Jackson <ajax@nwnk.net>
Date: Wed Dec 28 10:46:56 2005 +0000
Remove a debugging printf
commit 64ac7401ad5022462279dff4dcfb12844c9857ae
Author: Eric Anholt <anholt@freebsd.org>
Date: Wed Dec 28 10:43:02 2005 +0000
Fix a copy'n'paste-o that would result in mis-rounding of the results of
several composite operators in A and G channels.
commit 9ceffb6b92e55f0d74d71489900d43940f14dfd9
Author: Eric Anholt <anholt@freebsd.org>
Date: Wed Dec 28 10:37:17 2005 +0000
Merge from xserver a header for shm's server internal functions, which are
called by DDXes. Desired by XGL, and should be used in other locations,
probably.
commit b1b40ed6a87f72d07825624730cca193d5a89baf
Author: Eric Anholt <anholt@freebsd.org>
Date: Wed Dec 28 10:31:46 2005 +0000
Initial commit of XGL build infrastructure and XGL code changes for
building within the xorg server tree. Requires additional, uncommitted
dix changes to successfully build, and successful running is still yet
to happen.
commit 36061c75ae42aa733cde9b3fd05e0c8280b31655
Author: Eric Anholt <anholt@freebsd.org>
Date: Wed Dec 28 10:10:59 2005 +0000
Forced commit to note repocopy from xserver CVS as of a few minutes ago.
commit 05c139d4cdfd11d39c0168d0c80ac1dbdd069b4c
Author: Adam Jackson <ajax@nwnk.net>
Date: Wed Dec 28 10:02:54 2005 +0000
Enough build fixes to get {sdl,ephyr,fake} to link.
commit aeb770f645e2d591b255ec4ab06addcb1beafa5f
Author: Dave Airlie <airlied@linux.ie>
Date: Wed Dec 28 02:43:50 2005 +0000
recommit previous changes to evdev.c
commit ce7c0c89375ec74f89ae5727998fd75fb768d280
Author: Dave Airlie <airlied@linux.ie>
Date: Wed Dec 28 01:57:11 2005 +0000
some updates for default colormap install
commit 022aa1127c7dcd133ce73dbc12a10bfba8b1ed6e
Author: Adam Jackson <ajax@nwnk.net>
Date: Wed Dec 28 01:01:06 2005 +0000
Get Xsdl closer to linking.
commit 27d79ab2bcebb634d0b69c851c72283a7514eb0c
Author: Adam Jackson <ajax@nwnk.net>
Date: Tue Dec 27 23:03:15 2005 +0000
s/XSERVER/KDRIVE/
commit 72817714a0787536ce8e8ad0d5473dea0f1c1abe
Author: Adam Jackson <ajax@nwnk.net>
Date: Tue Dec 27 23:01:27 2005 +0000
Remove Imakefiles.
commit 9dd0af6cb4e2c8976ada57a4f4ed16faae090a9d
Author: Adam Jackson <ajax@nwnk.net>
Date: Tue Dec 27 08:31:37 2005 +0000
Skeletal kdrive build system. Totall non-functional atm.
commit 7fd73d2953cf9449c15462cf4bf67639db64f997
Author: Adam Jackson <ajax@nwnk.net>
Date: Tue Dec 27 08:29:50 2005 +0000
Build fixes: XSERVER_LIBS -> KDRIVE_LIBS, config.h -> kdrive-config.h
commit 2f3ac6e5fcbd0e954a094fb6b975d7c8816c44b7
Author: Adam Jackson <ajax@nwnk.net>
Date: Tue Dec 27 08:26:03 2005 +0000
Start importing kdrive.
commit 6798fd0170f4225ce4e69148978533fcee9bdc34
Author: Adam Jackson <ajax@nwnk.net>
Date: Mon Dec 26 19:13:52 2005 +0000
Bug #4190: Add a rule for 'make relink' since automake sucks.
commit 8fc4ea8620913776a903ee2b4f22c306d5778623
Author: Adam Jackson <ajax@nwnk.net>
Date: Mon Dec 26 18:55:09 2005 +0000
Nuke unsupported NDBM routines. Shrink the hash table a bit, over
25% of the buckets were going empty.
commit ed33c7c98ad0c542e9e2dd6caa3f84879c21dd61
Author: Daniel Stone <daniel@fooishbar.org>
Date: Mon Dec 26 04:23:58 2005 +0000
Remove unused -xkbdb and -noloadxkb options. Rename -ar1 and -ar2 to
-ardelay and -arinterval, respectively. Remove XKB banner from help text.
commit 7e3cb9a09ac422179be89773f7fb14a462d25434
Author: Adam Jackson <ajax@nwnk.net>
Date: Sun Dec 25 22:25:15 2005 +0000
Remove unused layer module.
commit 9b083369ded2258cbc8ac2058e06ec8a3b171178
Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
Date: Fri Dec 23 20:11:12 2005 +0000
Change list of X server man pages in "See Also" section to list the ones
actually included and remove the ones that are no longer.
commit 5fd978b1e7bce9169f87712a4a7c2c36a68ac00a
Author: Daniel Stone <daniel@fooishbar.org>
Date: Fri Dec 23 07:40:44 2005 +0000
Make LBX configuration default to auto.
commit 5230e86b1cc841bfb35806618052aa835b7eb7e7
Author: Dave Airlie <airlied@linux.ie>
Date: Fri Dec 23 04:13:37 2005 +0000
fix up xglglx.c
commit feb735c5bb0cd391136f1c73476703dff82dc9b0
Author: Dave Airlie <airlied@linux.ie>
Date: Fri Dec 23 02:07:58 2005 +0000
Well there were a couple of snapshots later than CVS available outside of
Novell, so I've done a crazy merge to try and get them into a workable
CVS, I suspect I may have failed.. there is a pre-xgldrop-merge tag if
I did.
commit ade104ce5a016623c1ce97b0d52b531185b35baf
Author: Dave Airlie <airlied@linux.ie>
Date: Fri Dec 23 01:51:40 2005 +0000
check drawable is available
commit 7fb521e80d6e2c05e9475e74fbf80bfbe74cda95
Author: Dave Airlie <airlied@linux.ie>
Date: Fri Dec 23 01:50:04 2005 +0000
from davidr's tree update some fixes
commit c88a3145d057ab72466a3ea8b789bf419e4efc33
Author: Dave Airlie <airlied@linux.ie>
Date: Fri Dec 23 01:49:21 2005 +0000
from davidr's tree if source picture defined return
commit c59508566f11982aa3f4be383597d0e6178718c2
Author: Dave Airlie <airlied@linux.ie>
Date: Fri Dec 23 01:13:28 2005 +0000
fix glx up for newest glitz interface
commit d822bc159672e7327054e572b659ae7dde040e83
Author: Dave Airlie <airlied@linux.ie>
Date: Fri Dec 23 00:08:35 2005 +0000
make xgl code at least build against latest glitz.
commit 6e2086395d99081d8d682b90cec650a06e41fc2c
Author: Dave Airlie <airlied@linux.ie>
Date: Thu Dec 22 23:32:49 2005 +0000
fixups for newer glitz API
commit f3ae42c0fd910b7f9feb9be91ccb056bce0cd999
Author: Dave Airlie <airlied@linux.ie>
Date: Thu Dec 22 23:31:15 2005 +0000
small fix towards new glitz interface
commit 2af7e94eab6847159a3439301ecc93c62a12b1a0
Author: Eric Anholt <anholt@freebsd.org>
Date: Thu Dec 22 13:54:08 2005 +0000
Adjust the rules for auto-generating some source files, so that they work
on both GNU make and FreeBSD's make.
commit 0d7ec5c7d9b451066a079fe56bcc9722341a91ff
Author: Kevin E Martin <kem@kem.org>
Date: Wed Dec 21 02:30:08 2005 +0000
Update package version for X11R7 release.
commit b37e738d5f4e1769bdee98acca788aeeb1556bcc
Author: Adam Jackson <ajax@nwnk.net>
Date: Tue Dec 20 21:40:19 2005 +0000
Fix an fb regression on A8 pictures. (Fredrik Höglund)
commit 03d37eb03864cfc1a2f8d239d5a4c8341bf274f7
Author: Adam Jackson <ajax@nwnk.net>
Date: Tue Dec 20 21:34:21 2005 +0000
Bug #5359: Fix a segfault (Mark Kettenis)
commit 7b89b643c12fa0f7a662b3ff76e05ece53101312
Author: Adam Jackson <ajax@nwnk.net>
Date: Mon Dec 19 16:44:21 2005 +0000
Bug #5116: Refer DRI section details to dri.fd.o.
commit 3ef3add90351e3cb7b54dbcedc234bc5d3d65f1c
Author: Adam Jackson <ajax@nwnk.net>
Date: Mon Dec 19 16:34:07 2005 +0000
Stub COPYING files
commit 3566307c8d44f89622ea51169f67c79092cb56d1
Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
Date: Mon Dec 19 09:18:29 2005 +0000
Fix typos.
commit 137447c5f3c6f1914ac869297f823ae93ce428ac
Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
Date: Thu Dec 15 01:54:45 2005 +0000
Update to 2005-12-14 snapshot from pciids.sf.net
commit 2cf86fce41e3fd2ac48c5088da11e19077e42e65
Author: Kevin E Martin <kem@kem.org>
Date: Thu Dec 15 00:20:27 2005 +0000
Update package version number for final X11R7 release candidate. Update
release string to 6.99.99.904.
commit f1ba3b4f33a928a3a59538799b3863de5c87e70e
Author: Adam Jackson <ajax@nwnk.net>
Date: Wed Dec 14 20:11:16 2005 +0000
Bug #4718: Command line flag to disable ACPI.
commit cf605eb91619a8c0589a08674ffc3e018471b3fc
Author: Adam Jackson <ajax@nwnk.net>
Date: Tue Dec 13 17:35:26 2005 +0000
Build libglx correctly when not building the Xorg DDX.
commit b076dd787ff71c4b385ab4e2e4eb367f3de378f6
Author: Adam Jackson <ajax@nwnk.net>
Date: Tue Dec 13 17:34:06 2005 +0000
Spell it XINERAMA_SRCS, not PANORAMIX_SRCS.
commit 3666dbb5f3e06fa6a72def64556d64cf73141777
Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
Date: Mon Dec 12 23:33:55 2005 +0000
Remove unnecessary include of dgaproc.h that broke Solaris builds.
commit 438a5549f08ab03443d45dd46323579a2f2e4ba2
Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
Date: Mon Dec 12 03:06:18 2005 +0000
Bugzilla #4715 <https://bugs.freedesktop.org/show_bug.cgi?id=4715> Files in
xserver/xorg/Xext not included in tarball after make dist
commit 62f3ef930adc7edd49b27dd1f7b0f51bc8bc0afa
Author: Adam Jackson <ajax@nwnk.net>
Date: Fri Dec 9 18:35:21 2005 +0000
Bug #5258: Restore binary compatibility with 6.8.2's PictureRec. (Aaron
Plattner)
commit b99dea9dcf99f907a3536c0db1c39cc67931a5b1
Author: Adam Jackson <ajax@nwnk.net>
Date: Fri Dec 9 18:32:46 2005 +0000
Bug #4935: Fix includes. (Eric Anholt)
commit f4957ee94810b471110deebf03d7413399b45db3
Author: Adam Jackson <ajax@nwnk.net>
Date: Fri Dec 9 18:30:51 2005 +0000
Bug #4809: Re-fix that doesn't break distcheck. (Alan Coopersmith)
commit de22d0c2264bd6dbacbbb4160d09c7e84ad37e70
Author: Adam Jackson <ajax@nwnk.net>
Date: Fri Dec 9 15:30:05 2005 +0000
Fix a thinko so the code matches the comment
commit 6fcb049cd0d2291da5943176716d1f7bbb85fdc2
Author: Adam Jackson <ajax@nwnk.net>
Date: Fri Dec 9 06:49:39 2005 +0000
Bug #1288: Additional refactor of the driver probe logic to keep ati loaded
before atimisc.
commit 17ac5e9fec1e07bd18ae1407043c300cb4695ede
Author: Adam Jackson <ajax@nwnk.net>
Date: Fri Dec 9 05:36:41 2005 +0000
Push the fallback drivers to the end of the list so driver probe order
stays useful.
commit 80ea67e37980d07438749f1aa4dfdd7ee1086799
Author: Adam Jackson <ajax@nwnk.net>
Date: Fri Dec 9 03:59:41 2005 +0000
Bug #4361: Change driver probe logic to read the driver list from disk
instead of using a compile-time array.
commit 7fa2d11d85d43f42aa9c02f8d772c91d1b04df43
Author: Adam Jackson <ajax@nwnk.net>
Date: Fri Dec 9 03:57:41 2005 +0000
Bug #4361: Define XF86CONFIGFILE properly so config file generation works
commit 26b41ff43959a07a778bc3d6e4db8da036f09de3
Author: Kevin E Martin <kem@kem.org>
Date: Fri Dec 9 03:02:21 2005 +0000
Fix sgml docs build.
commit d6f98cbdb8fb74c504a92939d3741420eeed7110
Author: Adam Jackson <ajax@nwnk.net>
Date: Thu Dec 8 19:33:09 2005 +0000
Bug #3944: Fix 24bpp packed pixel. (Søren Sandmann Pedersen)
commit f9ccebe8c5cd674c08fe8ed860d1c456e42c937e
Author: Adam Jackson <ajax@nwnk.net>
Date: Thu Dec 8 19:27:13 2005 +0000
Bug #4928: Fix compilation for Alpha. (Stefaan DeRoeck)
commit 3a6bdf0715b994d6ecaa5b6e448695a8a8ec7d72
Author: Kevin E Martin <kem@kem.org>
Date: Thu Dec 8 19:21:12 2005 +0000
Add configure option to set the top level font dir.
commit 008c2dd5e4614e6a21123ee3a2ac9c5d3bafa97a
Author: Kevin E Martin <kem@kem.org>
Date: Thu Dec 8 17:55:19 2005 +0000
Add configure options to allow hard-coded paths to be changed.
commit 39189c2b86a4c2ab5f3f161d423eb072356668e5
Author: Kevin E Martin <kem@kem.org>
Date: Thu Dec 8 17:54:40 2005 +0000
Allow hard-coded paths to be configurable.
commit 20c0ebe7b3feb85abf9bf140b7799aafc6f59513
Author: Kevin E Martin <kem@kem.org>
Date: Wed Dec 7 16:18:02 2005 +0000
Change to use the app-defaults default dir configured in libXt.
commit 4a39354e14c3c360046b04ea0d4825832b05df05
Author: Kevin E Martin <kem@kem.org>
Date: Tue Dec 6 22:48:51 2005 +0000
Change *man_SOURCES ==> *man_PRE to fix autotools warnings.
commit 84faf8dc9747bc4f1db5ebc2f23e17cf1460e2e9
Author: Adam Jackson <ajax@nwnk.net>
Date: Tue Dec 6 16:22:47 2005 +0000
Bug #5230: Fix whitespace bugs.
commit 9439297b7bc07dcb90f0d01da09eea1bac3d42ff
Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
Date: Tue Dec 6 15:50:35 2005 +0000
Bugzilla #5219 <https://bugs.freedesktop.org/show_bug.cgi?id=5219> Make
sure all optional sources are included in EXTRA_DIST, even if they
aren't used on the platform the distballs are made on.
commit f259fd680caccb59546d7788704e46e51a9c6146
Author: Adam Jackson <ajax@nwnk.net>
Date: Sat Dec 3 22:47:47 2005 +0000
Disable the xf8_32wid logic for now, breaks distcheck
commit 26f9c4305660c2b3dc7fe8d214bcdd3c24e1b198
Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
Date: Sat Dec 3 17:04:45 2005 +0000
Bugzilla #4809 <https://bugs.freedesktop.org/show_bug.cgi?id=4809> Patch
#3908 <https://bugs.freedesktop.org/attachment.cgi?id=3908> xf8_32wid
and cfb24 only need to be built on sparc
commit 98231c6b38c98976f4ac2b9417ecfbc37a8cbe9a
Author: Kevin E Martin <kem@kem.org>
Date: Sat Dec 3 05:47:25 2005 +0000
Update package version number for X11R7 RC3 release. Update release string
to 6.99.99.903 (i.e., 7.0 RC3).
commit 7c00afd0ec94e491f1a9ef32d6543ed51ea3319d
Author: Kevin E Martin <kem@kem.org>
Date: Fri Dec 2 06:02:45 2005 +0000
Define XFree86Server only where it is required.
commit 924518605b613eb66aa569877fa9f131e6f2a2fd
Author: Kevin E Martin <kem@kem.org>
Date: Thu Dec 1 23:39:00 2005 +0000
Fix GL build when srcdir != builddir (Donnie Berkholz).
commit 14b9315379fe8c783013906616d868f93fd51c83
Author: Kevin E Martin <kem@kem.org>
Date: Thu Dec 1 22:06:49 2005 +0000
Add missing XvExtension and XvMCExtension defines.
commit df8fa21d3189e20260328b88cc8a86224a9b1ebf
Author: Kevin E Martin <kem@kem.org>
Date: Thu Dec 1 16:20:09 2005 +0000
Fix typo: xorg_bus_linuxbsdpci ==> xorg_bus_linuxpci
commit ccfaf82367c9d057fd8314ce36b47f0a8eb696b6
Author: Eric Anholt <anholt@freebsd.org>
Date: Thu Dec 1 05:04:07 2005 +0000
Bug #5160: Fix the modular build to try to use the same logic for choosing
the architecture/os-specific bus support as monolithic.
commit 9c0bd9687fe7d20f2f0793332ae0db06f035eb23
Author: Adam Jackson <ajax@nwnk.net>
Date: Wed Nov 30 22:59:22 2005 +0000
Import libdrm 2.0
commit 4ec0b623b6ab5f8a1e5af2cc3d839251acf81ce2
Author: Adam Jackson <ajax@nwnk.net>
Date: Wed Nov 30 02:36:25 2005 +0000
Bug #5093: Fix fb for non-SSE machines. (Xavier Bachelot)
commit ed826d563cba82c516fd41f6a29ee50aa1fe6c6a
Author: Adam Jackson <ajax@nwnk.net>
Date: Tue Nov 29 23:34:30 2005 +0000
Only build dlloader modules by default.
commit da5d66f2ff27b21fe5c39a4abb4f627edd707f1d
Author: Kevin E Martin <kem@kem.org>
Date: Tue Nov 29 16:39:33 2005 +0000
Fix usage of XFree86LOADER/XFree86Module/IN_MODULE and update loadable
module builds to reflect this change.
commit 51a721a6dbb42702347aad3115147e4922fc1a25
Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
Date: Mon Nov 28 22:05:09 2005 +0000
Change *mandir targets to use new *_MAN_DIR variables set by xorg-macros.m4
update to fix bug #5167 (Linux prefers *.1x man pages in man1 subdir)
commit 381931b15b15d0a2ec384b0c22864412c44f9c6e
Author: Kevin E Martin <kem@kem.org>
Date: Wed Nov 23 07:14:46 2005 +0000
Add configure option to install libxf86config.a (disabled by default).
commit 594ca0966e8fd5992ebf95170cc42e19c698fec6
Author: Eric Anholt <anholt@freebsd.org>
Date: Tue Nov 22 02:11:00 2005 +0000
Bug #5118: Use "rm -f" instead of "$(RM)", which isn't always defined.
commit 1c8c1179c0789e3e134d31a62dbb88bfdb594b26
Author: Felix Kuehling <fxkuehl@gmx.de>
Date: Mon Nov 21 04:24:07 2005 +0000
Fix Xprt library dependencies in the case that Xprint is auto-detected by
configure.
commit a1f110bda80bb3b8e4f602385ca5ccd96cf3f786
Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
Date: Sun Nov 20 23:01:02 2005 +0000
Make sure XKM_OUTPUT_DIR (used in code) ends in / (so paths don't get hosed
when appending file names) but XKB_COMPILED_DIR (used in Makefiles)
does not so install-sh -d doesn't get confused when the directory
already exists.
commit 385730d23944c24dd9af45b27f62c1161abc48b2
Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
Date: Sun Nov 20 04:15:15 2005 +0000
Add xext to list of modules xorgcfg depends on.
commit 63aa96c08a8390621b017ea498c88cf88152024b
Author: Kevin E Martin <kem@kem.org>
Date: Sat Nov 19 07:15:50 2005 +0000
Update pkgconfig files to separate library build-time dependencies from
application build-time dependencies, and update package deps to work
with separate build roots.
commit d3b6653a2892e8c929c79fe3ace19ac9d8366fc4
Author: Adam Jackson <ajax@nwnk.net>
Date: Sat Nov 19 03:53:04 2005 +0000
Bug #4824: Build XTrap support by default, matching monolith.
commit 627ac1fe1dbcbc070575da7bee9e686a7dce5262
Author: Eric Anholt <anholt@freebsd.org>
Date: Fri Nov 18 23:34:04 2005 +0000
Bug #5060: Fix non-Linux DRI on 64 bit post Linux 32/64 changes.
commit e3ec048ff2fe0ee0862472e9b147b7ce488ea898
Author: Adam Jackson <ajax@nwnk.net>
Date: Fri Nov 18 22:43:50 2005 +0000
Bug #4928: Unbreak Makefile.am for Alpha chips. (Stefan DeRoeck)
commit de95d8ee197a0bb738037195997d754a20e10254
Author: Adam Jackson <ajax@nwnk.net>
Date: Fri Nov 18 18:02:24 2005 +0000
Bug #4859: Don't segfault on bad DDC read. (Tony Houghton)
commit 21f7d03dbc347f6bf97a40671275ac75df15bd10
Author: Adam Jackson <ajax@nwnk.net>
Date: Wed Nov 16 07:28:19 2005 +0000
Fix builds when not building the Xorg DDX.
commit fb2d9df869af0c96f1488ef7cf364e01a9d28f3f
Author: Adam Jackson <ajax@nwnk.net>
Date: Tue Nov 15 00:29:23 2005 +0000
Make fb build on darwin/ppc without addition #define hacks
commit 16b315affa30e34b9bab81778978484137a5d9bb
Author: Kevin E Martin <kem@kem.org>
Date: Mon Nov 14 21:04:12 2005 +0000
Use glcontextmodes.[ch] from Mesa.
commit 0c110c80e7afbef50bb354cf1df30123ed048250
Author: Kevin E Martin <kem@kem.org>
Date: Mon Nov 14 20:18:03 2005 +0000
Add GL_CFLAGS so that GLX can find its proto headers when using separate
build dirs.
commit fc81c13e4dafb0eb818879454ee7ae3fa3dae6d0
Author: Kean Johnson <kean@armory.com>
Date: Mon Nov 14 18:49:30 2005 +0000
Dont prevent SCO platforms for using the default ZAxisMapping now that the
OS layer correctly sends z-axis events when the wheel button is used.
commit bd9fb533b31c2427d854199fa59dccd357cf874b
Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
Date: Mon Nov 14 00:01:34 2005 +0000
Default xkb-output directory needs trailing slash.
commit 267cbffa41fffff69c692911d128462f5bab2a69
Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
Date: Sun Nov 13 20:53:24 2005 +0000
Bug #5019 <https://bugs.freedesktop.org/show_bug.cgi?id=5019> xserver
installs manpages into 'man1' instead of 'man1x'
commit 3179d29b8212c197634d81fbeb8dd2e8df995735
Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
Date: Sat Nov 12 18:03:34 2005 +0000
use RGB_DB not RGB_PATH as that's what configure defines (Jürg Billeter
<j@bitron.ch>)
commit 0e7e4c7064df64c29b1a0ccd84fba1be7c748f18
Author: Kevin E Martin <kem@kem.org>
Date: Thu Nov 10 04:59:21 2005 +0000
Fix typo to enable DGA support.
EXTMODULE is required to build DGA support into extmod.
commit e4554db8f87c6a39a3087186395972000bd2085c
Author: Kean Johnson <kean@armory.com>
Date: Thu Nov 10 02:41:20 2005 +0000
Dont pass wheel mouse buttons as real buttons, map them as Z-Axis movement
on SCO and USL. Re-instate the ZAxisMapping default for the mouse
driver.
commit 1b26fe6d2092c202141a0371f47ef1cd7c66ec00
Author: Kevin E Martin <kem@kem.org>
Date: Wed Nov 9 21:28:54 2005 +0000
Update package version number for X11R7 RC2 release. Update release string
to 6.99.99.902 (i.e., 7.0 RC2).
commit f886e632b8dab1bfa0de42b9759a8284ecd9b94f
Author: Matthias Hopf <mhopf@suse.de>
Date: Wed Nov 9 17:05:41 2005 +0000
Bug #4915: ButtonMapping option which allows to define arbitrary button
mappings (including left-handed mouse etc.). Fixed incorrect usage of
non-reversed, but ZAxisMapped buttons for state detection. Nuked unused
part of reverseMap.
commit a25871ae52dd5ce094ba8c1b2021dd027d3e71bd
Author: Kevin E Martin <kem@kem.org>
Date: Wed Nov 9 01:00:46 2005 +0000
DRM 1.0.5 import
commit c9709c0a38af46368726857f7261cbeb84e53911
Author: Kevin E Martin <kem@kem.org>
Date: Tue Nov 8 22:47:57 2005 +0000
Add newly checked in files to Xorg server build.
Fix release date. Enable DGA extension by default.
commit f8430a1b8651f4b52d9d3b54694a60d929b48925
Author: Kristian Høgsberg <krh@redhat.com>
Date: Tue Nov 8 19:04:56 2005 +0000
Bug #2880, add functions for byte and word level access to pci config
space.
Fix broken utf8 again.
commit 5390c7ab05d23f64e6d9afaa558be246a6d6e1b4
Author: Kean Johnson <kean@armory.com>
Date: Tue Nov 8 06:33:30 2005 +0000
See ChangeLog entry 2005-11-07 for details.
commit f5814bf3fff5352ed6edef4c58aadf2d4593f094
Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
Date: Tue Nov 8 03:12:43 2005 +0000
Don't reference noXkbExtension when building without XKB. (Bob Terek - Sun
Microsystems)
commit e73cdba865f36ebf78c2dc4ff674b4d9bfe85013
Author: Kevin E Martin <kem@kem.org>
Date: Mon Nov 7 21:03:49 2005 +0000
Fix Xvfb to work properly in depth 15 mode. Fixes XTS5 XCloseDisplay-3
server crash.
commit 890ed0e082e048fa8daf48229b40558381bd131d
Author: Thomas Hellstrom <unichrome@shipmail.org>
Date: Sun Nov 6 16:40:59 2005 +0000
Fix a bug where a system memory pixmap got a wrong address if memcpy()
fallback was used for downloading from screen.
commit 70aedcf32a0c924fd073f5b36d20813e8323026b
Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
Date: Sat Nov 5 18:56:50 2005 +0000
Bug #4948: <https://bugs.freedesktop.org/show_bug.cgi?id=4948> Incorrect
URL in log file for Xorg CVS. Also fixed wording of statement to not
refer to monolithic CVS since modular uses the same code, so it was
appearing in modular builds too.
commit 89c661d61f1b9c70a08237476fa1f7f42c1783ab
Author: Kevin E Martin <kem@kem.org>
Date: Fri Nov 4 21:37:32 2005 +0000
Only use fbCopyAreammx if planemask is FB_ALLONES (fixes XTS5 XCopyArea
tests 22 and 23).
commit 0b150a05e6fadca7ee8240697d6cbeadea0c53b3
Author: Ian Romanick <idr@us.ibm.com>
Date: Thu Nov 3 17:12:53 2005 +0000
Whitespace change just to make sure I created the branch correctly.
commit 90cf8e339b71c2f8f2d7a362e6e1ca8078d7f4fd
Author: Kevin E Martin <kem@kem.org>
Date: Thu Nov 3 17:08:06 2005 +0000
Fix vendor string and release version reported by the servers. Enable
security, lbx and xevie extensions to give us parity with monolithic
tree.
commit f23defeef285b4a5bb58405589294bd557c9bb01
Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
Date: Thu Nov 3 16:57:01 2005 +0000
Use APP_MAN_SUFFIX for Xserver man page instead of hardcoding section 1
commit f5daec674aeb4fe6ccbc95ead8a319bbeb368d9f
Author: Kevin E Martin <kem@kem.org>
Date: Wed Nov 2 15:56:40 2005 +0000
Add support for enabling/disabling DBE (part of generic enable/disable
extension support in the server).
commit a311bfa73afa1af76f81958d23bc8e0c631d6828
Author: Kevin E Martin <kem@kem.org>
Date: Wed Nov 2 15:53:57 2005 +0000
Fix support for enabling/disabling extensions loaded from modules.
commit 462a2407d540eac831c9be4dcee8a16aa1cea6ac
Author: Kevin E Martin <kem@kem.org>
Date: Tue Nov 1 15:01:51 2005 +0000
Add xorg-server.m4 for driver dependency checking.
Update pkgcheck depedencies to work with separate build roots.
commit 56101c9d6ec3585a0a8550da4b83dd399e3bcce6
Author: Kevin E Martin <kem@kem.org>
Date: Mon Oct 31 05:45:40 2005 +0000
Fix fd leak by closing them in the ACPI code instead of just using
shutdown.
commit 7993486e80711bd6f6f5b6c2b1f2ac32bfba735b
Author: Thomas Winischhofer <thomas@winischhofer.net>
Date: Sun Oct 30 17:38:49 2005 +0000
RandR: Add a driver func to let the driver determine the physical size of a
screen size (display mode). Useful for faked widescreen modes, modes
which are scaled by the driver, etc. This really helps fixing RandR's
sometimes dumb DPI assumptions.
commit c818d3a1a5439c54fc687927a99d69712602ed5e
Author: Thomas Winischhofer <thomas@winischhofer.net>
Date: Sun Oct 30 09:27:06 2005 +0000
Add xf86RandRSetNewVirtualAndDimensions to loader symlist
commit fdbb3ea60949a12eb2f4805d16e8acc2348e39c7
Author: Thomas Winischhofer <thomas@winischhofer.net>
Date: Sat Oct 29 21:31:23 2005 +0000
Add function for drivers to change RandR's idea of the virtual screen size.
(This allows drivers to reserve a larger virtual size at start and
change it later)
commit e921eec1c6d6ce32630977bd876c529a7c694459
Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
Date: Sat Oct 29 00:12:33 2005 +0000
Make X -> Xorg symlink at install time.
commit f842c229d4c4dbd5c01364f9e99709bedfd32be6
Author: Alan Hourihane <alanh@fairlite.demon.co.uk>
Date: Fri Oct 28 16:01:17 2005 +0000
build fix on alpha
commit 7416fd61a17a70a2c27c4b1d19796955c296dc7a
Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
Date: Thu Oct 27 21:03:27 2005 +0000
Improved stack trace dump code for Solaris - try fork & exec of pstack
first so we can see the names of non-exported symbols that aren't
visible to walkcontext/dladdr1 code.
commit b588bdfe2ac3758d7188706078d79fa276a303e3
Author: Dave Airlie <airlied@linux.ie>
Date: Sat Oct 22 04:38:50 2005 +0000
programs/Xserver/GL/mesa/X/xf86glx.c: Missing initializer in xf86glx.c
spotted while debugging something else.
commit 59279da49806b032027bb54410bc2513d21e3d9e
Author: Adam Jackson <ajax@nwnk.net>
Date: Fri Oct 21 19:06:13 2005 +0000
Bug #1429: Report input device type correctly. (Stéphane VOLTZ)
commit 4a8072011895e6f472e429af7503fc07e0561144
Author: Adam Jackson <ajax@nwnk.net>
Date: Fri Oct 21 18:50:09 2005 +0000
Bug #4730: Byte-swap the pixmap ID correctly. (Neil Campbell)
commit 81e913d3106066de73792f59f3e50e2b5458c567
Author: Adam Jackson <ajax@nwnk.net>
Date: Fri Oct 21 18:23:33 2005 +0000
Bug #4840: Typo, x$xRES -> x$RES. (George Fufutos)
commit f5a58178347878e0409b592330a07867bea02bef
Author: Ian Romanick <idr@us.ibm.com>
Date: Thu Oct 20 23:24:47 2005 +0000
Make sure that the __gl*_size prototypes are seen in all the places that
they need to be seen.
commit 279cf9f79da5778b6e14ecc437379d73e3bec5b0
Author: Donnie Berkholz <spyderous@gentoo.org>
Date: Thu Oct 20 22:41:28 2005 +0000
Bug #4817 <https://bugs.freedesktop.org/show_bug.cgi?id=4817> Restore '='
to '==' in test for mmx_capable.
commit 1f43d218cc24358a0379535ed517c23011633c31
Author: Thomas Winischhofer <thomas@winischhofer.net>
Date: Thu Oct 20 21:45:40 2005 +0000
EXA: The "optimization" for using a fill operation instead of 1x1 copies
checked the destination drawable's dimensions (!) instead of the
tile's. Really....
commit 15f56b203dbc14ea59885d40fd4bed3da9e8e190
Author: Adam Jackson <ajax@nwnk.net>
Date: Thu Oct 20 18:52:51 2005 +0000
Move xf86XTrapModule.c to dixmods, guess at a build system.
commit da43c778f4a831061ad2c8b8a312b7a54c9cd79e
Author: Adam Jackson <ajax@nwnk.net>
Date: Wed Oct 19 22:45:54 2005 +0000
Bug #3224: Degrade XKB fallback message to X_WARNING.
commit 4ebd26f04b32f1b09e0759f1a83437d0b1c4d646
Author: Adam Jackson <ajax@nwnk.net>
Date: Wed Oct 19 22:36:22 2005 +0000
Bug #3196: Fix Load foo.so syntax.
commit af211a9bc1bcab0aa631558e5d6ce013095f9802
Author: Adam Jackson <ajax@nwnk.net>
Date: Wed Oct 19 22:30:09 2005 +0000
Fix PCI bus scan on ia64 E8870 chipsets.
commit 5744308e2957781449bfe6fee9b465617a88384d
Author: Kevin E Martin <kem@kem.org>
Date: Tue Oct 18 22:06:54 2005 +0000
Update package version number for RC1 release. Update release string to
6.99.99.901 (i.e., 7.0 RC1).
commit 2769c3e72c470b472dae013e256a7ee73c3e53f2
Author: Adam Jackson <ajax@nwnk.net>
Date: Tue Oct 18 19:43:48 2005 +0000
Fix distcheck by forcing Xorg to be installed before chmod/chown.
commit dd0d010e9c34278f968be486a6c5c91e021b6609
Author: Adam Jackson <ajax@nwnk.net>
Date: Tue Oct 18 19:14:08 2005 +0000
Fix parallel builds my ensuring libdmxconfig builds first.
commit 79e6ac79f983b6cbd88a868dfd2235d9cbe75e8b
Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
Date: Tue Oct 18 07:18:21 2005 +0000
Don't use $< in explicit rules since neither BSD nor Solaris make allow
that.
commit fb282ef43a1936dcdefa57f16a8363b2adaf983b
Author: Aaron Plattner <aplattner@nvidia.com>
Date: Tue Oct 18 04:03:01 2005 +0000
Add miext/damage so misym.c can export DamageDamageRegion.
commit 959db6028d232dc76396cb658aa48d3b4e605aed
Author: Aaron Plattner <aplattner@nvidia.com>
Date: Tue Oct 18 04:02:31 2005 +0000
Export DamageDamageRegion. Not bumping the ABI version since we did that
already for this release.
commit b61c828b0455ec1d4a7ffb54b5ac9b65764a458b
Author: Kevin E Martin <kem@kem.org>
Date: Tue Oct 18 02:23:58 2005 +0000
DRM 20051017 import
commit d6a40bcd4a745b5d6d1070deb696b21d128ca0fe
Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
Date: Tue Oct 18 00:32:55 2005 +0000
Change default install dir for app-default files from
$(sysconfdir)/X11/app-defaults to $(libdir)/X11/app-defaults to match
the monolith & allow localization
commit e7007f7d51c9e1d39118865fefb1716c579a70bd
Author: Adam Jackson <ajax@nwnk.net>
Date: Mon Oct 17 22:42:03 2005 +0000
More automake 1.7 braindamage: use mkdir -p, not .
commit 151ba8b67fd88a721f9f72d3019212b22f5cd3e2
Author: Adam Jackson <ajax@nwnk.net>
Date: Mon Oct 17 22:25:58 2005 +0000
Work around automake-1.7 braindamage by providing an explicit rule for
XOrgCfg.
commit eec3df1503e561aff6656e15c73b25a0bba1b06b
Author: Kristian Høgsberg <krh@redhat.com>
Date: Mon Oct 17 17:11:12 2005 +0000
Fix whitespace in AS_HELP_STRING uses, convert all help strings to use
AS_HELP_STRING.
commit 1859c62607d567aa05334df1662f7249c983f793
Author: Kevin E Martin <kem@kem.org>
Date: Mon Oct 17 07:18:59 2005 +0000
include/dix-config.h.in Add support for more extensions
Add missing files to EXTRA_DIST
commit ccfe9e7e9b49cbbf7c50fbf1a5c33178f27f79eb
Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
Date: Sun Oct 16 21:57:34 2005 +0000
Link Xprint config directories in $(C_LOCALE) list to C locale dir, not
en_US
commit a7d6a4fb321415b8aaad72760ff8a1ca3fd077f9
Author: Donnie Berkholz <spyderous@gentoo.org>
Date: Sun Oct 16 03:02:53 2005 +0000
Change '==' to portable '='.
commit c2e461c7e970830ea430de3e5f352d144e9f0239
Author: Kevin E Martin <kem@kem.org>
Date: Sat Oct 15 20:44:44 2005 +0000
Fix typo and add new Makefiles to AC_OUTPUT
Fix typos
Add xorg.conf.man to CLEANFILES
Add missing files to EXTRA_DIST
commit 34b7b57b3c80507f63a542c6adb4b5c8ed80b642
Author: Kristian Høgsberg <krh@redhat.com>
Date: Sat Oct 15 19:34:28 2005 +0000
Doh, remember to add this file.
commit 744aa34ca5228ea176cc56a7bdd48bbf5f29b0b5
Author: Eric Anholt <anholt@freebsd.org>
Date: Sat Oct 15 02:19:09 2005 +0000
Add an additional meaning to the "dirty" flag. Now, if !dirty && !area, the
pixmaps's contents are undefined, so we won't need to upload the
undefined contents in MoveIn. Use the ExaCheck* for async ops as well,
so that dirty is always tracked. While the performance impact for my ls
-lR test was not significant (though the avoiding-upload path was being
hit), it's likely to be important for the upcoming Get/PutImage
acceleration from ajax.
commit 21e7339c1eead1148eea462bc99cf8faf02c8d39
Author: Kristian Høgsberg <krh@redhat.com>
Date: Fri Oct 14 22:44:56 2005 +0000
Hook up lbx.
commit d62943c040fd3d45079c9918c57f74f993b585d4
Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
Date: Fri Oct 14 22:19:51 2005 +0000
Set default font path to match the default in the monolith so fonts are
actually found.
commit 0ee70f53ef9b05052ee079560df107d05a9c5407
Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
Date: Fri Oct 14 22:01:46 2005 +0000
Install Xorg & xorg.conf man pages even when not building docs
commit 0676a2874a62a3661a718cdf21e75ffc77197ad9
Author: Kristian Høgsberg <krh@redhat.com>
Date: Fri Oct 14 20:01:36 2005 +0000
Add sysv and sco os-support subdirs and add simple EXTRA_DIST Makefile.am
in those dirs. Remove unsupported os-support subdirs (bsdi, dgux, hurd,
nto, os2, pmax, qnx4) that have no maintainer and we don't dist.
Add Options.
commit 57abb5b171b2fe88252aeb788463e533106d66b9
Author: Alan Hourihane <alanh@fairlite.demon.co.uk>
Date: Fri Oct 14 08:29:16 2005 +0000
remove reference to non-existent agpgart.h
commit 7e3e9ed97ba25bb84286f97fe6882a37c9aa7e25
Author: Donnie Berkholz <spyderous@gentoo.org>
Date: Fri Oct 14 06:10:06 2005 +0000
Add XTRAP_LIB to XPRINT_EXTENSIONS to fix xprint build when xtrap is
enabled.
commit 821584fcd3bf83f3aaacd35e54323f71d976db44
Author: Donnie Berkholz <spyderous@gentoo.org>
Date: Fri Oct 14 05:36:39 2005 +0000
Require glproto >= 1.4.1 if building DRI with GLX. This fixes a build
failure on a number of hyperpipe functions.
commit 8df7628a2ad93edf8271f13e0b43c0fa8f766668
Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
Date: Fri Oct 14 00:41:51 2005 +0000
Remove reference to XF86config-4. Add xorgcfg(1) to See Also list.
commit b54c8154ca19edce00b9c6379d5daf94268bade1
Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
Date: Fri Oct 14 00:34:49 2005 +0000
Set substitutions needed in xorgconfig man page.
commit 1df705e465a103c94ffbb9fe97bdbe6b0aefc746
Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
Date: Thu Oct 13 20:30:38 2005 +0000
AC_SUBST VENDOR_STRING & VENDOR_RELEASE for xorgcfg's app-defaults file
commit b349b20d783252d5126451142419aae554f9b776
Author: Kristian Høgsberg <krh@redhat.com>
Date: Thu Oct 13 18:08:24 2005 +0000
Dist NOTES.
Dist helper shell scripts.
Dist XAA.HOWTO and a few more unused C files.
Dist xorgconf.cpp.
Fix DIST_EXTRA typo.
Clean yacc and lex generated files only during make maintainer-clean as we
don't expect users to have those tools installed.
commit 35a767590e481b15ae66dccc2dd91098992b2751
Author: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Date: Thu Oct 13 01:13:58 2005 +0000
Fix stupid mistake in yesterday's allocator commit, would cause exa to
consider a random available memory size
commit a16dabd05ee7ec97877f07bd40ed83c01e72fc22
Author: Eric Anholt <anholt@freebsd.org>
Date: Wed Oct 12 11:15:44 2005 +0000
Remove an RM line that appears unnecessary and was breaking the build at
xf86DefModeSet.c with FreeBSD make, where RM was undefined. While here,
make the build of xf86DefModeSet.c depend on its sources, so it'll
rebuild properly, and make it a normal CLEANFILE rather than a
DISTCLEANFILE, since the intention seems to be to build it at the
user's build time.
commit b819c8378fbf29f185332e8435a80eb35991cd1f
Author: Alan Hourihane <alanh@fairlite.demon.co.uk>
Date: Wed Oct 12 08:22:31 2005 +0000
remove unneeded line of code
commit e573b272bf2b06fb62d0306ddc966f3230ead967
Author: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Date: Wed Oct 12 07:46:36 2005 +0000
Use proper access size when reading pixel based on bpp of the source pixmap
commit 55efb41f6cc064763cbfd3ee2a1239dc46cb109a
Author: Eric Anholt <anholt@freebsd.org>
Date: Wed Oct 12 07:35:20 2005 +0000
If a window background is a 1x1 pixmap, read the value out and go to
exaFillRegionSolid rather than sending piles and piles of Copies to the
hardware.
commit fce11fdf03acc1f3f1dafb79fc8fff0251cf5473
Author: Kevin E Martin <kem@kem.org>
Date: Wed Oct 12 02:11:06 2005 +0000
Fix typo (DIST_EXTRA -> EXTRA_DIST)
commit 12994b9afbc18bfb7209f677abf673415c9ddf15
Author: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Date: Tue Oct 11 23:11:37 2005 +0000
Fix a couple of bugs in the offscreen allocator. One mostly harmless was
causing our search loop for evictable blocks to possibly skip a good
candiate, and another was the allocator would occasionally use
area->offset as if it was the base of the pixmap, while for a pixmap
that is not in available state, it is not. This caused some funny
miscalculation leading to overlapping pixmaps and accesses beyond the
end of the framebuffer. To make things cleared, I renamed save_offset
to base_offset, made sure it's the one used everywhere in the
allocator, and only align "offset" for the client at the end of
exaOffscreenAlloc().
commit 8444a1f3918b0433f89cae31673ab63628b4543d
Author: Alan Hourihane <alanh@fairlite.demon.co.uk>
Date: Tue Oct 11 21:01:04 2005 +0000
missed commit
commit 3b683b63eed603ae58a8cddab48eb81f7ba0dbdf
Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
Date: Tue Oct 11 20:12:24 2005 +0000
missed ChangeLog entry for previous commit
commit b4450f3242ab408e80bc3d6d5d1cf6765f3e5339
Author: Thomas Winischhofer <thomas@winischhofer.net>
Date: Tue Oct 11 19:03:02 2005 +0000
Add DGAReInitModes, Part 2
commit d91d18e1d6d663244288748ab86a35a6c151a535
Author: Thomas Winischhofer <thomas@winischhofer.net>
Date: Tue Oct 11 19:02:18 2005 +0000
Add DGAReInitModes in order to allow the driver to change the list of
supported DGA modes. (Part 1)
commit c1a2abadfbb862cbaac3e23d0c1317ce5473ebdd
Author: Alan Hourihane <alanh@fairlite.demon.co.uk>
Date: Tue Oct 11 14:50:47 2005 +0000
fix a typo
commit 697f64a22ac5a7742a0022605a1074351296d4f8
Author: Alan Hourihane <alanh@fairlite.demon.co.uk>
Date: Tue Oct 11 14:50:03 2005 +0000
check randrp has been initialized
commit 2828d92c6ca400b603b6a20a221d9c858732292f
Author: Alan Hourihane <alanh@fairlite.demon.co.uk>
Date: Tue Oct 11 14:45:01 2005 +0000
programs/Xserver/hw/xfree86/common/xf86RandR.c
programs/Xserver/hw/xfree86/loader/xf86sym.c Add a new function
xf86GetRotation to allow third party modules to obtain the current
rotation.
commit cad18ec979e38ef80a606f0e4abf2142b9d0d2b1
Author: Alan Hourihane <alanh@fairlite.demon.co.uk>
Date: Mon Oct 10 10:07:47 2005 +0000
don't move x or y depending on the screen size change
commit 7f72f94aa4f0655b8aab6c67eef2a5f5ac4b418f
Author: Alan Hourihane <alanh@fairlite.demon.co.uk>
Date: Mon Oct 10 09:31:49 2005 +0000
rework that again
commit 7c1d9a31a36552467d194e7d009c17dc526256c2
Author: Alan Hourihane <alanh@fairlite.demon.co.uk>
Date: Mon Oct 10 09:24:28 2005 +0000
a furthur tweak to the randr cursor position fix
commit 13f958fbe8420e406f24c01d320f29002ee860b7
Author: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Date: Mon Oct 10 05:58:41 2005 +0000
Add missing {Prepare,Finish}Access() wrappers for the tile pixmap in the
fallback case
commit d82aeb55ca3b6abe4cafa7b9c39777a5f67308e5
Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
Date: Sun Oct 9 23:47:52 2005 +0000
Bug #3254 <https://bugs.freedesktop.org/show_bug.cgi?id=3254> Make sure
screensaver & DPMS timeouts don't overflow when multiplied by
MILLI_PER_MIN. (Reported by Zachary J. Slater)
commit 29b5f846d261976f466d2c7181d6a75de670066b
Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
Date: Sun Oct 9 17:47:34 2005 +0000
Bug #4715 <https://bugs.freedesktop.org/show_bug.cgi?id=4715> Add
SecurityPolicy to EXTRA_DIST (Bill Crawford)
commit 046234b3ebdfe221de9e87d70d287f69a6f59d6e
Author: Eric Anholt <anholt@freebsd.org>
Date: Sun Oct 9 02:03:22 2005 +0000
Don't try the accelerated glyphs path for component-alpha text (which I
don't expect drivers to be able to accelerate without exa assistance).
Instead, drop back to plain old miGlyphs for a 62.5% +/- 1.5% reduction
in runtime of my ls -lR test (n=5) with component alpha. While a
reasonable approach would seem to be making a better test to see
whether the entire path would be accelerated and force migration
appropriately, my attempt at this made the situation much worse.
commit 526d1502df8db6799c9d1155b86ce79cef90872b
Author: Alan Hourihane <alanh@fairlite.demon.co.uk>
Date: Fri Oct 7 21:29:39 2005 +0000
another update to the RandR fix (thanks Aaron)
commit 5a71a5667eb5b01e0f65f9310f4af1f6c5711ab7
Author: Kristian Høgsberg <krh@redhat.com>
Date: Fri Oct 7 19:01:10 2005 +0000
Add Xprint init scrips to EXTRA_DIST.
commit 470213753b158225b44a39a872599344acbc7101
Author: Alan Hourihane <alanh@fairlite.demon.co.uk>
Date: Fri Oct 7 18:15:08 2005 +0000
update the last RandR fix
commit 348242f35aeb2869ef390241035b5f3266fc0288
Author: Alan Hourihane <alanh@fairlite.demon.co.uk>
Date: Fri Oct 7 15:39:52 2005 +0000
programs/Xserver/hw/xfree86/common/xf86RandR.c Use PointerMoved instead of
SetCursorPosition, as PointerMoved will call AdjustFrame to reposition
the window if necessary and avoid the cursor ending up offscreen.
commit 578e18d11b3d61449c1dd7eba04e1748f19c68f3
Author: Kevin E Martin <kem@kem.org>
Date: Fri Oct 7 14:27:47 2005 +0000
Add darwin to dist
Include missing docs in EXTRA_DIST
Include headers and other files in dist
commit 148df64a05d69adaac4b0f3684b846eb1da60219
Author: Kevin E Martin <kem@kem.org>
Date: Fri Oct 7 04:11:02 2005 +0000
Add README.compiled to dist tarball
commit ff258ac2783203ed2a7698894d951391d1aecebc
Author: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Date: Thu Oct 6 23:45:29 2005 +0000
Clients tend to set picture->repeat when not necessary. Most HW cannot
accelerate repeat NPOT thus triggering software fallback (this is the
case with gnome desktop for example). This adds a simple optimisation
to exa that removes "repeat" when it's obviously useless, that is, the
single picture instance covers the entire rectangle beeing used
commit e4ed43c3a6c248ba2b82b8bbf29da537a68407e6
Author: Søren Sandmann Pedersen <sandmann@daimi.au.dk>
Date: Thu Oct 6 22:25:35 2005 +0000
symlink.sh:
New files linked:
xorgconf.cpp Options
usb.3 usb_hid_usages
lynx_ppc.S
BUSmemcpy.S IODelay.S PortIO.S SlowBcopy.S
sun_inout.s
xaaTEGlyphBlt.S
xkbcomp/compiled/README
New files excluded:
All of lib/GL/apple
xlibi18n/*/*.mapfile
xxserver/xorg/configure.ac, xkb/Makefile.am:
Install README.compiled in the xkb output dir
commit 1614a31a9dad9482ae4526c194c2bae1c4993f8f
Author: Eric Anholt <anholt@freebsd.org>
Date: Thu Oct 6 21:55:41 2005 +0000
Bug #4699: Correct some memory leaks in EXA and damage related to region
handling.
commit cd9ff6aec81e04bbfe14364407ccb28df05fc063
Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
Date: Thu Oct 6 20:16:13 2005 +0000
cpp processing for Xvfb man page
commit 370b8c8f1cb1a3531d52ea3b430852a0d76b2a4c
Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
Date: Thu Oct 6 20:14:43 2005 +0000
App-defaults file not supposed to have .ad suffix when installed Fix cpp
rules to set needed flags for app-defaults file
commit 2770233069d3845c681bea8eccff22e92254487e
Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
Date: Thu Oct 6 19:59:26 2005 +0000
Don't build "ev" example on systems without <linux/input.h>
commit 460145a5d52b5325fa5e920cee3699fcf7dd9afe
Author: Kristian Høgsberg <krh@redhat.com>
Date: Thu Oct 6 19:37:39 2005 +0000
Add cpconfig.c to EXTRA_DIST.
Add CURSOR.NOTES to EXTRA_DIST.
Add extrapci.ids to EXTRA_DIST and fix xf86PciIds.h rule.
commit e63f76caa1b1342422567fdcb9f8af24792c8ca1
Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
Date: Thu Oct 6 17:55:54 2005 +0000
Sun bug #6326551: xkbSetDetectableAutoRepeat broken when using XEvIE
<http://bugs.opensolaris.org/bugdatabase/view_bug.do?bug_id=6326551>
(Derek Wang, Sun Microsystems)
commit 5f30a7b10286b4f55821acd4eb5580a8f5a3c56a
Author: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Date: Thu Oct 6 08:08:04 2005 +0000
Bug #4689: Treat DirectColor as TrueColor in Render. It fixes some crashes
with xcompmgr when using apps that use a DirectColor visual for their
windows
commit 9000c0321baf1e25e1796e6a333aad0e5a22cbe2
Author: Kevin E Martin <kem@kem.org>
Date: Thu Oct 6 04:05:30 2005 +0000
Install correct man page and add to dist
commit 9b894df44b575f768a2400d044d8c1eb6ef2ec97
Author: Kevin E Martin <kem@kem.org>
Date: Thu Oct 6 02:40:41 2005 +0000
Include dmx-config.h for modular build
Use <X11/extensions/dmxext.h> intead of "dmxext.h"
commit 30c1369bf5816ffd7bd52d9a9dbcb72500684e2f
Author: Kevin E Martin <kem@kem.org>
Date: Thu Oct 6 02:35:22 2005 +0000
Add support for building DMX config and examples programs Add missing files
to EXTRA_DIST Install Xdmx man page
commit 1f9b6dc1ccd999c90ba825cf5fbdfa29770224a6
Author: Kevin E Martin <kem@kem.org>
Date: Thu Oct 6 00:34:29 2005 +0000
Clean up generated files to pass distcheck
Clean up generated files to pass distcheck Distribute getconfig.man.pre,
not getconfig.man
commit 61cd478b545de0313271cf6852e2df770e8f5914
Author: Adam Jackson <ajax@nwnk.net>
Date: Wed Oct 5 22:39:41 2005 +0000
Bug #3652: Server-side GLX support for GLX_SGIX_swap_barrier and
GLX_SGIX_hyperpipe extensions. (Eric Kunze, SGI)
commit e891d9c078bd31447ae3e1fc7f8c15953b0bb916
Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
Date: Wed Oct 5 22:19:09 2005 +0000
Update to 2005-10-05 snapshot from pciids.sf.net (includes a couple new
Radeon id's).
commit dc6ac8e46f80157960a24a1be1fb83f22dff45a0
Author: Kristian Høgsberg <krh@redhat.com>
Date: Wed Oct 5 21:38:40 2005 +0000
Add DGA configure option and add various files that we should be dist'ing.
Simplify xf86DefModeSet.c rule a bit.
commit 8391eaa4aa1ae3744ad8c45f5d148ba362d2c9dd
Author: Adam Jackson <ajax@nwnk.net>
Date: Wed Oct 5 21:13:49 2005 +0000
Preprocess and install XOrgCfg.ad as in the monolith.
commit a9df169f108b15d312421e498675cd2e48206660
Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
Date: Wed Oct 5 17:27:58 2005 +0000
Add missing $(DESTDIR) to custom install target
commit a6cbe0776fcc8fb19a2bf2ecef41559eed6e5cef
Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
Date: Wed Oct 5 16:39:09 2005 +0000
Fix the rest of the XFree86 DDX options that require an argument to say so
instead of reporting "unrecognized option" when the argument is
missing. Also give correct error instead of "unrecognized option" for
options only available to root.
commit 8c524f9966d2a167ea71dd81e235140e0db31471
Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
Date: Wed Oct 5 15:33:40 2005 +0000
Xdmx & Xprint also need xau & xdmcp module dependencies
commit 9f3ad65251832631630f7e587b409b750a144bd3
Author: Luc Verhaegen <libv@skynet.be>
Date: Wed Oct 5 07:27:52 2005 +0000
Fix lnx_pci.c's xf86GetOSOffsetFromPCI return value. Clears up the resource
ranges awkwardness and the "INVALID MEM ALLOCATION" warning.
commit da989e988cc96c0ec4f07fceb4c36b30c2e37f4a
Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
Date: Wed Oct 5 02:18:10 2005 +0000
Xnest depends on xdmcp & xau modules too
commit 9e8b5f3d478ca18a9ff9c26745de77c91a5d36d9
Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
Date: Wed Oct 5 01:38:50 2005 +0000
Make Xorg -config stop lying to people and claiming it doesn't exist when
you fail to specify a file name. Also, include it in the list of
available options for non-root users when listing all available flags.
commit 34a8411ede185553f1387ee0bf534cf77b0fc004
Author: Adam Jackson <ajax@nwnk.net>
Date: Wed Oct 5 00:55:08 2005 +0000
Bug #4038: Unbreak the SYSVIPC check for cross builds. (Detlef Vollman)
commit f47f00ab747563678c8625de5e5b2a588660064e
Author: Eric Anholt <anholt@freebsd.org>
Date: Tue Oct 4 11:24:09 2005 +0000
Mark the temporary pixmap dirty if UploadToScreen succeeds. Failure to do
so resulted in a solid black glyph if the font rendering actually
resulted in a fallback (subpixel AA, for example) and the temporary got
migrated after 10 or so glyphs.
commit 89a1a91b88b94b341075bc208941337ce11465b7
Author: Aaron Plattner <aplattner@nvidia.com>
Date: Tue Oct 4 07:42:21 2005 +0000
Add miext/cw to the module loader include path so that misym.c can export
miDisableCompositeWrapper.
commit 43625a47063c246e7bf9d687caded0b7e2ea0dc6
Author: Aaron Plattner <aplattner@nvidia.com>
Date: Tue Oct 4 07:31:53 2005 +0000
Bump the video driver module ABI minor version to 8 so modules statically
linked against miDisableCompositeWrapper won't load on older servers.
#include "cw.h" instead of #include "cw/cw.h"
commit ca57db6fc1e6100c47ad935d626fdd490ed6116e
Author: Aaron Plattner <aplattner@nvidia.com>
Date: Tue Oct 4 04:30:33 2005 +0000
Export miDisableCompositeWrapper.
commit b2e451b93c20efc49a6cc565239432b2c705fe37
Author: Eric Anholt <anholt@freebsd.org>
Date: Tue Oct 4 03:44:14 2005 +0000
Correct the test for whether projective transform is necessary. Also, use
"affine" to describe the variable (universally) on suggestion from
vektor. Corrects a rendercheck failure.
commit cdded97a0ad717f4f9120b37d2687fa661696c9b
Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
Date: Tue Oct 4 00:45:42 2005 +0000
Add #include <xorg-config.h> for modular build
commit 4ae4fc7d51aeb0f27bed52f7e6a346745f3ea453
Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
Date: Tue Oct 4 00:43:16 2005 +0000
Add gtf to xserver/xorg/hw/xfree86/utils
commit d51962378ef6371456e034d6d7f6780e05bc1207
Author: Adam Jackson <ajax@nwnk.net>
Date: Mon Oct 3 19:31:50 2005 +0000
Bug #3781: Only use fbCopyAreammx when alu == GXcopy. Originally Gentoo bug
#96053, patch by bartron@gmx.net.
commit 6d4b350dee9495e54e6e5492815885f1d8455ac9
Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
Date: Mon Oct 3 16:46:14 2005 +0000
Bug #3815 <https://bugs.freedesktop.org/show_bug.cgi?id=3815> Patch #3463
<https://bugs.freedesktop.org/attachment.cgi?id=3463> GNU/kFreeBSD
Xserver support (Robert Millan)
commit 22b4200b01310e7b4743ef0b3541c3053a2d8279
Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
Date: Mon Oct 3 15:41:10 2005 +0000
Whoops, need to be in DIST_SUBDIRS too.
commit 14a2bd33307fd937804a9fbb03787ec30858a05c
Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
Date: Mon Oct 3 15:37:57 2005 +0000
Add missing ] (Dawid Gajownik)
Add getconfig (Dawid Gajownik)
commit 84141fc299b03b5552be093f9b698a85bc670d65
Author: Eric Anholt <anholt@freebsd.org>
Date: Mon Oct 3 11:43:55 2005 +0000
Merge r1.36 of fbcompose.c from xserver CVS: Special case projective
transforms so we can avoid doing the expensive
64-bit math. Unroll the bilinear interpolation loops for an extra boost. I
tested this with the up/downscaling cairo-benchmarks with Xvfb and saw
a 12% +/- 4% decrease in time taken to run them.
commit c024262eae4e00567ccb66a59b4d572621233cbc
Author: Eric Anholt <anholt@freebsd.org>
Date: Mon Oct 3 10:20:29 2005 +0000
Merge r1.2 of fbedge.c from xserver CVS: Optimize spans where the same
value is being added to multiple pixels. This improves the speed of
rendering wide trapezoids. I tested this with a small set of xlibs
cairo-benchmarks with Xvfb and saw a 4% decrease in time taken to run
them.
commit a7e3c6fa8ceb6a3a423377aa32ab0da5a6ab9286
Author: Adam Jackson <ajax@nwnk.net>
Date: Mon Oct 3 06:31:48 2005 +0000
Real configure check for execinfo.h (Yuri Vasilevski)
commit e3d2a7d57bc57453d66aa63ca7fe4d910b64737c
Author: Adam Jackson <ajax@nwnk.net>
Date: Mon Oct 3 06:29:14 2005 +0000
Bug #4393: uClibc lies and defines __GLIBC__ even though it's not source
compatible with glibc, so the backtrace support check fails. Work
around this by wrapping the code in a configure check for execinfo.h,
and emulate detection for the monolith. (Yuri Vasilevski)
commit 5037d3441d65f1fb6493c3b55137ef1b5eddd6b0
Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
Date: Sun Oct 2 22:17:38 2005 +0000
Bug #1465 <https://bugs.freedesktop.org/show_bug.cgi?id=1465>
/etc/init.d/Xprint should use PROJECTROOT from build (Grzegorz
D?browski)
commit b05e78dd40e1fe915096362f32c3af8aee0ed36a
Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
Date: Sun Oct 2 19:30:57 2005 +0000
Fix typo in MAN_SRCS (Dawid Gajownik)
commit 8814896da83b19be01beedd0b2b3380298778328
Author: Eric Anholt <anholt@freebsd.org>
Date: Sun Oct 2 08:53:18 2005 +0000
Fix include path for commit of bug #4616.
commit ecaa46380ed0a920186407b9294c5c60f75f1a13
Author: Eric Anholt <anholt@freebsd.org>
Date: Sun Oct 2 08:28:27 2005 +0000
Bugzilla #4616:
- Merge various fb/ bits of COMPOSITE support from xserver, which weren't
necessary before due to cw hiding the issues. Fixes offset calculations
for a number of operations, and may pull some fixes that cairo has
wanted for XAA as well.
- Add a new call, miDisableCompositeWrapper(), which a DDX can call to keep
cw from getting initialized from the damage code. While it would be
cleaner to have each DDX initialize it if it needs it, we don't have
control over all of them (e.g. nvidia).
- Use the miDisableCompositeWrapper() to keep cw from getting set up for
screens using EXA, because EXA is already aware of composite. Avoiding
cw improved performance 0-35% on operations tested by ajax in x11perf.
commit 2c82429f8957ed0268c0e4e4fe5aed9093f33960
Author: Ian Romanick <idr@us.ibm.com>
Date: Sat Oct 1 22:25:13 2005 +0000
Refactors __glXImageSize and __glXImage3DSize into a single function. It
replaces all calls to the old functions with calls to __glXImageSize
with the new parameter list.
I have also added 'target' as a parameter. This is a stepping stone to the
code in patch #2410. Basically, if the texture target is one of
GL_PROXY_*, the image size is always zero. This gathers all the checks
for that into a single place. I have *not* modified the existing
callers to take this into account. They still do their own checks for
GL_PROXY_*. However, when the generated versions of those functions are
added to the tree, they *will* rely on that.
The code growth is mainly due to the new 40 line comment before
__glXImageSize.
I have tested this with a few of the texture using demos and tests from
Mesa, including tunnel, texdown, and drawpix.
Reviewed by: Adam Jackson, Eric Anholt, and Brian Paul.
commit e27b3e4ea1ddf9b2e9c2d63a0e60400b523a8a94
Author: Ian Romanick <idr@us.ibm.com>
Date: Sat Oct 1 22:19:04 2005 +0000
Remove some more incorrect prototypes for the __gl*_size functions.
commit e270e6394b623b48d416feeef0c3856f2e303c8d
Author: Matthieu Herrb <matthieu.herrb@laas.fr>
Date: Sat Oct 1 17:53:38 2005 +0000
Bug #3822: out of bound reads in fbbltone and fbblt (Mark Kettenis, Thierry
Deval).
commit 54b2a14f0fa4397f3e9ae75dd63d5cacfdd778eb
Author: Matthieu Herrb <matthieu.herrb@laas.fr>
Date: Sat Oct 1 17:30:58 2005 +0000
Bug #3411: fix handling of keyboard Autorepeat rate in xorg.conf.
commit a07dd03748c8fa2633e294ee4d9ab38265970e5e
Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
Date: Sat Oct 1 07:17:55 2005 +0000
Add hw/xfree86/getconfig
commit abc6aa50fb52fa4fa9b9436dbc3a70f86e62dc27
Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
Date: Sat Oct 1 06:27:12 2005 +0000
Oops - fix build/install of fbdevhw.man
commit 13e0db19d8c0b1df636f218bcbfbb2c54fa7576f
Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
Date: Sat Oct 1 06:19:02 2005 +0000
Adding more doc files & fbdevhw man page
commit b5ce065a5e91e2ad3213ea8c711cfe7ed9060c16
Author: Thomas Winischhofer <thomas@winischhofer.net>
Date: Fri Sep 30 08:54:44 2005 +0000
RandR: Fix failure handling (Closes #4635; Thomas Winischhofer)
commit 4608a2b654be84b2e345bcada63422d18c74a06e
Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
Date: Fri Sep 30 02:37:57 2005 +0000
Man page processing/installation and other doc file updates
commit aa74468aa59b95424cd0000179b8985b267d639b
Author: Adam Jackson <ajax@nwnk.net>
Date: Fri Sep 30 02:03:45 2005 +0000
sparse cleanups. s/0/NULL/ and mark a few things static.
commit c65fde5343719d3e9ebc76cc371c6f5f7948de8c
Author: Søren Sandmann Pedersen <sandmann@daimi.au.dk>
Date: Wed Sep 28 20:38:42 2005 +0000
Make the server distcheck:
- Fix up the XpConfig directory to remove the stuff it installs
- Add a few files to CLEANFILES here and there
commit 58abce3f90504dd48838a2f7ae7bb5db6a6cff70
Author: Eric Anholt <anholt@freebsd.org>
Date: Wed Sep 28 20:01:37 2005 +0000
- Use the dirty flag (which should be set correctly all the time,
particularly thanks to Prepare/FinishAccess) to avoid DFS/memcpy on
pixmap move-out if it's unnecessary. This was disabled in KAA because
cache misuse on ATI made me guess that this code was wrong.
- Unwrap Glyphs on closescreen.
commit f53404bdbba23fd46420564565ab815f7c20b101
Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
Date: Wed Sep 28 16:55:25 2005 +0000
Add kbd_mode build system
commit 940158a6f2e98069a47293d713df674e16ad8a11
Author: Ian Romanick <idr@us.ibm.com>
Date: Wed Sep 28 03:37:22 2005 +0000
Replace all uses of __glEvalComputeK (and the doubly redundant
EvalComputeK) with calls to one of __glMap[12][df]_size. This was
tested with progs/samples/eval (from Mesa).
commit 806d74bc0640f4f3dcc034b36a36aea289b01685
Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
Date: Wed Sep 28 01:57:47 2005 +0000
Add __SVR4 #ifdefs to work in non-Imake builds.
commit 88957862b812b3e1e19d5e11365a22dc249cf4d2
Author: Kevin E Martin <kem@kem.org>
Date: Tue Sep 27 23:28:46 2005 +0000
Fix distcheck build and install errors.
commit 003655c02ad3a031031bb4ac859966a513f63e10
Author: Søren Sandmann Pedersen <sandmann@daimi.au.dk>
Date: Tue Sep 27 18:36:14 2005 +0000
Make XpConfig build system call mkfont{scale,dir}
commit 156b2cf3f76ae53cc37b6f5910b446c776ccc9ba
Author: Søren Sandmann Pedersen <sandmann@daimi.au.dk>
Date: Tue Sep 27 17:49:35 2005 +0000
Add forgotten Makefile.am
commit f3d0cb4a5722e0512bbdcd179215532795cba38f
Author: Søren Sandmann Pedersen <sandmann@daimi.au.dk>
Date: Tue Sep 27 16:15:55 2005 +0000
Get XpConfig build system in pretty much working state
commit 1c2e8b1ecc8b7b8c8562461eed7892ff22d17e71
Author: Kevin E Martin <kem@kem.org>
Date: Tue Sep 27 15:11:56 2005 +0000
Fix make dist to include only sgml files.
commit ca64aab609c3585234410cd8d908f8e1efe5c788
Author: Kevin E Martin <kem@kem.org>
Date: Tue Sep 27 14:09:31 2005 +0000
Add build system for building docs and fix setuid issues.
Add build system for sgml docs.
commit 1a4e30d508e62ab304722c3525748ff0e3c2899d
Author: Kevin E Martin <kem@kem.org>
Date: Tue Sep 27 13:47:26 2005 +0000
Include xorg-config.h so the generated file will also include it.
commit 30ff9e26196bdba8435e0dcdb96864e81c8cb136
Author: Ian Romanick <idr@us.ibm.com>
Date: Tue Sep 27 00:04:40 2005 +0000
Fix some problems that caused incorrectly annotated prototypes for
__gl*_size functions to be used. The result was that, on x86, the code
would be compiled with FASTCALL semantics, but the callers would not.
This should fix GLX protocol errors that people are seeing. There
doesn't appear to be a bugzilla associated with this problem.
commit 6c5c54b9a2872f1bb7de36a8d2d4efcef70b14c6
Author: Søren Sandmann Pedersen <sandmann@daimi.au.dk>
Date: Mon Sep 26 23:07:44 2005 +0000
Various small fixups to get XpConfig to 'build'
commit 604f7c64efb57a48ec667c2ed62d3b4bad0c302b
Author: Søren Sandmann Pedersen <sandmann@daimi.au.dk>
Date: Mon Sep 26 22:45:43 2005 +0000
Check in skeleton Makefile.am's for the rest of XpConfig
commit 8907195d784ff2c72a00b64edab6a8ac3b31dec5
Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
Date: Mon Sep 26 20:58:26 2005 +0000
Take care of more files from monolith's Xserver/hw/xfree86/etc dir:
hw/xfree86/utils/ioport/Makefile.am
Add ioport and pcitweak utils from monolith hw/xfree86/etc dir.
Generate xf86DefModeSet.c from vesamodes & extramodes
Add apSolaris.shar to EXTRA_DIST
commit 9abccb5e65628c938c6f01b685ab8fbffae7bc3b
Author: Søren Sandmann Pedersen <sandmann@daimi.au.dk>
Date: Mon Sep 26 19:33:06 2005 +0000
Add initial build system for XpConfig
commit 0531c4be2f1a30082cfec5e411ab34d17978d66e
Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
Date: Mon Sep 26 02:41:38 2005 +0000
alanc@alf:/export/alanc/X.org/head/cvs-rw/xc [7:40pm - 628] head -14
ChangeLog
include xorg-config.h for modular build
Adjust XF86CONFIG defines for modular build
Fixes for modular build:
- include modular server config headers
- change default XCONFIGFILE to xorg.conf
- define XKB_RULES_DIR if not defined by Imake
commit 256fa24945bcaa6e5a68a48c1b757f8084e88a38
Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
Date: Sun Sep 25 17:48:09 2005 +0000
Add SecurityPolicy file for XCSECURITY extension.
Add README to EXTRA_DIST
commit 54639964cc344f1086196729fde37515f11e7972
Author: Bogdan Diaconescu <b_diaconescu@yahoo.com>
Date: Sat Sep 24 21:56:00 2005 +0000
Changed the license to a X/MIT one
commit 3192f400c72b3b606fcc1798d577737502897b43
Author: Adam Jackson <ajax@nwnk.net>
Date: Sat Sep 24 18:45:45 2005 +0000
Disable the {Open,Close}FullScreen DRI protocol. Remove empty FullScreen
stubs from drivers, comment the non-empty ones.
commit a5477ae7ac9a56c1a586950db1dee6661bff149d
Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
Date: Sat Sep 24 02:40:51 2005 +0000
Add scanpci, xorgcfg, & xorgconfig utilities.
commit 2ba865b3f57340fd1d75f7614c17f615cc127b89
Author: Søren Sandmann Pedersen <sandmann@daimi.au.dk>
Date: Fri Sep 23 23:04:04 2005 +0000
Fri Sep 23 19:00:06 2005 Søren Sandmann <sandmann@redhat.com>
Apply patch from Ronald Wahl to make sure that the stack pointer is not
modified at points where we access external variables. (Bug 4269).
commit 7554e1bf29e5aef8e76f88bac2994ea45a924f2b
Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
Date: Fri Sep 23 00:27:07 2005 +0000
Sun bug #6321613
<http://bugs.opensolaris.org/bugdatabase/view_bug.do?bug_id=6321613>
xorgcfg dumps core when it reads a configuration file that has a
Monitor Section, but does not have a "VendorName" entry inside it.
(Henry Zhao, Sun Microsystems)
commit 99793543c0fcfd4d699549fcc2bf0ed12aed6a19
Author: Alan Hourihane <alanh@fairlite.demon.co.uk>
Date: Thu Sep 22 12:40:41 2005 +0000
put back some agp related allocation messages
commit 02566dff4abbda6888f719727c169b966617a83d
Author: Alan Hourihane <alanh@fairlite.demon.co.uk>
Date: Thu Sep 22 12:33:36 2005 +0000
fix typo
commit 56e7766c775385b0c6e09e6a65a1c8e10dba786e
Author: Eric Anholt <anholt@freebsd.org>
Date: Wed Sep 21 22:26:07 2005 +0000
Bug #4541: Fix text drawing in the case where a list contains no
non-zero-sized glyphs. Several variables weren't updated, resulting in
rendering simply stopping when this case was hit. (Anders Kaseorg)
commit 32497ff479d0c34c05eb5acfcd5f7e186bac3227
Author: Kristian Høgsberg <krh@redhat.com>
Date: Wed Sep 21 18:14:32 2005 +0000
Accept --with-xkb-output argument to specify output dir for compiled xkb
keymaps. Define XKM_OUTPUT_DIR and XKB_BIN_DIRECTORY.
Add XKM_OUTPUT_DIR and XKB_BIN_DIRECTORY.
Add XKB_CFLAGS.
commit 361a9eb953aaa38f8ebc057185de29e50f9eef26
Author: Eric Anholt <anholt@freebsd.org>
Date: Wed Sep 21 10:27:53 2005 +0000
- Change migration-in rule slightly: previously, if your score was less
than the max, it was bumped, and then if you were above the threshhold
you got moved in. Instead, do the above-threshhold check separate from
score starting out less than max. While this will likely make thrashing
cases worse, I hope it will fix some issues with long term performance
(think of an xcompmgr with a backbuffer it's doing only accelerated
operations to. If some new pixmap comes in and bumps it out, even once,
it will never get a chance to re-migrate because its score will be
maxed). Change migration-out to be the same way for symmetry, though it
shouldn't ever affect anything.
- Fix a lot of debugging output, both in terms of printing quality, and
completeness. The fallback debugging covers a lot more now, pointing
out new areas for improvement. Debugging toggles are now centralized in
exaPriv.h.
commit 6a29c4cec156a135d1d9cdb65995f7a84de7cb56
Author: Eric Anholt <anholt@freebsd.org>
Date: Wed Sep 21 07:43:01 2005 +0000
Add support for hardware accelerating tiled background painting. One
example of this is the root weave, which paints slightly slower on SiS
now in my testing. However, according to keithp some apps use this
feature for a sort of cheap backing store, which this could help with
significantly. While I haven't done much performance testing with it,
it will at least rule out one possible source of terrible performance.
commit 1115ff4c008dea6d6cafcb39e4ce6d0b3ed4fcc0
Author: Adam Jackson <ajax@nwnk.net>
Date: Wed Sep 21 00:38:05 2005 +0000
Bug #4487: Add the bsd subdir to DIST_SUBDIRS. (Joshua Baergen)
commit 00bd8968b264c1f69487dd99c212e0ce889b11db
Author: Adam Jackson <ajax@nwnk.net>
Date: Wed Sep 21 00:24:10 2005 +0000
Bug #4257: Move cfbcmap.c to cfb_common_sources.
commit b7e723ed6f23cc8d85f1f1eced9d8ccbc2a6b38c
Author: Adam Jackson <ajax@nwnk.net>
Date: Tue Sep 20 23:32:21 2005 +0000
Missing backslash
commit 15b2f94de5e2cc7e4df8d897d562dffeda31c82c
Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
Date: Tue Sep 20 18:26:24 2005 +0000
Update CVS project tag & notice about pci.ids license in output .h.
Update to match recent changes to pci.ids, extrapci.ids, & pciid2c.pl for
people building on systems without perl.
commit 7d0f47c43c5c177cae0f375ceaeef892e4c9663a
Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
Date: Tue Sep 20 15:50:31 2005 +0000
Add --disable-install-setuid option so you can build as non-root and
chown/chmod later. Also disable by default on platforms that don't need
setuid root X servers (Darwin & SPARC's, according to
InstallXserverSetUID settings in the old Imake config files).
commit b623c60745ca486667657fa39ad517d1f7a72794
Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
Date: Mon Sep 19 22:44:49 2005 +0000
Linux/Alpha support (Stefaan De Roeck)
commit bd906c6bb803b286c39eca80e437a21c14e808a3
Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
Date: Mon Sep 19 18:54:05 2005 +0000
Update to latest version from pciids.sf.net
Sync with updates to pci.ids & PCI id list in nv driver
commit 535cd292c809314efe4730a27b0271adfa842775
Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
Date: Mon Sep 19 18:38:26 2005 +0000
#include "xf86Axp.h" -> "shared/xf86Axp.h" for modular build. (Stefaan De
Roeck)
commit a1bcf25a1f819768672ac837cb0a3d0c66937656
Author: Eric Anholt <anholt@freebsd.org>
Date: Sun Sep 18 02:32:23 2005 +0000
Break EXA ABI while we still can. Add coordinates to the UploadToScreen
hook so we can upload a subset of a pixmap, and convert the current
drivers to respect that. Use this support to directly UploadToScreen in
exaGlyphs, providing a 47.4% +/-2.4% decrease in wall time for ls -lR
programs/Xserver in an antialiased gnome-terminal on an M6 (n=3, caches
hot). I would have bumped major version, only I can't tell what the
EXA_VERSION_* is supposed to be doing as opposed to the module version.
commit 074913c8a9c1f66c8752387db2c81ad669e91878
Author: Eric Anholt <anholt@freebsd.org>
Date: Sat Sep 17 20:02:02 2005 +0000
- Don't try to upload 0 byte-per-pixel (PICT_a1) data using
RADEONHostDataBlit.
- Disable the shortcut for switching from 3d to 3d in radeon_exa.c. It
appears that we do need the cache flush here, thought it's not clear
why. Disable the 2d to 2d shortcut while here, since I'm unsure of what
we're doing. Exposed by the following bit:
- Bug #4485: Add a new routine, exaGlyphs, to handle font drawing. Glyphs
were being accumulated in from non-migratable scratch pixmaps, causing
the destination pixmap to move towards screen but the migration
necessary for source never to happen, leading to abysmal performance.
Instead, copy the scratch glyph data into a real pixmap first, then
composite from that into the destination, allowing for migration. time
ls -lR from programs/Xserver showed 26.9% (+/- 6.3%) decrease in wall
time (n=3).
- Create exaDrawableUse* wrapping exaPixmapUse*, but which are aware of
windows needing backing store. Makes migration code prettier, and
ensures that composited windows will be migrated as normal when we turn
off cw for EXA. (issue brought up by keithp)
commit be2bdab4339e493bb0ac3d0e36508b7aa1cd6e92
Author: Eric Anholt <anholt@freebsd.org>
Date: Thu Sep 15 06:46:05 2005 +0000
Bug #3990: Require glproto in the cases that it's necessary (DRI or DMX
with GLX). (spyderous)
commit ef7eef0f68af6bfbb4ee56115ac2f3c1b7425755
Author: Eric Anholt <anholt@freebsd.org>
Date: Thu Sep 15 05:55:21 2005 +0000
Bug #4046: Install the X.Org server setuid root. (David Schleef)
commit 88d7eb1f7ed6afc85c07797838714f2601356018
Author: Eric Anholt <anholt@freebsd.org>
Date: Thu Sep 15 05:06:54 2005 +0000
Bug #3889: Create the log dir on install, and allow configuring
specifically that directory. Failure to have the directory keeps the
xorg server from starting.
commit 25a0ecdc1868f4b53225b92e8ccd222814e2da2a
Author: Eric Anholt <anholt@freebsd.org>
Date: Thu Sep 15 04:07:19 2005 +0000
Don't put a version number on the module filename.
commit 0888ad3874414e32535fecdb717ee7ab86f9d4cc
Author: Eric Anholt <anholt@freebsd.org>
Date: Wed Sep 14 07:49:22 2005 +0000
Build xf8_32bpp, which is wanted by the mga driver, and export elf.h, which
is wanted by the rendition driver.
commit dfb5da93bc16b2fd2b00e939dbe101a04bdeab4f
Author: Eric Anholt <anholt@freebsd.org>
Date: Tue Sep 13 20:59:05 2005 +0000
Turn on DRI by default on Linux, NetBSD, FreeBSD, and fix the build of the
module for FreeBSD by setting some missing defines (XFree86Module,
IN_MODULE) in the dri directory. Note that those missing defines should
be somewhere generic, since there are other consumers of them, but I
haven't figured out where.
commit 12fbcfefe672ec226bdbc7597bf2fd2cb0ee1e19
Author: Eric Anholt <anholt@freebsd.org>
Date: Tue Sep 13 18:37:35 2005 +0000
Add some initial BSD support for the xorg server. Incomplete on NetBSD,
OpenBSD, and non-i386/amd64 FreeBSD for sure. Plus I haven't actually
run it yet.
commit 51eb6c83a3b2721703ca50758853bbf9f99fc4d2
Author: Søren Sandmann Pedersen <sandmann@daimi.au.dk>
Date: Tue Sep 13 15:28:29 2005 +0000
Tue Sep 13 11:27:05 2005 S%Gï¿¿%@ren Sandmann <sandmann@redhat.com>
* programs/Xserver/miext/shadow/shadow.c (shadowDamageBox): Add
missing REGION_UNINIT.
commit 133edff1b499b2c794fcc9a1860c1b5526b58869
Author: Eric Anholt <anholt@freebsd.org>
Date: Tue Sep 13 05:44:47 2005 +0000
Don't define POSIX_SOURCE on any BSDs, since it breaks things.
Define NO_SYS_HEADERS, as the monolithic build does. Helps FreeBSD.
Don't include validate.c in the library, since it seems to be a userland
test program.
commit c3d6799cee7ff8411b3a05a7ab7e2a9e80c95059
Author: Daniel Stone <daniel@fooishbar.org>
Date: Tue Sep 13 01:33:19 2005 +0000
Bug #594: CAN-2005-2495: Fix exploitable integer overflow in pixmap
creation, where we could create a far smaller pixmap than we thought,
allowing changes to arbitrary chunks of memory. (Søren Sandmann
Pedersen)
commit b290884719e18646326f0c2412c2494a07fe3cfd
Author: Adam Jackson <ajax@nwnk.net>
Date: Tue Sep 13 00:44:52 2005 +0000
Bug #3284: Make the DRI lock reference count per-screen.
commit 846f797f37c1ae57a8dad981113b1139359d8c94
Author: Daniel Stone <daniel@fooishbar.org>
Date: Mon Sep 12 08:24:48 2005 +0000
Add missing fontsproto and fontenc to REQUIRED_MODULES.
commit 5b218617fa8ba52bf65aef35da39e06c662495e6
Author: Daniel Stone <daniel@fooishbar.org>
Date: Mon Sep 12 07:53:16 2005 +0000
Add missing resourceproto to REQUIRED_MODULES.
commit ade158d238475ce923fbc5c49275c78cf3864223
Author: Daniel Stone <daniel@fooishbar.org>
Date: Mon Sep 12 07:07:59 2005 +0000
Define WITH_VGAHW, since we always build it; add to Xorg headers.
commit 34dc481a16c0c1cbd69a9ec7172331b59b85e9a7
Author: Daniel Stone <daniel@fooishbar.org>
Date: Mon Sep 12 07:02:46 2005 +0000
Put DMX AC_CONDITIONALS at the top level, since they must always be called.
commit b0f6fe1f38b448b5f1a280e86b01353865866c70
Author: Eric Anholt <anholt@freebsd.org>
Date: Sun Sep 11 21:38:41 2005 +0000
Add some optional (disabled) fallback debugging code to the async code, for
better tracking of when we're hitting software.
commit 1c003ccf5d68baaae6fafdc75eff964f2a62fc35
Author: Eric Anholt <anholt@freebsd.org>
Date: Sun Sep 11 19:08:10 2005 +0000
Add a pair of hooks, PrepareAccess() and FinishAccess(), which get called
around CPU access to the framebuffer. This allows the hardware to set
up swappers to deal with endianness, or to tell EXA to move the pixmap
out to framebuffer if insufficient swappers are available (note: must
not fail on front buffer!).
Submitted by: benh
commit ca210830bd361e3d91b6bc741c495b61c424d1d2
Author: Adam Jackson <ajax@nwnk.net>
Date: Sun Sep 11 18:43:55 2005 +0000
Simplify life for EXA drivers by reducing some {Con,Dis}joint ops.
commit 04f81cacb9fd0944879b2c23a99fa3a1ae979b12
Author: Matthieu Herrb <matthieu.herrb@laas.fr>
Date: Sun Sep 11 18:33:31 2005 +0000
OpenBSD also doesn't like defining POSIX_SOURCE: it limits available
functionnality in headers beyond what's used by Xorg.
commit 089b4272cf32fc9429c1a0e666c2ffb34fda0b93
Author: Daniel Stone <daniel@fooishbar.org>
Date: Sun Sep 11 01:16:14 2005 +0000
use RGB_DB not RGB_PATH as that's what it's looking for
define HAVE_XKB_CONFIG_H so setting xkb-path works (Jürg Billeter)
commit 2f9d01c9681d80235a70263e2e087dc6c181cdc8
Author: Eric Anholt <anholt@freebsd.org>
Date: Thu Sep 8 01:15:47 2005 +0000
Remove some references to mfb/cfb support that is no longer there.
commit b5d42012f9be87f3b45a089c596ce6dba8845794
Author: Daniel Stone <daniel@fooishbar.org>
Date: Wed Sep 7 01:30:23 2005 +0000
Fix typo resulting in failure to swap between RGB/BGR properly. (Stephen P.
Becker)
commit c8de8c23fbccb3296747f429a02c0c0682b74bf5
Author: Daniel Stone <daniel@fooishbar.org>
Date: Mon Sep 5 07:43:51 2005 +0000
Fix tests for maximum number of colours when creating a colourmap, so a
32-bit visual (e.g. ARGB) doesn't overflow an int when attempting to do
1 << 32. (Benjamin Herrenschmidt)
commit 5c5c51fa6da03f19831632a092761a1e4bcf653b
Author: Daniel Stone <daniel@fooishbar.org>
Date: Mon Sep 5 07:40:50 2005 +0000
Initialise private arrays with calloc, rather than standard malloc.
(Benjamin Herrenschmidt)
commit 691669c0121494df90c8523f7d17e01ba0b14a57
Author: Daniel Stone <daniel@fooishbar.org>
Date: Sat Sep 3 07:08:58 2005 +0000
xorg-server.h -> dix-config.h (thinko).
commit 4b2f5ba1b5d59fd6bd7f82da5730f72e8df04858
Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
Date: Sat Sep 3 03:27:55 2005 +0000
Use macros from xtrans.m4, issue error if not found.
commit 733a6d7a268945d149bcea159253408bedc69b12
Author: Jesse Barnes <jbarnes@virtuousgeek.org>
Date: Sat Sep 3 02:21:36 2005 +0000
Add EXA driver writer documentation for the benefit of future generations
of X hackers.
commit 854010d71dc0f1e9b73cdc764c9d2cf36f1da625
Author: Daniel Stone <daniel@fooishbar.org>
Date: Fri Sep 2 03:22:01 2005 +0000
Add -include dix-config.h to GL/mesa/X to catch _XSERVER64, et al.
commit 287336f3c9e5023acbfba6508b05a68ccca9ddf0
Author: Kristian Høgsberg <krh@redhat.com>
Date: Thu Sep 1 19:56:14 2005 +0000
Teach xkb how to optionally run xkbcomp from $bindir instead of
$datadir/xkb.
commit 94fbdb5c6d2cdc7b70ecdabe22a9de8b9aabeced
Author: Daniel Stone <daniel@fooishbar.org>
Date: Thu Sep 1 14:56:35 2005 +0000
Make RGB_PATH configurable.
Move I2C modules back to $(moduledir)/multimedia.
commit a65c5796133d126b1810749b5206607e7c42d787
Author: Kristian Høgsberg <krh@redhat.com>
Date: Wed Aug 31 14:58:09 2005 +0000
Include xkb-config.h if we have it so we pick up the paths defined there.
commit 9d3b5e89d691b79ea3361e6dc82938c22d70d0e3
Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
Date: Tue Aug 30 22:34:14 2005 +0000
Save keyboard LED state on startup and restore on exit so text console mode
LEDs match text console mode state. Move push of streams module earlier
so it's loaded before we start using kbd ioctls provided by the streams
module.
commit fa6fbd018da939fda7cc2b9a9aa2717b9675a178
Author: Kristian Høgsberg <krh@redhat.com>
Date: Tue Aug 30 22:31:52 2005 +0000
Use the $(moduledir) makefile variable instead of @moduledir@ so it can be
overridden at make install time.
Remove driverdir and inputdir from pkg-config file. The directory layout of
moduledir is fixed and well known by drivers.
commit b4f4bf028a88ee709f4536373de2d40b6445006e
Author: Alan Hourihane <alanh@fairlite.demon.co.uk>
Date: Tue Aug 30 19:51:59 2005 +0000
programs/Xserver/hw/xwin/winmultiwindowshape.c Fix off by one error (Colin
Harrison)
commit 0e50af8b7f459aafd1d1d52414629e926167a751
Author: Adam Jackson <ajax@nwnk.net>
Date: Tue Aug 30 19:35:06 2005 +0000
typo fix
commit 0c74799af4f924ba64ebd6052802b73547f55c72
Author: Eric Anholt <anholt@freebsd.org>
Date: Tue Aug 30 04:41:04 2005 +0000
Remove existing broken maxX/maxY code for composite (results in infinite
loops, doesn't deal with failure, doesn't present the interface to
drivers that I expected) and instead replace it with a simple fallback
to software when coordinate limits could be violated. Act similarly in
other acceleration cases as well.
The solution I want to see (and intend to do soon) is to (when necessary)
create temporary pictures/pixmaps pointing towards the real ones' bits,
with the offsets adjusted, then render from/to those using adjusted
coordinates.
commit f20e845b04dee5fc0780811f565180e322b60b73
Author: Eric Anholt <anholt@freebsd.org>
Date: Tue Aug 30 03:42:07 2005 +0000
More 0 -> NULL for pointers missed in previous commit to this file.
commit 7777d325a3d049cc233c004cba288ed5d10539c2
Author: Eric Anholt <anholt@freebsd.org>
Date: Tue Aug 30 03:05:21 2005 +0000
Apply an xserver patch from cworth: Avoid buffer ovverrun when a
trapezoid's right edge is on a pixel boundary.
commit e321f9e7ff7de9aa702e33a22743b55c8bb66953
Author: Eric Anholt <anholt@freebsd.org>
Date: Tue Aug 30 03:01:38 2005 +0000
Apply the xserver patch from vektor for bug #4208: Use NULL for pointers
instead of 0.
commit 20813d3af065f9b719b39d2e7a3382b8fa278a48
Author: Adam Jackson <ajax@nwnk.net>
Date: Sun Aug 28 19:47:39 2005 +0000
Bug #3974: Fix unaligned memory access on LP64. (Matthieu Herrb)
commit 0926cf79c030f29dce32a9dc944734960ec93d19
Author: Adam Jackson <ajax@nwnk.net>
Date: Fri Aug 26 20:21:57 2005 +0000
Add diagnostic messages for exaDriverInit failure cases.
commit 5ffff7cb868a768307ff6faf164210020e6b94a2
Author: Adam Jackson <ajax@nwnk.net>
Date: Fri Aug 26 20:08:09 2005 +0000
Bug #4160: Fix Altix kernel version check.
commit 6b0cdc5dd9e451021c562ac4b6b2101d50187a30
Author: Daniel Stone <daniel@fooishbar.org>
Date: Fri Aug 26 16:46:41 2005 +0000
Change use of dix-config.h to xorg-config.h.
commit 9d1b349b3765fb587b353c78cca9aa083f5d0eee
Author: Daniel Stone <daniel@fooishbar.org>
Date: Fri Aug 26 16:34:55 2005 +0000
Back out previous change until I figure out something smarter.
commit 3075df24e7931901c6f0526e10a89631fd73c4d0
Author: Daniel Stone <daniel@fooishbar.org>
Date: Fri Aug 26 07:35:55 2005 +0000
Subvert SIGUSR2 to reload all input devices. (Ubuntu #020)
commit 89c84575ea905c7598d6b6029c9209abe1cfb074
Author: Daniel Stone <daniel@fooishbar.org>
Date: Fri Aug 26 07:24:21 2005 +0000
Undo rate/period change after function body, so the damage doesn't leak
into other functions. (Debian #050)
commit bb5e934df7f23fb365ed673a12d283ff52af79c0
Author: Daniel Stone <daniel@fooishbar.org>
Date: Fri Aug 26 07:15:04 2005 +0000
Only open /proc/bus/pci/devices once. (Ubuntu #029)
commit c937faadd0a0a5f2598b84286ac1ed8996a512e5
Author: Daniel Stone <daniel@fooishbar.org>
Date: Fri Aug 26 06:48:24 2005 +0000
Better error message on failure to set iopl. (Debian #021)
commit 6d34a2ac8a33bd6c9083106b38fab6062e033e39
Author: Daniel Stone <daniel@fooishbar.org>
Date: Fri Aug 26 06:35:00 2005 +0000
Add Xv symbol from Xext.
commit b8f0d4c3ebee363279f9dc7318de3e3c854ca5ef
Author: Daniel Stone <daniel@fooishbar.org>
Date: Fri Aug 26 06:29:15 2005 +0000
Spit out an error when there is no valid FB device, instead of just failing
silently. (Debian #070)
commit b48a24e7969d99a0116bc780c70d3e1c18b34769
Author: Daniel Stone <daniel@fooishbar.org>
Date: Fri Aug 26 06:23:41 2005 +0000
Don't assume that all sun4m CPUs support muldiv; the Cypress CPU, which
implements the 4m MMU but only v7 instructions, does not. (Debian
#100).
commit fd158d3d5215b0a013f5305a76097b0b8fa14cf6
Author: Daniel Stone <daniel@fooishbar.org>
Date: Fri Aug 26 05:49:44 2005 +0000
Get prototype for ntohl from SuSv3-compliant location, fixing it for
systems which define ntohl as a macro only, not both macro and
function. (Debian #076)
commit 53e489c0e39b89f41213a726fe1b611d7d9a18db
Author: Daniel Stone <daniel@fooishbar.org>
Date: Fri Aug 26 05:47:36 2005 +0000
Work around ATI expansion ROM problem on IA64 caused by prototype HP
McKinley systems. (Bdale Garbee)
commit 40374d1149d6dcf0b4521faae8bdfecc8a3af077
Author: Daniel Stone <daniel@fooishbar.org>
Date: Fri Aug 26 05:00:07 2005 +0000
Accept 'Enabled' and 'Disabled' for Extensions section (Ubuntu #990)
commit ea80b5db257f4c22cf5a152084aef5fe05079db0
Author: Eric Anholt <anholt@freebsd.org>
Date: Thu Aug 25 22:11:04 2005 +0000
Fix a use-after-free of cursor data by refcounting for the sprite.current
reference. The particular path seen was XFixes' ReplaceCursor()
resulting in the sprite.current being freed, but then it getting
accessed during the ChangeToCursor() that happens as a result of
WindowHasNewCursor().
commit 54cc45b09bc6c860b3de2012b57c4b35ca18ffd2
Author: Søren Sandmann Pedersen <sandmann@daimi.au.dk>
Date: Thu Aug 25 21:22:41 2005 +0000
Thu Aug 25 17:15:01 2005 Søren Sandmann <sandmann@redhat.com>
Add all the drivers to the module_LTLIBRARIES instead of having separate
variables for them. Pointed out by Kristian Høgsberg.
commit ff22adc09763b2bd860e7f780a5d0855cab0ab30
Author: Kristian Høgsberg <krh@redhat.com>
Date: Thu Aug 25 14:19:43 2005 +0000
Remove sun_inout.s so make dist works (discussed with Alan Coopersmith).
commit 344a24b6229f477c892dd855546391bc1e091bd7
Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
Date: Thu Aug 25 04:09:45 2005 +0000
Use system curses library on Solaris for xorgcfg text mode.
commit 0711502f1847ed461672b9842218b9afa9d349ed
Author: Eric Anholt <anholt@freebsd.org>
Date: Wed Aug 24 23:48:11 2005 +0000
Bugzilla #4226: Change the pixmap migration strategy for the CopyNtoN case.
Now, if either source or dest were in framebuffer, try to get both
there, but prefer system memory for both otherwise. Required making
exaasync.c go through the try-acceleration path. This significantly
improves window resizing under composite, because previously the
pattern of creating a new pixmap and copying default contents from the
screen caused a fallback every time due to the new destination pixmap
being in system memory.
commit 2261710fe0dffd60433e3362ac12adf4db570fe5
Author: Eric Anholt <anholt@freebsd.org>
Date: Wed Aug 24 23:38:25 2005 +0000
Fix a bug where NULL could be dereferenced during the pixmap kick-out
process by referencing the correct offscreen area. Also drive-by the
comments related to these for clarity.
commit 55c5c6953a3a661758a42b147f9542950a62fc4d
Author: Eric Anholt <anholt@freebsd.org>
Date: Wed Aug 24 22:43:27 2005 +0000
Bugzilla #4090: Introduce getters for pixmap pitch and offset, to
simplify/clarify it for driver writers who probably don't want to know
what pPixmap->devPrivate.ptr or pPixmap->devKind mean. Converts the sis
driver to use them, and bumps the EXA module minor version.
commit 079ad773e09ed0c5baf01de3d4f02a5568da5634
Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
Date: Wed Aug 24 22:37:15 2005 +0000
Fill in xf86DeallocateGARTMemory stub based on lnx_agp.c version. Add
include of xorg-config.h for modular builds
commit 8fd250e5e4c2016614b82e2d653b7fbf8a3a5b99
Author: Eric Anholt <anholt@freebsd.org>
Date: Wed Aug 24 21:51:28 2005 +0000
Bugzilla #4089: Fix crashes in !EXA_OFFSCREEN_PIXMAPS case by not trying to
do migration when the EXA pixmap private is NULL.
commit 79dc5f3d5fe5a66f5fa53af9afc30d27d1af0bce
Author: Kristian Høgsberg <krh@redhat.com>
Date: Wed Aug 24 21:28:40 2005 +0000
Don't export non-standard symbols generated GCCs stack protection feature
(__guard, __stack_smash_handler).
commit d2952de6e3d9197529695bb88d8c3af679ad71af
Author: Søren Sandmann Pedersen <sandmann@daimi.au.dk>
Date: Wed Aug 24 19:41:43 2005 +0000
Wed Aug 24 15:39:07 2005 Søren Sandmann <sandmann@redhat.com>
Add GLX_{INC,LIBS} for xprint.
Add @DIX_FLAGS@ to AM_CFLAGS
commit 81e708440ced309adc62ebf43d00becd32338db5
Author: Søren Sandmann Pedersen <sandmann@daimi.au.dk>
Date: Wed Aug 24 19:35:51 2005 +0000
Wed Aug 24 15:29:50 2005 Søren Sandmann <sandmann@redhat.com>
Conditionally include dix-config.h
Conditionally include dix-config.h
commit 9657e0e9def47dba5b0bfa7461874362712a07bb
Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
Date: Wed Aug 24 15:18:06 2005 +0000
Don't try to build dmx/input/lnx-*.c if <linux/keyboard.h> isn't found
Don't try to build dmx/input/usb-*.c if <linux/input.h> isn't found
Replace -rdynamic with $(LD_EXPORT_SYMBOLS_FLAG) for compatibility with
compilers other than gcc
commit 825a95a1fab69f84c99ae132888fced22e28be33
Author: Daniel Stone <daniel@fooishbar.org>
Date: Wed Aug 24 11:18:35 2005 +0000
Remove use of dix-config and xorg-config.h from public headers.
commit 1fb4a5a4ea993a7913a7bcc362315d31b2907836
Author: Daniel Stone <daniel@fooishbar.org>
Date: Wed Aug 24 09:12:50 2005 +0000
Add xcmiscproto and bigreqsproto to REQUIRED_MODULES, since Xext uses them.
commit b47535bd661743946851099f226f9e6aa4cc8c90
Author: Alan Hourihane <alanh@fairlite.demon.co.uk>
Date: Wed Aug 24 08:49:31 2005 +0000
programs/Xserver/GL/windows/glwrap.c Wrap PointParameteriNV &
PointParameterivNV for Windows builds.
commit 9f498a37dd3d8456d2a97be9c039b63abc81a5fe
Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
Date: Tue Aug 23 20:58:29 2005 +0000
Display more friendly mouse protocol names. Enable mouse wheel mapping by
default.
commit cff4b1c2166aa2e75618c8df09554a602c3a68c5
Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
Date: Tue Aug 23 20:12:26 2005 +0000
Check for getconfig in GETCONFIG_DIR if it's not found in module dir.
commit bfd13645867aab831b7a0f2b1757cb80837c07d9
Author: Daniel Stone <daniel@fooishbar.org>
Date: Tue Aug 23 09:20:49 2005 +0000
Add missing saver, evie, video, trap proto pkg-config checks. (Georgi
Georgiev)
commit 27afac2ce6a77bc68669c1af6a61c589aa9ef384
Author: Daniel Stone <daniel@fooishbar.org>
Date: Tue Aug 23 08:59:30 2005 +0000
Fix test for Xnest presence. (Donnie Berkholz)
commit fed61462be281c568df6407f94ea519748f0b720
Author: Daniel Stone <daniel@fooishbar.org>
Date: Tue Aug 23 08:58:40 2005 +0000
Fix up warning on debugging.
commit e848eb289c9251742a88e76017603952394f4262
Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
Date: Tue Aug 23 01:14:35 2005 +0000
Rename app-defaults entries from xf86cfg to xorgcfg to match name passed to
XtAppInitialize. (Henry Zhao, Sun Microsystems) Also, display vendor
version instead of 4.0 for server version.
commit 6076fca82528da8d50b0ed6be8da6f811321474d
Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
Date: Tue Aug 23 00:32:27 2005 +0000
User message cleanups/updates for modern configurations.
commit b07602014061cb41540f6a7e74e4132e67aa1117
Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
Date: Mon Aug 22 21:47:59 2005 +0000
If MAKE_XKM_OUTPUT_DIR is defined, call trans_mkdir to create directory if
it doesn't already exist. (ported from Solaris Xsun bug #5039004)
When BuildLikeSun is set, define MAKE_XKM_OUTPUT_DIR and set the xkb output
directory to /var/run/xkb.
commit 4a19a33db6d04b5835830a665daa679ee2fcafe7
Author: Kevin E Martin <kem@kem.org>
Date: Mon Aug 22 21:29:18 2005 +0000
bugzilla #2880 (https://bugs.freedesktop.org/show_bug.cgi?id=2880)
attachment #2987 (https://bugs.freedesktop.org/attachment.cgi?id=2987)
Use system method to access PCI config space for inb and inw in
addition to inl (Olivier Baudron and Kevin Martin).
commit 5557a40a022b0ede36edd3370a60f5fc3d147796
Author: Kevin E Martin <kem@kem.org>
Date: Mon Aug 22 19:52:26 2005 +0000
Fix linking errors for xprint.
commit 7693f668efd206a6c259166665bc36d3c6335e8d
Author: Alan Hourihane <alanh@fairlite.demon.co.uk>
Date: Mon Aug 22 12:05:18 2005 +0000
programs/Xserver/hw/xfree86/os-support/linux/lnx_acpi.c
programs/Xserver/hw/xfree86/os-support/linux/lnx_apm.c
programs/Xserver/hw/xfree86/os-support/linux/Imakefile Add basic ACPI Linux
support so that events can be passed to the driver. (Alan Hourihane)
commit 02c834f198eab4c4686d8156b88508fe102099c1
Author: Daniel Stone <daniel@fooishbar.org>
Date: Mon Aug 22 09:15:31 2005 +0000
Include Xv and XvMC headers in the SDK.
commit 3c4d605c7e8a9f6d296086a5b03b4f11b90590db
Author: Daniel Stone <daniel@fooishbar.org>
Date: Mon Aug 22 09:15:20 2005 +0000
Fix linkage for Xnest, Xvfb, Xdmx and Xorg DDXes; include all libs.
commit 79be1f6d4d1ab48841d31d5553dd36b1b3632650
Author: Daniel Stone <daniel@fooishbar.org>
Date: Sun Aug 21 19:29:55 2005 +0000
Fix inclusion order of dix-config.h, so _XSERVER64 gets defined before X.h
or Xdefs.h get included. (Jürg Billeter)
commit 8d6e743bc4e6854ee0bb0fa4f197acd6d7683ccd
Author: Daniel Stone <daniel@fooishbar.org>
Date: Sun Aug 21 19:23:17 2005 +0000
Add _XSERVER64 definition to config headers.
commit 588105173840355717d7b2f7f652289a41166c3f
Author: Daniel Stone <daniel@fooishbar.org>
Date: Sun Aug 21 19:15:11 2005 +0000
Huge cleanup. Group into sections: hardware feature detection, extension
detection/configuration, DDX options. Make building of Xorg DDX fully
optional. Clarify and correct some help texts. Change all comments to
use dnl instead of #. Quote all tests correctly, and guard
pure-variable tests with 'x' (e.g. test $DMX = yes -> test "x$DMX" =
xyes). Since the DDXes seem to have pretty divergent extension support
these days, get rid of EXTENSION_LIBS, DMX_EXTENSIONS and
XPRINT_EXTENSIONS, and go back to building extension lists by hand in
the DDX-specific sections. Use portable POSIX constructs everywhere
(e.g. test foo && test bar, instead of test foo -a bar).
Clean up old cruft.
Set _XSERVER64 on 64-bit architectures, and use x86_64 for host_cpu instead
of amd64 (Jürg Billeter).
commit 367f45073953f8f99a2d9dd054f479e1070f856e
Author: Daniel Stone <daniel@fooishbar.org>
Date: Sun Aug 21 08:43:46 2005 +0000
Change xorg_bus_sbus to xorg_bus_sparc; build sparcPci.c on all SPARCs.
commit 71b3fea94e8845f35e47503636ca1fe78d2d48ca
Author: Daniel Stone <daniel@fooishbar.org>
Date: Sun Aug 21 08:24:52 2005 +0000
Typo fix (SOURCE -> SOURCES).
commit db2909ce76b178663de301c09fb97f2936b1997e
Author: Daniel Stone <daniel@fooishbar.org>
Date: Sun Aug 21 06:56:19 2005 +0000
Add test for SPARC. Build SparcMulDiv.S on all SPARCs.
Make the default font path configurable.
commit d96e6666862553d59fc1f9fdd14fb65f36d589af
Author: Adam Jackson <ajax@nwnk.net>
Date: Sat Aug 20 18:52:07 2005 +0000
Add sparcPci.c to EXTRA_DIST.
commit a402c876a465904ac71ebf39af67ea451b2457dc
Author: Daniel Stone <daniel@fooishbar.org>
Date: Sat Aug 20 18:11:17 2005 +0000
Make DRI/GLcore builds srcdir != builddir safe, and invoke symlink-mesa.sh
in our builddir, not our srcdir.
commit 238d45d2f148e1e0af4b1619cc1d5e8cc4bf9661
Author: Daniel Stone <daniel@fooishbar.org>
Date: Sat Aug 20 18:10:03 2005 +0000
Make Xprint build optional.
commit abab3fd628c2d1096e8534192f33c1068a573c12
Author: Daniel Stone <daniel@fooishbar.org>
Date: Sat Aug 20 18:09:21 2005 +0000
Make Xext linkage srcdir != builddir safe.
commit bb1d99ee72cc560e95010ea1008d5e796177ae62
Author: Daniel Stone <daniel@fooishbar.org>
Date: Sat Aug 20 18:07:59 2005 +0000
Build libxkbstubs.la to stub XKB DDX functions (e.g. VT switches), and
build libxorggxkb.la from within the Xorg DDX to replace the previous
xf86VT.o, et al, hacks.
commit 8a32ed46480d78b69f289c90098f5ed4a830851f
Author: Daniel Stone <daniel@fooishbar.org>
Date: Fri Aug 19 15:48:18 2005 +0000
Really hopefully the last xorg-commit test.
commit 2fd951434507d2a2c0266a052bdca6e223d31bfa
Author: Daniel Stone <daniel@fooishbar.org>
Date: Fri Aug 19 15:45:55 2005 +0000
Another test commit for xorg-commit.
commit 39630b301f769118959b20d962404555714a5812
Author: Daniel Stone <daniel@fooishbar.org>
Date: Fri Aug 19 15:25:19 2005 +0000
Testing xorg-commit, nothing else.
commit b13d3382de0027e897532926983b79caaa1eb655
Author: Daniel Stone <daniel@fooishbar.org>
Date: Fri Aug 19 15:21:54 2005 +0000
Fix dates on Søren's entries.
commit 8ec79e05feacd61562b53ebf36a8b30967affc1e
Author: Daniel Stone <daniel@fooishbar.org>
Date: Fri Aug 19 15:15:51 2005 +0000
Make symlink-mesa.sh call srcdir != objdir safe. Remove requirement for
XF86Rush protocol headers, which we don't even use.
commit 057a8709a116feb0fd0004141bbac20d2766f3db
Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
Date: Fri Aug 19 00:13:46 2005 +0000
More updates for Panoramix -> Xinerama rename
commit bed3235d222fd6e2207f6c0d551c67d5a53322cd
Author: Søren Sandmann Pedersen <sandmann@daimi.au.dk>
Date: Thu Aug 18 21:28:09 2005 +0000
Thu Aug 18 17:27:09 2005 Søren Sandmann <sandmann@redhat.com>
Move fbmmx to a convenience library since the mmx flags may be harmful when
applied to non-mmx code.
commit a0366ddb8cb1c57b85a5806eb348abc19c7f92d6
Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
Date: Thu Aug 18 17:14:11 2005 +0000
Replace gnu-makeism with portable rules
commit ea5c49cb17ac956d6dea6bf563e392e61c39da2b
Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
Date: Thu Aug 18 01:40:33 2005 +0000
//bugs.freedesktop.org/show_bug.cgi?id=2901> Patch #2331
<https://bugs.freedesktop.org/attachment.cgi?id=2331> Lines ending in
<backslash><space> break with cpp from gcc >= 3.3 (Peter Breitenlohner)
commit 22694500e0dd8752b4c01e340f587ecba1ff7fb7
Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
Date: Wed Aug 17 23:20:27 2005 +0000
Add xf86Sbus.h to EXTRA_DIST files (bugzilla #4128)
commit df938987d6c19fbdfff8d3334bb497f4814ae384
Author: Søren Sandmann Pedersen <sandmann@daimi.au.dk>
Date: Wed Aug 17 19:03:18 2005 +0000
Add buildsystem for Xprint, and:
Wed Aug 17 14:50:58 2005 Soren Sandmann <sandmann@redhat.com>
Include <X11/extensions/Print{,str}.h> instead of "Print{,str}.h"
Include <X11/fonts/fontstruct.h> isntead of "fonts/fontstruct.h"
Wed Aug 17 14:54:49 2005 Søren Sandmann <sandmann@redhat.com>
Conditionally compile in xprint.c
Add Xprint
commit f2f6820c3f01810a4da5a8bb4e43119ef2a3fcb6
Author: Søren Sandmann Pedersen <sandmann@daimi.au.dk>
Date: Wed Aug 17 17:20:13 2005 +0000
Wed Aug 17 13:13:00 2005 Søren Sandmann <sandmann@redhat.com>
Make asm labels local. Bug 4073, patch from Diego Pettenò.
commit ad7f2fc67376f4fbfe81047273de12f7926f0b17
Author: Søren Sandmann Pedersen <sandmann@daimi.au.dk>
Date: Tue Aug 16 16:21:09 2005 +0000
symlink.sh: Temporarily disable xkbdata, add type1mod.c
Tue Aug 16 12:09:09 2005 Søren Sandmann <sandmann@redhat.com>
Add ft and type1 modules.
commit 24597a1ee2c567ec6bc2f2208457f2778937a034
Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
Date: Tue Aug 16 00:40:25 2005 +0000
2005-08-15 Alan Coopersmith <alan.coopersmith@sun.co>m
Convert sunPostKbdEvent to use xf86ProcessAction like xf86PostKbdEvent.
commit b86282b764387ef8315fc4045d4e1ca1bb74fee1
Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
Date: Mon Aug 15 23:48:35 2005 +0000
Set ZAxisMapping default to "4 5 6 7".
commit a6c8d0d71eef7cb964797f7595be36ee0ac10a1a
Author: Søren Sandmann Pedersen <sandmann@daimi.au.dk>
Date: Mon Aug 15 19:42:48 2005 +0000
Mon Aug 15 15:41:26 2005 Søren Sandmann <sandmann@redhat.com>
Link this module with libXext.la.
Mon Aug 15 14:56:57 2005 Søren Sandmann <sandmann@redhat.com>
Remove the xkb* files.
Add xkbVT.o and friends as the last things on the link line so they will
override the symbols in libxkb.a. Add a comment on how this situation
might not be considered ideal.
commit 46aede552aa43cd59f81980303826b5c3d889c02
Author: Søren Sandmann Pedersen <sandmann@daimi.au.dk>
Date: Mon Aug 15 18:59:16 2005 +0000
Mon Aug 15 14:56:57 2005 Søren Sandmann <sandmann@redhat.com>
Remove the xkb* files.
Add xkbVT.o and friends as the last things on the link line so they will
override the symbols in libxkb.a. Add a comment on how this situation
might not be considered ideal.
commit bcc95c83406a4498227ffd8384bc272fd8cdc49c
Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
Date: Mon Aug 15 18:32:08 2005 +0000
Add AC_SYS_LARGEFILE to match flags used in monolith
commit 809906a754a1289b7e88489241a2065aa0bf27a2
Author: Dave Airlie <airlied@linux.ie>
Date: Mon Aug 15 08:24:45 2005 +0000
make mouse support work - note you need to change the evdev devices in the
source.. hacky...
commit fe5abff38e65c1a49886924efdf0242ab8048008
Author: Alan Hourihane <alanh@fairlite.demon.co.uk>
Date: Mon Aug 15 07:30:05 2005 +0000
Egbert's 64bit fixes for mixed 32/64bit clients
commit ebedc8bbb54b9b4e1814bc2758216af2bab93540
Author: Eric Anholt <anholt@freebsd.org>
Date: Sun Aug 14 19:46:55 2005 +0000
- Fix the exa pixmap offset/pitch alignment to deal with non-POT alignment
requirements. MGA, notably, uses a multiple of 3 in some cases.
- Rename the pixmap offset/pitch alignment fields to more clearly state
their meaning.
commit e3509c940fa1fc3988d23f884ca8bffc87d091e5
Author: Daniel Stone <daniel@fooishbar.org>
Date: Sun Aug 14 16:24:30 2005 +0000
Don't link libXext, as it is linked in to the server also.
commit 05071ae0fb847c211b1f20770d3b57fc2172738c
Author: Daniel Stone <daniel@fooishbar.org>
Date: Sat Aug 13 07:41:33 2005 +0000
Don't link in libx86emu.a as this a) fails badly on non-x86 systems, and b)
is done via x86emu.c including all the source files anyway.
commit 1ffe9ceb2f6a7261fb62c90dfea861f9dadd27ce
Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
Date: Sat Aug 13 06:15:35 2005 +0000
Oops, forgot a file in earlier Solaris kbd commit
commit c29051f9d108fe49c23d9cf36fd08cc64c87262a
Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
Date: Sat Aug 13 00:11:28 2005 +0000
Add LintTarget()
Bugzilla #1068 <https://bugs.freedesktop.org/show_bug.cgi?id=1068> Port
Solaris keyboard code to work with kbd driver.
Also incorporated "audio bell" feature from Xsun keyboard DDX to play bell
tones via /dev/audio (specified via Option "BellDevice" "/dev/audio" in
keyboard device options).
commit 616a65c4cc528278168db1414776f3a867cd463e
Author: Søren Sandmann Pedersen <sandmann@daimi.au.dk>
Date: Fri Aug 12 18:50:33 2005 +0000
Fri Aug 12 14:49:24 2005 Søren Sandmann <sandmann@redhat.com>
Apply another patch from Billy Biggs to fix precision issues.
commit 1eed84f227311730ce1f9ffab190e95de967c7da
Author: Søren Sandmann Pedersen <sandmann@daimi.au.dk>
Date: Fri Aug 12 18:47:17 2005 +0000
Fri Aug 12 14:45:54 2005 Søren Sandmann <sandmann@redhat.com>
Fix up multiplications based on patch by Billy Biggs. Part of bug 3945.
commit 8bfffb96b552a3facb77ff9e81658e80becbf2f4
Author: Søren Sandmann Pedersen <sandmann@daimi.au.dk>
Date: Fri Aug 12 18:31:07 2005 +0000
Fri Aug 12 14:29:09 2005 Søren Sandmann <sandmann@redhat.com>
Apply patch from Billy Biggs that fixes rounding problems with division.
Part of bug 3945.
commit 812ed2e17bfe8e232313cf9ab78000a564cb6b3c
Author: Søren Sandmann Pedersen <sandmann@daimi.au.dk>
Date: Fri Aug 12 17:43:38 2005 +0000
Fri Aug 12 10:45:01 2005 S%Gï¿¿%@ren Sandmann <sandmann@redhat.com>
Make this function compute the same results as the fbByteMul macro.
commit 370b111f4882a95248bcc4727438c95a065c174d
Author: Ian Romanick <idr@us.ibm.com>
Date: Fri Aug 12 16:30:57 2005 +0000
Use '$(DRMSRCDIR)/shared-core' instead of '$(DRMSRCDIR)/shared' for DRM
includes. This matches the way drivers are built in the Mesa tree and
fixes a build problem in the Savage driver.
Convert uses of __glPointParameterfvARB_size to
__glPointParameterfvEXT_size and uses of __glPointParameteriv_size to
__glPointParameterivNV_size. This eliminates the need to hand-edit
indirect_size.c after it is generated.
commit 5f5117729de3a8a4eb6e17dc0979e4b1c1ef9918
Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
Date: Fri Aug 12 01:17:58 2005 +0000
Fix segfault when "kbd" fails to load and "keyboard" driver is not
configured.
commit 13e16ee93a328a55494c2933143c66559fe7ba98
Author: Søren Sandmann Pedersen <sandmann@daimi.au.dk>
Date: Thu Aug 11 15:46:42 2005 +0000
Thu Aug 11 11:43:32 2005 Søren Sandmann <sandmann@redhat.com>
Make sure we don't crash on glyphs with NULL bits. Bug 659.
commit 3e471ddf1dbf58ed021d6f31bdaf438872f03ca8
Author: Søren Sandmann Pedersen <sandmann@daimi.au.dk>
Date: Thu Aug 11 14:36:29 2005 +0000
Add check for whether the platform is MMX capable and add the relevant
flags if so.
commit 130fffc0cdbfdc29f33f1ee97c09e744c19e243a
Author: Søren Sandmann Pedersen <sandmann@daimi.au.dk>
Date: Wed Aug 10 20:22:57 2005 +0000
Wed Aug 10 16:17:38 2005 Søren Sandmann <sandmann@redhat.com>
Add back non-SSE implementations. Define USE_SSE if the CPU is amd64/x86-64
commit ef50bba5694ef276a239882fae3502638b4ec784
Author: Søren Sandmann Pedersen <sandmann@daimi.au.dk>
Date: Wed Aug 10 19:42:36 2005 +0000
Revert previous patch as it causes build failures
commit b99360e264c9531593ce8eb67bd006275ca5e5a0
Author: Søren Sandmann Pedersen <sandmann@daimi.au.dk>
Date: Wed Aug 10 19:15:44 2005 +0000
Add XF86DDXACTIONS to AM_CFLAGS
commit 73a335a926e50afde36816ab47dae689202df319
Author: Jon Smirl <jonsmirl@yahoo.com>
Date: Tue Aug 9 16:51:05 2005 +0000
Point xegl at the DRI driver
commit 29d0ba9f06d90a1c7f619db87d681ca53fa1bf38
Author: Jon Smirl <jonsmirl@yahoo.com>
Date: Tue Aug 9 15:58:20 2005 +0000
Touchup xgl for modular tree
commit 435e2a09de7c9dd843b05f4a0484371a67940515
Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
Date: Tue Aug 9 01:18:04 2005 +0000
//bugs.freedesktop.org/show_bug.cgi?id=3950> Xorg prints version numbers in
wrong format for modules compiled for Xorg 6.99 & later (Adam Jackson &
Alan Coopersmith)
commit 5849c69db80b2320bddb7fafb519300cc0435c84
Author: Søren Sandmann Pedersen <sandmann@daimi.au.dk>
Date: Mon Aug 8 18:02:08 2005 +0000
Mon Aug 8 13:39:45 2005 Søren Sandmann <sandmann@redhat.com>
Conditionally include xorg-config.h
commit 5e6e5e6d8c6add3aac5c3aebc984d3afb842edc1
Author: Søren Sandmann Pedersen <sandmann@daimi.au.dk>
Date: Mon Aug 8 17:38:37 2005 +0000
Mon Aug 8 13:36:23 2005 Søren Sandmann <sandmann@redhat.com>
#undef PIXPRIV here.
commit a11ce76b0625501a202fa34e18777b7bd42b2713
Author: Keith Packard <keithp@keithp.com>
Date: Mon Aug 8 06:25:21 2005 +0000
Build with modular X.org libraries and headers.
composite/compwindow.c Don't damage unmoved windows. Let border clip reset
leave damage alone, pending actual damage for painting.
commit 129e812c339879b68bb162331ac9b7e0f86a7474
Author: Keith Packard <keithp@keithp.com>
Date: Mon Aug 8 02:30:31 2005 +0000
Re-add _XOPEN_SOURCE as it's needed *sometimes*. Place it in #ifndef to
avoid whinging.
commit 4dfc3357a78a52ef70750608138dfeef0371cbc4
Author: Keith Packard <keithp@keithp.com>
Date: Mon Aug 8 00:38:41 2005 +0000
Add autogenerated source files and other various non-CVS material to
.cvsignore files
Use XORG_CFLAGS. Ensure that all exa files are in SOURCES
remove _XOPEN_SOURCE as it's always in xtrans.pc these days and gcc whines
libdamage.la needs libcw.la when COMPOSITE is defined, but that
libdamage.la must be after libcomposite.la, so add libcw.la to
DAMAGE_LIB instead of EXTENSION_LIBS. Regularize library link order
across all X servers
commit 7d2b08aa4786eb4d181c88f7dc6b7eb059cc9dad
Author: Adam Jackson <ajax@nwnk.net>
Date: Sun Aug 7 20:42:50 2005 +0000
Invert the sense of the composite configure flag to match reality.
commit fcaa6f30c489578589af19ef798ab31150e696a2
Author: Adam Jackson <ajax@nwnk.net>
Date: Sun Aug 7 19:02:32 2005 +0000
Bug #3989: Fix Composite builds, enable Composite build by default. (Olli
Helenius)
commit 3639fb243450ae447e9901de9f909e975a919514
Author: Chris Lee <clee@c133.org>
Date: Sat Aug 6 23:56:18 2005 +0000
Enabling EXA by default in the modular build.
commit a16357ebc9344fbf3e393da9e7b28164ad5b9dc8
Author: Chris Lee <clee@c133.org>
Date: Sat Aug 6 23:46:38 2005 +0000
Last bits of changes to make exa build properly in the modular server.
commit cc67bd187f06bfade0d2fe1b4cca92805458b210
Author: Chris Lee <clee@c133.org>
Date: Sat Aug 6 23:34:09 2005 +0000
EXA support in the modular build.
commit 33326f4ee884aa677e4568c3eaed4311a8ed0f2a
Author: Chris Lee <clee@c133.org>
Date: Sat Aug 6 23:27:33 2005 +0000
Adding exa support to the modular server.
commit b90a88e80310e5650e2abed4c151889d9c0bd316
Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
Date: Sat Aug 6 19:48:12 2005 +0000
Add checks for functions used in os/access.c & os/connection.c:
getdtablesize(), getifaddrs(), getpeereid(), getpeerucred()
commit 2304c14fe5d3796c557a86d0ece1f0fb92591469
Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
Date: Sat Aug 6 19:14:24 2005 +0000
Fix endian test to work on big-endian platforms correctly
commit fc29d014aa586229cdc976aa1bfe38bd949f7cde
Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
Date: Sat Aug 6 16:29:20 2005 +0000
Merge in patch release RC handling code from 6.8.2 (Kevin Martin)
commit 9828a38ed695fed9788ace8bba575e521fa354b7
Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
Date: Sat Aug 6 03:14:50 2005 +0000
Solaris build fixes needed for modular builds
commit f51047c0b6749ae8f04925eb62706b4743328383
Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
Date: Fri Aug 5 15:43:31 2005 +0000
Fix 32-bit vs. 64-bit test for Solaris
commit 4220a0c4ccd0672460d31db239829384aee69f9a
Author: Matthew Allum <breakfast@10.am>
Date: Fri Aug 5 09:08:32 2005 +0000
Make Xephyr work without shadow fb
commit fedbce2186bbe3bd8d23a4d74c35f10286930a7d
Author: Adam Jackson <ajax@nwnk.net>
Date: Fri Aug 5 00:13:31 2005 +0000
EXTRA_DIST hacks to get all the OS support files into the tarball.
commit 39a80312e0c6e9f3b260d2f8279c71aef0a60d12
Author: Adam Jackson <ajax@nwnk.net>
Date: Thu Aug 4 22:31:20 2005 +0000
- Bug #3960: Add remaining GLX and pci.ids stuff to DIST (Cha Young-Ho,
Olli Helenius)
- Fix some distcheck problems for non-solaris systems
- Change server version number from the Xorg rev to an independent one
- _POSIX_SOURCE and _XOPEN_SOURCE defined to the right values
commit ed4d77a16a226a7bc88d0d4f5c595d16cdf46360
Author: Søren Sandmann Pedersen <sandmann@daimi.au.dk>
Date: Thu Aug 4 21:05:12 2005 +0000
Thu Aug 4 16:08:00 2005 Søren Sandmann <sandmann@redhat.com>
Make the fbCompose paths use the existing inline functions instead of
macros. Various other cleanups.
Remove macro definitions, move typedef to fbmmx.c
commit e62be6d2721e7f43c7bba6b8da4e5ec8c364697d
Author: Adam Jackson <ajax@nwnk.net>
Date: Thu Aug 4 18:45:46 2005 +0000
- Check for vsnprintf
- Don't build the Xorg DDX on darwin
- Workaround for gcc defining __ppc__ but not __powerpc__
commit 13bec87f45509452c643e20745e12878584d606a
Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
Date: Thu Aug 4 02:39:56 2005 +0000
Fix inline assembly versions of in*/out* for Sun compilers Add check for
ancient USL console code on Solaris to allow building on old Solaris
x86 versions
commit 9802106864a6b2c24df8e9fcb3c3471033abd5c6
Author: Adam Jackson <ajax@nwnk.net>
Date: Wed Aug 3 01:41:34 2005 +0000
dist fixes for cw and GL (Donnie Berkholz, me)
commit d7c246f35b1ba7ecbbc086dd1229b298faddec96
Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
Date: Tue Aug 2 23:57:52 2005 +0000
Only build ix86Pci.c on x86 & amd64 platforms Set DEFAULT_INT10 to x86emu
on everything but Linux/x86 Fix Sbus.c inclusion on sparc platforms
commit 3d0d95004c65cd3a29c94fec99e13ab7fdc19c7c
Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
Date: Tue Aug 2 20:47:47 2005 +0000
Add check for walkcontext() to enable stack trace dumper on Solaris
commit bb5258a21d9efbb7d8b4226a44bd5738eb46d32a
Author: Keith Packard <keithp@keithp.com>
Date: Tue Aug 2 17:57:36 2005 +0000
Mark generated files as BUILT_SOURCES and CLEANFILES to ensure they are
regenerated after 'make clean' and to make parallel builds work right.
commit 0c608a690e85064345d7ebdf6b03e2f3bd861708
Author: Keith Packard <keithp@keithp.com>
Date: Tue Aug 2 06:48:20 2005 +0000
Note yacc and lex generated files as BUILT_SOURCES so they are created
before anything is compiled; required for parallel builds
commit d31de217e6e9bfb0e1cc99141d80def9382de9a9
Author: Adam Jackson <ajax@nwnk.net>
Date: Tue Aug 2 03:36:09 2005 +0000
distcheck fixes
commit c83772fef7ea0379db9bab1120f064b80b74f377
Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
Date: Tue Aug 2 01:50:48 2005 +0000
Set OSNAME for "Build Operating System" line in Xorg log
commit 005a9cf1f5fe688f303b954870afd35635fc33bf
Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
Date: Tue Aug 2 01:03:25 2005 +0000
Fix Solaris assembly source to work with libtool
commit 48b130285ad1309a1ff5b2148b3bae5f5b642488
Author: Adam Jackson <ajax@nwnk.net>
Date: Tue Aug 2 00:47:08 2005 +0000
Move AM_CONDITIONAL for ia64 to global scope
commit 03379474e0fd9c21ac058e2319618934359b3262
Author: Adam Jackson <ajax@nwnk.net>
Date: Tue Aug 2 00:45:30 2005 +0000
only do the AS_HELP_STRING workaround once, d'oh
commit 2d7b1893befb84850f3221cbe70b3bce4e621d63
Author: Adam Jackson <ajax@nwnk.net>
Date: Tue Aug 2 00:41:07 2005 +0000
- Workaround for AS_HELP_STRING compatibility with older autoconf.
- New intermediate build target for Xorg server
- ia64 fixes
commit 7c84189ea1dc236bc979bb4bf158ecb1a6b45137
Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
Date: Mon Aug 1 22:22:16 2005 +0000
Bugzilla #3566 <https://bugs.freedesktop.org/show_bug.cgi?id=3566> Patch
#2906 <https://bugs.freedesktop.org/attachment.cgi?id=2906> Fix for
RENDER, repeating pictures and offscreen memory (Owen Taylor)
commit 2acd29c93fd3b3d438887f0ca9be6713db81c1e8
Author: Adam Jackson <ajax@nwnk.net>
Date: Mon Aug 1 22:13:20 2005 +0000
Bump autoconf dependency to 2.57 from 2.53. Add 2.57 compatibility hack for
the new AS_HELP_STRING syntax from 2.58+.
commit b7a43fa0f112d92cce71642142e07276da4de681
Author: Adam Jackson <ajax@nwnk.net>
Date: Mon Aug 1 19:00:21 2005 +0000
Bug #3739: Fail soft on unknown extension string.
commit 0285804811bd24ad7de8894f8188b87e821e54cc
Author: Adam Jackson <ajax@nwnk.net>
Date: Mon Aug 1 18:41:54 2005 +0000
GLX fix for loadable servers: indirect_size.c goes in libglx, not libGLcore
commit 78d51253e229bcb428039911d80a5d89d4bf4491
Author: Søren Sandmann Pedersen <sandmann@daimi.au.dk>
Date: Mon Aug 1 16:07:14 2005 +0000
Fri Jul 29 17:20:53 2005 Søren Sandmann <sandmann@redhat.com>
Fix rounding bug.
commit fd84b3b56280ef88a8c848c4338f0bea906ce6d8
Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
Date: Sat Jul 30 18:56:32 2005 +0000
Clear compiler warnings. (Stefan Dirsch)
commit 9e9f9cb4878d597b3fa6de7732d2866e24c32f54
Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
Date: Fri Jul 29 21:55:57 2005 +0000
Need to define SVR4 on SVR4-ish systems since many headers and source files
check for it, expecting Imake to have defined it already. (Should be
replaced with more specific checks & defines, but there's too many to
get them all right now.)
commit 14ade55b83aa72240a555b3b9def9f40a6a38cd9
Author: Kevin E Martin <kem@kem.org>
Date: Fri Jul 29 21:22:58 2005 +0000
Various changes preparing packages for RC0:
- Verify and update package version numbers as needed
- Implement versioning scheme
- Change bug address to point to bugzilla bug entry form
- Disable loadable i18n in libX11 by default (use --enable-loadable-i18n to
reenable it)
- Fix makedepend to use pkgconfig and pass distcheck
- Update build script to build macros first
- Update modular Xorg version
commit 2654f88cee86fae9db169dc8668492857fbbad98
Author: Kevin E Martin <kem@kem.org>
Date: Fri Jul 29 18:40:54 2005 +0000
Fix code to handle printing 7.0 release candidates properly.
commit d5d669b04ecbd91bb2db9ddc6238acabbeaabbe0
Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
Date: Thu Jul 28 23:33:57 2005 +0000
If neither --enable-dmx or --disable-dmx are specified, default to "yes" on
Linux, "no" on everything else (matches defaults in monolith Imake)
commit 86529c07d6ff69ef936ee370be07b373e2961360
Author: Kevin E Martin <kem@kem.org>
Date: Thu Jul 28 23:28:34 2005 +0000
Fix distcheck for server
commit 3e4bf8a8f46e14078c64c56ad303c80cd9d8d5be
Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
Date: Thu Jul 28 02:38:23 2005 +0000
Rework wrapping of common mouse driver to not require mousePriv.h, so that
modular tree xserver can be built on Solaris. Wrap more ioctls in
SYSCALL() to restart on signals.
commit cfd6c74067de7fdb2aeddee6780c29231a56acdc
Author: Søren Sandmann Pedersen <sandmann@daimi.au.dk>
Date: Wed Jul 27 17:50:13 2005 +0000
Add dbestruct.h to sdk_HEADERS
commit 5ced854186b851ba2c9ac84eb6d7f141fdee487b
Author: Søren Sandmann Pedersen <sandmann@daimi.au.dk>
Date: Wed Jul 27 17:35:25 2005 +0000
Add miwideline.h mistruct.h mifpoly.h to sdk_HEADERS
commit 7bd6b0640e69552ed4c9daac26e41410dd7338b4
Author: Kevin E Martin <kem@kem.org>
Date: Wed Jul 27 08:16:35 2005 +0000
Add #include <dmx-config.h> for building dmx/glxProxy in the modular tree.
commit b9ccd89918e1c79d6013fe563c7fa933c1274837
Author: Kevin E Martin <kem@kem.org>
Date: Wed Jul 27 08:11:26 2005 +0000
Fix dmx/glxProxy build
commit 8f6664fcff319ee155e7864ce25fa11c1fa5594b
Author: Søren Sandmann Pedersen <sandmann@daimi.au.dk>
Date: Tue Jul 26 23:40:45 2005 +0000
Add these files to the sdk:
cbf32.h cfb16.h cfbmap.h cfbunmap.h cfbunmap.h cfbmskbits.h xf86sbusBus.h
mifillarch.h mispans.h
commit 3cbb55f309b8eaba246d1d948b59883f9ed28bf4
Author: Søren Sandmann Pedersen <sandmann@daimi.au.dk>
Date: Tue Jul 26 22:17:27 2005 +0000
Install xorgVersion.h
commit df5d47560c19b01f2998806c4b62f459a6b5fc02
Author: Søren Sandmann Pedersen <sandmann@daimi.au.dk>
Date: Tue Jul 26 18:56:45 2005 +0000
xserver/xorg/fb/Makefile.am: install fboverlay.h
commit b25e6f82a1189a67208a2a4980d732ab77e64a35
Author: Søren Sandmann Pedersen <sandmann@daimi.au.dk>
Date: Tue Jul 26 18:21:22 2005 +0000
fb/Makefile.am: add fbpseudocolor.h to sdk_HEADERS
hw/xfree86/xaa/Makefile.am: add xaaWrapper.h to sdk_HEADERS
commit e7502158d6922a149d0aaf1de209f0b58fa444bf
Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
Date: Sun Jul 24 16:24:17 2005 +0000
Add xf86DeallocateGARTMemory stub so that Xorg can be built on Solaris
again.
commit 7c1148c0fbc00716bb7ec621a1b968b4127cbb00
Author: Adam Jackson <ajax@nwnk.net>
Date: Sat Jul 23 19:32:57 2005 +0000
Fire the Mesa symlink script from the configure stage.
commit f331a325447449982efba8adc5bc079371dfb77a
Author: Adam Jackson <ajax@nwnk.net>
Date: Sat Jul 23 19:29:58 2005 +0000
Add the symlink script for the Mesa source.
commit a5532e456d763718036e84891ff57c6f7417615a
Author: Stuart R. Anderson <anderson@netsweng.com>
Date: Sat Jul 23 18:16:06 2005 +0000
Change the default depth back to 8 like it was originally. Disable the
addition of depth 12 & 30. It causes more than MAXFORMATS depths to be
added to the screen which causes an array in the Screen structure to
overflow and crash on server reset.
commit d8a1241a24d75c258548875350bff4d0acc795ab
Author: Stuart R. Anderson <anderson@netsweng.com>
Date: Sat Jul 23 17:49:45 2005 +0000
Add a safety check to catch when numDepths GCperDepthexceeps MAXFORMATS
commit 93d29b4554d26b22ca43311264f85ea8e14804c2
Author: Adam Jackson <ajax@nwnk.net>
Date: Sat Jul 23 02:04:39 2005 +0000
Emit makefiles for glapi, slang, and grammar. Conditionally define GLX_LIBS
if GLX support is requested. Add GLX_LIBS to the link deps for Xvfb and
Xnest. All GLX support should work now for the vfb, xnest, and xfree86
DDXes.
commit 525d663ec5a8a181a1e36f3787b24cdb77290c17
Author: Adam Jackson <ajax@nwnk.net>
Date: Sat Jul 23 02:02:18 2005 +0000
glapi build (forgot this one somehow)
commit 6aaceef3231818682dccf1969b211f1dc798da1f
Author: Adam Jackson <ajax@nwnk.net>
Date: Sat Jul 23 02:00:52 2005 +0000
Fix the build system to reflect the rest of the Mesa core. Almost links,
needs a code fix to Mesa though.
commit d7e2cadb13ef0e77d864c8282489f544b0e1dede
Author: Adam Jackson <ajax@nwnk.net>
Date: Thu Jul 21 02:29:05 2005 +0000
GLX needs gl.h from Mesa too
commit bf32f4739c6ef7f41cde6cc409d42e00462402fb
Author: Alan Hourihane <alanh@fairlite.demon.co.uk>
Date: Tue Jul 19 20:51:46 2005 +0000
programs/Xserver/hw/xfree86/os-support/shared/agp_noop.c
programs/Xserver/hw/xfree86/os-support/linux/lnx_agp.c
programs/Xserver/hw/xfree86/os-support/xf86_OSproc.h
//bugs.freedesktop.org/show_bug.cgi?id=3164> Add xf86DeallocateGARTMemory()
function call (Austin Yuan)
commit 931abdba8410bf1188d69d54c57543a21ea36968
Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
Date: Tue Jul 19 02:50:00 2005 +0000
Change #include "X.h" to <X11/X.h>
commit 4f2e731aba0c5694abb65a877395cc5f9869c556
Author: Daniel Stone <daniel@fooishbar.org>
Date: Sun Jul 17 07:34:31 2005 +0000
objdir != srcdir fixes.
commit a6bd7ad985e138874bb0e1f33f545651dfde32a9
Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
Date: Sun Jul 17 01:52:33 2005 +0000
Set GLX automake conditional after we've tested for mesa source and set GLX
to "no" if it's --with-mesa-source wasn't set.
commit ead37b08699f665a856c7ba29578c27c27db4100
Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
Date: Sat Jul 16 20:52:25 2005 +0000
Mark variables modified in signal handlers as volatile (part of Sun bug id
4496504)
commit bbb49449cbc0815fd9c4faf9b6ee32be99a8aa3d
Author: Adam Jackson <ajax@nwnk.net>
Date: Sat Jul 16 16:30:40 2005 +0000
Fix --with-mesa-source parsing, and turn GLX off if no path to Mesa given.
commit d69e9872ae91c9c17a33e1ed763f98453d950b39
Author: Adam Jackson <ajax@nwnk.net>
Date: Sat Jul 16 16:29:30 2005 +0000
Typo fix, and re-add GLcore to the dixmods build
commit 8bc883c48c8f99502707998a8257c0563cae7d3a
Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
Date: Sat Jul 16 09:00:44 2005 +0000
Update build instructions. Add details about how the expat, fontconfig,
libpng, freetype, and xterm builds are now handled.
Update text docs from SGML masters.
commit 8e600b87643f7f4e19923dd6a0f2eec83303363a
Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
Date: Sat Jul 16 07:39:48 2005 +0000
Only pass -rdynamic when using gcc
commit 4f04e26c69747929243f176feaa90f3042481f53
Author: Adam Jackson <ajax@nwnk.net>
Date: Sat Jul 16 04:30:33 2005 +0000
Say --with-mesa-source to get GLcore built.
commit 4913316f25e76381844cf15aa64eff620c2807a1
Author: Adam Jackson <ajax@nwnk.net>
Date: Sat Jul 16 04:29:28 2005 +0000
Switch to MESA_SOURCE which we're already AC_SUBSTing
commit 7facb209a705ca406b05272c233ea0cfd6a5b266
Author: Adam Jackson <ajax@nwnk.net>
Date: Sat Jul 16 04:24:21 2005 +0000
Hook in the GLcore build
commit 2f9a7c6ee1012b2c7664c53f405affaf82bd0953
Author: Adam Jackson <ajax@nwnk.net>
Date: Sat Jul 16 04:13:33 2005 +0000
Hey look, GLcore links
commit 5f81eb1d89f623dd9281e686a4d4d4f403e459c6
Author: Kevin E Martin <kem@kem.org>
Date: Sat Jul 16 03:49:59 2005 +0000
Fix the *-config.h includes so that it is possible to build modules without
having to use -include in the Makefile.
commit 0635acab08bade9bfd9d2abd3ea5a3fe525bc647
Author: Kevin E Martin <kem@kem.org>
Date: Sat Jul 16 03:46:01 2005 +0000
Add record module building support Change module building to not use
-include Fix xnest, dmx and vfb builds to -DXFree86Server for fbcmap
compilation
commit 92b23ff426936909e1ff5e063b75e5f112b93ca1
Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
Date: Sat Jul 16 01:17:52 2005 +0000
Update to match recent changes to pci.ids & extrapci.ids for people
building on systems without perl.
commit 6ce3743948a7151c721194594091a7e1183e2f32
Author: Adam Jackson <ajax@nwnk.net>
Date: Sat Jul 16 00:51:14 2005 +0000
start the GLcore build system
commit 2f0487521da3da6784dd964c915071b82d749108
Author: Kevin E Martin <kem@kem.org>
Date: Fri Jul 15 23:08:31 2005 +0000
Fix the *-config.h includes for the files that have moved in the modular
tree.
commit a407fa373bb72f29050e3f027042011075b3bdf0
Author: Kevin E Martin <kem@kem.org>
Date: Fri Jul 15 22:51:05 2005 +0000
Move drm up to os-support since the files are shared by multiple platforms.
Fix the dri and drm build. Fix server-side DMX extension build. Make
xf4bpp use the correct version of mfbline.c for mfbseg.c. Add #ifndef
_HEADERNAME_H_/#define _HEADERNAME_H_/.../#endif to the headers.
commit eb6fa0dc15516a0a436090efc6d85f22baeec015
Author: Adam Jackson <ajax@nwnk.net>
Date: Fri Jul 15 22:14:28 2005 +0000
Enable GLX build by default
commit 0e352a8b2b4c78c291074b9531ed7afa7a20ac17
Author: Adam Jackson <ajax@nwnk.net>
Date: Fri Jul 15 21:59:39 2005 +0000
disable GLcore momentarily until a build system exists. --enable-glx should
work now.
commit 4bf453086418e93e81b24d3d2a0f49a9357acff3
Author: Kevin E Martin <kem@kem.org>
Date: Fri Jul 15 05:48:29 2005 +0000
Fix keyboard state when XEVIE is not enabled (Keith Packard).
commit 562acf2e69dcf08f8db8f8eeaa162949d45f70b2
Author: Søren Sandmann Pedersen <sandmann@daimi.au.dk>
Date: Thu Jul 14 23:41:15 2005 +0000
Add -I$(top_builddir)/hw/xfree86/dixmods/extmod to Xext/Makefile.am Patch
from Stefan Dirsch
commit defeb56fc9559661fa632935a4c76c500c7edcf4
Author: Kevin E Martin <kem@kem.org>
Date: Thu Jul 14 22:20:16 2005 +0000
Fix the build when DRI is enabled
commit 6b546d0ec07e493b501e82300b3e6c143cd4d0ac
Author: Kevin E Martin <kem@kem.org>
Date: Thu Jul 14 03:36:44 2005 +0000
Add #include <xnest-config.h> to the Xnest source files for modularization.
commit 7375f4d13626bbba4204e2f08f41c212b2eed992
Author: Kevin E Martin <kem@kem.org>
Date: Thu Jul 14 03:32:09 2005 +0000
Add support for Xnest
commit c582560c62fd8181b7521e470f118a59c418a95f
Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
Date: Thu Jul 14 02:59:34 2005 +0000
Add partial in*/out* assembly support for Sun compilers on x86
commit 64bf3a81a3212dc2c0f55aebdc74a618ca6a32c0
Author: Adam Jackson <ajax@nwnk.net>
Date: Thu Jul 14 02:53:31 2005 +0000
loadable extmod build system.
commit 6c96e0c9e4b3f1e8dfa5dcf7366bb838dc0724ec
Author: Adam Jackson <ajax@nwnk.net>
Date: Thu Jul 14 01:36:58 2005 +0000
loader support for extmod
commit 8ea4a1b759eae0279ce619c663f2cd2f6dee8d71
Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
Date: Thu Jul 14 01:00:39 2005 +0000
First pass at Solaris os-support
commit f07e905553783dc0133015bcbf94d3b6be68b19c
Author: Søren Sandmann Pedersen <sandmann@daimi.au.dk>
Date: Thu Jul 14 00:28:47 2005 +0000
- Add build system for xf86-video-ati
- Add build system for xserver/xorg/hw/xfree86/dri
- Add glcore.h to symlink.sh
- Symlink.sh: add some more DRI files, symlink glcore.h from
extras/Mesa/include/GL/internal to proto/GL
- proto/GL/Makefile.am: install glcore.h
- xf86-video-ark: s/module-dir/xorg-module-dir/
commit 939b7720f17ec5ac5edcc6cfe70453160ecb0161
Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
Date: Thu Jul 14 00:02:05 2005 +0000
Merge SVR4/pre-Solaris 8 and Solaris 8+ sections for greater consistency,
easier maintenance, and to fix some missing headers when building the
modular Xorg on Solaris.
commit 23d25a656d7fdbafa1c78be2950fb405f0a1b87b
Author: Adam Jackson <ajax@nwnk.net>
Date: Wed Jul 13 23:41:21 2005 +0000
Remove references to DDX-specific extensions
commit f4626bb72b9955846abee018ae31c1aeb51b8dbf
Author: Adam Jackson <ajax@nwnk.net>
Date: Wed Jul 13 22:59:39 2005 +0000
dlloader is the default in 6.9, but the loader doesn't get told to prefer
dlloader modules unless you -DDLOPEN_HACK.
commit 4f38526566dbcc296d124bb852adfa30ac4d927e
Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
Date: Wed Jul 13 22:54:02 2005 +0000
- Use fbdevhwstub.c if <linux/fb.h> is not found
- Use x86emu on Solaris instead of vm86
- Better per-OS control over which xf86Kbd*.c and *Pci.c files to build
- Set various #defines to be defined or not on Solaris as needed
commit db8aa17f15f62f243400b0267bf281dd27738644
Author: Adam Jackson <ajax@nwnk.net>
Date: Wed Jul 13 22:19:36 2005 +0000
updated comment for libbitmap
commit 4f9e76ed6a61b414ffc94550727a138c3f73996f
Author: Adam Jackson <ajax@nwnk.net>
Date: Wed Jul 13 22:09:52 2005 +0000
Dear libtool: Loadable modules do not need version numbers. kthnxbye.
commit 40ad7321f5d8d216523d575c4414736d8cfe9e88
Author: Adam Jackson <ajax@nwnk.net>
Date: Wed Jul 13 21:52:51 2005 +0000
Generate useful loadable modules by actually linking in the blobs from the
DIX
commit 0e08818d3951c324e5953bd23a8a9457b3fec78f
Author: Adam Jackson <ajax@nwnk.net>
Date: Wed Jul 13 21:41:02 2005 +0000
Hook dbe into the build
commit 2d4ddb5606b7328c591a7bffafbb49bdaf2adcf9
Author: Adam Jackson <ajax@nwnk.net>
Date: Wed Jul 13 21:36:27 2005 +0000
double-buffering extension
commit c2ec9fbb15c776b9c64451cf32927b1b8d1c560c
Author: Kevin E Martin <kem@kem.org>
Date: Wed Jul 13 21:17:53 2005 +0000
Only build Xi/stubs.c on DDXs that don't support the Xinput extension
commit 74a534f63c1ed016f24dbc3ca31f05b81076e8f0
Author: Søren Sandmann Pedersen <sandmann@daimi.au.dk>
Date: Wed Jul 13 20:19:38 2005 +0000
xc/programs/Xserver/hw/xfree86/drivers/i2c/*.c: include xorg-config.h
instead of config.h xserver/xorg/hw/xfree86/i2c/Makefile.am: Add i2c
drivers
commit 1dc3e96e4077a912dd3aa13fa80099f5864b641f
Author: Torrey Lyons <torrey@mrcla.com>
Date: Wed Jul 13 16:30:53 2005 +0000
Fix compilation where uint is not defined.
commit 19e20c1470c1f8d15f2a78fb29545bde06a65516
Author: Lars Knoll <lars@trolltech.com>
Date: Wed Jul 13 08:58:37 2005 +0000
don't clobber %ebx in the assembler.
commit bfb10bd2dcca65ba5d346c9d7da594a81c35c101
Author: Lars Knoll <lars@trolltech.com>
Date: Wed Jul 13 07:28:17 2005 +0000
Fix potential buffer overflow and a smaller bug in the convolution filter
commit 778a2703b233641e298fa81ef9c477943c496305
Author: Lars Knoll <lars@trolltech.com>
Date: Wed Jul 13 07:12:33 2005 +0000
fix compilation
commit 66bc36473c238fdee7e6c1d31e6e5f6813a7541a
Author: Daniel Stone <daniel@fooishbar.org>
Date: Tue Jul 12 23:36:27 2005 +0000
Use builddir, not srcdir, for built files.
commit d6808a48d2dffd72f618fa372fba993736638799
Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
Date: Tue Jul 12 18:16:03 2005 +0000
Fix scanpci -v core dump when subsys vendor/device id's are NOVENDOR &
NODEVICE. Bug #3763 <https://bugs.freedesktop.org/show_bug.cgi?id=3763>
Patch #3074 <https://bugs.freedesktop.org/attachment.cgi?id=3074>
commit cda9c7b2678ea08ac6176a9eee72e6e511134b8e
Author: Lars Knoll <lars@trolltech.com>
Date: Tue Jul 12 14:50:10 2005 +0000
add x86emu.
commit 41002623f314444bd416fd5f445a0425c5b59df0
Author: Lars Knoll <lars@trolltech.com>
Date: Tue Jul 12 10:02:10 2005 +0000
Add MMX Code paths for the basic composition operations in
fbComposeGeneral.
commit 697cf74fb50a550b8f7e124dc8f463a55519795f
Author: Keith Packard <keithp@keithp.com>
Date: Tue Jul 12 03:09:20 2005 +0000
Make Xprt run when linked against Xlib for Xrm
commit 419448ea7b0d7f672e568cb1d8b4e190a1f54825
Author: Adam Jackson <ajax@nwnk.net>
Date: Tue Jul 12 03:03:16 2005 +0000
Pull libdri out of the build for now until I get something better worked
out
commit f054bf2ff6b94e285e7f2d174163c01b07b07143
Author: Adam Jackson <ajax@nwnk.net>
Date: Tue Jul 12 01:29:41 2005 +0000
build fix
commit 02427d4d04f70109a499578c6762654463ebdae4
Author: Kevin E Martin <kem@kem.org>
Date: Tue Jul 12 01:20:36 2005 +0000
Add support for building Xdmx and Xvfb
commit 3fe6b5bb30e8e1b9017a9cf818fcceb279a28e65
Author: Adam Jackson <ajax@nwnk.net>
Date: Tue Jul 12 01:17:39 2005 +0000
GLX server support
commit 377e3bddd4d73154520a9582d75de2b20ae532a5
Author: Adam Jackson <ajax@nwnk.net>
Date: Tue Jul 12 00:55:43 2005 +0000
Forgot to add these for some reason
commit e348ac4b4dfb1112c19fe5fe5441182e66716087
Author: Kevin E Martin <kem@kem.org>
Date: Tue Jul 12 00:52:48 2005 +0000
Prepare Xdmx and Xvfb for modularization by adding appropriate #include
<{dix,dmx}-config.h> to the source files.
commit b7a9a6a03560bdf6584c71bf0b546301bba9ab89
Author: Kevin E Martin <kem@kem.org>
Date: Mon Jul 11 17:52:00 2005 +0000
Remove unneeded xf86drm.h includes to fix modular build.
commit cf4dfd650dbc2bb65eae4eea2acfb4a4c5295548
Author: Adam Jackson <ajax@nwnk.net>
Date: Mon Jul 11 02:29:50 2005 +0000
Prep for modular builds by adding guarded #include "config.h" everywhere.
commit c5548086f3864c828f0cad65d2708cefd2025947
Author: Adam Jackson <ajax@nwnk.net>
Date: Mon Jul 11 00:42:52 2005 +0000
Start filling in glx build. Add xf86Version.h and a few DRI headers to the
sdk (needed for modular driver builds).
commit 955fe17133d841758a18072a9acabedc81dc4562
Author: Adam Jackson <ajax@nwnk.net>
Date: Sun Jul 10 21:45:55 2005 +0000
add some convenience variables for the drivers
commit 78fab90230c61241af29f0c94f401ce0bc749b6b
Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
Date: Sat Jul 9 16:51:58 2005 +0000
Bug #3740 <https://bugs.freedesktop.org/show_bug.cgi?id=3740> Patch #3058
<https://bugs.freedesktop.org/attachment.cgi?id=3058>
08-Jul-2005 nv driver updates from Mark Vojkovich:
Change some console restore code for NV11. Hopefully, we can more reliably
restore the console for desktop systems using DVI. This may correct a
recent regression on NV11.
Also, new PCI IDs.
Add new nVidia PCI ids to match nv_driver.c changes.
commit 3c92389185f0c9fa3b8c299a084b10c12bcab52c
Author: Zack Rusin <zack@kde.org>
Date: Sat Jul 9 14:15:35 2005 +0000
Patch from Thomas Winischhofer to kick out all pixmaps to system ram upon a
VT switch and vice versa when returning.
commit 327741486e807c068383a771c04c9042b0589c37
Author: Adam Jackson <ajax@nwnk.net>
Date: Sat Jul 9 02:22:29 2005 +0000
Don't try to link fb, shadow, or vgahw into the loadable Xorg server, as
they're only supposed to be loadable modules.
commit 2b8e4db9ac4b4c8f8fd73c00436d6abec2faa535
Author: Adam Jackson <ajax@nwnk.net>
Date: Fri Jul 8 20:27:30 2005 +0000
-lXfont isn't enough for libbitmap, you need to get the -L from pkg-config
commit e84648df7d7eb700b7c2d35fdef0be1f463853fa
Author: Zack Rusin <zack@kde.org>
Date: Fri Jul 8 17:07:52 2005 +0000
mark drawable as dirty on copying/painting windows
commit 4ab73a73f4aa1f02cc8dada185b5dcbddfe43878
Author: Zack Rusin <zack@kde.org>
Date: Fri Jul 8 07:43:00 2005 +0000
heh, oops (thanks Thomas)
commit 0a28516a6e641b41e674f69fc228b0babbe1743b
Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
Date: Thu Jul 7 19:07:28 2005 +0000
More compiler warning fixes for missing prototypes:
Add prototype for XkbSetExtension()
Add #include <ctype.h> for isspace() & isdigit()
Add #include <grp.h> (for initgroups()) and remove extra *
Add prototype for xorgGetVersion()
commit 2c3c4060fd2a52f147eda01b11222c341c6e3dee
Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
Date: Thu Jul 7 16:18:52 2005 +0000
Bug #2901 <https://bugs.freedesktop.org/show_bug.cgi?id=2901> Add prototype
for XdmAuthenticationInit() (Peter Breitenlohner)
commit d0dc574adb79ffacf90b786d4ccfcd1cd8598728
Author: Zack Rusin <zack@kde.org>
Date: Thu Jul 7 15:05:02 2005 +0000
Check vtSema before accelerating primitives and sync in fallbacks only if
we got vtSema
commit 6cba5f1260c20b3bc072fdcc5f3e49fa28ba6414
Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
Date: Thu Jul 7 14:59:48 2005 +0000
Bug #2901 <https://bugs.freedesktop.org/show_bug.cgi?id=2901> Patch #2332
<https://bugs.freedesktop.org/attachment.cgi?id=2332> This patch avoids
79 gcc-3.4.3 warnings 'xxx' declared `static' but never defined mostly
due to including "ftfuncs.h" with the declaration of static functions
defined in "ftfuncs.c". (Peter Breitenlohner)
commit 7da3f4a786d9b61f4129c7dbbef80c84abbfde68
Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
Date: Thu Jul 7 03:12:40 2005 +0000
Bug #2901 <https://bugs.freedesktop.org/show_bug.cgi?id=2901> Fix warnings
about redefined macros (Peter Breitenlohner)
commit f86562540d1c945bfd96d4b89259d81e4ed25255
Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
Date: Thu Jul 7 02:47:06 2005 +0000
Bug #2901 <https://bugs.freedesktop.org/show_bug.cgi?id=2901> Patch #2325
<https://bugs.freedesktop.org/attachment.cgi?id=2325> Avoid 38
gcc-3.4.2 warnings: suggest parentheses around assignment used as truth
value suggest explicit braces to avoid ambiguous `else' suggest
parentheses around && within || suggest parentheses around arithmetic
in operand of ^ "/*" within comment (Peter Breitenlohner)
Bug #2901 <https://bugs.freedesktop.org/show_bug.cgi?id=2901> Patch #2326
<https://bugs.freedesktop.org/attachment.cgi?id=2326> This patch
removes these 2 gcc-3.4.3 warnings: missing braces around initializer
implicit declaration of function `XpOidTrayMediumListHasTray' (Peter
Breitenlohner)
commit 4047191124c237518110e698bde6dab445644449
Author: Damien Ciabrini <braun@club-internet.fr>
Date: Wed Jul 6 15:34:22 2005 +0000
Added hardware support for transformation matrix (zoom, rotation, etc...).
Fixed the composition function for RGB and A8 format. Avoid syncing
hardware after HW fills or copies.
commit 4073f24c90d4aff3f7d83af4c0e733eed082b53b
Author: Alan Hourihane <alanh@fairlite.demon.co.uk>
Date: Wed Jul 6 15:14:30 2005 +0000
add missing PictureTransformPoint3d call
commit c48f631cdb6a279ab1a24a486b05956cfa9ca3da
Author: Damien Ciabrini <braun@club-internet.fr>
Date: Wed Jul 6 13:57:41 2005 +0000
Fix offset alignment code in the offscreen memory allocator to prevent
textures from being allocated in the next free memory area.
commit baa99be190c51b533bf8748c6c6a9bce62594e96
Author: Ian Romanick <idr@us.ibm.com>
Date: Wed Jul 6 07:16:19 2005 +0000
Put the correct value in the length field of the reply. Previously, the
number of tag/date pairs was specified. This was incorrect. The correct
value is the number of values (one for the tag and one for the value).
Xorg bug: #3210
commit 6ba4a2e78a73858648b5b6a39306446d519c3a75
Author: Alexander Gottwald <alexander.gottwald@s1999.tu-chemnitz.de>
Date: Tue Jul 5 23:01:51 2005 +0000
Add more defines for XWin DDX Make building of cfb*, afb and mfb
conditional Set FD_SETSIZE=256 on cygwin
commit 71ed3ae0c696152e82a98ce2ac0fa67ce6f23464
Author: Alexander Gottwald <alexander.gottwald@s1999.tu-chemnitz.de>
Date: Tue Jul 5 22:58:29 2005 +0000
wrap fInternalWM with XWIN_MULTIWINDOWEXTWM
commit 456844a613240ce56181f6f3ec7873be9b2dc85d
Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
Date: Tue Jul 5 18:42:32 2005 +0000
Remove Speedo font module documentation.
Remove Speedo from list of font directories
Update default font path to remove Speedo, add TTF.
commit 20c15003f9648de0c03f7d4fa4508afd896b19f5
Author: Alexander Gottwald <alexander.gottwald@s1999.tu-chemnitz.de>
Date: Tue Jul 5 18:25:44 2005 +0000
Fix crash on server shutdown
commit d72fef26d44e649f39a56730830148d48d77ee9e
Author: Alexander Gottwald <alexander.gottwald@s1999.tu-chemnitz.de>
Date: Tue Jul 5 17:52:35 2005 +0000
Fix simultanious presses of Left and Right Control and Shift keys.
https://bugs.freedesktop.org/show_bug.cgi?id=3677
commit 0f2c8221c938ce8eebd9f0e111a6b87223c18f9e
Author: Alexander Gottwald <alexander.gottwald@s1999.tu-chemnitz.de>
Date: Tue Jul 5 16:35:42 2005 +0000
Fix typo which broke window titles
commit 0bb2eb8eaaf4054fefbc45bf3cb47bbcf10b7cfd
Author: Alexander Gottwald <alexander.gottwald@s1999.tu-chemnitz.de>
Date: Tue Jul 5 15:43:20 2005 +0000
Fix problem with fake Control press on Alt-Gr
https://bugs.freedesktop.org/show_bug.cgi?id=3680
https://bugs.freedesktop.org/show_bug.cgi?id=3497
Fix static declaration of winGetBaseDir
commit 3af77ad3e754c4d419a1996ca73a9fd01f92388a
Author: Alexander Gottwald <alexander.gottwald@s1999.tu-chemnitz.de>
Date: Tue Jul 5 14:09:48 2005 +0000
External windowmanagers could connect in multiwindow mode which lead to
strange results with the internal windowmanager.
commit 426282268bcdd0e0ca973fa79b414e9065fbfd9d
Author: Alexander Gottwald <alexander.gottwald@s1999.tu-chemnitz.de>
Date: Mon Jul 4 23:40:09 2005 +0000
Build miinitext.c and fbcmap.c as DDX specific files
Do not define _POSIX_SOURCE on cygwin.
commit 845a0ac68b02148db6f2cca81debf20b2331607b
Author: Alexander Gottwald <alexander.gottwald@s1999.tu-chemnitz.de>
Date: Mon Jul 4 23:11:20 2005 +0000
Revert last changes. They have to be addressed in a different way
commit 048045a9e714fc85c26028c4de36dff47644b826
Author: Alexander Gottwald <alexander.gottwald@s1999.tu-chemnitz.de>
Date: Mon Jul 4 22:18:40 2005 +0000
Add XWin DDX, make Xorg DDX conditional Make XF86VidMode and XF86Misc
conditional
Add XWin DDX
Added DDXTIME, DDXOSFATALERROR, DDXOSVERRORF and DDXBEFORERESET
Added fbcmap.c
Added miinitext.c
Added -I$(top_srcdir)/Xext/extmod to INCLUDES
commit 508cdb5cb01a91b1bf3ef31da80b6b1d36286bf0
Author: Alexander Gottwald <alexander.gottwald@s1999.tu-chemnitz.de>
Date: Mon Jul 4 22:10:43 2005 +0000
Include xwin-config.h if HAVE_XWIN_CONFIG is defined Cleanup X11 includes
handling Warning fixes
commit 5e50ae22bf206d6c2cc05e772e05fa5a363acb81
Author: Zack Rusin <zack@kde.org>
Date: Mon Jul 4 18:55:53 2005 +0000
remove the temporary debugging output
commit 7586ac6edea64b30d6187f9ec4d867521c1e769c
Author: Adam Jackson <ajax@nwnk.net>
Date: Mon Jul 4 18:41:04 2005 +0000
Bug #2216: Multiseat support. From various Debian and Ubuntu patches by
Aivils Stoss, Andreas Schuldei, Branden Robinson, and Daniel Stone.
commit ba011dc77dcfaea2843481fbba45a76d8cb9aa83
Author: Lars Knoll <lars@trolltech.com>
Date: Mon Jul 4 14:47:03 2005 +0000
don't be too smart and try to replace PictOpOver by PictOpSrc when we have
an external alpha map.
Make fbmmx.c compile on gcc 4.0.1.
commit a4df8ad75579d9c183f110d79d87cfb9aaf23acd
Author: Lars Knoll <lars@trolltech.com>
Date: Mon Jul 4 14:23:59 2005 +0000
Fix handling of "super luminescent" colors Fix off by one error in the
transformation handling.
commit e34f31762e0454930f30547a9407cc8b941c70f2
Author: Zack Rusin <zack@kde.org>
Date: Mon Jul 4 14:15:57 2005 +0000
This fixes the close screen mess (crash reported by Thomas). Also hide the
private Exa screen definition. Properly cleanup on screen close and do
not delete the private screen in the DriverFini call.
commit 4ef813961dc8dea8924a79e0954d5b6da12e77c0
Author: Alexander Gottwald <alexander.gottwald@s1999.tu-chemnitz.de>
Date: Mon Jul 4 09:01:43 2005 +0000
provide the uint datatype on WIN32
commit 7dc547252af3b23652b1d496957645726c7125a4
Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
Date: Mon Jul 4 00:16:23 2005 +0000
Fix builds on non-GLIBC systems (missing __GLIBC_PREREQ). Add Solaris stack
backtrace dumper.
commit d010de6979a6c51a628f2f8e6d7f479a542d1e8b
Author: Daniel Stone <daniel@fooishbar.org>
Date: Sun Jul 3 15:51:23 2005 +0000
Abandon the nostdinc experiment.
commit b0d80e76d28dbc1ee14453950db000bb4d7f377f
Author: Daniel Stone <daniel@fooishbar.org>
Date: Sun Jul 3 12:17:04 2005 +0000
Add missing include paths.
commit 461eb6ebd9273dc3dcd601ee0a0491981a98acd9
Author: Daniel Stone <daniel@fooishbar.org>
Date: Sun Jul 3 12:16:29 2005 +0000
Change HAVE_CONFIG_H to HAVE_DIX_CONFIG_H.
commit c1e69798ad14fb706f5f6de67e3f53df56f524c6
Author: Daniel Stone <daniel@fooishbar.org>
Date: Sun Jul 3 12:15:16 2005 +0000
Add explicit PSZ defines, remove unnecessary dix-config.h include.
Add -DXF86PM, forgotten from last commit.
commit 4e501d35e260775a43f340b3e1a9aa092570aba4
Author: Daniel Stone <daniel@fooishbar.org>
Date: Sun Jul 3 10:51:16 2005 +0000
Remove needless usage of DECkeysym.h.
commit a107f599518a175dd689417b48788a746303966a
Author: Daniel Stone <daniel@fooishbar.org>
Date: Sun Jul 3 09:39:54 2005 +0000
Predicate usage of xf86OSPM functions on #ifdef XF86PM.
Remove needless include of ../input/mouse/mouse.h.
commit 0bb669638f032e61471007b2fa88285aa5d63903
Author: Daniel Stone <daniel@fooishbar.org>
Date: Sun Jul 3 08:53:54 2005 +0000
Change <X11/misc.h> and <X11/os.h> to "misc.h" and "os.h".
commit 401e4580d6dd9867a691045688680ce410f84cb5
Author: Daniel Stone <daniel@fooishbar.org>
Date: Sun Jul 3 07:55:00 2005 +0000
Move misc.h and os.h from proto/X11 to xserver/xorg/include.
commit 46b64bd5c66abb1bb9f3538c887d10867607bfff
Author: Daniel Stone <daniel@fooishbar.org>
Date: Sun Jul 3 07:37:35 2005 +0000
Fix more include paths; add dix-config.h to XKB code.
commit e03198972ca78b03ad13cb49112c03a052bb763b
Author: Daniel Stone <daniel@fooishbar.org>
Date: Sun Jul 3 07:02:09 2005 +0000
Add Xtrans definitions (FONT_t, TRANS_CLIENT) to clean up warnings.
Add XSERV_t, TRANS_SERVER, TRANS_REOPEN to quash warnings.
Add #include <dix-config.h> or <xorg-config.h>, as appropriate, to all
source files in the xserver/xorg tree, predicated on defines of
HAVE_{DIX,XORG}_CONFIG_H. Change all Xfont includes to
<X11/fonts/foo.h>.
commit b8aef6c474ffc6d637bec178674898ea95ccde47
Author: Kevin E Martin <kem@kem.org>
Date: Sun Jul 3 03:28:27 2005 +0000
Fix build issues.
commit 826a6f029faeabaa783a93dfdccca846f9326b58
Author: Daniel Stone <daniel@fooishbar.org>
Date: Sat Jul 2 18:59:44 2005 +0000
Continuing Makefile cleanup; add DIX_CFLAGS and XORG_CFLAGS everywhere.
commit e58c09d31bdf90210e2ec1ef976cea0459cdc02a
Author: Adam Jackson <ajax@nwnk.net>
Date: Sat Jul 2 18:06:05 2005 +0000
Bug #3687: Print backtraces on fatal signal on glibc systems.
commit e6602b041fe489d51a1d7fac55cbbb12b1826ba1
Author: Adam Jackson <ajax@nwnk.net>
Date: Sat Jul 2 17:02:23 2005 +0000
Bug #3546: Use MAP_LENGTH instead of a magic number. (Mark McLoughlin) Bug
#3664: Further fixes to Xnest modifier state handling. (Mark
McLoughlin)
commit 9b1debcdb6c7df956c06350a6525afb8e6d691fa
Author: Daniel Stone <daniel@fooishbar.org>
Date: Fri Jul 1 22:43:43 2005 +0000
Change all misc.h and os.h references to <X11/foo.h>.
commit 657b4cb8aa0076acae85997c4f0c353b4d86b632
Author: Daniel Stone <daniel@fooishbar.org>
Date: Fri Jul 1 22:32:34 2005 +0000
Change all misc.h and os.h references to <X11/foo.h>.
commit 303c281f956d55e35b05ef8521d0b60d24aa7a10
Author: Daniel Stone <daniel@fooishbar.org>
Date: Fri Jul 1 21:15:20 2005 +0000
Add auto-generated header files.
commit 9a6ec34d2545a23586f11ad51c81f41a940d73d0
Author: Daniel Stone <daniel@fooishbar.org>
Date: Fri Jul 1 21:13:36 2005 +0000
Use canonical autogen.sh, which supports srcdir != objdir autogen.
commit 7ecc2d526c4ea5db2589644a2fec0daf71df36da
Author: Daniel Stone <daniel@fooishbar.org>
Date: Fri Jul 1 21:12:24 2005 +0000
Remove fbcmap.c hacks from the DIX.
commit 6251f9c00a866f64207d23b0a06306ead15298e8
Author: Daniel Stone <daniel@fooishbar.org>
Date: Fri Jul 1 21:11:16 2005 +0000
Minor build system tweaks.
commit 641f32c4368db07831d9d703161a9d4699307621
Author: Daniel Stone <daniel@fooishbar.org>
Date: Fri Jul 1 20:54:30 2005 +0000
Adding initial build system.
commit 507d30546f56bfd172fc43857459c78c1026e97c
Author: Daniel Stone <daniel@fooishbar.org>
Date: Fri Jul 1 20:54:01 2005 +0000
Adding initial build system.
commit a822df1cc16d150614dead70fd00750095a05c35
Author: Daniel Stone <daniel@fooishbar.org>
Date: Fri Jul 1 20:49:35 2005 +0000
Adding initial build system.
commit ded56b1a74e6b3e4c48054b7e142d924b19e6104
Author: Daniel Stone <daniel@fooishbar.org>
Date: Fri Jul 1 20:29:53 2005 +0000
Adding initial build system.
commit aabb868920658c9d3979dc194c6bd9702171f101
Author: Zack Rusin <zack@kde.org>
Date: Fri Jul 1 13:30:29 2005 +0000
removing all debugging output from the default build :)
commit 0fa9d1fb4886c418e3d8e0886ad815513eda0633
Author: Zack Rusin <zack@kde.org>
Date: Fri Jul 1 12:24:30 2005 +0000
Leave debugging output for only the interested parties.
commit 0df446ab8875430508ff51d3548955a215475084
Author: Zack Rusin <zack@kde.org>
Date: Fri Jul 1 10:39:21 2005 +0000
Missed this. Spotted by Thomas.
commit b5b2a0522efd61bd99b5d5d75cdd27960cd1c7e1
Author: Lars Knoll <lars@trolltech.com>
Date: Fri Jul 1 10:05:43 2005 +0000
Add support for gradients and solid fills to Render.
Changed the semantics of the Convolution filter a bit. It now doesn't try
to normalize the filter values but leaves this to the client. This
gives more reasonable behaviour in the limit where the filter
parameters sum up to 0.
commit 30c019e847adef6f7f3963df8ef1f3f994669a54
Author: Zack Rusin <zack@kde.org>
Date: Fri Jul 1 08:56:12 2005 +0000
Adding the new acceleration architecture: Exa. It's meant to replace XAA in
the coming months.
commit 276821605ee50e71f30dd52f2c12237fc61f288f
Author: David Reveman <c99drn@cs.umu.se>
Date: Fri Jul 1 03:14:54 2005 +0000
Fix return values in Xgl render texture implementation
commit 5e381441fff411316ea202a9f85aceb0e0dcf46b
Author: Alex Deucher <agd5f@yahoo.com>
Date: Fri Jul 1 02:56:04 2005 +0000
- Fix Support for Philips FM1236/F tuner on ATI AIW 9600 XT (Jeff Smith)
Bug 3401
commit c4d1b4e0424d53cd0470e0e3f57c10ee8fe3d8c2
Author: Alexander Gottwald <alexander.gottwald@s1999.tu-chemnitz.de>
Date: Thu Jun 30 21:33:46 2005 +0000
Added another test of checkForInput for WIN32 Windows keyboard and mouse
events are added to the input queue in Block- and WakupHandlers. There
is no device to check if input is ready.
commit 1230c55ac3f75f4902b51b223d40354a54d0d0ab
Author: Alexander Gottwald <alexander.gottwald@s1999.tu-chemnitz.de>
Date: Thu Jun 30 18:50:20 2005 +0000
Pass serverClient instead of NULL to ConfigureWindow. This should fix a
crash reported by Øyvind Harboe
commit 0929f79c1baa5b65808ab034591510906623e841
Author: Matthew Allum <breakfast@10.am>
Date: Thu Jun 30 13:39:00 2005 +0000
Another Xephyr focus/modifier fix
commit b6c7afe0b9faed7025c70334d464fd75ce5c84c4
Author: Lars Knoll <lars@trolltech.com>
Date: Wed Jun 29 15:19:14 2005 +0000
compile
commit d8a98454e305973dd7fec76db2ef80705cf7c298
Author: Lars Knoll <lars@trolltech.com>
Date: Wed Jun 29 11:57:16 2005 +0000
Add support for gradients and solid fills to Render.
Changed the semantics of the Convolution filter a bit. It now doesn't try
to normalize the filter values but leaves this to the client. This
gives more reasonable behaviour in the limit where the filter
parameters sum up to 0.
commit ce0e11aeac76119b96b463605bc1f5318e3d2bde
Author: Adam Jackson <ajax@nwnk.net>
Date: Tue Jun 28 21:05:31 2005 +0000
Bug #2447: Fix argument order to xf86DrvMsgVerb. (Luc Verhaegen)
commit 5ef5aec9bb5ee85295c0913afca891572d1315a4
Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
Date: Tue Jun 28 02:04:54 2005 +0000
Update to latest snapshot (27-May-2005) from http://pciids.sf.net/
commit b262a18aad36b2de729f6d00d144ac7277687f19
Author: Adam Jackson <ajax@nwnk.net>
Date: Sun Jun 26 02:48:36 2005 +0000
Cosmetic correctness fixes: miEmptyBox and miEmptyData are variables, and
miGlyphExtents is a function.
commit aa7fb99bc76e62036c73ff50f58337558859b814
Author: Adam Jackson <ajax@nwnk.net>
Date: Sat Jun 25 21:28:48 2005 +0000
Bug #3030: Fix Xnest keyboard state handling. (Mark McLoughlin)
commit 8562f800b879ae461317da9640961f753e107250
Author: Adam Jackson <ajax@nwnk.net>
Date: Sat Jun 25 21:16:54 2005 +0000
Bug #3626: _X_EXPORT tags for video and input drivers.
commit 582a9f0d2ec01f1a3c5625e2f45a4599be7a11d5
Author: Zack Rusin <zack@kde.org>
Date: Sat Jun 25 12:39:58 2005 +0000
Correctly handle empty rects on region initialization.
commit 56201222067e793a3542bcdcd39bb257b4fad2a6
Author: Matthew Allum <breakfast@10.am>
Date: Thu Jun 23 16:50:07 2005 +0000
Fix issues with focus in and modifiers from host confusing Xephr
commit a668b6c11a2d6b4800407ad918481d90be87a732
Author: Matthew Allum <breakfast@10.am>
Date: Thu Jun 23 16:34:07 2005 +0000
redo tslib
commit 5e863851a61207ade1ac807bc8cff7d9cf02dbbe
Author: Adam Jackson <ajax@nwnk.net>
Date: Sun Jun 19 01:30:29 2005 +0000
Build workaround. Add glcontextmodes.[ch] from Mesa.
commit 9743adbe94f29417818b90e18aebb96a72f332f0
Author: Søren Sandmann Pedersen <sandmann@daimi.au.dk>
Date: Thu Jun 16 20:50:12 2005 +0000
Add Type1 subdirectory to lib/Xfonts, update build system accordingly.
commit 68e856ff5b1842ba10421714b5f6b21d528f6071
Author: Ian Romanick <idr@us.ibm.com>
Date: Wed Jun 15 18:31:52 2005 +0000
DRM 20050615 import
commit 6e301a8e97e99d58eaed25453f66c6d73bafd460
Author: Ian Romanick <idr@us.ibm.com>
Date: Wed Jun 15 18:31:52 2005 +0000
Initial revision
commit f0c76610b72a5b54bae5a5eb51ff4c420a27320e
Author: Daniel Stone <daniel@fooishbar.org>
Date: Wed Jun 15 16:46:59 2005 +0000
Conditionalise another use of XEvIE.
commit 28ee3dd955302a1e99ffdc66cf0f512c6234d043
Author: Daniel Stone <daniel@fooishbar.org>
Date: Wed Jun 15 16:27:16 2005 +0000
Conditionalise building of XEvIE code with #ifdef XEVIE.
commit c6166ee74137084775c7550b708c5f71f16e7d3f
Author: Lars Knoll <lars@trolltech.com>
Date: Wed Jun 15 14:51:12 2005 +0000
Fix projective transformations in fbcompose.c Bugfix for convolution
filters
commit bd54b96034e640f202821eac0a2c40e66c1ddfd0
Author: David Reveman <c99drn@cs.umu.se>
Date: Wed Jun 15 05:50:15 2005 +0000
Shut up compiler
commit 7fa782dfd548498474830c7268032ffc5fb406a5
Author: Søren Sandmann Pedersen <sandmann@daimi.au.dk>
Date: Mon Jun 13 21:51:46 2005 +0000
Add xkbfile to symlink.sh, conditionally include "config.h" in
xc/lib/xkbfile
commit 0802a2824c06d294ea42f0f6256644da5c0038c2
Author: Eric Anholt <anholt@freebsd.org>
Date: Mon Jun 13 18:14:53 2005 +0000
Correct the CHIPSET lines for the 3dfx cards so the tdfx driver will
recognize them. I'm not sure if this file is supposed to be maintained
still, but I'd like to close FreeBSD ports/32121 which has been around
for far too long.
commit 2eab094816726542c4de6c9db5efa102ab1e1593
Author: David Reveman <c99drn@cs.umu.se>
Date: Mon Jun 13 16:38:06 2005 +0000
Build fixes
commit 49476ca73c86a599a1bc49cba1117d42f59996a8
Author: Lars Knoll <lars@trolltech.com>
Date: Mon Jun 13 14:40:25 2005 +0000
add the convolution filter from xserver to xorg
commit f0ab6d57df66da5de1a8182f8250cc2c8e1450ad
Author: David Reveman <c99drn@cs.umu.se>
Date: Mon Jun 13 06:00:35 2005 +0000
Remove xgloffscreen.c
commit f5aeaa7710de5ba4aad125bc8472bad1f17e23c6
Author: Adam Jackson <ajax@nwnk.net>
Date: Mon Jun 13 00:09:23 2005 +0000
Bug #3513: Silence unhandled event messages from Xnest when running with
-parent. (Mark McLoughlin)
commit 521916d0074901db58ab6b9edab52373da28bdb3
Author: David Reveman <c99drn@cs.umu.se>
Date: Fri Jun 10 12:30:39 2005 +0000
New implementation of GLX_MESA_render_texture
commit bdb3eb86f02e233b6aeef0995ea9afeaa7b035ac
Author: Kean Johnson <kean@armory.com>
Date: Fri Jun 10 06:54:07 2005 +0000
file usl_xqueue.c was initially added on branch sco_port_update.
commit 988ffddfe082fb27fadf9aa60ab22dce6855508c
Author: Adam Jackson <ajax@nwnk.net>
Date: Fri Jun 10 04:01:14 2005 +0000
Bug #2799: Input shape. (Keith Packard)
commit d24ed90547122832d4168ad761f68e107bb1a2db
Author: Eric Anholt <anholt@freebsd.org>
Date: Fri Jun 10 02:14:44 2005 +0000
Axe a few dead fields from the port priv struct and add my name to the
"Copyright" line of the license to ati_video.c that already has my name
in the text.
commit 75065f3a54ec760bbe81160fa233810f14d8aaa2
Author: Eric Anholt <anholt@freebsd.org>
Date: Thu Jun 9 23:22:55 2005 +0000
Perform a warnings sweep on hw/kdrive. A number of these were my fault, but
some come from others.
commit e11e60b361d63ae02918dd6b43038a5c92b73a49
Author: Eric Anholt <anholt@freebsd.org>
Date: Thu Jun 9 21:59:26 2005 +0000
Greatly improve the correctness and performance of the MGA render
implementation. Includes cache flushing to prevent bad first reads of
the framebuffer, fixing blending of many formats, falling back on many
unsupported operations, and falling back early to prevent migration.
Passes all of rendercheck except some of the blend (!) tests.
commit 9f81ce945680515e6db7da6c87458bee7c0f053d
Author: Ian Romanick <idr@us.ibm.com>
Date: Thu Jun 9 21:48:45 2005 +0000
Re-enable GL_HP_occlusion_test. The problems in Mesa that caused this bug
were fixed by Brian Paul in Mesa version 6.1. The current Mesa version
in the X.org tree is 6.2.1.
Xorg bug: 762
commit 92b3775ae8bdd4a84d7e101b36b306fbd3ac17a2
Author: Matthew Allum <breakfast@10.am>
Date: Thu Jun 9 16:22:27 2005 +0000
TSLib fixes. Add fullscreen support to ephyr
commit 545c082cf9c86f2a809ea6b4dca33643afb0c3d3
Author: Eric Anholt <anholt@freebsd.org>
Date: Thu Jun 9 10:44:45 2005 +0000
- Replace the syncAccel hook in the kdrive structure with a pair of hooks
in the kaa structure: markSync and waitMarker. The first, if set,
returns a hardware-dependent marker number which can then be waited for
with waitMarker. If markSync is absent (which is the case on all
drivers currently), waitMarker must wait for idle on any given marker
number. The intention is to allow for more parallelism when we get
downloading from framebuffer, or more fine-grained idling.
- Replace the KdMarkSync/KdCheckSync functions with kaaMarkSync and
kaaWaitSync. These will need to be refined when KAA starts being smart
about using them. Merge kpict.c into kasync.c since kasyn.c has all the
rest of these fallback funcs.
- Restructure all drivers to initialize a KaaInfo structure by hand rather
than statically in dubious order.
- Whack the i810 driver into shape in hopes that it'll work after this
change (it certainly wouldn't have before this). Doesn't support my
i845 though.
- Make a new KXV helper to avoid duplicated code to fill the region with
the necessary color key. Use it in i810 and mach64 (tested).
commit 72ca8e1b5432db57401e66af8a07fcd8cbbbb9f1
Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
Date: Thu Jun 9 03:11:58 2005 +0000
Add agpgart support for Solaris x86/x64. [Requires Solaris "Nevada" build
16 or later to get kernel side for now.] (Sophia Li - Sun Microsystems)
commit ca37d5755259ca03c61cf0567be3dea99d0c79f6
Author: Adam Jackson <ajax@nwnk.net>
Date: Thu Jun 9 03:01:57 2005 +0000
Bug #2469: More accurate damage reports. (Jonathan Lennox)
commit cdc15e2294a9bffc570e33bc31170081abfc55fb
Author: Adam Jackson <ajax@nwnk.net>
Date: Thu Jun 9 02:29:42 2005 +0000
Bug #1846: Add intentionally undocumented -disablexineramaextension flag to
the server to work around ignorant clients on large display walls.
(Kevin E. Martin)
commit e3cdec7cdcd76f6294ba1f296e4bcdee43b1eb3c
Author: Adam Jackson <ajax@nwnk.net>
Date: Thu Jun 9 02:19:10 2005 +0000
Bug #1880: Remove unused xnestConfineWindow. (Mark McLoughlin)
commit 0f7136191b54e587b66958985e14d8b0687c5ee1
Author: Adam Jackson <ajax@nwnk.net>
Date: Thu Jun 9 02:03:50 2005 +0000
Bug #3434: Don't define fbAddTraps twice. (Mike A. Harris)
commit e7fec996eb43a0bea94a37d329e3902299e6e895
Author: Alexander Gottwald <alexander.gottwald@s1999.tu-chemnitz.de>
Date: Wed Jun 8 16:13:11 2005 +0000
Merge from CYGWIN Added layout "French (Canada)" as ca_enhanced Added Czech
(QWERTY) layout
Merge from CYGWIN Print error code if winStoreColorsShadowDDNL fails
commit d0d164e6daf6c1d8afe8099fb6187d8a74ff652b
Author: Alexander Gottwald <alexander.gottwald@s1999.tu-chemnitz.de>
Date: Wed Jun 8 09:01:41 2005 +0000
Fix crash reported by yvind Harboe
commit d146c41882e50dd1ed6022f8a5866514067ba9d2
Author: David Reveman <c99drn@cs.umu.se>
Date: Tue Jun 7 08:53:40 2005 +0000
GLX improvements and remove use of pbuffers for offscreen rendering in Xgl
commit 8237b31f60245a8e67735d6c231dfb7dd0bbc388
Author: Jon Smirl <jonsmirl@yahoo.com>
Date: Mon Jun 6 04:06:38 2005 +0000
Keyboard sort of works now with evdev
commit c5026577cbc70c7365a9c81b2775136b45c850d2
Author: Jon Smirl <jonsmirl@yahoo.com>
Date: Sun Jun 5 17:32:41 2005 +0000
Create a default colormap
commit 021a5cd170051aae25cf61651d07b47a4df31ab4
Author: Jon Smirl <jonsmirl@yahoo.com>
Date: Sun Jun 5 01:58:41 2005 +0000
Enable egl server in automake
--enable-xeglserver
commit aa959672863aad71c807d6c09938bb296c347bcf
Author: Jon Smirl <jonsmirl@yahoo.com>
Date: Sat Jun 4 23:33:03 2005 +0000
Initial Xegl check-in. Works on EGL fbdev driver Input is totally broken.
commit 88d49bed008264092245c4f6c53174f93f6ab387
Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
Date: Fri Jun 3 21:49:11 2005 +0000
Need to set initial screen size at device open time too.
commit 0d206e177f46eedfffd8f88e985efdfaf117021c
Author: Alexander Gottwald <alexander.gottwald@s1999.tu-chemnitz.de>
Date: Fri Jun 3 08:12:22 2005 +0000
Backout last winRaiseWindow patch which caused stacking problems
commit 2fc290f646eb48f3c20ccff98355c2d082569160
Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
Date: Wed Jun 1 17:45:17 2005 +0000
Solaris VUID mouse protocol updates:
- support for mouse-like devices that report absolute coordinates
- support for mouse-like devices that need to know screen size so they can
scale absolute coordinates to screen size
- fix 3-button emulation
commit 8537146e3662cdc66ef4692bfd3886a676096fb8
Author: Adam Jackson <ajax@nwnk.net>
Date: Mon May 30 18:44:55 2005 +0000
Bug #3368: Cosmetic cleanup to DIX export list.
commit 547c47aaea9f31f7c873376b0db859c1c1d3d918
Author: Adam Jackson <ajax@nwnk.net>
Date: Mon May 30 18:36:19 2005 +0000
Bug #3407: Clean out ancient #ifdef X11R5 conditionals.
commit cebd7348d271591b7ebeebe3b332f835cfa8a068
Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
Date: Sat May 28 00:08:03 2005 +0000
Change hardcoded /usr/X11R6 to PROJECTROOT. Change hardcoded XF86Config to
XCONFIGFILE.
commit 1cb18a4bad565d1f783a4cefb3ed467699051068
Author: Alexander Gottwald <alexander.gottwald@s1999.tu-chemnitz.de>
Date: Wed May 25 12:14:29 2005 +0000
Workaround bug in pthread.h
commit 62343f5162066f19ca6e62d1c85a4a40d45b3295
Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
Date: Sun May 22 01:12:49 2005 +0000
Bugzilla #2800 <https://bugs.freedesktop.org/show_bug.cgi?id=2800> Xevie
extension crash with signal 11 on keyboard Bugzilla #1205
<https://bugs.freedesktop.org/show_bug.cgi?id=1205> Xevie client
receives two KeyPress events on consumed keys when XKB is enabled
Patch #2223 <https://bugs.freedesktop.org/attachment.cgi?id=2223> Fixes for
both of these and some other Xevie bugs (Derek Wang - Sun Microsystems)
commit a8a61bbe22361b12d4a2dd511894987a338e3eef
Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
Date: Sat May 21 07:46:38 2005 +0000
Initial experimental support for AMD64 builds on Solaris 10 x86. Improved
support for 64-bit SPARC builds on Solaris as well.
commit ef4401ff8a8c4d7c22ef6af7bf47ccb24f83967f
Author: Adam Jackson <ajax@nwnk.net>
Date: Thu May 19 18:53:51 2005 +0000
Bug #3334: Clean up remnants from the PEX, XIE, and BEZIER extensions.
commit 1e51e18382de61a67027759eccee9ccbb0924304
Author: Søren Sandmann Pedersen <sandmann@daimi.au.dk>
Date: Thu May 19 01:25:02 2005 +0000
Wed May 18 21:20:35 2005 Søren Sandmann <sandmann@redhat.com>
s/dst/src that I missed in the previous patch. Pointed out by Owen Taylor.
commit be3875994d7778ffad0cd957a4bd1500bf58ac2c
Author: Søren Sandmann Pedersen <sandmann@daimi.au.dk>
Date: Wed May 18 20:49:31 2005 +0000
Wed May 18 16:47:44 2005 Søren Sandmann <sandmann@redhat.com>
Actually assign the computed results. (Reported by Michael Dänzer, patch
by Owen Taylor).
commit 07d1e9ae5f0da65427ac52f065b173d340d70d6d
Author: Adam Jackson <ajax@nwnk.net>
Date: Wed May 18 19:44:35 2005 +0000
Bug #3066: Promote frameBufferPhysicalAddress to pointer from CARD32; bump
DRIINFO version to match. Fix various pointer printfs in libdri to be
64-bit aware. Silence a warning about redefining noXFree86DRIExtension.
(Jesse Barnes)
commit b87a32fb0eafa6d5f12a6faa634662c71fdc97fa
Author: Adam Jackson <ajax@nwnk.net>
Date: Wed May 18 17:47:35 2005 +0000
Bug #3163: Create new DRIINFO_*_VERSION macros to indicate the version
number of the DRIInfoRec, disambiguating it from the XF86DRI protocol
version number. Modify DRIQueryVersion to return the libdri version
number, which all DDXes were requesting implicitly. Fix the DDXes to
check for the DRIINFO version they were compiled against.
commit fddcde777f50611099d8888456d93be7e566c84e
Author: Egbert Eich <eich@suse.de>
Date: Wed May 18 15:38:50 2005 +0000
VBESetVBEMode() calls int10 0x4f02 to set a VBE video mode. This can be a
standard mode solely determined by the mode ID or it may be a detailed
mode with almost arbitrary mode parameters. The mode parameters are
passed to the BIOS in a memory area pointed to by es:di. If bit 11 in
the video mode is set this memory area is evaluated. When we don't have
such an area (passed to VBESetVBEMode() this function should unset this
bit for sanity reasons. (Bugzilla #3329)
commit f28d644d9fb1feeab1bbb3d5e68255bfa20905d8
Author: Zack Rusin <zack@kde.org>
Date: Wed May 18 14:24:14 2005 +0000
rewrite the rootless compositing code (1) compiles which is already a huge
improvement ;) , 2) matches the new render composition semantics)
commit bbbb0a3a84bf21f5120c73ef387d6190154c0f65
Author: Egbert Eich <eich@suse.de>
Date: Wed May 18 10:31:53 2005 +0000
Avoid segfaults if the number of user supplied monitor ranges exceed the
number of preallocated slots. We should really make this dynamic - but
I don't think this ever caused a problem so it's more or less academic.
A. Avoid that *SyncStart starts before *BlankStart. If *BlankStart >
*SyncStart it is made = *SyncStart and its width is made maximal but such
that the blank does not exceed *Total. Since the Sync width has the
same restrictions as the Blank width monitors should still be able to
clamp after the sync pulse. B. Over time mode validation has become
inconsistent when people started to add additional features to the mode
validation. One such feature is that the mode->Crtc* values have been
(ab)used to allow the driver ValidMode() function to pass driver
normalized timing values back to the validation function. The
introduction of these features made the code less readable and created
numerous possibly unintended side effects in the validation semantics.
I've attempted to consolidate these changes making the code more
consistent and eliminating a number of side effects. This should not
cause problems for the majority of drivers, still it should receive
testing - especially with ATi Mach64 and Radeon code. (Bugzilla #3325).
commit a90af4a2e6e38cbe20af13aaa7822836c01290ae
Author: Thomas Hellstrom <unichrome@shipmail.org>
Date: Sun May 15 17:45:47 2005 +0000
Bug 2750: Prevent mtrr_remove_offending from ending up in an endless loop
if the offending region refuses to be removed.
commit f58a54668b96884ece6ecbff732e880677d5d19e
Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
Date: Sat May 14 20:13:45 2005 +0000
Change return statements to fix compiler errors: "fbcompose.c", line 2815:
void function cannot return value "fbcompose.c", line 2861: void
function cannot return value
commit a9d820b454bbb418d04e1d3c3d5d4dd10d7bb3af
Author: Søren Sandmann Pedersen <sandmann@daimi.au.dk>
Date: Fri May 13 22:53:44 2005 +0000
- For now put xtrans in X11/Xtrans/X11, since libX11 is looking for it in
<X11/...>
- For Xcomposite and Xdamage, don't link the build system out of the xc
tree
- Link the public X11 headers into their own directory
- Add links to XKeysymDB and XErrorDB
- Add links to all the Xlib man pages
- Add links to the lcUniConv subdirectory
- Conditionally include config.h in Xlib source
commit 8993e70d8da89e130455369ccb504b3adea5344f
Author: Eric Anholt <anholt@freebsd.org>
Date: Tue May 10 00:12:17 2005 +0000
Bugzilla #2561: Disable some keycode translations on PC98, which had
various bad effects including modifier keys not working.
commit e78abf3bdfbf5fc13fbc5b1d3ec00e9484297b89
Author: Eric Anholt <anholt@freebsd.org>
Date: Mon May 9 23:42:26 2005 +0000
Bugzilla #2429: Correct the sysarch prototype for FreeBSD/alpha.
commit 3f1a1551df2a9f45b3b8821f3f168d4dc8b8b438
Author: Eric Anholt <anholt@freebsd.org>
Date: Mon May 9 23:26:02 2005 +0000
Increase the maximum number of buttons from 12 to 24. Helps with
button-happy mice like the Logitech MediaPlay. (Bugzilla #2390)
commit eca5dff173d5af0a31bbf84579909b88a86e4c92
Author: Adam Jackson <ajax@nwnk.net>
Date: Mon May 9 12:46:53 2005 +0000
Render performance improvements. (Lars Knoll, Zack Rusin)
commit 2de24db63eb65974ac547facf2a99aa4709d54b3
Author: Adam Jackson <ajax@nwnk.net>
Date: Sun May 8 23:34:15 2005 +0000
Render performance improvements. (Lars Knoll, Zack Rusin)
commit 2c9b1e337b2e82e10909f62e8cd8c2c7a402fdd8
Author: Alexander Gottwald <alexander.gottwald@s1999.tu-chemnitz.de>
Date: Sun May 8 21:14:55 2005 +0000
Only call ConfigureWindow from winRaiseWindow if the windows message
dispatch loop is running.
commit 78e4cb67d0f595f4fba5e98a9fa46de044556905
Author: Torrey Lyons <torrey@mrcla.com>
Date: Fri May 6 00:45:30 2005 +0000
Fix build issues on Mac OS X 10.4.0.
commit d5739efd2c266081ed6b844767dcdd0a3331bfd3
Author: Eric Anholt <anholt@freebsd.org>
Date: Wed May 4 04:14:58 2005 +0000
Port X.Org to FreeBSD/powerpc. This makes a bit of math for sysmouse in
mouse.c explicitly signed, avoiding the need for -fsigned-chars. (Peter
Grehan, grehan at FreeBSD dot org)
commit 6700847458427cbdbaf837ab06bfea9b80d92df2
Author: Harold L Hunt II <huntharo@msu.edu>
Date: Mon May 2 22:01:08 2005 +0000
Fix comments for pointers in parameter lists to work with fussy compilers
commit e50ab8feade400efd8e88ee0b2deeb924f169034
Author: Harold L Hunt II <huntharo@msu.edu>
Date: Mon May 2 21:57:32 2005 +0000
Fix message type (respose->response) and fix */*comment*/ blocks to work
with fussy compilers.
commit baa0cfc15442287557e44fa2614d89ab0b5c2539
Author: Alexander Gottwald <alexander.gottwald@s1999.tu-chemnitz.de>
Date: Mon May 2 14:07:31 2005 +0000
Print correct logfile in FatalError message
commit bc977945a53206d70ef9817d6ede4137eb5f7e3c
Author: David Reveman <c99drn@cs.umu.se>
Date: Mon May 2 00:33:52 2005 +0000
Set stencil size for Xgl GLX visuals
commit 5b4462ed9bbb17212dd57617cb7e837142b6270a
Author: David Reveman <c99drn@cs.umu.se>
Date: Sun May 1 22:55:25 2005 +0000
New algorithm for calculating glyph extents in Xgl
commit e4b33f4e91a5379c99ecf78ffb6a3e836cb42491
Author: Egbert Eich <eich@suse.de>
Date: Wed Apr 27 15:42:15 2005 +0000
Catch SIGCHLD in OsBlockSignals() too to make sure this signal doesn't
intercept reading the authority file (Fabian Franz, Bugzilla #3137).
commit 246b14cb29250517912d9c661ab037a953f4bbf4
Author: David Reveman <c99drn@cs.umu.se>
Date: Wed Apr 27 10:34:33 2005 +0000
Minor optimization
commit 28a2d841cee596c0242b1649587d6b180529c0ef
Author: David Reveman <c99drn@cs.umu.se>
Date: Wed Apr 27 09:29:33 2005 +0000
Line drawing improvements to Xgl
commit abcc8c352e5fe6dd3b7ce5c6a25f435f877264c3
Author: David Reveman <c99drn@cs.umu.se>
Date: Wed Apr 27 08:45:16 2005 +0000
Fix typo
commit 8bc5a387c365d6367813eac374150440d0edbf6e
Author: David Reveman <c99drn@cs.umu.se>
Date: Tue Apr 26 11:04:23 2005 +0000
Add glCopy operation and glPushAttrib/glPopAttrib support to Xgl GLX
commit f010131a1964b5ec35f3b333ffa7459c38f8ce45
Author: Roland Mainz <roland.mainz@nrubsig.org>
Date: Tue Apr 26 06:12:07 2005 +0000
xc/programs/Xserver/Xprint/Init.c
//bugs.freedesktop.org/show_bug.cgi?id=2879) attachment #2556
(https://bugs.freedesktop.org/attachment.cgi?id=2556) Refix for bug
2879 - downgrade 15bit PseudoColor to 14bit - the current datatype for
the |ColormapEntries| is a |signed short| which is too small for
|32768| colors (=integer overflow).
commit ba24ae89d33fbf3aacb8bbaf920d7436b77fda46
Author: David Reveman <c99drn@cs.umu.se>
Date: Mon Apr 25 17:18:01 2005 +0000
Add scissor based clipping to Xgl GLX
commit 07cc29cf69ff1e079efe3c9bfc55e8ac0f9bac93
Author: Adam Jackson <ajax@nwnk.net>
Date: Mon Apr 25 00:25:39 2005 +0000
Bug #2138: When the server is built with MakeDllModules YES, prefer
dlloader modules to elfloader modules, and vice versa when
MakeDllModules is NO. Based on 028_loader_speed_hack.diff from Ubuntu
(Daniel Stone).
commit 6c37648754c9bd901adecf8d38f9bb46db65efad
Author: Adam Jackson <ajax@nwnk.net>
Date: Mon Apr 25 00:11:21 2005 +0000
Bug #2141: Rework misleading warning message when APM support is
unavailable. (Previous patch on 2005-04-14 changed the wrong message.)
commit a369d390a87ab0189c465be6cfd914e4b9329691
Author: Roland Mainz <roland.mainz@nrubsig.org>
Date: Sun Apr 24 01:10:12 2005 +0000
xc/config/cf/X11.tmpl
xc/programs/Xserver/Xext/Imakefile
xc/programs/Xserver/dix/Imakefile
xc/programs/Xserver/dix/main.c
xc/programs/Xserver/dix/xpstubs.c
xc/programs/Xserver/mi/miinitext.c
//bugs.freedesktop.org/show_bug.cgi?id=2792) attachment #2526
(https://bugs.freedesktop.org/attachment.cgi?id=2526) bug 2792 part II:
Make Xprint headers in dix/, mi/, os/ and Xext/ conditional on whether
the Xprint extension is build or not. Patch by Egbert Eich
<eich@freedesktop.org> and Roland Mainz <roland.mainz@nrubsig.org>.
commit 13fcfee37305f46e95ff81d7d5eec4d88a63a63b
Author: Roland Mainz <roland.mainz@nrubsig.org>
Date: Sat Apr 23 22:55:40 2005 +0000
//bugs.freedesktop.org/show_bug.cgi?id=3118) attachment #2525
(https://bugs.freedesktop.org/attachment.cgi?id=2525) Get Xprint server
working again which was broken by the
05/04/20 05:49:46 commit commit (the CPP symbol |XPRINT| is not universally
available when building the Xserver and should be used with care).
commit 39eb2797183bf871a2dd01bff63dd35c146471f5
Author: Adam Jackson <ajax@nwnk.net>
Date: Sat Apr 23 19:16:10 2005 +0000
Bug #3016: Don't complain as loudly about failing to load a module that's
already loaded.
commit 139f900c56a6f44df2b411fe4bbc025a147e3abe
Author: Adam Jackson <ajax@nwnk.net>
Date: Sat Apr 23 19:01:13 2005 +0000
Bug #3109: Handle R_ALPHA_BRSGP relocations in elfloader. (Sergey Tikhonov)
commit 0e80fe0e607cc73856332563becd70ef92d1aa75
Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
Date: Fri Apr 22 22:11:26 2005 +0000
Clean up formatting, projectroot substutition, and grammatical nits.
commit dcfb97204b021738c0ee9f1f8f40243dfa0b2ce0
Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
Date: Fri Apr 22 22:04:37 2005 +0000
Work around clash between Solaris headers and module loader headers over
definition of FILE.
commit 07bd7df6a6a07834277b4bf505db6727841e1153
Author: Adam Jackson <ajax@nwnk.net>
Date: Fri Apr 22 20:49:50 2005 +0000
Bug #3069: Drop the BuildLowMem hack, it doesn't compile and isn't useful.
commit d450a70e00b50427ecb2065d3cc44f43d102cade
Author: Adam Jackson <ajax@nwnk.net>
Date: Fri Apr 22 17:45:14 2005 +0000
Bug #2373: SGI Altix platform support. (Shrijeet Mukherjee, Jesse Barnes,
Bjorn Helgaas, Egbert Eich.)
commit 16c2499b8f5c2405e36c7d5a922bb0b150df1762
Author: Adam Jackson <ajax@nwnk.net>
Date: Fri Apr 22 16:49:22 2005 +0000
Bug #2373: SGI Altix platform support. (Shrijeet Mukherjee, Jesse Barnes,
Bjorn Helgaas, Egbert Eich.)
commit 8565b6c0e2851cc3f194ba72d3db02a4e2976528
Author: Daniel Stone <daniel@fooishbar.org>
Date: Thu Apr 21 00:31:31 2005 +0000
Change xf86bigfont.h include to X11/extensions/xf86bigfont.h.
commit b241c703a2c4164420dd26ee11f583bbf9cfe0f3
Author: Daniel Stone <daniel@fooishbar.org>
Date: Thu Apr 21 00:31:13 2005 +0000
Change keymap.h includes to X11/keymap.h
commit 44528218d5ca75b842e4cefd8fdc58be2f35f0f4
Author: Daniel Stone <daniel@fooishbar.org>
Date: Wed Apr 20 23:33:53 2005 +0000
Change dmxext.h and dmxproto.h to <X11/extensions/...>.
commit efa9d5f4757bfc0588cee361bcc78dd8a09efa62
Author: Daniel Stone <daniel@fooishbar.org>
Date: Wed Apr 20 23:11:12 2005 +0000
Change "eviestr.h" to <X11/extensions/eviestr.h>.
commit db5bd04097fd815ab6523f187679682a5e5047fa
Author: Alexander Gottwald <alexander.gottwald@s1999.tu-chemnitz.de>
Date: Wed Apr 20 16:40:52 2005 +0000
Fix includes right throughout the Xserver tree:
apply changes to windows specific includes
Fix includes right throughout the Xserver tree:
apply changes to Xdmcp.h
commit 8963a220f36cf0ae2a8a653fd39c983140e29736
Author: Alexander Gottwald <alexander.gottwald@s1999.tu-chemnitz.de>
Date: Wed Apr 20 16:34:46 2005 +0000
warning fix for Win32
commit e6a0820d1b479058bddef66018d321940e79260c
Author: Daniel Stone <daniel@fooishbar.org>
Date: Wed Apr 20 15:16:36 2005 +0000
Change "xf86bigfstr.h" to <X11/extensions/xf86bigfstr.h> for includes.
commit 025724f9f5874159c20ebd705288ec60b960caac
Author: Alexander Gottwald <alexander.gottwald@s1999.tu-chemnitz.de>
Date: Wed Apr 20 14:17:35 2005 +0000
Add missing space after -query hostname
commit 35cd1684622f4528c68e07eea798c33bc4b93667
Author: Daniel Stone <daniel@fooishbar.org>
Date: Wed Apr 20 14:16:37 2005 +0000
Change xf86bigfstr.h to X11/extensions/xf86bigfstr.h for includes.
commit c7c27e61870b42de044b183c854a960582d98dbf
Author: Daniel Stone <daniel@fooishbar.org>
Date: Wed Apr 20 13:33:54 2005 +0000
Change xf86bigfont.h to X11/extensions/xf86bigfont.h for includes.
commit abd246c6c272a2c6f9c37404b2ed439911880e75
Author: Daniel Stone <daniel@fooishbar.org>
Date: Wed Apr 20 13:01:55 2005 +0000
Add glyphstr.h to includes.
commit 956dfa22f6076969776546fb1151e900d8d773a1
Author: Daniel Stone <daniel@fooishbar.org>
Date: Wed Apr 20 12:49:46 2005 +0000
Conditionalise usage of Xprint functions and headers.
commit 2cdfab0ed7eb33a6a50f9b7ec212b498dd8318b5
Author: Daniel Stone <daniel@fooishbar.org>
Date: Wed Apr 20 12:42:02 2005 +0000
Change keysymdef.h to X11/keysymdef.h for include statement.
commit fa5539247d3b246db9ff1469d08167178c85d7ad
Author: Daniel Stone <daniel@fooishbar.org>
Date: Wed Apr 20 12:39:28 2005 +0000
Change Xalloca.h to X11/Xalloca.h for include.
commit 292c4cff26687e6ef86c285b97813ab587daf009
Author: Daniel Stone <daniel@fooishbar.org>
Date: Wed Apr 20 12:25:48 2005 +0000
Fix includes right throughout the Xserver tree:
change "foo.h" to <X11/foo.h> for core headers, e.g. X.h, Xpoll.h;
change "foo.h", "extensions/foo.h" and "X11/foo.h" to
<X11/extensions/foo.h> for extension headers, e.g. Xv.h;
change "foo.[ch]" to <X11/Xtrans/foo.[ch]> for Xtrans files.
commit c062d7f96f47bdd31640be1fbce682d0774db3d9
Author: Alexander Gottwald <alexander.gottwald@s1999.tu-chemnitz.de>
Date: Tue Apr 19 18:21:01 2005 +0000
Prevent recursive calls to winRaiseWindow.
commit 4e914c5ed7679a1102f3e25af0c087380f834865
Author: David Reveman <c99drn@cs.umu.se>
Date: Tue Apr 19 14:51:29 2005 +0000
Hash texture objects and display lists in Xgl
commit 6bde764de102a56d2c71b971eaa36535e9760b52
Author: Bogdan Diaconescu <b_diaconescu@yahoo.com>
Date: Sun Apr 17 23:02:25 2005 +0000
Added a log pring for the parameters
commit 8594b8f2893e58ae824e140334c18ba3d7467217
Author: Bogdan Diaconescu <b_diaconescu@yahoo.com>
Date: Sun Apr 17 23:00:58 2005 +0000
Added new tuner FM1236MK3 PAL version
commit 7f74e3aebdf79fbca4141e6ffcdad39812df9335
Author: Bogdan Diaconescu <b_diaconescu@yahoo.com>
Date: Sun Apr 17 22:58:03 2005 +0000
This is the UDA1380 sound coder-decoder module
commit 7a4e5f4006319e025e3ff561eccc3f1ad6c661a0
Author: Torrey Lyons <torrey@mrcla.com>
Date: Sat Apr 16 00:21:21 2005 +0000
Fix cases in Darwin build where a variable is declared static and later as
extern (XFree86 Bug #1576, Jordan Frank).
commit 4f686f158b00478a3d074128f9e4cb6dc0d928cd
Author: Roland Mainz <roland.mainz@nrubsig.org>
Date: Fri Apr 15 23:34:39 2005 +0000
//bugs.freedesktop.org/show_bug.cgi?id=2885) attachment #2434
(https://bugs.freedesktop.org/attachment.cgi?id=2434) Fix Solaris build
bustage caused by namespace collision between symbols defined in
<sys/kbd.h> and those in "xf86_OSlib.h". Patch by Alan Coopersmith
<alan.coopersmith@sun.com>.
commit 7472fcfdd40e29cd2847e45d4bd2dd11ccc41ff5
Author: Adam Jackson <ajax@nwnk.net>
Date: Fri Apr 15 00:18:58 2005 +0000
Bug #2141: Rework misleading warning message when APM support is
unavailable.
commit 504067819a4f1a8564dcacc278933f533618b666
Author: Adam Jackson <ajax@nwnk.net>
Date: Thu Apr 14 17:51:51 2005 +0000
Bug #3025: gcc4 build fix.
commit e40db7f26af39a8b1f3675a2c87ce90c4fd59d85
Author: David Reveman <c99drn@cs.umu.se>
Date: Wed Apr 13 14:27:47 2005 +0000
Add GLX code to Xgl
commit ddfa6f00da7c80b246b57c592361baa4bc5a8e9d
Author: Roland Mainz <roland.mainz@nrubsig.org>
Date: Wed Apr 13 00:05:37 2005 +0000
//bugs.freedesktop.org/show_bug.cgi?id=3001) attachment #2404
(https://bugs.freedesktop.org/attachment.cgi?id=2404) Improve rendering
performance when glXSwapBuffers()| or |XPutImage()| are called for the
PostScript DDX via optimizing the codepath around
|PsOut_OutImageBytes()|. Patch by Simon Toedt <simon.toedt@gmail.com>
and Roland Mainz <roland.mainz@nrubsig.org>.
commit f45208a7e9c39345ac431c2e7da8777d6c466dcc
Author: Alan Hourihane <alanh@fairlite.demon.co.uk>
Date: Mon Apr 11 11:06:21 2005 +0000
update static file from pci.ids
commit b47f39b417cbe220690155a08c6bc18cd7cfa388
Author: Alan Hourihane <alanh@fairlite.demon.co.uk>
Date: Mon Apr 11 10:57:33 2005 +0000
import latest pci.ids file
commit 00a551393ce7aa9d2b23634737ced5071e3cdd35
Author: Egbert Eich <eich@suse.de>
Date: Mon Apr 11 10:54:13 2005 +0000
Reenable BackingStore in Xvfb.
commit 1fbd38f3b46df62561f8be74cbc05fcf8ad88a21
Author: Alexander Gottwald <alexander.gottwald@s1999.tu-chemnitz.de>
Date: Mon Apr 11 10:16:25 2005 +0000
Added wizard page for clipboard selection and additional server parameters
commit 6848b0353897a6a5d1218b266c22fb87a7c6d730
Author: Egbert Eich <eich@suse.de>
Date: Mon Apr 11 10:05:38 2005 +0000
Correct the mask bits when checking for a 64bit memory base in PCI config
space (bugzilla #2963).
commit adac7011965ed75ea399b93dae917cb48180c77a
Author: Egbert Eich <eich@suse.de>
Date: Mon Apr 11 09:33:43 2005 +0000
Preventing hight for drawing from becoming negative when face->dy < 0. The
height value is used in miFillPolyHelper() to calculate the size of
memory to be allocated. A negative value will lead to a crash (Bugzilla
#2690, Keith Packard, Egbert Eich).
commit 5e2080ef93a598c6d68e1b2f446f251ab025b702
Author: Roland Mainz <roland.mainz@nrubsig.org>
Date: Mon Apr 11 01:06:15 2005 +0000
xc/programs/Xserver/Xprint/attributes.c
xc/programs/glxgears/glxgears.c
xc/programs/xdbedizzy/xdbedizzy.c
xc/programs/xedit/Imakefile
xc/programs/xedit/Xedit-xprint.ad
xc/programs/xedit/util.c
xc/programs/xedit/xedit.h
xc/programs/xlogo/print.c
xc/programs/xlogo/xlogo.c
xc/programs/xlogo/xlogo.h
xc/programs/xman/Imakefile
xc/programs/xman/print.h
xc/programs/xmore/Imakefile
xc/programs/xmore/print.c
xc/programs/xmore/print.h
xc/programs/xmore/printdialog.c
xc/programs/xphelloworld/xpawhelloworld/xpawhelloworld.c
xc/programs/xphelloworld/xphelloworld/xphelloworld.c
xc/programs/xphelloworld/xpsimplehelloworld/xpsimplehelloworld.c
xc/programs/xphelloworld/xpxmhelloworld/xpxmhelloworld.c
//bugs.freedesktop.org/show_bug.cgi?id=790) attachment #2379
(https://bugs.freedesktop.org/attachment.cgi?id=2379) Implement support
client+Xserver support for passing output (stdout+stderr) of the
spooler command started by the Xprint server back to the application
using the "xp-spooler-command-results" XPJobAttr attribute
(applications can fetch the attribute value after the XPEndJobNotify
event was received; more details can be found in
http://xprint.mozdev.org/docs/dtprint_fspec.ps).
commit 9af443f5976ab3987e4ee9d397391e82206676b4
Author: Alexander Gottwald <alexander.gottwald@s1999.tu-chemnitz.de>
Date: Sat Apr 9 19:20:03 2005 +0000
Fix passing of non-RGB visuals. The old code did not initialize the
structure properly which lead to a crash in 8bpp mode
commit f02440dfa3439ab493c7918b472c23bb22e29707
Author: Alexander Gottwald <alexander.gottwald@s1999.tu-chemnitz.de>
Date: Wed Apr 6 15:18:59 2005 +0000
First import of xlaunch frontend for Xming
commit de5d24a200e4426e458fc447884d1a5b0257faaa
Author: Egbert Eich <eich@suse.de>
Date: Mon Apr 4 10:17:06 2005 +0000
Fixed sentinels in Xt, editres and xedit to reduce number of warnings with
gcc4 (Andreas Schwab).
commit 277ff06e9999f2efe0f082a3565f6279219c13e4
Author: Egbert Eich <eich@suse.de>
Date: Mon Apr 4 10:11:51 2005 +0000
Fix typo leading to bogus code in xorgcfg (Andreas Schwab).
commit 7eb6b69ebd945c753ee0988e1a85dffde982446e
Author: Egbert Eich <eich@suse.de>
Date: Mon Apr 4 09:55:25 2005 +0000
Support for HP's IPF ZX1 systems (Alex Williamson).
commit 231c00e8fba91b580ec3e2703dd1ceacf13a6624
Author: Egbert Eich <eich@suse.de>
Date: Mon Apr 4 09:47:07 2005 +0000
When not using dlopen ia64 needs an extra cache flush to ensure the icache
is coherent when modules are loaded (Alex Williamson).
commit 55dc930a180553c08d8546cc2078451c20e34934
Author: Torrey Lyons <torrey@mrcla.com>
Date: Sat Apr 2 02:29:24 2005 +0000
Fix XDarwin's handling of Wacom tablet mouse buttons (Based on patch
suggested by Daphne Pfister).
commit 03d126081e5ba57ea2304753289528a896f3baaf
Author: Roland Mainz <roland.mainz@nrubsig.org>
Date: Fri Apr 1 21:45:20 2005 +0000
xc/programs/Xserver/Xprint/Init.c
xc/programs/Xserver/Xprint/ps/Imakefile
xc/programs/Xserver/Xprint/ps/Ps.h
xc/programs/Xserver/Xprint/ps/PsArea.c
xc/programs/Xserver/Xprint/ps/PsColor.c
xc/programs/Xserver/Xprint/ps/PsImageUtil.c
xc/programs/Xserver/Xprint/ps/PsInit.c
//bugs.freedesktop.org/show_bug.cgi?id=2879) attachment #2287
(https://bugs.freedesktop.org/attachment.cgi?id=2287) Follow-up to
bugzilla #1299: Add new visuals in the Postscript DDX (including
TrueColor 16bit, PseudoColor 15bit/12bpg(12 bits per R-, G-, B-channel
as in PostScript Level 2 (and above) colors can have 12 bits per
component (36 bit for RGB)), PseudoColor+GrayScale+StaticGray
12bit/12bpg) and switch the default visual from PseudoColor 8bit/8bpg to
PseudoColor 12bit/12bpg.
commit fe37cc7e7b3036e538930c16bbdb39a7915b1685
Author: Matthieu Herrb <matthieu.herrb@laas.fr>
Date: Fri Apr 1 21:28:50 2005 +0000
programs/Xserver/hw/xfree86/loader/xf86sym.c
programs/Xserver/hw/xfree86/os-support/shared/libc_wrapper.c Fix setjump0
declaration for DllLoader.
commit ef60998a828951e61f1480e29c2fec62e7454bbc
Author: Kevin E Martin <kem@kem.org>
Date: Fri Apr 1 20:21:38 2005 +0000
bugzilla #2880 (https://bugs.freedesktop.org/show_bug.cgi?id=2880)
attachment #2285 (https://bugs.freedesktop.org/attachment.cgi?id=2285)
Use system method to access PCI config space.
commit 33ab2a2abc8c1e4ca9c7139454c60f5ad8a61a94
Author: Adam Jackson <ajax@nwnk.net>
Date: Fri Apr 1 20:05:11 2005 +0000
Bug #2835: Add symbol exports to support the ReadDisplay extension.
commit cbccac448a1466ab098e8fe5dbfff98264c7260a
Author: Alex Deucher <agd5f@yahoo.com>
Date: Thu Mar 31 23:18:10 2005 +0000
- Add new Radeon pci ids (ATI devrel), bug 2827
commit 59d7222b13775efb2159159cc897e7789bdf10b2
Author: Søren Sandmann Pedersen <sandmann@daimi.au.dk>
Date: Sun Mar 27 00:17:12 2005 +0000
Sat Mar 26 19:00:30 2005 Søren Sandmann <sandmann@redhat.com>
Remove accidentally committed prototype.
commit 476ae15640d2b97cb0ebccab8255ccf728596c62
Author: Søren Sandmann Pedersen <sandmann@daimi.au.dk>
Date: Sat Mar 26 23:50:24 2005 +0000
Sat Mar 26 18:49:21 2005 Soeren Sandmann <sandmann@redhat.com>
programs/Xserver/fb/fbmmx.h
New function.
Hook it up here
commit 0d33b588376a4d86d50ed8b7e06eaf0dbd8c5ba5
Author: Roland Mainz <roland.mainz@nrubsig.org>
Date: Fri Mar 25 23:11:14 2005 +0000
xc/programs/Xserver/Xprint/ps/Imakefile
//bugs.freedesktop.org/show_bug.cgi?id=2821) attachment #xxx
(https://bugs.freedesktop.org/attachment.cgi?id=xxx) Remove the cfb
dependicy from the PostScript DDX as this is not needed in a vector DDX
(mfb is still needed to fill the |BitmapToRegion()| callback with
|mfbPixmapToRegion()|).
commit 5f320335c3a8148ae98f82a00ff44954197f4251
Author: Matthieu Herrb <matthieu.herrb@laas.fr>
Date: Wed Mar 23 21:09:48 2005 +0000
bugzilla #2194: fix an alignement problem on 64 bit architectures.
commit f4e9f522fe8bec3dd6294d062c2244a06623add3
Author: Thomas Hellstrom <unichrome@shipmail.org>
Date: Wed Mar 23 21:03:41 2005 +0000
Bugzilla #2750 (https://bugs.freedesktop.org/show_bug.cgi?id=2750)
Linux-only fixes: Fix case where a smaller write-combining region
blocks write-combining setting of the whole frame buffer. Fix bug in wc
setting code when regions are first splitted and setting of
write-combining then fails.
commit 1be6e2388bcc5835ab62f0855d443fb508697deb
Author: Roland Mainz <roland.mainz@nrubsig.org>
Date: Wed Mar 23 20:49:52 2005 +0000
xc/programs/Xserver/hw/vfb/InitOutput.c
//bugs.freedesktop.org/show_bug.cgi?id=2791) attachment #2197
(https://bugs.freedesktop.org/attachment.cgi?id=2197) Add support for
12bit PseudoColor and 30bit TrueColor to Xvfb.
commit 26aec10adad51deb35a8398abb884d90be077a6b
Author: Roland Mainz <roland.mainz@nrubsig.org>
Date: Wed Mar 23 19:58:45 2005 +0000
xc/programs/Xserver/Imakefile
xc/programs/Xserver/Xprint/DiPrint.h
xc/programs/Xserver/Xprint/Imakefile
xc/programs/Xserver/Xprint/Init.c
xc/programs/Xserver/Xprint/ddxInit.c
xc/programs/Xserver/dix/Imakefile
xc/programs/Xserver/dix/main.c
xc/programs/Xserver/dix/xpstubs.c
xc/programs/Xserver/os/Imakefile
//bugs.freedesktop.org/show_bug.cgi?id=2792) attachment #2193
(https://bugs.freedesktop.org/attachment.cgi?id=2193) Fix build bustage
when |PrintOnlyServer| is set to |NO|. Patch by Roland Mainz
<roland.mainz@nrubsig.org> and Julien Lafon <julien.lafon@gmail.com>.
commit ac18f8e308221af368fd4153b4eee7b89f8dd4bc
Author: Roland Mainz <roland.mainz@nrubsig.org>
Date: Wed Mar 23 00:32:49 2005 +0000
//bugs.freedesktop.org/show_bug.cgi?id=2789) attachment #2187
(https://bugs.freedesktop.org/attachment.cgi?id=2187) Fix Xvfb to honor
the "-dpi" option (instead of using a hardcoded value of 100DPI).
commit 45bcb8e22ad949c456368b7d4f4226110f8b5cfc
Author: Adam Jackson <ajax@nwnk.net>
Date: Tue Mar 22 21:30:43 2005 +0000
Bug #1821: Typo fix in xorg.conf man page (Jens Schweikhardt)
commit cc95e597b51f06e835c6a9def1bc6681029bf41e
Author: Søren Sandmann Pedersen <sandmann@daimi.au.dk>
Date: Tue Mar 22 17:49:14 2005 +0000
Tue Mar 22 12:47:16 2005 Søren Sandmann <sandmann@redhat.com>
Only validate the source if it is a viewable window. Stops the cursor
flickering when it is above an unviewable window.
commit 1d68ede0eed62b48354a954a62fca98aa2ce9d2d
Author: Roland Mainz <roland.mainz@nrubsig.org>
Date: Sat Mar 19 20:51:34 2005 +0000
//bugs.freedesktop.org/show_bug.cgi?id=2771) attachment #2148
(https://bugs.freedesktop.org/attachment.cgi?id=2148) Remove RENDER
extension from exclusion list for the standalone print server (Xprt) to
get this extension enabled if the print DDX support it.
commit 64f1b3fe7e85245865666607d7b32ef7807df08f
Author: Michel Daenzer <michel@daenzer.net>
Date: Fri Mar 18 22:36:47 2005 +0000
Add support for production version of ATI RN50/ES1000. (ATI Technologies
Inc.)
commit 36dcc9bb1d51fb8c0d67c7e15700e3473a06e47b
Author: Torrey Lyons <torrey@mrcla.com>
Date: Thu Mar 17 01:12:07 2005 +0000
Fix build on stock Mac OS X: Out of the box, Mac OS X does not include
Freetype2, Expat, or PNG. Also global variables should be initalized in
the Xserver.
commit 82f5a127522e48ff7ff78400eadbce0a5a362064
Author: Søren Sandmann Pedersen <sandmann@daimi.au.dk>
Date: Wed Mar 16 21:25:43 2005 +0000
Wed Mar 16 16:17:43 2005 Søren Sandmann <sandmann@redhat.com>
Only validate the source if it is a viewable window. Stops the cursor
flickering when it is above an unviewable window.
commit 226c0907d4327a440fb0ac5380a19538ffdc6fa0
Author: David Reveman <c99drn@cs.umu.se>
Date: Wed Mar 16 21:05:51 2005 +0000
Add cursor support to Xglx
commit 7109ae147c3a9d243d11f386cfbcfbf7b4ea7918
Author: David Reveman <c99drn@cs.umu.se>
Date: Wed Mar 16 20:05:19 2005 +0000
Fix a few problems in Xgl
commit 04ccba4d40bef6cee902b118598272f26eebb1df
Author: Egbert Eich <eich@suse.de>
Date: Wed Mar 16 12:16:06 2005 +0000
Don't fail calling function when DriverFunc() for RandR fails as
DriverFunc() also returns FALSE when the specific sub function isn't
supported. In the case of xf86RandRGetInfo() we simply rely on what has
been set before and return TRUE. In the case of xf86RandRSetConfig() we
only bail with FALSE if we have to do a rotation and the call fails. We
presently cannot do rotation on the fly without the help of a driver
function (Bugzilla #2745).
commit 1011762254b41db5ce67cb652a2d4965efd7ec20
Author: Egbert Eich <eich@suse.de>
Date: Wed Mar 16 11:54:54 2005 +0000
Make message that gets printed when loader encounters a .o with no symbols
less conspicuous.
commit 816606b9eabee334ce6e0b79e8aa67544f428c19
Author: David Reveman <c99drn@cs.umu.se>
Date: Fri Mar 11 12:26:20 2005 +0000
Return early from xglFillRect when no rectangles should be filled
commit 4de5aa428514f2cacc60d4708dad996dedee1092
Author: David Reveman <c99drn@cs.umu.se>
Date: Fri Mar 11 00:58:49 2005 +0000
Use negative stride and PBOs in Xgl
commit 8653db5d57199d53c9b2b993c35a7b70c8949989
Author: Alexander Gottwald <alexander.gottwald@s1999.tu-chemnitz.de>
Date: Thu Mar 10 20:05:46 2005 +0000
Force rebuilding of window stack if a window changes it's state from
minimized.
commit 522628f25b4a075c8daf547991ea5b80c5efe9c7
Author: Egbert Eich <eich@suse.de>
Date: Tue Mar 8 10:26:59 2005 +0000
Adding more errnos to the libc wrapper (Bugzilla #2672).
commit db7c9d349b86216ed00888181c64ab707fbe18d4
Author: David Reveman <c99drn@cs.umu.se>
Date: Tue Mar 8 09:27:09 2005 +0000
Return early from xglCopy if fall-back is more efficient
commit e09d1d2ae3ccd59408b1dc6f264897ae12dfa2b8
Author: David Reveman <c99drn@cs.umu.se>
Date: Tue Mar 8 09:12:17 2005 +0000
Better ShmPutImage support in Xgl
commit 5d9885c5b95286c8d7f777c7232283e8b1e81d1b
Author: David Reveman <c99drn@cs.umu.se>
Date: Tue Mar 8 09:03:38 2005 +0000
Minor improvement to CopyArea in Xgl
commit 51155ca68bf7539bd3ace2ac068a2be1fbcf400c
Author: David Reveman <c99drn@cs.umu.se>
Date: Tue Mar 8 08:48:22 2005 +0000
Improve Xgl offscreen memory manager
commit e26a096cb662700387c7b43289d1f6f7ab4a0aac
Author: David Reveman <c99drn@cs.umu.se>
Date: Tue Mar 8 08:30:47 2005 +0000
Fix Xgl glyph caching
commit 8d0e520721ab7697d2d4f639425499b79c61b43f
Author: Roland Mainz <roland.mainz@nrubsig.org>
Date: Mon Mar 7 23:02:59 2005 +0000
xc/programs/Xserver/dix/atom.c
xc/programs/Xserver/dix/colormap.c
xc/programs/Xserver/dix/cursor.c
xc/programs/Xserver/dix/devices.c
xc/programs/Xserver/dix/dispatch.c
xc/programs/Xserver/dix/dixfonts.c
xc/programs/Xserver/dix/dixutils.c
xc/programs/Xserver/dix/events.c
xc/programs/Xserver/dix/extension.c
xc/programs/Xserver/dix/gc.c
xc/programs/Xserver/dix/glyphcurs.c
xc/programs/Xserver/dix/grabs.c
xc/programs/Xserver/dix/main.c
xc/programs/Xserver/dix/pixmap.c
xc/programs/Xserver/dix/privates.c
xc/programs/Xserver/dix/property.c
xc/programs/Xserver/dix/resource.c
xc/programs/Xserver/dix/swaprep.c
xc/programs/Xserver/dix/swapreq.c
//bugs.freedesktop.org/show_bug.cgi?id=2560) attachment #2037
(https://bugs.freedesktop.org/attachment.cgi?id=2037) ANSI-fy
Xserver/dix code. The conversion preserves the comments which annotate
variables. These have been moved into doxygen(esque?) "stubs" above
each function. Patch by Mike Owens <etc@filespanker.com>.
commit cb0aa2b4d8875f1ea66e720ca7c6cc2f403be26a
Author: Alexander Gottwald <alexander.gottwald@s1999.tu-chemnitz.de>
Date: Mon Mar 7 22:26:59 2005 +0000
Prevent winRaiseWindow from calling ConfigureWindow if the message was sent
from within winDestroyWindowsWindow
DestroyWindow send a WM_WINDOWPOSCHANGED to another window causing a
restacking of all windows, even of the window which is just about to
destroyed and whose structures may not be intact anymore.
commit 978f3b496b9951ee8120a0efcc5cd12503e26770
Author: Roland Mainz <roland.mainz@nrubsig.org>
Date: Sat Mar 5 21:38:29 2005 +0000
xc/programs/Xserver/Imakefile
xc/programs/Xserver/hw/xnest/Imakefile
//bugs.freedesktop.org/show_bug.cgi?id=2653) attachment #2020
(https://bugs.freedesktop.org/attachment.cgi?id=2020): Cleanup Xnest
usage of the DPMS dummy stub functions from dpmsstubs.c instead of
using it's own copy of these functions.
commit 602209990dbbc96b4c5a96e2221a418cf29e613d
Author: Roland Mainz <roland.mainz@nrubsig.org>
Date: Sat Mar 5 20:47:12 2005 +0000
//bugs.freedesktop.org/show_bug.cgi?id=2543) attachment #2019
(https://bugs.freedesktop.org/attachment.cgi?id=2019): Fix
|xf86SignalHandler()| which resets the signal handler before setting
the flag indicating a signal has been caught, theoretically allowing
the possibility of infinite recursion. Patch by Andrew Church
<xzilla@achurch.org>.
commit d995fe631a5706de93a05fda498333442af3d207
Author: Roland Mainz <roland.mainz@nrubsig.org>
Date: Wed Mar 2 14:21:40 2005 +0000
xc/programs/Xserver/hw/xnest/Screen.c
xc/programs/Xserver/hw/xnest/Window.c
//bugs.freedesktop.org/show_bug.cgi?id=2546) attachment #2005
(https://bugs.freedesktop.org/attachment.cgi?id=2005): Fix Xnest to
update the shape regions in the backend server whenever a client
changes them in Xnest (the fix is to add a new wrapper which calls
|xnestShapeWindow()| before calling |miSetShape()|). Patch by Mark
McLoughlin <mark@skynet.ie>
commit 3f79c5eefc0d62d3a9b095472cd75b446ba2a56e
Author: Roland Mainz <roland.mainz@nrubsig.org>
Date: Wed Mar 2 11:20:30 2005 +0000
xc/config/cf/DragonFly.cf
xc/config/cf/Imake.cf
xc/config/cf/Imakefile
xc/config/imake/imake.c
xc/config/imake/imakemdep.h
xc/extras/drm/shared/drm.h
xc/include/Xos_r.h
xc/lib/xtrans/Xtranssock.c
xc/programs/Xserver/hw/xfree86/os-support/xf86_OSlib.h
xc/programs/Xserver/hw/xfree86/os-support/xf86_libc.h
xc/programs/Xserver/hw/xfree86/os-support/linux/lnx_agp.c
//bugs.freedesktop.org/show_bug.cgi?id=1712) attachment #2004
(https://bugs.freedesktop.org/attachment.cgi?id=2004): Add support for
DragonFly/BSD platform. Patch by Jeroen Ruigrok <asmodai@tendra.org>
and Mike Verona <firedragonfly@gmail.com>.
commit 6c6151b2339a05c60ec58e013f915f79a3f9d756
Author: Alexander Gottwald <alexander.gottwald@s1999.tu-chemnitz.de>
Date: Tue Mar 1 18:58:17 2005 +0000
If a context is already attached copy it instead of reattaching to keep
displaylists and share displaylists Enable tracing of often called
functions with GLWIN_ENABLE_TRACE ForceCurrent is a no-op now
commit d323c4f59a653f364164d2a57fbbd102306a6ee9
Author: David Reveman <c99drn@cs.umu.se>
Date: Tue Mar 1 16:57:54 2005 +0000
Minor improvement to pixel transfers in Xgl
commit 2d2c1732620a83215983ee7a7dd469a1a85fcc12
Author: David Reveman <c99drn@cs.umu.se>
Date: Tue Mar 1 16:34:31 2005 +0000
Add dither support to Xgl
commit b4b27e9eaa43401ae70e5d03823012bf8c78848f
Author: Keith Packard <keithp@keithp.com>
Date: Mon Feb 28 20:45:15 2005 +0000
Force DPMS normal on screen enable
Add placeholder for bit used to redirect input
Add macrovision register defines
commit 409c0618bced6df02eed7af77107ff74508c0f3f
Author: Alexander Gottwald <alexander.gottwald@s1999.tu-chemnitz.de>
Date: Thu Feb 24 22:53:17 2005 +0000
on WM_WINDOWPOSCHANGED raise window directly and in sync without utilizing
the async windowmanager thread. Fixes some restacking problems occuring
which were timing dependent Do not raise the window on WM_ACTIVATE
Removed unused code for WM_WINDOWPOSCHANGING ESC is debug key. Print
status but do not abort processing the message
commit 775efdbd79448040b822fcc0556e98d3968ba8c3
Author: Alexander Gottwald <alexander.gottwald@s1999.tu-chemnitz.de>
Date: Wed Feb 23 19:17:10 2005 +0000
Bugzilla #2599 (https://bugs.freedesktop.org/show_bug.cgi?id=2599)
attachment #1964 (https://bugs.freedesktop.org/attachment.cgi?id=1964):
move miScreenInit in front of pScreen->function initializations to
prevent it from resetting ClipNotify.
commit c4b3fcda98a92c204534f04bd386ace5d3620d86
Author: Eric Anholt <anholt@freebsd.org>
Date: Mon Feb 21 03:44:10 2005 +0000
Move the draw tracing supplies into ati_draw.h, and do some touchups on it.
(When tracing drawing, I want to know what I'm drawing to, at a
minimum).
commit de34b0eefc9f8a29147659454398cabb187c7cb6
Author: Eric Anholt <anholt@freebsd.org>
Date: Mon Feb 21 03:05:55 2005 +0000
Extend the filter support to R200, and do the check for filter settings in
Check rather than Prepare, to avoid migration of things we won't be
able to accelerate.
commit 535c178286f94cc593b6cda753bbeb9b7cf6df4c
Author: Michel Daenzer <michel@daenzer.net>
Date: Fri Feb 18 19:55:35 2005 +0000
Bug #2576: Add support for ATI RN50/ES1000. (ATI Technologies Inc.)
commit 2f07222106358a02f56bf1e344d1fbf7ead14cbd
Author: Adam Jackson <ajax@nwnk.net>
Date: Fri Feb 18 17:52:48 2005 +0000
Bug #2455: Make x86emu handle JNL correctly. (David Wong)
commit 01b156240ce66703b38a67ee3cfbb475352cdf68
Author: Alexander Gottwald <alexander.gottwald@s1999.tu-chemnitz.de>
Date: Sat Feb 12 14:55:24 2005 +0000
winmultiwindowwindow.c
winmultiwindowwndproc.c
Cleanup some message debugging
commit 8df7126f09d6d7cb35a5912a71531cad28ba2545
Author: Alexander Gottwald <alexander.gottwald@s1999.tu-chemnitz.de>
Date: Sat Feb 12 14:47:17 2005 +0000
win.h
winfont.c
winmultiwindowshape.c
winmultiwindowwindow.c
winpfbdd.c
winshaddd.c
winshadddnl.c
winshadgdi.c
Fix incorrect wrapping of functions. Ensure the pointers from pScreen point
to the called function even if wrapped functions changed it
Set the window properties to NULL to avoid referencing freed memory because
of timing problems after deleting a window
Do not wrap ChangeWindowAttributes. All functions are noops currently
commit 676fdb03f3fb27ac24834aeb895df7d6d6e83f78
Author: Alexander Gottwald <alexander.gottwald@s1999.tu-chemnitz.de>
Date: Sat Feb 12 14:43:07 2005 +0000
print window handle in message outout
commit 046bdb17169ecb1361a42ab52043da699590d39a
Author: David Reveman <c99drn@cs.umu.se>
Date: Fri Feb 11 20:19:20 2005 +0000
Fixes a few problems in Xgl
commit 35bd81dfec62402f9d6c68d98e651e8cd87a8758
Author: Søren Sandmann Pedersen <sandmann@daimi.au.dk>
Date: Fri Feb 11 19:38:04 2005 +0000
Fri Feb 11 14:28:22 2005 Søren Sandmann <sandmann@redhat.com>
When COMPOSITE is enabled, call CopyWindow even when the pixels "don't
move" on screen.
Don't reject modes that are not supported by the unused monitor.
commit e5ccccfbd45c78c1be5e311b2cb4135a9a27540b
Author: Adam Jackson <ajax@nwnk.net>
Date: Fri Feb 11 06:37:38 2005 +0000
Bug #826: Make xorgconfig respect font installation outside $PROJECTROOT.
(Donnie Berkholz)
commit e7369daba58bb4fad5cef37fefbd851e59446045
Author: Egbert Eich <eich@suse.de>
Date: Wed Feb 9 11:12:54 2005 +0000
Added PCI2Host bus translations for linux PPC and fixed fixed bugs in
macros that apply these functions (Bill Randle Bugzilla #325 and #327).
commit aab9a8dd99e52297ed9b40c936600429f38fe9ad
Author: Keith Packard <keithp@keithp.com>
Date: Wed Feb 9 03:56:35 2005 +0000
Add initial evdev framework
commit a85c33b52c40fbae544c7dd40df8c8968e0cf7e9
Author: Keith Packard <keithp@keithp.com>
Date: Tue Feb 8 22:45:21 2005 +0000
update Xgl to changes in damage API. Remove some flags to support software
mesa
commit db2c83551cd3516800b88784c461fb33ee15aacf
Author: Keith Packard <keithp@keithp.com>
Date: Tue Feb 8 22:43:54 2005 +0000
hw/kdrive/ati/radeon_composite.c Support linear filtering
Change how touch screens work -- make them just another 'mouse' device. Add
unfinished (and unused) code to accelerate tiled fills.
commit 70d3a9192feefd54be93ea71231574c3ed815bf2
Author: Alexander Gottwald <alexander.gottwald@s1999.tu-chemnitz.de>
Date: Tue Feb 8 15:20:01 2005 +0000
Updated fix for ABNT2 and HK_Toggle keys.
commit 384099457e9d938871019ba2e5afc20280328884
Author: Alexander Gottwald <alexander.gottwald@s1999.tu-chemnitz.de>
Date: Tue Feb 8 10:15:49 2005 +0000
Backout ABNT2 and HK_Toggle fix since it broke keys F1 and F4.
commit ea5b09f95d6f25d8b0f8858c36b680055edd0da9
Author: Egbert Eich <eich@suse.de>
Date: Mon Feb 7 18:16:05 2005 +0000
Save gs register before calling the vm86_old syscall thru int 0x80. This is
required for linuxthreads as the TLS uses this register to keep track
of local thread storage (Bugzilla #2431, J. Scott Berg).
commit 4d55065b35baa7e13f6e726cb9d6675562648000
Author: Alexander Gottwald <alexander.gottwald@s1999.tu-chemnitz.de>
Date: Mon Feb 7 15:08:31 2005 +0000
Moved keyboard layout table to external file.
commit e132cb7590b5518ef1b7fce5f9151beed916fafc
Author: Alexander Gottwald <alexander.gottwald@s1999.tu-chemnitz.de>
Date: Mon Feb 7 15:05:39 2005 +0000
file winlayouts.h was initially added on branch CYGWIN.
commit c12ef1b34a55544f54401a5a66a36cd728e2f944
Author: Egbert Eich <eich@suse.de>
Date: Mon Feb 7 11:56:31 2005 +0000
Check the pixel clock choosen for a specific refresh rate against the
maximally allowed pixel clock when choosing mode lines for
VBESetVBEMode() and VESA BIOS version >= 3.0 (Bugzilla #2486).
commit 859be7a52b778df8acb676683351a6562a6d4400
Author: Felix Kuehling <fxkuehl@gmx.de>
Date: Fri Feb 4 01:14:49 2005 +0000
Applied patch (id=1354) by Mike A. Harris from bug #1901: The attached
patch updates a couple of PCI IDs for the Savage driver --
Debian/Ubuntu/Red Hat/Fedora.
commit 5feca068d740b165d3c36a690f5a68b7588b6625
Author: Alexander Gottwald <alexander.gottwald@s1999.tu-chemnitz.de>
Date: Thu Feb 3 09:58:47 2005 +0000
Bugzilla #1865 (https://bugs.freedesktop.org/show_bug.cgi?id=1865)
attachment #1827 (https://bugs.freedesktop.org/attachment.cgi?id=1827):
check for va_copy not being defined and use __va_copy if available
commit 3dda2fe0e2e7e4d2c058d32fa8691d12386b978d
Author: Alexander Gottwald <alexander.gottwald@s1999.tu-chemnitz.de>
Date: Wed Feb 2 18:06:14 2005 +0000
Force ShowWindow if XWin was started via run.exe. Fixes mainwindow not
showing bug
commit e8d3da3c753677cc1ae86bc5a79f2b7eba181d74
Author: Alexander Gottwald <alexander.gottwald@s1999.tu-chemnitz.de>
Date: Wed Feb 2 17:17:56 2005 +0000
Bugzilla #1866 (https://bugs.freedesktop.org/show_bug.cgi?id=1866)
attachment #1819 (https://bugs.freedesktop.org/attachment.cgi?id=1819):
Define APIENTRY on windows to prevent <GL/gl.h> from loading
<windows.h> removed leftovers from attachment #1818
commit 81b862509c87281705f8a8641c28ae2f45f15751
Author: Alexander Gottwald <alexander.gottwald@s1999.tu-chemnitz.de>
Date: Wed Feb 2 15:03:44 2005 +0000
Bugzilla #1866 (https://bugs.freedesktop.org/show_bug.cgi?id=1866)
attachment #1818 (https://bugs.freedesktop.org/attachment.cgi?id=1818):
Include Xwindows.h before GL/gl.h on windows to prevent loading
windows.h which pollutes our namespace with some symbols.
commit b532bfb483cc8ea87c28302e3d676234cab7c3f0
Author: Adam Jackson <ajax@nwnk.net>
Date: Wed Feb 2 04:07:04 2005 +0000
Bug #1294: Make sure RenderAccel hooks get wrapped in XAA init.
commit 44e2d9167943182fea530dfd7ec16aa53db20f4c
Author: Roland Mainz <roland.mainz@nrubsig.org>
Date: Wed Feb 2 00:55:21 2005 +0000
xc/programs/Xserver/hw/xfree86/os-support/bus/xf86Sbus.h
xc/programs/Xserver/hw/xfree86/os-support/linux/lnx_io.c
//bugs.freedesktop.org/show_bug.cgi?id=825) attachment #956
(https://bugs.freedesktop.org/attachment.cgi?id=956): Fix build
problems on Linux/SPARC. Patch by Jeremy Huddleston
<eradicator@gentoo.org>. Approved in the 2005-01-31 Xorg
release-wranglers phone call.
commit 15c555a25df76e0e95bc8eaa2ca7ec80a7695a6c
Author: David Reveman <c99drn@cs.umu.se>
Date: Tue Feb 1 21:22:02 2005 +0000
Use negative stride for trapezoid masks in Xgl
commit 2f0bdf77dd37d1763c4f4f409d55a6aad6031b9f
Author: Alexander Gottwald <alexander.gottwald@s1999.tu-chemnitz.de>
Date: Tue Feb 1 18:14:01 2005 +0000
xc/programs/Xserver/xkb/ddxLoad.c
Bugzilla #2245 (https://bugs.freedesktop.org/show_bug.cgi?id=2245)
attachment #1649 (https://bugs.freedesktop.org/attachment.cgi?id=1649):
cleanup the generation of xkbcomp command lines. Allocate them
dynamicly and remove unmaintainable length calculation.
commit d3ca132061a861cb9292b5a95dbcb2f67695883b
Author: Alexander Gottwald <alexander.gottwald@s1999.tu-chemnitz.de>
Date: Mon Jan 31 10:49:30 2005 +0000
winmultiwindowwindow.c
Create windows with SWP_NOACTIVATE flag (updated) (Kensuke Matsuzaki)
Fixes for window ordering problem (updated) (Kensuke Matsuzaki)
commit 374b9aa8ce14cd20a6768519eee63948c83488d6
Author: Alexander Gottwald <alexander.gottwald@s1999.tu-chemnitz.de>
Date: Mon Jan 31 10:47:32 2005 +0000
Added hungarian keyboard layout.
commit 8d277ceb22929fcb44f2d4def8c5b70535eb087f
Author: Alexander Gottwald <alexander.gottwald@s1999.tu-chemnitz.de>
Date: Mon Jan 31 10:43:37 2005 +0000
winmessages.h
winmsg.h
winmsg.c
winmultiwindowwndproc.c
winwin32rootlesswndproc.c
Make logging of messages configurable with environment variables
commit 2982d173cad762b801869b7ceacc237afdad88d6
Author: Alexander Gottwald <alexander.gottwald@s1999.tu-chemnitz.de>
Date: Mon Jan 31 10:32:19 2005 +0000
resolve SHGetFolderPath dynamicly since it is not available on all Windows
systems.
commit 8ac3be3f6c4bcaa8c3f6080cbfe72db4967feff8
Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
Date: Sun Jan 30 21:18:46 2005 +0000
//bugs.freedesktop.org/show_bug.cgi?id=1692> Remove reference to
nonexistent Monitors file from xorgconfig (Report & patch from Dejan
Lesjak <dejan.lesjak@ijs.si>)
commit 206072c475408b8d4cfd75d897854d8478fe0905
Author: Matthieu Herrb <matthieu.herrb@laas.fr>
Date: Sun Jan 30 20:12:07 2005 +0000
programs/Xserver/hw/xfree86/os-support/bsd/bsd_kbd.c Fix option
dontVTSwitch under *BSD, when XKB is disabled. Bugzilla #2252.
commit 327922f006dcc2e30ec0391d7fa786560fcd1599
Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
Date: Sat Jan 29 01:01:03 2005 +0000
Update to latest rev from http://pciids.sf.net/
Remove entries that now duplicate pci.ids Add entries for new Nvidia boards
added in recent nv driver update
commit d23c46dd3e2cbf84012055bad43b1bb15809a244
Author: Egbert Eich <eich@suse.de>
Date: Fri Jan 28 16:13:00 2005 +0000
Modifying X.Org Xserver DDX to allow to run X with ordinary user
permissions when no access to HW registers is required. For API changes
which mostly involve the modifications to make the RRFunc (introduced
with 6.8) more flexible please check Bugzilla #2407. NOTE: This patch
applies changes to OS specific files for other OSes which I cannot
test.
commit 1562ec5cc3706acfac1db04366f78e4949ef5502
Author: Alexander Gottwald <alexander.gottwald@s1999.tu-chemnitz.de>
Date: Thu Jan 27 20:33:34 2005 +0000
Functions like glGenTextures and glBindTexture are in OpenGL 1.1 and can be
resolved at linktime. Fixes tuxkart (at least with wine)
commit 5ca5fe71119f35f1f24aeb49e2608684024d450a
Author: Eric Anholt <anholt@freebsd.org>
Date: Thu Jan 27 05:25:57 2005 +0000
Add an OUT_RING_REG macro for use with DMA_PACKET0, which is like OUT_RING
but includes debugging to ensure that the reg being submitted is the
one that follows in the packet. Convert most uses of OUT_RING to it,
and convert a couple of OUT_REG sets to DMA_PACKET0/OUT_RING_REG. Also,
add checking to see if more registers are submitted to a DMA_PACKET0
than should be, to avoid hangs during stupid mistakes (checking for
less isn't done).
commit 0bd459488bf88084d703d801bfd5e79ea6d2b5a5
Author: Eric Anholt <anholt@freebsd.org>
Date: Thu Jan 27 03:52:49 2005 +0000
Move the bailing out due to ATIUploadToScreen() being unfinished up
farther, so that the traces aren't as confusing.
commit a973af4a9ade68b271d0695898d72aea50d8953b
Author: Eric Anholt <anholt@freebsd.org>
Date: Thu Jan 27 03:50:48 2005 +0000
Remove an unused field.
commit 59c7005bb155393c44792d457d98d72e34bb1b51
Author: Egbert Eich <eich@suse.de>
Date: Wed Jan 26 15:50:17 2005 +0000
When we tested if a PCI base address was unassigned we didn't take into
account that this bar could have been the upper part of a 64bit base
address. This fix makes this code 64bit bar aware (Bugzilla #2382).
commit 7c3dd0a5a76bea2c64972ae19d99775b5a992513
Author: Egbert Eich <eich@suse.de>
Date: Wed Jan 26 15:45:49 2005 +0000
Rewrite of RemoveOverlaps() to make the code more readable. It was
virtually impossible to determine if the old code did what it was
supposed to do. Also changed paradigm: Trust the based address more
than the (guessed) size. (Bugzilla #2383)
commit 9817582328cdafee59de616136172c2ce361a4b3
Author: David Reveman <c99drn@cs.umu.se>
Date: Wed Jan 26 10:58:52 2005 +0000
Xgl improvements
commit 13b5a93b70839053b9165b5087872164f0612536
Author: Egbert Eich <eich@suse.de>
Date: Tue Jan 25 10:08:18 2005 +0000
Fix interpretation of 64bit PCI bases: read hi long word from the right bar
(Michael Yaroslavtsev, Bugzilla #2322).
commit 8813898ef6b9eb470e079bcdcffa89d1243b63b9
Author: Keith Packard <keithp@keithp.com>
Date: Tue Jan 25 06:04:21 2005 +0000
Fix R100 text by forcing the 3d engine to idle before executing more 3d
commands. Add docs for the ISYNC_CNTL register, which doesn't quite do
what we want.
commit 33155b4fd3ce025d555f07833f96b760d5cdfbd3
Author: Eric Anholt <anholt@freebsd.org>
Date: Tue Jan 25 03:37:05 2005 +0000
Finish converting RB2D_DSTCACHE to RB3D_DSTCACHE. Remove an extra pixel
cache flush in the idle function. Init an extra reg for r200, and
annotate the TCL_BYPASS better. Also, clean up some style nits from the
last commit.
commit 3b1f1508b13520626839d45185dec09a42b9ff71
Author: Keith Packard <keithp@keithp.com>
Date: Tue Jan 25 02:39:48 2005 +0000
Add tracing. Hack Radeon cache registers to use 3D addresses. Works on M6
commit 6eaca06dac037851ae5c9575048faf932ad5ffc8
Author: Eric Anholt <anholt@freebsd.org>
Date: Tue Jan 25 01:40:18 2005 +0000
Fix a leak of a region when the driver's CheckComposite fails.
commit 8a1bee8ea9a028eef65b8884f73a79fbe84a9f3a
Author: Eric Anholt <anholt@freebsd.org>
Date: Tue Jan 25 01:38:26 2005 +0000
Silence a warning about uninitialized variable (though it would be).
commit 67eeede4e16324990e1a6afc237a3f51b8edea39
Author: Adam Jackson <ajax@nwnk.net>
Date: Mon Jan 24 20:44:49 2005 +0000
Bug #2004: Make DDC delay slightly longer. (Thomas J. Moore)
commit 55736aa8c17f762b15e9bcd7b3f68f8680b7cb33
Author: Egbert Eich <eich@suse.de>
Date: Fri Jan 21 14:25:26 2005 +0000
Alan Cox requested that we check the kernel version before we use kernel
VGA font save/restore as the required features have been added to Linux
2.6.11 (Bugzilla #2277).
commit d7263b11f043c8c0f83d6e05095143c70177926b
Author: Keith Packard <keithp@keithp.com>
Date: Thu Jan 20 20:51:27 2005 +0000
Reinitialize offscreen memory before enabling cursor on VT switch-to
commit 13c6b2f0b6c464ce11f6c332b2fa1a529bdbab01
Author: Eric Anholt <anholt@freebsd.org>
Date: Thu Jan 20 16:22:04 2005 +0000
Add a set of macros for dealing with the repeated code to wait for a while
reading a register/attempting DMA. Now it'll wait for a certain number
of seconds rather than a certain number of times through the loop
before deciding that it's timed out and resetting the hardware. Also,
add more timeout handling, and reset the draw state after resetting the
engine.
commit dbe45c71590ac319250d04a2bf37ec07cd79e42a
Author: Eric Anholt <anholt@freebsd.org>
Date: Thu Jan 20 07:28:02 2005 +0000
Use RadeonSwitchTo3D() instead of doing the WAIT_UNTIL ourselves (RST3D()
also does DC_FLUSH, which may be important).
commit fc43c154943fb1d277a9cffa9a4db7e76db461bc
Author: Eric Anholt <anholt@freebsd.org>
Date: Thu Jan 20 07:09:00 2005 +0000
Add R200 XV support, and make R100 (hopefully) use linear filtering instead
of nearest. Also, use RadeonSwitchTo3D instead of doing the WAIT_UNTIL
ourselves.
commit 77755065345eb71c997c1ff74dcfd2b2bbbf1305
Author: Eric Anholt <anholt@freebsd.org>
Date: Thu Jan 20 01:09:48 2005 +0000
Make R200 PDMA work -- primary queue sizes are now 9 bits, not 8.
commit 9bd876768b2165ec3903ad0848ae2ae950330290
Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
Date: Wed Jan 19 22:23:20 2005 +0000
Fix debugging ErrorF() so it compiles when DEBUG is true.
commit ff433adba3a643512fdd44e41cd08965fab9c9cb
Author: Keith Packard <keithp@keithp.com>
Date: Wed Jan 19 06:35:28 2005 +0000
Prefer 32bpp to 24bpp. Fix 16 color planar mode (!)
commit cbcdae5a3f7c4009121f86de52bba6c657f20fff
Author: Adam Jackson <ajax@nwnk.net>
Date: Mon Jan 17 17:17:45 2005 +0000
more static server build fixes
commit 79a7120983eff6fa114d4250fe01b62d4a99a612
Author: Adam Jackson <ajax@nwnk.net>
Date: Sun Jan 16 01:59:23 2005 +0000
Bug #1895: Fix fbComposeGetSolid for BGR. (David S. Miller)
commit 24cdd188dc3c10b56d6a7b46dafefb16c6d13efc
Author: Søren Sandmann Pedersen <sandmann@daimi.au.dk>
Date: Fri Jan 14 22:07:59 2005 +0000
Fri Jan 14 17:03:40 2005 Søren Sandmann <sandmann@redhat.com>
Fix from Keith Packard for bitgravity bugs in the Composite extension,
reported by Amir Bukhari.
commit 7db2e666e2dc9a1dba468e35e9d382e76ed8be54
Author: Søren Sandmann Pedersen <sandmann@daimi.au.dk>
Date: Fri Jan 14 21:56:51 2005 +0000
Fri Jan 14 11:12:46 2005 Søren Sandmann <sandmann@redhat.com>
Use mmx CopyArea in a few more places.
commit 761f937fdee9ccd10ad54c1f06e12f2f102547a6
Author: Egbert Eich <eich@suse.de>
Date: Fri Jan 14 19:29:18 2005 +0000
- Don't suspend Xserver on APM standby request as this seems to cause
problems on may systems which don't support APM standby and might not
be required as according to the APM specs the chips should receive
enough power to retain its state.
- Print out power state change requests to log file in all verbosity
levels.
- Don't change server state if no driver PM function is registered.
(Bugzilla #2279)
commit 16f9d2d72a2378470e9c5b31c59fa6c9a00892d6
Author: Egbert Eich <eich@suse.de>
Date: Fri Jan 14 18:42:26 2005 +0000
Let the OS instead of X save/restore text console fonts on Linux. So far we
relied on the generic VGA layer to restore text console fonts for us
when shutting down the server or VT switching back to the text console.
This has worked rather well but it has some downsides on Linux: a. Many
people use fbdev as console text mode. In this case it is not necessary
to save/restore console fonts as the console is running in graphics
mode anyway. b. Some architectures don't have a fbdev console but
require a full POST of even the primary card (ie. IA64). This posting
has to take place before we even have a chance to save anything.
Therefore the fonts we save are the once written to the chip by POST,
not what has been programmed by the user. c. Certain chipsets utilize
the BIOS to perform mode setting. This may interfer with the vga
save/restore font function in a strange way. It would therefore be
preferrable to let the OS - which has been used to set up the font in
the first place - take care of saving/restoring the data. I will attach
a patch which will do so for Linux. To make this fully functional a
small patch needs to be applied to the Linux kernel. To disable this
feature add: #define DoOSFontRestore NO to your host.def. (Bugzilla
#2277)
commit 6c0b03a2362f33ae24a2f6845ed1418c9af4b8bc
Author: Adam Jackson <ajax@nwnk.net>
Date: Fri Jan 14 17:14:08 2005 +0000
Build fixes for static server.
commit df4a1fa9c5cc5d54a9347a2bf4843cae87a942f1
Author: Alexander Gottwald <alexander.gottwald@s1999.tu-chemnitz.de>
Date: Fri Jan 14 12:17:10 2005 +0000
Added copyright notice.
commit 2137bc6eb9f36f4ba999023d83c637024f3a6e4c
Author: Roland Mainz <roland.mainz@nrubsig.org>
Date: Fri Jan 14 08:37:30 2005 +0000
xc/programs/Xserver/afb/afbbres.c
xc/programs/Xserver/afb/afbbresd.c
xc/programs/Xserver/afb/afbclip.c
xc/programs/Xserver/afb/afbhrzvert.c
xc/programs/Xserver/afb/afbline.c
xc/programs/Xserver/afb/afbmodule.c
xc/programs/Xserver/afb/afbpixmap.c
xc/programs/Xserver/afb/afbpolypnt.c
xc/programs/Xserver/afb/afbpushpxl.c
xc/programs/Xserver/afb/afbtegblt.c
xc/programs/Xserver/cfb/Imakefile.inc
xc/programs/Xserver/cfb/cfballpriv.c
xc/programs/Xserver/cfb/cfbbitblt.c
xc/programs/Xserver/cfb/cfbcppl.c
xc/programs/Xserver/cfb/cfbgc.c
xc/programs/Xserver/cfb/cfbglblt8.c
xc/programs/Xserver/cfb/cfbmap.h
xc/programs/Xserver/cfb/cfbpixmap.c
xc/programs/Xserver/cfb/cfbscrinit.c
xc/programs/Xserver/cfb/cfbtab.h
xc/programs/Xserver/cfb/cfbteblt8.c
xc/programs/Xserver/cfb/cfbunmap.h
xc/programs/Xserver/mfb/maskbits.c
xc/programs/Xserver/mfb/maskbits.h
xc/programs/Xserver/mfb/mergerop.h
xc/programs/Xserver/mfb/mfb.h
xc/programs/Xserver/mfb/mfbclip.c
xc/programs/Xserver/mfb/mfbfont.c
xc/programs/Xserver/mfb/mfbgc.c
xc/programs/Xserver/mfb/mfbmisc.c
xc/programs/Xserver/mfb/mfbpushpxl.c
//bugs.freedesktop.org/show_bug.cgi?id=1114) attachment #667
(https://bugs.freedesktop.org/attachment.cgi?id=667): Convert afb and
cfb{,16,24,32} to be dlloader-friendly. Patch by Adam Jackson
<ajax@freedesktop.org>.
commit 61b3c3aef5437f14d413a60da792257b01e9f8fa
Author: Søren Sandmann Pedersen <sandmann@daimi.au.dk>
Date: Thu Jan 13 23:07:41 2005 +0000
Thu Jan 13 17:45:13 2005 Søren Sandmann <sandmann@redhat.com>
Make sure the pixmap is a valid new resource
Make sure the context is a legal new resource.
Handle null attrib_list.
Handle null attrib_list; copy attrib_list to data; actually allocate the
new GLXDrawable.
commit 433c38f22fa96486a43dc0c9871cc09875251b34
Author: Søren Sandmann Pedersen <sandmann@daimi.au.dk>
Date: Thu Jan 13 20:49:21 2005 +0000
Thu Jan 13 15:40:29 2005 Søren Sandmann <sandmann@redhat.com>
Add MMX implementation of non-repeating source IN repeating mask, aka
"translucent window".
Add MMX implementation of CopyArea.
Use MMX implementation of CopyArea.
Use the new implementations.
commit a303670107f205c6ca76919ca6cd6af6013073f1
Author: Adam Jackson <ajax@nwnk.net>
Date: Thu Jan 13 01:22:53 2005 +0000
Bug #2114: PPC64 Linux build fix: use system definition of eieio().
Originally Gentoo bug #66223. (Tim Yamin, Donnie Berkholz)
commit 15895b411779aa3c14ffb92fb58cd8ec24845ea7
Author: Alexander Gottwald <alexander.gottwald@s1999.tu-chemnitz.de>
Date: Wed Jan 12 16:10:00 2005 +0000
winmsg.c
Introduce function winTrace which prints log message with verbosity 10
Use winTrace for 3 heavily called functions
commit 8aabc94596dae0fd4ce2c975de75946685faf2cd
Author: Alexander Gottwald <alexander.gottwald@s1999.tu-chemnitz.de>
Date: Tue Jan 11 17:33:03 2005 +0000
Document the -silent-dup-error switch
commit b6301dc41090899b20003eab1356bc09fc5eed1a
Author: Egbert Eich <eich@suse.de>
Date: Tue Jan 11 14:59:02 2005 +0000
Minor format fix.
Added explanatory comment and debug code.
Added comment.
commit 27fc6874b34d70a7ddae5ed8f516f6cfaab518b8
Author: Alexander Gottwald <alexander.gottwald@s1999.tu-chemnitz.de>
Date: Tue Jan 11 12:03:34 2005 +0000
Do not grab ALT-TAB when window is in multiwindow mode
commit d365664c58919edb5e121a7c884384438df79776
Author: Alexander Gottwald <alexander.gottwald@s1999.tu-chemnitz.de>
Date: Tue Jan 11 11:58:12 2005 +0000
Fix crash with not matching definitions of PATH_MAX
commit 65b893a707ad8b3e4d0971825c05a965dca36d10
Author: Roland Mainz <roland.mainz@nrubsig.org>
Date: Mon Jan 10 23:38:50 2005 +0000
//bugs.freedesktop.org/show_bug.cgi?id=2167) attachment #1641
(https://bugs.freedesktop.org/attachment.cgi?id=1641): Fix broken
Solaris print queue enumeration.
commit c6b5a9431178ac7eb90ec498e6830366865d1268
Author: Roland Mainz <roland.mainz@nrubsig.org>
Date: Mon Jan 10 18:47:55 2005 +0000
//bugs.freedesktop.org/show_bug.cgi?id=2254) attachment #1659
(https://bugs.freedesktop.org/attachment.cgi?id=1659): Refix for gcc4.0
build failure. It seems that the |ExecCommand()| function has no
consumer and can safely be removed.
commit eb701e9b4481f984fdcfece181126f7424e2bf45
Author: Alexander Gottwald <alexander.gottwald@s1999.tu-chemnitz.de>
Date: Mon Jan 10 17:54:31 2005 +0000
winkeybd.h
Adjust keysyms for Hiragana_Katakana toggle and backslash/underscore on
Japanese and ABNT2 keyboards
commit 2ef9d01c4d3b03f0a5d829304f2a7e2cc1327f3b
Author: Roland Mainz <roland.mainz@nrubsig.org>
Date: Mon Jan 10 14:16:29 2005 +0000
xc/programs/Xserver/Xprint/Util.c
xc/programs/Xserver/Xprint/attributes.h
//bugs.freedesktop.org/show_bug.cgi?id=2254) attachment #1654
(https://bugs.freedesktop.org/attachment.cgi?id=1654): Fix gcc4.0 build
failure. Patch by Egbert Eich <eich@freedesktop.org> and Roland Mainz
<roland.mainz@nrubsig.org>
commit 57387e115caf5a4b9501cc8f6ddeb1946b0e6547
Author: Alexander Gottwald <alexander.gottwald@s1999.tu-chemnitz.de>
Date: Mon Jan 10 13:13:08 2005 +0000
winkeybd.h
winkeyhook.c
Make keyhook feature work in multiwindowmode too Hook windows keys
commit f417159e51afe22de7d4e6ba9f154313c6af59bc
Author: Egbert Eich <eich@suse.de>
Date: Mon Jan 10 12:20:33 2005 +0000
Make option 'DontVTSwitch' work again with kbd driver under Linux. The kbd
driver now calls the OS layer to handle special keys. Possibly other
special keys and other OSes need to be looked at also. (Helmut
Fahrion).
commit fe4e74241f6791cb1cefdddeb492ed0f56ce99b4
Author: Alexander Gottwald <alexander.gottwald@s1999.tu-chemnitz.de>
Date: Sun Jan 9 17:35:47 2005 +0000
xc/programs/Xserver/xkb/ddxList.c
//bugs.freedesktop.org/show_bug.cgi?id=2245) attachment #1647
(https://bugs.freedesktop.org/attachment.cgi?id=1647): export
Win32System and Win32TempDir remove #ifdef WIN32 block for building
xkbcomp commandline create win32 tempfile in system tempdir use
PATH_MAX*4 for commandline buffer unlink tmpfile again
commit ba25f7e8dcaa2690ce3eab839904fac034002e0b
Author: Alexander Gottwald <alexander.gottwald@s1999.tu-chemnitz.de>
Date: Sun Jan 9 15:29:45 2005 +0000
//bugs.freedesktop.org/show_bug.cgi?id=2245) attachment #1645
(https://bugs.freedesktop.org/attachment.cgi?id=1645): cleanup some
#ifdef __UNIXOS2__ and WIN32 blocks. make OutputDirectory check the
size of the buffer quote all file and pathnames in the xkbcomp
commandline use PATH_MAX*4 for commandline buffer
commit 2410b61f430c3ac4be79043f8b00defe6d53148c
Author: Roland Mainz <roland.mainz@nrubsig.org>
Date: Sun Jan 9 00:38:08 2005 +0000
//bugs.freedesktop.org/show_bug.cgi?id=2240) attachment #1642
(https://bugs.freedesktop.org/attachment.cgi?id=1642): Fix incorrect
usage of /usr/bin/tr in startup script (the used "[\n]" is neither
correct or portable, using "\n" seems to be sufficient (this fixes
various "random" issues, including including Debian bug #258419 and
Debian bug #264983). Patch by Drew Parsons <dparsons@debian.org>.
commit 709a2343a8c12ea7e158c63a9737b11744b50994
Author: Alexander Gottwald <alexander.gottwald@s1999.tu-chemnitz.de>
Date: Sat Jan 8 13:01:03 2005 +0000
Fix a possible null-pointer dereference (Keishi Suenaga)
commit d332a909f8b8741af75047d78a62a3d19e0776e1
Author: Alexander Gottwald <alexander.gottwald@s1999.tu-chemnitz.de>
Date: Thu Jan 6 21:29:09 2005 +0000
Imakefile
InitOutput.c
XWin.rc
winerror.c
wintrayicon.c
winvideo.c
winshaddd.c
Set PROJECT_NAME in Imakefile to create alternative window titles for
Cygwin/X and Xming
commit d6a74f2c4aec9c914ec0837bd0bf0d212019093f
Author: Alexander Gottwald <alexander.gottwald@s1999.tu-chemnitz.de>
Date: Thu Jan 6 16:02:47 2005 +0000
Imakefile
InitOutput.c
XWin.rc
winerror.c
wintrayicon.c
winvideo.c
Set PROJECT_NAME in Imakefile to create alternative window titles for
Cygwin/X and Xming
commit 3165236483de936b4ca22f8b6d2d2b8b1a1a4909
Author: Alexander Gottwald <alexander.gottwald@s1999.tu-chemnitz.de>
Date: Thu Jan 6 13:24:57 2005 +0000
Fix crash with non-nullterminated strings (reported by yvind Harboe)
commit 591ac9c811de0871d3bdcc19cada0ff6715bf67c
Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
Date: Tue Jan 4 00:16:20 2005 +0000
Bugzilla #2211 (https://bugs.freedesktop.org/show_bug.cgi?id=2211)
attachment #1627 (https://bugs.freedesktop.org/attachment.cgi?id=1627):
xorgconfig default keyboard model outdated (should be pc105, not
pc101/pc102)
commit af8bd7161724b6709ffe582dfd830c05d9bf4f26
Author: Søren Sandmann Pedersen <sandmann@daimi.au.dk>
Date: Mon Jan 3 21:32:22 2005 +0000
Mon Jan 3 12:45:10 2005 Søren Sandmann <sandmann@redhat.com>
Clean-ups and support for AMD64. Bug 1067. Patch by Nicholas Miell
(nmiell@comcast.net)
Add support for AMD64
Many cleanups using <mmintrin.h> instead of __builin_ia32_*, and intrinsics
instead of inline assembly. Also unconditionally use pshufw on AMD64.
s/USE_GCC34_MMX/USE_MMX/g
commit 5f39eff85109a73d006832ad35d9d5b58f93ef0c
Author: Egbert Eich <eich@suse.de>
Date: Mon Jan 3 15:43:55 2005 +0000
Added missing return value (Bugzilla #2205) Problem found by Stefan Kulow.
commit ae6d52092bca6068a7847b3944148336ab489869
Author: Egbert Eich <eich@suse.de>
Date: Mon Jan 3 15:39:35 2005 +0000
Added missing return value (Bugzilla #2206) Problem found by Stefan Kulow.
commit 83e13e21c8d9a3b54cae2ecc2943be3316659870
Author: Alexander Gottwald <alexander.gottwald@s1999.tu-chemnitz.de>
Date: Fri Dec 24 14:40:28 2004 +0000
Print error message if CreateProcess fails Simplify popen simulation code
for WIN32 Remove temporary file after executing xkbcomp
commit 106703edf67139fa52f6810f9ced0ce5ba86a3cd
Author: Eric Anholt <anholt@freebsd.org>
Date: Wed Dec 22 18:39:41 2004 +0000
Back out the previous day's broken R200 "fix" -- the same number of coords
are always emitted. Fix the real problem, which was not enough regs
being initialized in ati_draw.c. Fix a typo that was resulting in alpha
coming out as 0 * src or 0 * broken instead of src * 1 or src * mask.
Assign the blending results to R0, as appears to be necessary. Unbreak
the dst-alpha-blend-with-no-dst-alpha code. Yow. And set the right DMA
count for the r200 traps code.
commit 3035739e5b7d5a9042292d64455feb4b38788fe4
Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
Date: Wed Dec 22 08:28:16 2004 +0000
Bug #2123 <https://bugs.freedesktop.org/show_bug.cgi?id=2123> Attachment
#1587 <https://bugs.freedesktop.org/attachment.cgi?id=1587> Call to
uname should not check for return == 0, but for >= 0 instead
commit fa0677ab43722462042f87c4636a7d59d1cb873f
Author: Eric Anholt <anholt@freebsd.org>
Date: Tue Dec 21 09:51:47 2004 +0000
Fix r200 render (for real this time?) by setting tex1_comp_cnt right for
non-mask rendering. Reenable it. Also, R200TexFormats was used instead
of R100 in one place. Harmless so far, because the formats were in the
same order.
commit 4b0247b9e0a6b7f40cd2738fb29d2ed1acba99e7
Author: Eric Anholt <anholt@freebsd.org>
Date: Tue Dec 21 09:49:30 2004 +0000
Whitespace nit.
commit 894431412613265fd315cf7a707ffa741f93cf47
Author: Matthieu Herrb <matthieu.herrb@laas.fr>
Date: Wed Dec 15 20:51:25 2004 +0000
Use snprintf.
commit eea11301fd9247a28b1daeb340a018c7ea309c41
Author: Thomas Winischhofer <thomas@winischhofer.net>
Date: Wed Dec 15 15:05:35 2004 +0000
Another fix for MiscPassMessage(): Initialize returned "status".
commit 264c3eefe6c0cdee1ff0a5de914f051ab23026b7
Author: Alexander Gottwald <alexander.gottwald@s1999.tu-chemnitz.de>
Date: Wed Dec 15 12:22:39 2004 +0000
latest changes from CYGWIN
commit c7fec26b50f8a64360d1252cdf48370935fb2f76
Author: Thomas Winischhofer <thomas@winischhofer.net>
Date: Wed Dec 15 00:32:56 2004 +0000
Make MISC extention's PassMessage() actually work and fix memory leaks
commit d0b17bda4dc469e2ce72f4f8965916b316e1deb7
Author: Egbert Eich <eich@suse.de>
Date: Tue Dec 14 08:59:20 2004 +0000
Removed #ifdef'ed out code together with the comment explaining why it was
#ifdef'ed out.
Fixed typo.
Added comment to a changed that's been committed with one of the previous
commits.
commit 0e6a122316a94c96051f1d832990032a386097bc
Author: Roland Mainz <roland.mainz@nrubsig.org>
Date: Mon Dec 13 03:42:32 2004 +0000
//bugs.freedesktop.org/show_bug.cgi?id=1695) attachment #1230
(https://bugs.freedesktop.org/attachment.cgi?id=1230): Fix crash in
Xscreensaver code which allowed any authentificated X client to crash
the Xserver using |XScreenSaverUnsetAttributes()|. Patch by
ajax@nwnk.net
commit 159e443a2209eb3ea305e84b847b76ef1637d005
Author: Roland Mainz <roland.mainz@nrubsig.org>
Date: Mon Dec 13 02:13:32 2004 +0000
//bugs.freedesktop.org/show_bug.cgi?id=1688) attachment #1530
(https://bugs.freedesktop.org/attachment.cgi?id=1530): Fix the current
implementation to make it possible to slow down the mouse pointer or
use arbitrary fractions (without running into rounding error issues).
The change is using the same method of preserving rounding errors that
the exponential method is already using. Patch by Jan Brunner
<Jan_B@gmx.ch>.
commit f1768677f73150c686cf5678f5f5d63c0cfa8e56
Author: Kristian Høgsberg <krh@redhat.com>
Date: Sun Dec 12 23:29:20 2004 +0000
Reduce vidmode logging.
commit 9286a5d032ea6bed102db39281c3d2537da4dccc
Author: Kristian Høgsberg <krh@redhat.com>
Date: Sun Dec 12 22:58:37 2004 +0000
Add fix for 460gx pci scan code.
commit 8266a2581d21a1a2880a0e8babb8b0305c435ec0
Author: Torrey Lyons <torrey@mrcla.com>
Date: Thu Dec 9 22:40:35 2004 +0000
Fix crash with more than one screen reported by John Davidorff Pell.
commit 081b33d73f73572cfefba7e5489408a7117b6e9f
Author: Alexander Gottwald <alexander.gottwald@s1999.tu-chemnitz.de>
Date: Wed Dec 8 15:48:15 2004 +0000
import changes from CYGWIN branch
commit 6c317c1c1323bd11292f8f9f179d75c96a18e616
Author: Roland Mainz <roland.mainz@nrubsig.org>
Date: Wed Dec 8 05:52:20 2004 +0000
//bugs.freedesktop.org/show_bug.cgi?id=1361) attachment #1287
(https://bugs.freedesktop.org/attachment.cgi?id=1287): Avoid DRI
initalisation when the Xfree86-DRI extension was turned off. Patch by
Kristian Hgsberg <krh@bitplanet.net>.
commit b9476cd96faf19153c11e3370e9fced8045600f4
Author: Roland Mainz <roland.mainz@nrubsig.org>
Date: Wed Dec 8 05:48:16 2004 +0000
//bugs.freedesktop.org/show_bug.cgi?id=1361) attachment #938
(https://bugs.freedesktop.org/attachment.cgi?id=938): Allow more
extensions to be enabled/disabled.
commit 47935dd7f010f2f77768774ceb6f85667efe4264
Author: Matthew Allum <breakfast@10.am>
Date: Mon Dec 6 22:29:31 2004 +0000
Xephyr on Xorg fix
commit 8091b301c941473ab99626a6e66f72acdb6750f7
Author: Matthieu Herrb <matthieu.herrb@laas.fr>
Date: Mon Dec 6 21:54:19 2004 +0000
xf86Config.c references USE_DEPRECATED_KEYBOARD_DRIVER so define it if
needed when building this file
- bug fix: pointerMsg -> keyboardMsg in auto-configuration code.
- make the 'kbd' driver the default for autoconfiguration everywhere.
commit cde3a175005104e061c1ff133f07c598868bdc4e
Author: Alexander Gottwald <alexander.gottwald@s1999.tu-chemnitz.de>
Date: Mon Dec 6 18:28:12 2004 +0000
include windows.h
commit 9c94971617db11861aed82e16804fc14a9ca1260
Author: Egbert Eich <eich@suse.de>
Date: Mon Dec 6 15:53:00 2004 +0000
Use the same method of finding the screen pixmap of COMPOSITE extension is
compiled in or not.
Removed stale make variable.
Updated xaaWrapper.c: Under certain circumstances the accel path was not
used when possible. Removed some debugging stuff and stale code that
had been commented out.
Check if maps are really installed before attempting to list them.
commit 4945034792b28d1a222a615404bfceaf48a130c5
Author: Alexander Gottwald <alexander.gottwald@s1999.tu-chemnitz.de>
Date: Mon Dec 6 12:26:50 2004 +0000
problem with max() macro. this one slipped though again
commit 531776becf95f66e6e435aad0dc21ead436ff5aa
Author: Alexander Gottwald <alexander.gottwald@s1999.tu-chemnitz.de>
Date: Sun Dec 5 21:33:23 2004 +0000
missed another wBOOL issue
commit 9bd1328c49aafae67a6a6d9fd17063c75d8547a2
Author: Alexander Gottwald <alexander.gottwald@s1999.tu-chemnitz.de>
Date: Sun Dec 5 21:24:48 2004 +0000
redone ddraw.h to be able to mix it with w32api style COM header files.
obj_base.h is not needed anymore. Using <objbase.h> instead.
Use Xwindows.h instead of windows.h
do not include win_ms.h
remove extra definition of sleep()
Set HOME to Documents and Settings/username if not set
Use Xming basedir instead of ProjectRoot for system.XWinrc
Fix callback functions to use wBOOL instead of BOOL
Fix compiler warnings. Added debug output.
Fix warning about undefined macro max
commit bf0a760331e2fe4dbc00e78f87022c7464d9ca4f
Author: Roland Mainz <roland.mainz@nrubsig.org>
Date: Sun Dec 5 04:39:34 2004 +0000
//freedesktop.org/bugzilla/show_bug.cgi?id=1800): Fix Postscript DDX's 1bit
StaticGray visual to report only 1bit of significant bits in color
specification (instead of 8bits). Patch by Julien Lafon
<julien.lafon@gmail.com>
commit 44f4713a056b7a6a076b2f65fbed43e0cfe9ff06
Author: Markus Kuhn <Markus.Kuhn@cl.cam.ac.uk>
Date: Sat Dec 4 00:43:13 2004 +0000
Encoding of numerous files changed to UTF-8
commit f264a7ea741f57fbc3bb900cfbb9e0cc23f46e90
Author: Alexander Gottwald <alexander.gottwald@s1999.tu-chemnitz.de>
Date: Fri Dec 3 12:04:15 2004 +0000
Removed scprintf, aprintf and snprintf stuff and use newXprintf
commit 16a683f4d164899ecfdafb853f48cff10fd13fd4
Author: Alexander Gottwald <alexander.gottwald@s1999.tu-chemnitz.de>
Date: Fri Dec 3 11:57:42 2004 +0000
Bugzilla #1865, https://bugs.freedesktop.org/show_bug.cgi?id=1865 Added
X(NF)printf and X(NF)vprintf functions which allocate the buffer with
X(NF)alloc
Bugzilla #1865, https://bugs.freedesktop.org/show_bug.cgi?id=1865 extend
snprintf to work on NULL.
commit fe2a2213d1db8700f6078379f86ebe8827793c20
Author: Roland Mainz <roland.mainz@nrubsig.org>
Date: Thu Dec 2 23:47:39 2004 +0000
//freedesktop.org/bugzilla/show_bug.cgi?id=1998): Fix Xserver standalone
build when RENDER extension includes are not availabe.
commit 30a4202f3d59a32fd6f93dfd257d93ee21b68ed9
Author: Kristian Høgsberg <krh@redhat.com>
Date: Thu Dec 2 21:58:58 2004 +0000
Use __printf__ in gcc function attributes to avoid clash with libc wrapper
define, and remove the last bits of the old workaround.
commit e62d85baa31fc853aefdef49962ad4cb86ae8245
Author: Alexander Gottwald <alexander.gottwald@s1999.tu-chemnitz.de>
Date: Thu Dec 2 21:49:54 2004 +0000
Remove some of the ifdef WIN32 checks from WaitForSomething
commit 2782b8871196ef28f9a6c84bf6c8b5086d00d5d4
Author: Alexander Gottwald <alexander.gottwald@s1999.tu-chemnitz.de>
Date: Thu Dec 2 14:19:01 2004 +0000
Adjust the width of the rootless backbuffer to match 32 bit alignment
Make multiplemonitors default for -internalwm
commit 3b3e24dc4d89b471d80428dd9ad122f259b1fc81
Author: Alexander Gottwald <alexander.gottwald@s1999.tu-chemnitz.de>
Date: Thu Dec 2 13:38:30 2004 +0000
Set HasFfs to NO
Fix link order problems with mingw. Add libdix.a after libmi.a.
Pass -DHAS_FFS to compiler
remove inline code for ffs(). It will link to dix/ffs.c instead added
declaration for ffs()
commit 2620676306d1eccd24a6bf0637a60842656e6f7c
Author: Phil Blundell <pb@reciva.com>
Date: Wed Dec 1 19:43:29 2004 +0000
Patch from Florian Boor <florian.boor@kernelconcepts.de>:
Check return value from ts_config. (TslibInit): Likewise.
commit 96545d038837bbc7dc435ed7c1f631454e86cecb
Author: Alexander Gottwald <alexander.gottwald@s1999.tu-chemnitz.de>
Date: Wed Dec 1 14:57:45 2004 +0000
Remove code which sneaked in recently. It is not proven to be correct, just
a workaround and disabled by default
commit 3f063fc49cc2d456359a1b0b9f36f27befdb09b0
Author: Alexander Gottwald <alexander.gottwald@s1999.tu-chemnitz.de>
Date: Wed Dec 1 14:16:07 2004 +0000
Set XERRORDB environment variable to relocate the XErrorDB file
commit 908442301478b21febab17e31aa55918eaaa5101
Author: Roland Mainz <roland.mainz@nrubsig.org>
Date: Tue Nov 30 23:43:33 2004 +0000
//freedesktop.org/bugzilla/show_bug.cgi?id=811): Updating generated
Xprt.html which was forgotten during the previous work.
commit af717ae57dd6c5e6ad41b4142d62cdbb55f13777
Author: Egbert Eich <eich@suse.de>
Date: Tue Nov 30 08:38:44 2004 +0000
Make Xorg the default server to install.
Avoid PIO access on IA64. Some IA64 machine check if legacy ports outside
the VGA range are accessed. The ATi driver however does this to probe
for ISA Mach8/32/64. Since no IA64 has ISA slots this restriction
should not be relevant to the user.
Avoid recursive calls of xf86scanpci(). This function normally detects that
it has been called before by checking if the PCI structure is filled
out. So far if this was not the case (because PCI probing has failed
for some reason) the function is traversed again. With the chipset
specific PCI bus probing this can lead to an endless recursive loop as
the post-probing code calls xf86scanpci() from within this function.
The OS specific PCI code for Linux worked only if bus 0 was populated as it
checked for the presence of /proc/bus/pci/00. Fixed to check for
/proc/bus/pci/<bus_to_look_for> instead.
commit 59ccc6465ca15e046ad11362ae5fbb3c71d2c148
Author: Alexander Gottwald <alexander.gottwald@s1999.tu-chemnitz.de>
Date: Mon Nov 29 12:34:55 2004 +0000
Fixed windows.h include for cygwin.
Bugzilla #1945: Stop unnecessary reordering.
commit df2f2ff5a4ebf6c5289da64bf3f572341a0f7656
Author: Phil Blundell <pb@reciva.com>
Date: Sun Nov 28 23:20:17 2004 +0000
Re-read "fix" structure from kernel after mode selection, in case line
pitch has changed.
commit 6062f6a6e7b3c444a35e3f11b2541df2aa0066a2
Author: Roland Mainz <roland.mainz@nrubsig.org>
Date: Thu Nov 25 22:42:51 2004 +0000
xc/programs/Xserver/Xprint/Imakefile
xc/programs/Xserver/Xprint/Xprt.html
xc/programs/Xserver/Xprint/Xprt.man
//freedesktop.org/bugzilla/show_bug.cgi?id=811): Add missing manual page
for "Xprt" (DocBook master file (Xprt.sgml) and the generated files
(Xprt.html, Xprt.man).
commit cbce4cf96dfa2eeecb253d73d7d9acecbc52ad67
Author: Alexander Gottwald <alexander.gottwald@s1999.tu-chemnitz.de>
Date: Thu Nov 25 12:48:21 2004 +0000
Bugzilla #1914: fix size limit for -fp argument
commit 2b75c19ea2bb76512d51e99c5c9ecb073fdb9163
Author: Matthew Allum <breakfast@10.am>
Date: Wed Nov 24 17:50:50 2004 +0000
minor Xephyr fix
commit a96254234fc9410944406f6ae878815cd3cfcee3
Author: Matthew Allum <breakfast@10.am>
Date: Wed Nov 24 17:08:06 2004 +0000
XEphyr -parent switch fixes
commit a7a07d0c71aa3f2e224cceea7e8d8348523136ee
Author: Alexander Gottwald <alexander.gottwald@s1999.tu-chemnitz.de>
Date: Wed Nov 24 16:56:03 2004 +0000
Finally the multiwindow mode defines a default cursor
commit ca4da62478a3ad86ab087245bf8eb7d7fadf31de
Author: Eric Anholt <anholt@freebsd.org>
Date: Wed Nov 24 09:07:58 2004 +0000
Add <sys/types.h> include to unbreak build on FreeBSD.
commit da3df7522d15855fa871c45f3b8db23e7c639a44
Author: Kristian Høgsberg <krh@redhat.com>
Date: Wed Nov 24 02:45:33 2004 +0000
Remove this file and all references to the binary expiry code.
Remove old obsolete include/extensions/damage.h.
Include srvrv_ctrl(xfree86) in macintosh US XKB symbol file so VT switching
works again on mac (#1872).
Remove out of place #define's of printf to xf86printf. This definition
should only be in xfree86/os-support/xf86_libc.h
commit 9a26d6f39e199bad287d4e538ef75700a0102788
Author: Thomas Hellstrom <unichrome@shipmail.org>
Date: Tue Nov 23 17:29:47 2004 +0000
Bugzilla #1883 (https://freedesktop.org/bugzilla/show_bug.cgi?id=1883): Fix
insufficient SHM detection in XvMC local test. Removed reference to
getpagesize() which caused linking problems on s390. Reported by Stefan
Dirsch <sndirsh@suse.de>
commit fec868bf0f67a8f62fc69d55e2ff72b6cacea6f8
Author: Roland Mainz <roland.mainz@nrubsig.org>
Date: Tue Nov 23 17:10:55 2004 +0000
//freedesktop.org/bugzilla/show_bug.cgi?id=1204): Fix X11 test suite
(caused by DAMAGE layer) failure with Xvfb when rendering text using
|XDrawText*()| (XDrawText() tests 1, 3, 4, 27, 28,
29, 30, 34, 37, 39, 41, 43 and XDrawText16() tests 1, 3, 9, 10, 11, 12,
13, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 34,
37, 39, 41, 43). Patch by Hong Bo Peng <penghb@cn.ibm.com> and Stefan
Dirsch <sndirsch@suse.de>.
commit b09f2a0495071a068c2b6b36084c974acf7aab9b
Author: Alexander Gottwald <alexander.gottwald@s1999.tu-chemnitz.de>
Date: Mon Nov 22 16:04:04 2004 +0000
Windows does not have ffs() implementation. added one
Enable RootlessSafeAlpha and RootlessAcceleration for the Windows port too
commit bb43f234c5d418e064c89b928b81b53987f14e92
Author: Alexander Gottwald <alexander.gottwald@s1999.tu-chemnitz.de>
Date: Mon Nov 22 15:00:04 2004 +0000
Use GetTempPath for finding a place where to store temporary files on
Windows
commit bc7493801d1f5177d9ba3fe09accc2a2d72cfe3d
Author: Alexander Gottwald <alexander.gottwald@s1999.tu-chemnitz.de>
Date: Mon Nov 22 14:28:25 2004 +0000
Fixes for building multiwindow and internalwm on mingw
Changed some debugging output
commit 255c3c0e8ca0f402b2c327d70c8a254ba65eda03
Author: Alexander Gottwald <alexander.gottwald@s1999.tu-chemnitz.de>
Date: Mon Nov 22 14:12:33 2004 +0000
Xming: Place logfile in users tempdir
commit 0f7874cbfc01da339cc6be221351ddffdb37805d
Author: Alexander Gottwald <alexander.gottwald@s1999.tu-chemnitz.de>
Date: Mon Nov 22 13:23:25 2004 +0000
Use a simple hashtable as ConnectionTranslation instead of a plain array on
Windows because socket fds are not sequential and do not start at 0
commit e6bc551e3451efe4fcbb55475d6d0ff53fcc9807
Author: Alexander Gottwald <alexander.gottwald@s1999.tu-chemnitz.de>
Date: Mon Nov 15 18:13:41 2004 +0000
Use CreateProcess instead of system() to spawn xkbcomp on windows. system()
can not handle spaces in the path component. Quoted all filenames on
the commandline.
commit 6618567311f41f5e237f12b4204aa32ce174a514
Author: Alexander Gottwald <alexander.gottwald@s1999.tu-chemnitz.de>
Date: Mon Nov 15 15:58:51 2004 +0000
Remove override of HasSnprintf
commit 9826b83826190e514ed115e15691ca015780f9bc
Author: Alexander Gottwald <alexander.gottwald@s1999.tu-chemnitz.de>
Date: Mon Nov 15 15:06:51 2004 +0000
Bufzilla #1802, http://freedesktop.org/bugzilla/show_bug.cgi?id=1802 Added
mingw (Win32) port
commit cecb668149e1956fb29bc89855182349122e2f4e
Author: David Reveman <c99drn@cs.umu.se>
Date: Sun Nov 14 23:21:29 2004 +0000
Add xglPixmapToRegion
commit 343f965749af0a985573c525dc6084c2519b6ffe
Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
Date: Sun Nov 14 17:29:56 2004 +0000
Fix typos in output file. (Bugzilla #1849, reported by Yi Ren-Chen)
commit 636a9e786881dd42cd6fd579e13b7895cf9f10eb
Author: Phil Blundell <pb@reciva.com>
Date: Sat Nov 13 18:03:16 2004 +0000
Don't leave stale pointers hanging around after ts_close(). (TslibFini):
Likewise.
commit 36d9e01c0d36eaf0d9cb1e77dd2908b09d55a35d
Author: Phil Blundell <pb@reciva.com>
Date: Sat Nov 13 16:41:00 2004 +0000
New global variable. (KdProcessArgument): Set it to TRUE on -nozap switch.
(KdUseMsg): Add help for -nozap and -rgba switches.
Declare.
Honour dontZap flag.
commit 3b0dce3620e4cce74c3a2c7f9077cc28be11740d
Author: Thomas Hellstrom <unichrome@shipmail.org>
Date: Sat Nov 13 11:09:23 2004 +0000
lib/XvMC/Imake
Added support for automatic loading of the correct hardware XvMC driver.
This involves a protocol extension of the XvMC protocol. The XvMC
revision number was bumped.
commit a97548b1c9bb69b5824609c1da1ad66c3a9c5065
Author: Kristian Høgsberg <krh@redhat.com>
Date: Thu Nov 11 20:10:28 2004 +0000
Cosmetic fix to make xf86pciBus.c use standard min() macro.
commit e5040e24f03a2fe770139e6f37acef3da48aa0f9
Author: Matthieu Herrb <matthieu.herrb@laas.fr>
Date: Thu Nov 11 16:09:58 2004 +0000
oops commited wrong version previously
commit e380fd548ed5452d08184723145dd992ad72288c
Author: Matthieu Herrb <matthieu.herrb@laas.fr>
Date: Thu Nov 11 15:44:31 2004 +0000
update shared lib revisions on OpenBSD (Bug #1828).
update references to xf86site.def in comments (Bug #1827).
fix kbd driver for wskbd protocol and pure wscons console driver (Bug
#1825).
don't add '-4' to generated default file name (bug #1826).
typo in resource name (XFree86 bug #1300, X.org bug #1825)
commit d7f46f71d892768ea85552a0d5458b69b561fe21
Author: Matthew Allum <breakfast@10.am>
Date: Thu Nov 11 14:55:30 2004 +0000
Xephyr grab fix
commit 2854fa438ff721637f2e53fbafa141b3db8a9082
Author: Adam Jackson <ajax@nwnk.net>
Date: Tue Nov 9 17:06:15 2004 +0000
Bug #557: Don't use "bool" as a variable name in xf86cfg, to avoid compiler
bugs. (Donnie Berkholz)
commit 367b963b6333ee58e197845f1389a95ff26f108e
Author: Adam Jackson <ajax@nwnk.net>
Date: Tue Nov 9 15:58:41 2004 +0000
Bug #1765: Add support for R_ALPHA_SREL32 relocations in elfloader.
Originally Debian patch
202_alpha_elfloader_support_R_ALPHA_SREL32.diff. (Falk Hueffner)
commit 50cdff7ee2a1b448da24e85efae02237cff9b6b7
Author: Matthew Allum <breakfast@10.am>
Date: Tue Nov 9 11:36:49 2004 +0000
Xephyr improvements
commit 81a3b6fe27567b4f91033ece69996aa6bf8d01a3
Author: Matthew Allum <breakfast@10.am>
Date: Mon Nov 8 22:39:47 2004 +0000
Add support to Xephyr for lower depths than hosts
commit e494e24c508b34b144355cb380aac16abf2fb891
Author: Alexander Gottwald <alexander.gottwald@s1999.tu-chemnitz.de>
Date: Sat Nov 6 11:56:57 2004 +0000
Wrap all mwextwm and internalwm code with XWIN_MULTIWINDOWEXTWM
commit 16ee24cd994fa3f8d479c972f18c8207a5116cb7
Author: Torrey Lyons <torrey@mrcla.com>
Date: Fri Nov 5 19:51:38 2004 +0000
Use ROOTLESS instead of platform specific defines.
commit 64c7f8e667eef955b266c359291206c7188ce20c
Author: David Reveman <c99drn@cs.umu.se>
Date: Fri Nov 5 13:26:07 2004 +0000
Use UTF-8 encoding in Xgl sources
commit 1d994e1d14225c1dec5251edeae40e24923a31c6
Author: David Reveman <c99drn@cs.umu.se>
Date: Fri Nov 5 12:46:29 2004 +0000
Use negative strides in Xgl if pixel data have bottom-top scanline order
commit 2dd76d646c517e1988897692e9ff8b6194d25c87
Author: David Reveman <c99drn@cs.umu.se>
Date: Thu Nov 4 23:19:13 2004 +0000
Add working Xgl server code
commit 1aef1060647d22b676a29f6dcf1ac54f9fe7ff5d
Author: Kensuke Matsuzaki <zakki@peppermint.jp>
Date: Thu Nov 4 11:52:22 2004 +0000
Add InternalWM mode.
commit 522c878fca3bfe97cd408e37065f827c004faa04
Author: Egbert Eich <eich@suse.de>
Date: Tue Nov 2 08:54:53 2004 +0000
Removing unneeded private FreeType2 symbol.
Updating to EDID 1.3. (Bugzilla# 1490, Jay Cotton, Egbert Eich).
Removing unneeded code.
Fixed KGA handling for i810. KGA handling for chips derived from C&T chips
is slightly different. The changes make the code consistent with the
C&T (chips) and i740 drivers.
commit 1074992c285835ca9d96d11e8352bbe2cdbc2a28
Author: Egbert Eich <eich@suse.de>
Date: Mon Nov 1 16:05:27 2004 +0000
Fixed sig11 which occured when calling a CloseDisplay() after
XScreenSaverSetAttributes() followed by XScreenSaverUnsetAttributes().
Caused by missing FreeResource() in XScreenSaverUnsetAttributes().
Removing unused DDC sections that caused misinterpretation of DDC data due
to a missing break statement in a switch.
Fixed typo: #if <-> #ifdef.
commit 7e588ba9abdcc2078b6c361c81806337b8ff0827
Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
Date: Sat Oct 30 20:33:43 2004 +0000
Add -d flag for compilers like the Sun C compilers that produce dependency
lists themselves. To use with the Sun compilers, add to host.def: #
define UseCCMakeDepend YES # define DependFlags -cc $(CC) -d -xM (Sun
bug id #4245688 - fix by Alan Coopersmith)
Add Solaris to the platforms on which mprotect is run to set execute
permissions when necessary. (Sun bug id #6175128 - fix by Alan
Coopersmith)
Internationalize digital output (Sun bug id #4119396 - fix by Steve
Swales), add -bgpixmap option to set XPM file as background (originally
from STSF project version of xclock by Alan Coopersmith)
xc/programs/xmodmap/handle.c,pf.c xmodmap was printing line numbers which
are one too low in error messages (Xorg bugzilla #1739, Sun bug id
4637857 - fix by Sam Lau)
commit 612bd1c27322a69a98b59193e7d31501688359bd
Author: Thomas Winischhofer <thomas@winischhofer.net>
Date: Fri Oct 29 02:07:15 2004 +0000
Add facility for catching signal 4 from driver. This can be used to check
for OS SSE support. (Part 2)
commit 09fdfaa28d2afe33dfadd4293b39a34da268fbdb
Author: Thomas Winischhofer <thomas@winischhofer.net>
Date: Fri Oct 29 02:06:17 2004 +0000
Add facility to catch sig 4 from driver. This can be used to check for OS
SSE support. (Part 1)
commit b0185a4bf77a668e65e94197bdb13331680521c7
Author: Thomas Winischhofer <thomas@winischhofer.net>
Date: Thu Oct 28 22:12:23 2004 +0000
Add xf86[GetGammaRamp|ChangeGammaRamp|GetGammaRampSize] to symlist in order
to allow drivers to use them
commit 9d4823adc8319a20d2ace3d0944ca32e300f6eeb
Author: Alexander Gottwald <alexander.gottwald@s1999.tu-chemnitz.de>
Date: Thu Oct 28 14:23:08 2004 +0000
Import recent changes from CYGWIN branch
commit db65fce04ddec1dac0d92ad3abc95ab4996bd206
Author: Torrey Lyons <torrey@mrcla.com>
Date: Mon Oct 25 19:09:11 2004 +0000
Fix rootless Cygwin crash due to acceleration code illegally modifying a
const structure (Reported by Kensuke Matsuzaki).
commit a57e85b52357f15f52e81c8d9b310a76e0c62b3f
Author: Roland Mainz <roland.mainz@nrubsig.org>
Date: Mon Oct 25 07:12:21 2004 +0000
Fix for https://freedesktop.org/bugzilla/show_bug.cgi?id=1664 - RFE: Add
support for the DOUBLE-BUFFER extension to the Xprint server and DDX.
Additionally a "pixmap-scrubber" optimisation is added to the
PostScript DDX to remove all content from a vector pixmap when a
|PolyFillRect()| call covers the whole pixmap surface with a solid fill
(this avoids that a backbuffer vector pixmap gets constantly filled
even when the content is not visible anymore after |XdbeSwapBuffers()|
has cleared the hidden buffer with the background color).
commit e0cc4871491ab7a8c52749ff2c077d8f11516b15
Author: Phil Blundell <pb@reciva.com>
Date: Wed Oct 20 18:06:58 2004 +0000
Add epson.
Build Makefile in hw/kdrive/epson.
commit 258c9016a0c966187a81f9d956766791d6e8c505
Author: Phil Blundell <pb@reciva.com>
Date: Wed Oct 20 18:02:32 2004 +0000
Block SIGIO before disabling input fds. (KdEnableInput): Unblock it after
enabling them again.
commit cbd5fbcb7e5b802cbcff317fdc2f848043207690
Author: Phil Blundell <pb@reciva.com>
Date: Wed Oct 20 08:20:51 2004 +0000
Import Epson 13806 driver from Costas Stylianou:
New files.
commit 0584d92b36910d42e4fba96cee5f3380eeb3b493
Author: Egbert Eich <eich@suse.de>
Date: Mon Oct 18 14:21:46 2004 +0000
Made handling of DevelDrivers for x86-64 more conformant to other
platforms.
Compress all font encodings (Stefan Dirsch).
Fixed warnings.
Turn on forwarding XNSpotLocation event to XIM server in OffTheSpot and
Root mode (bugzilla #1580, James Su).
Added another compose key combination for the Euro symbol (Stefan Dirsch).
Added support for UTF-8 in ja_JP, ko_KR and zh_TW locales (Mike Fabian).
Changed default encoding for ru from KOI8-R to ISO8859-5 (Mike Fabian).
This is the encoding that is also used by glibc. We may break other
libcs - lets see who complains.
Added explanation for DESTDIR to install to a different directory than /.
Added some early bailouts to atiprobe if PCI structure pointer is NULL to
prevent sig11.
XV support doesn't depend on 2D acceleration any more. This patch removes
this limitation from the NSC driver. This is a patch that I have
committed to XFree86 a while ago but never ported over to X.Org.
Matthieu Herrb contributed some build fixes.
Fixing SetDPMSTimers() so that DPMS*Time == 0 disables the appropriate
timer. This takes advantage of the fact that TimerSet() with a timeout
argument 0 behaves like TimerCanel().
Use /dev/xconsole (named pipe) or devpts for system logger (Werner Fink).
Create missing links for backward compatibility to XFree86 (Stefan Dirsch).
Changed comment to mention xorg.
Changed cursor for the 'kill' action from XC_draped_box to XC_Pirate. If
you don't like it we can change it back (original author unkown).
Added 'pic' to the man page rendering command pipeline (Werner Fink).
Added missing return value (Stefan Dirsch, Roland Mainz)
commit 77dab254402073bf96234a6b1056b2277578a976
Author: Alex Deucher <agd5f@yahoo.com>
Date: Sun Oct 17 20:29:35 2004 +0000
- Add interlaced support to S3 driver (bug 332, Leo Savernik)
- EmulateWheelTimeout (bug 323, Mathias Fröhlich)
- single button double-click (bug 322, Rob Brown)
commit 9a0cf1eb43878308c0a83e4f935933b647edc6d5
Author: Matthieu Herrb <matthieu.herrb@laas.fr>
Date: Sun Oct 17 10:46:14 2004 +0000
Remove some remaining AMOEBA specific code.
commit 5505555c15bfa2de1f596ae0997335fdbf07eb5a
Author: Roland Mainz <roland.mainz@nrubsig.org>
Date: Fri Oct 15 22:29:40 2004 +0000
Fix for https://freedesktop.org/bugzilla/show_bug.cgi?id=1647 - Fix the
problem that |XpSubmitJob()| returns a random value (patch by Stefan
Dirsch/SuSE).
commit 60caca718d23012c4c85ce70547610fe05168342
Author: Roland Mainz <roland.mainz@nrubsig.org>
Date: Fri Oct 15 22:08:38 2004 +0000
Fix for https://freedesktop.org/bugzilla/show_bug.cgi?id=1646 - Fix the
problem that |PsCreateColormap()| returns a random value (patch by
Stefan Dirsch/SuSE).
commit 4782b2f7c10708f9662d9fc743c692d0bec85743
Author: Roland Mainz <roland.mainz@nrubsig.org>
Date: Fri Oct 15 21:43:31 2004 +0000
Fix for https://freedesktop.org/bugzilla/show_bug.cgi?id=1637 - Fix
problems in oid code which may cause the usage of an invalid string
pointer (original patch by Egbert Eich).
commit 881b5756dc96dc33f6966ec6fccd324f63559dc2
Author: Adam Jackson <ajax@nwnk.net>
Date: Thu Oct 14 23:10:30 2004 +0000
Bug #1628: Convert xf86{BusToMem,MemToBus} to PIC code, eliminating a text
relocation and enabling the server to be built as a
position-independent executable. (PaX Team)
commit a0251ee285e1f1e28d06927d8ab7d35d59fda607
Author: Roland Mainz <roland.mainz@nrubsig.org>
Date: Thu Oct 14 02:20:52 2004 +0000
Fix for https://freedesktop.org/bugzilla/show_bug.cgi?id=1629 - Fix crash
on AMD64, regression caused by bug 1496 ("Xorg Xprt does not support
"*xp-listfonts-mode: xp-list-internal-printer-fonts" to toggle the
usage of printer-builtin fonts").
commit 3a055ea35b687e381da4d729dbdd0ebac47f673b
Author: Vladimir Dergachev <volodya@mindspring.com>
Date: Wed Oct 13 23:02:42 2004 +0000
Modified:
xc/programs/Xserver/hw/xfree86/drivers/ati/radeon_video.c
xc/programs/Xserver/hw/xfree86/drivers/i2c/fi1236.h Squash annoying warning
about fi1236_dump_status
commit 3364e7fbd44537b98212820fb2b1941abf0d5ef3
Author: Egbert Eich <eich@suse.de>
Date: Tue Oct 12 19:13:43 2004 +0000
Set fbdev mode as the default mode on PPC (Olaf Hering).
Added support for IBM space saver keyboard (Stefan Dirsch). Added support
for Cherry CyMotion Master XPress (Marcus Schaefer).
Change order of SetDisplayDevice(), HWRestore(), UnbindGART() and
RestoreBIOSMemSize() to be exactly opposite to the Save procedure in
EnterVT() (Matthias Hopf, Alan Hourihane).
Fix text mode restauration by removing the assumption that the register
which determines which head is programmed is set. to the active head by
the BIOS (Mark Vojkovich).
When I wrote the resource code 5 years ago I made some assumptions which
turned out to be false: I've assumed that the bus number of the PCI
hostbridge would be the PCI bus the bridge links to. This is not
correct. Fixing this assumption is not easy. However I hope that the
attached patch will make the system work regardless as it 'ignores'
host bridges from which the target bus is not known. This should not
matter at all as we really don't care about host bridges (unless we
have bridge specific code which retrieves information about the
bridge).
Fixed server crash on reset when a structure allocated in PreInit() was
freed on CloseScreen().
Fixed ring buffer lock ups that happened because the structure that
contained ringbuffer data was not zeroed after allocation.
Fixed numerous warnings due to signed unsigned comparisons.
programs/Xserver/hw/xfree86/drivers/nv/nv_driver.c:
(NVBacklightEnable): Changed the order in which the sequencer registers
and the backlight control registers are written. The sequencer control
register need to be written first otherwise DPMS screen blanking
produces vertical bars on a mobile device. lib/Xau/Imakefile: Build
libXau static library PIC so it can be linked into toolkits that would
like to wrap its functionality.
commit 4ab7d316eceb23c81c1b208f9291750cf6b37513
Author: Egbert Eich <eich@suse.de>
Date: Mon Oct 11 09:58:04 2004 +0000
Improving DPMS handling on VT swich and server termination/abort: previous
version called the driver directly and too late.
Unblank secondary screen explicitely. Don't rely on the value read during
register save as the BIOS have blanked the secondary head.
Checking if server isn't switched away before calling sync. Sanity check
for possible bugs in aother areas of the code.
Fixing default amount of of allocated video memory from AGP for i810: Use
16MB if less than 192MB are installed else use 24MB (Matthias Hopf).
commit ca1fda2a3f674a6d59de236612c7077387738ec3
Author: Matthieu Herrb <matthieu.herrb@laas.fr>
Date: Sun Oct 10 17:48:43 2004 +0000
programs/Xserver/Xext/saver.c Fix for XFree86 bugzilla #1224.
commit fa9847aeb9094aafc3798aee1fc8379e77a18d6a
Author: Torrey Lyons <torrey@mrcla.com>
Date: Fri Oct 8 00:35:08 2004 +0000
Allow rootless implementations to override frame reordering. This is used
on Mac OS X when genie-restoring from the Dock to ensure that the
animation completes before drawing the frame.
commit d737bc3300cf1847bcea08ca781f37ee3ee62692
Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
Date: Tue Oct 5 17:28:15 2004 +0000
Make xorgconfig ask again instead of giving up and throwing away all your
answers when you give a bad file name or bad amount of video RAM. (Sun
bug id 5070654 - Derek Wang)
commit 75217be88ccb87a54c84e31697ffb98b5f9b8e0a
Author: Roland Mainz <roland.mainz@nrubsig.org>
Date: Mon Oct 4 05:34:32 2004 +0000
Fix for http://freedesktop.org/bugzilla/show_bug.cgi?id=661 - Xprt
producing spurious characters in PS output when using the bitmap cache
(Originally reported against Solaris Xprt as Sun bug id #4369307, and
fixed in Solaris by Jay Hobson.
commit 658b4ed81f777df2d8b9f47904de90bde1897113
Author: Roland Mainz <roland.mainz@nrubsig.org>
Date: Mon Oct 4 05:04:14 2004 +0000
Fix for http://freedesktop.org/bugzilla/show_bug.cgi?id=1299 - Add more
visuals to the Postscript DDX (8bit GrayScale/StaticGray, 1bit
StaticGray and the basic infratructure for "deep" visuals with more
than 8bits per RGB gun).
commit e622b346113f65788110777d7d1b5fc436600a4d
Author: Roland Mainz <roland.mainz@nrubsig.org>
Date: Sun Oct 3 23:29:21 2004 +0000
Fix for http://freedesktop.org/bugzilla/show_bug.cgi?id=1496 : Fixed Xprt
font handling which did not support "*xp-listfonts-modes:
xp-list-internal-printer-fonts" or "*xp-listfonts-modes:
xp-list-glyph-fonts" to toggle the usage of printer-builtin and glyph
fonts in XListFonts*(), XLoad*Font(), etc. Additionally the Xprint DDX
now explicitly list "xp-listfonts-modes" in
"document-attributes-supported" (for document-level) or
"xp-page-attributes-supported" (for page-level) when the DDX implements
this feature (as described in the CDE DtPrint specification).
commit 8b2f127ea0db2c7fee223b69f4fceee0427fb2e4
Author: Roland Mainz <roland.mainz@nrubsig.org>
Date: Sun Oct 3 15:34:33 2004 +0000
Fix for http://freedesktop.org/bugzilla/show_bug.cgi?id=1416 - Fix Xprt
PostScript DDX crashes when copying offscreen pixmap content to the
same pixmap.
commit 7b27bf869dcf02bccf730706fc451c6f4c72b1f0
Author: Vladimir Dergachev <volodya@mindspring.com>
Date: Sun Oct 3 15:01:31 2004 +0000
Modified:
xc/programs/Xserver/hw/xfree86/drivers/i2c/fi1236.c Make sure formatting
style is consistent within a single function. MT2032 functions are best
be in separate file anyway.
commit 4046653cb63f4cd752212e7cf65fad5408d8f5b8
Author: Vladimir Dergachev <volodya@mindspring.com>
Date: Sun Oct 3 14:38:31 2004 +0000
Modified:
xc/programs/Xserver/hw/xfree86/drivers/i2c/fi1236.c Fix compilation with
gcc 3.4.x Cleanup xf86DrvMsg noise.
commit ebe7b3fe160259b6f19fe760d6ff4f5bb1dd4b72
Author: Vladimir Dergachev <volodya@mindspring.com>
Date: Sat Oct 2 01:35:33 2004 +0000
xc/programs/Xserver/hw/xfree86/drivers/i2c/*_module.c Change version
strings to XORG.
commit 0d474149f1cb68a60927529f6eac611a12acf5e6
Author: Vladimir Dergachev <volodya@mindspring.com>
Date: Thu Sep 30 22:58:07 2004 +0000
Initial code from GATOS. This needs to be cleaned up, for example the bt829
code is practically untouched since xatitv (which was a standalone test
program). However, it all worked and was debugged over long period of
time, so I prefer to to mess with these for now.
New drivers: fi12xx (including MT2032 - this would be be split off later).
tdaXXX msp34xx bt8xx
commit 1dfafe2aeec864a9bdfd6da3324243b2be8e3a62
Author: Roland Mainz <roland.mainz@nrubsig.org>
Date: Wed Sep 29 04:17:44 2004 +0000
Fix for http://freedesktop.org/bugzilla/show_bug.cgi?id=1489 - Use |long|
instead of |int| for BIGREQUESTS commandline option.
commit de89181444a2f2258a446fe20a25e37fd225a568
Author: Roland Mainz <roland.mainz@nrubsig.org>
Date: Fri Sep 24 02:11:14 2004 +0000
Fix for http://freedesktop.org/bugzilla/show_bug.cgi?id=1453 - Fix spaces
in usage output for BIGREQUESTS extension (option "-maxbigreqsize").
commit 884cb060eea2b914191c269a0c9955ed83d07ff9
Author: Torrey Lyons <torrey@mrcla.com>
Date: Wed Sep 22 23:52:39 2004 +0000
Update XDarwin project to Xcode 1.5 format and remove unused
QUARTZ_SAFETY_DELAY code.
commit 35a3bf13a8be96bb29dce32399c3684c6baa527d
Author: Torrey Lyons <torrey@mrcla.com>
Date: Wed Sep 22 23:38:33 2004 +0000
Add option for XDarwin to track system keyboard layout changes as they
occur (John Harper and Torrey T. Lyons).
commit 1b3fa4d53b287cbe9d38c5f8c9fbbc2298690959
Author: Torrey Lyons <torrey@mrcla.com>
Date: Wed Sep 22 22:52:03 2004 +0000
Warning fixes.
commit de68a3339b9f19630e29a17773cad060b1f65300
Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
Date: Wed Sep 22 17:20:56 2004 +0000
Allow overriding DPMS defaults (timeouts & default for on/off) from
#defines/-D options.
programs/Xserver/hw/xfree86/common/xf86DPMS.c Use defaultDPMSEnabled global
for the default state of DPMS if not set in any config files.
programs/Xserver/hw/xfree86/os-support/sunos/solaris-sparcv8plus.S Add
support for required assembly inline functions for Sun compilers on
Solaris/sparc.
Add support for Solaris/sparc libraries.
commit d7514b9162648f894211884b199ef2edc458aa86
Author: Adam Jackson <ajax@nwnk.net>
Date: Wed Sep 22 04:38:03 2004 +0000
Bug #1252, #1253, #1255, #1256: Various typo fixes from Dave Jones.
commit 269012e6014d7c23bf6805ba14ca0b598cdd6313
Author: Torrey Lyons <torrey@mrcla.com>
Date: Tue Sep 21 22:01:14 2004 +0000
Add offscreen GLX direct rendering with XDarwin's xpr backend (John
Harper).
commit 0514f8b65616d8878000764485e71384b71e3860
Author: Egbert Eich <eich@suse.de>
Date: Tue Sep 21 17:57:36 2004 +0000
Merged over libXpm security fix provided by Chris Evans, Matthieu Herrb and
Alan Coopersmith from release 6.8.1.
Fail during initialization with error if font/fontset is not set for
widget. This prevents a sig11 later when the non-existent font/fontset
structs are referenced.
Check if xf86Info.kbdProc pointer is really set before calling it on abort
as this pointer won't be set if the new modular keyboard driver is used
(Matthias Hopf).
Added new libs to the bindist control files.
Removed inclusion of unnecessary kernel header on Linux. This may fail in
an -ansi environment.
commit 814b74662103710665c0b5659a93974ad609276c
Author: Alexander Gottwald <alexander.gottwald@s1999.tu-chemnitz.de>
Date: Mon Sep 20 08:44:54 2004 +0000
Bugzilla #1402: The last patch was broken on linux. Take definition of
badSysCall out of the OS specific block.
commit b600fcda38f4ab4796b5536cbedc5dee1abd25b1
Author: Eric Anholt <anholt@freebsd.org>
Date: Mon Sep 20 03:12:00 2004 +0000
Fix the R200 Render code. Composite and Trapezoids are now supported just
as well as on R100.
commit 908287addaff10a0f5f6f14bf06a9b85870737ec
Author: Alexander Gottwald <alexander.gottwald@s1999.tu-chemnitz.de>
Date: Sun Sep 19 12:59:52 2004 +0000
Bugzilla #1402: fix BigFont extension if SHM is compiled in but not
working. Does not access SHM and privates if the SHM syscall failed
during extension initialization.
commit 90ff3688cdc0c2c1b5ccdbd9cc0659b9a355e85f
Author: Eric Anholt <anholt@freebsd.org>
Date: Sun Sep 19 10:57:31 2004 +0000
Unbreak the AGP DRI case. That was quite a pile of broken code.
commit 9297c6149f83de22395503c484a2ca65dbffaf6b
Author: Roland Mainz <roland.mainz@nrubsig.org>
Date: Sat Sep 18 23:18:35 2004 +0000
Fix for http://freedesktop.org/bugzilla/show_bug.cgi?id=1404 - Fixing
random crashes (like in DAMAGE code etc.) in Xnest due uninitalised
GetWindowPixmap. Original patch by Alexander Gottwald
<ago@freedesktop.org>
commit 6344bb51e2a97d9678cec2ec1dab19abfe9d9e8d
Author: Torrey Lyons <torrey@mrcla.com>
Date: Sat Sep 18 00:38:30 2004 +0000
Bugzilla #1032: Make rootless acceleration functions compatible with
Damage.
commit cedb9a8d62df3391fd89a8b05a2dd64bd098a7df
Author: Torrey Lyons <torrey@mrcla.com>
Date: Fri Sep 17 21:57:26 2004 +0000
Update Apple's list and hash utility routines to latest versions (John
Harper).
commit b56f4532d1a5febb8df45da0e3d3ad7bf8838e5f
Author: Alexander Gottwald <alexander.gottwald@s1999.tu-chemnitz.de>
Date: Thu Sep 16 13:22:52 2004 +0000
Remove code which prevented the use from specifying the window size in
nodecoration mode.
commit c4083511acd1d0f20a242b8cd3ed62629629ce8f
Author: Alexander Gottwald <alexander.gottwald@s1999.tu-chemnitz.de>
Date: Wed Sep 15 17:58:50 2004 +0000
add support for mice with more than 3 buttons and one scroll wheel (Chris
B)
commit 516f452e78170bc643117a71bd2246a83b071316
Author: Egbert Eich <eich@suse.de>
Date: Wed Sep 15 09:23:59 2004 +0000
Adding support for OS dependent probing of IA64 chipsets. Not all IA64
chipsets can be probed without OS support as probing them is only
possible using ACPI. One example of this are the HP ZX1/2 chipsets:
previously the code assumed that these chips were present when no other
of the known chipsets could be probed. This assumption brought SGI
Altrix machines with 64 CPUs to a grinding halt.
commit a3aa6a2d865239c5b8f29cbd849ae3288e36b8a9
Author: Egbert Eich <eich@suse.de>
Date: Wed Sep 15 09:05:22 2004 +0000
Unregistering events in XSelectInput() when unregistering IM filter
callbacks may be a bad idea as others may be interested in this event.
Removed the call to XSelectInput() altogether as we are in root window
anyway (Lubos Lunak).
Fix size of a variable that gets assigned the value of SmartScheduleTime
(long) to long. This should help to prevent smart scheduler lockup on
64 bit systems due to overruns (Andreas Schwab).
commit f642fc729b481c55073c75beca301b2f17881179
Author: Roland Mainz <roland.mainz@nrubsig.org>
Date: Tue Sep 14 23:21:22 2004 +0000
Refix for http://freedesktop.org/bugzilla/show_bug.cgi?id=1361 - RFE: Allow
enabling/disabling of more extensions (fixing duplicate symbols caused
by previous checkin; attachment #899)
commit 0d95bdfbabf4c526f6f54d6f1de8811f4e6d5d5f
Author: Phil Blundell <pb@reciva.com>
Date: Tue Sep 14 23:08:10 2004 +0000
Only set screen parameters if resolution has changed from current values.
Patch from scoony@noos.fr.
commit ba3b6fd23be5f1f900fcff57bc586e08bc524e99
Author: Eric Anholt <anholt@freebsd.org>
Date: Tue Sep 14 06:26:54 2004 +0000
Add proper PCI/AGP detection, based on Mike Harris's code for Radeon, but
using the MMIO mirror of the bits instead of config space.
commit d9df39ee2b5b462be87718046b16d30c231563ec
Author: Roland Mainz <roland.mainz@nrubsig.org>
Date: Tue Sep 14 00:51:25 2004 +0000
Fix for http://freedesktop.org/bugzilla/show_bug.cgi?id=1361 - RFE: Allow
enabling/disabling of more extensions
commit 80dc84d067c5af29e33a0c7ac62eecc8ba4e0871
Author: Eric Anholt <anholt@freebsd.org>
Date: Sun Sep 12 23:22:31 2004 +0000
- Fix a segfault on VT switch with DRI. Still dies due to cursor allocation
troubles.
- Move the RemoveBlockAndWakeupHandlers to match
RegisterBlockAndWakeupHandlers.
- Enable R100 trapezoid "acceleration" when DRI is working, so that it can
be exposed and worked on.
commit ab50679aabdda9e6197568f745d02fe1e65c7a24
Author: Eric Anholt <anholt@freebsd.org>
Date: Sun Sep 12 23:01:24 2004 +0000
Fix a bad argument missed in the previous commit for ATIDRIDMA* functions.
commit 2d069b1d1950b5f6f9140e5573e349e6559251e6
Author: Eric Anholt <anholt@freebsd.org>
Date: Sun Sep 12 22:21:12 2004 +0000
Move the RegisterBlockAndWakeupHandlers to before DRI initialization. The
change to use that instead of manual wrapping made the DMA dispatch
come after the lock had been dropped, causing lots of pain.
commit 27b5a65f05c78a0b6de0d0ace4f4275d990cc3a4
Author: Eric Anholt <anholt@freebsd.org>
Date: Sun Sep 12 20:31:39 2004 +0000
Reset the CCE/CP on engine reset, and make the ATIDRIDMA functions take a
more useful argument.
commit fcd52d276f0276490ef08af2f0d6c52ed631f130
Author: Eric Anholt <anholt@freebsd.org>
Date: Sun Sep 12 20:19:15 2004 +0000
Add missing kaa.h include for kaaInitTrapOffsets.
commit b5d406e8c84d8aba2b45e985e43d02c2e6770019
Author: Eric Anholt <anholt@freebsd.org>
Date: Sun Sep 12 20:02:10 2004 +0000
Fix handling of is_agp. is_agp is whether the card is actually AGP, while
using_agp should say whether AGP is being used as part of DMA/DRI.
commit 7cab70d1cb7298035429dd8953e521a31fc6770d
Author: Eric Anholt <anholt@freebsd.org>
Date: Sun Sep 12 19:52:51 2004 +0000
Improve error handling, especially in the DRI case. Do some FatalErrors
instead of ErrorFs for things that are really bad, and put limits on
some loops. Now, sometimes instead of hanging the entire system, we
(mostly-) cleanly drop to console when the card has hung.
commit 0cd662ea80579c317d706ebe04971bb29d0f9b4f
Author: Eric Anholt <anholt@freebsd.org>
Date: Sat Sep 11 09:28:19 2004 +0000
- Add disabled WIP trapezoid code for R128 and R100. The R128 rendering is
not doing an add of 1 per triangle like I hoped, and instead seems to
be saturating all the pixels or something. The R100 acceleration
renders pretty well, with some gaps. Note that both are slower than
software due to lack of DMA to submit vertices.
- Mostly fix R128 and Radeon transform support, including supporting
bilinear filtering on R128. Subpixel offsets are still probably an
issue (reported by rendercheck), but I want to make 100% sure about my
understanding of the protocol before changing everybody, including fb.
- Add support for dst formats without alpha to R128 Composite.
- Remove the R128 Blend code, which has long outlived its usefulness. (I
kept it around for one reason: It could be useful for the w/h > 1024
case with no mask and a non-src op. That seems pretty infrequent and
not worth the trouble).
commit 396100dd235105a0e2c9013f1e07e4dae0cc3404
Author: Eric Anholt <anholt@freebsd.org>
Date: Sat Sep 11 09:23:12 2004 +0000
- Don't require Imrecise mode for Trapezoid acceleration. It looks like we
might be able to do Precise in hardware, so leave it up to the driver.
- Add a helper function for computing a set of offsets for smooth trapezoid
rasterizing using many sharp trapezoids.
commit 501dcf37aac4ec9298e8c79ca65c048c362bce31
Author: Matthew Allum <breakfast@10.am>
Date: Wed Sep 8 11:31:49 2004 +0000
cursor fixes
commit 20918ab480c8c8285a68e9f974b0208a18acec94
Author: Matthew Allum <breakfast@10.am>
Date: Tue Sep 7 19:00:04 2004 +0000
avoid ephyr breakage when tslib enabled
commit 8bf6ea903be4c052c747e3e81fc977155072299d
Author: Matthew Allum <breakfast@10.am>
Date: Tue Sep 7 12:44:19 2004 +0000
fixes to Xephyr debug mode
commit b3322257815ec4550e1634453167535b02c1bfbd
Author: Kevin E Martin <kem@kem.org>
Date: Fri Sep 3 23:41:21 2004 +0000
Update formatted docs.
commit b2135e589baeb2ea26da50b9167feaea23bcce3c
Author: Kevin E Martin <kem@kem.org>
Date: Fri Sep 3 16:18:23 2004 +0000
First set of documentation updates.
Include more correct fix for rootless interaction with damage (Bug #1168,
Keith Packard).
commit d7fef52254126aa5897a5c58faeda1f61d5b13d8
Author: Kevin E Martin <kem@kem.org>
Date: Thu Sep 2 04:04:47 2004 +0000
Workaround for servers using rootless layer with damage (Bug #1168, Torrey
T. Lyons).
commit 0e56515aa3ebc5ee8cc33213fb22b69bb4b3a0da
Author: Kevin E Martin <kem@kem.org>
Date: Thu Sep 2 01:38:17 2004 +0000
Fix AGL display problems (Bug #1210, Torrey T. Lyons).
commit 2753c8e2c84cc1fb6d73a05258ab7200068e7830
Author: Matthew Allum <breakfast@10.am>
Date: Wed Sep 1 15:30:58 2004 +0000
see changelog
commit 7c0aaa53bf8dcf3d0a8c9e78d31cf62b1766fb35
Author: Matthew Allum <breakfast@10.am>
Date: Wed Sep 1 11:13:36 2004 +0000
'-dpi' fixes for Xephyr
commit 16ff3a872731633b6f1f4920f793153722026189
Author: Matthew Allum <breakfast@10.am>
Date: Wed Sep 1 08:31:20 2004 +0000
Actuall select events for -parent option
commit 2d065c4c33b9ec17c4c791070cf8189cb57bbb9c
Author: Matthew Allum <breakfast@10.am>
Date: Tue Aug 31 16:33:05 2004 +0000
Added ephyr server sources
commit 6ec9ecd591fba9e9b69b8ebbd2fa08c0a2beac08
Author: Eric Anholt <anholt@freebsd.org>
Date: Mon Aug 30 22:16:46 2004 +0000
Add a set of three hooks for accelerating trapezoids, and use it for the
RasterizeTrapezoid screen function. These hooks will be called for
imprecise, non-sharp trapezoids with A8 destinations.
Note that the current main consumer of trapezoids, cairo, is requesting
precise, sharp trapezoids by not changing the default Picture
attributes, but gets non-sharp effects in software because fb bases its
choice of sharp/non-sharp on the mask format being A8 vs A1, and cairo
asks for A8. Follow fb's (poor?) example by ignoring the sharp setting
and basing the choice off of the mask being A8.
commit ccaf332ce3a9393715317edd3b92420c27fc94eb
Author: Eric Anholt <anholt@freebsd.org>
Date: Mon Aug 30 16:43:10 2004 +0000
Rather than initially place pixmaps in framebuffer based on a size
heuristic, delay the decision until the first
kaaPixmapUse{Screen|Memory}, and put it in framebuffer if UseScreen was
called. Provides a significant improvement in cairo speeds (100%
speedup in cairogears here) and is likely to improve text performance
as well.
commit 14b2db63e7ae0c0d356062cd15811484038f97d9
Author: Kevin E Martin <kem@kem.org>
Date: Sun Aug 29 21:06:00 2004 +0000
Fix make install when BuildServersOnly is YES (Bug #1213).
Fix build failures when UseDeprecatedKeyboardDriver is YES and
DoLoadableServer is NO (Bug #1229, Kristian Hgsberg).
Fix failure when using DLL loader and LD_BIND_NOW is set (Bug #1212, Adam
Jackson).
commit ac038e9cc6f7708fdd9f36494861d2f611d5a90a
Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
Date: Sun Aug 29 00:48:17 2004 +0000
Don't define _XOPEN_SOURCE before including math.h on Solaris - it's not
needed on older releases, and breaks builds on Solaris 10. (Same as
bugzilla #189).
commit 89d702763875831604751bac396c3d2400ec59b6
Author: Egbert Eich <eich@suse.de>
Date: Fri Aug 27 21:44:54 2004 +0000
Fix for XV memory allocation: Also use tiled area for allocation even if it
hasn't been used before.
commit 971755765d6ef9cadf11127478af59189034d356
Author: Eric Anholt <anholt@freebsd.org>
Date: Fri Aug 27 21:09:23 2004 +0000
Bug #1101: Fix PaintWindow in the pixmap case when the window's origin is
not at the backing pixmap's origin. Resulted in incorrect rendering in
at least aisleriot, fluxbox, and KDE apps, and probably many more.
While here, move the ParentRelative loop above the drawable grab -- may
improve correctness with ParentRelative background origins as well.
Note that the border code doesn't handle ParentRelative yet.
commit 1840a50bb763d5c94195eaffa3954c1afd77a31a
Author: Kevin E Martin <kem@kem.org>
Date: Fri Aug 27 20:39:17 2004 +0000
Add missing reply for DMX (Rik Faith).
commit f30fbc600f3e5c3b4aceafb8256594af0069f2c9
Author: Egbert Eich <eich@suse.de>
Date: Fri Aug 27 20:20:54 2004 +0000
Fixed typos.
commit 276cf271527b7a6f464025457e5dd452ac13605e
Author: Egbert Eich <eich@suse.de>
Date: Fri Aug 27 20:16:28 2004 +0000
- adding missing file
commit ecd889c6ff7427b4e7d3f820586aac178a4dfdc2
Author: Egbert Eich <eich@suse.de>
Date: Fri Aug 27 19:27:12 2004 +0000
Added support for LynxOS 4.0 (Thomas Mueller).
Fix arm netwinder build (Donnie Berkholz).
commit 7c087078694a6895a9bcbe62d091665c05a86b5a
Author: Egbert Eich <eich@suse.de>
Date: Fri Aug 27 12:32:14 2004 +0000
- Make DDC code more VESA compliant: when MaxClock is set to 0xFF it means
'no value specified'. Therefore setting it to 0.
commit c0bff215de2d034118d06cac42e234008612204b
Author: Kevin E Martin <kem@kem.org>
Date: Fri Aug 27 01:15:10 2004 +0000
Fix xtest failures in Xvfb from XMatchVisualInfo test.
commit 5335bc8a0657b3e378795b44698ed23020c13891
Author: Eric Anholt <anholt@freebsd.org>
Date: Thu Aug 26 20:32:59 2004 +0000
Bug #1138: Wrap funcs in CW's GC ops as well. While this is unnecessary
according to the rules as I understand them (bug #1045), not everybody
follows the rules. GC funcs were being called on the same GC from
within GC ops, and the cwValidateGC caused a loop in the funcs chain
that resulted in a crash, notably in cwPolylines.
commit c8672e7ac79c872344f287f7cc106cb5c006e619
Author: Egbert Eich <eich@suse.de>
Date: Thu Aug 26 11:58:08 2004 +0000
Fixed support for LynxOS 3.1 (LynxOS 4 will follow) (Thomas Mueller).
2
commit 198e62c44b99ee0890b944f92b162387f77aa10d
Author: Torrey Lyons <torrey@mrcla.com>
Date: Sat Aug 21 00:46:01 2004 +0000
Documentation only update: Update XDarwin application version for release.
commit 74d84d7b122802230579a4da8c2e6914d2f5f060
Author: Kevin E Martin <kem@kem.org>
Date: Fri Aug 20 05:22:39 2004 +0000
Fix keyboard driver failing to initialize if DoLoadableServer is NO (Bug
#1133, Kristian Hgsberg).
commit bd3e6e44259155cb37f39eb2ca5e1f0de1c2ebb7
Author: Kevin E Martin <kem@kem.org>
Date: Thu Aug 19 04:08:40 2004 +0000
Add missing no.*Extension symbols (Bug #1131, Aaron Plattner).
commit 87842285007e9ac4f9de0349abee1fb66b7c795f
Author: Kevin E Martin <kem@kem.org>
Date: Wed Aug 18 21:11:17 2004 +0000
Fix CopyArea for non-redir dst, redir src (Bug #1105, Eric Anholt).
commit 9223baf985778c536ce93846c431b46a0192cf32
Author: Kevin E Martin <kem@kem.org>
Date: Wed Aug 18 18:41:41 2004 +0000
Fix AIX build problems (Bugs #1020, 1102, 1103, Dan McNichol).
Remove old config files (Bug #1123, Jim Gettys).
Remove old log message (Bug #1123, Jim Gettys).
commit a45bc0df7a1c369e8429e84414ac813187c90059
Author: Kevin E Martin <kem@kem.org>
Date: Tue Aug 17 17:55:02 2004 +0000
Fix DRI module loading (Bug #1057, Ronny Vindenes).
Fix Xvfb at 8bpp (Bug #1091).
Fix link order when building with Xprint in glxgears (Bug #1060, Alexander
Gottwald).
commit 75de2fe82e7da755555028a724f68b9fb9ddfb14
Author: Kevin E Martin <kem@kem.org>
Date: Mon Aug 16 22:48:50 2004 +0000
Update release and date for first RC.
Fix kbd/keyboard driver for DoLoadableServer NO.
Revert change since it is better to set date in the config files.
commit 1798cac6fa2e909c9f3df26b97ee8232a0bf1592
Author: Kevin E Martin <kem@kem.org>
Date: Mon Aug 16 20:17:51 2004 +0000
Add kdb <-> keyboard aliasing when UseDeprecatedKeyboardDriver is NO (Bug
#1072, Kristian Hgsberg).
commit 6cac342517892a20bab6a6177f8b5742feaaed38
Author: Alexander Gottwald <alexander.gottwald@s1999.tu-chemnitz.de>
Date: Mon Aug 16 15:48:53 2004 +0000
document broken composite in XWin
commit 9aa6beb6b7e6272b05a03e0a4fd34eb8ad21bf47
Author: Kevin E Martin <kem@kem.org>
Date: Mon Aug 16 02:07:53 2004 +0000
Fix banner to print out proper version information.
commit 9da0c214ab5f4ee9c1610b4888f5c7c0dd2bcacc
Author: Keith Packard <keithp@keithp.com>
Date: Sun Aug 15 21:13:11 2004 +0000
Clip destination instead of source. Should be the same, but it looks nicer
to me.
Clean up transition between cheap and expensive GC wrappers by using the
prologue and epilogue macros. Before, the GC would be left unvalidated
sometimes which would cause all kinds of entertaining bugs against a
DDX which cares (XAA).
commit a68f350195c1c54034f98e2b78c2c3da70044884
Author: Keith Packard <keithp@keithp.com>
Date: Sun Aug 15 19:05:01 2004 +0000
Remove debugging code which did a full tree walk on every window operation
Eliminate needless (and, it turns out, dangerous) call to ChangeGC on
DestroyGCPrivate.
in cwSetWindowPixmap, check if the pixmap is the screen pixmap and disable
the wrapper by setting the private to NULL.
commit 5db70ae2575e3e8669d7a66e2218ba28e8bdfa68
Author: Kristian Høgsberg <krh@redhat.com>
Date: Sun Aug 15 15:40:19 2004 +0000
Remove #error used for testing.
commit 1e728c3e88f6a74b93dc11827c9fcfe7b39ca5a5
Author: Keith Packard <keithp@keithp.com>
Date: Sun Aug 15 03:34:18 2004 +0000
Copy bits from parent window when allocating pixmaps so that Background ==
None works.
Copy filter to backing picture during validation.
Mark picture serialNumber when setting Filter or Transform so Validate
occurs.
Initialize xf86Screens[i]->pScreen to NULL so that RADEON driver doesn't
crash during server reset using old pScreen.
commit 943308517905d16bda1bb27cd745bd291a84dbf6
Author: Keith Packard <keithp@keithp.com>
Date: Sun Aug 15 00:43:39 2004 +0000
Redraw window borders when switching window pixmaps around
Make cw "own" the window pixmaps by wrapping
GetWindowPixmap/SetWindowPixmap.
commit 597fdae93e6e1b7e4052097baf3d91e7a134c162
Author: Kristian Høgsberg <krh@redhat.com>
Date: Sat Aug 14 23:59:52 2004 +0000
More kbd fun: write out "kbd" from Xorg -configure (#1078).
commit e483fe3ec384da556c31292001a86ec95c2ddc46
Author: Keith Packard <keithp@keithp.com>
Date: Sat Aug 14 21:57:58 2004 +0000
Fix offsets again. Really, it works this time. Promise.
commit e6216b48f5feee72f107348cb21bad724536ec62
Author: Keith Packard <keithp@keithp.com>
Date: Sat Aug 14 21:36:10 2004 +0000
Fix offsets, do whole region at once by using GC clipping
commit ed425d1d88a72586d5d7a4aad9d0be0b06637070
Author: Eric Anholt <anholt@freebsd.org>
Date: Sat Aug 14 20:29:28 2004 +0000
Bug #1077: Fix source copy performance problem exposed by Composite.
commit cc3ad0ed4302f54318e190a2b10646337f242d40
Author: Keith Packard <keithp@keithp.com>
Date: Sat Aug 14 19:53:36 2004 +0000
Fix clip list computation and setting to ignore clip changes to "real"
GC/Picture and track serial numbers correctly when copying
pCompositeClip down.
commit 183c6d06455114c61f6db57ec0a084caf11ece3a
Author: Eric Anholt <anholt@freebsd.org>
Date: Sat Aug 14 19:51:11 2004 +0000
Wrap CopyWindow in cw, which fixes scrolling in many apps.
commit e61b5d38ab30c4f73ba0d070f485a32708a03eb6
Author: Keith Packard <keithp@keithp.com>
Date: Sat Aug 14 07:12:37 2004 +0000
Use XLIB_SKIP_ARGB_VISUALS environment variable to disable all depth 32
visuals. Necessary to keep Flash from crashing.
Must call ValidateGC/ValidatePicture on "real" GC/Picture to ensure
pCompositeClip is set correctly.
Need to take the composite clip from the "real" GC/Picture and turn it into
the clientClip for the backing version.
Adjust pixmap screen origin to account for drawable->x/y Change debugging
output a bit (disabled by default)
commit 05f6329eb6f564ad4fc366d75f4ebf9f3ba4b5dd
Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
Date: Fri Aug 13 23:57:38 2004 +0000
Don't enable speedo & type1 modules if they're not being built
Clean up a couple of hardcoded paths & vendor names to use defines set by
Imakefile
commit 3f84e4f71d9c7c560f9bef675b1cc96fa1d83b14
Author: Kevin E Martin <kem@kem.org>
Date: Fri Aug 13 19:51:34 2004 +0000
Fix Xprt bug by disabling code that merges multiple audit messages (Bug
#964, Roland Mainz).
commit 922fd3a2e568571171dfd64a94f804350829230f
Author: Alexander Gottwald <alexander.gottwald@s1999.tu-chemnitz.de>
Date: Fri Aug 13 19:18:29 2004 +0000
Added $(MESASRCDIR)/src/mesa/glapi to INCLUDES. Removed $(SERVERSRC)/mi
from INCLUDES. Rearranged INCLUDES for better readability.
Removed mipointrst.h and miscstruct.h from #include since they are not used
anymore.
commit f63f4b768cd5ec5bffd270e448e6e51b8ad67016
Author: Søren Sandmann Pedersen <sandmann@daimi.au.dk>
Date: Fri Aug 13 18:24:07 2004 +0000
Fri Aug 13 19:53:10 2004 Soeren Sandmann <sandmann@redhat.com>
Fix for lockups on some versions of Matrox Mystique. #687, Patch from Mike
Harris.
Call xf86EnableDisableFBAccess though the function pointer instead of
directly. #1041, Patch from Aaron Plattner.
Swap the phsyical size of the screen when rotiation. #1050, Patch from
Aaron Plattner.
Fri Aug 13 19:47:12 2004 Soeren Sandmann <sandmann@redhat.com>
Make HAVE_FT_BITMAP_SIZE_Y_PPEM conditional on the FreeType version instead
of proping it. This way it will work with the monolithic version too.
#1062, Patch by Owen Taylor.
commit a29bfbd3d0a5d39ccee5b83ac1ba632091b031bb
Author: Keith Packard <keithp@keithp.com>
Date: Fri Aug 13 08:16:14 2004 +0000
Empty damage object when freeing pixmap.
Wrap InstallColormap so that the DDX doesn't see colormaps from our ARGB
visual (avoids lovely green tint to screen). Also, set visual->nplanes
of ARGB visual to all used (including alpha) planes so DIX can set
pixel values correctly.
Translate automatic update regions correctly to account for borders
When nplanes == 32 (ARGB visuals), mask in all ones for alpha values to
allocated pixel values.
Remove redundant fbAddTraps declaration
Fix fbCopyWindow to work on non-screen pixmaps (not needed yet)
Replace broken clipping code with that from modular tree.
Respect subWindowMode.
commit 24bed5cff908a6f8b1857e3dadac22d6db54c69e
Author: Eric Anholt <anholt@freebsd.org>
Date: Fri Aug 13 07:47:21 2004 +0000
Fix copy'n'paste-os of x/y in CopyPicture for AlphaXOrigin and ClipXOrigin.
commit 5825e4559e7aaf3b40205a0dca49a785c8de7b92
Author: Eric Anholt <anholt@freebsd.org>
Date: Thu Aug 12 23:14:50 2004 +0000
Fix after Mesa 20040812 merge: revert glxext.h to vendor branch, and fix
bug #1022.
commit 2889ad2cb8827f20b6d69da4fe99db33bf9c5ff2
Author: Torrey Lyons <torrey@mrcla.com>
Date: Thu Aug 12 20:24:36 2004 +0000
Fix crash in rootless XDarwin due to rootless being initialized before
damage extension.
commit 961333143e2df3e3f33e8624fc61e79cf3e86cd1
Author: Eric Anholt <anholt@freebsd.org>
Date: Thu Aug 12 08:45:33 2004 +0000
Apply a kludge to initialize the composite wrapper before DamageSetup. If
not, DamageSetup will wrap some operations first, and the cw
initializes during ExtensionInit, so cw comes higher in the wrapping
chain. cw going first will result in damage getting confused when the
drawables get changed around.
commit 6e0228722cc2fa37a0e2359bc3dab3646e36c4b7
Author: Eric Anholt <anholt@freebsd.org>
Date: Thu Aug 12 08:11:59 2004 +0000
Fix various cw issues, including a couple reported by deronj:
- Fix wrapping of GC ops/funcs according to policy described in bug #1045.
- Remove ValidateGC/ValidatePictures on the redirected drawables/pictures
-- it's not needed, and DDXs shouldn't be seeing redirected drawables
in render or GC ops/funcs when cw is running.
- Mark all GC/Picture state as dirty when moving from redirected to
non-redirected, since it hadn't been passed down in Change* or
Validate* while redirected.
- Remove CreatePicture wrapper that didn't do anything.
- Comment on why AddTraps wrapper isn't needed.
commit 789cf3ed846045d91f950cb177ef6bae4c8966fc
Author: Eric Anholt <anholt@freebsd.org>
Date: Thu Aug 12 07:57:03 2004 +0000
Fix some issues reported by deronj:
- Hopefully fix a crash in compCheckRedirect on unrealizing windows.
- Remove an extern that doesn't point at anything.
commit 1a073786e0159a80ac3b8772a1d89b0618a8ff33
Author: Kevin E Martin <kem@kem.org>
Date: Thu Aug 12 05:11:57 2004 +0000
Update version and date for next snapshot
commit 47ee5f4ba72f0e0bc92a5e04073c70808e85fc08
Author: Kristian Høgsberg <krh@redhat.com>
Date: Thu Aug 12 01:57:51 2004 +0000
Add call to SourceValidate() when pDst == pSrc, so misprite.c get a chance
to remove the sprite before the area is copied. The drivers handle pDst
!= pSrc (#1030).
commit 09d0056b8bc103f67a35980934f03d28fed51164
Author: Adam Jackson <ajax@nwnk.net>
Date: Thu Aug 12 01:30:57 2004 +0000
Wrap the Propolice fix in #ifdef __SSP__; Propolice doesn't define this yet
but an RFE has been submitted upstream.
commit e30c22dbbffa2605f8d7ac010c8208a135a2293a
Author: Adam Jackson <ajax@nwnk.net>
Date: Thu Aug 12 01:16:36 2004 +0000
Back out the propolice fix for a second, it causes linktime errors.
commit 9d0213525f4f692c250f10309146fe9db76ba12d
Author: Keith Packard <keithp@keithp.com>
Date: Thu Aug 12 00:09:30 2004 +0000
Paint to parent window instead of parent window's pixmap (helps for servers
that don't have a pixmap for the root)
Fix offsets for render drawing.
commit c7bc76f663008119b3681d4b7adef7dc9ffdc236
Author: Torrey Lyons <torrey@mrcla.com>
Date: Wed Aug 11 23:53:36 2004 +0000
Fix leftover XF86_VERSION_SNAP macro.
commit eb607030e32cbad846696a20cfb3045c5f8f65c1
Author: Adam Jackson <ajax@nwnk.net>
Date: Wed Aug 11 23:10:02 2004 +0000
Teach the loader about the extra symbols needed for Propolice-protected
modules to work under elfloader. From Travis Tilley (Gentoo).
commit fd439afdfe7ba451aff19b62d1764e4dfd0b782f
Author: Keith Packard <keithp@keithp.com>
Date: Wed Aug 11 22:40:14 2004 +0000
Add COMPOSITE change to fbCopyWindow (not needed yet)
Xnest was half-using midispcur and doing a bad job of it. Replace all of
that code with mipointer which does a lot of the work.
Support DDXen which don't provide GetWindowPixmap, or which return NULL for
the root pixmap.
commit f95293e5253904883d3b40f9e68e6175247754a3
Author: Kevin E Martin <kem@kem.org>
Date: Wed Aug 11 22:27:50 2004 +0000
Fix bogus contact address in Xserver/os/util.c (Bug #738).
commit 56520ecd5ceb9526541c241634b467eba6a8f7cf
Author: Eric Anholt <anholt@freebsd.org>
Date: Wed Aug 11 22:13:01 2004 +0000
In CopyPicture, add missing call to ChangePicture to notify about the
changes that CopyPicture has done.
commit f77f1d50723aceb5059a96f7a4068046b7961c51
Author: Kevin E Martin <kem@kem.org>
Date: Wed Aug 11 21:14:18 2004 +0000
Apply PPC64 build patch (Bug #303, Mike A. Harris, Alan Coopersmith).
commit 3dbaeb2e126d9424b21df91f0be9129c4eea6f1b
Author: Kristian Høgsberg <krh@redhat.com>
Date: Wed Aug 11 20:25:13 2004 +0000
Patch xorgconfig to generate config files with correct keyboard driver; use
"kbd" by default, "keyboard" if UseDeprecatedKeyboarDriver is YES
(#1040).
commit ca458e3c9b25c3efc10532eb8e31bdcff44dc321
Author: Roland Mainz <roland.mainz@nrubsig.org>
Date: Wed Aug 11 13:55:03 2004 +0000
Fix for http://freedesktop.org/bugzilla/show_bug.cgi?id=492 -
/etc/init.d/xprint did not source xorg.conf for font paths additionally
to xfree86 config files
commit 81881b96861d707b0729e0146a4b53b3dd234885
Author: Kevin E Martin <kem@kem.org>
Date: Tue Aug 10 21:37:35 2004 +0000
Update version to 6.7.99.1 and fix problem with snapshot string generation.
commit 21c7c8cdc7d2f607177634601cef8b0290fb0e80
Author: Kevin E Martin <kem@kem.org>
Date: Mon Aug 9 22:37:22 2004 +0000
Fix install problem on platforms not using xorg.cf/xfree86.cf (Bug #339,
Harold L. Hunt II, Alexander Gottwald).
Fix crash when using X core font in zh_CN.UTF-8 locale (Bug #368, Yu Shao,
David Dawes).
Fix glXMakeCurrent(Dpy, None, NULL) crash (Bug #719, Adam Jackson).
HP-PA build fix (Bug #828, Guy Martin, Paul Anderson).
Fix SDK build for GATOS and Wacom driver (Bug #829, Bryan Stine).
Fix attempt to read video ROM before enabling it (Bug #843, Ivan
Kokshaysky, Mike A. Harris).
Fix detection of primary adapter (Bug #843, Ivan Kokshaysky, Mike A.
Harris).
Clarify xset man page description of how to use the keyboard repeat rate
settings (Bug #846, Mike A. Harris).
Fix problem where print-screen key would get remapped to sys-req in certain
keymaps, which broke GNOME printscreen functionality (Bug #847, Owen
Taylor).
Fix several render problems:
- MMIO mode support
- Hang on IGP chips
- VT switching hang
- 3D render corruption (Bug #922, Hui Yu).
commit 26847ef9268f687c4f45f3d048eff4b06c2ba3bf
Author: Kristian Høgsberg <krh@redhat.com>
Date: Mon Aug 9 03:40:50 2004 +0000
Move the new render symbols to dixsym.c instead so they are grouped with
the other render symbols.
Initialize screen_x and screen_y to 0. This fixes a problem with the new
Damage based sprite, where intersection test against the root pixmap
would fail because the two fields were not initialized (damage.c,
166-170).
commit 57eab4dc87670da42e645a4c341d1ee661b43b5b
Author: Kevin E Martin <kem@kem.org>
Date: Mon Aug 9 02:08:35 2004 +0000
- Fix building without Xfixes extension
- Fix building without Xevie
- Fix building without DPMS
- Fix "Extensions" section config file support to accept general boolean
options
commit a2e51b13ea5a2e5fc5626905b6c2caac6358eb11
Author: Kristian Høgsberg <krh@redhat.com>
Date: Sun Aug 8 20:56:56 2004 +0000
Disable legacy keyboard driver "keyboard", unless
USE_DEPRECATED_KEYBOARD_DRIVER is defined. Print warning if the old
driver is used.
commit 3431692bf44e7be01187b421cfb0e46131c5e4c7
Author: Kristian Høgsberg <krh@redhat.com>
Date: Sun Aug 8 17:02:19 2004 +0000
Add new render symbols to list of exported extension symbols so
DoLoadableServer works again.
commit 1e694d2b51a954d1bc4afdde390723e9a1a5b9bf
Author: Keith Packard <keithp@keithp.com>
Date: Sat Aug 7 01:23:07 2004 +0000
Fix minor timestamp lossage in mieq.
Replace miSprite implementation with Damage-based one. Otherwise damage and
misprite conflict causing looping.
Change pScreen usage around a bit to eliminate warnings
commit 45fde3b041c071ae5a604cefbbfa4da5c1e828f8
Author: Keith Packard <keithp@keithp.com>
Date: Sat Aug 7 01:19:01 2004 +0000
Eliminate mfb support. Fix visuals to match "normal" PC hardware (making
lightpipe work).
commit 2bdbc2c0d39b1618440a6a8ed1c38a11703e898c
Author: Keith Packard <keithp@keithp.com>
Date: Sat Aug 7 01:02:41 2004 +0000
Clean up cw initialization, make sure wrappers re-wrap on exit.
commit cff0043a347ba06e8ab16a84a35c99794b45149b
Author: Keith Packard <keithp@keithp.com>
Date: Sat Aug 7 00:58:21 2004 +0000
Remove alpha-related fields from visual structure to retain binary
compatibilty. Applications using ARGB visuals will need to use Render
or other mechanisms to compute pixel values instead of AllocColor
commit 196aafb19a3cfdc8c21f9bf75814cf0d84ff4446
Author: Keith Packard <keithp@keithp.com>
Date: Fri Aug 6 23:42:10 2004 +0000
Add RenderAddTraps. Rewrite trapezoid rendering code.
commit e847bcda0827ffb87689a0162c648570de6d6f69
Author: Eric Anholt <anholt@freebsd.org>
Date: Fri Aug 6 00:31:28 2004 +0000
Fix missing ';' in cw.c and unwrap the render wrapper properly.
commit ae1580c494fde2b56f9faa40f7ebcf637728efc8
Author: Eric Anholt <anholt@freebsd.org>
Date: Thu Aug 5 18:24:58 2004 +0000
- Add a new Render function, CopyPicture, which will update a picture with
the flagged bits from a source picture. Approved in principle by
keithp.
- Use CopyPicture and SetTransform to update most of the backing picture's
state in the composite wrapper. Filters are still missing.
- Don't allocate a picture private, now that we calculate clipping properly
and don't need the serialNumber or stateChanges.
- Use the format of the source pixmap rather than generating the format
from the window's visual.
- Wrap the rest of the Render primitives that were stubbed out before.
commit 73e14bd611fa7eac649a2b4c7964959d9eae887b
Author: Eric Anholt <anholt@freebsd.org>
Date: Wed Aug 4 23:18:38 2004 +0000
- Always validate the backing GC in cwValidateGC, not just when the clip
list changes.
- Use FillTiled instead of FillSolid for painting tiled border/background
pixmaps, and don't needlessly change the scratch GC's defaults.
- Use the preferred dixChangeGC instead of DoChangeGC.
- Simplify a silly loop and clean up a couple of comments.
commit d240c41a3ab9cde9921cc96cf86e630ca5c9005a
Author: Egbert Eich <eich@suse.de>
Date: Wed Aug 4 12:21:48 2004 +0000
Optimization of CJK rendering when using versions of freetype prior to
2.1.8 (Chisato Yamauchi).
A small backward compatibility fix to make the freetype module build with
freetype version < 2.1.7.
Fixed/added some debugging code.
commit 751fd11a9ad1a473d7311362246b0869a008001b
Author: Eric Anholt <anholt@freebsd.org>
Date: Wed Aug 4 10:05:37 2004 +0000
- Add two new XAA hooks, SetupForCPUToScreenTexture2 and
SetupForCPUToScreenAlphaTexture2. These add a dstFormat argument after
the previous format argument, which the driver needs to use to properly
set up the destination format. Two new arrays are added for the list of
destination formats supported that correspond to the previous format
arrays for sources.
- Make Render acceleration only occur when the new hook for that
acceleration type is supplied and the dst format list is set, along
with the src format list being set. Without knowing the destination
format, the Render acceleration couldn't properly support all the
destinations it might encounter.
- Bump XAA module minor version.
- Update the Radeon Render acceleration to use the new hooks when the XAA
module is sufficiently new. Fix a bug in the src/dst alpha booleans for
ops, and use them to set blend_cntl to support destinations without
alpha. Add missing PICT_a1r5g5b5 texture format, and add list
terminator. (!)
commit 9c1d52a69db841ac85ef97d7223361b83a66ae29
Author: Alexander Gottwald <alexander.gottwald@s1999.tu-chemnitz.de>
Date: Tue Aug 3 10:12:25 2004 +0000
Merge from CYGWIN branch
2004-08-02 Kensuke Matsuzaki
Fix the bug that we can't copy & paste multi-byte string to Unicode-base
Windows application. Rename fUnicodeSupport to fUseUnicode, because it
don't mean wheather Windows support Unicode or not.
commit defcfe3c7ee3e39ef02da08b7227b758dbede325
Author: Matthieu Herrb <matthieu.herrb@laas.fr>
Date: Tue Aug 3 09:33:54 2004 +0000
programs/Xserver/hw/xfree86/ddc/xf86DDC.h
programs/Xserver/hw/xfree86/vgahw/vgaHW.c
programs/Xserver/hw/xfree86/vgahw/vgaHW.h
programs/Xserver/miext/shadow/shadow.h
programs/Xserver/miext/shadow/shpacked.c
programs/Xserver/miext/shadow/shplanar.c
programs/Xserver/miext/shadow/shrotate.c Fix glitches in pointer to
functions declarations.
commit e6d0b18c24f7f84aabed763be1cc8414883fab95
Author: Matthieu Herrb <matthieu.herrb@laas.fr>
Date: Tue Aug 3 08:52:17 2004 +0000
Fix declaration of XAACachePlanarMonoStippleProc. Rename
XAACachePlanarMonoStippleWeak to XAAGetCachePlanarMonoStipple() for
consistency with other parts of xaa and fix forward declaration in
xaalocal.h. Fixes last comments on Bug #962.
commit bfbb40c28ce6e98c82973bd96054d4787579eaa6
Author: Eric Anholt <anholt@freebsd.org>
Date: Tue Aug 3 05:49:48 2004 +0000
Major improvements to Composite wrapper. Several issues remain, but it now
appears stable in limited testing.
- Allocate the picture private, avoiding segfault.
- Wrap PaintWindow to draw the background/border to the backing pixmap
(based on Deron Johnson's comptran.c).
- Set the x_off/y_off returns to translate coordinates properly.
- Don't bother allocating temporary areas for the modified coordinates.
Layers above are responsible for handling lower layers changing the
arguments, so cw doesn't have to worry about it. mibstore.c has to do
the allocation because it calls down twice (front buffer and backing
store). (Suggested by keithp)
- Handle the mode argument to PolyPoint, Polylines, and FillPolygon.
- Remove some dead elements in the cw privates.
- Kill a prototype warning in compinit.c by adding the cw.h header.
commit b7ba272da0910c6558f71cfedd0bf9836fc892c1
Author: Eric Anholt <anholt@freebsd.org>
Date: Tue Aug 3 05:39:19 2004 +0000
The Damage extension has to wrap after (be called before) the Composite
extension so that the redirecting of drawables by the wrapper doesn't
confuse Damage.
commit d112e55992e9e03e74fdf5738c8c47cd90033a37
Author: Adam Jackson <ajax@nwnk.net>
Date: Tue Aug 3 02:44:23 2004 +0000
Bug #962: Remove LoaderSymbol calls introduced by the dlloader work so
DoLoadableServer NO builds work again.
commit 734cb34dc1697530ecd971b84e1061ed86b4c2a4
Author: Søren Sandmann Pedersen <sandmann@daimi.au.dk>
Date: Mon Aug 2 21:15:30 2004 +0000
Mon Aug 2 21:49:33 2004 Soeren Sandmann <sandmann@redhat.com>
Remove double cast.
commit e6b9cc79c204420117a1f7b23d131ec24923d612
Author: Egbert Eich <eich@suse.de>
Date: Mon Aug 2 19:35:07 2004 +0000
Removed distro specific stuff.
Fixed FreeType module to build with FreeType versions older than 2.1.7.
Fixed typo.
Added vtSema to protect call of driver DPMS function.
removed unneeded variable
Modified RandR driver hook to reduce the number of function calls to one.
Function is sufficiently generic to be extended in the future.
commit b759da83ae62a897b7727d9180a68b962b571286
Author: Alexander Gottwald <alexander.gottwald@s1999.tu-chemnitz.de>
Date: Sun Aug 1 16:16:18 2004 +0000
added README for Cygwin/X
This file currently contains the Cygwin/X specific release notes from 6.7.0
and a first collection of what will make up the release notes for the
next release
commit d638a50f3f039d84d86c00696d7d3ec22560bc3c
Author: Alexander Gottwald <alexander.gottwald@s1999.tu-chemnitz.de>
Date: Sat Jul 31 18:33:56 2004 +0000
adjust prototype for winInitCmapPrivates to match Egberts change.
commit 488be6611919af97d7e4f8b0994487882eb78e18
Author: Kevin E Martin <kem@kem.org>
Date: Sat Jul 31 09:41:27 2004 +0000
Fix typo
commit 383b6b59864098b03d991628ff5933d997793ea1
Author: Kevin E Martin <kem@kem.org>
Date: Sat Jul 31 09:14:06 2004 +0000
Add "Extensions" section support to configuration parser
commit d690556d496c7331bd112903a0c9e6553c7d3342
Author: Eric Anholt <anholt@freebsd.org>
Date: Sat Jul 31 08:24:14 2004 +0000
Integrate COMPOSITEWRAP branch including composite wrapper. This code still
has several issues, including:
- CopyWindow and PaintWindow wrappers missing (will be done soon)
- Some segfaults seen in the Render wrappers.
- Xprt server build breaks with Composite.
- DDXs must be recompiled for Composite due to VisualRec size change.
- Composite bugs pointed out by Deron Johnson in email.
Also, reorder XFixes initialization according to comments by Keith which
are also in xserver CVS.
commit 8763cca7f9927bd6c9caf804bf09dcfea929eed0
Author: Eric Anholt <anholt@freebsd.org>
Date: Sat Jul 31 07:26:50 2004 +0000
Update xfixes server code to major version 3 from xserver CVS, and perform
minor diff-reduction versus xserver CVS.
commit 25bd6ff4a622d09fb0c247b7c40281744c61431e
Author: Kevin E Martin <kem@kem.org>
Date: Sat Jul 31 04:23:21 2004 +0000
Add new extension enable/disable feature. This code is a small step in the
right direction -- i.e., moving towards full run-time config of
extensions. Currently, only XTEST, XINERAMA, RENDER, XKB, and XEVIE are
supported.
commit 326729ebca863c99cf913445126294a3c6d3db5d
Author: Eric Anholt <anholt@freebsd.org>
Date: Sat Jul 31 01:48:27 2004 +0000
- Add some XFIXES bits apparently missed in the DAMAGE-XFIXES merge
- Add missing XCSECURITY ifdef.
- Sync some whitespace to xserver CVS and surrounding style.
commit 370bda820b2912b93dcc34c088075f8e65a9e5cb
Author: Eric Anholt <anholt@freebsd.org>
Date: Sat Jul 31 01:38:46 2004 +0000
Integrate latest damage bits, including the addition of Composite code.
Includes REGION_INIT -> REGION_NULL necessary to avoid segfaults with
inlined region macros.
commit 7542d8a17ad469f9c760f0f843bd6a4fb6deb57d
Author: Stuart Kreitman <stuart.kreitman@sun.com>
Date: Sat Jul 31 01:37:47 2004 +0000
Turn on XEVIE https://freedesktop.org/bugzilla/show_bug.cgi?id=947 Modified
Files: miinitext.c
commit b2065f376b932e49f1f96dfb92ddb52d15796abe
Author: Stuart Kreitman <stuart.kreitman@sun.com>
Date: Sat Jul 31 01:34:26 2004 +0000
Integration of XEVIE branch to trunk, latest updates
https://freedesktop.org/bugzilla/show_bug.cgi?id=947 Modified Files:
Imakefile xevie.c
commit e68bfc801680f2852c59099aa3d7502e49b48b2c
Author: Stuart Kreitman <stuart.kreitman@sun.com>
Date: Sat Jul 31 01:33:40 2004 +0000
Integration of XEVIE branch to trunk, Some updates from latest reviews
https://freedesktop.org/bugzilla/show_bug.cgi?id=947 Modified Files:
events.c
commit 706b2a7e02aa0085769fb87782118488d0f90eaa
Author: Adam Jackson <ajax@nwnk.net>
Date: Sat Jul 31 01:21:19 2004 +0000
Change several LoaderSymbol calls introduced by the bug #400 patch to
*Weak() resolver functions.
commit 9e13805b02f37497971c789b4035abc29463c550
Author: Alexander Gottwald <alexander.gottwald@s1999.tu-chemnitz.de>
Date: Sat Jul 31 00:44:45 2004 +0000
adjust prototype for winInitCmapPrivates to match Egberts change.
commit 4da507a03fd5659e5944d9e47dd2f8920636383b
Author: Kevin E Martin <kem@kem.org>
Date: Sat Jul 31 00:32:43 2004 +0000
Fix compiler warning
commit 64a6d3e9c84a36b4e0550d112f288b695c5056cd
Author: Hui YU <hyu@ati.com>
Date: Fri Jul 30 22:20:21 2004 +0000
Support for New radeon chips: R420/M18, R423, RV370/M22, RV380/M24, RS300.
Add special handlings for DELL triple-head server (RV100). Misc. bug
fixes for flat panel, host aperture, etc (Bug #946)
commit d3c98fed2c37a863a6765a3e288bcdbc2738878a
Author: Egbert Eich <eich@suse.de>
Date: Fri Jul 30 21:53:09 2004 +0000
Add support for on-the-fly screen rotation when supported by hardware (Aron
Plattner).
commit 4baf0029418d3eeeac5d1026a7cfea3234e44e48
Author: Egbert Eich <eich@suse.de>
Date: Fri Jul 30 21:46:38 2004 +0000
An experimental pseudocolor emulation layer. Not fully completed, currently
only works for 16bpp.
commit 63a152f7812d0981e3e7aa41a42e59cd0c3e50dc
Author: Egbert Eich <eich@suse.de>
Date: Fri Jul 30 21:39:20 2004 +0000
removing some unnecessary restricitons on the allowed visuals.
commit 0ba15599466ddb644728c6b68e64e05b1317ac2e
Author: Egbert Eich <eich@suse.de>
Date: Fri Jul 30 21:10:46 2004 +0000
Adding a colormap index to the InitColormapPrivate() func call. Without it
it was completely useless.
test if colormap with index really exists in the list of installed maps
before using it.
commit bbfe7bed3fe4d9bd089327cd59e6faedb592dabb
Author: Egbert Eich <eich@suse.de>
Date: Fri Jul 30 20:56:53 2004 +0000
Set DPMS to ON when VT switching away or shutting down the server. Failing
to do this may leave the text console blank.
commit 40b975e3acb11c1ec2fd4c5984f5efa20b669489
Author: Egbert Eich <eich@suse.de>
Date: Fri Jul 30 20:51:09 2004 +0000
Improved error messages.
build fixes for AMD64.
Made shm* functions in the libc_wrapper more standard conformant by setting
errno correctly.
Use xf86ExendedInitInt10() in VBEExtendedInit() to be able to pass flags.
commit 7643199de1c4f12a2aadeaf2d539a37ddb45672b
Author: Egbert Eich <eich@suse.de>
Date: Fri Jul 30 20:38:27 2004 +0000
Fix static build.
add i845 to the list of chips that allow memory size tweaking.
commit 48514fee3c8ec26f36e142ffc9272e510b9a4238
Author: Adam Jackson <ajax@nwnk.net>
Date: Fri Jul 30 20:30:57 2004 +0000
Bug #400 (partial): Driver fixes for the dlloader. When using dlloader, all
framebuffer formats except cfb and the overlay modes should work, and
r128 and radeon need to be loaded from the ati driver (both issues to
be fixed soon). Tested on i740, s3virge, mach64, tdfx, vesa, and vga
drivers. elfloader users shouldn't be affected.
commit 29012adb37c533f57c684ad94c4d83a6c31793e5
Author: Torrey Lyons <torrey@mrcla.com>
Date: Fri Jul 30 19:28:03 2004 +0000
Add generic rootless layer documentation missed from last commit.
commit 784e4d1cc02dea837a38a4140a18013953296366
Author: Torrey Lyons <torrey@mrcla.com>
Date: Fri Jul 30 19:12:18 2004 +0000
Merge many XDarwin improvements:
- Fix launch of X clients by double clicking in the Finder when there is a
space in the path (Torrey T. Lyons).
- Interpret scroll wheel mouse events correctly when shift is held down
(Benjamin Burke).
- Add option to always use Mac command key equivalents (John Harper and
Torrey T. Lyons).
- Add support for dynamic screen configuration changes in rootless mode
(John Harper and Torrey T. Lyons).
- Add documentation on generic rootless layer (Torrey T. Lyons).
commit c2275b31adc3c4292c171055db16e00ee0e69e43
Author: Egbert Eich <eich@suse.de>
Date: Fri Jul 30 19:04:14 2004 +0000
Removed bugs on TweakMemorySize() which prevented it from working at all.
Initialized last element of BIOS version number string to 0 to avoid random
problems.
commit 5ed0aefc67e86abaddf1b6bffdc832996b86fb46
Author: Egbert Eich <eich@suse.de>
Date: Fri Jul 30 18:40:36 2004 +0000
Fixed typo in a comment.
Deleted bogus comment.
Added debugging support.
commit d380647739e4767da69edc44bbb441b3b9554b03
Author: Torrey Lyons <torrey@mrcla.com>
Date: Fri Jul 30 18:22:13 2004 +0000
Add initial Xinput support for XDarwin (Greg Parker).
commit 41641c11ec8994f1bc4bd1b05ae2cb38167c8312
Author: Torrey Lyons <torrey@mrcla.com>
Date: Fri Jul 30 17:37:09 2004 +0000
Make XDarwin not default to StaticColor on ix86 (Shantonu Sen).
commit f4c84e7dbf0f25a2544d4400e600310421683f3c
Author: Roland Mainz <roland.mainz@nrubsig.org>
Date: Fri Jul 30 12:03:56 2004 +0000
Fix for http://xprint.freedesktop.org/cgi-bin/bugzilla/show_bug.cgi?id=940
- Filter /etc/init.d/xprint throught CPP/|MakeScriptFromCpp()| to allow
platform-specific customisation.
commit ed923a42b800e3f701084ef5828cabbbefe8361f
Author: Eric Anholt <anholt@freebsd.org>
Date: Fri Jul 30 06:54:41 2004 +0000
file cw_render.c was initially added on branch COMPOSITEWRAP.
commit 69e379ddaf85feda6a163b5f4e855ffe86b254df
Author: Eric Anholt <anholt@freebsd.org>
Date: Fri Jul 30 06:54:41 2004 +0000
file cw_ops.c was initially added on branch COMPOSITEWRAP.
commit 0ee93acd103af947fef0a28e32b5b3f2857789bf
Author: Eric Anholt <anholt@freebsd.org>
Date: Fri Jul 30 06:54:40 2004 +0000
file cw.c was initially added on branch COMPOSITEWRAP.
commit 3bdaa0e7fa7b6f5d550907d5fe7d0fb16c53e243
Author: Eric Anholt <anholt@freebsd.org>
Date: Fri Jul 30 06:54:40 2004 +0000
file cw.h was initially added on branch COMPOSITEWRAP.
commit 94e1ea569171334eb40a2d4a63138c02915203db
Author: Eric Anholt <anholt@freebsd.org>
Date: Fri Jul 30 06:54:40 2004 +0000
file compwindow.c was initially added on branch COMPOSITEWRAP.
commit 705536d04c4f09c84bb04827c07bb899584f399d
Author: Eric Anholt <anholt@freebsd.org>
Date: Fri Jul 30 06:54:40 2004 +0000
file compinit.c was initially added on branch COMPOSITEWRAP.
commit b80dbd886d7cc3a72772f3231a8c8e8df7f6679f
Author: Eric Anholt <anholt@freebsd.org>
Date: Fri Jul 30 06:54:40 2004 +0000
file compalloc.c was initially added on branch COMPOSITEWRAP.
commit beb26caf68d3e25bf85fd63dbb499eca4b1f05ba
Author: Eric Anholt <anholt@freebsd.org>
Date: Fri Jul 30 06:54:40 2004 +0000
file compext.c was initially added on branch COMPOSITEWRAP.
commit 97afc846003bb521cf9d6e92b298024d83db8759
Author: Eric Anholt <anholt@freebsd.org>
Date: Fri Jul 30 06:54:40 2004 +0000
file compint.h was initially added on branch COMPOSITEWRAP.
commit 854c1afa867ff617b47c4cde3cfd86bd26e9931a
Author: Kevin E Martin <kem@kem.org>
Date: Fri Jul 30 04:44:13 2004 +0000
Fix "DoLoadableServer NO" build
commit 71164d118c192e96eb2b0fc45514233e9563a568
Author: Stuart Kreitman <stuart.kreitman@sun.com>
Date: Fri Jul 30 01:21:57 2004 +0000
Integration of XEVIE branch to trunk
https://freedesktop.org/bugzilla/show_bug.cgi?id=947
Modified Files: cursorstr.h input.h inputstr.h windowstr.h
commit 82a6a659248bb66a0364eb9eaf331747834fb5c6
Author: Stuart Kreitman <stuart.kreitman@sun.com>
Date: Fri Jul 30 01:20:42 2004 +0000
Integration of XEVIE branch to trunk
https://freedesktop.org/bugzilla/show_bug.cgi?id=947
Modified Files: Imakefile Added Files: xevie.c
commit dd7077cadcdc323e1a301ed5eefa7ff12599aa4d
Author: Kevin E Martin <kem@kem.org>
Date: Fri Jul 30 01:15:57 2004 +0000
Cleaned up code since client's saveSet is no longer defined as a pointer*
(forgot one change in previous check-in)
commit 813d75f9d3c7b540977926e37310fa683daf12e1
Author: Kevin E Martin <kem@kem.org>
Date: Thu Jul 29 23:43:40 2004 +0000
Use LibraryTargetName when not building a loadable server
Move extern function declarations to window.h
Cleaned up code since client's saveSet is no longer defined as a pointer*
Added externs back in
Change #if to #ifdef to fix compiler warning
Add function declarations that were inadvertently removed by previous check
in
Disable extensions that are not (yet) supported by DMX
commit 274d5044ac41523ff23912c223177c429c710e09
Author: Stuart Kreitman <stuart.kreitman@sun.com>
Date: Thu Jul 29 18:49:42 2004 +0000
Integration of DAMAGE-XFIXES branch to trunk
https://freedesktop.org/bugzilla/show_bug.cgi?id=859
Modified Files: Imakefile miinitext.c
commit 406c49eb810cbdcfd833cac4eeaa465598238691
Author: Stuart Kreitman <stuart.kreitman@sun.com>
Date: Thu Jul 29 18:46:37 2004 +0000
Integration of DAMAGE-XFIXES branch to trunk
https://freedesktop.org/bugzilla/show_bug.cgi?id=859
DAMAGE calls some shape functions. Modified Files: Imakefile shape.c
commit 0bca00e1205bf1a4537cbf7be6339b3b1f9b953f
Author: Stuart Kreitman <stuart.kreitman@sun.com>
Date: Thu Jul 29 18:43:58 2004 +0000
Integration of DAMAGE-XFIXES branch to trunk
https://freedesktop.org/bugzilla/show_bug.cgi?id=859
Modified Files: dispatch.c dixutils.c events.c window.c
commit d4a101d4ef9943dcddf08b00b2d3ab4319597193
Author: Stuart Kreitman <stuart.kreitman@sun.com>
Date: Thu Jul 29 18:37:54 2004 +0000
Integration of DAMAGE-XFIXES branch to trunk
https://freedesktop.org/bugzilla/show_bug.cgi?id=859
These RENDER changes come from the experimental freedesktop tree formerly
known as "Xserver". Partly motivated by compatibility with DAMAGE as
pulled from that tree, also some of the code just is better
implemented.
Modified Files: filter.c picture.c picture.h picturestr.h
commit e1281790bb3d7cdcc5de85829806dd53da67e326
Author: Stuart Kreitman <stuart.kreitman@sun.com>
Date: Thu Jul 29 18:16:56 2004 +0000
Integration of DAMAGE-XFIXES branch to trunk
https://freedesktop.org/bugzilla/show_bug.cgi?id=859
Modified Files: cursorstr.h dix.h dixstruct.h regionstr.h window.h
commit d2f798b6dbaebd0300f42c2e083a962c37647620
Author: Stuart Kreitman <stuart.kreitman@sun.com>
Date: Thu Jul 29 14:42:24 2004 +0000
Integration of DAMAGE-XFIXES branch to trunk
https://freedesktop.org/bugzilla/show_bug.cgi?id=859
Added Files: Imakefile damage.c damage.h damagestr.h
commit 682ee8a9f8d55c6a6f517a277d1bfad2a0f28594
Author: Stuart Kreitman <stuart.kreitman@sun.com>
Date: Thu Jul 29 14:40:33 2004 +0000
Integration of DAMAGE-XFIXES branch to trunk
https://freedesktop.org/bugzilla/show_bug.cgi?id=859
commit 6ed1c3845517c7731dcc74baa51bb801838afaff
Author: Stuart Kreitman <stuart.kreitman@sun.com>
Date: Thu Jul 29 14:33:43 2004 +0000
bugzilla 859 -merging DAMAGE-XFIXES into trunk
commit 736e511824c4f5e77e637c680a4e45f0b7631644
Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
Date: Wed Jul 28 03:57:19 2004 +0000
Fix shared reqs for Xlibi18n, Xaw6 & Xmu for Solaris
Improved support for Compose and Kana Lock LED's on Sun keyboards
Add event definitions for additional keys on Sun Japanese keyboards
VUID mouse protocol support for Solaris Make default mouse message clearer
on machines that use a default other than /dev/mouse.
commit d374dffb20364a3df184cc28888ee7edbe50f474
Author: Rik Faith <faith@alephnull.com>
Date: Wed Jul 28 00:28:00 2004 +0000
When using DMX console input, make detached screens display as grey (vs.
white for attached and black for dead-space).
commit 1498414cc85c148ef15b9b57d9f9b6b850bf2702
Author: Torrey Lyons <torrey@mrcla.com>
Date: Tue Jul 27 20:26:47 2004 +0000
Fix Xprint build on Darwin.
commit ddd58356123f61b863754eb0bdd42a8defa0461b
Author: Torrey Lyons <torrey@mrcla.com>
Date: Tue Jul 27 20:24:00 2004 +0000
Fix XDarwin's broken build of libGL and server side GLX. GL library is only
known to build correctly on Mac OS X 10.3.4 and still needs some work
for earlier versions.
commit 8ef3e7052e8e1db869411e9f6fc88491e3f05474
Author: Alexander Gottwald <alexander.gottwald@s1999.tu-chemnitz.de>
Date: Tue Jul 27 09:53:14 2004 +0000
Merge latest changes from CYGWIN branch
Use find | xargs combination instead of simple shell globbing to prevent
commandline argument overflow
commit a12a678bc9af8df1a3078f574b0c910e3e6983f8
Author: Matthieu Herrb <matthieu.herrb@laas.fr>
Date: Tue Jul 27 06:20:52 2004 +0000
Fix a bug that caused an entire batch of events to be thrown out when one
of an unknown type is encountered. (Ty Sarna, NetBSD).
commit 19002e47a0dbf55e035b674116a533ec9814edfa
Author: Alex Deucher <agd5f@yahoo.com>
Date: Tue Jul 27 02:50:41 2004 +0000
- enable maven support for TV detection, DPMS, and DDC on crtc2 on G400
(Ryan Underwood) (http://bugs.xfree86.org/show_bug.cgi?id=1098)
- expose I2CStart; needed for mga maven support (Ryan Underwood)
commit 2a7b137d41eb8ce6efc45b47b5df0c89eb4f5d93
Author: Matthieu Herrb <matthieu.herrb@laas.fr>
Date: Mon Jul 26 22:41:47 2004 +0000
remove extra ';' (Alan Hourihane, Keith Packard).
commit 799208dd44a65b18dda97b4843a27a2628f955f4
Author: Adam Jackson <ajax@nwnk.net>
Date: Mon Jul 26 19:06:04 2004 +0000
Bug #377: Make lib{glx,GLcore,dri} work when compiled as dlloader modules.
commit f15f881727cee9a879bd43be8dc849320f8d3cbd
Author: Keith Packard <keithp@keithp.com>
Date: Mon Jul 26 17:14:27 2004 +0000
Eliminate bogus rate check in fbdevModeSupported. Hmm. Potentially bogus
rate selection necessary for Mac fbdev
Don't know about fb changes to pixmaps, so can't track dirt.
Add Mac specific 1280x854 mode. Warn when requested mode isn't found.
Add ability to soft-boot video cards.
Add region expand request. FIXME: need test cases
commit 20913b7d5daf90e0f7ad1ee967ad2f0daaec40f9
Author: Matthieu Herrb <matthieu.herrb@laas.fr>
Date: Sat Jul 24 17:35:39 2004 +0000
Fix a problem with wsmouse driver loosing events on 64bit architectures
(XFree86 Bugzilla #1438, John Heasley). "To fix this, I've added a
mouse buffer (Xisb buffer) "scale" value to the MouseDevPtr type. If
set, it is used as structure size of which we want space for a few."
commit c57944cd9aaac717d4d4ada44626e35925b39bbd
Author: Keith Packard <keithp@keithp.com>
Date: Sat Jul 24 17:02:49 2004 +0000
Check for mmio before restoring crtc/crtc2 pitch registers
commit 5fdff8b95e8f90221a46717c2f84715ab238460c
Author: Matthieu Herrb <matthieu.herrb@laas.fr>
Date: Sat Jul 24 16:32:39 2004 +0000
Bugzilla #884: OpenBSD/amd64 support.
commit cc3e0173d9fae8a40eb46606d9951e3aa1df975a
Author: Søren Sandmann Pedersen <sandmann@daimi.au.dk>
Date: Thu Jul 22 19:24:50 2004 +0000
Thu Jul 22 20:03:11 2004 Soeren Sandmann <sandmann@daimi.au.dk>
Call MMX solid fill routine when available.
Call MMX operations when available.
New HasGcc34 macro
New file with many operations implemented with MMX intrinsics, conditional
on having GCC 3.4 on i386.
commit 9565d9e0cf85e6f5fb47acebdd66212bd6cc3e08
Author: Keith Packard <keithp@keithp.com>
Date: Thu Jul 22 18:17:59 2004 +0000
Correct pitch so that accelerator can run on 1400x1050 screens. Add a few
more register sets for cursors.
commit 67dbad6b3b9163eafae7d9dd7698708e10372a21
Author: Eric Anholt <anholt@freebsd.org>
Date: Thu Jul 22 06:48:19 2004 +0000
DRM 20040721 import
commit 829b2c72a6433ebaf63f2d2726259c73cca4bd1a
Author: Eric Anholt <anholt@freebsd.org>
Date: Thu Jul 22 06:48:19 2004 +0000
Initial revision
commit 448e0754e369d433a61ae337bbfd7dba195c5e69
Author: Phil Blundell <pb@reciva.com>
Date: Wed Jul 21 20:33:35 2004 +0000
Include -lts if appropriate. Patch from pattieja@bentham.ispvip.biz.
commit 0c32a94623b13dd1ac5b015b465bdf890f498282
Author: Alexander Gottwald <alexander.gottwald@s1999.tu-chemnitz.de>
Date: Tue Jul 20 15:15:13 2004 +0000
Bugzilla #889: Bind -from address to port number 0 instead of 177
commit 07e6011106dcfa0ab69861aa7dcbb88382625c16
Author: Phil Blundell <pb@reciva.com>
Date: Tue Jul 20 14:33:42 2004 +0000
Select optimized
16bpp shadow copy functions if screen is 16bpp. Select -YX versions for
90 and 270 rotations if architecture is ARM.
commit 797114414096d7bf7ed0d73a878d0cffef262301
Author: Roland Mainz <roland.mainz@nrubsig.org>
Date: Mon Jul 19 22:01:52 2004 +0000
Fix for http://freedesktop.org/bugzilla/show_bug.cgi?id=893 - Fixing the
bug that Xprt did not honor ${LC_ALL} when looking for model-config
dirs.
commit 8853f9331826899229e5b7c964e9c852c0371ce5
Author: Eric Anholt <anholt@freebsd.org>
Date: Mon Jul 19 12:07:01 2004 +0000
Add support for a8b8g8r8 and x8b8g8r8 pictures, which showed up frequently
with metacity usage.
commit adf4b38f49da063576b48f9c0750b78bb753b3de
Author: Eric Anholt <anholt@freebsd.org>
Date: Mon Jul 19 11:42:49 2004 +0000
Breakage in last commit to this file: pCurPriv->area isn't set up until
Enable, these days.
commit d2e74e419d2c75c5a5b97236d2714730e6f69ee0
Author: Eric Anholt <anholt@freebsd.org>
Date: Mon Jul 19 11:19:12 2004 +0000
Set the right number of texture coordinates for r200 Render support (still
disabled, needs to be tested).
commit cefcb7f123c962c3715b0c46f30430e87c82a017
Author: Eric Anholt <anholt@freebsd.org>
Date: Mon Jul 19 11:16:13 2004 +0000
- Add Radeon picture transform support.
- On R128, don't refer to an old Composite's mask transform when the
current Composite doesn't have a mask.
- Staticize some global variables in r128_composite.c.
commit 9fe216a45836b98b5aea55725019668de3900e83
Author: Eric Anholt <anholt@freebsd.org>
Date: Mon Jul 19 07:53:54 2004 +0000
Use the offscreen memory manager as much as possible to do the reservation
of memory at startup. Do some drive-by cleanups while I'm here
(sorry!).
commit e2bb9f38cdcb74fd7630f4efe310ad14d597171e
Author: Eric Anholt <anholt@freebsd.org>
Date: Mon Jul 19 07:20:01 2004 +0000
Add support for transforms of textures on R128.
commit c04264727860cbe2e276e1934d6700d0baaf9f73
Author: Rik Faith <faith@alephnull.com>
Date: Sun Jul 18 22:19:33 2004 +0000
Addition of console input after removal of core backend input that is not
on screen 0 can cause a segfault. Fix by preventing reinitialization of
detached inputs. When Xinerama is active and screen 0 is detached,
pixmaps for XGetImage must be obtained from another screen.
commit 0addd0d499046fc8a6cdc18fc41d34cac2ba77ea
Author: Roland Mainz <roland.mainz@nrubsig.org>
Date: Sun Jul 18 05:21:20 2004 +0000
Fix for http://freedesktop.org/bugzilla/show_bug.cgi?id=858 - Fixing the
problem that clients cannot use the TrueColor visual without calling
|XInstallColormap();|.
commit 7f9e263658b1c9c435db851a8afd904a2f584d13
Author: Kevin E Martin <kem@kem.org>
Date: Sat Jul 17 20:44:14 2004 +0000
Revert change to MAXFORMATS to maintain binary compatibility
commit c47a1bdd7463b6863018e2c4237acfd28b89f38f
Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
Date: Sat Jul 17 01:13:31 2004 +0000
Fix typo in debug message in MakeAllCLTSServerListeners
Add $(GETPEER_DEFINES) to DEPEND_DEFINES for makedepend
Add "localuser" and "localgroup" access types to server-interpreted
authentication scheme.
commit 3e52373fc8179a59efc9e7ab22ce0cb5160d0409
Author: Carlos Romero <kcrashcore@bellsouth.net>
Date: Thu Jul 15 09:56:40 2004 +0000
Enable i810.
commit aeb78eaa980ac93f6af3e947ab1ad8bce5bc5bd1
Author: Eric Anholt <anholt@freebsd.org>
Date: Thu Jul 8 08:21:25 2004 +0000
Commit the rest of the dirty optimization from 20040703 and add a missing
header include. I don't know how this happened, but I'm going to blame
a "few" fscks having happened between testing the code and committing
(due to other driver changes that made me not blame dirty for the
failures I saw) for disappearance of kasync.c changes. Fixes a lot of
corruption.
commit b46767352822b09e5dab8b54cbb7a37a9b62de53
Author: Eric Anholt <anholt@freebsd.org>
Date: Thu Jul 8 06:57:58 2004 +0000
Remove duplicate protos in kdrive.h.
commit 764d9e822b01fdfe3ff088028959cbc48b349026
Author: Carlos Romero <kcrashcore@bellsouth.net>
Date: Wed Jul 7 20:43:25 2004 +0000
missing xkb/[xkb.h, xkbDflts.h] and hw/kdrive/mga/g400_common.h
commit f96ef08d48b01f6119799ede9ffc43d0134cbf8b
Author: Carlos Romero <kcrashcore@bellsouth.net>
Date: Wed Jul 7 19:21:07 2004 +0000
Initial kdrive XKB/XINPUT support, use --enable-xkb --enable-xinput
commit a5c9b3229ce418a5e3eacc40b7a7f11c0a26d958
Author: Rik Faith <faith@alephnull.com>
Date: Wed Jul 7 04:32:52 2004 +0000
Bugzilla #817
commit 1498d7a096f0855fa965585acd9ca4a2780cc959
Author: Kevin E Martin <kem@kem.org>
Date: Tue Jul 6 23:51:00 2004 +0000
- Disable building DMX on OSs that have not been verified to build
correctly (Kevin Martin).
- Fix DMX build when Xinerama is not enabled (Kevin Martin).
commit 0e45f2a7536bf4b66d6f64d96b44431310884af3
Author: Egbert Eich <eich@suse.de>
Date: Tue Jul 6 14:49:13 2004 +0000
ifdef'ed some IA32-only assembler statements. Presently these chipsets are
IA32 only, anyway (Egbert Eich).
Disabling generic VGA testing for IA64 architectures. Temporarily disabling
support for ZX1 bus. This code is extremely invasive and is executed as
fallback without testing for a ZX1 chipset. It brings a SGI Altrix to a
grinding halt. (Egbert Eich).
commit df2b55a25b7056ac92c1f6cbee9f16bd0a37ba8c
Author: Egbert Eich <eich@suse.de>
Date: Tue Jul 6 14:37:48 2004 +0000
Separated Intel drivers from default DriDrivers to avoid building them on
IA64 (Egbert Eich).
Fixed wrong function prototype (Egbert Eich).
Don't test for generic VGA on IA64 (Egbert Eich).
Fixed a segfault when accessing a structure before verifying the pointer
exists (Egbert Eich).
Added a showcache option for debugging (Egbert Eich).
Increase default video RAM size to 16MB when DRI is enabled and more than
128MB are available (Egbert Eich). Fixed lockups during mode switch.
Problem was introduced when attempting to copy the behavior during
LeaveVT()/EnterVT() but but forgetting to call I810DRILeave() before
I810DRIEnter(). The entire DRILeave()/Enter() scenario has been
commented out as it didn't seem to be necessary (Egbert Eich).
Fix TweakMemorySize() (tested with i855/i865) (Egbert Eich).
increased MAX_DEVICES to 128 (Egbert Eich).
Use OS provided PCI config space access as default method (Egbert Eich).
Added support for Linux 2.6 proc file format.
Fixed unaligned accesses to pieces of the VBE info block. VESA did not
align elements to size (Egbert Eich).
commit 7c466d64c34e68e0bc50e083861874161ae02db9
Author: Eric Anholt <anholt@freebsd.org>
Date: Sat Jul 3 10:23:03 2004 +0000
Clean up Rage 128 composite code. Now it composites more operations
correctly and is simpler.
commit 020701566916c8569f5af7f2efe1de36fea2002e
Author: Eric Anholt <anholt@freebsd.org>
Date: Sat Jul 3 09:16:30 2004 +0000
Add a "dirty" flag to the pixmap private. Clear it when setting up an
offscreen pixmap area, and set it when any rendering occurs. When
moving a pixmap out of offscreen, don't read data back if it wasn't
dirtied (compared to the system memory copy).
commit fd594b0559caa98ee0823be956aecf9c9d2e52bc
Author: Phil Blundell <pb@reciva.com>
Date: Fri Jul 2 21:30:00 2004 +0000
Call ts_read multiple times, to avoid events getting stuck in the pipeline.
commit 7976ee51afcad41b611e642d2feb31d805dedcf6
Author: Kevin E Martin <kem@kem.org>
Date: Wed Jun 30 20:06:56 2004 +0000
Add Distributed Multihead X (DMX) support
commit d5db59bd79f5d8788b99056bf9d969b5b3ad99e1
Author: Eric Anholt <anholt@freebsd.org>
Date: Tue Jun 29 20:37:51 2004 +0000
Add an offscreen area scoring to improve choosing offscreen areas to kick
out when allocation can't find a free area of the requested size. When
offscreen pixmaps get used, the offscreen area's score is increased by
a constant value. Every certain number of increases, all offscreen area
scores get decreased by a fraction. When choosing a set of areas to
remove for a new allocation, the set of areas with the smallest total
score is chosen for removal. While this is not the smartest system, it
prevents things like always removing the first offscreen area in memory
(likely the most recent) to be kicked out when doing replacing.
commit ea78d1c6fcd27d28e69cb97faf72b7b719f6f93e
Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
Date: Mon Jun 28 18:08:26 2004 +0000
Add GLX_ALIAS_VOID for GLX_ALIAS of functions with return type void to fix
builds with non-gcc compilers that refuse to let you do return
function_that_returns_void(...)
programs/Xserver/hw/xfree86/os-support/shared/sigiostubs.c Remove includes
of xf86drm.h that break non-DRI builds
commit 7ff67f2872ddd15908f789ec9bdb76e8211d6431
Author: Keith Packard <keithp@keithp.com>
Date: Mon Jun 28 00:48:51 2004 +0000
Separate out off-screen allocation from Init. Fix Enable to update
off-screen addresses. Wrap RandR to update off-screen addresses.
Set off_screen_base and memory_size fields correctly.
commit 5b75aae2cf1ad38556e9a55da72ad65419aa7f84
Author: Keith Packard <keithp@keithp.com>
Date: Sat Jun 26 04:13:03 2004 +0000
Add ARGB cursor support for Radeon cards.
commit 8bc0bc6d36dbc5000069017a1984905065164016
Author: Alexander Gottwald <alexander.gottwald@s1999.tu-chemnitz.de>
Date: Fri Jun 25 08:58:18 2004 +0000
#Bug 784: Ignore unconfigured interfaces with xdmcp
commit c5ab3fdd928d12b4dc28108f2242b3b75e1ac65f
Author: Alexander Gottwald <alexander.gottwald@s1999.tu-chemnitz.de>
Date: Fri Jun 25 08:56:04 2004 +0000
#Bug 780: add RRSetScreenConfig
commit f8226cee08a00b49f32dc3db814478490febe45d
Author: Roland Mainz <roland.mainz@nrubsig.org>
Date: Fri Jun 25 00:02:11 2004 +0000
Fix for http://xprint.freedesktop.org/bugzilla/show_bug.cgi?id=791 - Adding
special support for Canon C3200N
commit ad6b9644a39343437967b4c3b2442dbd47508443
Author: Roland Mainz <roland.mainz@nrubsig.org>
Date: Thu Jun 24 06:26:27 2004 +0000
Fix for http://xprint.freedesktop.org/bugzilla/show_bug.cgi?id=660 : Fix
for the issue that GetPrinterList does not return printer descriptions
on Solaris. The patch implements a framework which allows the printer
enumerator scripts to pass additional printer attributes to the
information pool (currently only "xp-printerattr.descriptor" is
implemented).
commit 884908a63c624585c9b5fcf22d565236298c2916
Author: Roland Mainz <roland.mainz@nrubsig.org>
Date: Tue Jun 22 10:18:13 2004 +0000
Fix for http://xprint.freedesktop.org/bugzilla/show_bug.cgi?id=789 : Adding
a workaround for the issue that Xprt may hang when the CUPS spooler
frontend sends messages to stdout.
commit c66cc2a219e860ae3c0b5d4ad18b22a6dc4e16df
Author: Alexander Gottwald <alexander.gottwald@s1999.tu-chemnitz.de>
Date: Mon Jun 21 13:51:57 2004 +0000
Bug 783: rootless patches for cygwin
commit ed7f92e791f052d64cffef4b44eae5160fb24689
Author: Alexander Gottwald <alexander.gottwald@s1999.tu-chemnitz.de>
Date: Mon Jun 21 13:44:14 2004 +0000
Bug 778: add ddxBeforeReset
commit 68d92cca1a696521599db6a826d2187ec0c15f01
Author: Alexander Gottwald <alexander.gottwald@s1999.tu-chemnitz.de>
Date: Mon Jun 21 13:35:05 2004 +0000
Bug 782: Merge native OpenGL for Windows from CYGWIN branch
commit d6e8b1affec7351549c0006cc63b6923091cdd68
Author: Alexander Gottwald <alexander.gottwald@s1999.tu-chemnitz.de>
Date: Mon Jun 21 13:19:32 2004 +0000
Bug 777: Merge from CYGWIN branch
commit dfdbb60bf5f613b3554d5435f08f16bde72aa353
Author: Roland Mainz <roland.mainz@nrubsig.org>
Date: Mon Jun 21 00:29:46 2004 +0000
Fix for http://xprint.freedesktop.org/bugzilla/show_bug.cgi?id=772 - RFE:
Switch default resolution from 300DPI to 600DPI
commit dd831c7a5c1b0c540a78350aadaeb34a8aa67395
Author: Roland Mainz <roland.mainz@nrubsig.org>
Date: Sat Jun 19 21:56:01 2004 +0000
Refix for http://freedesktop.org/bugzilla/show_bug.cgi?id=764 : Rework
previous solution and make Xprt to default to "-noreset" (the default
of Solaris version of Xprt) and add a "-reset" option which can be used
to restore the default behaviour on demand.
commit da78a4ddd833f78baf1d2579a1adea8208016ddb
Author: Damien Ciabrini <braun@club-internet.fr>
Date: Wed Jun 16 21:36:54 2004 +0000
Update MGA composite patch commit. (some files were missing in the previous
commit)
commit e56e24af252bd3b8e58076adf0f8eabf1103f187
Author: Eric Anholt <anholt@freebsd.org>
Date: Wed Jun 16 09:37:59 2004 +0000
Merge DRI-trunk-20040613 changes in programs/Xserver/GL.
commit 2e1868b560315a8b20d688e646c489a5ad93eeae
Author: Eric Anholt <anholt@freebsd.org>
Date: Wed Jun 16 09:25:21 2004 +0000
DRI trunk-20040613 import
commit f45c46c630855e8e0d1c28b1f0d3b2ad54334619
Author: Eric Anholt <anholt@freebsd.org>
Date: Wed Jun 16 09:25:15 2004 +0000
Initial revision
commit 22bad9474b8822f03f84a8a39edce624bfb9befa
Author: Eric Anholt <anholt@freebsd.org>
Date: Wed Jun 16 09:22:17 2004 +0000
DRI XFree86-4_3_99_12-merge import
commit 1c133c27ccc1f09b95922fdece3c8d73cc182def
Author: Eric Anholt <anholt@freebsd.org>
Date: Wed Jun 16 09:22:05 2004 +0000
Initial revision
commit b61ff0daa4bd1e3b828dc5b985c3a2f3c92b202e
Author: Eric Anholt <anholt@freebsd.org>
Date: Wed Jun 16 09:16:01 2004 +0000
DRM 20040613 import
commit bcc1eab1fd57e8cb686d625934a6e527b7ae4ea2
Author: Eric Anholt <anholt@freebsd.org>
Date: Wed Jun 16 09:16:01 2004 +0000
Initial revision
commit 580b9a7da1bf0e20acdcddd676d471b3d6589023
Author: Jaymz Julian <jaymz@artificial-stupidity.net>
Date: Mon Jun 14 08:43:57 2004 +0000
MGA composite support from Damien Ciabrini - thanks!
commit 95d65cf6bb753d10f4db3d857fb98bb09389228e
Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
Date: Sun Jun 13 04:50:21 2004 +0000
Manual page X(7) does not reference Xprt(1x), xplsprinters(1x), etc.
xc/config/cf/Imake.rules Correct comment to match rule name for
InstallDriverSDKObjectModule
xc/programs/Xserver/hw/xfree86/os-support/sunos/sun_kbd.c Log results of
ioctls to probe keyboard type & layout
commit 4ffde8a6b3299f002c10b1abd881e4c6849767ea
Author: Eric Anholt <anholt@freebsd.org>
Date: Thu Jun 10 19:22:58 2004 +0000
- Pass the right pixel mask (all ones) in to PrepareSolid in the
solid-fill-based composite acceleration.
- Use a real pixmap when doing an UploadToScratch (For pDrawable->type ==
DRAWABLE_WINDOW, you need to get the backing pixmap).
- Pass back the x/y offsets from kaaGetOffscreenPixmap unconditionally,
because they'll be used in the scratch case.
- Turn on the Render acceleration for Rage 128 and Radeon 100-series at
last!
commit c3bc6dd551436d5e37a07f37b3b77a83bb5b5da0
Author: Eric Anholt <anholt@freebsd.org>
Date: Thu Jun 10 09:50:59 2004 +0000
Align scratch area offsets to the offscreen byte alignment.
commit cf3f95d2164604047866b283fe0071574bf16dbc
Author: Eric Anholt <anholt@freebsd.org>
Date: Thu Jun 10 08:37:28 2004 +0000
Oops, testers reported that the last patch actually didn't work (conflicts
occurred), so the R300 PDMA doesn't work. Disable.
commit 0b7647ee359537953b67b0dbf9daa807e356062b
Author: Eric Anholt <anholt@freebsd.org>
Date: Thu Jun 10 05:57:31 2004 +0000
Bug #242: Fix setup of R300 cards, by providing R300 CP code from
volodya-project and initializing PDMA.
commit b3a18ca8b827cfe2ebb295a03a9776028242c1a0
Author: Franco Catrin L <fcatrin@tuxpan.com>
Date: Mon Jun 7 05:13:29 2004 +0000
Neomagic driver enabled
commit 893ea125597f3c6273f45a51673d4dc514e754e9
Author: Franco Catrin L <fcatrin@tuxpan.com>
Date: Mon Jun 7 05:05:10 2004 +0000
small fixes. README added
commit d9cca52feba13b69f3eea9e1d958b8a4711e7d67
Author: Keith Packard <keithp@keithp.com>
Date: Fri Jun 4 17:06:18 2004 +0000
Add (stubbed out) Xgl server code
commit f8a1dd3ce725195baa6f38a880299752c6c6c2c4
Author: Keith Packard <keithp@keithp.com>
Date: Fri Jun 4 16:10:50 2004 +0000
Add top-level build support for GL X server (not working yet)
Fix a few allocation bugs with alternate visual ids Allow for non-8/8/8
alternate visuals
Turn off any existing shadow before enabling it again (avoids
re-registering existing damage)
Add some validation code to catch re-registered damages
commit 6741fadc52598af0096f106a2cefd640abb434b3
Author: Phil Blundell <pb@reciva.com>
Date: Wed Jun 2 20:49:50 2004 +0000
New conditional. (REQUIRED_MODULES): Demand xcalibrateext if building
XCalibrate.
New file.
Add xcalibrate.c.
Read raw events if requested.
commit d4d0c8470c4272dec642ab4c68f44a83cda06971
Author: Phil Blundell <pb@reciva.com>
Date: Sun May 30 20:40:30 2004 +0000
Add -lts if using tslib.
commit 8124810950d7e0b9db7f66dadee7218b0c26c4c3
Author: Carlos Romero <kcrashcore@bellsouth.net>
Date: Sun May 30 13:51:18 2004 +0000
Initialize permedia engine for acceleration to work.
commit ea1bbf8d83d3780ccce5ebcdff48f0b19863cee1
Author: Ralph Thomas <ralpht@68k.org>
Date: Sat May 29 12:15:46 2004 +0000
Adding driver for VIA CLE266 graphics chip. Currently it only accelerates
copy and fill operations.
commit 6af411b02e808220d3afcef14abb97eec86cf1f3
Author: Daniel Stone <daniel@fooishbar.org>
Date: Fri May 28 04:56:49 2004 +0000
Hey, I like devfs.
Try /dev/fb/0 if /dev/fb0 fails.
commit a7b42f685e7a4bf57cf89a3ef664a581ecedb50f
Author: Alexander Gottwald <alexander.gottwald@s1999.tu-chemnitz.de>
Date: Thu May 27 14:11:42 2004 +0000
file ChangeLog was initially added on branch CYGWIN.
commit 05a3dbf5dc55ea534c68fc9d05b3949805a0752e
Author: Egbert Eich <eich@suse.de>
Date: Wed May 26 17:44:29 2004 +0000
Updated x86emu and resynced with upsteam at Scitech.
commit 9549f628e066396e6bc9a7edfc919bdd6860f170
Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
Date: Tue May 25 20:33:46 2004 +0000
getconfig: file '/usr/X11R6/lib/X11/getconfig/xorg.cfg' has bad signature
(Change "Xorg Project" to "Xorg Foundation" to match getconfig script)
commit f8124d3ef5890d59c3ce41bee46b5e3576d0f9b1
Author: Carlos Romero <kcrashcore@bellsouth.net>
Date: Tue May 25 13:02:44 2004 +0000
Add pm2 to the build
commit 32d0920ef9ec3c5e61089b88dedc82ffab294276
Author: Carlos Romero <kcrashcore@bellsouth.net>
Date: Mon May 24 19:31:41 2004 +0000
Initial import of Permedia2 driver
commit 5b2211ec3545f1634f807daf84b6c4bc2c0fdecf
Author: Egbert Eich <eich@suse.de>
Date: Mon May 24 19:05:01 2004 +0000
Muffle compiler warnings.
fix option name in log message.
improve debugging messages.
commit 932efe8e6d4e6280aed9b5e25af56888c964d37b
Author: Keith Packard <keithp@keithp.com>
Date: Fri May 21 03:32:27 2004 +0000
Allow for multiple composite-based visuals, then add an RGB24 visual in
addition to the ARGB32 one. This allows 'glitz' to run on top of any X
server using mesa.
Switch to using 32bpp for depth 24 pixmaps (even when the frame buffer is
not depth 24).
commit cde51fd05b2bd413d8db8ad750e6a72398a7039c
Author: Keith Packard <keithp@keithp.com>
Date: Thu May 20 19:51:44 2004 +0000
Miscomputing pitch in 24bpp modes because of rounding errors.
commit b9d920f3dc060d230a4a7b2d40210524acf50666
Author: Keith Packard <keithp@keithp.com>
Date: Thu May 20 05:27:03 2004 +0000
Fix SYNC_ALWAYS (debugging) code to use mach64WaitIdle instead of
KdCheckSync -- the boolean used in the latter won't be set yet.
Oops. == instead of =.
Must sync hardware before rasterizing trapezoids in case the mask is in
off-screen memory and has just been erased. Yes, it is silly to place
masks in off-screen memory. That's a separate issue.
commit 94648799c82e59166155ca5abf22a9391693e6a1
Author: Keith Packard <keithp@keithp.com>
Date: Thu May 20 02:42:20 2004 +0000
Pin header-only pixmaps in memory.
Off-screen reallocation could have used a stale pointer.
Separate framebuffer mapping computation from actual frame buffer mapping.
Now map the frame buffer from vesaEnable so that VT switch shares the
same mapping code. This makes sure any shadow framebuffer is allocated
again.
commit cade317d31dddab61199d5e90bcff36fb12f3cd1
Author: Eric Anholt <anholt@freebsd.org>
Date: Mon May 17 20:18:02 2004 +0000
Overhaul of the ATI driver:
- Add monochrome hardware cursor support.
- Try to auto-detect AGP support for DRI on Radeons. And fail. Detect it
properly on R128.
- Set up card for pseudo-DMA if possible. Convert 2D rendering code to
prepare DMA packets only. Use generic code to decode DMA packets to
MMIO if PDMA is unavailable. Add WIP code to support "real" DMA without
DRM support.
- Dispatch pending DMA commands when the server sleeps. Otherwise some
things, such as typing in an xterm, wouldn't show up for a time.
- Fix Radeon Composite acceleration in many ways, and add Rage 128
Composite acceleration. Disable them both due to still-not-understood
issues they have. They fail with In, Out, AtopReverse, and Xor, and
text rendering is strange.
- Add textured XV support for R100 and Rage 128. No brightness/sat
controls, but it does support multiple ports, and cooperates with
Composite.
- Add WIP code for hostdata uploads.
- Many cleanups and fixes.
commit 834537e212e01314b60737278b7abc6bb7cef102
Author: Eric Anholt <anholt@freebsd.org>
Date: Mon May 17 07:19:49 2004 +0000
Make kaaMoveInPixmap public. This will be used by the ATI driver's xvideo
support to ensure that the destination is in framebuffer.
commit 85f46e0bcdf60d145a6868ee71d10688c9113e6e
Author: Eric Anholt <anholt@freebsd.org>
Date: Mon May 17 07:14:23 2004 +0000
Add new CheckComposite hook. This allows a driver to avoid the migration of
pixmaps for a Composite operation if the operation can't be supported.
This hook is optional.
commit 47fb207c8ae2b54e976066f78892a1ee3fb35d30
Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
Date: Sun May 16 05:08:39 2004 +0000
xc/programs/Xserver/fb/fb.h
xc/programs/Xserver/fb/fboverlay.c
xc/programs/Xserver/fb/fbscreen.c
- Change #ifdef for checking for old format miScreenInit to
FB_OLD_MISCREENINIT for easier portability to xservers with updated
screen structs but old function prototypes. Make it automatically
defined if FB_OLD_SCREEN is defined.
- Add _LP64 to list of #ifdefs for 64-bit platforms to support
64-bit Solaris.
commit fc2dd516c3c7382915452207180a1c483d0d73ca
Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
Date: Sun May 16 00:03:54 2004 +0000
xc/programs/Xserver/hw/xfree86/xf86config/Imakefile
xc/programs/Xserver/hw/xfree86/xf86config/xorgconfig.c
- Clean up server name changes from TM branch
- Set default XKB rules file name correctly
- Use default font path from Imake configuration for the default font path
in generated xorg.conf files.
- Use path variables from Imake configuration for paths to files, in case
vendor has configured them to install somewhere other than the
defaults.
commit b1aa9499ffb827f4b1acc75f197e332bba382565
Author: Roland Mainz <roland.mainz@nrubsig.org>
Date: Sat May 15 14:43:05 2004 +0000
Fix for http://pdx.freedesktop.org/cgi-bin/bugzilla/show_bug.cgi?id=622 -
RFE: Xprt default BIGREQUESTS extension buffer size should be 8MB (to
make |XpPutDocumentData()| happy and to improve performance).
commit 74b2a7694791297a4f798ecc05c7eb8f68634722
Author: Eric Anholt <anholt@freebsd.org>
Date: Fri May 14 00:34:28 2004 +0000
Add new flag, KAA_OFFSCREEN_ALIGN_POT, which tells KAA to align pixmap
pitches to a power-of-two number of bytes. Useful for Render
acceleration on older cards.
commit 2bea33e881693e7d7dcf938db79c888a71dfb2fb
Author: Eric Anholt <anholt@freebsd.org>
Date: Fri May 14 00:27:29 2004 +0000
Don't let the visible screen get "migrated" offscreen, which manifests
itself as a hang.
Reported by: Ginokas <ginokas@free.fr>
commit 40354e761892dc2ef88d2e722d8d7896642003eb
Author: Eric Anholt <anholt@freebsd.org>
Date: Thu May 13 22:57:15 2004 +0000
Add generic functions for copying packed/planar XV data, copied from
mach64.
commit 2e330e980f61b256c55f5b9debb00574e4e85b26
Author: Eric Anholt <anholt@freebsd.org>
Date: Thu May 13 21:41:48 2004 +0000
Move fourcc.h to a generic location in src/.
commit f52a4d472d2463482d865c5006208182c294e670
Author: Keith Packard <keithp@keithp.com>
Date: Thu May 13 21:25:51 2004 +0000
Follow GLX in setting ARGB visual nplanes to 24.
Retry current mouse protocol when sync is lost
commit aa5a87847290d49b03a33351ebfd8df652a42489
Author: Eric Anholt <anholt@freebsd.org>
Date: Thu May 13 21:15:06 2004 +0000
There's no need to explicitly set softCursor -- kdrive handles this if the
cursor hooks aren't set.
commit 4078457919708a8dbf9db8ee6e4871ecbf72518f
Author: Eric Anholt <anholt@freebsd.org>
Date: Wed May 12 01:49:46 2004 +0000
Fix problems in render fb implementation found by rendercheck:
- fbCombineSaturate was pointed at fbCombineDisjointOver, instead of
fbCombineDisjointOverReverse as it should. Instead, point
fbCombineDisjointOverReverse at fbCombineSaturate (which is likely to
be faster).
- fix previously-unused fbCombineSaturate implementation.
- fbCombineMaskAlphaC was just a copy of fbCombineMaskValueC. Make it do
what it's supposed to (return a cs.alpha).
- fbCombineAtopC didn't invert the source alpha value.
- fix copy'n'paste errors in fbCombine(Dis/Con)jointGeneralC, also source
alpha wasn't treated in a component fashion.
- fbCompositeSrc_8888* didn't handle when the source lacks an alpha
channel. Rather than adding that and possilby slowing down the (normal)
alpha case, don't let x8r8g8b8/x8b8g8r8 Pictures be used in
fbCompositeSrc_8888* because Over with one of these is just Src.
commit a43d5412b4d79d67af20dc8af144a9ca80263e9d
Author: Alexander Gottwald <alexander.gottwald@s1999.tu-chemnitz.de>
Date: Sun May 9 16:20:13 2004 +0000
file ChangeLog was initially added on branch CYGWIN.
commit 0498d818fe40cb4eb03983e27a980791bbadf6db
Author: Roland Mainz <roland.mainz@nrubsig.org>
Date: Sat May 8 02:06:46 2004 +0000
Fix for http://pdx.freedesktop.org/cgi-bin/bugzilla/show_bug.cgi?id=608
("Can not print on Debian/CUPS due to error |Xprt_64:lpr: unable to
print file: server-error-not-accepting-jobs|"): Xprt did not setup the
list of supplementary group ids, causing print failure when the the
calling user must be a member in a specific group to be allowed to
print.
commit 75d96afcc4a1f201da665bd73b7067e8e7139a3f
Author: Egbert Eich <eich@suse.de>
Date: Thu May 6 17:31:17 2004 +0000
BugZilla #601: Fixing makedepend choking on floating point exception
because CHAR_BIT is defined to __CHAR_BIT__ which is a compiler
intrinsic define. BugZilla #605: Fixing build on IA64 which is broken
due to the inclusion of the kernel header asm/page.h. Kernel headers
however don't work with
-ansi. The inclusion of asm/page.h can however savely be removed as it
there are plenty of other ways to determine the page size.
commit 7124cfaa006e840ba48dcc466c0dc8b34503a686
Author: Keith Packard <keithp@keithp.com>
Date: Thu May 6 16:19:32 2004 +0000
Use current resolution by default, change rate to 75 to match
fbdevModeSupported cut-off (?). Glenn McGrath <glennm@hydrix.com>
commit e4ac2411eddf1f01ef9204f27b6d1ce8f1749439
Author: Roland Mainz <roland.mainz@nrubsig.org>
Date: Thu May 6 01:53:52 2004 +0000
Fix for http://pdx.freedesktop.org/cgi-bin/bugzilla/show_bug.cgi?id=551 -
PS DDX will not build on platforms with BuildFreeType NO. Patch by Alan
Coopersmith <alan.coopersmith@sun.com>.
commit b1c65e1ca6828ea82ee7790f22c26503b0a5e17d
Author: Roland Mainz <roland.mainz@nrubsig.org>
Date: Thu May 6 00:24:32 2004 +0000
Fix for http://pdx.freedesktop.org/cgi-bin/bugzilla/show_bug.cgi?id=536 -
RFE: PS output should contain the FreeType2 version being used.
commit 8d4f21ab53c44ca48501d6211ea6db0c0b8af916
Author: Eamon Walsh <ewalsh@epoch.ncsc.mil>
Date: Wed May 5 20:15:41 2004 +0000
Add XACE and XSELINUX extensions to the build system
commit 0106715000196c7b349a0b4494b61545f0f5e138
Author: Eamon Walsh <ewalsh@epoch.ncsc.mil>
Date: Wed May 5 20:07:37 2004 +0000
Modify XC-SECURITY and XC-APPGROUP extensions to work with XACE
commit 8526cd6395490b03b279f1962df777fb0e4a9878
Author: Eamon Walsh <ewalsh@epoch.ncsc.mil>
Date: Wed May 5 20:04:52 2004 +0000
Replace XC-SECURITY code with XACE security hooks
commit 6d066cb10990d951449b342b40dec1f1b1ae593c
Author: Eamon Walsh <ewalsh@epoch.ncsc.mil>
Date: Tue May 4 19:44:02 2004 +0000
Merge the new release from HEAD
commit b5f200ce9d495c6ce94e0170909465a30e8799d9
Author: Keith Packard <keithp@keithp.com>
Date: Tue May 4 03:28:06 2004 +0000
Attached is a patch to fix a build error whe ncompiling with tslib support,
a variable wasnt set, i just changed it to be like the other
MAkefile.ams :) -- Glenn McGrath <glennm@hydrix.com>
commit 5ca651e66f3d0ab189962bb4609b87a865364ef8
Author: Alexander Gottwald <alexander.gottwald@s1999.tu-chemnitz.de>
Date: Fri Apr 30 12:48:56 2004 +0000
file winmessages.h was initially added on branch CYGWIN.
commit 2c2c1704b542f29fe5ac9917e1141040a0dbd3e9
Author: Roland Mainz <roland.mainz@nrubsig.org>
Date: Thu Apr 29 23:59:15 2004 +0000
Fix for http://pdx.freedesktop.org/cgi-bin/bugzilla/show_bug.cgi?id=567 -
Xorg Xprt starts to consume 100% CPU when being idle for some time
(internal screensaver goes mad after 10mins)
commit a8429d76103ff0f4fc61db86201c741f91bfcba2
Author: Keith Packard <keithp@keithp.com>
Date: Wed Apr 28 07:26:46 2004 +0000
Add completely fake X server -- draws to allocated buffer, has no keyboard
or mouse.
commit 85e4e5445218d70f627fb132a8e8f18470e6749d
Author: Roland Mainz <roland.mainz@nrubsig.org>
Date: Mon Apr 26 11:07:03 2004 +0000
Work-in-progress for
http://pdx.freedesktop.org/cgi-bin/bugzilla/show_bug.cgi?id=542 - GLX
support for PS DDX / part #1: Fix visual setup (attachment #243)
commit 46472cbee679f9757c4003a0dcf158aeb3852f47
Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
Date: Mon Apr 26 02:39:58 2004 +0000
xc/config/cf/sun.cf
xc/config/cf/sv4Lib.rules
xc/programs/Xserver/Imakefile
xc/programs/Xserver/hw/xfree86/os-support/sunos/find_deps.pl Make Solaris
builds work when using MakeDllModules (it's not the default yet, but at
least it works now if you turn it on) Also improve default compiler,
optimizer, & linker flags for Solaris builds using either Sun cc or gcc
xc/programs/Xserver/cfb/Imakefile.inc
xc/programs/Xserver/cfb/stipsparc.s
xc/programs/Xserver/cfb/stipsprc32.s Remove text relocation error when
building shared versions
commit 36e3e5430e1ca7103a4e0b796eb3817975b40d90
Author: Roland Mainz <roland.mainz@nrubsig.org>
Date: Sun Apr 25 22:42:09 2004 +0000
Fix for http://pdx.freedesktop.org/cgi-bin/bugzilla/show_bug.cgi?id=541 -
Xorg Xprt may crash with "Freeing resource id=40200000 which isnt
there"
commit 2fb588620030ad393f8500d60e16144d59e4effe
Author: Egbert Eich <eich@suse.de>
Date: Fri Apr 23 19:54:30 2004 +0000
Merging XORG-CURRENT into trunk
commit 0664db19bf37f9dd69cca6adff4e238e310c3092
Author: Egbert Eich <eich@suse.de>
Date: Fri Apr 23 18:54:16 2004 +0000
Merging XORG-CURRENT into trunk
commit 68fd529608c58334f13beb88dbcc1d5db85b9b00
Author: Roland Mainz <roland.mainz@nrubsig.org>
Date: Wed Apr 21 23:24:20 2004 +0000
Fix for http://pdx.freedesktop.org/cgi-bin/bugzilla/show_bug.cgi?id=535 -
Xprt should not annouce extensions which are not supported
commit 1af13123fa79ad1c6747aad60ed458bbd69da12d
Author: Roland Mainz <roland.mainz@nrubsig.org>
Date: Wed Apr 21 10:03:41 2004 +0000
Fix for http://pdx.freedesktop.org/cgi-bin/bugzilla/show_bug.cgi?id=530 -
Land XPRINT branch on XORG-CURRENT
commit 449e83a9470ec4bdd0871e2f263f608b24455423
Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
Date: Sun Apr 18 03:00:43 2004 +0000
xc/lib/GL/glx/Imakefile
xc/lib/GL/mesa/src/Imakefile LargePICTable required for Solaris SPARC
builds
xc/programs/Xserver/hw/xfree86/drivers/glint/pm3_accel.c
xc/programs/Xserver/hw/xfree86/common/xf86Events.c Add != NULL to if
statements to get past syntax error reported by Sun Forte 6.1 cc.
xc/config/imake/imake.c
xc/config/cf/sun.cf
xc/config/cf/sunLib.tmpl Allow compiling with Sun compilers installed
somewhere other than /opt/SUNWspro
xc/programs/Xserver/hw/xfree86/common/compiler.h
xc/programs/Xserver/hw/xfree86/os-support/bus/Pci.h Check for
defined(sparc) as well as defined(__sparc__) since Sun compilers don't
define __sparc__
commit 425251a752805affb6ce14baa58d92c384f39501
Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
Date: Sat Apr 17 18:47:05 2004 +0000
Bugzilla #495: LocalClientCred should use getpeerucred on Solaris 10
commit 7215fb186f076a24d0a04c9c20ac9b92cae1f49b
Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
Date: Fri Apr 16 00:21:24 2004 +0000
xc/programs/Xserver/hw/xfree86/os-support/sunos/sun_mouse.c Solaris mouse
enhancements, including autoprobe support, VUID wheel mouse events, and
streams module pushing. Bugzilla #434. (Russ Blaine & Alan Coopersmith,
Sun Microsystems)
xc/programs/Xserver/hw/xfree86/os-support/sunos/sun_init.c Xorg doesn't
reset console to text mode on Solaris x86 8 and later Bugzilla #469.
commit c6c6d0de2309019999fa75a2f36a4f4a93ad2f31
Author: Egbert Eich <eich@suse.de>
Date: Thu Apr 15 10:17:35 2004 +0000
Merged changes from RELEASE-1 branch
commit 9d24a5fa91bf165bbd2048a844edeb59b5e34aad
Author: Harold L Hunt II <huntharo@msu.edu>
Date: Wed Apr 14 00:01:22 2004 +0000
file XWinrc.man was initially added on branch CYGWIN.
commit 01bb5eb5032a7566c86a51053146dba98a3ed749
Author: Roland Mainz <roland.mainz@nrubsig.org>
Date: Tue Apr 13 03:16:46 2004 +0000
file psout_ftpstype3.c was initially added on branch XPRINT.
commit cb3f3d8f2283d384dc5a3af3f38053cc8a2d192e
Author: Roland Mainz <roland.mainz@nrubsig.org>
Date: Tue Apr 13 03:16:46 2004 +0000
file psout_ft.c was initially added on branch XPRINT.
commit 7cfb4c2b33ae2147b5d6ddc2afc8b777686a666f
Author: Roland Mainz <roland.mainz@nrubsig.org>
Date: Tue Apr 13 03:16:46 2004 +0000
file psout_ftpstype1.c was initially added on branch XPRINT.
commit 4ae42e79d46d7db30f7b6f321bbb0d134862138d
Author: Roland Mainz <roland.mainz@nrubsig.org>
Date: Tue Apr 13 03:16:46 2004 +0000
file PsFTFonts.c was initially added on branch XPRINT.
commit b5fb71922b02024aa5a8f349c9d2c956e2f83f0f
Author: Roland Mainz <roland.mainz@nrubsig.org>
Date: Tue Apr 13 03:16:45 2004 +0000
file xprint.sh was initially added on branch XPRINT.
commit ca9a9a58be51a21f123b11dd68047034696cae84
Author: Roland Mainz <roland.mainz@nrubsig.org>
Date: Tue Apr 13 03:16:45 2004 +0000
file xprint.csh was initially added on branch XPRINT.
commit 7c1f840108172d6b18af47465ea72f4820640598
Author: Roland Mainz <roland.mainz@nrubsig.org>
Date: Tue Apr 13 03:16:45 2004 +0000
file cde_xsessiond_xprint.sh was initially added on branch XPRINT.
commit 579221198aeac7010435b29db1ad8fe9ee2d7c5d
Author: Roland Mainz <roland.mainz@nrubsig.org>
Date: Tue Apr 13 03:16:44 2004 +0000
file spooler.c was initially added on branch XPRINT.
commit 7677b4992fee7eb73cc97914163dcf689ad13d6a
Author: Roland Mainz <roland.mainz@nrubsig.org>
Date: Tue Apr 13 03:16:44 2004 +0000
file spooler.h was initially added on branch XPRINT.
commit d3907ca519b476c99e29a58c22258f22dbe63244
Author: Roland Mainz <roland.mainz@nrubsig.org>
Date: Tue Apr 13 03:16:44 2004 +0000
file document was initially added on branch XPRINT.
commit 3646bb9c894d5f011e2df4fac402118d8350102e
Author: Roland Mainz <roland.mainz@nrubsig.org>
Date: Tue Apr 13 03:16:39 2004 +0000
file spooltodir.sh was initially added on branch XPRINT.
commit 8c006df3c6d8e5ac95f0b0fa38a030100541598f
Author: Roland Mainz <roland.mainz@nrubsig.org>
Date: Tue Apr 13 03:16:39 2004 +0000
file model-config was initially added on branch XPRINT.
commit 95a84bc0cb809e5c7141d0411e329a3ec300b8aa
Author: Roland Mainz <roland.mainz@nrubsig.org>
Date: Tue Apr 13 03:16:38 2004 +0000
file ZapfDingbats.pmf was initially added on branch XPRINT.
commit 5527b39e668ea7a88c41186dbb6d7b66e892547a
Author: Roland Mainz <roland.mainz@nrubsig.org>
Date: Tue Apr 13 03:16:38 2004 +0000
file Times-Roman.pmf was initially added on branch XPRINT.
commit 69c405ac66b1a15076e247dd1b578b7b4b210b00
Author: Roland Mainz <roland.mainz@nrubsig.org>
Date: Tue Apr 13 03:16:38 2004 +0000
file Times-Italic.pmf was initially added on branch XPRINT.
commit b6b75f677292ed0c694921df0abf40038dd5e99d
Author: Roland Mainz <roland.mainz@nrubsig.org>
Date: Tue Apr 13 03:16:38 2004 +0000
file Times-BoldItalic.pmf was initially added on branch XPRINT.
commit 6605566bcf008551d33a9a68bd03e9a0c57c4f60
Author: Roland Mainz <roland.mainz@nrubsig.org>
Date: Tue Apr 13 03:16:38 2004 +0000
file Souvenir-LightItalic.pmf was initially added on branch XPRINT.
commit 38ad2972bffea1019214785ee479f7670ca70d1f
Author: Roland Mainz <roland.mainz@nrubsig.org>
Date: Tue Apr 13 03:16:38 2004 +0000
file Souvenir-Light.pmf was initially added on branch XPRINT.
commit 10d8eace174a9778a3313ac36a3422637b020d5f
Author: Roland Mainz <roland.mainz@nrubsig.org>
Date: Tue Apr 13 03:16:38 2004 +0000
file Souvenir-DemiItalic.pmf was initially added on branch XPRINT.
commit fb5ac8e2bdfe1217663679f5eae8045473456752
Author: Roland Mainz <roland.mainz@nrubsig.org>
Date: Tue Apr 13 03:16:38 2004 +0000
file NewCenturySchlbk-Roman.pmf was initially added on branch XPRINT.
commit 5ec311b05dc1e509c115ccca808ee05090cfddad
Author: Roland Mainz <roland.mainz@nrubsig.org>
Date: Tue Apr 13 03:16:38 2004 +0000
file NewCenturySchlbk-Italic.pmf was initially added on branch XPRINT.
commit 70947a8f1addf4ca17e50d9e6ae590266ac446cc
Author: Roland Mainz <roland.mainz@nrubsig.org>
Date: Tue Apr 13 03:16:38 2004 +0000
file Symbol.pmf was initially added on branch XPRINT.
commit 436ff77b21515cd9fe9732e0bd5361f2bfba44ed
Author: Roland Mainz <roland.mainz@nrubsig.org>
Date: Tue Apr 13 03:16:38 2004 +0000
file Times-Bold.pmf was initially added on branch XPRINT.
commit 4db563027844245d6c9085f997e75da743410885
Author: Roland Mainz <roland.mainz@nrubsig.org>
Date: Tue Apr 13 03:16:38 2004 +0000
file NewCenturySchlbk-Bold.pmf was initially added on branch XPRINT.
commit 79110faa2eac849756b859071ce68fba64de57aa
Author: Roland Mainz <roland.mainz@nrubsig.org>
Date: Tue Apr 13 03:16:38 2004 +0000
file NewCenturySchlbk-BoldItalic.pmf was initially added on branch XPRINT.
commit 4e1ae7e9cc04806f4436759764cc680ecf1f014c
Author: Roland Mainz <roland.mainz@nrubsig.org>
Date: Tue Apr 13 03:16:38 2004 +0000
file Souvenir-Demi.pmf was initially added on branch XPRINT.
commit 433913bacf988908b94c420452c042eebcb381ac
Author: Roland Mainz <roland.mainz@nrubsig.org>
Date: Tue Apr 13 03:16:38 2004 +0000
file LubalinGraph-Demi.pmf was initially added on branch XPRINT.
commit d5bae63138ab833fdd56bb983436ac514536d7b6
Author: Roland Mainz <roland.mainz@nrubsig.org>
Date: Tue Apr 13 03:16:38 2004 +0000
file LubalinGraph-DemiOblique.pmf was initially added on branch XPRINT.
commit 3acd6856617e784ee30333dc9b779189a3f44052
Author: Roland Mainz <roland.mainz@nrubsig.org>
Date: Tue Apr 13 03:16:38 2004 +0000
file LubalinGraph-Book.pmf was initially added on branch XPRINT.
commit 5f73192458136fe4b6b82372c3b1653fbf831ebd
Author: Roland Mainz <roland.mainz@nrubsig.org>
Date: Tue Apr 13 03:16:38 2004 +0000
file Helvetica.pmf was initially added on branch XPRINT.
commit e129abc3bf269e857aa65065cc18a31a56ba0373
Author: Roland Mainz <roland.mainz@nrubsig.org>
Date: Tue Apr 13 03:16:38 2004 +0000
file Helvetica-Oblique.pmf was initially added on branch XPRINT.
commit 576a4cddf995082d10e2e29e1b58c1564eb11ee7
Author: Roland Mainz <roland.mainz@nrubsig.org>
Date: Tue Apr 13 03:16:38 2004 +0000
file Helvetica-BoldOblique.pmf was initially added on branch XPRINT.
commit cf26c87833a79427b665abce67ca19f2b68bc8e5
Author: Roland Mainz <roland.mainz@nrubsig.org>
Date: Tue Apr 13 03:16:38 2004 +0000
file Helvetica-Bold.pmf was initially added on branch XPRINT.
commit a091408c372a2aa89fb83b023248f45aa8cd4173
Author: Roland Mainz <roland.mainz@nrubsig.org>
Date: Tue Apr 13 03:16:38 2004 +0000
file Courier.pmf was initially added on branch XPRINT.
commit 9e4221d08ff9a408fb25a32887390b14788b1558
Author: Roland Mainz <roland.mainz@nrubsig.org>
Date: Tue Apr 13 03:16:38 2004 +0000
file Courier-Oblique.pmf was initially added on branch XPRINT.
commit 6b2674078079a5959a2b7758e6c628a14ec1a46c
Author: Roland Mainz <roland.mainz@nrubsig.org>
Date: Tue Apr 13 03:16:38 2004 +0000
file Courier-BoldOblique.pmf was initially added on branch XPRINT.
commit 6aee2d37b95170a65ee08c0866c425f115ebc9f1
Author: Roland Mainz <roland.mainz@nrubsig.org>
Date: Tue Apr 13 03:16:38 2004 +0000
file LubalinGraph-BookOblique.pmf was initially added on branch XPRINT.
commit 7a59fe1dd987e1ef0abd92e0ac80dd87a15137fe
Author: Roland Mainz <roland.mainz@nrubsig.org>
Date: Tue Apr 13 03:16:38 2004 +0000
file AvantGarde-Demi.pmf was initially added on branch XPRINT.
commit 22e0316acc8992033fc82a38f663fce130e4031b
Author: Roland Mainz <roland.mainz@nrubsig.org>
Date: Tue Apr 13 03:16:38 2004 +0000
file AvantGarde-DemiOblique.pmf was initially added on branch XPRINT.
commit f8aded3a7f8c97731e33b4362243da947fb4e774
Author: Roland Mainz <roland.mainz@nrubsig.org>
Date: Tue Apr 13 03:16:38 2004 +0000
file AvantGarde-Book.pmf was initially added on branch XPRINT.
commit 2224187c05d4dc05f7e03e22307cf7816d69f789
Author: Roland Mainz <roland.mainz@nrubsig.org>
Date: Tue Apr 13 03:16:38 2004 +0000
file AvantGarde-BookOblique.pmf was initially added on branch XPRINT.
commit 9eafaaf83294d1988b30bde4485a299cf8ae5035
Author: Roland Mainz <roland.mainz@nrubsig.org>
Date: Tue Apr 13 03:16:38 2004 +0000
file Courier-Bold.pmf was initially added on branch XPRINT.
commit f9eea9864e333efde97143278916da44639cc18a
Author: Roland Mainz <roland.mainz@nrubsig.org>
Date: Tue Apr 13 03:16:38 2004 +0000
file ps2pdf_spooltodir.sh was initially added on branch XPRINT.
commit 20248eedd69c42c27605d7bcfb265994f5846f17
Author: Franco Catrin L <fcatrin@tuxpan.com>
Date: Sun Apr 11 16:39:48 2004 +0000
fixed Changelog format
commit bc7168ee763ffac9cbb992096a53b346cd640a13
Author: Franco Catrin L <fcatrin@tuxpan.com>
Date: Sun Apr 11 16:24:03 2004 +0000
Added ROP
commit 784d37ee369b94c83c4cc6e280a39f32da8aa678
Author: Franco Catrin L <fcatrin@tuxpan.com>
Date: Sun Apr 11 15:51:04 2004 +0000
Fixed size calculation in solid rendering
commit 056322336cbb6093d74aa9d22bbfd42e2248a16a
Author: Franco Catrin L <fcatrin@tuxpan.com>
Date: Sun Apr 11 15:20:17 2004 +0000
Basic bitblt implementation
commit c231856a1343e38381e1b4e545ff1ac279141bf0
Author: Franco Catrin L <fcatrin@tuxpan.com>
Date: Sun Apr 11 00:53:10 2004 +0000
First acceleration function implemented (DrawSolid)
commit 47436a8af82a00d0d392cef4d5906729d9a37649
Author: Franco Catrin L <fcatrin@tuxpan.com>
Date: Sun Apr 11 00:15:57 2004 +0000
Finnally got MMIO working all timecat ChangeLog cat ChangeLog cat ChangeLog
:-D
commit 1740b938e4c4f1cd3de700ea26143b01c0312325
Author: Franco Catrin L <fcatrin@tuxpan.com>
Date: Tue Apr 6 18:09:44 2004 +0000
Return back to VESA only version
commit 07bc231872e7e056fa3049a0fcd963c61f826f80
Author: Franco Catrin L <fcatrin@tuxpan.com>
Date: Mon Apr 5 18:19:34 2004 +0000
small fixes, but still can't get this driver woking again
commit b526276faa765df893197e04370a915ed73947dc
Author: Brent Cook <busterbcook@yahoo.com>
Date: Mon Apr 5 02:52:35 2004 +0000
removed hardcoded vesa references so we can operate with any backend. fbdev
works for initializing the screen, but input fails shortly after.
commit 920e6ff81baeec16465f81bacbcff711ce82e149
Author: Brent Cook <busterbcook@yahoo.com>
Date: Sun Apr 4 07:30:07 2004 +0000
Begin separating VESA calls into a more generic backend wrapper like the
ati driver, cascading between VESA and FBDEV. We only have init
functions done so far; need to add all of the others. Fixed some
compiler warnings. Whitespace and formatting cleanups (using 4 spaces,
no tabs)
commit 530371ceaf7f593badf38bbc2d2e50f6a920d24f
Author: Brent Cook <busterbcook@yahoo.com>
Date: Sat Apr 3 22:26:37 2004 +0000
added touchscreen support, detect all known PCI chips in the Neomagic line.
We'll not bother with ISA for now.
commit 962b898868dcab959c390986dcb0b4dd750dc107
Author: Brent Cook <busterbcook@yahoo.com>
Date: Sat Apr 3 22:22:48 2004 +0000
initial import of original driver by Franco Catrin L. Wraps VESA for most
parts, with some hardware acceleration enabled for the cursor on the
NM2300.
commit 8a2fce3b90b5efc8bab19675cb8e02690e24442e
Author: Harold L Hunt II <huntharo@msu.edu>
Date: Sat Apr 3 05:01:21 2004 +0000
file winkeyhook.c was initially added on branch CYGWIN.
commit 12d5371ed2fbefab069dea46be972a7269b8c2db
Author: Stuart Kreitman <stuart.kreitman@sun.com>
Date: Tue Mar 30 18:31:54 2004 +0000
file xfixes.h was initially added on branch DAMAGE-XFIXES.
commit a4b319dbf375461c975450659723e6326153e536
Author: Stuart Kreitman <stuart.kreitman@sun.com>
Date: Tue Mar 30 18:31:54 2004 +0000
file xfixes.c was initially added on branch DAMAGE-XFIXES.
commit 5319d30d45d5f8ec04a496327f32cc6431c6a511
Author: Stuart Kreitman <stuart.kreitman@sun.com>
Date: Tue Mar 30 18:31:54 2004 +0000
file select.c was initially added on branch DAMAGE-XFIXES.
commit 76f247bd0ef23d688028c63b5f8bd3e9ad6b1b45
Author: Stuart Kreitman <stuart.kreitman@sun.com>
Date: Tue Mar 30 18:31:54 2004 +0000
file saveset.c was initially added on branch DAMAGE-XFIXES.
commit 83f0f1babb612774f609c71879a225c43f63ac1f
Author: Stuart Kreitman <stuart.kreitman@sun.com>
Date: Tue Mar 30 18:31:54 2004 +0000
file cursor.c was initially added on branch DAMAGE-XFIXES.
commit 52bc7693dbe7e3db916f8d463d9a750e3c6ffa4d
Author: Stuart Kreitman <stuart.kreitman@sun.com>
Date: Tue Mar 30 18:31:54 2004 +0000
file region.c was initially added on branch DAMAGE-XFIXES.
commit 5d9098cb17cd88cfdf49de92bec2a787d6681649
Author: Stuart Kreitman <stuart.kreitman@sun.com>
Date: Tue Mar 30 18:31:54 2004 +0000
file xfixesint.h was initially added on branch DAMAGE-XFIXES.
commit ace9aa7c45ff2ea6b3476006574da5c27d05afd4
Author: Stuart Kreitman <stuart.kreitman@sun.com>
Date: Tue Mar 30 17:41:24 2004 +0000
file damage.c was initially added on branch DAMAGE-XFIXES.
commit 72dc7569c6bbc216f613be21ea4f79d3ef1d5534
Author: Stuart Kreitman <stuart.kreitman@sun.com>
Date: Tue Mar 30 17:41:24 2004 +0000
file damage.h was initially added on branch DAMAGE-XFIXES.
commit 95da7b7e061b6925d8cd85bc7b25708ff253fcb1
Author: Stuart Kreitman <stuart.kreitman@sun.com>
Date: Tue Mar 30 17:41:24 2004 +0000
file damagestr.h was initially added on branch DAMAGE-XFIXES.
commit 629c3792225cec28572081ebc8dda3fd803fe616
Author: Egbert Eich <eich@suse.de>
Date: Tue Mar 30 14:23:15 2004 +0000
36. Conversion: __AMD64__ > __amd64__ (Egbert Eich).
35. Fixed stretching option and centering in C&T driver (Egbert Eich).
34. Added support for memory size tweaking in BIOS for i845 (Egbert Eich,
thanks to Christian Ziez)
33. Removed video playback dependency on Accel in NSC drivers (Egbert
3Eich).
32. Fix HW cursor state on Savage driver when entering VT as some BIOSes
seem to enable it unconditionally (Egbert Eich).
31. Fixed Emulate3Button message to distinguish between 'hard' (ie.
configured) and 'soft' (ie. automatic emulation that is disabled as
soon as the middle button is pressed) (Egbert Eich).
30. Free XrmDB in XCloseDisplay() only when implicitely allocated by
XGetDefaults(). If Client allocates it itself it should free it also.
Trying to free it for the client may result in segfault if the client
has already freed it (Egbert Eich).
commit b5e400867feab935aa04e9aadb12deb0601b7f83
Author: Egbert Eich <eich@suse.de>
Date: Tue Mar 30 14:14:31 2004 +0000
- backing out XFIXES and DAMAGE related code that accidentally went in
here.
commit 0017ddaa6406524d0a86ff7020eed4c33758ddbd
Author: Stuart Kreitman <stuart.kreitman@sun.com>
Date: Tue Mar 30 02:16:15 2004 +0000
file damageextint.h was initially added on branch DAMAGE-XFIXES.
commit 4b5112fd0593b34e6e096d88b0841a28636600f6
Author: Stuart Kreitman <stuart.kreitman@sun.com>
Date: Tue Mar 30 02:16:15 2004 +0000
file damageext.c was initially added on branch DAMAGE-XFIXES.
commit 733bfa4b5dd5255713a98f390a1fb65be6e16c2d
Author: Stuart Kreitman <stuart.kreitman@sun.com>
Date: Tue Mar 30 02:16:15 2004 +0000
file damageext.h was initially added on branch DAMAGE-XFIXES.
commit b1ed473ef2e1da99d7fe3df14fdef4d8b6365626
Author: Harold L Hunt II <huntharo@msu.edu>
Date: Tue Mar 30 00:31:28 2004 +0000
file winrandr.c was initially added on branch CYGWIN.
commit fec5095bdfb376d0046e2f52188c68bef4e31fd7
Author: Keith Packard <keithp@keithp.com>
Date: Sun Mar 28 07:14:30 2004 +0000
file xorgcfg.man was initially added on branch XORG-RELEASE-1-TM.
commit 136a9364be80f407f498e9e9695cadaab39227ad
Author: Keith Packard <keithp@keithp.com>
Date: Sun Mar 28 07:14:30 2004 +0000
file XOrgCfg.cpp was initially added on branch XORG-RELEASE-1-TM.
commit 881afb356d6992bcfbbfcbdf31f1f71c64d648da
Author: Keith Packard <keithp@keithp.com>
Date: Sat Mar 27 17:01:11 2004 +0000
file Xorg.man was initially added on branch XORG-RELEASE-1-TM.
commit d2119ac7c56ba94db1d8639937b13e72288a328c
Author: Keith Packard <keithp@keithp.com>
Date: Sat Mar 27 17:01:11 2004 +0000
file xorg.conf.man was initially added on branch XORG-RELEASE-1-TM.
commit 5a9f3a36a35549f30fc67a8e3a3e9a201efb91ec
Author: Egbert Eich <eich@suse.de>
Date: Fri Mar 26 20:02:03 2004 +0000
file xorgHelper.c was initially added on branch XORG-RELEASE-1-TM.
commit b2b0e70fe5c65c8f2d518f5f0ce89a86938701ed
Author: Egbert Eich <eich@suse.de>
Date: Fri Mar 26 19:54:39 2004 +0000
file xorgconf.cpp was initially added on branch XORG-RELEASE-1-TM.
commit 83880dd464a415d3d0efa546b1f0b9887342e809
Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
Date: Fri Mar 26 17:11:49 2004 +0000
29. XkbWriteRulesProp fails if XkbRulesFile is NULL. Bug #376. (Alan
Coopersmith)
commit 861a33678243349b987ff30912985968ede8ac84
Author: Stuart Kreitman <stuart.kreitman@sun.com>
Date: Fri Mar 26 01:22:18 2004 +0000
oops
commit 23d552bbef2984afee889f82ded154478548ee15
Author: Egbert Eich <eich@suse.de>
Date: Thu Mar 25 11:00:52 2004 +0000
file xorg.cfg was initially added on branch XORG-RELEASE-1-TM.
commit d1e52f13ad4610ec4907432c21384d08d6aaaf27
Author: Stuart Kreitman <stuart.kreitman@sun.com>
Date: Thu Mar 25 05:11:16 2004 +0000
oops
commit f0336f18ee4106050104cb060c38fe87541615da
Author: Stuart Kreitman <stuart.kreitman@sun.com>
Date: Thu Mar 25 03:45:49 2004 +0000
built,working DAMAGE/XFIXES in mono tree
commit f1394ec3cec09ff9c5fbbff3c1f595a642b25f91
Author: Torrey Lyons <torrey@mrcla.com>
Date: Wed Mar 24 22:15:25 2004 +0000
Change XFree86 Project to X.Org Foundation in localized XDarwin splash
screens.
commit d2bbcc0deed3a607d347ed4ef07ded9bcb44f1bb
Author: Torrey Lyons <torrey@mrcla.com>
Date: Wed Mar 24 22:12:34 2004 +0000
Change XFree86 Project to X.Org Foundation in XDarwin splash screen.
commit 84d25a5e178835234261a63f0a1b8131c01bbe1f
Author: Egbert Eich <eich@suse.de>
Date: Wed Mar 24 15:58:45 2004 +0000
file xorgVersion.h was initially added on branch XORG-RELEASE-1-TM.
commit 685d1630c1540e29644849254bd45708aa5763bb
Author: Egbert Eich <eich@suse.de>
Date: Tue Mar 23 12:46:30 2004 +0000
file xorgconfig.man was initially added on branch XORG-RELEASE-1-TM.
commit 6631bd586f74f89e2dce74fe1cc25ee982883323
Author: Egbert Eich <eich@suse.de>
Date: Tue Mar 23 12:46:30 2004 +0000
file xorgconfig.c was initially added on branch XORG-RELEASE-1-TM.
commit 05a16f4acce3b6ef4ddafe044f96774de3f75b7c
Author: Alexander Gottwald <alexander.gottwald@s1999.tu-chemnitz.de>
Date: Mon Mar 22 13:43:35 2004 +0000
file glwindows.h was initially added on branch CYGWIN.
commit 3c2e2d9ae0704931737bb0879a49a8575a07d13b
Author: Kaleb Keithley <kaleb@freedesktop.org>
Date: Sun Mar 21 22:55:35 2004 +0000
bug #357. Fix XDarwin so it builds on Mac OS X 10.2 and earlier. Merged
down from -RELEASE-1-TM and -RELEASE-1
commit 122be5328ffea0a3b92612b8ea0f5b02736ac175
Author: Kaleb Keithley <kaleb@freedesktop.org>
Date: Fri Mar 19 23:16:06 2004 +0000
no bug report. Restore Credits to the hw/darwin ddx that were deleted
previously. RTF may or may not be "human readable," but with a little
effort it's about as readable as SGML, IMNSHO.
commit 551c93da612923f8d32707adc16431979bad6fb0
Author: Harold L Hunt II <huntharo@msu.edu>
Date: Mon Mar 15 04:33:23 2004 +0000
file winkeynames.h was initially added on branch CYGWIN.
commit 0c97b290015186acbaadae9a9bf79f37c3d38b40
Author: Harold L Hunt II <huntharo@msu.edu>
Date: Mon Mar 15 04:33:23 2004 +0000
file winkeymap.h was initially added on branch CYGWIN.
commit dae90c3af98edd5e95289abd930b3872c996c503
Author: Egbert Eich <eich@suse.de>
Date: Sun Mar 14 08:34:49 2004 +0000
Importing vendor version xf86-4_4_99_1 on Sun Mar 14 00:26:39 PST 2004
commit 4e996f9d76f51e9b1e33bef610bb9c2a746c8b9c
Author: Alexander Gottwald <alexander.gottwald@s1999.tu-chemnitz.de>
Date: Fri Mar 12 21:05:47 2004 +0000
file winpriv.c was initially added on branch CYGWIN.
commit c79b4bfd15534de12aaf8eca9965403b4913ca4b
Author: Alexander Gottwald <alexander.gottwald@s1999.tu-chemnitz.de>
Date: Fri Mar 12 21:05:47 2004 +0000
file winpriv.h was initially added on branch CYGWIN.
commit 24c02f84cc31475bfba27417dfef66b11c09b25c
Author: Harold L Hunt II <huntharo@msu.edu>
Date: Fri Mar 12 01:11:23 2004 +0000
file X-boxed.ico was initially added on branch CYGWIN.
commit 45b638b87f0daf94f9fce566179775fb2889c663
Author: Daniel Stone <daniel@fooishbar.org>
Date: Wed Mar 10 11:49:11 2004 +0000
Twenty link errors for Xizzle now - count 'em. 20.
Get rid of all references to SCO.
Change SDK include dir to $(includedir)/xizzle. Add SDK libs where
necessary.
Reformat to be nicer and easier to shuffle around; also, fix lib ordering
so we get so much closer to the elusive final link. Shuffle
common/xf86Init.c into libxizzle.a.
Fix a couple of early snafus - s/BUILDXI/XINPUT/, et al; make the SDK stuff
conditional as needed; fix the SBus includes.
Name library os-support/libxizzleos.a, not os-support/foo/libxizzlefoo.a.
Clean up ARCH_SOURCES so it's always initialised to something.
Move linked libraries to _LIBADD, which somehow escaped my attention. Make
inclusion of drm/libxizzlelinuxdrm.a dependent on DRI.
s/VERSION/VBE_VERSION/;
Axe this redundant dir.
All Xizzle-specific: axe hw/xizzle/Xi, shuffle link order, fix list of
required modules to be vaguely sane, add some pertinent libs/incs.
commit 519f76a0867fb2711d311b7929632408c3633e37
Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
Date: Sun Mar 7 23:45:10 2004 +0000
24. Update license for Xinerama code from DEC to the version requested by
Compaq for X11R6.5.1 that allows redistribution without written
permission from DEC. Originally X.org Defect #9263. freedesktop.org
bugzilla #283. (Alan Coopersmith)
commit 505fe2ba307e9270627ca7f3cb6b4e1dbacc327b
Author: Egbert Eich <eich@suse.de>
Date: Fri Mar 5 13:41:12 2004 +0000
23. Merged with XFree86 4.4.0. Added changes that went into infected files.
Reverted darwin/bundle/**/Credits.rtf to XFree86 versions to avoid
future conflicts on ASCII but not humal readable files. (There should
probably be separate CreditsXorg.rtf files) (Egbert Eich).
commit 1b22db1ebcf1ba98ca8519fa38210e275373f8f6
Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
Date: Thu Mar 4 02:13:09 2004 +0000
21. X server crashes when X-Resource has to byte-swap. Sun bug #5007488.
freedesktop.org bugzilla #267. (Alan Coopersmith)
commit 47c9395969593a4e897e8c8110d5f2414e47b06a
Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
Date: Wed Mar 3 17:03:46 2004 +0000
file solaris-ia32.S was initially added on branch XORG-CURRENT.
commit ed066cc67b1fca03fb38c80ecb8194b5b40963be
Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
Date: Wed Mar 3 17:03:46 2004 +0000
Enable inlining of assembly functions for inX/outX on Solaris 8 with Sun
compilers
commit 867451f1ab7b9870621725bd4be3dd8694c364b8
Author: Egbert Eich <eich@suse.de>
Date: Wed Mar 3 12:12:50 2004 +0000
Importing vendor version xf86-4_4_0 on Wed Mar 3 04:09:24 PST 2004
commit 2934f0731b3d2bc9c1e25ceab26d9e0d9cadb054
Author: Harold L Hunt II <huntharo@msu.edu>
Date: Tue Mar 2 20:00:16 2004 +0000
file winvalargs.c was initially added on branch CYGWIN.
commit f72efebf280547c80ff7010e32f56416e7121164
Author: Harold L Hunt II <huntharo@msu.edu>
Date: Tue Mar 2 19:26:34 2004 +0000
Replace a handful of calls to ErrorF and exit(1) with a single call to
FatalError. These direct calls to exit(1) made it impossible to do
anything ddx-specific in these cases; note that most of these calls
occur during argument processing.
commit 7557d4da10cc482fcec40acadf7744b04c1615a0
Author: Kaleb Keithley <kaleb@freedesktop.org>
Date: Tue Mar 2 19:00:06 2004 +0000
bug #230 Revert to Xinerama 1.1 In order to make a "quick" release it has
been decided that the priority is to preserve the server's internal
API/ABI so that third-party drivers that depend on symbols like
noPanoramiXExtension, etc., would not need to be recompiled. Toobad gcc
on Linux doesn't support ELF's weak symbols as that would have been a
reasonable solution for preserving the ABI. N.B.: While symbols, i.e.
functions and variables revert to the old name, I did not revert build
names, i.e. -DXINERAMA, to the old -DPANORAMIX. There was no need, and
it's just a build issue that has no impact on the binary output of the
build.
commit 215a13aa8f537dcb62b0a2f6d335901ee47e9e9b
Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
Date: Mon Mar 1 16:38:20 2004 +0000
Add the .stab.indexstr section produced by Sun's compilers to the list of
SHT_STRTAB sections with debug information to ignore when loading ELF
objects.
commit d87b05563dc13ba8d9825ec3bb772702dce6c9fe
Author: Harold L Hunt II <huntharo@msu.edu>
Date: Mon Mar 1 03:33:28 2004 +0000
file indirect.c was initially added on branch CYGWIN.
commit f81d63ec5396c8d7f62ddd6ff6bab10b32493264
Author: Kaleb Keithley <kaleb@freedesktop.org>
Date: Sun Feb 29 20:11:11 2004 +0000
bug #240 Instead of both Meta keys generating Meta_L, and both Alt keys
generating Alt_L, etc, fix the implementation so that you get Meta_L
for the left Meta key and Meta_R for the right Meta key. Ditto for Alt,
Control, and Shift.
commit 6c412a43e42538a51d3a4d92a6db12b0b6cf0e9b
Author: Jaymz Julian <jaymz@artificial-stupidity.net>
Date: Sat Feb 28 09:47:55 2004 +0000
sdl x server so that we can x-on-x the fb stuff for ease of debugging. if
anyone uses this in production, a big scary monster will eat them. hrm,
perhaps i should make it have a --i-know-what-i'm-doing param that it
doens't start without, heh
commit bb93fef9877a885da2c6108410155fa996b19abf
Author: Kaleb Keithley <kaleb@freedesktop.org>
Date: Fri Feb 27 19:35:49 2004 +0000
bug #238 test for root-window that XFree86 fixed in their
programs/Xserver/Xext/shm.c
3.37 and programs/Xserver/Xext/xvdisp.c 1.26 got zapped when Xinerama2 was
merged into the tree. (Xinerama has since been reverted to 1.1, but
that's another story.)
commit cb718ce08eb25c3999c91b8d614fb88237fad03d
Author: Kaleb Keithley <kaleb@freedesktop.org>
Date: Fri Feb 27 16:17:12 2004 +0000
Revert to Xinerama 1.1 In order to make a "quick" release it has been
decided that the priority is to preserve the server's internal API/ABI
so that third-party drivers that depend on symbols like
noPanoramiXExtension, etc., would not need to be recompiled. Toobad gcc
on Linux doesn't support ELF's weak symbols as that would have been a
reasonable solution for preserving the ABI. N.B.: While symbols, i.e.
functions and variables revert to the old name, I did not revert build
names, i.e. -DXINERAMA, to the old -DPANORAMIX. There was no need, and
it's just a build issue that has no impact on the binary output of the
build.
commit df0313d35bc89abe9374ed25533db283430716e0
Author: Egbert Eich <eich@suse.de>
Date: Thu Feb 26 13:36:15 2004 +0000
readding XFree86's cvs IDs
commit 147aae87fde5edeed395f77e60f0f8e812d3b6af
Author: Egbert Eich <eich@suse.de>
Date: Thu Feb 26 09:23:53 2004 +0000
Importing vendor version xf86-4_3_99_903 on Wed Feb 26 01:21:00 PST 2004
commit 8844423f890194bcb0419a38249029f1997c8c66
Author: Stuart Kreitman <stuart.kreitman@sun.com>
Date: Wed Feb 25 23:28:43 2004 +0000
file xevie.c was initially added on branch XEVIE.
commit b052486adb9ea26f37be120966eb60cd3ac3db2f
Author: Kaleb Keithley <kaleb@freedesktop.org>
Date: Wed Feb 25 21:47:10 2004 +0000
bug #230 Revert to Xinerama 1.1 In order to make a "quick" release it has
been decided that the priority is to preserve the server's internal
API/ABI so that third-party drivers that depend on symbols like
noPanoramiXExtension, etc., would not need to be recompiled. Too bad
gcc on Linux doesn't support ELF's weak symbols as that would have been
a reasonable solution for preserving the ABI. N.B.: While symbols, i.e.
functions and variables revert to the old name, I did not revert build
names, i.e. -DXINERAMA, to the old -DPANORAMIX. There was no need, and
it's just a build issue that has no impact on the binary output of the
build.
commit 14ab4ade74e946c09d633b15ab4d447d7b69ea29
Author: Kaleb Keithley <kaleb@freedesktop.org>
Date: Tue Feb 24 15:22:40 2004 +0000
bug #214. Merge most of 4.4RC3
commit 9343c8f5ac180043c29ead5e83a3efef16d7b3f2
Author: Kaleb Keithley <kaleb@freedesktop.org>
Date: Tue Feb 24 15:16:35 2004 +0000
bug #188, #214, see versions 1.1.4.3 and 1.1.4.4 of this file. fix bad
merge
commit 03d893bff9bf5d6be9663a21cc983873d8e8d4c7
Author: Kaleb Keithley <kaleb@freedesktop.org>
Date: Mon Feb 23 21:37:29 2004 +0000
merge most of XFree86 RC3 (4.3.99.903) from vendor branch. bug #214
commit 4ee0a53de870192d57c02baffa106b10bae6e0bf
Author: Kaleb Keithley <kaleb@freedesktop.org>
Date: Mon Feb 23 20:35:22 2004 +0000
Import most of XFree86 4.4RC3. This import excludes files which have the
new license. If we want to, later we can import 4.4RC3 again and pick
up the files that have the new license, but for now the vendor branch
is "pure."
commit dcdd47ebbd4e9b5f4cbb598a5217004df0e80844
Author: Kaleb Keithley <kaleb@freedesktop.org>
Date: Mon Feb 23 20:35:19 2004 +0000
Initial revision
commit 30ac3efde2c3f08b98f31833df4ea7d87f33b092
Author: Kaleb Keithley <kaleb@freedesktop.org>
Date: Mon Feb 23 16:32:14 2004 +0000
bug #188 report bugs to X.org bugzilla, not XFree86
commit d52f3ac58fd596fca392394f16acff84115f6e1d
Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
Date: Wed Feb 18 21:43:19 2004 +0000
Additional fixes to allow building with Sun compilers on Solaris x86
commit 07109fd63e0999905e6f7df8fd7f9c713d0dc2cc
Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
Date: Wed Feb 18 21:30:12 2004 +0000
Sun cc on Solaris x86 defines __i386 but not __i386__ so the x86
architecture #ifdef should accept either form
commit a27ffd2678ef76453c4fa27932462425d804df6d
Author: Warren Turkal <wt@penguintechs.com>
Date: Wed Feb 18 02:12:44 2004 +0000
completely get rid of NeedNestedPrototypes
completely get rid of NeedVarargsPrototypes
remove a lot of NeedFunctionPrototypes
ansify many function declarations
commit d17586c4dc858d0127fa021e6db62f8cc28ef7a6
Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
Date: Mon Feb 16 20:19:59 2004 +0000
[fd.o bugzilla #189] _XOPEN_SOURCE defines break builds on Solaris Express
commit b146ef1548d36d6897fbd674f1c3b8324bed11a7
Author: Warren Turkal <wt@penguintechs.com>
Date: Sun Feb 15 15:04:57 2004 +0000
Moving toward a working input extension.
commit e90274c2bba1f66a68c2bc30ddb589dbf6fa0929
Author: Egbert Eich <eich@suse.de>
Date: Wed Feb 11 19:29:37 2004 +0000
2. Fixing segfaults that may happen in some corner cases when VT switching
and during int10 initialization (Egbert Eich).
commit 453a0743eb524da88dd364ccac86f35e61899e64
Author: Kaleb Keithley <kaleb@freedesktop.org>
Date: Sun Feb 8 00:17:31 2004 +0000
revert to RC1 version of file with the license we like
commit d6f33d897221450f3cfcc1162e2a6d09b227326e
Author: Kaleb Keithley <kaleb@freedesktop.org>
Date: Sun Feb 8 00:12:27 2004 +0000
revert to RC1 version of the file with the license we like
commit bd20c8d340fce0700ae813bd5b55fe7f4b9e0c98
Author: Jaymz Julian <jaymz@artificial-stupidity.net>
Date: Thu Feb 5 09:09:51 2004 +0000
Polling input mode for the kdrive os layer. And a moose!
commit af798d27743dbc4f70e85e297daa5863ec89640b
Author: Jaymz Julian <jaymz@artificial-stupidity.net>
Date: Wed Feb 4 16:08:27 2004 +0000
More NULL checks. These ones are more useful than the last (which just made
debugging a bunch of problems easier), since you can implement less in
the basic simplest case driver now (not that i'm lazy, mind :-p)
commit 3c64b65d805915e5c5628663113c54c3e9c3013b
Author: Egbert Eich <eich@suse.de>
Date: Thu Jan 29 08:08:57 2004 +0000
Importing vendor version xf86-012804-2330 on Thu Jan 29 00:06:33 PST 2004
commit 2ec70aa70133190ad31a83114fdb9a218e6aa8e6
Author: Eric Anholt <anholt@freebsd.org>
Date: Sun Jan 25 05:31:24 2004 +0000
Disable GLX visuals code on !GLXEXT, and remove a useless prototype.
commit 01e9cc858ac646b3140d1d85ea9c069bc708fb28
Author: Eric Anholt <anholt@freebsd.org>
Date: Sun Jan 25 01:30:33 2004 +0000
- Add glx visuals code based on XFree86's Radeon driver.
- Reserve areas for back/depth/span when USING_DRI && GLXEXT. This would be
better in a TransitionTo3d, but we'd need to work with the offscreen
memory manager for that.
- Misc. fixes to ati_dri.c for DRI+GLX. Needs more work still.
commit f2bedd17af7c3b9241c02dc1c899f32fc0cd2f10
Author: Eric Anholt <anholt@freebsd.org>
Date: Sun Jan 25 01:16:19 2004 +0000
Oops, turn fallback output back off.
commit 26c5a8dfdd2aa09db46c4cf963ca697df3e777ef
Author: Eric Anholt <anholt@freebsd.org>
Date: Sun Jan 25 01:04:12 2004 +0000
Whitespace cleanup.
commit 6870c081572fcf32997e7906a54d09da0ca58ac3
Author: Keith Packard <keithp@keithp.com>
Date: Thu Jan 15 09:19:56 2004 +0000
Oops, lost a diff needed for the non-screen format pixmap code
commit 3867e03cb63e49aeb1742a8a4bdaed0b7a23749e
Author: Keith Packard <keithp@keithp.com>
Date: Thu Jan 15 09:15:53 2004 +0000
Fix up some mis-used variable names
commit f233bbf3652327e62e03efbb8a355e6af2703a1c
Author: Keith Packard <keithp@keithp.com>
Date: Thu Jan 15 09:13:01 2004 +0000
Accelerate non-screen format pixmaps.
commit 751fb0374b12679f63c922adf0f0e7cadd83d861
Author: Harold L Hunt II <huntharo@msu.edu>
Date: Thu Jan 15 06:06:44 2004 +0000
file winresource.h was initially added on branch CYGWIN.
commit a265167f19e37aec2173c0ca6c9955450aa69941
Author: Anders Carlsson <andersca@gnome.org>
Date: Wed Jan 14 10:00:00 2004 +0000
Add IPAQ modeline by Dennis Noordsij.
commit 6c97b277d9140b9d6bca047c56e303f6fc1d92e0
Author: Eric Anholt <anholt@freebsd.org>
Date: Sun Jan 11 00:10:34 2004 +0000
Support 1x1 repeat sources in R128's Blend.
commit 92702565657d48f1fcc2bae1b5989b1d6d3dd164
Author: Eric Anholt <anholt@freebsd.org>
Date: Fri Jan 9 08:43:48 2004 +0000
Change PCI ID information field to be one of r128, r100, r200, r300. This
is all the information we need so far. Put that information into atic,
and use it correctly in the code (unlike before).
commit 5d51dfc69cb245f6a1c7b106954a3365524741e2
Author: Eric Anholt <anholt@freebsd.org>
Date: Fri Jan 9 08:40:32 2004 +0000
Use the scratch area for Composite when one of src or dst is in memory.
commit 6d8001f4688e2149fcdd480401c46c7540680576
Author: Eric Anholt <anholt@freebsd.org>
Date: Thu Jan 8 20:18:13 2004 +0000
Compile fixes for non-DRI case and for non-C99 compiler.
commit 1be4b2d5e8048eb3653fad3a1267a0da865bcee8
Author: Eric Anholt <anholt@freebsd.org>
Date: Thu Jan 8 08:25:49 2004 +0000
Forced commit: Previous commit included the removal of the 8192 scanline
limit on offscreen memory in the fbdev case. I remember daenzer (who
originally put that code in) saying he wasn't sure of it, and there
doesn't seem to be any reason for that limit given how acceleration is
done.
commit b27729ec88f5d4153a0debfe2347bbed022329ba
Author: Eric Anholt <anholt@freebsd.org>
Date: Thu Jan 8 08:16:24 2004 +0000
- Add a new UploadToScratch kaa hook for putting the data for a single
pixmap into temporary offscreen storage. Subsequent UploadToScratch may
clobber the data of previous ones. This allows hardware acceleration of
composite operations on glyphs.
- Add a new UploadToScreen kaa hook for doing the actual moving of data to
framebuffer. This would allow us to do things like hostdata blits or
memcpy to agp and then blit.
- Add an UploadToScreen on ATI which is just memcpy, but which will be
replaced with a hostdata blit soon.
- Add UploadToScratch on ATI and reserve 64k of scratch space. This
provided a 3x speedup of rgb24text on my Radeon.
commit d640cf4cb4e031a0e93dfd5955405847fe4475c0
Author: Harold L Hunt II <huntharo@msu.edu>
Date: Thu Jan 8 05:10:33 2004 +0000
file winprocarg.c was initially added on branch CYGWIN.
commit 77183abbc499c69fbbbae1d92a6b012c5f80b6c4
Author: Harold L Hunt II <huntharo@msu.edu>
Date: Thu Jan 8 05:10:32 2004 +0000
file winglobals.c was initially added on branch CYGWIN.
commit eb5bb9c1a16db308eae84ea45a5920c768d4a2ff
Author: Harold L Hunt II <huntharo@msu.edu>
Date: Thu Jan 8 05:10:32 2004 +0000
file winclipboardwrappers.c was initially added on branch CYGWIN.
commit e93d468df21840007cbeea03ed545e75f0f0baf1
Author: Harold L Hunt II <huntharo@msu.edu>
Date: Thu Jan 8 05:10:32 2004 +0000
file winauth.c was initially added on branch CYGWIN.
commit 737eddfa4b6a8851e20823405b7269dd49c49b89
Author: Eric Anholt <anholt@freebsd.org>
Date: Wed Jan 7 09:50:28 2004 +0000
Disconnect the sis300 driver. I've never managed to fix it, and it breaks
the build on PPC.
commit 5a2c23f8a18767f0eb2fe2846ca3ba18fd236284
Author: Eric Anholt <anholt@freebsd.org>
Date: Wed Jan 7 02:30:29 2004 +0000
Speed things up slightly by removing Z values from emitted vertices and by
emitting as a tri fan rather than a tri list. A rect list would save an
additional vertex (out of 4) per rectangle, but there's no measurable
speed difference and the tri fan may be useful when transforms come
into play.
commit cff782078cec9b10606c5873816b7acd9977ce4d
Author: Eric Anholt <anholt@freebsd.org>
Date: Sun Jan 4 20:51:53 2004 +0000
- Don't forget to UNINIT miComputeCompositeRegion's regions
- Fix a bit of whitespace nearby.
commit 34d1529731fff0cb61c71f76edc5c6499ece68d1
Author: Eric Anholt <anholt@freebsd.org>
Date: Sun Jan 4 20:47:30 2004 +0000
- Correctly set the texture coordinate set source for the second texture
unit.
- Re-enable Radeon's Composite accel now that fonts work again.
commit 9f1a92cd092e87f774ce4ed99d4b3e15f905d4f7
Author: Eric Anholt <anholt@freebsd.org>
Date: Sat Jan 3 21:52:14 2004 +0000
- Call appropriate Done function for Composite.
- Don't allow src transforms for Copy acceleration.
- Minor whitespace fixes.
commit 3db761a17b60b80acb83f365628b093f0ba6958c
Author: Eric Anholt <anholt@freebsd.org>
Date: Sat Jan 3 11:46:57 2004 +0000
- Add more Composite operations, including Saturate, to Radeon Composite
accel. I don't 100% trust that the math works for Saturate, but I can't
tell from existing information.
- Fix texture pitch fallback checks.
- Fallback when src or mask have transforms.
- Disable Radeon Composite accel until the offset thing is fixed.
- Set offscreenPitch to 64 on Radeon thanks to new information and a kaa
fix. Fixes acceleration at width!=1024.
commit d15acfa79b64b8dab1e930ce8e5423a212a1360b
Author: Eric Anholt <anholt@freebsd.org>
Date: Sat Jan 3 11:25:27 2004 +0000
Split the various attempts at accelerating Composite into separate
functions. Along with making things more readable, it fixes a problem
where the coordinates would get messed up if acceleration failed due to
things like pixmaps being in the wrong locations.
commit 1e1a35e20c1d281bc9700b349cda1e67f65905dd
Author: Eric Anholt <anholt@freebsd.org>
Date: Sat Jan 3 11:17:44 2004 +0000
Actually align the offset of allocated offscreen areas.
commit 354f8f7e943d1a0732f4181420211efff27532b8
Author: Eric Anholt <anholt@freebsd.org>
Date: Wed Dec 31 23:24:33 2003 +0000
Some strange \240 character snuck into the original commit of this file.
commit 5f947b04da13256e5f514c40dedb98c6e1cbe0f1
Author: Eric Anholt <anholt@freebsd.org>
Date: Tue Dec 30 08:45:53 2003 +0000
There's never a copy between different depths. Remove the check.
commit c8eb20a08ee9174374b6f5ac6e79f31fce26e181
Author: Eric Anholt <anholt@freebsd.org>
Date: Tue Dec 30 08:23:56 2003 +0000
- Add new Composite hook for kdrive drivers, which only ensures that the
pixmaps are offscreen and don't have alpha maps. It is the last case
checked before going to software fallback
- Use the new Composite hook in the ati driver to implement acceleration of
most Composites that get done in an xcompmgr environment on r100 series
cards. It is only available when using the DRM. There are still some
corruption issues, but the DRI is still non-default and I need to get
this into version control.
commit adfc1ed8e1e150100accf014e46241201275138f
Author: Eric Anholt <anholt@freebsd.org>
Date: Mon Dec 29 09:04:20 2003 +0000
Add dependency lines so that servers are rebuilt when server libraries are
changed.
commit df03e80ae9162ec87f503322ccbcf2846ad38bef
Author: Eric Anholt <anholt@freebsd.org>
Date: Mon Dec 29 06:24:01 2003 +0000
Merge dri-0-1-branch to trunk. Notable changes:
- Add libdrm and libdri. Portions of the DRI extension are stubbed out.
- Use the DRM in the ATI driver when available. This provides a minor
performance improvement in x11perf, and opens the possibility of using
the 3d hardware for acceleration in the future.
- Implement solid fill acceleration for Composite in KAA.
- Implement Blend hook for Composite and use it on r128.
- Fix a bug of mine that resulted in overuse of offscreen memory.
- Fix many miscellaneous bugs in ATI driver and add PCI IDs.
commit 9bea538745f1a0c14faaac0e61dee5cf86f98dc6
Author: Eric Anholt <anholt@freebsd.org>
Date: Sun Dec 28 09:56:54 2003 +0000
file kaa.h was initially added on branch dri-0-1-branch.
commit fb8cd7454baec0bc0f693d222f3920ce03dde7c6
Author: Eric Anholt <anholt@freebsd.org>
Date: Sun Dec 28 09:56:54 2003 +0000
file kaapict.c was initially added on branch dri-0-1-branch.
commit f388f1509cb131cdf0675415214c9610d3d322c7
Author: Eric Anholt <anholt@freebsd.org>
Date: Tue Dec 23 22:29:38 2003 +0000
file r128_blendtmp.h was initially added on branch dri-0-1-branch.
commit 918958705dd97ce678b8901666c85fb359d0e013
Author: Kaleb Keithley <kaleb@freedesktop.org>
Date: Sun Dec 21 13:39:58 2003 +0000
Use a different icon
commit e97c634593dd171a05aa0fa5a35d218dcc3ecfb0
Author: Kaleb Keithley <kaleb@freedesktop.org>
Date: Sat Dec 20 00:28:31 2003 +0000
merge XFree86 RC2 (4.3.99.902) from vendor branch
commit 12e532010b9e8cb67bedd44d489c9c40dd265165
Author: Kaleb Keithley <kaleb@freedesktop.org>
Date: Fri Dec 19 20:55:39 2003 +0000
XFree86 4.3.99.902 (RC 2)
commit 4b75c7f6358b28978b05ffa4b73853d936454f50
Author: Kaleb Keithley <kaleb@freedesktop.org>
Date: Thu Dec 18 19:32:17 2003 +0000
First pass at "Standard" Xinerama. The sources for this came from Heather
Lanigan's xinerama tree on Sourceforge.Net. No attempt has been made to
handle previous, non-standard versions of the protocol. Nor has any
attempt been made to preserve the ABI of previous versions -- that part
will be added at a later time, and then probably only on systems that
have nice object/linker semantics, e.g. ELF systems with weak symbols.
commit 305c444de3baa863d7abc4221e8cebb973805847
Author: Eric Anholt <anholt@freebsd.org>
Date: Mon Dec 8 01:55:10 2003 +0000
Add initial SiS 300-series (300, 305, 540, 630, 730) driver based off of
the ATI driver. It suffers from hw/sw synchronization problems, it
looks like, but may be good enough to work on Render acceleration
experiments. Committing it as-is so I don't lose it again.
commit 8a7481a27496c842ec2ef5bac5e4d0b5e6279deb
Author: Kaleb Keithley <kaleb@freedesktop.org>
Date: Sat Dec 6 13:24:29 2003 +0000
merge XFree86 4.3.99.901 (RC1) from vendor branch
commit e82928826f60a2e76a670c936bd557838fc1764c
Author: Kensuke Matsuzaki <zakki@peppermint.jp>
Date: Fri Dec 5 03:37:26 2003 +0000
file winwin32rootlesswindow.c was initially added on branch CYGWIN.
commit fc40d0a3cbee053d446032ae3150b06edf66a335
Author: Kensuke Matsuzaki <zakki@peppermint.jp>
Date: Fri Dec 5 03:37:26 2003 +0000
file winwin32rootlesswndproc.c was initially added on branch CYGWIN.
commit c3f26a1b989dbbf5167e6e352aebf2f53bfcc442
Author: Kensuke Matsuzaki <zakki@peppermint.jp>
Date: Fri Dec 5 03:37:26 2003 +0000
file winwindowswm.c was initially added on branch CYGWIN.
commit 0f06636a9a088fc27262da0f0bc9a20a3dbeab69
Author: Kensuke Matsuzaki <zakki@peppermint.jp>
Date: Fri Dec 5 03:37:26 2003 +0000
file winwin32rootless.c was initially added on branch CYGWIN.
commit a84f16a9ad2ed0f874d2c1816aedee96725d2657
Author: Kaleb Keithley <kaleb@freedesktop.org>
Date: Thu Dec 4 22:03:38 2003 +0000
XFree86 4.3.99.901 (RC 1)
commit 33fdd50a94baab1db342bfce442907db8f8ad03e
Author: Keith Packard <keithp@keithp.com>
Date: Tue Dec 2 01:59:38 2003 +0000
Wrap ClipNotify to see region motions during MoveWindow.
Check window reorigin in PositionWindow and bump pixmap serial numbers to
revalidate GCs.
Fix picture clip region origin in automatic update
Initialize client private 'critical' value
Clean up pixmap bounds checking code to only affect contents allocated by
fb.
Oops. Call SourceValidate for Composite operations.
Add Xchips server (vesa based)
commit 6db77925406a0ee600998ad558a50190ba631649
Author: Eric Anholt <anholt@freebsd.org>
Date: Mon Dec 1 22:56:06 2003 +0000
file radeon_sarea.h was initially added on branch dri-0-1-branch.
commit 313046b42832fa2434d617997d5701157b55e7c8
Author: Eric Anholt <anholt@freebsd.org>
Date: Mon Dec 1 22:56:06 2003 +0000
file radeon_common.h was initially added on branch dri-0-1-branch.
commit 2ad126286e524392741164babe530210892c377f
Author: Eric Anholt <anholt@freebsd.org>
Date: Mon Dec 1 22:56:06 2003 +0000
file r128_sarea.h was initially added on branch dri-0-1-branch.
commit f486c136ad8d2d893cdf3aee6aa752578a6809d7
Author: Eric Anholt <anholt@freebsd.org>
Date: Mon Dec 1 22:56:06 2003 +0000
file r128_common.h was initially added on branch dri-0-1-branch.
commit 1eb63ef1b5d0ce10117196df3e81e8312a55a93c
Author: Eric Anholt <anholt@freebsd.org>
Date: Mon Dec 1 22:56:06 2003 +0000
file ati_sarea.h was initially added on branch dri-0-1-branch.
commit 1fa5f28406f8a7ad54049e4bec129953149bd3ed
Author: Eric Anholt <anholt@freebsd.org>
Date: Mon Dec 1 22:56:06 2003 +0000
file ati_dri.c was initially added on branch dri-0-1-branch.
commit 14ce4f2c3ebc20e5f6d57adda0a7e14229541a72
Author: Eric Anholt <anholt@freebsd.org>
Date: Mon Dec 1 22:56:06 2003 +0000
file ati_dri.h was initially added on branch dri-0-1-branch.
commit 8887456e7d4fc1280287ed3e35c6c4464525827b
Author: Eric Anholt <anholt@freebsd.org>
Date: Mon Dec 1 22:56:06 2003 +0000
file ati_dripriv.h was initially added on branch dri-0-1-branch.
commit 6c9e7f47357b02f41b9f1f43f7f1d9b5a139e5b6
Author: Eric Anholt <anholt@freebsd.org>
Date: Mon Dec 1 22:56:06 2003 +0000
file ati_draw.h was initially added on branch dri-0-1-branch.
commit 2ad20d4e99d0d8ecb922507e0bfead8b7b7d4a55
Author: Eric Anholt <anholt@freebsd.org>
Date: Mon Dec 1 22:56:06 2003 +0000
file ati_drawtmp.h was initially added on branch dri-0-1-branch.
commit ae2454f65698eef66b3507e586e4f8125cb1790d
Author: Anders Carlsson <andersca@gnome.org>
Date: Mon Dec 1 22:11:12 2003 +0000
Add support for setting the video mode.
commit e31051ba26c18f6232798c5a5c4725f5ce53d6b9
Author: Phil Blundell <pb@reciva.com>
Date: Mon Dec 1 21:49:41 2003 +0000
Call KdShadowUnset before fbdevSetShadow.
commit 9cdd6fd9e3d6e44adf392279093f92fb6678a49c
Author: Eric Anholt <anholt@freebsd.org>
Date: Mon Dec 1 04:33:36 2003 +0000
- Add fbdev mode-setting backend to Xati. It and vesa are compiled in when
available, with fbdev being used by default.
- Use depth 16 by default when vesa backend is used.
- Add MMIO defines for PowerPC (should be in a common location).
Many thanks for Michel Daenzer for much of this code.
commit ec7f5539302fafd1ac7609ac423f1379f54916ab
Author: Eric Anholt <anholt@freebsd.org>
Date: Mon Dec 1 03:15:13 2003 +0000
Add more RV250 PCI IDs.
commit d221c484f9521c780fc3c7e88833c62e50463c6d
Author: Eric Anholt <anholt@freebsd.org>
Date: Mon Dec 1 01:46:42 2003 +0000
Remove sys/io.h inclusion from some files that didn't need it, and change
asm/io.h to sys/io.h in vga.c, which newer Linux complains about.
commit 5fd7f82390d78621a8aad959eb216b8fb7e1a97f
Author: Kaleb Keithley <kaleb@freedesktop.org>
Date: Sun Nov 30 16:47:13 2003 +0000
xfree86 merge
commit 77836ebda2a47e04c56c5842f62fab5992909712
Author: Kaleb Keithley <kaleb@freedesktop.org>
Date: Sat Nov 29 16:08:53 2003 +0000
xfree86 merge
commit 88193e928be7cf5a526b50ad1e0b4ac9cddef297
Author: Kaleb Keithley <kaleb@freedesktop.org>
Date: Sat Nov 29 15:10:02 2003 +0000
xfree86 merge
commit 0097b6fe2d1739e46e4e7726aaa481b6dc84870c
Author: Kaleb Keithley <kaleb@freedesktop.org>
Date: Wed Nov 26 22:49:07 2003 +0000
merge latest (4.3.99.16) from XFree86 (vendor) branch
commit d803918a9fb5f80a2d6e4b711d8e43916cd09da5
Author: Eric Anholt <anholt@freebsd.org>
Date: Tue Nov 25 22:39:54 2003 +0000
Add new Radeon 9200 PCI IDs.
commit adc7f9a4ebdfe11d4cd6de9388b63dfe36450b39
Author: Kaleb Keithley <kaleb@freedesktop.org>
Date: Tue Nov 25 19:29:01 2003 +0000
XFree86 4.3.99.16 Bring the tree up to date for the Cygwin folks
commit 90f1536dd315cd265bfc7ef35058761a65a01734
Author: Kaleb Keithley <kaleb@freedesktop.org>
Date: Tue Nov 25 19:29:01 2003 +0000
Initial revision
commit d461855a73d8c9f51a18673aef7ce88f94a71629
Author: Eric Anholt <anholt@freebsd.org>
Date: Sun Nov 23 10:12:04 2003 +0000
- Fix Radeon offscreen pixmap pitch alignment.
- Remove usleeps from idle and waitavail code, recommended by keithp.
- Add a workaround for apparent broken acceleration with Rage 128 and
offset alignment with 8-bit acceleration (24-hack and plain 8-bit).
- Minor cleanup of setup code.
commit 8e09afe657b110bc1ea9e58dea81a120c343d16e
Author: Eric Anholt <anholt@freebsd.org>
Date: Sun Nov 23 02:08:16 2003 +0000
Add RV250 PCI IDs.
commit b3247251fb7d9f2d50ef41d9c2089629544d534d
Author: Eric Anholt <anholt@freebsd.org>
Date: Thu Nov 20 07:49:46 2003 +0000
- Fix a bug in pitch alignment for offscren pixmaps.
- Add 24-bit acceleration for Xati using the 8-bit trick from mach64.
- Add offscreen pixmap support to Xati.
commit 41dde24b229f4bc4738637d9cd0a86b74b9f8457
Author: Eric Anholt <anholt@freebsd.org>
Date: Thu Nov 20 00:05:56 2003 +0000
- Fix confusion of depth/bitsPerPixel in ati_draw.c
- Disable acceleration with 24bpp due to apparent broken acceleration.
Accel at 24bpp was the cause of the crashes when people tried to use
any depth over 16. XFree86 doesn't support 24 either.
- Disable at < 8bpp, too.
- Add the other Rage 128 PCI IDs.
- Remove unnecessary setting of scissor registers (only default scissor
gets used).
commit 7abbcce4222958b4670873a17f67ea1ec1d958e2
Author: Eric Anholt <anholt@freebsd.org>
Date: Wed Nov 19 08:32:38 2003 +0000
- Add PCI information (device/vendor id, bus location) to KdCardAttr to
help with ati, and future DRM drivers.
- Add new "ati" kdrive driver. It has ancestry in the r128 driver from
andersca, but took a detour through being the WIP SiS 300 driver on the
way. It supports Radeons (tested on QD VIVO and 7500) and Rage 128.
Current limitations include that it requires depth 16 and that the
other Rage 128 PCI IDs aren't included yet.
commit e9cb70dae0a85fcd116d7ffac73d1322ec282a94
Author: Keith Packard <keithp@keithp.com>
Date: Tue Nov 18 18:38:48 2003 +0000
Reset available offscreen segment save function pointer. (Not a functional
change, just cleaning up a bit)
Reset the screen->memory_base value when frame buffer is remapped. This
makes sure new off-screen allocations point at the newly mapped region
rather than the old (now unmapped) region.
commit f333581b7b4066ab054dd765a1c9bae0f3407188
Author: Seth W. Klein <sk@sethwklein.net>
Date: Tue Nov 18 04:53:16 2003 +0000
Added infrastructure for driver specific usage messages and added vesa
usage message.
commit 003e87717cfe378261ed1a1e7bcb2cf0d200b1b8
Author: Keith Packard <keithp@keithp.com>
Date: Mon Nov 17 22:09:12 2003 +0000
Recompute winSize/borderSize to fix them when changing redirection.
Sufficient, but not always necessary.
Add borderClip to damage on creation so that clients needn't guess.
Fix API to FbDots functions to make PolyPoint work with screen_x/screen_y
offsets
Add debugging code to make sure no pictures are left pointing at freed
pixmaps. "Can't" happen, but it did once.
Change KdOffscreenArea structure to eliminate separate private structure,
eliminate the ScreenPtr, change from doubly linked to singly linked
list.
Don't damage BackgroundNone windows on PW_BACKGROUND. Re-clip damage to
borderClip in DamageSubtract.
commit c57959ad6a4c0f5329762f401fd7871ffb2ee90c
Author: Kaleb Keithley <kaleb@freedesktop.org>
Date: Mon Nov 17 19:03:47 2003 +0000
merge XFree86 4.3.0.1 to -CURRENT
commit acd200770513ad03dd3f4bdc7448edfd69b1ff9d
Author: Keith Packard <keithp@keithp.com>
Date: Mon Nov 17 06:54:52 2003 +0000
Clear window when Manual Subwindows redirect is destroyed
Fix Tile/Stipple origin with non-zero pixmap window origins
Use computed depth for TrueColor visuals as fbdev doesn't have one.
commit d568221710959cf7d783e6ff0fb80fb43a231124
Author: Kaleb Keithley <kaleb@freedesktop.org>
Date: Fri Nov 14 16:49:22 2003 +0000
XFree86 4.3.0.1
commit 9508a382f8a9f241dab097d921b6d290c1c3a776
Author: Kaleb Keithley <kaleb@freedesktop.org>
Date: Fri Nov 14 16:48:57 2003 +0000
Initial revision
commit ded6147bfb5d75ff1e67c858040a628b61bc17d1
Author: Kaleb Keithley <kaleb@freedesktop.org>
Date: Fri Nov 14 15:54:54 2003 +0000
R6.6 is the Xorg base-line
commit cb6ef07bf01e72d1a6e6e83ceb7f76d6534da941
Author: Keith Packard <keithp@keithp.com>
Date: Fri Nov 14 07:46:20 2003 +0000
Accelerated image text code drew glyphs at wrong location when compositing
manager enabled.
commit 318d525bf2fe52b059b1568e9b31d144b297a781
Author: Keith Packard <keithp@keithp.com>
Date: Thu Nov 13 09:14:29 2003 +0000
Have the composite extension tell the damage extension about clients which
have redirected subwindows in manual mode. Those clients are marked
Critical and given a significant scheduling boost whenever they receive
a damage notify event. This dramatically improves update frequency.
If the kernel reported a large number of keys, readKernelMapping would walk
off the end of the kdKeysym array.
Fix usage of _IOWR; the 'size' argument is actually a datatype.
commit e9904cefa39e1c9d3c7bf2f335dbafb23809cdba
Author: Eric Anholt <anholt@freebsd.org>
Date: Tue Nov 11 05:46:15 2003 +0000
Fix Makefile.am's to include header files needed for distcheck. Remove
-Werror default and add --enable-werror switch to add it back.
commit 5dc119b73ffcae32c2d470b734dfa2f8af58e77e
Author: Keith Packard <keithp@keithp.com>
Date: Mon Nov 10 20:35:05 2003 +0000
Fix KdXv interface to pass drawable down so that bits can be put into
drawable pixmap rather than directly into the frame buffer. Rewrite
logic in kdoffscreen to make space for new allocations, now deals
correctly with locked areas.
commit e500986657ea8b4e14a1ff4730ecda4583c75277
Author: Keith Packard <keithp@keithp.com>
Date: Mon Nov 10 06:40:23 2003 +0000
Must offset composite parameters by drawable coordinates in accelerated
case.
commit d694b44259ff51cfca2c3ec9a58bf164010cc1ad
Author: Phil Blundell <pb@reciva.com>
Date: Sat Nov 8 18:51:59 2003 +0000
Avoid ugly shell error when libXdmcp isn't present.
New functions. (TsInit): Register them.
commit 3e18c6363454aa87e1ad8c121019bab185e613b8
Author: Keith Packard <keithp@keithp.com>
Date: Sat Nov 8 00:28:19 2003 +0000
Fix KAA to work with screen_x/screen_y hacks from COMPOSITE Also add
kaaComposite acceleration for simple bltblt case.
commit 1280f79054dc16ccf321006cd2de53e0f53c7b70
Author: Keith Packard <keithp@keithp.com>
Date: Fri Nov 7 23:29:29 2003 +0000
Ok, Composite extension is semi-working; when no-one asks for redirection,
the server seems to act as before. With RedirectSubwindows (root,
automatic), the server looks just like a regular X server. Now to go
rewrite the (currently lame) compositing manager to get some real
action on the screen.
Some of the fixes here are to make valgrind quiet with various ioctls used
by kdrive/linux.
Also fixed a bug where fbdev initialization was out of order in fbdev.c and
smi.c
commit d319a0a610c90524ad29cab3c6d4d21b5298fc7f
Author: Phil Blundell <pb@reciva.com>
Date: Fri Nov 7 23:00:06 2003 +0000
Fix warnings.
commit 598c5d549abbb819f3391a2c88432941b546a213
Author: Matthew Allum <breakfast@10.am>
Date: Thu Nov 6 14:01:46 2003 +0000
tslib improvements
commit 7e1a564c416f6dc337a0021b1c0e1f2cb3b27296
Author: Keith Packard <keithp@keithp.com>
Date: Wed Nov 5 06:46:13 2003 +0000
Replace translucent compositing hacks with PictOpSrc to match eventual
extension semantics. Replace mouse acceleration with quadratic.
commit 5378236aa647ec9a723a3e5fbd2a57eb286a1938
Author: Keith Packard <keithp@keithp.com>
Date: Sun Nov 2 19:56:10 2003 +0000
merge xfixes_2_branch back to HEAD
commit 9e94665cf9cf0f74dff5b3cdaa4cde99e234fa45
Author: Phil Blundell <pb@reciva.com>
Date: Tue Oct 28 22:28:33 2003 +0000
try /dev/misc/apm_bios if /dev/apm_bios doesn't exist
commit bb99451f275827da580dcfa3b66cd0705fcc900a
Author: Phil Blundell <pb@reciva.com>
Date: Tue Oct 28 22:27:35 2003 +0000
move smi into VESA_SUBDIRS
commit 9a05f8f7858641b780046ad69d61f21ccbb93db8
Author: Keith Packard <keithp@keithp.com>
Date: Sun Oct 19 20:46:23 2003 +0000
Minor cleanups -- remove a couple of bogus KdCheckSync calls, restructure
KdOffscreenSwapOut to avoid unneeded 'continue'
commit 16b2ea64e7e0bd32d6dba078b4891167bd335d44
Author: Keith Packard <keithp@keithp.com>
Date: Thu Oct 16 08:03:25 2003 +0000
Discard/reconstruct list of offscreen areas on VT switch so no allocations
can occur while switched away.
Set type of off_screen_areas member to actual type instead of pointer
commit f4bcd36a386116c450ea6893ab3d08e81cea663b
Author: Anders Carlsson <andersca@gnome.org>
Date: Wed Oct 15 05:34:54 2003 +0000
Add a memory_base variable and use it.
commit f5916edb172738c73c8f78b23981abfd8d03a079
Author: Keith Packard <keithp@keithp.com>
Date: Wed Oct 15 04:59:45 2003 +0000
hw/kdrive/*/Makefile.am Libraries in local dir must not use global path or
make doesn't build things in the right order (-j)
hw/kdrive/mga/mga.h, mgadraw.c Fix warnings
commit b3e47ce18ff9c86833fc6302b1e074912edce404
Author: Keith Packard <keithp@keithp.com>
Date: Wed Oct 15 01:00:38 2003 +0000
various Split out pixmap allocation debug statements Fix bogus offscreen
pixmap size test Add migration to composite function for source
operands
VbeDPMS Remove extraneous call to VbeGetVib.
commit 28bcd2efd134bfea3daa0738c9155b36cdf84168
Author: Keith Packard <keithp@keithp.com>
Date: Tue Oct 14 21:33:04 2003 +0000
Avoid attempting acceleration on non-screen formats (for now)
Offscreen allocator API changes.
commit cb46169759a833605b78409ae68c9fb57618ceba
Author: Keith Packard <keithp@keithp.com>
Date: Tue Oct 14 21:10:53 2003 +0000
Use same assumptions as layergc about what layer kind is approprate for
unwrapping pixmap operations. This makes sure the accelerated code gets
invoked for pixmaps
Add pixmap migration support to kaa. Can't quite automatically migrate
pixmaps off-screen, but soon we will. Can kick objects out of video
memory. Move per-screen linked list pointers to pixmap private. Wrap
Composite in preparation for migrating pixmaps. Have kasync ignore
drawable type so that pixmaps trigger sync Add KdOffscreenFini to
cleanup on server reset. Switch off screen area to have only a 'save'
function; moving objects to off screen memory is done by saving then
freeing the area.
commit 109b94951654171ada94e2ffb29568b8a1bcde77
Author: Keith Packard <keithp@keithp.com>
Date: Tue Oct 14 05:08:35 2003 +0000
-Wall fixes. Might have fixed VESA based DPMS code as a result
commit 4b844cafb2516139c8407822b61939cd6c743742
Author: Keith Packard <keithp@keithp.com>
Date: Tue Oct 14 05:07:39 2003 +0000
Check for off-screen pixmap support in KaaDrawableIsOffscreenPixmap. -Wall
fixes. Allocate pixmap private space only for screens with off-screen
pixmap support
commit cdf3377f6d3789628495ac64df80ac7dc235e46d
Author: Keith Packard <keithp@keithp.com>
Date: Tue Oct 14 05:05:53 2003 +0000
-Wall fixes. Support off-screen pixmaps
commit 777f31cd0b5ec387d975e6d10ae73fa325e4c311
Author: Keith Packard <keithp@keithp.com>
Date: Tue Oct 14 05:05:28 2003 +0000
-Wall fixes. Add klinux.h to export function declarations
commit a398339b6d5209a11af93a3b836b0cad326a0799
Author: Keith Packard <keithp@keithp.com>
Date: Tue Oct 14 05:04:22 2003 +0000
-Wall fixes
commit 44f2e82f1b463e272f4e521561f74eb14bf24082
Author: Anders Carlsson <andersca@gnome.org>
Date: Mon Oct 13 02:19:47 2003 +0000
Use pixmaps instead of drawables in the kaa functions. Have the mga server
support accelerated operations on offscreen pixmaps.
commit 47a9fab5e286c5224047690482a2cb36a3c17b88
Author: Anders Carlsson <andersca@gnome.org>
Date: Mon Oct 13 01:19:37 2003 +0000
Add support for offscreen pixmaps.
commit c538fa874257a2cbf53f329d3982e7a01fefe629
Author: Anders Carlsson <andersca@gnome.org>
Date: Mon Oct 13 00:56:21 2003 +0000
Fix a couple of bugs.
commit a50438b4709b32ec869e232628971b0dccd27adf
Author: Anders Carlsson <andersca@gnome.org>
Date: Mon Oct 13 00:19:58 2003 +0000
Add offscreen memory manager and update the servers to reflect the name
change for the kaa structure.
commit 307f3dbd10e0c8e392865e85e9e3e4dff108df02
Author: Anders Carlsson <andersca@gnome.org>
Date: Sun Oct 12 14:17:24 2003 +0000
Remove this for now.
commit ab3305d0ac805d0c9e917c35b316d9b58dde2187
Author: Anders Carlsson <andersca@gnome.org>
Date: Sat Oct 11 19:36:13 2003 +0000
Add ATI Rage 128 server.
commit ed98d3814ee65cd9fd18eeadbd20c8fc6b4ab342
Author: Keith Packard <keithp@keithp.com>
Date: Thu Oct 9 23:35:44 2003 +0000
use #if instead of #ifdef
commit 4dd37de858464c576bfdcd10255a8e233a5b05d5
Author: Anders Carlsson <andersca@gnome.org>
Date: Thu Oct 9 16:21:24 2003 +0000
Build smi after vesa.
commit e5a1c9952f7d621493f08257c8b9456b7608c55a
Author: Keith Packard <keithp@keithp.com>
Date: Thu Oct 9 07:29:31 2003 +0000
Initialize smi chip on graphics setup. Seems to help some.
commit 10f721acc5e59ea4152b94246b62963f2ff9d678
Author: Keith Packard <keithp@keithp.com>
Date: Thu Oct 9 07:12:01 2003 +0000
Leave iopl set to 3 so vesa module will work
commit f74555e94264e6f703d399a5e0475c7283e20a88
Author: Keith Packard <keithp@keithp.com>
Date: Thu Oct 9 06:36:26 2003 +0000
Add xfixes, fix smi driver to use either fbdev or vesa. Add hole mapping to
vesa server by default
commit 346aff7ef6f47a191c7f134b7843a634189b9e83
Author: Keith Packard <keithp@keithp.com>
Date: Thu Oct 9 06:35:11 2003 +0000
Use either vesa or fbdev, selectable at compile time
commit adc5b8068d5532a6f3f23e64d3c668a22d5b1504
Author: Keith Packard <keithp@keithp.com>
Date: Sun Oct 5 05:22:35 2003 +0000
Fix fbdev server to allow accelerated servers on top to use RandR. Switch
smi server to fbdev (vesa bios doesnt work on the Acer I have here)
commit f3d8476ced1e3ba4b4ca7c9e23e98c2cc7ffcc14
Author: Phil Blundell <pb@reciva.com>
Date: Sat Oct 4 02:56:54 2003 +0000
few more fixes for h3600 ts
commit aae3e6dcb3d72eba6d7d8d99079782ed1bfe63bd
Author: Keith Packard <keithp@keithp.com>
Date: Sat Oct 4 02:43:16 2003 +0000
configure.ac Makefile.am os/oscolor.c Xext/saver.c Xext/Makefile.am
hw/kdrive/linux/ts.c hw/kdrive/src/Makefile.am hw/kdrive/src/kdrive.h
hw/kdrive/src/kinput.c hw/kdrive/src/kmap.c Autodetect VM86 (for vesa),
AGPGART, APM, MTRR, tslib and handhelds.org touch screen. Add
USE_RGB_BUILTIN and code for fileless RGB database. Add
MIT-SCREEN-SAVER
commit efbf205a2ac4792b71d39f8fe3ef3b1cf12697c0
Author: Phil Blundell <pb@reciva.com>
Date: Fri Oct 3 15:27:46 2003 +0000
add --disable-kdrivevesa option
commit 89a536f349525e642bb4cd233bc47864ed4a6ad7
Author: Keith Packard <keithp@keithp.com>
Date: Thu Oct 2 02:30:28 2003 +0000
Add smi server
commit 5a21f4f4d0c03e0e34f1979fd7cec8f0d19b00d4
Author: Keith Packard <keithp@keithp.com>
Date: Wed Oct 1 06:43:50 2003 +0000
Add XDM cookies. Fix up support for pkgconfig X bits
commit a42e31b28c493dc3d6b32cde4e72ff17fc983183
Author: Matthew Allum <breakfast@10.am>
Date: Tue Sep 30 22:14:59 2003 +0000
Fixed tslib driver to handle VT switches
commit a0876ade6479c40dcef63f70f4c6c5a5988edeba
Author: Keith Packard <keithp@keithp.com>
Date: Tue Sep 30 20:49:47 2003 +0000
Enable maintainer mode from autogen.sh. Fix vesa build to create library
before program. Remove bogus AC_SUBST lines for XSERVER_CFLAGS and
XSERVER_LIBS
commit e8c02296476f068bc8158d112dc15df00dddac2a
Author: Matthew Allum <breakfast@10.am>
Date: Tue Sep 30 20:15:14 2003 +0000
Added --enable-tslib configure option
commit a42384e9356ec79510682bacf08410e87d7102ff
Author: Keith Packard <keithp@keithp.com>
Date: Mon Sep 29 01:42:40 2003 +0000
Use other freedesktop.org packages to build the server
commit 6a098a88af174db1674662c09e2385b4e6e0bb4e
Author: Anders Carlsson <andersca@gnome.org>
Date: Wed Sep 24 23:36:54 2003 +0000
Add beginnings of offscreen memory manager.
commit 918a8273eeabcb14fc82742cc68223d8a7c2a67a
Author: Keith Packard <keithp@keithp.com>
Date: Wed Sep 24 21:07:06 2003 +0000
hw/kdrive/src/kdrive.c
hw/kdrive/src/kdrive.h Add -switchCmd option to set command that is
executed whenever the VT is enabled or disabled. This permits input
device to be customized by external apps when switching to X.
commit 20bbd750d0d359e55cbdcc86aeea6013ac665bce
Author: Anders Carlsson <andersca@gnome.org>
Date: Mon Sep 22 21:14:59 2003 +0000
Accelerate server.
commit 49771e3f074cae3947b0084e6514a19dc4c4cad1
Author: Anders Carlsson <andersca@gnome.org>
Date: Thu Sep 18 20:48:48 2003 +0000
Add mga server to the build.
commit 07ab15d61d2468fc858453cdabe7296d19fc9e10
Author: Anders Carlsson <andersca@gnome.org>
Date: Thu Sep 18 20:47:43 2003 +0000
Add mga server
commit b260825e880615f589e2bad35491ebb598e21a0f
Author: Anders Carlsson <andersca@gnome.org>
Date: Thu Sep 18 14:44:57 2003 +0000
Try this.
commit b889d4ba2c2e59769a3ff6fd00ee5bb395108827
Author: Anders Carlsson <andersca@gnome.org>
Date: Thu Sep 18 14:42:00 2003 +0000
Try things out.
commit 85ff67670c6216a8c4368a8bd70fd0434a4e0aca
Author: Anders Carlsson <andersca@gnome.org>
Date: Tue Sep 16 21:07:16 2003 +0000
Add fbdev server to the build.
commit be12dcdcf39a30f69fe73cbb5a4acacef8024db6
Author: Keith Packard <keithp@keithp.com>
Date: Fri Sep 12 07:00:19 2003 +0000
Switch to freedesktop.org libXfont
commit eca43a59ec95646836f9704714823249a15747fa
Author: Keith Packard <keithp@keithp.com>
Date: Fri Sep 12 01:51:16 2003 +0000
Clean up mach64 for autofoo
commit 6b16b827bb125b43b41b7f8558991e90ada316de
Author: Keith Packard <keithp@keithp.com>
Date: Fri Sep 12 01:49:46 2003 +0000
Add some configure options, make the mach64 server build
commit ce55d3234dc34157f0fc8059a6793cdd17fa4519
Author: Keith Packard <keithp@keithp.com>
Date: Thu Sep 11 05:15:08 2003 +0000
Move kdrive common sources to src dir
commit 269b9dac5a96005fe38379377526592cb7930a51
Author: Keith Packard <keithp@keithp.com>
Date: Thu Sep 11 05:12:51 2003 +0000
Get Xvesa building
commit 0d775576b9b3cf410e9a463b87340612d34bc13d
Author: Keith Packard <keithp@keithp.com>
Date: Thu Sep 11 03:26:03 2003 +0000
Add Makefile.am
commit ef8977a30ccb55af8e8bbb635127efb94f232983
Author: Keith Packard <keithp@keithp.com>
Date: Thu Sep 11 03:23:13 2003 +0000
More build fixes
commit 14a8311bb3b6273617f7c7b70222e97835e9c8af
Author: Keith Packard <keithp@keithp.com>
Date: Thu Sep 11 02:31:24 2003 +0000
Make more stuff build
commit 8bc8fd8678b20dde2a3fc47ff5b617bc8046ea9f
Author: Mike A. Harris <mharris@redhat.com>
Date: Thu Sep 11 02:02:54 2003 +0000
POSIX sigaction cleanups - removed act.sa_restorer as it's not in POSIX and
is not portable
commit 514ab46ce3c6eb0163720315474cba884d029b62
Author: Anders Carlsson <andersca@gnome.org>
Date: Thu Sep 11 00:47:36 2003 +0000
Start autoifying everything.
commit 283a7f32c449b1970e5a484351f8396a8afd99da
Author: Keith Packard <keithp@keithp.com>
Date: Mon Jul 7 19:13:03 2003 +0000
Update RCS tags, fix keyboard hang on VT switch, fix scroll wheel mice, add
-rawcoord option to not transform mice on rotate, fix mtrr to use
power-of-two size, add a few vesa options
commit 804b89284665f19e2c92a07fadc72c25fbb3f5d9
Author: Keith Packard <keithp@keithp.com>
Date: Wed Jul 2 17:53:46 2003 +0000
Silicon motion driver for kdrive
commit b923d897a51707c25b2dc62395d9765ba1a47bfe
Author: Keith Packard <keithp@keithp.com>
Date: Wed Jul 2 17:53:46 2003 +0000
Initial revision
commit 544ee9bb7a060d6a85b5168a2de74ff1db430c89
Author: Marc Aurele La France <tsi@ualberta.edu>
Date: Wed Apr 23 21:51:18 2003 +0000
136. Fix bug that prevented fbman from using the last partial scanline of a
Mach64 framebuffer (Marc La France).
135. Make ATI Mach64 FIFO cache integrity testing optional (Marc La
France).
134. Export ATI Mach64 hardware overlay as an XVideo adaptor (derived from
GATOS project, Egbert Eich, Marc La France).
133. Reorganise ATI Mach64 support into separate source files (Marc La
France).
132. Refine atimisc's decoding of the panel mode on server entry in an
attempt to reduce the effect of atyfb bugs (Marc La France).
131. Make Rage128 and Radeon XVideo available even when 2D acceleration is
disabled (Marc La France).
130. There is no longer any need to require hardware cursors during Rage128
and Radeon XVideo displays (Marc La France).
129. Initialise v4l's XVideo adaptors last (Marc La France).
128. Reduce cut&paste effects by adding more helpers to Xv (derived from
#5645, Bjrn Augustsson, Marc La France).
127. Centralise a region comparison primitive into 'mi' and use it instead
of local definitions throughout the server (Marc La France).
126. DPMSExtension & XvExtension driver cleanups (Marc La France).
commit 870d0f8752c11c3df42185786ab1e2bd200e4de1
Author: Egbert Eich <eich@suse.de>
Date: Thu Dec 12 18:29:05 2002 +0000
621. Let kbd driver test if Xserver is in suspend before handling any input
events (Egbert Eich).
620. Fixed agp version checking to accept minor versions >= the specified
number (Leif Delgass).
commit 7827fce0b5ff600d0adc3a30eab69e8141c2e548
Author: Keith Packard <keithp@keithp.com>
Date: Wed Nov 13 16:37:39 2002 +0000
Allow input devices to be closed while the VT is switched away (needs
per-driver support)
commit 3eaea6608bc33633c00860008f246f59ad5687a7
Author: Keith Packard <keithp@keithp.com>
Date: Tue Nov 12 22:20:42 2002 +0000
Update ipaq-specific ts driver to match generic tslib version
commit 612e82053d986df70bcc9c87038244eab8c3dc13
Author: Keith Packard <keithp@keithp.com>
Date: Tue Nov 5 05:28:34 2002 +0000
Clean up touch screen hacks for controlling pointer on alternate screen
commit 358d887cbef4d2ec34532a364dd44205eab36c23
Author: Keith Packard <keithp@keithp.com>
Date: Fri Nov 1 22:27:49 2002 +0000
Add support for ARM linux TS lib (disabled by default) in kdrive
commit f0a8d06fcaf3fe0a652efa65966f4b0b0d688c12
Author: Keith Packard <keithp@keithp.com>
Date: Thu Oct 31 18:29:50 2002 +0000
Refix mouse matrix computation for touch screens. Update usage message for
-screen option
commit 28d191680ecbcd50dc1cccec12e55a3c433fbf48
Author: Keith Packard <keithp@keithp.com>
Date: Wed Oct 30 21:25:53 2002 +0000
Uninitialized mouse matrix elements
commit dd7c85f108d01d207248300019e88d56012c33c9
Author: Alan Hourihane <alanh@fairlite.demon.co.uk>
Date: Wed Oct 30 12:52:06 2002 +0000
441. Import Mesa-4.0.4, and resync with the DRI trunk (DRI Project).
commit d04246c8fca4132063234ab44a68a7fac8c22261
Author: Keith Packard <keithp@keithp.com>
Date: Fri Oct 18 06:31:17 2002 +0000
Changed arguments to vesaRandRSetConfig
commit 7d214e2e2a2a1601ca14be6b52190c5b22611e2d
Author: Keith Packard <keithp@keithp.com>
Date: Fri Oct 18 06:08:10 2002 +0000
Fix additions of RandR support in kmode.c
commit 5bb4a7b6998132d574d823301333b7e119dc7213
Author: Keith Packard <keithp@keithp.com>
Date: Fri Oct 18 06:00:29 2002 +0000
Fix other half of kdrive mach64 video code after randr update
commit e1c304e22b1a29a5259aec1e956dbc75e0fa0138
Author: Keith Packard <keithp@keithp.com>
Date: Mon Oct 14 18:01:42 2002 +0000
Add refresh rates to RandR (v1.1)
commit 5804e69f4c20dcd33f69673aa82da3051e6eed3c
Author: Keith Packard <keithp@keithp.com>
Date: Sun Oct 13 19:35:56 2002 +0000
Custom file for rotating pcmcia screens
commit b5d1c538622b21bed8eb59b557d79323f65ffbd7
Author: Keith Packard <keithp@keithp.com>
Date: Tue Oct 8 21:28:05 2002 +0000
Add vtxx option to kdrive servers
commit f214cab20baf57fc23389ef9b63a3e3a50b2a4f6
Author: Keith Packard <keithp@keithp.com>
Date: Tue Oct 8 21:27:18 2002 +0000
Clear screen on mode switch
commit b28a8c6e2a1fbc57d96d94b7445c86f94c2d8d4d
Author: Keith Packard <keithp@keithp.com>
Date: Tue Oct 8 21:25:35 2002 +0000
Add another mach64 PCI id
commit 9373d9186b413e1d53200b191816b9143d19c4bf
Author: Keith Packard <keithp@keithp.com>
Date: Fri Oct 4 01:44:20 2002 +0000
Fix mouse mapping under reflection
commit a80e1e5aed07cb57151408b0481f18e2ffb7f146
Author: Keith Packard <keithp@keithp.com>
Date: Thu Oct 3 22:09:04 2002 +0000
Update kdrive servers to support reflection
commit 238a2ec201a52d59a46540ddd419d8d6f6bf8daa
Author: Keith Packard <keithp@keithp.com>
Date: Sun Sep 29 23:39:47 2002 +0000
Update RandR to 1.0 (library version 2.0)
commit 5d871996431e33b0d64ad9158e040e46770b6ee4
Author: Keith Packard <keithp@keithp.com>
Date: Thu Sep 26 02:56:48 2002 +0000
Add image transformation and sub-pixel ordering to Render
commit a2637ba1f6c8417a48c95c9b65542c696ba0c8c0
Author: Egbert Eich <eich@suse.de>
Date: Mon Sep 16 18:05:35 2002 +0000
319. Moved LdPreLib define after the vendor/OS specific config files as it
may depend on setting done there (Egbert Eich).
318. Several fixes for cross compile environment (Egbert Eich).
317. Added code to allow for building of static only libraries with
-fPIC for platforms which require it (Egbert Eich).
316. Added '-m32' to gcc flags as default for ia32 builds when gcc version
is >= 3.1. This allows building a 32 bit Version of X on 64bit x86-64
(Egbert Eich).
315. Changed direct calls of ld to 'gcc -nostdlib' for Linux (Egbert Eich).
314. Changed calls to as to 'gcc -c -x assembler-with-cpp' for Linux
(Egbert Eich).
313. Added '-fno-strict-aliasing' flag to gcc version >= 3.1 (Egbert Eich).
Strict requires that one address must not contain pointers to different
types - a feature heavily used by X (Egbert Eich).
312. Fixed a core dump problem in libXtt (?) (Egbert Eich).
311. Removed '#pragma pack' from structures that contain function pointers
in x86emu. This causes problems on gcc 3.1 for ia64 (Egbert Eich).
310. Added defines for missing X types to saverproto.h (Egbert Eich).
309. Fixed compiler warings generated by gcc >= 3.1 in mesa drivers (Egbert
Eich).
308. For platforms that allow both 32 and 64 bit libraries to be executed
split Xlib i18n modules path into
<libpath>/X11R6/lib/X11/locale/lib/common and
<libpath>/X11R6/lib/X11/locale/lib64/common. 'lib64' has been defined
to be the default path for 64bit shared libraries on these platforms
(Egbert Eich).
307. Fixed obvious typo in OMlib (Egbert Eich).
306. Fixed code in cfb that didn't comply with C sequence rules. Modern C
compilers tend to be more aggressive on code reordering (Egbert Eich).
305. Changed arguments of NoopDDA() from VarArgs to void. Handling of
VarArgs by gcc isn't compatible with the way it was used on certain
platforms (Egbert Eich).
304. Added support for 32bit pixmaps for 24bit overlay framebuffers in fb
overlay code (Egbert Eich).
303. Fixed kdrive to print a meaningful error message instead of just core
dump when no matching graphics cards is found (Egbert Eich).
302. fixed portability bug in xwd (Andreas Schwab <schwab@suse.de>)
301. fixed X Server crash, which happended each time a proportional
iso10646 font was loaded with xtt backend (Yong Li
<rigel863@yahoo.com>)
300. Added some ARM specific fixes to compiler.h (Uli Hecht).
299. Added a virtual 'dummy' driver (Egbert Eich).
298. Fixed core dump when certain access functions are not set in xf86Bus.c
(Egbert Eich).
297. Fixed problem where SIGIO could be disabled after a server reset.
296. Added configurable list of devices the xf86Misc extension is allowed
to change the mouse device to (Egbert Eich).
295. Changed default mouse type to 'auto' when generating config file with
'-configure' (Egbert Eich).
294. Made sure keyboard modifier settings are consistent after exit from
DGA when the xkb extension is used (Egbert Eich).
293. Disabled keyboard processing when Xserver is suspended by power
management. This allows effective locking of laptops when stolen
(Egbert Eich).
292. Added/improved options for lockfile syncing (Egbert Eich).
291. Added support for backup copy of Xserver logfile (Egbert Eich).
290. Fixed GetTimeInMillis() to use deltas instead of absolute time
returend by gettimeofday(). This ensures time is monotonic in X (Egbert
Eich).
289. Fixed xf86Misc extension to allow modification of Expps2 mice (Egbert
Eich).
288. Made code in xf86MiscExt.c more readable (Egbert Eich).
287. Fixed PCI CardBus bridge handling (Egbert Eich).
286. Added code to reenable PCI bus mastering after coming back from a VT
switch to radeon driver (Charl P. Botha <http://cpbotha.net/>) (Egbert
Eich).
285. Dito for r128 driver (M. Harris).
284. Dito for glint and mga driver (Egbert Eich).
283. Fixed double scan issues for low res modes in C&T driver (Egbert
Eich).
282. Set rgbBits to 8 for all HiQV chips in chips driver (Egbert Eich).
281. Moved initialization of accel funtions past initialization of
offscreen fb manager in chips driver (Egbert Eich).
280. Fixed initialization of video in chips driver (?).
279. Fixed HALlib problem restoring text mode on G550 (Egbert Eich).
278. Restructured and included Matrox's Merged Framebuffer changes to mga
driver (Egbert Eich).
277. G450/550 clockchip programming fixes (Matrox).
276. Fixed HW Cursor for HALlib frame granularity (Egbert Eich).
275. Enabling 2D accel in 24-bit for neomagic 2360 and 2380 (Egbert Eich).
274. Added support for builtin 1024x480 mode of Sony subnotebooks for
Neomagic driver (Egbert Eich).
273. Fixed support for lowRes (320x240) modes in neomagic driver (Egbert
Eich).
272. Fixed RAC function registration in S3 driver (Egbert Eich).
271. Added some voodoo to screen initialization of S3 driver (Egbert Eich).
270. Fixed vbe/int10 support in SMI driver. It used to core dump when BIOS
was not usable (Egbert Eich).
269. Separated BRIGHTNESS and and CAPTURE_BRIGNTESS video attributes in smi
driver: CAPTURE_BRIGHTNESS refers to the capture chip (ie. Philips
SAA7110) while BRIGHTNESS controls the video overlay of the SMI chip
itself (Egbert Eich).
268. Disable automatic loading of DRI when running SUN ffb as this is
inconsistent with other drivers (Thorsten Kukuk).
267. Fixed Gamma/Brightness code in trident driver (Egbert Eich).
266. Added FpDelay debugging option (Egbert Eich).
260. Fixed video support for Trident 9397 (Egbert Eich).
265. Fixed Cursor/VT switch support for vmware driver (Egbert Eich).
264. Fixed Blit problems in vmware driver when running KDE (Egbert Eich).
263. Added RENDER support to vmware driver (Egbert Eich).
262. Added C&T 69030 to extrapci.ids (Egbert Eich).
261. Improved mouse autodetection code (Egbert Eich).
260. Restructured int10 code so that vm86 and x86emu support can be loaded
as modules. Implemented heuristic to try vm86 first and fall back to
x86emu. This allows 32 bit Xservers to run on x86_64 on 64-bit kernel
without vm86 support (Egbert Eich).
259. Restructured elf loader: determine which section to load from
elfheader flags (Egbert Eich).
258. Adding RENDER Support to RAC (Egbert Eich).
257. Using borderClip instead of borderSize region for redisplay function
in miext/shadow code to avoid core dumps when vt switched away (Egbert
Eich).
256. Replacing sprintf() by snprintf() in lbxproxy to eliminate possible
buffer overrun exploits (Egbert Eich).
255. KP_Decimal fixes to Czech and Slovak keybards (Jan Holesovsky
<kendy@suse.cz>) (Egbert Eich).
commit 2698ee9f29189a44de1c92df99f48d45f0111577
Author: Keith Packard <keithp@keithp.com>
Date: Thu Aug 15 18:07:57 2002 +0000
Prefer touchscreen to mouse
commit fe477855d7d714c154dc9fcb1d0aa67fb8e4e5a5
Author: Keith Packard <keithp@keithp.com>
Date: Fri Aug 2 16:30:50 2002 +0000
Fix for iPaq IOCTL changes
commit cf49ce6f26caee30f4160e6e0b2b658863e7a145
Author: Keith Packard <keithp@keithp.com>
Date: Fri Aug 2 16:15:02 2002 +0000
Allow both touchscreen and mouse at the same time
commit 1a5f923c62dcffb3a81c6532f3dc071c70345cb3
Author: David Dawes <dawes@xfree86.org>
Date: Tue Jun 4 22:19:58 2002 +0000
174. Fix makedepend so that it can parse a unary '+' operator (#5185, Mark
Snitily).
173. Fix a typo in Xvesa's emulation of instructions forbidden in vm86 mode
(#5184, Juliusz Chroboczek)
172. Fix a bounds check in Xlib's Region code (#5183, Owen Taylor).
commit 98f8d7af3cb7a10cc268a8bdd3039539b1bf90f2
Author: Keith Packard <keithp@keithp.com>
Date: Tue Feb 19 00:18:05 2002 +0000
kdrive/vesa: apply vm86 patch from Juliusz
commit 6d8cedf68c7803330bc920cf7506727c4ad6108c
Author: Keith Packard <keithp@keithp.com>
Date: Thu Feb 14 16:08:05 2002 +0000
update kdrive manual and usage
commit 44b20bfa587def11f3127980e67ff47e695c3e51
Author: Keith Packard <keithp@keithp.com>
Date: Fri Feb 1 00:52:15 2002 +0000
kdrive/mach64: recognize the mach64li
commit 3abb3e073961986137f8fec1f194c60636b9e864
Author: Keith Packard <keithp@keithp.com>
Date: Fri Jan 18 16:25:19 2002 +0000
kdrive: fix button emulation for iPAQ
commit 88810cfc02941d7e54924e25aa872e5cc740d274
Author: Keith Packard <keithp@keithp.com>
Date: Thu Dec 20 16:47:30 2001 +0000
kdrive/linux/mouse.c: convert mouse data to signed values for compilers
with default unsigned chars
commit 83388cb23282471e80d513bd3ab472b51c110b35
Author: Keith Packard <keithp@keithp.com>
Date: Mon Dec 10 16:34:20 2001 +0000
kdrive/i810: bit swap for i810 cursor (from Pontus Lidman)
commit 4646a6c3b925676039f50bacb4f3c780f6e81bcc
Author: Keith Packard <keithp@keithp.com>
Date: Fri Dec 7 02:19:04 2001 +0000
kdrive: work around ipaq touch screen compile problems
commit 54feb8a4c8f0e0cb6eb40b494171fa4f3552cfc3
Author: Keith Packard <keithp@keithp.com>
Date: Fri Dec 7 02:18:19 2001 +0000
kdrive: missing registration for mouse input type
commit 636390fb9d6314e506f593da6556fa198b4e9bf6
Author: Keith Packard <keithp@keithp.com>
Date: Thu Nov 22 23:38:21 2001 +0000
kdrive: initialize all Linux mouse driver fields
commit 668c25a769044f06ed47a3145a11aceeb9574c9d
Author: Keith Packard <keithp@keithp.com>
Date: Thu Nov 8 10:26:24 2001 +0000
kdrive: fix ALTGR keyboard mappings
commit e76c6b2acae5622dd2d4944cd6f3673dbc70a571
Author: Keith Packard <keithp@keithp.com>
Date: Thu Nov 8 09:35:08 2001 +0000
kdrive/linux: update ps/2 mouse detection/configuration code from FreeBSD
bits
commit 6fafe3b092f799da788a1ae75be1c23da42f0983
Author: Keith Packard <keithp@keithp.com>
Date: Thu Nov 8 09:33:51 2001 +0000
kdrive: Open APM device r/w for kernel 2.4.14
commit 2f2e256de71c42b7856440ec43b1c122019b95b7
Author: Marc Aurele La France <tsi@ualberta.edu>
Date: Mon Oct 29 16:34:56 2001 +0000
DPMS warning fix
commit b8d90c5ea4659a01694864e6c05a563dcea296eb
Author: Marc Aurele La France <tsi@ualberta.edu>
Date: Sun Oct 28 03:33:10 2001 +0000
407. Fix for threaded libraries (Marc La France).
406. Finish removal of SuperProbe (Marc La France).
405. A rather large number of warning fixes throughout (Marc La France).
404. Fix bug in HTML install script (Marc La France).
403. Missing ident lines for some XFree86-modified files (Marc La France).
402. Add default half-width doublescanned modes (Marc La France).
401. Mark all driver-registered resources with ResBus (Maarc La France).
400. Fix DPMS-related build problem (Marc La France).
399. Log a message just before calling each ChipProbe() during '-probe'
processing (Marc La France).
398. Temporarily disable ISA probing on SPARCs and PowerPCs (Marc La
France).
397. Add PCI IDs for Sun hardware (Marc La France).
396. Fix memory leak in resource relocation (Marc La France).
395. Do not relocate resources that only conflict with disabled non-video
PCI devices or disabled PCI ROMs (Marc La France).
394. Re-organise SBUS code (Marc La France).
393. Add as-yet-unused definitions for PCI resource types other than I/O
and memory (Marc La France).
392. Add doc for Solaris, but don't format it yet (Marc La France).
391. Normalise driver names (Marc La France).
390. For SPARCs, disable DGA support in ATI driver (Marc La France).
389. Clean up some debugging messages (Marc La France).
388. Fix newport driver for when a /proc fs isn't mounted (Marc La France).
387. Fix DAC handling bugs in s3 driver (Marc La France).
386. Fix resource registration bug for PCI Tseng's (Marc La France).
385. Add aperture driver for Solaris (not yet used) (Marc La France).
384. Rework scanpci to fix problems that prevented it from completely
displaying non-PCI bridges and Simba bridges (Marc La France).
383. Fix build problems in some input drivers (Marc La France).
382. Fix int10 compile problem for SPARCs and PowerPCs (Marc La France).
381. Ensure master aborts on secondary buses complete normally during PCI
scans (Marc La France).
380. Some memory mapping and Solaris cleanups (Marc La France).
commit a8518b35617a479f50c735c015115b853f4aa327
Author: Keith Packard <keithp@keithp.com>
Date: Wed Oct 24 20:14:52 2001 +0000
kdrive/savage: Long lines cant be drawn with accelerator
commit 28fd5f7525848cf0109f9cf2d6311f3717570a5d
Author: Keith Packard <keithp@keithp.com>
Date: Fri Oct 12 06:33:12 2001 +0000
kdrive: add new auto-detecting and auto-switching mouse driver
commit 5f310d7f8b566b1e331286752d349f87ef43a811
Author: Keith Packard <keithp@keithp.com>
Date: Sat Sep 29 04:16:39 2001 +0000
kdrive: restructure APM/VT switch support to reset keyboard state and flush
buffer on APM resume
commit bb2e1c53b58ac94539f0d11ae195186a9ee0a2f7
Author: Keith Packard <keithp@keithp.com>
Date: Fri Sep 21 21:58:34 2001 +0000
hw/kdrive: Xv window private should be allocated on demand
commit 59cd35f634468acfa2e48711da09fabc811d96f9
Author: Keith Packard <keithp@keithp.com>
Date: Fri Sep 14 19:25:17 2001 +0000
hw/kdrive/vesa: initialize mouse matrix for non-rotated case correctly
commit fbaf3ceae0519ebdfee4b6a73b1bc0000f141cf2
Author: Keith Packard <keithp@keithp.com>
Date: Fri Sep 14 19:24:11 2001 +0000
hw/kdrive/trident: solid fill checks busted for planemasking
commit 216090d1aedb23c691a75da25b14d8543b932e1c
Author: Keith Packard <keithp@keithp.com>
Date: Wed Sep 5 07:12:43 2001 +0000
kdrive: Add primitive ct65550 server. Update kdrive/vesa code to support
DPMS using VESA bios routines. Include support for Toshiba SMM DPMS as
well
commit f856b952ec7251d6e95f0b93d62fb026d07b0ebc
Author: David Dawes <dawes@xfree86.org>
Date: Thu Aug 9 20:45:15 2001 +0000
187. Add an MS mouse driver for KDrive (#4754, Juliusz Chroboczek).
commit f4db75ac431c14e0c24ff7549c6ce1e3b0b86b87
Author: Keith Packard <keithp@keithp.com>
Date: Thu Aug 9 09:08:55 2001 +0000
kdrive/mach64: support Xv under RandR
commit 628d7695d1696f6f5cba6ea1f2548aa5d0f38c80
Author: Keith Packard <keithp@keithp.com>
Date: Thu Aug 9 09:06:08 2001 +0000
kdrive: disable sigio debugging
commit 958c0374a6709386e91b4b3ed7ba8fa81d415ebf
Author: Keith Packard <keithp@keithp.com>
Date: Tue Jul 24 21:26:17 2001 +0000
kdrive: add apm support, fix MTRR unmapping bug
commit b7eb8a35b51aa2edc9ff59f091ee88ea7000b757
Author: Keith Packard <keithp@keithp.com>
Date: Tue Jul 24 19:06:04 2001 +0000
kdrive: Unmap vesa device when disabled
commit d2d221a012950b98e48e47b6dea38e6ad385fef8
Author: Keith Packard <keithp@keithp.com>
Date: Mon Jul 23 03:44:17 2001 +0000
kdrive/mach64: Force read of GUI_STAT on every op to avoid problems across
suspend/resume
commit 79486b3b5c792a990cb73b4efa453218262e605f
Author: Keith Packard <keithp@keithp.com>
Date: Fri Jul 20 19:35:30 2001 +0000
Too many changes, but all in kdrive:
Add support for global screen origins (-origin option), handles both
Xinerama and mouse crossings.
Fix XV enable/disable sequences -- can't use card wrappers as cards have
more than one screen.
Change vesa/fbdev to use new depth-independent rotation shadow update
Fix vesa to allow starting rotation value (again)
Make vesa driver write all colormap changes in one INT10 call
commit 9826d5a1339570c037ae1ef29c9a237874a6ffa2
Author: Keith Packard <keithp@keithp.com>
Date: Thu Jul 19 08:46:30 2001 +0000
kdrive/fbdev: only setting first colormap entry on static hardware
commit 35d8b5f44269c97497c73d3638b8f0345757c04c
Author: Keith Packard <keithp@keithp.com>
Date: Mon Jul 16 19:48:00 2001 +0000
kdrive/fbdev: fix static color case
commit 090a429573dfb965ebc4ea8ea57e3bef5f9a8539
Author: Keith Packard <keithp@keithp.com>
Date: Wed Jul 11 16:42:17 2001 +0000
kdrive/fbdev: dont set DPMS mode repeatedly to the same value
commit 99fb2eb76d8f93578e4aba75c73b9be0766f7b6f
Author: Keith Packard <keithp@keithp.com>
Date: Wed Jul 11 05:02:24 2001 +0000
Generalize kludge in fbdev that normalizes pixel formats to something that
Render can handle
commit 562474091a3d52a062eb89d25a7d38200a785425
Author: Keith Packard <keithp@keithp.com>
Date: Wed Jul 11 02:58:19 2001 +0000
Fix TOUCHSCREEN support in kdrive
commit 67cd53abfce7ed17ae4c428332a9e0fd908da97a
Author: Keith Packard <keithp@keithp.com>
Date: Fri Jun 29 14:00:41 2001 +0000
Rework kdrive input fd handling, enable multiple simultaneous mice
commit c872ee82045e8c7ce019df2577d06bec549cd71c
Author: Keith Packard <keithp@keithp.com>
Date: Fri Jun 29 13:57:45 2001 +0000
kdrive: typo in MTRR calculations
commit 63dd090655ba995b8f26386bb50cb5b7568f7da0
Author: Keith Packard <keithp@keithp.com>
Date: Fri Jun 29 13:55:53 2001 +0000
kdrive: dont touch hardware when disabled
commit 01a53daa03a8ee36ce136dde3a9a9b152e9c2e2f
Author: Keith Packard <keithp@keithp.com>
Date: Sat Jun 23 03:41:24 2001 +0000
Clean up mach64 video code to add ReputVideo and make StopVideo not crash
the machine
commit 31d47ec8bed1b02d04563ba502eaeb028975f653
Author: Keith Packard <keithp@keithp.com>
Date: Thu Jun 21 21:44:09 2001 +0000
kdrive/mach64: remove useless Xv debug printfs
commit bd61c15279e2195c72b3add32961ed21e293d48b
Author: Keith Packard <keithp@keithp.com>
Date: Thu Jun 21 01:01:30 2001 +0000
Add RCS tag
commit 66c9184807997d2a0a155ba1697906c07396863f
Author: Keith Packard <keithp@keithp.com>
Date: Thu Jun 21 00:58:51 2001 +0000
Fix screen physical size in RandR code for kdrive fbdev and pcmcia servers
commit f8a456f094d8f61c021bbfb6e6f0a4723ebdc73f
Author: Alan Hourihane <alanh@fairlite.demon.co.uk>
Date: Wed Jun 20 21:53:31 2001 +0000
Add RandR support to the Kdrive pcmcia driver.
commit 918ff10f2697ee8c17013bd31596072a38c5ac9b
Author: Keith Packard <keithp@keithp.com>
Date: Tue Jun 19 09:31:47 2001 +0000
Finish Xv support for kdrive/mach64
commit 6d86517b0ed0db51f3eaf19c186db52feb1e47e0
Author: Keith Packard <keithp@keithp.com>
Date: Sat Jun 16 05:53:05 2001 +0000
Screen flipping broken pointer remapping
commit 54aea8ec0c1c3633788fd9b19636093860c75d53
Author: Keith Packard <keithp@keithp.com>
Date: Sat Jun 16 05:48:49 2001 +0000
Patch DPMS support in kdrive/mach64, add preliminary (broken) Xv support
commit f386ca6c69ba10cd8c0dd60bb25cde37ecfc8bc7
Author: Keith Packard <keithp@keithp.com>
Date: Wed Jun 13 19:18:44 2001 +0000
Support initial rotation in kdrive/fbdev, use that as the normal
orientation
commit 93dbdc89c172fd5d6450f21ebc91011771ac0100
Author: Keith Packard <keithp@keithp.com>
Date: Wed Jun 13 19:18:03 2001 +0000
Add -dpi support to kdrive
commit a6517a3056a88fca35a47185a0e6d83f3e8b0015
Author: Keith Packard <keithp@keithp.com>
Date: Mon Jun 11 01:38:54 2001 +0000
Advertise supported rotations in kdrive/vesa server
commit 4f8254b31f30bd12224c2fdcecfbd67b41ecd7e1
Author: Keith Packard <keithp@keithp.com>
Date: Tue Jun 5 17:17:39 2001 +0000
Attempt to make kdrive/fbdev run on static gray hardware (iPaq 3150)
commit bf4dbfbf45e4e6b1b86c624b1995a1050b7a0eef
Author: Alan Hourihane <alanh@fairlite.demon.co.uk>
Date: Tue Jun 5 16:57:44 2001 +0000
fix some warnings due to new shadow code
commit a4ba10ba6ffb1c01a0df5b34669b9fb24ad0e7d9
Author: Keith Packard <keithp@keithp.com>
Date: Tue Jun 5 16:49:31 2001 +0000
kdrive/fbdev: RandR initialization sequence change
commit 7fcf46356ba70563f036f535e60667727db442ae
Author: Keith Packard <keithp@keithp.com>
Date: Mon Jun 4 09:45:42 2001 +0000
Allow for hardware acceleration under RandR with Layer. Hardware/Software
cursor switching still busted
commit 54e66d92db917923e33e018e628a7629d6705507
Author: Keith Packard <keithp@keithp.com>
Date: Sun Jun 3 21:52:46 2001 +0000
Update RandR protocol
commit 88ae32841d766c7d0df79ee25e1db62996d4ecb3
Author: Keith Packard <keithp@keithp.com>
Date: Sun Jun 3 18:48:19 2001 +0000
Add mach64 driver to Tiny-X
commit 14ed0c3d6d674df4edcbcd8840a7cea4b41a0673
Author: Keith Packard <keithp@keithp.com>
Date: Wed May 30 15:36:25 2001 +0000
Fix kaa to not try Copy for pixmap sources
commit a2bd75d15a99d4ee117e17921f0426228d53f5e8
Author: Keith Packard <keithp@keithp.com>
Date: Tue May 29 21:55:41 2001 +0000
Xfbdev: Make sure screen gets re-enabled on RandR failure
commit 562925c439cf1746f2caa720d4f2dce54ba0311b
Author: Keith Packard <keithp@keithp.com>
Date: Tue May 29 17:47:55 2001 +0000
Fix Xipaq build after layer/RandR additions
commit 78b53386b51cde4fe4664963ddafa36b814360f2
Author: Keith Packard <keithp@keithp.com>
Date: Tue May 29 04:54:13 2001 +0000
Add miext/layer for more complete RandR support in kdrive/Xfbdev
commit 06f758797ab3651b0e293ae26daf4df77702fdde
Author: Keith Packard <keithp@keithp.com>
Date: Sat May 26 01:25:42 2001 +0000
Add initial RandR support to Xvesa
commit ba8351609869165aa2de92b7a876dc2d2768cb5b
Author: David Dawes <dawes@xfree86.org>
Date: Fri May 25 18:40:59 2001 +0000
38. Fix xmh's use of XtNewString() with getenv (#4694, Tim Waugh).
37. Xdm/PAM fixes: leave it to PAM to observe whether or not an account is
locked, and reinitialize credentials after calling initgroups(),
because sometimes the credentials pam_setcred() gives are in the form
of group membership (#4693, Mike Harris).
35. Fix warnings when building mieq.c (#4689, Adam Sulmicki).
34. Fix some bugs in the cz and sk entried in XKB's keymap/xfree86 file
(#4692, Ivan Pascal).
33. Add 'hr' entries to XKB's keymap/xfree86 and rules/xfree86.lst files
(#4687, Nerijus Baliunas).
32. Include <X11/Xutil.h> in shape.h to get Region typedef (#4686, Adam
Sulmicki).
commit e9314bd34ec39cc699591123cc8a05a934b66b85
Author: Alan Hourihane <alanh@fairlite.demon.co.uk>
Date: Fri May 25 07:44:29 2001 +0000
wrap some stuff around #ifdef TOUCHSCREEN
commit e6497f39af98cd25719eab72b0be04fa4146172f
Author: Alan Hourihane <alanh@fairlite.demon.co.uk>
Date: Thu May 24 19:31:46 2001 +0000
fix ifdef->if
commit 0e1a49a7dd00ae494d92ab480d9776ec5320cb3e
Author: Alan Hourihane <alanh@fairlite.demon.co.uk>
Date: Wed May 23 17:28:39 2001 +0000
add missing pieces for the pcmcia driver
commit 85d827f5329fa93dea1125788457fac6835cd134
Author: Alan Hourihane <alanh@fairlite.demon.co.uk>
Date: Wed May 23 08:56:09 2001 +0000
Add PCMCIA server for HP VGA Out PC Card and the Voyager VGA Card. Use on
the Compaq IPAQ. Use -listmodes to see supported modes. Hack the
touchscreen driver to work as a mouse pad for the VGA screen. Fixup key
bindings so xmodmap can remap IPAQ's buttons as mouse buttons.
commit f9104754cda1212cf48d6d24a0a586c5368d7549
Author: Keith Packard <keithp@keithp.com>
Date: Wed May 23 03:29:44 2001 +0000
Add RandR extension
commit dc383e8f77f99e8c2b799a6ab4e4998a1fcacb24
Author: Marc Aurele La France <tsi@ualberta.edu>
Date: Sun Apr 1 14:00:04 2001 +0000
317. glxinfo needs libGLU (Marc La France).
316. Rage128 fix to Cards database (Marc La France).
315. Minor fix to PCI resource overlap handling (Marc La France).
314. Loader code simplification and IA-64 cache flushes (Marc La France).
313. Workaround in the ATI driver for troublesome interaction between
loader and compiler optimisation (Marc La France).
312. Warning fixes for `gcc -fno-builtin`, which appears to be the default
on some systems (Marc La France).
more of #301, tags, warnings and build fixes.
commit 518e205b06d0dc7a0cd35fbc2c6a4376f2959020
Author: Keith Packard <keithp@keithp.com>
Date: Fri Mar 30 17:35:55 2001 +0000
kdrive/igs: add missing register definitions that used to be in igsregs.t
commit eb3da37564593b7c9fb574af824e2f5e0cc6bb24
Author: Keith Packard <keithp@keithp.com>
Date: Fri Mar 30 02:18:41 2001 +0000
Add files for Xmuu and i810 driver
commit f39a62d122b6e63e2971d8593bf6b24933f66ec8
Author: Keith Packard <keithp@keithp.com>
Date: Fri Mar 30 02:15:20 2001 +0000
Add Xmuu library to remove requirement for Xt/Xaw from most X utilities Add
i810 and Xv support to kdrive
commit a161cfd72870ae6dca66ef02f5cdd13b7ac75fd6
Author: David Dawes <dawes@xfree86.org>
Date: Wed Mar 21 16:43:16 2001 +0000
remove Id line
commit 0aa54b4d409647778b563d77ef6100085d86c6f3
Author: David Dawes <dawes@xfree86.org>
Date: Tue Feb 13 21:15:15 2001 +0000
144. Fix the neomagic driver so that it saves/restores the palette (#4452,
Ken Hornstein).
143. Fix a palette saving bug in the vgahw module (#4452, Ken Hornstein).
142. Fix a typo in Xfbdev.man (#4446, Juliusz Chroboczek).
141. Major updates to the savage driver, including:
- DDC support
- I2C support
- XVideo YUV overlay support for Savage/MX and Savage/IX
- DGA support
- yanks Ani Joshi's depth/bitsPerPixel patch for searching the BIOS
- fixes interactions with frame buffer and SVGATextMode consoles; VT
switching now seems quite reliable for almost everyone
- yanks unused options
- adds new options for hacks to deal with the status register hangs
- adds one special case memory configuration for Savage 4
- adds support for doublescan modes (320x240 works)
- adds LCD panel detection
- fixes a panning bug at depth 24 (panning must be to even pixels)
- adds a workaround for bugs in the latest ProSavage BIOSes (#4445, 4448,
Tim Roberts).
140. Make 'X -configure' use the long monitor name when present in the DDC
info (#4444, Andrew C. Aitchison).
139. Make glxinfo respect $DISPLAY (#4443, Meelis Roos).
138. Fix TrueType font problems in 4.0.2 (#4439, Juliusz Chroboczek).
137. Document the "DisplaySize" keyword in the XF86Config man page (#4438,
Andrew C. Aitchison).
commit 3dfa6cce9938413e10cc400ba6d9b19b8f28e485
Author: David Dawes <dawes@xfree86.org>
Date: Sat Jan 27 18:20:40 2001 +0000
88. Set the version strings in man pages dynamically (David Dawes).
87. Remove the XF86_VERSION string from xf86Version.h, leaving just the
numerical values. All the version information is now derived from that
single set of values (David Dawes).
commit 60c7a912e257045d1189a19a38d9dbedc20ae78b
Author: David Dawes <dawes@xfree86.org>
Date: Wed Jan 24 00:06:10 2001 +0000
79. Preprocess all man pages to make sure that the references to pages in
sections that are platform-dependent are correct. Also fixed some misc
formatting problems found while doing that (David Dawes).
commit dacbf5671da08d161cd7a32496e0b58f50a93453
Author: Keith Packard <keithp@keithp.com>
Date: Tue Jan 23 06:25:05 2001 +0000
Integrate jg patch for iPAQ
commit 2869e08a328cb6aa51c17b96bdebd37e9eeefc88
Author: Keith Packard <keithp@keithp.com>
Date: Wed Dec 13 18:06:54 2000 +0000
kdrive: non-x86 compiles broken in kmap.c
commit ec4916836c42cb4a1dc1622dddd27951a90a52c9
Author: Keith Packard <keithp@keithp.com>
Date: Fri Dec 8 23:04:57 2000 +0000
kdrive: dont try MTRR on non-x86, fix backspace mapping
commit d09a156d92dbcd9368be20dabe47ea197f19357e
Author: Keith Packard <keithp@keithp.com>
Date: Fri Dec 8 22:59:37 2000 +0000
kdrive: allow screen size specification
commit 6b61d48f2146f18c94d5f2b3d16a822c0eee9841
Author: Keith Packard <keithp@keithp.com>
Date: Fri Dec 8 21:40:29 2000 +0000
kdrive/vesa: type cast warning fix
commit b59eabd230110d604515868893d9aa06e6d3b748
Author: Keith Packard <keithp@keithp.com>
Date: Fri Dec 8 21:40:02 2000 +0000
kdrive: A few iPAQ inspired changes to event management
commit a25637fe789c5127451233c759074780cbc110ac
Author: David Dawes <dawes@xfree86.org>
Date: Mon Dec 4 21:01:00 2000 +0000
missing ident lines
commit 1adbdf76a903aa37d553c1c2cc43a783f21acaa5
Author: Keith Packard <keithp@keithp.com>
Date: Fri Dec 1 00:01:32 2000 +0000
kdrive: add Xkdrive/Xfbdev man pages, update Xvesa manual
commit 5f8e75f27d49719f5fd07d48481435f93779da6c
Author: Keith Packard <keithp@keithp.com>
Date: Wed Nov 29 08:42:25 2000 +0000
kdrive: add MTRR support, add clock support to trident driver
commit 02568ec5a8f278faaa26c973fcb424da3fd31f2b
Author: Keith Packard <keithp@keithp.com>
Date: Sun Nov 19 20:51:12 2000 +0000
kdrive: vesa get mode using uninitialized value
commit 8f634a6516caca0e4be875e696820a820e480cff
Author: Keith Packard <keithp@keithp.com>
Date: Fri Oct 20 00:19:51 2000 +0000
Add VGA BIOS modes to Tiny-X Xvesa server
commit f16d5d6817f15be35293ee995d073eb57fafe283
Author: Keith Packard <keithp@keithp.com>
Date: Wed Oct 11 06:04:40 2000 +0000
Add composite operator support to trident
commit d579bd5676ea570a8f2765cd2f6ba40074171593
Author: Marc Aurele La France <tsi@ualberta.edu>
Date: Tue Oct 10 14:05:48 2000 +0000
Static build fix and ident lines.
commit 5f5b9ed1ad0591d70354c2b90609051d169fc33e
Author: Keith Packard <keithp@keithp.com>
Date: Sun Oct 8 02:08:39 2000 +0000
kdrive: Add timeout to screen switching to avoid unintentional flipping
commit fb8b58270fcaee236337d3818df04e651acbcea9
Author: Keith Packard <keithp@keithp.com>
Date: Fri Oct 6 22:13:40 2000 +0000
kdrive: support jgs new linux keysyms
commit 15d45ffbd9af5ccce07264d6182b2222c417a2a5
Author: Keith Packard <keithp@keithp.com>
Date: Fri Oct 6 22:05:53 2000 +0000
kdrive: fix any-edge screen-switching behaviour
commit fae164a4958b95e3ba4e4d5125da4611fcb14f6d
Author: Keith Packard <keithp@keithp.com>
Date: Fri Oct 6 05:54:09 2000 +0000
kdrive: ignore mouse/keyboard fds in WakeupHandler while switched away
commit b814019be970bc45f808ec19eef0a48b789d6646
Author: Keith Packard <keithp@keithp.com>
Date: Tue Oct 3 17:22:14 2000 +0000
kdrive: zero out fbdev screen private as its supposed to be
commit e0ccbaab226bd3e1d619d66c9ec718c67c0a559a
Author: Keith Packard <keithp@keithp.com>
Date: Thu Sep 28 20:58:21 2000 +0000
kdrive: fix typo initializing touch screen
commit 6171187e92152a443f7d5dd7f0dad866b3e275ea
Author: Keith Packard <keithp@keithp.com>
Date: Wed Sep 27 20:47:37 2000 +0000
kdrive: memory/fd leaks fixed in fbdev/vesa/trident drivers
commit 367cab99ece8655bbd8a65096bb68bcfd7ef6fea
Author: Marc Aurele La France <tsi@ualberta.edu>
Date: Tue Sep 26 15:57:04 2000 +0000
721. PCI chip ID updates to ATI driver (Marc La France).
720. Fix i810 driver for -probe and -configure (Marc La France).
719. Change message when default modes are deleted (Marc La France).
718. Fix Xinerama byte swapping bug (Marc La France).
717. IA-64 and Alpha fixes for pswrap, Mesa, DRI, Xpm, libX11, Xt, Xaw,
Xmu, dps, Type1 fonts, cfb24, most output drivers, ELF loader, ramdac
module, xf4bpp and xf86cfg (Marc La France).
716. Improve IA-64 support by removing a plethora of 32-bit'isms (Marc La
France).
715. Default HasLinuxDoc to NO (Marc La France).
ident lines and warning fixes.
commit 94368c3b92b8513d5135fb3c20165f108b0e96fd
Author: Keith Packard <keithp@keithp.com>
Date: Tue Sep 26 04:31:23 2000 +0000
kdrive: Add iPAQ and Touch screen support
commit 03e3689701007ea40422b4d729b65aaebcd84869
Author: Alan Hourihane <alanh@fairlite.demon.co.uk>
Date: Sun Sep 24 13:52:40 2000 +0000
reversed a tag accidentally - put it back.
commit 61e8a40f0d4e886bec96c3f9ee90433a3fab9d54
Author: Alan Hourihane <alanh@fairlite.demon.co.uk>
Date: Sun Sep 24 13:51:22 2000 +0000
DRI merge
commit 2bbb90ebd927607e0b2c7cd8f3a402b44705fe03
Author: Keith Packard <keithp@keithp.com>
Date: Fri Sep 22 06:25:29 2000 +0000
Changes for PPC support under linux and a few overlay additions
commit 02777941e6ac8c79f934ba95b6b2e7f388ffbd14
Author: Keith Packard <keithp@keithp.com>
Date: Tue Sep 19 23:50:48 2000 +0000
kdrive: fix bug in vesa 4plane in 8bpp mode
commit 5b9f49f64c7fb51afbfaab4f848fc7d67851582c
Author: Keith Packard <keithp@keithp.com>
Date: Tue Sep 19 23:49:55 2000 +0000
kdrive: use VESA instead of FBDEV for trident driver
commit 18692160c964c80ba83b63bc207660b6254e11cb
Author: Keith Packard <keithp@keithp.com>
Date: Tue Sep 19 23:49:17 2000 +0000
kdrive: make sure allocation worked before accessing
commit d6e151ce4deaff506c580da7e3baf055db1c3ae3
Author: Keith Packard <keithp@keithp.com>
Date: Fri Sep 15 15:19:00 2000 +0000
Tiny-X: Add mouse matrix to rotate mouse, allow enable to fail, add render
by default
commit f7421d836186cd6dfb919c5a48d556a68d6c5a5d
Author: Keith Packard <keithp@keithp.com>
Date: Fri Sep 15 07:25:13 2000 +0000
Add rotation to fbdev and vesa
commit 5ec29fe9ea788e0dcc47534a2eca479b2c465160
Author: Marc Aurele La France <tsi@ualberta.edu>
Date: Thu Sep 7 19:44:26 2000 +0000
Ident lines
commit db1a883d32ce8138dde288d32c11e147cdfc81a0
Author: Keith Packard <keithp@keithp.com>
Date: Sun Sep 3 05:12:28 2000 +0000
Rework tiny-x vesa driver for shadowing and multiple screen support. Allow
enable to fail and avoid crashing
commit c97fb611dd7dedef6d075ef9d56f3d32c8018d39
Author: Keith Packard <keithp@keithp.com>
Date: Sun Sep 3 05:11:46 2000 +0000
Rework vesa driver for shadowing and multiple screen support. Allow enable
to fail and avoid crashing
commit 38059656849a5bab5b56b23359a90aca4ba396c7
Author: Keith Packard <keithp@keithp.com>
Date: Tue Aug 29 17:20:15 2000 +0000
Use VESA driver underneath
commit 77331f967077ca2fefbfb117c7e9bc2bf65b5e31
Author: Keith Packard <keithp@keithp.com>
Date: Tue Aug 29 17:19:51 2000 +0000
Changes from Juliusz for emulating some in/out insns, make ready for other
layers to use
commit 3095deed7701a1a14be85dff4a6994028b5a6d09
Author: David Dawes <dawes@xfree86.org>
Date: Mon Aug 28 15:29:19 2000 +0000
565. Support for multithreaded libraries on NetBSD when used in conjunction
with the GNU pth library (#4113, Chris Sekiya).
564. Add /usr/pkg/bin to NetBSD's DefaultUserPath (#4112, Bernd Ernesti).
563. Add a (Linux-specific) VESA driver for Keith's small X server (#4111,
Juliusz Chroboczek).
562. Update Hungarian xkb maps (#A.145, Peter Soos). remove koi8-r encoding
file since it's built-in
commit f32448679118b77825625aafdc4d6ae4d636cc21
Author: Marc Aurele La France <tsi@ualberta.edu>
Date: Mon Aug 28 02:43:14 2000 +0000
Ident lines
commit 83a388c96d665b6bfb0ae195c8c74e0e1520ab8f
Author: Keith Packard <keithp@keithp.com>
Date: Sat Aug 26 00:24:38 2000 +0000
Try to avoid hitting hardware during server reset when not active, add
KdPicture code
commit 4223801110c8d5873dd668880dff411765dfc18d
Author: Keith Packard <keithp@keithp.com>
Date: Wed Aug 9 17:52:45 2000 +0000
Add overlay support for savage. Make sis setup code work on nIc
commit 325fb002e8832a05361516bbaf19d1e8b67a3486
Author: Keith Packard <keithp@keithp.com>
Date: Wed May 24 23:57:56 2000 +0000
Fix 640x480x60 mode, drop inb/outb on non-x86 machines
commit a6d519e527a81341ad333cb25b410dfde07176ae
Author: Keith Packard <keithp@keithp.com>
Date: Wed May 24 23:52:48 2000 +0000
Add modes, cursors and acceleration
commit 240aeb4cda91d19f5b19ebd7f7d6c1aad19f1642
Author: Marc Aurele La France <tsi@ualberta.edu>
Date: Thu May 11 18:14:13 2000 +0000
162. Fix possible SEGV in generic int10 module (Marc La France).
161. Fix *BSD aperture driver to allow for int10 (Bernd Ernesti, Marc La
France).
160. Fix vesafb restore problem in ATI driver (Marc La France).
159. Fix a few more compilation glitches (Marc La France).
commit 3731c184d69e3c1face0c731926433d522d48067
Author: Keith Packard <keithp@keithp.com>
Date: Sat May 6 22:17:53 2000 +0000
Lots of Tiny-X changes:
Add overlay support in the Tiny-X Savage4 driver (required changing lots of
Tiny-X code). Savage4 now support 8/16, 8/32 overlays.
Add IGS Cyberpro 5050 driver. This chip has bus support for embeded
systems.
commit 4b54f22b6accf438f31fbbe79877545c38375351
Author: David Dawes <dawes@xfree86.org>
Date: Wed Feb 23 20:30:15 2000 +0000
remove/disable standard RCS ident lines that are in some files some bindist
updates don't define noPanoramiXExtension when Xinerama is not enabled
Add xfontsel to programs/Imakefile
commit be2dad5954b8fee09a84f417e41bb65745dadf76
Author: David Dawes <dawes@xfree86.org>
Date: Fri Jan 21 18:41:49 2000 +0000
missing ident lines
commit 306ac1db85c30a796c9a69c639e7f2e4efd98d50
Author: David Dawes <dawes@xfree86.org>
Date: Fri Jan 21 01:12:02 2000 +0000
3554. Fix "controlization" in XLookupString for chars > 127 (#3569, Ivan
Pascal).
3553. Take advantage of FB speedups in Tiny-X (#3568, Keith Packard).
3552. Speed up FB and do 32bit accesses instead of 64bit accesses (#3567,
Keith Packard).
3551. Eliminate saving the contents of the screen durint VT switching
(#3562, Keith Packard).
3550. Make using fb easier for driver writers (#3561, Keith Packard).
3549. Fix TCP font server connections (#3560, Keith Packard).
3548. Implement the "OverclockMem" option for the Millennium and Millennium
II (#3558, Andrew Aitchison).
3547. Speed up some FB performance problems (#3557, 3559, 3560, Keith
Packard).
3546. Work around a bad code generation bug in gcc 2.7.2.3 that shows up in
XAA (#3550, Rik Faith).
3545. Add a -brief option to xclock to show only hours and minutes when in
digital mode (#3549, Keith Packard).
3544. Fix some dead key problems with xkb symbols for Swiss French and
Swiss German keyboards (#3546, Charles Lopes).
commit 6d978d21b0bea6c73b65f2f47c68de4b94dd73c4
Author: Robin Cutshaw <robin@intercore.com>
Date: Thu Dec 30 03:42:58 1999 +0000
Itsy cleanup.
commit 30e35cb44b6ea11d0eac8ce0d986517f3224852a
Author: Robin Cutshaw <robin@intercore.com>
Date: Thu Dec 30 03:03:21 1999 +0000
3516. Jumbo Tiny-X patch with Itsy support (#3527, Keith Packard).
commit f13b792a3a8d307a18cd6a41aa5a06622009e42f
Author: Dirk Hohndel <dirk.hohndel@intel.com>
Date: Fri Nov 19 13:54:06 1999 +0000
3336. Fx up new MMIO macros (#3337, Matt Grossman).
3335. Clean up compiler warnings in lib/font/bitmap (#3411, Matt Grossman).
3334. TGA fixes, add sync on green (#3410, Matt Grossman).
3333. Fix NULL pointer dereference in libXaw (#3406, Christopher Sekiya).
3332. Add Rage128 support (#3405, Rik Faith, funded by ATI).
3331. Add MTRR support for NetBSD and OpenBSD. Add new NetBSD aperture
driver (#3404, Matthieu Herrb).
3330. Xterm patch #121 (#3402, Thomas Dickey).
3329. Rendition driver bugfixes and alpha related cleanups (#3400, Dejan
Ilic, Marc Langenbach, Egbert Eich).
3328. Add void input device (#3392, Frederic Lepied).
3327. Changed the Xon serial option to be able to select xon/xoff for
input, output or both. Add support for Graphire models. Change wacom
init phase to use new Xoff option (#3391, Frederic Lepied).
3326. Change the SwapAxes option to SwapXY in elographics/microtouch driver
to match an already existing option in the Dynapro driver. Add a Focus
class capability to the elographics driver (#3395, Patrick Lecoanet).
3325. Update mouse rate handling (#3388, Harald Koenig).
3324. Fix NULL pointer dereference in misprite.c (#3380, Edward Wang).
3323. Add FBDev and ShadowFB support to glint driver. Add new option
"NoWriteBitmap" (#3383, Michel Daenzer).
3322. Update SuperProbe to handle S3 Savage4, Savage200 and clean up
Trio3D/Savage3D detection (#3382,3384 Harald Koenig).
3321. Add new framebuffer code and tiny X DDX architecture (#3379, Keith
Packard).
3320. Add DGA2 documentation (#3378, Mark Vojkovich).
3319. Update XFree86 manpage wrt -bpp/-depth/-fbbpp (#3377, Andy Isaacson).
3318. Make SuperProbe check primary cards, only (#3374, Harald Koenig).
3317. Add SilkenMouse to *BSD (#3373, Matthieu Herrb).
3316. Allow SilkenMouse to work if not all drivers of an OS support SIGIO
(#3372, Keith Packard).
3315. Fix a few problems in TGA driver and add support for backing store
and SilkenMouse (#3371, Matt Grossman).
3314. Add smarter scheduler (#3370, Keith Packard).
3313. Xterm patch #120 (#3369, Thomas Dickey).
3312. Enable xf86SetKbdRate function on Solaris 8 (#3364, David Holland).
3311. Fix some bugs and add acceleration to Rendition server (#3360, Dejan
Ilic).
3310. Make raw DDC information available as properties in the root window
(#3357, Andrew Aitchison).
3309. Fix for xf86CreateRootWindow (#3355, Andrew Aitchison).
3308. Add manpage for the chips driver (#3353, David Bateman).
3307. Update contact info (#3352, Andrew van der Stock).
3306. Add kbd rate support for Linux (#3363, Harald Koenig).
3305. Update Portuguese XKB map (#3351, Joao Esteves, Francisco Colaco).
3304. Fix text clipping in 3dfx driver (#3349, Henrik Harmsen).
3303. Fix S3 ViRGE hw cursor (#3348, Harald Koenig).
3302. Fix clipping in 3dfx driver (#3342, Daryll Strauss).
3301. Enable SilkenMouse for 3dfx driver (#3341, Henrik Harmsen).
3300. Enable SIGIO support on LynxOS (#3339, Thomas Mueller).
3299. Get TRUE defined in sigio.c. Fix xterm compile problem on ISC (#3338,
Michael Rohleder).
3298. Correct DPMS suspend/standby modes for 3dfx driver (#3336, Henrik
Harmsen)
3297. Xterm patch #119 (#3335, Thomas Dickey).
Generated by dwww version 1.15 on Sat May 18 07:34:08 CEST 2024.